diff --git a/.github/actions/prepare-build/action.yml b/.github/actions/prepare-build/action.yml
new file mode 100644
index 0000000000..ce75b7a57c
--- /dev/null
+++ b/.github/actions/prepare-build/action.yml
@@ -0,0 +1,47 @@
+name: "Prebuilt steps for build"
+description: "Reusable steps for multiple jobs"
+inputs:
+   java_ver:
+     required: true
+     description: "Java version to install"
+   ghc_ver:
+     required: true
+     description: "GHC version to install"
+   github_ref:
+     required: true
+     description: "Git reference"
+   os:
+     required: true
+     description: "Target OS"
+   cache_path:
+     required: false
+     default: "~/.cabal/store"
+     description: "Cache path"
+   cabal_ver:
+     required: false
+     default: 3.10.1.0
+     description: "GHC version to install"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Haskell
+      uses: simplex-chat/setup-haskell-action@v2
+      with:
+        ghc-version: ${{ inputs.ghc_ver }}
+        cabal-version: ${{ inputs.cabal_ver }}
+
+    - name: Setup Java
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'corretto'
+        java-version: ${{ inputs.java_ver }}
+        cache: 'gradle'
+
+    - name: Restore cached build
+      uses: actions/cache@v4
+      with:
+        path: |
+          ${{ inputs.cache_path }}
+          dist-newstyle
+        key: ${{ inputs.os }}-ghc${{ inputs.ghc_ver }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
diff --git a/.github/actions/prepare-release/action.yml b/.github/actions/prepare-release/action.yml
new file mode 100644
index 0000000000..e0d32bd596
--- /dev/null
+++ b/.github/actions/prepare-release/action.yml
@@ -0,0 +1,39 @@
+name: "Upload binary and update hash"
+description: "Reusable steps for multiple jobs"
+inputs:
+   bin_path:
+     required: true
+     description: "Path to binary to upload"
+   bin_name:
+     required: true
+     description: "Name of uploaded binary"
+   bin_hash:
+     required: true
+     description: "Message with SHA to include in release"
+   github_ref:
+     required: true
+     description: "Github reference"
+   github_token:
+     required: true
+     description: "Github token"
+runs:
+  using: "composite"
+  steps:
+    - name: Upload file with specific name
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: simplex-chat/upload-release-action@v2
+      with:
+        repo_token: ${{ inputs.github_token }}
+        file: ${{ inputs.bin_path }}
+        asset_name: ${{ inputs.bin_name }}
+        tag: ${{ inputs.github_ref }}
+
+    - name: Add hash to release notes
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: simplex-chat/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ inputs.github_token }}
+      with:
+        append_body: true
+        body: |
+          ${{ inputs.bin_hash }}
diff --git a/.github/actions/swap/action.yml b/.github/actions/swap/action.yml
new file mode 100644
index 0000000000..87d670b147
--- /dev/null
+++ b/.github/actions/swap/action.yml
@@ -0,0 +1,44 @@
+name: 'Set Swap Space'
+description: 'Add moar swap'
+branding:
+  icon: 'crop'
+  color: 'orange'
+inputs:
+  swap-size-gb:
+    description: 'Swap space to create, in Gigabytes.'
+    required: false
+    default: '10'
+runs:
+  using: "composite"
+  steps:
+    - name: Swap space report before modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo
+    - name: Set Swap
+      shell: bash
+      run: |
+          export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
+          echo "Swap file: $SWAP_FILE"
+          if [ -z "$SWAP_FILE" ]; then
+            SWAP_FILE=/opt/swapfile
+          else
+            sudo swapoff $SWAP_FILE
+            sudo rm $SWAP_FILE
+          fi
+          sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
+          sudo chmod 600 $SWAP_FILE
+          sudo mkswap $SWAP_FILE
+          sudo swapon $SWAP_FILE
+    - name: Swap space report after modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2338258d82..ca1bc79510 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,17 +22,58 @@ on:
       - "README.md"
       - "PRIVACY.md"
 
+# This workflow uses custom actions (prepare-build and prepare-release) defined in:
+# 
+# .github/actions/
+# ├── prepare-build
+# │   └── action.yml
+# └── prepare-release
+#     └── action.yml
+
+# Important!
+# Do not use always(), it makes build unskippable.
+# See: https://github.com/actions/runner/issues/1846#issuecomment-1246102753
+
 jobs:
-  prepare-release:
-    if: startsWith(github.ref, 'refs/tags/v')
+
+# =============================
+#       Global variables
+# =============================
+
+# That is the only and less hacky way to setup global variables
+# to use in strategy matrix (env:/YAML anchors doesn't work).
+# See: https://github.com/orgs/community/discussions/56787#discussioncomment-6041789
+#      https://github.com/actions/runner/issues/1182
+#      https://stackoverflow.com/a/77549656
+
+  variables:
+    runs-on: ubuntu-latest
+    outputs:
+      GHC_VER: 9.6.3
+      JAVA_VER: 17
+    steps:
+      - name: Dummy job when we have just simple variables
+        if: false
+        run: echo
+
+# =============================
+#       Create release
+# =============================
+
+# Create release, but only if it's triggered by tag push.
+# On pull requests/commits push, this job will always complete.
+
+  maybe-release:
     runs-on: ubuntu-latest
     steps:
       - name: Clone project
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: actions/checkout@v3
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v4
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: simplex-chat/release-changelog-builder-action@v5
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -42,7 +83,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: simplex-chat/action-gh-release@v2
         with:
           body: ${{ steps.build_changelog.outputs.changelog }}
           prerelease: true
@@ -52,183 +94,295 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  build:
-    name: build-${{ matrix.os }}-${{ matrix.ghc }}
-    if: always()
-    needs: prepare-release
-    runs-on: ${{ matrix.os }}
+# =========================
+#        Linux Build
+# =========================
+
+  build-linux:
+    name: "ubuntu-${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
+    runs-on: ubuntu-${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: 22.04
             ghc: "8.10.7"
-            cache_path: ~/.cabal/store
-          - os: ubuntu-20.04
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-20_04-x86-64
-            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
-          - os: ubuntu-22.04
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-22_04-x86-64
+            should_run: ${{ !(github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }}
+          - os: 22.04
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_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
-            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
-          - os: windows-latest
-            ghc: "9.6.3"
-            cache_path: C:/cabal
-            asset_name: simplex-chat-windows-x86-64
-            desktop_asset_name: simplex-desktop-windows-x86_64.msi
-
+            should_run: true
+          - os: 24.04
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-ubuntu-24_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-24_04-x86_64.deb
+            should_run: true
     steps:
-      - name: Skip unreliable ghc 8.10.7 build on stable branch
-        if: matrix.ghc == '8.10.7' && github.ref == 'refs/heads/stable'
-        run: exit 0
-
-      - name: Configure pagefile (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: al-cheb/configure-pagefile-action@v1.3
-        with:
-          minimum-size: 16GB
-          maximum-size: 16GB
-          disk-root: "C:"
-
-      - name: Clone project
+      - name: Checkout Code
+        if: matrix.should_run == true
         uses: actions/checkout@v3
 
-      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+      - name: Setup swap
+        if: matrix.ghc == '8.10.7' && matrix.should_run == true
+        uses: ./.github/actions/swap
         with:
-          ghc-version: ${{ matrix.ghc }}
-          cabal-version: "3.10.1.0"
+          swap-size-gb: 30
+
+      # Otherwise we run out of disk space with Docker build
+      - name: Free disk space
+        if: matrix.should_run == true
+        shell: bash
+        run: ./scripts/ci/linux_util_free_space.sh
 
       - name: Restore cached build
-        id: restore_cache
-        uses: actions/cache/restore@v3
+        if: matrix.should_run == true
+        uses: actions/cache@v4
         with:
           path: |
-            ${{ matrix.cache_path }}
+            ~/.cabal/store
             dist-newstyle
-          key: ${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
+          key: ubuntu-${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
 
-      # / Unix
+      - name: Set up Docker Buildx
+        if: matrix.should_run == true
+        uses: simplex-chat/docker-setup-buildx-action@v3
 
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-latest'
+      - name: Build and cache Docker image
+        if: matrix.should_run == true
+        uses: simplex-chat/docker-build-push-action@v6
+        with:
+          context: .
+          load: true
+          file: Dockerfile.build
+          tags: build/${{ matrix.os }}:latest
+          build-args: |
+            TAG=${{ matrix.os }}
+            GHC=${{ matrix.ghc }}
+
+      # Docker needs these flags for AppImage build:
+      # --device /dev/fuse
+      # --cap-add SYS_ADMIN
+      # --security-opt apparmor:unconfined
+      - name: Start container
+        if: matrix.should_run == true
         shell: bash
         run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
+          docker run -t -d \
+            --device /dev/fuse \
+            --cap-add SYS_ADMIN \
+            --security-opt apparmor:unconfined \
+            --name builder \
+            -v ~/.cabal:/root/.cabal \
+            -v /home/runner/work/_temp:/home/runner/work/_temp \
+            -v ${{ github.workspace }}:/project \
+            build/${{ matrix.os }}:latest
 
-      - 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@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/lib"            >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/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 openssl for Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
-        run: brew install openssl@3.0
-
-      - name: Unix prepare cabal.project.local for Ubuntu
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
+      - name: Prepare cabal.project.local
+        if: matrix.should_run == true
         shell: bash
         run: |
           echo "ignore-project: False"    >> cabal.project.local
           echo "package direct-sqlcipher" >> cabal.project.local
           echo "    flags: +openssl"      >> cabal.project.local
 
-      - name: Unix build CLI
-        id: unix_cli_build
-        if: matrix.os != 'windows-latest'
+      # chmod/git commands are used to workaround permission issues when cache is restored
+      - name: Build CLI
+        if: matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          chmod -R 777 dist-newstyle ~/.cabal && git config --global --add safe.directory '*'
+          cabal clean
+          cabal update
+          cabal build -j --enable-tests
+          mkdir -p /out
+          for i in simplex-chat simplex-chat-test; do
+            bin=$(find /project/dist-newstyle -name "$i" -type f -executable)
+            chmod +x "$bin"
+            mv "$bin" /out/
+          done
+          strip /out/simplex-chat
+
+      - name: Copy tests from container
+        if: matrix.should_run == true
         shell: bash
         run: |
-          cabal build --enable-tests
-          path=$(cabal list-bin simplex-chat)
-          echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          docker cp builder:/out/simplex-chat-test .
 
-      - name: Unix upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_cli_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.unix_cli_build.outputs.bin_hash }}
-
-      - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-          cache: 'gradle'
-
-      - name: Linux build desktop
-        id: linux_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+      - name: Copy CLI from container and prepare it
+        id: linux_cli_prepare
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
         shell: bash
+        run: |
+          docker cp builder:/out/simplex-chat ./${{ matrix.cli_asset_name }}
+          path="${{ github.workspace }}/${{ matrix.cli_asset_name }}"
+          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        uses: ./.github/actions/prepare-release
+        with:
+          bin_path: ${{ steps.linux_cli_prepare.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.linux_cli_prepare.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Desktop
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
         run: |
           scripts/desktop/build-lib-linux.sh
           cd apps/multiplatform
           ./gradlew packageDeb
-          path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb)
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Linux make AppImage
-        id: linux_appimage_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+      - name: Prepare Desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
         shell: bash
         run: |
-          scripts/desktop/make-appimage-linux.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)
-          echo "appimage_path=$path" >> $GITHUB_OUTPUT
-          echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          path=$(echo ${{ github.workspace }}/apps/multiplatform/release/main/deb/simplex_*_amd64.deb )
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Mac build desktop
+      - name: Upload Desktop
+        uses: ./.github/actions/prepare-release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        with:
+          bin_path: ${{ steps.linux_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.linux_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build AppImage
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+
+      - name: Prepare AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        shell: bash
+        run: |
+          path=$(echo ${{ github.workspace }}/apps/multiplatform/release/main/*imple*.AppImage)
+          echo "appimage_path=$path" >> $GITHUB_OUTPUT
+          echo "appimage_hash=$(echo SHA2-256\(simplex-desktop-x86_64.AppImage\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload AppImage
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        uses: ./.github/actions/prepare-release
+        with:
+          bin_path: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          bin_name: "simplex-desktop-x86_64.AppImage"
+          bin_hash: ${{ steps.linux_appimage_build.outputs.appimage_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fix permissions for cache
+        if: matrix.should_run == true
+        shell: bash
+        run: |
+          sudo chmod -R 777 dist-newstyle ~/.cabal
+          sudo chown -R $(id -u):$(id -g) dist-newstyle ~/.cabal
+
+      - name: Run tests
+        if: matrix.should_run == true
+        timeout-minutes: 120
+        shell: bash
+        run: |
+          i=1
+          attempts=1
+          ${{ (github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }} && attempts=3
+          while [ "$i" -le "$attempts" ]; do
+            if ./simplex-chat-test; then
+              break
+            else
+              echo "Attempt $i failed, retrying..."
+              i=$((i + 1))
+              sleep 1
+            fi
+          done
+          if [ "$i" -gt "$attempts" ]; then
+            echo "All "$attempts" attempts failed."
+            exit 1
+          fi
+
+# =========================
+#        MacOS Build
+# =========================
+
+  build-macos:
+    name: "${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-latest
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-macos-aarch64
+            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
+            openssl_dir: "/opt/homebrew/opt"
+          - os: macos-13
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-macos-x86-64
+            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
+            openssl_dir: "/usr/local/opt"
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Prepare build
+        uses: ./.github/actions/prepare-build
+        with:
+          java_ver: ${{ needs.variables.outputs.JAVA_VER }}
+          ghc_ver: ${{ matrix.ghc }}
+          os: ${{ matrix.os }}
+          github_ref: ${{ github.ref }}
+
+      - name: Install OpenSSL
+        run: brew install openssl@3.0
+
+      - name: Prepare cabal.project.local
+        shell: bash
+        run: |
+          echo "ignore-project: False"                                                    >> cabal.project.local
+          echo "package simplexmq"                                                        >> cabal.project.local
+          echo "    extra-include-dirs: ${{ matrix.opnessl_dir }}/openssl@3.0/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: ${{ matrix.openssl_dir}}/openssl@3.0/lib"             >> cabal.project.local
+          echo ""                                                                         >> cabal.project.local
+          echo "package direct-sqlcipher"                                                 >> cabal.project.local
+          echo "    extra-include-dirs: ${{ matrix.openssl_dir }}/openssl@3.0/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: ${{ matrix.openssl_dir }}/openssl@3.0/lib"            >> cabal.project.local
+          echo "    flags: +openssl"                                                      >> cabal.project.local
+
+      - name: Build CLI
+        id: mac_cli_build
+        shell: bash
+        run: |
+          cabal build -j --enable-tests
+          path=$(cabal list-bin simplex-chat)
+          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
+        with:
+          bin_path: ${{ steps.mac_cli_build.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.mac_cli_build.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 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')
         shell: bash
         env:
           APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -238,88 +392,77 @@ jobs:
           scripts/ci/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Linux upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload Desktop
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
+          bin_path: ${{ steps.mac_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.mac_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Linux update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_desktop_build.outputs.package_hash }}
-
-      - name: Linux upload AppImage to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
-          asset_name: simplex-desktop-x86_64.AppImage
-          tag: ${{ github.ref }}
-
-      - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ 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')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.mac_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.mac_desktop_build.outputs.package_hash }}
-
-      - name: Cache unix build
-        uses: actions/cache/save@v3
-        if: matrix.os != 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
-
-      - name: Unix test
-        if: matrix.os != 'windows-latest'
-        timeout-minutes: 40
+      - name: Run tests
+        timeout-minutes: 120
         shell: bash
-        run: cabal test --test-show-details=direct
+        run: |
+          i=1
+          attempts=1
+          ${{ (github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }} && attempts=3
+          while [ "$i" -le "$attempts" ]; do
+            if cabal test --test-show-details=direct; then
+              break
+            else
+              echo "Attempt $i failed, retrying..."
+              i=$((i + 1))
+              sleep 1
+            fi
+          done
+          if [ "$i" -gt "$attempts" ]; then
+            echo "All "$attempts" attempts failed."
+            exit 1
+          fi
 
-      # Unix /
+# =========================
+#      Windows Build
+# =========================
 
-      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+  build-windows:
+    name: "${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
 
+      - name: Prepare build
+        uses: ./.github/actions/prepare-build
+        with:
+          java_ver: ${{ needs.variables.outputs.JAVA_VER }}
+          ghc_ver: ${{ matrix.ghc }}
+          os: ${{ matrix.os }}
+          cache_path: "C:/cabal"
+          github_ref: ${{ github.ref }}
+
+      - name: Configure pagefile (Windows)
+        uses: simplex-chat/configure-pagefile-action@v1.4
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
+  
       - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
+        uses: simplex-chat/setup-msys2@v2
         with:
           msystem: ucrt64
           update: true
@@ -331,10 +474,9 @@ jobs:
             toolchain:p
             cmake:p
 
-
-      - name: Windows build
-        id: windows_build
-        if: matrix.os == 'windows-latest'
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+      - name: Build CLI
+        id: windows_cli_build
         shell: msys2 {0}
         run: |
           export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
@@ -349,70 +491,42 @@ jobs:
 
           rm -rf dist-newstyle/src/direct-sq*
           sed -i "s/, unix /--, unix /" simplex-chat.cabal
-          cabal build --enable-tests
+          cabal build -j --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)
           echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Windows upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
+          bin_path: ${{ steps.windows_cli_build.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.windows_cli_build.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Windows update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_build.outputs.bin_hash }}
-
-      - name: Windows build desktop
+      - name: Build Desktop
         id: windows_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v')
         shell: msys2 {0}
         run: |
           export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
           scripts/desktop/build-lib-windows.sh
           cd apps/multiplatform
           ./gradlew packageMsi
+          rm -rf dist-newstyle/src/direct-sq*
           path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
           echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Windows upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload Desktop
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Windows update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_desktop_build.outputs.package_hash }}
-
-      - name: Cache windows build
-        uses: actions/cache/save@v3
-        if: matrix.os == 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
-
-      # Windows /
+          bin_path: ${{ steps.windows_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.windows_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/reproduce-schedule.yml b/.github/workflows/reproduce-schedule.yml
new file mode 100644
index 0000000000..7de44addc7
--- /dev/null
+++ b/.github/workflows/reproduce-schedule.yml
@@ -0,0 +1,45 @@
+name: Reproduce latest release
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # every day at 02:00 night
+
+jobs:
+  reproduce:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Get latest release
+        shell: bash
+        run: |
+          curl --proto '=https' \
+               --tlsv1.2 \
+               -sSf -L \
+               'https://api.github.com/repos/simplex-chat/simplex-chat/releases/latest' \
+               2>/dev/null | \
+          grep -i "tag_name" | \
+          awk -F \" '{print "TAG="$4}' >> $GITHUB_ENV
+
+      - name: Execute reproduce script
+        run: |
+          ${GITHUB_WORKSPACE}/scripts/reproduce-builds.sh "$TAG"
+
+      - name: Check if build has been reproduced
+        env:
+          url: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_URL }}
+          user: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_USER }}
+          pass: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_PASS }}
+        run: |
+          if [ -f "${GITHUB_WORKSPACE}/$TAG/_sha256sums" ]; then
+            exit 0
+          else
+            curl --proto '=https' --tlsv1.2 -sSf \
+              -u "${user}:${pass}" \
+              -H 'Content-Type: application/json' \
+              -d '{"title": "👾 GitHub: Runner", "description": "⛔️ '"$TAG"' did not reproduce."}' \
+              "$url"
+            exit 1
+          fi
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 6839d48aeb..5fbe8293bc 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -33,7 +33,7 @@ jobs:
           ./website/web.sh
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: simplex-chat/actions-gh-pages@v3
         with:
           publish_dir: ./website/_site
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index 7b9641777a..cdcbc40d7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
 
 # Compile simplex-chat
 RUN cabal update
-RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library'
+RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
 
 # Strip the binary from debug symbols to reduce size
 RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
diff --git a/Dockerfile.build b/Dockerfile.build
new file mode 100644
index 0000000000..76bb1127f2
--- /dev/null
+++ b/Dockerfile.build
@@ -0,0 +1,92 @@
+# syntax=docker/dockerfile:1.7.0-labs
+ARG TAG=24.04
+FROM ubuntu:${TAG} AS build
+
+### Build stage
+
+ARG GHC=9.6.3
+ARG CABAL=3.10.1.0
+ARG JAVA=17
+
+ENV TZ=Etc/UTC \
+    DEBIAN_FRONTEND=noninteractive
+
+# Install curl, git and and simplex-chat dependencies
+RUN apt-get update && \
+    apt-get install -y curl \
+                       libpq-dev \
+                       git \
+                       sqlite3 \
+                       libsqlite3-dev \
+                       build-essential \
+                       libgmp3-dev \
+                       zlib1g-dev \
+                       llvm \
+                       cmake \
+                       llvm-dev \
+                       libnuma-dev \
+                       libssl-dev \
+                       desktop-file-utils \
+                       patchelf \
+                       ca-certificates \
+                       zip \
+                       wget \
+                       fuse3 \
+                       file \
+                       appstream \
+                       gpg \
+                       unzip &&\
+    ln -s /bin/fusermount /bin/fusermount3 || :
+
+# Install Java Coretto
+# Required, because official Java in Ubuntu
+# depends on libjpeg.so.8 and liblcms2.so.2 which are NOT copied into final
+# /usr/lib/runtime/lib directory and I do not have time to figure out gradle.kotlin
+# to fix this :(
+RUN curl --proto '=https' --tlsv1.2 -sSf 'https://apt.corretto.aws/corretto.key' | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg &&\
+    echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/corretto.list &&\
+    apt update &&\
+    apt install -y java-${JAVA}-amazon-corretto-jdk
+
+# Specify bootstrap Haskell versions
+ENV BOOTSTRAP_HASKELL_GHC_VERSION=${GHC}
+ENV BOOTSTRAP_HASKELL_CABAL_VERSION=${CABAL}
+
+# Do not install Stack
+ENV BOOTSTRAP_HASKELL_INSTALL_NO_STACK=true
+ENV BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=true
+
+# 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"
+
+# Set both as default
+RUN ghcup set ghc "${GHC}" && \
+    ghcup set cabal "${CABAL}"
+
+#=====================
+# Install Android SDK
+#=====================
+ARG SDK_VERSION=13114758
+
+ENV SDK_VERSION=$SDK_VERSION \
+    ANDROID_HOME=/root
+
+RUN curl -L -o tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${SDK_VERSION}_latest.zip" && \
+    unzip tools.zip && rm tools.zip && \
+    mv cmdline-tools tools && mkdir "$ANDROID_HOME/cmdline-tools" && mv tools "$ANDROID_HOME/cmdline-tools/" && \
+    ln -s "$ANDROID_HOME/cmdline-tools/tools" "$ANDROID_HOME/cmdline-tools/latest"
+
+ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin"
+
+# https://askubuntu.com/questions/885658/android-sdk-repositories-cfg-could-not-be-loaded
+RUN mkdir -p ~/.android ~/.gradle && \
+    touch ~/.android/repositories.cfg && \
+    echo 'org.gradle.console=plain' > ~/.gradle/gradle.properties &&\
+    yes | sdkmanager --licenses >/dev/null
+
+ENV PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools
+
+WORKDIR /project
diff --git a/PRIVACY.md b/PRIVACY.md
index 7c4bfbf660..18e5539726 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -123,6 +123,16 @@ This section applies only to the experimental group directory operated by Simple
 
 [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).
 
+#### Public groups and content channels
+
+You may participate in a public group and receive content from a public channel (Group). In case you send messages or comments to the Group, you grant a license:
+- to all recipients:
+  - to share your messages with the new Group members and outside of the group, e.g. via quoting (replying), forwarding and copy-pasting your message. When your message is deleted or marked as deleted, the copies of your message will not be deleted.
+  - to retain a copy of your messages according to the Group settings (e.g., the Group may allow irreversible message deletion from the recipient devices for a limited period of time, or it may only allow to edit and mark messages as deleted on recipient devices). Deleting message from the recipient devices or marking message as deleted revokes the license to share the message.
+- to Group owners: to share your messages with the new Group members as history of the Group. Currently, the Group history shared with the new members is limited to 100 messages.
+
+Group owners may use chat relays or automated bots (Chat Relays) to re-broadcast member messages to all members, for efficiency. The Chat Relays may be operated by the group owners, by preset operators or by 3rd parties. The Chat Relays have access to and will retain messages in line with Group settings, for technical functioning of the Group. Neither you nor group owners grant any content license to Chat Relay operators.
+
 #### User Support
 
 The app includes support contact operated by SimpleX Chat Ltd. If you contact support, any personal data you share 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.
@@ -131,9 +141,9 @@ The app includes support contact operated by SimpleX Chat Ltd. If you contact su
 
 Preset server operators will not share the information on their servers with each other, other than aggregate usage statistics. 
 
-Preset server operators will not provide general access to their servers or the data on their servers to each other.
+Preset server operators must not provide general access to their servers or the data on their servers to each other.
 
-Preset server operators will provide non-administrative access to control port of preset servers to SimpleX Chat Ltd, for the purposes of removing identified illegal content. This control port access only allows deleting known links and files, and access to aggregate statistics, but does NOT allow enumerating any information on the servers.
+Preset server operators will provide non-administrative access to control port of preset servers to SimpleX Chat Ltd, for the purposes of removing illegal content identified in publicly accessible resources (contact and group addresses, and downloadable files). This control port access only allows deleting known links and files, and accessing aggregate server-wide statistics, but does NOT allow enumerating any information on the servers or accessing statistics related to specific users.
 
 ### Information Preset Server Operators May Share
 
@@ -148,7 +158,7 @@ The cases when the preset server operators may share the data temporarily stored
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
 - To protect against harm to the rights, property, or safety of software users, operators of preset servers, or the public as required or permitted by law.
 
-At the time of updating this document, the preset server operators 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 the preset server operators are ever requested to provide such access or information, they will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
+By the time of updating this document, the preset server operators were not served with any enforceable requests and did not provide any information from the servers to any third parties. If the preset server operators are ever requested to provide such access or information, they will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
 
 Preset server operators will publish information they are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
 
@@ -190,7 +200,18 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b
 
 **Legal usage**. You agree to use SimpleX Chat Applications only for legal purposes. You will not use (or assist others in using) the Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, other preset server operators, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While server operators cannot access content or identify messages or groups, in some cases the links to the illegal communications can be shared publicly on social media or websites. Preset server operators reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via their servers, whether they were reported by the users or discovered by the operators themselves.
 
-**Damage to SimpleX Chat Ltd and Preset Server Operators**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit SimpleX Chat Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, other preset server operators, their Infrastructure, or any other systems. For example, you must not 1) access preset operators' Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of preset operators' Infrastructure; 3) collect information about the users in any manner; or 4) sell, rent, or charge for preset operators' 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.
+**Damage to SimpleX Chat Ltd and Preset Server Operators**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit SimpleX Chat Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, other preset server operators, their Infrastructure, or any other systems. For example, you must not 1) access preset operators' Infrastructure or systems without authorization, in any way other than by using the Software or by using a 3rd party client applications that satisfies the requirements of the Conditions of use (see the next section); 2) disrupt the integrity or performance of preset operators' Infrastructure; 3) collect information about the users in any manner; or 4) sell, rent, or charge for preset operators' 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.
+
+**3rd party client applications**. You may use a 3rd party application (App) to access preset operators' Infrastructure or systems, provided that this App:
+- is compatible with the protocol specifications not older than 1 year,
+- provides user-to-user messaging only or enables automated chat bots sending messages requested by users (in case of bots, it must be made clear to the users that these are automated bots),
+- implements the same limits, rules and restrictions as Software,
+- requires that the users accept the same Conditions of use of preset operators' Infrastructure as in Software prior to providing access to this Infrastructure,
+- displays the notice that it is the App for using SimpleX network,
+- provides its source code under open-source license accessible to the users via the App interface. In case the App uses the source code of Software, the App's source code must be provided under AGPLv3 license, and in case it is developed without using Software code its source code must be provided under any widely recognized free open-source license,
+- does NOT use the branding of SimpleX Chat Ltd without the permission,
+- does NOT pretend to be Software,
+- complies with these Conditions of use.
 
 **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. SimpleX Chat Ltd and other preset server operators are not responsible for any data loss.
 
@@ -222,4 +243,4 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b
 
 **Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd and preset server operators at any time by deleting the Applications from your devices and discontinuing use of the Infrastructure of SimpleX Chat Ltd and preset server operators. 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 and/or preset server operators.
 
-Updated November 14, 2024
+Updated March 3, 2025
diff --git a/README.md b/README.md
index 936667da8c..40d552b84d 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ You must:
 
 Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
 
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=2-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)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FiBkJE72asZX1NUZaYFIeKRVk6oVjb-iv%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAinqu3j74AMjODLoIRR487ZW6ysip_dlpD6Zxk18SPFY%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22groupLinkId%22%3A%223wAFGCLygQHR5AwynZOHlQ%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:
 
@@ -169,6 +169,7 @@ It is possible to donate via:
 - ETH: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
 - USDT (Ethereum): 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
 - ZEC: t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg
+- ZEC shielded: u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq
 - DOGE: D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf
 - SOL: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
 - please ask if you want to donate any other coins.
@@ -234,6 +235,10 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
+[Mar 8, 2025. SimpleX Chat v6.3: new user experience and safety in public groups](./blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.md)
+
+[Jan 14, 2025. SimpleX network: large groups and privacy-preserving content moderation](./blog/20250114-simplex-network-large-groups-privacy-preserving-content-moderation.md)
+
 [Dec 10, 2024. SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
 
 [Oct 14, 2024. SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
@@ -305,12 +310,13 @@ What is already implemented:
 15. Manual messaging queue rotations to move conversation to another SMP relay.
 16. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
 17. Local files encryption.
+18. [Reproducible server builds](./docs/SERVER.md#reproduce-builds).
 
 We plan to add:
 
 1. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
 2. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-3. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+3. Reproducible clients builds – this is a complex problem, but we are aiming to have it in 2025 at least partially.
 4. Recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
 
 ## For developers
diff --git a/apps/ios/Shared/AppDelegate.swift b/apps/ios/Shared/AppDelegate.swift
index ad8c661e1c..3f6998c9ec 100644
--- a/apps/ios/Shared/AppDelegate.swift
+++ b/apps/ios/Shared/AppDelegate.swift
@@ -54,7 +54,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                             try await apiVerifyToken(token: token, nonce: nonce, code: verification)
                             m.tokenStatus = .active
                         } catch {
-                            if let cr = error as? ChatResponse, case .chatCmdError(_, .errorAgent(.NTF(.AUTH))) = cr {
+                            if let cr = error as? ChatError, case .errorAgent(.NTF(.AUTH)) = cr {
                                 m.tokenStatus = .expired
                             }
                             logger.error("AppDelegate: didReceiveRemoteNotification: apiVerifyToken or apiIntervalNofication error: \(responseError(error))")
diff --git a/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/Contents.json
new file mode 100644
index 0000000000..cb29f09fe1
--- /dev/null
+++ b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vertical_logo_x1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vertical_logo_x2.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vertical_logo_x3.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x1.png b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x1.png
new file mode 100644
index 0000000000..f916e43ea9
Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x1.png differ
diff --git a/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x2.png b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x2.png
new file mode 100644
index 0000000000..bb35878f0c
Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x2.png differ
diff --git a/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x3.png b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x3.png
new file mode 100644
index 0000000000..c55f481b36
Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/vertical_logo_x3.png differ
diff --git a/apps/ios/Shared/ContentView.swift b/apps/ios/Shared/ContentView.swift
index 652258415e..2ad8d546f2 100644
--- a/apps/ios/Shared/ContentView.swift
+++ b/apps/ios/Shared/ContentView.swift
@@ -11,12 +11,10 @@ import SimpleXChat
 
 private enum NoticesSheet: Identifiable {
     case whatsNew(updatedConditions: Bool)
-    case updatedConditions
 
     var id: String {
         switch self {
         case .whatsNew: return "whatsNew"
-        case .updatedConditions: return "updatedConditions"
         }
     }
 }
@@ -76,7 +74,7 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder func allViews() -> some View {
+    func allViews() -> some View {
         ZStack {
             let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
             // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
@@ -211,7 +209,7 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder private func activeCallInteractiveArea(_ call: Call) -> some View {
+    private func activeCallInteractiveArea(_ call: Call) -> some View {
         HStack {
             Text(call.contact.displayName).font(.body).foregroundColor(.white)
             Spacer()
@@ -278,18 +276,18 @@ struct ContentView: View {
                             let showWhatsNew = shouldShowWhatsNew()
                             let showUpdatedConditions = chatModel.conditions.conditionsAction?.showNotice ?? false
                             noticesShown = showWhatsNew || showUpdatedConditions
-                            if showWhatsNew {
+                            if showWhatsNew || showUpdatedConditions {
                                 noticesSheetItem = .whatsNew(updatedConditions: showUpdatedConditions)
-                            } else if showUpdatedConditions {
-                                noticesSheetItem = .updatedConditions
                             }
                         }
                     }
                 }
                 prefShowLANotice = true
                 connectViaUrl()
+                showReRegisterTokenAlert()
             }
             .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
+            .onChange(of: chatModel.reRegisterTknStatus) { _ in showReRegisterTokenAlert() }
             .sheet(item: $noticesSheetItem) { item in
                 switch item {
                 case let .whatsNew(updatedConditions):
@@ -298,13 +296,6 @@ struct ContentView: View {
                         .if(updatedConditions) { v in
                             v.task { await setConditionsNotified_() }
                         }
-                case .updatedConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
-                    .task { await setConditionsNotified_() }
                 }
             }
             if chatModel.setDeliveryReceipts {
@@ -315,6 +306,12 @@ struct ContentView: View {
         .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
         .onContinueUserActivity("INStartAudioCallIntent", perform: processUserActivity)
         .onContinueUserActivity("INStartVideoCallIntent", perform: processUserActivity)
+        .onContinueUserActivity(NSUserActivityTypeBrowsingWeb) { userActivity in
+            if let url = userActivity.webpageURL {
+                logger.debug("onContinueUserActivity.NSUserActivityTypeBrowsingWeb: \(url)")
+                chatModel.appOpenUrl = url
+            }
+        }
     }
 
     private func setConditionsNotified_() async {
@@ -446,12 +443,12 @@ struct ContentView: View {
     }
 
     func connectViaUrl() {
-        dismissAllSheets() {
-            let m = ChatModel.shared
-            if let url = m.appOpenUrl {
-                m.appOpenUrl = nil
+        let m = ChatModel.shared
+        if let url = m.appOpenUrl {
+            m.appOpenUrl = nil
+            dismissAllSheets() {
                 var path = url.path
-                if (path == "/contact" || path == "/invitation") {
+                if (path == "/contact" || path == "/invitation" || path == "/a" || path == "/c" || path == "/g" || path == "/i") {
                     path.removeFirst()
                     let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
                     planAndConnect(
@@ -468,6 +465,21 @@ struct ContentView: View {
         }
     }
 
+    func showReRegisterTokenAlert() {
+        dismissAllSheets() {
+            let m = ChatModel.shared
+            if let errorTknStatus = m.reRegisterTknStatus, let token = chatModel.deviceToken {
+                chatModel.reRegisterTknStatus = nil
+                AlertManager.shared.showAlert(Alert(
+                    title: Text("Notifications error"),
+                    message: Text(tokenStatusInfo(errorTknStatus, register: true)),
+                    primaryButton: .default(Text("Register")) { reRegisterToken(token: token) },
+                    secondaryButton: .cancel()
+                ))
+            }
+        }
+    }
+
     private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
         AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
     }
diff --git a/apps/ios/Shared/Model/AppAPITypes.swift b/apps/ios/Shared/Model/AppAPITypes.swift
new file mode 100644
index 0000000000..6c47d654e0
--- /dev/null
+++ b/apps/ios/Shared/Model/AppAPITypes.swift
@@ -0,0 +1,2318 @@
+//
+//  APITypes.swift
+//  SimpleX
+//
+//  Created by EP on 01/05/2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SimpleXChat
+import SwiftUI
+
+// some constructors are used in SEChatCommand or NSEChatCommand types as well - they must be syncronised
+enum ChatCommand: ChatCmdProtocol {
+    case showActiveUser
+    case createActiveUser(profile: Profile?, pastTimestamp: Bool)
+    case listUsers
+    case apiSetActiveUser(userId: Int64, viewPwd: String?)
+    case setAllContactReceipts(enable: Bool)
+    case apiSetUserContactReceipts(userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings)
+    case apiSetUserGroupReceipts(userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings)
+    case apiHideUser(userId: Int64, viewPwd: String)
+    case apiUnhideUser(userId: Int64, viewPwd: String)
+    case apiMuteUser(userId: Int64)
+    case apiUnmuteUser(userId: Int64)
+    case apiDeleteUser(userId: Int64, delSMPQueues: Bool, viewPwd: String?)
+    case startChat(mainApp: Bool, enableSndFiles: Bool)
+    case checkChatRunning
+    case apiStopChat
+    case apiActivateChat(restoreChat: Bool)
+    case apiSuspendChat(timeoutMicroseconds: Int)
+    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
+    case apiSetEncryptLocalFiles(enable: Bool)
+    case apiExportArchive(config: ArchiveConfig)
+    case apiImportArchive(config: ArchiveConfig)
+    case apiDeleteStorage
+    case apiStorageEncryption(config: DBEncryptionConfig)
+    case testStorageEncryption(key: String)
+    case apiSaveSettings(settings: AppSettings)
+    case apiGetSettings(settings: AppSettings)
+    case apiGetChatTags(userId: Int64)
+    case apiGetChats(userId: Int64)
+    case apiGetChat(chatId: ChatId, scope: GroupChatScope?, contentTag: MsgContentTag?, pagination: ChatPagination, search: String)
+    case apiGetChatItemInfo(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64)
+    case apiSendMessages(type: ChatType, id: Int64, scope: GroupChatScope?, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
+    case apiCreateChatTag(tag: ChatTagData)
+    case apiSetChatTags(type: ChatType, id: Int64, tagIds: [Int64])
+    case apiDeleteChatTag(tagId: Int64)
+    case apiUpdateChatTag(tagId: Int64, tagData: ChatTagData)
+    case apiReorderChatTags(tagIds: [Int64])
+    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
+    case apiReportMessage(groupId: Int64, chatItemId: Int64, reportReason: ReportReason, reportText: String)
+    case apiUpdateChatItem(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64, updatedMessage: UpdatedMessage, live: Bool)
+    case apiDeleteChatItem(type: ChatType, id: Int64, scope: GroupChatScope?, itemIds: [Int64], mode: CIDeleteMode)
+    case apiDeleteMemberChatItem(groupId: Int64, itemIds: [Int64])
+    case apiArchiveReceivedReports(groupId: Int64)
+    case apiDeleteReceivedReports(groupId: Int64, itemIds: [Int64], mode: CIDeleteMode)
+    case apiChatItemReaction(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64, add: Bool, reaction: MsgReaction)
+    case apiGetReactionMembers(userId: Int64, groupId: Int64, itemId: Int64, reaction: MsgReaction)
+    case apiPlanForwardChatItems(fromChatType: ChatType, fromChatId: Int64, fromScope: GroupChatScope?, itemIds: [Int64])
+    case apiForwardChatItems(toChatType: ChatType, toChatId: Int64, toScope: GroupChatScope?, fromChatType: ChatType, fromChatId: Int64, fromScope: GroupChatScope?, itemIds: [Int64], ttl: Int?)
+    case apiGetNtfToken
+    case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
+    case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
+    case apiCheckToken(token: DeviceToken)
+    case apiDeleteToken(token: DeviceToken)
+    case apiGetNtfConns(nonce: String, encNtfInfo: String)
+    case apiGetConnNtfMessages(connMsgReqs: [ConnMsgReq])
+    case apiNewGroup(userId: Int64, incognito: Bool, groupProfile: GroupProfile)
+    case apiAddMember(groupId: Int64, contactId: Int64, memberRole: GroupMemberRole)
+    case apiJoinGroup(groupId: Int64)
+    case apiAcceptMember(groupId: Int64, groupMemberId: Int64, memberRole: GroupMemberRole)
+    case apiDeleteMemberSupportChat(groupId: Int64, groupMemberId: Int64)
+    case apiMembersRole(groupId: Int64, memberIds: [Int64], memberRole: GroupMemberRole)
+    case apiBlockMembersForAll(groupId: Int64, memberIds: [Int64], blocked: Bool)
+    case apiRemoveMembers(groupId: Int64, memberIds: [Int64], withMessages: Bool)
+    case apiLeaveGroup(groupId: Int64)
+    case apiListMembers(groupId: Int64)
+    case apiUpdateGroupProfile(groupId: Int64, groupProfile: GroupProfile)
+    case apiCreateGroupLink(groupId: Int64, memberRole: GroupMemberRole, short: Bool)
+    case apiGroupLinkMemberRole(groupId: Int64, memberRole: GroupMemberRole)
+    case apiDeleteGroupLink(groupId: Int64)
+    case apiGetGroupLink(groupId: Int64)
+    case apiAddGroupShortLink(groupId: Int64)
+    case apiCreateMemberContact(groupId: Int64, groupMemberId: Int64)
+    case apiSendMemberContactInvitation(contactId: Int64, msg: MsgContent)
+    case apiTestProtoServer(userId: Int64, server: String)
+    case apiGetServerOperators
+    case apiSetServerOperators(operators: [ServerOperator])
+    case apiGetUserServers(userId: Int64)
+    case apiSetUserServers(userId: Int64, userServers: [UserOperatorServers])
+    case apiValidateServers(userId: Int64, userServers: [UserOperatorServers])
+    case apiGetUsageConditions
+    case apiSetConditionsNotified(conditionsId: Int64)
+    case apiAcceptConditions(conditionsId: Int64, operatorIds: [Int64])
+    case apiSetChatItemTTL(userId: Int64, seconds: Int64)
+    case apiGetChatItemTTL(userId: Int64)
+    case apiSetChatTTL(userId: Int64, type: ChatType, id: Int64, seconds: Int64?)
+    case apiSetNetworkConfig(networkConfig: NetCfg)
+    case apiGetNetworkConfig
+    case apiSetNetworkInfo(networkInfo: UserNetworkInfo)
+    case reconnectAllServers
+    case reconnectServer(userId: Int64, smpServer: String)
+    case apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings)
+    case apiSetMemberSettings(groupId: Int64, groupMemberId: Int64, memberSettings: GroupMemberSettings)
+    case apiContactInfo(contactId: Int64)
+    case apiGroupMemberInfo(groupId: Int64, groupMemberId: Int64)
+    case apiContactQueueInfo(contactId: Int64)
+    case apiGroupMemberQueueInfo(groupId: Int64, groupMemberId: Int64)
+    case apiSwitchContact(contactId: Int64)
+    case apiSwitchGroupMember(groupId: Int64, groupMemberId: Int64)
+    case apiAbortSwitchContact(contactId: Int64)
+    case apiAbortSwitchGroupMember(groupId: Int64, groupMemberId: Int64)
+    case apiSyncContactRatchet(contactId: Int64, force: Bool)
+    case apiSyncGroupMemberRatchet(groupId: Int64, groupMemberId: Int64, force: Bool)
+    case apiGetContactCode(contactId: Int64)
+    case apiGetGroupMemberCode(groupId: Int64, groupMemberId: Int64)
+    case apiVerifyContact(contactId: Int64, connectionCode: String?)
+    case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
+    case apiAddContact(userId: Int64, short: Bool, incognito: Bool)
+    case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
+    case apiChangeConnectionUser(connId: Int64, userId: Int64)
+    case apiConnectPlan(userId: Int64, connLink: String)
+    case apiConnect(userId: Int64, incognito: Bool, connLink: CreatedConnLink)
+    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
+    case apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode)
+    case apiClearChat(type: ChatType, id: Int64)
+    case apiListContacts(userId: Int64)
+    case apiUpdateProfile(userId: Int64, profile: Profile)
+    case apiSetContactPrefs(contactId: Int64, preferences: Preferences)
+    case apiSetContactAlias(contactId: Int64, localAlias: String)
+    case apiSetGroupAlias(groupId: Int64, localAlias: String)
+    case apiSetConnectionAlias(connId: Int64, localAlias: String)
+    case apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?)
+    case apiSetChatUIThemes(chatId: String, themes: ThemeModeOverrides?)
+    case apiCreateMyAddress(userId: Int64, short: Bool)
+    case apiDeleteMyAddress(userId: Int64)
+    case apiShowMyAddress(userId: Int64)
+    case apiAddMyAddressShortLink(userId: Int64)
+    case apiSetProfileAddress(userId: Int64, on: Bool)
+    case apiAddressAutoAccept(userId: Int64, autoAccept: AutoAccept?)
+    case apiAcceptContact(incognito: Bool, contactReqId: Int64)
+    case apiRejectContact(contactReqId: Int64)
+    // WebRTC calls
+    case apiSendCallInvitation(contact: Contact, callType: CallType)
+    case apiRejectCall(contact: Contact)
+    case apiSendCallOffer(contact: Contact, callOffer: WebRTCCallOffer)
+    case apiSendCallAnswer(contact: Contact, answer: WebRTCSession)
+    case apiSendCallExtraInfo(contact: Contact, extraInfo: WebRTCExtraInfo)
+    case apiEndCall(contact: Contact)
+    case apiGetCallInvitations
+    case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
+    // WebRTC calls /
+    case apiGetNetworkStatuses
+    case apiChatRead(type: ChatType, id: Int64, scope: GroupChatScope?)
+    case apiChatItemsRead(type: ChatType, id: Int64, scope: GroupChatScope?, itemIds: [Int64])
+    case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
+    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
+    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
+    case cancelFile(fileId: Int64)
+    // remote desktop commands
+    case setLocalDeviceName(displayName: String)
+    case connectRemoteCtrl(xrcpInvitation: String)
+    case findKnownRemoteCtrl
+    case confirmRemoteCtrl(remoteCtrlId: Int64)
+    case verifyRemoteCtrlSession(sessionCode: String)
+    case listRemoteCtrls
+    case stopRemoteCtrl
+    case deleteRemoteCtrl(remoteCtrlId: Int64)
+    case apiUploadStandaloneFile(userId: Int64, file: CryptoFile)
+    case apiDownloadStandaloneFile(userId: Int64, url: String, file: CryptoFile)
+    case apiStandaloneFileInfo(url: String)
+    // misc
+    case showVersion
+    case getAgentSubsTotal(userId: Int64)
+    case getAgentServersSummary(userId: Int64)
+    case resetAgentServersStats
+    case string(String)
+
+    var cmdString: String {
+        get {
+            switch self {
+            case .showActiveUser: return "/u"
+            case let .createActiveUser(profile, pastTimestamp):
+                let user = NewUser(profile: profile, pastTimestamp: pastTimestamp)
+                return "/_create user \(encodeJSON(user))"
+            case .listUsers: return "/users"
+            case let .apiSetActiveUser(userId, viewPwd): return "/_user \(userId)\(maybePwd(viewPwd))"
+            case let .setAllContactReceipts(enable): return "/set receipts all \(onOff(enable))"
+            case let .apiSetUserContactReceipts(userId, userMsgReceiptSettings):
+                let umrs = userMsgReceiptSettings
+                return "/_set receipts contacts \(userId) \(onOff(umrs.enable)) clear_overrides=\(onOff(umrs.clearOverrides))"
+            case let .apiSetUserGroupReceipts(userId, userMsgReceiptSettings):
+                let umrs = userMsgReceiptSettings
+                return "/_set receipts groups \(userId) \(onOff(umrs.enable)) clear_overrides=\(onOff(umrs.clearOverrides))"
+            case let .apiHideUser(userId, viewPwd): return "/_hide user \(userId) \(encodeJSON(viewPwd))"
+            case let .apiUnhideUser(userId, viewPwd): return "/_unhide user \(userId) \(encodeJSON(viewPwd))"
+            case let .apiMuteUser(userId): return "/_mute user \(userId)"
+            case let .apiUnmuteUser(userId): return "/_unmute user \(userId)"
+            case let .apiDeleteUser(userId, delSMPQueues, viewPwd): return "/_delete user \(userId) del_smp=\(onOff(delSMPQueues))\(maybePwd(viewPwd))"
+            case let .startChat(mainApp, enableSndFiles): return "/_start main=\(onOff(mainApp)) snd_files=\(onOff(enableSndFiles))"
+            case .checkChatRunning: return "/_check running"
+            case .apiStopChat: return "/_stop"
+            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
+            case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
+            case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder): return "/set file paths \(encodeJSON(AppFilePaths(appFilesFolder: filesFolder, appTempFolder: tempFolder, appAssetsFolder: assetsFolder)))"
+            case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
+            case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
+            case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
+            case .apiDeleteStorage: return "/_db delete"
+            case let .apiStorageEncryption(cfg): return "/_db encryption \(encodeJSON(cfg))"
+            case let .testStorageEncryption(key): return "/db test key \(key)"
+            case let .apiSaveSettings(settings): return "/_save app settings \(encodeJSON(settings))"
+            case let .apiGetSettings(settings): return "/_get app settings \(encodeJSON(settings))"
+            case let .apiGetChatTags(userId): return "/_get tags \(userId)"
+            case let .apiGetChats(userId): return "/_get chats \(userId) pcc=on"
+            case let .apiGetChat(chatId, scope, contentTag, pagination, search):
+                let tag = contentTag != nil ? " content=\(contentTag!.rawValue)" : ""
+                return "/_get chat \(chatId)\(scopeRef(scope: scope))\(tag) \(pagination.cmdString)" + (search == "" ? "" : " search=\(search)")
+            case let .apiGetChatItemInfo(type, id, scope, itemId): return "/_get item info \(ref(type, id, scope: scope)) \(itemId)"
+            case let .apiSendMessages(type, id, scope, live, ttl, composedMessages):
+                let msgs = encodeJSON(composedMessages)
+                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
+                return "/_send \(ref(type, id, scope: scope)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
+            case let .apiCreateChatTag(tag): return "/_create tag \(encodeJSON(tag))"
+            case let .apiSetChatTags(type, id, tagIds): return "/_tags \(ref(type, id, scope: nil)) \(tagIds.map({ "\($0)" }).joined(separator: ","))"
+            case let .apiDeleteChatTag(tagId): return "/_delete tag \(tagId)"
+            case let .apiUpdateChatTag(tagId, tagData): return "/_update tag \(tagId) \(encodeJSON(tagData))"
+            case let .apiReorderChatTags(tagIds): return "/_reorder tags \(tagIds.map({ "\($0)" }).joined(separator: ","))"
+            case let .apiCreateChatItems(noteFolderId, composedMessages):
+                let msgs = encodeJSON(composedMessages)
+                return "/_create *\(noteFolderId) json \(msgs)"
+            case let .apiReportMessage(groupId, chatItemId, reportReason, reportText):
+                return "/_report #\(groupId) \(chatItemId) reason=\(reportReason) \(reportText)"
+            case let .apiUpdateChatItem(type, id, scope, itemId, um, live): return "/_update item \(ref(type, id, scope: scope)) \(itemId) live=\(onOff(live)) \(um.cmdString)"
+            case let .apiDeleteChatItem(type, id, scope, itemIds, mode): return "/_delete item \(ref(type, id, scope: scope)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) \(mode.rawValue)"
+            case let .apiDeleteMemberChatItem(groupId, itemIds): return "/_delete member item #\(groupId) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
+            case let .apiArchiveReceivedReports(groupId): return "/_archive reports #\(groupId)"
+            case let .apiDeleteReceivedReports(groupId, itemIds, mode): return "/_delete reports #\(groupId) \(itemIds.map({ "\($0)" }).joined(separator: ",")) \(mode.rawValue)"
+            case let .apiChatItemReaction(type, id, scope, itemId, add, reaction): return "/_reaction \(ref(type, id, scope: scope)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
+            case let .apiGetReactionMembers(userId, groupId, itemId, reaction): return "/_reaction members \(userId) #\(groupId) \(itemId) \(encodeJSON(reaction))"
+            case let .apiPlanForwardChatItems(type, id, scope, itemIds): return "/_forward plan \(ref(type, id, scope: scope)) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
+            case let .apiForwardChatItems(toChatType, toChatId, toScope, fromChatType, fromChatId, fromScope, itemIds, ttl):
+                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
+                return "/_forward \(ref(toChatType, toChatId, scope: toScope)) \(ref(fromChatType, fromChatId, scope: fromScope)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) ttl=\(ttlStr)"
+            case .apiGetNtfToken: return "/_ntf get "
+            case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
+            case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
+            case let .apiCheckToken(token): return "/_ntf check \(token.cmdString)"
+            case let .apiDeleteToken(token): return "/_ntf delete \(token.cmdString)"
+            case let .apiGetNtfConns(nonce, encNtfInfo): return "/_ntf conns \(nonce) \(encNtfInfo)"
+            case let .apiGetConnNtfMessages(connMsgReqs): return "/_ntf conn messages \(connMsgReqs.map { $0.cmdString }.joined(separator: ","))"
+            case let .apiNewGroup(userId, incognito, groupProfile): return "/_group \(userId) incognito=\(onOff(incognito)) \(encodeJSON(groupProfile))"
+            case let .apiAddMember(groupId, contactId, memberRole): return "/_add #\(groupId) \(contactId) \(memberRole)"
+            case let .apiJoinGroup(groupId): return "/_join #\(groupId)"
+            case let .apiAcceptMember(groupId, groupMemberId, memberRole): return "/_accept member #\(groupId) \(groupMemberId) \(memberRole.rawValue)"
+            case let .apiDeleteMemberSupportChat(groupId, groupMemberId): return "/_delete member chat #\(groupId) \(groupMemberId)"
+            case let .apiMembersRole(groupId, memberIds, memberRole): return "/_member role #\(groupId) \(memberIds.map({ "\($0)" }).joined(separator: ",")) \(memberRole.rawValue)"
+            case let .apiBlockMembersForAll(groupId, memberIds, blocked): return "/_block #\(groupId) \(memberIds.map({ "\($0)" }).joined(separator: ",")) blocked=\(onOff(blocked))"
+            case let .apiRemoveMembers(groupId, memberIds, withMessages): return "/_remove #\(groupId) \(memberIds.map({ "\($0)" }).joined(separator: ",")) messages=\(onOff(withMessages))"
+            case let .apiLeaveGroup(groupId): return "/_leave #\(groupId)"
+            case let .apiListMembers(groupId): return "/_members #\(groupId)"
+            case let .apiUpdateGroupProfile(groupId, groupProfile): return "/_group_profile #\(groupId) \(encodeJSON(groupProfile))"
+            case let .apiCreateGroupLink(groupId, memberRole, short): return "/_create link #\(groupId) \(memberRole) short=\(onOff(short))"
+            case let .apiGroupLinkMemberRole(groupId, memberRole): return "/_set link role #\(groupId) \(memberRole)"
+            case let .apiDeleteGroupLink(groupId): return "/_delete link #\(groupId)"
+            case let .apiGetGroupLink(groupId): return "/_get link #\(groupId)"
+            case let .apiAddGroupShortLink(groupId): return "/_short link #\(groupId)"
+            case let .apiCreateMemberContact(groupId, groupMemberId): return "/_create member contact #\(groupId) \(groupMemberId)"
+            case let .apiSendMemberContactInvitation(contactId, mc): return "/_invite member contact @\(contactId) \(mc.cmdString)"
+            case let .apiTestProtoServer(userId, server): return "/_server test \(userId) \(server)"
+            case .apiGetServerOperators: return "/_operators"
+            case let .apiSetServerOperators(operators): return "/_operators \(encodeJSON(operators))"
+            case let .apiGetUserServers(userId): return "/_servers \(userId)"
+            case let .apiSetUserServers(userId, userServers): return "/_servers \(userId) \(encodeJSON(userServers))"
+            case let .apiValidateServers(userId, userServers): return "/_validate_servers \(userId) \(encodeJSON(userServers))"
+            case .apiGetUsageConditions: return "/_conditions"
+            case let .apiSetConditionsNotified(conditionsId): return "/_conditions_notified \(conditionsId)"
+            case let .apiAcceptConditions(conditionsId, operatorIds): return "/_accept_conditions \(conditionsId) \(joinedIds(operatorIds))"
+            case let .apiSetChatItemTTL(userId, seconds): return "/_ttl \(userId) \(chatItemTTLStr(seconds: seconds))"
+            case let .apiGetChatItemTTL(userId): return "/_ttl \(userId)"
+            case let .apiSetChatTTL(userId, type, id, seconds): return "/_ttl \(userId) \(ref(type, id, scope: nil)) \(chatItemTTLStr(seconds: seconds))"
+            case let .apiSetNetworkConfig(networkConfig): return "/_network \(encodeJSON(networkConfig))"
+            case .apiGetNetworkConfig: return "/network"
+            case let .apiSetNetworkInfo(networkInfo): return "/_network info \(encodeJSON(networkInfo))"
+            case .reconnectAllServers: return "/reconnect"
+            case let .reconnectServer(userId, smpServer): return "/reconnect \(userId) \(smpServer)"
+            case let .apiSetChatSettings(type, id, chatSettings): return "/_settings \(ref(type, id, scope: nil)) \(encodeJSON(chatSettings))"
+            case let .apiSetMemberSettings(groupId, groupMemberId, memberSettings): return "/_member settings #\(groupId) \(groupMemberId) \(encodeJSON(memberSettings))"
+            case let .apiContactInfo(contactId): return "/_info @\(contactId)"
+            case let .apiGroupMemberInfo(groupId, groupMemberId): return "/_info #\(groupId) \(groupMemberId)"
+            case let .apiContactQueueInfo(contactId): return "/_queue info @\(contactId)"
+            case let .apiGroupMemberQueueInfo(groupId, groupMemberId): return "/_queue info #\(groupId) \(groupMemberId)"
+            case let .apiSwitchContact(contactId): return "/_switch @\(contactId)"
+            case let .apiSwitchGroupMember(groupId, groupMemberId): return "/_switch #\(groupId) \(groupMemberId)"
+            case let .apiAbortSwitchContact(contactId): return "/_abort switch @\(contactId)"
+            case let .apiAbortSwitchGroupMember(groupId, groupMemberId): return "/_abort switch #\(groupId) \(groupMemberId)"
+            case let .apiSyncContactRatchet(contactId, force): if force {
+                return "/_sync @\(contactId) force=on"
+            } else {
+                return "/_sync @\(contactId)"
+            }
+            case let .apiSyncGroupMemberRatchet(groupId, groupMemberId, force): if force {
+                return "/_sync #\(groupId) \(groupMemberId) force=on"
+            } else {
+                return "/_sync #\(groupId) \(groupMemberId)"
+            }
+            case let .apiGetContactCode(contactId): return "/_get code @\(contactId)"
+            case let .apiGetGroupMemberCode(groupId, groupMemberId): return "/_get code #\(groupId) \(groupMemberId)"
+            case let .apiVerifyContact(contactId, .some(connectionCode)): return "/_verify code @\(contactId) \(connectionCode)"
+            case let .apiVerifyContact(contactId, .none): return "/_verify code @\(contactId)"
+            case let .apiVerifyGroupMember(groupId, groupMemberId, .some(connectionCode)): return "/_verify code #\(groupId) \(groupMemberId) \(connectionCode)"
+            case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
+            case let .apiAddContact(userId, short, incognito): return "/_connect \(userId) short=\(onOff(short)) incognito=\(onOff(incognito))"
+            case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
+            case let .apiChangeConnectionUser(connId, userId): return "/_set conn user :\(connId) \(userId)"
+            case let .apiConnectPlan(userId, connLink): return "/_connect plan \(userId) \(connLink)"
+            case let .apiConnect(userId, incognito, connLink): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connLink.connFullLink) \(connLink.connShortLink ?? "")"
+            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
+            case let .apiDeleteChat(type, id, chatDeleteMode): return "/_delete \(ref(type, id, scope: nil)) \(chatDeleteMode.cmdString)"
+            case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id, scope: nil))"
+            case let .apiListContacts(userId): return "/_contacts \(userId)"
+            case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
+            case let .apiSetContactPrefs(contactId, preferences): return "/_set prefs @\(contactId) \(encodeJSON(preferences))"
+            case let .apiSetContactAlias(contactId, localAlias): return "/_set alias @\(contactId) \(localAlias.trimmingCharacters(in: .whitespaces))"
+            case let .apiSetGroupAlias(groupId, localAlias): return "/_set alias #\(groupId) \(localAlias.trimmingCharacters(in: .whitespaces))"
+            case let .apiSetConnectionAlias(connId, localAlias): return "/_set alias :\(connId) \(localAlias.trimmingCharacters(in: .whitespaces))"
+            case let .apiSetUserUIThemes(userId, themes): return "/_set theme user \(userId) \(themes != nil ? encodeJSON(themes) : "")"
+            case let .apiSetChatUIThemes(chatId, themes): return "/_set theme \(chatId) \(themes != nil ? encodeJSON(themes) : "")"
+            case let .apiCreateMyAddress(userId, short): return "/_address \(userId) short=\(onOff(short))"
+            case let .apiDeleteMyAddress(userId): return "/_delete_address \(userId)"
+            case let .apiShowMyAddress(userId): return "/_show_address \(userId)"
+            case let .apiAddMyAddressShortLink(userId): return "/_short_link_address \(userId)"
+            case let .apiSetProfileAddress(userId, on): return "/_profile_address \(userId) \(onOff(on))"
+            case let .apiAddressAutoAccept(userId, autoAccept): return "/_auto_accept \(userId) \(AutoAccept.cmdString(autoAccept))"
+            case let .apiAcceptContact(incognito, contactReqId): return "/_accept incognito=\(onOff(incognito)) \(contactReqId)"
+            case let .apiRejectContact(contactReqId): return "/_reject \(contactReqId)"
+            case let .apiSendCallInvitation(contact, callType): return "/_call invite @\(contact.apiId) \(encodeJSON(callType))"
+            case let .apiRejectCall(contact): return "/_call reject @\(contact.apiId)"
+            case let .apiSendCallOffer(contact, callOffer): return "/_call offer @\(contact.apiId) \(encodeJSON(callOffer))"
+            case let .apiSendCallAnswer(contact, answer): return "/_call answer @\(contact.apiId) \(encodeJSON(answer))"
+            case let .apiSendCallExtraInfo(contact, extraInfo): return "/_call extra @\(contact.apiId) \(encodeJSON(extraInfo))"
+            case let .apiEndCall(contact): return "/_call end @\(contact.apiId)"
+            case .apiGetCallInvitations: return "/_call get"
+            case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
+            case .apiGetNetworkStatuses: return "/_network_statuses"
+            case let .apiChatRead(type, id, scope): return "/_read chat \(ref(type, id, scope: scope))"
+            case let .apiChatItemsRead(type, id, scope, itemIds): return "/_read chat items \(ref(type, id, scope: scope)) \(joinedIds(itemIds))"
+            case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id, scope: nil)) \(onOff(unreadChat))"
+            case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
+            case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
+            case let .cancelFile(fileId): return "/fcancel \(fileId)"
+            case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
+            case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
+            case .findKnownRemoteCtrl: return "/find remote ctrl"
+            case let .confirmRemoteCtrl(rcId): return "/confirm remote ctrl \(rcId)"
+            case let .verifyRemoteCtrlSession(sessCode): return "/verify remote ctrl \(sessCode)"
+            case .listRemoteCtrls: return "/list remote ctrls"
+            case .stopRemoteCtrl: return "/stop remote ctrl"
+            case let .deleteRemoteCtrl(rcId): return "/delete remote ctrl \(rcId)"
+            case let .apiUploadStandaloneFile(userId, file): return "/_upload \(userId) \(file.filePath)"
+            case let .apiDownloadStandaloneFile(userId, link, file): return "/_download \(userId) \(link) \(file.filePath)"
+            case let .apiStandaloneFileInfo(link): return "/_download info \(link)"
+            case .showVersion: return "/version"
+            case let .getAgentSubsTotal(userId): return "/get subs total \(userId)"
+            case let .getAgentServersSummary(userId): return "/get servers summary \(userId)"
+            case .resetAgentServersStats: return "/reset servers stats"
+            case let .string(str): return str
+            }
+        }
+    }
+
+    var cmdType: String {
+        get {
+            switch self {
+            case .showActiveUser: return "showActiveUser"
+            case .createActiveUser: return "createActiveUser"
+            case .listUsers: return "listUsers"
+            case .apiSetActiveUser: return "apiSetActiveUser"
+            case .setAllContactReceipts: return "setAllContactReceipts"
+            case .apiSetUserContactReceipts: return "apiSetUserContactReceipts"
+            case .apiSetUserGroupReceipts: return "apiSetUserGroupReceipts"
+            case .apiHideUser: return "apiHideUser"
+            case .apiUnhideUser: return "apiUnhideUser"
+            case .apiMuteUser: return "apiMuteUser"
+            case .apiUnmuteUser: return "apiUnmuteUser"
+            case .apiDeleteUser: return "apiDeleteUser"
+            case .startChat: return "startChat"
+            case .checkChatRunning: return "checkChatRunning"
+            case .apiStopChat: return "apiStopChat"
+            case .apiActivateChat: return "apiActivateChat"
+            case .apiSuspendChat: return "apiSuspendChat"
+            case .apiSetAppFilePaths: return "apiSetAppFilePaths"
+            case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
+            case .apiExportArchive: return "apiExportArchive"
+            case .apiImportArchive: return "apiImportArchive"
+            case .apiDeleteStorage: return "apiDeleteStorage"
+            case .apiStorageEncryption: return "apiStorageEncryption"
+            case .testStorageEncryption: return "testStorageEncryption"
+            case .apiSaveSettings: return "apiSaveSettings"
+            case .apiGetSettings: return "apiGetSettings"
+            case .apiGetChatTags: return "apiGetChatTags"
+            case .apiGetChats: return "apiGetChats"
+            case .apiGetChat: return "apiGetChat"
+            case .apiGetChatItemInfo: return "apiGetChatItemInfo"
+            case .apiSendMessages: return "apiSendMessages"
+            case .apiCreateChatTag: return "apiCreateChatTag"
+            case .apiSetChatTags: return "apiSetChatTags"
+            case .apiDeleteChatTag: return "apiDeleteChatTag"
+            case .apiUpdateChatTag: return "apiUpdateChatTag"
+            case .apiReorderChatTags: return "apiReorderChatTags"
+            case .apiCreateChatItems: return "apiCreateChatItems"
+            case .apiReportMessage: return "apiReportMessage"
+            case .apiUpdateChatItem: return "apiUpdateChatItem"
+            case .apiDeleteChatItem: return "apiDeleteChatItem"
+            case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
+            case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
+            case .apiArchiveReceivedReports: return "apiArchiveReceivedReports"
+            case .apiDeleteReceivedReports: return "apiDeleteReceivedReports"
+            case .apiChatItemReaction: return "apiChatItemReaction"
+            case .apiGetReactionMembers: return "apiGetReactionMembers"
+            case .apiPlanForwardChatItems: return "apiPlanForwardChatItems"
+            case .apiForwardChatItems: return "apiForwardChatItems"
+            case .apiGetNtfToken: return "apiGetNtfToken"
+            case .apiRegisterToken: return "apiRegisterToken"
+            case .apiVerifyToken: return "apiVerifyToken"
+            case .apiCheckToken: return "apiCheckToken"
+            case .apiDeleteToken: return "apiDeleteToken"
+            case .apiGetNtfConns: return "apiGetNtfConns"
+            case .apiGetConnNtfMessages: return "apiGetConnNtfMessages"
+            case .apiNewGroup: return "apiNewGroup"
+            case .apiAddMember: return "apiAddMember"
+            case .apiJoinGroup: return "apiJoinGroup"
+            case .apiAcceptMember: return "apiAcceptMember"
+            case .apiDeleteMemberSupportChat: return "apiDeleteMemberSupportChat"
+            case .apiMembersRole: return "apiMembersRole"
+            case .apiBlockMembersForAll: return "apiBlockMembersForAll"
+            case .apiRemoveMembers: return "apiRemoveMembers"
+            case .apiLeaveGroup: return "apiLeaveGroup"
+            case .apiListMembers: return "apiListMembers"
+            case .apiUpdateGroupProfile: return "apiUpdateGroupProfile"
+            case .apiCreateGroupLink: return "apiCreateGroupLink"
+            case .apiGroupLinkMemberRole: return "apiGroupLinkMemberRole"
+            case .apiDeleteGroupLink: return "apiDeleteGroupLink"
+            case .apiGetGroupLink: return "apiGetGroupLink"
+            case .apiAddGroupShortLink: return "apiAddGroupShortLink"
+            case .apiCreateMemberContact: return "apiCreateMemberContact"
+            case .apiSendMemberContactInvitation: return "apiSendMemberContactInvitation"
+            case .apiTestProtoServer: return "apiTestProtoServer"
+            case .apiGetServerOperators: return "apiGetServerOperators"
+            case .apiSetServerOperators: return "apiSetServerOperators"
+            case .apiGetUserServers: return "apiGetUserServers"
+            case .apiSetUserServers: return "apiSetUserServers"
+            case .apiValidateServers: return "apiValidateServers"
+            case .apiGetUsageConditions: return "apiGetUsageConditions"
+            case .apiSetConditionsNotified: return "apiSetConditionsNotified"
+            case .apiAcceptConditions: return "apiAcceptConditions"
+            case .apiSetChatItemTTL: return "apiSetChatItemTTL"
+            case .apiGetChatItemTTL: return "apiGetChatItemTTL"
+            case .apiSetChatTTL: return "apiSetChatTTL"
+            case .apiSetNetworkConfig: return "apiSetNetworkConfig"
+            case .apiGetNetworkConfig: return "apiGetNetworkConfig"
+            case .apiSetNetworkInfo: return "apiSetNetworkInfo"
+            case .reconnectAllServers: return "reconnectAllServers"
+            case .reconnectServer: return "reconnectServer"
+            case .apiSetChatSettings: return "apiSetChatSettings"
+            case .apiSetMemberSettings: return "apiSetMemberSettings"
+            case .apiContactInfo: return "apiContactInfo"
+            case .apiGroupMemberInfo: return "apiGroupMemberInfo"
+            case .apiContactQueueInfo: return "apiContactQueueInfo"
+            case .apiGroupMemberQueueInfo: return "apiGroupMemberQueueInfo"
+            case .apiSwitchContact: return "apiSwitchContact"
+            case .apiSwitchGroupMember: return "apiSwitchGroupMember"
+            case .apiAbortSwitchContact: return "apiAbortSwitchContact"
+            case .apiAbortSwitchGroupMember: return "apiAbortSwitchGroupMember"
+            case .apiSyncContactRatchet: return "apiSyncContactRatchet"
+            case .apiSyncGroupMemberRatchet: return "apiSyncGroupMemberRatchet"
+            case .apiGetContactCode: return "apiGetContactCode"
+            case .apiGetGroupMemberCode: return "apiGetGroupMemberCode"
+            case .apiVerifyContact: return "apiVerifyContact"
+            case .apiVerifyGroupMember: return "apiVerifyGroupMember"
+            case .apiAddContact: return "apiAddContact"
+            case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
+            case .apiChangeConnectionUser: return "apiChangeConnectionUser"
+            case .apiConnectPlan: return "apiConnectPlan"
+            case .apiConnect: return "apiConnect"
+            case .apiDeleteChat: return "apiDeleteChat"
+            case .apiClearChat: return "apiClearChat"
+            case .apiListContacts: return "apiListContacts"
+            case .apiUpdateProfile: return "apiUpdateProfile"
+            case .apiSetContactPrefs: return "apiSetContactPrefs"
+            case .apiSetContactAlias: return "apiSetContactAlias"
+            case .apiSetGroupAlias: return "apiSetGroupAlias"
+            case .apiSetConnectionAlias: return "apiSetConnectionAlias"
+            case .apiSetUserUIThemes: return "apiSetUserUIThemes"
+            case .apiSetChatUIThemes: return "apiSetChatUIThemes"
+            case .apiCreateMyAddress: return "apiCreateMyAddress"
+            case .apiDeleteMyAddress: return "apiDeleteMyAddress"
+            case .apiShowMyAddress: return "apiShowMyAddress"
+            case .apiAddMyAddressShortLink: return "apiAddMyAddressShortLink"
+            case .apiSetProfileAddress: return "apiSetProfileAddress"
+            case .apiAddressAutoAccept: return "apiAddressAutoAccept"
+            case .apiAcceptContact: return "apiAcceptContact"
+            case .apiRejectContact: return "apiRejectContact"
+            case .apiSendCallInvitation: return "apiSendCallInvitation"
+            case .apiRejectCall: return "apiRejectCall"
+            case .apiSendCallOffer: return "apiSendCallOffer"
+            case .apiSendCallAnswer: return "apiSendCallAnswer"
+            case .apiSendCallExtraInfo: return "apiSendCallExtraInfo"
+            case .apiEndCall: return "apiEndCall"
+            case .apiGetCallInvitations: return "apiGetCallInvitations"
+            case .apiCallStatus: return "apiCallStatus"
+            case .apiGetNetworkStatuses: return "apiGetNetworkStatuses"
+            case .apiChatRead: return "apiChatRead"
+            case .apiChatItemsRead: return "apiChatItemsRead"
+            case .apiChatUnread: return "apiChatUnread"
+            case .receiveFile: return "receiveFile"
+            case .setFileToReceive: return "setFileToReceive"
+            case .cancelFile: return "cancelFile"
+            case .setLocalDeviceName: return "setLocalDeviceName"
+            case .connectRemoteCtrl: return "connectRemoteCtrl"
+            case .findKnownRemoteCtrl: return "findKnownRemoteCtrl"
+            case .confirmRemoteCtrl: return "confirmRemoteCtrl"
+            case .verifyRemoteCtrlSession: return "verifyRemoteCtrlSession"
+            case .listRemoteCtrls: return "listRemoteCtrls"
+            case .stopRemoteCtrl: return "stopRemoteCtrl"
+            case .deleteRemoteCtrl: return "deleteRemoteCtrl"
+            case .apiUploadStandaloneFile: return "apiUploadStandaloneFile"
+            case .apiDownloadStandaloneFile: return "apiDownloadStandaloneFile"
+            case .apiStandaloneFileInfo: return "apiStandaloneFileInfo"
+            case .showVersion: return "showVersion"
+            case .getAgentSubsTotal: return "getAgentSubsTotal"
+            case .getAgentServersSummary: return "getAgentServersSummary"
+            case .resetAgentServersStats: return "resetAgentServersStats"
+            case .string: return "console command"
+            }
+        }
+    }
+
+    func ref(_ type: ChatType, _ id: Int64, scope: GroupChatScope?) -> String {
+        "\(type.rawValue)\(id)\(scopeRef(scope: scope))"
+    }
+
+    func scopeRef(scope: GroupChatScope?) -> String {
+        switch (scope) {
+        case .none: ""
+        case let .memberSupport(groupMemberId_):
+            if let groupMemberId = groupMemberId_ {
+                "(_support:\(groupMemberId))"
+            } else {
+                "(_support)"
+            }
+        }
+    }
+
+    func joinedIds(_ ids: [Int64]) -> String {
+        ids.map { "\($0)" }.joined(separator: ",")
+    }
+
+    func chatItemTTLStr(seconds: Int64?) -> String {
+        if let seconds = seconds {
+            return String(seconds)
+        } else {
+            return "default"
+        }
+    }
+
+    var obfuscated: ChatCommand {
+        switch self {
+        case let .apiStorageEncryption(cfg):
+            return .apiStorageEncryption(config: DBEncryptionConfig(currentKey: obfuscate(cfg.currentKey), newKey: obfuscate(cfg.newKey)))
+        case let .apiSetActiveUser(userId, viewPwd):
+            return .apiSetActiveUser(userId: userId, viewPwd: obfuscate(viewPwd))
+        case let .apiHideUser(userId, viewPwd):
+            return .apiHideUser(userId: userId, viewPwd: obfuscate(viewPwd))
+        case let .apiUnhideUser(userId, viewPwd):
+            return .apiUnhideUser(userId: userId, viewPwd: obfuscate(viewPwd))
+        case let .apiDeleteUser(userId, delSMPQueues, viewPwd):
+            return .apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: obfuscate(viewPwd))
+        case let .testStorageEncryption(key):
+            return .testStorageEncryption(key: obfuscate(key))
+        default: return self
+        }
+    }
+
+    private func obfuscate(_ s: String) -> String {
+        s == "" ? "" : "***"
+    }
+
+    private func obfuscate(_ s: String?) -> String? {
+        if let s = s {
+            return obfuscate(s)
+        }
+        return nil
+    }
+
+    private func onOffParam(_ param: String, _ b: Bool?) -> String {
+        if let b = b {
+            return " \(param)=\(onOff(b))"
+        }
+        return ""
+    }
+
+    private func maybePwd(_ pwd: String?) -> String {
+        pwd == "" || pwd == nil ? "" : " " + encodeJSON(pwd)
+    }
+}
+
+// ChatResponse is split to three enums to reduce stack size used when parsing it, parsing large enums is very inefficient.
+enum ChatResponse0: Decodable, ChatAPIResult {
+    case activeUser(user: User)
+    case usersList(users: [UserInfo])
+    case chatStarted
+    case chatRunning
+    case chatStopped
+    case apiChats(user: UserRef, chats: [ChatData])
+    case apiChat(user: UserRef, chat: ChatData, navInfo: NavigationInfo?)
+    case chatTags(user: UserRef, userTags: [ChatTag])
+    case chatItemInfo(user: UserRef, chatItem: AChatItem, chatItemInfo: ChatItemInfo)
+    case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
+    case serverOperatorConditions(conditions: ServerOperatorConditions)
+    case userServers(user: UserRef, userServers: [UserOperatorServers])
+    case userServersValidation(user: UserRef, serverErrors: [UserServersError])
+    case usageConditions(usageConditions: UsageConditions, conditionsText: String, acceptedConditions: UsageConditions?)
+    case chatItemTTL(user: UserRef, chatItemTTL: Int64?)
+    case networkConfig(networkConfig: NetCfg)
+    case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
+    case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
+    case queueInfo(user: UserRef, rcvMsgInfo: RcvMsgInfo?, queueInfo: ServerQueueInfo)
+    case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactSwitchAborted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberSwitchAborted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactRatchetSyncStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
+    case groupMemberRatchetSyncStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
+    case contactCode(user: UserRef, contact: Contact, connectionCode: String)
+    case groupMemberCode(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionCode: String)
+    case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
+    case tagsUpdated(user: UserRef, userTags: [ChatTag], chatTags: [Int64])
+
+    var responseType: String {
+        switch self {
+        case .activeUser: "activeUser"
+        case .usersList: "usersList"
+        case .chatStarted: "chatStarted"
+        case .chatRunning: "chatRunning"
+        case .chatStopped: "chatStopped"
+        case .apiChats: "apiChats"
+        case .apiChat: "apiChat"
+        case .chatTags: "chatTags"
+        case .chatItemInfo: "chatItemInfo"
+        case .serverTestResult: "serverTestResult"
+        case .serverOperatorConditions: "serverOperators"
+        case .userServers: "userServers"
+        case .userServersValidation: "userServersValidation"
+        case .usageConditions: "usageConditions"
+        case .chatItemTTL: "chatItemTTL"
+        case .networkConfig: "networkConfig"
+        case .contactInfo: "contactInfo"
+        case .groupMemberInfo: "groupMemberInfo"
+        case .queueInfo: "queueInfo"
+        case .contactSwitchStarted: "contactSwitchStarted"
+        case .groupMemberSwitchStarted: "groupMemberSwitchStarted"
+        case .contactSwitchAborted: "contactSwitchAborted"
+        case .groupMemberSwitchAborted: "groupMemberSwitchAborted"
+        case .contactRatchetSyncStarted: "contactRatchetSyncStarted"
+        case .groupMemberRatchetSyncStarted: "groupMemberRatchetSyncStarted"
+        case .contactCode: "contactCode"
+        case .groupMemberCode: "groupMemberCode"
+        case .connectionVerified: "connectionVerified"
+        case .tagsUpdated: "tagsUpdated"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case let .activeUser(user): return String(describing: user)
+        case let .usersList(users): return String(describing: users)
+        case .chatStarted: return noDetails
+        case .chatRunning: return noDetails
+        case .chatStopped: return noDetails
+        case let .apiChats(u, chats): return withUser(u, String(describing: chats))
+        case let .apiChat(u, chat, navInfo): return withUser(u, "chat: \(String(describing: chat))\nnavInfo: \(String(describing: navInfo))")
+        case let .chatTags(u, userTags): return withUser(u, "userTags: \(String(describing: userTags))")
+        case let .chatItemInfo(u, chatItem, chatItemInfo): return withUser(u, "chatItem: \(String(describing: chatItem))\nchatItemInfo: \(String(describing: chatItemInfo))")
+        case let .serverTestResult(u, server, testFailure): return withUser(u, "server: \(server)\nresult: \(String(describing: testFailure))")
+        case let .serverOperatorConditions(conditions): return "conditions: \(String(describing: conditions))"
+        case let .userServers(u, userServers): return withUser(u, "userServers: \(String(describing: userServers))")
+        case let .userServersValidation(u, serverErrors): return withUser(u, "serverErrors: \(String(describing: serverErrors))")
+        case let .usageConditions(usageConditions, _, acceptedConditions): return "usageConditions: \(String(describing: usageConditions))\nacceptedConditions: \(String(describing: acceptedConditions))"
+        case let .chatItemTTL(u, chatItemTTL): return withUser(u, String(describing: chatItemTTL))
+        case let .networkConfig(networkConfig): return String(describing: networkConfig)
+        case let .contactInfo(u, contact, connectionStats_, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats_: \(String(describing: connectionStats_))\ncustomUserProfile: \(String(describing: customUserProfile))")
+        case let .groupMemberInfo(u, groupInfo, member, connectionStats_): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats_: \(String(describing: connectionStats_))")
+        case let .queueInfo(u, rcvMsgInfo, queueInfo):
+            let msgInfo = if let info = rcvMsgInfo { encodeJSON(info) } else { "none" }
+            return withUser(u, "rcvMsgInfo: \(msgInfo)\nqueueInfo: \(encodeJSON(queueInfo))")
+        case let .contactSwitchStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .groupMemberSwitchStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .contactSwitchAborted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .groupMemberSwitchAborted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .contactRatchetSyncStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .groupMemberRatchetSyncStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
+        case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
+        case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
+        case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
+        case let .tagsUpdated(u, userTags, chatTags): return withUser(u, "userTags: \(String(describing: userTags))\nchatTags: \(String(describing: chatTags))")
+        }
+    }
+
+    static func fallbackResult(_ type: String, _ json: NSDictionary) -> ChatResponse0? {
+        if type == "apiChats" {
+            if let r = parseApiChats(json) {
+                return .apiChats(user: r.user, chats: r.chats)
+            }
+        } else if type == "apiChat" {
+            if let jApiChat = json["apiChat"] as? NSDictionary,
+               let user: UserRef = try? decodeObject(jApiChat["user"] as Any),
+               let jChat = jApiChat["chat"] as? NSDictionary,
+               let (chat, navInfo) = try? parseChatData(jChat, jApiChat["navInfo"] as? NSDictionary) {
+                return .apiChat(user: user, chat: chat, navInfo: navInfo)
+            }
+        }
+        return nil
+    }
+}
+
+enum ChatResponse1: Decodable, ChatAPIResult {
+    case invitation(user: UserRef, connLinkInvitation: CreatedConnLink, connection: PendingContactConnection)
+    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
+    case connectionUserChanged(user: UserRef, fromConnection: PendingContactConnection, toConnection: PendingContactConnection, newUser: UserRef)
+    case connectionPlan(user: UserRef, connLink: CreatedConnLink, connectionPlan: ConnectionPlan)
+    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
+    case sentInvitation(user: UserRef, connection: PendingContactConnection)
+    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
+    case contactAlreadyExists(user: UserRef, contact: Contact)
+    case contactDeleted(user: UserRef, contact: Contact)
+    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
+    case groupDeletedUser(user: UserRef, groupInfo: GroupInfo)
+    case itemsReadForChat(user: UserRef, chatInfo: ChatInfo)
+    case chatCleared(user: UserRef, chatInfo: ChatInfo)
+    case userProfileNoChange(user: User)
+    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
+    case userPrivacy(user: User, updatedUser: User)
+    case contactAliasUpdated(user: UserRef, toContact: Contact)
+    case groupAliasUpdated(user: UserRef, toGroup: GroupInfo)
+    case connectionAliasUpdated(user: UserRef, toConnection: PendingContactConnection)
+    case contactPrefsUpdated(user: User, fromContact: Contact, toContact: Contact)
+    case userContactLink(user: User, contactLink: UserContactLink)
+    case userContactLinkUpdated(user: User, contactLink: UserContactLink)
+    case userContactLinkCreated(user: User, connLinkContact: CreatedConnLink)
+    case userContactLinkDeleted(user: User)
+    case acceptingContactRequest(user: UserRef, contact: Contact)
+    case contactRequestRejected(user: UserRef)
+    case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
+    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case groupChatItemsDeleted(user: UserRef, groupInfo: GroupInfo, chatItemIDs: Set<Int64>, byUser: Bool, member_: GroupMember?)
+    case forwardPlan(user: UserRef, chatItemIds: [Int64], forwardConfirmation: ForwardConfirmation?)
+    case chatItemUpdated(user: UserRef, chatItem: AChatItem)
+    case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
+    case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
+    case reactionMembers(user: UserRef, memberReactions: [MemberReaction])
+    case chatItemsDeleted(user: UserRef, chatItemDeletions: [ChatItemDeletion], byUser: Bool)
+    case contactsList(user: UserRef, contacts: [Contact])
+
+    var responseType: String {
+        switch self {
+        case .invitation: "invitation"
+        case .connectionIncognitoUpdated: "connectionIncognitoUpdated"
+        case .connectionUserChanged: "connectionUserChanged"
+        case .connectionPlan: "connectionPlan"
+        case .sentConfirmation: "sentConfirmation"
+        case .sentInvitation: "sentInvitation"
+        case .sentInvitationToContact: "sentInvitationToContact"
+        case .contactAlreadyExists: "contactAlreadyExists"
+        case .contactDeleted: "contactDeleted"
+        case .contactConnectionDeleted: "contactConnectionDeleted"
+        case .groupDeletedUser: "groupDeletedUser"
+        case .itemsReadForChat: "itemsReadForChat"
+        case .chatCleared: "chatCleared"
+        case .userProfileNoChange: "userProfileNoChange"
+        case .userProfileUpdated: "userProfileUpdated"
+        case .userPrivacy: "userPrivacy"
+        case .contactAliasUpdated: "contactAliasUpdated"
+        case .groupAliasUpdated: "groupAliasUpdated"
+        case .connectionAliasUpdated: "connectionAliasUpdated"
+        case .contactPrefsUpdated: "contactPrefsUpdated"
+        case .userContactLink: "userContactLink"
+        case .userContactLinkUpdated: "userContactLinkUpdated"
+        case .userContactLinkCreated: "userContactLinkCreated"
+        case .userContactLinkDeleted: "userContactLinkDeleted"
+        case .acceptingContactRequest: "acceptingContactRequest"
+        case .contactRequestRejected: "contactRequestRejected"
+        case .networkStatuses: "networkStatuses"
+        case .newChatItems: "newChatItems"
+        case .groupChatItemsDeleted: "groupChatItemsDeleted"
+        case .forwardPlan: "forwardPlan"
+        case .chatItemUpdated: "chatItemUpdated"
+        case .chatItemNotChanged: "chatItemNotChanged"
+        case .chatItemReaction: "chatItemReaction"
+        case .reactionMembers: "reactionMembers"
+        case .chatItemsDeleted: "chatItemsDeleted"
+        case .contactsList: "contactsList"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
+        case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
+        case let .groupDeletedUser(u, groupInfo): return withUser(u, String(describing: groupInfo))
+        case let .itemsReadForChat(u, chatInfo): return withUser(u, String(describing: chatInfo))
+        case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
+        case .userProfileNoChange: return noDetails
+        case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
+        case let .userPrivacy(u, updatedUser): return withUser(u, String(describing: updatedUser))
+        case let .contactAliasUpdated(u, toContact): return withUser(u, String(describing: toContact))
+        case let .groupAliasUpdated(u, toGroup): return withUser(u, String(describing: toGroup))
+        case let .connectionAliasUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
+        case let .contactPrefsUpdated(u, fromContact, toContact): return withUser(u, "fromContact: \(String(describing: fromContact))\ntoContact: \(String(describing: toContact))")
+        case let .userContactLink(u, contactLink): return withUser(u, contactLink.responseDetails)
+        case let .userContactLinkUpdated(u, contactLink): return withUser(u, contactLink.responseDetails)
+        case let .userContactLinkCreated(u, connLink): return withUser(u, String(describing: connLink))
+        case .userContactLinkDeleted: return noDetails
+        case let .acceptingContactRequest(u, contact): return withUser(u, String(describing: contact))
+        case .contactRequestRejected: return noDetails
+        case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
+        case let .newChatItems(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case let .groupChatItemsDeleted(u, gInfo, chatItemIDs, byUser, member_):
+            return withUser(u, "chatItemIDs: \(String(describing: chatItemIDs))\ngroupInfo: \(String(describing: gInfo))\nbyUser: \(byUser)\nmember_: \(String(describing: member_))")
+        case let .forwardPlan(u, chatItemIds, forwardConfirmation): return withUser(u, "items: \(chatItemIds) forwardConfirmation: \(String(describing: forwardConfirmation))")
+        case let .chatItemUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .chatItemNotChanged(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .chatItemReaction(u, added, reaction): return withUser(u, "added: \(added)\n\(String(describing: reaction))")
+        case let .reactionMembers(u, reaction): return withUser(u, "memberReactions: \(String(describing: reaction))")
+        case let .chatItemsDeleted(u, items, byUser):
+            let itemsString = items.map { item in
+                "deletedChatItem:\n\(String(describing: item.deletedChatItem))\ntoChatItem:\n\(String(describing: item.toChatItem))" }.joined(separator: "\n")
+            return withUser(u, itemsString + "\nbyUser: \(byUser)")
+        case let .contactsList(u, contacts): return withUser(u, String(describing: contacts))
+        case let .invitation(u, connLinkInvitation, connection): return withUser(u, "connLinkInvitation: \(connLinkInvitation)\nconnection: \(connection)")
+        case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
+        case let .connectionUserChanged(u, fromConnection, toConnection, newUser): return withUser(u, "fromConnection: \(String(describing: fromConnection))\ntoConnection: \(String(describing: toConnection))\nnewUserId: \(String(describing: newUser.userId))")
+        case let .connectionPlan(u, connLink, connectionPlan): return withUser(u, "connLink: \(String(describing: connLink))\nconnectionPlan: \(String(describing: connectionPlan))")
+        case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
+        case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
+        case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
+        case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
+        }
+    }
+}
+
+enum ChatResponse2: Decodable, ChatAPIResult {
+    // group responses
+    case groupCreated(user: UserRef, groupInfo: GroupInfo)
+    case sentGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, member: GroupMember)
+    case userAcceptedGroupSent(user: UserRef, groupInfo: GroupInfo, hostContact: Contact?)
+    case userDeletedMembers(user: UserRef, groupInfo: GroupInfo, members: [GroupMember], withMessages: Bool)
+    case leftMemberUser(user: UserRef, groupInfo: GroupInfo)
+    case groupMembers(user: UserRef, group: SimpleXChat.Group)
+    case memberAccepted(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case memberSupportChatDeleted(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case membersRoleUser(user: UserRef, groupInfo: GroupInfo, members: [GroupMember], toRole: GroupMemberRole)
+    case membersBlockedForAllUser(user: UserRef, groupInfo: GroupInfo, members: [GroupMember], blocked: Bool)
+    case groupUpdated(user: UserRef, toGroup: GroupInfo)
+    case groupLinkCreated(user: UserRef, groupInfo: GroupInfo, connLinkContact: CreatedConnLink, memberRole: GroupMemberRole)
+    case groupLink(user: UserRef, groupInfo: GroupInfo, connLinkContact: CreatedConnLink, memberRole: GroupMemberRole)
+    case groupLinkDeleted(user: UserRef, groupInfo: GroupInfo)
+    case newMemberContact(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
+    case newMemberContactSentInv(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
+    // receiving file responses
+    case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
+    case rcvFileAcceptedSndCancelled(user: UserRef, rcvFileTransfer: RcvFileTransfer)
+    case standaloneFileInfo(fileMeta: MigrationFileLinkData?)
+    case rcvStandaloneFileCreated(user: UserRef, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileCancelled(user: UserRef, chatItem_: AChatItem?, rcvFileTransfer: RcvFileTransfer)
+    // sending file responses
+    case sndFileCancelled(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
+    case sndStandaloneFileCreated(user: UserRef, fileTransferMeta: FileTransferMeta) // returned by _upload
+    case sndFileStartXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta) // not used
+    case sndFileCancelledXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
+    // call invitations
+    case callInvitations(callInvitations: [RcvCallInvitation])
+    // notifications
+    case ntfTokenStatus(status: NtfTknStatus)
+    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode, ntfServer: String)
+    case ntfConns(ntfConns: [NtfConn])
+    case connNtfMessages(receivedMsgs: [RcvNtfMsgInfo])
+    // remote desktop responses
+    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
+    case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
+    case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
+    // misc
+    case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
+    case cmdOk(user_: UserRef?)
+    case agentSubsTotal(user: UserRef, subsTotal: SMPServerSubs, hasSession: Bool)
+    case agentServersSummary(user: UserRef, serversSummary: PresentedServersSummary)
+    case agentSubsSummary(user: UserRef, subsSummary: SMPServerSubs)
+    case archiveExported(archiveErrors: [ArchiveError])
+    case archiveImported(archiveErrors: [ArchiveError])
+    case appSettings(appSettings: AppSettings)
+
+    var responseType: String {
+        switch self {
+        case .groupCreated: "groupCreated"
+        case .sentGroupInvitation: "sentGroupInvitation"
+        case .userAcceptedGroupSent: "userAcceptedGroupSent"
+        case .userDeletedMembers: "userDeletedMembers"
+        case .leftMemberUser: "leftMemberUser"
+        case .groupMembers: "groupMembers"
+        case .memberAccepted: "memberAccepted"
+        case .memberSupportChatDeleted: "memberSupportChatDeleted"
+        case .membersRoleUser: "membersRoleUser"
+        case .membersBlockedForAllUser: "membersBlockedForAllUser"
+        case .groupUpdated: "groupUpdated"
+        case .groupLinkCreated: "groupLinkCreated"
+        case .groupLink: "groupLink"
+        case .groupLinkDeleted: "groupLinkDeleted"
+        case .newMemberContact: "newMemberContact"
+        case .newMemberContactSentInv: "newMemberContactSentInv"
+        case .rcvFileAccepted: "rcvFileAccepted"
+        case .rcvFileAcceptedSndCancelled: "rcvFileAcceptedSndCancelled"
+        case .standaloneFileInfo: "standaloneFileInfo"
+        case .rcvStandaloneFileCreated: "rcvStandaloneFileCreated"
+        case .rcvFileCancelled: "rcvFileCancelled"
+        case .sndFileCancelled: "sndFileCancelled"
+        case .sndStandaloneFileCreated: "sndStandaloneFileCreated"
+        case .sndFileStartXFTP: "sndFileStartXFTP"
+        case .sndFileCancelledXFTP: "sndFileCancelledXFTP"
+        case .callInvitations: "callInvitations"
+        case .ntfTokenStatus: "ntfTokenStatus"
+        case .ntfToken: "ntfToken"
+        case .ntfConns: "ntfConns"
+        case .connNtfMessages: "connNtfMessages"
+        case .remoteCtrlList: "remoteCtrlList"
+        case .remoteCtrlConnecting: "remoteCtrlConnecting"
+        case .remoteCtrlConnected: "remoteCtrlConnected"
+        case .versionInfo: "versionInfo"
+        case .cmdOk: "cmdOk"
+        case .agentSubsTotal: "agentSubsTotal"
+        case .agentServersSummary: "agentServersSummary"
+        case .agentSubsSummary: "agentSubsSummary"
+        case .archiveExported: "archiveExported"
+        case .archiveImported: "archiveImported"
+        case .appSettings: "appSettings"
+        }
+    }
+
+    var details: String {
+        switch self {
+        case let .groupCreated(u, groupInfo): return withUser(u, String(describing: groupInfo))
+        case let .sentGroupInvitation(u, groupInfo, contact, member): return withUser(u, "groupInfo: \(groupInfo)\ncontact: \(contact)\nmember: \(member)")
+        case let .userAcceptedGroupSent(u, groupInfo, hostContact): return withUser(u, "groupInfo: \(groupInfo)\nhostContact: \(String(describing: hostContact))")
+        case let .userDeletedMembers(u, groupInfo, members, withMessages): return withUser(u, "groupInfo: \(groupInfo)\nmembers: \(members)\nwithMessages: \(withMessages)")
+        case let .leftMemberUser(u, groupInfo): return withUser(u, String(describing: groupInfo))
+        case let .groupMembers(u, group): return withUser(u, String(describing: group))
+        case let .memberAccepted(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
+        case let .memberSupportChatDeleted(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
+        case let .membersRoleUser(u, groupInfo, members, toRole): return withUser(u, "groupInfo: \(groupInfo)\nmembers: \(members)\ntoRole: \(toRole)")
+        case let .membersBlockedForAllUser(u, groupInfo, members, blocked): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(members)\nblocked: \(blocked)")
+        case let .groupUpdated(u, toGroup): return withUser(u, String(describing: toGroup))
+        case let .groupLinkCreated(u, groupInfo, connLinkContact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\nconnLinkContact: \(connLinkContact)\nmemberRole: \(memberRole)")
+        case let .groupLink(u, groupInfo, connLinkContact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\nconnLinkContact: \(connLinkContact)\nmemberRole: \(memberRole)")
+        case let .groupLinkDeleted(u, groupInfo): return withUser(u, String(describing: groupInfo))
+        case let .newMemberContact(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
+        case let .newMemberContactSentInv(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
+        case let .rcvFileAccepted(u, chatItem): return withUser(u, String(describing: chatItem))
+        case .rcvFileAcceptedSndCancelled: return noDetails
+        case let .standaloneFileInfo(fileMeta): return String(describing: fileMeta)
+        case .rcvStandaloneFileCreated: return noDetails
+        case let .rcvFileCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileCancelled(u, chatItem, _, _): return withUser(u, String(describing: chatItem))
+        case .sndStandaloneFileCreated: return noDetails
+        case let .sndFileStartXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileCancelledXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .callInvitations(invs): return String(describing: invs)
+        case let .ntfTokenStatus(status): return String(describing: status)
+        case let .ntfToken(token, status, ntfMode, ntfServer): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)\nntfServer: \(ntfServer)"
+        case let .ntfConns(ntfConns): return String(describing: ntfConns)
+        case let .connNtfMessages(receivedMsgs): return "receivedMsgs: \(String(describing: receivedMsgs))"
+        case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
+        case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
+        case let .remoteCtrlConnected(remoteCtrl): return String(describing: remoteCtrl)
+        case let .versionInfo(versionInfo, chatMigrations, agentMigrations): return "\(String(describing: versionInfo))\n\nchat migrations: \(chatMigrations.map(\.upName))\n\nagent migrations: \(agentMigrations.map(\.upName))"
+        case .cmdOk: return noDetails
+        case let .agentSubsTotal(u, subsTotal, hasSession): return withUser(u, "subsTotal: \(String(describing: subsTotal))\nhasSession: \(hasSession)")
+        case let .agentServersSummary(u, serversSummary): return withUser(u, String(describing: serversSummary))
+        case let .agentSubsSummary(u, subsSummary): return withUser(u, String(describing: subsSummary))
+        case let .archiveExported(archiveErrors): return String(describing: archiveErrors)
+        case let .archiveImported(archiveErrors): return String(describing: archiveErrors)
+        case let .appSettings(appSettings): return String(describing: appSettings)
+        }
+    }
+}
+
+enum ChatEvent: Decodable, ChatAPIResult {
+    case chatSuspended
+    case contactSwitch(user: UserRef, contact: Contact, switchProgress: SwitchProgress)
+    case groupMemberSwitch(user: UserRef, groupInfo: GroupInfo, member: GroupMember, switchProgress: SwitchProgress)
+    case contactRatchetSync(user: UserRef, contact: Contact, ratchetSyncProgress: RatchetSyncProgress)
+    case groupMemberRatchetSync(user: UserRef, groupInfo: GroupInfo, member: GroupMember, ratchetSyncProgress: RatchetSyncProgress)
+    case contactDeletedByContact(user: UserRef, contact: Contact)
+    case contactConnected(user: UserRef, contact: Contact, userCustomProfile: Profile?)
+    case contactConnecting(user: UserRef, contact: Contact)
+    case contactSndReady(user: UserRef, contact: Contact)
+    case receivedContactRequest(user: UserRef, contactRequest: UserContactRequest)
+    case contactUpdated(user: UserRef, toContact: Contact)
+    case groupMemberUpdated(user: UserRef, groupInfo: GroupInfo, fromMember: GroupMember, toMember: GroupMember)
+    case contactsMerged(user: UserRef, intoContact: Contact, mergedContact: Contact)
+    case networkStatus(networkStatus: NetworkStatus, connections: [String])
+    case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
+    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case chatItemsStatusesUpdated(user: UserRef, chatItems: [AChatItem])
+    case chatItemUpdated(user: UserRef, chatItem: AChatItem)
+    case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
+    case chatItemsDeleted(user: UserRef, chatItemDeletions: [ChatItemDeletion], byUser: Bool)
+    // group events
+    case groupChatItemsDeleted(user: UserRef, groupInfo: GroupInfo, chatItemIDs: Set<Int64>, byUser: Bool, member_: GroupMember?)
+    case receivedGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, memberRole: GroupMemberRole)
+    case userAcceptedGroupSent(user: UserRef, groupInfo: GroupInfo, hostContact: Contact?)
+    case groupLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember)
+    case businessLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, fromContact: Contact)
+    case joinedGroupMemberConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, member: GroupMember)
+    case memberAcceptedByOther(user: UserRef, groupInfo: GroupInfo, acceptingMember: GroupMember, member: GroupMember)
+    case memberRole(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
+    case memberBlockedForAll(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, blocked: Bool)
+    case deletedMemberUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember, withMessages: Bool)
+    case deletedMember(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, deletedMember: GroupMember, withMessages: Bool)
+    case leftMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case groupDeleted(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case userJoinedGroup(user: UserRef, groupInfo: GroupInfo)
+    case joinedGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
+    case connectedToGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember, memberContact: Contact?)
+    case groupUpdated(user: UserRef, toGroup: GroupInfo)
+    case newMemberContactReceivedInv(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
+    // receiving file events
+    case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
+    case rcvFileAcceptedSndCancelled(user: UserRef, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileStart(user: UserRef, chatItem: AChatItem) // send by chats
+    case rcvFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, receivedSize: Int64, totalSize: Int64, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileComplete(user: UserRef, chatItem: AChatItem)
+    case rcvStandaloneFileComplete(user: UserRef, targetPath: String, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileSndCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileError(user: UserRef, chatItem_: AChatItem?, agentError: AgentErrorType, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileWarning(user: UserRef, chatItem_: AChatItem?, agentError: AgentErrorType, rcvFileTransfer: RcvFileTransfer)
+    // sending file events
+    case sndFileStart(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileComplete(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileRcvCancelled(user: UserRef, chatItem_: AChatItem?, sndFileTransfer: SndFileTransfer)
+    case sndFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
+    case sndFileRedirectStartXFTP(user: UserRef, fileTransferMeta: FileTransferMeta, redirectMeta: FileTransferMeta)
+    case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
+    case sndStandaloneFileComplete(user: UserRef, fileTransferMeta: FileTransferMeta, rcvURIs: [String])
+    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
+    case sndFileWarning(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
+    // call events
+    case callInvitation(callInvitation: RcvCallInvitation)
+    case callOffer(user: UserRef, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
+    case callAnswer(user: UserRef, contact: Contact, answer: WebRTCSession)
+    case callExtraInfo(user: UserRef, contact: Contact, extraInfo: WebRTCExtraInfo)
+    case callEnded(user: UserRef, contact: Contact)
+    case contactDisabled(user: UserRef, contact: Contact)
+    // notification marker
+    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
+    // remote desktop responses
+    case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo, ctrlAppInfo_: CtrlAppInfo?, appVersion: String, compatible: Bool)
+    case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
+    case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
+    case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
+    // pq
+    case contactPQEnabled(user: UserRef, contact: Contact, pqEnabled: Bool)
+    
+    var responseType: String {
+        switch self {
+        case .chatSuspended: "chatSuspended"
+        case .contactSwitch: "contactSwitch"
+        case .groupMemberSwitch: "groupMemberSwitch"
+        case .contactRatchetSync: "contactRatchetSync"
+        case .groupMemberRatchetSync: "groupMemberRatchetSync"
+        case .contactDeletedByContact: "contactDeletedByContact"
+        case .contactConnected: "contactConnected"
+        case .contactConnecting: "contactConnecting"
+        case .contactSndReady: "contactSndReady"
+        case .receivedContactRequest: "receivedContactRequest"
+        case .contactUpdated: "contactUpdated"
+        case .groupMemberUpdated: "groupMemberUpdated"
+        case .contactsMerged: "contactsMerged"
+        case .networkStatus: "networkStatus"
+        case .networkStatuses: "networkStatuses"
+        case .newChatItems: "newChatItems"
+        case .chatItemsStatusesUpdated: "chatItemsStatusesUpdated"
+        case .chatItemUpdated: "chatItemUpdated"
+        case .chatItemReaction: "chatItemReaction"
+        case .chatItemsDeleted: "chatItemsDeleted"
+        case .groupChatItemsDeleted: "groupChatItemsDeleted"
+        case .receivedGroupInvitation: "receivedGroupInvitation"
+        case .userAcceptedGroupSent: "userAcceptedGroupSent"
+        case .groupLinkConnecting: "groupLinkConnecting"
+        case .businessLinkConnecting: "businessLinkConnecting"
+        case .joinedGroupMemberConnecting: "joinedGroupMemberConnecting"
+        case .memberAcceptedByOther: "memberAcceptedByOther"
+        case .memberRole: "memberRole"
+        case .memberBlockedForAll: "memberBlockedForAll"
+        case .deletedMemberUser: "deletedMemberUser"
+        case .deletedMember: "deletedMember"
+        case .leftMember: "leftMember"
+        case .groupDeleted: "groupDeleted"
+        case .userJoinedGroup: "userJoinedGroup"
+        case .joinedGroupMember: "joinedGroupMember"
+        case .connectedToGroupMember: "connectedToGroupMember"
+        case .groupUpdated: "groupUpdated"
+        case .newMemberContactReceivedInv: "newMemberContactReceivedInv"
+        case .rcvFileAccepted: "rcvFileAccepted"
+        case .rcvFileAcceptedSndCancelled: "rcvFileAcceptedSndCancelled"
+        case .rcvFileStart: "rcvFileStart"
+        case .rcvFileProgressXFTP: "rcvFileProgressXFTP"
+        case .rcvFileComplete: "rcvFileComplete"
+        case .rcvStandaloneFileComplete: "rcvStandaloneFileComplete"
+        case .rcvFileSndCancelled: "rcvFileSndCancelled"
+        case .rcvFileError: "rcvFileError"
+        case .rcvFileWarning: "rcvFileWarning"
+        case .sndFileStart: "sndFileStart"
+        case .sndFileComplete: "sndFileComplete"
+        case .sndFileRcvCancelled: "sndFileRcvCancelled"
+        case .sndFileProgressXFTP: "sndFileProgressXFTP"
+        case .sndFileRedirectStartXFTP: "sndFileRedirectStartXFTP"
+        case .sndFileCompleteXFTP: "sndFileCompleteXFTP"
+        case .sndStandaloneFileComplete: "sndStandaloneFileComplete"
+        case .sndFileError: "sndFileError"
+        case .sndFileWarning: "sndFileWarning"
+        case .callInvitation: "callInvitation"
+        case .callOffer: "callOffer"
+        case .callAnswer: "callAnswer"
+        case .callExtraInfo: "callExtraInfo"
+        case .callEnded: "callEnded"
+        case .contactDisabled: "contactDisabled"
+        case .ntfMessage: "ntfMessage"
+        case .remoteCtrlFound: "remoteCtrlFound"
+        case .remoteCtrlSessionCode: "remoteCtrlSessionCode"
+        case .remoteCtrlConnected: "remoteCtrlConnected"
+        case .remoteCtrlStopped: "remoteCtrlStopped"
+        case .contactPQEnabled: "contactPQEnabled"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case .chatSuspended: return noDetails
+        case let .contactSwitch(u, contact, switchProgress): return withUser(u, "contact: \(String(describing: contact))\nswitchProgress: \(String(describing: switchProgress))")
+        case let .groupMemberSwitch(u, groupInfo, member, switchProgress): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nswitchProgress: \(String(describing: switchProgress))")
+        case let .contactRatchetSync(u, contact, ratchetSyncProgress): return withUser(u, "contact: \(String(describing: contact))\nratchetSyncProgress: \(String(describing: ratchetSyncProgress))")
+        case let .groupMemberRatchetSync(u, groupInfo, member, ratchetSyncProgress): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nratchetSyncProgress: \(String(describing: ratchetSyncProgress))")
+        case let .contactDeletedByContact(u, contact): return withUser(u, String(describing: contact))
+        case let .contactConnected(u, contact, _): return withUser(u, String(describing: contact))
+        case let .contactConnecting(u, contact): return withUser(u, String(describing: contact))
+        case let .contactSndReady(u, contact): return withUser(u, String(describing: contact))
+        case let .receivedContactRequest(u, contactRequest): return withUser(u, String(describing: contactRequest))
+        case let .contactUpdated(u, toContact): return withUser(u, String(describing: toContact))
+        case let .groupMemberUpdated(u, groupInfo, fromMember, toMember): return withUser(u, "groupInfo: \(groupInfo)\nfromMember: \(fromMember)\ntoMember: \(toMember)")
+        case let .contactsMerged(u, intoContact, mergedContact): return withUser(u, "intoContact: \(intoContact)\nmergedContact: \(mergedContact)")
+        case let .networkStatus(status, conns): return "networkStatus: \(String(describing: status))\nconnections: \(String(describing: conns))"
+        case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
+        case let .newChatItems(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case let .chatItemsStatusesUpdated(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case let .chatItemUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .chatItemReaction(u, added, reaction): return withUser(u, "added: \(added)\n\(String(describing: reaction))")
+        case let .chatItemsDeleted(u, items, byUser):
+            let itemsString = items.map { item in
+                "deletedChatItem:\n\(String(describing: item.deletedChatItem))\ntoChatItem:\n\(String(describing: item.toChatItem))" }.joined(separator: "\n")
+            return withUser(u, itemsString + "\nbyUser: \(byUser)")
+        case let .groupChatItemsDeleted(u, gInfo, chatItemIDs, byUser, member_):
+            return withUser(u, "chatItemIDs: \(String(describing: chatItemIDs))\ngroupInfo: \(String(describing: gInfo))\nbyUser: \(byUser)\nmember_: \(String(describing: member_))")
+        case let .receivedGroupInvitation(u, groupInfo, contact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\ncontact: \(contact)\nmemberRole: \(memberRole)")
+        case let .userAcceptedGroupSent(u, groupInfo, hostContact): return withUser(u, "groupInfo: \(groupInfo)\nhostContact: \(String(describing: hostContact))")
+        case let .groupLinkConnecting(u, groupInfo, hostMember): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))")
+        case let .businessLinkConnecting(u, groupInfo, hostMember, fromContact): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))\nfromContact: \(String(describing: fromContact))")
+        case let .joinedGroupMemberConnecting(u, groupInfo, hostMember, member): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(hostMember)\nmember: \(member)")
+        case let .memberAcceptedByOther(u, groupInfo, acceptingMember, member): return withUser(u, "groupInfo: \(groupInfo)\nacceptingMember: \(acceptingMember)\nmember: \(member)")
+        case let .memberRole(u, groupInfo, byMember, member, fromRole, toRole): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\nmember: \(member)\nfromRole: \(fromRole)\ntoRole: \(toRole)")
+        case let .memberBlockedForAll(u, groupInfo, byMember, member, blocked): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\nmember: \(member)\nblocked: \(blocked)")
+        case let .deletedMemberUser(u, groupInfo, member, withMessages): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)\nwithMessages: \(withMessages)")
+        case let .deletedMember(u, groupInfo, byMember, deletedMember, withMessages): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\ndeletedMember: \(deletedMember)\nwithMessages: \(withMessages)")
+        case let .leftMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
+        case let .groupDeleted(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
+        case let .userJoinedGroup(u, groupInfo): return withUser(u, String(describing: groupInfo))
+        case let .joinedGroupMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
+        case let .connectedToGroupMember(u, groupInfo, member, memberContact): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)\nmemberContact: \(String(describing: memberContact))")
+        case let .groupUpdated(u, toGroup): return withUser(u, String(describing: toGroup))
+        case let .newMemberContactReceivedInv(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
+        case let .rcvFileAccepted(u, chatItem): return withUser(u, String(describing: chatItem))
+        case .rcvFileAcceptedSndCancelled: return noDetails
+        case let .rcvFileStart(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .rcvFileProgressXFTP(u, chatItem, receivedSize, totalSize, _): return withUser(u, "chatItem: \(String(describing: chatItem))\nreceivedSize: \(receivedSize)\ntotalSize: \(totalSize)")
+        case let .rcvStandaloneFileComplete(u, targetPath, _): return withUser(u, targetPath)
+        case let .rcvFileComplete(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .rcvFileSndCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .rcvFileError(u, chatItem, agentError, _): return withUser(u, "agentError: \(String(describing: agentError))\nchatItem: \(String(describing: chatItem))")
+        case let .rcvFileWarning(u, chatItem, agentError, _): return withUser(u, "agentError: \(String(describing: agentError))\nchatItem: \(String(describing: chatItem))")
+        case let .sndFileStart(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileComplete(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileRcvCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileProgressXFTP(u, chatItem, _, sentSize, totalSize): return withUser(u, "chatItem: \(String(describing: chatItem))\nsentSize: \(sentSize)\ntotalSize: \(totalSize)")
+        case let .sndFileRedirectStartXFTP(u, _, redirectMeta): return withUser(u, String(describing: redirectMeta))
+        case let .sndFileCompleteXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndStandaloneFileComplete(u, _, rcvURIs): return withUser(u, String(rcvURIs.count))
+        case let .sndFileError(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
+        case let .sndFileWarning(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
+        case let .callInvitation(inv): return String(describing: inv)
+        case let .callOffer(u, contact, callType, offer, sharedKey, askConfirmation): return withUser(u, "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")\naskConfirmation: \(askConfirmation)\noffer: \(String(describing: offer))")
+        case let .callAnswer(u, contact, answer): return withUser(u, "contact: \(contact.id)\nanswer: \(String(describing: answer))")
+        case let .callExtraInfo(u, contact, extraInfo): return withUser(u, "contact: \(contact.id)\nextraInfo: \(String(describing: extraInfo))")
+        case let .callEnded(u, contact): return withUser(u, "contact: \(contact.id)")
+        case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
+        case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
+        case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
+        case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nsessionCode: \(sessionCode)"
+        case let .remoteCtrlConnected(remoteCtrl): return String(describing: remoteCtrl)
+        case let .remoteCtrlStopped(rcsState, rcStopReason): return "rcsState: \(String(describing: rcsState))\nrcStopReason: \(String(describing: rcStopReason))"
+        case let .contactPQEnabled(u, contact, pqEnabled): return withUser(u, "contact: \(String(describing: contact))\npqEnabled: \(pqEnabled)")
+        }
+    }    
+}
+
+struct NewUser: Encodable {
+    var profile: Profile?
+    var pastTimestamp: Bool
+}
+
+enum ChatPagination {
+    static let INITIAL_COUNT = 75
+    static let PRELOAD_COUNT = 100
+    static let UNTIL_PRELOAD_COUNT = 50
+
+    case last(count: Int)
+    case after(chatItemId: Int64, count: Int)
+    case before(chatItemId: Int64, count: Int)
+    case around(chatItemId: Int64, count: Int)
+    case initial(count: Int)
+
+    var cmdString: String {
+        switch self {
+        case let .last(count): return "count=\(count)"
+        case let .after(chatItemId, count): return "after=\(chatItemId) count=\(count)"
+        case let .before(chatItemId, count): return "before=\(chatItemId) count=\(count)"
+        case let .around(chatItemId, count): return "around=\(chatItemId) count=\(count)"
+        case let .initial(count): return "initial=\(count)"
+        }
+    }
+}
+
+enum ConnectionPlan: Decodable, Hashable {
+    case invitationLink(invitationLinkPlan: InvitationLinkPlan)
+    case contactAddress(contactAddressPlan: ContactAddressPlan)
+    case groupLink(groupLinkPlan: GroupLinkPlan)
+    case error(chatError: ChatError)
+}
+
+enum InvitationLinkPlan: Decodable, Hashable {
+    case ok
+    case ownLink
+    case connecting(contact_: Contact?)
+    case known(contact: Contact)
+}
+
+enum ContactAddressPlan: Decodable, Hashable {
+    case ok
+    case ownLink
+    case connectingConfirmReconnect
+    case connectingProhibit(contact: Contact)
+    case known(contact: Contact)
+    case contactViaAddress(contact: Contact)
+}
+
+enum GroupLinkPlan: Decodable, Hashable {
+    case ok
+    case ownLink(groupInfo: GroupInfo)
+    case connectingConfirmReconnect
+    case connectingProhibit(groupInfo_: GroupInfo?)
+    case known(groupInfo: GroupInfo)
+}
+
+struct ChatTagData: Encodable {
+    var emoji: String?
+    var text: String
+}
+
+struct UpdatedMessage: Encodable {
+    var msgContent: MsgContent
+    var mentions: [String: Int64]
+    
+    var cmdString: String {
+        "json \(encodeJSON(self))"
+    }
+}
+
+enum ChatDeleteMode: Codable {
+    case full(notify: Bool)
+    case entity(notify: Bool)
+    case messages
+
+    var cmdString: String {
+        switch self {
+        case let .full(notify): "full notify=\(onOff(notify))"
+        case let .entity(notify): "entity notify=\(onOff(notify))"
+        case .messages: "messages"
+        }
+    }
+
+    var isEntity: Bool {
+        switch self {
+        case .entity: return true
+        default: return false
+        }
+    }
+}
+
+enum NetworkStatus: Decodable, Equatable {
+    case unknown
+    case connected
+    case disconnected
+    case error(connectionError: String)
+
+    var statusString: LocalizedStringKey {
+        switch self {
+        case .connected: "connected"
+        case .error: "error"
+        default: "connecting"
+        }
+    }
+
+    var statusExplanation: LocalizedStringKey {
+        switch self {
+        case .connected: "You are connected to the server used to receive messages from this contact."
+        case let .error(err): "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+        default: "Trying to connect to the server used to receive messages from this contact."
+        }
+    }
+
+    var imageName: String {
+        switch self {
+        case .unknown: "circle.dotted"
+        case .connected: "circle.fill"
+        case .disconnected: "ellipsis.circle.fill"
+        case .error: "exclamationmark.circle.fill"
+        }
+    }
+}
+
+enum ForwardConfirmation: Decodable, Hashable {
+    case filesNotAccepted(fileIds: [Int64])
+    case filesInProgress(filesCount: Int)
+    case filesMissing(filesCount: Int)
+    case filesFailed(filesCount: Int)
+}
+
+struct ConnNetworkStatus: Decodable {
+    var agentConnId: String
+    var networkStatus: NetworkStatus
+}
+
+struct UserMsgReceiptSettings: Codable {
+    var enable: Bool
+    var clearOverrides: Bool
+}
+
+
+struct UserContactLink: Decodable, Hashable {
+    var connLinkContact: CreatedConnLink
+    var autoAccept: AutoAccept?
+
+    var responseDetails: String {
+        "connLinkContact: \(connLinkContact)\nautoAccept: \(AutoAccept.cmdString(autoAccept))"
+    }
+}
+
+struct AutoAccept: Codable, Hashable {
+    var businessAddress: Bool
+    var acceptIncognito: Bool
+    var autoReply: MsgContent?
+
+    static func cmdString(_ autoAccept: AutoAccept?) -> String {
+        guard let autoAccept = autoAccept else { return "off" }
+        var s = "on"
+        if autoAccept.acceptIncognito {
+            s += " incognito=on"
+        } else if autoAccept.businessAddress {
+            s += " business"
+        }
+        guard let msg = autoAccept.autoReply else { return s }
+        return s + " " + msg.cmdString
+    }
+}
+
+struct DeviceToken: Decodable {
+    var pushProvider: PushProvider
+    var token: String
+
+    var cmdString: String {
+        "\(pushProvider) \(token)"
+    }
+}
+
+enum PushEnvironment: String {
+    case development
+    case production
+}
+
+enum PushProvider: String, Decodable {
+    case apns_dev
+    case apns_prod
+
+    init(env: PushEnvironment) {
+        switch env {
+        case .development: self = .apns_dev
+        case .production: self = .apns_prod
+        }
+    }
+}
+
+// This notification mode is for app core, UI uses AppNotificationsMode.off to mean completely disable,
+// and .local for periodic background checks
+enum NotificationsMode: String, Decodable, SelectableItem {
+    case off = "OFF"
+    case periodic = "PERIODIC"
+    case instant = "INSTANT"
+
+    var label: LocalizedStringKey {
+        switch self {
+        case .off: "No push server"
+        case .periodic: "Periodic"
+        case .instant: "Instant"
+        }
+    }
+
+    var icon: String {
+        switch self {
+        case .off: return "arrow.clockwise"
+        case .periodic: return "timer"
+        case .instant: return "bolt"
+        }
+    }
+
+    var id: String { self.rawValue }
+
+    static var values: [NotificationsMode] = [.instant, .periodic, .off]
+}
+
+struct RemoteCtrlInfo: Decodable {
+    var remoteCtrlId: Int64
+    var ctrlDeviceName: String
+    var sessionState: RemoteCtrlSessionState?
+
+    var deviceViewName: String {
+        ctrlDeviceName == "" ? "\(remoteCtrlId)" : ctrlDeviceName
+    }
+}
+
+enum RemoteCtrlSessionState: Decodable {
+    case starting
+    case searching
+    case connecting
+    case pendingConfirmation(sessionCode: String)
+    case connected(sessionCode: String)
+}
+
+enum RemoteCtrlStopReason: Decodable {
+    case discoveryFailed(chatError: ChatError)
+    case connectionFailed(chatError: ChatError)
+    case setupFailed(chatError: ChatError)
+    case disconnected
+}
+
+struct CtrlAppInfo: Decodable {
+    var appVersionRange: AppVersionRange
+    var deviceName: String
+}
+
+struct AppVersionRange: Decodable {
+    var minVersion: String
+    var maxVersion: String
+}
+
+struct CoreVersionInfo: Decodable {
+    var version: String
+    var simplexmqVersion: String
+    var simplexmqCommit: String
+}
+
+struct ArchiveConfig: Encodable {
+    var archivePath: String
+    var disableCompression: Bool?
+}
+
+struct DBEncryptionConfig: Codable {
+    var currentKey: String
+    var newKey: String
+}
+
+enum OperatorTag: String, Codable {
+    case simplex = "simplex"
+    case flux = "flux"
+}
+
+struct ServerOperatorInfo {
+    var description: [String]
+    var website: URL
+    var selfhost: (text: String, link: URL)? = nil
+    var logo: String
+    var largeLogo: String
+    var logoDarkMode: String
+    var largeLogoDarkMode: String
+}
+
+let operatorsInfo: Dictionary<OperatorTag, ServerOperatorInfo> = [
+    .simplex: ServerOperatorInfo(
+        description: [
+            "SimpleX Chat is the first communication network that has no user profile IDs of any kind, not even random numbers or identity keys.",
+            "SimpleX Chat Ltd develops the communication software for SimpleX network."
+        ],
+        website: URL(string: "https://simplex.chat")!,
+        logo: "decentralized",
+        largeLogo: "logo",
+        logoDarkMode: "decentralized-light",
+        largeLogoDarkMode: "logo-light"
+    ),
+    .flux: ServerOperatorInfo(
+        description: [
+            "Flux is the largest decentralized cloud, based on a global network of user-operated nodes.",
+            "Flux offers a powerful, scalable, and affordable cutting edge technology platform for all.",
+            "Flux operates servers in SimpleX network to improve its privacy and decentralization."
+        ],
+        website: URL(string: "https://runonflux.com")!,
+        selfhost: (text: "Self-host SimpleX servers on Flux", link: URL(string: "https://home.runonflux.io/apps/marketplace?q=simplex")!),
+        logo: "flux_logo_symbol",
+        largeLogo: "flux_logo",
+        logoDarkMode: "flux_logo_symbol",
+        largeLogoDarkMode: "flux_logo-light"
+    ),
+]
+
+struct UsageConditions: Decodable {
+    var conditionsId: Int64
+    var conditionsCommit: String
+    var notifiedAt: Date?
+    var createdAt: Date
+
+    static var sampleData = UsageConditions(
+        conditionsId: 1,
+        conditionsCommit: "11a44dc1fd461a93079f897048b46998db55da5c",
+        notifiedAt: nil,
+        createdAt: Date.now
+    )
+}
+
+enum UsageConditionsAction: Decodable {
+    case review(operators: [ServerOperator], deadline: Date?, showNotice: Bool)
+    case accepted(operators: [ServerOperator])
+
+    var showNotice: Bool {
+        switch self {
+        case let .review(_, _, showNotice): showNotice
+        case .accepted: false
+        }
+    }
+}
+
+struct ServerOperatorConditions: Decodable {
+    var serverOperators: [ServerOperator]
+    var currentConditions: UsageConditions
+    var conditionsAction: UsageConditionsAction?
+
+    static var empty = ServerOperatorConditions(
+        serverOperators: [],
+        currentConditions: UsageConditions(conditionsId: 0, conditionsCommit: "empty", notifiedAt: nil, createdAt: .now),
+        conditionsAction: nil
+    )
+}
+
+enum ConditionsAcceptance: Equatable, Codable, Hashable {
+    case accepted(acceptedAt: Date?, autoAccepted: Bool)
+    // If deadline is present, it means there's a grace period to review and accept conditions during which user can continue to use the operator.
+    // No deadline indicates it's required to accept conditions for the operator to start using it.
+    case required(deadline: Date?)
+
+    var conditionsAccepted: Bool {
+        switch self {
+        case .accepted: true
+        case .required: false
+        }
+    }
+
+    var usageAllowed: Bool {
+        switch self {
+        case .accepted: true
+        case let .required(deadline): deadline != nil
+        }
+    }
+}
+
+struct ServerOperator: Identifiable, Equatable, Codable {
+    var operatorId: Int64
+    var operatorTag: OperatorTag?
+    var tradeName: String
+    var legalName: String?
+    var serverDomains: [String]
+    var conditionsAcceptance: ConditionsAcceptance
+    var enabled: Bool
+    var smpRoles: ServerRoles
+    var xftpRoles: ServerRoles
+
+    var id: Int64 { operatorId }
+
+    static func == (l: ServerOperator, r: ServerOperator) -> Bool {
+        l.operatorId == r.operatorId && l.operatorTag == r.operatorTag && l.tradeName == r.tradeName && l.legalName == r.legalName &&
+        l.serverDomains == r.serverDomains && l.conditionsAcceptance == r.conditionsAcceptance && l.enabled == r.enabled &&
+        l.smpRoles == r.smpRoles && l.xftpRoles == r.xftpRoles
+    }
+
+    var legalName_: String {
+        legalName ?? tradeName
+    }
+
+    var info: ServerOperatorInfo {
+        return if let operatorTag = operatorTag {
+            operatorsInfo[operatorTag] ?? ServerOperator.dummyOperatorInfo
+        } else {
+            ServerOperator.dummyOperatorInfo
+        }
+    }
+
+    static let dummyOperatorInfo = ServerOperatorInfo(
+        description: ["Default"],
+        website: URL(string: "https://simplex.chat")!,
+        logo: "decentralized",
+        largeLogo: "logo",
+        logoDarkMode: "decentralized-light",
+        largeLogoDarkMode: "logo-light"
+    )
+
+    func logo(_ colorScheme: ColorScheme) -> String {
+        colorScheme == .light ? info.logo : info.logoDarkMode
+    }
+
+    func largeLogo(_ colorScheme: ColorScheme) -> String {
+        colorScheme == .light ? info.largeLogo : info.largeLogoDarkMode
+    }
+
+    static var sampleData1 = ServerOperator(
+        operatorId: 1,
+        operatorTag: .simplex,
+        tradeName: "SimpleX Chat",
+        legalName: "SimpleX Chat Ltd",
+        serverDomains: ["simplex.im"],
+        conditionsAcceptance: .accepted(acceptedAt: nil, autoAccepted: false),
+        enabled: true,
+        smpRoles: ServerRoles(storage: true, proxy: true),
+        xftpRoles: ServerRoles(storage: true, proxy: true)
+    )
+}
+
+struct ServerRoles: Equatable, Codable {
+    var storage: Bool
+    var proxy: Bool
+}
+
+struct UserOperatorServers: Identifiable, Equatable, Codable {
+    var `operator`: ServerOperator?
+    var smpServers: [UserServer]
+    var xftpServers: [UserServer]
+
+    var id: String {
+        if let op = self.operator {
+            "\(op.operatorId)"
+        } else {
+            "nil operator"
+        }
+    }
+
+    var operator_: ServerOperator {
+        get {
+            self.operator ?? ServerOperator(
+                operatorId: 0,
+                operatorTag: nil,
+                tradeName: "",
+                legalName: "",
+                serverDomains: [],
+                conditionsAcceptance: .accepted(acceptedAt: nil, autoAccepted: false),
+                enabled: false,
+                smpRoles: ServerRoles(storage: true, proxy: true),
+                xftpRoles: ServerRoles(storage: true, proxy: true)
+            )
+        }
+        set { `operator` = newValue }
+    }
+
+    static var sampleData1 = UserOperatorServers(
+        operator: ServerOperator.sampleData1,
+        smpServers: [UserServer.sampleData.preset],
+        xftpServers: [UserServer.sampleData.xftpPreset]
+    )
+
+    static var sampleDataNilOperator = UserOperatorServers(
+        operator: nil,
+        smpServers: [UserServer.sampleData.preset],
+        xftpServers: [UserServer.sampleData.xftpPreset]
+    )
+}
+
+enum UserServersError: Decodable {
+    case noServers(protocol: ServerProtocol, user: UserRef?)
+    case storageMissing(protocol: ServerProtocol, user: UserRef?)
+    case proxyMissing(protocol: ServerProtocol, user: UserRef?)
+    case duplicateServer(protocol: ServerProtocol, duplicateServer: String, duplicateHost: String)
+
+    var globalError: String? {
+        switch self {
+        case let .noServers(`protocol`, _):
+            switch `protocol` {
+            case .smp: return globalSMPError
+            case .xftp: return globalXFTPError
+            }
+        case let .storageMissing(`protocol`, _):
+            switch `protocol` {
+            case .smp: return globalSMPError
+            case .xftp: return globalXFTPError
+            }
+        case let .proxyMissing(`protocol`, _):
+            switch `protocol` {
+            case .smp: return globalSMPError
+            case .xftp: return globalXFTPError
+            }
+        default: return nil
+        }
+    }
+
+    var globalSMPError: String? {
+        switch self {
+        case let .noServers(.smp, user):
+            let text = NSLocalizedString("No message servers.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        case let .storageMissing(.smp, user):
+            let text = NSLocalizedString("No servers to receive messages.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        case let .proxyMissing(.smp, user):
+            let text = NSLocalizedString("No servers for private message routing.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        default:
+            return nil
+        }
+    }
+
+    var globalXFTPError: String? {
+        switch self {
+        case let .noServers(.xftp, user):
+            let text = NSLocalizedString("No media & file servers.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        case let .storageMissing(.xftp, user):
+            let text = NSLocalizedString("No servers to send files.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        case let .proxyMissing(.xftp, user):
+            let text = NSLocalizedString("No servers to receive files.", comment: "servers error")
+            if let user = user {
+                return userStr(user) + " " + text
+            } else {
+                return text
+            }
+        default:
+            return nil
+        }
+    }
+
+    private func userStr(_ user: UserRef) -> String {
+        String.localizedStringWithFormat(NSLocalizedString("For chat profile %@:", comment: "servers error"), user.localDisplayName)
+    }
+}
+
+struct UserServer: Identifiable, Equatable, Codable, Hashable {
+    var serverId: Int64?
+    var server: String
+    var preset: Bool
+    var tested: Bool?
+    var enabled: Bool
+    var deleted: Bool
+    var createdAt = Date()
+
+    static func == (l: UserServer, r: UserServer) -> Bool {
+        l.serverId == r.serverId && l.server == r.server && l.preset == r.preset && l.tested == r.tested &&
+        l.enabled == r.enabled && l.deleted == r.deleted
+    }
+
+    var id: String { "\(server) \(createdAt)" }
+
+    static var empty = UserServer(serverId: nil, server: "", preset: false, tested: nil, enabled: false, deleted: false)
+
+    var isEmpty: Bool {
+        server.trimmingCharacters(in: .whitespaces) == ""
+    }
+
+    struct SampleData {
+        var preset: UserServer
+        var custom: UserServer
+        var untested: UserServer
+        var xftpPreset: UserServer
+    }
+
+    static var sampleData = SampleData(
+        preset: UserServer(
+            serverId: 1,
+            server: "smp://abcd@smp8.simplex.im",
+            preset: true,
+            tested: true,
+            enabled: true,
+            deleted: false
+        ),
+        custom: UserServer(
+            serverId: 2,
+            server: "smp://abcd@smp9.simplex.im",
+            preset: false,
+            tested: false,
+            enabled: false,
+            deleted: false
+        ),
+        untested: UserServer(
+            serverId: 3,
+            server: "smp://abcd@smp10.simplex.im",
+            preset: false,
+            tested: nil,
+            enabled: true,
+            deleted: false
+        ),
+        xftpPreset: UserServer(
+            serverId: 4,
+            server: "xftp://abcd@xftp8.simplex.im",
+            preset: true,
+            tested: true,
+            enabled: true,
+            deleted: false
+        )
+    )
+
+    enum CodingKeys: CodingKey {
+        case serverId
+        case server
+        case preset
+        case tested
+        case enabled
+        case deleted
+    }
+}
+
+enum ProtocolTestStep: String, Decodable, Equatable {
+    case connect
+    case disconnect
+    case createQueue
+    case secureQueue
+    case deleteQueue
+    case createFile
+    case uploadFile
+    case downloadFile
+    case compareFile
+    case deleteFile
+
+    var text: String {
+        switch self {
+        case .connect: return NSLocalizedString("Connect", comment: "server test step")
+        case .disconnect: return NSLocalizedString("Disconnect", comment: "server test step")
+        case .createQueue: return NSLocalizedString("Create queue", comment: "server test step")
+        case .secureQueue: return NSLocalizedString("Secure queue", comment: "server test step")
+        case .deleteQueue: return NSLocalizedString("Delete queue", comment: "server test step")
+        case .createFile: return NSLocalizedString("Create file", comment: "server test step")
+        case .uploadFile: return NSLocalizedString("Upload file", comment: "server test step")
+        case .downloadFile: return NSLocalizedString("Download file", comment: "server test step")
+        case .compareFile: return NSLocalizedString("Compare file", comment: "server test step")
+        case .deleteFile: return NSLocalizedString("Delete file", comment: "server test step")
+        }
+    }
+}
+
+struct ProtocolTestFailure: Decodable, Error, Equatable {
+    var testStep: ProtocolTestStep
+    var testError: AgentErrorType
+
+    static func == (l: ProtocolTestFailure, r: ProtocolTestFailure) -> Bool {
+        l.testStep == r.testStep
+    }
+
+    var localizedDescription: String {
+        let err = String.localizedStringWithFormat(NSLocalizedString("Test failed at step %@.", comment: "server test failure"), testStep.text)
+        switch testError {
+        case .SMP(_, .AUTH):
+            return err + " " + NSLocalizedString("Server requires authorization to create queues, check password", comment: "server test error")
+        case .XFTP(.AUTH):
+            return err + " " + NSLocalizedString("Server requires authorization to upload, check password", comment: "server test error")
+        case .BROKER(_, .NETWORK):
+            return err + " " + NSLocalizedString("Possibly, certificate fingerprint in server address is incorrect", comment: "server test error")
+        default:
+            return err
+        }
+    }
+}
+
+struct MigrationFileLinkData: Codable {
+    let networkConfig: NetworkConfig?
+
+    struct NetworkConfig: Codable {
+        let socksProxy: String?
+        let networkProxy: NetworkProxy?
+        let hostMode: HostMode?
+        let requiredHostMode: Bool?
+
+        func transformToPlatformSupported() -> NetworkConfig {
+            return if let hostMode, let requiredHostMode {
+                NetworkConfig(
+                    socksProxy: nil,
+                    networkProxy: nil,
+                    hostMode: hostMode == .onionViaSocks ? .onionHost : hostMode,
+                    requiredHostMode: requiredHostMode
+                )
+            } else { self }
+        }
+    }
+
+    func addToLink(link: String) -> String {
+        "\(link)&data=\(encodeJSON(self).addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!)"
+    }
+
+    static func readFromLink(link: String) -> MigrationFileLinkData? {
+//        standaloneFileInfo(link)
+        nil
+    }
+}
+
+struct AppSettings: Codable, Equatable {
+    var networkConfig: NetCfg? = nil
+    var networkProxy: NetworkProxy? = nil
+    var privacyEncryptLocalFiles: Bool? = nil
+    var privacyAskToApproveRelays: Bool? = nil
+    var privacyAcceptImages: Bool? = nil
+    var privacyLinkPreviews: Bool? = nil
+    var privacyShowChatPreviews: Bool? = nil
+    var privacySaveLastDraft: Bool? = nil
+    var privacyProtectScreen: Bool? = nil
+    var privacyMediaBlurRadius: Int? = nil
+    var notificationMode: AppSettingsNotificationMode? = nil
+    var notificationPreviewMode: NotificationPreviewMode? = nil
+    var webrtcPolicyRelay: Bool? = nil
+    var webrtcICEServers: [String]? = nil
+    var confirmRemoteSessions: Bool? = nil
+    var connectRemoteViaMulticast: Bool? = nil
+    var connectRemoteViaMulticastAuto: Bool? = nil
+    var developerTools: Bool? = nil
+    var confirmDBUpgrades: Bool? = nil
+    var androidCallOnLockScreen: AppSettingsLockScreenCalls? = nil
+    var iosCallKitEnabled: Bool? = nil
+    var iosCallKitCallsInRecents: Bool? = nil
+    var uiProfileImageCornerRadius: Double? = nil
+    var uiChatItemRoundness: Double? = nil
+    var uiChatItemTail: Bool? = nil
+    var uiColorScheme: String? = nil
+    var uiDarkColorScheme: String? = nil
+    var uiCurrentThemeIds: [String: String]? = nil
+    var uiThemes: [ThemeOverrides]? = nil
+    var oneHandUI: Bool? = nil
+    var chatBottomBar: Bool? = nil
+
+    func prepareForExport() -> AppSettings {
+        var empty = AppSettings()
+        let def = AppSettings.defaults
+        if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
+        if networkProxy != def.networkProxy { empty.networkProxy = networkProxy }
+        if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
+        if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
+        if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
+        if privacyLinkPreviews != def.privacyLinkPreviews { empty.privacyLinkPreviews = privacyLinkPreviews }
+        if privacyShowChatPreviews != def.privacyShowChatPreviews { empty.privacyShowChatPreviews = privacyShowChatPreviews }
+        if privacySaveLastDraft != def.privacySaveLastDraft { empty.privacySaveLastDraft = privacySaveLastDraft }
+        if privacyProtectScreen != def.privacyProtectScreen { empty.privacyProtectScreen = privacyProtectScreen }
+        if privacyMediaBlurRadius != def.privacyMediaBlurRadius { empty.privacyMediaBlurRadius = privacyMediaBlurRadius }
+        if notificationMode != def.notificationMode { empty.notificationMode = notificationMode }
+        if notificationPreviewMode != def.notificationPreviewMode { empty.notificationPreviewMode = notificationPreviewMode }
+        if webrtcPolicyRelay != def.webrtcPolicyRelay { empty.webrtcPolicyRelay = webrtcPolicyRelay }
+        if webrtcICEServers != def.webrtcICEServers { empty.webrtcICEServers = webrtcICEServers }
+        if confirmRemoteSessions != def.confirmRemoteSessions { empty.confirmRemoteSessions = confirmRemoteSessions }
+        if connectRemoteViaMulticast != def.connectRemoteViaMulticast {empty.connectRemoteViaMulticast = connectRemoteViaMulticast }
+        if connectRemoteViaMulticastAuto != def.connectRemoteViaMulticastAuto { empty.connectRemoteViaMulticastAuto = connectRemoteViaMulticastAuto }
+        if developerTools != def.developerTools { empty.developerTools = developerTools }
+        if confirmDBUpgrades != def.confirmDBUpgrades { empty.confirmDBUpgrades = confirmDBUpgrades }
+        if androidCallOnLockScreen != def.androidCallOnLockScreen { empty.androidCallOnLockScreen = androidCallOnLockScreen }
+        if iosCallKitEnabled != def.iosCallKitEnabled { empty.iosCallKitEnabled = iosCallKitEnabled }
+        if iosCallKitCallsInRecents != def.iosCallKitCallsInRecents { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
+        if uiProfileImageCornerRadius != def.uiProfileImageCornerRadius { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
+        if uiChatItemRoundness != def.uiChatItemRoundness { empty.uiChatItemRoundness = uiChatItemRoundness }
+        if uiChatItemTail != def.uiChatItemTail { empty.uiChatItemTail = uiChatItemTail }
+        if uiColorScheme != def.uiColorScheme { empty.uiColorScheme = uiColorScheme }
+        if uiDarkColorScheme != def.uiDarkColorScheme { empty.uiDarkColorScheme = uiDarkColorScheme }
+        if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
+        if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
+        if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
+        if chatBottomBar != def.chatBottomBar { empty.chatBottomBar = chatBottomBar }
+        return empty
+    }
+
+    static var defaults: AppSettings {
+        AppSettings (
+            networkConfig: NetCfg.defaults,
+            networkProxy: NetworkProxy.def,
+            privacyEncryptLocalFiles: true,
+            privacyAskToApproveRelays: true,
+            privacyAcceptImages: true,
+            privacyLinkPreviews: true,
+            privacyShowChatPreviews: true,
+            privacySaveLastDraft: true,
+            privacyProtectScreen: false,
+            privacyMediaBlurRadius: 0,
+            notificationMode: AppSettingsNotificationMode.instant,
+            notificationPreviewMode: NotificationPreviewMode.message,
+            webrtcPolicyRelay: true,
+            webrtcICEServers: [],
+            confirmRemoteSessions: false,
+            connectRemoteViaMulticast: true,
+            connectRemoteViaMulticastAuto: true,
+            developerTools: false,
+            confirmDBUpgrades: false,
+            androidCallOnLockScreen: AppSettingsLockScreenCalls.show,
+            iosCallKitEnabled: true,
+            iosCallKitCallsInRecents: false,
+            uiProfileImageCornerRadius: 22.5,
+            uiChatItemRoundness: 0.75,
+            uiChatItemTail: true,
+            uiColorScheme: DefaultTheme.SYSTEM_THEME_NAME,
+            uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
+            uiCurrentThemeIds: nil as [String: String]?,
+            uiThemes: nil as [ThemeOverrides]?,
+            oneHandUI: true,
+            chatBottomBar: true
+        )
+    }
+}
+
+enum AppSettingsNotificationMode: String, Codable {
+    case off
+    case periodic
+    case instant
+
+    func toNotificationsMode() -> NotificationsMode {
+        switch self {
+        case .instant: .instant
+        case .periodic: .periodic
+        case .off: .off
+        }
+    }
+
+    static func from(_ mode: NotificationsMode) -> AppSettingsNotificationMode {
+        switch mode {
+        case .instant: .instant
+        case .periodic: .periodic
+        case .off: .off
+        }
+    }
+}
+
+//enum NotificationPreviewMode: Codable {
+//    case hidden
+//    case contact
+//    case message
+//}
+
+enum AppSettingsLockScreenCalls: String, Codable {
+    case disable
+    case show
+    case accept
+}
+
+struct UserNetworkInfo: Codable, Equatable {
+    let networkType: UserNetworkType
+    let online: Bool
+}
+
+enum UserNetworkType: String, Codable {
+    case none
+    case cellular
+    case wifi
+    case ethernet
+    case other
+
+    var text: LocalizedStringKey {
+        switch self {
+        case .none: "No network connection"
+        case .cellular: "Cellular"
+        case .wifi: "WiFi"
+        case .ethernet: "Wired ethernet"
+        case .other: "Other"
+        }
+    }
+}
+
+struct RcvMsgInfo: Codable {
+    var msgId: Int64
+    var msgDeliveryId: Int64
+    var msgDeliveryStatus: String
+    var agentMsgId: Int64
+    var agentMsgMeta: String
+}
+
+struct ServerQueueInfo: Codable {
+    var server: String
+    var rcvId: String
+    var sndId: String
+    var ntfId: String?
+    var status: String
+    var info: QueueInfo
+}
+
+struct QueueInfo: Codable {
+    var qiSnd: Bool
+    var qiNtf: Bool
+    var qiSub: QSub?
+    var qiSize: Int
+    var qiMsg: MsgInfo?
+}
+
+struct QSub: Codable {
+    var qSubThread: QSubThread
+    var qDelivered: String?
+}
+
+enum QSubThread: String, Codable {
+    case noSub
+    case subPending
+    case subThread
+    case prohibitSub
+}
+
+struct MsgInfo: Codable {
+    var msgId: String
+    var msgTs: Date
+    var msgType: MsgType
+}
+
+enum MsgType: String, Codable {
+    case message
+    case quota
+}
+
+struct PresentedServersSummary: Codable {
+    var statsStartedAt: Date
+    var allUsersSMP: SMPServersSummary
+    var allUsersXFTP: XFTPServersSummary
+    var currentUserSMP: SMPServersSummary
+    var currentUserXFTP: XFTPServersSummary
+}
+
+struct SMPServersSummary: Codable {
+    var smpTotals: SMPTotals
+    var currentlyUsedSMPServers: [SMPServerSummary]
+    var previouslyUsedSMPServers: [SMPServerSummary]
+    var onlyProxiedSMPServers: [SMPServerSummary]
+}
+
+struct SMPTotals: Codable {
+    var sessions: ServerSessions
+    var subs: SMPServerSubs
+    var stats: AgentSMPServerStatsData
+}
+
+struct SMPServerSummary: Codable, Identifiable {
+    var smpServer: String
+    var known: Bool?
+    var sessions: ServerSessions?
+    var subs: SMPServerSubs?
+    var stats: AgentSMPServerStatsData?
+
+    var id: String { smpServer }
+
+    var hasSubs: Bool { subs != nil }
+
+    var sessionsOrNew: ServerSessions { sessions ?? ServerSessions.newServerSessions }
+
+    var subsOrNew: SMPServerSubs { subs ?? SMPServerSubs.newSMPServerSubs }
+}
+
+struct ServerSessions: Codable {
+    var ssConnected: Int
+    var ssErrors: Int
+    var ssConnecting: Int
+
+    static var newServerSessions = ServerSessions(
+        ssConnected: 0,
+        ssErrors: 0,
+        ssConnecting: 0
+    )
+
+    var hasSess: Bool { ssConnected > 0 }
+}
+
+struct SMPServerSubs: Codable {
+    var ssActive: Int
+    var ssPending: Int
+
+    static var newSMPServerSubs = SMPServerSubs(
+        ssActive: 0,
+        ssPending: 0
+    )
+
+    var total: Int { ssActive + ssPending }
+
+    var shareOfActive: Double {
+        guard total != 0 else { return 0.0 }
+        return Double(ssActive) / Double(total)
+    }
+}
+
+struct AgentSMPServerStatsData: Codable {
+    var _sentDirect: Int
+    var _sentViaProxy: Int
+    var _sentProxied: Int
+    var _sentDirectAttempts: Int
+    var _sentViaProxyAttempts: Int
+    var _sentProxiedAttempts: Int
+    var _sentAuthErrs: Int
+    var _sentQuotaErrs: Int
+    var _sentExpiredErrs: Int
+    var _sentOtherErrs: Int
+    var _recvMsgs: Int
+    var _recvDuplicates: Int
+    var _recvCryptoErrs: Int
+    var _recvErrs: Int
+    var _ackMsgs: Int
+    var _ackAttempts: Int
+    var _ackNoMsgErrs: Int
+    var _ackOtherErrs: Int
+    var _connCreated: Int
+    var _connSecured: Int
+    var _connCompleted: Int
+    var _connDeleted: Int
+    var _connDelAttempts: Int
+    var _connDelErrs: Int
+    var _connSubscribed: Int
+    var _connSubAttempts: Int
+    var _connSubIgnored: Int
+    var _connSubErrs: Int
+    var _ntfKey: Int
+    var _ntfKeyAttempts: Int
+    var _ntfKeyDeleted: Int
+    var _ntfKeyDeleteAttempts: Int
+}
+
+struct XFTPServersSummary: Codable {
+    var xftpTotals: XFTPTotals
+    var currentlyUsedXFTPServers: [XFTPServerSummary]
+    var previouslyUsedXFTPServers: [XFTPServerSummary]
+}
+
+struct XFTPTotals: Codable {
+    var sessions: ServerSessions
+    var stats: AgentXFTPServerStatsData
+}
+
+struct XFTPServerSummary: Codable, Identifiable {
+    var xftpServer: String
+    var known: Bool?
+    var sessions: ServerSessions?
+    var stats: AgentXFTPServerStatsData?
+    var rcvInProgress: Bool
+    var sndInProgress: Bool
+    var delInProgress: Bool
+
+    var id: String { xftpServer }
+}
+
+struct AgentXFTPServerStatsData: Codable {
+    var _uploads: Int
+    var _uploadsSize: Int64
+    var _uploadAttempts: Int
+    var _uploadErrs: Int
+    var _downloads: Int
+    var _downloadsSize: Int64
+    var _downloadAttempts: Int
+    var _downloadAuthErrs: Int
+    var _downloadErrs: Int
+    var _deletions: Int
+    var _deleteAttempts: Int
+    var _deleteErrs: Int
+}
+
+struct AgentNtfServerStatsData: Codable {
+    var _ntfCreated: Int
+    var _ntfCreateAttempts: Int
+    var _ntfChecked: Int
+    var _ntfCheckAttempts: Int
+    var _ntfDeleted: Int
+    var _ntfDelAttempts: Int
+}
diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift
index 95cebcde10..f8cb022095 100644
--- a/apps/ios/Shared/Model/ChatModel.swift
+++ b/apps/ios/Shared/Model/ChatModel.swift
@@ -30,9 +30,18 @@ actor TerminalItems {
         }
     }
 
-    func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
+    func addCommand<R: ChatAPIResult>(_ start: Date, _ cmd: ChatCommand, _ res: APIResult<R>) async {
         await add(.cmd(start, cmd))
-        await add(.resp(.now, resp))
+        await addResult(res)
+    }
+    
+    func addResult<R: ChatAPIResult>(_ res: APIResult<R>) async {
+        let item: TerminalItem = switch res {
+        case let .result(r): .res(.now, r)
+        case let .error(e): .err(.now, e)
+        case let .invalid(type, json): .bad(.now, type, json)
+        }
+        await add(item)
     }
 }
 
@@ -43,8 +52,26 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
     items.append(item)
 }
 
+// analogue for SecondaryContextFilter in Kotlin
+enum SecondaryItemsModelFilter {
+    case groupChatScopeContext(groupScopeInfo: GroupChatScopeInfo)
+    case msgContentTagContext(contentTag: MsgContentTag)
+
+    func descr() -> String {
+        switch self {
+        case let .groupChatScopeContext(groupScopeInfo):
+            return "groupChatScopeContext \(groupScopeInfo.toChatScope())"
+        case let .msgContentTagContext(contentTag):
+            return "msgContentTagContext \(contentTag.rawValue)"
+        }
+    }
+}
+
+// analogue for ChatsContext in Kotlin
 class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
+    static let shared = ItemsModel(secondaryIMFilter: nil)
+    public var secondaryIMFilter: SecondaryItemsModelFilter?
+    public var preloadState = PreloadState()
     private let publisher = ObservableObjectPublisher()
     private var bag = Set<AnyCancellable>()
     var reversedChatItems: [ChatItem] = [] {
@@ -53,51 +80,103 @@ class ItemsModel: ObservableObject {
     var itemAdded = false {
         willSet { publisher.send() }
     }
-    
+
+    let chatState = ActiveChatState()
+
     // Publishes directly to `objectWillChange` publisher,
     // this will cause reversedChatItems to be rendered without throttling
     @Published var isLoading = false
-    @Published var showLoadingProgress = false
+    @Published var showLoadingProgress: ChatId? = nil
 
-    init() {
+    private var navigationTimeoutTask: Task<Void, Never>? = nil
+    private var loadChatTask: Task<Void, Never>? = nil
+
+    var lastItemsLoaded: Bool {
+        chatState.splits.isEmpty || chatState.splits.first != reversedChatItems.first?.id
+    }
+
+    init(secondaryIMFilter: SecondaryItemsModelFilter? = nil) {
+        self.secondaryIMFilter = secondaryIMFilter
         publisher
             .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
             .sink { self.objectWillChange.send() }
             .store(in: &bag)
     }
 
+    static func loadSecondaryChat(_ chatId: ChatId, chatFilter: SecondaryItemsModelFilter, willNavigate: @escaping () -> Void = {}) {
+        let im = ItemsModel(secondaryIMFilter: chatFilter)
+        ChatModel.shared.secondaryIM = im
+        im.loadOpenChat(chatId, willNavigate: willNavigate)
+    }
+
     func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
+        navigationTimeoutTask?.cancel()
+        loadChatTask?.cancel()
+        navigationTimeoutTask = Task {
             do {
                 try await Task.sleep(nanoseconds: 250_000000)
                 await MainActor.run {
-                    willNavigate()
                     ChatModel.shared.chatId = chatId
+                    willNavigate()
                 }
             } catch {}
         }
-        let progressTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 1500_000000)
-                await MainActor.run { showLoadingProgress = true }
-            } catch {}
-        }
-        Task {
-            if let chat = ChatModel.shared.getChat(chatId) {
-                await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
+        loadChatTask = Task {
+            await MainActor.run { self.isLoading = true }
+//            try? await Task.sleep(nanoseconds: 1000_000000)
+            await loadChat(chatId: chatId, im: self)
+            if !Task.isCancelled {
                 await MainActor.run {
                     self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
+                    self.showLoadingProgress = nil
                 }
             }
         }
     }
+
+    func loadOpenChatNoWait(_ chatId: ChatId, _ openAroundItemId: ChatItem.ID? = nil) {
+        navigationTimeoutTask?.cancel()
+        loadChatTask?.cancel()
+        loadChatTask = Task {
+            //            try? await Task.sleep(nanoseconds: 1000_000000)
+            await loadChat(chatId: chatId, im: self, openAroundItemId: openAroundItemId, clearItems: openAroundItemId == nil)
+            if !Task.isCancelled {
+                await MainActor.run {
+                    if openAroundItemId == nil {
+                        ChatModel.shared.chatId = chatId
+                    }
+                }
+            }
+        }
+    }
+
+    public var contentTag: MsgContentTag? {
+        switch secondaryIMFilter {
+        case nil: nil
+        case .groupChatScopeContext: nil
+        case let .msgContentTagContext(contentTag): contentTag
+        }
+    }
+
+    public var groupScopeInfo: GroupChatScopeInfo? {
+        switch secondaryIMFilter {
+        case nil: nil
+        case let .groupChatScopeContext(scopeInfo): scopeInfo
+        case .msgContentTagContext: nil
+        }
+    }
+}
+
+class PreloadState {
+    var prevFirstVisible: Int64 = Int64.min
+    var prevItemsCount: Int = 0
+    var preloading: Bool = false
+
+    func clear() {
+        prevFirstVisible = Int64.min
+        prevItemsCount = 0
+        preloading = false
+    }
 }
 
 class ChatTagsModel: ObservableObject {
@@ -124,11 +203,9 @@ class ChatTagsModel: ObservableObject {
                 }
             }
         }
-        if case let .presetTag(tag) = tm.activeFilter, (newPresetTags[tag] ?? 0) == 0 {
-            activeFilter = nil
-        }
         presetTags = newPresetTags
         unreadTags = newUnreadTags
+        clearActiveChatFilterIfNeeded()
     }
 
     func updateChatFavorite(favorite: Bool, wasFavorite: Bool) {
@@ -137,9 +214,7 @@ class ChatTagsModel: ObservableObject {
             presetTags[.favorites] = (count ?? 0) + 1
         } else if !favorite && wasFavorite, let count {
             presetTags[.favorites] = max(0, count - 1)
-            if case .presetTag(.favorites) = activeFilter, (presetTags[.favorites] ?? 0) == 0 {
-                activeFilter = nil
-            }
+            clearActiveChatFilterIfNeeded()
         }
     }
 
@@ -163,6 +238,7 @@ class ChatTagsModel: ObservableObject {
                 }
             }
         }
+        clearActiveChatFilterIfNeeded()
     }
     
     func markChatTagRead(_ chat: Chat) -> Void {
@@ -193,7 +269,17 @@ class ChatTagsModel: ObservableObject {
 
     func changeGroupReportsTag(_ by: Int = 0) {
         if by == 0 { return }
-        presetTags[.groupReports] = (presetTags[.groupReports] ?? 0) + by
+        presetTags[.groupReports] = max(0, (presetTags[.groupReports] ?? 0) + by)
+        clearActiveChatFilterIfNeeded()
+    }
+
+    func clearActiveChatFilterIfNeeded() {
+        let clear = switch activeFilter {
+        case let .presetTag(tag): (presetTags[tag] ?? 0) == 0
+        case let .userTag(tag): !userTags.contains(tag)
+        case .unread, nil: false
+        }
+        if clear { activeFilter = nil }
     }
 }
 
@@ -253,7 +339,7 @@ final class ChatModel: ObservableObject {
     @Published var deletedChats: Set<String> = []
     // current chat
     @Published var chatId: String?
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
+    @Published var openAroundItemId: ChatItem.ID? = nil
     @Published var chatToTop: String?
     @Published var groupMembers: [GMember] = []
     @Published var groupMembersIndexes: Dictionary<Int64, Int> = [:] // groupMemberId to index in groupMembers list
@@ -267,6 +353,7 @@ final class ChatModel: ObservableObject {
     @Published var deviceToken: DeviceToken?
     @Published var savedToken: DeviceToken?
     @Published var tokenRegistered = false
+    @Published var reRegisterTknStatus: NtfTknStatus? = nil
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
     @Published var notificationServer: String?
@@ -301,6 +388,10 @@ final class ChatModel: ObservableObject {
 
     let im = ItemsModel.shared
 
+    // ItemsModel for secondary chat view (such as support scope chat), as opposed to ItemsModel.shared used for primary chat
+    @Published var secondaryIM: ItemsModel? = nil
+    @Published var secondaryPendingInviteeChatOpened = false
+
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
     let ntfEnableLocal = true
@@ -358,7 +449,7 @@ final class ChatModel: ObservableObject {
 
     func getGroupChat(_ groupId: Int64) -> Chat? {
         chats.first { chat in
-            if case let .group(groupInfo) = chat.chatInfo {
+            if case let .group(groupInfo, _) = chat.chatInfo {
                 return groupInfo.groupId == groupId
             } else {
                 return false
@@ -411,7 +502,11 @@ final class ChatModel: ObservableObject {
 
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatInfo = cInfo
+            if case let .group(groupInfo, groupChatScope) = cInfo, groupChatScope != nil {
+                chats[i].chatInfo = .group(groupInfo: groupInfo, groupChatScope: nil)
+            } else {
+                chats[i].chatInfo = cInfo
+            }
             chats[i].created = Date.now
         }
     }
@@ -433,7 +528,7 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroup(_ groupInfo: GroupInfo) {
-        updateChat(.group(groupInfo: groupInfo))
+        updateChat(.group(groupInfo: groupInfo, groupChatScope: nil))
     }
 
     private func updateChat(_ cInfo: ChatInfo, addMissing: Bool = true) {
@@ -476,76 +571,112 @@ final class ChatModel: ObservableObject {
 //    }
 
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // updates membersRequireAttention
+        updateChatInfo(cInfo)
         // mark chat non deleted
         if case let .direct(contact) = cInfo, contact.chatDeleted {
             var updatedContact = contact
             updatedContact.chatDeleted = false
             updateContact(updatedContact)
         }
-        // update previews
+        // update chat list
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = switch cInfo {
-            case .group:
-                if let currentPreviewItem = chats[i].chatItems.first {
-                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
-                        [cItem]
+            // update preview
+            if cInfo.groupChatScope() == nil || cInfo.groupInfo?.membership.memberPending ?? false {
+                chats[i].chatItems = switch cInfo {
+                case .group:
+                    if let currentPreviewItem = chats[i].chatItems.first {
+                        if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
+                            [cItem]
+                        } else {
+                            [currentPreviewItem]
+                        }
                     } else {
-                        [currentPreviewItem]
+                        [cItem]
                     }
-                } else {
+                default:
                     [cItem]
                 }
-            default:
-                [cItem]
-            }
-            if case .rcvNew = cItem.meta.itemStatus {
-                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
+                if case .rcvNew = cItem.meta.itemStatus {
+                    unreadCollector.changeUnreadCounter(cInfo.id, by: 1, unreadMentions: cItem.meta.userMention ? 1 : 0)
+                }
             }
+            // pop chat
             popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
         } else {
-            addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
+            if cInfo.groupChatScope() == nil {
+                addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
+            } else {
+                addChat(Chat(chatInfo: cInfo, chatItems: []))
+            }
         }
-        // add to current chat
-        if chatId == cInfo.id {
-            _ = _upsertChatItem(cInfo, cItem)
+        // add to current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            _ = _upsertChatItem(ciIM, cInfo, cItem)
+        }
+    }
+
+    func getCIItemsModel(_ cInfo: ChatInfo, _ ci: ChatItem) -> ItemsModel? {
+        let cInfoScope = cInfo.groupChatScope()
+        if let cInfoScope = cInfoScope {
+            switch cInfoScope {
+            case .memberSupport:
+                switch secondaryIM?.secondaryIMFilter {
+                case .none:
+                    return nil
+                case let .groupChatScopeContext(groupScopeInfo):
+                    return (cInfo.id == chatId && sameChatScope(cInfoScope, groupScopeInfo.toChatScope())) ? secondaryIM : nil
+                case let .msgContentTagContext(contentTag):
+                    return (cInfo.id == chatId && ci.isReport && contentTag == .report) ? secondaryIM : nil
+                }
+            }
+        } else {
+            return cInfo.id == chatId ? im : nil
         }
     }
 
     func upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-        // update previews
-        var res: Bool
-        if let chat = getChat(cInfo.id) {
-            if let pItem = chat.chatItems.last {
-                if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
+        // update chat list
+        var itemAdded: Bool = false
+        if cInfo.groupChatScope() == nil {
+            if let chat = getChat(cInfo.id) {
+                if let pItem = chat.chatItems.last {
+                    if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
+                        chat.chatItems = [cItem]
+                    }
+                } else {
                     chat.chatItems = [cItem]
                 }
             } else {
-                chat.chatItems = [cItem]
+                addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
+                itemAdded = true
+            }
+            if cItem.isDeletedContent || cItem.meta.itemDeleted != nil {
+                VoiceItemState.stopVoiceInChatView(cInfo, cItem)
             }
-            res = false
-        } else {
-            addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
-            res = true
         }
-        if cItem.isDeletedContent || cItem.meta.itemDeleted != nil {
-            VoiceItemState.stopVoiceInChatView(cInfo, cItem)
+        // update current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            itemAdded = _upsertChatItem(ciIM, cInfo, cItem)
         }
-        // update current chat
-        return chatId == cInfo.id ? _upsertChatItem(cInfo, cItem) : res
+        return itemAdded
     }
 
-    private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-        if let i = getChatItemIndex(cItem) {
-            _updateChatItem(at: i, with: cItem)
-            ChatItemDummyModel.shared.sendUpdate()
+    private func _upsertChatItem(_ ciIM: ItemsModel, _ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
+        if let i = getChatItemIndex(ciIM, cItem) {
+            let oldStatus = ciIM.reversedChatItems[i].meta.itemStatus
+            let newStatus = cItem.meta.itemStatus
+            var ci = cItem
+            if shouldKeepOldSndCIStatus(oldStatus: oldStatus, newStatus: newStatus) {
+                ci.meta.itemStatus = oldStatus
+            }
+            _updateChatItem(ciIM: ciIM, at: i, with: ci)
+            ChatItemDummyModel.shared.sendUpdate() // TODO [knocking] review what's this
             return false
         } else {
-            var ci = cItem
-            if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                ci.meta.itemStatus = status
-            }
-            im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-            im.itemAdded = true
+            ciIM.reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
+            ciIM.chatState.itemAdded((cItem.id, cItem.isRcvNew), hasLiveDummy ? 1 : 0)
+            ciIM.itemAdded = true
             ChatItemDummyModel.shared.sendUpdate()
             return true
         }
@@ -559,45 +690,87 @@ final class ChatModel: ObservableObject {
     }
 
     func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
-        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+        if let ciIM = getCIItemsModel(cInfo, cItem),
+           let i = getChatItemIndex(ciIM, cItem) {
             withConditionalAnimation {
-                _updateChatItem(at: i, with: cItem)
+                _updateChatItem(ciIM: ciIM, at: i, with: cItem)
             }
-        } else if let status = status {
-            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
-    private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+    private func _updateChatItem(ciIM: ItemsModel, at i: Int, with cItem: ChatItem) {
+        ciIM.reversedChatItems[i] = cItem
+        ciIM.reversedChatItems[i].viewTimestamp = .now
     }
 
-    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
-        im.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+    func getChatItemIndex(_ ciIM: ItemsModel, _ cItem: ChatItem) -> Int? {
+        ciIM.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        if cItem.isRcvNew {
-            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
-        }
-        // update previews
-        if let chat = getChat(cInfo.id) {
-            if let pItem = chat.chatItems.last, pItem.id == cItem.id {
-                chat.chatItems = [ChatItem.deletedItemDummy()]
+        // update chat list
+        if cInfo.groupChatScope() == nil {
+            if cItem.isRcvNew {
+                unreadCollector.changeUnreadCounter(cInfo.id, by: -1, unreadMentions: cItem.meta.userMention ? -1 : 0)
+            }
+            // update previews
+            if let chat = getChat(cInfo.id) {
+                if let pItem = chat.chatItems.last, pItem.id == cItem.id {
+                    chat.chatItems = [ChatItem.deletedItemDummy()]
+                }
             }
         }
-        // remove from current chat
-        if chatId == cInfo.id {
-            if let i = getChatItemIndex(cItem) {
-                _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+        // remove from current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            if let i = getChatItemIndex(ciIM, cItem) {
+                withAnimation {
+                    let item = ciIM.reversedChatItems.remove(at: i)
+                    ciIM.chatState.itemsRemoved([(item.id, i, item.isRcvNew)], im.reversedChatItems.reversed())
                 }
             }
         }
         VoiceItemState.stopVoiceInChatView(cInfo, cItem)
     }
 
+    func removeMemberItems(_ removedMember: GroupMember, byMember: GroupMember, _ groupInfo: GroupInfo) {
+        // this should not happen, only another member can "remove" user, user can only "leave" (another event).
+        if byMember.groupMemberId == groupInfo.membership.groupMemberId {
+            logger.debug("exiting removeMemberItems")
+            return
+        }
+        if chatId == groupInfo.id {
+            for i in 0..<im.reversedChatItems.count {
+                if let updatedItem = removedUpdatedItem(im.reversedChatItems[i]) {
+                    _updateChatItem(ciIM: im, at: i, with: updatedItem) // TODO [knocking] review: use getCIItemsModel?
+                }
+            }
+        } else if let chat = getChat(groupInfo.id),
+                  chat.chatItems.count > 0,
+                  let updatedItem = removedUpdatedItem(chat.chatItems[0]) {
+                chat.chatItems = [updatedItem]
+        }
+        
+        func removedUpdatedItem(_ item: ChatItem) -> ChatItem? {
+            let newContent: CIContent
+            if case .groupSnd = item.chatDir, removedMember.groupMemberId == groupInfo.membership.groupMemberId {
+                newContent = .sndModerated
+            } else if case let .groupRcv(groupMember) = item.chatDir, groupMember.groupMemberId == removedMember.groupMemberId {
+                newContent = .rcvModerated
+            } else {
+                return nil
+            }
+            var updatedItem = item
+            updatedItem.meta.itemDeleted = .moderated(deletedTs: Date.now, byGroupMember: byMember)
+            if groupInfo.fullGroupPreferences.fullDelete.on {
+                updatedItem.content = newContent
+            }
+            if item.isActiveReport {
+                decreaseGroupReportsCounter(groupInfo.id)
+            }
+            return updatedItem
+        }
+    }
+
     func nextChatItemData<T>(_ chatItemId: Int64, previous: Bool, map: @escaping (ChatItem) -> T?) -> T? {
         guard var i = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
         if previous {
@@ -640,6 +813,7 @@ final class ChatModel: ObservableObject {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
             im.reversedChatItems.insert(cItem, at: 0)
+            im.chatState.itemAdded((cItem.id, cItem.isRcvNew), 0)
             im.itemAdded = true
         }
         return cItem
@@ -659,63 +833,23 @@ final class ChatModel: ObservableObject {
         im.reversedChatItems.first?.isLiveDummy == true
     }
 
-    func markChatItemsRead(_ cInfo: ChatInfo) {
+    func markAllChatItemsRead(_ chatIM: ItemsModel, _ cInfo: ChatInfo) {
         // update preview
         _updateChat(cInfo.id) { chat in
-            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
-            self.updateFloatingButtons(unreadCount: 0)
+            self.decreaseUnreadCounter(user: self.currentUser!, chat: chat)
             ChatTagsModel.shared.markChatTagRead(chat)
             chat.chatStats = ChatStats()
         }
         // update current chat
         if chatId == cInfo.id {
-            markCurrentChatRead()
-        }
-    }
-
-    private func markCurrentChatRead(fromIndex i: Int = 0) {
-        var j = i
-        while j < im.reversedChatItems.count {
-            markChatItemRead_(j)
-            j += 1
-        }
-    }
-
-    private func updateFloatingButtons(unreadCount: Int) {
-        let fbm = ChatView.FloatingButtonModel.shared
-        fbm.totalUnread = unreadCount
-        fbm.objectWillChange.send()
-    }
-
-    func markChatItemsRead(_ cInfo: ChatInfo, aboveItem: ChatItem? = nil) {
-        if let cItem = aboveItem {
-            if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-                markCurrentChatRead(fromIndex: i)
-                _updateChat(cInfo.id) { chat in
-                    var unreadBelow = 0
-                    var j = i - 1
-                    while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
-                            unreadBelow += 1
-                        }
-                        j -= 1
-                    }
-                    // update preview
-                    let markedCount = chat.chatStats.unreadCount - unreadBelow
-                    if markedCount > 0 {
-                        let wasUnread = chat.unreadTag
-                        chat.chatStats.unreadCount -= markedCount
-                        ChatTagsModel.shared.updateChatTagRead(chat, wasUnread: wasUnread)
-                        self.decreaseUnreadCounter(user: self.currentUser!, by: markedCount)
-                        self.updateFloatingButtons(unreadCount: chat.chatStats.unreadCount)
-                    }
-                }
+            var i = 0
+            while i < im.reversedChatItems.count {
+                markChatItemRead_(chatIM, i)
+                i += 1
             }
-        } else {
-            markChatItemsRead(cInfo)
+            im.chatState.itemsRead(nil, im.reversedChatItems.reversed())
         }
     }
-
     func markChatUnread(_ cInfo: ChatInfo, unreadChat: Bool = true) {
         _updateChat(cInfo.id) { chat in
             let wasUnread = chat.unreadTag
@@ -727,7 +861,7 @@ final class ChatModel: ObservableObject {
     func clearChat(_ cInfo: ChatInfo) {
         // clear preview
         if let chat = getChat(cInfo.id) {
-            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
+            self.decreaseUnreadCounter(user: self.currentUser!, chat: chat)
             chat.chatItems = []
             ChatTagsModel.shared.markChatTagRead(chat)
             chat.chatStats = ChatStats()
@@ -735,20 +869,28 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             im.reversedChatItems = []
+            im.chatState.clear()
         }
     }
 
-    func markChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) {
+    func markChatItemsRead(_ chatIM: ItemsModel, _ cInfo: ChatInfo, _ itemIds: [ChatItem.ID], _ mentionsRead: Int) {
         if self.chatId == cInfo.id {
-            for itemId in itemIds {
-                if let i = im.reversedChatItems.firstIndex(where: { $0.id == itemId }) {
-                    markChatItemRead_(i)
+            var unreadItemIds: Set<ChatItem.ID> = []
+            var i = 0
+            var ids = Set(itemIds)
+            while i < chatIM.reversedChatItems.count && !ids.isEmpty {
+                let item = chatIM.reversedChatItems[i]
+                if ids.contains(item.id) && item.isRcvNew {
+                    markChatItemRead_(chatIM, i)
+                    unreadItemIds.insert(item.id)
+                    ids.remove(item.id)
                 }
+                i += 1
             }
+            chatIM.chatState.itemsRead(unreadItemIds, chatIM.reversedChatItems.reversed())
         }
-        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count)
+        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count, unreadMentions: -mentionsRead)
     }
 
     private let unreadCollector = UnreadCollector()
@@ -756,16 +898,16 @@ final class ChatModel: ObservableObject {
     class UnreadCollector {
         private let subject = PassthroughSubject<Void, Never>()
         private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: Int] = [:]
+        private var unreadCounts: [ChatId: (unread: Int, mentions: Int)] = [:]
 
         init() {
             subject
                 .debounce(for: 1, scheduler: DispatchQueue.main)
                 .sink {
                     let m = ChatModel.shared
-                    for (chatId, count) in self.unreadCounts {
-                        if let i = m.getChatIndex(chatId) {
-                            m.changeUnreadCounter(i, by: count)
+                    for (chatId, (unread, mentions)) in self.unreadCounts {
+                        if unread != 0 || mentions != 0, let i = m.getChatIndex(chatId) {
+                            m.changeUnreadCounter(i, by: unread, unreadMentions: mentions)
                         }
                     }
                     self.unreadCounts = [:]
@@ -773,11 +915,9 @@ final class ChatModel: ObservableObject {
                 .store(in: &bag)
         }
 
-        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
-            if chatId == ChatModel.shared.chatId {
-                ChatView.FloatingButtonModel.shared.totalUnread += count
-            }
-            self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
+        func changeUnreadCounter(_ chatId: ChatId, by count: Int, unreadMentions: Int) {
+            let (unread, mentions) = self.unreadCounts[chatId] ?? (0, 0)
+            self.unreadCounts[chatId] = (unread + count, mentions + unreadMentions)
             subject.send()
         }
     }
@@ -844,20 +984,22 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+    private func markChatItemRead_(_ chatIM: ItemsModel, _ i: Int) {
+        let meta = chatIM.reversedChatItems[i].meta
         if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            chatIM.reversedChatItems[i].meta.itemStatus = .rcvRead
+            chatIM.reversedChatItems[i].viewTimestamp = .now
             if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                chatIM.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
             }
         }
     }
 
-    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
+    func changeUnreadCounter(_ chatIndex: Int, by count: Int, unreadMentions: Int) {
         let wasUnread = chats[chatIndex].unreadTag
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
+        let stats = chats[chatIndex].chatStats
+        chats[chatIndex].chatStats.unreadCount = stats.unreadCount + count
+        chats[chatIndex].chatStats.unreadMentions = stats.unreadMentions + unreadMentions
         ChatTagsModel.shared.updateChatTagRead(chats[chatIndex], wasUnread: wasUnread)
         changeUnreadCounter(user: currentUser!, by: count)
     }
@@ -866,6 +1008,13 @@ final class ChatModel: ObservableObject {
         changeUnreadCounter(user: user, by: 1)
     }
 
+    func decreaseUnreadCounter(user: any UserLike, chat: Chat) {
+        let by = chat.chatInfo.chatSettings?.enableNtfs == .mentions
+                ? chat.chatStats.unreadMentions
+                : chat.chatStats.unreadCount
+        decreaseUnreadCounter(user: user, by: by)
+    }
+
     func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
     }
@@ -878,8 +1027,20 @@ final class ChatModel: ObservableObject {
     }
 
     func totalUnreadCountForAllUsers() -> Int {
-        chats.filter { $0.chatInfo.ntfsEnabled }.reduce(0, { count, chat in count + chat.chatStats.unreadCount }) +
-            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
+        var unread: Int = 0
+        for chat in chats {
+            switch chat.chatInfo.chatSettings?.enableNtfs {
+            case .all: unread += chat.chatStats.unreadCount
+            case .mentions: unread += chat.chatStats.unreadMentions
+            default: ()
+            }
+        }
+        for u in users {
+            if !u.user.activeUser {
+                unread += u.unreadCount
+            }
+        }
+        return unread
     }
 
     func increaseGroupReportsCounter(_ chatId: ChatId) {
@@ -887,7 +1048,7 @@ final class ChatModel: ObservableObject {
     }
 
     func decreaseGroupReportsCounter(_ chatId: ChatId, by: Int = 1) {
-        changeGroupReportsCounter(chatId, -1)
+        changeGroupReportsCounter(chatId, -by)
     }
 
     private func changeGroupReportsCounter(_ chatId: ChatId, _ by: Int = 0) {
@@ -908,7 +1069,7 @@ final class ChatModel: ObservableObject {
         var count = 0
         var ns: [String] = []
         if let ciCategory = chatItem.mergeCategory,
-           var i = getChatItemIndex(chatItem) {
+           var i = getChatItemIndex(im, chatItem) { // TODO [knocking] review: use getCIItemsModel?
             while i < im.reversedChatItems.count {
                 let ci = im.reversedChatItems[i]
                 if ci.mergeCategory != ciCategory { break }
@@ -924,7 +1085,7 @@ final class ChatModel: ObservableObject {
 
     // returns the index of the passed item and the next item (it has smaller index)
     func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
-        if let i = getChatItemIndex(ci) {
+        if let i = getChatItemIndex(im, ci) { // TODO [knocking] review: use getCIItemsModel?
             (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
         } else {
             (nil, nil)
@@ -948,12 +1109,17 @@ final class ChatModel: ObservableObject {
 
     // returns the previous member in the same merge group and the count of members in this group
     func getPrevHiddenMember(_ member: GroupMember, _ range: ClosedRange<Int>) -> (GroupMember?, Int) {
+        let items = im.reversedChatItems
         var prevMember: GroupMember? = nil
         var memberIds: Set<Int64> = []
         for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
-                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
-                memberIds.insert(m.groupMemberId)
+            if i < items.count {
+                if case let .groupRcv(m) = items[i].chatDir {
+                    if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
+                    memberIds.insert(m.groupMemberId)
+                }
+            } else {
+                logger.error("getPrevHiddenMember: index >= count of reversed items: \(i) vs \(items.count), range: \(String(describing: range))")
             }
         }
         return (prevMember, memberIds.count)
@@ -1030,7 +1196,7 @@ final class ChatModel: ObservableObject {
     func removeWallpaperFilesFromChat(_ chat: Chat) {
         if case let .direct(contact) = chat.chatInfo {
             removeWallpaperFilesFromTheme(contact.uiThemes)
-        } else if case let .group(groupInfo) = chat.chatInfo {
+        } else if case let .group(groupInfo, _) = chat.chatInfo {
             removeWallpaperFilesFromTheme(groupInfo.uiThemes)
         }
     }
@@ -1082,35 +1248,30 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
         )
     }
 
-    var userCanSend: Bool {
-        switch chatInfo {
-        case .direct: return true
-        case let .group(groupInfo):
-            let m = groupInfo.membership
-            return m.memberActive && m.memberRole >= .member
-        case .local:
-            return true
-        default: return false
-        }
-    }
-
-    var userIsObserver: Bool {
-        switch chatInfo {
-        case let .group(groupInfo):
-            let m = groupInfo.membership
-            return m.memberActive && m.memberRole == .observer
-        default: return false
-        }
-    }
-
     var unreadTag: Bool {
-        chatInfo.ntfsEnabled && (chatStats.unreadCount > 0 || chatStats.unreadChat)
+        switch chatInfo.chatSettings?.enableNtfs {
+        case .all: chatStats.unreadChat || chatStats.unreadCount > 0
+        case .mentions: chatStats.unreadChat || chatStats.unreadMentions > 0
+        default: chatStats.unreadChat
+        }
     }
     
     var id: ChatId { get { chatInfo.id } }
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }
 
+    var supportUnreadCount: Int {
+        switch chatInfo {
+        case let .group(groupInfo, _):
+            if groupInfo.canModerate {
+                return groupInfo.membersRequireAttention
+            } else {
+                return groupInfo.membership.supportChat?.unread ?? 0
+            }
+        default: return 0
+        }
+    }
+
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 
diff --git a/apps/ios/Shared/Model/NtfManager.swift b/apps/ios/Shared/Model/NtfManager.swift
index 6c33031eeb..da55bd90d0 100644
--- a/apps/ios/Shared/Model/NtfManager.swift
+++ b/apps/ios/Shared/Model/NtfManager.swift
@@ -248,7 +248,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
 
     func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
-        if cInfo.ntfsEnabled {
+        if cInfo.ntfsEnabled(chatItem: cItem) {
             addNotification(createMessageReceivedNtf(user, cInfo, cItem, 0))
         }
     }
diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift
index 2380f79d59..4f9d75bada 100644
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -11,7 +11,7 @@ import UIKit
 import Dispatch
 import BackgroundTasks
 import SwiftUI
-import SimpleXChat
+@preconcurrency import SimpleXChat
 
 private var chatController: chat_ctrl?
 
@@ -19,32 +19,34 @@ private let networkStatusesLock = DispatchQueue(label: "chat.simplex.app.network
 
 enum TerminalItem: Identifiable {
     case cmd(Date, ChatCommand)
-    case resp(Date, ChatResponse)
+    case res(Date, ChatAPIResult)
+    case err(Date, ChatError)
+    case bad(Date, String, Data?)
 
     var id: Date {
-        get {
-            switch self {
-            case let .cmd(id, _): return id
-            case let .resp(id, _): return id
-            }
+        switch self {
+        case let .cmd(d, _): d
+        case let .res(d, _): d
+        case let .err(d, _): d
+        case let .bad(d, _, _): d
         }
     }
 
     var label: String {
-        get {
-            switch self {
-            case let .cmd(_, cmd): return "> \(cmd.cmdString.prefix(30))"
-            case let .resp(_, resp): return "< \(resp.responseType)"
-            }
+        switch self {
+        case let .cmd(_, cmd): "> \(cmd.cmdString.prefix(30))"
+        case let .res(_, res): "< \(res.responseType)"
+        case let .err(_, err): "< error \(err.errorType)"
+        case let .bad(_, type, _): "< * \(type)"
         }
     }
 
     var details: String {
-        get {
-            switch self {
-            case let .cmd(_, cmd): return cmd.cmdString
-            case let .resp(_, resp): return resp.details
-            }
+        switch self {
+        case let .cmd(_, cmd): cmd.cmdString
+        case let .res(_, res): res.details
+        case let .err(_, err): String(describing: err)
+        case let .bad(_, _, json): dataToString(json)
         }
     }
 }
@@ -86,18 +88,24 @@ private func withBGTask<T>(bgDelay: Double? = nil, f: @escaping () -> T) -> T {
     return r
 }
 
-func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) -> ChatResponse {
+@inline(__always)
+func chatSendCmdSync<R: ChatAPIResult>(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, ctrl: chat_ctrl? = nil, log: Bool = true) throws -> R {
+    let res: APIResult<R> = chatApiSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl: ctrl, log: log)
+    return try apiResult(res)
+}
+
+func chatApiSendCmdSync<R: ChatAPIResult>(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, ctrl: chat_ctrl? = nil, log: Bool = true) -> APIResult<R> {
     if log {
         logger.debug("chatSendCmd \(cmd.cmdType)")
     }
     let start = Date.now
-    let resp = bgTask
+    let resp: APIResult<R> = bgTask
                 ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd, ctrl) }
                 : sendSimpleXCmd(cmd, ctrl)
     if log {
         logger.debug("chatSendCmd \(cmd.cmdType): \(resp.responseType)")
-        if case let .response(_, json) = resp {
-            logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
+        if case let .invalid(_, json) = resp {
+            logger.debug("chatSendCmd \(cmd.cmdType) response: \(dataToString(json))")
         }
         Task {
             await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
@@ -106,35 +114,51 @@ 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, log: Bool = true) async -> ChatResponse {
+@inline(__always)
+func chatSendCmd<R: ChatAPIResult>(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, ctrl: chat_ctrl? = nil, log: Bool = true) async throws -> R {
+    let res: APIResult<R> = await chatApiSendCmd(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl: ctrl, log: log)
+    return try apiResult(res)
+}
+
+@inline(__always)
+func chatApiSendCmd<R: ChatAPIResult>(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, ctrl: chat_ctrl? = nil, log: Bool = true) async -> APIResult<R> {
     await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl, log: log))
+        cont.resume(returning: chatApiSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl: ctrl, log: log))
     }
 }
 
-func chatRecvMsg(_ ctrl: chat_ctrl? = nil) async -> ChatResponse? {
+@inline(__always)
+func apiResult<R: ChatAPIResult>(_ res: APIResult<R>) throws -> R {
+    switch res {
+    case let .result(r): return r
+    case let .error(e): throw e
+    case let .invalid(type, _): throw ChatError.unexpectedResult(type: type)
+    }
+}
+
+func chatRecvMsg(_ ctrl: chat_ctrl? = nil) async -> APIResult<ChatEvent>? {
     await withCheckedContinuation { cont in
-        _  = withBGTask(bgDelay: msgDelay) { () -> ChatResponse? in
-            let resp = recvSimpleXMsg(ctrl)
-            cont.resume(returning: resp)
-            return resp
+        _  = withBGTask(bgDelay: msgDelay) { () -> APIResult<ChatEvent>? in
+            let evt: APIResult<ChatEvent>? = recvSimpleXMsg(ctrl)
+            cont.resume(returning: evt)
+            return evt
         }
     }
 }
 
 func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
-    let r = chatSendCmdSync(.showActiveUser, ctrl)
+    let r: APIResult<ChatResponse0> = chatApiSendCmdSync(.showActiveUser, ctrl: ctrl)
     switch r {
-    case let .activeUser(user): return user
-    case .chatCmdError(_, .error(.noActiveUser)): return nil
-    default: throw r
+    case let .result(.activeUser(user)): return user
+    case .error(.error(.noActiveUser)): return nil
+    default: throw r.unexpected
     }
 }
 
 func apiCreateActiveUser(_ p: Profile?, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p, pastTimestamp: pastTimestamp), ctrl)
+    let r: ChatResponse0 = try chatSendCmdSync(.createActiveUser(profile: p, pastTimestamp: pastTimestamp), ctrl: ctrl)
     if case let .activeUser(user) = r { return user }
-    throw r
+    throw r.unexpected
 }
 
 func listUsers() throws -> [UserInfo] {
@@ -145,41 +169,35 @@ func listUsersAsync() async throws -> [UserInfo] {
     return try listUsersResponse(await chatSendCmd(.listUsers))
 }
 
-private func listUsersResponse(_ r: ChatResponse) throws -> [UserInfo] {
+private func listUsersResponse(_ r: ChatResponse0) throws -> [UserInfo] {
     if case let .usersList(users) = r {
         return users.sorted { $0.user.chatViewName.compare($1.user.chatViewName) == .orderedAscending }
     }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetActiveUser(_ userId: Int64, viewPwd: String?) throws -> User {
-    let r = chatSendCmdSync(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
     if case let .activeUser(user) = r { return user }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetActiveUserAsync(_ userId: Int64, viewPwd: String?) async throws -> User {
-    let r = await chatSendCmd(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
+    let r: ChatResponse0 = try await chatSendCmd(.apiSetActiveUser(userId: userId, viewPwd: viewPwd))
     if case let .activeUser(user) = r { return user }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetAllContactReceipts(enable: Bool) async throws {
-    let r = await chatSendCmd(.setAllContactReceipts(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
+    try await sendCommandOkResp(.setAllContactReceipts(enable: enable))
 }
 
 func apiSetUserContactReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
-    let r = await chatSendCmd(.apiSetUserContactReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
-    if case .cmdOk = r { return }
-    throw r
+    try await sendCommandOkResp(.apiSetUserContactReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
 }
 
 func apiSetUserGroupReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
-    let r = await chatSendCmd(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
-    if case .cmdOk = r { return }
-    throw r
+    try await sendCommandOkResp(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
 }
 
 func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
@@ -199,90 +217,88 @@ func apiUnmuteUser(_ userId: Int64) async throws -> User {
 }
 
 func setUserPrivacy_(_ cmd: ChatCommand) async throws -> User {
-    let r = await chatSendCmd(cmd)
+    let r: ChatResponse1 = try await chatSendCmd(cmd)
     if case let .userPrivacy(_, updatedUser) = r { return updatedUser }
-    throw r
+    throw r.unexpected
 }
 
 func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) async throws {
-    let r = await chatSendCmd(.apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: viewPwd))
-    if case .cmdOk = r { return }
-    throw r
+    try await sendCommandOkResp(.apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: viewPwd))
 }
 
 func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true, enableSndFiles: true), ctrl)
+    let r: ChatResponse0 = try chatSendCmdSync(.startChat(mainApp: true, enableSndFiles: true), ctrl: ctrl)
     switch r {
     case .chatStarted: return true
     case .chatRunning: return false
-    default: throw r
+    default: throw r.unexpected
     }
 }
 
 func apiCheckChatRunning() throws -> Bool {
-    let r = chatSendCmdSync(.checkChatRunning)
+    let r: ChatResponse0 = try chatSendCmdSync(.checkChatRunning)
     switch r {
     case .chatRunning: return true
     case .chatStopped: return false
-    default: throw r
+    default: throw r.unexpected
     }
 }
 
 func apiStopChat() async throws {
-    let r = await chatSendCmd(.apiStopChat)
+    let r: ChatResponse0 = try await chatSendCmd(.apiStopChat)
     switch r {
     case .chatStopped: return
-    default: throw r
+    default: throw r.unexpected
     }
 }
 
 func apiActivateChat() {
     chatReopenStore()
-    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
-    if case .cmdOk = r { return }
-    logger.error("apiActivateChat error: \(String(describing: r))")
+    do {
+        try sendCommandOkRespSync(.apiActivateChat(restoreChat: true))
+    } catch {
+        logger.error("apiActivateChat error: \(responseError(error))")
+    }
 }
 
 func apiSuspendChat(timeoutMicroseconds: Int) {
-    let r = chatSendCmdSync(.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
-    if case .cmdOk = r { return }
-    logger.error("apiSuspendChat error: \(String(describing: r))")
+    do {
+        try sendCommandOkRespSync(.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
+    } catch {
+        logger.error("apiSuspendChat error: \(responseError(error))")
+    }
 }
 
 func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl)
+    let r: ChatResponse2 = try chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl: ctrl)
     if case .cmdOk = r { return }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = chatSendCmdSync(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
+    try sendCommandOkRespSync(.apiSetEncryptLocalFiles(enable: enable))
 }
 
 func apiSaveAppSettings(settings: AppSettings) throws {
-    let r = chatSendCmdSync(.apiSaveSettings(settings: settings))
-    if case .cmdOk = r { return }
-    throw r
+    try sendCommandOkRespSync(.apiSaveSettings(settings: settings))
 }
 
 func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
-    let r = chatSendCmdSync(.apiGetSettings(settings: settings))
+    let r: ChatResponse2 = try chatSendCmdSync(.apiGetSettings(settings: settings))
     if case let .appSettings(settings) = r { return settings }
-    throw r
+    throw r.unexpected
 }
 
 func apiExportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
-    let r = await chatSendCmd(.apiExportArchive(config: config))
+    let r: ChatResponse2 = try await chatSendCmd(.apiExportArchive(config: config))
     if case let .archiveExported(archiveErrors) = r { return archiveErrors }
-    throw r
+    throw r.unexpected
 }
 
 func apiImportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
-    let r = await chatSendCmd(.apiImportArchive(config: config))
+    let r: ChatResponse2 = try await chatSendCmd(.apiImportArchive(config: config))
     if case let .archiveImported(archiveErrors) = r { return archiveErrors }
-    throw r
+    throw r.unexpected
 }
 
 func apiDeleteStorage() async throws {
@@ -293,8 +309,8 @@ 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 testStorageEncryption(key: String, ctrl: chat_ctrl? = nil) async throws {
+    try await sendCommandOkResp(.testStorageEncryption(key: key), ctrl: ctrl)
 }
 
 func apiGetChats() throws -> [ChatData] {
@@ -307,92 +323,92 @@ func apiGetChatsAsync() async throws -> [ChatData] {
     return try apiChatsResponse(await chatSendCmd(.apiGetChats(userId: userId)))
 }
 
-private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
+private func apiChatsResponse(_ r: ChatResponse0) throws -> [ChatData] {
     if case let .apiChats(_, chats) = r { return chats }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetChatTags() throws -> [ChatTag] {
     let userId = try currentUserId("apiGetChatTags")
-    let r = chatSendCmdSync(.apiGetChatTags(userId: userId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiGetChatTags(userId: userId))
     if case let .chatTags(_, tags) = r { return tags }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetChatTagsAsync() async throws -> [ChatTag] {
     let userId = try currentUserId("apiGetChatTags")
-    let r = await chatSendCmd(.apiGetChatTags(userId: userId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetChatTags(userId: userId))
     if case let .chatTags(_, tags) = r { return tags }
-    throw r
+    throw r.unexpected
 }
 
 let loadItemsPerPage = 50
 
-func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> Chat {
-    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
-    if case let .apiChat(_, chat) = r { return Chat.init(chat) }
-    throw r
+func apiGetChat(chatId: ChatId, scope: GroupChatScope?, contentTag: MsgContentTag? = nil, pagination: ChatPagination, search: String = "") async throws -> (Chat, NavigationInfo) {
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetChat(chatId: chatId, scope: scope, contentTag: contentTag, pagination: pagination, search: search))
+    if case let .apiChat(_, chat, navInfo) = r { return (Chat.init(chat), navInfo ?? NavigationInfo()) }
+    throw r.unexpected
 }
 
-func apiGetChatItems(type: ChatType, id: Int64, pagination: ChatPagination, search: String = "") async throws -> [ChatItem] {
-    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: pagination, search: search))
-    if case let .apiChat(_, chat) = r { return chat.chatItems }
-    throw r
+func loadChat(chat: Chat, im: ItemsModel, search: String = "", clearItems: Bool = true) async {
+    await loadChat(chatId: chat.chatInfo.id, im: im, search: search, clearItems: clearItems)
 }
 
-func loadChat(chat: Chat, search: String = "", clearItems: Bool = true, replaceChat: Bool = false) async {
-    do {
-        let cInfo = chat.chatInfo
-        let m = ChatModel.shared
-        let im = ItemsModel.shared
-        m.chatItemStatuses = [:]
+func loadChat(chatId: ChatId, im: ItemsModel, search: String = "", openAroundItemId: ChatItem.ID? = nil, clearItems: Bool = true) async {
+    await MainActor.run {
         if clearItems {
-            await MainActor.run { im.reversedChatItems = [] }
+            im.reversedChatItems = []
+            im.chatState.clear()
         }
-        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        await MainActor.run {
-            im.reversedChatItems = chat.chatItems.reversed()
-            m.updateChatInfo(chat.chatInfo)
-            if (replaceChat) {
-                m.replaceChat(chat.chatInfo.id, chat)
-            }
-        }
-    } catch let error {
-        logger.error("loadChat error: \(responseError(error))")
     }
+    await apiLoadMessages(
+        chatId,
+        im,
+        ( // pagination
+            openAroundItemId != nil
+            ? .around(chatItemId: openAroundItemId!, count: loadItemsPerPage)
+            : (
+                search == ""
+                ? .initial(count: loadItemsPerPage) : .last(count: loadItemsPerPage)
+            )
+        ),
+        search,
+        openAroundItemId,
+        { 0...0 }
+    )
 }
 
-func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -> ChatItemInfo {
-    let r = await chatSendCmd(.apiGetChatItemInfo(type: type, id: id, itemId: itemId))
+func apiGetChatItemInfo(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64) async throws -> ChatItemInfo {
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetChatItemInfo(type: type, id: id, scope: scope, itemId: itemId))
     if case let .chatItemInfo(_, _, chatItemInfo) = r { return chatItemInfo }
-    throw r
+    throw r.unexpected
 }
 
-func apiPlanForwardChatItems(type: ChatType, id: Int64, itemIds: [Int64]) async throws -> ([Int64], ForwardConfirmation?) {
-    let r = await chatSendCmd(.apiPlanForwardChatItems(toChatType: type, toChatId: id, itemIds: itemIds))
+func apiPlanForwardChatItems(type: ChatType, id: Int64, scope: GroupChatScope?, itemIds: [Int64]) async throws -> ([Int64], ForwardConfirmation?) {
+    let r: ChatResponse1 = try await chatSendCmd(.apiPlanForwardChatItems(fromChatType: type, fromChatId: id, fromScope: scope, itemIds: itemIds))
     if case let .forwardPlan(_, chatItemIds, forwardConfimation) = r { return (chatItemIds, forwardConfimation) }
-    throw r
+    throw r.unexpected
 }
 
-func apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?) async -> [ChatItem]? {
-    let cmd: ChatCommand = .apiForwardChatItems(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemIds: itemIds, ttl: ttl)
+func apiForwardChatItems(toChatType: ChatType, toChatId: Int64, toScope: GroupChatScope?, fromChatType: ChatType, fromChatId: Int64, fromScope: GroupChatScope?, itemIds: [Int64], ttl: Int?) async -> [ChatItem]? {
+    let cmd: ChatCommand = .apiForwardChatItems(toChatType: toChatType, toChatId: toChatId, toScope: toScope, fromChatType: fromChatType, fromChatId: fromChatId, fromScope: fromScope, itemIds: itemIds, ttl: ttl)
     return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
 }
 
 func apiCreateChatTag(tag: ChatTagData) async throws -> [ChatTag] {
-    let r = await chatSendCmd(.apiCreateChatTag(tag: tag))
+    let r: ChatResponse0 = try await chatSendCmd(.apiCreateChatTag(tag: tag))
     if case let .chatTags(_, userTags) = r {
         return userTags
     }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetChatTags(type: ChatType, id: Int64, tagIds: [Int64]) async throws -> ([ChatTag], [Int64]) {
-    let r = await chatSendCmd(.apiSetChatTags(type: type, id: id, tagIds: tagIds))
+    let r: ChatResponse0 = try await chatSendCmd(.apiSetChatTags(type: type, id: id, tagIds: tagIds))
     if case let .tagsUpdated(_, userTags, chatTags) = r {
         return (userTags, chatTags)
     }
-    throw r
+    throw r.unexpected
 }
 
 func apiDeleteChatTag(tagId: Int64) async throws  {
@@ -407,14 +423,14 @@ func apiReorderChatTags(tagIds: [Int64]) async throws {
     try await sendCommandOkResp(.apiReorderChatTags(tagIds: tagIds))
 }
 
-func apiSendMessages(type: ChatType, id: Int64, live: Bool = false, ttl: Int? = nil, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
-    let cmd: ChatCommand = .apiSendMessages(type: type, id: id, live: live, ttl: ttl, composedMessages: composedMessages)
+func apiSendMessages(type: ChatType, id: Int64, scope: GroupChatScope?, live: Bool = false, ttl: Int? = nil, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
+    let cmd: ChatCommand = .apiSendMessages(type: type, id: id, scope: scope, live: live, ttl: ttl, composedMessages: composedMessages)
     return await processSendMessageCmd(toChatType: type, cmd: cmd)
 }
 
 private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> [ChatItem]? {
     let chatModel = ChatModel.shared
-    let r: ChatResponse
+    let r: APIResult<ChatResponse1>
     if toChatType == .direct {
         var cItem: ChatItem? = nil
         let endTask = beginBGTask({
@@ -424,8 +440,8 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
                 }
             }
         })
-        r = await chatSendCmd(cmd, bgTask: false)
-        if case let .newChatItems(_, aChatItems) = r {
+        r = await chatApiSendCmd(cmd, bgTask: false)
+        if case let .result(.newChatItems(_, aChatItems)) = r {
             let cItems = aChatItems.map { $0.chatItem }
             if let cItemLast = cItems.last {
                 cItem = cItemLast
@@ -436,40 +452,40 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
         if let networkErrorAlert = networkErrorAlert(r) {
             AlertManager.shared.showAlert(networkErrorAlert)
         } else {
-            sendMessageErrorAlert(r)
+            sendMessageErrorAlert(r.unexpected)
         }
         endTask()
         return nil
     } else {
-        r = await chatSendCmd(cmd, bgDelay: msgDelay)
-        if case let .newChatItems(_, aChatItems) = r {
+        r = await chatApiSendCmd(cmd, bgDelay: msgDelay)
+        if case let .result(.newChatItems(_, aChatItems)) = r {
             return aChatItems.map { $0.chatItem }
         }
-        sendMessageErrorAlert(r)
+        sendMessageErrorAlert(r.unexpected)
         return nil
     }
 }
 
 func apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
-    let r = await chatSendCmd(.apiCreateChatItems(noteFolderId: noteFolderId, composedMessages: composedMessages))
-    if case let .newChatItems(_, aChatItems) = r { return aChatItems.map { $0.chatItem } }
-    createChatItemsErrorAlert(r)
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiCreateChatItems(noteFolderId: noteFolderId, composedMessages: composedMessages))
+    if case let .result(.newChatItems(_, aChatItems)) = r { return aChatItems.map { $0.chatItem } }
+    createChatItemsErrorAlert(r.unexpected)
     return nil
 }
 
 func apiReportMessage(groupId: Int64, chatItemId: Int64, reportReason: ReportReason, reportText: String) async -> [ChatItem]? {
-    let r = await chatSendCmd(.apiReportMessage(groupId: groupId, chatItemId: chatItemId, reportReason: reportReason, reportText: reportText))
-    if case let .newChatItems(_, aChatItems) = r { return aChatItems.map { $0.chatItem } }
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiReportMessage(groupId: groupId, chatItemId: chatItemId, reportReason: reportReason, reportText: reportText))
+    if case let .result(.newChatItems(_, aChatItems)) = r { return aChatItems.map { $0.chatItem } }
 
     logger.error("apiReportMessage error: \(String(describing: r))")
     AlertManager.shared.showAlertMsg(
         title: "Error creating report",
-        message: "Error: \(responseError(r))"
+        message: "Error: \(responseError(r.unexpected))"
     )
     return nil
 }
 
-private func sendMessageErrorAlert(_ r: ChatResponse) {
+private func sendMessageErrorAlert(_ r: ChatError) {
     logger.error("send message error: \(String(describing: r))")
     AlertManager.shared.showAlertMsg(
         title: "Error sending message",
@@ -477,7 +493,7 @@ private func sendMessageErrorAlert(_ r: ChatResponse) {
     )
 }
 
-private func createChatItemsErrorAlert(_ r: ChatResponse) {
+private func createChatItemsErrorAlert(_ r: ChatError) {
     logger.error("apiCreateChatItems error: \(String(describing: r))")
     AlertManager.shared.showAlertMsg(
         title: "Error creating message",
@@ -485,42 +501,57 @@ private func createChatItemsErrorAlert(_ r: ChatResponse) {
     )
 }
 
-func apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool = false) async throws -> ChatItem {
-    let r = await chatSendCmd(.apiUpdateChatItem(type: type, id: id, itemId: itemId, msg: msg, live: live), bgDelay: msgDelay)
-    if case let .chatItemUpdated(_, aChatItem) = r { return aChatItem.chatItem }
-    throw r
+func apiUpdateChatItem(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64, updatedMessage: UpdatedMessage, live: Bool = false) async throws -> ChatItem {
+    let r: ChatResponse1 = try await chatSendCmd(.apiUpdateChatItem(type: type, id: id, scope: scope, itemId: itemId, updatedMessage: updatedMessage, live: live), bgDelay: msgDelay)
+    switch r {
+    case let .chatItemUpdated(_, aChatItem): return aChatItem.chatItem
+    case let .chatItemNotChanged(_, aChatItem): return aChatItem.chatItem
+    default: throw r.unexpected
+    }
 }
 
-func apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction) async throws -> ChatItem {
-    let r = await chatSendCmd(.apiChatItemReaction(type: type, id: id, itemId: itemId, add: add, reaction: reaction), bgDelay: msgDelay)
+func apiChatItemReaction(type: ChatType, id: Int64, scope: GroupChatScope?, itemId: Int64, add: Bool, reaction: MsgReaction) async throws -> ChatItem {
+    let r: ChatResponse1 = try await chatSendCmd(.apiChatItemReaction(type: type, id: id, scope: scope, itemId: itemId, add: add, reaction: reaction), bgDelay: msgDelay)
     if case let .chatItemReaction(_, _, reaction) = r { return reaction.chatReaction.chatItem }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetReactionMembers(groupId: Int64, itemId: Int64, reaction: MsgReaction) async throws -> [MemberReaction] {
     let userId = try currentUserId("apiGetReactionMemebers")
-    let r = await chatSendCmd(.apiGetReactionMembers(userId: userId, groupId: groupId, itemId: itemId, reaction: reaction ))
+    let r: ChatResponse1 = try await chatSendCmd(.apiGetReactionMembers(userId: userId, groupId: groupId, itemId: itemId, reaction: reaction ))
     if case let .reactionMembers(_, memberReactions) = r { return memberReactions }
-    throw r
+    throw r.unexpected
 }
 
-func apiDeleteChatItems(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemIds: itemIds, mode: mode), bgDelay: msgDelay)
+func apiDeleteChatItems(type: ChatType, id: Int64, scope: GroupChatScope?, itemIds: [Int64], mode: CIDeleteMode) async throws -> [ChatItemDeletion] {
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteChatItem(type: type, id: id, scope: scope, itemIds: itemIds, mode: mode), bgDelay: msgDelay)
     if case let .chatItemsDeleted(_, items, _) = r { return items }
-    throw r
+    throw r.unexpected
 }
 
 func apiDeleteMemberChatItems(groupId: Int64, itemIds: [Int64]) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, itemIds: itemIds), bgDelay: msgDelay)
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, itemIds: itemIds), bgDelay: msgDelay)
     if case let .chatItemsDeleted(_, items, _) = r { return items }
-    throw r
+    throw r.unexpected
+}
+
+func apiArchiveReceivedReports(groupId: Int64) async throws -> ChatResponse1 {
+    let r: ChatResponse1 = try await chatSendCmd(.apiArchiveReceivedReports(groupId: groupId), bgDelay: msgDelay)
+    if case .groupChatItemsDeleted = r { return r }
+    throw r.unexpected
+}
+
+func apiDeleteReceivedReports(groupId: Int64, itemIds: [Int64], mode: CIDeleteMode) async throws -> [ChatItemDeletion] {
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteReceivedReports(groupId: groupId, itemIds: itemIds, mode: mode), bgDelay: msgDelay)
+    if case let .chatItemsDeleted(_, chatItemDeletions, _) = r { return chatItemDeletions }
+    throw r.unexpected
 }
 
 func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String?) {
-    let r = chatSendCmdSync(.apiGetNtfToken)
+    let r: APIResult<ChatResponse2> = chatApiSendCmdSync(.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 .result(.ntfToken(token, status, ntfMode, ntfServer)): return (token, status, ntfMode, ntfServer)
+    case .error(.errorAgent(.CMD(.PROHIBITED, _))): return (nil, nil, .off, nil)
     default:
         logger.debug("apiGetNtfToken response: \(String(describing: r))")
         return (nil, nil, .off, nil)
@@ -528,9 +559,9 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String
 }
 
 func apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode) async throws -> NtfTknStatus {
-    let r = await chatSendCmd(.apiRegisterToken(token: token, notificationMode: notificationMode))
+    let r: ChatResponse2 = try await chatSendCmd(.apiRegisterToken(token: token, notificationMode: notificationMode))
     if case let .ntfTokenStatus(status) = r { return status }
-    throw r
+    throw r.unexpected
 }
 
 func registerToken(token: DeviceToken) {
@@ -542,7 +573,12 @@ func registerToken(token: DeviceToken) {
         Task {
             do {
                 let status = try await apiRegisterToken(token: token, notificationMode: mode)
-                await MainActor.run { m.tokenStatus = status }
+                await MainActor.run {
+                    m.tokenStatus = status
+                    if !status.workingToken {
+                        m.reRegisterTknStatus = status
+                    }
+                }
             } catch let error {
                 logger.error("registerToken apiRegisterToken error: \(responseError(error))")
             }
@@ -550,90 +586,129 @@ func registerToken(token: DeviceToken) {
     }
 }
 
+func tokenStatusInfo(_ status: NtfTknStatus, register: Bool) -> String {
+    String.localizedStringWithFormat(NSLocalizedString("Token status: %@.", comment: "token status"), status.text)
+    + "\n" + status.info(register: register)
+}
+
+func reRegisterToken(token: DeviceToken) {
+    let m = ChatModel.shared
+    let mode = m.notificationMode
+    logger.debug("reRegisterToken \(mode.rawValue)")
+    Task {
+        do {
+            let status = try await apiRegisterToken(token: token, notificationMode: mode)
+            await MainActor.run {
+                m.tokenStatus = status
+                showAlert(
+                    status.workingToken
+                    ? NSLocalizedString("Notifications status", comment: "alert title")
+                    : NSLocalizedString("Notifications error", comment: "alert title"),
+                    message: tokenStatusInfo(status, register: false)
+                )
+            }
+        } catch let error {
+            logger.error("reRegisterToken apiRegisterToken error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error registering for notifications", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
 func apiVerifyToken(token: DeviceToken, nonce: String, code: String) async throws {
     try await sendCommandOkResp(.apiVerifyToken(token: token, nonce: nonce, code: code))
 }
 
+func apiCheckToken(token: DeviceToken) async throws -> NtfTknStatus {
+    let r: ChatResponse2 = try await chatSendCmd(.apiCheckToken(token: token))
+    if case let .ntfTokenStatus(status) = r { return status }
+    throw r.unexpected
+}
+
 func apiDeleteToken(token: DeviceToken) async throws {
     try await sendCommandOkResp(.apiDeleteToken(token: token))
 }
 
 func testProtoServer(server: String) async throws -> Result<(), ProtocolTestFailure> {
     let userId = try currentUserId("testProtoServer")
-    let r = await chatSendCmd(.apiTestProtoServer(userId: userId, server: server))
+    let r: ChatResponse0 = try await chatSendCmd(.apiTestProtoServer(userId: userId, server: server))
     if case let .serverTestResult(_, _, testFailure) = r {
         if let t = testFailure {
             return .failure(t)
         }
         return .success(())
     }
-    throw r
+    throw r.unexpected
 }
 
 func getServerOperators() async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiGetServerOperators)
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetServerOperators)
     if case let .serverOperatorConditions(conditions) = r { return conditions }
     logger.error("getServerOperators error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func getServerOperatorsSync() throws -> ServerOperatorConditions {
-    let r = chatSendCmdSync(.apiGetServerOperators)
+    let r: ChatResponse0 = try chatSendCmdSync(.apiGetServerOperators)
     if case let .serverOperatorConditions(conditions) = r { return conditions }
     logger.error("getServerOperators error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func setServerOperators(operators: [ServerOperator]) async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiSetServerOperators(operators: operators))
+    let r: ChatResponse0 = try await chatSendCmd(.apiSetServerOperators(operators: operators))
     if case let .serverOperatorConditions(conditions) = r { return conditions }
     logger.error("setServerOperators error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func getUserServers() async throws -> [UserOperatorServers] {
     let userId = try currentUserId("getUserServers")
-    let r = await chatSendCmd(.apiGetUserServers(userId: userId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetUserServers(userId: userId))
     if case let .userServers(_, userServers) = r { return userServers }
     logger.error("getUserServers error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func setUserServers(userServers: [UserOperatorServers]) async throws {
     let userId = try currentUserId("setUserServers")
-    let r = await chatSendCmd(.apiSetUserServers(userId: userId, userServers: userServers))
+    let r: ChatResponse2 = try await chatSendCmd(.apiSetUserServers(userId: userId, userServers: userServers))
     if case .cmdOk = r { return }
     logger.error("setUserServers error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func validateServers(userServers: [UserOperatorServers]) async throws -> [UserServersError] {
     let userId = try currentUserId("validateServers")
-    let r = await chatSendCmd(.apiValidateServers(userId: userId, userServers: userServers))
+    let r: ChatResponse0 = try await chatSendCmd(.apiValidateServers(userId: userId, userServers: userServers))
     if case let .userServersValidation(_, serverErrors) = r { return serverErrors }
     logger.error("validateServers error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func getUsageConditions() async throws -> (UsageConditions, String?, UsageConditions?) {
-    let r = await chatSendCmd(.apiGetUsageConditions)
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetUsageConditions)
     if case let .usageConditions(usageConditions, conditionsText, acceptedConditions) = r { return (usageConditions, conditionsText, acceptedConditions) }
     logger.error("getUsageConditions error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func setConditionsNotified(conditionsId: Int64) async throws {
-    let r = await chatSendCmd(.apiSetConditionsNotified(conditionsId: conditionsId))
+    let r: ChatResponse2 = try await chatSendCmd(.apiSetConditionsNotified(conditionsId: conditionsId))
     if case .cmdOk = r { return }
     logger.error("setConditionsNotified error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func acceptConditions(conditionsId: Int64, operatorIds: [Int64]) async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiAcceptConditions(conditionsId: conditionsId, operatorIds: operatorIds))
+    let r: ChatResponse0 = try await chatSendCmd(.apiAcceptConditions(conditionsId: conditionsId, operatorIds: operatorIds))
     if case let .serverOperatorConditions(conditions) = r { return conditions }
     logger.error("acceptConditions error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func getChatItemTTL() throws -> ChatItemTTL {
@@ -646,7 +721,7 @@ func getChatItemTTLAsync() async throws -> ChatItemTTL {
     return try chatItemTTLResponse(await chatSendCmd(.apiGetChatItemTTL(userId: userId)))
 }
 
-private func chatItemTTLResponse(_ r: ChatResponse) throws -> ChatItemTTL {
+private func chatItemTTLResponse(_ r: ChatResponse0) throws -> ChatItemTTL {
     if case let .chatItemTTL(_, chatItemTTL) = r {
         if let ttl = chatItemTTL {
             return ChatItemTTL(ttl)
@@ -654,7 +729,7 @@ private func chatItemTTLResponse(_ r: ChatResponse) throws -> ChatItemTTL {
             throw RuntimeError("chatItemTTLResponse: invalid ttl")
         }
     }
-    throw r
+    throw r.unexpected
 }
 
 func setChatItemTTL(_ chatItemTTL: ChatItemTTL) async throws {
@@ -668,21 +743,21 @@ func setChatTTL(chatType: ChatType, id: Int64, _ chatItemTTL: ChatTTL) async thr
 }
 
 func getNetworkConfig() async throws -> NetCfg? {
-    let r = await chatSendCmd(.apiGetNetworkConfig)
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetNetworkConfig)
     if case let .networkConfig(cfg) = r { return cfg }
-    throw r
+    throw r.unexpected
 }
 
 func setNetworkConfig(_ cfg: NetCfg, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg), ctrl)
+    let r: ChatResponse2 = try chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg), ctrl: ctrl)
     if case .cmdOk = r { return }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetNetworkInfo(_ networkInfo: UserNetworkInfo) throws {
-    let r = chatSendCmdSync(.apiSetNetworkInfo(networkInfo: networkInfo))
+    let r: ChatResponse2 = try chatSendCmdSync(.apiSetNetworkInfo(networkInfo: networkInfo))
     if case .cmdOk = r { return }
-    throw r
+    throw r.unexpected
 }
 
 func reconnectAllServers() async throws {
@@ -703,131 +778,135 @@ func apiSetMemberSettings(_ groupId: Int64, _ groupMemberId: Int64, _ memberSett
 }
 
 func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profile?) {
-    let r = await chatSendCmd(.apiContactInfo(contactId: contactId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiContactInfo(contactId: contactId))
     if case let .contactInfo(_, _, connStats, customUserProfile) = r { return (connStats, customUserProfile) }
-    throw r
+    throw r.unexpected
 }
 
 func apiGroupMemberInfoSync(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
-    let r = chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
-    throw r
+    throw r.unexpected
 }
 
 func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, ConnectionStats?) {
-    let r = await chatSendCmd(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
-    throw r
+    throw r.unexpected
 }
 
 func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
-    let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
+    throw r.unexpected
 }
 
 func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
-    let r = await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
+    throw r.unexpected
 }
 
 func apiSwitchContact(contactId: Int64) throws -> ConnectionStats {
-    let r = chatSendCmdSync(.apiSwitchContact(contactId: contactId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiSwitchContact(contactId: contactId))
     if case let .contactSwitchStarted(_, _, connectionStats) = r { return connectionStats }
-    throw r
+    throw r.unexpected
 }
 
 func apiSwitchGroupMember(_ groupId: Int64, _ groupMemberId: Int64) throws -> ConnectionStats {
-    let r = chatSendCmdSync(.apiSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberSwitchStarted(_, _, _, connectionStats) = r { return connectionStats }
-    throw r
+    throw r.unexpected
 }
 
 func apiAbortSwitchContact(_ contactId: Int64) throws -> ConnectionStats {
-    let r = chatSendCmdSync(.apiAbortSwitchContact(contactId: contactId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiAbortSwitchContact(contactId: contactId))
     if case let .contactSwitchAborted(_, _, connectionStats) = r { return connectionStats }
-    throw r
+    throw r.unexpected
 }
 
 func apiAbortSwitchGroupMember(_ groupId: Int64, _ groupMemberId: Int64) throws -> ConnectionStats {
-    let r = chatSendCmdSync(.apiAbortSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiAbortSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberSwitchAborted(_, _, _, connectionStats) = r { return connectionStats }
-    throw r
+    throw r.unexpected
 }
 
 func apiSyncContactRatchet(_ contactId: Int64, _ force: Bool) throws -> ConnectionStats {
-    let r = chatSendCmdSync(.apiSyncContactRatchet(contactId: contactId, force: force))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiSyncContactRatchet(contactId: contactId, force: force))
     if case let .contactRatchetSyncStarted(_, _, connectionStats) = r { return connectionStats }
-    throw r
+    throw r.unexpected
 }
 
 func apiSyncGroupMemberRatchet(_ groupId: Int64, _ groupMemberId: Int64, _ force: Bool) throws -> (GroupMember, ConnectionStats) {
-    let r = chatSendCmdSync(.apiSyncGroupMemberRatchet(groupId: groupId, groupMemberId: groupMemberId, force: force))
+    let r: ChatResponse0 = try chatSendCmdSync(.apiSyncGroupMemberRatchet(groupId: groupId, groupMemberId: groupMemberId, force: force))
     if case let .groupMemberRatchetSyncStarted(_, _, member, connectionStats) = r { return (member, connectionStats) }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetContactCode(_ contactId: Int64) async throws -> (Contact, String) {
-    let r = await chatSendCmd(.apiGetContactCode(contactId: contactId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetContactCode(contactId: contactId))
     if case let .contactCode(_, contact, connectionCode) = r { return (contact, connectionCode) }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, String) {
-    let r = await chatSendCmd(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse0 = try await chatSendCmd(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberCode(_, _, member, connectionCode) = r { return (member, connectionCode) }
-    throw r
+    throw r.unexpected
 }
 
 func apiVerifyContact(_ contactId: Int64, connectionCode: String?) -> (Bool, String)? {
-    let r = chatSendCmdSync(.apiVerifyContact(contactId: contactId, connectionCode: connectionCode))
-    if case let .connectionVerified(_, verified, expectedCode) = r { return (verified, expectedCode) }
+    let r: APIResult<ChatResponse0> = chatApiSendCmdSync(.apiVerifyContact(contactId: contactId, connectionCode: connectionCode))
+    if case let .result(.connectionVerified(_, verified, expectedCode)) = r { return (verified, expectedCode) }
     logger.error("apiVerifyContact error: \(String(describing: r))")
     return nil
 }
 
 func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCode: String?) -> (Bool, String)? {
-    let r = chatSendCmdSync(.apiVerifyGroupMember(groupId: groupId, groupMemberId: groupMemberId, connectionCode: connectionCode))
-    if case let .connectionVerified(_, verified, expectedCode) = r { return (verified, expectedCode) }
+    let r: APIResult<ChatResponse0> = chatApiSendCmdSync(.apiVerifyGroupMember(groupId: groupId, groupMemberId: groupMemberId, connectionCode: connectionCode))
+    if case let .result(.connectionVerified(_, verified, expectedCode)) = r { return (verified, expectedCode) }
     logger.error("apiVerifyGroupMember error: \(String(describing: r))")
     return nil
 }
 
-func apiAddContact(incognito: Bool) async -> ((String, PendingContactConnection)?, Alert?) {
+func apiAddContact(incognito: Bool) async -> ((CreatedConnLink, PendingContactConnection)?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiAddContact: no current user")
         return (nil, nil)
     }
-    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
-    if case let .invitation(_, connReqInvitation, connection) = r { return ((connReqInvitation, connection), nil) }
+    let short = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiAddContact(userId: userId, short: short, incognito: incognito), bgTask: false)
+    if case let .result(.invitation(_, connLinkInv, connection)) = r { return ((connLinkInv, connection), nil) }
     let alert = connectionErrorAlert(r)
     return (nil, alert)
 }
 
 func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
-    let r = await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
     if case let .connectionIncognitoUpdated(_, toConnection) = r { return toConnection }
-    throw r
+    throw r.unexpected
 }
 
-func apiChangeConnectionUser(connId: Int64, userId: Int64) async throws -> PendingContactConnection? {
-    let r = await chatSendCmd(.apiChangeConnectionUser(connId: connId, userId: userId))
-    
+func apiChangeConnectionUser(connId: Int64, userId: Int64) async throws -> PendingContactConnection {
+    let r: ChatResponse1 = try await chatSendCmd(.apiChangeConnectionUser(connId: connId, userId: userId))
+
     if case let .connectionUserChanged(_, _, toConnection, _) = r {return toConnection}
-    throw r
+    throw r.unexpected
 }
 
-func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
-    let userId = try currentUserId("apiConnectPlan")
-    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
-    if case let .connectionPlan(_, connectionPlan) = r { return connectionPlan }
-    logger.error("apiConnectPlan error: \(responseError(r))")
-    throw r
+func apiConnectPlan(connLink: String) async -> ((CreatedConnLink, ConnectionPlan)?, Alert?) {
+    guard let userId = ChatModel.shared.currentUser?.userId else {
+        logger.error("apiConnectPlan: no current user")
+        return (nil, nil)
+    }
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiConnectPlan(userId: userId, connLink: connLink))
+    if case let .result(.connectionPlan(_, connLink, connPlan)) = r { return ((connLink, connPlan), nil) }
+    let alert = apiConnectResponseAlert(r.unexpected) ?? connectionErrorAlert(r)
+    return (nil, alert)
 }
 
-func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
-    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnect(incognito: Bool, connLink: CreatedConnLink) async -> (ConnReqType, PendingContactConnection)? {
+    let (r, alert) = await apiConnect_(incognito: incognito, connLink: connLink)
     if let alert = alert {
         AlertManager.shared.showAlert(alert)
         return nil
@@ -836,38 +915,49 @@ func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, Pending
     }
 }
 
-func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
+func apiConnect_(incognito: Bool, connLink: CreatedConnLink) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
         return (nil, nil)
     }
-    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiConnect(userId: userId, incognito: incognito, connLink: connLink))
     let m = ChatModel.shared
     switch r {
-    case let .sentConfirmation(_, connection):
+    case let .result(.sentConfirmation(_, connection)):
         return ((.invitation, connection), nil)
-    case let .sentInvitation(_, connection):
+    case let .result(.sentInvitation(_, connection)):
         return ((.contact, connection), nil)
-    case let .contactAlreadyExists(_, contact):
+    case let .result(.contactAlreadyExists(_, contact)):
         if let c = m.getContactChat(contact.contactId) {
             ItemsModel.shared.loadOpenChat(c.id)
         }
         let alert = contactAlreadyExistsAlert(contact)
         return (nil, alert)
-    case .chatCmdError(_, .error(.invalidConnReq)):
-        let alert = mkAlert(
+    default: ()
+    }
+    let alert = apiConnectResponseAlert(r.unexpected) ?? connectionErrorAlert(r)
+    return (nil, alert)
+}
+
+private func apiConnectResponseAlert(_ r: ChatError) -> Alert? {
+    switch r {
+    case .error(.invalidConnReq):
+        mkAlert(
             title: "Invalid connection link",
             message: "Please check that you used the correct link or ask your contact to send you another one."
         )
-        return (nil, alert)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))):
-        let alert = mkAlert(
+    case .error(.unsupportedConnReq):
+        mkAlert(
+            title: "Unsupported connection link",
+            message: "This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link."
+        )
+    case .errorAgent(.SMP(_, .AUTH)):
+        mkAlert(
             title: "Connection error (AUTH)",
             message: "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection."
         )
-        return (nil, alert)
-    case let .chatCmdError(_, .errorAgent(.SMP(_, .BLOCKED(info)))):
-        let alert = Alert(
+    case let .errorAgent(.SMP(_, .BLOCKED(info))):
+        Alert(
             title: Text("Connection blocked"),
             message: Text("Connection is blocked by server operator:\n\(info.reason.text)"),
             primaryButton: .default(Text("Ok")),
@@ -877,25 +967,22 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
                 }
             }
         )
-        return (nil, alert)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .QUOTA))):
-        let alert = mkAlert(
+    case .errorAgent(.SMP(_, .QUOTA)):
+        mkAlert(
             title: "Undelivered messages",
             message: "The connection reached the limit of undelivered messages, your contact may be offline."
         )
-        return (nil, alert)
-    case let .chatCmdError(_, .errorAgent(.INTERNAL(internalErr))):
+    case let .errorAgent(.INTERNAL(internalErr)):
         if internalErr == "SEUniqueID" {
-            let alert = mkAlert(
+            mkAlert(
                 title: "Already connected?",
                 message: "It seems like you are already connected via this link. If it is not the case, there was an error (\(responseError(r)))."
             )
-            return (nil, alert)
+        } else {
+            nil
         }
-    default: ()
+    default: nil
     }
-    let alert = connectionErrorAlert(r)
-    return (nil, alert)
 }
 
 func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
@@ -905,13 +992,13 @@ func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
     )
 }
 
-private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
+private func connectionErrorAlert<R>(_ r: APIResult<R>) -> Alert {
     if let networkErrorAlert = networkErrorAlert(r) {
         return networkErrorAlert
     } else {
         return mkAlert(
             title: "Connection error",
-            message: "Error: \(responseError(r))"
+            message: "Error: \(responseError(r.unexpected))"
         )
     }
 }
@@ -921,9 +1008,9 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
         logger.error("apiConnectContactViaAddress: no current user")
         return (nil, nil)
     }
-    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
-    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
-    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
+    if case let .result(.sentInvitationToContact(_, contact, _)) = r { return (contact, nil) }
+    logger.error("apiConnectContactViaAddress error: \(responseError(r.unexpected))")
     let alert = connectionErrorAlert(r)
     return (nil, alert)
 }
@@ -932,11 +1019,11 @@ func apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode = .
     let chatId = type.rawValue + id.description
     DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
     defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
-    throw r
+    throw r.unexpected
 }
 
 func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws -> Contact {
@@ -950,9 +1037,9 @@ func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify:
             DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) }
         }
     }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
     if case let .contactDeleted(_, contact) = r { return contact }
-    throw r
+    throw r.unexpected
 }
 
 func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
@@ -1003,9 +1090,9 @@ func deleteContactChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(noti
 
 
 func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
-    let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
+    let r: ChatResponse1 = try await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
     if case let .chatCleared(_, updatedChatInfo) = r { return updatedChatInfo }
-    throw r
+    throw r.unexpected
 }
 
 func clearChat(_ chat: Chat) async {
@@ -1020,119 +1107,132 @@ func clearChat(_ chat: Chat) async {
 
 func apiListContacts() throws -> [Contact] {
     let userId = try currentUserId("apiListContacts")
-    let r = chatSendCmdSync(.apiListContacts(userId: userId))
+    let r: ChatResponse1 = try chatSendCmdSync(.apiListContacts(userId: userId))
     if case let .contactsList(_, contacts) = r { return contacts }
-    throw r
+    throw r.unexpected
 }
 
 func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
     let userId = try currentUserId("apiUpdateProfile")
-    let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
-    case .userProfileNoChange: return (profile, [])
-    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
-    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
-    default: throw r
+    case .result(.userProfileNoChange): return (profile, [])
+    case let .result(.userProfileUpdated(_, _, toProfile, updateSummary)): return (toProfile, updateSummary.changedContacts)
+    case .error(.errorStore(.duplicateName)): return nil;
+    default: throw r.unexpected
     }
 }
 
 func apiSetProfileAddress(on: Bool) async throws -> User? {
     let userId = try currentUserId("apiSetProfileAddress")
-    let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
     switch r {
     case .userProfileNoChange: return nil
     case let .userProfileUpdated(user, _, _, _): return user
-    default: throw r
+    default: throw r.unexpected
     }
 }
 
 func apiSetContactPrefs(contactId: Int64, preferences: Preferences) async throws -> Contact? {
-    let r = await chatSendCmd(.apiSetContactPrefs(contactId: contactId, preferences: preferences))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetContactPrefs(contactId: contactId, preferences: preferences))
     if case let .contactPrefsUpdated(_, _, toContact) = r { return toContact }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetContactAlias(contactId: Int64, localAlias: String) async throws -> Contact? {
-    let r = await chatSendCmd(.apiSetContactAlias(contactId: contactId, localAlias: localAlias))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetContactAlias(contactId: contactId, localAlias: localAlias))
     if case let .contactAliasUpdated(_, toContact) = r { return toContact }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetGroupAlias(groupId: Int64, localAlias: String) async throws -> GroupInfo? {
-    let r = await chatSendCmd(.apiSetGroupAlias(groupId: groupId, localAlias: localAlias))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetGroupAlias(groupId: groupId, localAlias: localAlias))
     if case let .groupAliasUpdated(_, toGroup) = r { return toGroup }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetConnectionAlias(connId: Int64, localAlias: String) async throws -> PendingContactConnection? {
-    let r = await chatSendCmd(.apiSetConnectionAlias(connId: connId, localAlias: localAlias))
+    let r: ChatResponse1 = try await chatSendCmd(.apiSetConnectionAlias(connId: connId, localAlias: localAlias))
     if case let .connectionAliasUpdated(_, toConnection) = r { return toConnection }
-    throw r
+    throw r.unexpected
 }
 
 func apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?) async -> Bool {
-    let r = await chatSendCmd(.apiSetUserUIThemes(userId: userId, themes: themes))
-    if case .cmdOk = r { return true }
-    logger.error("apiSetUserUIThemes bad response: \(String(describing: r))")
-    return false
+    do {
+        try await sendCommandOkResp(.apiSetUserUIThemes(userId: userId, themes: themes))
+        return true
+    } catch {
+        logger.error("apiSetUserUIThemes bad response: \(responseError(error))")
+        return false
+    }
 }
 
 func apiSetChatUIThemes(chatId: ChatId, themes: ThemeModeOverrides?) async -> Bool {
-    let r = await chatSendCmd(.apiSetChatUIThemes(chatId: chatId, themes: themes))
-    if case .cmdOk = r { return true }
-    logger.error("apiSetChatUIThemes bad response: \(String(describing: r))")
-    return false
+    do {
+        try await sendCommandOkResp(.apiSetChatUIThemes(chatId: chatId, themes: themes))
+        return true
+    } catch {
+        logger.error("apiSetChatUIThemes bad response: \(responseError(error))")
+        return false
+    }
 }
 
 
-func apiCreateUserAddress() async throws -> String {
+func apiCreateUserAddress(short: Bool) async throws -> CreatedConnLink {
     let userId = try currentUserId("apiCreateUserAddress")
-    let r = await chatSendCmd(.apiCreateMyAddress(userId: userId))
-    if case let .userContactLinkCreated(_, connReq) = r { return connReq }
-    throw r
+    let r: ChatResponse1 = try await chatSendCmd(.apiCreateMyAddress(userId: userId, short: short))
+    if case let .userContactLinkCreated(_, connLink) = r { return connLink }
+    throw r.unexpected
 }
 
 func apiDeleteUserAddress() async throws -> User? {
     let userId = try currentUserId("apiDeleteUserAddress")
-    let r = await chatSendCmd(.apiDeleteMyAddress(userId: userId))
+    let r: ChatResponse1 = try await chatSendCmd(.apiDeleteMyAddress(userId: userId))
     if case let .userContactLinkDeleted(user) = r { return user }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetUserAddress() throws -> UserContactLink? {
     let userId = try currentUserId("apiGetUserAddress")
-    return try userAddressResponse(chatSendCmdSync(.apiShowMyAddress(userId: userId)))
+    return try userAddressResponse(chatApiSendCmdSync(.apiShowMyAddress(userId: userId)))
 }
 
 func apiGetUserAddressAsync() async throws -> UserContactLink? {
     let userId = try currentUserId("apiGetUserAddressAsync")
-    return try userAddressResponse(await chatSendCmd(.apiShowMyAddress(userId: userId)))
+    return try userAddressResponse(await chatApiSendCmd(.apiShowMyAddress(userId: userId)))
 }
 
-private func userAddressResponse(_ r: ChatResponse) throws -> UserContactLink? {
+private func userAddressResponse(_ r: APIResult<ChatResponse1>) throws -> UserContactLink? {
     switch r {
-    case let .userContactLink(_, contactLink): return contactLink
-    case .chatCmdError(_, chatError: .errorStore(storeError: .userContactLinkNotFound)): return nil
-    default: throw r
+    case let .result(.userContactLink(_, contactLink)): return contactLink
+    case .error(.errorStore(storeError: .userContactLinkNotFound)): return nil
+    default: throw r.unexpected
     }
 }
 
+func apiAddMyAddressShortLink() async throws -> UserContactLink {
+    let userId = try currentUserId("apiAddMyAddressShortLink")
+    let r: ChatResponse1 = try await chatSendCmd(.apiAddMyAddressShortLink(userId: userId))
+    if case let .userContactLink(_, contactLink) = r { return contactLink }
+    throw r.unexpected
+}
+
 func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContactLink? {
     let userId = try currentUserId("userAddressAutoAccept")
-    let r = await chatSendCmd(.apiAddressAutoAccept(userId: userId, autoAccept: autoAccept))
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiAddressAutoAccept(userId: userId, autoAccept: autoAccept))
     switch r {
-    case let .userContactLinkUpdated(_, contactLink): return contactLink
-    case .chatCmdError(_, chatError: .errorStore(storeError: .userContactLinkNotFound)): return nil
-    default: throw r
+    case let .result(.userContactLinkUpdated(_, contactLink)): return contactLink
+    case .error(.errorStore(storeError: .userContactLinkNotFound)): return nil
+    default: throw r.unexpected
     }
 }
 
 func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Contact? {
-    let r = await chatSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
+    let r: APIResult<ChatResponse1> = await chatApiSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
     let am = AlertManager.shared
 
-    if case let .acceptingContactRequest(_, contact) = r { return contact }
-    if case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))) = r {
+    if case let .result(.acceptingContactRequest(_, contact)) = r { return contact }
+    if case .error(.errorAgent(.SMP(_, .AUTH))) = r {
         am.showAlertMsg(
             title: "Connection error (AUTH)",
             message: "Sender may have deleted the connection request."
@@ -1143,24 +1243,26 @@ func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Cont
         logger.error("apiAcceptContactRequest error: \(String(describing: r))")
         am.showAlertMsg(
             title: "Error accepting contact request",
-            message: "Error: \(responseError(r))"
+            message: "Error: \(responseError(r.unexpected))"
         )
     }
     return nil
 }
 
 func apiRejectContactRequest(contactReqId: Int64) async throws {
-    let r = await chatSendCmd(.apiRejectContact(contactReqId: contactReqId))
+    let r: ChatResponse1 = try await chatSendCmd(.apiRejectContact(contactReqId: contactReqId))
     if case .contactRequestRejected = r { return }
-    throw r
+    throw r.unexpected
 }
 
-func apiChatRead(type: ChatType, id: Int64) async throws {
-    try await sendCommandOkResp(.apiChatRead(type: type, id: id))
+func apiChatRead(type: ChatType, id: Int64, scope: GroupChatScope?) async throws {
+    try await sendCommandOkResp(.apiChatRead(type: type, id: id, scope: scope))
 }
 
-func apiChatItemsRead(type: ChatType, id: Int64, itemIds: [Int64]) async throws {
-    try await sendCommandOkResp(.apiChatItemsRead(type: type, id: id, itemIds: itemIds))
+func apiChatItemsRead(type: ChatType, id: Int64, scope: GroupChatScope?, itemIds: [Int64]) async throws -> ChatInfo {
+    let r: ChatResponse1 = try await chatSendCmd(.apiChatItemsRead(type: type, id: id, scope: scope, itemIds: itemIds))
+    if case let .itemsReadForChat(_, updatedChatInfo) = r { return updatedChatInfo }
+    throw r.unexpected
 }
 
 func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
@@ -1168,31 +1270,33 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
 }
 
 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 {
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.apiUploadStandaloneFile(userId: user.userId, file: file), ctrl: ctrl)
+    if case let .result(.sndStandaloneFileCreated(_, fileTransferMeta)) = r {
         return (fileTransferMeta, nil)
     } else {
-        logger.error("uploadStandaloneFile error: \(String(describing: r))")
-        return (nil, responseError(r))
+        let err = responseError(r.unexpected)
+        logger.error("uploadStandaloneFile error: \(err)")
+        return (nil, err)
     }
 }
 
 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 {
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.apiDownloadStandaloneFile(userId: user.userId, url: url, file: file), ctrl: ctrl)
+    if case let .result(.rcvStandaloneFileCreated(_, rcvFileTransfer)) = r {
         return (rcvFileTransfer, nil)
     } else {
-        logger.error("downloadStandaloneFile error: \(String(describing: r))")
-        return (nil, responseError(r))
+        let err = responseError(r.unexpected)
+        logger.error("downloadStandaloneFile error: \(err)")
+        return (nil, err)
     }
 }
 
 func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationFileLinkData? {
-    let r = await chatSendCmd(.apiStandaloneFileInfo(url: url), ctrl)
-    if case let .standaloneFileInfo(fileMeta) = r {
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.apiStandaloneFileInfo(url: url), ctrl: ctrl)
+    if case let .result(.standaloneFileInfo(fileMeta)) = r {
         return fileMeta
     } else {
-        logger.error("standaloneFileInfo error: \(String(describing: r))")
+        logger.error("standaloneFileInfo error: \(responseError(r.unexpected))")
         return nil
     }
 }
@@ -1207,12 +1311,12 @@ func receiveFile(user: any UserLike, fileId: Int64, userApprovedRelays: Bool = f
 }
 
 func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool = false, auto: Bool = false) async {
-    var fileIdsToApprove = [Int64]()
-    var srvsToApprove = Set<String>()
-    var otherFileErrs = [ChatResponse]()
-
+    var fileIdsToApprove: [Int64] = []
+    var srvsToApprove: Set<String> = []
+    var otherFileErrs: [APIResult<ChatResponse2>] = []
+    
     for fileId in fileIds {
-        let r = await chatSendCmd(
+        let r: APIResult<ChatResponse2> = await chatApiSendCmd(
             .receiveFile(
                 fileId: fileId,
                 userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
@@ -1221,32 +1325,22 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
             )
         )
         switch r {
-        case let .rcvFileAccepted(_, chatItem):
+        case let .result(.rcvFileAccepted(_, chatItem)):
             await chatItemSimpleUpdate(user, chatItem)
+            // TODO when aChatItem added
+            //        case let .rcvFileAcceptedSndCancelled(user, aChatItem, _):
+            //            await chatItemSimpleUpdate(user, aChatItem)
+            //            Task { cleanupFile(aChatItem) }
+        case let .error(.error(.fileNotApproved(fileId, unknownServers))):
+            fileIdsToApprove.append(fileId)
+            srvsToApprove.formUnion(unknownServers)
         default:
-            if let chatError = chatError(r) {
-                switch chatError {
-                case let .fileNotApproved(fileId, unknownServers):
-                    fileIdsToApprove.append(fileId)
-                    srvsToApprove.formUnion(unknownServers)
-                default:
-                    otherFileErrs.append(r)
-                }
-            }
+            otherFileErrs.append(r)
         }
     }
-
+    
     if !auto {
-        let otherErrsStr = if otherFileErrs.isEmpty {
-            ""
-        } else if otherFileErrs.count == 1 {
-            "\(otherFileErrs[0])"
-        } else if otherFileErrs.count == 2 {
-            "\(otherFileErrs[0])\n\(otherFileErrs[1])"
-        } else {
-            "\(otherFileErrs[0])\n\(otherFileErrs[1])\nand \(otherFileErrs.count - 2) other error(s)"
-        }
-
+        let otherErrsStr = fileErrorStrs(otherFileErrs)
         // If there are not approved files, alert is shown the same way both in case of singular and plural files reception
         if !fileIdsToApprove.isEmpty {
             let srvs = srvsToApprove
@@ -1282,7 +1376,7 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
         } else if otherFileErrs.count == 1 { // If there is a single other error, we differentiate on it
             let errorResponse = otherFileErrs.first!
             switch errorResponse {
-            case let .rcvFileAcceptedSndCancelled(_, rcvFileTransfer):
+            case let .result(.rcvFileAcceptedSndCancelled(_, rcvFileTransfer)):
                 logger.debug("receiveFiles error: sender cancelled file transfer \(rcvFileTransfer.fileId)")
                 await MainActor.run {
                     showAlert(
@@ -1290,19 +1384,14 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
                         message: NSLocalizedString("Sender cancelled file transfer.", comment: "alert message")
                     )
                 }
+            case .error(.error(.fileCancelled)), .error(.error(.fileAlreadyReceiving)):
+                logger.debug("receiveFiles ignoring FileCancelled or FileAlreadyReceiving error")
             default:
-                if let chatError = chatError(errorResponse) {
-                    switch chatError {
-                    case .fileCancelled, .fileAlreadyReceiving:
-                        logger.debug("receiveFiles ignoring FileCancelled or FileAlreadyReceiving error")
-                    default:
-                        await MainActor.run {
-                            showAlert(
-                                NSLocalizedString("Error receiving file", comment: "alert title"),
-                                message: responseError(errorResponse)
-                            )
-                        }
-                    }
+                await MainActor.run {
+                    showAlert(
+                        NSLocalizedString("Error receiving file", comment: "alert title"),
+                        message: responseError(errorResponse.unexpected)
+                    )
                 }
             }
         } else if otherFileErrs.count > 1 { // If there are multiple other errors, we show general alert
@@ -1314,8 +1403,22 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
             }
         }
     }
+    
+    func fileErrorStrs(_ errs: [APIResult<ChatResponse2>]) -> String {
+        var errStr = ""
+        if errs.count >= 1 {
+            errStr = String(describing: errs[0].unexpected)
+        }
+        if errs.count >= 2 {
+            errStr += "\n\(String(describing: errs[1].unexpected))"
+        }
+        if errs.count > 2 {
+            errStr += "\nand \(errs.count - 2) other error(s)"
+        }
+        return errStr
+    }
 }
-
+    
 func cancelFile(user: User, fileId: Int64) async {
     if let chatItem = await apiCancelFile(fileId: fileId) {
         await chatItemSimpleUpdate(user, chatItem)
@@ -1324,12 +1427,12 @@ 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)
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.cancelFile(fileId: fileId), ctrl: ctrl)
     switch r {
-    case let .sndFileCancelled(_, chatItem, _, _) : return chatItem
-    case let .rcvFileCancelled(_, chatItem, _) : return chatItem
+    case let .result(.sndFileCancelled(_, chatItem, _, _)) : return chatItem
+    case let .result(.rcvFileCancelled(_, chatItem, _)) : return chatItem
     default:
-        logger.error("apiCancelFile error: \(String(describing: r))")
+        logger.error("apiCancelFile error: \(responseError(r.unexpected))")
         return nil
     }
 }
@@ -1339,9 +1442,9 @@ func setLocalDeviceName(_ displayName: String) throws {
 }
 
 func connectRemoteCtrl(desktopAddress: String) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
+    let r: ChatResponse2 = try await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
     if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
+    throw r.unexpected
 }
 
 func findKnownRemoteCtrl() async throws {
@@ -1349,21 +1452,21 @@ func findKnownRemoteCtrl() async throws {
 }
 
 func confirmRemoteCtrl(_ rcId: Int64) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.confirmRemoteCtrl(remoteCtrlId: rcId))
+    let r: ChatResponse2 = try await chatSendCmd(.confirmRemoteCtrl(remoteCtrlId: rcId))
     if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
+    throw r.unexpected
 }
 
 func verifyRemoteCtrlSession(_ sessCode: String) async throws -> RemoteCtrlInfo {
-    let r = await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
+    let r: ChatResponse2 = try await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
     if case let .remoteCtrlConnected(rc) = r { return rc }
-    throw r
+    throw r.unexpected
 }
 
 func listRemoteCtrls() throws -> [RemoteCtrlInfo] {
-    let r = chatSendCmdSync(.listRemoteCtrls)
+    let r: ChatResponse2 = try chatSendCmdSync(.listRemoteCtrls)
     if case let .remoteCtrlList(rcInfo) = r { return rcInfo }
-    throw r
+    throw r.unexpected
 }
 
 func stopRemoteCtrl() async throws {
@@ -1374,8 +1477,8 @@ func deleteRemoteCtrl(_ rcId: Int64) async throws {
     try await sendCommandOkResp(.deleteRemoteCtrl(remoteCtrlId: rcId))
 }
 
-func networkErrorAlert(_ r: ChatResponse) -> Alert? {
-    if let alert = getNetworkErrorAlert(r) {
+func networkErrorAlert<R>(_ res: APIResult<R>) -> Alert? {
+    if case let .error(e) = res, let alert = getNetworkErrorAlert(e) {
         return mkAlert(title: alert.title, message: alert.message)
     } else {
         return nil
@@ -1437,15 +1540,15 @@ func apiEndCall(_ contact: Contact) async throws {
 }
 
 func apiGetCallInvitationsSync() throws -> [RcvCallInvitation] {
-    let r = chatSendCmdSync(.apiGetCallInvitations)
+    let r: ChatResponse2 = try chatSendCmdSync(.apiGetCallInvitations)
     if case let .callInvitations(invs) = r { return invs }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
-    let r = await chatSendCmd(.apiGetCallInvitations)
+    let r: ChatResponse2 = try await chatSendCmd(.apiGetCallInvitations)
     if case let .callInvitations(invs) = r { return invs }
-    throw r
+    throw r.unexpected
 }
 
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
@@ -1457,18 +1560,18 @@ func apiCallStatus(_ contact: Contact, _ status: String) async throws {
 }
 
 func apiGetNetworkStatuses() throws -> [ConnNetworkStatus] {
-    let r = chatSendCmdSync(.apiGetNetworkStatuses)
+    let r: ChatResponse1 = try chatSendCmdSync(.apiGetNetworkStatuses)
     if case let .networkStatuses(_, statuses) = r { return statuses }
-    throw r
+    throw r.unexpected
 }
 
-func markChatRead(_ chat: Chat) async {
+func markChatRead(_ im: ItemsModel, _ chat: Chat) async {
     do {
         if chat.chatStats.unreadCount > 0 {
             let cInfo = chat.chatInfo
-            try await apiChatRead(type: cInfo.chatType, id: cInfo.apiId)
+            try await apiChatRead(type: cInfo.chatType, id: cInfo.apiId, scope: cInfo.groupChatScope())
             await MainActor.run {
-                withAnimation { ChatModel.shared.markChatItemsRead(cInfo) }
+                withAnimation { ChatModel.shared.markAllChatItemsRead(im, cInfo) }
             }
         }
         if chat.chatStats.unreadChat {
@@ -1491,40 +1594,41 @@ func markChatUnread(_ chat: Chat, unreadChat: Bool = true) async {
     }
 }
 
-func apiMarkChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) async {
+func apiMarkChatItemsRead(_ im: ItemsModel, _ cInfo: ChatInfo, _ itemIds: [ChatItem.ID], mentionsRead: Int) async {
     do {
-        try await apiChatItemsRead(type: cInfo.chatType, id: cInfo.apiId, itemIds: itemIds)
-        DispatchQueue.main.async {
-            ChatModel.shared.markChatItemsRead(cInfo, itemIds)
+        let updatedChatInfo = try await apiChatItemsRead(type: cInfo.chatType, id: cInfo.apiId, scope: cInfo.groupChatScope(), itemIds: itemIds)
+        await MainActor.run {
+            ChatModel.shared.updateChatInfo(updatedChatInfo)
+            ChatModel.shared.markChatItemsRead(im, cInfo, itemIds, mentionsRead)
         }
     } catch {
         logger.error("apiChatItemsRead error: \(responseError(error))")
     }
 }
 
-private func sendCommandOkResp(_ cmd: ChatCommand, _ ctrl: chat_ctrl? = nil) async throws {
-    let r = await chatSendCmd(cmd, ctrl)
+private func sendCommandOkResp(_ cmd: ChatCommand, ctrl: chat_ctrl? = nil) async throws {
+    let r: ChatResponse2 = try await chatSendCmd(cmd, ctrl: ctrl)
     if case .cmdOk = r { return }
-    throw r
+    throw r.unexpected
 }
 
 private func sendCommandOkRespSync(_ cmd: ChatCommand) throws {
-    let r = chatSendCmdSync(cmd)
+    let r: ChatResponse2 = try chatSendCmdSync(cmd)
     if case .cmdOk = r { return }
-    throw r
+    throw r.unexpected
 }
 
 func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
     let userId = try currentUserId("apiNewGroup")
-    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
+    let r: ChatResponse2 = try chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
     if case let .groupCreated(_, groupInfo) = r { return groupInfo }
-    throw r
+    throw r.unexpected
 }
 
 func apiAddMember(_ groupId: Int64, _ contactId: Int64, _ memberRole: GroupMemberRole) async throws -> GroupMember {
-    let r = await chatSendCmd(.apiAddMember(groupId: groupId, contactId: contactId, memberRole: memberRole))
+    let r: ChatResponse2 = try await chatSendCmd(.apiAddMember(groupId: groupId, contactId: contactId, memberRole: memberRole))
     if case let .sentGroupInvitation(_, _, _, member) = r { return member }
-    throw r
+    throw r.unexpected
 }
 
 enum JoinGroupResult {
@@ -1534,31 +1638,43 @@ enum JoinGroupResult {
 }
 
 func apiJoinGroup(_ groupId: Int64) async throws -> JoinGroupResult {
-    let r = await chatSendCmd(.apiJoinGroup(groupId: groupId))
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.apiJoinGroup(groupId: groupId))
     switch r {
-    case let .userAcceptedGroupSent(_, groupInfo, _): return .joined(groupInfo: groupInfo)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))): return .invitationRemoved
-    case .chatCmdError(_, .errorStore(.groupNotFound)): return .groupNotFound
-    default: throw r
+    case let .result(.userAcceptedGroupSent(_, groupInfo, _)): return .joined(groupInfo: groupInfo)
+    case .error(.errorAgent(.SMP(_, .AUTH))): return .invitationRemoved
+    case .error(.errorStore(.groupNotFound)): return .groupNotFound
+    default: throw r.unexpected
     }
 }
 
-func apiRemoveMember(_ groupId: Int64, _ memberId: Int64) async throws -> GroupMember {
-    let r = await chatSendCmd(.apiRemoveMember(groupId: groupId, memberId: memberId), bgTask: false)
-    if case let .userDeletedMember(_, _, member) = r { return member }
-    throw r
+func apiAcceptMember(_ groupId: Int64, _ groupMemberId: Int64, _ memberRole: GroupMemberRole) async throws -> (GroupInfo, GroupMember) {
+    let r: ChatResponse2 = try await chatSendCmd(.apiAcceptMember(groupId: groupId, groupMemberId: groupMemberId, memberRole: memberRole))
+    if case let .memberAccepted(_, groupInfo, member) = r { return (groupInfo, member) }
+    throw r.unexpected
 }
 
-func apiMemberRole(_ groupId: Int64, _ memberId: Int64, _ memberRole: GroupMemberRole) async throws -> GroupMember {
-    let r = await chatSendCmd(.apiMemberRole(groupId: groupId, memberId: memberId, memberRole: memberRole), bgTask: false)
-    if case let .memberRoleUser(_, _, member, _, _) = r { return member }
-    throw r
+func apiDeleteMemberSupportChat(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupInfo, GroupMember) {
+    let r: ChatResponse2 = try await chatSendCmd(.apiDeleteMemberSupportChat(groupId: groupId, groupMemberId: groupMemberId))
+    if case let .memberSupportChatDeleted(_, groupInfo, member) = r { return (groupInfo, member) }
+    throw r.unexpected
 }
 
-func apiBlockMemberForAll(_ groupId: Int64, _ memberId: Int64, _ blocked: Bool) async throws -> GroupMember {
-    let r = await chatSendCmd(.apiBlockMemberForAll(groupId: groupId, memberId: memberId, blocked: blocked), bgTask: false)
-    if case let .memberBlockedForAllUser(_, _, member, _) = r { return member }
-    throw r
+func apiRemoveMembers(_ groupId: Int64, _ memberIds: [Int64], _ withMessages: Bool = false) async throws -> (GroupInfo, [GroupMember]) {
+    let r: ChatResponse2 = try await chatSendCmd(.apiRemoveMembers(groupId: groupId, memberIds: memberIds, withMessages: withMessages), bgTask: false)
+    if case let .userDeletedMembers(_, updatedGroupInfo, members, _withMessages) = r { return (updatedGroupInfo, members) }
+    throw r.unexpected
+}
+
+func apiMembersRole(_ groupId: Int64, _ memberIds: [Int64], _ memberRole: GroupMemberRole) async throws -> [GroupMember] {
+    let r: ChatResponse2 = try await chatSendCmd(.apiMembersRole(groupId: groupId, memberIds: memberIds, memberRole: memberRole), bgTask: false)
+    if case let .membersRoleUser(_, _, members, _) = r { return members }
+    throw r.unexpected
+}
+
+func apiBlockMembersForAll(_ groupId: Int64, _ memberIds: [Int64], _ blocked: Bool) async throws -> [GroupMember] {
+    let r: ChatResponse2 = try await chatSendCmd(.apiBlockMembersForAll(groupId: groupId, memberIds: memberIds, blocked: blocked), bgTask: false)
+    if case let .membersBlockedForAllUser(_, _, members, _) = r { return members }
+    throw r.unexpected
 }
 
 func leaveGroup(_ groupId: Int64) async {
@@ -1571,92 +1687,100 @@ func leaveGroup(_ groupId: Int64) async {
 }
 
 func apiLeaveGroup(_ groupId: Int64) async throws -> GroupInfo {
-    let r = await chatSendCmd(.apiLeaveGroup(groupId: groupId), bgTask: false)
+    let r: ChatResponse2 = try await chatSendCmd(.apiLeaveGroup(groupId: groupId), bgTask: false)
     if case let .leftMemberUser(_, groupInfo) = r { return groupInfo }
-    throw r
+    throw r.unexpected
 }
 
+// use ChatModel's loadGroupMembers from views
 func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
-    let r = await chatSendCmd(.apiListMembers(groupId: groupId))
-    if case let .groupMembers(_, group) = r { return group.members }
+    let r: APIResult<ChatResponse2> = await chatApiSendCmd(.apiListMembers(groupId: groupId))
+    if case let .result(.groupMembers(_, group)) = r { return group.members }
     return []
 }
 
 func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
     let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
     return ChatModel.shared.chats
-        .compactMap{ $0.chatInfo.contact }
-        .filter{ c in c.sendMsgEnabled && !c.nextSendGrpInv && !memberContactIds.contains(c.apiId) }
+        .compactMap{ c in c.chatInfo.sendMsgEnabled ? c.chatInfo.contact : nil }
+        .filter{ c in !c.nextSendGrpInv && !memberContactIds.contains(c.apiId) }
         .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }
 
 func apiUpdateGroup(_ groupId: Int64, _ groupProfile: GroupProfile) async throws -> GroupInfo {
-    let r = await chatSendCmd(.apiUpdateGroupProfile(groupId: groupId, groupProfile: groupProfile))
+    let r: ChatResponse2 = try await chatSendCmd(.apiUpdateGroupProfile(groupId: groupId, groupProfile: groupProfile))
     if case let .groupUpdated(_, toGroup) = r { return toGroup }
-    throw r
+    throw r.unexpected
 }
 
-func apiCreateGroupLink(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (String, GroupMemberRole) {
-    let r = await chatSendCmd(.apiCreateGroupLink(groupId: groupId, memberRole: memberRole))
-    if case let .groupLinkCreated(_, _, connReq, memberRole) = r { return (connReq, memberRole) }
-    throw r
+func apiCreateGroupLink(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (CreatedConnLink, GroupMemberRole) {
+    let short = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)
+    let r: ChatResponse2 = try await chatSendCmd(.apiCreateGroupLink(groupId: groupId, memberRole: memberRole, short: short))
+    if case let .groupLinkCreated(_, _, connLink, memberRole) = r { return (connLink, memberRole) }
+    throw r.unexpected
 }
 
-func apiGroupLinkMemberRole(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (String, GroupMemberRole) {
-    let r = await chatSendCmd(.apiGroupLinkMemberRole(groupId: groupId, memberRole: memberRole))
-    if case let .groupLink(_, _, connReq, memberRole) = r { return (connReq, memberRole) }
-    throw r
+func apiGroupLinkMemberRole(_ groupId: Int64, memberRole: GroupMemberRole = .member) async throws -> (CreatedConnLink, GroupMemberRole) {
+    let r: ChatResponse2 = try await chatSendCmd(.apiGroupLinkMemberRole(groupId: groupId, memberRole: memberRole))
+    if case let .groupLink(_, _, connLink, memberRole) = r { return (connLink, memberRole) }
+    throw r.unexpected
 }
 
 func apiDeleteGroupLink(_ groupId: Int64) async throws {
-    let r = await chatSendCmd(.apiDeleteGroupLink(groupId: groupId))
+    let r: ChatResponse2 = try await chatSendCmd(.apiDeleteGroupLink(groupId: groupId))
     if case .groupLinkDeleted = r { return }
-    throw r
+    throw r.unexpected
 }
 
-func apiGetGroupLink(_ groupId: Int64) throws -> (String, GroupMemberRole)? {
-    let r = chatSendCmdSync(.apiGetGroupLink(groupId: groupId))
+func apiGetGroupLink(_ groupId: Int64) throws -> (CreatedConnLink, GroupMemberRole)? {
+    let r: APIResult<ChatResponse2> = chatApiSendCmdSync(.apiGetGroupLink(groupId: groupId))
     switch r {
-    case let .groupLink(_, _, connReq, memberRole):
-        return (connReq, memberRole)
-    case .chatCmdError(_, chatError: .errorStore(storeError: .groupLinkNotFound)):
+    case let .result(.groupLink(_, _, connLink, memberRole)):
+        return (connLink, memberRole)
+    case .error(.errorStore(storeError: .groupLinkNotFound)):
         return nil
-    default: throw r
+    default: throw r.unexpected
     }
 }
 
+func apiAddGroupShortLink(_ groupId: Int64) async throws -> (CreatedConnLink, GroupMemberRole) {
+    let r: ChatResponse2 = try await chatSendCmd(.apiAddGroupShortLink(groupId: groupId))
+    if case let .groupLink(_, _, connLink, memberRole) = r { return (connLink, memberRole) }
+    throw r.unexpected
+}
+
 func apiCreateMemberContact(_ groupId: Int64, _ groupMemberId: Int64) async throws -> Contact {
-    let r = await chatSendCmd(.apiCreateMemberContact(groupId: groupId, groupMemberId: groupMemberId))
+    let r: ChatResponse2 = try await chatSendCmd(.apiCreateMemberContact(groupId: groupId, groupMemberId: groupMemberId))
     if case let .newMemberContact(_, contact, _, _) = r { return contact }
-    throw r
+    throw r.unexpected
 }
 
 func apiSendMemberContactInvitation(_ contactId: Int64, _ msg: MsgContent) async throws -> Contact {
-    let r = await chatSendCmd(.apiSendMemberContactInvitation(contactId: contactId, msg: msg), bgDelay: msgDelay)
+    let r: ChatResponse2 = try await chatSendCmd(.apiSendMemberContactInvitation(contactId: contactId, msg: msg), bgDelay: msgDelay)
     if case let .newMemberContactSentInv(_, contact, _, _) = r { return contact }
-    throw r
+    throw r.unexpected
 }
 
 func apiGetVersion() throws -> CoreVersionInfo {
-    let r = chatSendCmdSync(.showVersion)
+    let r: ChatResponse2 = try chatSendCmdSync(.showVersion)
     if case let .versionInfo(info, _, _) = r { return info }
-    throw r
+    throw r.unexpected
 }
 
 func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
     let userId = try currentUserId("getAgentSubsTotal")
-    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
+    let r: ChatResponse2 = try await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
     if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
     logger.error("getAgentSubsTotal error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func getAgentServersSummary() throws -> PresentedServersSummary {
     let userId = try currentUserId("getAgentServersSummary")
-    let r = chatSendCmdSync(.getAgentServersSummary(userId: userId), log: false)
+    let r: ChatResponse2 = try chatSendCmdSync(.getAgentServersSummary(userId: userId), log: false)
     if case let .agentServersSummary(_, serversSummary) = r { return serversSummary }
     logger.error("getAgentServersSummary error: \(String(describing: r))")
-    throw r
+    throw r.unexpected
 }
 
 func resetAgentServersStats() async throws {
@@ -1866,7 +1990,7 @@ class ChatReceiver {
     private var receiveMessages = true
     private var _lastMsgTime = Date.now
 
-    var messagesChannel: ((ChatResponse) -> Void)? = nil
+    var messagesChannel: ((APIResult<ChatEvent>) -> Void)? = nil
 
     static let shared = ChatReceiver()
 
@@ -1884,7 +2008,12 @@ class ChatReceiver {
         while self.receiveMessages {
             if let msg = await chatRecvMsg() {
                 self._lastMsgTime = .now
-                await processReceivedMsg(msg)
+                Task { await TerminalItems.shared.addResult(msg) }
+                switch msg {
+                case let .result(evt): await processReceivedMsg(evt)
+                case let .error(err): logger.debug("chatRecvMsg error: \(responseError(err))")
+                case let .invalid(type, json): logger.debug("chatRecvMsg event: * \(type) \(dataToString(json))")
+                }
                 if let messagesChannel {
                     messagesChannel(msg)
                 }
@@ -1901,10 +2030,7 @@ class ChatReceiver {
     }
 }
 
-func processReceivedMsg(_ res: ChatResponse) async {
-    Task {
-        await TerminalItems.shared.add(.resp(.now, res))
-    }
+func processReceivedMsg(_ res: ChatEvent) async {
     let m = ChatModel.shared
     let n = NetworkModel.shared
     logger.debug("processReceivedMsg: \(res.responseType)")
@@ -2027,7 +2153,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
                     if cItem.isActiveReport {
                         m.increaseGroupReportsCounter(cInfo.id)
                     }
-                } else if cItem.isRcvNew && cInfo.ntfsEnabled {
+                } else if cItem.isRcvNew && cInfo.ntfsEnabled(chatItem: cItem) {
                     m.increaseUnreadCounter(user: user)
                 }
             }
@@ -2045,7 +2171,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
             let cInfo = chatItem.chatInfo
             let cItem = chatItem.chatItem
             if !cItem.isDeletedContent && active(user) {
-                await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
+                _ = await MainActor.run { m.upsertChatItem(cInfo, cItem) }
             }
             if let endTask = m.messageDelivery[cItem.id] {
                 switch cItem.meta.itemStatus {
@@ -2072,7 +2198,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .chatItemsDeleted(user, items, _):
         if !active(user) {
             for item in items {
-                if item.toChatItem == nil && item.deletedChatItem.chatItem.isRcvNew && item.deletedChatItem.chatInfo.ntfsEnabled {
+                let d = item.deletedChatItem
+                if item.toChatItem == nil && d.chatItem.isRcvNew && d.chatInfo.ntfsEnabled(chatItem: d.chatItem) {
                     await MainActor.run {
                         m.decreaseUnreadCounter(user: user)
                     }
@@ -2088,42 +2215,16 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 } else {
                     m.removeChatItem(item.deletedChatItem.chatInfo, item.deletedChatItem.chatItem)
                 }
+                if item.deletedChatItem.chatItem.isActiveReport {
+                    m.decreaseGroupReportsCounter(item.deletedChatItem.chatInfo.id)
+                }
+            }
+            if let updatedChatInfo = items.last?.deletedChatItem.chatInfo {
+                m.updateChatInfo(updatedChatInfo)
             }
         }
     case let .groupChatItemsDeleted(user, groupInfo, chatItemIDs, _, member_):
-        if !active(user) {
-            do {
-                let users = try listUsers()
-                await MainActor.run {
-                    m.users = users
-                }
-            } catch {
-                logger.error("Error loading users: \(error)")
-            }
-            return
-        }
-        let im = ItemsModel.shared
-        let cInfo = ChatInfo.group(groupInfo: groupInfo)
-        await MainActor.run {
-            m.decreaseGroupReportsCounter(cInfo.id, by: chatItemIDs.count)
-        }
-        var notFound = chatItemIDs.count
-        for ci in im.reversedChatItems {
-            if chatItemIDs.contains(ci.id) {
-                let deleted = if case let .groupRcv(groupMember) = ci.chatDir, let member_, groupMember.groupMemberId != member_.groupMemberId {
-                    CIDeleted.moderated(deletedTs: Date.now, byGroupMember: member_)
-                } else {
-                    CIDeleted.deleted(deletedTs: Date.now)
-                }
-                await MainActor.run {
-                    var newItem = ci
-                    newItem.meta.itemDeleted = deleted
-                    _ = m.upsertChatItem(cInfo, newItem)
-                }
-                notFound -= 1
-                if notFound == 0 { break }
-            }
-        }
+        await groupChatItemsDeleted(user, groupInfo, chatItemIDs, member_)
     case let .receivedGroupInvitation(user, groupInfo, _, _):
         if active(user) {
             await MainActor.run {
@@ -2143,7 +2244,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
     case let .groupLinkConnecting(user, groupInfo, hostMember):
         if !active(user) { return }
-        
+
         await MainActor.run {
             m.updateGroup(groupInfo)
             if let hostConn = hostMember.activeConn {
@@ -2169,21 +2270,36 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
         }
-    case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
+    case let .memberAcceptedByOther(user, groupInfo, _, member):
         if active(user) {
             await MainActor.run {
+                _ = m.upsertGroupMember(groupInfo, member)
                 m.updateGroup(groupInfo)
             }
         }
-    case let .deletedMember(user, groupInfo, _, deletedMember):
+    case let .deletedMemberUser(user, groupInfo, member, withMessages): // TODO update user member
         if active(user) {
             await MainActor.run {
+                m.updateGroup(groupInfo)
+                if withMessages {
+                    m.removeMemberItems(groupInfo.membership, byMember: member, groupInfo)
+                }
+            }
+        }
+    case let .deletedMember(user, groupInfo, byMember, deletedMember, withMessages):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroup(groupInfo)
                 _ = m.upsertGroupMember(groupInfo, deletedMember)
+                if withMessages {
+                    m.removeMemberItems(deletedMember, byMember: byMember, groupInfo)
+                }
             }
         }
     case let .leftMember(user, groupInfo, member):
         if active(user) {
             await MainActor.run {
+                m.updateGroup(groupInfo)
                 _ = m.upsertGroupMember(groupInfo, member)
             }
         }
@@ -2198,6 +2314,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
             await MainActor.run {
                 m.updateGroup(groupInfo)
             }
+            if m.chatId == groupInfo.id,
+               case .memberSupport(nil) = m.secondaryIM?.groupScopeInfo {
+                await MainActor.run {
+                    m.secondaryPendingInviteeChatOpened = false
+                }
+            }
         }
     case let .joinedGroupMember(user, groupInfo, member):
         if active(user) {
@@ -2244,6 +2366,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
     case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
         await chatItemSimpleUpdate(user, aChatItem)
+// TODO when aChatItem added
+//    case let .rcvFileAcceptedSndCancelled(user, aChatItem, _): // usually rcvFileAcceptedSndCancelled is a response, but it's also an event for XFTP files auto-accepted from NSE
+//        await chatItemSimpleUpdate(user, aChatItem)
+//        Task { cleanupFile(aChatItem) }
     case let .rcvFileStart(user, aChatItem):
         await chatItemSimpleUpdate(user, aChatItem)
     case let .rcvFileComplete(user, aChatItem):
@@ -2466,6 +2592,43 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     }
 }
 
+func groupChatItemsDeleted(_ user: UserRef, _ groupInfo: GroupInfo, _ chatItemIDs: Set<Int64>, _ member_: GroupMember?) async {
+    let m = ChatModel.shared
+    if !active(user) {
+        do {
+            let users = try listUsers()
+            await MainActor.run {
+                m.users = users
+            }
+        } catch {
+            logger.error("Error loading users: \(error)")
+        }
+        return
+    }
+    let im = ItemsModel.shared
+    let cInfo = ChatInfo.group(groupInfo: groupInfo, groupChatScope: nil)
+    await MainActor.run {
+        m.decreaseGroupReportsCounter(cInfo.id, by: chatItemIDs.count)
+    }
+    var notFound = chatItemIDs.count
+    for ci in im.reversedChatItems {
+        if chatItemIDs.contains(ci.id) {
+            let deleted = if case let .groupRcv(groupMember) = ci.chatDir, let member_, groupMember.groupMemberId != member_.groupMemberId {
+                CIDeleted.moderated(deletedTs: Date.now, byGroupMember: member_)
+            } else {
+                CIDeleted.deleted(deletedTs: Date.now)
+            }
+            await MainActor.run {
+                var newItem = ci
+                newItem.meta.itemDeleted = deleted
+                _ = m.upsertChatItem(cInfo, newItem)
+            }
+            notFound -= 1
+            if notFound == 0 { break }
+        }
+    }
+}
+
 func refreshCallInvitations() async throws {
     let m = ChatModel.shared
     let callInvitations = try await apiGetCallInvitations()
diff --git a/apps/ios/Shared/SimpleXApp.swift b/apps/ios/Shared/SimpleXApp.swift
index 10120db185..47c0f61c79 100644
--- a/apps/ios/Shared/SimpleXApp.swift
+++ b/apps/ios/Shared/SimpleXApp.swift
@@ -19,6 +19,7 @@ struct SimpleXApp: App {
 
     @Environment(\.scenePhase) var scenePhase
     @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @State private var appOpenUrlLater: URL?
 
     init() {
         DispatchQueue.global(qos: .background).sync {
@@ -42,7 +43,11 @@ struct SimpleXApp: App {
                 .environmentObject(AppTheme.shared)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
-                    chatModel.appOpenUrl = url
+                    if AppChatState.shared.value == .active {
+                        chatModel.appOpenUrl = url
+                    } else {
+                        appOpenUrlLater = url
+                    }
                 }
                 .onAppear() {
                     // Present screen for continue migration if it wasn't finished yet
@@ -93,7 +98,16 @@ struct SimpleXApp: App {
                                             if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
                                                 await updateCallInvitations()
                                             }
+                                            if let url = appOpenUrlLater {
+                                                await MainActor.run {
+                                                    appOpenUrlLater = nil
+                                                    chatModel.appOpenUrl = url
+                                                }
+                                            }
                                         }
+                                    } else if let url = appOpenUrlLater {
+                                        appOpenUrlLater = nil
+                                        chatModel.appOpenUrl = url
                                     }
                                 }
                             }
@@ -145,7 +159,7 @@ struct SimpleXApp: App {
             if let id = chatModel.chatId,
                let chat = chatModel.getChat(id),
                !NtfManager.shared.navigatingToChat {
-                Task { await loadChat(chat: chat, clearItems: false) }
+                Task { await loadChat(chat: chat, im: ItemsModel.shared, clearItems: false) }
             }
             if let ncr = chatModel.ntfContactRequest {
                 await MainActor.run { chatModel.ntfContactRequest = nil }
diff --git a/apps/ios/Shared/Views/Call/ActiveCallView.swift b/apps/ios/Shared/Views/Call/ActiveCallView.swift
index 2f76f1f046..ab7a47b944 100644
--- a/apps/ios/Shared/Views/Call/ActiveCallView.swift
+++ b/apps/ios/Shared/Views/Call/ActiveCallView.swift
@@ -243,7 +243,7 @@ struct ActiveCallView: View {
                 ChatReceiver.shared.messagesChannel = nil
                 return
             }
-            if case let .chatItemsStatusesUpdated(_, chatItems) = msg,
+            if case let .result(.chatItemsStatusesUpdated(_, chatItems)) = msg,
                chatItems.contains(where: { ci in
                    ci.chatInfo.id == call.contact.id &&
                    ci.chatItem.content.isSndCall &&
@@ -361,7 +361,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
+                        Text(verbatim: "(") + Text(connInfo.text) + Text(verbatim: ")")
                     }
                 }
             }
@@ -390,7 +390,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
+                        Text(verbatim: "(") + Text(connInfo.text) + Text(verbatim: ")")
                     }
                 }
             }
@@ -467,7 +467,7 @@ struct ActiveCallOverlay: View {
         .disabled(call.initialCallType == .audio && client.activeCall?.peerHasOldVersion == true)
     }
 
-    @ViewBuilder private func flipCameraButton() -> some View {
+    private func flipCameraButton() -> some View {
         controlButton(call, "arrow.triangle.2.circlepath", padding: 12) {
                 Task {
                     if await WebRTCClient.isAuthorized(for: .video) {
@@ -477,11 +477,11 @@ struct ActiveCallOverlay: View {
         }
     }
 
-    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
         callButton(imageName, call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2), padding: padding, perform)
     }
 
-    @ViewBuilder private func audioDevicePickerButton() -> some View {
+    private func audioDevicePickerButton() -> some View {
         AudioDevicePicker()
             .opacity(0.8)
             .scaleEffect(2)
diff --git a/apps/ios/Shared/Views/Chat/ChatInfoToolbar.swift b/apps/ios/Shared/Views/Chat/ChatInfoToolbar.swift
index 62a41c504a..b60842a4a0 100644
--- a/apps/ios/Shared/Views/Chat/ChatInfoToolbar.swift
+++ b/apps/ios/Shared/Views/Chat/ChatInfoToolbar.swift
@@ -22,11 +22,28 @@ struct ChatInfoToolbar: View {
                 Image(systemName: "theatermasks").frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(.indigo)
                 Spacer().frame(width: 16)
             }
-            ChatInfoImage(
-                chat: chat,
-                size: imageSize,
-                color: Color(uiColor: .tertiaryLabel)
-            )
+            ZStack(alignment: .bottomTrailing) {
+                ChatInfoImage(
+                    chat: chat,
+                    size: imageSize,
+                    color: Color(uiColor: .tertiaryLabel)
+                )
+                if chat.chatStats.reportsCount > 0 {
+                    Image(systemName: "flag.circle.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 14, height: 14)
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, .red)
+                } else if chat.supportUnreadCount > 0 {
+                    Image(systemName: "flag.circle.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 14, height: 14)
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, theme.colors.primary)
+                }
+            }
             .padding(.trailing, 4)
             let t = Text(cInfo.displayName).font(.headline)
             (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)
diff --git a/apps/ios/Shared/Views/Chat/ChatInfoView.swift b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
index 7a5003c94d..0498dc5d70 100644
--- a/apps/ios/Shared/Views/Chat/ChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
@@ -7,7 +7,7 @@
 //
 
 import SwiftUI
-import SimpleXChat
+@preconcurrency import SimpleXChat
 
 func infoRow(_ title: LocalizedStringKey, _ value: String) -> some View {
     HStack {
@@ -158,7 +158,9 @@ struct ChatInfoView: View {
                             searchButton(width: buttonWidth)
                             AudioCallButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
                             VideoButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                            muteButton(width: buttonWidth)
+                            if let nextNtfMode = chat.chatInfo.nextNtfMode {
+                                muteButton(width: buttonWidth, nextNtfMode: nextNtfMode)
+                            }
                         }
                     }
                     .padding(.trailing)
@@ -432,13 +434,13 @@ struct ChatInfoView: View {
         .disabled(!contact.ready || chat.chatItems.isEmpty)
     }
 
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+    private func muteButton(width: CGFloat, nextNtfMode: MsgFilter) -> some View {
+        return InfoViewButton(
+            image: nextNtfMode.iconFilled,
+            title: "\(nextNtfMode.text(mentions: false))",
             width: width
         ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+            toggleNotifications(chat, enableNtfs: nextNtfMode)
         }
         .disabled(!contact.ready || !contact.active)
     }
@@ -682,17 +684,23 @@ struct ChatTTLOption: View {
             ) {
                 progressIndicator = true
                 Task {
+                    let m = ChatModel.shared
                     do {
                         try await setChatTTL(chatType: chat.chatInfo.chatType, id: chat.chatInfo.apiId, ttl)
-                        await loadChat(chat: chat, clearItems: true, replaceChat: true)
+                        await loadChat(chat: chat, im: ItemsModel.shared, clearItems: true)
                         await MainActor.run {
                             progressIndicator = false
                             currentChatItemTTL = chatItemTTL
+                            if ItemsModel.shared.reversedChatItems.isEmpty && m.chatId == chat.id,
+                               let chat = m.getChat(chat.id) {
+                                chat.chatItems = []
+                                m.replaceChat(chat.id, chat)
+                            }
                         }
                     }
                     catch let error {
                         logger.error("setChatTTL error \(responseError(error))")
-                        await loadChat(chat: chat, clearItems: true, replaceChat: true)
+                        await loadChat(chat: chat, im: ItemsModel.shared, clearItems: true)
                         await MainActor.run {
                             chatItemTTL = currentChatItemTTL
                             progressIndicator = false
@@ -930,7 +938,7 @@ struct ChatWallpaperEditorSheet: View {
         self.chat = chat
         self.themes = if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
             uiThemes
-        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+        } else if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
             uiThemes
         } else {
             ThemeModeOverrides()
@@ -966,7 +974,7 @@ struct ChatWallpaperEditorSheet: View {
     private func themesFromChat(_ chat: Chat) -> ThemeModeOverrides {
         if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
             uiThemes
-        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+        } else if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
             uiThemes
         } else {
             ThemeModeOverrides()
@@ -1044,12 +1052,12 @@ struct ChatWallpaperEditorSheet: View {
                             chat.wrappedValue = Chat.init(chatInfo: ChatInfo.direct(contact: contact))
                             themes = themesFromChat(chat.wrappedValue)
                         }
-                    } else if case var ChatInfo.group(groupInfo) = chat.wrappedValue.chatInfo {
+                    } else if case var ChatInfo.group(groupInfo, _) = chat.wrappedValue.chatInfo {
                         groupInfo.uiThemes = changedThemesConstant
 
                         await MainActor.run {
-                            ChatModel.shared.updateChatInfo(ChatInfo.group(groupInfo: groupInfo))
-                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.group(groupInfo: groupInfo))
+                            ChatModel.shared.updateChatInfo(ChatInfo.group(groupInfo: groupInfo, groupChatScope: nil))
+                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.group(groupInfo: groupInfo, groupChatScope: nil))
                             themes = themesFromChat(chat.wrappedValue)
                         }
                     }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift
index 3b3e1b3899..0283e9c07e 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift
@@ -50,7 +50,7 @@ struct CICallItemView: View {
         Image(systemName: "phone.connection").foregroundColor(.green)
     }
 
-    @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
+    private func endedCallIcon(_ sent: Bool) -> some View {
         HStack {
             Image(systemName: "phone.down")
             Text(durationText(duration)).foregroundColor(theme.colors.secondary)
@@ -60,16 +60,16 @@ struct CICallItemView: View {
 
     @ViewBuilder private func acceptCallButton() -> some View {
         if case let .direct(contact) = chat.chatInfo {
-            Button {
-                if let invitation = m.callInvitations[contact.id] {
-                    CallController.shared.answerCall(invitation: invitation)
-                    logger.debug("acceptCallButton call answered")
-                } else {
-                    AlertManager.shared.showAlertMsg(title: "Call already ended!")
-                }
-            } label: {
-                Label("Answer call", systemImage: "phone.arrow.down.left")
-            }
+            Label("Answer call", systemImage: "phone.arrow.down.left")
+                .foregroundColor(theme.colors.primary)
+                .simultaneousGesture(TapGesture().onEnded {
+                    if let invitation = m.callInvitations[contact.id] {
+                        CallController.shared.answerCall(invitation: invitation)
+                        logger.debug("acceptCallButton call answered")
+                    } else {
+                        AlertManager.shared.showAlertMsg(title: "Call already ended!")
+                    }
+                })
         } else {
             Image(systemName: "phone.arrow.down.left").foregroundColor(theme.colors.secondary)
         }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIChatFeatureView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIChatFeatureView.swift
index 02be8af73b..b2b4441646 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIChatFeatureView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIChatFeatureView.swift
@@ -12,8 +12,8 @@ import SimpleXChat
 struct CIChatFeatureView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.revealed) var revealed: Bool
-    @ObservedObject var im = ItemsModel.shared
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var feature: Feature
@@ -53,7 +53,7 @@ struct CIChatFeatureView: View {
     private func mergedFeatures() -> [FeatureInfo]? {
         var fs: [FeatureInfo] = []
         var icons: Set<String> = []
-        if var i = m.getChatItemIndex(chatItem) {
+        if var i = m.getChatItemIndex(im, chatItem) {
             while i < im.reversedChatItems.count,
                   let f = featureInfo(im.reversedChatItems[i]) {
                 if !icons.contains(f.icon) {
@@ -108,6 +108,7 @@ struct CIChatFeatureView_Previews: PreviewProvider {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
         CIChatFeatureView(
             chat: Chat.sampleData,
+            im: ItemsModel.shared,
             chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary)
         ).environment(\.revealed, true)
     }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIFeaturePreferenceView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIFeaturePreferenceView.swift
index 2c9c261536..67f7b69e2c 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIFeaturePreferenceView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIFeaturePreferenceView.swift
@@ -26,9 +26,9 @@ struct CIFeaturePreferenceView: View {
                allowed != .no && ct.allowsFeature(feature) && !ct.userAllowsFeature(feature) {
                 let setParam = feature == .timedMessages && ct.mergedPreferences.timedMessages.userPreference.preference.ttl == nil
                 featurePreferenceView(acceptText: setParam ? "Set 1 day" : "Accept")
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         allowFeatureToContact(ct, feature, param: setParam ? 86400 : nil)
-                    }
+                    })
             } else {
                 featurePreferenceView()
             }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift
index a785f3e6d8..1b9376b5db 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift
@@ -19,42 +19,42 @@ struct CIFileView: View {
     var body: some View {
         if smallViewSize != nil {
             fileIndicator()
-            .onTapGesture(perform: fileAction)
+            .simultaneousGesture(TapGesture().onEnded(fileAction))
         } else {
             let metaReserve = edited
             ? "                           "
             : "                       "
-            Button(action: fileAction) {
-                HStack(alignment: .bottom, spacing: 6) {
-                    fileIndicator()
-                        .padding(.top, 5)
-                        .padding(.bottom, 3)
-                    if let file = file {
-                        let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
-                        VStack(alignment: .leading, spacing: 2) {
-                            Text(file.fileName)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.onBackground)
-                            Text(prettyFileSize + metaReserve)
-                                .font(.caption)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    } else {
-                        Text(metaReserve)
+            HStack(alignment: .bottom, spacing: 6) {
+                fileIndicator()
+                    .padding(.top, 5)
+                    .padding(.bottom, 3)
+                if let file = file {
+                    let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text(file.fileName)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(theme.colors.onBackground)
+                        Text(prettyFileSize + metaReserve)
+                            .font(.caption)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(theme.colors.secondary)
                     }
+                } else {
+                    Text(metaReserve)
                 }
-                .padding(.top, 4)
-                .padding(.bottom, 6)
-                .padding(.leading, 10)
-                .padding(.trailing, 12)
             }
+            .padding(.top, 4)
+            .padding(.bottom, 6)
+            .padding(.leading, 10)
+            .padding(.trailing, 12)
+            .simultaneousGesture(TapGesture().onEnded(fileAction))
             .disabled(!itemInteractive)
         }
     }
 
+    @inline(__always)
     private var itemInteractive: Bool {
         if let file = file {
             switch (file.fileStatus) {
@@ -278,6 +278,7 @@ func showFileErrorAlert(_ err: FileError, temporary: Bool = false) {
 
 struct CIFileView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentFile: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -293,16 +294,16 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: fileChatItemWtFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift
index 107208a033..3fcf578875 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift
@@ -84,12 +84,12 @@ struct CIGroupInvitationView: View {
         }
 
         if action {
-            v.onTapGesture {
+            v.simultaneousGesture(TapGesture().onEnded {
                 inProgress = true
                 joinGroup(groupInvitation.groupId) {
                     await MainActor.run { inProgress = false }
                 }
-            }
+            })
             .disabled(inProgress)
         } else {
             v
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
index d491563913..d1f49f635a 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
@@ -12,6 +12,7 @@ import SimpleXChat
 struct CIImageView: View {
     @EnvironmentObject var m: ChatModel
     let chatItem: ChatItem
+    var scrollToItem: ((ChatItem.ID) -> Void)? = nil
     var preview: UIImage?
     let maxWidth: CGFloat
     var imgWidth: CGFloat?
@@ -25,12 +26,14 @@ struct CIImageView: View {
             if let uiImage = getLoadedImage(file) {
                 Group { if smallView { smallViewImageView(uiImage) } else { imageView(uiImage) } }
                 .fullScreenCover(isPresented: $showFullScreenImage) {
-                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage)
+                    FullScreenMediaView(chatItem: chatItem, scrollToItem: scrollToItem, image: uiImage, showView: $showFullScreenImage)
                 }
                 .if(!smallView) { view in
                     view.modifier(PrivacyBlur(blurred: $blurred))
                 }
-                .onTapGesture { showFullScreenImage = true }
+                .if(!blurred) { v in
+                    v.simultaneousGesture(TapGesture().onEnded { showFullScreenImage = true })
+                }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenImage = false
                 }
@@ -42,7 +45,7 @@ struct CIImageView: View {
                         imageView(preview).modifier(PrivacyBlur(blurred: $blurred))
                     }
                 }
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         if let file = file {
                             switch file.fileStatus {
                             case .rcvInvitation, .rcvAborted:
@@ -79,7 +82,7 @@ struct CIImageView: View {
                             default: ()
                             }
                         }
-                    }
+                    })
             }
         }
         .onDisappear {
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIInvalidJSONView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIInvalidJSONView.swift
index 18fd682646..5e9fa691de 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIInvalidJSONView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIInvalidJSONView.swift
@@ -7,10 +7,11 @@
 //
 
 import SwiftUI
+import SimpleXChat
 
 struct CIInvalidJSONView: View {
     @EnvironmentObject var theme: AppTheme
-    var json: String
+    var json: Data?
     @State private var showJSON = false
     
     var body: some View {
@@ -23,16 +24,16 @@ struct CIInvalidJSONView: View {
         .padding(.vertical, 6)
         .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .textSelection(.disabled)
-        .onTapGesture { showJSON = true }
+        .simultaneousGesture(TapGesture().onEnded { showJSON = true })
         .appSheet(isPresented: $showJSON) {
-            invalidJSONView(json)
+            invalidJSONView(dataToString(json))
         }
     }
 }
 
 func invalidJSONView(_ json: String) -> some View {
     VStack(alignment: .leading, spacing: 16) {
-        Button {
+        Button { // this is used in the sheet, Button works here
             showShareSheet(items: [json])
         } label: {
             Image(systemName: "square.and.arrow.up")
@@ -49,6 +50,6 @@ func invalidJSONView(_ json: String) -> some View {
 
 struct CIInvalidJSONView_Previews: PreviewProvider {
     static var previews: some View {
-        CIInvalidJSONView(json: "{}")
+        CIInvalidJSONView(json: "{}".data(using: .utf8)!)
     }
 }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
index 692e6bb8a6..f9dbaede63 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
@@ -21,15 +21,15 @@ struct CILinkView: View {
                     .resizable()
                     .scaledToFit()
                     .modifier(PrivacyBlur(blurred: $blurred))
+                    .if(!blurred) { v in
+                        v.simultaneousGesture(TapGesture().onEnded {
+                            openBrowserAlert(uri: linkPreview.uri)
+                        })
+                    }
             }
             VStack(alignment: .leading, spacing: 6) {
                 Text(linkPreview.title)
                     .lineLimit(3)
-//                if linkPreview.description != "" {
-//                    Text(linkPreview.description)
-//                        .font(.subheadline)
-//                        .lineLimit(12)
-//                }
                 Text(linkPreview.uri.absoluteString)
                     .font(.caption)
                     .lineLimit(1)
@@ -37,10 +37,32 @@ struct CILinkView: View {
             }
             .padding(.horizontal, 12)
             .frame(maxWidth: .infinity, alignment: .leading)
+            .simultaneousGesture(TapGesture().onEnded {
+                openBrowserAlert(uri: linkPreview.uri)
+            })
         }
     }
 }
 
+func openBrowserAlert(uri: URL) {
+    showAlert(
+        NSLocalizedString("Open link?", comment: "alert title"),
+        message: uri.absoluteString,
+        actions: {[
+            UIAlertAction(
+                title: NSLocalizedString("Cancel", comment: "alert action"),
+                style: .default,
+                handler: { _ in }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Open", comment: "alert action"),
+                style: .default,
+                handler: { _ in UIApplication.shared.open(uri) }
+            )
+        ]}
+    )
+}
+
 struct LargeLinkPreview_Previews: PreviewProvider {
     static var previews: some View {
         let preview = LinkPreview(
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
index d24c737907..2898a318a9 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
@@ -20,12 +20,11 @@ struct CIMemberCreatedContactView: View {
             case let .groupRcv(groupMember):
                 if let contactId = groupMember.memberContactId {
                     memberCreatedContactView(openText: "Open")
-                        .onTapGesture {
-                            dismissAllSheets(animated: true)
-                            DispatchQueue.main.async {
-                                ItemsModel.shared.loadOpenChat("@\(contactId)")
+                        .simultaneousGesture(TapGesture().onEnded {
+                            ItemsModel.shared.loadOpenChat("@\(contactId)") {
+                                dismissAllSheets(animated: true)
                             }
-                        }
+                        })
                 } else {
                     memberCreatedContactView()
                 }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift
index e58ad0f74e..fc73778239 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift
@@ -15,7 +15,7 @@ struct CIMetaView: View {
     @Environment(\.showTimestamp) var showTimestamp: Bool
     var chatItem: ChatItem
     var metaColor: Color
-    var paleMetaColor = Color(UIColor.tertiaryLabel)
+    var paleMetaColor = Color(uiColor: .tertiaryLabel)
     var showStatus = true
     var showEdited = true
     var invertedMaterial = false
@@ -152,11 +152,13 @@ func ciMetaText(
     return r.font(.caption)
 }
 
+@inline(__always)
 private func statusIconText(_ icon: String, _ color: Color?) -> Text {
     colored(Text(Image(systemName: icon)), color)
 }
 
 // Applying `foregroundColor(nil)` breaks `.invertedForegroundStyle` modifier
+@inline(__always)
 private func colored(_ t: Text, _ color: Color?) -> Text {
     if let color {
         t.foregroundColor(color)
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift
index 4603a026cd..3201332c1e 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift
@@ -45,7 +45,7 @@ struct CIRcvDecryptionError: View {
         viewBody()
             .onAppear {
                 // for direct chat ConnectionStats are populated on opening chat, see ChatView onAppear
-                if case let .group(groupInfo) = chat.chatInfo,
+                if case let .group(groupInfo, _) = chat.chatInfo,
                    case let .groupRcv(groupMember) = chatItem.chatDir {
                     do {
                         let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
@@ -68,7 +68,7 @@ struct CIRcvDecryptionError: View {
             }
     }
 
-    @ViewBuilder private func viewBody() -> some View {
+    private func viewBody() -> some View {
         Group {
             if case let .direct(contact) = chat.chatInfo,
                let contactStats = contact.activeConn?.connectionStats {
@@ -83,7 +83,7 @@ struct CIRcvDecryptionError: View {
                 } else {
                     basicDecryptionErrorItem()
                 }
-            } else if case let .group(groupInfo) = chat.chatInfo,
+            } else if case let .group(groupInfo, _) = chat.chatInfo,
                       case let .groupRcv(groupMember) = chatItem.chatDir,
                       let mem = m.getGroupMember(groupMember.groupMemberId),
                       let memberStats = mem.wrapped.activeConn?.connectionStats {
@@ -133,7 +133,7 @@ struct CIRcvDecryptionError: View {
             CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
-        .onTapGesture(perform: { onClick() })
+        .simultaneousGesture(TapGesture().onEnded(onClick))
         .padding(.vertical, 6)
         .textSelection(.disabled)
     }
@@ -151,7 +151,7 @@ struct CIRcvDecryptionError: View {
             CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
-        .onTapGesture(perform: { onClick() })
+        .simultaneousGesture(TapGesture().onEnded(onClick))
         .padding(.vertical, 6)
         .textSelection(.disabled)
     }
@@ -161,13 +161,13 @@ struct CIRcvDecryptionError: View {
         let why = Text(decryptErrorReason)
         switch msgDecryptError {
         case .ratchetHeader:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .tooManySkipped:
-            message = Text("\(msgCount) messages skipped.") + Text("\n") + why
+            message = Text("\(msgCount) messages skipped.") + textNewLine + why
         case .ratchetEarlier:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .other:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .ratchetSync:
             message = Text("Encryption re-negotiation failed.")
         }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
index f774299ad3..eacbe9360a 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
@@ -47,57 +47,57 @@ struct CIVideoView: View {
         let file = chatItem.file
         ZStack(alignment: smallView ? .topLeading : .center) {
             ZStack(alignment: .topLeading) {
-                if let file = file, let preview = preview, let decrypted = urlDecrypted, smallView {
-                    smallVideoView(decrypted, file, preview)
-                } else if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
-                    videoView(player, decrypted, file, preview, duration)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil, smallView {
-                    smallVideoViewEncrypted(file, defaultPreview)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
-                    videoViewEncrypted(file, defaultPreview, duration)
-                } else if let preview, let file {
-                    Group { if smallView { smallViewImageView(preview, file) } else { imageView(preview) } }
-                        .onTapGesture {
-                            switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
-                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                            case .rcvAccepted:
-                                switch file.fileProtocol {
-                                case .xftp:
-                                    AlertManager.shared.showAlertMsg(
-                                        title: "Waiting for video",
-                                        message: "Video will be received when your contact completes uploading it."
-                                    )
-                                case .smp:
-                                    AlertManager.shared.showAlertMsg(
-                                        title: "Waiting for video",
-                                        message: "Video will be received when your contact is online, please wait or check later!"
-                                    )
-                                case .local: ()
-                                }
-                            case .rcvTransfer: () // ?
-                            case .rcvComplete: () // ?
-                            case .rcvCancelled: () // TODO
-                            default: ()
-                            }
+                if let file, let preview {
+                    if let urlDecrypted {
+                        if smallView {
+                            smallVideoView(urlDecrypted, file, preview)
+                        } else if let player {
+                            videoView(player, urlDecrypted, file, preview, duration)
                         }
+                    } else if file.loaded {
+                        if smallView {
+                            smallVideoViewEncrypted(file, preview)
+                        } else {
+                            videoViewEncrypted(file, preview, duration)
+                        }
+                    } else {
+                        Group { if smallView { smallViewImageView(preview, file) } else { imageView(preview) } }
+                            .simultaneousGesture(TapGesture().onEnded {
+                                switch file.fileStatus {
+                                case .rcvInvitation, .rcvAborted:
+                                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                                case .rcvAccepted:
+                                    switch file.fileProtocol {
+                                    case .xftp:
+                                        AlertManager.shared.showAlertMsg(
+                                            title: "Waiting for video",
+                                            message: "Video will be received when your contact completes uploading it."
+                                        )
+                                    case .smp:
+                                        AlertManager.shared.showAlertMsg(
+                                            title: "Waiting for video",
+                                            message: "Video will be received when your contact is online, please wait or check later!"
+                                        )
+                                    case .local: ()
+                                    }
+                                case .rcvTransfer: () // ?
+                                case .rcvComplete: () // ?
+                                case .rcvCancelled: () // TODO
+                                default: ()
+                                }
+                            })
+                    }
                 }
                 if !smallView {
                     durationProgress()
                 }
             }
             if !blurred, let file, showDownloadButton(file.fileStatus) {
-                if !smallView {
-                    Button {
-                        receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                    } label: {
-                        playPauseIcon("play.fill")
-                    }
-                } else if !file.showStatusIconInSmallView {
+                if !smallView || !file.showStatusIconInSmallView {
                     playPauseIcon("play.fill")
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                        }
+                        })
                 }
             }
         }
@@ -151,27 +151,26 @@ struct CIVideoView: View {
             ZStack(alignment: .center) {
                 let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
                 imageView(defaultPreview)
-                .onTapGesture {
+                .simultaneousGesture(TapGesture().onEnded {
                     decrypt(file: file) {
                         showFullScreenPlayer = urlDecrypted != nil
                     }
-                }
+                })
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
                 if !blurred {
                     if !decryptionInProgress {
-                        Button {
-                            decrypt(file: file) {
-                                if urlDecrypted != nil {
-                                    videoPlaying = true
-                                    player?.play()
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
+                            .simultaneousGesture(TapGesture().onEnded {
+                                decrypt(file: file) {
+                                    if urlDecrypted != nil {
+                                        videoPlaying = true
+                                        player?.play()
+                                    }
                                 }
-                            }
-                        } label: {
-                            playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                        }
-                        .disabled(!canBePlayed)
+                            })
+                            .disabled(!canBePlayed)
                     } else {
                         videoDecryptionProgress()
                     }
@@ -194,29 +193,30 @@ struct CIVideoView: View {
                     }
                 }
                 .modifier(PrivacyBlur(enabled: !videoPlaying, blurred: $blurred))
-                .onTapGesture {
-                    switch player.timeControlStatus {
-                    case .playing:
-                        player.pause()
-                        videoPlaying = false
-                    case .paused:
-                        if canBePlayed {
-                            showFullScreenPlayer = true
+                .if(!blurred) { v in
+                    v.simultaneousGesture(TapGesture().onEnded {
+                        switch player.timeControlStatus {
+                        case .playing:
+                            player.pause()
+                            videoPlaying = false
+                        case .paused:
+                            if canBePlayed {
+                                showFullScreenPlayer = true
+                            }
+                        default: ()
                         }
-                    default: ()
-                    }
+                    })
                 }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
                 if !videoPlaying && !blurred {
-                    Button {
-                        m.stopPreviousRecPlay = url
-                        player.play()
-                    } label: {
-                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                    }
-                    .disabled(!canBePlayed)
+                    playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
+                        .simultaneousGesture(TapGesture().onEnded {
+                            m.stopPreviousRecPlay = url
+                            player.play()
+                        })
+                        .disabled(!canBePlayed)
                 }
             }
             fileStatusIcon()
@@ -235,7 +235,7 @@ struct CIVideoView: View {
         return ZStack(alignment: .topLeading) {
             let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
             smallViewImageView(preview, file)
-                .onTapGesture {
+                .onTapGesture { // this is shown in chat list, where onTapGesture works
                     decrypt(file: file) {
                         showFullScreenPlayer = urlDecrypted != nil
                     }
@@ -256,7 +256,7 @@ struct CIVideoView: View {
     private func smallVideoView(_ url: URL, _ file: CIFile, _ preview: UIImage) -> some View {
         return ZStack(alignment: .topLeading) {
             smallViewImageView(preview, file)
-                .onTapGesture {
+                .onTapGesture { // this is shown in chat list, where onTapGesture works
                     showFullScreenPlayer = true
                 }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
@@ -354,14 +354,14 @@ struct CIVideoView: View {
             case .sndCancelled: fileIcon("xmark", 10, 13)
             case let .sndError(sndFileError):
                 fileIcon("xmark", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(sndFileError)
-                    }
+                    })
             case let .sndWarning(sndFileError):
                 fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(sndFileError, temporary: true)
-                    }
+                    })
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case let .rcvTransfer(rcvProgress, rcvTotal):
@@ -375,14 +375,14 @@ struct CIVideoView: View {
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case let .rcvError(rcvFileError):
                 fileIcon("xmark", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(rcvFileError)
-                    }
+                    })
             case let .rcvWarning(rcvFileError):
                 fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(rcvFileError, temporary: true)
-                    }
+                    })
             case .invalid: fileIcon("questionmark", 10, 13)
             }
         }
@@ -429,7 +429,7 @@ struct CIVideoView: View {
             Color.black.edgesIgnoringSafeArea(.all)
             VideoPlayer(player: fullPlayer)
             .overlay(alignment: .topLeading, content: {
-                Button(action: { showFullScreenPlayer = false },
+                Button(action: { showFullScreenPlayer = false }, // this is used in full screen player, Button works here
                     label: {
                         Image(systemName: "multiply")
                         .resizable()
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift
index ff4378c715..47aee2a586 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift
@@ -168,14 +168,14 @@ struct VoiceMessagePlayer: View {
                 case .sndCancelled: playbackButton()
                 case let .sndError(sndFileError):
                     fileStatusIcon("multiply", 14)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(sndFileError)
-                        }
+                        })
                 case let .sndWarning(sndFileError):
                     fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(sndFileError, temporary: true)
-                        }
+                        })
                 case .rcvInvitation: downloadButton(recordingFile, "play.fill")
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
@@ -184,14 +184,14 @@ struct VoiceMessagePlayer: View {
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case let .rcvError(rcvFileError):
                     fileStatusIcon("multiply", 14)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(rcvFileError)
-                        }
+                        })
                 case let .rcvWarning(rcvFileError):
                     fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(rcvFileError, temporary: true)
-                        }
+                        })
                 case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 }
             } else {
@@ -255,59 +255,29 @@ struct VoiceMessagePlayer: View {
         }
     }
 
-    @ViewBuilder private func playbackButton() -> some View {
-        if sizeMultiplier != 1 {
-            switch playbackState {
-            case .noPlayback:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
-                        if let recordingSource = getLoadedFileSource(recordingFile) {
-                            startPlayback(recordingSource)
-                        }
-                    }
-            case .playing:
-                playPauseIcon("pause.fill", theme.colors.primary)
-                    .onTapGesture {
-                        audioPlayer?.pause()
-                        playbackState = .paused
-                        notifyStateChange()
-                    }
-            case .paused:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
-                        audioPlayer?.play()
-                        playbackState = .playing
-                        notifyStateChange()
-                    }
-            }
-        } else {
-            switch playbackState {
-            case .noPlayback:
-                Button {
+    private func playbackButton() -> some View {
+        let icon = switch playbackState {
+        case .noPlayback: "play.fill"
+        case .playing: "pause.fill"
+        case .paused: "play.fill"
+        }
+        return playPauseIcon(icon, theme.colors.primary)
+            .simultaneousGesture(TapGesture().onEnded { _ in
+                switch playbackState {
+                case .noPlayback:
                     if let recordingSource = getLoadedFileSource(recordingFile) {
                         startPlayback(recordingSource)
                     }
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
-                }
-            case .playing:
-                Button {
+                case .playing:
                     audioPlayer?.pause()
                     playbackState = .paused
                     notifyStateChange()
-                } label: {
-                    playPauseIcon("pause.fill", theme.colors.primary)
-                }
-            case .paused:
-                Button {
+                case .paused:
                     audioPlayer?.play()
                     playbackState = .playing
                     notifyStateChange()
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
                 }
-            }
-        }
+            })
     }
 
     private func playPauseIcon(_ image: String, _ color: Color/* = .accentColor*/) -> some View {
@@ -329,28 +299,14 @@ struct VoiceMessagePlayer: View {
     }
 
     private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
-        Group {
-            if sizeMultiplier != 1 {
-                playPauseIcon(icon, theme.colors.primary)
-                    .onTapGesture {
-                        Task {
-                            if let user = chatModel.currentUser {
-                                await receiveFile(user: user, fileId: recordingFile.fileId)
-                            }
-                        }
+        playPauseIcon(icon, theme.colors.primary)
+            .simultaneousGesture(TapGesture().onEnded {
+                Task {
+                    if let user = chatModel.currentUser {
+                        await receiveFile(user: user, fileId: recordingFile.fileId)
                     }
-            } else {
-                Button {
-                    Task {
-                        if let user = chatModel.currentUser {
-                            await receiveFile(user: user, fileId: recordingFile.fileId)
-                        }
-                    }
-                } label: {
-                    playPauseIcon(icon, theme.colors.primary)
                 }
-            }
-        }
+            })
     }
 
     func notifyStateChange() {
@@ -430,6 +386,7 @@ struct VoiceMessagePlayer: View {
     }
 }
 
+@inline(__always)
 func voiceMessageSizeBasedOnSquareSize(_ squareSize: CGFloat) -> CGFloat {
     let squareToCircleRatio = 0.935
     return squareSize + squareSize * (1 - squareToCircleRatio)
@@ -446,10 +403,12 @@ class VoiceItemState {
         self.playbackTime = playbackTime
     }
 
+    @inline(__always)
     static func id(_ chat: Chat, _ chatItem: ChatItem) -> String {
         "\(chat.id) \(chatItem.id)"
     }
 
+    @inline(__always)
     static func id(_ chatInfo: ChatInfo, _ chatItem: ChatItem) -> String {
         "\(chatInfo.id) \(chatItem.id)"
     }
@@ -476,6 +435,7 @@ class VoiceItemState {
 
 struct CIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -498,10 +458,10 @@ struct CIVoiceView_Previews: PreviewProvider {
                 duration: 30,
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentVoiceMessage, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: voiceMessageWtFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 360))
     }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift b/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift
index 47a2cbb6cb..0b6f249b9c 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift
@@ -77,6 +77,7 @@ struct FramedCIVoiceView: View {
 
 struct FramedCIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -92,11 +93,11 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentVoiceMessage, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: voiceMessageWithQuote, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift b/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift
index 6da893d1d2..c9c9952688 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift
@@ -12,9 +12,11 @@ import SimpleXChat
 struct FramedItemView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     var chatItem: ChatItem
+    var scrollToItem: (ChatItem.ID) -> Void
+    @Binding var scrollToItemId: ChatItem.ID?
     var preview: UIImage?
     var maxWidth: CGFloat = .infinity
     @State var msgWidth: CGFloat = 0
@@ -23,8 +25,6 @@ struct FramedItemView: View {
     @State private var useWhiteMetaColor: Bool = false
     @State var showFullScreenImage = false
     @Binding var allowMenu: Bool
-    @State private var showSecrets = false
-    @State private var showQuoteSecrets = false
     @State private var showFullscreenGallery: Bool = false
 
     var body: some View {
@@ -57,18 +57,26 @@ struct FramedItemView: View {
 
                 if let qi = chatItem.quotedItem {
                     ciQuoteView(qi)
-                        .onTapGesture {
-                            if let ci = ItemsModel.shared.reversedChatItems.first(where: { $0.id == qi.itemId }) {
+                        .simultaneousGesture(TapGesture().onEnded {
+                            if let ci = im.reversedChatItems.first(where: { $0.id == qi.itemId }) {
                                 withAnimation {
-                                    scrollModel.scrollToItem(id: ci.id)
+                                    scrollToItem(ci.id)
                                 }
+                            } else if let id = qi.itemId {
+                                if (chatItem.isReport && im.secondaryIMFilter != nil) {
+                                    scrollToItemId = id
+                                } else {
+                                    scrollToItem(id)
+                                }
+                            } else {
+                                showQuotedItemDoesNotExistAlert()
                             }
-                        }
+                        })
                 } 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, msgContentView: framedMsgContentView)
+                ChatItemContentView(chat: chat, im: im, chatItem: chatItem, msgContentView: framedMsgContentView)
                     .padding(chatItem.content.msgContent != nil ? 0 : 4)
                     .overlay(DetermineWidth())
             }
@@ -85,19 +93,19 @@ struct FramedItemView: View {
                 .overlay(DetermineWidth())
                 .accessibilityLabel("")
             }
-        }   
+        }
             .background { chatItemFrameColorMaybeImageOrVideo(chatItem, theme).modifier(ChatTailPadding()) }
             .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
 
         if let (title, text) = chatItem.meta.itemStatus.statusInfo {
-            v.onTapGesture {
+            v.simultaneousGesture(TapGesture().onEnded {
                 AlertManager.shared.showAlert(
                     Alert(
                         title: Text(title),
                         message: Text(text)
                     )
                 )
-            }
+            })
         } else {
             v
         }
@@ -117,7 +125,7 @@ struct FramedItemView: View {
         } else {
             switch (chatItem.content.msgContent) {
             case let .image(text, _):
-                CIImageView(chatItem: chatItem, preview: preview, maxWidth: maxWidth, imgWidth: imgWidth, showFullScreenImage: $showFullscreenGallery)
+                CIImageView(chatItem: chatItem, scrollToItem: scrollToItem, preview: preview, maxWidth: maxWidth, imgWidth: imgWidth, showFullScreenImage: $showFullscreenGallery)
                     .overlay(DetermineWidth())
                 if text == "" && !chatItem.meta.isLive {
                     Color.clear
@@ -155,7 +163,7 @@ struct FramedItemView: View {
             case let .file(text):
                 ciFileView(chatItem, text)
             case let .report(text, reason):
-                ciMsgContentView(chatItem, Text(text.isEmpty ? reason.text : "\(reason.text): ").italic().foregroundColor(.red))
+                ciMsgContentView(chatItem, txtPrefix: reason.attrString)
             case let .link(_, preview):
                 CILinkView(linkPreview: preview)
                 ciMsgContentView(chatItem)
@@ -199,6 +207,7 @@ struct FramedItemView: View {
     }
 
     @ViewBuilder private func ciQuoteView(_ qi: CIQuote) -> some View {
+        let backgroundColor = chatItemFrameContextColor(chatItem, theme)
         let v = ZStack(alignment: .topTrailing) {
             switch (qi.content) {
             case let .image(_, image):
@@ -240,7 +249,8 @@ struct FramedItemView: View {
             // if enable this always, size of the framed voice message item will be incorrect after end of playback
             .overlay { if case .voice = chatItem.content.msgContent {} else { DetermineWidth() } }
             .frame(minWidth: msgWidth, alignment: .leading)
-            .background(chatItemFrameContextColor(chatItem, theme))
+            .background(backgroundColor)
+            .environment(\.containerBackground, UIColor(backgroundColor))
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)
         } else {
@@ -254,7 +264,7 @@ struct FramedItemView: View {
                 VStack(alignment: .leading, spacing: 2) {
                     Text(sender)
                         .font(.caption)
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(qi.chatDir == .groupSnd ? .accentColor : theme.colors.secondary)
                         .lineLimit(1)
                     ciQuotedMsgTextView(qi, lines: 2)
                 }
@@ -266,14 +276,12 @@ struct FramedItemView: View {
         .padding(.top, 6)
         .padding(.horizontal, 12)
     }
-    
+
+    @inline(__always)
     private func ciQuotedMsgTextView(_ qi: CIQuote, lines: Int) -> some View {
-        toggleSecrets(qi.formattedText, $showQuoteSecrets,
-            MsgContentView(chat: chat, text: qi.text, formattedText: qi.formattedText, showSecrets: showQuoteSecrets)
-                .lineLimit(lines)
-                .font(.subheadline)
-                .padding(.bottom, 6)
-        )
+        MsgContentView(chat: chat, text: qi.text, formattedText: qi.formattedText, textStyle: .subheadline)
+            .lineLimit(lines)
+            .padding(.bottom, 6)
     }
 
     private func ciQuoteIconView(_ image: String) -> some View {
@@ -288,24 +296,27 @@ struct FramedItemView: View {
     
     private func membership() -> GroupMember? {
         switch chat.chatInfo {
-        case let .group(groupInfo: groupInfo): return groupInfo.membership
+        case let .group(groupInfo: groupInfo, _): return groupInfo.membership
         default: return nil
         }
     }
     
-    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, _ txtPrefix: Text? = nil) -> some View {
+    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, txtPrefix: NSAttributedString? = nil) -> some View {
         let text = ci.meta.isLive ? ci.content.msgContent?.text ?? ci.text : ci.text
         let rtl = isRightToLeft(text)
         let ft = text == "" ? [] : ci.formattedText
-        let v = toggleSecrets(ft, $showSecrets, MsgContentView(
+        let v = MsgContentView(
             chat: chat,
             text: text,
             formattedText: ft,
+            textStyle: .body,
             meta: ci.meta,
+            mentions: ci.mentions,
+            userMemberId: chat.chatInfo.groupInfo?.membership.memberId,
             rightToLeft: rtl,
-            showSecrets: showSecrets,
             prefix: txtPrefix
-        ))
+        )
+        .environment(\.containerBackground, UIColor(chatItemFrameColor(ci, theme)))
         .multilineTextAlignment(rtl ? .trailing : .leading)
         .padding(.vertical, 6)
         .padding(.horizontal, 12)
@@ -336,13 +347,12 @@ struct FramedItemView: View {
             return videoWidth
         }
     }
-}
 
-@ViewBuilder func toggleSecrets<V: View>(_ ft: [FormattedText]?, _ showSecrets: Binding<Bool>, _ v: V) -> some View {
-    if let ft = ft, ft.contains(where: { $0.isSecret }) {
-        v.onTapGesture { showSecrets.wrappedValue.toggle() }
-    } else {
-        v
+    private func showQuotedItemDoesNotExistAlert() {
+        AlertManager.shared.showAlertMsg(
+            title: "No message",
+            message: "This message was deleted or not received yet."
+        )
     }
 }
 
@@ -382,15 +392,16 @@ func chatItemFrameContextColor(_ ci: ChatItem, _ theme: AppTheme) -> Color {
 
 struct FramedItemView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         Group{
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat"), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }
@@ -398,17 +409,18 @@ struct FramedItemView_Previews: PreviewProvider {
 
 struct FramedItemView_Edited_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         Group {
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi there hello hello hello ther hello hello", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemEdited: true), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello there this is a long text", quotedItem: CIQuote.getSample(1, .now, "hi there", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemEdited: true), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat", .rcvRead, itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi there hello hello hello ther hello hello", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello there this is a long text", quotedItem: CIQuote.getSample(1, .now, "hi there", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemEdited: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 200))
@@ -417,17 +429,18 @@ struct FramedItemView_Edited_Previews: PreviewProvider {
 
 struct FramedItemView_Deleted_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         Group {
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi there hello hello hello ther hello hello", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
-            FramedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello there this is a long text", quotedItem: CIQuote.getSample(1, .now, "hi there", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi there hello hello hello ther hello hello", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
+            FramedItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello there this is a long text", quotedItem: CIQuote.getSample(1, .now, "hi there", chatDir: .directSnd, image: "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAuKADAAQAAAABAAAAYAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAYAC4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQADP/aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKK+CP2vP+ChXwZ/ZPibw7dMfEHi2VAYdGs3G9N33TO/IiU9hgu3ZSOa/NzXNL/4KJ/td6JJ49+NXiq2+Cvw7kG/ZNKbDMLcjKblmfI/57SRqewrwMdxBRo1HQoRdWqt1HaP+KT0j838j7XKOCMXiqEcbjKkcPh5bSne8/wDr3BXlN+is+5+43jb45/Bf4bs0fj/xZpGjSL1jvL2KF/8AvlmDfpXjH/DfH7GQuPsv/CydD35x/wAfIx+fT9a/AO58D/8ABJj4UzvF4v8AFfif4l6mp/evpkfkWzP3w2Isg+omb61X/wCF0/8ABJr/AI9f+FQeJPL6ed9vbzPrj7ZivnavFuIT+KhHyc5Sf3wjY+7w/hlgZQv7PF1P70aUKa+SqTUvwP6afBXx2+CnxIZYvAHi3R9ZkfpHZ3sUz/8AfKsW/SvVq/lItvBf/BJX4rTLF4V8UeJ/hpqTH91JqUfn2yv2y2JcD3MqfUV9OaFon/BRH9krQ4vH3wI8XW3xq+HkY3+XDKb/ABCvJxHuaZMDr5Ergd1ruwvFNVrmq0VOK3lSkp29Y6SS+R5GY+HGGi1DD4qVKo9oYmm6XN5RqK9Nvsro/obor4A/ZC/4KH/Bv9qxV8MLnw54vjU+bo9443SFPvG3k4EoHdcB17rjmvv+vqcHjaGKpKth5qUX1X9aPyZ+b5rlOMy3ESwmOpOFRdH+aezT6NXTCiiiuo84KKKKACiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/Q/v4ooooAKKKKACiiigAr8tf+ChP7cWs/BEWfwD+A8R1P4k+JQkUCQr5rWUc52o+zndNIf9Up4H324wD9x/tDfGjw/wDs9fBnX/i/4jAeHRrZpI4c4M87YWKIe7yFV9gc9q/n6+B3iOb4GfCLxL/wU1+Oypq3jzxndT2nhK2uBwZptyvcBeoQBSq4xthjwPvivluIs0lSthKM+WUk5Sl/JBbtebekfM/R+BOHaeIcszxVL2kISUKdP/n7WlrGL/uxXvT8u6uizc6b8I/+CbmmRePPi9HD8Q/j7rifbktLmTz7bSGm582ZzktITyX++5+5tX5z5L8LPgv+0X/wVH12+8ZfEbxneW/2SRxB9o02eTSosdY4XRlgjYZGV++e5Jr8xvF3i7xN4+8UX/jXxney6jquqTNcXVzMcvJI5ySfQdgBwBgDgV+sP/BPX9jj9oL9oXw9H4tuvG2s+DfAVlM8VsthcyJLdSBsyCBNwREDZ3SEHLcBTgkfmuX4j+0MXHB06LdBXagna/8AenK6u+7el9Ej9+zvA/2Jls81r4uMcY7J1px5lHf93ShaVo9FFJNq8pMyPil/wRs/aj8D6dLq3gq70vxdHECxgtZGtrogf3UmAQn2EmT2r8rPEPh3xB4R1u58M+KrGfTdRsnMdxa3MbRTROOzKwBBr+674VfCnTfhNoI0DTtX1jWFAGZtYvpL2U4934X/AICAK8V/aW/Yf/Z9/areHUvibpkkerWsRhg1KxkMFyqHkBiMrIAeQJFYDJxjJr6bNPD+nOkqmAfLP+WTuvk7XX4/I/PeHvG6tSxDo5zH2lLpUhHll6uN7NelmvPY/iir2T4KftA/GD9njxMvir4Q65caTPkGWFTutrgD+GaE/I4+oyOxB5r2n9tb9jTxj+x18RYvD+pTtqmgaqrS6VqezZ5qpjfHIBwsseRuA4IIYdcD4yr80q0sRgcQ4SvCpB+jT8mvzP6Bw2JwOcYGNany1aFRdVdNdmn22aauno9T9tLO0+D/APwUr02Txd8NI4Ph38ftGT7b5NtIYLXWGh58yJwQVkBGd/8ArEP3i6fMP0R/4J7ftw6/8YZ7z9nb9oGJtN+JPhoPFIJ18p75IPlclegnj/5aKOGHzrxnH8rPhXxT4j8D+JbHxj4QvZdO1TTJkuLW5hba8UqHIIP8x0I4PFfsZ8bPEdx+0N8FvDv/AAUl+CgXSfiJ4EuYLXxZBbDALw4CXO0clMEZznMLlSf3Zr7PJM+nzyxUF+9ir1IrRVILeVtlOO+lrr5n5RxfwbRdKGXVXfDzfLRm9ZUKr+GDlq3RqP3UnfllZfy2/ptorw/9m/43aF+0X8FNA+L+gARpq1uGnhByYLlCUmiP+44IHqMHvXuFfsNGtCrTjVpu8ZJNPyZ/LWKwtXDVp4evG04Nxa7NOzX3hRRRWhzhRRRQBBdf8e0n+6f5Vx1djdf8e0n+6f5Vx1AH/9H+/iiiigAooooAKKKKAPw9/wCCvXiPWviH4q+F/wCyN4XlKT+K9TS6uQvoXFvAT7AvI3/AQe1fnF/wVO+IOnXfxx034AeDj5Xhv4ZaXb6TawKfkE7Ro0rY6bgvlofdT61+h3xNj/4Tv/gtd4Q0W/8Anh8P6THLGp6Ax21xOD/324Nfg3+0T4kufGH7QHjjxRdtukvte1GXJ9PPcKPwAAr8a4pxUpLEz6zq8n/btOK0+cpX9Uf1d4c5bCDy+lbSlh3W/wC38RNq/qoQcV5M8fjiaeRYEOGchR9TxX9svw9+GHijSvgB4I+Gnwr1ceGbGztYY728gijluhbohLLAJVeJZJJCN0jo+0Zwu4gj+JgO8REsf3l+YfUV/bf8DNVm+Mv7KtkNF1CTTZ9Z0d4Ir2D/AFls9zF8sidPmj3hhz1Fel4YyhGtiHpzWjur6e9f9Dw/H9VXQwFvgvUv62hb8Oa3zPoDwfp6aPoiaONXuNaa1Zo3ubp43nLDqrmJEXI/3QfWukmjMsTRBihYEbl6jPcZ7ivxk/4JMf8ABOv9ob9hBvFdr8ZvGOma9Yak22wttLiYGV2kMkl1dzSIkkkzcKisX8tSwDYNfs/X7Bj6NOlXlCjUU4/zJWv8j+ZsNUnOmpThyvtufj/+1Z8Hf2bPi58PviF8Avh/4wl1j4iaBZjXG0m71qfU7i3u4FMqt5VxLL5LzR70Kx7AVfJXAXH8sysGUMOh5r+vzwl+wD+y78KP2wPEX7bGn6xqFv4g8QmWa70+fUFGlrdTRmGS4EGATIY2dRvdlXe+0DPH83Nh+x58bPFev3kljpSaVYPcymGS+kEX7oudp2DL/dx/DX4Z4xZxkmCxGHxdTGRTlG0ueUU7q3S93a7S69Oh/SngTnNSjgcZhMc1CnCSlC70966dr/4U7Lq79T5Kr9MP+CWfxHsNH+P138EPF2JvDfxL0640a9gc/I0vls0Rx6kb4x/v1x3iz9hmHwV4KuPFHiLxlaWkltGzt5sBSAsBkIHL7iT0GFJJ7V8qfAnxLc+D/jd4N8V2bFJdP1vT5wR/szoT+YyK/NeD+Lcvx+Ijisuq88ackpPlklruveSvdX2ufsmavC5zlWKw9CV7xaTs1aSV4tXS1Ukmrdj9/P8Agkfrus/DD4ifFP8AY/8AEkrPJ4Z1F7y1DeiSG3mI9m2wv/wI1+5Ffhd4Ki/4Qf8A4Lb+INM0/wCSHxDpDySqOhL2cMx/8fizX7o1/RnC7ccLPDP/AJdTnBeid1+DP5M8RkqmZUselZ4ijSqv1lG0vvcWwooor6Q+BCiiigCC6/49pP8AdP8AKuOrsbr/AI9pP90/yrjqAP/S/v4ooooAKKKKACiiigD8LfiNIfBP/BbLwpq9/wDJDr2kJHGTwCZLS4gH/j0eK/Bj9oPw7c+Evj3428M3ilZLHXtRiIPoJ3x+Ywa/fL/grnoWsfDPx98K/wBrzw5EzyeGNSS0uSvokguYQfZtsy/8CFfnB/wVP+HNho/7QFp8bvCeJvDnxK0231mznQfI0vlqsoz6kbJD/v1+M8U4WUViYW1hV5/+3akVr/4FG3qz+r/DnMYTeX1b6VcP7L/t/Dzenq4Tcl5I/M2v6yP+CR3j4eLP2XbLRZZN0uku9sRnp5bMB/45sr+Tev3u/wCCJXj7yNW8T/DyZ+C6XUak9pUw36xD865uAcV7LNFTf24tfd736Hd405d9Y4cddLWlOMvk7wf/AKUvuP6Kq/P/APaa+InjJfF8vge3lez06KONgIyVM+8ZJYjkgHIx045r9AK/Gr/gsB8UPHXwg8N+AvFfgV4oWmv7u3uTJEsiyL5SsiNkZxkMeCDmvU8bsgzPN+Fa+FyrEujUUot6tKcdnBtapO6fny2ejZ/OnAOFWJzqjheVOU+ZK+yaTlfr2t8z85td/b18H6D4n1DQLrw5fSLY3Elv5okRWcxsVJKMAVyR0yTivEPHf7f3jjVFe18BaXb6PGeBPcH7RN9QMBAfqGrFP7UPwj8c3f2/4y/DuzvbxgA93ZNtd8dyGwT+Lmuvh/aP/ZT8IxC58EfD0y3Y5UzwxKAf99mlP5Cv49wvCeBwUoc3D9Sday3qRlTb73c7Wf8Aej8j+rKWVUKLV8vlKf8AiTj/AOlW+9Hw74w8ceNvHl8NX8bajc6jK2SjTsSo/wBxeFUf7orovgf4dufF3xp8H+F7NS0uoa3p8Cgf7c6A/pW98avjx4q+NmoW0mswW9jY2G/7LaWy4WPfjJLHlicD0HoBX13/AMEtPhrZeI/2jH+L3inEPh34cWE+t31w/wBxJFRliBPqPmkH/XOv3fhXCVa/1ahUoRoybV4RacYq/dKK0jq7Ky1s3uezm+PeByeviqkFBxhK0U767RirJattLTqz9H/CMg8af8Futd1DT/ni8P6OySsOxSyiiP8A49Niv3Qr8NP+CS+j6t8V/iv8V/2wdfiZD4i1B7K0LDtLJ9olUf7imFfwr9y6/oLhe88LUxPSrUnNejdl+CP5G8RWqeY0cAnd4ejSpP8AxRjd/c5NBRRRX0h8CFFFFAEF1/x7Sf7p/lXHV2N1/wAe0n+6f5Vx1AH/0/7+KKKKACiiigAooooA8M/aT+B+iftGfBLxB8INcIjGrWxFvORnyLmMh4ZB/uSAE46jI71+AfwU8N3H7SXwL8Qf8E5fjFt0r4kfD65nuvCstycbmhz5ltuPVcE4x1idWHEdf031+UX/AAUL/Yj8T/FG/sv2mP2c5H074keGtkoFufLe+jg5Taennx9Ezw6/Ie2PleI8slUtjKUOZpOM4/zwe6X96L1j5/cfpPAXEMKF8rxNX2cZSU6VR7Uq0dE3/cmvcn5dldn8r/iXw3r/AIN8Q3vhPxXZy6fqemzPb3VtMNskUsZwysPY/n1HFfe3/BL3x/8A8IP+1bptvK+2HVbeSBvdoyso/RWH419SX8fwg/4Kc6QmleIpLfwB8f8ASI/ssiXCGC11kwfLtZSNwkGMbceZH0w6Dj88tM+HvxW/ZK/aO8OQ/FvR7nQ7uw1OElpV/czQs+x2ilGUkUqTypPvivy3DYWWX46hjaT56HOrSXa+ql/LK26fy0P6LzDMYZ3lGMynEx9ni/ZyvTfV2bjKD+3BtJqS9HZn9gnxB/aM+Cvwp8XWXgj4ja/Bo+o6hB9ogW5DrG0ZYoCZNvlr8wI+Zh0r48/4KkfDey+NP7GOqeIPDUsV7L4elh1u0khYOskcOVl2MCQcwu5GDyRXwx/wVBnbVPH3gjxGeVvPDwUt2LxzOW/9Cr87tO8PfFXVdPisbDS9avNImbzLNILa4mtXfo5j2KULZwDjmvqs+4srKvi8rqYfnjays2nqlq9JX3v0P4FwfiDisjzqNanQU3RnGUbNq9rOz0ej207nxZovhrV9enMNhHwpwztwq/U+vt1qrrWlT6JqUumXBDNHj5l6EEZr7U+IHhHxF8JvEUHhL4j2Umiald2sV/Hb3Q8t2hnztbB75BDKfmVgQQCK8e0f4N/E349/FRvBvwh0a41y+YRq/kD91ECPvSyHCRqPVmFfl8aNZ1vYcj59rWd79rbn9T+HPjFnnEPE1WhmmEWEwKw8qkVJNbSppTdSSimmpO1ko2a3aueH+H/D+ueLNds/DHhi0lv9R1CZLe2toV3SSyyHCqoHUk1+yfxl8N3X7Ln7P+h/8E9/hOF1X4nfEm4gufFDWp3FBMR5dqGHRTgLzx5au5wJKtaZZ/B7/gmFpBhsJLbx78fdVi+zwQWyma00UzjbgAfMZDnGMCSToAiElvv/AP4J7fsS+LPh5q15+1H+0q76h8R/Em+ZUuSHksI5/vFj0E8g4YDiNPkH8VfeZJkVTnlhYfxpK02tqUHur7c8trdFfzt9dxdxjQ9lDMKi/wBlpvmpRejxFVfDK26o03713bmla2yv90/sw/ArRv2bvgboHwh0crK2mQZup1GPPu5Tvmk9fmcnGei4HavfKKK/YaFGFGnGlTVoxSSXkj+WMXi6uKr1MTXlec25N923dsKKKK1OcKKKKAILr/j2k/3T/KuOrsbr/j2k/wB0/wAq46gD/9T+/iiiigAooooAKKKKACiiigD87P2wf+Ccnwm/ahmbxvosh8K+NY8NHq1onyzOn3ftEYK7yMcSKVkX1IAFfnT4m8f/ALdv7L+gyfDn9rjwFb/GLwFD8q3ssf2srGOjfaAjspA6GeMMOzV/RTRXz+N4eo1akq+Hm6VR7uNrS/xRekvzPuMo45xOGoQweOpRxFCPwqd1KH/XuorSh8m0uiPwz0L/AIKEf8E3vi6miH4saHd6Xc6B5gs4tWs3vYIPNILAGFpA65UcSLxjgCvtS1/4KT/sLWVlHFZePrCGCJAqRJa3K7VHQBRFxj0xXv8A48/Zc/Zx+J0z3Xj3wPoupzyHLTS2cfnE+8iqH/WvGP8Ah23+w953n/8ACu9PznOPMn2/98+bj9K5oYTOqMpSpyoyb3k4yjJ2015Xqac/BNSbrPD4mlKW6hKlJf8AgUkpP5n5zfta/tof8Ex/jPq+k+IPHelan491HQlljtI7KGWyikWUqSkryNCzJlcgc4JPHNcZ4V+Iv7c37TGgJ8N/2Ovh7bfB7wHN8pvoo/shMZ4LfaSiMxx1MERf/ar9sPAn7LH7N3wxmS68B+BtF02eM5WaOzjMwI9JGBf9a98AAGBWSyDF16kquKrqPN8Xso8rfrN3lY9SXG+WYPDww2W4SdRQ+B4io5xjre6pRtTvfW+up+cv7H//AATg+FX7MdynjzxHMfFnjeTLvqt2vyQO/wB77OjFtpOeZGLSH1AOK/Rqiivo8FgaGEpKjh4KMV/V33fmz4LNs5xuZ4h4rHVXOb6vouyWyS6JJIKKKK6zzAooooAKKKKAILr/AI9pP90/yrjq7G6/49pP90/yrjqAP//Z"), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: Binding.constant(true))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 200))
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/FullScreenMediaView.swift b/apps/ios/Shared/Views/Chat/ChatItem/FullScreenMediaView.swift
index 044ee2a26d..f243a83142 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/FullScreenMediaView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/FullScreenMediaView.swift
@@ -13,8 +13,8 @@ import AVKit
 
 struct FullScreenMediaView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
     @State var chatItem: ChatItem
+    var scrollToItem: ((ChatItem.ID) -> Void)?
     @State var image: UIImage?
     @State var player: AVPlayer? = nil
     @State var url: URL? = nil
@@ -71,7 +71,7 @@ struct FullScreenMediaView: View {
                 let w = abs(t.width)
                 if t.height > 60 && t.height > w * 2  {
                     showView = false
-                    scrollModel.scrollToItem(id: chatItem.id)
+                    scrollToItem?(chatItem.id)
                 } else if w > 60 && w > abs(t.height) * 2 && !scrolling {
                     let previous = t.width > 0
                     scrolling = true
@@ -126,7 +126,7 @@ struct FullScreenMediaView: View {
                         .scaledToFit()
             }
         }
-        .onTapGesture { showView = false }
+        .onTapGesture { showView = false } // this is used in full screen view, onTapGesture works
     }
 
     private func videoView( _ player: AVPlayer, _ url: URL) -> some View {
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift b/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift
index afeb88b05d..47a30f6cf3 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift
@@ -31,8 +31,8 @@ struct IntegrityErrorItemView: View {
             case .msgBadHash:
                 AlertManager.shared.showAlert(Alert(
                     title: Text("Bad message hash"),
-                    message: Text("The hash of the previous message is different.") + Text("\n") +
-                        Text(decryptErrorReason) + Text("\n") +
+                    message: Text("The hash of the previous message is different.") + textNewLine +
+                        Text(decryptErrorReason) + textNewLine +
                         Text("Please report it to the developers.")
                 ))
             case .msgBadId: msgBadIdAlert()
@@ -47,7 +47,7 @@ struct IntegrityErrorItemView: View {
             message: Text("""
                 The ID of the next message is incorrect (less or equal to the previous).
                 It can happen because of some bug or when the connection is compromised.
-                """) + Text("\n") +
+                """) + textNewLine +
                 Text("Please report it to the developers.")
         ))
     }
@@ -71,7 +71,7 @@ struct CIMsgError: View {
         .padding(.vertical, 6)
         .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
         .textSelection(.disabled)
-        .onTapGesture(perform: onTap)
+        .simultaneousGesture(TapGesture().onEnded(onTap))
     }
 }
 
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift b/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift
index 87a9b2ce61..c6a5d0353c 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift
@@ -14,6 +14,7 @@ struct MarkedDeletedItemView: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     var chatItem: ChatItem
 
     var body: some View {
@@ -29,14 +30,14 @@ struct MarkedDeletedItemView: View {
     var mergedMarkedDeletedText: LocalizedStringKey {
         if !revealed,
            let ciCategory = chatItem.mergeCategory,
-           var i = m.getChatItemIndex(chatItem) {
+           var i = m.getChatItemIndex(im, chatItem) {
             var moderated = 0
             var blocked = 0
             var blockedByAdmin = 0
             var deleted = 0
             var moderatedBy: Set<String> = []
-            while i < ItemsModel.shared.reversedChatItems.count,
-                  let ci = .some(ItemsModel.shared.reversedChatItems[i]),
+            while i < im.reversedChatItems.count,
+                  let ci = .some(im.reversedChatItems[i]),
                   ci.mergeCategory == ciCategory,
                   let itemDeleted = ci.meta.itemDeleted {
                 switch itemDeleted {
@@ -85,6 +86,7 @@ struct MarkedDeletedItemView_Previews: PreviewProvider {
         Group {
             MarkedDeletedItemView(
                 chat: Chat.sampleData,
+                im: ItemsModel.shared,
                 chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))
             ).environment(\.revealed, true)
         }
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
index e9b6d0ba84..e04584dfff 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
@@ -11,51 +11,74 @@ import SimpleXChat
 
 let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
 
-private let noTyping = Text(verbatim: "   ")
-
-private let typingIndicators: [Text] = [
-    (typing(.black) + typing() + typing()),
-    (typing(.bold) + typing(.black) + typing()),
-    (typing() + typing(.bold) + typing(.black)),
-    (typing() + typing() + typing(.bold))
-]
-
-private func typing(_ w: Font.Weight = .light) -> Text {
-    Text(".").fontWeight(w)
+private func typing(_ theme: AppTheme, _ descr: UIFontDescriptor, _ ws: [UIFont.Weight]) -> NSMutableAttributedString {
+    let res = NSMutableAttributedString()
+    for w in ws {
+        res.append(NSAttributedString(string: ".", attributes: [
+            .font: UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: w),
+            .kern: -2 as NSNumber,
+            .foregroundColor: UIColor(theme.colors.secondary)
+        ]))
+    }
+    return res
 }
 
 struct MsgContentView: View {
     @ObservedObject var chat: Chat
     @Environment(\.showTimestamp) var showTimestamp: Bool
+    @Environment(\.containerBackground) var containerBackground: UIColor
     @EnvironmentObject var theme: AppTheme
     var text: String
     var formattedText: [FormattedText]? = nil
+    var textStyle: UIFont.TextStyle
     var sender: String? = nil
     var meta: CIMeta? = nil
+    var mentions: [String: CIMention]? = nil
+    var userMemberId: String? = nil
     var rightToLeft = false
-    var showSecrets: Bool
-    var prefix: Text? = nil
+    var prefix: NSAttributedString? = nil
+    @State private var showSecrets: Set<Int> = []
     @State private var typingIdx = 0
     @State private var timer: Timer?
+    @State private var typingIndicators: [NSAttributedString] = []
+    @State private var noTyping = NSAttributedString(string: "   ")
+    @State private var phase: CGFloat = 0
 
     @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
 
     var body: some View {
+        let v = msgContentView()
         if meta?.isLive == true {
-            msgContentView()
-            .onAppear { switchTyping() }
+            v.onAppear {
+                let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body)
+                noTyping = NSAttributedString(string: "   ", attributes: [
+                    .font: UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: .regular),
+                    .kern: -2 as NSNumber,
+                    .foregroundColor: UIColor(theme.colors.secondary)
+                ])
+                switchTyping()
+            }
             .onDisappear(perform: stopTyping)
             .onChange(of: meta?.isLive, perform: switchTyping)
             .onChange(of: meta?.recent, perform: switchTyping)
         } else {
-            msgContentView()
+            v
         }
     }
 
     private func switchTyping(_: Bool? = nil) {
         if let meta = meta, meta.isLive && meta.recent {
+            if typingIndicators.isEmpty {
+                let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body)
+                typingIndicators = [
+                    typing(theme, descr, [.black, .light, .light]),
+                    typing(theme, descr, [.bold, .black, .light]),
+                    typing(theme, descr, [.light, .bold, .black]),
+                    typing(theme, descr, [.light, .light, .bold])
+                ]
+            }
             timer = timer ?? Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { _ in
-                typingIdx = (typingIdx + 1) % typingIndicators.count
+                typingIdx = typingIdx + 1
             }
         } else {
             stopTyping()
@@ -65,100 +88,276 @@ struct MsgContentView: View {
     private func stopTyping() {
         timer?.invalidate()
         timer = nil
+        typingIdx = 0
     }
 
-    private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary, prefix: prefix)
+    @inline(__always)
+    private func msgContentView() -> some View {
+        let r = messageText(text, formattedText, textStyle: textStyle, sender: sender, mentions: mentions, userMemberId: userMemberId, showSecrets: showSecrets, backgroundColor: containerBackground, prefix: prefix)
+        let s = r.string
+        let t: Text
         if let mt = meta {
             if mt.isLive {
-                v = v + typingIndicator(mt.recent)
+                s.append(typingIndicator(mt.recent))
             }
-            v = v + reserveSpaceForMeta(mt)
+            t = Text(AttributedString(s)) + reserveSpaceForMeta(mt)
+        } else {
+            t = Text(AttributedString(s))
         }
-        return v
+        return msgTextResultView(r, t, showSecrets: $showSecrets)
     }
 
-    private func typingIndicator(_ recent: Bool) -> Text {
-        return (recent ? typingIndicators[typingIdx] : noTyping)
-            .font(.body.monospaced())
-            .kerning(-2)
-            .foregroundColor(theme.colors.secondary)
+    @inline(__always)
+    private func typingIndicator(_ recent: Bool) -> NSAttributedString {
+        recent && !typingIndicators.isEmpty
+        ? typingIndicators[typingIdx % 4]
+        : noTyping
     }
 
+    @inline(__always)
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text(verbatim: "   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+        (rightToLeft ? textNewLine : Text(verbatim: "   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
     }
 }
 
-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool, secondaryColor: Color, prefix: Text? = nil) -> Text {
-    let s = text
-    var res: Text
-    
-    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
-        res = formatText(ft[0], preview, showSecret: showSecrets)
-        var i = 1
-        while i < ft.count {
-            res = res + formatText(ft[i], preview, showSecret: showSecrets)
-            i = i + 1
-        }
-    } else {
-        res = Text(s)
-    }
-
-    if let i = icon {
-        res = Text(Image(systemName: i)).foregroundColor(secondaryColor) + textSpace + res
-    }
-    
-    if let p = prefix {
-        res = p + res
-    }
-
-    if let s = sender {
-        let t = Text(s)
-        return (preview ? t : t.fontWeight(.medium)) + Text(": ") + res
-    } else {
-        return res
-    }
+func msgTextResultView(_ r: MsgTextResult, _ t: Text, showSecrets: Binding<Set<Int>>? = nil) -> some View {
+    t.if(r.hasSecrets, transform: hiddenSecretsView)
+        .if(r.handleTaps) { $0.overlay(handleTextTaps(r.string, showSecrets: showSecrets)) }
 }
 
-private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool) -> Text {
-    let t = ft.text
-    if let f = ft.format {
-        switch (f) {
-        case .bold: return Text(t).bold()
-        case .italic: return Text(t).italic()
-        case .strikeThrough: return Text(t).strikethrough()
-        case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return
-            showSecret
-            ? Text(t)
-            : Text(AttributedString(t, attributes: AttributeContainer([
-                .foregroundColor: UIColor.clear as Any,
-                .backgroundColor: UIColor.secondarySystemFill as Any
-            ])))
-        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
-        case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, smpHosts):
-            switch privacySimplexLinkModeDefault.get() {
-            case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
-            case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return linkText(t, simplexUri, preview, prefix: "")
+@inline(__always)
+private func handleTextTaps(_ s: NSAttributedString, showSecrets: Binding<Set<Int>>? = nil) -> some View {
+    return GeometryReader { g in
+        Rectangle()
+            .fill(Color.clear)
+            .contentShape(Rectangle())
+            .simultaneousGesture(DragGesture(minimumDistance: 0).onEnded { event in
+                let t = event.translation
+                if t.width * t.width + t.height * t.height > 100 { return }
+                let framesetter = CTFramesetterCreateWithAttributedString(s as CFAttributedString)
+                let path = CGPath(rect: CGRect(origin: .zero, size: g.size), transform: nil)
+                let frame = CTFramesetterCreateFrame(framesetter, CFRangeMake(0, s.length), path, nil)
+                let point = CGPoint(x: event.location.x, y: g.size.height - event.location.y) // Flip y for UIKit
+                var index: CFIndex?
+                if let lines = CTFrameGetLines(frame) as? [CTLine] {
+                    var origins = [CGPoint](repeating: .zero, count: lines.count)
+                    CTFrameGetLineOrigins(frame, CFRangeMake(0, 0), &origins)
+                    for i in 0 ..< lines.count {
+                        let bounds = CTLineGetBoundsWithOptions(lines[i], .useOpticalBounds)
+                        if bounds.offsetBy(dx: origins[i].x, dy: origins[i].y).contains(point) {
+                            index = CTLineGetStringIndexForPosition(lines[i], point)
+                            break
+                        }
+                    }
+                }
+                if let index, let (url, browser) = attributedStringLink(s, for: index) {
+                    if browser {
+                        openBrowserAlert(uri: url)
+                    } else {
+                        UIApplication.shared.open(url)
+                    }
+                }
+            })
+    }
+
+    func attributedStringLink(_ s: NSAttributedString, for index: CFIndex) -> (URL, Bool)? {
+        var linkURL: URL?
+        var browser: Bool = false
+        s.enumerateAttributes(in: NSRange(location: 0, length: s.length)) { attrs, range, stop in
+            if index >= range.location && index < range.location + range.length {
+                if let url = attrs[linkAttrKey] as? NSURL {
+                    linkURL = url.absoluteURL
+                    browser = attrs[webLinkAttrKey] != nil
+                } else if let showSecrets, let i = attrs[secretAttrKey] as? Int {
+                    if showSecrets.wrappedValue.contains(i) {
+                        showSecrets.wrappedValue.remove(i)
+                    } else {
+                        showSecrets.wrappedValue.insert(i)
+                    }
+                }
+                stop.pointee = true
             }
-        case .email: return linkText(t, t, preview, prefix: "mailto:")
-        case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
         }
-    } else {
-        return Text(t)
+        return if let linkURL { (linkURL, browser) } else { nil }
     }
 }
 
-private func linkText(_ s: String, _ link: String, _ preview: Bool, prefix: String, color: Color = Color(uiColor: uiLinkColor), uiColor: UIColor = uiLinkColor) -> Text {
-    preview
-    ? Text(s).foregroundColor(color).underline(color: color)
-    : Text(AttributedString(s, attributes: AttributeContainer([
-        .link: NSURL(string: prefix + link) as Any,
-        .foregroundColor: uiColor as Any
-    ]))).underline()
+func hiddenSecretsView<V: View>(_ v: V) -> some View {
+    v.overlay(
+        GeometryReader { g in
+            let size = (g.size.width + g.size.height) / 1.4142
+            Image("vertical_logo")
+                .resizable(resizingMode: .tile)
+                .frame(width: size, height: size)
+                .rotationEffect(.degrees(45), anchor: .center)
+                .position(x: g.size.width / 2, y: g.size.height / 2)
+                .clipped()
+                .saturation(0.65)
+                .opacity(0.35)
+        }
+        .mask(v)
+    )
+}
+
+private let linkAttrKey = NSAttributedString.Key("chat.simplex.app.link")
+
+private let webLinkAttrKey = NSAttributedString.Key("chat.simplex.app.webLink")
+
+private let secretAttrKey = NSAttributedString.Key("chat.simplex.app.secret")
+
+typealias MsgTextResult = (string: NSMutableAttributedString, hasSecrets: Bool, handleTaps: Bool)
+
+func messageText(
+    _ text: String,
+    _ formattedText: [FormattedText]?,
+    textStyle: UIFont.TextStyle = .body,
+    sender: String?,
+    preview: Bool = false,
+    mentions: [String: CIMention]?,
+    userMemberId: String?,
+    showSecrets: Set<Int>?,
+    backgroundColor: UIColor,
+    prefix: NSAttributedString? = nil
+) -> MsgTextResult {
+    let res = NSMutableAttributedString()
+    let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: textStyle)
+    let font = UIFont.preferredFont(forTextStyle: textStyle)
+    let plain: [NSAttributedString.Key: Any] = [
+        .font: font,
+        .foregroundColor: UIColor.label
+    ]
+    let secretColor = backgroundColor.withAlphaComponent(1)
+    var link: [NSAttributedString.Key: Any]?
+    var hasSecrets = false
+    var handleTaps = false
+
+    if let sender {
+        if preview {
+            res.append(NSAttributedString(string: sender + ": ", attributes: plain))
+        } else {
+            var attrs = plain
+            attrs[.font] = UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.medium]]), size: descr.pointSize)
+            res.append(NSAttributedString(string: sender, attributes: attrs))
+            res.append(NSAttributedString(string: ": ", attributes: plain))
+        }
+    }
+
+    if let prefix {
+        res.append(prefix)
+    }
+
+    if let fts = formattedText, fts.count > 0 {
+        var bold: UIFont?
+        var italic: UIFont?
+        var snippet: UIFont?
+        var mention: UIFont?
+        var secretIdx: Int = 0
+        for ft in fts {
+            var t = ft.text
+            var attrs = plain
+            switch (ft.format) {
+            case .bold:
+                bold = bold ?? UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.bold]]), size: descr.pointSize)
+                attrs[.font] = bold
+            case .italic:
+                italic = italic ?? UIFont(descriptor: descr.withSymbolicTraits(.traitItalic) ?? descr, size: descr.pointSize)
+                attrs[.font] = italic
+            case .strikeThrough:
+                attrs[.strikethroughStyle] = NSUnderlineStyle.single.rawValue
+            case .snippet:
+                snippet = snippet ?? UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: .regular)
+                attrs[.font] = snippet
+            case .secret:
+                if let showSecrets {
+                    if !showSecrets.contains(secretIdx) {
+                        attrs[.foregroundColor] = UIColor.clear
+                        attrs[.backgroundColor] = secretColor
+                    }
+                    attrs[secretAttrKey] = secretIdx
+                    secretIdx += 1
+                    handleTaps = true
+                } else {
+                    attrs[.foregroundColor] = UIColor.clear
+                    attrs[.backgroundColor] = secretColor
+                }
+                hasSecrets = true
+            case let .colored(color):
+                if let c = color.uiColor {
+                    attrs[.foregroundColor] = UIColor(c)
+                }
+            case .uri:
+                attrs = linkAttrs()
+                if !preview {
+                    let s = t.lowercased()
+                    let link = s.hasPrefix("http://") || s.hasPrefix("https://")
+                                ? t
+                                : "https://" + t
+                    attrs[linkAttrKey] = NSURL(string: link)
+                    attrs[webLinkAttrKey] = true
+                    handleTaps = true
+                }
+            case let .simplexLink(linkType, simplexUri, smpHosts):
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: simplexUri)
+                    handleTaps = true
+                }
+                if case .description = privacySimplexLinkModeDefault.get() {
+                    t = simplexLinkText(linkType, smpHosts)
+                }
+            case let .mention(memberName):
+                if let m = mentions?[memberName] {
+                    mention = mention ?? UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.semibold]]), size: descr.pointSize)
+                    attrs[.font] = mention
+                    if let ref = m.memberRef {
+                        let name: String = if let alias = ref.localAlias, alias != "" {
+                            "\(alias) (\(ref.displayName))"
+                        } else {
+                            ref.displayName
+                        }
+                        if m.memberId == userMemberId {
+                            attrs[.foregroundColor] = UIColor.tintColor
+                        }
+                        t = mentionText(name)
+                    } else {
+                        t = mentionText(memberName)
+                    }
+                }
+            case .email:
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: "mailto:" + ft.text)
+                    handleTaps = true
+                }
+            case .phone:
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: "tel:" + t.replacingOccurrences(of: " ", with: ""))
+                    handleTaps = true
+                }
+            case .none: ()
+            }
+            res.append(NSAttributedString(string: t, attributes: attrs))
+        }
+    } else {
+        res.append(NSMutableAttributedString(string: text, attributes: plain))
+    }
+    
+    return (string: res, hasSecrets: hasSecrets, handleTaps: handleTaps)
+
+    func linkAttrs() -> [NSAttributedString.Key: Any] {
+        link = link ?? [
+            .font: font,
+            .foregroundColor: uiLinkColor,
+            .underlineStyle: NSUnderlineStyle.single.rawValue
+        ]
+        return link!
+    }
+}
+
+@inline(__always)
+private func mentionText(_ name: String) -> String {
+    name.contains(" @") ? "@'\(name)'" : "@\(name)"
 }
 
 func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
@@ -172,9 +371,9 @@ struct MsgContentView_Previews: PreviewProvider {
             chat: Chat.sampleData,
             text: chatItem.text,
             formattedText: chatItem.formattedText,
+            textStyle: .body,
             sender: chatItem.memberDisplayName,
-            meta: chatItem.meta,
-            showSecrets: false
+            meta: chatItem.meta
         )
         .environmentObject(Chat.sampleData)
     }
diff --git a/apps/ios/Shared/Views/Chat/ChatItemForwardingView.swift b/apps/ios/Shared/Views/Chat/ChatItemForwardingView.swift
index 587957cd5d..dfc620c402 100644
--- a/apps/ios/Shared/Views/Chat/ChatItemForwardingView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemForwardingView.swift
@@ -41,7 +41,7 @@ struct ChatItemForwardingView: View {
         .alert(item: $alert) { $0.alert }
     }
 
-    @ViewBuilder private func forwardListView() -> some View {
+    private func forwardListView() -> some View {
         VStack(alignment: .leading) {
             if !chatsToForwardTo.isEmpty {
                 List {
diff --git a/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift b/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift
index 62ea607d27..cd75d1b0cd 100644
--- a/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift
@@ -14,6 +14,7 @@ struct ChatItemInfoView: View {
     @Environment(\.dismiss) var dismiss
     @EnvironmentObject var theme: AppTheme
     var ci: ChatItem
+    var userMemberId: String?
     @Binding var chatItemInfo: ChatItemInfo?
     @State private var selection: CIInfoTab = .history
     @State private var alert: CIInfoViewAlert? = nil
@@ -130,9 +131,9 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func details() -> some View {
+    private func details() -> some View {
         let meta = ci.meta
-        VStack(alignment: .leading, spacing: 16) {
+        return VStack(alignment: .leading, spacing: 16) {
             Text(title)
                 .font(.largeTitle)
                 .bold()
@@ -196,7 +197,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func historyTab() -> some View {
+    private func historyTab() -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
             ScrollView {
@@ -226,12 +227,13 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
-        VStack(alignment: .leading, spacing: 4) {
-            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
+    private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
+        let backgroundColor = chatItemFrameColor(ci, theme)
+        return VStack(alignment: .leading, spacing: 4) {
+            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil, backgroundColor: UIColor(backgroundColor))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, theme))
+                .background(backgroundColor)
                 .modifier(ChatItemClipped())
                 .contextMenu {
                     if itemVersion.msgContent.text != "" {
@@ -256,9 +258,9 @@ struct ChatItemInfoView: View {
         .frame(maxWidth: maxWidth, alignment: .leading)
     }
 
-    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
+    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil, backgroundColor: UIColor) -> some View {
         if text != "" {
-            TextBubble(text: text, formattedText: formattedText, sender: sender)
+            TextBubble(text: text, formattedText: formattedText, sender: sender, mentions: ci.mentions, userMemberId: userMemberId, backgroundColor: backgroundColor)
         } else {
             Text("no text")
                 .italic()
@@ -271,14 +273,18 @@ struct ChatItemInfoView: View {
         var text: String
         var formattedText: [FormattedText]?
         var sender: String? = nil
-        @State private var showSecrets = false
+        var mentions: [String: CIMention]?
+        var userMemberId: String?
+        var backgroundColor: UIColor
+        @State private var showSecrets: Set<Int> = []
 
         var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary))
+            let r = messageText(text, formattedText, sender: sender, mentions: mentions, userMemberId: userMemberId, showSecrets: showSecrets, backgroundColor: backgroundColor)
+            return msgTextResultView(r, Text(AttributedString(r.string)), showSecrets: $showSecrets)
         }
     }
 
-    @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
+    private func quoteTab(_ qi: CIQuote) -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
             ScrollView {
@@ -296,9 +302,10 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
-        VStack(alignment: .leading, spacing: 4) {
-            textBubble(qi.text, qi.formattedText, qi.getSender(nil))
+    private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
+        let backgroundColor = quotedMsgFrameColor(qi, theme)
+        return VStack(alignment: .leading, spacing: 4) {
+            textBubble(qi.text, qi.formattedText, qi.getSender(nil), backgroundColor: UIColor(backgroundColor))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(quotedMsgFrameColor(qi, theme))
@@ -331,7 +338,7 @@ struct ChatItemInfoView: View {
         : theme.appColors.receivedMessage
     }
 
-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
+    private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 16) {
                 details()
@@ -351,8 +358,9 @@ struct ChatItemInfoView: View {
             Button {
                 Task {
                     await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
-                        dismiss()
+                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id) {
+                            dismiss()
+                        }
                     }
                 }
             } label: {
@@ -368,7 +376,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
+    private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
         HStack {
             ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
                 .padding(.trailing, 6)
@@ -399,7 +407,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+    private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 16) {
                 details()
@@ -414,7 +422,7 @@ struct ChatItemInfoView: View {
         .frame(maxHeight: .infinity, alignment: .top)
     }
 
-    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+    private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
         LazyVStack(alignment: .leading, spacing: 12) {
             let mss = membersStatuses(memberDeliveryStatuses)
             if !mss.isEmpty {
@@ -548,6 +556,6 @@ func localTimestamp(_ date: Date) -> String {
 
 struct ChatItemInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        ChatItemInfoView(ci: ChatItem.getSample(1, .directSnd, .now, "hello"), chatItemInfo: Binding.constant(nil))
+        ChatItemInfoView(ci: ChatItem.getSample(1, .directSnd, .now, "hello"), userMemberId: Chat.sampleData.chatInfo.groupInfo?.membership.memberId, chatItemInfo: Binding.constant(nil))
     }
 }
diff --git a/apps/ios/Shared/Views/Chat/ChatItemView.swift b/apps/ios/Shared/Views/Chat/ChatItemView.swift
index ebbc55a932..a412bf4452 100644
--- a/apps/ios/Shared/Views/Chat/ChatItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemView.swift
@@ -18,6 +18,10 @@ extension EnvironmentValues {
         static let defaultValue: Bool = true
     }
 
+    struct ContainerBackground: EnvironmentKey {
+        static let defaultValue: UIColor = .clear
+    }
+
     var showTimestamp: Bool {
         get { self[ShowTimestamp.self] }
         set { self[ShowTimestamp.self] = newValue }
@@ -27,26 +31,40 @@ extension EnvironmentValues {
         get { self[Revealed.self] }
         set { self[Revealed.self] = newValue }
     }
+
+    var containerBackground: UIColor {
+        get { self[ContainerBackground.self] }
+        set { self[ContainerBackground.self] = newValue }
+    }
 }
 
 struct ChatItemView: View {
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.showTimestamp) var showTimestamp: Bool
     @Environment(\.revealed) var revealed: Bool
     var chatItem: ChatItem
+    var scrollToItem: (ChatItem.ID) -> Void
+    @Binding var scrollToItemId: ChatItem.ID?
     var maxWidth: CGFloat = .infinity
     @Binding var allowMenu: Bool
 
     init(
         chat: Chat,
+        im: ItemsModel,
         chatItem: ChatItem,
+        scrollToItem: @escaping (ChatItem.ID) -> Void,
+        scrollToItemId: Binding<ChatItem.ID?> = .constant(nil),
         showMember: Bool = false,
         maxWidth: CGFloat = .infinity,
         allowMenu: Binding<Bool> = .constant(false)
     ) {
         self.chat = chat
+        self.im = im
         self.chatItem = chatItem
+        self.scrollToItem = scrollToItem
+        _scrollToItemId = scrollToItemId
         self.maxWidth = maxWidth
         _allowMenu = allowMenu
     }
@@ -54,14 +72,14 @@ struct ChatItemView: View {
     var body: some View {
         let ci = chatItem
         if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
+            MarkedDeletedItemView(chat: chat, im: im, chatItem: chatItem)
         } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                 EmojiItemView(chat: chat, chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                 CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, im: im, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -89,7 +107,10 @@ struct ChatItemView: View {
         }()
         return FramedItemView(
             chat: chat,
+            im: im,
             chatItem: chatItem,
+            scrollToItem: scrollToItem,
+            scrollToItemId: $scrollToItemId,
             preview: preview,
             maxWidth: maxWidth,
             imgWidth: adjustedMaxWidth,
@@ -104,6 +125,7 @@ struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     var chatItem: ChatItem
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
@@ -127,7 +149,9 @@ struct ChatItemContentView<Content: View>: View {
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case .rcvDirectEvent: eventItemView()
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
+        case .rcvGroupEvent(.newMemberPendingReview): CIEventView(eventText: pendingReviewEventItemText())
         case .rcvGroupEvent: eventItemView()
+        case .sndGroupEvent(.userPendingReview): CIEventView(eventText: pendingReviewEventItemText())
         case .sndGroupEvent: eventItemView()
         case .rcvConnEvent: eventItemView()
         case .sndConnEvent: eventItemView()
@@ -136,7 +160,7 @@ 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, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
+            CIChatFeatureView(chat: chat, im: im, chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
         case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -168,6 +192,13 @@ struct ChatItemContentView<Content: View>: View {
         CIEventView(eventText: eventItemViewText(theme.colors.secondary))
     }
 
+    private func pendingReviewEventItemText() -> Text {
+        Text(chatItem.content.text)
+            .font(.caption)
+            .foregroundColor(theme.colors.secondary)
+            .fontWeight(.bold)
+    }
+
     private func eventItemViewText(_ secondaryColor: Color) -> Text {
         if !revealed, let t = mergedGroupEventText {
             return chatEventText(t + textSpace + chatItem.timestampText, secondaryColor)
@@ -183,7 +214,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chat: chat, im: im, chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
 
     private var mergedGroupEventText: Text? {
@@ -243,16 +274,17 @@ func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
 
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getDeletedContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)).environment(\.revealed, true)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)).environment(\.revealed, true)
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 70))
@@ -262,57 +294,72 @@ struct ChatItemView_Previews: PreviewProvider {
 
 struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: 1, toMsgId: 2)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
                     content: .rcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 2),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupInvitation(groupInvitation: CIGroupInvitation.getSample(status: .pending), memberRole: .admin),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupEvent(rcvGroupEvent: .memberAdded(groupMemberId: 1, profile: Profile.sampleData)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: ciFeatureContent,
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
         }
         .environment(\.revealed, true)
diff --git a/apps/ios/Shared/Views/Chat/ChatItemsLoader.swift b/apps/ios/Shared/Views/Chat/ChatItemsLoader.swift
new file mode 100644
index 0000000000..93ecf870eb
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/ChatItemsLoader.swift
@@ -0,0 +1,516 @@
+//
+//  ChatItemsLoader.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 17.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SimpleXChat
+import SwiftUI
+
+let TRIM_KEEP_COUNT = 200
+
+func apiLoadMessages(
+    _ chatId: ChatId,
+    _ im: ItemsModel,
+    _ pagination: ChatPagination,
+    _ search: String = "",
+    _ openAroundItemId: ChatItem.ID? = nil,
+    _ visibleItemIndexesNonReversed: @MainActor () -> ClosedRange<Int> = { 0 ... 0 }
+) async {
+    let chat: Chat
+    let navInfo: NavigationInfo
+    do {
+        (chat, navInfo) = try await apiGetChat(chatId: chatId, scope: im.groupScopeInfo?.toChatScope(), contentTag: im.contentTag, pagination: pagination, search: search)
+    } catch let error {
+        logger.error("apiLoadMessages error: \(responseError(error))")
+        return
+    }
+
+    let chatModel = ChatModel.shared
+
+    // For .initial allow the chatItems to be empty as well as chatModel.chatId to not match this chat because these values become set after .initial finishes
+    let paginationIsInitial = switch pagination { case .initial: true; default: false }
+    let paginationIsLast = switch pagination { case .last: true; default: false }
+    // When openAroundItemId is provided, chatId can be different too
+    if ((chatModel.chatId != chat.id || chat.chatItems.isEmpty) && !paginationIsInitial && !paginationIsLast && openAroundItemId == nil) || Task.isCancelled {
+        return
+    }
+
+    let unreadAfterItemId = im.chatState.unreadAfterItemId
+
+    let oldItems = Array(im.reversedChatItems.reversed())
+    var newItems: [ChatItem] = []
+    switch pagination {
+    case .initial:
+        let newSplits: [Int64] = if !chat.chatItems.isEmpty && navInfo.afterTotal > 0 { [chat.chatItems.last!.id] } else { [] }
+        if im.secondaryIMFilter == nil && chatModel.getChat(chat.id) == nil {
+            chatModel.addChat(chat)
+        }
+        await MainActor.run {
+            im.reversedChatItems = chat.chatItems.reversed()
+            if im.secondaryIMFilter == nil {
+                chatModel.updateChatInfo(chat.chatInfo)
+            }
+            im.chatState.splits = newSplits
+            if !chat.chatItems.isEmpty {
+                im.chatState.unreadAfterItemId = chat.chatItems.last!.id
+            }
+            im.chatState.totalAfter = navInfo.afterTotal
+            im.chatState.unreadTotal = chat.chatStats.unreadCount
+            im.chatState.unreadAfter = navInfo.afterUnread
+            im.chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+
+            im.preloadState.clear()
+        }
+    case let .before(paginationChatItemId, _):
+        newItems.append(contentsOf: oldItems)
+        let indexInCurrentItems = oldItems.firstIndex(where: { $0.id == paginationChatItemId })
+        guard let indexInCurrentItems else { return }
+        let (newIds, _) = mapItemsToIds(chat.chatItems)
+        let wasSize = newItems.count
+        let visibleItemIndexes = await MainActor.run { visibleItemIndexesNonReversed() }
+        let modifiedSplits = removeDuplicatesAndModifySplitsOnBeforePagination(
+            unreadAfterItemId, &newItems, newIds, im.chatState.splits, visibleItemIndexes
+        )
+        let insertAt = max((indexInCurrentItems - (wasSize - newItems.count) + modifiedSplits.trimmedIds.count), 0)
+        newItems.insert(contentsOf: chat.chatItems, at: insertAt)
+        let newReversed: [ChatItem] = newItems.reversed()
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = modifiedSplits.newSplits
+            im.chatState.moveUnreadAfterItem(modifiedSplits.oldUnreadSplitIndex, modifiedSplits.newUnreadSplitIndex, oldItems)
+        }
+    case let .after(paginationChatItemId, _):
+        newItems.append(contentsOf: oldItems)
+        let indexInCurrentItems = oldItems.firstIndex(where: { $0.id == paginationChatItemId })
+        guard let indexInCurrentItems else { return }
+
+        let mappedItems = mapItemsToIds(chat.chatItems)
+        let newIds = mappedItems.0
+        let (newSplits, unreadInLoaded) = removeDuplicatesAndModifySplitsOnAfterPagination(
+            mappedItems.1, paginationChatItemId, &newItems, newIds, chat, im.chatState.splits
+        )
+        let indexToAdd = min(indexInCurrentItems + 1, newItems.count)
+        let indexToAddIsLast = indexToAdd == newItems.count
+        newItems.insert(contentsOf: chat.chatItems, at: indexToAdd)
+        let new: [ChatItem] = newItems
+        let newReversed: [ChatItem] = newItems.reversed()
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = newSplits
+            im.chatState.moveUnreadAfterItem(im.chatState.splits.first ?? new.last!.id, new)
+            // loading clear bottom area, updating number of unread items after the newest loaded item
+            if indexToAddIsLast {
+                im.chatState.unreadAfterNewestLoaded -= unreadInLoaded
+            }
+        }
+    case .around:
+        var newSplits: [Int64]
+        if openAroundItemId == nil {
+            newItems.append(contentsOf: oldItems)
+            newSplits = await removeDuplicatesAndUpperSplits(&newItems, chat, im.chatState.splits, visibleItemIndexesNonReversed)
+        } else {
+            newSplits = []
+        }
+        let (itemIndex, splitIndex) = indexToInsertAround(chat.chatInfo.chatType, chat.chatItems.last, to: newItems, Set(newSplits))
+        //indexToInsertAroundTest()
+        newItems.insert(contentsOf: chat.chatItems, at: itemIndex)
+        newSplits.insert(chat.chatItems.last!.id, at: splitIndex)
+        let newReversed: [ChatItem] = newItems.reversed()
+        let orderedSplits = newSplits
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = orderedSplits
+            im.chatState.unreadAfterItemId = chat.chatItems.last!.id
+            im.chatState.totalAfter = navInfo.afterTotal
+            im.chatState.unreadTotal = chat.chatStats.unreadCount
+            im.chatState.unreadAfter = navInfo.afterUnread
+
+            if let openAroundItemId {
+                im.chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+                if im.secondaryIMFilter == nil {
+                    ChatModel.shared.openAroundItemId = openAroundItemId // TODO [knocking] move openAroundItemId from ChatModel to ItemsModel?
+                    ChatModel.shared.chatId = chat.id
+                }
+            } else {
+                // no need to set it, count will be wrong
+                // chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+            }
+            im.preloadState.clear()
+        }
+    case .last:
+        newItems.append(contentsOf: oldItems)
+        let newSplits = await removeDuplicatesAndUnusedSplits(&newItems, chat, im.chatState.splits)
+        newItems.append(contentsOf: chat.chatItems)
+        let items = newItems
+        await MainActor.run {
+            im.reversedChatItems = items.reversed()
+            im.chatState.splits = newSplits
+            if im.secondaryIMFilter == nil {
+                chatModel.updateChatInfo(chat.chatInfo)
+            }
+            im.chatState.unreadAfterNewestLoaded = 0
+        }
+    }
+}
+
+
+private class ModifiedSplits {
+    let oldUnreadSplitIndex: Int
+    let newUnreadSplitIndex: Int
+    let trimmedIds: Set<Int64>
+    let newSplits: [Int64]
+
+    init(oldUnreadSplitIndex: Int, newUnreadSplitIndex: Int, trimmedIds: Set<Int64>, newSplits: [Int64]) {
+        self.oldUnreadSplitIndex = oldUnreadSplitIndex
+        self.newUnreadSplitIndex = newUnreadSplitIndex
+        self.trimmedIds = trimmedIds
+        self.newSplits = newSplits
+    }
+}
+
+private func removeDuplicatesAndModifySplitsOnBeforePagination(
+    _ unreadAfterItemId: Int64,
+    _ newItems: inout [ChatItem],
+    _ newIds: Set<Int64>,
+    _ splits: [Int64],
+    _ visibleItemIndexes: ClosedRange<Int>
+) -> ModifiedSplits {
+    var oldUnreadSplitIndex: Int = -1
+    var newUnreadSplitIndex: Int = -1
+    var lastSplitIndexTrimmed: Int? = nil
+    var allowedTrimming = true
+    var index = 0
+    /** keep the newest [TRIM_KEEP_COUNT] items (bottom area) and oldest [TRIM_KEEP_COUNT] items, trim others */
+    let trimLowerBound = visibleItemIndexes.upperBound + TRIM_KEEP_COUNT
+    let trimUpperBound = newItems.count - TRIM_KEEP_COUNT
+    let trimRange = trimUpperBound >= trimLowerBound ? trimLowerBound ... trimUpperBound : -1 ... -1
+    var trimmedIds = Set<Int64>()
+    let prevTrimLowerBound = visibleItemIndexes.upperBound + TRIM_KEEP_COUNT + 1
+    let prevTrimUpperBound = newItems.count - TRIM_KEEP_COUNT
+    let prevItemTrimRange = prevTrimUpperBound >= prevTrimLowerBound ? prevTrimLowerBound ... prevTrimUpperBound : -1 ... -1
+    var newSplits = splits
+
+    newItems.removeAll(where: {
+        let invisibleItemToTrim = trimRange.contains(index) && allowedTrimming
+        let prevItemWasTrimmed = prevItemTrimRange.contains(index) && allowedTrimming
+        // may disable it after clearing the whole split range
+        if !splits.isEmpty && $0.id == splits.first {
+            // trim only in one split range
+            allowedTrimming = false
+        }
+        let indexInSplits = splits.firstIndex(of: $0.id)
+        if let indexInSplits {
+            lastSplitIndexTrimmed = indexInSplits
+        }
+        if invisibleItemToTrim {
+            if prevItemWasTrimmed {
+                trimmedIds.insert($0.id)
+            } else {
+                newUnreadSplitIndex = index
+                // prev item is not supposed to be trimmed, so exclude current one from trimming and set a split here instead.
+                // this allows to define splitRange of the oldest items and to start loading trimmed items when user scrolls in the opposite direction
+                if let lastSplitIndexTrimmed {
+                    var new = newSplits
+                    new[lastSplitIndexTrimmed] = $0.id
+                    newSplits = new
+                } else {
+                    newSplits = [$0.id] + newSplits
+                }
+            }
+        }
+        if unreadAfterItemId == $0.id {
+            oldUnreadSplitIndex = index
+        }
+        index += 1
+        return (invisibleItemToTrim && prevItemWasTrimmed) || newIds.contains($0.id)
+    })
+    // will remove any splits that now becomes obsolete because items were merged
+    newSplits = newSplits.filter { split in !newIds.contains(split) && !trimmedIds.contains(split) }
+    return ModifiedSplits(oldUnreadSplitIndex: oldUnreadSplitIndex, newUnreadSplitIndex:  newUnreadSplitIndex, trimmedIds: trimmedIds, newSplits: newSplits)
+}
+
+private func removeDuplicatesAndModifySplitsOnAfterPagination(
+    _ unreadInLoaded: Int,
+    _ paginationChatItemId: Int64,
+    _ newItems: inout [ChatItem],
+    _ newIds: Set<Int64>,
+    _ chat: Chat,
+    _ splits: [Int64]
+) -> ([Int64], Int) {
+    var unreadInLoaded = unreadInLoaded
+    var firstItemIdBelowAllSplits: Int64? = nil
+    var splitsToRemove: Set<Int64> = []
+    let indexInSplitRanges = splits.firstIndex(of: paginationChatItemId)
+    // Currently, it should always load from split range
+    let loadingFromSplitRange = indexInSplitRanges != nil
+    let topSplits: [Int64]
+    var splitsToMerge: [Int64]
+    if let indexInSplitRanges, loadingFromSplitRange && indexInSplitRanges + 1 <= splits.count {
+        splitsToMerge = Array(splits[indexInSplitRanges + 1 ..< splits.count])
+        topSplits = Array(splits[0 ..< indexInSplitRanges + 1])
+    } else {
+        splitsToMerge = []
+        topSplits = []
+    }
+    newItems.removeAll(where: { new in
+        let duplicate = newIds.contains(new.id)
+        if loadingFromSplitRange && duplicate {
+            if splitsToMerge.contains(new.id) {
+                splitsToMerge.removeAll(where: { $0 == new.id })
+                splitsToRemove.insert(new.id)
+            } else if firstItemIdBelowAllSplits == nil && splitsToMerge.isEmpty {
+                // we passed all splits and found duplicated item below all of them, which means no splits anymore below the loaded items
+                firstItemIdBelowAllSplits = new.id
+            }
+        }
+        if duplicate && new.isRcvNew {
+            unreadInLoaded -= 1
+        }
+        return duplicate
+    })
+    var newSplits: [Int64] = []
+    if firstItemIdBelowAllSplits != nil {
+        // no splits below anymore, all were merged with bottom items
+        newSplits = topSplits
+    } else {
+        if !splitsToRemove.isEmpty {
+            var new = splits
+            new.removeAll(where: { splitsToRemove.contains($0) })
+            newSplits = new
+        }
+        let enlargedSplit = splits.firstIndex(of: paginationChatItemId)
+        if let enlargedSplit {
+            // move the split to the end of loaded items
+            var new = splits
+            new[enlargedSplit] = chat.chatItems.last!.id
+            newSplits = new
+        }
+    }
+    return (newSplits, unreadInLoaded)
+}
+
+private func removeDuplicatesAndUpperSplits(
+    _ newItems: inout [ChatItem],
+    _ chat: Chat,
+    _ splits: [Int64],
+    _ visibleItemIndexesNonReversed: @MainActor () -> ClosedRange<Int>
+) async -> [Int64] {
+    if splits.isEmpty {
+        removeDuplicates(&newItems, chat)
+        return splits
+    }
+
+    var newSplits = splits
+    let visibleItemIndexes = await MainActor.run { visibleItemIndexesNonReversed() }
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    var idsToTrim: [BoxedValue<Set<Int64>>] = []
+    idsToTrim.append(BoxedValue(Set()))
+    var index = 0
+    newItems.removeAll(where: {
+        let duplicate = newIds.contains($0.id)
+        if (!duplicate && visibleItemIndexes.lowerBound > index) {
+            idsToTrim.last?.boxedValue.insert($0.id)
+        }
+        if visibleItemIndexes.lowerBound > index, let firstIndex = newSplits.firstIndex(of: $0.id) {
+            newSplits.remove(at: firstIndex)
+            // closing previous range. All items in idsToTrim that ends with empty set should be deleted.
+            // Otherwise, the last set should be excluded from trimming because it is in currently visible split range
+            idsToTrim.append(BoxedValue(Set()))
+        }
+
+        index += 1
+        return duplicate
+    })
+    if !idsToTrim.last!.boxedValue.isEmpty {
+        // it has some elements to trim from currently visible range which means the items shouldn't be trimmed
+        // Otherwise, the last set would be empty
+        idsToTrim.removeLast()
+    }
+    let allItemsToDelete = idsToTrim.compactMap { set in set.boxedValue }.joined()
+    if !allItemsToDelete.isEmpty {
+        newItems.removeAll(where: { allItemsToDelete.contains($0.id) })
+    }
+    return newSplits
+}
+
+private func removeDuplicatesAndUnusedSplits(
+    _ newItems: inout [ChatItem],
+    _ chat: Chat,
+    _ splits: [Int64]
+) async -> [Int64] {
+    if splits.isEmpty {
+        removeDuplicates(&newItems, chat)
+        return splits
+    }
+
+    var newSplits = splits
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    newItems.removeAll(where: {
+        let duplicate = newIds.contains($0.id)
+        if duplicate, let firstIndex = newSplits.firstIndex(of: $0.id) {
+            newSplits.remove(at: firstIndex)
+        }
+        return duplicate
+    })
+    return newSplits
+}
+
+// ids, number of unread items
+private func mapItemsToIds(_ items: [ChatItem]) -> (Set<Int64>, Int) {
+    var unreadInLoaded = 0
+    var ids: Set<Int64> = Set()
+    var i = 0
+    while i < items.count {
+        let item = items[i]
+        ids.insert(item.id)
+        if item.isRcvNew {
+            unreadInLoaded += 1
+        }
+        i += 1
+    }
+    return (ids, unreadInLoaded)
+}
+
+private func removeDuplicates(_ newItems: inout [ChatItem], _ chat: Chat) {
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    newItems.removeAll { newIds.contains($0.id) }
+}
+
+private typealias SameTimeItem = (index: Int, item: ChatItem)
+
+// return (item index, split index)
+private func indexToInsertAround(_ chatType: ChatType, _ lastNew: ChatItem?, to: [ChatItem], _ splits: Set<Int64>) -> (Int, Int) {
+    guard to.count > 0, let lastNew = lastNew else { return (0, 0) }
+    // group sorting: item_ts, item_id
+    // everything else: created_at, item_id
+    let compareByTimeTs = chatType == .group
+    // in case several items have the same time as another item in the `to` array
+    var sameTime: [SameTimeItem] = []
+
+    // trying to find new split index for item looks difficult but allows to not use one more loop.
+    // The idea is to memorize how many splits were till any index (map number of splits until index)
+    // and use resulting itemIndex to decide new split index position.
+    // Because of the possibility to have many items with the same timestamp, it's possible to see `itemIndex < || == || > i`.
+    var splitsTillIndex: [Int] = []
+    var splitsPerPrevIndex = 0
+
+    for i in 0 ..< to.count {
+        let item = to[i]
+
+        splitsPerPrevIndex = splits.contains(item.id) ? splitsPerPrevIndex + 1 : splitsPerPrevIndex
+        splitsTillIndex.append(splitsPerPrevIndex)
+
+        let itemIsNewer = (compareByTimeTs ? item.meta.itemTs > lastNew.meta.itemTs : item.meta.createdAt > lastNew.meta.createdAt)
+        if itemIsNewer || i + 1 == to.count {
+            if (compareByTimeTs ? lastNew.meta.itemTs == item.meta.itemTs : lastNew.meta.createdAt == item.meta.createdAt) {
+                sameTime.append((i, item))
+            }
+            // time to stop the loop. Item is newer or it's the last item in `to` array, taking previous items and checking position inside them
+            let itemIndex: Int
+            if sameTime.count > 1, let first = sameTime.sorted(by: { prev, next in prev.item.meta.itemId < next.item.id }).first(where: { same in same.item.id > lastNew.id }) {
+                itemIndex = first.index
+            } else if sameTime.count == 1 {
+                itemIndex = sameTime[0].item.id > lastNew.id ? sameTime[0].index : sameTime[0].index + 1
+            } else {
+                itemIndex = itemIsNewer ? i : i + 1
+            }
+            let splitIndex = splitsTillIndex[min(itemIndex, splitsTillIndex.count - 1)]
+            let prevItemSplitIndex = itemIndex == 0 ? 0 : splitsTillIndex[min(itemIndex - 1, splitsTillIndex.count - 1)]
+            return (itemIndex, splitIndex == prevItemSplitIndex ? splitIndex : prevItemSplitIndex)
+        }
+
+        if (compareByTimeTs ? lastNew.meta.itemTs == item.meta.itemTs : lastNew.meta.createdAt == item.meta.createdAt) {
+            sameTime.append(SameTimeItem(index: i, item: item))
+        } else {
+            sameTime = []
+        }
+    }
+    // shouldn't be here
+    return (to.count, splits.count)
+}
+
+private func indexToInsertAroundTest() {
+    func assert(_ one: (Int, Int), _ two: (Int, Int)) {
+        if one != two {
+            logger.debug("\(String(describing: one)) != \(String(describing: two))")
+            fatalError()
+        }
+    }
+
+    let itemsToInsert = [ChatItem.getSample(3, .groupSnd, Date.init(timeIntervalSince1970: 3), "")]
+    let items1 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 1), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 2), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items1, Set([1])), (3, 1))
+
+    let items2 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 1), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items2, Set([2])), (3, 1))
+
+    let items3 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items3, Set([1])), (3, 1))
+
+    let items4 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items4, Set([4])), (1, 0))
+
+    let items5 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items5, Set([2])), (2, 1))
+
+    let items6 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items6, Set([5])), (0, 0))
+
+    let items7 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, nil, to: items7, Set([6])), (0, 0))
+
+    let items8 = [
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items8, Set([2])), (0, 0))
+
+    let items9 = [
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items9, Set([5])), (1, 0))
+
+    let items10 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items10, Set([4])), (0, 0))
+
+    let items11: [ChatItem] = []
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items11, Set([])), (0, 0))
+}
diff --git a/apps/ios/Shared/Views/Chat/ChatItemsMerger.swift b/apps/ios/Shared/Views/Chat/ChatItemsMerger.swift
new file mode 100644
index 0000000000..5f2102b8bc
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/ChatItemsMerger.swift
@@ -0,0 +1,457 @@
+//
+//  ChatItemsMerger.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 02.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MergedItems: Hashable, Equatable {
+    let im: ItemsModel
+    let items: [MergedItem]
+    let splits: [SplitRange]
+    // chat item id, index in list
+    let indexInParentItems: Dictionary<Int64, Int>
+
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.hashValue == rhs.hashValue
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine("\(items.hashValue)")
+    }
+
+    static func create(_ im: ItemsModel, _ revealedItems: Set<Int64>) -> MergedItems {
+        if im.reversedChatItems.isEmpty {
+            return MergedItems(im: im, items: [], splits: [], indexInParentItems: [:])
+        }
+
+        let unreadCount = im.chatState.unreadTotal
+
+        let unreadAfterItemId = im.chatState.unreadAfterItemId
+        let itemSplits = im.chatState.splits
+        var mergedItems: [MergedItem] = []
+        // Indexes of splits here will be related to reversedChatItems, not chatModel.chatItems
+        var splitRanges: [SplitRange] = []
+        var indexInParentItems = Dictionary<Int64, Int>()
+        var index = 0
+        var unclosedSplitIndex: Int? = nil
+        var unclosedSplitIndexInParent: Int? = nil
+        var visibleItemIndexInParent = -1
+        var unreadBefore = unreadCount - im.chatState.unreadAfterNewestLoaded
+        var lastRevealedIdsInMergedItems: BoxedValue<[Int64]>? = nil
+        var lastRangeInReversedForMergedItems: BoxedValue<ClosedRange<Int>>? = nil
+        var recent: MergedItem? = nil
+        while index < im.reversedChatItems.count {
+            let item = im.reversedChatItems[index]
+            let prev = index >= 1 ? im.reversedChatItems[index - 1] : nil
+            let next = index + 1 < im.reversedChatItems.count ? im.reversedChatItems[index + 1] : nil
+            let category = item.mergeCategory
+            let itemIsSplit = itemSplits.contains(item.id)
+
+            if item.id == unreadAfterItemId {
+                unreadBefore = unreadCount - im.chatState.unreadAfter
+            }
+            if item.isRcvNew {
+                unreadBefore -= 1
+            }
+
+            let revealed = item.mergeCategory == nil || revealedItems.contains(item.id)
+            if recent != nil, case let .grouped(items, _, _, _, mergeCategory, unreadIds, _, _) = recent, mergeCategory == category, let first = items.boxedValue.first, !revealedItems.contains(first.item.id) && !itemIsSplit {
+                let listItem = ListItem(item: item, prevItem: prev, nextItem: next, unreadBefore: unreadBefore)
+                items.boxedValue.append(listItem)
+
+                if item.isRcvNew {
+                    unreadIds.boxedValue.insert(item.id)
+                }
+                if let lastRevealedIdsInMergedItems, let lastRangeInReversedForMergedItems {
+                    if revealed {
+                        lastRevealedIdsInMergedItems.boxedValue.append(item.id)
+                    }
+                    lastRangeInReversedForMergedItems.boxedValue = lastRangeInReversedForMergedItems.boxedValue.lowerBound ... index
+                }
+            } else {
+                visibleItemIndexInParent += 1
+                let listItem = ListItem(item: item, prevItem: prev, nextItem: next, unreadBefore: unreadBefore)
+                if item.mergeCategory != nil {
+                    if item.mergeCategory != prev?.mergeCategory || lastRevealedIdsInMergedItems == nil {
+                        lastRevealedIdsInMergedItems = BoxedValue(revealedItems.contains(item.id) ? [item.id] : [])
+                    } else if revealed, let lastRevealedIdsInMergedItems {
+                        lastRevealedIdsInMergedItems.boxedValue.append(item.id)
+                    }
+                    lastRangeInReversedForMergedItems = BoxedValue(index ... index)
+                    recent = MergedItem.grouped(
+                        items: BoxedValue([listItem]),
+                        revealed: revealed,
+                        revealedIdsWithinGroup: lastRevealedIdsInMergedItems!,
+                        rangeInReversed: lastRangeInReversedForMergedItems!,
+                        mergeCategory: item.mergeCategory,
+                        unreadIds: BoxedValue(item.isRcvNew ? Set(arrayLiteral: item.id) : Set()),
+                        startIndexInReversedItems: index,
+                        hash: listItem.genHash(revealedItems.contains(prev?.id ?? -1), revealedItems.contains(next?.id ?? -1))
+                    )
+                } else {
+                    lastRangeInReversedForMergedItems = nil
+                    recent = MergedItem.single(
+                        item: listItem,
+                        startIndexInReversedItems: index,
+                        hash: listItem.genHash(revealedItems.contains(prev?.id ?? -1), revealedItems.contains(next?.id ?? -1))
+                    )
+                }
+                mergedItems.append(recent!)
+            }
+            if itemIsSplit {
+                // found item that is considered as a split
+                if let unclosedSplitIndex, let unclosedSplitIndexInParent {
+                    // it was at least second split in the list
+                    splitRanges.append(SplitRange(itemId: im.reversedChatItems[unclosedSplitIndex].id, indexRangeInReversed: unclosedSplitIndex ... index - 1, indexRangeInParentItems: unclosedSplitIndexInParent ... visibleItemIndexInParent - 1))
+                }
+                unclosedSplitIndex = index
+                unclosedSplitIndexInParent = visibleItemIndexInParent
+            } else if index + 1 == im.reversedChatItems.count, let unclosedSplitIndex, let unclosedSplitIndexInParent {
+                // just one split for the whole list, there will be no more, it's the end
+                splitRanges.append(SplitRange(itemId: im.reversedChatItems[unclosedSplitIndex].id, indexRangeInReversed: unclosedSplitIndex ... index, indexRangeInParentItems: unclosedSplitIndexInParent ... visibleItemIndexInParent))
+            }
+            indexInParentItems[item.id] = visibleItemIndexInParent
+            index += 1
+        }
+        return MergedItems(
+            im: im,
+            items: mergedItems,
+            splits: splitRanges,
+            indexInParentItems: indexInParentItems
+        )
+    }
+
+    // Use this check to ensure that mergedItems state based on currently actual state of global
+    // splits and reversedChatItems
+    func isActualState() -> Bool {
+        // do not load anything if global splits state is different than in merged items because it
+        // will produce undefined results in terms of loading and placement of items. 
+        // Same applies to reversedChatItems
+        return indexInParentItems.count == im.reversedChatItems.count &&
+        splits.count == im.chatState.splits.count &&
+        // that's just an optimization because most of the time only 1 split exists
+        ((splits.count == 1 && splits[0].itemId == im.chatState.splits[0]) || splits.map({ split in split.itemId }).sorted() == im.chatState.splits.sorted())
+    }
+}
+
+
+enum MergedItem: Identifiable, Hashable, Equatable {
+    // equatable and hashable implementations allows to see the difference and correctly scroll to items we want
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.hash == rhs.hash
+    }
+
+    var id: Int64 { newest().item.id }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(hash)
+    }
+
+    var hash: String {
+        switch self {
+        case .single(_, _, let hash): hash + " 1"
+        case .grouped(let items, _, _, _, _, _, _, let hash): hash + " \(items.boxedValue.count)"
+        }
+    }
+
+    // the item that is always single, cannot be grouped and always revealed
+    case single(
+        item: ListItem,
+        startIndexInReversedItems: Int,
+        hash: String
+    )
+
+    /** The item that can contain multiple items or just one depending on revealed state. When the whole group of merged items is revealed,
+     * there will be multiple [Grouped] items with revealed flag set to true. When the whole group is collapsed, it will be just one instance
+     *  of [Grouped] item with all grouped items inside [items]. In other words, number of [MergedItem] will always be equal to number of
+     *  visible items in ChatView's EndlessScrollView  */
+    case grouped (
+        items: BoxedValue<[ListItem]>,
+        revealed: Bool,
+        // it stores ids for all consecutive revealed items from the same group in order to hide them all on user's action
+        // it's the same list instance for all Grouped items within revealed group
+        /** @see reveal */
+        revealedIdsWithinGroup: BoxedValue<[Int64]>,
+        rangeInReversed: BoxedValue<ClosedRange<Int>>,
+        mergeCategory: CIMergeCategory?,
+        unreadIds: BoxedValue<Set<Int64>>,
+        startIndexInReversedItems: Int,
+        hash: String
+    )
+
+    func revealItems(_ reveal: Bool, _ revealedItems: Binding<Set<Int64>>) {
+        if case .grouped(let items, _, let revealedIdsWithinGroup, _, _, _, _, _) = self {
+            var newRevealed = revealedItems.wrappedValue
+            var i = 0
+            if reveal {
+                while i < items.boxedValue.count {
+                    newRevealed.insert(items.boxedValue[i].item.id)
+                    i += 1
+                }
+            } else {
+                while i < revealedIdsWithinGroup.boxedValue.count {
+                    newRevealed.remove(revealedIdsWithinGroup.boxedValue[i])
+                    i += 1
+                }
+                revealedIdsWithinGroup.boxedValue.removeAll()
+            }
+            revealedItems.wrappedValue = newRevealed
+        }
+    }
+
+    var startIndexInReversedItems: Int {
+        get {
+            switch self {
+            case let .single(_, startIndexInReversedItems, _): startIndexInReversedItems
+            case let .grouped(_, _, _, _, _, _, startIndexInReversedItems, _): startIndexInReversedItems
+            }
+        }
+    }
+
+    func hasUnread() -> Bool {
+        switch self {
+        case let .single(item, _, _): item.item.isRcvNew
+        case let .grouped(_, _, _, _, _, unreadIds, _, _): !unreadIds.boxedValue.isEmpty
+        }
+    }
+
+    func newest() -> ListItem {
+        switch self {
+        case let .single(item, _, _): item
+        case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue[0]
+        }
+    }
+
+    func oldest() -> ListItem {
+        switch self {
+        case let .single(item, _, _): item
+        case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue[items.boxedValue.count - 1]
+        }
+    }
+
+    func lastIndexInReversed() -> Int {
+        switch self {
+        case .single: startIndexInReversedItems
+        case let .grouped(items, _, _, _, _, _, _, _): startIndexInReversedItems + items.boxedValue.count - 1
+        }
+    }
+}
+
+struct SplitRange {
+    let itemId: Int64
+    /** range of indexes inside reversedChatItems where the first element is the split (it's index is [indexRangeInReversed.first])
+     * so [0, 1, 2, -100-, 101] if the 3 is a split, SplitRange(indexRange = 3 .. 4) will be this SplitRange instance
+     * (3, 4 indexes of the splitRange with the split itself at index 3)
+     * */
+    let indexRangeInReversed: ClosedRange<Int>
+    /** range of indexes inside LazyColumn where the first element is the split (it's index is [indexRangeInParentItems.first]) */
+    let indexRangeInParentItems: ClosedRange<Int>
+}
+
+struct ListItem: Hashable {
+    let item: ChatItem
+    let prevItem: ChatItem?
+    let nextItem: ChatItem?
+    // how many unread items before (older than) this one (excluding this one)
+    let unreadBefore: Int
+
+    private func chatDirHash(_ chatDir: CIDirection?) -> Int {
+        guard let chatDir else { return 0 }
+        return switch chatDir {
+        case .directSnd: 0
+        case .directRcv: 1
+        case .groupSnd: 2
+        case let .groupRcv(mem): "\(mem.groupMemberId) \(mem.displayName) \(mem.memberStatus.rawValue) \(mem.memberRole.rawValue) \(mem.image?.hash ?? 0)".hash
+        case .localSnd: 4
+        case .localRcv: 5
+        }
+    }
+
+    // using meta.hashValue instead of parts takes much more time so better to use partial meta here
+    func genHash(_ prevRevealed: Bool, _ nextRevealed: Bool) -> String {
+        "\(item.meta.itemId) \(item.meta.updatedAt.hashValue) \(item.meta.itemEdited) \(item.meta.itemDeleted?.hashValue ?? 0) \(item.meta.itemTimed?.hashValue ?? 0) \(item.meta.itemStatus.hashValue) \(item.meta.sentViaProxy ?? false) \(item.mergeCategory?.hashValue ?? 0) \(chatDirHash(item.chatDir)) \(item.reactions.hashValue) \(item.meta.isRcvNew) \(item.text.hash) \(item.file?.hashValue ?? 0) \(item.quotedItem?.itemId ?? 0) \(unreadBefore) \(prevItem?.id ?? 0) \(chatDirHash(prevItem?.chatDir)) \(prevItem?.mergeCategory?.hashValue ?? 0) \(prevRevealed) \(nextItem?.id ?? 0) \(chatDirHash(nextItem?.chatDir)) \(nextItem?.mergeCategory?.hashValue ?? 0) \(nextRevealed)"
+    }
+}
+
+class ActiveChatState {
+    var splits: [Int64] = []
+    var unreadAfterItemId: Int64 = -1
+    // total items after unread after item (exclusive)
+    var totalAfter: Int = 0
+    var unreadTotal: Int = 0
+    // exclusive
+    var unreadAfter: Int = 0
+    // exclusive
+    var unreadAfterNewestLoaded: Int = 0
+
+    func moveUnreadAfterItem(_ toItemId: Int64?, _ nonReversedItems: [ChatItem]) {
+        guard let toItemId else { return }
+        let currentIndex = nonReversedItems.firstIndex(where: { $0.id == unreadAfterItemId })
+        let newIndex = nonReversedItems.firstIndex(where: { $0.id == toItemId })
+        guard let currentIndex, let newIndex else {
+            return
+        }
+        unreadAfterItemId = toItemId
+        let unreadDiff = newIndex > currentIndex
+        ? -nonReversedItems[currentIndex + 1..<newIndex + 1].filter { $0.isRcvNew }.count
+        : nonReversedItems[newIndex + 1..<currentIndex + 1].filter { $0.isRcvNew }.count
+        unreadAfter += unreadDiff
+    }
+
+    func moveUnreadAfterItem(_ fromIndex: Int, _ toIndex: Int, _ nonReversedItems: [ChatItem]) {
+        if fromIndex == -1 || toIndex == -1 {
+            return
+        }
+        unreadAfterItemId = nonReversedItems[toIndex].id
+        let unreadDiff = toIndex > fromIndex
+        ? -nonReversedItems[fromIndex + 1..<toIndex + 1].filter { $0.isRcvNew }.count
+        : nonReversedItems[toIndex + 1..<fromIndex + 1].filter { $0.isRcvNew }.count
+        unreadAfter += unreadDiff
+    }
+
+    func clear() {
+        splits = []
+        unreadAfterItemId = -1
+        totalAfter = 0
+        unreadTotal = 0
+        unreadAfter = 0
+        unreadAfterNewestLoaded = 0
+    }
+
+    func itemsRead(_ itemIds: Set<Int64>?, _ newItems: [ChatItem]) {
+        guard let itemIds else {
+            // special case when the whole chat became read
+            unreadTotal = 0
+            unreadAfter = 0
+            return
+        }
+        var unreadAfterItemIndex: Int = -1
+        // since it's more often that the newest items become read, it's logical to loop from the end of the list to finish it faster
+        var i = newItems.count - 1
+        var ids = itemIds
+        // intermediate variables to prevent re-setting state value a lot of times without reason
+        var newUnreadTotal = unreadTotal
+        var newUnreadAfter = unreadAfter
+        while i >= 0 {
+            let item = newItems[i]
+            if item.id == unreadAfterItemId {
+                unreadAfterItemIndex = i
+            }
+            if ids.contains(item.id) {
+                // was unread, now this item is read
+                if (unreadAfterItemIndex == -1) {
+                    newUnreadAfter -= 1
+                }
+                newUnreadTotal -= 1
+                ids.remove(item.id)
+                if ids.isEmpty {
+                    break
+                }
+            }
+            i -= 1
+        }
+        unreadTotal = newUnreadTotal
+        unreadAfter = newUnreadAfter
+    }
+
+    func itemAdded(_ item: (Int64, Bool), _ index: Int) {
+        if item.1 {
+            unreadAfter += 1
+            unreadTotal += 1
+        }
+    }
+
+    func itemsRemoved(_ itemIds: [(Int64, Int, Bool)], _ newItems: [ChatItem]) {
+        var newSplits: [Int64] = []
+        for split in splits {
+            let index = itemIds.firstIndex(where: { (delId, _, _) in delId == split })
+            // deleted the item that was right before the split between items, find newer item so it will act like the split
+            if let index {
+                let idx = itemIds[index].1 - itemIds.filter { (_, delIndex, _) in delIndex <= index }.count
+                let newSplit = newItems.count > idx && idx >= 0 ? newItems[idx].id : nil
+                // it the  whole section is gone and splits overlap, don't add it at all
+                if let newSplit, !newSplits.contains(newSplit) {
+                    newSplits.append(newSplit)
+                }
+            } else {
+                newSplits.append(split)
+            }
+        }
+        splits = newSplits
+
+        let index = itemIds.firstIndex(where: { (delId, _, _) in delId == unreadAfterItemId })
+        // unread after item was removed
+        if let index {
+            let idx = itemIds[index].1 - itemIds.filter { (_, delIndex, _) in delIndex <= index }.count
+            var newUnreadAfterItemId = newItems.count > idx && idx >= 0 ? newItems[idx].id : nil
+            let newUnreadAfterItemWasNull = newUnreadAfterItemId == nil
+            if newUnreadAfterItemId == nil {
+                // everything on top (including unread after item) were deleted, take top item as unread after id
+                newUnreadAfterItemId = newItems.first?.id
+            }
+            if let newUnreadAfterItemId {
+                unreadAfterItemId = newUnreadAfterItemId
+                totalAfter -= itemIds.filter { (_, delIndex, _) in delIndex > index }.count
+                unreadTotal -= itemIds.filter { (_, delIndex, isRcvNew) in delIndex <= index && isRcvNew }.count
+                unreadAfter -= itemIds.filter { (_, delIndex, isRcvNew) in delIndex > index && isRcvNew }.count
+                if newUnreadAfterItemWasNull {
+                    // since the unread after item was moved one item after initial position, adjust counters accordingly
+                    if newItems.first?.isRcvNew == true {
+                        unreadTotal += 1
+                        unreadAfter -= 1
+                    }
+                }
+            } else {
+                // all items were deleted, 0 items in chatItems
+                unreadAfterItemId = -1
+                totalAfter = 0
+                unreadTotal = 0
+                unreadAfter = 0
+            }
+        } else {
+            totalAfter -= itemIds.count
+        }
+    }
+}
+
+class BoxedValue<T: Hashable>: Equatable, Hashable {
+    static func == (lhs: BoxedValue<T>, rhs: BoxedValue<T>) -> Bool {
+        lhs.boxedValue == rhs.boxedValue
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine("\(self)")
+    }
+
+    var boxedValue : T
+    init(_ value: T) {
+        self.boxedValue = value
+    }
+}
+
+@MainActor
+func visibleItemIndexesNonReversed(_ im: ItemsModel, _ listState: EndlessScrollView<MergedItem>.ListState, _ mergedItems: MergedItems) -> ClosedRange<Int> {
+    let zero = 0 ... 0
+    let items = mergedItems.items
+    if items.isEmpty {
+        return zero
+    }
+    let newest = items.count > listState.firstVisibleItemIndex ? items[listState.firstVisibleItemIndex].startIndexInReversedItems : nil
+    let oldest = items.count > listState.lastVisibleItemIndex ? items[listState.lastVisibleItemIndex].lastIndexInReversed() : nil
+    guard let newest, let oldest else {
+        return zero
+    }
+    let size = im.reversedChatItems.count
+    let range = size - oldest ... size - newest
+    if range.lowerBound < 0 || range.upperBound < 0 {
+        return zero
+    }
+
+    // visible items mapped to their underlying data structure which is im.reversedChatItems.reversed()
+    return range
+}
diff --git a/apps/ios/Shared/Views/Chat/ChatScrollHelpers.swift b/apps/ios/Shared/Views/Chat/ChatScrollHelpers.swift
new file mode 100644
index 0000000000..2fb1c3fb35
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/ChatScrollHelpers.swift
@@ -0,0 +1,174 @@
+//
+//  ChatScrollHelpers.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 20.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+func loadLastItems(_ loadingMoreItems: Binding<Bool>, loadingBottomItems: Binding<Bool>, _ chat: Chat, _ im: ItemsModel) async {
+    await MainActor.run {
+        loadingMoreItems.wrappedValue = true
+        loadingBottomItems.wrappedValue = true
+    }
+    try? await Task.sleep(nanoseconds: 500_000000)
+    if ChatModel.shared.chatId != chat.chatInfo.id {
+        await MainActor.run {
+            loadingMoreItems.wrappedValue = false
+            loadingBottomItems.wrappedValue = false
+        }
+        return
+    }
+    await apiLoadMessages(chat.chatInfo.id, im, ChatPagination.last(count: 50))
+    await MainActor.run {
+        loadingMoreItems.wrappedValue = false
+        loadingBottomItems.wrappedValue = false
+    }
+}
+
+func preloadIfNeeded(
+    _ im: ItemsModel,
+    _ allowLoadMoreItems: Binding<Bool>,
+    _ ignoreLoadingRequests: Binding<Int64?>,
+    _ listState: EndlessScrollView<MergedItem>.ListState,
+    _ mergedItems: BoxedValue<MergedItems>,
+    loadItems: @escaping (Bool, ChatPagination) async -> Bool,
+    loadLastItems: @escaping () async -> Void
+) {
+    let state = im.preloadState
+    guard !listState.isScrolling && !listState.isAnimatedScrolling,
+          !state.preloading,
+          listState.totalItemsCount > 0
+    else {
+        return
+    }
+    if state.prevFirstVisible != listState.firstVisibleItemId as! Int64 || state.prevItemsCount != mergedItems.boxedValue.indexInParentItems.count {
+        state.preloading = true
+        let allowLoadMore = allowLoadMoreItems.wrappedValue
+        Task {
+            defer { state.preloading = false }
+            var triedToLoad = true
+            await preloadItems(im, mergedItems.boxedValue, allowLoadMore, listState, ignoreLoadingRequests) { pagination in
+                triedToLoad = await loadItems(false, pagination)
+                return triedToLoad
+            }
+            if triedToLoad {
+                state.prevFirstVisible = listState.firstVisibleItemId as! Int64
+                state.prevItemsCount = mergedItems.boxedValue.indexInParentItems.count
+            }
+            // it's important to ask last items when the view is fully covered with items. Otherwise, visible items from one
+            // split will be merged with last items and position of scroll will change unexpectedly.
+            if listState.itemsCanCoverScreen && !im.lastItemsLoaded {
+                await loadLastItems()
+            }
+        }
+    } else if listState.itemsCanCoverScreen && !im.lastItemsLoaded {
+        state.preloading = true
+        Task {
+            defer { state.preloading = false }
+            await loadLastItems()
+        }
+    }
+}
+
+func preloadItems(
+    _ im: ItemsModel,
+    _ mergedItems: MergedItems,
+    _ allowLoadMoreItems: Bool,
+    _ listState: EndlessScrollView<MergedItem>.ListState,
+    _ ignoreLoadingRequests: Binding<Int64?>,
+    _ loadItems: @escaping (ChatPagination) async -> Bool) 
+async {
+    let allowLoad = allowLoadMoreItems || mergedItems.items.count == listState.lastVisibleItemIndex + 1
+    let remaining = ChatPagination.UNTIL_PRELOAD_COUNT
+    let firstVisibleIndex = listState.firstVisibleItemIndex
+
+    if !(await preloadItemsBefore()) {
+        await preloadItemsAfter()
+    }
+
+    func preloadItemsBefore() async -> Bool {
+        let splits = mergedItems.splits
+        let lastVisibleIndex = listState.lastVisibleItemIndex
+        var lastIndexToLoadFrom: Int? = findLastIndexToLoadFromInSplits(firstVisibleIndex, lastVisibleIndex, remaining, splits)
+        let items: [ChatItem] = im.reversedChatItems.reversed()
+        if splits.isEmpty && !items.isEmpty && lastVisibleIndex > mergedItems.items.count - remaining {
+            lastIndexToLoadFrom = items.count - 1
+        }
+        let loadFromItemId: Int64?
+        if allowLoad, let lastIndexToLoadFrom {
+            let index = items.count - 1 - lastIndexToLoadFrom
+            loadFromItemId = index >= 0 ? items[index].id : nil
+        } else {
+            loadFromItemId = nil
+        }
+        guard let loadFromItemId, ignoreLoadingRequests.wrappedValue != loadFromItemId else {
+            return false
+        }
+        let sizeWas = items.count
+        let firstItemIdWas = items.first?.id
+        let triedToLoad = await loadItems(ChatPagination.before(chatItemId: loadFromItemId, count: ChatPagination.PRELOAD_COUNT))
+        if triedToLoad && sizeWas == im.reversedChatItems.count && firstItemIdWas == im.reversedChatItems.last?.id {
+            ignoreLoadingRequests.wrappedValue = loadFromItemId
+            return false
+        }
+        return triedToLoad
+    }
+
+    func preloadItemsAfter() async {
+        let splits = mergedItems.splits
+        let split = splits.last(where: { $0.indexRangeInParentItems.contains(firstVisibleIndex) })
+        // we're inside a splitRange (top --- [end of the splitRange --- we're here --- start of the splitRange] --- bottom)
+        let reversedItems: [ChatItem] = im.reversedChatItems
+        if let split, split.indexRangeInParentItems.lowerBound + remaining > firstVisibleIndex {
+            let index = split.indexRangeInReversed.lowerBound
+            if index >= 0 {
+                let loadFromItemId = reversedItems[index].id
+                _ = await loadItems(ChatPagination.after(chatItemId: loadFromItemId, count: ChatPagination.PRELOAD_COUNT))
+            }
+        }
+    }
+}
+
+func oldestPartiallyVisibleListItemInListStateOrNull(_ listState: EndlessScrollView<MergedItem>.ListState) -> ListItem? {
+    if listState.lastVisibleItemIndex < listState.items.count {
+        return listState.items[listState.lastVisibleItemIndex].oldest()
+    } else {
+        return listState.items.last?.oldest()
+    }
+}
+
+private func findLastIndexToLoadFromInSplits(_ firstVisibleIndex: Int, _ lastVisibleIndex: Int, _ remaining: Int, _ splits: [SplitRange]) -> Int? {
+    for split in splits {
+        // before any split
+        if split.indexRangeInParentItems.lowerBound > firstVisibleIndex {
+            if lastVisibleIndex > (split.indexRangeInParentItems.lowerBound - remaining) {
+                return split.indexRangeInReversed.lowerBound - 1
+            }
+            break
+        }
+        let containsInRange = split.indexRangeInParentItems.contains(firstVisibleIndex)
+        if containsInRange {
+            if lastVisibleIndex > (split.indexRangeInParentItems.upperBound - remaining) {
+                return split.indexRangeInReversed.upperBound
+            }
+            break
+        }
+    }
+    return nil
+}
+
+/// Disable animation on iOS 15
+func withConditionalAnimation<Result>(
+    _ animation: Animation? = .default,
+    _ body: () throws -> Result
+) rethrows -> Result {
+    if #available(iOS 16.0, *) {
+        try withAnimation(animation, body)
+    } else {
+        try body()
+    }
+}
diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift
index baceb5b4ab..8ce0c50849 100644
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -15,40 +15,56 @@ private let memberImageSize: CGFloat = 34
 
 struct ChatView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var im = ItemsModel.shared
+    @State var revealedItems: Set<Int64> = Set()
     @State var theme: AppTheme = buildTheme()
     @Environment(\.dismiss) var dismiss
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.scenePhase) var scenePhase
     @State @ObservedObject var chat: Chat
-    @StateObject private var scrollModel = ReverseListScrollModel()
+    @ObservedObject var im: ItemsModel
+    @State var mergedItems: BoxedValue<MergedItems>
+    @State var floatingButtonModel: FloatingButtonModel
+    @Binding var scrollToItemId: ChatItem.ID?
     @State private var showChatInfoSheet: Bool = false
     @State private var showAddMembersSheet: Bool = false
     @State private var composeState = ComposeState()
+    @State private var selectedRange = NSRange()
     @State private var keyboardVisible = false
+    @State private var keyboardHiddenDate = Date.now
     @State private var connectionStats: ConnectionStats?
     @State private var customUserProfile: Profile?
     @State private var connectionCode: String?
-    @State private var loadingItems = false
-    @State private var firstPage = false
-    @State private var revealedChatItem: ChatItem?
-    @State private var searchMode = false
+    @State private var loadingMoreItems = false
+    @State private var loadingTopItems = false
+    @State private var requestedTopScroll = false
+    @State private var loadingBottomItems = false
+    @State private var requestedBottomScroll = false
+    @State private var showSearch = false
     @State private var searchText: String = ""
     @FocusState private var searchFocussed
     // opening GroupMemberInfoView on member icon
     @State private var selectedMember: GMember? = nil
     // opening GroupLinkView on link button (incognito)
     @State private var showGroupLinkSheet: Bool = false
-    @State private var groupLink: String?
+    @State private var groupLink: CreatedConnLink?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
     @State private var forwardedChatItems: [ChatItem] = []
     @State private var selectedChatItems: Set<Int64>? = nil
     @State private var showDeleteSelectedMessages: Bool = false
+    @State private var showArchiveSelectedReports: Bool = false
     @State private var allowToDeleteSelectedMessagesForAll: Bool = false
+    @State private var allowLoadMoreItems: Bool = false
+    @State private var ignoreLoadingRequests: Int64? = nil
+    @State private var animatedScrollingInProgress: Bool = false
+    @State private var showUserSupportChatSheet = false
+
+    @State private var scrollView: EndlessScrollView<MergedItem> = EndlessScrollView(frame: .zero)
 
     @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
+    let userSupportScopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: nil)
+
     var body: some View {
         if #available(iOS 16.0, *) {
             viewBody
@@ -59,44 +75,80 @@ struct ChatView: View {
         }
     }
 
-    @ViewBuilder
     private var viewBody: some View {
         let cInfo = chat.chatInfo
-        ZStack {
+        let memberSupportChat: (groupInfo: GroupInfo, member: GroupMember?)? =
+                if case let .group(groupInfo, .memberSupport(member)) = cInfo {
+                    (groupInfo, member)
+                } else {
+                    nil
+                }
+        let userMemberKnockingChat = memberSupportChat?.groupInfo.membership.memberPending == true
+        return ZStack {
             let wallpaperImage = theme.wallpaper.type.image
             let wallpaperType = theme.wallpaper.type
             let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
             let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
             Color.clear.ignoresSafeArea(.all)
-                .if(wallpaperImage != nil) { view in
+                .if(wallpaperImage != nil && im.secondaryIMFilter == nil) { view in
                     view.modifier(
                         ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
                     )
             }
             VStack(spacing: 0) {
                 ZStack(alignment: .bottomTrailing) {
-                    chatItemsList()
-                    FloatingButtons(theme: theme, scrollModel: scrollModel, chat: chat)
+                    if userMemberKnockingChat {
+                        ZStack(alignment: .top) {
+                            chatItemsList()
+                            userMemberKnockingTitleBar()
+                        }
+                    } else {
+                        chatItemsList()
+                    }
+                    if let groupInfo = chat.chatInfo.groupInfo, !composeState.message.isEmpty {
+                        GroupMentionsView(im: im, groupInfo: groupInfo, composeState: $composeState, selectedRange: $selectedRange, keyboardVisible: $keyboardVisible)
+                    }
+                    FloatingButtons(im: im, theme: theme, scrollView: scrollView, chat: chat, loadingMoreItems: $loadingMoreItems, loadingTopItems: $loadingTopItems, requestedTopScroll: $requestedTopScroll, loadingBottomItems: $loadingBottomItems, requestedBottomScroll: $requestedBottomScroll, animatedScrollingInProgress: $animatedScrollingInProgress, listState: scrollView.listState, model: floatingButtonModel, reloadItems: {
+                            mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+                            scrollView.updateItems(mergedItems.boxedValue.items)
+                        }
+                    )
                 }
                 connectingText()
                 if selectedChatItems == nil {
+                    let reason = chat.chatInfo.userCantSendReason
                     ComposeView(
                         chat: chat,
+                        im: im,
                         composeState: $composeState,
-                        keyboardVisible: $keyboardVisible
+                        keyboardVisible: $keyboardVisible,
+                        keyboardHiddenDate: $keyboardHiddenDate,
+                        selectedRange: $selectedRange,
+                        disabledText: reason?.composeLabel
                     )
                     .disabled(!cInfo.sendMsgEnabled)
+                    .if(!cInfo.sendMsgEnabled) { v in
+                        v.disabled(true).onTapGesture {
+                            AlertManager.shared.showAlertMsg(
+                                title: "You can't send messages!",
+                                message: reason?.alertMessage
+                            )
+                        }
+                    }
                 } else {
                     SelectedItemsBottomToolbar(
-                        chatItems: ItemsModel.shared.reversedChatItems,
+                        im: im,
                         selectedChatItems: $selectedChatItems,
                         chatInfo: chat.chatInfo,
                         deleteItems: { forAll in
                             allowToDeleteSelectedMessagesForAll = forAll
                             showDeleteSelectedMessages = true
                         },
+                        archiveItems: {
+                            showArchiveSelectedReports = true
+                        },
                         moderateItems: {
-                            if case let .group(groupInfo) = chat.chatInfo {
+                            if case let .group(groupInfo, _) = chat.chatInfo {
                                 showModerateSelectedMessagesAlert(groupInfo)
                             }
                         },
@@ -104,15 +156,22 @@ struct ChatView: View {
                     )
                 }
             }
+            if im.showLoadingProgress == chat.id {
+                ProgressView().scaleEffect(2)
+            }
         }
         .safeAreaInset(edge: .top) {
             VStack(spacing: .zero) {
-                if searchMode { searchToolbar() }
+                if showSearch { searchToolbar() }
                 Divider()
             }
             .background(ToolbarMaterial.material(toolbarMaterial))
         }
-        .navigationTitle(cInfo.chatViewName)
+        .navigationTitle(
+            memberSupportChat == nil
+            ? cInfo.chatViewName
+            : memberSupportChat?.member?.chatViewName ?? NSLocalizedString("Chat with admins", comment: "chat toolbar")
+        )
         .background(theme.colors.background)
         .navigationBarTitleDisplayMode(.inline)
         .environmentObject(theme)
@@ -130,24 +189,35 @@ struct ChatView: View {
                 }
             }
         }
-        .appSheet(item: $selectedMember) { member in
-            Group {
-                if case let .group(groupInfo) = chat.chatInfo {
-                    GroupMemberInfoView(
-                        groupInfo: groupInfo,
-                        chat: chat,
-                        groupMember: member,
-                        navigation: true
-                    )
+        .confirmationDialog(selectedChatItems?.count == 1 ? "Archive report?" : "Archive \((selectedChatItems?.count ?? 0)) reports?", isPresented: $showArchiveSelectedReports, titleVisibility: .visible) {
+            Button("For me", role: .destructive) {
+                if let selected = selectedChatItems {
+                    archiveReports(chat.chatInfo, selected.sorted(), false, deletedSelectedMessages)
                 }
             }
+            if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, groupInfo.membership.memberActive {
+                Button("For all moderators", role: .destructive) {
+                    if let selected = selectedChatItems {
+                        archiveReports(chat.chatInfo, selected.sorted(), true, deletedSelectedMessages)
+                    }
+                }
+            }
+        }
+        .appSheet(item: $selectedMember) { member in
+            if case let .group(groupInfo, _) = chat.chatInfo {
+                GroupMemberInfoView(
+                    groupInfo: groupInfo,
+                    chat: chat,
+                    groupMember: member,
+                    scrollToItemId: $scrollToItemId,
+                    navigation: true
+                )
+            }
         }
         // it should be presented on top level in order to prevent a bug in SwiftUI on iOS 16 related to .focused() modifier in AddGroupMembersView's search field
         .appSheet(isPresented: $showAddMembersSheet) {
-            Group {
-                if case let .group(groupInfo) = cInfo {
-                    AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-                }
+            if case let .group(groupInfo, _) = cInfo {
+                AddGroupMembersView(chat: chat, groupInfo: groupInfo)
             }
         }
         .sheet(isPresented: Binding(
@@ -166,44 +236,108 @@ struct ChatView: View {
                 ChatItemForwardingView(chatItems: forwardedChatItems, fromChatInfo: chat.chatInfo, composeState: $composeState)
             }
         }
+        .appSheet(
+            isPresented: $showUserSupportChatSheet,
+            onDismiss: {
+                if chat.chatInfo.groupInfo?.membership.memberPending ?? false {
+                    chatModel.chatId = nil
+                }
+            }
+        ) {
+            if let groupInfo = cInfo.groupInfo {
+                SecondaryChatView(
+                    chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: userSupportScopeInfo), chatItems: [], chatStats: ChatStats()),
+                    scrollToItemId: $scrollToItemId
+                )
+            }
+        }
         .onAppear {
+            scrollView.listState.onUpdateListener = onChatItemsUpdated
             selectedChatItems = nil
+            revealedItems = Set()
             initChatView()
+            if im.isLoading {
+                Task {
+                    try? await Task.sleep(nanoseconds: 500_000000)
+                    await MainActor.run {
+                        if im.isLoading {
+                            im.showLoadingProgress = chat.id
+                        }
+                    }
+                }
+            }
+            // if this is the main chat of the group with the pending member (knocking)
+            if case let .group(groupInfo, nil) = chat.chatInfo,
+               groupInfo.membership.memberPending {
+                ItemsModel.loadSecondaryChat(chat.id, chatFilter: .groupChatScopeContext(groupScopeInfo: userSupportScopeInfo)) {
+                    showUserSupportChatSheet = true
+                    chatModel.secondaryPendingInviteeChatOpened = true
+                }
+            }
         }
         .onChange(of: chatModel.chatId) { cId in
             showChatInfoSheet = false
             selectedChatItems = nil
-            scrollModel.scrollToBottom()
+            revealedItems = Set()
             stopAudioPlayer()
             if let cId {
                 if let c = chatModel.getChat(cId) {
                     chat = c
                 }
+                scrollView.listState.onUpdateListener = onChatItemsUpdated
                 initChatView()
                 theme = buildTheme()
+                closeSearch()
+                mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+                scrollView.updateItems(mergedItems.boxedValue.items)
+
+                if let openAround = chatModel.openAroundItemId, let index = mergedItems.boxedValue.indexInParentItems[openAround] {
+                    scrollView.scrollToItem(index)
+                } else if let unreadIndex = mergedItems.boxedValue.items.lastIndex(where: { $0.hasUnread() }) {
+                    scrollView.scrollToItem(unreadIndex)
+                } else {
+                    scrollView.scrollToBottom()
+                }
+                if chatModel.openAroundItemId != nil {
+                    chatModel.openAroundItemId = nil
+                }
             } else {
                 dismiss()
             }
         }
-        .onChange(of: revealedChatItem) { _ in
-            NotificationCenter.postReverseListNeedsLayout()
-        }
-        .onChange(of: im.isLoading) { isLoading in
-            if !isLoading,
-               im.reversedChatItems.count <= loadItemsPerPage,
-               filtered(im.reversedChatItems).count < 10 {
-                loadChatItems(chat.chatInfo)
+        .onChange(of: chatModel.secondaryPendingInviteeChatOpened) { opened in
+            if im.secondaryIMFilter != nil && !opened {
+                dismiss()
+            }
+        }
+        .onChange(of: chatModel.openAroundItemId) { openAround in
+            if let openAround {
+                closeSearch()
+                mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+                scrollView.updateItems(mergedItems.boxedValue.items)
+                chatModel.openAroundItemId = nil
+
+                if let index = mergedItems.boxedValue.indexInParentItems[openAround] {
+                    scrollView.scrollToItem(index)
+                }
+
+                // this may already being loading because of changed chat id (see .onChange(of: chat.id)
+                if !loadingBottomItems {
+                    allowLoadMoreItems = false
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        allowLoadMoreItems = true
+                    }
+                }
             }
         }
-        .environmentObject(scrollModel)
         .onDisappear {
             VideoPlayerView.players.removeAll()
             stopAudioPlayer()
             if chatModel.chatId == cInfo.id && !presentationMode.wrappedValue.isPresented {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
-                        chatModel.chatItemStatuses = [:]
-                        ItemsModel.shared.reversedChatItems = []
+                        im.reversedChatItems = []
+                        im.chatState.clear()
                         chatModel.groupMembers = []
                         chatModel.groupMembersIndexes.removeAll()
                         chatModel.membersLoaded = false
@@ -216,133 +350,220 @@ struct ChatView: View {
         }
         .toolbar {
             ToolbarItem(placement: .principal) {
-                if selectedChatItems != nil {
-                    SelectedItemsTopToolbar(selectedChatItems: $selectedChatItems)
-                } else if case let .direct(contact) = cInfo {
-                    Button {
-                        Task {
-                            showChatInfoSheet = true
-                        }
-                    } label: {
-                        ChatInfoToolbar(chat: chat)
-                    }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
-                        ChatInfoView(
-                            chat: chat,
-                            contact: contact,
-                            localAlias: chat.chatInfo.localAlias,
-                            featuresAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
-                            currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
-                            onSearch: { focusSearch() }
-                        )
-                    }
-                } else if case let .group(groupInfo) = cInfo {
-                    Button {
-                        Task { await chatModel.loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
-                    } label: {
-                        ChatInfoToolbar(chat: chat)
-                            .tint(theme.colors.primary)
-                    }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
-                        GroupChatInfoView(
-                            chat: chat,
-                            groupInfo: Binding(
-                                get: { groupInfo },
-                                set: { gInfo in
-                                    chat.chatInfo = .group(groupInfo: gInfo)
-                                    chat.created = Date.now
-                                }
-                            ),
-                            onSearch: { focusSearch() },
-                            localAlias: groupInfo.localAlias
-                        )
-                    }
-                } else if case .local = cInfo {
-                    ChatInfoToolbar(chat: chat)
+                if im.secondaryIMFilter == nil {
+                    primaryPrincipalToolbarContent()
+                } else if !userMemberKnockingChat { // no toolbar while knocking chat, it's unstable on sheet
+                    secondaryPrincipalToolbarContent()
                 }
             }
             ToolbarItem(placement: .navigationBarTrailing) {
-                let isLoading = im.isLoading && im.showLoadingProgress
-                if selectedChatItems != nil {
-                    Button {
-                        withAnimation {
-                            selectedChatItems = nil
-                        }
-                    } label: {
-                        Text("Cancel")
-                    }
-                } else {
-                    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)
-                                }
-                            }
-                            Menu {
-                                if !isLoading {
-                                    if callsPrefEnabled && chatModel.activeCall == nil {
-                                        Button {
-                                            CallController.shared.startCall(contact, .video)
-                                        } label: {
-                                            Label("Video call", systemImage: "video")
-                                        }
-                                        .disabled(!contact.ready || !contact.active)
-                                    }
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                        .disabled(!contact.ready || !contact.active)
-                                }
-                            } label: {
-                                Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
-                            }
-                        }
-                    case let .group(groupInfo):
-                        HStack {
-                            if groupInfo.canAddMembers {
-                                if (chat.chatInfo.incognito) {
-                                    groupLinkButton()
-                                        .appSheet(isPresented: $showGroupLinkSheet) {
-                                            GroupLinkView(
-                                                groupId: groupInfo.groupId,
-                                                groupLink: $groupLink,
-                                                groupLinkMemberRole: $groupLinkMemberRole,
-                                                showTitle: true,
-                                                creatingGroup: false
-                                            )
-                                        }
-                                } else {
-                                    addMembersButton()
-                                }
-                            }
-                            Menu {
-                                if !isLoading {
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                }
-                            } label: {
-                                Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
-                            }
-                        }
-                    case .local:
-                        searchButton()
-                    default:
-                        EmptyView()
+                if im.secondaryIMFilter == nil {
+                    primaryTrailingToolbarContent()
+                } else if !userMemberKnockingChat {
+                    secondaryTrailingToolbarContent()
+                }
+            }
+        }
+        .if(im.secondaryIMFilter == nil) { v in
+            v.onChange(of: scrollToItemId) { itemId in
+                if let itemId = itemId {
+                    dismissAllSheets(animated: false) {
+                        scrollToItem(itemId)
+                        scrollToItemId = nil
                     }
                 }
             }
         }
     }
-    
+
+    @inline(__always)
+    @ViewBuilder private func primaryPrincipalToolbarContent() -> some View {
+        let cInfo = chat.chatInfo
+        if selectedChatItems != nil {
+            SelectedItemsTopToolbar(selectedChatItems: $selectedChatItems)
+        } else if case let .direct(contact) = cInfo {
+            Button {
+                Task {
+                    showChatInfoSheet = true
+                }
+            } label: {
+                ChatInfoToolbar(chat: chat)
+            }
+            .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                ChatInfoView(
+                    chat: chat,
+                    contact: contact,
+                    localAlias: chat.chatInfo.localAlias,
+                    featuresAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
+                    currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences),
+                    onSearch: { focusSearch() }
+                )
+            }
+        } else if case let .group(groupInfo, _) = cInfo {
+            Button {
+                Task { await chatModel.loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
+            } label: {
+                ChatInfoToolbar(chat: chat)
+                    .tint(theme.colors.primary)
+            }
+            .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                GroupChatInfoView(
+                    chat: chat,
+                    groupInfo: Binding(
+                        get: { groupInfo },
+                        set: { gInfo in
+                            chat.chatInfo = .group(groupInfo: gInfo, groupChatScope: nil)
+                            chat.created = Date.now
+                        }
+                    ),
+                    scrollToItemId: $scrollToItemId,
+                    onSearch: { focusSearch() },
+                    localAlias: groupInfo.localAlias
+                )
+            }
+        } else if case .local = cInfo {
+            ChatInfoToolbar(chat: chat)
+        }
+    }
+
+    @inline(__always)
+    @ViewBuilder private func primaryTrailingToolbarContent() -> some View {
+        let cInfo = chat.chatInfo
+        if selectedChatItems != nil {
+            Button {
+                withAnimation {
+                    selectedChatItems = nil
+                }
+            } label: {
+                Text("Cancel")
+            }
+        } else {
+            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)
+                        }
+                    }
+                    Menu {
+                        if callsPrefEnabled && chatModel.activeCall == nil {
+                            Button {
+                                CallController.shared.startCall(contact, .video)
+                            } label: {
+                                Label("Video call", systemImage: "video")
+                            }
+                            .disabled(!contact.ready || !contact.active)
+                        }
+                        searchButton()
+                        ToggleNtfsButton(chat: chat)
+                            .disabled(!contact.ready || !contact.active)
+                    } label: {
+                        Image(systemName: "ellipsis")
+                    }
+                }
+            case let .group(groupInfo, _):
+                HStack {
+                    if groupInfo.canAddMembers {
+                        if (chat.chatInfo.incognito) {
+                            groupLinkButton()
+                                .appSheet(isPresented: $showGroupLinkSheet) {
+                                    GroupLinkView(
+                                        groupId: groupInfo.groupId,
+                                        groupLink: $groupLink,
+                                        groupLinkMemberRole: $groupLinkMemberRole,
+                                        showTitle: true,
+                                        creatingGroup: false
+                                    )
+                                }
+                        } else {
+                            addMembersButton()
+                        }
+                    }
+                    Menu {
+                        searchButton()
+                        ToggleNtfsButton(chat: chat)
+                    } label: {
+                        Image(systemName: "ellipsis")
+                    }
+                }
+            case .local:
+                searchButton()
+            default:
+                EmptyView()
+            }
+        }
+    }
+
+    @inline(__always)
+    @ViewBuilder private func secondaryPrincipalToolbarContent() -> some View {
+        if selectedChatItems != nil {
+            SelectedItemsTopToolbar(selectedChatItems: $selectedChatItems)
+        } else {
+            switch im.secondaryIMFilter {
+            case let .groupChatScopeContext(groupScopeInfo):
+                switch groupScopeInfo {
+                case let .memberSupport(groupMember_):
+                    if let groupMember = groupMember_ {
+                        MemberSupportChatToolbar(groupMember: groupMember)
+                    } else {
+                        textChatToolbar("Chat with admins")
+                    }
+                }
+            case let .msgContentTagContext(contentTag):
+                switch contentTag {
+                case .report:
+                    textChatToolbar("Member reports")
+                default:
+                    EmptyView()
+                }
+            case .none:
+                EmptyView()
+            }
+        }
+    }
+
+    @inline(__always)
+    @ViewBuilder private func secondaryTrailingToolbarContent() -> some View {
+        if selectedChatItems != nil {
+            Button {
+                withAnimation {
+                    selectedChatItems = nil
+                }
+            } label: {
+                Text("Cancel")
+            }
+        } else {
+            searchButton()
+        }
+    }
+
+    @inline(__always)
+    private func userMemberKnockingTitleBar() -> some View {
+         VStack(spacing: 0) {
+             Text("Chat with admins")
+                 .font(.headline)
+                 .foregroundColor(theme.colors.onBackground)
+                 .padding(.top, 8)
+                 .padding(.bottom, 14)
+                 .frame(maxWidth: .infinity)
+                 .background(ToolbarMaterial.material(toolbarMaterial))
+             Divider()
+         }
+    }
+
+    func textChatToolbar(_ text: LocalizedStringKey) -> some View {
+        Text(text)
+        .font(.headline)
+        .lineLimit(1)
+        .foregroundColor(theme.colors.onBackground)
+        .frame(width: 220)
+    }
+
     private func initChatView() {
         let cInfo = chat.chatInfo
         // This check prevents the call to apiContactInfo after the app is suspended, and the database is closed.
@@ -370,7 +591,40 @@ struct ChatView: View {
                 await markChatUnread(chat, unreadChat: false)
             }
         }
-        ChatView.FloatingButtonModel.shared.totalUnread = chat.chatStats.unreadCount
+        floatingButtonModel.updateOnListChange(scrollView.listState)
+    }
+
+    private func scrollToItem(_ itemId: ChatItem.ID) {
+        Task {
+            do {
+                var index = mergedItems.boxedValue.indexInParentItems[itemId]
+                if index == nil {
+                    let pagination = ChatPagination.around(chatItemId: itemId, count: ChatPagination.PRELOAD_COUNT * 2)
+                    let oldSize = im.reversedChatItems.count
+                    let triedToLoad = await loadChatItems(chat, pagination)
+                    if !triedToLoad {
+                        return
+                    }
+                    var repeatsLeft = 50
+                    while oldSize == im.reversedChatItems.count && repeatsLeft > 0 {
+                        try await Task.sleep(nanoseconds: 20_000000)
+                        repeatsLeft -= 1
+                    }
+                    index = mergedItems.boxedValue.indexInParentItems[itemId]
+                }
+                if let index {
+                    closeKeyboardAndRun {
+                        Task {
+                            await MainActor.run { animatedScrollingInProgress = true }
+                            await scrollView.scrollToItemAnimated(min(im.reversedChatItems.count - 1, index))
+                            await MainActor.run { animatedScrollingInProgress = false }
+                        }
+                    }
+                }
+            } catch {
+                logger.error("Error scrolling to item: \(error)")
+            }
+        }
     }
 
     private func searchToolbar() -> some View {
@@ -394,16 +648,14 @@ struct ChatView: View {
             .cornerRadius(10.0)
 
             Button ("Cancel") {
-                searchText = ""
-                searchMode = false
-                searchFocussed = false
-                Task { await loadChat(chat: chat) }
+                closeSearch()
+                searchTextChanged("")
             }
         }
         .padding(.horizontal)
         .padding(.vertical, 8)
     }
-    
+
     private func voiceWithoutFrame(_ ci: ChatItem) -> Bool {
         ci.content.msgContent?.isVoice == true && ci.content.text.count == 0 && ci.quotedItem == nil && ci.meta.itemForwarded == nil
     }
@@ -421,49 +673,86 @@ struct ChatView: View {
             .map { $0.element }
     }
 
-
     private func chatItemsList() -> some View {
         let cInfo = chat.chatInfo
-        let mergedItems = filtered(im.reversedChatItems)
         return GeometryReader { g in
-            ReverseList(items: mergedItems, scrollState: $scrollModel.state) { ci in
+            //let _ = logger.debug("Reloading chatItemsList with number of itmes: \(im.reversedChatItems.count)")
+            ScrollRepresentable(scrollView: scrollView) { (index: Int, mergedItem: MergedItem) in
+                let ci = switch mergedItem {
+                case let .single(item, _, _): item.item
+                case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue.last!.item
+                }
                 let voiceNoFrame = voiceWithoutFrame(ci)
                 let maxWidth = cInfo.chatType == .group
-                                ? voiceNoFrame
-                                    ? (g.size.width - 28) - 42
-                                    : (g.size.width - 28) * 0.84 - 42
-                                : voiceNoFrame
-                                    ? (g.size.width - 32)
-                                    : (g.size.width - 32) * 0.84
+                ? voiceNoFrame
+                ? (g.size.width - 28) - 42
+                : (g.size.width - 28) * 0.84 - 42
+                : voiceNoFrame
+                ? (g.size.width - 32)
+                : (g.size.width - 32) * 0.84
                 return ChatItemWithMenu(
+                    im: im,
                     chat: $chat,
+                    index: index,
+                    isLastItem: index == mergedItems.boxedValue.items.count - 1,
                     chatItem: ci,
+                    scrollToItem: scrollToItem,
+                    scrollToItemId: $scrollToItemId,
+                    merged: mergedItem,
                     maxWidth: maxWidth,
                     composeState: $composeState,
                     selectedMember: $selectedMember,
                     showChatInfoSheet: $showChatInfoSheet,
-                    revealedChatItem: $revealedChatItem,
+                    revealedItems: $revealedItems,
                     selectedChatItems: $selectedChatItems,
-                    forwardedChatItems: $forwardedChatItems
+                    forwardedChatItems: $forwardedChatItems,
+                    searchText: $searchText,
+                    closeKeyboardAndRun: closeKeyboardAndRun
                 )
+                // crashes on Cell size calculation without this line
+                .environmentObject(ChatModel.shared)
+                .environmentObject(theme) // crashes without this line when scrolling to the first unread in EndlessScrollVIew
                 .id(ci.id) // Required to trigger `onAppear` on iOS15
-            } loadPage: {
-                loadChatItems(cInfo)
             }
-            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
-            .padding(.vertical, -InvertedTableView.inset)
-            .onTapGesture { hideKeyboard() }
-            .onChange(of: searchText) { _ in
-                Task { await loadChat(chat: chat, search: searchText) }
+            .onAppear {
+                if !im.isLoading {
+                    updateWithInitiallyLoadedItems()
+                }
             }
-            .onChange(of: im.itemAdded) { added in
-                if added {
+            .onChange(of: im.isLoading) { loading in
+                if !loading {
+                    updateWithInitiallyLoadedItems()
+                }
+            }
+            .onChange(of: im.reversedChatItems) { items in
+                mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+                scrollView.updateItems(mergedItems.boxedValue.items)
+                if im.itemAdded {
                     im.itemAdded = false
-                    if FloatingButtonModel.shared.isReallyNearBottom {
-                        scrollModel.scrollToBottom()
+                    if scrollView.listState.firstVisibleItemIndex < 2 {
+                        scrollView.scrollToBottomAnimated()
+                    } else {
+                        scrollView.scroll(by: 34)
                     }
                 }
             }
+            .onChange(of: revealedItems) { revealed in
+                mergedItems.boxedValue = MergedItems.create(im, revealed)
+                scrollView.updateItems(mergedItems.boxedValue.items)
+            }
+            .onChange(of: chat.id) { _ in
+                allowLoadMoreItems = false
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    allowLoadMoreItems = true
+                }
+            }
+            .padding(.vertical, -100)
+            .onTapGesture { hideKeyboard() }
+            .onChange(of: searchText) { s in
+                if showSearch {
+                    searchTextChanged(s)
+                }
+            }
         }
     }
 
@@ -481,89 +770,58 @@ struct ChatView: View {
         }
     }
 
-    class FloatingButtonModel: ObservableObject {
-        static let shared = FloatingButtonModel()
-        @Published var unreadBelow: Int = 0
-        @Published var isNearBottom: Bool = true
-        @Published var date: Date?
-        @Published var isDateVisible: Bool = false
-        var totalUnread: Int = 0
-        var isReallyNearBottom: Bool = true
-        var hideDateWorkItem: DispatchWorkItem?
+    private func updateWithInitiallyLoadedItems() {
+        if mergedItems.boxedValue.items.isEmpty {
+            mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+        }
+        let unreadIndex = mergedItems.boxedValue.items.lastIndex(where: { $0.hasUnread() })
+        let unreadItemId: Int64? = if let unreadIndex { mergedItems.boxedValue.items[unreadIndex].newest().item.id } else { nil }
+        // this helps to speed up initial process of setting scroll position and reduce time needed
+        // to layout items on screen
+        if let unreadIndex, let unreadItemId {
+            scrollView.setScrollPosition(unreadIndex, unreadItemId)
+        }
+        scrollView.updateItems(mergedItems.boxedValue.items)
+        if let unreadIndex {
+            scrollView.scrollToItem(unreadIndex)
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            allowLoadMoreItems = true
+        }
+    }
 
-        func updateOnListChange(_ listState: ListState) {
-            let im = ItemsModel.shared
-            let unreadBelow =
-                if let id = listState.bottomItemId,
-                   let index = im.reversedChatItems.firstIndex(where: { $0.id == id })
-                {
-                 im.reversedChatItems[..<index].reduce(into: 0) { unread, chatItem in
-                     if chatItem.isRcvNew { unread += 1 }
-                 }
-                } else {
-                    0
-                }
-            let date: Date? =
-                if let topItemDate = listState.topItemDate {
-                    Calendar.current.startOfDay(for: topItemDate)
-                } else {
-                    nil
-                }
-
-            // set the counters and date indicator
-            DispatchQueue.main.async { [weak self] in
-                guard let it = self else { return }
-                it.setDate(visibility: true)
-                it.unreadBelow = unreadBelow
-                it.date = date
-                it.isReallyNearBottom = listState.scrollOffset > 0 && listState.scrollOffset < 500
+    private func searchTextChanged(_ s: String) {
+        Task {
+            await loadChat(chat: chat, im: im, search: s)
+            mergedItems.boxedValue = MergedItems.create(im, revealedItems)
+            await MainActor.run {
+                scrollView.updateItems(mergedItems.boxedValue.items)
             }
-            
-            // set floating button indication mode
-            let nearBottom = listState.scrollOffset < 800
-            if nearBottom != self.isNearBottom {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) { [weak self] in
-                    self?.isNearBottom = nearBottom
-                }
-            }
-            
-            // hide Date indicator after 1 second of no scrolling
-            hideDateWorkItem?.cancel()
-            let workItem = DispatchWorkItem { [weak self] in
-                guard let it = self else { return }
-                it.setDate(visibility: false)
-                it.hideDateWorkItem = nil
-            }
-            DispatchQueue.main.async { [weak self] in
-                self?.hideDateWorkItem = workItem
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: workItem)
+            if !s.isEmpty {
+                scrollView.scrollToBottom()
+            } else if let index = scrollView.listState.items.lastIndex(where: { $0.hasUnread() }) {
+                // scroll to the top unread item
+                scrollView.scrollToItem(index)
+            } else {
+                scrollView.scrollToBottom()
             }
         }
-
-        func resetDate() {
-            date = nil
-            isDateVisible = false
-        }
-
-        private func setDate(visibility isVisible: Bool) {
-            if isVisible {
-                if !isNearBottom,
-                   !isDateVisible,
-                   let date, !Calendar.current.isDateInToday(date) {
-                    withAnimation { self.isDateVisible = true }
-                }
-            } else if isDateVisible {
-                withAnimation { self.isDateVisible = false }
-            }
-        }
-
     }
 
     private struct FloatingButtons: View {
+        @ObservedObject var im: ItemsModel
         let theme: AppTheme
-        let scrollModel: ReverseListScrollModel
+        let scrollView: EndlessScrollView<MergedItem>
         let chat: Chat
-        @ObservedObject var model = FloatingButtonModel.shared
+        @Binding var loadingMoreItems: Bool
+        @Binding var loadingTopItems: Bool
+        @Binding var requestedTopScroll: Bool
+        @Binding var loadingBottomItems: Bool
+        @Binding var requestedBottomScroll: Bool
+        @Binding var animatedScrollingInProgress: Bool
+        let listState: EndlessScrollView<MergedItem>.ListState
+        @ObservedObject var model: FloatingButtonModel
+        let reloadItems: () -> Void
 
         var body: some View {
             ZStack(alignment: .top) {
@@ -573,52 +831,113 @@ struct ChatView: View {
                          .background(.thinMaterial)
                          .clipShape(Capsule())
                          .opacity(model.isDateVisible ? 1 : 0)
+                         .padding(.vertical, 4)
                 }
                 VStack {
-                    let unreadAbove = model.totalUnread - model.unreadBelow
-                    if unreadAbove > 0 {
-                        circleButton {
-                            unreadCountText(unreadAbove)
-                                .font(.callout)
-                                .foregroundColor(theme.colors.primary)
-                        }
-                        .onTapGesture {
-                            scrollModel.scrollToNextPage()
-                        }
-                        .contextMenu {
-                            Button {
-                                Task {
-                                    await markChatRead(chat)
+                    if model.unreadAbove > 0 && !animatedScrollingInProgress {
+                        if loadingTopItems && requestedTopScroll {
+                            circleButton { ProgressView() }
+                        } else {
+                            circleButton {
+                                unreadCountText(model.unreadAbove)
+                                    .font(.callout)
+                                    .foregroundColor(theme.colors.primary)
+                            }
+                            .onTapGesture {
+                                if loadingTopItems {
+                                    requestedTopScroll = true
+                                    requestedBottomScroll = false
+                                } else {
+                                    scrollToTopUnread()
+                                }
+                            }
+                            .contextMenu {
+                                Button {
+                                    Task {
+                                        await markChatRead(im, chat)
+                                    }
+                                } label: {
+                                    Label("Mark read", systemImage: "checkmark")
                                 }
-                            } label: {
-                                Label("Mark read", systemImage: "checkmark")
                             }
                         }
                     }
                     Spacer()
-                    if model.unreadBelow > 0 {
-                        circleButton {
-                            unreadCountText(model.unreadBelow)
-                                .font(.callout)
-                                .foregroundColor(theme.colors.primary)
+                    if listState.firstVisibleItemIndex != 0 && !animatedScrollingInProgress {
+                        if loadingBottomItems && requestedBottomScroll {
+                            circleButton { ProgressView() }
+                        } else {
+                            circleButton {
+                                Group {
+                                    if model.unreadBelow > 0 {
+                                        unreadCountText(model.unreadBelow)
+                                            .font(.callout)
+                                            .foregroundColor(theme.colors.primary)
+                                    } else {
+                                        Image(systemName: "chevron.down").foregroundColor(theme.colors.primary)
+                                    }
+                                }
+                            }
+                            .onTapGesture {
+                                if loadingBottomItems || !im.lastItemsLoaded {
+                                    requestedTopScroll = false
+                                    requestedBottomScroll = true
+                                } else {
+                                    scrollToBottom()
+                                }
+                            }
                         }
-                        .onTapGesture {
-                            scrollModel.scrollToBottom()
-                        }
-                    } else if !model.isNearBottom {
-                        circleButton {
-                            Image(systemName: "chevron.down")
-                                .foregroundColor(theme.colors.primary)
-                        }
-                        .onTapGesture { scrollModel.scrollToBottom() }
                     }
                 }
                 .padding()
                 .frame(maxWidth: .infinity, alignment: .trailing)
             }
+            .onChange(of: loadingTopItems) { loading in
+                if !loading && requestedTopScroll {
+                    requestedTopScroll = false
+                    scrollToTopUnread()
+                }
+            }
+            .onChange(of: loadingBottomItems) { loading in
+                if !loading && requestedBottomScroll && im.lastItemsLoaded {
+                    requestedBottomScroll = false
+                    scrollToBottom()
+                }
+            }
             .onDisappear(perform: model.resetDate)
         }
 
+        private func scrollToTopUnread() {
+            Task {
+                if !im.chatState.splits.isEmpty {
+                    await MainActor.run { loadingMoreItems = true }
+                    await loadChat(chatId: chat.id, im: im, openAroundItemId: nil, clearItems: false)
+                    await MainActor.run { reloadItems() }
+                    if let index = listState.items.lastIndex(where: { $0.hasUnread() }) {
+                        await MainActor.run { animatedScrollingInProgress = true }
+                        await scrollView.scrollToItemAnimated(index)
+                        await MainActor.run { animatedScrollingInProgress = false }
+                    }
+                    await MainActor.run { loadingMoreItems = false }
+                } else if let index = listState.items.lastIndex(where: { $0.hasUnread() }) {
+                    await MainActor.run { animatedScrollingInProgress = true }
+                    // scroll to the top unread item
+                    await scrollView.scrollToItemAnimated(index)
+                    await MainActor.run { animatedScrollingInProgress = false }
+                } else {
+                    logger.debug("No more unread items, total: \(listState.items.count)")
+                }
+            }
+        }
+
+        private func scrollToBottom() {
+            animatedScrollingInProgress = true
+            Task {
+                await scrollView.scrollToItemAnimated(0, top: false)
+                await MainActor.run { animatedScrollingInProgress = false }
+            }
+        }
+
         private func circleButton<Content: View>(_ content: @escaping () -> Content) -> some View {
             ZStack {
                 Circle()
@@ -677,14 +996,32 @@ struct ChatView: View {
     }
 
     private func focusSearch() {
-        searchMode = true
+        showSearch = true
         searchFocussed = true
         searchText = ""
     }
 
+    private func closeSearch() {
+        showSearch = false
+        searchText = ""
+        searchFocussed = false
+    }
+
+    private func closeKeyboardAndRun(_ action: @escaping () -> Void) {
+        var delay: TimeInterval = 0
+        if keyboardVisible || keyboardHiddenDate.timeIntervalSinceNow >= -1 || showSearch {
+            delay = 0.5
+            closeSearch()
+            hideKeyboard()
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+            action()
+        }
+    }
+
     private func addMembersButton() -> some View {
         Button {
-            if case let .group(gInfo) = chat.chatInfo {
+            if case let .group(gInfo, _) = chat.chatInfo {
                 Task { await chatModel.loadGroupMembers(gInfo) { showAddMembersSheet = true } }
             }
         } label: {
@@ -694,7 +1031,7 @@ struct ChatView: View {
 
     private func groupLinkButton() -> some View {
         Button {
-            if case let .group(gInfo) = chat.chatInfo {
+            if case let .group(gInfo, _) = chat.chatInfo {
                 Task {
                     do {
                         if let link = try apiGetGroupLink(gInfo.groupId) {
@@ -745,6 +1082,7 @@ struct ChatView: View {
                     let (validItems, confirmation) = try await apiPlanForwardChatItems(
                         type: chat.chatInfo.chatType,
                         id: chat.chatInfo.apiId,
+                        scope: chat.chatInfo.groupChatScope(),
                         itemIds: Array(selectedChatItems)
                     )
                     if let confirmation {
@@ -810,7 +1148,7 @@ struct ChatView: View {
                 )
             }
         }
-        
+
         func forwardAction(_ items: [Int64]) -> UIAlertAction {
             UIAlertAction(
                 title: NSLocalizedString("Forward messages", comment: "alert action"),
@@ -834,7 +1172,6 @@ struct ChatView: View {
         }
 
         func openForwardingSheet(_ items: [Int64]) async {
-            let im = ItemsModel.shared
             var items = Set(items)
             var fci = [ChatItem]()
             for reversedChatItem in im.reversedChatItems {
@@ -848,43 +1185,38 @@ struct ChatView: View {
         }
     }
 
-    private func loadChatItems(_ cInfo: ChatInfo) {
-        Task {
-            if loadingItems || firstPage { return }
-            loadingItems = true
-            do {
-                var reversedPage = Array<ChatItem>()
-                var chatItemsAvailable = true
-                // Load additional items until the page is +50 large after merging
-                while chatItemsAvailable && filtered(reversedPage).count < loadItemsPerPage {
-                    let pagination: ChatPagination =
-                        if let lastItem = reversedPage.last ?? im.reversedChatItems.last {
-                            .before(chatItemId: lastItem.id, count: loadItemsPerPage)
-                        } else {
-                            .last(count: loadItemsPerPage)
-                        }
-                    let chatItems = try await apiGetChatItems(
-                        type: cInfo.chatType,
-                        id: cInfo.apiId,
-                        pagination: pagination,
-                        search: searchText
-                    )
-                    chatItemsAvailable = !chatItems.isEmpty
-                    reversedPage.append(contentsOf: chatItems.reversed())
-                }
-                await MainActor.run {
-                    if reversedPage.count == 0 {
-                        firstPage = true
-                    } else {
-                        im.reversedChatItems.append(contentsOf: reversedPage)
-                    }
-                    loadingItems = false
-                }
-            } catch let error {
-                logger.error("apiGetChat error: \(responseError(error))")
-                await MainActor.run { loadingItems = false }
+    private func loadChatItems(_ chat: Chat, _ pagination: ChatPagination) async -> Bool {
+        if loadingMoreItems { return false }
+        await MainActor.run {
+            loadingMoreItems = true
+            if case .before = pagination {
+                loadingTopItems = true
+            } else if case .after = pagination {
+                loadingBottomItems = true
             }
         }
+        let triedToLoad = await loadChatItemsUnchecked(chat, pagination)
+        await MainActor.run {
+            loadingMoreItems = false
+            if case .before = pagination {
+                loadingTopItems = false
+            } else if case .after = pagination {
+                loadingBottomItems = false
+            }
+        }
+        return triedToLoad
+    }
+
+    private func loadChatItemsUnchecked(_ chat: Chat, _ pagination: ChatPagination) async -> Bool {
+        await apiLoadMessages(
+            chat.chatInfo.id,
+            im,
+            pagination,
+            searchText,
+            nil,
+            { visibleItemIndexesNonReversed(im, scrollView.listState, mergedItems.boxedValue) }
+        )
+        return true
     }
 
     func stopAudioPlayer() {
@@ -892,96 +1224,151 @@ struct ChatView: View {
         VoiceItemState.chatView = [:]
     }
 
+    func onChatItemsUpdated() {
+        if !mergedItems.boxedValue.isActualState() {
+            //logger.debug("Items are not actual, waiting for the next update: \(String(describing: mergedItems.boxedValue.splits))  \(im.chatState.splits), \(mergedItems.boxedValue.indexInParentItems.count) vs \(im.reversedChatItems.count)")
+            return
+        }
+        floatingButtonModel.updateOnListChange(scrollView.listState)
+        preloadIfNeeded(
+            im,
+            $allowLoadMoreItems,
+            $ignoreLoadingRequests,
+            scrollView.listState,
+            mergedItems,
+            loadItems: { unchecked, pagination in
+                if unchecked {
+                    await loadChatItemsUnchecked(chat, pagination)
+                } else {
+                    await loadChatItems(chat, pagination)
+                }
+            },
+            loadLastItems: {
+                if !loadingMoreItems {
+                    await loadLastItems($loadingMoreItems, loadingBottomItems: $loadingBottomItems, chat, im)
+                }
+            }
+        )
+    }
+
     private struct ChatItemWithMenu: View {
+        @ObservedObject var im: ItemsModel
         @EnvironmentObject var m: ChatModel
         @EnvironmentObject var theme: AppTheme
         @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileRadius = defaultProfileImageCorner
         @Binding @ObservedObject var chat: Chat
         @ObservedObject var dummyModel: ChatItemDummyModel = .shared
+        let index: Int
+        let isLastItem: Bool
         let chatItem: ChatItem
+        let scrollToItem: (ChatItem.ID) -> Void
+        @Binding var scrollToItemId: ChatItem.ID?
+        let merged: MergedItem
         let maxWidth: CGFloat
         @Binding var composeState: ComposeState
         @Binding var selectedMember: GMember?
         @Binding var showChatInfoSheet: Bool
-        @Binding var revealedChatItem: ChatItem?
+        @Binding var revealedItems: Set<Int64>
 
         @State private var deletingItem: ChatItem? = nil
         @State private var showDeleteMessage = false
         @State private var deletingItems: [Int64] = []
         @State private var showDeleteMessages = false
+        @State private var archivingReports: Set<Int64>? = nil
+        @State private var showArchivingReports = false
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
         @State private var msgWidth: CGFloat = 0
+        @State private var touchInProgress: Bool = false
 
         @Binding var selectedChatItems: Set<Int64>?
         @Binding var forwardedChatItems: [ChatItem]
 
+        @Binding var searchText: String
+        var closeKeyboardAndRun: (@escaping () -> Void) -> Void
+
         @State private var allowMenu: Bool = true
         @State private var markedRead = false
+        @State private var markReadTask: Task<Void, Never>? = nil
         @State private var actionSheet: SomeActionSheet? = nil
 
-        var revealed: Bool { chatItem == revealedChatItem }
+        var revealed: Bool { revealedItems.contains(chatItem.id) }
 
         typealias ItemSeparation = (timestamp: Bool, largeGap: Bool, date: Date?)
 
-        func getItemSeparation(_ chatItem: ChatItem, at i: Int?) -> ItemSeparation {
-            let im = ItemsModel.shared
-            if let i, i > 0 && im.reversedChatItems.count >= i {
-                let nextItem = im.reversedChatItems[i - 1]
-                let largeGap = !nextItem.chatDir.sameDirection(chatItem.chatDir) || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
-                return (
-                    timestamp: largeGap || formatTimestampMeta(chatItem.meta.itemTs) != formatTimestampMeta(nextItem.meta.itemTs),
-                    largeGap: largeGap,
-                    date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: nextItem.meta.itemTs) ? nil : nextItem.meta.itemTs
-                )
+        private func reveal(_ yes: Bool) -> Void {
+            merged.revealItems(yes, $revealedItems)
+        }
+
+        func getItemSeparation(_ chatItem: ChatItem, _ prevItem: ChatItem?) -> ItemSeparation {
+            guard let prevItem else {
+                return ItemSeparation(timestamp: true, largeGap: true, date: nil)
+            }
+
+            let sameMemberAndDirection = if case .groupRcv(let prevGroupMember) = prevItem.chatDir, case .groupRcv(let groupMember) = chatItem.chatDir {
+                groupMember.groupMemberId == prevGroupMember.groupMemberId
             } else {
-                return (timestamp: true, largeGap: true, date: nil)
+                chatItem.chatDir.sent == prevItem.chatDir.sent
+            }
+            let largeGap = !sameMemberAndDirection || prevItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
+
+            return ItemSeparation(
+                timestamp: largeGap || formatTimestampMeta(chatItem.meta.itemTs) != formatTimestampMeta(prevItem.meta.itemTs),
+                largeGap: largeGap,
+                date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: prevItem.meta.itemTs) ? nil : prevItem.meta.itemTs
+            )
+        }
+
+        func shouldShowAvatar(_ current: ChatItem, _ older: ChatItem?) -> Bool {
+            let oldIsGroupRcv = switch older?.chatDir {
+            case .groupRcv: true
+            default: false
+            }
+            let sameMember = switch (older?.chatDir, current.chatDir) {
+            case (.groupRcv(let oldMember), .groupRcv(let member)):
+                oldMember.memberId == member.memberId
+            default:
+                false
+            }
+            if case .groupRcv = current.chatDir, (older == nil || (!oldIsGroupRcv || !sameMember)) {
+                return true
+            } else {
+                return false
             }
         }
 
         var body: some View {
-            let currIndex = m.getChatItemIndex(chatItem)
-            let ciCategory = chatItem.mergeCategory
-            let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
-            let range = itemsRange(currIndex, prevHidden)
-            let timeSeparation = getItemSeparation(chatItem, at: currIndex)
-            let im = ItemsModel.shared
-            Group {
-                if revealed, let range = range {
-                    let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    VStack(spacing: 0) {
-                        ForEach(items.reversed(), id: \.1.viewId) { (i: Int, ci: ChatItem) in
-                            let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
-                            chatItemView(ci, nil, prev, getItemSeparation(ci, at: i))
-                                .overlay {
-                                    if let selected = selectedChatItems, ci.canBeDeletedForSelf {
-                                        Color.clear
-                                            .contentShape(Rectangle())
-                                            .onTapGesture {
-                                                let checked = selected.contains(ci.id)
-                                                selectUnselectChatItem(select: !checked, ci)
-                                            }
-                                    }
-                                }
-                        }
-                    }
-                } else {
-                    VStack(spacing: 0) {
-                        chatItemView(chatItem, range, prevItem, timeSeparation)
-                        if let date = timeSeparation.date {
-                            DateSeparator(date: date).padding(8)
-                        }
-                    }
+            let last = isLastItem ? im.reversedChatItems.last : nil
+            let listItem = merged.newest()
+            let item = listItem.item
+            let range: ClosedRange<Int>? = if case let .grouped(_, _, _, rangeInReversed, _, _, _, _) = merged {
+                rangeInReversed.boxedValue
+            } else {
+                nil
+            }
+            let showAvatar = shouldShowAvatar(item, listItem.nextItem)
+            let single = switch merged {
+            case .single: true
+            default: false
+            }
+            let itemSeparation = getItemSeparation(item, single || revealed ? listItem.prevItem: nil)
+            return VStack(spacing: 0) {
+                if let last {
+                    DateSeparator(date: last.meta.itemTs).padding(8)
+                }
+                chatItemListView(range, showAvatar, item, itemSeparation)
                     .overlay {
                         if let selected = selectedChatItems, chatItem.canBeDeletedForSelf {
                             Color.clear
                                 .contentShape(Rectangle())
-                                .onTapGesture {
+                                .simultaneousGesture(TapGesture().onEnded {
                                     let checked = selected.contains(chatItem.id)
                                     selectUnselectChatItem(select: !checked, chatItem)
-                                }
+                                })
                         }
                     }
+                if let date = itemSeparation.date {
+                    DateSeparator(date: date).padding(8)
                 }
             }
             .onAppear {
@@ -991,42 +1378,73 @@ struct ChatView: View {
                     markedRead = true
                 }
                 if let range {
-                    let itemIds = unreadItemIds(range)
+                    let (itemIds, unreadMentions) = unreadItemIds(range)
                     if !itemIds.isEmpty {
                         waitToMarkRead {
-                            await apiMarkChatItemsRead(chat.chatInfo, itemIds)
+                            await apiMarkChatItemsRead(im, chat.chatInfo, itemIds, mentionsRead: unreadMentions)
                         }
                     }
                 } else if chatItem.isRcvNew  {
                     waitToMarkRead {
-                        await apiMarkChatItemsRead(chat.chatInfo, [chatItem.id])
+                        await apiMarkChatItemsRead(im, chat.chatInfo, [chatItem.id], mentionsRead: chatItem.meta.userMention ? 1 : 0)
                     }
                 }
             }
+            .onDisappear {
+                markReadTask?.cancel()
+                markedRead = false
+            }
             .actionSheet(item: $actionSheet) { $0.actionSheet }
+            // skip updating struct on touch if no need to show GoTo button
+            .if(touchInProgress || searchIsNotBlank || (chatItem.meta.itemForwarded != nil && chatItem.meta.itemForwarded != .unknown)) {
+                // long press listener steals taps from top-level listener, so repeating it's logic here as well
+                $0.onTapGesture {
+                    hideKeyboard()
+                }
+                .onLongPressGesture(minimumDuration: .infinity, perform: {}, onPressingChanged: { pressing in
+                    touchInProgress = pressing
+                })
+            }
         }
 
-        private func unreadItemIds(_ range: ClosedRange<Int>) -> [ChatItem.ID] {
-            let im = ItemsModel.shared
-            return range.compactMap { i in
-                if i >= 0 && i < im.reversedChatItems.count {
-                    let ci = im.reversedChatItems[i]
-                    return if ci.isRcvNew { ci.id } else { nil }
-                } else {
-                    return nil
+        private func unreadItemIds(_ range: ClosedRange<Int>) -> ([ChatItem.ID], Int) {
+            var unreadItems: [ChatItem.ID] = []
+            var unreadMentions: Int = 0
+
+            for i in range {
+                if i < 0 || i >= im.reversedChatItems.count {
+                    break
+                }
+                let ci = im.reversedChatItems[i]
+                if ci.isRcvNew {
+                    unreadItems.append(ci.id)
+                    if ci.meta.userMention {
+                        unreadMentions += 1
+                    }
                 }
             }
+
+            return (unreadItems, unreadMentions)
         }
-        
+
         private func waitToMarkRead(_ op: @Sendable @escaping () async -> Void) {
-            Task {
-                _ = try? await Task.sleep(nanoseconds: 600_000000)
-                if m.chatId == chat.chatInfo.id {
-                    await op()
+            markReadTask = Task {
+                do {
+                    _ = try await Task.sleep(nanoseconds: 600_000000)
+                    if m.chatId == chat.chatInfo.id {
+                        await op()
+                    }
+                } catch {
+                    // task was cancelled
                 }
             }
         }
-        
+
+        private var searchIsNotBlank: Bool {
+            get {
+                searchText.count > 0 && !searchText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            }
+        }
 
         @available(iOS 16.0, *)
         struct MemberLayout: Layout {
@@ -1072,20 +1490,25 @@ struct ChatView: View {
             }
         }
 
-        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?, _ itemSeparation: ItemSeparation) -> some View {
+        @ViewBuilder func chatItemListView(
+            _ range: ClosedRange<Int>?,
+            _ showAvatar: Bool,
+            _ ci: ChatItem,
+            _ itemSeparation: ItemSeparation
+        ) -> some View {
             let bottomPadding: Double = itemSeparation.largeGap ? 10 : 2
             if case let .groupRcv(member) = ci.chatDir,
-               case let .group(groupInfo) = chat.chatInfo {
-                let (prevMember, memCount): (GroupMember?, Int) =
-                if let range = range {
-                    m.getPrevHiddenMember(member, range)
-                } else {
-                    (nil, 1)
-                }
-                if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
+               case .group = chat.chatInfo {
+                if showAvatar {
                     VStack(alignment: .leading, spacing: 4) {
                         if ci.content.showMemberName {
                             Group {
+                                let (prevMember, memCount): (GroupMember?, Int) =
+                                if let range = range {
+                                    m.getPrevHiddenMember(member, range)
+                                } else {
+                                    (nil, 1)
+                                }
                                 if memCount == 1 && member.memberRole > .member {
                                     Group {
                                         if #available(iOS 16.0, *) {
@@ -1129,7 +1552,7 @@ struct ChatView: View {
                             }
                             HStack(alignment: .top, spacing: 10) {
                                 MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
-                                    .onTapGesture {
+                                    .simultaneousGesture(TapGesture().onEnded {
                                         if let mem = m.getGroupMember(member.groupMemberId) {
                                             selectedMember = mem
                                         } else {
@@ -1138,7 +1561,7 @@ struct ChatView: View {
                                             m.groupMembersIndexes[member.groupMemberId] = m.groupMembers.count - 1
                                             selectedMember = mem
                                         }
-                                    }
+                                    })
                                 chatItemWithMenu(ci, range, maxWidth, itemSeparation)
                                     .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
                             }
@@ -1188,20 +1611,31 @@ struct ChatView: View {
             }
         }
 
-        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat, _ itemSeparation: ItemSeparation) -> some View {
+        func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat, _ itemSeparation: ItemSeparation) -> some View {
             let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
-            VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(
-                    chat: chat,
-                    chatItem: ci,
-                    maxWidth: maxWidth,
-                    allowMenu: $allowMenu
-                )
-                .environment(\.revealed, revealed)
-                .environment(\.showTimestamp, itemSeparation.timestamp)
-                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
-                .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
-                .accessibilityLabel("")
+            return VStack(alignment: alignment.horizontal, spacing: 3) {
+                HStack {
+                    if ci.chatDir.sent {
+                        goToItemButton(true)
+                    }
+                    ChatItemView(
+                        chat: chat,
+                        im: im,
+                        chatItem: ci,
+                        scrollToItem: scrollToItem,
+                        scrollToItemId: $scrollToItemId,
+                        maxWidth: maxWidth,
+                        allowMenu: $allowMenu
+                    )
+                    .environment(\.revealed, revealed)
+                    .environment(\.showTimestamp, itemSeparation.timestamp)
+                    .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
+                    .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
+                    .accessibilityLabel("")
+                    if !ci.chatDir.sent {
+                        goToItemButton(false)
+                    }
+                }
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                     chatItemReactions(ci)
                         .padding(.bottom, 4)
@@ -1222,12 +1656,28 @@ struct ChatView: View {
                         deleteMessages(chat, deletingItems, moderate: false)
                     }
                 }
+                .confirmationDialog(archivingReports?.count == 1 ? "Archive report?" : "Archive \(archivingReports?.count ?? 0) reports?", isPresented: $showArchivingReports, titleVisibility: .visible) {
+                    Button("For me", role: .destructive) {
+                        if let reports = self.archivingReports {
+                            archiveReports(chat.chatInfo, reports.sorted(), false)
+                            self.archivingReports = []
+                        }
+                    }
+                    if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, groupInfo.membership.memberActive {
+                        Button("For all moderators", role: .destructive) {
+                            if let reports = self.archivingReports {
+                                archiveReports(chat.chatInfo, reports.sorted(), true)
+                                self.archivingReports = []
+                            }
+                        }
+                    }
+                }
                 .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
                 .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
                 .sheet(isPresented: $showChatItemInfoSheet, onDismiss: {
                     chatItemInfo = nil
                 }) {
-                    ChatItemInfoView(ci: ci, chatItemInfo: $chatItemInfo)
+                    ChatItemInfoView(ci: ci, userMemberId: chat.chatInfo.groupInfo?.membership.memberId, chatItemInfo: $chatItemInfo)
                 }
         }
 
@@ -1257,12 +1707,12 @@ struct ChatView: View {
                     .padding(.horizontal, 6)
                     .padding(.vertical, 4)
                     .if(chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted)) { v in
-                        v.onTapGesture {
+                        v.simultaneousGesture(TapGesture().onEnded {
                             setReaction(ci, add: !r.userReacted, reaction: r.reaction)
-                        }
+                        })
                     }
                     switch chat.chatInfo {
-                    case let .group(groupInfo):
+                    case let .group(groupInfo, _):
                         v.contextMenu {
                             ReactionContextMenu(
                                 groupInfo: groupInfo,
@@ -1285,7 +1735,7 @@ struct ChatView: View {
 
         @ViewBuilder
         private func menu(_ ci: ChatItem, _ range: ClosedRange<Int>?, live: Bool) -> some View {
-            if case let .group(gInfo) = chat.chatInfo, ci.isReport, ci.meta.itemDeleted == nil {
+            if case let .group(gInfo, _) = chat.chatInfo, ci.isReport, ci.meta.itemDeleted == nil {
                 if ci.chatDir != .groupSnd, gInfo.membership.memberRole >= .moderator {
                     archiveReportButton(ci)
                 }
@@ -1343,9 +1793,13 @@ struct ChatView: View {
                 if ci.chatDir != .groupSnd {
                     if let (groupInfo, _) = ci.memberToModerate(chat.chatInfo) {
                         moderateButton(ci, groupInfo)
-                    } // else if ci.meta.itemDeleted == nil, case let .group(gInfo) = chat.chatInfo, gInfo.membership.memberRole == .member, !live, composeState.voiceMessageRecordingState == .noRecording {
-                        // reportButton(ci)
-                    // }
+                    } else if ci.meta.itemDeleted == nil && chat.groupFeatureEnabled(.reports),
+                              case let .group(gInfo, _) = chat.chatInfo,
+                              gInfo.membership.memberRole == .member
+                                && !live
+                                && composeState.voiceMessageRecordingState == .noRecording {
+                        reportButton(ci)
+                    }
                 }
             } else if ci.meta.itemDeleted != nil {
                 if revealed {
@@ -1451,6 +1905,7 @@ struct ChatView: View {
                     let chatItem = try await apiChatItemReaction(
                         type: cInfo.chatType,
                         id: cInfo.apiId,
+                        scope: cInfo.groupChatScope(),
                         itemId: ci.id,
                         add: add,
                         reaction: reaction
@@ -1564,11 +2019,11 @@ struct ChatView: View {
                 Task {
                     do {
                         let cInfo = chat.chatInfo
-                        let ciInfo = try await apiGetChatItemInfo(type: cInfo.chatType, id: cInfo.apiId, itemId: ci.id)
+                        let ciInfo = try await apiGetChatItemInfo(type: cInfo.chatType, id: cInfo.apiId, scope: cInfo.groupChatScope(), itemId: ci.id)
                         await MainActor.run {
                             chatItemInfo = ciInfo
                         }
-                        if case let .group(gInfo) = chat.chatInfo {
+                        if case let .group(gInfo, _) = chat.chatInfo {
                             await m.loadGroupMembers(gInfo)
                         }
                     } catch let error {
@@ -1609,7 +2064,7 @@ struct ChatView: View {
         private func hideButton() -> Button<some View> {
             Button {
                 withConditionalAnimation {
-                    revealedChatItem = nil
+                    reveal(false)
                 }
             } label: {
                 Label(
@@ -1622,13 +2077,13 @@ struct ChatView: View {
         private func deleteButton(_ ci: ChatItem, label: LocalizedStringKey = "Delete") -> Button<some View> {
             Button(role: .destructive) {
                 if !revealed,
-                   let currIndex = m.getChatItemIndex(ci),
+                   let currIndex = m.getChatItemIndex(im, ci),
                    let ciCategory = ci.mergeCategory {
                     let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
                     if let range = itemsRange(currIndex, prevHidden) {
                         var itemIds: [Int64] = []
                         for i in range {
-                            itemIds.append(ItemsModel.shared.reversedChatItems[i].id)
+                            itemIds.append(im.reversedChatItems[i].id)
                         }
                         showDeleteMessages = true
                         deletingItems = itemIds
@@ -1677,20 +2132,11 @@ struct ChatView: View {
                 )
             }
         }
-        
+
         private func archiveReportButton(_ cItem: ChatItem) -> Button<some View> {
-            Button(role: .destructive) {
-                AlertManager.shared.showAlert(
-                    Alert(
-                        title: Text("Archive report?"),
-                        message: Text("The report will be archived for you."),
-                        primaryButton: .destructive(Text("Archive")) {
-                            deletingItem = cItem
-                            deleteMessage(.cidmInternalMark, moderate: false)
-                        },
-                        secondaryButton: .cancel()
-                    )
-                )
+            Button {
+                archivingReports = [cItem.id]
+                showArchivingReports = true
             } label: {
                 Label("Archive report", systemImage: "archivebox")
             }
@@ -1699,7 +2145,7 @@ struct ChatView: View {
         private func revealButton(_ ci: ChatItem) -> Button<some View> {
             Button {
                 withConditionalAnimation {
-                    revealedChatItem = ci
+                    reveal(true)
                 }
             } label: {
                 Label(
@@ -1712,7 +2158,7 @@ struct ChatView: View {
         private func expandButton() -> Button<some View> {
             Button {
                 withConditionalAnimation {
-                    revealedChatItem = chatItem
+                    reveal(true)
                 }
             } label: {
                 Label(
@@ -1725,7 +2171,7 @@ struct ChatView: View {
         private func shrinkButton() -> Button<some View> {
             Button {
                 withConditionalAnimation {
-                    revealedChatItem = nil
+                    reveal(false)
                 }
             } label: {
                 Label (
@@ -1734,7 +2180,7 @@ struct ChatView: View {
                 )
             }
         }
-        
+
         private func reportButton(_ ci: ChatItem) -> Button<some View> {
             Button(role: .destructive) {
                 var buttons: [ActionSheet.Button] = ReportReason.supportedReasons.map { reason in
@@ -1748,9 +2194,9 @@ struct ChatView: View {
                         }
                     }
                 }
-                
+
                 buttons.append(.cancel())
-               
+
                 actionSheet = SomeActionSheet(
                     actionSheet: ActionSheet(
                         title: Text("Report reason?"),
@@ -1765,7 +2211,7 @@ struct ChatView: View {
                 )
             }
         }
-        
+
         var deleteMessagesTitle: LocalizedStringKey {
             let n = deletingItems.count
             return n == 1 ? "Delete message?" : "Delete \(n) messages?"
@@ -1775,12 +2221,12 @@ struct ChatView: View {
             selectedChatItems = selectedChatItems ?? []
             var itemIds: [Int64] = []
             if !revealed,
-               let currIndex = m.getChatItemIndex(ci),
+               let currIndex = m.getChatItemIndex(im, ci),
                let ciCategory = ci.mergeCategory {
                 let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
                 if let range = itemsRange(currIndex, prevHidden) {
                     for i in range {
-                        itemIds.append(ItemsModel.shared.reversedChatItems[i].id)
+                        itemIds.append(im.reversedChatItems[i].id)
                     }
                 } else {
                     itemIds.append(ci.id)
@@ -1814,6 +2260,7 @@ struct ChatView: View {
                             try await apiDeleteChatItems(
                                 type: chat.chatInfo.chatType,
                                 id: chat.chatInfo.apiId,
+                                scope: chat.chatInfo.groupChatScope(),
                                 itemIds: [di.id],
                                 mode: mode
                             )
@@ -1830,6 +2277,7 @@ struct ChatView: View {
                                 if deletedItem.isActiveReport {
                                     m.decreaseGroupReportsCounter(chat.chatInfo.id)
                                 }
+                                m.updateChatInfo(itemDeletion.deletedChatItem.chatInfo)
                             }
                         }
                     }
@@ -1838,7 +2286,7 @@ struct ChatView: View {
                 }
             }
         }
-        
+
         @ViewBuilder private func contactReactionMenu(_ contact: Contact, _ r: CIReactionCount) -> some View {
             if !r.userReacted || r.totalReacted > 1 {
                 Button { showChatInfoSheet = true } label: {
@@ -1853,6 +2301,34 @@ struct ChatView: View {
             }
         }
 
+        func goToItemInnerButton(_ alignStart: Bool, _ image: String, touchInProgress: Bool, _ onClick: @escaping () -> Void) -> some View {
+            Image(systemName: image)
+                .resizable()
+                .frame(width: 13, height: 13)
+                .padding([alignStart ? .trailing : .leading], 10)
+                .tint(theme.colors.secondary.opacity(touchInProgress ? 1.0 : 0.4))
+                .simultaneousGesture(TapGesture().onEnded(onClick))
+        }
+
+        @ViewBuilder
+        func goToItemButton(_ alignStart: Bool) -> some View {
+            let chatTypeApiIdMsgId = chatItem.meta.itemForwarded?.chatTypeApiIdMsgId
+            if searchIsNotBlank {
+                goToItemInnerButton(alignStart, "magnifyingglass", touchInProgress: touchInProgress) {
+                    closeKeyboardAndRun {
+                        im.loadOpenChatNoWait(chat.id, chatItem.id)
+                    }
+                }
+            } else if let chatTypeApiIdMsgId {
+                goToItemInnerButton(alignStart, "arrow.right", touchInProgress: touchInProgress) {
+                    closeKeyboardAndRun {
+                        let (chatType, apiId, msgId) = chatTypeApiIdMsgId
+                        im.loadOpenChatNoWait("\(chatType.rawValue)\(apiId)", msgId)
+                    }
+                }
+            }
+        }
+
         private struct SelectedChatItem: View {
             @EnvironmentObject var theme: AppTheme
             var ciId: Int64
@@ -1874,6 +2350,84 @@ struct ChatView: View {
     }
 }
 
+class FloatingButtonModel: ObservableObject {
+    @ObservedObject var im: ItemsModel
+
+    public init(im: ItemsModel) {
+        self.im = im
+    }
+
+    @Published var unreadAbove: Int = 0
+    @Published var unreadBelow: Int = 0
+    @Published var isNearBottom: Bool = true
+    @Published var date: Date? = nil
+    @Published var isDateVisible: Bool = false
+    var hideDateWorkItem: DispatchWorkItem? = nil
+
+    func updateOnListChange(_ listState: EndlessScrollView<MergedItem>.ListState) {
+        let lastVisibleItem = oldestPartiallyVisibleListItemInListStateOrNull(listState)
+        let unreadBelow = if let lastVisibleItem {
+            max(0, im.chatState.unreadTotal - lastVisibleItem.unreadBefore)
+        } else {
+            0
+        }
+        let unreadAbove = im.chatState.unreadTotal - unreadBelow
+        let date: Date? =
+        if let lastVisible = listState.visibleItems.last {
+            Calendar.current.startOfDay(for: lastVisible.item.oldest().item.meta.itemTs)
+            } else {
+                nil
+            }
+
+        // set the counters and date indicator
+        DispatchQueue.main.async { [weak self] in
+            guard let it = self else { return }
+            it.setDate(visibility: true)
+            it.unreadAbove = unreadAbove
+            it.unreadBelow = unreadBelow
+            it.date = date
+        }
+
+        // set floating button indication mode
+        let nearBottom = listState.firstVisibleItemIndex < 1
+        if nearBottom != self.isNearBottom {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) { [weak self] in
+                self?.isNearBottom = nearBottom
+            }
+        }
+
+        // hide Date indicator after 1 second of no scrolling
+        hideDateWorkItem?.cancel()
+        let workItem = DispatchWorkItem { [weak self] in
+            guard let it = self else { return }
+            it.setDate(visibility: false)
+            it.hideDateWorkItem = nil
+        }
+        DispatchQueue.main.async { [weak self] in
+            self?.hideDateWorkItem = workItem
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: workItem)
+        }
+    }
+
+    func resetDate() {
+        date = nil
+        isDateVisible = false
+    }
+
+    private func setDate(visibility isVisible: Bool) {
+        if isVisible {
+            if !isNearBottom,
+               !isDateVisible,
+               let date, !Calendar.current.isDateInToday(date) {
+                withAnimation { self.isDateVisible = true }
+            }
+        } else if isDateVisible {
+            withAnimation { self.isDateVisible = false }
+        }
+    }
+
+}
+
 private func broadcastDeleteButtonText(_ chat: Chat) -> LocalizedStringKey {
     chat.chatInfo.featureEnabled(.fullDelete) ? "Delete for everyone" : "Mark deleted for everyone"
 }
@@ -1895,6 +2449,7 @@ private func deleteMessages(_ chat: Chat, _ deletingItems: [Int64], _ mode: CIDe
                     try await apiDeleteChatItems(
                         type: chatInfo.chatType,
                         id: chatInfo.apiId,
+                        scope: chatInfo.groupChatScope(),
                         itemIds: itemIds,
                         mode: mode
                     )
@@ -1912,6 +2467,9 @@ private func deleteMessages(_ chat: Chat, _ deletingItems: [Int64], _ mode: CIDe
                             ChatModel.shared.decreaseGroupReportsCounter(chat.chatInfo.id)
                         }
                     }
+                    if let updatedChatInfo = deletedItems.last?.deletedChatItem.chatInfo {
+                        ChatModel.shared.updateChatInfo(updatedChatInfo)
+                    }
                 }
                 await onSuccess()
             } catch {
@@ -1921,11 +2479,45 @@ private func deleteMessages(_ chat: Chat, _ deletingItems: [Int64], _ mode: CIDe
     }
 }
 
+func archiveReports(_ chatInfo: ChatInfo, _ itemIds: [Int64], _ forAll: Bool, _ onSuccess: @escaping () async -> Void = {}) {
+    if itemIds.count > 0 {
+        Task {
+            do {
+                let deleted = try await apiDeleteReceivedReports(
+                    groupId: chatInfo.apiId,
+                    itemIds: itemIds,
+                    mode: forAll ? CIDeleteMode.cidmBroadcast : CIDeleteMode.cidmInternalMark
+                )
+
+                await MainActor.run {
+                    for di in deleted {
+                        if let toItem = di.toChatItem {
+                            _ = ChatModel.shared.upsertChatItem(chatInfo, toItem.chatItem)
+                        } else {
+                            ChatModel.shared.removeChatItem(chatInfo, di.deletedChatItem.chatItem)
+                        }
+                        let deletedItem = di.deletedChatItem.chatItem
+                        if deletedItem.isActiveReport {
+                            ChatModel.shared.decreaseGroupReportsCounter(chatInfo.id)
+                        }
+                    }
+                    if let updatedChatInfo = deleted.last?.deletedChatItem.chatInfo {
+                        ChatModel.shared.updateChatInfo(updatedChatInfo)
+                    }
+                }
+                await onSuccess()
+            } catch {
+                logger.error("ChatView.archiveReports error: \(error.localizedDescription)")
+            }
+        }
+    }
+}
+
 private func buildTheme() -> AppTheme {
     if let cId = ChatModel.shared.chatId, let chat = ChatModel.shared.getChat(cId) {
         let perChatTheme = if case let .direct(contact) = chat.chatInfo {
             contact.uiThemes?.preferredMode(!AppTheme.shared.colors.isLight)
-        } else if case let .group(groupInfo) = chat.chatInfo {
+        } else if case let .group(groupInfo, _) = chat.chatInfo {
             groupInfo.uiThemes?.preferredMode(!AppTheme.shared.colors.isLight)
         } else {
             nil as ThemeModeOverride?
@@ -1961,7 +2553,7 @@ struct ReactionContextMenu: View {
     @ViewBuilder private func groupMemberReactionList() -> some View {
         if memberReactions.isEmpty {
             ForEach(Array(repeating: 0, count: reactionCount.totalReacted), id: \.self) { _ in
-                Text(verbatim: " ")
+                textSpace
             }
         } else {
             ForEach(memberReactions, id: \.groupMember.groupMemberId) { mr in
@@ -2044,21 +2636,19 @@ 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")
+        if let nextMode = chat.chatInfo.nextNtfMode {
+            Button {
+                toggleNotifications(chat, enableNtfs: nextMode)
+            } label: {
+                Label(nextMode.text(mentions: chat.chatInfo.hasMentions), systemImage: nextMode.icon)
             }
         }
     }
 }
 
-func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
+func toggleNotifications(_ chat: Chat, enableNtfs: MsgFilter) {
     var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs ? .all : .none
+    chatSettings.enableNtfs = enableNtfs
     updateChatSettings(chat, chatSettings: chatSettings)
 }
 
@@ -2080,7 +2670,7 @@ func updateChatSettings(_ chat: Chat, chatSettings: ChatSettings) {
                 case var .direct(contact):
                     contact.chatSettings = chatSettings
                     ChatModel.shared.updateContact(contact)
-                case var .group(groupInfo):
+                case var .group(groupInfo, _):
                     groupInfo.chatSettings = chatSettings
                     ChatModel.shared.updateGroup(groupInfo)
                 default: ()
@@ -2097,7 +2687,8 @@ struct ChatView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
         chatModel.chatId = "@1"
-        ItemsModel.shared.reversedChatItems = [
+        let im = ItemsModel.shared
+        im.reversedChatItems = [
             ChatItem.getSample(1, .directSnd, .now, "hello"),
             ChatItem.getSample(2, .directRcv, .now, "hi"),
             ChatItem.getSample(3, .directRcv, .now, "hi there"),
@@ -2109,7 +2700,13 @@ struct ChatView_Previews: PreviewProvider {
             ChatItem.getSample(9, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
         ]
         @State var showChatInfo = false
-        return ChatView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
-            .environmentObject(chatModel)
+        return ChatView(
+            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
+            im: im,
+            mergedItems: BoxedValue(MergedItems.create(im, [])),
+            floatingButtonModel: FloatingButtonModel(im: im),
+            scrollToItemId: Binding.constant(nil)
+        )
+        .environmentObject(chatModel)
     }
 }
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeLinkView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeLinkView.swift
index 6c44aeea83..e629a984df 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeLinkView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeLinkView.swift
@@ -18,7 +18,7 @@ struct ComposeLinkView: View {
 
     var body: some View {
         HStack(alignment: .center, spacing: 8) {
-            if let linkPreview = linkPreview {
+            if let linkPreview {
                 linkPreviewView(linkPreview)
             } else {
                 ProgressView()
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
index a68a4987a1..68a2f6d7b1 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
@@ -11,6 +11,8 @@ import SimpleXChat
 import SwiftyGif
 import PhotosUI
 
+let MAX_NUMBER_OF_MENTIONS = 3
+
 enum ComposePreview {
     case noPreview
     case linkPreview(linkPreview: LinkPreview?)
@@ -19,7 +21,7 @@ enum ComposePreview {
     case filePreview(fileName: String, file: URL)
 }
 
-enum ComposeContextItem {
+enum ComposeContextItem: Equatable {
     case noContextItem
     case quotedItem(chatItem: ChatItem)
     case editingItem(chatItem: ChatItem)
@@ -39,31 +41,41 @@ struct LiveMessage {
     var sentMsg: String?
 }
 
+typealias MentionedMembers = [String: CIMention]
+
 struct ComposeState {
     var message: String
+    var parsedMessage: [FormattedText]
     var liveMessage: LiveMessage? = nil
     var preview: ComposePreview
     var contextItem: ComposeContextItem
     var voiceMessageRecordingState: VoiceMessageRecordingState
     var inProgress = false
     var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
+    var mentions: MentionedMembers = [:]
 
     init(
         message: String = "",
+        parsedMessage: [FormattedText] = [],
         liveMessage: LiveMessage? = nil,
         preview: ComposePreview = .noPreview,
         contextItem: ComposeContextItem = .noContextItem,
-        voiceMessageRecordingState: VoiceMessageRecordingState = .noRecording
+        voiceMessageRecordingState: VoiceMessageRecordingState = .noRecording,
+        mentions: MentionedMembers = [:]
     ) {
         self.message = message
+        self.parsedMessage = parsedMessage
         self.liveMessage = liveMessage
         self.preview = preview
         self.contextItem = contextItem
         self.voiceMessageRecordingState = voiceMessageRecordingState
+        self.mentions = mentions
     }
 
     init(editingItem: ChatItem) {
-        self.message = editingItem.content.text
+        let text = editingItem.content.text
+        self.message = text
+        self.parsedMessage = editingItem.formattedText ?? FormattedText.plain(text)
         self.preview = chatItemPreview(chatItem: editingItem)
         self.contextItem = .editingItem(chatItem: editingItem)
         if let emc = editingItem.content.msgContent,
@@ -72,10 +84,12 @@ struct ComposeState {
         } else {
             self.voiceMessageRecordingState = .noRecording
         }
+        self.mentions = editingItem.mentions ?? [:]
     }
 
     init(forwardingItems: [ChatItem], fromChatInfo: ChatInfo) {
         self.message = ""
+        self.parsedMessage = []
         self.preview = .noPreview
         self.contextItem = .forwardingItems(chatItems: forwardingItems, fromChatInfo: fromChatInfo)
         self.voiceMessageRecordingState = .noRecording
@@ -83,20 +97,38 @@ struct ComposeState {
 
     func copy(
         message: String? = nil,
+        parsedMessage: [FormattedText]? = nil,
         liveMessage: LiveMessage? = nil,
         preview: ComposePreview? = nil,
         contextItem: ComposeContextItem? = nil,
-        voiceMessageRecordingState: VoiceMessageRecordingState? = nil
+        voiceMessageRecordingState: VoiceMessageRecordingState? = nil,
+        mentions: MentionedMembers? = nil
     ) -> ComposeState {
         ComposeState(
             message: message ?? self.message,
+            parsedMessage: parsedMessage ?? self.parsedMessage,
             liveMessage: liveMessage ?? self.liveMessage,
             preview: preview ?? self.preview,
             contextItem: contextItem ?? self.contextItem,
-            voiceMessageRecordingState: voiceMessageRecordingState ?? self.voiceMessageRecordingState
+            voiceMessageRecordingState: voiceMessageRecordingState ?? self.voiceMessageRecordingState,
+            mentions: mentions ?? self.mentions
         )
     }
-
+    
+    func mentionMemberName(_ name: String) -> String {
+        var n = 0
+        var tryName = name
+        while mentions[tryName] != nil {
+            n += 1
+            tryName = "\(name)_\(n)"
+        }
+        return tryName
+    }
+    
+    var memberMentions: [String: Int64] {
+        self.mentions.compactMapValues { $0.memberRef?.groupMemberId }
+    }
+    
     var editing: Bool {
         switch contextItem {
         case .editingItem: return true
@@ -291,8 +323,12 @@ struct ComposeView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @Binding var composeState: ComposeState
     @Binding var keyboardVisible: Bool
+    @Binding var keyboardHiddenDate: Date
+    @Binding var selectedRange: NSRange
+    var disabledText: LocalizedStringKey? = nil
 
     @State var linkUrl: URL? = nil
     @State var hasSimplexLink: Bool = false
@@ -321,6 +357,20 @@ struct ComposeView: View {
     var body: some View {
         VStack(spacing: 0) {
             Divider()
+            if let groupInfo = chat.chatInfo.groupInfo,
+               case let .groupChatScopeContext(groupScopeInfo) = im.secondaryIMFilter,
+               case let .memberSupport(member) = groupScopeInfo,
+               let member = member,
+               member.memberPending,
+               composeState.contextItem == .noContextItem,
+               composeState.noPreview {
+                ContextPendingMemberActionsView(
+                    groupInfo: groupInfo,
+                    member: member
+                )
+                Divider()
+            }
+
             if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                 ContextInvitingContactMemberView()
                 Divider()
@@ -331,8 +381,8 @@ struct ComposeView: View {
                 Divider()
             }
             // preference checks should match checks in forwarding list
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
+            let simplexLinkProhibited = im.secondaryIMFilter == nil && hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
+            let fileProhibited = im.secondaryIMFilter == nil && composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
             let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
             if simplexLinkProhibited {
                 msgNotAllowedView("SimpleX links not allowed", icon: "link")
@@ -357,12 +407,13 @@ struct ComposeView: View {
                     Image(systemName: "paperclip")
                         .resizable()
                 }
-                .disabled(composeState.attachmentDisabled || !chat.userCanSend || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
+                .disabled(composeState.attachmentDisabled || !chat.chatInfo.sendMsgEnabled || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
                 .frame(width: 25, height: 25)
-                .padding(.bottom, 12)
+                .padding(.bottom, 16)
                 .padding(.leading, 12)
                 .tint(theme.colors.primary)
-                if case let .group(g) = chat.chatInfo,
+                if im.secondaryIMFilter == nil,
+                   case let .group(g, _) = chat.chatInfo,
                    !g.fullGroupPreferences.files.on(for: g.membership) {
                     b.disabled(true).onTapGesture {
                         AlertManager.shared.showAlertMsg(
@@ -376,6 +427,7 @@ struct ComposeView: View {
                 ZStack(alignment: .leading) {
                     SendMessageView(
                         composeState: $composeState,
+                        selectedRange: $selectedRange,
                         sendMessage: { ttl in
                             sendMessage(ttl: ttl)
                             resetLinkPreview()
@@ -400,24 +452,19 @@ struct ComposeView: View {
                         timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                         onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
                         keyboardVisible: $keyboardVisible,
+                        keyboardHiddenDate: $keyboardHiddenDate,
                         sendButtonColor: chat.chatInfo.incognito
-                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : theme.colors.primary
+                        ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
+                        : theme.colors.primary
                     )
                     .padding(.trailing, 12)
-                    .disabled(!chat.userCanSend)
+                    .disabled(!chat.chatInfo.sendMsgEnabled)
 
-                    if chat.userIsObserver {
-                        Text("you are observer")
+                    if let disabledText {
+                        Text(disabledText)
                             .italic()
                             .foregroundColor(theme.colors.secondary)
                             .padding(.horizontal, 12)
-                            .onTapGesture {
-                                AlertManager.shared.showAlertMsg(
-                                    title: "You can't send messages!",
-                                    message: "Please contact group admin."
-                                )
-                            }
                     }
                 }
             }
@@ -428,21 +475,23 @@ struct ComposeView: View {
                 .ignoresSafeArea(.all, edges: .bottom)
         }
         .onChange(of: composeState.message) { msg in
+            let parsedMsg = parseSimpleXMarkdown(msg)
+            composeState = composeState.copy(parsedMessage: parsedMsg ?? FormattedText.plain(msg))
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {
-                    showLinkPreview(msg)
+                    showLinkPreview(parsedMsg)
                 } else {
                     resetLinkPreview()
                     hasSimplexLink = false
                 }
             } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
+                (_, hasSimplexLink) = getSimplexLink(parsedMsg)
             } else {
                 hasSimplexLink = false
             }
         }
-        .onChange(of: chat.userCanSend) { canSend in
-            if !canSend {
+        .onChange(of: chat.chatInfo.sendMsgEnabled) { sendEnabled in
+            if !sendEnabled {
                 cancelCurrentVoiceRecording()
                 clearCurrentDraft()
                 clearState()
@@ -793,6 +842,7 @@ struct ComposeView: View {
         var sent: ChatItem?
         let msgText = text ?? composeState.message
         let liveMessage = composeState.liveMessage
+        let mentions = composeState.memberMentions
         if !live {
             if liveMessage != nil { composeState = composeState.copy(liveMessage: nil) }
             await sending()
@@ -803,7 +853,7 @@ struct ComposeView: View {
             // Composed text is send as a reply to the last forwarded item
             sent = await forwardItems(chatItems, fromChatInfo, ttl).last
             if !composeState.message.isEmpty {
-                _ = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
+                _ = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl, mentions: mentions)
             }
         } else if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
@@ -819,10 +869,11 @@ struct ComposeView: View {
 
             switch (composeState.preview) {
             case .noPreview:
-                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
+                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl, mentions: mentions)
             case .linkPreview:
-                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
+                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl, mentions: mentions)
             case let .mediaPreviews(media):
+                // TODO: CHECK THIS
                 let last = media.count - 1
                 var msgs: [ComposedMessage] = []
                 if last >= 0 {
@@ -847,10 +898,10 @@ struct ComposeView: View {
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
                 let file = voiceCryptoFile(recordingFileName)
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl, mentions: mentions)
             case let .filePreview(_, file):
                 if let savedFile = saveFileFromURL(file) {
-                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
+                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl, mentions: mentions)
                 }
             }
         }
@@ -904,8 +955,9 @@ struct ComposeView: View {
                         let chatItem = try await apiUpdateChatItem(
                             type: chat.chatInfo.chatType,
                             id: chat.chatInfo.apiId,
+                            scope: chat.chatInfo.groupChatScope(),
                             itemId: ei.id,
-                            msg: mc,
+                            updatedMessage: UpdatedMessage(msgContent: mc, mentions: composeState.memberMentions),
                             live: live
                         )
                         await MainActor.run {
@@ -966,9 +1018,9 @@ struct ComposeView: View {
                 reportReason: reportReason,
                 reportText: msgText
             ) {
-                await MainActor.run {
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
+                if showReportsInSupportChatAlertDefault.get() {
+                    await MainActor.run {
+                        showReportsInSupportChatAlert()
                     }
                 }
                 return chatItems.first
@@ -976,10 +1028,30 @@ struct ComposeView: View {
             
             return nil
         }
-                
-        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+
+        func showReportsInSupportChatAlert() {
+            showAlert(
+                NSLocalizedString("Report sent to moderators", comment: "alert title"),
+                message: NSLocalizedString("You can view your reports in Chat with admins.", comment: "alert message"),
+                actions: {[
+                    UIAlertAction(
+                        title: NSLocalizedString("Don't show again", comment: "alert action"),
+                        style: .default,
+                        handler: { _ in
+                            showReportsInSupportChatAlertDefault.set(false)
+                        }
+                    ),
+                    UIAlertAction(
+                        title: NSLocalizedString("Ok", comment: "alert action"),
+                        style: .default
+                    )
+                ]}
+            )
+        }
+
+        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?, mentions: [String: Int64]) async -> ChatItem? {
             await send(
-                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)],
+                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc, mentions: mentions)],
                 live: live,
                 ttl: ttl
             ).first
@@ -991,6 +1063,7 @@ struct ComposeView: View {
                 : await apiSendMessages(
                     type: chat.chatInfo.chatType,
                     id: chat.chatInfo.apiId,
+                    scope: chat.chatInfo.groupChatScope(),
                     live: live,
                     ttl: ttl,
                     composedMessages: msgs
@@ -1015,8 +1088,10 @@ struct ComposeView: View {
             if let chatItems = await apiForwardChatItems(
                 toChatType: chat.chatInfo.chatType,
                 toChatId: chat.chatInfo.apiId,
+                toScope: chat.chatInfo.groupChatScope(),
                 fromChatType: fromChatInfo.chatType,
                 fromChatId: fromChatInfo.apiId,
+                fromScope: fromChatInfo.groupChatScope(),
                 itemIds: forwardedItems.map { $0.id },
                 ttl: ttl
             ) {
@@ -1043,7 +1118,8 @@ struct ComposeView: View {
         func checkLinkPreview() -> MsgContent {
             switch (composeState.preview) {
             case let .linkPreview(linkPreview: linkPreview):
-                if let url = parseMessage(msgText).url,
+                if let parsedMsg = parseSimpleXMarkdown(msgText),
+                   let url = getSimplexLink(parsedMsg).url,
                    let linkPreview = linkPreview,
                    url == linkPreview.uri {
                     return .link(text: msgText, preview: linkPreview)
@@ -1162,9 +1238,9 @@ struct ComposeView: View {
         }
     }
 
-    private func showLinkPreview(_ s: String) {
+    private func showLinkPreview(_ parsedMsg: [FormattedText]?) {
         prevLinkUrl = linkUrl
-        (linkUrl, hasSimplexLink) = parseMessage(s)
+        (linkUrl, hasSimplexLink) = getSimplexLink(parsedMsg)
         if let url = linkUrl {
             if url != composeState.linkPreview?.uri && url != pendingLinkUrl {
                 pendingLinkUrl = url
@@ -1181,8 +1257,8 @@ struct ComposeView: View {
         }
     }
 
-    private func parseMessage(_ msg: String) -> (url: URL?, hasSimplexLink: Bool) {
-        guard let parsedMsg = parseSimpleXMarkdown(msg) else { return (nil, false) }
+    private func getSimplexLink(_ parsedMsg: [FormattedText]?) -> (url: URL?, hasSimplexLink: Bool) {
+        guard let parsedMsg else { return (nil, false) }
         let url: URL? = if let uri = parsedMsg.first(where: { ft in
             ft.format == .uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text)
         }) {
@@ -1213,11 +1289,14 @@ struct ComposeView: View {
         if pendingLinkUrl == url {
             composeState = composeState.copy(preview: .linkPreview(linkPreview: nil))
             getLinkPreview(url: url) { linkPreview in
-                if let linkPreview = linkPreview,
-                   pendingLinkUrl == url {
+                if let linkPreview, pendingLinkUrl == url {
                     composeState = composeState.copy(preview: .linkPreview(linkPreview: linkPreview))
-                    pendingLinkUrl = nil
+                } else {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        composeState = composeState.copy(preview: .noPreview)
+                    }
                 }
+                pendingLinkUrl = nil
             }
         }
     }
@@ -1233,19 +1312,27 @@ struct ComposeView: View {
 struct ComposeView_Previews: PreviewProvider {
     static var previews: some View {
         let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
+        let im = ItemsModel.shared
         @State var composeState = ComposeState(message: "hello")
+        @State var selectedRange = NSRange()
 
         return Group {
             ComposeView(
                 chat: chat,
+                im: im,
                 composeState: $composeState,
-                keyboardVisible: Binding.constant(true)
+                keyboardVisible: Binding.constant(true),
+                keyboardHiddenDate: Binding.constant(Date.now),
+                selectedRange: $selectedRange
             )
             .environmentObject(ChatModel())
             ComposeView(
                 chat: chat,
+                im: im,
                 composeState: $composeState,
-                keyboardVisible: Binding.constant(true)
+                keyboardVisible: Binding.constant(true),
+                keyboardHiddenDate: Binding.constant(Date.now),
+                selectedRange: $selectedRange
             )
             .environmentObject(ChatModel())
         }
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift
index 3cb747ec68..845442c75f 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift
@@ -70,8 +70,10 @@ struct ContextItemView: View {
             .lineLimit(lines)
     }
 
-    private func contextMsgPreview(_ contextItem: ChatItem) -> Text {
-        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
+    private func contextMsgPreview(_ contextItem: ChatItem) -> some View {
+        let r = messageText(contextItem.text, contextItem.formattedText, sender: nil, preview: true, mentions: contextItem.mentions, userMemberId: nil, showSecrets: nil, backgroundColor: UIColor(background))
+        let t = attachment() + Text(AttributedString(r.string))
+        return t.if(r.hasSecrets, transform: hiddenSecretsView)
 
         func attachment() -> Text {
             let isFileLoaded = if let fileSource = getLoadedFileSource(contextItem.file) {
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift
new file mode 100644
index 0000000000..96915b342f
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift
@@ -0,0 +1,108 @@
+//
+//  ContextPendingMemberActionsView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 02.05.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct ContextPendingMemberActionsView: View {
+    @EnvironmentObject var theme: AppTheme
+    @Environment(\.dismiss) var dismiss
+    var groupInfo: GroupInfo
+    var member: GroupMember
+
+    var body: some View {
+        HStack(spacing: 0) {
+            ZStack {
+                Text("Reject")
+                    .foregroundColor(.red)
+            }
+            .frame(maxWidth: .infinity)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                showRejectMemberAlert(groupInfo, member, dismiss: dismiss)
+            }
+
+            ZStack {
+                Text("Accept")
+                    .foregroundColor(theme.colors.primary)
+            }
+            .frame(maxWidth: .infinity)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                showAcceptMemberAlert(groupInfo, member, dismiss: dismiss)
+            }
+        }
+        .frame(minHeight: 54)
+        .frame(maxWidth: .infinity)
+        .background(.thinMaterial)
+    }
+}
+
+func showRejectMemberAlert(_ groupInfo: GroupInfo, _ member: GroupMember, dismiss: DismissAction? = nil) {
+    showAlert(
+        title: NSLocalizedString("Reject member?", comment: "alert title"),
+        buttonTitle: "Reject",
+        buttonAction: { removeMember(groupInfo, member, dismiss: dismiss) },
+        cancelButton: true
+    )
+}
+
+func showAcceptMemberAlert(_ groupInfo: GroupInfo, _ member: GroupMember, dismiss: DismissAction? = nil) {
+    showAlert(
+        NSLocalizedString("Accept member", comment: "alert title"),
+        message: NSLocalizedString("Member will join the group, accept member?", comment: "alert message"),
+        actions: {[
+            UIAlertAction(
+                title: NSLocalizedString("Accept as member", comment: "alert action"),
+                style: .default,
+                handler: { _ in
+                    acceptMember(groupInfo, member, .member, dismiss: dismiss)
+                }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Accept as observer", comment: "alert action"),
+                style: .default,
+                handler: { _ in
+                    acceptMember(groupInfo, member, .observer, dismiss: dismiss)
+                }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Cancel", comment: "alert action"),
+                style: .default
+            )
+        ]}
+    )
+}
+
+func acceptMember(_ groupInfo: GroupInfo, _ member: GroupMember, _ role: GroupMemberRole, dismiss: DismissAction? = nil) {
+    Task {
+        do {
+            let (gInfo, acceptedMember) = try await apiAcceptMember(groupInfo.groupId, member.groupMemberId, role)
+            await MainActor.run {
+                _ = ChatModel.shared.upsertGroupMember(gInfo, acceptedMember)
+                ChatModel.shared.updateGroup(gInfo)
+                dismiss?()
+            }
+        } catch let error {
+            logger.error("apiAcceptMember error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error accepting member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    ContextPendingMemberActionsView(
+        groupInfo: GroupInfo.sampleData,
+        member: GroupMember.sampleData
+    )
+}
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/NativeTextEditor.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/NativeTextEditor.swift
index 2fc122f249..d809fd7b76 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/NativeTextEditor.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/NativeTextEditor.swift
@@ -16,19 +16,15 @@ struct NativeTextEditor: UIViewRepresentable {
     @Binding var disableEditing: Bool
     @Binding var height: CGFloat
     @Binding var focused: Bool
+    @Binding var lastUnfocusedDate: Date
     @Binding var placeholder: String?
+    @Binding var selectedRange: NSRange
     let onImagesAdded: ([UploadContent]) -> Void
     
-    private let minHeight: CGFloat = 37
+    static let minHeight: CGFloat = 39
 
-    private let defaultHeight: CGFloat = {
-        let field = CustomUITextField(height: Binding.constant(0))
-        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
-        return min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, 37), 360).rounded(.down)
-    }()
-    
-    func makeUIView(context: Context) -> UITextView {
-        let field = CustomUITextField(height: _height)
+    func makeUIView(context: Context) -> CustomUITextField {
+        let field = CustomUITextField(parent: self, height: _height)
         field.backgroundColor = .clear
         field.text = text
         field.textAlignment = alignment(text)
@@ -37,10 +33,9 @@ struct NativeTextEditor: UIViewRepresentable {
             if !disableEditing {
                 text = newText
                 field.textAlignment = alignment(text)
-                updateFont(field)
+                field.updateFont()
                 // Speed up the process of updating layout, reduce jumping content on screen
-                updateHeight(field)
-                self.height = field.frame.size.height
+                field.updateHeight()
             } else {
                 field.text = text
             }
@@ -48,48 +43,32 @@ struct NativeTextEditor: UIViewRepresentable {
                 onImagesAdded(images)
             }
         }
-        field.setOnFocusChangedListener { focused = $0 }
+        field.setOnFocusChangedListener {
+            focused = $0
+            if !focused {
+                lastUnfocusedDate = .now
+            }
+        }
         field.delegate = field
         field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
         field.setPlaceholderView()
-        updateFont(field)
-        updateHeight(field)
+        field.updateFont()
+        field.updateHeight(updateBindingNow: false)
         return field
     }
     
-    func updateUIView(_ field: UITextView, context: Context) {
+    func updateUIView(_ field: CustomUITextField, context: Context) {
         if field.markedTextRange == nil && field.text != text {
             field.text = text
             field.textAlignment = alignment(text)
-            updateFont(field)
-            updateHeight(field)
+            field.updateFont()
+            field.updateHeight(updateBindingNow: false)
         }
-        
-        let castedField = field as! CustomUITextField
-        if castedField.placeholder != placeholder {
-            castedField.placeholder = placeholder
+        if field.placeholder != placeholder {
+            field.placeholder = placeholder
         }
-    }
-
-    private func updateHeight(_ field: UITextView) {
-        let maxHeight = min(360, field.font!.lineHeight * 12)
-        // When having emoji in text view and then removing it, sizeThatFits shows previous size (too big for empty text view), so using work around with default size
-        let newHeight = field.text == ""
-        ? defaultHeight
-        : min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, minHeight), maxHeight).rounded(.down)
-
-        if field.frame.size.height != newHeight {
-            field.frame.size = CGSizeMake(field.frame.size.width, newHeight)
-            (field as! CustomUITextField).invalidateIntrinsicContentHeight(newHeight)
-        }
-    }
-
-    private func updateFont(_ field: UITextView) {
-        let newFont = isShortEmoji(field.text)
-        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
-        : UIFont.preferredFont(forTextStyle: .body)
-        if field.font != newFont {
-            field.font = newFont
+        if field.selectedRange != selectedRange {
+            field.selectedRange = selectedRange
         }
     }
 }
@@ -98,15 +77,17 @@ private func alignment(_ text: String) -> NSTextAlignment {
     isRightToLeft(text) ? .right : .left
 }
 
-private class CustomUITextField: UITextView, UITextViewDelegate {
+class CustomUITextField: UITextView, UITextViewDelegate {
+    var parent: NativeTextEditor?
     var height: Binding<CGFloat>
     var newHeight: CGFloat = 0
     var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
     var onFocusChanged: (Bool) -> Void = { focused in }
-    
+
     private let placeholderLabel: UILabel = UILabel()
 
-    init(height: Binding<CGFloat>) {
+    init(parent: NativeTextEditor?, height: Binding<CGFloat>) {
+        self.parent = parent
         self.height = height
         super.init(frame: .zero, textContainer: nil)
     }
@@ -128,11 +109,44 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
         invalidateIntrinsicContentSize()
     }
 
-    override var intrinsicContentSize: CGSize {
-        if height.wrappedValue != newHeight {
-            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
+    func updateHeight(updateBindingNow: Bool = true) {
+        let maxHeight = min(360, font!.lineHeight * 12)
+        let newHeight = min(max(sizeThatFits(CGSizeMake(frame.size.width, CGFloat.greatestFiniteMagnitude)).height, NativeTextEditor.minHeight), maxHeight).rounded(.down)
+
+        if self.newHeight != newHeight {
+            frame.size = CGSizeMake(frame.size.width, newHeight)
+            invalidateIntrinsicContentHeight(newHeight)
+            if updateBindingNow {
+                self.height.wrappedValue = newHeight
+            } else {
+                DispatchQueue.main.async {
+                    self.height.wrappedValue = newHeight
+                }
+            }
         }
-        return CGSizeMake(0, newHeight)
+    }
+
+    func updateFont() {
+        let newFont = isShortEmoji(text)
+        ? (text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
+        : UIFont.preferredFont(forTextStyle: .body)
+        if font != newFont {
+            font = newFont
+            // force apply new font because it has problem with doing it when the field had two emojis
+            if text.count == 0 {
+                text = " "
+                text = ""
+            }
+        }
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        updateHeight()
+    }
+
+    override var intrinsicContentSize: CGSize {
+        CGSizeMake(0, newHeight)
     }
 
     func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
@@ -232,10 +246,22 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
     
     func textViewDidBeginEditing(_ textView: UITextView) {
         onFocusChanged(true)
+        updateSelectedRange(textView)
     }
     
     func textViewDidEndEditing(_ textView: UITextView) {
         onFocusChanged(false)
+        updateSelectedRange(textView)
+    }
+    
+    func textViewDidChangeSelection(_ textView: UITextView) {
+        updateSelectedRange(textView)
+    }
+    
+    private func updateSelectedRange(_ textView: UITextView) {
+        if parent?.selectedRange != textView.selectedRange {
+            parent?.selectedRange = textView.selectedRange
+        }
     }
 }
 
@@ -246,7 +272,9 @@ struct NativeTextEditor_Previews: PreviewProvider{
             disableEditing: Binding.constant(false),
             height: Binding.constant(100),
             focused: Binding.constant(false),
+            lastUnfocusedDate: Binding.constant(.now),
             placeholder: Binding.constant("Placeholder"),
+            selectedRange: Binding.constant(NSRange(location: 0, length: 0)),
             onImagesAdded: { _ in }
         )
         .fixedSize(horizontal: false, vertical: true)
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift
index fb69dfdd17..e7b02c9aea 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift
@@ -13,7 +13,9 @@ private let liveMsgInterval: UInt64 = 3000_000000
 
 struct SendMessageView: View {
     @Binding var composeState: ComposeState
+    @Binding var selectedRange: NSRange
     @EnvironmentObject var theme: AppTheme
+    @Environment(\.isEnabled) var isEnabled
     var sendMessage: (Int?) -> Void
     var sendLiveMessage: (() async -> Void)? = nil
     var updateLiveMessage: (() async -> Void)? = nil
@@ -31,8 +33,9 @@ struct SendMessageView: View {
     @State private var holdingVMR = false
     @Namespace var namespace
     @Binding var keyboardVisible: Bool
+    @Binding var keyboardHiddenDate: Date
     var sendButtonColor = Color.accentColor
-    @State private var teHeight: CGFloat = 42
+    @State private var teHeight: CGFloat = NativeTextEditor.minHeight
     @State private var teFont: Font = .body
     @State private var sendButtonSize: CGFloat = 29
     @State private var sendButtonOpacity: CGFloat = 1
@@ -43,52 +46,54 @@ struct SendMessageView: View {
     @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
 
     var body: some View {
-        ZStack {
-            let composeShape = RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
-            HStack(alignment: .bottom) {
-                ZStack(alignment: .leading) {
-                    if case .voicePreview = composeState.preview {
-                        Text("Voice message…")
-                            .font(teFont.italic())
-                            .multilineTextAlignment(.leading)
-                            .foregroundColor(theme.colors.secondary)
-                            .padding(.horizontal, 10)
-                            .padding(.vertical, 8)
-                            .frame(maxWidth: .infinity)
-                    } else {
-                        NativeTextEditor(
-                            text: $composeState.message,
-                            disableEditing: $composeState.inProgress,
-                            height: $teHeight,
-                            focused: $keyboardVisible,
-                            placeholder: Binding(get: { composeState.placeholder }, set: { _ in }),
-                            onImagesAdded: onMediaAdded
-                        )
-                        .allowsTightening(false)
-                        .fixedSize(horizontal: false, vertical: true)
-                    }
-                }
-                if progressByTimeout {
-                    ProgressView()
-                        .scaleEffect(1.4)
-                        .frame(width: 31, height: 31, alignment: .center)
-                        .padding([.bottom, .trailing], 3)
-                } else {
-                    VStack(alignment: .trailing) {
-                        if teHeight > 100 && !composeState.inProgress {
-                            deleteTextButton()
-                            Spacer()
-                        }
-                        composeActionButtons()
-                    }
-                    .frame(height: teHeight, alignment: .bottom)
-                }
+        let composeShape = RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
+        ZStack(alignment: .leading) {
+            if case .voicePreview = composeState.preview {
+                Text("Voice message…")
+                    .font(teFont.italic())
+                    .multilineTextAlignment(.leading)
+                    .foregroundColor(theme.colors.secondary)
+                    .padding(.horizontal, 10)
+                    .padding(.vertical, 8)
+                    .padding(.trailing, 32)
+                    .frame(maxWidth: .infinity)
+            } else {
+                NativeTextEditor(
+                    text: $composeState.message,
+                    disableEditing: $composeState.inProgress,
+                    height: $teHeight,
+                    focused: $keyboardVisible,
+                    lastUnfocusedDate: $keyboardHiddenDate,
+                    placeholder: Binding(get: { composeState.placeholder }, set: { _ in }),
+                    selectedRange: $selectedRange,
+                    onImagesAdded: onMediaAdded
+                )
+                .padding(.trailing, 32)
+                .allowsTightening(false)
+                .fixedSize(horizontal: false, vertical: true)
             }
-            .padding(.vertical, 1)
-            .background(theme.colors.background)
-            .clipShape(composeShape)
-            .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.5).opacity(0.7))
         }
+        .overlay(alignment: .topTrailing, content: {
+            if !progressByTimeout && teHeight > 100 && !composeState.inProgress {
+                deleteTextButton()
+            }
+        })
+        .overlay(alignment: .bottomTrailing, content: {
+            if progressByTimeout {
+                ProgressView()
+                    .scaleEffect(1.4)
+                    .frame(width: 31, height: 31, alignment: .center)
+                    .padding([.bottom, .trailing], 4)
+            } else {
+                composeActionButtons()
+                // required for intercepting clicks
+                    .background(.white.opacity(0.000001))
+            }
+        })
+        .padding(.vertical, 1)
+        .background(theme.colors.background)
+        .clipShape(composeShape)
+        .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.5).opacity(0.7))
         .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
             if inProgress {
@@ -167,7 +172,7 @@ struct SendMessageView: View {
             !composeState.sendEnabled ||
             composeState.inProgress
         )
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -190,7 +195,7 @@ struct SendMessageView: View {
             composeState.endLiveDisabled ||
             disableSendButton
         )
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .contextMenu{
             sendButtonContextMenuItems()
         }
@@ -251,6 +256,7 @@ struct SendMessageView: View {
     }
 
     private struct RecordVoiceMessageButton: View {
+        @Environment(\.isEnabled) var isEnabled
         @EnvironmentObject var theme: AppTheme
         var startVoiceMessageRecording: (() -> Void)?
         var finishVoiceMessageRecording: (() -> Void)?
@@ -259,15 +265,14 @@ struct SendMessageView: View {
         @State private var pressed: TimeInterval? = nil
 
         var body: some View {
-            Button(action: {}) {
-                Image(systemName: "mic.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 20, height: 20)
-                    .foregroundColor(theme.colors.primary)
-            }
+            Image(systemName: isEnabled ? "mic.fill" : "mic")
+            .resizable()
+            .scaledToFit()
+            .frame(width: 20, height: 20)
+            .foregroundColor(isEnabled ? theme.colors.primary : theme.colors.secondary)
+            .opacity(holdingVMR ? 0.7 : 1)
             .disabled(disabled)
-            .frame(width: 29, height: 29)
+            .frame(width: 31, height: 31)
             .padding([.bottom, .trailing], 4)
             ._onButtonGesture { down in
                 if down {
@@ -275,9 +280,7 @@ struct SendMessageView: View {
                     pressed = ProcessInfo.processInfo.systemUptime
                     startVoiceMessageRecording?()
                 } else {
-                    let now = ProcessInfo.processInfo.systemUptime
-                    if let pressed = pressed,
-                       now - pressed >= 1 {
+                    if let pressed, ProcessInfo.processInfo.systemUptime - pressed >= 1 {
                         finishVoiceMessageRecording?()
                     }
                     holdingVMR = false
@@ -323,7 +326,7 @@ struct SendMessageView: View {
                 .foregroundColor(theme.colors.secondary)
         }
         .disabled(composeState.inProgress)
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -351,7 +354,7 @@ struct SendMessageView: View {
             Image(systemName: "bolt.fill")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(isEnabled ? theme.colors.primary : theme.colors.secondary)
                 .frame(width: 20, height: 20)
         }
         .frame(width: 29, height: 29)
@@ -408,7 +411,7 @@ struct SendMessageView: View {
                 .foregroundColor(theme.colors.primary)
         }
         .disabled(composeState.inProgress)
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -424,8 +427,10 @@ struct SendMessageView: View {
 struct SendMessageView_Previews: PreviewProvider {
     static var previews: some View {
         @State var composeStateNew = ComposeState()
+        @State var selectedRange = NSRange()
         let ci = ChatItem.getSample(1, .directSnd, .now, "hello")
         @State var composeStateEditing = ComposeState(editingItem: ci)
+        @State var selectedRangeEditing = NSRange()
         @State var sendEnabled: Bool = true
 
         return Group {
@@ -434,9 +439,11 @@ struct SendMessageView_Previews: PreviewProvider {
                 Spacer(minLength: 0)
                 SendMessageView(
                     composeState: $composeStateNew,
+                    selectedRange: $selectedRange,
                     sendMessage: { _ in },
                     onMediaAdded: { _ in },
-                    keyboardVisible: Binding.constant(true)
+                    keyboardVisible: Binding.constant(true),
+                    keyboardHiddenDate: Binding.constant(Date.now)
                 )
             }
             VStack {
@@ -444,9 +451,11 @@ struct SendMessageView_Previews: PreviewProvider {
                 Spacer(minLength: 0)
                 SendMessageView(
                     composeState: $composeStateEditing,
+                    selectedRange: $selectedRangeEditing,
                     sendMessage: { _ in },
                     onMediaAdded: { _ in },
-                    keyboardVisible: Binding.constant(true)
+                    keyboardVisible: Binding.constant(true),
+                    keyboardHiddenDate: Binding.constant(Date.now)
                 )
             }
         }
diff --git a/apps/ios/Shared/Views/Chat/EndlessScrollView.swift b/apps/ios/Shared/Views/Chat/EndlessScrollView.swift
new file mode 100644
index 0000000000..cc61754b26
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/EndlessScrollView.swift
@@ -0,0 +1,715 @@
+//
+//  EndlessScrollView.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 25.01.2025.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct ScrollRepresentable<Content: View, ScrollItem>: UIViewControllerRepresentable where ScrollItem : Identifiable, ScrollItem: Hashable {
+
+    let scrollView: EndlessScrollView<ScrollItem>
+    let content: (Int, ScrollItem) -> Content
+
+    func makeUIViewController(context: Context) -> ScrollController {
+        ScrollController.init(scrollView: scrollView, content: content)
+    }
+
+    func updateUIViewController(_ controller: ScrollController, context: Context) {}
+
+    class ScrollController: UIViewController {
+        let scrollView: EndlessScrollView<ScrollItem>
+        fileprivate var items: [ScrollItem] = []
+        fileprivate var content: ((Int, ScrollItem) -> Content)!
+
+        fileprivate init(scrollView: EndlessScrollView<ScrollItem>, content: @escaping (Int, ScrollItem) -> Content) {
+            self.scrollView = scrollView
+            self.content = content
+            super.init(nibName: nil, bundle: nil)
+            self.view = scrollView
+            scrollView.createCell = createCell
+            scrollView.updateCell = updateCell
+        }
+
+        required init?(coder: NSCoder) { fatalError() }
+
+        private func createCell(_ index: Int, _ items: [ScrollItem], _ cellsToReuse: inout [UIView]) -> UIView {
+            let item: ScrollItem? = index >= 0 && index < items.count ? items[index] : nil
+            let cell: UIView
+            if #available(iOS 16.0, *), false {
+                let c: UITableViewCell = cellsToReuse.isEmpty ? UITableViewCell() : cellsToReuse.removeLast() as! UITableViewCell
+                if let item {
+                    c.contentConfiguration = UIHostingConfiguration { self.content(index, item) }
+                        .margins(.all, 0)
+                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
+                }
+                cell = c
+            } else {
+                let c = cellsToReuse.isEmpty ? HostingCell<Content>() : cellsToReuse.removeLast() as! HostingCell<Content>
+                if let item {
+                    c.set(content: self.content(index, item), parent: self)
+                }
+                cell = c
+            }
+            cell.isHidden = false
+            cell.backgroundColor = .clear
+            let size = cell.systemLayoutSizeFitting(CGSizeMake(scrollView.bounds.width, CGFloat.greatestFiniteMagnitude))
+            cell.frame.size.width = scrollView.bounds.width
+            cell.frame.size.height = size.height
+            return cell
+        }
+
+        private func updateCell(cell: UIView, _ index: Int, _ items: [ScrollItem]) {
+            let item = items[index]
+            if #available(iOS 16.0, *), false {
+                (cell as! UITableViewCell).contentConfiguration = UIHostingConfiguration { self.content(index, item) }
+                    .margins(.all, 0)
+                    .minSize(height: 1) // Passing zero will result in system default of 44 points being used
+            } else {
+                if let cell = cell as? HostingCell<Content> {
+                    cell.set(content: self.content(index, item), parent: self)
+                } else {
+                    fatalError("Unexpected Cell Type for: \(item)")
+                }
+            }
+            let size = cell.systemLayoutSizeFitting(CGSizeMake(scrollView.bounds.width, CGFloat.greatestFiniteMagnitude))
+            cell.frame.size.width = scrollView.bounds.width
+            cell.frame.size.height = size.height
+            cell.setNeedsLayout()
+        }
+    }
+}
+
+class EndlessScrollView<ScrollItem>: UIScrollView, UIScrollViewDelegate, UIGestureRecognizerDelegate where ScrollItem : Identifiable, ScrollItem: Hashable {
+
+    /// Stores actual state of the scroll view and all elements drawn on the screen
+    let listState: ListState = ListState()
+
+    /// Just some random big number that will probably be enough to scrolling down and up without reaching the end
+    var initialOffset: CGFloat = 100000000
+
+    /// Default item id when no items in the visible items list. Something that will never be in real data
+    fileprivate static var DEFAULT_ITEM_ID: any Hashable { get { Int64.min } }
+
+    /// Storing an offset that was already used for laying down content to be able to see the difference
+    var prevProcessedOffset: CGFloat = 0
+
+    /// When screen is being rotated, it's important to track the view size and adjust scroll offset accordingly because the view doesn't know that the content
+    /// starts from bottom and ends at top, not vice versa as usual
+    var oldScreenHeight: CGFloat = 0
+
+    /// Not 100% correct height of the content since the items loaded lazily and their dimensions are unkown until they are on screen
+    var estimatedContentHeight: ContentHeight = ContentHeight()
+
+    /// Specify here the value that is small enough to NOT see any weird animation when you scroll to items. Minimum expected item size is ok. Scroll speed depends on it too
+    var averageItemHeight: CGFloat = 30
+
+    /// This is used as a multiplier for difference between current index and scrollTo index using [averageItemHeight] as well. Increase it to get faster speed
+    var scrollStepMultiplier: CGFloat = 0.37
+
+    /// Adds content padding to top
+    var insetTop: CGFloat = 100
+
+    /// Adds content padding to bottom
+    var insetBottom: CGFloat = 100
+
+    var scrollToItemIndexDelayed: Int? = nil
+
+    /// The second scroll view that is used only for purpose of displaying scroll bar with made-up content size and scroll offset that is gathered from main scroll view, see [estimatedContentHeight]
+    let scrollBarView: UIScrollView = UIScrollView(frame: .zero)
+
+    /// Stores views that can be used to hold new content so it will be faster to replace something than to create the whole view from scratch
+    var cellsToReuse: [UIView] = []
+
+    /// Enable debug to see hundreds of logs
+    var debug: Bool = false
+
+    var createCell: (Int, [ScrollItem], inout [UIView]) -> UIView? = { _, _, _ in nil }
+    var updateCell: (UIView, Int, [ScrollItem]) -> Void = { cell, _, _ in }
+
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.delegate = self
+    }
+
+    required init?(coder: NSCoder) { fatalError() }
+
+    class ListState: NSObject {
+
+        /// Will be called on every change of the items array, visible items, and scroll position
+        var onUpdateListener: () -> Void = {}
+
+        /// Items that were used to lay out the screen
+        var items: [ScrollItem] = [] {
+            didSet {
+                onUpdateListener()
+            }
+        }
+
+        /// It is equai to the number of [items]
+        var totalItemsCount: Int {
+            items.count
+        }
+
+        /// The items with their positions and other useful information. Only those that are visible on screen
+        var visibleItems: [EndlessScrollView<ScrollItem>.VisibleItem] = []
+
+        /// Index in [items] of the first item on screen. This is intentiallty not derived from visible items because it's is used as a starting point for laying out the screen
+        var firstVisibleItemIndex: Int = 0
+
+        /// Unique item id of the first visible item on screen
+        var firstVisibleItemId: any Hashable = EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+
+        /// Item offset of the first item on screen. Most of the time it's non-positive but it can be positive as well when a user produce overscroll effect on top/bottom of the scroll view
+        var firstVisibleItemOffset: CGFloat = -100
+
+        /// Index of the last visible item on screen
+        var lastVisibleItemIndex: Int {
+            visibleItems.last?.index ?? 0
+        }
+
+        /// Specifies if visible items cover the whole screen or can cover it (if overscrolled)
+        var itemsCanCoverScreen: Bool = false
+
+        /// Whether there is a non-animated scroll to item in progress or not
+        var isScrolling: Bool = false
+        /// Whether there is an animated scroll to item in progress or not
+        var isAnimatedScrolling: Bool = false
+
+        override init() {
+            super.init()
+        }
+    }
+
+    class VisibleItem {
+        let index: Int
+        let item: ScrollItem
+        let view: UIView
+        var offset: CGFloat
+
+        init(index: Int, item: ScrollItem, view: UIView, offset: CGFloat) {
+            self.index = index
+            self.item = item
+            self.view = view
+            self.offset = offset
+        }
+    }
+
+    class ContentHeight {
+        /// After that you should see overscroll effect. When scroll positon is far from
+        /// top/bottom items, these values are estimated based on items count multiplied by averageItemHeight or real item height (from visible items). Example:
+        /// [ 10, 9, 8, 7, (6, 5, 4, 3), 2, 1, 0] - 6, 5, 4, 3 are visible and have know heights but others have unknown height and for them averageItemHeight will be used to calculate the whole content height
+        var topOffsetY: CGFloat = 0
+        var bottomOffsetY: CGFloat = 0
+
+        var virtualScrollOffsetY: CGFloat = 0
+
+        /// How much distance were overscolled on top which often means to show sticky scrolling that should scroll back to real position after a users finishes dragging the scrollView
+        var overscrolledTop: CGFloat = 0
+
+        /// Adds content padding to bottom and top
+        var inset: CGFloat = 100
+
+        /// Estimated height of the contents of scroll view
+        var height: CGFloat {
+            get { bottomOffsetY - topOffsetY }
+        }
+
+        /// Estimated height of the contents of scroll view + distance of overscrolled effect. It's only updated when number of item changes to prevent jumping of scroll bar
+        var virtualOverscrolledHeight: CGFloat {
+            get {
+                bottomOffsetY - topOffsetY + overscrolledTop - inset * 2
+            }
+        }
+
+        func update(
+            _ contentOffset: CGPoint,
+            _ listState: ListState,
+            _ averageItemHeight: CGFloat,
+            _ updateStaleHeight: Bool
+        ) {
+            let lastVisible = listState.visibleItems.last
+            let firstVisible = listState.visibleItems.first
+            guard let last = lastVisible, let first = firstVisible else {
+                topOffsetY = contentOffset.y
+                bottomOffsetY = contentOffset.y
+                virtualScrollOffsetY = 0
+                overscrolledTop = 0
+                return
+            }
+            topOffsetY = last.view.frame.origin.y - CGFloat(listState.totalItemsCount - last.index - 1) * averageItemHeight - self.inset
+            bottomOffsetY = first.view.frame.origin.y + first.view.bounds.height + CGFloat(first.index) * averageItemHeight + self.inset
+            virtualScrollOffsetY = contentOffset.y - topOffsetY
+            overscrolledTop = max(0, last.index == listState.totalItemsCount - 1 ? last.view.frame.origin.y - contentOffset.y : 0)
+        }
+    }
+
+    var topY: CGFloat {
+        get { contentOffset.y }
+    }
+
+    var bottomY: CGFloat {
+        get { contentOffset.y + bounds.height }
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        if contentSize.height == 0 {
+            setup()
+        }
+        let newScreenHeight = bounds.height
+        if newScreenHeight != oldScreenHeight && oldScreenHeight != 0 {
+            contentOffset.y += oldScreenHeight - newScreenHeight
+            scrollBarView.frame = CGRectMake(frame.width - 10, self.insetTop, 10, frame.height - self.insetTop - self.insetBottom)
+        }
+        oldScreenHeight = newScreenHeight
+        adaptItems(listState.items, false)
+        if let index = scrollToItemIndexDelayed {
+            scrollToItem(index)
+            scrollToItemIndexDelayed = nil
+        }
+    }
+
+    private func setup() {
+        contentSize = CGSizeMake(frame.size.width, initialOffset * 2)
+        prevProcessedOffset = initialOffset
+        contentOffset = CGPointMake(0, initialOffset)
+        
+        showsVerticalScrollIndicator = false
+        scrollBarView.showsHorizontalScrollIndicator = false
+        panGestureRecognizer.delegate = self
+        addGestureRecognizer(scrollBarView.panGestureRecognizer)
+        superview!.addSubview(scrollBarView)
+    }
+
+    func updateItems(_ items: [ScrollItem], _ forceReloadVisible: Bool = false) {
+        if !Thread.isMainThread {
+            logger.error("Use main thread to update items")
+            return
+        }
+        if bounds.height == 0 {
+            self.listState.items = items
+            // this function requires to have valid bounds and it will be called again once it has them
+            return
+        }
+        adaptItems(items, forceReloadVisible)
+        snapToContent(animated: false)
+    }
+
+    /// [forceReloadVisible]: reloads every item that was visible regardless of hashValue changes
+    private func adaptItems(_ items: [ScrollItem], _ forceReloadVisible: Bool, overridenOffset: CGFloat? = nil) {
+        let start = Date.now
+        // special case when everything was removed
+        if items.isEmpty {
+            listState.visibleItems.forEach { item in item.view.removeFromSuperview() }
+            listState.visibleItems = []
+            listState.itemsCanCoverScreen = false
+            listState.firstVisibleItemId = EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+            listState.firstVisibleItemIndex = 0
+            listState.firstVisibleItemOffset = -insetTop
+
+            estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+            scrollBarView.contentSize = .zero
+            scrollBarView.contentOffset = .zero
+
+            prevProcessedOffset = contentOffset.y
+            // this check is just to prevent didSet listener from firing on the same empty array, no use for this
+            if !self.listState.items.isEmpty {
+                self.listState.items = items
+            }
+            return
+        }
+
+        let contentOffsetY = overridenOffset ?? contentOffset.y
+
+        var oldVisible = listState.visibleItems
+        var newVisible: [VisibleItem] = []
+        var visibleItemsHeight: CGFloat = 0
+        let offsetsDiff = contentOffsetY - prevProcessedOffset
+
+        var shouldBeFirstVisible = items.firstIndex(where: { item in item.id == listState.firstVisibleItemId as! ScrollItem.ID }) ?? 0
+
+        var wasFirstVisibleItemOffset = listState.firstVisibleItemOffset
+        var alreadyChangedIndexWhileScrolling = false
+        var allowOneMore = false
+        var nextOffsetY: CGFloat = 0
+        var i = shouldBeFirstVisible
+        // building list of visible items starting from the first one that should be visible
+        while i >= 0 && i < items.count {
+            let item = items[i]
+            let visibleIndex = oldVisible.firstIndex(where: { vis in vis.item.id == item.id })
+            let visible: VisibleItem?
+            if let visibleIndex {
+                let v = oldVisible.remove(at: visibleIndex)
+                if forceReloadVisible || v.view.bounds.width != bounds.width || v.item.hashValue != item.hashValue {
+                    let wasHeight = v.view.bounds.height
+                    updateCell(v.view, i, items)
+                    if wasHeight < v.view.bounds.height && i == 0 && shouldBeFirstVisible == i {
+                        v.view.frame.origin.y -= v.view.bounds.height - wasHeight
+                    }
+                }
+                visible = v
+            } else {
+                visible = nil
+            }
+            if shouldBeFirstVisible == i {
+                if let vis = visible {
+
+                    if // there is auto scroll in progress and the first item has a higher offset than bottom part
+                        // of the screen. In order to make scrolling down & up equal in time, we treat this as a sign to
+                        // re-make the first visible item
+                        (listState.isAnimatedScrolling && vis.view.frame.origin.y + vis.view.bounds.height < contentOffsetY + bounds.height) ||
+                        // the fist visible item previously is hidden now, remove it and move on
+                        !isVisible(vis.view) {
+                        let newIndex: Int
+                        if listState.isAnimatedScrolling {
+                            // skip many items to make the scrolling take less time
+                            var indexDiff = !alreadyChangedIndexWhileScrolling ? Int(ceil(abs(offsetsDiff / averageItemHeight))) : 0
+                            // if index was already changed, no need to change it again. Otherwise, the scroll will overscoll and return back animated. Because it means the whole screen was scrolled
+                            alreadyChangedIndexWhileScrolling = true
+
+                            indexDiff = offsetsDiff <= 0 ? indexDiff : -indexDiff
+                            newIndex = max(0, min(items.count - 1, i + indexDiff))
+                            // offset for the first visible item can now be 0 because the previous first visible item doesn't exist anymore
+                            wasFirstVisibleItemOffset = 0
+                        } else {
+                            // don't skip multiple items if it's manual scrolling gesture
+                            newIndex = i + (offsetsDiff <= 0 ? 1 : -1)
+                        }
+                        shouldBeFirstVisible = newIndex
+                        i = newIndex
+
+                        cellsToReuse.append(vis.view)
+                        hideAndRemoveFromSuperviewIfNeeded(vis.view)
+                        continue
+                    }
+                }
+                let vis: VisibleItem
+                if let visible {
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    cell.frame.origin.y = bottomY + wasFirstVisibleItemOffset - cell.frame.height
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                newVisible.append(vis)
+                visibleItemsHeight += vis.view.frame.height
+                nextOffsetY = vis.view.frame.origin.y
+            } else {
+                let vis: VisibleItem
+                if let visible {
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                    nextOffsetY -= vis.view.frame.height
+                    vis.view.frame.origin.y = nextOffsetY
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    nextOffsetY -= cell.frame.height
+                    cell.frame.origin.y = nextOffsetY
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                newVisible.append(vis)
+                visibleItemsHeight += vis.view.frame.height
+            }
+            if abs(nextOffsetY) < contentOffsetY && !allowOneMore {
+                break
+            } else if abs(nextOffsetY) < contentOffsetY {
+                allowOneMore = false
+            }
+            i += 1
+        }
+        if let firstVisible = newVisible.first, firstVisible.view.frame.origin.y + firstVisible.view.frame.height < contentOffsetY + bounds.height, firstVisible.index > 0 {
+            var offset: CGFloat = firstVisible.view.frame.origin.y + firstVisible.view.frame.height
+            let index = firstVisible.index
+            for i in stride(from: index - 1, through: 0, by: -1) {
+                let item = items[i]
+                let visibleIndex = oldVisible.firstIndex(where: { vis in vis.item.id == item.id })
+                let vis: VisibleItem
+                if let visibleIndex {
+                    let visible = oldVisible.remove(at: visibleIndex)
+                    visible.view.frame.origin.y = offset
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    cell.frame.origin.y = offset
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                offset += vis.view.frame.height
+                newVisible.insert(vis, at: 0)
+                visibleItemsHeight += vis.view.frame.height
+                if offset >= contentOffsetY + bounds.height {
+                    break
+                }
+            }
+        }
+
+        // removing already unneeded visible items
+        oldVisible.forEach { vis in
+            cellsToReuse.append(vis.view)
+            hideAndRemoveFromSuperviewIfNeeded(vis.view)
+        }
+        let itemsCountChanged = listState.items.count != items.count
+        prevProcessedOffset = contentOffsetY
+
+        listState.visibleItems = newVisible
+        // bottom drawing starts from 0 until top visible area at least (bound.height - insetTop) or above top bar (bounds.height).
+        // For visible items to preserve offset after adding more items having such height is enough
+        listState.itemsCanCoverScreen = visibleItemsHeight >= bounds.height - insetTop
+
+        listState.firstVisibleItemId = listState.visibleItems.first?.item.id ?? EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+        listState.firstVisibleItemIndex = listState.visibleItems.first?.index ?? 0
+        listState.firstVisibleItemOffset = listState.visibleItems.first?.offset ?? -insetTop
+        // updating the items with the last step in order to call listener with fully updated state
+        listState.items = items
+
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, itemsCountChanged)
+        scrollBarView.contentSize = CGSizeMake(bounds.width, estimatedContentHeight.virtualOverscrolledHeight)
+        scrollBarView.contentOffset = CGPointMake(0, estimatedContentHeight.virtualScrollOffsetY)
+        scrollBarView.isHidden = listState.visibleItems.count == listState.items.count && (listState.visibleItems.isEmpty || -listState.firstVisibleItemOffset + (listState.visibleItems.last?.offset ?? 0) + insetTop < bounds.height)
+
+        if debug {
+            println("time spent \((-start.timeIntervalSinceNow).description.prefix(5).replacingOccurrences(of: "0.000", with: "<0").replacingOccurrences(of: "0.", with: ""))")
+        }
+    }
+
+    func setScrollPosition(_ index: Int, _ id: Int64, _ offset: CGFloat = 0) {
+        listState.firstVisibleItemIndex = index
+        listState.firstVisibleItemId = id
+        listState.firstVisibleItemOffset = offset == 0 ? -bounds.height + insetTop + insetBottom : offset
+    }
+
+    func scrollToItem(_ index: Int, top: Bool = true) {
+        if index >= listState.items.count || listState.isScrolling || listState.isAnimatedScrolling {
+            return
+        }
+        if bounds.height == 0 || contentSize.height == 0 {
+            scrollToItemIndexDelayed = index
+            return
+        }
+        listState.isScrolling = true
+        defer {
+            listState.isScrolling = false
+        }
+
+        // just a faster way to set top item as requested index
+        listState.firstVisibleItemIndex = index
+        listState.firstVisibleItemId = listState.items[index].id
+        listState.firstVisibleItemOffset = -bounds.height + insetTop + insetBottom
+        scrollBarView.flashScrollIndicators()
+        adaptItems(listState.items, false)
+
+        var adjustedOffset = self.contentOffset.y
+        var i = 0
+
+        var upPrev = index > listState.firstVisibleItemIndex
+        //let firstOrLastIndex = upPrev ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+        //let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier)
+
+        var stepSlowdownMultiplier: CGFloat = 1
+        while i < 200 {
+            let up = index > listState.firstVisibleItemIndex
+            if upPrev != up {
+                stepSlowdownMultiplier = stepSlowdownMultiplier * 0.5
+                upPrev = up
+            }
+
+            // these two lines makes scrolling's finish non-linear and NOT overscroll visually when reach target index
+            let firstOrLastIndex = up ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+            let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier) * stepSlowdownMultiplier
+
+            let offsetToScroll = (up ? -averageItemHeight : averageItemHeight) * step
+            adjustedOffset += offsetToScroll
+            if let item = listState.visibleItems.first(where: { $0.index == index }) {
+                let y = if top {
+                    min(estimatedContentHeight.bottomOffsetY - bounds.height, item.view.frame.origin.y - insetTop)
+                } else {
+                    max(estimatedContentHeight.topOffsetY - insetTop - insetBottom, item.view.frame.origin.y + item.view.bounds.height - bounds.height + insetBottom)
+                }
+                setContentOffset(CGPointMake(contentOffset.x, y), animated: false)
+                scrollBarView.flashScrollIndicators()
+                break
+            }
+            contentOffset = CGPointMake(contentOffset.x, adjustedOffset)
+            adaptItems(listState.items, false)
+            snapToContent(animated: false)
+            i += 1
+        }
+        adaptItems(listState.items, false)
+        snapToContent(animated: false)
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+    }
+
+    func scrollToItemAnimated(_ index: Int, top: Bool = true) async {
+        if index >= listState.items.count || listState.isScrolling || listState.isAnimatedScrolling {
+            return
+        }
+        listState.isAnimatedScrolling = true
+        defer {
+            listState.isAnimatedScrolling = false
+        }
+        var adjustedOffset = self.contentOffset.y
+        var i = 0
+
+        var upPrev = index > listState.firstVisibleItemIndex
+        //let firstOrLastIndex = upPrev ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+        //let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier)
+
+        var stepSlowdownMultiplier: CGFloat = 1
+        while i < 200 {
+            let up = index > listState.firstVisibleItemIndex
+            if upPrev != up {
+                stepSlowdownMultiplier = stepSlowdownMultiplier * 0.5
+                upPrev = up
+            }
+
+            // these two lines makes scrolling's finish non-linear and NOT overscroll visually when reach target index
+            let firstOrLastIndex = up ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+            let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier) * stepSlowdownMultiplier
+
+            //println("Scrolling step \(step) \(stepSlowdownMultiplier)  index \(index) \(firstOrLastIndex)  \(index - firstOrLastIndex)  \(adjustedOffset), up \(up), i \(i)")
+
+            let offsetToScroll = (up ? -averageItemHeight : averageItemHeight) * step
+            adjustedOffset += offsetToScroll
+            if let item = listState.visibleItems.first(where: { $0.index == index }) {
+                let y = if top {
+                    min(estimatedContentHeight.bottomOffsetY - bounds.height, item.view.frame.origin.y - insetTop)
+                } else {
+                    max(estimatedContentHeight.topOffsetY - insetTop - insetBottom, item.view.frame.origin.y + item.view.bounds.height - bounds.height + insetBottom)
+                }
+                setContentOffset(CGPointMake(contentOffset.x, y), animated: true)
+                scrollBarView.flashScrollIndicators()
+                break
+            }
+            contentOffset = CGPointMake(contentOffset.x, adjustedOffset)
+
+            // skipping unneded relayout if this offset is already processed
+            if prevProcessedOffset - contentOffset.y != 0 {
+                adaptItems(listState.items, false)
+                snapToContent(animated: false)
+            }
+            // let UI time to update to see the animated position change
+            await MainActor.run {}
+
+            i += 1
+        }
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+    }
+
+    func scrollToBottom() {
+        scrollToItem(0, top: false)
+    }
+
+    func scrollToBottomAnimated() {
+        Task {
+            await scrollToItemAnimated(0, top: false)
+        }
+    }
+
+    func scroll(by: CGFloat, animated: Bool = true) {
+        setContentOffset(CGPointMake(contentOffset.x, contentOffset.y + by), animated: animated)
+    }
+
+    func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool {
+        if !listState.items.isEmpty {
+            scrollToBottomAnimated()
+        }
+        return false
+    }
+
+    private func snapToContent(animated: Bool) {
+        let topBlankSpace = estimatedContentHeight.height < bounds.height ? bounds.height - estimatedContentHeight.height : 0
+        if topY < estimatedContentHeight.topOffsetY - topBlankSpace {
+            setContentOffset(CGPointMake(0, estimatedContentHeight.topOffsetY - topBlankSpace), animated: animated)
+        } else if bottomY > estimatedContentHeight.bottomOffsetY {
+            setContentOffset(CGPointMake(0, estimatedContentHeight.bottomOffsetY - bounds.height), animated: animated)
+        }
+    }
+
+    func offsetToBottom(_ view: UIView) -> CGFloat {
+        bottomY - (view.frame.origin.y + view.frame.height)
+    }
+
+    /// If I try to .removeFromSuperview() right when I need to remove the view, it is possible to crash the app when the view was hidden in result of
+    /// pressing Hide in menu on top of the revealed item within the group. So at that point the item should still be attached to the view
+    func hideAndRemoveFromSuperviewIfNeeded(_ view: UIView) {
+        if view.isHidden {
+            // already passed this function
+            return
+        }
+        (view as? ReusableView)?.prepareForReuse()
+        view.isHidden = true
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+            if view.isHidden { view.removeFromSuperview() }
+        }
+    }
+
+    /// Synchronizing both scrollViews
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        true
+    }
+
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        if !decelerate {
+            snapToContent(animated: true)
+        }
+    }
+
+    override var contentOffset: CGPoint {
+        get { super.contentOffset }
+        set {
+            var newOffset = newValue
+            let topBlankSpace = estimatedContentHeight.height < bounds.height ? bounds.height - estimatedContentHeight.height : 0
+            if contentOffset.y > 0 && newOffset.y < estimatedContentHeight.topOffsetY - topBlankSpace && contentOffset.y > newOffset.y {
+                if !isDecelerating {
+                    newOffset.y = min(contentOffset.y, newOffset.y + abs(newOffset.y - estimatedContentHeight.topOffsetY + topBlankSpace) / 1.8)
+                } else {
+                    DispatchQueue.main.async {
+                        self.setContentOffset(newValue, animated: false)
+                        self.snapToContent(animated: true)
+                    }
+                }
+            } else if contentOffset.y > 0 && newOffset.y + bounds.height > estimatedContentHeight.bottomOffsetY && contentOffset.y < newOffset.y {
+                if !isDecelerating {
+                    newOffset.y = max(contentOffset.y, newOffset.y - abs(newOffset.y + bounds.height - estimatedContentHeight.bottomOffsetY) / 1.8)
+                } else {
+                    DispatchQueue.main.async {
+                        self.setContentOffset(newValue, animated: false)
+                        self.snapToContent(animated: true)
+                    }
+                }
+            }
+            super.contentOffset = newOffset
+        }
+    }
+
+    private func stopScrolling() {
+        let offsetYToStopAt = if abs(contentOffset.y - estimatedContentHeight.topOffsetY) < abs(bottomY - estimatedContentHeight.bottomOffsetY) {
+            estimatedContentHeight.topOffsetY
+        } else {
+            estimatedContentHeight.bottomOffsetY - bounds.height
+        }
+        setContentOffset(CGPointMake(contentOffset.x, offsetYToStopAt), animated: false)
+    }
+
+    func isVisible(_ view: UIView) -> Bool {
+        if view.superview == nil {
+             return false
+        }
+        return view.frame.intersects(CGRectMake(0, contentOffset.y, bounds.width, bounds.height))
+    }
+}
+
+private func println(_ text: String) {
+    print("\(Date.now.timeIntervalSince1970): \(text)")
+}
diff --git a/apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift b/apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift
index 66fe67a29e..3154f16f5b 100644
--- a/apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift
@@ -78,6 +78,12 @@ struct AddGroupMembersViewCommon: View {
                     let count = selectedContacts.count
                     Section {
                         if creatingGroup {
+                            MemberAdmissionButton(
+                                groupInfo: $groupInfo,
+                                admission: groupInfo.groupProfile.memberAdmission_,
+                                currentAdmission: groupInfo.groupProfile.memberAdmission_,
+                                creatingGroup: true
+                            )
                             GroupPreferencesButton(
                                 groupInfo: $groupInfo,
                                 preferences: groupInfo.fullGroupPreferences,
@@ -145,9 +151,9 @@ struct AddGroupMembersViewCommon: View {
         return dummy
     }()
 
-    @ViewBuilder private func inviteMembersButton() -> some View {
+    private func inviteMembersButton() -> some View {
         let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Invite to group" : "Invite to chat"
-        Button {
+        return Button {
             inviteMembers()
         } label: {
             HStack {
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
index b0f896e493..55d7b626fa 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
@@ -17,11 +17,12 @@ struct GroupChatInfoView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @Binding var groupInfo: GroupInfo
+    @Binding var scrollToItemId: ChatItem.ID?
     var onSearch: () -> Void
     @State var localAlias: String
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: GroupChatInfoViewAlert? = nil
-    @State private var groupLink: String?
+    @State private var groupLink: CreatedConnLink?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
     @State private var groupLinkNavLinkActive: Bool = false
     @State private var addMembersNavLinkActive: Bool = false
@@ -87,7 +88,25 @@ struct GroupChatInfoView: View {
                         .listRowBackground(Color.clear)
                         .listRowSeparator(.hidden)
                         .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                    
+
+                    Section {
+                        if groupInfo.canAddMembers && groupInfo.businessChat == nil {
+                            groupLinkButton()
+                        }
+                        if groupInfo.businessChat == nil && groupInfo.membership.memberRole >= .moderator {
+                            memberSupportButton()
+                        }
+                        if groupInfo.canModerate {
+                            GroupReportsChatNavLink(chat: chat, scrollToItemId: $scrollToItemId)
+                        }
+                        if groupInfo.membership.memberActive
+                            && (groupInfo.membership.memberRole < .moderator || groupInfo.membership.supportChat != nil) {
+                            UserSupportChatNavLink(chat: chat, groupInfo: groupInfo, scrollToItemId: $scrollToItemId)
+                        }
+                    } header: {
+                        Text("")
+                    }
+
                     Section {
                         if groupInfo.isOwner && groupInfo.businessChat == nil {
                             editGroupButton()
@@ -96,19 +115,6 @@ struct GroupChatInfoView: View {
                             addOrEditWelcomeMessage()
                         }
                         GroupPreferencesButton(groupInfo: $groupInfo, preferences: groupInfo.fullGroupPreferences, currentPreferences: groupInfo.fullGroupPreferences)
-                        if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
-                            sendReceiptsOption()
-                        } else {
-                            sendReceiptsOptionDisabled()
-                        }
-                                                
-                        NavigationLink {
-                            ChatWallpaperEditorSheet(chat: chat)
-                        } label: {
-                            Label("Chat theme", systemImage: "photo")
-                        }
-                    } header: {
-                        Text("")
                     } footer: {
                         let label: LocalizedStringKey = (
                             groupInfo.businessChat == nil
@@ -120,6 +126,16 @@ struct GroupChatInfoView: View {
                     }
                     
                     Section {
+                        if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                            sendReceiptsOption()
+                        } else {
+                            sendReceiptsOptionDisabled()
+                        }
+                        NavigationLink {
+                            ChatWallpaperEditorSheet(chat: chat)
+                        } label: {
+                            Label("Chat theme", systemImage: "photo")
+                        }
                         ChatTTLOption(chat: chat, progressIndicator: $progressIndicator)
                     } footer: {
                         Text("Delete chat messages from your device.")
@@ -127,9 +143,6 @@ struct GroupChatInfoView: View {
                     
                     Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
                         if groupInfo.canAddMembers {
-                            if groupInfo.businessChat == nil {
-                                groupLinkButton()
-                            }
                             if (chat.chatInfo.incognito) {
                                 Label("Invite members", systemImage: "plus")
                                     .foregroundColor(Color(uiColor: .tertiaryLabel))
@@ -138,23 +151,22 @@ struct GroupChatInfoView: View {
                                 addMembersButton()
                             }
                         }
-                        if members.count > 8 {
-                            searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
-                                .padding(.leading, 8)
-                        }
+                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
+                            .padding(.leading, 8)
                         let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                        let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
-                        MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
+                        let filteredMembers = s == ""
+                            ? members
+                            : members.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) }
+                        MemberRowView(
+                            chat: chat,
+                            groupInfo: groupInfo,
+                            groupMember: GMember(groupInfo.membership),
+                            scrollToItemId: $scrollToItemId,
+                            user: true,
+                            alert: $alert
+                        )
                         ForEach(filteredMembers) { member in
-                            ZStack {
-                                NavigationLink {
-                                    memberInfoView(member)
-                                } label: {
-                                    EmptyView()
-                                }
-                                .opacity(0)
-                                MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
-                            }
+                            MemberRowView(chat: chat, groupInfo: groupInfo, groupMember: member, scrollToItemId: $scrollToItemId, alert: $alert)
                         }
                     }
                     
@@ -163,7 +175,7 @@ struct GroupChatInfoView: View {
                         if groupInfo.canDelete {
                             deleteGroupButton()
                         }
-                        if groupInfo.membership.memberCurrent {
+                        if groupInfo.membership.memberCurrentOrPending {
                             leaveGroupButton()
                         }
                     }
@@ -276,7 +288,9 @@ struct GroupChatInfoView: View {
                 if groupInfo.canAddMembers {
                     addMembersActionButton(width: buttonWidth)
                 }
-                muteButton(width: buttonWidth)
+                if let nextNtfMode = chat.chatInfo.nextNtfMode {
+                    muteButton(width: buttonWidth, nextNtfMode: nextNtfMode)
+                }
             }
             .frame(maxWidth: .infinity, alignment: .center)
         }
@@ -290,9 +304,9 @@ struct GroupChatInfoView: View {
         .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
     }
 
-    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
-        if chat.chatInfo.incognito {
-            ZStack {
+    private func addMembersActionButton(width: CGFloat) -> some View {
+        ZStack {
+            if chat.chatInfo.incognito {
                 InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
                     groupLinkNavLinkActive = true
                 }
@@ -304,10 +318,7 @@ struct GroupChatInfoView: View {
                 }
                 .frame(width: 1, height: 1)
                 .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        } else {
-            ZStack {
+            } else {
                 InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
                     addMembersNavLinkActive = true
                 }
@@ -320,17 +331,17 @@ struct GroupChatInfoView: View {
                 .frame(width: 1, height: 1)
                 .hidden()
             }
-            .disabled(!groupInfo.ready)
         }
+        .disabled(!groupInfo.ready)
     }
 
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+    private func muteButton(width: CGFloat, nextNtfMode: MsgFilter) -> some View {
+        return InfoViewButton(
+            image: nextNtfMode.iconFilled,
+            title: "\(nextNtfMode.text(mentions: true))",
             width: width
         ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+            toggleNotifications(chat, enableNtfs: nextNtfMode)
         }
         .disabled(!groupInfo.ready)
     }
@@ -353,25 +364,23 @@ struct GroupChatInfoView: View {
             .onAppear {
                 searchFocussed = false
                 Task {
-                    let groupMembers = await apiListMembers(groupInfo.groupId)
-                    await MainActor.run {
-                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                        chatModel.populateGroupMembersIndexes()
-                    }
+                    await chatModel.loadGroupMembers(groupInfo)
                 }
             }
     }
 
     private struct MemberRowView: View {
+        var chat: Chat
         var groupInfo: GroupInfo
         @ObservedObject var groupMember: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
         @EnvironmentObject var theme: AppTheme
         var user: Bool = false
         @Binding var alert: GroupChatInfoViewAlert?
 
         var body: some View {
             let member = groupMember.wrapped
-            let v = HStack{
+            let v1 = HStack{
                 MemberProfileImage(member, size: 38)
                     .padding(.trailing, 2)
                 // TODO server connection status
@@ -387,7 +396,21 @@ struct GroupChatInfoView: View {
                 Spacer()
                 memberInfo(member)
             }
-            
+
+            let v = ZStack {
+                if user {
+                    v1
+                } else {
+                    NavigationLink {
+                        memberInfoView()
+                    } label: {
+                        EmptyView()
+                    }
+                    .opacity(0)
+                    v1
+                }
+            }
+
             if user {
                 v
             } else if groupInfo.membership.memberRole >= .admin {
@@ -412,6 +435,11 @@ struct GroupChatInfoView: View {
             }
         }
 
+        private func memberInfoView() -> some View {
+            GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember, scrollToItemId: $scrollToItemId)
+                .navigationBarHidden(false)
+        }
+
         private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey {
             if member.activeConn?.connDisabled ?? false {
                 return "disabled"
@@ -491,11 +519,6 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember)
-            .navigationBarHidden(false)
-    }
-
     private func groupLinkButton() -> some View {
         NavigationLink {
             groupLinkDestinationView()
@@ -521,15 +544,95 @@ struct GroupChatInfoView: View {
         .navigationBarTitleDisplayMode(.large)
     }
 
+    struct UserSupportChatNavLink: View {
+        @ObservedObject var chat: Chat
+        @EnvironmentObject var theme: AppTheme
+        var groupInfo: GroupInfo
+        @EnvironmentObject var chatModel: ChatModel
+        @Binding var scrollToItemId: ChatItem.ID?
+        @State private var navLinkActive = false
+
+        var body: some View {
+            let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: nil)
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(
+                    chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                    scrollToItemId: $scrollToItemId
+                )
+            } label: {
+                HStack {
+                    Label("Chat with admins", systemImage: chat.supportUnreadCount > 0 ? "flag.fill" : "flag")
+                    Spacer()
+                    if chat.supportUnreadCount > 0 {
+                        UnreadBadge(count: chat.supportUnreadCount, color: theme.colors.primary)
+                    }
+                }
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo))
+                }
+            }
+        }
+    }
+
+    private func memberSupportButton() -> some View {
+        NavigationLink {
+            MemberSupportView(groupInfo: groupInfo, scrollToItemId: $scrollToItemId)
+                .navigationBarTitle("Chats with members")
+                .modifier(ThemedBackground())
+                .navigationBarTitleDisplayMode(.large)
+        } label: {
+            HStack {
+                Label(
+                    "Chats with members",
+                    systemImage: chat.supportUnreadCount > 0 ? "flag.fill" : "flag"
+                )
+                Spacer()
+                if chat.supportUnreadCount > 0 {
+                    UnreadBadge(count: chat.supportUnreadCount, color: theme.colors.primary)
+                }
+            }
+        }
+    }
+
+    struct GroupReportsChatNavLink: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @EnvironmentObject var theme: AppTheme
+        @State private var navLinkActive = false
+        @ObservedObject var chat: Chat
+        @Binding var scrollToItemId: ChatItem.ID?
+
+        var body: some View {
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(chat: chat, scrollToItemId: $scrollToItemId)
+            } label: {
+                HStack {
+                    Label {
+                        Text("Member reports")
+                    } icon: {
+                        Image(systemName: chat.chatStats.reportsCount > 0 ? "flag.fill" : "flag").foregroundColor(.red)
+                    }
+                    Spacer()
+                    if chat.chatStats.reportsCount > 0 {
+                        UnreadBadge(count: chat.chatStats.reportsCount, color: .red)
+                    }
+                }
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(chat.id, chatFilter: .msgContentTagContext(contentTag: .report))
+                }
+            }
+        }
+    }
+
     private func editGroupButton() -> some View {
         NavigationLink {
             GroupProfileView(
                 groupInfo: $groupInfo,
                 groupProfile: groupInfo.groupProfile
             )
-            .navigationBarTitle("Group profile")
-            .modifier(ThemedBackground())
-            .navigationBarTitleDisplayMode(.large)
         } label: {
             Label("Edit group profile", systemImage: "pencil")
         }
@@ -571,9 +674,9 @@ struct GroupChatInfoView: View {
         }
     }
 
-    @ViewBuilder private func leaveGroupButton() -> some View {
+    private func leaveGroupButton() -> some View {
         let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Leave group" : "Leave chat"
-        Button(role: .destructive) {
+        return Button(role: .destructive) {
             alert = .leaveGroupAlert
         } label: {
             Label(label, systemImage: "rectangle.portrait.and.arrow.right")
@@ -681,24 +784,36 @@ struct GroupChatInfoView: View {
             title: Text("Remove member?"),
             message: Text(messageLabel),
             primaryButton: .destructive(Text("Remove")) {
-                Task {
-                    do {
-                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
-                        await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
-                        }
-                    } catch let error {
-                        logger.error("apiRemoveMember error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error removing member")
-                        alert = .error(title: a.title, error: a.message)
-                    }
-                }
+                removeMember(groupInfo, mem)
             },
             secondaryButton: .cancel()
         )
     }
 }
 
+func removeMember(_ groupInfo: GroupInfo, _ mem: GroupMember, dismiss: DismissAction? = nil) {
+    Task {
+        do {
+            let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId])
+            await MainActor.run {
+                ChatModel.shared.updateGroup(updatedGroupInfo)
+                updatedMembers.forEach { updatedMember in
+                    _ = ChatModel.shared.upsertGroupMember(updatedGroupInfo, updatedMember)
+                }
+                dismiss?()
+            }
+        } catch let error {
+            logger.error("apiRemoveMembers error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error removing member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
 func deleteGroupAlertMessage(_ groupInfo: GroupInfo) -> Text {
     groupInfo.businessChat == nil ? (
         groupInfo.membership.memberCurrent ? Text("Group will be deleted for all members - this cannot be undone!") : Text("Group will be deleted for you - this cannot be undone!")
@@ -792,6 +907,7 @@ struct GroupChatInfoView_Previews: PreviewProvider {
         GroupChatInfoView(
             chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
             groupInfo: Binding.constant(GroupInfo.sampleData),
+            scrollToItemId: Binding.constant(nil),
             onSearch: {},
             localAlias: ""
         )
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift b/apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift
index 39288e2d52..49e4d49e86 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift
@@ -10,12 +10,14 @@ import SwiftUI
 import SimpleXChat
 
 struct GroupLinkView: View {
+    @EnvironmentObject var theme: AppTheme
     var groupId: Int64
-    @Binding var groupLink: String?
+    @Binding var groupLink: CreatedConnLink?
     @Binding var groupLinkMemberRole: GroupMemberRole
     var showTitle: Bool = false
     var creatingGroup: Bool = false
     var linkCreatedCb: (() -> Void)? = nil
+    @State private var showShortLink = true
     @State private var creatingLink = false
     @State private var alert: GroupLinkAlert?
     @State private var shouldCreate = true
@@ -33,16 +35,23 @@ struct GroupLinkView: View {
     }
 
     var body: some View {
-        if creatingGroup {
-            groupLinkView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Continue") { linkCreatedCb?() }
+        ZStack {
+            if creatingGroup {
+                groupLinkView()
+                    .navigationBarBackButtonHidden()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
                     }
-                }
-        } else {
-            groupLinkView()
+            } else {
+                groupLinkView()
+            }
+            if creatingLink {
+                ProgressView()
+                    .scaleEffect(2)
+                    .frame(maxWidth: .infinity)
+            }
         }
     }
 
@@ -69,14 +78,22 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
-                        .id("simplex-qrcode-view-for-\(groupLink)")
+                    SimpleXCreatedLinkQRCode(link: groupLink, short: $showShortLink)
+                        .id("simplex-qrcode-view-for-\(groupLink.simplexChatUri(short: showShortLink))")
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink.simplexChatUri(short: showShortLink)])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
+                    if (groupLink.connShortLink == nil && UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)) {
+                        Button {
+                            addShortLink()
+                        } label: {
+                            Label("Add short link", systemImage: "plus")
+                        }
+                    }
+
                     if !creatingGroup {
                         Button(role: .destructive) { alert = .deleteLink } label: {
                             Label("Delete link", systemImage: "trash")
@@ -87,11 +104,10 @@ struct GroupLinkView: View {
                         Label("Create link", systemImage: "link.badge.plus")
                     }
                     .disabled(creatingLink)
-                    if creatingLink {
-                        ProgressView()
-                            .scaleEffect(2)
-                            .frame(maxWidth: .infinity)
-                    }
+                }
+            } header: {
+                if let groupLink, groupLink.connShortLink != nil {
+                    ToggleShortLinkHeader(text: Text(""), link: groupLink, short: $showShortLink)
                 }
             }
             .alert(item: $alert) { alert in
@@ -154,12 +170,32 @@ struct GroupLinkView: View {
             }
         }
     }
+
+    private func addShortLink() {
+        Task {
+            do {
+                creatingLink = true
+                let link = try await apiAddGroupShortLink(groupId)
+                await MainActor.run {
+                    creatingLink = false
+                    (groupLink, groupLinkMemberRole) = link
+                }
+            } catch let error {
+                logger.error("apiAddGroupShortLink: \(responseError(error))")
+                await MainActor.run {
+                    creatingLink = false
+                    let a = getErrorAlert(error, "Error adding short link")
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
 }
 
 struct GroupLinkView_Previews: PreviewProvider {
     static var previews: some View {
-        @State var groupLink: String? = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-        @State var noGroupLink: String? = nil
+        @State var groupLink: CreatedConnLink? = CreatedConnLink(connFullLink: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", connShortLink: nil)
+        @State var noGroupLink: CreatedConnLink? = nil
 
         return Group {
             GroupLinkView(groupId: 1, groupLink: $groupLink, groupLinkMemberRole: Binding.constant(.member))
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
index 102f0333be..fa7fc7cae4 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
@@ -16,6 +16,7 @@ struct GroupMemberInfoView: View {
     @State var groupInfo: GroupInfo
     @ObservedObject var chat: Chat
     @ObservedObject var groupMember: GMember
+    @Binding var scrollToItemId: ChatItem.ID?
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
@@ -103,6 +104,10 @@ struct GroupMemberInfoView: View {
 
                     if member.memberActive {
                         Section {
+                            if groupInfo.membership.memberRole >= .moderator
+                                && (member.memberRole < .moderator || member.supportChat != nil) {
+                                MemberInfoSupportChatNavLink(groupInfo: groupInfo, member: groupMember, scrollToItemId: $scrollToItemId)
+                            }
                             if let code = connectionCode { verifyCodeButton(code) }
                             if let connStats = connectionStats,
                                connStats.ratchetSyncAllowed {
@@ -278,7 +283,7 @@ struct GroupMemberInfoView: View {
             }
         }
         .onChange(of: chat.chatInfo) { c in
-            if case let .group(gI) = chat.chatInfo {
+            if case let .group(gI, _) = chat.chatInfo {
                 groupInfo = gI
             }
         }
@@ -366,14 +371,8 @@ struct GroupMemberInfoView: View {
     func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
         InfoViewButton(image: "message.fill", title: "message", width: width) {
             Task {
-                do {
-                    let chat = try await apiGetChat(type: .direct, id: contactId)
-                    chatModel.addChat(chat)
-                    ItemsModel.shared.loadOpenChat(chat.id) {
-                        dismissAllSheets(animated: true)
-                    }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
+                ItemsModel.shared.loadOpenChat("@\(contactId)") {
+                    dismissAllSheets(animated: true)
                 }
             }
         }
@@ -480,6 +479,31 @@ struct GroupMemberInfoView: View {
         .frame(maxWidth: .infinity, alignment: .center)
     }
 
+    struct MemberInfoSupportChatNavLink: View {
+        @EnvironmentObject var theme: AppTheme
+        var groupInfo: GroupInfo
+        var member: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
+        @State private var navLinkActive = false
+
+        var body: some View {
+            let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: member.wrapped)
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(
+                    chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                    scrollToItemId: $scrollToItemId
+                )
+            } label: {
+                Label("Chat with member", systemImage: "flag")
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo))
+                }
+            }
+        }
+    }
+
     private func verifyCodeButton(_ code: String) -> some View {
         let member = groupMember.wrapped
         return NavigationLink {
@@ -616,13 +640,16 @@ struct GroupMemberInfoView: View {
             primaryButton: .destructive(Text("Remove")) {
                 Task {
                     do {
-                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
+                        let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId])
                         await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                            chatModel.updateGroup(updatedGroupInfo)
+                            updatedMembers.forEach { updatedMember in
+                                _ = chatModel.upsertGroupMember(updatedGroupInfo, updatedMember)
+                            }
                             dismiss()
                         }
                     } catch let error {
-                        logger.error("apiRemoveMember error: \(responseError(error))")
+                        logger.error("apiRemoveMembers error: \(responseError(error))")
                         let a = getErrorAlert(error, "Error removing member")
                         alert = .error(title: a.title, error: a.message)
                     }
@@ -647,14 +674,16 @@ struct GroupMemberInfoView: View {
             primaryButton: .default(Text("Change")) {
                 Task {
                     do {
-                        let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
+                        let updatedMembers = try await apiMembersRole(groupInfo.groupId, [mem.groupMemberId], newRole)
                         await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                            updatedMembers.forEach { updatedMember in
+                                _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                            }
                         }
 
                     } catch let error {
                         newRole = mem.memberRole
-                        logger.error("apiMemberRole error: \(responseError(error))")
+                        logger.error("apiMembersRole error: \(responseError(error))")
                         let a = getErrorAlert(error, "Error changing role")
                         alert = .error(title: a.title, error: a.message)
                     }
@@ -806,12 +835,14 @@ func unblockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
 func blockMemberForAll(_ gInfo: GroupInfo, _ member: GroupMember, _ blocked: Bool) {
     Task {
         do {
-            let updatedMember = try await apiBlockMemberForAll(gInfo.groupId, member.groupMemberId, blocked)
+            let updatedMembers = try await apiBlockMembersForAll(gInfo.groupId, [member.groupMemberId], blocked)
             await MainActor.run {
-                _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
+                updatedMembers.forEach { updatedMember in
+                    _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
+                }
             }
         } catch let error {
-            logger.error("apiBlockMemberForAll error: \(responseError(error))")
+            logger.error("apiBlockMembersForAll error: \(responseError(error))")
         }
     }
 }
@@ -821,7 +852,8 @@ struct GroupMemberInfoView_Previews: PreviewProvider {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
             chat: Chat.sampleData,
-            groupMember: GMember.sampleData
+            groupMember: GMember.sampleData,
+            scrollToItemId: Binding.constant(nil)
         )
     }
 }
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift b/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift
new file mode 100644
index 0000000000..07cc7bd217
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift
@@ -0,0 +1,269 @@
+//
+//  GroupMentions.swift
+//  SimpleX (iOS)
+//
+//  Created by Diogo Cunha on 30/01/2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+let MENTION_START: Character = "@"
+let QUOTE: Character = "'"
+let MEMBER_ROW_SIZE: CGFloat = 60
+let MAX_VISIBLE_MEMBER_ROWS: CGFloat = 4.8
+
+struct GroupMentionsView: View {
+    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    var im: ItemsModel
+    var groupInfo: GroupInfo
+    @Binding var composeState: ComposeState
+    @Binding var selectedRange: NSRange
+    @Binding var keyboardVisible: Bool
+
+    @State private var isVisible = false
+    @State private var currentMessage: String = ""
+    @State private var mentionName: String = ""
+    @State private var mentionRange: NSRange?
+    @State private var mentionMemberId: String?
+    @State private var sortedMembers: [GMember] = []
+
+    var body: some View {
+        ZStack(alignment: .bottom) {
+            if isVisible {
+                let filtered = filteredMembers()
+                if filtered.count > 0 {
+                    Color.white.opacity(0.01)
+                        .edgesIgnoringSafeArea(.all)
+                        .onTapGesture {
+                            isVisible = false
+                        }
+                    VStack(spacing: 0) {
+                        Spacer()
+                        Divider()
+                        let scroll = ScrollView {
+                            LazyVStack(spacing: 0) {
+                                ForEach(Array(filtered.enumerated()), id: \.element.wrapped.groupMemberId) { index, member in
+                                    let mentioned = mentionMemberId == member.wrapped.memberId
+                                    let disabled = composeState.mentions.count >= MAX_NUMBER_OF_MENTIONS && !mentioned
+                                    ZStack(alignment: .bottom) {
+                                        memberRowView(member.wrapped, mentioned)
+                                            .contentShape(Rectangle())
+                                            .disabled(disabled)
+                                            .opacity(disabled ? 0.6 : 1)
+                                            .onTapGesture {
+                                                memberSelected(member)
+                                            }
+                                            .padding(.horizontal)
+                                            .frame(height: MEMBER_ROW_SIZE)
+
+                                        Divider()
+                                            .padding(.leading)
+                                            .padding(.leading, 48)
+                                    }
+                                }
+                            }
+                        }
+                            .frame(maxHeight: MEMBER_ROW_SIZE * min(MAX_VISIBLE_MEMBER_ROWS, CGFloat(filtered.count)))
+                            .background(Color(UIColor.systemBackground))
+
+                        if #available(iOS 16.0, *) {
+                            scroll.scrollDismissesKeyboard(.never)
+                        } else {
+                            scroll
+                        }
+                    }
+                }
+            }
+        }
+        .onChange(of: composeState.parsedMessage) { parsedMsg in
+            currentMessage = composeState.message
+            messageChanged(currentMessage, parsedMsg, selectedRange)
+        }
+        .onChange(of: selectedRange) { r in
+            // This condition is needed to prevent messageChanged called twice,
+            // because composeState.formattedText triggers later when message changes.
+            // The condition is only true if position changed without text change
+            if currentMessage == composeState.message {
+                messageChanged(currentMessage, composeState.parsedMessage, r)
+            }
+        }
+        .onAppear {
+            currentMessage = composeState.message
+        }
+    }
+
+    func contextMemberFilter(_ member: GroupMember) -> Bool {
+        switch im.secondaryIMFilter {
+        case nil:
+            return true
+        case let .groupChatScopeContext(groupScopeInfo):
+            switch (groupScopeInfo) {
+            case let .memberSupport(groupMember_):
+                if let scopeMember = groupMember_ {
+                    return member.memberRole >= .moderator || member.groupMemberId == scopeMember.groupMemberId
+                } else {
+                    return member.memberRole >= .moderator
+                }
+            }
+        case .msgContentTagContext:
+            return false
+        }
+    }
+
+    private func filteredMembers() -> [GMember] {
+        let s = mentionName.lowercased()
+        return sortedMembers.filter {
+            contextMemberFilter($0.wrapped)
+            && (s.isEmpty || $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s))
+        }
+    }
+
+    private func messageChanged(_ msg: String, _ parsedMsg: [FormattedText], _ range: NSRange) {
+        removeUnusedMentions(parsedMsg)
+        if let (ft, r) = selectedMarkdown(parsedMsg, range) {
+            switch ft.format {
+            case let .mention(name):
+                isVisible = true
+                mentionName = name
+                mentionRange = r
+                mentionMemberId = composeState.mentions[name]?.memberId
+                if !m.membersLoaded {
+                    Task {
+                        await m.loadGroupMembers(groupInfo)
+                        sortMembers()
+                    }
+                }
+                return
+            case .none: () //
+                let pos = range.location
+                if range.length == 0, let (at, atRange) = getCharacter(msg, pos - 1), at == "@" {
+                    let prevChar = getCharacter(msg, pos - 2)?.char
+                    if prevChar == nil || prevChar == " " || prevChar == "\n" {
+                        isVisible = true
+                        mentionName = ""
+                        mentionRange = atRange
+                        mentionMemberId = nil
+                        Task {
+                            await m.loadGroupMembers(groupInfo)
+                            sortMembers()
+                        }
+                        return
+                    }
+                }
+            default: ()
+            }
+        }
+        closeMemberList()
+    }
+
+    private func sortMembers() {
+        sortedMembers = m.groupMembers.filter({ m in
+            let status = m.wrapped.memberStatus
+            return status != .memLeft && status != .memRemoved && status != .memInvited
+        })
+        .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+    }
+
+    private func removeUnusedMentions(_ parsedMsg: [FormattedText]) {
+        let usedMentions: Set<String> = Set(parsedMsg.compactMap { ft in
+            if case let .mention(name) = ft.format { name } else { nil }
+        })
+        if usedMentions.count < composeState.mentions.count  {
+            composeState = composeState.copy(mentions: composeState.mentions.filter({ usedMentions.contains($0.key) }))
+        }
+    }
+
+    private func getCharacter(_ s: String, _ pos: Int) -> (char: String.SubSequence, range: NSRange)? {
+        if pos < 0 || pos >= s.count { return nil }
+        let r = NSRange(location: pos, length: 1)
+        return if let range = Range(r, in: s) {
+            (s[range], r)
+        } else {
+            nil
+        }
+    }
+    
+    private func selectedMarkdown(_ parsedMsg: [FormattedText], _ range: NSRange) -> (FormattedText, NSRange)? {
+        if parsedMsg.isEmpty { return nil }
+        var i = 0
+        var pos: Int = 0
+        while i < parsedMsg.count && pos + parsedMsg[i].text.count < range.location {
+            pos += parsedMsg[i].text.count
+            i += 1
+        }
+        // the second condition will be true when two markdowns are selected
+        return i >= parsedMsg.count || range.location + range.length > pos + parsedMsg[i].text.count
+            ? nil
+            : (parsedMsg[i], NSRange(location: pos, length: parsedMsg[i].text.count))
+    }
+    
+    private func memberSelected(_ member: GMember) {
+        if let range = mentionRange, mentionMemberId == nil || mentionMemberId != member.wrapped.memberId {
+            addMemberMention(member, range)
+        }
+    }
+    
+    private func addMemberMention(_ member: GMember, _ r: NSRange) {
+        guard let range = Range(r, in: composeState.message) else { return }
+        var mentions = composeState.mentions
+        var newName: String
+        if let mm = mentions.first(where: { $0.value.memberId == member.wrapped.memberId }) {
+            newName = mm.key
+        } else {
+            newName = composeState.mentionMemberName(member.wrapped.memberProfile.displayName)
+        }
+        mentions[newName] = CIMention(groupMember: member.wrapped)
+        var msgMention = newName.contains(" ") || newName.last?.isPunctuation == true
+                        ? "@'\(newName)'"
+                        : "@\(newName)"
+        var newPos = r.location + msgMention.count
+        let newMsgLength = composeState.message.count + msgMention.count - r.length
+        print(newPos)
+        print(newMsgLength)
+        if newPos == newMsgLength {
+            msgMention += " "
+            newPos += 1
+        }
+        composeState = composeState.copy(
+            message: composeState.message.replacingCharacters(in: range, with: msgMention),
+            mentions: mentions
+        )
+        selectedRange = NSRange(location: newPos, length: 0)
+        closeMemberList()
+        keyboardVisible = true
+    }
+    
+    private func closeMemberList() {
+        isVisible = false
+        mentionName = ""
+        mentionRange = nil
+        mentionMemberId = nil
+    }
+    
+    private func memberRowView(_ member: GroupMember, _ mentioned: Bool) -> some View {
+        return HStack{
+            MemberProfileImage(member, size: 38)
+                .padding(.trailing, 2)
+            VStack(alignment: .leading) {
+                let t = Text(member.localAliasAndFullName).foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)
+                (member.verified ? memberVerifiedShield() + t : t)
+                    .lineLimit(1)
+            }
+            Spacer()
+            if mentioned {
+                Image(systemName: "checkmark")
+            }
+        }
+
+        func memberVerifiedShield() -> Text {
+            (Text(Image(systemName: "checkmark.shield")) + textSpace)
+                .font(.caption)
+                .baselineOffset(2)
+                .kerning(-2)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift b/apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift
index 9ef53258aa..55b1dc6d2e 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift
@@ -30,6 +30,14 @@ struct GroupPreferencesView: View {
         let saveText: LocalizedStringKey = creatingGroup ? "Save" : "Save and notify group members"
         VStack {
             List {
+                Section {
+                    MemberAdmissionButton(
+                        groupInfo: $groupInfo,
+                        admission: groupInfo.groupProfile.memberAdmission_,
+                        currentAdmission: groupInfo.groupProfile.memberAdmission_,
+                        creatingGroup: creatingGroup
+                    )
+                }
                 featureSection(.timedMessages, $preferences.timedMessages.enable)
                 featureSection(.fullDelete, $preferences.fullDelete.enable)
                 featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
@@ -37,6 +45,7 @@ struct GroupPreferencesView: View {
                 featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
                 featureSection(.files, $preferences.files.enable, $preferences.files.role)
                 featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.reports, $preferences.reports.enable)
                 featureSection(.history, $preferences.history.enable)
 
                 if groupInfo.isOwner {
@@ -89,6 +98,7 @@ struct GroupPreferencesView: View {
                 settingsRow(icon, color: color) {
                     Toggle(feature.text, isOn: enable)
                 }
+                .disabled(feature == .reports) // remove in 6.4
                 if timedOn {
                     DropdownCustomTimePicker(
                         selection: $preferences.timedMessages.ttl,
@@ -138,6 +148,66 @@ struct GroupPreferencesView: View {
     }
 }
 
+struct MemberAdmissionButton: View {
+    @Binding var groupInfo: GroupInfo
+    @State var admission: GroupMemberAdmission
+    @State var currentAdmission: GroupMemberAdmission
+    var creatingGroup: Bool = false
+
+    var body: some View {
+        NavigationLink {
+            MemberAdmissionView(
+                groupInfo: $groupInfo,
+                admission: $admission,
+                currentAdmission: currentAdmission,
+                creatingGroup: creatingGroup,
+                saveAdmission: saveAdmission
+            )
+            .navigationBarTitle("Member admission")
+            .modifier(ThemedBackground(grouped: true))
+            .navigationBarTitleDisplayMode(.large)
+            .onDisappear {
+                let saveText = NSLocalizedString(
+                    creatingGroup ? "Save" : "Save and notify group members",
+                    comment: "alert button"
+                )
+
+                if groupInfo.groupProfile.memberAdmission_ != admission {
+                    showAlert(
+                        title: NSLocalizedString("Save admission settings?", comment: "alert title"),
+                        buttonTitle: saveText,
+                        buttonAction: { saveAdmission() },
+                        cancelButton: true
+                    )
+                }
+            }
+        } label: {
+            if creatingGroup {
+                Text("Set member admission")
+            } else {
+                Label("Member admission", systemImage: "switch.2")
+            }
+        }
+    }
+
+    private func saveAdmission() {
+        Task {
+            do {
+                var gp = groupInfo.groupProfile
+                gp.memberAdmission = admission
+                let gInfo = try await apiUpdateGroup(groupInfo.groupId, gp)
+                await MainActor.run {
+                    groupInfo = gInfo
+                    ChatModel.shared.updateGroup(gInfo)
+                    currentAdmission = admission
+                }
+            } catch {
+                logger.error("MemberAdmissionView apiUpdateGroup error: \(responseError(error))")
+            }
+        }
+    }
+}
+
 struct GroupPreferencesView_Previews: PreviewProvider {
     static var previews: some View {
         GroupPreferencesView(
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
index 1617edd11f..4de3608735 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
@@ -26,6 +26,7 @@ struct GroupProfileView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @Binding var groupInfo: GroupInfo
     @State var groupProfile: GroupProfile
+    @State private var currentProfileHash: Int?
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
@@ -34,60 +35,40 @@ struct GroupProfileView: View {
     @FocusState private var focusDisplayName
 
     var body: some View {
-        return VStack(alignment: .leading) {
-            Text("Group profile is stored on members' devices, not on the servers.")
-                .padding(.vertical)
+        List {
+            EditProfileImage(profileImage: $groupProfile.image, showChooseSource: $showChooseSource)
+                .if(!focusDisplayName) { $0.padding(.top) }
 
-            ZStack(alignment: .center) {
-                ZStack(alignment: .topTrailing) {
-                    profileImageView(groupProfile.image)
-                    if groupProfile.image != nil {
-                        Button {
-                            groupProfile.image = nil
-                        } label: {
-                            Image(systemName: "multiply")
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 12)
-                        }
-                    }
-                }
-
-                editImageButton { showChooseSource = true }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-
-            VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
-                    if !validNewProfileName() {
+            Section {
+                HStack {
+                    TextField("Group display name", text: $groupProfile.displayName)
+                        .focused($focusDisplayName)
+                    if !validNewProfileName {
                         Button {
                             alert = .invalidName(validName: mkValidName(groupProfile.displayName))
                         } label: {
                             Image(systemName: "exclamationmark.circle").foregroundColor(.red)
                         }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                     }
-                    profileNameTextEdit("Group display name", $groupProfile.displayName)
-                        .focused($focusDisplayName)
                 }
-                .padding(.bottom)
                 let fullName = groupInfo.groupProfile.fullName
                 if fullName != "" && fullName != groupProfile.displayName {
-                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
-                        .padding(.bottom)
-                }
-                HStack(spacing: 20) {
-                    Button("Cancel") { dismiss() }
-                    Button("Save group profile") { saveProfile() }
-                        .disabled(!canUpdateProfile())
+                    TextField("Group full name (optional)", text: $groupProfile.fullName)
                 }
+            } footer: {
+                Text("Group profile is stored on members' devices, not on the servers.")
             }
-            .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
 
+            Section {
+                Button("Reset") {
+                    groupProfile = groupInfo.groupProfile
+                    currentProfileHash = groupProfile.hashValue
+                }
+                .disabled(currentProfileHash == groupProfile.hashValue)
+                Button("Save group profile", action: saveProfile)
+                .disabled(!canUpdateProfile)
+            }
         }
-        .padding()
-        .frame(maxHeight: .infinity, alignment: .top)
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -95,6 +76,11 @@ struct GroupProfileView: View {
             Button("Choose from library") {
                 showImagePicker = true
             }
+            if UIPasteboard.general.hasImages {
+                Button("Paste image") {
+                    chosenImage = UIPasteboard.general.image
+                }
+            }
         }
         .fullScreenCover(isPresented: $showTakePhoto) {
             ZStack {
@@ -120,8 +106,20 @@ struct GroupProfileView: View {
             }
         }
         .onAppear {
+            currentProfileHash = groupProfile.hashValue
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                focusDisplayName = true
+                withAnimation { focusDisplayName = true }
+            }
+        }
+        .onDisappear {
+            if canUpdateProfile {
+                showAlert(
+                    title: NSLocalizedString("Save group profile?", comment: "alert title"),
+                    message: NSLocalizedString("Group profile was changed. If you save it, the updated profile will be sent to group members.", comment: "alert message"),
+                    buttonTitle: NSLocalizedString("Save (and notify members)", comment: "alert button"),
+                    buttonAction: saveProfile,
+                    cancelButton: true
+                )
             }
         }
         .alert(item: $alert) { a in
@@ -135,30 +133,30 @@ struct GroupProfileView: View {
                 return createInvalidNameAlert(name, $groupProfile.displayName)
             }
         }
-        .contentShape(Rectangle())
-        .onTapGesture { hideKeyboard() }
+        .navigationBarTitle("Group profile")
+        .modifier(ThemedBackground(grouped: true))
+        .navigationBarTitleDisplayMode(focusDisplayName ? .inline : .large)
     }
 
-    private func canUpdateProfile() -> Bool {
-        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
+    private var canUpdateProfile: Bool {
+        currentProfileHash != groupProfile.hashValue &&
+        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" &&
+        validNewProfileName
     }
 
-    private func validNewProfileName() -> Bool {
+    private var validNewProfileName: Bool {
         groupProfile.displayName == groupInfo.groupProfile.displayName
             || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
     }
 
-    func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
-        TextField(label, text: name)
-            .padding(.leading, 32)
-    }
-
     func saveProfile() {
         Task {
             do {
                 groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
+                groupProfile.fullName = groupProfile.fullName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
+                    currentProfileHash = groupProfile.hashValue
                     groupInfo = gInfo
                     chatModel.updateGroup(gInfo)
                     dismiss()
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift b/apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift
index 8dfc32f6ea..97bff70efb 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift
@@ -18,6 +18,7 @@ struct GroupWelcomeView: View {
     @State private var editMode = true
     @FocusState private var keyboardVisible: Bool
     @State private var showSaveDialog = false
+    @State private var showSecrets: Set<Int> = []
 
     let maxByteCount = 1200
 
@@ -58,7 +59,8 @@ struct GroupWelcomeView: View {
     }
 
     private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false, secondaryColor: theme.colors.secondary)
+        let r = messageText(welcomeText, parseSimpleXMarkdown(welcomeText), sender: nil, mentions: nil, userMemberId: nil, showSecrets: showSecrets, backgroundColor: UIColor(theme.colors.background))
+        return msgTextResultView(r, Text(AttributedString(r.string)), showSecrets: $showSecrets)
             .frame(minHeight: 130, alignment: .topLeading)
             .frame(maxWidth: .infinity, alignment: .leading)
     }
diff --git a/apps/ios/Shared/Views/Chat/Group/MemberAdmissionView.swift b/apps/ios/Shared/Views/Chat/Group/MemberAdmissionView.swift
new file mode 100644
index 0000000000..d80615b5d2
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/Group/MemberAdmissionView.swift
@@ -0,0 +1,93 @@
+//
+//  MemberAdmissionView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+private let memberCriterias: [(criteria: MemberCriteria?, text: LocalizedStringKey)] = [
+    (nil, "off"),
+    (.all, "all")
+]
+
+struct MemberAdmissionView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @Binding var groupInfo: GroupInfo
+    @Binding var admission: GroupMemberAdmission
+    var currentAdmission: GroupMemberAdmission
+    let creatingGroup: Bool
+    let saveAdmission: () -> Void
+    @State private var showSaveDialogue = false
+
+    var body: some View {
+        let saveText: LocalizedStringKey = creatingGroup ? "Save" : "Save and notify group members"
+        VStack {
+            List {
+                admissionSection(
+                    NSLocalizedString("Review members", comment: "admission stage"),
+                    NSLocalizedString("Review members before admitting (\"knocking\").", comment: "admission stage description"),
+                    $admission.review
+                )
+
+                if groupInfo.isOwner {
+                    Section {
+                        Button("Reset") { admission = currentAdmission }
+                        Button(saveText) { saveAdmission() }
+                    }
+                    .disabled(currentAdmission == admission)
+                }
+            }
+        }
+        .modifier(BackButton(disabled: Binding.constant(false)) {
+            if currentAdmission == admission {
+                dismiss()
+            } else {
+                showSaveDialogue = true
+            }
+        })
+        .confirmationDialog("Save admission settings?", isPresented: $showSaveDialogue) {
+            Button(saveText) {
+                saveAdmission()
+                dismiss()
+            }
+            Button("Exit without saving") {
+                admission = currentAdmission
+                dismiss()
+            }
+        }
+    }
+
+    private func admissionSection(_ admissionStageStr: String, _ admissionStageDescrStr: String, _ memberCriteria: Binding<MemberCriteria?>) -> some View {
+        Section {
+            if groupInfo.isOwner {
+                Picker(admissionStageStr, selection: memberCriteria) {
+                    ForEach(memberCriterias, id: \.criteria) { mc in
+                        Text(mc.text)
+                    }
+                }
+                .frame(height: 36)
+            } else {
+                infoRow(Text(admissionStageStr), memberCriteria.wrappedValue?.text ?? NSLocalizedString("off", comment: "member criteria value"))
+            }
+        } footer: {
+            Text(admissionStageDescrStr)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}
+
+#Preview {
+    MemberAdmissionView(
+        groupInfo: Binding.constant(GroupInfo.sampleData),
+        admission: Binding.constant(GroupMemberAdmission.sampleData),
+        currentAdmission: GroupMemberAdmission.sampleData,
+        creatingGroup: false,
+        saveAdmission: {}
+    )
+}
diff --git a/apps/ios/Shared/Views/Chat/Group/MemberSupportChatToolbar.swift b/apps/ios/Shared/Views/Chat/Group/MemberSupportChatToolbar.swift
new file mode 100644
index 0000000000..23001e64bf
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/Group/MemberSupportChatToolbar.swift
@@ -0,0 +1,44 @@
+//
+//  MemberSupportChatToolbar.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 01.05.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MemberSupportChatToolbar: View {
+    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
+    var groupMember: GroupMember
+    var imageSize: CGFloat = 32
+    
+    var body: some View {
+        return HStack {
+            MemberProfileImage(groupMember, size: imageSize)
+                .padding(.trailing, 4)
+            let t = Text(groupMember.chatViewName).font(.headline)
+            (groupMember.verified ? memberVerifiedShield + t : t)
+                .lineLimit(1)
+        }
+        .foregroundColor(theme.colors.onBackground)
+        .frame(width: 220)
+    }
+
+    private var memberVerifiedShield: Text {
+        (Text(Image(systemName: "checkmark.shield")) + textSpace)
+            .font(.caption)
+            .foregroundColor(theme.colors.secondary)
+            .baselineOffset(1)
+            .kerning(-2)
+    }
+}
+
+#Preview {
+    MemberSupportChatToolbar(
+        groupMember: GroupMember.sampleData
+    )
+    .environmentObject(CurrentColors.toAppTheme())
+}
diff --git a/apps/ios/Shared/Views/Chat/Group/MemberSupportView.swift b/apps/ios/Shared/Views/Chat/Group/MemberSupportView.swift
new file mode 100644
index 0000000000..7f3672ea17
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/Group/MemberSupportView.swift
@@ -0,0 +1,287 @@
+//
+//  MemberSupportView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MemberSupportView: View {
+    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @State private var searchText: String = ""
+    @FocusState private var searchFocussed
+    var groupInfo: GroupInfo
+    @Binding var scrollToItemId: ChatItem.ID?
+
+    var body: some View {
+        viewBody()
+            .onAppear {
+                Task {
+                    await chatModel.loadGroupMembers(groupInfo)
+                }
+            }
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        Task {
+                            await chatModel.loadGroupMembers(groupInfo)
+                        }
+                    } label: {
+                        Image(systemName: "arrow.clockwise")
+                    }
+                }
+            }
+    }
+
+    @ViewBuilder private func viewBody() -> some View {
+        let membersWithChats = sortedMembersWithChats()
+        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+        let filteredMembersWithChats = s == ""
+        ? membersWithChats
+        : membersWithChats.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) }
+
+        if membersWithChats.isEmpty {
+            Text("No chats with members")
+                .foregroundColor(.secondary)
+        } else {
+            List {
+                searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
+                    .padding(.leading, 8)
+                ForEach(filteredMembersWithChats) { memberWithChat in
+                    MemberSupportChatNavLink(
+                        groupInfo: groupInfo,
+                        memberWithChat: memberWithChat,
+                        scrollToItemId: $scrollToItemId
+                    )
+                }
+            }
+        }
+    }
+
+    struct MemberSupportChatNavLink: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @EnvironmentObject var theme: AppTheme
+        @State private var memberSupportChatNavLinkActive = false
+        var groupInfo: GroupInfo
+        var memberWithChat: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
+
+        var body: some View {
+            ZStack {
+                let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: memberWithChat.wrapped)
+                Button {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo)) {
+                        memberSupportChatNavLinkActive = true
+                    }
+                } label: {
+                    SupportChatRowView(groupMember: memberWithChat, groupInfo: groupInfo)
+                }
+
+                NavigationLink(isActive: $memberSupportChatNavLinkActive) {
+                    SecondaryChatView(
+                        chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                        scrollToItemId: $scrollToItemId
+                    )
+                } label: {
+                    EmptyView()
+                }
+                .frame(width: 1, height: 1)
+                .hidden()
+            }
+            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                if memberWithChat.wrapped.memberPending {
+                    Button {
+                        showAcceptMemberAlert(groupInfo, memberWithChat.wrapped)
+                    } label: {
+                        Label("Accept", systemImage: "checkmark")
+                    }
+                    .tint(theme.colors.primary)
+                } else {
+                    Button {
+                        showDeleteMemberSupportChatAlert(groupInfo, memberWithChat.wrapped)
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                    }
+                    .tint(.red)
+                }
+            }
+        }
+    }
+
+    func sortedMembersWithChats() -> [GMember] {
+        chatModel.groupMembers
+            .filter {
+                $0.wrapped.supportChat != nil &&
+                $0.wrapped.memberStatus != .memLeft &&
+                $0.wrapped.memberStatus != .memRemoved
+            }
+            .sorted { (m0: GMember, m1: GMember) -> Bool in
+                if m0.wrapped.memberPending != m1.wrapped.memberPending {
+                    return m0.wrapped.memberPending
+                }
+
+                let mentions0 = (m0.wrapped.supportChat?.mentions ?? 0) > 0
+                let mentions1 = (m1.wrapped.supportChat?.mentions ?? 0) > 0
+                if mentions0 != mentions1 {
+                    return mentions0
+                }
+
+                let attention0 = (m0.wrapped.supportChat?.memberAttention ?? 0) > 0
+                let attention1 = (m1.wrapped.supportChat?.memberAttention ?? 0) > 0
+                if attention0 != attention1 {
+                    return attention0
+                }
+
+                let unread0 = (m0.wrapped.supportChat?.unread ?? 0) > 0
+                let unread1 = (m1.wrapped.supportChat?.unread ?? 0) > 0
+                if unread0 != unread1 {
+                    return unread0
+                }
+
+                return (m0.wrapped.supportChat?.chatTs ?? .distantPast) > (m1.wrapped.supportChat?.chatTs ?? .distantPast)
+            }
+    }
+
+    private struct SupportChatRowView: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @ObservedObject var groupMember: GMember
+        @EnvironmentObject var theme: AppTheme
+        @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+        var groupInfo: GroupInfo
+
+        var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+
+        var body: some View {
+            let member = groupMember.wrapped
+            HStack{
+                MemberProfileImage(member, size: 38)
+                    .padding(.trailing, 2)
+                VStack(alignment: .leading) {
+                    let t = Text(member.chatViewName).foregroundColor(theme.colors.onBackground)
+                    (member.verified ? memberVerifiedShield + t : t)
+                        .lineLimit(1)
+                    Text(memberStatus(member))
+                        .lineLimit(1)
+                        .font(.caption)
+                        .foregroundColor(theme.colors.secondary)
+                }
+
+                Spacer()
+
+                if member.memberPending {
+                    Image(systemName: "flag.fill")
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: dynamicChatInfoSize * 0.8, height: dynamicChatInfoSize * 0.8)
+                        .foregroundColor(theme.colors.primary)
+                }
+                if let supportChat = member.supportChat {
+                    SupportChatUnreadIndicator(supportChat: supportChat)
+                }
+            }
+        }
+
+        private func memberStatus(_ member: GroupMember) -> LocalizedStringKey {
+            if member.activeConn?.connDisabled ?? false {
+                return "disabled"
+            } else if member.activeConn?.connInactive ?? false {
+                return "inactive"
+            } else if member.memberPending {
+                return member.memberStatus.text
+            } else {
+                return LocalizedStringKey(member.memberRole.text)
+            }
+        }
+
+        struct SupportChatUnreadIndicator: View {
+            @EnvironmentObject var theme: AppTheme
+            @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+            var supportChat: GroupSupportChat
+
+            var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+
+            private var indicatorTint: Color {
+                if supportChat.mentions > 0 || supportChat.memberAttention > 0 {
+                    return theme.colors.primary
+                } else {
+                    return theme.colors.secondary
+                }
+            }
+
+            var body: some View {
+                HStack(alignment: .center, spacing: 2) {
+                    if supportChat.unread > 0 || supportChat.mentions > 0 || supportChat.memberAttention > 0 {
+                        if supportChat.mentions > 0 && supportChat.unread > 1 {
+                            Text("\(MENTION_START)")
+                                .font(userFont <= .xxxLarge ? .body : .callout)
+                                .foregroundColor(indicatorTint)
+                                .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                                .cornerRadius(dynamicSize(userFont).unreadCorner)
+                                .padding(.bottom, 1)
+                        }
+                        let singleUnreadIsMention = supportChat.mentions > 0 && supportChat.unread == 1
+                        (singleUnreadIsMention ? Text("\(MENTION_START)") : unreadCountText(supportChat.unread))
+                            .font(userFont <= .xxxLarge ? .caption : .caption2)
+                            .foregroundColor(.white)
+                            .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+                            .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                            .background(indicatorTint)
+                            .cornerRadius(dynamicSize(userFont).unreadCorner)
+                    }
+                }
+                .frame(height: dynamicChatInfoSize)
+                .frame(minWidth: 22)
+            }
+        }
+
+        private var memberVerifiedShield: Text {
+            (Text(Image(systemName: "checkmark.shield")) + textSpace)
+                .font(.caption)
+                .baselineOffset(2)
+                .kerning(-2)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}
+
+func showDeleteMemberSupportChatAlert(_ groupInfo: GroupInfo, _ member: GroupMember) {
+    showAlert(
+        title: NSLocalizedString("Delete chat with member?", comment: "alert title"),
+        buttonTitle: "Delete",
+        buttonAction: { deleteMemberSupportChat(groupInfo, member) },
+        cancelButton: true
+    )
+}
+
+func deleteMemberSupportChat(_ groupInfo: GroupInfo, _ member: GroupMember) {
+    Task {
+        do {
+            let (gInfo, updatedMember) = try await apiDeleteMemberSupportChat(groupInfo.groupId, member.groupMemberId)
+            await MainActor.run {
+                _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
+                ChatModel.shared.updateGroup(gInfo)
+            }
+            // TODO member row doesn't get removed from list (upsertGroupMember correctly sets supportChat to nil) - this repopulates list to fix it
+            await ChatModel.shared.loadGroupMembers(gInfo)
+        } catch let error {
+            logger.error("apiDeleteMemberSupportChat error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error deleting chat with member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    MemberSupportView(
+        groupInfo: GroupInfo.sampleData,
+        scrollToItemId: Binding.constant(nil)
+    )
+}
diff --git a/apps/ios/Shared/Views/Chat/Group/SecondaryChatView.swift b/apps/ios/Shared/Views/Chat/Group/SecondaryChatView.swift
new file mode 100644
index 0000000000..47c5df264f
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/Group/SecondaryChatView.swift
@@ -0,0 +1,42 @@
+//
+//  SecondaryChatView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 29.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct SecondaryChatView: View {
+    @EnvironmentObject var chatModel: ChatModel
+    @ObservedObject var chat: Chat
+    @Binding var scrollToItemId: ChatItem.ID?
+
+    var body: some View {
+        if let im = chatModel.secondaryIM {
+            ChatView(
+                chat: chat,
+                im: im,
+                mergedItems: BoxedValue(MergedItems.create(im, [])),
+                floatingButtonModel: FloatingButtonModel(im: im),
+                scrollToItemId: $scrollToItemId
+            )
+            .onDisappear {
+                chatModel.secondaryIM = nil
+            }
+        }
+    }
+}
+
+#Preview {
+    SecondaryChatView(
+        chat: Chat(
+            chatInfo: .group(groupInfo: GroupInfo.sampleData, groupChatScope: .memberSupport(groupMember_: GroupMember.sampleData)),
+            chatItems: [],
+            chatStats: ChatStats()
+        ),
+        scrollToItemId: Binding.constant(nil)
+    )
+}
diff --git a/apps/ios/Shared/Views/Chat/ReverseList.swift b/apps/ios/Shared/Views/Chat/ReverseList.swift
deleted file mode 100644
index e33adcef58..0000000000
--- a/apps/ios/Shared/Views/Chat/ReverseList.swift
+++ /dev/null
@@ -1,371 +0,0 @@
-//
-//  ReverseList.swift
-//  SimpleX (iOS)
-//
-//  Created by Levitating Pineapple on 11/06/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-import SimpleXChat
-
-/// A List, which displays it's items in reverse order - from bottom to top
-struct ReverseList<Content: View>: UIViewControllerRepresentable {
-    let items: Array<ChatItem>
-
-    @Binding var scrollState: ReverseListScrollModel.State
-
-    /// Closure, that returns user interface for a given item
-    let content: (ChatItem) -> Content
-
-    let loadPage: () -> Void
-
-    func makeUIViewController(context: Context) -> Controller {
-        Controller(representer: self)
-    }
-
-    func updateUIViewController(_ controller: Controller, context: Context) {
-        controller.representer = self
-        if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
-            controller.view.layer.removeAllAnimations()
-            switch destination {
-            case .nextPage:
-                controller.scrollToNextPage()
-            case let .item(id):
-                controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
-            case .bottom:
-                controller.scroll(to: 0, position: .top)
-            }
-        } else {
-            controller.update(items: items)
-        }
-    }
-
-    /// Controller, which hosts SwiftUI cells
-    class Controller: UITableViewController {
-        private enum Section { case main }
-        var representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, ChatItem>!
-        private var itemCount: Int = 0
-        private let updateFloatingButtons = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-
-        init(representer: ReverseList) {
-            self.representer = representer
-            super.init(style: .plain)
-
-            // 1. Style
-            tableView = InvertedTableView()
-            tableView.separatorStyle = .none
-            tableView.transform = .verticalFlip
-            tableView.backgroundColor = .clear
-
-            // 2. Register cells
-            if #available(iOS 16.0, *) {
-                tableView.register(
-                    UITableViewCell.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            } else {
-                tableView.register(
-                    HostingCell<Content>.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            }
-
-            // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
-                tableView: tableView
-            ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8 {
-                    self.representer.loadPage()
-                }
-                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
-                if #available(iOS 16.0, *) {
-                    cell.contentConfiguration = UIHostingConfiguration { self.representer.content(item) }
-                        .margins(.all, 0)
-                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
-                } else {
-                    if let cell = cell as? HostingCell<Content> {
-                        cell.set(content: self.representer.content(item), parent: self)
-                    } else {
-                        fatalError("Unexpected Cell Type for: \(item)")
-                    }
-                }
-                cell.transform = .verticalFlip
-                cell.selectionStyle = .none
-                cell.backgroundColor = .clear
-                return cell
-            }
-
-            // 4. External state changes will require manual layout updates
-            NotificationCenter.default
-                .addObserver(
-                    self,
-                    selector: #selector(updateLayout),
-                    name: notificationName,
-                    object: nil
-                )
-
-            updateFloatingButtons
-                .throttle(for: 0.2, scheduler: DispatchQueue.global(qos: .background), latest: true)
-                .sink {
-                    if let listState = DispatchQueue.main.sync(execute: { [weak self] in self?.getListState() }) {
-                        ChatView.FloatingButtonModel.shared.updateOnListChange(listState)
-                    }
-                }
-                .store(in: &bag)
-        }
-
-        @available(*, unavailable)
-        required init?(coder: NSCoder) { fatalError() }
-
-        deinit { NotificationCenter.default.removeObserver(self) }
-
-        @objc private func updateLayout() {
-            if #available(iOS 16.0, *) {
-                tableView.setNeedsLayout()
-                tableView.layoutIfNeeded()
-            } else {
-                tableView.reloadData()
-            }
-        }
-
-        /// Hides keyboard, when user begins to scroll.
-        /// Equivalent to `.scrollDismissesKeyboard(.immediately)`
-        override func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
-            UIApplication.shared
-                .sendAction(
-                    #selector(UIResponder.resignFirstResponder),
-                    to: nil,
-                    from: nil,
-                    for: nil
-                )
-            NotificationCenter.default.post(name: .chatViewWillBeginScrolling, object: nil)
-        }
-
-        override func viewDidAppear(_ animated: Bool) {
-            tableView.clipsToBounds = false
-            parent?.viewIfLoaded?.clipsToBounds = false
-        }
-
-        /// Scrolls up
-        func scrollToNextPage() {
-            tableView.setContentOffset(
-                CGPoint(
-                    x: tableView.contentOffset.x,
-                    y: tableView.contentOffset.y + tableView.bounds.height
-                ),
-                animated: true
-            )
-            Task { representer.scrollState = .atDestination }
-        }
-
-        /// Scrolls to Item at index path
-        /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
-        func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            var animated = false
-            if #available(iOS 16.0, *) {
-                animated = true
-            }
-            if let index, tableView.numberOfRows(inSection: 0) != 0 {
-                tableView.scrollToRow(
-                    at: IndexPath(row: index, section: 0),
-                    at: position,
-                    animated: animated
-                )
-            } else {
-                tableView.setContentOffset(
-                    CGPoint(x: .zero, y: -InvertedTableView.inset),
-                    animated: animated
-                )
-            }
-            Task { representer.scrollState = .atDestination }
-        }
-
-        func update(items: [ChatItem]) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, ChatItem>()
-            snapshot.appendSections([.main])
-            snapshot.appendItems(items)
-            dataSource.defaultRowAnimation = .none
-            dataSource.apply(
-                snapshot,
-                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
-            )
-            // Sets content offset on initial load
-            if itemCount == 0 {
-                tableView.setContentOffset(
-                    CGPoint(x: 0, y: -InvertedTableView.inset),
-                    animated: false
-                )
-            }
-            itemCount = items.count
-            updateFloatingButtons.send()
-        }
-
-        override func scrollViewDidScroll(_ scrollView: UIScrollView) {
-            updateFloatingButtons.send()
-        }
-
-        func getListState() -> ListState? {
-            if let visibleRows = tableView.indexPathsForVisibleRows,
-                visibleRows.last?.item ?? 0 < representer.items.count {
-                let scrollOffset: Double = tableView.contentOffset.y + InvertedTableView.inset
-                let topItemDate: Date? =
-                    if let lastVisible = visibleRows.last(where: { isVisible(indexPath: $0) }) {
-                        representer.items[lastVisible.item].meta.itemTs
-                    } else {
-                        nil
-                    }
-                let bottomItemId: ChatItem.ID? =
-                    if let firstVisible = visibleRows.first(where: { isVisible(indexPath: $0) }) {
-                        representer.items[firstVisible.item].id
-                    } else {
-                        nil
-                    }
-                return (scrollOffset: scrollOffset, topItemDate: topItemDate, bottomItemId: bottomItemId)
-            }
-            return nil
-        }
-        
-        private func isVisible(indexPath: IndexPath) -> Bool {
-            if let relativeFrame = tableView.superview?.convert(
-                tableView.rectForRow(at: indexPath),
-                from: tableView
-            ) {
-                relativeFrame.maxY > InvertedTableView.inset &&
-                relativeFrame.minY < tableView.frame.height - InvertedTableView.inset
-            } else { false }
-        }
-    }
-
-    /// `UIHostingConfiguration` back-port for iOS14 and iOS15
-    /// Implemented as a `UITableViewCell` that wraps and manages a generic `UIHostingController`
-    private final class HostingCell<Hosted: View>: UITableViewCell {
-        private let hostingController = UIHostingController<Hosted?>(rootView: nil)
-
-        /// Updates content of the cell
-        /// For reference: https://noahgilmore.com/blog/swiftui-self-sizing-cells/
-        func set(content: Hosted, parent: UIViewController) {
-            hostingController.view.backgroundColor = .clear
-            hostingController.rootView = content
-            if let hostingView = hostingController.view {
-                hostingView.invalidateIntrinsicContentSize()
-                if hostingController.parent != parent { parent.addChild(hostingController) }
-                if !contentView.subviews.contains(hostingController.view) {
-                    contentView.addSubview(hostingController.view)
-                    hostingView.translatesAutoresizingMaskIntoConstraints = false
-                    NSLayoutConstraint.activate([
-                        hostingView.leadingAnchor
-                            .constraint(equalTo: contentView.leadingAnchor),
-                        hostingView.trailingAnchor
-                            .constraint(equalTo: contentView.trailingAnchor),
-                        hostingView.topAnchor
-                            .constraint(equalTo: contentView.topAnchor),
-                        hostingView.bottomAnchor
-                            .constraint(equalTo: contentView.bottomAnchor)
-                    ])
-                }
-                if hostingController.parent != parent { hostingController.didMove(toParent: parent) }
-            } else {
-                fatalError("Hosting View not loaded \(hostingController)")
-            }
-        }
-
-        override func prepareForReuse() {
-            super.prepareForReuse()
-            hostingController.rootView = nil
-        }
-    }
-}
-
-typealias ListState = (
-    scrollOffset: Double,
-    topItemDate: Date?,
-    bottomItemId: ChatItem.ID?
-)
-
-/// Manages ``ReverseList`` scrolling
-class ReverseListScrollModel: ObservableObject {
-    /// Represents Scroll State of ``ReverseList``
-    enum State: Equatable {
-        enum Destination: Equatable {
-            case nextPage
-            case item(ChatItem.ID)
-            case bottom
-        }
-
-        case scrollingTo(Destination)
-        case atDestination
-    }
-
-    @Published var state: State = .atDestination
-
-    func scrollToNextPage() {
-        state = .scrollingTo(.nextPage)
-    }
-
-    func scrollToBottom() {
-        state = .scrollingTo(.bottom)
-    }
-
-    func scrollToItem(id: ChatItem.ID) {
-        state = .scrollingTo(.item(id))
-    }
-}
-
-fileprivate let cellReuseId = "hostingCell"
-
-fileprivate let notificationName = NSNotification.Name(rawValue: "reverseListNeedsLayout")
-
-fileprivate extension CGAffineTransform {
-    /// Transform that vertically flips the view, preserving it's location
-    static let verticalFlip = CGAffineTransform(scaleX: 1, y: -1)
-}
-
-extension NotificationCenter {
-    static func postReverseListNeedsLayout() {
-        NotificationCenter.default.post(
-            name: notificationName,
-            object: nil
-        )
-    }
-}
-
-/// Disable animation on iOS 15
-func withConditionalAnimation<Result>(
-    _ animation: Animation? = .default,
-    _ body: () throws -> Result
-) rethrows -> Result {
-    if #available(iOS 16.0, *) {
-        try withAnimation(animation, body)
-    } else {
-        try body()
-    }
-}
-
-class InvertedTableView: UITableView {
-    static let inset = CGFloat(100)
-
-    static let insets = UIEdgeInsets(
-        top: inset,
-        left: .zero,
-        bottom: inset,
-        right: .zero
-    )
-
-    override var contentInsetAdjustmentBehavior: UIScrollView.ContentInsetAdjustmentBehavior {
-        get { .never }
-        set { }
-    }
-
-    override var contentInset: UIEdgeInsets {
-        get { Self.insets }
-        set { }
-    }
-
-    override var adjustedContentInset: UIEdgeInsets {
-        Self.insets
-    }
-}
diff --git a/apps/ios/Shared/Views/Chat/ScrollViewCells.swift b/apps/ios/Shared/Views/Chat/ScrollViewCells.swift
new file mode 100644
index 0000000000..d062627d5b
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/ScrollViewCells.swift
@@ -0,0 +1,52 @@
+//
+//  ScrollViewCells.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 27.01.2025.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+protocol ReusableView {
+    func prepareForReuse()
+}
+
+/// `UIHostingConfiguration` back-port for iOS14 and iOS15
+/// Implemented as a `UIView` that wraps and manages a generic `UIHostingController`
+final class HostingCell<Hosted: View>: UIView, ReusableView {
+    private let hostingController = UIHostingController<Hosted?>(rootView: nil)
+
+    /// Updates content of the cell
+    /// For reference: https://noahgilmore.com/blog/swiftui-self-sizing-cells/
+    func set(content: Hosted, parent: UIViewController) {
+        hostingController.view.backgroundColor = .clear
+        hostingController.rootView = content
+        if let hostingView = hostingController.view {
+            hostingView.invalidateIntrinsicContentSize()
+            if hostingController.parent != parent { parent.addChild(hostingController) }
+            if !subviews.contains(hostingController.view) {
+                addSubview(hostingController.view)
+                hostingView.translatesAutoresizingMaskIntoConstraints = false
+                NSLayoutConstraint.activate([
+                    hostingView.leadingAnchor
+                        .constraint(equalTo: leadingAnchor),
+                    hostingView.trailingAnchor
+                        .constraint(equalTo: trailingAnchor),
+                    hostingView.topAnchor
+                        .constraint(equalTo: topAnchor),
+                    hostingView.bottomAnchor
+                        .constraint(equalTo: bottomAnchor)
+                ])
+            }
+            if hostingController.parent != parent { hostingController.didMove(toParent: parent) }
+        } else {
+            fatalError("Hosting View not loaded \(hostingController)")
+        }
+    }
+
+    func prepareForReuse() {
+        //super.prepareForReuse()
+        hostingController.rootView = nil
+    }
+}
diff --git a/apps/ios/Shared/Views/Chat/SelectableChatItemToolbars.swift b/apps/ios/Shared/Views/Chat/SelectableChatItemToolbars.swift
index 81498ee497..e397970acd 100644
--- a/apps/ios/Shared/Views/Chat/SelectableChatItemToolbars.swift
+++ b/apps/ios/Shared/Views/Chat/SelectableChatItemToolbars.swift
@@ -25,17 +25,20 @@ struct SelectedItemsTopToolbar: View {
 struct SelectedItemsBottomToolbar: View {
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var theme: AppTheme
-    let chatItems: [ChatItem]
+    let im: ItemsModel
     @Binding var selectedChatItems: Set<Int64>?
     var chatInfo: ChatInfo
     // Bool - delete for everyone is possible
     var deleteItems: (Bool) -> Void
+    var archiveItems: () -> Void
     var moderateItems: () -> Void
     //var shareItems: () -> Void
     var forwardItems: () -> Void
     @State var deleteEnabled: Bool = false
     @State var deleteForEveryoneEnabled: Bool = false
 
+    @State var canArchiveReports: Bool = false
+
     @State var canModerate: Bool = false
     @State var moderateEnabled: Bool = false
 
@@ -50,7 +53,11 @@ struct SelectedItemsBottomToolbar: View {
 
             HStack(alignment: .center) {
                 Button {
-                    deleteItems(deleteForEveryoneEnabled)
+                    if canArchiveReports {
+                        archiveItems()
+                    } else {
+                        deleteItems(deleteForEveryoneEnabled)
+                    }
                 } label: {
                     Image(systemName: "trash")
                         .resizable()
@@ -68,9 +75,9 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || deleteCountProhibited ? theme.colors.secondary : .red)
+                        .foregroundColor(!moderateEnabled || deleteCountProhibited || im.secondaryIMFilter != nil ? theme.colors.secondary : .red)
                 }
-                .disabled(!moderateEnabled || deleteCountProhibited)
+                .disabled(!moderateEnabled || deleteCountProhibited || im.secondaryIMFilter != nil)
                 .opacity(canModerate ? 1 : 0)
 
                 Spacer()
@@ -81,24 +88,24 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!forwardEnabled || forwardCountProhibited ? theme.colors.secondary : theme.colors.primary)
+                        .foregroundColor(!forwardEnabled || forwardCountProhibited || im.secondaryIMFilter != nil ? theme.colors.secondary : theme.colors.primary)
                 }
-                .disabled(!forwardEnabled || forwardCountProhibited)
+                .disabled(!forwardEnabled || forwardCountProhibited || im.secondaryIMFilter != nil)
             }
             .frame(maxHeight: .infinity)
             .padding([.leading, .trailing], 12)
         }
         .onAppear {
-            recheckItems(chatInfo, chatItems, selectedChatItems)
+            recheckItems(chatInfo, im.reversedChatItems, selectedChatItems)
         }
         .onChange(of: chatInfo) { info in
-            recheckItems(info, chatItems, selectedChatItems)
+            recheckItems(info, im.reversedChatItems, selectedChatItems)
         }
-        .onChange(of: chatItems) { items in
+        .onChange(of: im.reversedChatItems) { items in
             recheckItems(chatInfo, items, selectedChatItems)
         }
         .onChange(of: selectedChatItems) { selected in
-            recheckItems(chatInfo, chatItems, selected)
+            recheckItems(chatInfo, im.reversedChatItems, selected)
         }
         .frame(height: 55.5)
         .background(.thinMaterial)
@@ -109,19 +116,25 @@ struct SelectedItemsBottomToolbar: View {
         deleteCountProhibited = count == 0 || count > 200
         forwardCountProhibited = count == 0 || count > 20
         canModerate = possibleToModerate(chatInfo)
+        let groupInfo: GroupInfo? = if case let ChatInfo.group(groupInfo: info, _) = chatInfo {
+            info
+        } else {
+             nil
+        }
         if let selected = selectedItems {
             let me: Bool
             let onlyOwnGroupItems: Bool
-            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, forwardEnabled, selectedChatItems) = chatItems.reduce((true, true, true, true, true, [])) { (r, ci) in
+            (deleteEnabled, deleteForEveryoneEnabled, canArchiveReports, me, onlyOwnGroupItems, forwardEnabled, selectedChatItems) = chatItems.reduce((true, true, true, true, true, true, [])) { (r, ci) in
                 if selected.contains(ci.id) {
-                    var (de, dee, me, onlyOwnGroupItems, fe, sel) = r
+                    var (de, dee, ar, me, onlyOwnGroupItems, fe, sel) = r
                     de = de && ci.canBeDeletedForSelf
                     dee = dee && ci.meta.deletable && !ci.localNote && !ci.isReport
+                    ar = ar && ci.isActiveReport && ci.chatDir != .groupSnd && groupInfo != nil && groupInfo!.membership.memberRole >= .moderator
                     onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd && !ci.isReport
                     me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil && !ci.isReport
                     fe = fe && ci.content.msgContent != nil && ci.meta.itemDeleted == nil && !ci.isLiveDummy && !ci.isReport
                     sel.insert(ci.id) // we are collecting new selected items here to account for any changes in chat items list
-                    return (de, dee, me, onlyOwnGroupItems, fe, sel)
+                    return (de, dee, ar, me, onlyOwnGroupItems, fe, sel)
                 } else {
                     return r
                 }
@@ -132,7 +145,7 @@ struct SelectedItemsBottomToolbar: View {
 
     private func possibleToModerate(_ chatInfo: ChatInfo) -> Bool {
         return switch chatInfo {
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             groupInfo.membership.memberRole >= .admin
         default: false
         }
diff --git a/apps/ios/Shared/Views/Chat/VerifyCodeView.swift b/apps/ios/Shared/Views/Chat/VerifyCodeView.swift
index 7b01fe0300..373311073a 100644
--- a/apps/ios/Shared/Views/Chat/VerifyCodeView.swift
+++ b/apps/ios/Shared/Views/Chat/VerifyCodeView.swift
@@ -24,85 +24,70 @@ struct VerifyCodeView: View {
     }
 
     private func verifyCodeView(_ code: String) -> some View {
-        ScrollView {
-            let splitCode = splitToParts(code, length: 24)
-            VStack(alignment: .leading) {
-                Group {
+        let splitCode = splitToParts(code, length: 24)
+        return List {
+            Section {
+                QRCode(uri: code, small: true)
+
+                Text(splitCode)
+                    .multilineTextAlignment(.leading)
+                    .font(.body.monospaced())
+                    .lineLimit(20)
+                    .frame(maxWidth: .infinity, alignment: .center)
+            } header: {
+                if connectionVerified {
                     HStack {
-                        if connectionVerified {
-                            Image(systemName: "checkmark.shield")
-                                .foregroundColor(theme.colors.secondary)
-                            Text("\(displayName) is verified")
-                        } else {
-                            Text("\(displayName) is not verified")
-                        }
+                        Image(systemName: "checkmark.shield").foregroundColor(theme.colors.secondary)
+                        Text("\(displayName) is verified").textCase(.none)
                     }
-                    .frame(height: 24)
-
-                    QRCode(uri: code)
-                        .padding(.horizontal)
-
-                    Text(splitCode)
-                        .multilineTextAlignment(.leading)
-                        .font(.body.monospaced())
-                        .lineLimit(20)
-                        .padding(.bottom, 8)
+                } else {
+                    Text("\(displayName) is not verified").textCase(.none)
                 }
-                .frame(maxWidth: .infinity, alignment: .center)
-
+            } footer: {
                 Text("To verify end-to-end encryption with your contact compare (or scan) the code on your devices.")
-                    .padding(.bottom)
+            }
 
-                Group {
-                    if connectionVerified {
-                        Button {
-                            verifyCode(nil)
-                        } label: {
-                            Label("Clear verification", systemImage: "shield")
-                        }
-                        .padding()
-                    } else {
-                        HStack {
-                            NavigationLink {
-                                ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
-                                    .navigationBarTitleDisplayMode(.large)
-                                    .navigationTitle("Scan code")
-                                    .modifier(ThemedBackground())
-                            } label: {
-                                Label("Scan code", systemImage: "qrcode")
-                            }
-                            .padding()
-                            Button {
-                                verifyCode(code) { verified in
-                                    if !verified { showCodeError = true }
-                                }
-                            } label: {
-                                Label("Mark verified", systemImage: "checkmark.shield")
-                            }
-                            .padding()
-                            .alert(isPresented: $showCodeError) {
-                                Alert(title: Text("Incorrect security code!"))
-                            }
-                        }
-                    }
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
-            }
-            .padding()
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-            .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
+            Section {
+                if connectionVerified {
                     Button {
-                        showShareSheet(items: [splitCode])
+                        verifyCode(nil)
                     } label: {
-                        Image(systemName: "square.and.arrow.up")
+                        Label("Clear verification", systemImage: "shield")
+                    }
+                } else {
+                    NavigationLink {
+                        ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
+                            .navigationBarTitleDisplayMode(.large)
+                            .navigationTitle("Scan code")
+                            .modifier(ThemedBackground())
+                    } label: {
+                        Label("Scan code", systemImage: "qrcode")
+                    }
+                    Button {
+                        verifyCode(code) { verified in
+                            if !verified { showCodeError = true }
+                        }
+                    } label: {
+                        Label("Mark verified", systemImage: "checkmark.shield")
+                    }
+                    .alert(isPresented: $showCodeError) {
+                        Alert(title: Text("Incorrect security code!"))
                     }
                 }
             }
-            .onChange(of: connectionVerified) { _ in
-                if connectionVerified { dismiss() }
+        }
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button {
+                    showShareSheet(items: [splitCode])
+                } label: {
+                    Image(systemName: "square.and.arrow.up")
+                }
             }
         }
+        .onChange(of: connectionVerified) { _ in
+            if connectionVerified { dismiss() }
+        }
     }
 
     private func verifyCode(_ code: String?, _ cb: ((Bool) -> Void)? = nil) {
diff --git a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
index f1ee4e4c42..1e747b8019 100644
--- a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
@@ -66,7 +66,7 @@ struct ChatListNavLink: View {
             switch chat.chatInfo {
             case let .direct(contact):
                 contactNavLink(contact)
-            case let .group(groupInfo):
+            case let .group(groupInfo, _):
                 groupNavLink(groupInfo)
             case let .local(noteFolder):
                 noteFolderNavLink(noteFolder)
@@ -90,11 +90,11 @@ struct ChatListNavLink: View {
         .actionSheet(item: $actionSheet) { $0.actionSheet }
     }
     
-    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
+    private func contactNavLink(_ contact: Contact) -> some View {
         Group {
             if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
                 ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: dynamicRowHeight)
+                    .frameCompat(height: dynamicRowHeight)
                     .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                         Button {
                             deleteContactDialog(
@@ -121,6 +121,7 @@ struct ChatListNavLink: View {
                     selection: $chatModel.chatId,
                     label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                 )
+                .frameCompat(height: dynamicRowHeight)
                 .swipeActions(edge: .leading, allowsFullSwipe: true) {
                     markReadButton()
                     toggleFavoriteButton()
@@ -145,7 +146,6 @@ struct ChatListNavLink: View {
                     }
                     .tint(.red)
                 }
-                .frame(height: dynamicRowHeight)
             }
         }
         .alert(item: $alert) { $0.alert }
@@ -163,7 +163,7 @@ struct ChatListNavLink: View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
             ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
-                .frame(height: dynamicRowHeight)
+                .frameCompat(height: dynamicRowHeight)
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
                     if groupInfo.canDelete {
@@ -183,13 +183,13 @@ struct ChatListNavLink: View {
                 .disabled(inProgress)
         case .memAccepted:
             ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                .frame(height: dynamicRowHeight)
+                .frameCompat(height: dynamicRowHeight)
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
                 }
                 .swipeActions(edge: .trailing) {
                     tagChatButton(chat)
-                    if (groupInfo.membership.memberCurrent) {
+                    if (groupInfo.membership.memberCurrentOrPending) {
                         leaveGroupChatButton(groupInfo)
                     }
                     if groupInfo.canDelete {
@@ -203,7 +203,7 @@ struct ChatListNavLink: View {
                 label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                 disabled: !groupInfo.ready
             )
-            .frame(height: dynamicRowHeight)
+            .frameCompat(height: dynamicRowHeight)
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
                 markReadButton()
                 toggleFavoriteButton()
@@ -211,37 +211,46 @@ struct ChatListNavLink: View {
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 tagChatButton(chat)
+                let showReportsButton = chat.chatStats.reportsCount > 0 && groupInfo.membership.memberRole >= .moderator
                 let showClearButton = !chat.chatItems.isEmpty
                 let showDeleteGroup = groupInfo.canDelete
-                let showLeaveGroup = groupInfo.membership.memberCurrent
-                let totalNumberOfButtons = 1 + (showClearButton ? 1 : 0) + (showDeleteGroup ? 1 : 0) + (showLeaveGroup ? 1 : 0)
+                let showLeaveGroup = groupInfo.membership.memberCurrentOrPending
+                let totalNumberOfButtons = 1 + (showReportsButton ? 1 : 0) + (showClearButton ? 1 : 0) + (showDeleteGroup ? 1 : 0) + (showLeaveGroup ? 1 : 0)
 
-                if showClearButton, totalNumberOfButtons <= 3 {
+                if showClearButton && totalNumberOfButtons <= 3 {
                     clearChatButton()
                 }
-                if (showLeaveGroup) {
+
+                if showReportsButton && totalNumberOfButtons <= 3 {
+                    archiveAllReportsButton()
+                }
+
+                if showLeaveGroup {
                     leaveGroupChatButton(groupInfo)
                 }
-                
-                if showDeleteGroup {
-                    if totalNumberOfButtons <= 3 {
+
+                if showDeleteGroup && totalNumberOfButtons <= 3 {
+                    deleteGroupChatButton(groupInfo)
+                } else if totalNumberOfButtons > 3 {
+                    if showDeleteGroup && !groupInfo.membership.memberActive {
                         deleteGroupChatButton(groupInfo)
+                        moreOptionsButton(false, chat, groupInfo)
                     } else {
-                        moreOptionsButton(chat, groupInfo)
+                        moreOptionsButton(true, chat, groupInfo)
                     }
                 }
             }
         }
     }
 
-    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
+    private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
         NavLinkPlain(
             chatId: chat.chatInfo.id,
             selection: $chatModel.chatId,
             label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
             disabled: !noteFolder.ready
         )
-        .frame(height: dynamicRowHeight)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             markReadButton()
         }
@@ -267,7 +276,7 @@ struct ChatListNavLink: View {
     @ViewBuilder private func markReadButton() -> some View {
         if chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat {
             Button {
-                Task { await markChatRead(chat) }
+                Task { await markChatRead(ItemsModel.shared, chat) }
             } label: {
                 SwipeLabel(NSLocalizedString("Read", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI)
             }
@@ -302,14 +311,22 @@ struct ChatListNavLink: View {
     }
 
     @ViewBuilder private func toggleNtfsButton(chat: Chat) -> some View {
-        Button {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        } label: {
-            if chat.chatInfo.ntfsEnabled {
-                SwipeLabel(NSLocalizedString("Mute", comment: "swipe action"), systemImage: "speaker.slash.fill", inverted: oneHandUI)
-            } else {
-                SwipeLabel(NSLocalizedString("Unmute", comment: "swipe action"), systemImage: "speaker.wave.2.fill", inverted: oneHandUI)
+        if let nextMode = chat.chatInfo.nextNtfMode {
+            Button {
+                toggleNotifications(chat, enableNtfs: nextMode)
+            } label: {
+                SwipeLabel(nextMode.text(mentions: chat.chatInfo.hasMentions), systemImage: nextMode.iconFilled, inverted: oneHandUI)
             }
+        } else {
+            EmptyView()
+        }
+    }
+
+    private func archiveAllReportsButton() -> some View {
+        Button {
+            AlertManager.shared.showAlert(archiveAllReportsAlert())
+        } label: {
+            SwipeLabel(NSLocalizedString("Archive reports", comment: "swipe action"), systemImage: "archivebox", inverted: oneHandUI)
         }
     }
 
@@ -354,15 +371,20 @@ struct ChatListNavLink: View {
         )
     }
     
-    private func moreOptionsButton(_ chat: Chat, _ groupInfo: GroupInfo?) -> some View {
+    private func moreOptionsButton(_ canShowGroupDelete: Bool, _ chat: Chat, _ groupInfo: GroupInfo?) -> some View {
         Button {
-            var buttons: [Alert.Button] = [
-                .default(Text("Clear")) {
-                    AlertManager.shared.showAlert(clearChatAlert())
-                }
-            ]
-            
-            if let gi = groupInfo, gi.canDelete {
+            var buttons: [Alert.Button] = []
+            buttons.append(.default(Text("Clear")) {
+                AlertManager.shared.showAlert(clearChatAlert())
+            })
+
+            if let groupInfo, chat.chatStats.reportsCount > 0 && groupInfo.membership.memberRole >= .moderator && groupInfo.ready {
+                buttons.append(.default(Text("Archive reports")) {
+                    AlertManager.shared.showAlert(archiveAllReportsAlert())
+                })
+            }
+
+            if canShowGroupDelete, let gi = groupInfo, gi.canDelete {
                 buttons.append(.destructive(Text("Delete")) {
                     AlertManager.shared.showAlert(deleteGroupAlert(gi))
                 })
@@ -372,7 +394,7 @@ struct ChatListNavLink: View {
                                
             actionSheet = SomeActionSheet(
                 actionSheet: ActionSheet(
-                    title: Text("Clear or delete group?"),
+                    title: canShowGroupDelete ? Text("Clear or delete group?") : Text("Clear group?"),
                     buttons: buttons
                 ),
                 id: "other options"
@@ -411,6 +433,7 @@ struct ChatListNavLink: View {
 
     private func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
         ContactRequestView(contactRequest: contactRequest, chat: chat)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
                 Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
@@ -429,7 +452,6 @@ struct ChatListNavLink: View {
             }
             .tint(.red)
         }
-        .frame(height: dynamicRowHeight)
         .contentShape(Rectangle())
         .onTapGesture { showContactRequestDialog = true }
         .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
@@ -441,6 +463,7 @@ struct ChatListNavLink: View {
 
     private func contactConnectionNavLink(_ contactConnection: PendingContactConnection) -> some View {
         ContactConnectionView(chat: chat)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
                 AlertManager.shared.showAlert(deleteContactConnectionAlert(contactConnection) { a in
@@ -458,14 +481,11 @@ struct ChatListNavLink: View {
             }
             .tint(theme.colors.primary)
         }
-        .frame(height: dynamicRowHeight)
         .appSheet(isPresented: $showContactConnectionInfo) {
-            Group {
-                if case let .contactConnection(contactConnection) = chat.chatInfo {
-                    ContactConnectionInfo(contactConnection: contactConnection)
-                        .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
-                        .modifier(ThemedBackground(grouped: true))
-                }
+            if case let .contactConnection(contactConnection) = chat.chatInfo {
+                ContactConnectionInfo(contactConnection: contactConnection)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
+                    .modifier(ThemedBackground(grouped: true))
             }
         }
         .contentShape(Rectangle())
@@ -490,6 +510,27 @@ struct ChatListNavLink: View {
         )
     }
 
+    private func archiveAllReportsAlert() -> Alert {
+        Alert(
+            title: Text("Archive all reports?"),
+            message: Text("All reports will be archived for you."),
+            primaryButton: .destructive(Text("Archive")) {
+                Task { await archiveAllReportsForMe(chat.chatInfo.apiId) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
+    private func archiveAllReportsForMe(_ apiId: Int64) async {
+        do {
+            if case let .groupChatItemsDeleted(user, groupInfo, chatItemIDs, _, member) = try await apiArchiveReceivedReports(groupId: apiId) {
+                await groupChatItemsDeleted(user, groupInfo, chatItemIDs, member)
+            }
+        } catch {
+            logger.error("archiveAllReportsForMe error: \(responseError(error))")
+        }
+    }
+
     private func clearChatAlert() -> Alert {
         Alert(
             title: Text("Clear conversation?"),
@@ -536,14 +577,14 @@ struct ChatListNavLink: View {
         )
     }
 
-    private func invalidJSONPreview(_ json: String) -> some View {
+    private func invalidJSONPreview(_ json: Data?) -> some View {
         Text("invalid chat data")
             .foregroundColor(.red)
             .padding(4)
-            .frame(height: dynamicRowHeight)
+            .frameCompat(height: dynamicRowHeight)
             .onTapGesture { showInvalidJSON = true }
             .appSheet(isPresented: $showInvalidJSON) {
-                invalidJSONView(json)
+                invalidJSONView(dataToString(json))
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
             }
     }
@@ -552,8 +593,27 @@ struct ChatListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
-                AlertManager.shared.showAlert(connReqSentAlert(.contact))
+                ItemsModel.shared.loadOpenChat(contact.id) {
+                    AlertManager.shared.showAlert(connReqSentAlert(.contact))
+                }
+            }
+        }
+    }
+}
+
+extension View {
+    @inline(__always)
+    @ViewBuilder fileprivate func frameCompat(height: CGFloat) -> some View {
+        if #available(iOS 16, *) {
+            self.frame(height: height)
+        } else {
+            VStack(spacing: 0) {
+                Divider()
+                    .padding(.leading, 16)
+                self
+                    .frame(height: height)
+                    .padding(.horizontal, 8)
+                    .padding(.vertical, 8)
             }
         }
     }
@@ -645,7 +705,7 @@ func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
 }
 
 func getErrorAlert(_ error: Error, _ title: LocalizedStringKey) -> ErrorAlert {
-    if let r = error as? ChatResponse,
+    if let r = error as? ChatError,
        let alert = getNetworkErrorAlert(r) {
         return alert
     } else {
diff --git a/apps/ios/Shared/Views/ChatList/ChatListView.swift b/apps/ios/Shared/Views/ChatList/ChatListView.swift
index 68e0c57c75..377764ac83 100644
--- a/apps/ios/Shared/Views/ChatList/ChatListView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListView.swift
@@ -148,7 +148,11 @@ struct ChatListView: View {
     @State private var userPickerShown: Bool = false
     @State private var sheet: SomeSheet<AnyView>? = nil
     @StateObject private var chatTagsModel = ChatTagsModel.shared
-    
+    @State private var scrollToItemId: ChatItem.ID? = nil
+
+    // iOS 15 is required it to show/hide toolbar while chat is hidden/visible
+    @State private var viewOnScreen = true
+
     @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
     @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
     @AppStorage(DEFAULT_ADDRESS_CREATION_CARD_SHOWN) private var addressCreationCardShown = false
@@ -203,7 +207,17 @@ struct ChatListView: View {
                 .navigationBarHidden(searchMode || oneHandUI)
         }
         .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-        .onDisappear() { activeUserPickerSheet = nil }
+        .onAppear {
+            if #unavailable(iOS 16.0), !viewOnScreen {
+                viewOnScreen = true
+            }
+        }
+        .onDisappear {
+            activeUserPickerSheet = nil
+            if #unavailable(iOS 16.0) {
+                viewOnScreen = false
+            }
+        }
         .refreshable {
             AlertManager.shared.showAlert(Alert(
                 title: Text("Reconnect servers?"),
@@ -258,7 +272,7 @@ struct ChatListView: View {
             }
         } else {
             if oneHandUI {
-                content().toolbar { bottomToolbarGroup }
+                content().toolbar { bottomToolbarGroup() }
             } else {
                 content().toolbar { topToolbar }
             }
@@ -286,9 +300,9 @@ struct ChatListView: View {
         }
     }
     
-    @ToolbarContentBuilder var bottomToolbarGroup: some ToolbarContent {
+    @ToolbarContentBuilder func bottomToolbarGroup() -> some ToolbarContent {
         let padding: Double = Self.hasHomeIndicator ? 0 : 14
-        ToolbarItemGroup(placement: .bottomBar) {
+        ToolbarItemGroup(placement: viewOnScreen ? .bottomBar : .principal) {
             leadingToolbarItem.padding(.bottom, padding)
             Spacer()
             SubsStatusIndicator().padding(.bottom, padding)
@@ -322,9 +336,9 @@ struct ChatListView: View {
         }
     }
     
-    @ViewBuilder private var chatList: some View {
+    private var chatList: some View {
         let cs = filteredChats()
-        ZStack {
+        return ZStack {
             ScrollViewReader { scrollProxy in
                 List {
                     if !chatModel.chats.isEmpty {
@@ -354,13 +368,7 @@ struct ChatListView: View {
                         .offset(x: -8)
                     } else {
                         ForEach(cs, id: \.viewId) { chat in
-                            VStack(spacing: .zero) {
-                                Divider()
-                                    .padding(.leading, 16)
-                                ChatListNavLink(chat: chat,  parentSheet: $sheet)
-                                    .padding(.horizontal, 8)
-                                    .padding(.vertical, 6)
-                            }
+                            ChatListNavLink(chat: chat,  parentSheet: $sheet)
                             .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                             .listRowSeparator(.hidden)
                             .listRowInsets(EdgeInsets())
@@ -439,7 +447,14 @@ struct ChatListView: View {
     
     @ViewBuilder private func chatView() -> some View {
         if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
-            ChatView(chat: chat)
+            let im = ItemsModel.shared
+            ChatView(
+                chat: chat,
+                im: im,
+                mergedItems: BoxedValue(MergedItems.create(im, [])),
+                floatingButtonModel: FloatingButtonModel(im: im),
+                scrollToItemId: $scrollToItemId
+            )
         }
     }
     
@@ -480,7 +495,7 @@ struct ChatListView: View {
             switch chatTagsModel.activeFilter {
             case let .presetTag(tag): presetTagMatchesChat(tag, chat.chatInfo, chat.chatStats)
             case let .userTag(tag): chat.chatInfo.chatTags?.contains(tag.chatTagId) == true
-            case .unread: chat.chatStats.unreadChat ||  chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0
+            case .unread: chat.unreadTag
             case .none: true
             }
         }
@@ -791,7 +806,7 @@ struct TagsView: View {
         }
     }
 
-    @ViewBuilder private func expandedPresetTagsFiltersView() -> some View {
+    private func expandedPresetTagsFiltersView() -> some View {
         ForEach(PresetTag.allCases, id: \.id) { tag in
             if (chatTagsModel.presetTags[tag] ?? 0) > 0 {
                 expandedTagFilterView(tag)
@@ -885,12 +900,12 @@ func presetTagMatchesChat(_ tag: PresetTag, _ chatInfo: ChatInfo, _ chatStats: C
         case let .direct(contact): !(contact.activeConn == nil && contact.profile.contactLink != nil && contact.active) && !contact.chatDeleted
         case .contactRequest: true
         case .contactConnection: true
-        case let .group(groupInfo): groupInfo.businessChat?.chatType == .customer
+        case let .group(groupInfo, _): groupInfo.businessChat?.chatType == .customer
         default: false
         }
     case .groups:
         switch chatInfo {
-        case let .group(groupInfo): groupInfo.businessChat == nil
+        case let .group(groupInfo, _): groupInfo.businessChat == nil
         default: false
         }
     case .business:
diff --git a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
index 654bb56441..49f629d084 100644
--- a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
@@ -27,72 +27,80 @@ struct ChatPreviewView: View {
     
     var body: some View {
         let cItem = chat.chatItems.last
-        return HStack(spacing: 8) {
-            ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
-                chatPreviewImageOverlayIcon()
-                    .padding([.bottom, .trailing], 1)
-            }
-            .padding(.leading, 4)
-
-            let chatTs = if let cItem {
-                cItem.meta.itemTs
-            } else {
-                chat.chatInfo.chatTs
-            }
-            VStack(spacing: 0) {
-                HStack(alignment: .top) {
-                    chatPreviewTitle()
-                    Spacer()
-                    (formatTimestampText(chatTs))
-                        .font(.subheadline)
-                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(theme.colors.secondary)
-                        .padding(.top, 4)
+        return ZStack {
+            HStack(spacing: 8) {
+                ZStack(alignment: .bottomTrailing) {
+                    ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
+                    chatPreviewImageOverlayIcon()
+                        .padding([.bottom, .trailing], 1)
                 }
-                .padding(.bottom, 4)
-                .padding(.horizontal, 8)
-
-                ZStack(alignment: .topTrailing) {
-                    let chat = activeContentPreview?.chat ?? chat
-                    let ci = activeContentPreview?.ci ?? chat.chatItems.last
-                    let mc = ci?.content.msgContent
-                    HStack(alignment: .top) {
-                        let deleted = ci?.isDeletedContent == true || ci?.meta.itemDeleted != nil
-                        let showContentPreview = (showChatPreviews && chatModel.draftChatId != chat.id && !deleted) || activeContentPreview != nil
-                        if let ci, showContentPreview {
-                            chatItemContentPreview(chat, ci)
-                        }
-                        let mcIsVoice = switch mc { case .voice: true; default: false }
-                        if !mcIsVoice || !showContentPreview || mc?.text != "" || chatModel.draftChatId == chat.id {
-                            let hasFilePreview = if case .file = mc { true } else { false }
-                            chatMessagePreview(cItem, hasFilePreview)
-                        } else {
-                            Spacer()
-                            chatInfoIcon(chat).frame(minWidth: 37, alignment: .trailing)
-                        }
-                    }
-                    .onChange(of: chatModel.stopPreviousRecPlay?.path) { _ in
-                        checkActiveContentPreview(chat, ci, mc)
-                    }
-                    .onChange(of: activeContentPreview) { _ in
-                        checkActiveContentPreview(chat, ci, mc)
-                    }
-                    .onChange(of: showFullscreenGallery) { _ in
-                        checkActiveContentPreview(chat, ci, mc)
-                    }
-                    chatStatusImage()
-                        .padding(.top, dynamicChatInfoSize * 1.44)
-                        .frame(maxWidth: .infinity, alignment: .trailing)
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .padding(.trailing, 8)
+                .padding(.leading, 4)
                 
-                Spacer()
+                let chatTs = if let cItem {
+                    cItem.meta.itemTs
+                } else {
+                    chat.chatInfo.chatTs
+                }
+                VStack(spacing: 0) {
+                    HStack(alignment: .top) {
+                        chatPreviewTitle()
+                        Spacer()
+                        (formatTimestampText(chatTs))
+                            .font(.subheadline)
+                            .frame(minWidth: 60, alignment: .trailing)
+                            .foregroundColor(theme.colors.secondary)
+                            .padding(.top, 4)
+                    }
+                    .padding(.bottom, 4)
+                    .padding(.horizontal, 8)
+                    
+                    ZStack(alignment: .topTrailing) {
+                        let chat = activeContentPreview?.chat ?? chat
+                        let ci = activeContentPreview?.ci ?? chat.chatItems.last
+                        let mc = ci?.content.msgContent
+                        HStack(alignment: .top) {
+                            let deleted = ci?.isDeletedContent == true || ci?.meta.itemDeleted != nil
+                            let showContentPreview = (showChatPreviews && chatModel.draftChatId != chat.id && !deleted) || activeContentPreview != nil
+                            if let ci, showContentPreview {
+                                chatItemContentPreview(chat, ci)
+                            }
+                            let mcIsVoice = switch mc { case .voice: true; default: false }
+                            if !mcIsVoice || !showContentPreview || mc?.text != "" || chatModel.draftChatId == chat.id {
+                                let hasFilePreview = if case .file = mc { true } else { false }
+                                chatMessagePreview(cItem, hasFilePreview)
+                            } else {
+                                Spacer()
+                                chatInfoIcon(chat).frame(minWidth: 37, alignment: .trailing)
+                            }
+                        }
+                        .onChange(of: chatModel.stopPreviousRecPlay?.path) { _ in
+                            checkActiveContentPreview(chat, ci, mc)
+                        }
+                        .onChange(of: activeContentPreview) { _ in
+                            checkActiveContentPreview(chat, ci, mc)
+                        }
+                        .onChange(of: showFullscreenGallery) { _ in
+                            checkActiveContentPreview(chat, ci, mc)
+                        }
+                        chatStatusImage()
+                            .padding(.top, dynamicChatInfoSize * 1.44)
+                            .frame(maxWidth: .infinity, alignment: .trailing)
+                    }
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.trailing, 8)
+                    
+                    Spacer()
+                }
+                .frame(maxHeight: .infinity)
+            }
+            .opacity(deleting ? 0.4 : 1)
+            .padding(.bottom, -8)
+            
+            if deleting {
+                ProgressView()
+                    .scaleEffect(2)
             }
-            .frame(maxHeight: .infinity)
         }
-        .padding(.bottom, -8)
         .onChange(of: chatModel.deletedChats.contains(chat.chatInfo.id)) { contains in
             deleting = contains
             // Stop voice when deleting the chat
@@ -133,8 +141,9 @@ struct ChatPreviewView: View {
             } else {
                 EmptyView()
             }
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             switch (groupInfo.membership.memberStatus) {
+            case .memRejected: inactiveIcon()
             case .memLeft: inactiveIcon()
             case .memRemoved: inactiveIcon()
             case .memGroupDeleted: inactiveIcon()
@@ -145,7 +154,7 @@ struct ChatPreviewView: View {
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    private func inactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -156,11 +165,11 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             previewTitle(contact.verified == true ? verifiedIcon + t : t).foregroundColor(deleting ? Color.secondary : nil)
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
             case .memInvited: v.foregroundColor(deleting ? theme.colors.secondary : chat.chatInfo.incognito ? .indigo : theme.colors.primary)
-            case .memAccepted: v.foregroundColor(theme.colors.secondary)
+            case .memAccepted, .memRejected: v.foregroundColor(theme.colors.secondary)
             default: if deleting  { v.foregroundColor(theme.colors.secondary) } else { v }
             }
         default: previewTitle(t)
@@ -178,14 +187,17 @@ struct ChatPreviewView: View {
             .kerning(-2)
     }
 
-    private func chatPreviewLayout(_ text: Text?, draft: Bool = false, _ hasFilePreview: Bool = false) -> some View {
+    private func chatPreviewLayout(_ text: Text?, draft: Bool = false, hasFilePreview: Bool = false, hasSecrets: Bool) -> some View {
         ZStack(alignment: .topTrailing) {
+            let s = chat.chatStats
+            let mentionWidth: CGFloat = if s.unreadMentions > 0 && s.unreadCount > 1 { dynamicSize(userFont).unreadCorner } else { 0 }
             let t = text
                 .lineLimit(userFont <= .xxxLarge ? 2 : 1)
                 .multilineTextAlignment(.leading)
+                .if(hasSecrets, transform: hiddenSecretsView)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, hasFilePreview ? 0 : 8)
-                .padding(.trailing, hasFilePreview ? 38 : 36)
+                .padding(.trailing, mentionWidth + (hasFilePreview ? 38 : 36))
                 .offset(x: hasFilePreview ? -2 : 0)
                 .fixedSize(horizontal: false, vertical: true)
             if !showChatPreviews && !draft {
@@ -200,19 +212,34 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatInfoIcon(_ chat: Chat) -> some View {
         let s = chat.chatStats
         if s.unreadCount > 0 || s.unreadChat {
-            unreadCountText(s.unreadCount)
-                .font(userFont <= .xxxLarge ? .caption  : .caption2)
-                .foregroundColor(.white)
-                .padding(.horizontal, dynamicSize(userFont).unreadPadding)
-                .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
-                .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
-                .cornerRadius(dynamicSize(userFont).unreadCorner)
-        } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
-            Image(systemName: "speaker.slash.fill")
+            let mentionColor = mentionColor(chat)
+            HStack(alignment: .center, spacing: 2) {
+                if s.unreadMentions > 0 && s.unreadCount > 1 {
+                    Text("\(MENTION_START)")
+                        .font(userFont <= .xxxLarge ? .body : .callout)
+                        .foregroundColor(mentionColor)
+                        .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                        .cornerRadius(dynamicSize(userFont).unreadCorner)
+                        .padding(.bottom, 1)
+                }
+                let singleUnreadIsMention = s.unreadMentions > 0 && s.unreadCount == 1
+                (singleUnreadIsMention ? Text("\(MENTION_START)") : unreadCountText(s.unreadCount))
+                    .font(userFont <= .xxxLarge ? .caption : .caption2)
+                    .foregroundColor(.white)
+                    .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+                    .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                    .background(singleUnreadIsMention ? mentionColor : chat.chatInfo.ntfsEnabled(false) || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
+                    .cornerRadius(dynamicSize(userFont).unreadCorner)
+            }
+            .frame(height: dynamicChatInfoSize)
+        } else if let ntfMode = chat.chatInfo.chatSettings?.enableNtfs, ntfMode != .all {
+            let iconSize = ntfMode == .mentions ? dynamicChatInfoSize * 0.8 : dynamicChatInfoSize
+            let iconColor = ntfMode == .mentions ? theme.colors.secondary.opacity(0.7) : theme.colors.secondary
+            Image(systemName: ntfMode.iconFilled)
                 .resizable()
                 .scaledToFill()
-                .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
-                .foregroundColor(theme.colors.secondary)
+                .frame(width: iconSize, height: iconSize)
+                .foregroundColor(iconColor)
         } else if chat.chatInfo.chatSettings?.favorite ?? false {
             Image(systemName: "star.fill")
                 .resizable()
@@ -224,12 +251,22 @@ struct ChatPreviewView: View {
             Color.clear.frame(width: 0)
         }
     }
+    
+    private func mentionColor(_ chat: Chat) -> Color {
+        switch chat.chatInfo.chatSettings?.enableNtfs {
+        case .all: theme.colors.primary
+        case .mentions: theme.colors.primary
+        default: theme.colors.secondary
+        }
+    }
 
-    private func messageDraft(_ draft: ComposeState) -> Text {
+    private func messageDraft(_ draft: ComposeState) -> (Text, Bool) {
         let msg = draft.message
-        return image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
-                + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
+        let r = messageText(msg, parseSimpleXMarkdown(msg), sender: nil, preview: true, mentions: draft.mentions, userMemberId: nil, showSecrets: nil, backgroundColor: UIColor(theme.colors.background))
+        return (image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
+                    + attachment()
+                    + Text(AttributedString(r.string)),
+                r.hasSecrets)
 
         func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
             Text(Image(systemName: s)).foregroundColor(color) + textSpace
@@ -245,10 +282,11 @@ struct ChatPreviewView: View {
         }
     }
 
-    func chatItemPreview(_ cItem: ChatItem) -> Text {
+    func chatItemPreview(_ cItem: ChatItem) -> (Text, Bool) {
         let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
         let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary, prefix: prefix())
+        let r = messageText(itemText, itemFormattedText, sender: cItem.memberDisplayName, preview: true, mentions: cItem.mentions, userMemberId: chat.chatInfo.groupInfo?.membership.memberId, showSecrets: nil, backgroundColor: UIColor(theme.colors.background), prefix: prefix())
+        return (Text(AttributedString(r.string)), r.hasSecrets)
 
         // 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
@@ -275,19 +313,21 @@ struct ChatPreviewView: View {
             }
         }
         
-        func prefix() -> Text {
+        func prefix() -> NSAttributedString? {
             switch cItem.content.msgContent {
-            case let .report(_, reason): return Text(!itemText.isEmpty ? "\(reason.text): " : reason.text).italic().foregroundColor(Color.red)
-            default: return Text("")
+            case let .report(_, reason): reason.attrString
+            default: nil
             }
         }
     }
 
     @ViewBuilder private func chatMessagePreview(_ cItem: ChatItem?, _ hasFilePreview: Bool = false) -> some View {
         if chatModel.draftChatId == chat.id, let draft = chatModel.draft {
-            chatPreviewLayout(messageDraft(draft), draft: true, hasFilePreview)
+            let (t, hasSecrets) = messageDraft(draft)
+            chatPreviewLayout(t, draft: true, hasFilePreview: hasFilePreview, hasSecrets: hasSecrets)
         } else if let cItem = cItem {
-            chatPreviewLayout(itemStatusMark(cItem) + chatItemPreview(cItem), hasFilePreview)
+            let (t, hasSecrets) = chatItemPreview(cItem)
+            chatPreviewLayout(itemStatusMark(cItem) + t, hasFilePreview: hasFilePreview, hasSecrets: hasSecrets)
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
@@ -301,10 +341,12 @@ struct ChatPreviewView: View {
                         chatPreviewInfoText("connecting…")
                     }
                 }
-            case let .group(groupInfo):
+            case let .group(groupInfo, _):
                 switch (groupInfo.membership.memberStatus) {
+                case .memRejected: chatPreviewInfoText("rejected")
                 case .memInvited: groupInvitationPreviewText(groupInfo)
                 case .memAccepted: chatPreviewInfoText("connecting…")
+                case .memPendingReview, .memPendingApproval: chatPreviewInfoText("reviewed by admins")
                 default: EmptyView()
                 }
             default: EmptyView()
@@ -313,7 +355,6 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder func chatItemContentPreview(_ chat: Chat, _ ci: ChatItem) -> some View {
-        let linkClicksEnabled = privacyChatListOpenLinksDefault.get() != PrivacyChatListOpenLinksMode.no
         let mc = ci.content.msgContent
         switch mc {
         case let .link(_, preview):
@@ -335,28 +376,16 @@ struct ChatPreviewView: View {
                     .cornerRadius(8)
                 }
                 .onTapGesture {
-                    switch privacyChatListOpenLinksDefault.get() {
-                    case .yes:  UIApplication.shared.open(preview.uri)
-                    case .no: ItemsModel.shared.loadOpenChat(chat.id)
-                    case .ask: AlertManager.shared.showAlert(
-                        Alert(title: Text("Open web link?"),
-                              message: Text(preview.uri.absoluteString),
-                              primaryButton: .default(Text("Open chat"), action: { ItemsModel.shared.loadOpenChat(chat.id) }),
-                              secondaryButton: .default(Text("Open link"), action: { UIApplication.shared.open(preview.uri) })
-                             )
-                    )
-                    }
+                    openBrowserAlert(uri: preview.uri)
                 }
             }
         case let .image(_, image):
             smallContentPreview(size: dynamicMediaSize) {
                 CIImageView(chatItem: ci, preview: imageFromBase64(image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
             }
         case let .video(_,image, duration):
             smallContentPreview(size: dynamicMediaSize) {
                 CIVideoView(chatItem: ci, preview: imageFromBase64(image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
             }
         case let .voice(_, duration):
             smallContentPreviewVoice(size: dynamicMediaSize) {
@@ -377,7 +406,7 @@ struct ChatPreviewView: View {
         : chatPreviewInfoText("you are invited to group")
     }
 
-    @ViewBuilder private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
+    private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
         Text(text)
             .frame(maxWidth: .infinity, minHeight: 44, maxHeight: 44, alignment: .topLeading)
             .padding([.leading, .trailing], 8)
@@ -411,7 +440,11 @@ struct ChatPreviewView: View {
             if progressByTimeout {
                 ProgressView()
             } else if chat.chatStats.reportsCount > 0 {
-                groupReportsIcon(size: size * 0.8)
+                flagIcon(size: size * 0.8, color: .red)
+            } else if chat.supportUnreadCount > 0 {
+                flagIcon(size: size * 0.8, color: theme.colors.primary)
+            } else if chat.chatInfo.groupInfo?.membership.memberPending ?? false {
+                flagIcon(size: size * 0.8, color: theme.colors.secondary)
             } else {
                 incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
             }
@@ -457,12 +490,12 @@ struct ChatPreviewView: View {
     }
 }
 
-@ViewBuilder func groupReportsIcon(size: CGFloat) -> some View {
+func flagIcon(size: CGFloat, color: Color) -> some View {
     Image(systemName: "flag")
         .resizable()
         .scaledToFit()
         .frame(width: size, height: size)
-        .foregroundColor(.red)
+        .foregroundColor(color)
 }
 
 func smallContentPreview(size: CGFloat, _ view: @escaping () -> some View) -> some View {
diff --git a/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift b/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift
index 0f64b632dc..b9f5b984e1 100644
--- a/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift
+++ b/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift
@@ -14,6 +14,7 @@ struct ContactConnectionInfo: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @State var contactConnection: PendingContactConnection
+    @State private var showShortLink: Bool = true
     @State private var alert: CCInfoAlert?
     @State private var localAlias = ""
     @State private var showIncognitoSheet = false
@@ -61,14 +62,19 @@ struct ContactConnectionInfo: View {
                     }
 
                     if contactConnection.initiated,
-                       let connReqInv = contactConnection.connReqInv {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                       let connLinkInv = contactConnection.connLinkInv {
+                        SimpleXCreatedLinkQRCode(link: connLinkInv, short: $showShortLink)
+                            .id("simplex-invitation-qrcode-\(connLinkInv.simplexChatUri(short: showShortLink))")
                         incognitoEnabled()
-                        shareLinkButton(connReqInv, theme.colors.secondary)
-                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
+                        shareLinkButton(connLinkInv, short: showShortLink)
+                        oneTimeLinkLearnMoreButton()
                     } else {
                         incognitoEnabled()
-                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
+                        oneTimeLinkLearnMoreButton()
+                    }
+                } header: {
+                    if let connLinkInv = contactConnection.connLinkInv, connLinkInv.connShortLink != nil {
+                        ToggleShortLinkHeader(text: Text(""), link: connLinkInv, short: $showShortLink)
                     }
                 } footer: {
                     sharedProfileInfo(contactConnection.incognito)
@@ -167,26 +173,22 @@ struct ContactConnectionInfo: View {
     }
 }
 
-private func shareLinkButton(_ connReqInvitation: String, _ secondaryColor: Color) -> some View {
+private func shareLinkButton(_ connLinkInvitation: CreatedConnLink, short: Bool) -> some View {
     Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
+        showShareSheet(items: [connLinkInvitation.simplexChatUri(short: short)])
     } label: {
-        settingsRow("square.and.arrow.up", color: secondaryColor) {
-            Text("Share 1-time link")
-        }
+        Label("Share 1-time link", systemImage: "square.and.arrow.up")
     }
 }
 
-private func oneTimeLinkLearnMoreButton(_ secondaryColor: Color) -> some View {
+private func oneTimeLinkLearnMoreButton() -> some View {
     NavigationLink {
         AddContactLearnMore(showTitle: false)
             .navigationTitle("One-time invitation link")
             .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
     } label: {
-        settingsRow("info.circle", color: secondaryColor) {
-            Text("Learn more")
-        }
+        Label("Learn more", systemImage: "info.circle")
     }
 }
 
diff --git a/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift b/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift
index aa802c1af9..8b0a8af888 100644
--- a/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift
+++ b/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift
@@ -245,7 +245,7 @@ struct ServersSummaryView: View {
         }
     }
 
-    @ViewBuilder private func smpServersListView(
+    private func smpServersListView(
         _ servers: [SMPServerSummary],
         _ statsStartedAt: Date,
         _ header: LocalizedStringKey? = nil,
@@ -256,7 +256,7 @@ struct ServersSummaryView: View {
             ? serverAddress($0.smpServer) < serverAddress($1.smpServer)
             : $0.hasSubs && !$1.hasSubs
         }
-        Section {
+        return Section {
             ForEach(sortedServers) { server in
                 smpServerView(server, statsStartedAt)
             }
@@ -318,14 +318,14 @@ struct ServersSummaryView: View {
         return onionHosts == .require ? .indigo : .accentColor
     }
 
-    @ViewBuilder private func xftpServersListView(
+    private func xftpServersListView(
         _ servers: [XFTPServerSummary],
         _ statsStartedAt: Date,
         _ header: LocalizedStringKey? = nil,
         _ footer: LocalizedStringKey? = nil
     ) -> some View {
         let sortedServers = servers.sorted { serverAddress($0.xftpServer) < serverAddress($1.xftpServer) }
-        Section {
+        return Section {
             ForEach(sortedServers) { server in
                 xftpServerView(server, statsStartedAt)
             }
@@ -587,7 +587,7 @@ struct SMPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + textNewLine + Text("All data is kept private on your device.")
         }
     }
 }
@@ -703,7 +703,7 @@ struct XFTPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + textNewLine + Text("All data is kept private on your device.")
         }
     }
 }
diff --git a/apps/ios/Shared/Views/ChatList/TagListView.swift b/apps/ios/Shared/Views/ChatList/TagListView.swift
index 8811234f52..2063fe15de 100644
--- a/apps/ios/Shared/Views/ChatList/TagListView.swift
+++ b/apps/ios/Shared/Views/ChatList/TagListView.swift
@@ -61,7 +61,7 @@ struct TagListView: View {
                         Button {
                             showAlert(
                                 NSLocalizedString("Delete list?", comment: "alert title"),
-                                message: NSLocalizedString("All chats will be removed from the list \(text), and the list deleted.", comment: "alert message"),
+                                message: String.localizedStringWithFormat(NSLocalizedString("All chats will be removed from the list %@, and the list deleted.", comment: "alert message"), text),
                                 actions: {[
                                     UIAlertAction(
                                         title: NSLocalizedString("Cancel", comment: "alert action"),
@@ -138,7 +138,7 @@ struct TagListView: View {
         }
     }
     
-    @ViewBuilder private func radioButton(selected: Bool) -> some View {
+    private func radioButton(selected: Bool) -> some View {
         Image(systemName: selected ? "checkmark.circle.fill" : "circle")
             .imageScale(.large)
             .foregroundStyle(selected ? Color.accentColor : Color(.tertiaryLabel))
diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index dbe10ad997..c38ddfb1da 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -124,7 +124,7 @@ struct UserPicker: View {
             ZStack(alignment: .topTrailing) {
                 ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
                 if (u.unreadCount > 0) {
-                    UnreadBadge(userInfo: u).offset(x: 4, y: -4)
+                    userUnreadBadge(u, theme: theme).offset(x: 4, y: -4)
                 }
             }
             .padding(.trailing, 6)
@@ -171,19 +171,27 @@ struct UserPicker: View {
     }
 }
 
+@inline(__always)
+func userUnreadBadge(_ userInfo: UserInfo, theme: AppTheme) -> some View {
+    UnreadBadge(
+        count: userInfo.unreadCount,
+        color: userInfo.user.showNtfs ? theme.colors.primary : theme.colors.secondary
+    )
+}
+
 struct UnreadBadge: View {
-    var userInfo: UserInfo
-    @EnvironmentObject var theme: AppTheme
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+    var count: Int
+    var color: Color
 
     var body: some View {
         let size = dynamicSize(userFont).chatInfoSize
-        unreadCountText(userInfo.unreadCount)
+        unreadCountText(count)
             .font(userFont <= .xxxLarge ? .caption : .caption2)
             .foregroundColor(.white)
             .padding(.horizontal, dynamicSize(userFont).unreadPadding)
             .frame(minWidth: size, minHeight: size)
-            .background(userInfo.user.showNtfs ? theme.colors.primary : theme.colors.secondary)
+            .background(color)
             .cornerRadius(dynamicSize(userFont).unreadCorner)
     }
 }
diff --git a/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift b/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
index 242b492e83..456c46d318 100644
--- a/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
+++ b/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
@@ -140,9 +140,9 @@ struct ContactListNavLink: View {
         }
     }
 
-    @ViewBuilder private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
+    private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
         let t = Text(chat.chatInfo.chatViewName).foregroundColor(titleColor)
-        (
+        return (
             contact.verified == true
             ? verifiedIcon + t
             : t
@@ -188,8 +188,7 @@ struct ContactListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
-                DispatchQueue.main.async {
+                ItemsModel.shared.loadOpenChat(contact.id) {
                     dismissAllSheets(animated: true) {
                         AlertManager.shared.showAlert(connReqSentAlert(.contact))
                     }
diff --git a/apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift b/apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift
index 3cd37e4930..441a164f8a 100644
--- a/apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift
+++ b/apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift
@@ -173,7 +173,7 @@ struct DatabaseEncryptionView: View {
             }
             return true
         } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorExport(.errorNotADatabase))) = error as? ChatResponse {
+            if case .errorDatabase(.errorExport(.errorNotADatabase)) = error as? ChatError {
                 await operationEnded(.currentPassphraseError)
             } else {
                 await operationEnded(.error(title: "Error encrypting database", error: "\(responseError(error))"))
diff --git a/apps/ios/Shared/Views/Database/DatabaseErrorView.swift b/apps/ios/Shared/Views/Database/DatabaseErrorView.swift
index 6222a28fb4..02a1b87826 100644
--- a/apps/ios/Shared/Views/Database/DatabaseErrorView.swift
+++ b/apps/ios/Shared/Views/Database/DatabaseErrorView.swift
@@ -28,7 +28,7 @@ struct DatabaseErrorView: View {
         }
     }
 
-    @ViewBuilder private func databaseErrorView() -> some View {
+    private func databaseErrorView() -> some View {
         VStack(alignment: .center, spacing: 20) {
             switch status {
             case let .errorNotADatabase(dbFile):
@@ -141,7 +141,7 @@ struct DatabaseErrorView: View {
     }
 
     private func migrationsText(_ ms: [String]) -> some View {
-        (Text("Migrations:").font(.subheadline) + Text(verbatim: "\n") + Text(ms.joined(separator: "\n")).font(.caption))
+        (Text("Migrations:").font(.subheadline) + textNewLine + Text(ms.joined(separator: "\n")).font(.caption))
             .multilineTextAlignment(.center)
             .padding(.horizontal, 25)
     }
diff --git a/apps/ios/Shared/Views/Database/DatabaseView.swift b/apps/ios/Shared/Views/Database/DatabaseView.swift
index 4c05434eb6..a7e61b3105 100644
--- a/apps/ios/Shared/Views/Database/DatabaseView.swift
+++ b/apps/ios/Shared/Views/Database/DatabaseView.swift
@@ -21,7 +21,7 @@ enum DatabaseAlert: Identifiable {
     case deleteLegacyDatabase
     case deleteFilesAndMedia
     case setChatItemTTL(ttl: ChatItemTTL)
-    case error(title: LocalizedStringKey, error: String = "")
+    case error(title: String, error: String = "")
 
     var id: String {
         switch self {
@@ -279,7 +279,7 @@ struct DatabaseView: View {
         case let .archiveExportedWithErrors(archivePath, errs):
             return Alert(
                 title: Text("Chat database exported"),
-                message: Text("You may save the exported archive.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
+                message: Text("You may save the exported archive.") + textNewLine + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
                 dismissButton: .default(Text("Continue")) {
                     showShareSheet(items: [archivePath])
                 }
@@ -456,7 +456,7 @@ struct DatabaseView: View {
             }
         } catch let error {
             await MainActor.run {
-                alert = .error(title: "Error exporting chat database", error: responseError(error))
+                alert = .error(title: NSLocalizedString("Error exporting chat database", comment: "alert title"), error: responseError(error))
                 progressIndicator = false
             }
         }
@@ -492,10 +492,10 @@ struct DatabaseView: View {
                         return migration
                     }
                 } catch let error {
-                    await operationEnded(.error(title: "Error importing chat database", error: responseError(error)), progressIndicator, alert)
+                    await operationEnded(.error(title: NSLocalizedString("Error importing chat database", comment: "alert title"), error: responseError(error)), progressIndicator, alert)
                 }
             } catch let error {
-                await operationEnded(.error(title: "Error deleting chat database", error: responseError(error)), progressIndicator, alert)
+                await operationEnded(.error(title: NSLocalizedString("Error deleting chat database", comment: "alert title"), error: responseError(error)), progressIndicator, alert)
             }
         } else {
             showAlert("Error accessing database file")
@@ -513,7 +513,7 @@ struct DatabaseView: View {
             await DatabaseView.operationEnded(.chatDeleted, $progressIndicator, $alert)
             return true
         } catch let error {
-            await DatabaseView.operationEnded(.error(title: "Error deleting database", error: responseError(error)), $progressIndicator, $alert)
+            await DatabaseView.operationEnded(.error(title: NSLocalizedString("Error deleting database", comment: "alert title"), error: responseError(error)), $progressIndicator, $alert)
             return false
         }
     }
@@ -522,7 +522,7 @@ struct DatabaseView: View {
         if removeLegacyDatabaseAndFiles() {
             legacyDatabase = false
         } else {
-            alert = .error(title: "Error deleting old database")
+            alert = .error(title: NSLocalizedString("Error deleting old database", comment: "alert title"))
         }
     }
 
@@ -546,7 +546,7 @@ struct DatabaseView: View {
                 let (title, message) = chatDeletedAlertText()
                 showAlert(title, message: message, actions: { [okAlertActionWaiting] })
             } else if case let .error(title, error) = dbAlert {
-                showAlert("\(title)", message: error, actions: { [okAlertActionWaiting] })
+                showAlert(title, message: error, actions: { [okAlertActionWaiting] })
             } else {
                 alert.wrappedValue = dbAlert
                 cont.resume()
@@ -567,7 +567,7 @@ struct DatabaseView: View {
                 }
             } catch {
                 await MainActor.run {
-                    alert = .error(title: "Error changing setting", error: responseError(error))
+                    alert = .error(title: NSLocalizedString("Error changing setting", comment: "alert title"), error: responseError(error))
                     chatItemTTL = currentChatItemTTL
                     afterSetCiTTL()
                 }
diff --git a/apps/ios/Shared/Views/Helpers/AppSheet.swift b/apps/ios/Shared/Views/Helpers/AppSheet.swift
index 1e334367e8..17fe95a058 100644
--- a/apps/ios/Shared/Views/Helpers/AppSheet.swift
+++ b/apps/ios/Shared/Views/Helpers/AppSheet.swift
@@ -33,7 +33,7 @@ extension View {
     func appSheet<Content>(
         isPresented: Binding<Bool>,
         onDismiss: (() -> Void)? = nil,
-        content: @escaping () -> Content
+        @ViewBuilder content: @escaping () -> Content
     ) -> some View where Content: View {
         sheet(isPresented: isPresented, onDismiss: onDismiss) {
             content().modifier(PrivacySensitive())
@@ -43,7 +43,7 @@ extension View {
     func appSheet<T, Content>(
         item: Binding<T?>,
         onDismiss: (() -> Void)? = nil,
-        content: @escaping (T) -> Content
+        @ViewBuilder content: @escaping (T) -> Content
     ) -> some View where T: Identifiable, Content: View {
         sheet(item: item, onDismiss: onDismiss) { it in
             content(it).modifier(PrivacySensitive())
diff --git a/apps/ios/Shared/Views/Helpers/ViewModifiers.swift b/apps/ios/Shared/Views/Helpers/ViewModifiers.swift
index c790b9cff2..85ef85c611 100644
--- a/apps/ios/Shared/Views/Helpers/ViewModifiers.swift
+++ b/apps/ios/Shared/Views/Helpers/ViewModifiers.swift
@@ -9,6 +9,7 @@
 import SwiftUI
 
 extension View {
+    @inline(__always)
     @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
         if condition {
             transform(self)
@@ -36,9 +37,9 @@ struct PrivacyBlur: ViewModifier {
                 .overlay {
                     if (blurred && enabled) {
                         Color.clear.contentShape(Rectangle())
-                            .onTapGesture {
+                            .simultaneousGesture(TapGesture().onEnded {
                                 blurred = false
-                            }
+                            })
                     }
                 }
                 .onReceive(NotificationCenter.default.publisher(for: .chatViewWillBeginScrolling)) { _ in
diff --git a/apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift b/apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift
index 27bb95b599..c21ff9be8b 100644
--- a/apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift
+++ b/apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift
@@ -65,6 +65,9 @@ struct LocalAuthView: View {
                 // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                 m.chatId = nil
                 ItemsModel.shared.reversedChatItems = []
+                ItemsModel.shared.chatState.clear()
+                ChatModel.shared.secondaryIM?.reversedChatItems = []
+                ChatModel.shared.secondaryIM?.chatState.clear()
                 m.updateChats([])
                 m.users = []
                 _ = kcAppPassword.set(password)
diff --git a/apps/ios/Shared/Views/LocalAuth/PasscodeEntry.swift b/apps/ios/Shared/Views/LocalAuth/PasscodeEntry.swift
index 609943bcb6..4a6f8e7549 100644
--- a/apps/ios/Shared/Views/LocalAuth/PasscodeEntry.swift
+++ b/apps/ios/Shared/Views/LocalAuth/PasscodeEntry.swift
@@ -28,7 +28,7 @@ struct PasscodeEntry: View {
         }
     }
 
-    @ViewBuilder private func passwordView() -> some View {
+    private func passwordView() -> some View {
         Text(
             password == ""
             ? " "
diff --git a/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift b/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
index eb8df5fb04..0af8fa7ad8 100644
--- a/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
+++ b/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
@@ -177,7 +177,7 @@ struct MigrateFromDevice: View {
             case let .archiveExportedWithErrors(archivePath, errs):
                 return Alert(
                     title: Text("Chat database exported"),
-                    message: Text("You may migrate the exported database.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
+                    message: Text("You may migrate the exported database.") + textNewLine + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
                     dismissButton: .default(Text("Continue")) {
                         Task { await uploadArchive(path: archivePath) }
                     }
@@ -520,15 +520,15 @@ struct MigrateFromDevice: View {
             chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
                 await MainActor.run {
                     switch msg {
-                    case let .sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize):
+                    case let .result(.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:
+                    case .result(.sndFileRedirectStartXFTP):
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             migrationState = .linkCreation
                         }
-                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
+                    case let .result(.sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs)):
                         let cfg = getNetCfg()
                         let proxy: NetworkProxy? = if cfg.socksProxy == nil {
                             nil
@@ -546,7 +546,7 @@ struct MigrateFromDevice: View {
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             migrationState = .linkShown(fileId: fileTransferMeta.fileId, link: data.addToLink(link: rcvURIs[0]), archivePath: archivePath, ctrl: ctrl)
                         }
-                    case .sndFileError:
+                    case .result(.sndFileError):
                         alert = .error(title: "Upload failed", error: "Check your internet connection and try again")
                         migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
                     default:
@@ -691,7 +691,7 @@ private struct PassphraseConfirmationView: View {
                 migrationState = .uploadConfirmation
             }
         } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorOpen(.errorNotADatabase))) = error as? ChatResponse {
+            if case .errorDatabase(.errorOpen(.errorNotADatabase)) = error as? ChatError {
                 showErrorOnMigrationIfNeeded(.errorNotADatabase(dbFile: ""), $alert)
             } else {
                 alert = .error(title: "Error", error: NSLocalizedString("Error verifying passphrase:", comment: "") + " " + String(responseError(error)))
@@ -733,11 +733,11 @@ func chatStoppedView() -> some View {
 private class MigrationChatReceiver {
     let ctrl: chat_ctrl
     let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
+    let processReceivedMsg: (APIResult<ChatEvent>) async -> Void
     private var receiveLoop: Task<Void, Never>?
     private var receiveMessages = true
 
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
+    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (APIResult<ChatEvent>) async -> Void) {
         self.ctrl = ctrl
         self.databaseUrl = databaseUrl
         self.processReceivedMsg = processReceivedMsg
@@ -752,9 +752,9 @@ private class MigrationChatReceiver {
 
     func receiveMsgLoop() async {
         // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
+        if let msg: APIResult<ChatEvent> = await chatRecvMsg(ctrl) {
             Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
+                await TerminalItems.shared.addResult(msg)
             }
             logger.debug("processReceivedMsg: \(msg.responseType)")
             await processReceivedMsg(msg)
diff --git a/apps/ios/Shared/Views/Migration/MigrateToDevice.swift b/apps/ios/Shared/Views/Migration/MigrateToDevice.swift
index 2d83cdc7c8..93fe19cf33 100644
--- a/apps/ios/Shared/Views/Migration/MigrateToDevice.swift
+++ b/apps/ios/Shared/Views/Migration/MigrateToDevice.swift
@@ -496,10 +496,10 @@ struct MigrateToDevice: View {
             chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
                 await MainActor.run {
                     switch msg {
-                    case let .rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer):
+                    case let .result(.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:
+                    case .result(.rcvStandaloneFileComplete):
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             // User closed the whole screen before new state was saved
                             if migrationState == nil {
@@ -509,10 +509,10 @@ struct MigrateToDevice: View {
                                 MigrationToDeviceState.save(.archiveImport(archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
                             }
                         }
-                    case .rcvFileError:
+                    case .result(.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)):
+                    case .error(.error(.noRcvFileUser)):
                         alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
                         migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
                     default:
@@ -539,7 +539,7 @@ struct MigrateToDevice: View {
                     chatInitControllerRemovingDatabases()
                 } else if ChatModel.shared.chatRunning == true {
                     // cannot delete storage if chat is running
-                    try await apiStopChat()
+                    try await stopChatAsync()
                 }
                 try await apiDeleteStorage()
                 try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
@@ -623,7 +623,7 @@ struct MigrateToDevice: View {
             AlertManager.shared.showAlert(
                 Alert(
                     title: Text("Error migrating settings"),
-                    message: Text ("Some app settings were not migrated.") + Text("\n") + Text(responseError(error)))
+                    message: Text ("Some app settings were not migrated.") + textNewLine + Text(responseError(error)))
             )
         }
         hideView()
@@ -632,6 +632,8 @@ struct MigrateToDevice: View {
     private func hideView() {
         onboardingStageDefault.set(.onboardingComplete)
         m.onboardingStage = .onboardingComplete
+        m.migrationState = nil
+        MigrationToDeviceState.save(nil)
         dismiss()
     }
 
@@ -749,11 +751,11 @@ private func progressView() -> some View {
 private class MigrationChatReceiver {
     let ctrl: chat_ctrl
     let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
+    let processReceivedMsg: (APIResult<ChatEvent>) async -> Void
     private var receiveLoop: Task<Void, Never>?
     private var receiveMessages = true
 
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
+    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (APIResult<ChatEvent>) async -> Void) {
         self.ctrl = ctrl
         self.databaseUrl = databaseUrl
         self.processReceivedMsg = processReceivedMsg
@@ -770,7 +772,7 @@ private class MigrationChatReceiver {
         // TODO use function that has timeout
         if let msg = await chatRecvMsg(ctrl) {
             Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
+                await TerminalItems.shared.addResult(msg)
             }
             logger.debug("processReceivedMsg: \(msg.responseType)")
             await processReceivedMsg(msg)
diff --git a/apps/ios/Shared/Views/NewChat/AddGroupView.swift b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
index 0c7f6136ff..b3c33e95ea 100644
--- a/apps/ios/Shared/Views/NewChat/AddGroupView.swift
+++ b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
@@ -23,7 +23,7 @@ struct AddGroupView: View {
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
     @State private var showInvalidNameAlert = false
-    @State private var groupLink: String?
+    @State private var groupLink: CreatedConnLink?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
@@ -191,13 +191,9 @@ struct AddGroupView: View {
             profile.groupPreferences = GroupPreferences(history: GroupPreference(enable: .on))
             let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
             Task {
-                let groupMembers = await apiListMembers(gInfo.groupId)
-                await MainActor.run {
-                    m.groupMembers = groupMembers.map { GMember.init($0) }
-                    m.populateGroupMembersIndexes()
-                }
+                await m.loadGroupMembers(gInfo)
             }
-            let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
+            let c = Chat(chatInfo: .group(groupInfo: gInfo, groupChatScope: nil), chatItems: [])
             m.addChat(c)
             withAnimation {
                 groupInfo = gInfo
diff --git a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
index 39656c1534..98f43f49b2 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
@@ -85,7 +85,7 @@ struct NewChatSheet: View {
         }
     }
 
-    @ViewBuilder private func viewBody(_ showArchive: Bool) -> some View {
+    private func viewBody(_ showArchive: Bool) -> some View {
         List {
             HStack {
                 ContactsListSearchBar(
@@ -125,7 +125,7 @@ struct NewChatSheet: View {
                     }
                     NavigationLink {
                         AddGroupView()
-                            .navigationTitle("Create secret group")
+                            .navigationTitle("Create group")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
                     } label: {
@@ -258,7 +258,7 @@ struct ContactsList: View {
         }
     }
     
-    @ViewBuilder private func noResultSection(text: String) -> some View {
+    private func noResultSection(text: String) -> some View {
         Section {
             Text(text)
                 .foregroundColor(theme.colors.secondary)
diff --git a/apps/ios/Shared/Views/NewChat/NewChatView.swift b/apps/ios/Shared/Views/NewChat/NewChatView.swift
index 6e898f4cdf..110eda7882 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatView.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatView.swift
@@ -81,7 +81,8 @@ struct NewChatView: View {
     @State var selection: NewChatOption
     @State var showQRCodeScanner = false
     @State private var invitationUsed: Bool = false
-    @State private var connReqInvitation: String = ""
+    @State private var connLinkInvitation: CreatedConnLink = CreatedConnLink(connFullLink: "", connShortLink: nil)
+    @State private var showShortLink = true
     @State private var creatingConnReq = false
     @State var choosingProfile = false
     @State private var pastedLink: String = ""
@@ -174,11 +175,12 @@ struct NewChatView: View {
 
     private func prepareAndInviteView() -> some View {
         ZStack { // ZStack is needed for views to not make transitions between each other
-            if connReqInvitation != "" {
+            if connLinkInvitation.connFullLink != "" {
                 InviteView(
                     invitationUsed: $invitationUsed,
                     contactConnection: $contactConnection,
-                    connReqInvitation: $connReqInvitation,
+                    connLinkInvitation: $connLinkInvitation,
+                    showShortLink: $showShortLink,
                     choosingProfile: $choosingProfile
                 )
             } else if creatingConnReq {
@@ -190,16 +192,16 @@ struct NewChatView: View {
     }
 
     private func createInvitation() {
-        if connReqInvitation == "" && contactConnection == nil && !creatingConnReq {
+        if connLinkInvitation.connFullLink == "" && contactConnection == nil && !creatingConnReq {
             creatingConnReq = true
             Task {
                 _ = try? await Task.sleep(nanoseconds: 250_000000)
                 let (r, apiAlert) = await apiAddContact(incognito: incognitoGroupDefault.get())
-                if let (connReq, pcc) = r {
+                if let (connLink, pcc) = r {
                     await MainActor.run {
                         m.updateContactConnection(pcc)
                         m.showingInvitation = ShowingInvitation(pcc: pcc, connChatUsed: false)
-                        connReqInvitation = connReq
+                        connLinkInvitation = connLink
                         contactConnection = pcc
                     }
                 } else {
@@ -243,7 +245,8 @@ private struct InviteView: View {
     @EnvironmentObject var theme: AppTheme
     @Binding var invitationUsed: Bool
     @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
+    @Binding var connLinkInvitation: CreatedConnLink
+    @Binding var showShortLink: Bool
     @Binding var choosingProfile: Bool
 
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
@@ -261,7 +264,7 @@ private struct InviteView: View {
                     NavigationLink {
                         ActiveProfilePicker(
                             contactConnection: $contactConnection,
-                            connReqInvitation: $connReqInvitation,
+                            connLinkInvitation: $connLinkInvitation,
                             incognitoEnabled: $incognitoDefault,
                             choosingProfile: $choosingProfile,
                             selectedProfile: selectedProfile
@@ -296,7 +299,7 @@ private struct InviteView: View {
 
     private func shareLinkView() -> some View {
         HStack {
-            let link = simplexChatLink(connReqInvitation)
+            let link = connLinkInvitation.simplexChatUri(short: showShortLink)
             linkTextView(link)
             Button {
                 showShareSheet(items: [link])
@@ -310,9 +313,9 @@ private struct InviteView: View {
     }
 
     private func qrCodeView() -> some View {
-        Section(header: Text("Or show this code").foregroundColor(theme.colors.secondary)) {
-            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
-                .id("simplex-qrcode-view-for-\(connReqInvitation)")
+        Section {
+            SimpleXCreatedLinkQRCode(link: connLinkInvitation, short: $showShortLink, onShare: setInvitationUsed)
+                .id("simplex-qrcode-view-for-\(connLinkInvitation.simplexChatUri(short: showShortLink))")
                 .padding()
                 .background(
                     RoundedRectangle(cornerRadius: 12, style: .continuous)
@@ -322,6 +325,8 @@ private struct InviteView: View {
                 .listRowBackground(Color.clear)
                 .listRowSeparator(.hidden)
                 .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+        } header: {
+            ToggleShortLinkHeader(text: Text("Or show this code"), link: connLinkInvitation, short: $showShortLink)
         }
     }
 
@@ -343,7 +348,7 @@ private struct ActiveProfilePicker: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
+    @Binding var connLinkInvitation: CreatedConnLink
     @Binding var incognitoEnabled: Bool
     @Binding var choosingProfile: Bool
     @State private var alert: SomeAlert?
@@ -415,12 +420,11 @@ private struct ActiveProfilePicker: View {
                 }
                 Task {
                     do {
-                        if let contactConn = contactConnection,
-                           let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId) {
-                            
+                        if let contactConn = contactConnection {
+                            let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId)
                             await MainActor.run {
                                 contactConnection = conn
-                                connReqInvitation = conn.connReqInv ?? ""
+                                connLinkInvitation = conn.connLinkInv ?? CreatedConnLink(connFullLink: "", connShortLink: nil)
                                 incognitoEnabled = false
                                 chatModel.updateContactConnection(conn)
                             }
@@ -502,7 +506,7 @@ private struct ActiveProfilePicker: View {
         }
     }
     
-    @ViewBuilder private func profilerPickerUserOption(_ user: User) -> some View {
+    private func profilerPickerUserOption(_ user: User) -> some View {
         Button {
             if selectedProfile == user && incognitoEnabled {
                 incognitoEnabled = false
@@ -836,23 +840,25 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {
 }
 
 enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
+    case ownInvitationLinkConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case invitationLinkConnecting(connectionLink: CreatedConnLink)
+    case ownContactAddressConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case contactAddressConnectingConfirmReconnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnectingConfirmReconnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnecting(connectionLink: CreatedConnLink, groupInfo: GroupInfo?)
+    case error(shortOrFullLink: String, alert: Alert)
 
     var id: String {
         switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
+        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink.connFullLink)"
+        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink.connFullLink)"
+        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink.connFullLink)"
+        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink.connFullLink)"
+        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink.connFullLink)"
+        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink.connFullLink)"
+        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink.connFullLink)"
+        case let .error(shortOrFullLink, alert): return "error \(shortOrFullLink)"
         }
     }
 }
@@ -935,21 +941,22 @@ func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (
                 dismissButton: .default(Text("OK")) { cleanup?() }
             )
         }
+    case let .error(_, alert): return alert
     }
 }
 
 enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfile(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfileDestructive(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
     case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
+    case ownGroupLinkConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
 
     var id: String {
         switch self {
-        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
+        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink.connFullLink)"
+        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink.connFullLink)"
         case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
+        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink.connFullLink)"
         }
     }
 }
@@ -1008,7 +1015,7 @@ func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool
 }
 
 func planAndConnect(
-    _ connectionLink: String,
+    _ shortOrFullLink: String,
     showAlert: @escaping (PlanAndConnectAlert) -> Void,
     showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
     dismiss: Bool,
@@ -1018,8 +1025,8 @@ func planAndConnect(
     filterKnownGroup: ((GroupInfo) -> Void)? = nil
 ) {
     Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
+        let (result, alert) = await apiConnectPlan(connLink: shortOrFullLink)
+        if let (connectionLink, connectionPlan) = result {
             switch connectionPlan {
             case let .invitationLink(ilp):
                 switch ilp {
@@ -1028,32 +1035,40 @@ func planAndConnect(
                     if let incognito = incognito {
                         connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
                     } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
+                        await MainActor.run {
+                            showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
+                        }
                     }
                 case .ownLink:
                     logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
+                    await MainActor.run {
+                        if let incognito = incognito {
+                            showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                        } else {
+                            showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
+                        }
                     }
                 case let .connecting(contact_):
                     logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        if let f = filterKnownContact {
-                            f(contact)
+                    await MainActor.run {
+                        if let contact = contact_ {
+                            if let f = filterKnownContact {
+                                f(contact)
+                            } else {
+                                openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                            }
                         } else {
-                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                            showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
                         }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
                     }
                 case let .known(contact):
                     logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                    await MainActor.run {
+                        if let f = filterKnownContact {
+                            f(contact)
+                        } else {
+                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                        }
                     }
                 }
             case let .contactAddress(cap):
@@ -1063,83 +1078,109 @@ func planAndConnect(
                     if let incognito = incognito {
                         connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
                     } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
+                        await MainActor.run {
+                            showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
+                        }
                     }
                 case .ownLink:
                     logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
+                    await MainActor.run {
+                        if let incognito = incognito {
+                            showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                        } else {
+                            showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
+                        }
                     }
                 case .connectingConfirmReconnect:
                     logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
+                    await MainActor.run {
+                        if let incognito = incognito {
+                            showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                        } else {
+                            showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
+                        }
                     }
                 case let .connectingProhibit(contact):
                     logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                    await MainActor.run {
+                        if let f = filterKnownContact {
+                            f(contact)
+                        } else {
+                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                        }
                     }
                 case let .known(contact):
                     logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                    await MainActor.run {
+                        if let f = filterKnownContact {
+                            f(contact)
+                        } else {
+                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                        }
                     }
                 case let .contactViaAddress(contact):
                     logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
                     if let incognito = incognito {
                         connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
                     } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
+                        await MainActor.run {
+                            showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
+                        }
                     }
                 }
             case let .groupLink(glp):
                 switch glp {
                 case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
+                    await MainActor.run {
+                        if let incognito = incognito {
+                            showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                        } else {
+                            showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
+                        }
                     }
                 case let .ownLink(groupInfo):
                     logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
+                    await MainActor.run {
+                        if let f = filterKnownGroup {
+                            f(groupInfo)
+                        }
+                        showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
                     }
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
                 case .connectingConfirmReconnect:
                     logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
+                    await MainActor.run {
+                        if let incognito = incognito {
+                            showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                        } else {
+                            showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
+                        }
                     }
                 case let .connectingProhibit(groupInfo_):
                     logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                    await MainActor.run {
+                        showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                    }
                 case let .known(groupInfo):
                     logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
-                    } else {
-                        openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
+                    await MainActor.run {
+                        if let f = filterKnownGroup {
+                            f(groupInfo)
+                        } else {
+                            openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
+                        }
                     }
                 }
+            case let .error(chatError):
+                logger.debug("planAndConnect, .error \(chatErrorString(chatError))")
+                if let incognito = incognito {
+                    connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
+                } else {
+                    showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
+                }
             }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
+        } else if let alert {
+            await MainActor.run {
+                showAlert(.error(shortOrFullLink: shortOrFullLink, alert: alert))
             }
         }
     }
@@ -1161,22 +1202,22 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn
 }
 
 private func connectViaLink(
-    _ connectionLink: String,
+    _ connectionLink: CreatedConnLink,
     connectionPlan: ConnectionPlan?,
     dismiss: Bool,
     incognito: Bool,
     cleanup: (() -> Void)?
 ) {
     Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
+        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connLink: connectionLink) {
             await MainActor.run {
                 ChatModel.shared.updateContactConnection(pcc)
             }
             let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
+            crt = if let plan = connectionPlan {
+                planToConnReqType(plan) ?? connReqType
             } else {
-                crt = connReqType
+                connReqType
             }
             DispatchQueue.main.async {
                 if dismiss {
@@ -1199,39 +1240,35 @@ private func connectViaLink(
 }
 
 func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(c.id)
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    ItemsModel.shared.loadOpenChat(c.id)
+    let m = ChatModel.shared
+    if let c = m.getContactChat(contact.contactId) {
+        if dismiss {
+            dismissAllSheets(animated: true) {
+                ItemsModel.shared.loadOpenChat(c.id) {
                     showAlreadyExistsAlert?()
                 }
             }
+        } else {
+            ItemsModel.shared.loadOpenChat(c.id) {
+                showAlreadyExistsAlert?()
+            }
         }
     }
 }
 
 func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(g.id)
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    ItemsModel.shared.loadOpenChat(g.id)
+    let m = ChatModel.shared
+    if let g = m.getGroupChat(groupInfo.groupId) {
+        if dismiss {
+            dismissAllSheets(animated: true) {
+                ItemsModel.shared.loadOpenChat(g.id) {
                     showAlreadyExistsAlert?()
                 }
             }
+        } else {
+            ItemsModel.shared.loadOpenChat(g.id) {
+                showAlreadyExistsAlert?()
+            }
         }
     }
 }
@@ -1269,11 +1306,12 @@ enum ConnReqType: Equatable {
     }
 }
 
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
+private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType? {
     switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
+    case .invitationLink: .invitation
+    case .contactAddress: .contact
+    case .groupLink: .groupLink
+    case .error: nil
     }
 }
 
diff --git a/apps/ios/Shared/Views/NewChat/QRCode.swift b/apps/ios/Shared/Views/NewChat/QRCode.swift
index bc1dc4b5bc..c9054f30da 100644
--- a/apps/ios/Shared/Views/NewChat/QRCode.swift
+++ b/apps/ios/Shared/Views/NewChat/QRCode.swift
@@ -8,18 +8,30 @@
 
 import SwiftUI
 import CoreImage.CIFilterBuiltins
+import SimpleXChat
 
 struct MutableQRCode: View {
     @Binding var uri: String
+    var small: Bool = false
     var withLogo: Bool = true
     var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
 
     var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
+        QRCode(uri: uri, small: small, withLogo: withLogo, tintColor: tintColor)
             .id("simplex-qrcode-view-for-\(uri)")
     }
 }
 
+struct SimpleXCreatedLinkQRCode: View {
+    let link: CreatedConnLink
+    @Binding var short: Bool
+    var onShare: (() -> Void)? = nil
+
+    var body: some View {
+        QRCode(uri: link.simplexChatUri(short: short), small: short && link.connShortLink != nil, onShare: onShare)
+    }
+}
+
 struct SimpleXLinkQRCode: View {
     let uri: String
     var withLogo: Bool = true
@@ -27,56 +39,57 @@ struct SimpleXLinkQRCode: View {
     var onShare: (() -> Void)? = nil
 
     var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor, onShare: onShare)
+        QRCode(uri: simplexChatLink(uri), small: uri.count < 200, withLogo: withLogo, tintColor: tintColor, onShare: onShare)
     }
 }
 
-func simplexChatLink(_ uri: String) -> String {
-    uri.starts(with: "simplex:/")
-    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
-    : uri
-}
+private let smallQRRatio: CGFloat = 0.63
 
 struct QRCode: View {
     let uri: String
+    var small: Bool = false
     var withLogo: Bool = true
     var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
     var onShare: (() -> Void)? = nil
     @State private var image: UIImage? = nil
     @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var width: CGFloat = .infinity
 
     var body: some View {
         ZStack {
             if let image = image {
-                qrCodeImage(image)
-                GeometryReader { geo in
+                qrCodeImage(image).frame(width: width, height: width)
+                GeometryReader { g in
+                    let w = g.size.width * (small ? smallQRRatio : 1)
+                    let l = w * (small ? 0.195 : 0.16)
+                    let m = w * 0.005
                     ZStack {
                         if withLogo {
-                            let w = geo.size.width
                             Image("icon-light")
                             .resizable()
                             .scaledToFit()
-                            .frame(width: w * 0.16, height: w * 0.16)
-                            .frame(width: w * 0.165, height: w * 0.165)
+                            .frame(width: l, height: l)
+                            .frame(width: l + m, height: l + m)
                             .background(.white)
                             .clipShape(Circle())
                         }
                     }
                     .onAppear {
+                        width = w
                         makeScreenshotFunc = {
                             let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                            showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                            showShareSheet(items: [makeScreenshot(g.frame(in: .local).origin, size)])
                             onShare?()
                         }
                     }
-                    .frame(width: geo.size.width, height: geo.size.height)
+                    .frame(width: g.size.width, height: g.size.height)
                 }
             } else {
-                Color.clear.aspectRatio(1, contentMode: .fit)
+                Color.clear.aspectRatio(small ? 1 / smallQRRatio : 1, contentMode: .fit)
             }
         }
         .onTapGesture(perform: makeScreenshotFunc)
-        .task { image = await generateImage(uri, tintColor: tintColor) }
+        .task { image = await generateImage(uri, tintColor: tintColor, errorLevel: small ? "M" : "L") }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
@@ -89,10 +102,11 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String, tintColor: UIColor) async -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor, errorLevel: String) async -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)
+    filter.correctionLevel = errorLevel
     if let outputImage = filter.outputImage,
        let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
         return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
diff --git a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
index 1a0a736acd..656cef4a04 100644
--- a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
+++ b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
@@ -43,26 +43,23 @@ struct OnboardingButtonStyle: ButtonStyle {
     }
 }
 
-private enum ChooseServerOperatorsSheet: Identifiable {
-    case showInfo
+private enum OnboardingConditionsViewSheet: Identifiable {
     case showConditions
+    case configureOperators
 
     var id: String {
         switch self {
-        case .showInfo: return "showInfo"
         case .showConditions: return "showConditions"
+        case .configureOperators: return "configureOperators"
         }
     }
 }
 
-struct ChooseServerOperators: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
+struct OnboardingConditionsView: View {
     @EnvironmentObject var theme: AppTheme
-    var onboarding: Bool
     @State private var serverOperators: [ServerOperator] = []
     @State private var selectedOperatorIds = Set<Int64>()
-    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
+    @State private var sheetItem: OnboardingConditionsViewSheet? = nil
     @State private var notificationsModeNavLinkActive = false
     @State private var justOpened = true
 
@@ -70,83 +67,47 @@ struct ChooseServerOperators: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .leading, spacing: 20) {
-                    let title = Text("Server operators")
+                    Text("Conditions of use")
                         .font(.largeTitle)
                         .bold()
                         .frame(maxWidth: .infinity, alignment: .center)
-                    
-                    if onboarding {
-                        title.padding(.top, 25)
-                    } else {
-                        title
-                    }
-
-                    infoText()
-                        .frame(maxWidth: .infinity, alignment: .center)
+                        .padding(.top, 25)
 
                     Spacer()
-                    
-                    ForEach(serverOperators) { srvOperator in
-                        operatorCheckView(srvOperator)
+
+                    VStack(alignment: .leading, spacing: 20) {
+                        Text("Private chats, groups and your contacts are not accessible to server operators.")
+                            .lineSpacing(2)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                        Text("""
+                        By using SimpleX Chat you agree to:
+                        - send only legal content in public groups.
+                        - respect other users – no spam.
+                        """)
+                        .lineSpacing(2)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+
+                        Button("Privacy policy and conditions of use.") {
+                            sheetItem = .showConditions
+                        }
+                        .frame(maxWidth: .infinity, alignment: .leading)
                     }
-                    VStack {
-                        Text("SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.").padding(.bottom, 8)
-                        Text("You can configure servers via settings.")
-                    }
-                    .font(.footnote)
-                    .multilineTextAlignment(.center)
-                    .frame(maxWidth: .infinity, alignment: .center)
-                    .padding(.horizontal, 16)
-                    
+                    .padding(.horizontal, 4)
+
                     Spacer()
-                    
-                    let reviewForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-                    let canReviewLater = reviewForOperators.allSatisfy { $0.conditionsAcceptance.usageAllowed }
-                    let currEnabledOperatorIds = Set(serverOperators.filter { $0.enabled }.map { $0.operatorId })
-                    
-                    VStack(spacing: 8) {
-                        if !reviewForOperators.isEmpty {
-                            reviewConditionsButton()
-                        } else if selectedOperatorIds != currEnabledOperatorIds && !selectedOperatorIds.isEmpty {
-                            setOperatorsButton()
-                        } else {
-                            continueButton()
+
+                    VStack(spacing: 12) {
+                        acceptConditionsButton()
+
+                        Button("Configure server operators") {
+                            sheetItem = .configureOperators
                         }
-                        if onboarding {
-                            Group {
-                                if reviewForOperators.isEmpty {
-                                    Button("Conditions of use") {
-                                        sheetItem = .showConditions
-                                    }
-                                } else {
-                                    Text("Conditions of use")
-                                        .foregroundColor(.clear)
-                                }
-                            }
-                            .font(.system(size: 17, weight: .semibold))
-                            .frame(minHeight: 40)
-                        }
-                    }
-                    
-                    if !onboarding && !reviewForOperators.isEmpty {
-                        VStack(spacing: 8) {
-                            reviewLaterButton()
-                            (
-                                Text("Conditions will be accepted for enabled operators after 30 days.")
-                                + textSpace
-                                + Text("You can configure operators in Network & servers settings.")
-                            )
-                            .multilineTextAlignment(.center)
-                            .font(.footnote)
-                            .padding(.horizontal, 32)
-                        }
-                        .frame(maxWidth: .infinity)
-                        .disabled(!canReviewLater)
-                        .padding(.bottom)
+                        .frame(minHeight: 40)
                     }
                 }
+                .padding(25)
                 .frame(minHeight: g.size.height)
             }
             .onAppear {
@@ -158,130 +119,28 @@ struct ChooseServerOperators: View {
             }
             .sheet(item: $sheetItem) { item in
                 switch item {
-                case .showInfo:
-                    ChooseServerOperatorsInfoView()
                 case .showConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
+                    SimpleConditionsView()
+                        .modifier(ThemedBackground(grouped: true))
+                case .configureOperators:
+                    ChooseServerOperators(serverOperators: serverOperators, selectedOperatorIds: $selectedOperatorIds)
+                        .modifier(ThemedBackground())
                 }
             }
             .frame(maxHeight: .infinity, alignment: .top)
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .frame(maxHeight: .infinity, alignment: .top)
-        .padding(onboarding ? 25 : 16)
-    }
-
-    private func infoText() -> some View {
-        Button {
-            sheetItem = .showInfo
-        } label: {
-            Label("How it helps privacy", systemImage: "info.circle")
-                .font(.headline)
-        }
-    }
-
-    @ViewBuilder private func operatorCheckView(_ serverOperator: ServerOperator) -> some View {
-        let checked = selectedOperatorIds.contains(serverOperator.operatorId)
-        let icon = checked ? "checkmark.circle.fill" : "circle"
-        let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
-        HStack(spacing: 10) {
-            Image(serverOperator.largeLogo(colorScheme))
-                .resizable()
-                .scaledToFit()
-                .frame(height: 48)
-            Spacer()
-            Image(systemName: icon)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 26, height: 26)
-                .foregroundColor(iconColor)
-        }
-        .background(theme.colors.background)
-        .padding()
-        .clipShape(RoundedRectangle(cornerRadius: 18))
-        .overlay(
-            RoundedRectangle(cornerRadius: 18)
-                .stroke(Color(uiColor: .secondarySystemFill), lineWidth: 2)
-        )
-        .padding(.horizontal, 2)
-        .onTapGesture {
-            if checked {
-                selectedOperatorIds.remove(serverOperator.operatorId)
-            } else {
-                selectedOperatorIds.insert(serverOperator.operatorId)
-            }
-        }
-    }
-
-    private func reviewConditionsButton() -> some View {
-        NavigationLink("Review conditions") {
-            reviewConditionsView()
-                .navigationTitle("Conditions of use")
-                .navigationBarTitleDisplayMode(.large)
-                .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-                .modifier(ThemedBackground(grouped: true))
-        }
-        .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-        .disabled(selectedOperatorIds.isEmpty)
-    }
-
-    private func setOperatorsButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                Task {
-                    if let enabledOperators = enabledOperators(serverOperators) {
-                        let r = try await setServerOperators(operators: enabledOperators)
-                        await MainActor.run {
-                            ChatModel.shared.conditions = r
-                            continueToNextStep()
-                        }
-                    } else {
-                        await MainActor.run {
-                            continueToNextStep()
-                        }
-                    }
-                }
-            } label: {
-                Text("Update")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func continueButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Continue")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func reviewLaterButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Review later")
-            }
-            .buttonStyle(.borderless)
-        }
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func continueToNextStep() {
-        if onboarding {
-            onboardingStageDefault.set(.step4_SetNotificationsMode)
-            notificationsModeNavLinkActive = true
-        } else {
-            dismiss()
-        }
+        onboardingStageDefault.set(.step4_SetNotificationsMode)
+        notificationsModeNavLinkActive = true
     }
 
     func notificationsModeNavLinkButton(_ button: @escaping (() -> some View)) -> some View {
@@ -304,25 +163,6 @@ struct ChooseServerOperators: View {
             .modifier(ThemedBackground())
     }
 
-    @ViewBuilder private func reviewConditionsView() -> some View {
-        let operatorsWithConditionsAccepted = ChatModel.shared.conditions.serverOperators.filter { $0.conditionsAcceptance.conditionsAccepted }
-        let acceptForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-        VStack(alignment: .leading, spacing: 20) {
-            if !operatorsWithConditionsAccepted.isEmpty {
-                Text("Conditions are already accepted for these operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                Text("The same conditions will apply to operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            } else {
-                Text("Conditions will be accepted for operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            }
-            ConditionsTextView()
-                .frame(maxHeight: .infinity)
-            acceptConditionsButton()
-                .padding(.bottom)
-                .padding(.bottom)
-        }
-        .padding(.horizontal, 25)
-    }
-
     private func acceptConditionsButton() -> some View {
         notificationsModeNavLinkButton {
             Button {
@@ -356,9 +196,10 @@ struct ChooseServerOperators: View {
                     }
                 }
             } label: {
-                Text("Accept conditions")
+                Text("Accept")
             }
-            .buttonStyle(OnboardingButtonStyle())
+            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
+            .disabled(selectedOperatorIds.isEmpty)
         }
     }
 
@@ -393,6 +234,126 @@ struct ChooseServerOperators: View {
     }
 }
 
+private enum ChooseServerOperatorsSheet: Identifiable {
+    case showInfo
+
+    var id: String {
+        switch self {
+        case .showInfo: return "showInfo"
+        }
+    }
+}
+
+struct ChooseServerOperators: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @Environment(\.colorScheme) var colorScheme: ColorScheme
+    @EnvironmentObject var theme: AppTheme
+    var serverOperators: [ServerOperator]
+    @Binding var selectedOperatorIds: Set<Int64>
+    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
+
+    var body: some View {
+        GeometryReader { g in
+            ScrollView {
+                VStack(alignment: .leading, spacing: 20) {
+                    Text("Server operators")
+                        .font(.largeTitle)
+                        .bold()
+                        .frame(maxWidth: .infinity, alignment: .center)
+                        .padding(.top, 25)
+
+                    infoText()
+                        .frame(maxWidth: .infinity, alignment: .center)
+
+                    Spacer()
+                    
+                    ForEach(serverOperators) { srvOperator in
+                        operatorCheckView(srvOperator)
+                    }
+                    VStack {
+                        Text("SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.").padding(.bottom, 8)
+                        Text("You can configure servers via settings.")
+                    }
+                    .font(.footnote)
+                    .multilineTextAlignment(.center)
+                    .frame(maxWidth: .infinity, alignment: .center)
+                    .padding(.horizontal, 16)
+                    
+                    Spacer()
+
+                    VStack(spacing: 8) {
+                        setOperatorsButton()
+                        onboardingButtonPlaceholder()
+                    }
+                }
+                .frame(minHeight: g.size.height)
+            }
+            .sheet(item: $sheetItem) { item in
+                switch item {
+                case .showInfo:
+                    ChooseServerOperatorsInfoView()
+                }
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+        .frame(maxHeight: .infinity, alignment: .top)
+        .padding(25)
+        .interactiveDismissDisabled(selectedOperatorIds.isEmpty)
+    }
+
+    private func infoText() -> some View {
+        Button {
+            sheetItem = .showInfo
+        } label: {
+            Label("How it helps privacy", systemImage: "info.circle")
+                .font(.headline)
+        }
+    }
+
+    private func operatorCheckView(_ serverOperator: ServerOperator) -> some View {
+        let checked = selectedOperatorIds.contains(serverOperator.operatorId)
+        let icon = checked ? "checkmark.circle.fill" : "circle"
+        let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+        return HStack(spacing: 10) {
+            Image(serverOperator.largeLogo(colorScheme))
+                .resizable()
+                .scaledToFit()
+                .frame(height: 48)
+            Spacer()
+            Image(systemName: icon)
+                .resizable()
+                .scaledToFit()
+                .frame(width: 26, height: 26)
+                .foregroundColor(iconColor)
+        }
+        .background(theme.colors.background)
+        .padding()
+        .clipShape(RoundedRectangle(cornerRadius: 18))
+        .overlay(
+            RoundedRectangle(cornerRadius: 18)
+                .stroke(Color(uiColor: .secondarySystemFill), lineWidth: 2)
+        )
+        .padding(.horizontal, 2)
+        .onTapGesture {
+            if checked {
+                selectedOperatorIds.remove(serverOperator.operatorId)
+            } else {
+                selectedOperatorIds.insert(serverOperator.operatorId)
+            }
+        }
+    }
+
+    private func setOperatorsButton() -> some View {
+        Button {
+            dismiss()
+        } label: {
+            Text("OK")
+        }
+        .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
+        .disabled(selectedOperatorIds.isEmpty)
+    }
+}
+
 let operatorsPostLink = URL(string: "https://simplex.chat/blog/20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.html")!
 
 struct ChooseServerOperatorsInfoView: View {
@@ -447,5 +408,5 @@ struct ChooseServerOperatorsInfoView: View {
 }
 
 #Preview {
-    ChooseServerOperators(onboarding: true)
+    OnboardingConditionsView()
 }
diff --git a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift
index 409cb859ea..ae72cb1be5 100644
--- a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift
+++ b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift
@@ -62,8 +62,7 @@ struct CreateProfile: View {
                 .frame(height: 20)
             } footer: {
                 VStack(alignment: .leading, spacing: 8) {
-                    Text("Your profile, contacts and delivered messages are stored on your device.")
-                    Text("The profile is only shared with your contacts.")
+                    Text("Your profile is stored on your device and only shared with your contacts.")
                 }
                 .foregroundColor(theme.colors.secondary)
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -118,25 +117,22 @@ struct CreateFirstProfile: View {
     @State private var nextStepNavLinkActive = false
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            VStack(alignment: .center, spacing: 20) {
-                Text("Create your profile")
+        let v = VStack(alignment: .leading, spacing: 16) {
+            VStack(alignment: .center, spacing: 16) {
+                Text("Create profile")
                     .font(.largeTitle)
                     .bold()
                     .multilineTextAlignment(.center)
-                
-                Text("Your profile, contacts and delivered messages are stored on your device.")
-                    .font(.callout)
-                    .foregroundColor(theme.colors.secondary)
-                    .multilineTextAlignment(.center)
-                
-                Text("The profile is only shared with your contacts.")
+
+                Text("Your profile is stored on your device and only shared with your contacts.")
                     .font(.callout)
                     .foregroundColor(theme.colors.secondary)
                     .multilineTextAlignment(.center)
             }
+            .fixedSize(horizontal: false, vertical: true)
             .frame(maxWidth: .infinity) // Ensures it takes up the full width
             .padding(.horizontal, 10)
+            .onTapGesture { focusDisplayName = false }
 
             HStack {
                 let name = displayName.trimmingCharacters(in: .whitespaces)
@@ -145,6 +141,7 @@ struct CreateFirstProfile: View {
                     TextField("Enter your name…", text: $displayName)
                         .focused($focusDisplayName)
                         .padding(.horizontal)
+                        .padding(.trailing, 20)
                         .padding(.vertical, 10)
                         .background(
                             RoundedRectangle(cornerRadius: 10, style: .continuous)
@@ -173,12 +170,23 @@ struct CreateFirstProfile: View {
             }
         }
         .onAppear() {
-            focusDisplayName = true
+            if #available(iOS 16, *) {
+                focusDisplayName = true
+            } else {
+                // it does not work before animation completes on iOS 15
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    focusDisplayName = true
+                }
+            }
         }
         .padding(.horizontal, 25)
-        .padding(.top, 10)
         .padding(.bottom, 25)
         .frame(maxWidth: .infinity, alignment: .leading)
+        if #available(iOS 16, *) {
+            return v.padding(.top, 10)
+        } else {
+            return v.padding(.top, 75).ignoresSafeArea(.all, edges: .top)
+        }
     }
 
     func createProfileButton() -> some View {
@@ -206,7 +214,7 @@ struct CreateFirstProfile: View {
     }
 
     private func nextStepDestinationView() -> some View {
-        ChooseServerOperators(onboarding: true)
+        OnboardingConditionsView()
             .navigationBarBackButtonHidden(true)
             .modifier(ThemedBackground())
     }
@@ -235,15 +243,15 @@ private func showCreateProfileAlert(
     _ error: Error
 ) {
     let m = ChatModel.shared
-    switch error as? ChatResponse {
-    case .chatCmdError(_, .errorStore(.duplicateName)),
-         .chatCmdError(_, .error(.userExists)):
+    switch error as? ChatError {
+    case .errorStore(.duplicateName),
+         .error(.userExists):
         if m.currentUser == nil {
             AlertManager.shared.showAlert(duplicateUserAlert)
         } else {
             showAlert(.duplicateUserError)
         }
-    case .chatCmdError(_, .error(.invalidDisplayName)):
+    case .error(.invalidDisplayName):
         if m.currentUser == nil {
             AlertManager.shared.showAlert(invalidDisplayNameAlert)
         } else {
diff --git a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift
index befb34b318..a2f5db7f03 100644
--- a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift
+++ b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift
@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                         Spacer()
 
                         if let userAddress = m.userAddress {
-                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                            SimpleXCreatedLinkQRCode(link: userAddress.connLinkContact, short: Binding.constant(false))
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -77,9 +77,9 @@ struct CreateSimpleXAddress: View {
                 progressIndicator = true
                 Task {
                     do {
-                        let connReqContact = try await apiCreateUserAddress()
+                        let connLinkContact = try await apiCreateUserAddress(short: false)
                         DispatchQueue.main.async {
-                            m.userAddress = UserContactLink(connReqContact: connReqContact)
+                            m.userAddress = UserContactLink(connLinkContact: connLinkContact)
                         }
                         await MainActor.run { progressIndicator = false }
                     } catch let error {
@@ -121,7 +121,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [simplexChatLink(userAddress.connLinkContact.simplexChatUri(short: false))])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -189,7 +189,7 @@ struct SendAddressMailView: View {
         let messageBody = String(format: NSLocalizedString("""
             <p>Hi!</p>
             <p><a href="%@">Connect to me via SimpleX Chat</a></p>
-            """, comment: "email text"), simplexChatLink(userAddress.connReqContact))
+            """, comment: "email text"), simplexChatLink(userAddress.connLinkContact.simplexChatUri(short: false)))
         MailView(
             isShowing: self.$showMailView,
             result: $mailViewResult,
diff --git a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift
index b2b1b8fa68..8f448dc508 100644
--- a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift
+++ b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift
@@ -23,7 +23,7 @@ struct OnboardingView: View {
             case .step3_CreateSimpleXAddress: // deprecated
                 CreateSimpleXAddress()
             case .step3_ChooseServerOperators:
-                ChooseServerOperators(onboarding: true)
+                OnboardingConditionsView()
                     .navigationBarBackButtonHidden(true)
                     .modifier(ThemedBackground())
             case .step4_SetNotificationsMode:
@@ -44,7 +44,7 @@ enum OnboardingStage: String, Identifiable {
     case step1_SimpleXInfo
     case step2_CreateProfile // deprecated
     case step3_CreateSimpleXAddress // deprecated
-    case step3_ChooseServerOperators
+    case step3_ChooseServerOperators // changed to simplified conditions
     case step4_SetNotificationsMode
     case onboardingComplete
 
diff --git a/apps/ios/Shared/Views/Onboarding/SetNotificationsMode.swift b/apps/ios/Shared/Views/Onboarding/SetNotificationsMode.swift
index 97e1f49382..31865e7af9 100644
--- a/apps/ios/Shared/Views/Onboarding/SetNotificationsMode.swift
+++ b/apps/ios/Shared/Views/Onboarding/SetNotificationsMode.swift
@@ -17,7 +17,7 @@ struct SetNotificationsMode: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .center, spacing: 20) {
                     Text("Push notifications")
                         .font(.largeTitle)
@@ -57,11 +57,17 @@ struct SetNotificationsMode: View {
                 .padding(25)
                 .frame(minHeight: g.size.height)
             }
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .frame(maxHeight: .infinity)
         .sheet(isPresented: $showInfo) {
             NotificationsInfoView()
         }
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func setNotificationsMode(_ token: DeviceToken, _ mode: NotificationsMode) {
diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
index 40dd29db53..9f41a37b1d 100644
--- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
+++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
@@ -18,7 +18,7 @@ struct SimpleXInfo: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .leading) {
                     VStack(alignment: .center, spacing: 10) {
                         Image(colorScheme == .light ? "logo" : "logo-light")
@@ -36,7 +36,7 @@ struct SimpleXInfo: View {
                                 .font(.headline)
                         }
                     }
-                    
+
                     Spacer()
 
                     VStack(alignment: .leading) {
@@ -66,6 +66,9 @@ struct SimpleXInfo: View {
                         }
                     }
                 }
+                .padding(.horizontal, 25)
+                .padding(.top, 75)
+                .padding(.bottom, 25)
                 .frame(minHeight: g.size.height)
             }
             .sheet(isPresented: Binding(
@@ -88,14 +91,17 @@ struct SimpleXInfo: View {
                     createProfileNavLinkActive: $createProfileNavLinkActive
                 )
             }
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .onAppear() {
             setLastVersionDefault()
         }
         .frame(maxHeight: .infinity)
-        .padding(.horizontal, 25)
-        .padding(.top, 75)
-        .padding(.bottom, 25)
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func onboardingInfoRow(_ image: String, _ title: LocalizedStringKey, _ text: LocalizedStringKey, width: CGFloat) -> some View {
@@ -129,6 +135,7 @@ struct SimpleXInfo: View {
 
             NavigationLink(isActive: $createProfileNavLinkActive) {
                 CreateFirstProfile()
+                    .modifier(ThemedBackground())
             } label: {
                 EmptyView()
             }
@@ -140,6 +147,8 @@ struct SimpleXInfo: View {
 
 let textSpace = Text(verbatim: " ")
 
+let textNewLine = Text(verbatim: "\n")
+
 struct SimpleXInfo_Previews: PreviewProvider {
     static var previews: some View {
         SimpleXInfo(onboarding: true)
diff --git a/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift b/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
index 182c5652d7..f65a21623a 100644
--- a/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
+++ b/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
@@ -539,7 +539,46 @@ private let versionDescriptions: [VersionDescription] = [
                 description: "Delivered even when Apple drops them."
             )),
         ]
-    )
+    ),
+    VersionDescription(
+        version: "v6.3",
+        post: URL(string: "https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html"),
+        features: [
+            .feature(Description(
+                icon: "at",
+                title: "Mention members 👋",
+                description: "Get notified when mentioned."
+            )),
+            .feature(Description(
+                icon: "flag",
+                title: "Send private reports",
+                description: "Help admins moderating their groups."
+            )),
+            .feature(Description(
+                icon: "list.bullet",
+                title: "Organize chats into lists",
+                description: "Don't miss important messages."
+            )),
+            .feature(Description(
+                icon: nil,
+                title: "Better privacy and security",
+                description: nil,
+                subfeatures: [
+                    ("eye.slash", "Private media file names."),
+                    ("trash", "Set message expiration in chats.")
+                ]
+            )),
+            .feature(Description(
+                icon: nil,
+                title: "Better groups performance",
+                description: nil,
+                subfeatures: [
+                    ("bolt", "Faster sending messages."),
+                    ("person.2.slash", "Faster deletion of groups.")
+                ]
+            )),
+        ]
+    ),
 ]
 
 private let lastVersion = versionDescriptions.last!.version
@@ -555,8 +594,6 @@ func shouldShowWhatsNew() -> Bool {
 }
 
 fileprivate struct NewOperatorsView: View {
-    @State private var showOperatorsSheet = false
-
     var body: some View {
         VStack(alignment: .leading) {
             Image((operatorsInfo[.flux] ?? ServerOperator.dummyOperatorInfo).largeLogo)
@@ -567,16 +604,7 @@ fileprivate struct NewOperatorsView: View {
                 .multilineTextAlignment(.leading)
                 .lineLimit(10)
             HStack {
-                Button("Enable Flux") {
-                    showOperatorsSheet = true
-                }
-                Text("for better metadata privacy.")
-            }
-        }
-        .sheet(isPresented: $showOperatorsSheet) {
-            NavigationView {
-                ChooseServerOperators(onboarding: false)
-                    .modifier(ThemedBackground())
+                Text("Enable Flux in Network & servers settings for better metadata privacy.")
             }
         }
     }
diff --git a/apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift b/apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift
index 67020e09e7..01b25baed8 100644
--- a/apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift
+++ b/apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift
@@ -456,12 +456,12 @@ struct ConnectDesktopView: View {
                 }
             } catch let e {
                 await MainActor.run {
-                    switch e as? ChatResponse {
-                    case .chatCmdError(_, .errorRemoteCtrl(.badInvitation)): alert = .badInvitationError
-                    case .chatCmdError(_, .error(.commandError)): alert = .badInvitationError
-                    case let .chatCmdError(_, .errorRemoteCtrl(.badVersion(v))): alert = .badVersionError(version: v)
-                    case .chatCmdError(_, .errorAgent(.RCP(.version))): alert = .badVersionError(version: nil)
-                    case .chatCmdError(_, .errorAgent(.RCP(.ctrlAuth))): alert = .desktopDisconnectedError
+                    switch e as? ChatError {
+                    case .errorRemoteCtrl(.badInvitation): alert = .badInvitationError
+                    case .error(.commandError): alert = .badInvitationError
+                    case let .errorRemoteCtrl(.badVersion(v)): alert = .badVersionError(version: v)
+                    case .errorAgent(.RCP(.version)): alert = .badVersionError(version: nil)
+                    case .errorAgent(.RCP(.ctrlAuth)): alert = .desktopDisconnectedError
                     default: errorAlert(e)
                     }
                 }
diff --git a/apps/ios/Shared/Views/TerminalView.swift b/apps/ios/Shared/Views/TerminalView.swift
index 23e1f783f7..554219eb69 100644
--- a/apps/ios/Shared/Views/TerminalView.swift
+++ b/apps/ios/Shared/Views/TerminalView.swift
@@ -18,7 +18,9 @@ struct TerminalView: View {
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State var composeState: ComposeState = ComposeState()
+    @State var selectedRange = NSRange()
     @State private var keyboardVisible = false
+    @State private var keyboardHiddenDate = Date.now
     @State var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
     @State private var terminalItem: TerminalItem?
     @State private var scrolled = false
@@ -96,10 +98,12 @@ struct TerminalView: View {
 
                 SendMessageView(
                     composeState: $composeState,
+                    selectedRange: $selectedRange,
                     sendMessage: { _ in consoleSendMessage() },
                     showVoiceMessageButton: false,
                     onMediaAdded: { _ in },
-                    keyboardVisible: $keyboardVisible
+                    keyboardVisible: $keyboardVisible,
+                    keyboardHiddenDate: $keyboardHiddenDate
                 )
                 .padding(.horizontal, 12)
             }
@@ -141,18 +145,18 @@ struct TerminalView: View {
     }
     
     func consoleSendMessage() {
-        let cmd = ChatCommand.string(composeState.message)
         if composeState.message.starts(with: "/sql") && (!prefPerformLA || !developerTools) {
-            let resp = ChatResponse.chatCmdError(user_: nil, chatError: ChatError.error(errorType: ChatErrorType.commandError(message: "Failed reading: empty")))
+            let resp: APIResult<ChatResponse2> = APIResult.error(ChatError.error(errorType: ChatErrorType.commandError(message: "Failed reading: empty")))
             Task {
-                await TerminalItems.shared.addCommand(.now, cmd, resp)
+                await TerminalItems.shared.addCommand(.now, .string(composeState.message), resp)
             }
         } else {
+            let cmd = composeState.message
             DispatchQueue.global().async {
                 Task {
-                    composeState.inProgress = true
-                    _ = await chatSendCmd(cmd)
-                    composeState.inProgress = false
+                    await MainActor.run { composeState.inProgress = true }
+                    await sendTerminalCmd(cmd)
+                    await MainActor.run { composeState.inProgress = false }
                 }
             }
         }
@@ -160,12 +164,38 @@ struct TerminalView: View {
     }
 }
 
+func sendTerminalCmd(_ cmd: String) async {
+    let start: Date = .now
+    await withCheckedContinuation { (cont: CheckedContinuation<Void, Never>) in
+        let d = sendSimpleXCmdStr(cmd)
+        Task {
+            guard let d else {
+                await TerminalItems.shared.addCommand(start, ChatCommand.string(cmd), APIResult<ChatResponse2>.error(.invalidJSON(json: nil)))
+                return
+            }
+            let r0: APIResult<ChatResponse0> = decodeAPIResult(d)
+            guard case .invalid = r0 else {
+                await TerminalItems.shared.addCommand(start, .string(cmd), r0)
+                return
+            }
+            let r1: APIResult<ChatResponse1> = decodeAPIResult(d)
+            guard case .invalid = r1 else {
+                await TerminalItems.shared.addCommand(start, .string(cmd), r1)
+                return
+            }
+            let r2: APIResult<ChatResponse2> = decodeAPIResult(d)
+            await TerminalItems.shared.addCommand(start, .string(cmd), r2)
+        }
+        cont.resume(returning: ())
+    }
+}
+
 struct TerminalView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
         chatModel.terminalItems = [
-            .resp(.now, ChatResponse.response(type: "contactSubscribed", json: "{}")),
-            .resp(.now, ChatResponse.response(type: "newChatItems", json: "{}"))
+            .err(.now, APIResult<ChatResponse2>.invalid(type: "contactSubscribed", json: "{}".data(using: .utf8)!).unexpected),
+            .err(.now, APIResult<ChatResponse2>.invalid(type: "newChatItems", json: "{}".data(using: .utf8)!).unexpected)
         ]
         return NavigationView {
             TerminalView()
diff --git a/apps/ios/Shared/Views/UserSettings/AppSettings.swift b/apps/ios/Shared/Views/UserSettings/AppSettings.swift
index 00532c0a8e..44e0b20958 100644
--- a/apps/ios/Shared/Views/UserSettings/AppSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AppSettings.swift
@@ -38,7 +38,6 @@ extension AppSettings {
             privacyLinkPreviewsGroupDefault.set(val)
             def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
         }
-        if let val = privacyChatListOpenLinks { privacyChatListOpenLinksDefault.set(val) }
         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) }
@@ -78,7 +77,6 @@ extension AppSettings {
         c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
         c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()
         c.privacyLinkPreviews = def.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
-        c.privacyChatListOpenLinks = privacyChatListOpenLinksDefault.get()
         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)
diff --git a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
index 4c61d592ac..02dec5a618 100644
--- a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
@@ -367,13 +367,13 @@ struct ChatThemePreview: View {
                 let alice = ChatItem.getSample(1, CIDirection.directRcv, Date.now, NSLocalizedString("Good afternoon!", comment: "message preview"))
                 let bob = ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir))
                 HStack {
-                    ChatItemView(chat: Chat.sampleData, chatItem: alice)
+                    ChatItemView(chat: Chat.sampleData, im: ItemsModel.shared, chatItem: alice, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
                         .modifier(ChatItemClipped(alice, tailVisible: true))
                     Spacer()
                 }
                 HStack {
                     Spacer()
-                    ChatItemView(chat: Chat.sampleData, chatItem: bob)
+                    ChatItemView(chat: Chat.sampleData, im: ItemsModel.shared, chatItem: bob, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
                         .modifier(ChatItemClipped(bob, tailVisible: true))
                         .frame(alignment: .trailing)
                 }
diff --git a/apps/ios/Shared/Views/UserSettings/MarkdownHelp.swift b/apps/ios/Shared/Views/UserSettings/MarkdownHelp.swift
index cf9cada592..71c284e9ab 100644
--- a/apps/ios/Shared/Views/UserSettings/MarkdownHelp.swift
+++ b/apps/ios/Shared/Views/UserSettings/MarkdownHelp.swift
@@ -19,7 +19,7 @@ struct MarkdownHelp: View {
             mdFormat("_italic_", Text("italic").italic())
             mdFormat("~strike~", Text("strike").strikethrough())
             mdFormat("`a + b`", Text("`a + b`").font(.body.monospaced()))
-            mdFormat("!1 colored!", Text("colored").foregroundColor(.red) + Text(" (") + color("1", .red) + color("2", .green) + color("3", .blue) + color("4", .yellow) + color("5", .cyan) + Text("6").foregroundColor(.purple) + Text(")"))
+            mdFormat("!1 colored!", Text("colored").foregroundColor(.red) + Text(verbatim: " (") + color("1", .red) + color("2", .green) + color("3", .blue) + color("4", .yellow) + color("5", .cyan) + Text("6").foregroundColor(.purple) + Text(verbatim: ")"))
             (
                 mdFormat("#secret#", Text("secret")
                     .foregroundColor(.clear)
@@ -39,7 +39,7 @@ private func mdFormat(_ format: LocalizedStringKey, _ example: Text) -> some Vie
 }
 
 private func color(_ s: String, _ c: Color) -> Text {
-    Text(s).foregroundColor(c) + Text(", ")
+    Text(s).foregroundColor(c) + Text(verbatim: ", ")
 }
 
 struct MarkdownHelp_Previews: PreviewProvider {
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/AdvancedNetworkSettings.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/AdvancedNetworkSettings.swift
index 754ca3cf6b..fa698f8b7c 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/AdvancedNetworkSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/AdvancedNetworkSettings.swift
@@ -208,6 +208,19 @@ struct AdvancedNetworkSettings: View {
                     }
                 }
 
+                Section {
+                    Picker("Use web port", selection: $netCfg.smpWebPortServers) {
+                        ForEach(SMPWebPortServers.allCases, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+                } header: {
+                    Text("TCP port for messaging")
+                } footer: {
+                    netCfg.smpWebPortServers == .preset
+                    ? Text("Use TCP port 443 for preset servers only.")
+                    : Text("Use TCP port \(netCfg.smpWebPortServers == .all ? "443" : "5223") when no port is specified.")
+                }
+                
                 Section("TCP connection") {
                     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("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
@@ -360,8 +373,8 @@ struct AdvancedNetworkSettings: View {
         let userMode = Text("A separate TCP connection will be used **for each chat profile you have in the app**.")
         return switch mode {
         case .user: userMode
-        case .session: userMode + Text("\n") + Text("New SOCKS credentials will be used every time you start the app.")
-        case .server: userMode + Text("\n") + Text("New SOCKS credentials will be used for each server.")
+        case .session: userMode + textNewLine + Text("New SOCKS credentials will be used every time you start the app.")
+        case .server: userMode + textNewLine + Text("New SOCKS credentials will be used for each server.")
         case .entity: Text("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.")
         }
     }
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
index 16aa98bc5f..6f4710396a 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
@@ -238,22 +238,23 @@ struct UsageConditionsView: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 20) {
-            HStack {
-                Text("Conditions of use").font(.largeTitle).bold()
-                Spacer()
-                conditionsLinkButton()
-            }
-            .padding(.top)
-            .padding(.top)
-
             switch ChatModel.shared.conditions.conditionsAction {
 
             case .none:
+                regularConditionsHeader()
+                    .padding(.top)
+                    .padding(.top)
                 ConditionsTextView()
                     .padding(.bottom)
                     .padding(.bottom)
 
             case let .review(operators, deadline, _):
+                HStack {
+                    Text("Updated conditions").font(.largeTitle).bold()
+                }
+                .padding(.top)
+                .padding(.top)
+
                 Text("Conditions will be accepted for the operator(s): **\(operators.map { $0.legalName_ }.joined(separator: ", "))**.")
                 ConditionsTextView()
                 VStack(spacing: 8) {
@@ -265,6 +266,10 @@ struct UsageConditionsView: View {
                             .multilineTextAlignment(.center)
                             .frame(maxWidth: .infinity, alignment: .center)
                             .padding(.horizontal, 32)
+                        conditionsDiffButton(.footnote)
+                    } else {
+                        conditionsDiffButton()
+                            .padding(.top)
                     }
                 }
                 .padding(.bottom)
@@ -272,6 +277,9 @@ struct UsageConditionsView: View {
                 
 
             case let .accepted(operators):
+                regularConditionsHeader()
+                    .padding(.top)
+                    .padding(.top)
                 Text("Conditions are accepted for the operator(s): **\(operators.map { $0.legalName_ }.joined(separator: ", "))**.")
                 ConditionsTextView()
                     .padding(.bottom)
@@ -312,6 +320,43 @@ struct UsageConditionsView: View {
             }
         }
     }
+
+    @ViewBuilder private func conditionsDiffButton(_ font: Font? = nil) -> some View {
+        let commit = ChatModel.shared.conditions.currentConditions.conditionsCommit
+        if let commitUrl = URL(string: "https://github.com/simplex-chat/simplex-chat/commit/\(commit)") {
+            Link(destination: commitUrl) {
+                HStack {
+                    Text("Open changes")
+                    Image(systemName: "arrow.up.right.circle")
+                }
+                .font(font)
+            }
+        }
+    }
+}
+
+private func regularConditionsHeader() -> some View {
+    HStack {
+        Text("Conditions of use").font(.largeTitle).bold()
+        Spacer()
+        conditionsLinkButton()
+    }
+}
+
+struct SimpleConditionsView: View {
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 20) {
+            regularConditionsHeader()
+                .padding(.top)
+                .padding(.top)
+            ConditionsTextView()
+                .padding(.bottom)
+                .padding(.bottom)
+        }
+        .padding(.horizontal, 25)
+        .frame(maxHeight: .infinity)
+    }
 }
 
 func validateServers_(_ userServers: Binding<[UserOperatorServers]>, _ serverErrors: Binding<[UserServersError]>) {
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NewServerView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NewServerView.swift
index 17a0ffdd1c..c8cb2349e7 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NewServerView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NewServerView.swift
@@ -65,7 +65,7 @@ struct NewServerView: View {
                 useServerSection(valid)
                 if valid {
                     Section(header: Text("Add to another device").foregroundColor(theme.colors.secondary)) {
-                        MutableQRCode(uri: $serverToEdit.server)
+                        MutableQRCode(uri: $serverToEdit.server, small: true)
                             .listRowInsets(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
                     }
                 }
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
index 24da6a94a8..afbccc109c 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
@@ -38,9 +38,9 @@ struct OperatorView: View {
             .allowsHitTesting(!testing)
     }
 
-    @ViewBuilder private func operatorView() -> some View {
+    private func operatorView() -> some View {
         let duplicateHosts = findDuplicateHosts(serverErrors)
-        VStack {
+        return VStack {
             List {
                 Section {
                     infoViewLink()
@@ -500,14 +500,14 @@ struct SingleOperatorUsageConditionsView: View {
         }
     }
     
-    @ViewBuilder private func acceptConditionsButton() -> some View {
+    private func acceptConditionsButton() -> some View {
         let operatorIds = ChatModel.shared.conditions.serverOperators
             .filter {
                 $0.operatorId == userServers[operatorIndex].operator_.operatorId || // Opened operator
                 ($0.enabled && !$0.conditionsAcceptance.conditionsAccepted) // Other enabled operators with conditions not accepted
             }
             .map { $0.operatorId }
-        Button {
+        return Button {
             acceptForOperators(operatorIds, operatorIndex)
         } label: {
             Text("Accept conditions")
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServerView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServerView.swift
index 13d01874ed..97bfd360cb 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServerView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServerView.swift
@@ -110,7 +110,7 @@ struct ProtocolServerView: View {
                 useServerSection(valid)
                 if valid {
                     Section(header: Text("Add to another device").foregroundColor(theme.colors.secondary)) {
-                        MutableQRCode(uri: $serverToEdit.server)
+                        MutableQRCode(uri: $serverToEdit.server, small: true)
                             .listRowInsets(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
                     }
                 }
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServersView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServersView.swift
index ed3c5c773c..b9737914ec 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServersView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServersView.swift
@@ -38,9 +38,9 @@ struct YourServersView: View {
             .allowsHitTesting(!testing)
     }
 
-    @ViewBuilder private func yourServersView() -> some View {
+    private func yourServersView() -> some View {
         let duplicateHosts = findDuplicateHosts(serverErrors)
-        List {
+        return List {
             if !userServers[operatorIndex].smpServers.filter({ !$0.deleted }).isEmpty {
                 Section {
                     ForEach($userServers[operatorIndex].smpServers) { srv in
diff --git a/apps/ios/Shared/Views/UserSettings/NotificationsView.swift b/apps/ios/Shared/Views/UserSettings/NotificationsView.swift
index 4e7f826f4f..c4d0588987 100644
--- a/apps/ios/Shared/Views/UserSettings/NotificationsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NotificationsView.swift
@@ -13,7 +13,7 @@ struct NotificationsView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
-    @State private var showAlert: NotificationAlert?
+    @State private var ntfAlert: NotificationAlert?
     @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
     @State private var testing = false
     @State private var testedSuccess: Bool? = nil
@@ -25,7 +25,7 @@ struct NotificationsView: View {
                 ProgressView().scaleEffect(2)
             }
         }
-        .alert(item: $showAlert) { alert in
+        .alert(item: $ntfAlert) { alert in
             if let token = m.deviceToken {
                 return notificationAlert(alert, token)
             } else {
@@ -41,7 +41,7 @@ struct NotificationsView: View {
                     List {
                         Section {
                             SelectionListView(list: NotificationsMode.values, selection: $notificationMode) { mode in
-                                showAlert = .setMode(mode: mode)
+                                ntfAlert = .setMode(mode: mode)
                             }
                         } footer: {
                             VStack(alignment: .leading) {
@@ -95,7 +95,7 @@ struct NotificationsView: View {
 
                 if let server = m.notificationServer {
                     smpServers("Push server", [server], theme.colors.secondary)
-                    testServerButton(server)
+                    testTokenButton(server)
                 }
             } header: {
                 Text("Push notifications")
@@ -163,7 +163,7 @@ struct NotificationsView: View {
                     await MainActor.run {
                         let err = responseError(error)
                         logger.error("apiDeleteToken error: \(err)")
-                        showAlert = .error(title: "Error deleting token", error: err)
+                        ntfAlert = .error(title: "Error deleting token", error: err)
                     }
                 }
             default:
@@ -181,19 +181,19 @@ struct NotificationsView: View {
                     await MainActor.run {
                         let err = responseError(error)
                         logger.error("apiRegisterToken error: \(err)")
-                        showAlert = .error(title: "Error enabling notifications", error: err)
+                        ntfAlert = .error(title: "Error enabling notifications", error: err)
                     }
                 }
             }
         }
     }
 
-    private func testServerButton(_ server: String) -> some View {
+    private func testTokenButton(_ server: String) -> some View {
         HStack {
-            Button("Test server") {
+            Button("Test notifications") {
                 testing = true
                 Task {
-                    await testServer(server)
+                    await testServerAndToken(server)
                     await MainActor.run { testing = false }
                 }
             }
@@ -215,22 +215,61 @@ struct NotificationsView: View {
         }
     }
 
-    private func testServer(_ server: String) async {
+    private func testServerAndToken(_ server: String) async {
         do {
             let r = try await testProtoServer(server: server)
             switch r {
             case .success:
-                await MainActor.run {
-                    testedSuccess = true
+                if let token = m.deviceToken {
+                    do {
+                        let status = try await apiCheckToken(token: token)
+                        await MainActor.run {
+                            m.tokenStatus = status
+                            testedSuccess = status.workingToken
+                            if status.workingToken {
+                                showAlert(
+                                    NSLocalizedString("Notifications status", comment: "alert title"),
+                                    message: tokenStatusInfo(status, register: false)
+                                )
+                            } else {
+                                showAlert(
+                                    title: NSLocalizedString("Notifications error", comment: "alert title"),
+                                    message: tokenStatusInfo(status, register: true),
+                                    buttonTitle: "Register",
+                                    buttonAction: {
+                                        reRegisterToken(token: token)
+                                        testedSuccess = nil
+                                    },
+                                    cancelButton: true
+                                )
+                            }
+                        }
+                    } catch let error {
+                        await MainActor.run {
+                            let err = responseError(error)
+                            logger.error("apiCheckToken \(err)")
+                            ntfAlert = .error(title: "Error checking token status", error: err)
+                        }
+                    }
+                } else {
+                    await MainActor.run {
+                        showAlert(
+                            NSLocalizedString("No token!", comment: "alert title")
+                        )
+                    }
                 }
             case let .failure(f):
                 await MainActor.run {
-                    showAlert = .testFailure(testFailure: f)
+                    ntfAlert = .testFailure(testFailure: f)
                     testedSuccess = false
                 }
             }
         } catch let error {
-            logger.error("testServerConnection \(responseError(error))")
+            await MainActor.run {
+                let err = responseError(error)
+                logger.error("testServerConnection \(err)")
+                ntfAlert = .error(title: "Error testing server connection", error: err)
+            }
         }
     }
 }
diff --git a/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift b/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift
index 0b9d1ef76c..eba7f8066a 100644
--- a/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift
@@ -14,12 +14,13 @@ struct PrivacySettings: View {
     @EnvironmentObject var theme: AppTheme
     @AppStorage(DEFAULT_PRIVACY_ACCEPT_IMAGES) private var autoAcceptImages = true
     @AppStorage(DEFAULT_PRIVACY_LINK_PREVIEWS) private var useLinkPreviews = true
-    @State private var chatListOpenLinks = privacyChatListOpenLinksDefault.get()
     @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_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_PRIVACY_SHORT_LINKS) private var shortSimplexLinks = false
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
     @State private var currentLAMode = privacyLocalAuthModeDefault.get()
@@ -75,17 +76,6 @@ struct PrivacySettings: View {
                                 privacyLinkPreviewsGroupDefault.set(linkPreviews)
                             }
                     }
-                    settingsRow("arrow.up.right.circle", color: theme.colors.secondary) {
-                        Picker("Open links from chat list", selection: $chatListOpenLinks) {
-                            ForEach(PrivacyChatListOpenLinksMode.allCases) { mode in
-                                Text(mode.text)
-                            }
-                        }
-                    }
-                    .frame(height: 36)
-                    .onChange(of: chatListOpenLinks) { mode in
-                        privacyChatListOpenLinksDefault.set(mode)
-                    }
                     settingsRow("message", color: theme.colors.secondary) {
                         Toggle("Show last messages", isOn: $showChatPreviews)
                     }
@@ -111,6 +101,11 @@ struct PrivacySettings: View {
                     .onChange(of: simplexLinkMode) { mode in
                         privacySimplexLinkModeDefault.set(mode)
                     }
+                    if developerTools {
+                        settingsRow("link.badge.plus", color: theme.colors.secondary) {
+                            Toggle("Use short links (BETA)", isOn: $shortSimplexLinks)
+                        }
+                    }
                 } header: {
                     Text("Chats")
                         .foregroundColor(theme.colors.secondary)
diff --git a/apps/ios/Shared/Views/UserSettings/SettingsView.swift b/apps/ios/Shared/Views/UserSettings/SettingsView.swift
index 138c3689f5..50a012f4f8 100644
--- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift
@@ -29,10 +29,10 @@ 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_LINK_PREVIEWS = "privacyLinkPreviews" // deprecated, moved to app group
-let DEFAULT_PRIVACY_CHAT_LIST_OPEN_LINKS = "privacyChatListOpenLinks"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
 let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
 let DEFAULT_PRIVACY_SAVE_LAST_DRAFT = "privacySaveLastDraft"
+let DEFAULT_PRIVACY_SHORT_LINKS = "privacyShortLinks"
 let DEFAULT_PRIVACY_PROTECT_SCREEN = "privacyProtectScreen"
 let DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET = "privacyDeliveryReceiptsSet"
 let DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS = "privacyMediaBlurRadius"
@@ -58,6 +58,7 @@ 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_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT = "showReportsInSupportChatAlert"
 let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
 let DEFAULT_MIGRATION_TO_STAGE = "migrationToStage"
@@ -99,6 +100,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_PRIVACY_SIMPLEX_LINK_MODE: SimpleXLinkMode.description.rawValue,
     DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS: true,
     DEFAULT_PRIVACY_SAVE_LAST_DRAFT: true,
+    DEFAULT_PRIVACY_SHORT_LINKS: false,
     DEFAULT_PRIVACY_PROTECT_SCREEN: false,
     DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET: false,
     DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS: 0,
@@ -116,6 +118,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
     DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE: true,
     DEFAULT_SHOW_MUTE_PROFILE_ALERT: true,
+    DEFAULT_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT: true,
     DEFAULT_ONBOARDING_STAGE: OnboardingStage.onboardingComplete.rawValue,
     DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
     DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
@@ -143,6 +146,7 @@ let hintDefaults = [
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN,
     DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE,
     DEFAULT_SHOW_MUTE_PROFILE_ALERT,
+    DEFAULT_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT,
     DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE,
     DEFAULT_SHOW_DELETE_CONTACT_NOTICE
 ]
@@ -183,8 +187,6 @@ let connectViaLinkTabDefault = EnumDefault<ConnectViaLinkTab>(defaults: UserDefa
 
 let privacySimplexLinkModeDefault = EnumDefault<SimpleXLinkMode>(defaults: UserDefaults.standard, forKey: DEFAULT_PRIVACY_SIMPLEX_LINK_MODE, withDefault: .description)
 
-let privacyChatListOpenLinksDefault = EnumDefault<PrivacyChatListOpenLinksMode>(defaults: UserDefaults.standard, forKey: DEFAULT_PRIVACY_CHAT_LIST_OPEN_LINKS, withDefault: PrivacyChatListOpenLinksMode.ask)
-
 let privacyLocalAuthModeDefault = EnumDefault<LAMode>(defaults: UserDefaults.standard, forKey: DEFAULT_LA_MODE, withDefault: .system)
 
 let privacyDeliveryReceiptsSet = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET)
@@ -196,6 +198,8 @@ let customDisappearingMessageTimeDefault = IntDefault(defaults: UserDefaults.sta
 let showDeleteConversationNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE)
 let showDeleteContactNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONTACT_NOTICE)
 
+let showReportsInSupportChatAlertDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT)
+
 /// after importing new database, this flag will be set and unset only after importing app settings in `initializeChat` */
 let shouldImportAppSettingsDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOULD_IMPORT_APP_SETTINGS)
 let currentThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME, withDefault: DefaultTheme.SYSTEM_THEME_NAME)
@@ -281,159 +285,159 @@ struct SettingsView: View {
         }
     }
 
-    @ViewBuilder func settingsView() -> some View {
-        let user = chatModel.currentUser
-            List {
-                Section(header: Text("Settings").foregroundColor(theme.colors.secondary)) {
-                    NavigationLink {
-                        NotificationsView()
-                            .navigationTitle("Notifications")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        HStack {
-                            notificationsIcon()
-                            Text("Notifications")
-                        }
-                    }
-                    .disabled(chatModel.chatRunning != true)
-                    
-                    NavigationLink {
-                        NetworkAndServers()
-                            .navigationTitle("Network & servers")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        settingsRow("externaldrive.connected.to.line.below", color: theme.colors.secondary) { Text("Network & servers") }
-                    }
-                    .disabled(chatModel.chatRunning != true)
-                    
-                    NavigationLink {
-                        CallSettings()
-                            .navigationTitle("Your calls")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        settingsRow("video", color: theme.colors.secondary) { Text("Audio & video calls") }
-                    }
-                    .disabled(chatModel.chatRunning != true)
-                    
-                    NavigationLink {
-                        PrivacySettings()
-                            .navigationTitle("Your privacy")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        settingsRow("lock", color: theme.colors.secondary) { Text("Privacy & security") }
-                    }
-                    .disabled(chatModel.chatRunning != true)
-                    
-                    if UIApplication.shared.supportsAlternateIcons {
-                        NavigationLink {
-                            AppearanceSettings()
-                                .navigationTitle("Appearance")
-                                .modifier(ThemedBackground(grouped: true))
-                        } label: {
-                            settingsRow("sun.max", color: theme.colors.secondary) { Text("Appearance") }
-                        }
-                        .disabled(chatModel.chatRunning != true)
+    func settingsView() -> some View {
+        List {
+            let user = chatModel.currentUser
+            Section(header: Text("Settings").foregroundColor(theme.colors.secondary)) {
+                NavigationLink {
+                    NotificationsView()
+                        .navigationTitle("Notifications")
+                        .modifier(ThemedBackground(grouped: true))
+                } label: {
+                    HStack {
+                        notificationsIcon()
+                        Text("Notifications")
                     }
                 }
+                .disabled(chatModel.chatRunning != true)
 
-                Section(header: Text("Chat database").foregroundColor(theme.colors.secondary)) {
-                    chatDatabaseRow()
-                    NavigationLink {
-                        MigrateFromDevice(showProgressOnSettings: $showProgress)
-                            .toolbar {
-                                // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-                                ToolbarItem(placement: .principal) {
-                                    Text("Migrate device").font(.headline)
-                                }
-                            }
-                            .modifier(ThemedBackground(grouped: true))
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        settingsRow("tray.and.arrow.up", color: theme.colors.secondary) { Text("Migrate to another device") }
-                    }
+                NavigationLink {
+                    NetworkAndServers()
+                        .navigationTitle("Network & servers")
+                        .modifier(ThemedBackground(grouped: true))
+                } label: {
+                    settingsRow("externaldrive.connected.to.line.below", color: theme.colors.secondary) { Text("Network & servers") }
                 }
-                
-                Section(header: Text("Help").foregroundColor(theme.colors.secondary)) {
-                    if let user = user {
-                        NavigationLink {
-                            ChatHelp(dismissSettingsSheet: dismiss)
-                                .navigationTitle("Welcome \(user.displayName)!")
-                                .modifier(ThemedBackground())
-                                .frame(maxHeight: .infinity, alignment: .top)
-                        } label: {
-                            settingsRow("questionmark", color: theme.colors.secondary) { Text("How to use it") }
-                        }
-                    }
+                .disabled(chatModel.chatRunning != true)
+
+                NavigationLink {
+                    CallSettings()
+                        .navigationTitle("Your calls")
+                        .modifier(ThemedBackground(grouped: true))
+                } label: {
+                    settingsRow("video", color: theme.colors.secondary) { Text("Audio & video calls") }
+                }
+                .disabled(chatModel.chatRunning != true)
+
+                NavigationLink {
+                    PrivacySettings()
+                        .navigationTitle("Your privacy")
+                        .modifier(ThemedBackground(grouped: true))
+                } label: {
+                    settingsRow("lock", color: theme.colors.secondary) { Text("Privacy & security") }
+                }
+                .disabled(chatModel.chatRunning != true)
+
+                if UIApplication.shared.supportsAlternateIcons {
                     NavigationLink {
-                        WhatsNewView(viaSettings: true, updatedConditions: false)
-                            .modifier(ThemedBackground())
-                            .navigationBarTitleDisplayMode(.inline)
+                        AppearanceSettings()
+                            .navigationTitle("Appearance")
+                            .modifier(ThemedBackground(grouped: true))
                     } label: {
-                        settingsRow("plus", color: theme.colors.secondary) { Text("What's new") }
+                        settingsRow("sun.max", color: theme.colors.secondary) { Text("Appearance") }
                     }
+                    .disabled(chatModel.chatRunning != true)
+                }
+            }
+
+            Section(header: Text("Chat database").foregroundColor(theme.colors.secondary)) {
+                chatDatabaseRow()
+                NavigationLink {
+                    MigrateFromDevice(showProgressOnSettings: $showProgress)
+                        .toolbar {
+                            // Redaction broken for `.navigationTitle` - using a toolbar item instead.
+                            ToolbarItem(placement: .principal) {
+                                Text("Migrate device").font(.headline)
+                            }
+                        }
+                        .modifier(ThemedBackground(grouped: true))
+                        .navigationBarTitleDisplayMode(.large)
+                } label: {
+                    settingsRow("tray.and.arrow.up", color: theme.colors.secondary) { Text("Migrate to another device") }
+                }
+            }
+
+            Section(header: Text("Help").foregroundColor(theme.colors.secondary)) {
+                if let user = user {
                     NavigationLink {
-                        SimpleXInfo(onboarding: false)
-                            .navigationBarTitle("", displayMode: .inline)
+                        ChatHelp(dismissSettingsSheet: dismiss)
+                            .navigationTitle("Welcome \(user.displayName)!")
                             .modifier(ThemedBackground())
                             .frame(maxHeight: .infinity, alignment: .top)
                     } label: {
-                        settingsRow("info", color: theme.colors.secondary) { Text("About SimpleX Chat") }
+                        settingsRow("questionmark", color: theme.colors.secondary) { Text("How to use it") }
                     }
-                    settingsRow("number", color: theme.colors.secondary) {
-                        Button("Send questions and ideas") {
-                            dismiss()
-                            DispatchQueue.main.async {
-                                UIApplication.shared.open(simplexTeamURL)
-                            }
+                }
+                NavigationLink {
+                    WhatsNewView(viaSettings: true, updatedConditions: false)
+                        .modifier(ThemedBackground())
+                        .navigationBarTitleDisplayMode(.inline)
+                } label: {
+                    settingsRow("plus", color: theme.colors.secondary) { Text("What's new") }
+                }
+                NavigationLink {
+                    SimpleXInfo(onboarding: false)
+                        .navigationBarTitle("", displayMode: .inline)
+                        .modifier(ThemedBackground())
+                        .frame(maxHeight: .infinity, alignment: .top)
+                } label: {
+                    settingsRow("info", color: theme.colors.secondary) { Text("About SimpleX Chat") }
+                }
+                settingsRow("number", color: theme.colors.secondary) {
+                    Button("Send questions and ideas") {
+                        dismiss()
+                        DispatchQueue.main.async {
+                            UIApplication.shared.open(simplexTeamURL)
                         }
                     }
-                    .disabled(chatModel.chatRunning != true)
-                    settingsRow("envelope", color: theme.colors.secondary) { Text("[Send us email](mailto:chat@simplex.chat)") }
                 }
+                .disabled(chatModel.chatRunning != true)
+                settingsRow("envelope", color: theme.colors.secondary) { Text("[Send us email](mailto:chat@simplex.chat)") }
+            }
 
-                Section(header: Text("Support SimpleX Chat").foregroundColor(theme.colors.secondary)) {
-                    settingsRow("keyboard", color: theme.colors.secondary) { Text("[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)") }
-                    settingsRow("star", color: theme.colors.secondary) {
-                        Button("Rate the app") {
-                            if let scene = sceneDelegate.windowScene {
-                                SKStoreReviewController.requestReview(in: scene)
-                            }
+            Section(header: Text("Support SimpleX Chat").foregroundColor(theme.colors.secondary)) {
+                settingsRow("keyboard", color: theme.colors.secondary) { Text("[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)") }
+                settingsRow("star", color: theme.colors.secondary) {
+                    Button("Rate the app") {
+                        if let scene = sceneDelegate.windowScene {
+                            SKStoreReviewController.requestReview(in: scene)
                         }
                     }
-                    ZStack(alignment: .leading) {
-                        Image(colorScheme == .dark ? "github_light" : "github")
-                            .resizable()
-                            .frame(width: 24, height: 24)
-                            .opacity(0.5)
-                            .colorMultiply(theme.colors.secondary)
-                        Text("[Star on GitHub](https://github.com/simplex-chat/simplex-chat)")
-                            .padding(.leading, indent)
-                    }
                 }
+                ZStack(alignment: .leading) {
+                    Image(colorScheme == .dark ? "github_light" : "github")
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                        .opacity(0.5)
+                        .colorMultiply(theme.colors.secondary)
+                    Text("[Star on GitHub](https://github.com/simplex-chat/simplex-chat)")
+                        .padding(.leading, indent)
+                }
+            }
 
-                Section(header: Text("Develop").foregroundColor(theme.colors.secondary)) {
-                    NavigationLink {
-                        DeveloperView()
-                            .navigationTitle("Developer tools")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        settingsRow("chevron.left.forwardslash.chevron.right", color: theme.colors.secondary) { Text("Developer tools") }
-                    }
-                    NavigationLink {
-                        VersionView()
-                            .navigationBarTitle("App version")
-                            .modifier(ThemedBackground())
-                    } label: {
-                        Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))")
-                    }
+            Section(header: Text("Develop").foregroundColor(theme.colors.secondary)) {
+                NavigationLink {
+                    DeveloperView()
+                        .navigationTitle("Developer tools")
+                        .modifier(ThemedBackground(grouped: true))
+                } label: {
+                    settingsRow("chevron.left.forwardslash.chevron.right", color: theme.colors.secondary) { Text("Developer tools") }
+                }
+                NavigationLink {
+                    VersionView()
+                        .navigationBarTitle("App version")
+                        .modifier(ThemedBackground())
+                } label: {
+                    Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))")
                 }
             }
-            .navigationTitle("Your settings")
-            .modifier(ThemedBackground(grouped: true))
-            .onDisappear {
-                chatModel.showingTerminal = false
-                chatModel.terminalItems = []
-            }
+        }
+        .navigationTitle("Your settings")
+        .modifier(ThemedBackground(grouped: true))
+        .onDisappear {
+            chatModel.showingTerminal = false
+            chatModel.terminalItems = []
+        }
     }
     
     private func chatDatabaseRow() -> some View {
@@ -477,7 +481,11 @@ struct SettingsView: View {
         case .registered:
             icon = "bolt.fill"
             color = theme.colors.secondary
-        case .invalid:
+        case .invalid: fallthrough
+        case .invalidBad: fallthrough
+        case .invalidTopic: fallthrough
+        case .invalidExpired: fallthrough
+        case .invalidUnregistered:
             icon = "bolt.slash"
             color = theme.colors.secondary
         case .confirmed:
@@ -524,7 +532,7 @@ struct ProfilePreview: View {
 func profileName(_ profileOf: NamedChat) -> Text {
     var t = Text(profileOf.displayName).fontWeight(.semibold).font(.title2)
     if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
-        t = t + Text(" (" + profileOf.fullName + ")")
+        t = t + Text(verbatim: " (" + profileOf.fullName + ")")
 //                        .font(.callout)
         }
     return t
diff --git a/apps/ios/Shared/Views/UserSettings/StorageView.swift b/apps/ios/Shared/Views/UserSettings/StorageView.swift
index 2cf63692a7..094c1cb3d6 100644
--- a/apps/ios/Shared/Views/UserSettings/StorageView.swift
+++ b/apps/ios/Shared/Views/UserSettings/StorageView.swift
@@ -33,7 +33,7 @@ struct StorageView: View {
     private func directoryView(_ name: LocalizedStringKey, _ contents: [String: Int64]) -> some View {
         Text(name).font(.headline)
         ForEach(Array(contents), id: \.key) { (key, value) in
-            Text(key).bold() + Text("   ") + Text("\(ByteCountFormatter.string(fromByteCount: value, countStyle: .binary))")
+            Text(key).bold() + Text(verbatim: "   ") + Text((ByteCountFormatter.string(fromByteCount: value, countStyle: .binary)))
         }
     }
 
diff --git a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
index 7965215b49..f374995f78 100644
--- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
@@ -8,7 +8,7 @@
 
 import SwiftUI
 import MessageUI
-import SimpleXChat
+@preconcurrency import SimpleXChat
 
 struct UserAddressView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -16,6 +16,7 @@ struct UserAddressView: View {
     @EnvironmentObject var theme: AppTheme
     @State var shareViaProfile = false
     @State var autoCreate = false
+    @State private var showShortLink = true
     @State private var aas = AutoAcceptState()
     @State private var savedAAS = AutoAcceptState()
     @State private var showMailView = false
@@ -135,8 +136,8 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            SimpleXLinkQRCode(uri: userAddress.connReqContact)
-                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
+            SimpleXCreatedLinkQRCode(link: userAddress.connLinkContact, short: $showShortLink)
+                .id("simplex-contact-address-qrcode-\(userAddress.connLinkContact.simplexChatUri(short: showShortLink))")
             shareQRCodeButton(userAddress)
             // if MFMailComposeViewController.canSendMail() {
             //     shareViaEmailButton(userAddress)
@@ -152,9 +153,11 @@ struct UserAddressView: View {
                     }
             }
             addressSettingsButton(userAddress)
+            if (userAddress.connLinkContact.connShortLink == nil && UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)) {
+                addShortLinkButton()
+            }
         } header: {
-            Text("For social media")
-                .foregroundColor(theme.colors.secondary)
+            ToggleShortLinkHeader(text: Text("For social media"), link: userAddress.connLinkContact, short: $showShortLink)
         } footer: {
             if aas.business {
                 Text("Add your team members to the conversations.")
@@ -193,9 +196,10 @@ struct UserAddressView: View {
         progressIndicator = true
         Task {
             do {
-                let connReqContact = try await apiCreateUserAddress()
+                let short = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)
+                let connLinkContact = try await apiCreateUserAddress(short: short)
                 DispatchQueue.main.async {
-                    chatModel.userAddress = UserContactLink(connReqContact: connReqContact)
+                    chatModel.userAddress = UserContactLink(connLinkContact: connLinkContact)
                     alert = .shareOnCreate
                     progressIndicator = false
                 }
@@ -208,6 +212,32 @@ struct UserAddressView: View {
         }
     }
 
+    private func addShortLinkButton() -> some View {
+        Button {
+            addShortLink()
+        } label: {
+            Label("Add short link", systemImage: "plus")
+        }
+    }
+
+    private func addShortLink() {
+        progressIndicator = true
+        Task {
+            do {
+                let userAddress = try await apiAddMyAddressShortLink()
+                await MainActor.run {
+                    chatModel.userAddress = userAddress
+                }
+                await MainActor.run { progressIndicator = false }
+            } catch let error {
+                logger.error("apiAddMyAddressShortLink: \(responseError(error))")
+                let a = getErrorAlert(error, "Error creating address")
+                alert = .error(title: a.title, error: a.message)
+                await MainActor.run { progressIndicator = false }
+            }
+        }
+    }
+
     private func createOneTimeLinkButton() -> some View {
         NavigationLink {
             NewChatView(selection: .invite)
@@ -231,7 +261,7 @@ struct UserAddressView: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [simplexChatLink(userAddress.connLinkContact.simplexChatUri(short: showShortLink))])
         } label: {
             settingsRow("square.and.arrow.up", color: theme.colors.secondary) {
                 Text("Share address")
@@ -294,6 +324,28 @@ struct UserAddressView: View {
     }
 }
 
+struct ToggleShortLinkHeader: View {
+    @EnvironmentObject var theme: AppTheme
+    let text: Text
+    var link: CreatedConnLink
+    @Binding var short: Bool
+    
+    var body: some View {
+        if link.connShortLink == nil {
+            text.foregroundColor(theme.colors.secondary)
+        } else {
+            HStack {
+                text.foregroundColor(theme.colors.secondary)
+                Spacer()
+                Text(short ? "Full link" : "Short link")
+                    .textCase(.none)
+                    .foregroundColor(theme.colors.primary)
+                    .onTapGesture { short.toggle() }
+            }
+        }
+    }
+}
+
 private struct AutoAcceptState: Equatable {
     var enable = false
     var incognito = false
@@ -542,7 +594,7 @@ private func saveAAS(_ aas: Binding<AutoAcceptState>, _ savedAAS: Binding<AutoAc
 struct UserAddressView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
-        chatModel.userAddress = UserContactLink(connReqContact: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")
+        chatModel.userAddress = UserContactLink(connLinkContact: CreatedConnLink(connFullLink: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", connShortLink: nil))
 
         
         return Group {
diff --git a/apps/ios/Shared/Views/UserSettings/UserProfile.swift b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
index 8a70efbe82..aa2c04ccaa 100644
--- a/apps/ios/Shared/Views/UserSettings/UserProfile.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
@@ -25,28 +25,8 @@ struct UserProfile: View {
 
     var body: some View {
         List {
-            Group {
-                if profile.image != nil {
-                    ZStack(alignment: .bottomTrailing) {
-                        ZStack(alignment: .topTrailing) {
-                            profileImageView(profile.image)
-                                .onTapGesture { showChooseSource = true }
-                            overlayButton("multiply", edge: .top) { profile.image = nil }
-                        }
-                        overlayButton("camera", edge: .bottom) { showChooseSource = true }
-                    }
-                } else {
-                    ZStack(alignment: .center) {
-                        profileImageView(profile.image)
-                        editImageButton { showChooseSource = true }
-                    }
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-            .listRowBackground(Color.clear)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-            .padding(.top)
-            .contentShape(Rectangle())
+            EditProfileImage(profileImage: $profile.image, showChooseSource: $showChooseSource)
+                .padding(.top)
 
             Section {
                 HStack {
@@ -133,26 +113,6 @@ struct UserProfile: View {
         .alert(item: $alert) { a in userProfileAlert(a, $profile.displayName) }
     }
 
-    @ViewBuilder
-    private func overlayButton(
-        _ systemName: String,
-        edge: Edge.Set,
-        action: @escaping () -> Void
-    ) -> some View {
-        Image(systemName: systemName)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .frame(height: 12)
-            .foregroundColor(theme.colors.primary)
-            .padding(6)
-            .frame(width: 36, height: 36, alignment: .center)
-            .background(radius >= 20 ? Color.clear : theme.colors.background.opacity(0.5))
-            .clipShape(Circle())
-            .contentShape(Circle())
-            .padding([.trailing, edge], -12)
-            .onTapGesture(perform: action)
-    }
-
     private func showFullName(_ user: User) -> Bool {
         user.profile.fullName != "" && user.profile.fullName != user.profile.displayName
     }
@@ -190,8 +150,54 @@ struct UserProfile: View {
     }
 }
 
-func profileImageView(_ imageStr: String?) -> some View {
-    ProfileImage(imageStr: imageStr, size: 192)
+struct EditProfileImage: View {
+    @EnvironmentObject var theme: AppTheme
+    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
+    @Binding var profileImage: String?
+    @Binding var showChooseSource: Bool
+
+    var body: some View {
+        Group {
+            if profileImage != nil {
+                ZStack(alignment: .bottomTrailing) {
+                    ZStack(alignment: .topTrailing) {
+                        ProfileImage(imageStr: profileImage, size: 160)
+                            .onTapGesture { showChooseSource = true }
+                        overlayButton("multiply", edge: .top) { profileImage = nil }
+                    }
+                    overlayButton("camera", edge: .bottom) { showChooseSource = true }
+                }
+            } else {
+                ZStack(alignment: .center) {
+                    ProfileImage(imageStr: profileImage, size: 160)
+                    editImageButton { showChooseSource = true }
+                }
+            }
+        }
+        .frame(maxWidth: .infinity, alignment: .center)
+        .listRowBackground(Color.clear)
+        .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+        .contentShape(Rectangle())
+    }
+
+    private func overlayButton(
+        _ systemName: String,
+        edge: Edge.Set,
+        action: @escaping () -> Void
+    ) -> some View {
+        Image(systemName: systemName)
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+            .frame(height: 12)
+            .foregroundColor(theme.colors.primary)
+            .padding(6)
+            .frame(width: 36, height: 36, alignment: .center)
+            .background(radius >= 20 ? Color.clear : theme.colors.background.opacity(0.5))
+            .clipShape(Circle())
+            .contentShape(Circle())
+            .padding([.trailing, edge], -12)
+            .onTapGesture(perform: action)
+    }
 }
 
 func editImageButton(action: @escaping () -> Void) -> some View {
diff --git a/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift b/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
index 781ea4bc34..ddfe59e719 100644
--- a/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
@@ -221,11 +221,11 @@ struct UserProfilesView: View {
         !user.hidden ? nil : trimmedSearchTextOrPassword
     }
 
-    @ViewBuilder private func profileActionView(_ action: UserProfileAction) -> some View {
+    private func profileActionView(_ action: UserProfileAction) -> some View {
         let passwordValid = actionPassword == actionPassword.trimmingCharacters(in: .whitespaces)
         let passwordField = PassphraseField(key: $actionPassword, placeholder: "Profile password", valid: passwordValid)
         let actionEnabled: (User) -> Bool = { user in actionPassword != "" && passwordValid && correctPassword(user, actionPassword) }
-        List {
+        return List {
             switch action {
             case let .deleteUser(user, delSMPQueues):
                 actionHeader("Delete profile", user)
@@ -350,7 +350,7 @@ struct UserProfilesView: View {
                     Image(systemName: "checkmark").foregroundColor(theme.colors.onBackground)
                 } else {
                     if userInfo.unreadCount > 0 {
-                        UnreadBadge(userInfo: userInfo)
+                        userUnreadBadge(userInfo, theme: theme)
                     }
                     if user.hidden {
                         Image(systemName: "lock").foregroundColor(theme.colors.secondary)
diff --git a/apps/ios/SimpleX (iOS).entitlements b/apps/ios/SimpleX (iOS).entitlements
index c78a7cb941..2ec32def0a 100644
--- a/apps/ios/SimpleX (iOS).entitlements	
+++ b/apps/ios/SimpleX (iOS).entitlements	
@@ -9,6 +9,10 @@
 		<string>applinks:simplex.chat</string>
 		<string>applinks:www.simplex.chat</string>
 		<string>applinks:simplex.chat?mode=developer</string>
+		<string>applinks:*.simplex.im</string>
+		<string>applinks:*.simplex.im?mode=developer</string>
+		<string>applinks:*.simplexonflux.com</string>
+		<string>applinks:*.simplexonflux.com?mode=developer</string>
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
diff --git a/apps/ios/SimpleX Localizations/ar.xcloc/Localized Contents/ar.xliff b/apps/ios/SimpleX Localizations/ar.xcloc/Localized Contents/ar.xliff
index ef91bb30fd..e965e5a1a5 100644
--- a/apps/ios/SimpleX Localizations/ar.xcloc/Localized Contents/ar.xliff	
+++ b/apps/ios/SimpleX Localizations/ar.xcloc/Localized Contents/ar.xliff	
@@ -49,7 +49,7 @@
       </trans-unit>
       <trans-unit id="%@" xml:space="preserve" approved="no">
         <source>%@</source>
-        <target state="needs-translation">%@</target>
+        <target state="translated">%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ %@" xml:space="preserve" approved="no">
@@ -379,292 +379,356 @@
         <target state="translated">أضف إلى جهاز آخر</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
+      <trans-unit id="Admins can create the links to join groups." xml:space="preserve" approved="no">
         <source>Admins can create the links to join groups.</source>
+        <target state="translated">يمكن للمُدراء إنشاء روابط للانضمام إلى المجموعات.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Advanced network settings" xml:space="preserve">
+      <trans-unit id="Advanced network settings" xml:space="preserve" approved="no">
         <source>Advanced network settings</source>
+        <target state="translated">إعدادات الشبكة المتقدمة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve">
+      <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
         <source>All chats and messages will be deleted - this cannot be undone!</source>
+        <target state="translated">سيتم حذف جميع الدردشات والرسائل - لا يمكن التراجع عن هذا!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All group members will remain connected." xml:space="preserve">
+      <trans-unit id="All group members will remain connected." xml:space="preserve" approved="no">
         <source>All group members will remain connected.</source>
+        <target state="translated">سيبقى جميع أعضاء المجموعة على اتصال.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve">
+      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve" approved="no">
         <source>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</source>
+        <target state="translated">سيتم حذف جميع الرسائل - لا يمكن التراجع عن هذا! سيتم حذف الرسائل فقط من أجلك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected" xml:space="preserve">
         <source>All your contacts will remain connected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow" xml:space="preserve">
+      <trans-unit id="Allow" xml:space="preserve" approved="no">
         <source>Allow</source>
+        <target state="translated">سماح</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
+      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve" approved="no">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
+        <target state="translated">السماح بالرسائل المختفية فقط إذا سمحت لك جهة الاتصال بذلك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
+      <trans-unit id="Allow sending direct messages to members." xml:space="preserve" approved="no">
         <source>Allow sending direct messages to members.</source>
+        <target state="translated">السماح بإرسال رسائل مباشرة إلى الأعضاء.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow sending disappearing messages." xml:space="preserve" approved="no">
         <source>Allow sending disappearing messages.</source>
+        <target state="translated">السماح بإرسال الرسائل التي تختفي.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow to send voice messages." xml:space="preserve" approved="no">
         <source>Allow to send voice messages.</source>
+        <target state="translated">السماح بإرسال رسائل صوتية.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
+      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve" approved="no">
         <source>Allow voice messages only if your contact allows them.</source>
+        <target state="translated">اسمح بالرسائل الصوتية فقط إذا سمحت جهة اتصالك بذلك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages?" xml:space="preserve">
+      <trans-unit id="Allow voice messages?" xml:space="preserve" approved="no">
         <source>Allow voice messages?</source>
+        <target state="translated">السماح بالرسائل الصوتية؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow your contacts to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send disappearing messages.</source>
+        <target state="translated">السماح لجهات اتصالك بإرسال رسائل تختفي.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send voice messages.</source>
+        <target state="translated">اسمح لجهات اتصالك بإرسال رسائل صوتية.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connected?" xml:space="preserve">
+      <trans-unit id="Already connected?" xml:space="preserve" approved="no">
         <source>Already connected?</source>
+        <target state="translated">متصل بالفعل؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Answer call" xml:space="preserve">
+      <trans-unit id="Answer call" xml:space="preserve" approved="no">
         <source>Answer call</source>
+        <target state="translated">أجب الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App build: %@" xml:space="preserve">
+      <trans-unit id="App build: %@" xml:space="preserve" approved="no">
         <source>App build: %@</source>
+        <target state="translated">إصدار التطبيق: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App icon" xml:space="preserve">
+      <trans-unit id="App icon" xml:space="preserve" approved="no">
         <source>App icon</source>
+        <target state="translated">رمز التطبيق</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version" xml:space="preserve">
+      <trans-unit id="App version" xml:space="preserve" approved="no">
         <source>App version</source>
+        <target state="translated">نسخة التطبيق</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version: v%@" xml:space="preserve">
+      <trans-unit id="App version: v%@" xml:space="preserve" approved="no">
         <source>App version: v%@</source>
+        <target state="translated">نسخة التطبيق: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Appearance" xml:space="preserve">
+      <trans-unit id="Appearance" xml:space="preserve" approved="no">
         <source>Appearance</source>
+        <target state="translated">المظهر</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Attach" xml:space="preserve">
+      <trans-unit id="Attach" xml:space="preserve" approved="no">
         <source>Attach</source>
+        <target state="translated">إرفاق</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio &amp; video calls" xml:space="preserve">
+      <trans-unit id="Audio &amp; video calls" xml:space="preserve" approved="no">
         <source>Audio &amp; video calls</source>
+        <target state="translated">مكالمات الصوت والفيديو</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication failed" xml:space="preserve">
+      <trans-unit id="Authentication failed" xml:space="preserve" approved="no">
         <source>Authentication failed</source>
+        <target state="translated">فشلت المصادقة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication unavailable" xml:space="preserve">
+      <trans-unit id="Authentication unavailable" xml:space="preserve" approved="no">
         <source>Authentication unavailable</source>
+        <target state="translated">المصادقة غير متاحة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Auto-accept contact requests" xml:space="preserve">
+      <trans-unit id="Auto-accept contact requests" xml:space="preserve" approved="no">
         <source>Auto-accept contact requests</source>
+        <target state="translated">قبول طلبات الاتصال تلقائيًا</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Auto-accept images" xml:space="preserve">
+      <trans-unit id="Auto-accept images" xml:space="preserve" approved="no">
         <source>Auto-accept images</source>
+        <target state="translated">قبول تلقائي للصور</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Automatically" xml:space="preserve">
         <source>Automatically</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Back" xml:space="preserve">
+      <trans-unit id="Back" xml:space="preserve" approved="no">
         <source>Back</source>
+        <target state="translated">رجوع</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
         <source>Both you and your contact can irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Both you and your contact can send disappearing messages." xml:space="preserve">
+      <trans-unit id="Both you and your contact can send disappearing messages." xml:space="preserve" approved="no">
         <source>Both you and your contact can send disappearing messages.</source>
+        <target state="translated">يمكنك أنت وجهة اتصالك إرسال رسائل تختفي.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
+      <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve" approved="no">
         <source>Both you and your contact can send voice messages.</source>
+        <target state="translated">يمكنك أنت وجهة اتصالك إرسال رسائل صوتية.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
+      <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve" approved="no">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
+        <target state="translated">حسب ملف تعريف الدردشة (افتراضي) أو [حسب الاتصال] (https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Call already ended!" xml:space="preserve">
+      <trans-unit id="Call already ended!" xml:space="preserve" approved="no">
         <source>Call already ended!</source>
+        <target state="translated">انتهت المكالمة بالفعل!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Calls" xml:space="preserve">
+      <trans-unit id="Calls" xml:space="preserve" approved="no">
         <source>Calls</source>
+        <target state="translated">المكالمات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't invite contact!" xml:space="preserve">
+      <trans-unit id="Can't invite contact!" xml:space="preserve" approved="no">
         <source>Can't invite contact!</source>
+        <target state="translated">لا يمكن دعوة جهة اتصال!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't invite contacts!" xml:space="preserve">
+      <trans-unit id="Can't invite contacts!" xml:space="preserve" approved="no">
         <source>Can't invite contacts!</source>
+        <target state="translated">لا يمكن دعوة جهات الاتصال!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Cancel" xml:space="preserve">
+      <trans-unit id="Cancel" xml:space="preserve" approved="no">
         <source>Cancel</source>
+        <target state="translated">إلغاء</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
+      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve" approved="no">
         <source>Cannot access keychain to save database password</source>
+        <target state="translated">لا يمكن الوصول إلى سلسلة المفاتيح لحفظ كلمة مرور قاعدة البيانات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Cannot receive file" xml:space="preserve">
+      <trans-unit id="Cannot receive file" xml:space="preserve" approved="no">
         <source>Cannot receive file</source>
+        <target state="translated">لا يمكن استلام الملف</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change" xml:space="preserve">
+      <trans-unit id="Change" xml:space="preserve" approved="no">
         <source>Change</source>
+        <target state="translated">تغير</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change database passphrase?" xml:space="preserve">
+      <trans-unit id="Change database passphrase?" xml:space="preserve" approved="no">
         <source>Change database passphrase?</source>
+        <target state="translated">تغيير عبارة مرور قاعدة البيانات؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change member role?" xml:space="preserve">
+      <trans-unit id="Change member role?" xml:space="preserve" approved="no">
         <source>Change member role?</source>
+        <target state="translated">تغيير دور العضو؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change receiving address" xml:space="preserve">
+      <trans-unit id="Change receiving address" xml:space="preserve" approved="no">
         <source>Change receiving address</source>
+        <target state="translated">تغيير عنوان الاستلام</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change receiving address?" xml:space="preserve">
+      <trans-unit id="Change receiving address?" xml:space="preserve" approved="no">
         <source>Change receiving address?</source>
+        <target state="translated">تغيير عنوان الاستلام؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change role" xml:space="preserve">
+      <trans-unit id="Change role" xml:space="preserve" approved="no">
         <source>Change role</source>
+        <target state="translated">تغيير الدور</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat archive" xml:space="preserve">
         <source>Chat archive</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat console" xml:space="preserve">
+      <trans-unit id="Chat console" xml:space="preserve" approved="no">
         <source>Chat console</source>
+        <target state="translated">وحدة تحكم الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat database" xml:space="preserve">
+      <trans-unit id="Chat database" xml:space="preserve" approved="no">
         <source>Chat database</source>
+        <target state="translated">قاعدة بيانات الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat database deleted" xml:space="preserve">
+      <trans-unit id="Chat database deleted" xml:space="preserve" approved="no">
         <source>Chat database deleted</source>
+        <target state="translated">حُذفت قاعدة بيانات الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat database imported" xml:space="preserve">
+      <trans-unit id="Chat database imported" xml:space="preserve" approved="no">
         <source>Chat database imported</source>
+        <target state="translated">استُوردت قاعدة بيانات الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat is running" xml:space="preserve">
+      <trans-unit id="Chat is running" xml:space="preserve" approved="no">
         <source>Chat is running</source>
+        <target state="translated">الدردشة قيد التشغيل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat is stopped" xml:space="preserve">
+      <trans-unit id="Chat is stopped" xml:space="preserve" approved="no">
         <source>Chat is stopped</source>
+        <target state="translated">توقفت الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat preferences" xml:space="preserve">
+      <trans-unit id="Chat preferences" xml:space="preserve" approved="no">
         <source>Chat preferences</source>
+        <target state="translated">تفضيلات الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chats" xml:space="preserve">
+      <trans-unit id="Chats" xml:space="preserve" approved="no">
         <source>Chats</source>
+        <target state="translated">الدردشات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Check server address and try again." xml:space="preserve">
+      <trans-unit id="Check server address and try again." xml:space="preserve" approved="no">
         <source>Check server address and try again.</source>
+        <target state="translated">تحقق من عنوان الخادم وحاول مرة أخرى.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Choose file" xml:space="preserve">
+      <trans-unit id="Choose file" xml:space="preserve" approved="no">
         <source>Choose file</source>
+        <target state="translated">اختر الملف</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Choose from library" xml:space="preserve">
+      <trans-unit id="Choose from library" xml:space="preserve" approved="no">
         <source>Choose from library</source>
+        <target state="translated">اختر من المكتبة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear" xml:space="preserve">
+      <trans-unit id="Clear" xml:space="preserve" approved="no">
         <source>Clear</source>
+        <target state="translated">مسح</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear conversation" xml:space="preserve">
+      <trans-unit id="Clear conversation" xml:space="preserve" approved="no">
         <source>Clear conversation</source>
+        <target state="translated">مسح الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear conversation?" xml:space="preserve">
+      <trans-unit id="Clear conversation?" xml:space="preserve" approved="no">
         <source>Clear conversation?</source>
+        <target state="translated">مسح الدردشة؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear verification" xml:space="preserve">
+      <trans-unit id="Clear verification" xml:space="preserve" approved="no">
         <source>Clear verification</source>
+        <target state="translated">امسح التحقُّق</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Colors" xml:space="preserve">
         <source>Colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Compare security codes with your contacts." xml:space="preserve">
+      <trans-unit id="Compare security codes with your contacts." xml:space="preserve" approved="no">
         <source>Compare security codes with your contacts.</source>
+        <target state="translated">قارن رموز الأمان مع جهات اتصالك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Configure ICE servers" xml:space="preserve">
+      <trans-unit id="Configure ICE servers" xml:space="preserve" approved="no">
         <source>Configure ICE servers</source>
+        <target state="translated">ضبط خوادم ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Confirm" xml:space="preserve">
+      <trans-unit id="Confirm" xml:space="preserve" approved="no">
         <source>Confirm</source>
+        <target state="translated">تأكيد</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Confirm new passphrase…" xml:space="preserve">
+      <trans-unit id="Confirm new passphrase…" xml:space="preserve" approved="no">
         <source>Confirm new passphrase…</source>
+        <target state="translated">تأكيد عبارة المرور الجديدة…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect" xml:space="preserve">
+      <trans-unit id="Connect" xml:space="preserve" approved="no">
         <source>Connect</source>
+        <target state="translated">اتصل</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Connect via contact link?" xml:space="preserve">
@@ -675,8 +739,9 @@
         <source>Connect via group link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect via link" xml:space="preserve">
+      <trans-unit id="Connect via link" xml:space="preserve" approved="no">
         <source>Connect via link</source>
+        <target state="translated">تواصل عبر الرابط</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link / QR code" xml:space="preserve">
@@ -691,224 +756,273 @@
         <source>Connect via relay</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting server…" xml:space="preserve">
+      <trans-unit id="Connecting server…" xml:space="preserve" approved="no">
         <source>Connecting to server…</source>
+        <target state="translated">جارِ الاتصال بالخادم…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting server… (error: %@)" xml:space="preserve">
+      <trans-unit id="Connecting server… (error: %@)" xml:space="preserve" approved="no">
         <source>Connecting to server… (error: %@)</source>
+        <target state="translated">الاتصال بالخادم... (الخطأ: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection" xml:space="preserve">
+      <trans-unit id="Connection" xml:space="preserve" approved="no">
         <source>Connection</source>
+        <target state="translated">الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection error" xml:space="preserve">
+      <trans-unit id="Connection error" xml:space="preserve" approved="no">
         <source>Connection error</source>
+        <target state="translated">خطأ في الإتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection error (AUTH)" xml:space="preserve">
+      <trans-unit id="Connection error (AUTH)" xml:space="preserve" approved="no">
         <source>Connection error (AUTH)</source>
+        <target state="translated">خطأ في الإتصال (المصادقة)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection request" xml:space="preserve">
         <source>Connection request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection request sent!" xml:space="preserve">
+      <trans-unit id="Connection request sent!" xml:space="preserve" approved="no">
         <source>Connection request sent!</source>
+        <target state="translated">أرسلت طلب الاتصال!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection timeout" xml:space="preserve">
+      <trans-unit id="Connection timeout" xml:space="preserve" approved="no">
         <source>Connection timeout</source>
+        <target state="translated">انتهت مهلة الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact allows" xml:space="preserve">
+      <trans-unit id="Contact allows" xml:space="preserve" approved="no">
         <source>Contact allows</source>
+        <target state="translated">تسمح جهة الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact already exists" xml:space="preserve">
+      <trans-unit id="Contact already exists" xml:space="preserve" approved="no">
         <source>Contact already exists</source>
+        <target state="translated">جهة الاتصال موجودة بالفعل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact and all messages will be deleted - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact hidden:" xml:space="preserve">
+      <trans-unit id="Contact hidden:" xml:space="preserve" approved="no">
         <source>Contact hidden:</source>
+        <target state="translated">جهة الاتصال مخفية:</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Contact is connected" xml:space="preserve">
+      <trans-unit id="Contact is connected" xml:space="preserve" approved="no">
         <source>Contact is connected</source>
+        <target state="translated">تم الاتصال</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Contact is not connected yet!" xml:space="preserve">
         <source>Contact is not connected yet!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact name" xml:space="preserve">
+      <trans-unit id="Contact name" xml:space="preserve" approved="no">
         <source>Contact name</source>
+        <target state="translated">اسم جهة الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact preferences" xml:space="preserve">
+      <trans-unit id="Contact preferences" xml:space="preserve" approved="no">
         <source>Contact preferences</source>
+        <target state="translated">تفضيلات جهة الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact requests" xml:space="preserve">
         <source>Contact requests</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
+      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve" approved="no">
         <source>Contacts can mark messages for deletion; you will be able to view them.</source>
+        <target state="translated">يمكن لجهات الاتصال تحديد الرسائل لحذفها؛ ستتمكن من مشاهدتها.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Copy" xml:space="preserve">
+      <trans-unit id="Copy" xml:space="preserve" approved="no">
         <source>Copy</source>
+        <target state="translated">نسخ</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Core built at: %@" xml:space="preserve">
         <source>Core built at: %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Core version: v%@" xml:space="preserve">
+      <trans-unit id="Core version: v%@" xml:space="preserve" approved="no">
         <source>Core version: v%@</source>
+        <target state="translated">الإصدار الأساسي: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create" xml:space="preserve">
+      <trans-unit id="Create" xml:space="preserve" approved="no">
         <source>Create</source>
+        <target state="translated">إنشاء</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create address" xml:space="preserve">
         <source>Create address</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create group link" xml:space="preserve">
+      <trans-unit id="Create group link" xml:space="preserve" approved="no">
         <source>Create group link</source>
+        <target state="translated">إنشاء رابط المجموعة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create link" xml:space="preserve">
+      <trans-unit id="Create link" xml:space="preserve" approved="no">
         <source>Create link</source>
+        <target state="translated">إنشاء رابط</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
         <source>Create one-time invitation link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create queue" xml:space="preserve">
+      <trans-unit id="Create queue" xml:space="preserve" approved="no">
         <source>Create queue</source>
+        <target state="translated">إنشاء قائمة انتظار</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create secret group" xml:space="preserve">
+      <trans-unit id="Create secret group" xml:space="preserve" approved="no">
         <source>Create secret group</source>
+        <target state="translated">إنشاء مجموعة سرية</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create your profile" xml:space="preserve">
+      <trans-unit id="Create your profile" xml:space="preserve" approved="no">
         <source>Create your profile</source>
+        <target state="translated">أنشئ ملف تعريفك</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created on %@" xml:space="preserve">
         <source>Created on %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Current passphrase…" xml:space="preserve">
+      <trans-unit id="Current passphrase…" xml:space="preserve" approved="no">
         <source>Current passphrase…</source>
+        <target state="translated">عبارة المرور الحالية…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
+      <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve" approved="no">
         <source>Currently maximum supported file size is %@.</source>
+        <target state="translated">الحد الأقصى لحجم الملف المدعوم حاليًا هو %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Dark" xml:space="preserve">
+      <trans-unit id="Dark" xml:space="preserve" approved="no">
         <source>Dark</source>
+        <target state="translated">داكن</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database ID" xml:space="preserve">
+      <trans-unit id="Database ID" xml:space="preserve" approved="no">
         <source>Database ID</source>
+        <target state="translated">معرّف قاعدة البيانات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encrypted!" xml:space="preserve">
+      <trans-unit id="Database encrypted!" xml:space="preserve" approved="no">
         <source>Database encrypted!</source>
+        <target state="translated">قاعدة البيانات مُعمّاة!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encryption passphrase will be updated and stored in the keychain.&#10;" xml:space="preserve">
+      <trans-unit id="Database encryption passphrase will be updated and stored in the keychain.&#10;" xml:space="preserve" approved="no">
         <source>Database encryption passphrase will be updated and stored in the keychain.
 </source>
+        <target state="translated">سيتم تحديث عبارة المرور الخاصة بتشفير قاعدة البيانات وتخزينها في سلسلة المفاتيح.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encryption passphrase will be updated.&#10;" xml:space="preserve">
+      <trans-unit id="Database encryption passphrase will be updated.&#10;" xml:space="preserve" approved="no">
         <source>Database encryption passphrase will be updated.
 </source>
+        <target state="translated">سيتم تحديث عبارة مرور تعمية قاعدة البيانات.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database error" xml:space="preserve">
+      <trans-unit id="Database error" xml:space="preserve" approved="no">
         <source>Database error</source>
+        <target state="translated">خطأ في قاعدة البيانات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database is encrypted using a random passphrase, you can change it." xml:space="preserve">
+      <trans-unit id="Database is encrypted using a random passphrase, you can change it." xml:space="preserve" approved="no">
         <source>Database is encrypted using a random passphrase, you can change it.</source>
+        <target state="translated">قاعدة البيانات مُعمّاة باستخدام عبارة مرور عشوائية، يمكنك تغييرها.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database is encrypted using a random passphrase. Please change it before exporting." xml:space="preserve">
+      <trans-unit id="Database is encrypted using a random passphrase. Please change it before exporting." xml:space="preserve" approved="no">
         <source>Database is encrypted using a random passphrase. Please change it before exporting.</source>
+        <target state="translated">قاعدة البيانات مُعمّاة باستخدام عبارة مرور عشوائية. يُرجى تغييره قبل التصدير.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase" xml:space="preserve">
+      <trans-unit id="Database passphrase" xml:space="preserve" approved="no">
         <source>Database passphrase</source>
+        <target state="translated">عبارة مرور قاعدة البيانات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase &amp; export" xml:space="preserve">
+      <trans-unit id="Database passphrase &amp; export" xml:space="preserve" approved="no">
         <source>Database passphrase &amp; export</source>
+        <target state="translated">عبارة مرور قاعدة البيانات وتصديرها</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
+      <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve" approved="no">
         <source>Database passphrase is different from saved in the keychain.</source>
+        <target state="translated">عبارة المرور الخاصة بقاعدة البيانات مختلفة عن تلك المحفوظة في سلسلة المفاتيح.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
+      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve" approved="no">
         <source>Database passphrase is required to open chat.</source>
+        <target state="translated">عبارة مرور قاعدة البيانات مطلوبة لفتح الدردشة.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database will be encrypted and the passphrase stored in the keychain.&#10;" xml:space="preserve">
+      <trans-unit id="Database will be encrypted and the passphrase stored in the keychain.&#10;" xml:space="preserve" approved="no">
         <source>Database will be encrypted and the passphrase stored in the keychain.
 </source>
+        <target state="translated">سيتم تشفير قاعدة البيانات وتخزين عبارة المرور في سلسلة المفاتيح.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database will be encrypted.&#10;" xml:space="preserve">
+      <trans-unit id="Database will be encrypted.&#10;" xml:space="preserve" approved="no">
         <source>Database will be encrypted.
 </source>
+        <target state="translated">سيتم تعمية قاعدة البيانات.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database will be migrated when the app restarts" xml:space="preserve">
+      <trans-unit id="Database will be migrated when the app restarts" xml:space="preserve" approved="no">
         <source>Database will be migrated when the app restarts</source>
+        <target state="translated">سيتم نقل قاعدة البيانات عند إعادة تشغيل التطبيق</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Decentralized" xml:space="preserve">
+      <trans-unit id="Decentralized" xml:space="preserve" approved="no">
         <source>Decentralized</source>
+        <target state="translated">لامركزي</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete" xml:space="preserve">
+      <trans-unit id="Delete" xml:space="preserve" approved="no">
         <source>Delete</source>
+        <target state="translated">حذف</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
         <source>Delete Contact</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete address" xml:space="preserve">
+      <trans-unit id="Delete address" xml:space="preserve" approved="no">
         <source>Delete address</source>
+        <target state="translated">حذف العنوان</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete address?" xml:space="preserve">
+      <trans-unit id="Delete address?" xml:space="preserve" approved="no">
         <source>Delete address?</source>
+        <target state="translated">حذف العنوان؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete after" xml:space="preserve">
+      <trans-unit id="Delete after" xml:space="preserve" approved="no">
         <source>Delete after</source>
+        <target state="translated">حذف بعد</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete all files" xml:space="preserve">
+      <trans-unit id="Delete all files" xml:space="preserve" approved="no">
         <source>Delete all files</source>
+        <target state="translated">حذف جميع الملفات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
@@ -919,152 +1033,188 @@
         <source>Delete chat archive?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete chat profile?" xml:space="preserve">
+      <trans-unit id="Delete chat profile?" xml:space="preserve" approved="no">
         <source>Delete chat profile?</source>
+        <target state="translated">حذف ملف تعريف الدردشة؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete connection" xml:space="preserve">
+      <trans-unit id="Delete connection" xml:space="preserve" approved="no">
         <source>Delete connection</source>
+        <target state="translated">حذف الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact" xml:space="preserve">
+      <trans-unit id="Delete contact" xml:space="preserve" approved="no">
         <source>Delete contact</source>
+        <target state="translated">حذف جهة الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete contact?" xml:space="preserve">
+      <trans-unit id="Delete contact?" xml:space="preserve" approved="no">
         <source>Delete contact?</source>
+        <target state="translated">حذف جهة الاتصال؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete database" xml:space="preserve">
+      <trans-unit id="Delete database" xml:space="preserve" approved="no">
         <source>Delete database</source>
+        <target state="translated">حذف قاعدة البيانات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete files and media?" xml:space="preserve">
+      <trans-unit id="Delete files and media?" xml:space="preserve" approved="no">
         <source>Delete files and media?</source>
+        <target state="translated">حذف الملفات والوسائط؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete files for all chat profiles" xml:space="preserve">
+      <trans-unit id="Delete files for all chat profiles" xml:space="preserve" approved="no">
         <source>Delete files for all chat profiles</source>
+        <target state="translated">حذف الملفات لجميع ملفات تعريف الدردشة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete for everyone" xml:space="preserve">
+      <trans-unit id="Delete for everyone" xml:space="preserve" approved="no">
         <source>Delete for everyone</source>
+        <target state="translated">حذف للجميع</target>
         <note>chat feature</note>
       </trans-unit>
-      <trans-unit id="Delete for me" xml:space="preserve">
+      <trans-unit id="Delete for me" xml:space="preserve" approved="no">
         <source>Delete for me</source>
+        <target state="translated">حذف بالنسبة لي</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete group" xml:space="preserve">
+      <trans-unit id="Delete group" xml:space="preserve" approved="no">
         <source>Delete group</source>
+        <target state="translated">حذف المجموعة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete group?" xml:space="preserve">
+      <trans-unit id="Delete group?" xml:space="preserve" approved="no">
         <source>Delete group?</source>
+        <target state="translated">حذف المجموعة؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete invitation" xml:space="preserve">
+      <trans-unit id="Delete invitation" xml:space="preserve" approved="no">
         <source>Delete invitation</source>
+        <target state="translated">حذف الدعوة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete link" xml:space="preserve">
+      <trans-unit id="Delete link" xml:space="preserve" approved="no">
         <source>Delete link</source>
+        <target state="translated">حذف الرابط</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete link?" xml:space="preserve">
+      <trans-unit id="Delete link?" xml:space="preserve" approved="no">
         <source>Delete link?</source>
+        <target state="translated">حذف الرابط؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete message?" xml:space="preserve">
+      <trans-unit id="Delete message?" xml:space="preserve" approved="no">
         <source>Delete message?</source>
+        <target state="translated">حذف الرسالة؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete messages" xml:space="preserve">
+      <trans-unit id="Delete messages" xml:space="preserve" approved="no">
         <source>Delete messages</source>
+        <target state="translated">حذف الرسائل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete messages after" xml:space="preserve">
+      <trans-unit id="Delete messages after" xml:space="preserve" approved="no">
         <source>Delete messages after</source>
+        <target state="translated">حذف الرسائل بعد</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete old database" xml:space="preserve">
+      <trans-unit id="Delete old database" xml:space="preserve" approved="no">
         <source>Delete old database</source>
+        <target state="translated">حذف قاعدة البيانات القديمة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete old database?" xml:space="preserve">
+      <trans-unit id="Delete old database?" xml:space="preserve" approved="no">
         <source>Delete old database?</source>
+        <target state="translated">حذف قاعدة البيانات القديمة؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete pending connection" xml:space="preserve">
         <source>Delete pending connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete pending connection?" xml:space="preserve">
+      <trans-unit id="Delete pending connection?" xml:space="preserve" approved="no">
         <source>Delete pending connection?</source>
+        <target state="translated">حذف الاتصال قيد الانتظار؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete queue" xml:space="preserve">
+      <trans-unit id="Delete queue" xml:space="preserve" approved="no">
         <source>Delete queue</source>
+        <target state="translated">حذف قائمة الانتظار</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Delete user profile?" xml:space="preserve">
+      <trans-unit id="Delete user profile?" xml:space="preserve" approved="no">
         <source>Delete user profile?</source>
+        <target state="translated">حذف ملف تعريف المستخدم؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Description" xml:space="preserve">
+      <trans-unit id="Description" xml:space="preserve" approved="no">
         <source>Description</source>
+        <target state="translated">الوصف</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Develop" xml:space="preserve">
+      <trans-unit id="Develop" xml:space="preserve" approved="no">
         <source>Develop</source>
+        <target state="translated">يطور</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Developer tools" xml:space="preserve">
+      <trans-unit id="Developer tools" xml:space="preserve" approved="no">
         <source>Developer tools</source>
+        <target state="translated">أدوات المطور</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Device" xml:space="preserve">
+      <trans-unit id="Device" xml:space="preserve" approved="no">
         <source>Device</source>
+        <target state="translated">الجهاز</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
+      <trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve" approved="no">
         <source>Device authentication is disabled. Turning off SimpleX Lock.</source>
+        <target state="translated">استيثاق الجهاز مُعطَّل. جارِ إيقاف تشغيل قفل SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
+      <trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve" approved="no">
         <source>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</source>
+        <target state="translated">مصادقة الجهاز غير مفعّلة. يمكنك تشغيل قفل SimpleX عبر الإعدادات، بمجرد تفعيل مصادقة الجهاز.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
+      <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve" approved="no">
         <source>Different names, avatars and transport isolation.</source>
+        <target state="translated">أسماء مختلفة، صور الأفاتار وعزل النقل.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Direct messages" xml:space="preserve">
+      <trans-unit id="Direct messages" xml:space="preserve" approved="no">
         <source>Direct messages</source>
+        <target state="translated">رسائل مباشرة</target>
         <note>chat feature</note>
       </trans-unit>
-      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
+      <trans-unit id="Direct messages between members are prohibited." xml:space="preserve" approved="no">
         <source>Direct messages between members are prohibited.</source>
+        <target state="translated">الرسائل المباشرة بين الأعضاء ممنوعة.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
+      <trans-unit id="Disable SimpleX Lock" xml:space="preserve" approved="no">
         <source>Disable SimpleX Lock</source>
+        <target state="translated">تعطيل قفل SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Disappearing messages" xml:space="preserve">
+      <trans-unit id="Disappearing messages" xml:space="preserve" approved="no">
         <source>Disappearing messages</source>
+        <target state="translated">الرسائل المختفية</target>
         <note>chat feature</note>
       </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited in this chat." xml:space="preserve">
+      <trans-unit id="Disappearing messages are prohibited in this chat." xml:space="preserve" approved="no">
         <source>Disappearing messages are prohibited in this chat.</source>
+        <target state="translated">يُحظر اختفاء الرسائل في هذه الدردشة.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
+      <trans-unit id="Disappearing messages are prohibited." xml:space="preserve" approved="no">
         <source>Disappearing messages are prohibited.</source>
+        <target state="translated">الرسائل المختفية ممنوعة.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Disconnect" xml:space="preserve">
+      <trans-unit id="Disconnect" xml:space="preserve" approved="no">
         <source>Disconnect</source>
+        <target state="translated">قطع الاتصال</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
@@ -1075,124 +1225,153 @@
         <source>Display name:</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
+      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve" approved="no">
         <source>Do NOT use SimpleX for emergency calls.</source>
+        <target state="translated">لا تستخدم SimpleX لإجراء مكالمات الطوارئ.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do it later" xml:space="preserve">
+      <trans-unit id="Do it later" xml:space="preserve" approved="no">
         <source>Do it later</source>
+        <target state="translated">افعل ذلك لاحقا</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Duplicate display name!" xml:space="preserve">
+      <trans-unit id="Duplicate display name!" xml:space="preserve" approved="no">
         <source>Duplicate display name!</source>
+        <target state="translated">اسم العرض مكرر!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Edit" xml:space="preserve">
+      <trans-unit id="Edit" xml:space="preserve" approved="no">
         <source>Edit</source>
+        <target state="translated">تحرير</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Edit group profile" xml:space="preserve">
+      <trans-unit id="Edit group profile" xml:space="preserve" approved="no">
         <source>Edit group profile</source>
+        <target state="translated">حرّر ملف تعريف المجموعة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable" xml:space="preserve">
+      <trans-unit id="Enable" xml:space="preserve" approved="no">
         <source>Enable</source>
+        <target state="translated">تفعيل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
+      <trans-unit id="Enable SimpleX Lock" xml:space="preserve" approved="no">
         <source>Enable SimpleX Lock</source>
+        <target state="translated">تفعيل قفل SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Enable TCP keep-alive" xml:space="preserve">
+      <trans-unit id="Enable TCP keep-alive" xml:space="preserve" approved="no">
         <source>Enable TCP keep-alive</source>
+        <target state="translated">تفعيل أبقِ TCP على قيد الحياة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
+      <trans-unit id="Enable automatic message deletion?" xml:space="preserve" approved="no">
         <source>Enable automatic message deletion?</source>
+        <target state="translated">تفعيل الحذف التلقائي للرسائل؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable instant notifications?" xml:space="preserve">
+      <trans-unit id="Enable instant notifications?" xml:space="preserve" approved="no">
         <source>Enable instant notifications?</source>
+        <target state="translated">تفعيل الإشعارات فورية؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable notifications" xml:space="preserve">
+      <trans-unit id="Enable notifications" xml:space="preserve" approved="no">
         <source>Enable notifications</source>
+        <target state="translated">تفعيل الإشعارات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable periodic notifications?" xml:space="preserve">
+      <trans-unit id="Enable periodic notifications?" xml:space="preserve" approved="no">
         <source>Enable periodic notifications?</source>
+        <target state="translated">تفعيل الإشعارات دورية؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt" xml:space="preserve">
+      <trans-unit id="Encrypt" xml:space="preserve" approved="no">
         <source>Encrypt</source>
+        <target state="translated">التشفير</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt database?" xml:space="preserve">
+      <trans-unit id="Encrypt database?" xml:space="preserve" approved="no">
         <source>Encrypt database?</source>
+        <target state="translated">تشفير قاعدة البيانات؟</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypted database" xml:space="preserve">
+      <trans-unit id="Encrypted database" xml:space="preserve" approved="no">
         <source>Encrypted database</source>
+        <target state="translated">قاعدة بيانات مشفرة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypted message or another event" xml:space="preserve">
+      <trans-unit id="Encrypted message or another event" xml:space="preserve" approved="no">
         <source>Encrypted message or another event</source>
+        <target state="translated">رسالة مشفرة أو حدث آخر</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encrypted message: database error" xml:space="preserve">
+      <trans-unit id="Encrypted message: database error" xml:space="preserve" approved="no">
         <source>Encrypted message: database error</source>
+        <target state="translated">رسالة مشفرة: خطأ في قاعدة البيانات</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encrypted message: keychain error" xml:space="preserve">
+      <trans-unit id="Encrypted message: keychain error" xml:space="preserve" approved="no">
         <source>Encrypted message: keychain error</source>
+        <target state="translated">رسالة مشفرة: خطأ في سلسلة المفاتيح</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encrypted message: no passphrase" xml:space="preserve">
+      <trans-unit id="Encrypted message: no passphrase" xml:space="preserve" approved="no">
         <source>Encrypted message: no passphrase</source>
+        <target state="translated">الرسالة المشفرة: لا توجد عبارة مرور</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Encrypted message: unexpected error" xml:space="preserve">
+      <trans-unit id="Encrypted message: unexpected error" xml:space="preserve" approved="no">
         <source>Encrypted message: unexpected error</source>
+        <target state="translated">رسالة مشفرة: خطأ غير متوقع</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Enter correct passphrase." xml:space="preserve">
+      <trans-unit id="Enter correct passphrase." xml:space="preserve" approved="no">
         <source>Enter correct passphrase.</source>
+        <target state="translated">أدخل عبارة المرور الصحيحة.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter passphrase…" xml:space="preserve">
+      <trans-unit id="Enter passphrase…" xml:space="preserve" approved="no">
         <source>Enter passphrase…</source>
+        <target state="translated">أدخل عبارة المرور…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter server manually" xml:space="preserve">
+      <trans-unit id="Enter server manually" xml:space="preserve" approved="no">
         <source>Enter server manually</source>
+        <target state="translated">أدخل الخادم يدوياً</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error" xml:space="preserve">
+      <trans-unit id="Error" xml:space="preserve" approved="no">
         <source>Error</source>
+        <target state="translated">خطأ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error accepting contact request" xml:space="preserve">
+      <trans-unit id="Error accepting contact request" xml:space="preserve" approved="no">
         <source>Error accepting contact request</source>
+        <target state="translated">خطأ في قبول طلب الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error accessing database file" xml:space="preserve">
         <source>Error accessing database file</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error adding member(s)" xml:space="preserve">
+      <trans-unit id="Error adding member(s)" xml:space="preserve" approved="no">
         <source>Error adding member(s)</source>
+        <target state="translated">خطأ في إضافة عضو (أعضاء)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing address" xml:space="preserve">
+      <trans-unit id="Error changing address" xml:space="preserve" approved="no">
         <source>Error changing address</source>
+        <target state="translated">خطأ في تغيير العنوان</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing role" xml:space="preserve">
+      <trans-unit id="Error changing role" xml:space="preserve" approved="no">
         <source>Error changing role</source>
+        <target state="translated">خطأ في تغيير الدور المتغير</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing setting" xml:space="preserve">
+      <trans-unit id="Error changing setting" xml:space="preserve" approved="no">
         <source>Error changing setting</source>
+        <target state="translated">خطأ في تغيير الإعدادات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating address" xml:space="preserve">
@@ -1973,8 +2152,9 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>Open user profiles</source>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Anybody can host servers." xml:space="preserve">
+      <trans-unit id="Anybody can host servers." xml:space="preserve" approved="no">
         <source>Anybody can host servers.</source>
+        <target state="translated">يمكن لأي شخص استضافة الخوادم.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
@@ -2377,96 +2557,117 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>Sent messages will be deleted after set time.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
+      <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve" approved="no">
         <source>Server requires authorization to create queues, check password</source>
+        <target state="translated">يتطلب الخادم إذنًا لإنشاء قوائم انتظار، تحقق من كلمة المرور</target>
         <note>server test error</note>
       </trans-unit>
-      <trans-unit id="Server test failed!" xml:space="preserve">
+      <trans-unit id="Server test failed!" xml:space="preserve" approved="no">
         <source>Server test failed!</source>
+        <target state="translated">فشلت تجربة الخادم!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Servers" xml:space="preserve">
+      <trans-unit id="Servers" xml:space="preserve" approved="no">
         <source>Servers</source>
+        <target state="translated">الخوادم</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Set 1 day" xml:space="preserve">
+      <trans-unit id="Set 1 day" xml:space="preserve" approved="no">
         <source>Set 1 day</source>
+        <target state="translated">تعيين يوم واحد</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Set contact name…" xml:space="preserve">
+      <trans-unit id="Set contact name…" xml:space="preserve" approved="no">
         <source>Set contact name…</source>
+        <target state="translated">تعيين اسم جهة الاتصال…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Set group preferences" xml:space="preserve">
+      <trans-unit id="Set group preferences" xml:space="preserve" approved="no">
         <source>Set group preferences</source>
+        <target state="translated">عيّن تفضيلات المجموعة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Set passphrase to export" xml:space="preserve">
+      <trans-unit id="Set passphrase to export" xml:space="preserve" approved="no">
         <source>Set passphrase to export</source>
+        <target state="translated">عيّن عبارة المرور للتصدير</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Set timeouts for proxy/VPN" xml:space="preserve">
+      <trans-unit id="Set timeouts for proxy/VPN" xml:space="preserve" approved="no">
         <source>Set timeouts for proxy/VPN</source>
+        <target state="translated">حدد مهلات للوسيط او شبكات افتراضية خاصة (Proxy/VPN timeouts)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Settings" xml:space="preserve">
+      <trans-unit id="Settings" xml:space="preserve" approved="no">
         <source>Settings</source>
+        <target state="translated">الإعدادات</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share" xml:space="preserve">
+      <trans-unit id="Share" xml:space="preserve" approved="no">
         <source>Share</source>
+        <target state="translated">مشاركة</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Share invitation link" xml:space="preserve">
         <source>Share invitation link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share link" xml:space="preserve">
+      <trans-unit id="Share link" xml:space="preserve" approved="no">
         <source>Share link</source>
+        <target state="translated">مشاركة الرابط</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share one-time invitation link" xml:space="preserve">
         <source>Share one-time invitation link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show QR code" xml:space="preserve">
+      <trans-unit id="Show QR code" xml:space="preserve" approved="no">
         <source>Show QR code</source>
+        <target state="translated">عرض رمز QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show preview" xml:space="preserve">
+      <trans-unit id="Show preview" xml:space="preserve" approved="no">
         <source>Show preview</source>
+        <target state="translated">عرض المعاينة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
+      <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve" approved="no">
         <source>SimpleX Chat security was audited by Trail of Bits.</source>
+        <target state="translated">تم تدقيق أمان SimpleX Chat بواسطة Trail of Bits.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SimpleX Lock" xml:space="preserve">
+      <trans-unit id="SimpleX Lock" xml:space="preserve" approved="no">
         <source>SimpleX Lock</source>
+        <target state="translated">قفل SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SimpleX Lock turned on" xml:space="preserve">
+      <trans-unit id="SimpleX Lock turned on" xml:space="preserve" approved="no">
         <source>SimpleX Lock turned on</source>
+        <target state="translated">تم تشغيل القفل SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SimpleX contact address" xml:space="preserve">
+      <trans-unit id="SimpleX contact address" xml:space="preserve" approved="no">
         <source>SimpleX contact address</source>
+        <target state="translated">عنوان جهة أتصال SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve">
+      <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve" approved="no">
         <source>SimpleX encrypted message or connection event</source>
+        <target state="translated">حَدَثْ SimpleX لرسالة أو اتصال مشفر</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="SimpleX group link" xml:space="preserve">
+      <trans-unit id="SimpleX group link" xml:space="preserve" approved="no">
         <source>SimpleX group link</source>
+        <target state="translated">رابط مجموعة SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX links" xml:space="preserve">
+      <trans-unit id="SimpleX links" xml:space="preserve" approved="no">
         <source>SimpleX links</source>
+        <target state="translated">روابط SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
+      <trans-unit id="SimpleX one-time invitation" xml:space="preserve" approved="no">
         <source>SimpleX one-time invitation</source>
+        <target state="translated">دعوة SimpleX لمرة واحدة</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -2625,8 +2826,8 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -3526,72 +3727,87 @@ SimpleX servers cannot see your profile.</source>
         <source>secret</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="starting…" xml:space="preserve">
+      <trans-unit id="starting…" xml:space="preserve" approved="no">
         <source>starting…</source>
+        <target state="translated">يبدأ…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="strike" xml:space="preserve">
+      <trans-unit id="strike" xml:space="preserve" approved="no">
         <source>strike</source>
+        <target state="translated">شطب</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="this contact" xml:space="preserve">
         <source>this contact</source>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="unknown" xml:space="preserve">
+      <trans-unit id="unknown" xml:space="preserve" approved="no">
         <source>unknown</source>
+        <target state="translated">غير معروف</target>
         <note>connection info</note>
       </trans-unit>
-      <trans-unit id="updated group profile" xml:space="preserve">
+      <trans-unit id="updated group profile" xml:space="preserve" approved="no">
         <source>updated group profile</source>
+        <target state="translated">حدثت ملف تعريف المجموعة</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
         <source>v%@ (%@)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="via contact address link" xml:space="preserve">
+      <trans-unit id="via contact address link" xml:space="preserve" approved="no">
         <source>via contact address link</source>
+        <target state="translated">عبر رابط عنوان الاتصال</target>
         <note>chat list item description</note>
       </trans-unit>
-      <trans-unit id="via group link" xml:space="preserve">
+      <trans-unit id="via group link" xml:space="preserve" approved="no">
         <source>via group link</source>
+        <target state="translated">عبر رابط المجموعة</target>
         <note>chat list item description</note>
       </trans-unit>
-      <trans-unit id="via one-time link" xml:space="preserve">
+      <trans-unit id="via one-time link" xml:space="preserve" approved="no">
         <source>via one-time link</source>
+        <target state="translated">عبر رابط لمرة واحدة</target>
         <note>chat list item description</note>
       </trans-unit>
-      <trans-unit id="via relay" xml:space="preserve">
+      <trans-unit id="via relay" xml:space="preserve" approved="no">
         <source>via relay</source>
+        <target state="translated">عبر المُرحل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
+      <trans-unit id="video call (not e2e encrypted)" xml:space="preserve" approved="no">
         <source>video call (not e2e encrypted)</source>
+        <target state="translated">مكالمة الفيديو ليست مُعمّاة بين الطريفين</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="waiting for answer…" xml:space="preserve">
+      <trans-unit id="waiting for answer…" xml:space="preserve" approved="no">
         <source>waiting for answer…</source>
+        <target state="translated">بانتظار الرد…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="waiting for confirmation…" xml:space="preserve">
+      <trans-unit id="waiting for confirmation…" xml:space="preserve" approved="no">
         <source>waiting for confirmation…</source>
+        <target state="translated">في انتظار التأكيد…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="wants to connect to you!" xml:space="preserve">
+      <trans-unit id="wants to connect to you!" xml:space="preserve" approved="no">
         <source>wants to connect to you!</source>
+        <target state="translated">يريد الاتصال بك!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="yes" xml:space="preserve">
+      <trans-unit id="yes" xml:space="preserve" approved="no">
         <source>yes</source>
+        <target state="translated">نعم</target>
         <note>pref value</note>
       </trans-unit>
-      <trans-unit id="you are invited to group" xml:space="preserve">
+      <trans-unit id="you are invited to group" xml:space="preserve" approved="no">
         <source>you are invited to group</source>
+        <target state="translated">أنت مدعو إلى المجموعة</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="you changed address" xml:space="preserve">
+      <trans-unit id="you changed address" xml:space="preserve" approved="no">
         <source>you changed address</source>
+        <target state="translated">غيّرتَ العنوان</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="you changed address for %@" xml:space="preserve">
@@ -3606,16 +3822,18 @@ SimpleX servers cannot see your profile.</source>
         <source>you changed role of %1$@ to %2$@</source>
         <note>snd group event chat item</note>
       </trans-unit>
-      <trans-unit id="you left" xml:space="preserve">
+      <trans-unit id="you left" xml:space="preserve" approved="no">
         <source>you left</source>
+        <target state="translated">غادرت</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you removed %@" xml:space="preserve">
         <source>you removed %@</source>
         <note>snd group event chat item</note>
       </trans-unit>
-      <trans-unit id="you shared one-time link" xml:space="preserve">
+      <trans-unit id="you shared one-time link" xml:space="preserve" approved="no">
         <source>you shared one-time link</source>
+        <target state="translated">لقد شاركت رابط لمرة واحدة</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="you shared one-time link incognito" xml:space="preserve">
@@ -3657,7 +3875,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="# %@" xml:space="preserve" approved="no">
         <source># %@</source>
-        <target state="needs-translation"># %@</target>
+        <target state="translated"># %@</target>
         <note>copied message info title, # &lt;title&gt;</note>
       </trans-unit>
       <trans-unit id="## History" xml:space="preserve" approved="no">
@@ -3877,6 +4095,1668 @@ SimpleX servers cannot see your profile.</source>
         <source>Active connections</source>
         <target state="translated">اتصالات نشطة</target>
       </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">طبّق</target>
+      </trans-unit>
+      <trans-unit id="%@ server" xml:space="preserve" approved="no">
+        <source>%@ server</source>
+        <target state="translated">%@ خادم</target>
+      </trans-unit>
+      <trans-unit id="Accept conditions" xml:space="preserve" approved="no">
+        <source>Accept conditions</source>
+        <target state="translated">اقبل الشروط</target>
+      </trans-unit>
+      <trans-unit id="Share address" xml:space="preserve" approved="no">
+        <source>Share address</source>
+        <target state="translated">مشاركة العنوان</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">جارٍ الاتصال بالفعل!</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) are still being downloaded.</source>
+        <target state="translated">%d الملف(ات) لا تزال قيد التنزيل.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve" approved="no">
+        <source>%d file(s) failed to download.</source>
+        <target state="translated">%d الملف(ات) فشلت في التنزيل.</target>
+      </trans-unit>
+      <trans-unit id="All app data is deleted." xml:space="preserve" approved="no">
+        <source>All app data is deleted.</source>
+        <target state="translated">حُذفت جميع بيانات التطبيق.</target>
+      </trans-unit>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target state="translated">السماح بحذف الرسائل بشكل لا رجوع فيه فقط إذا سمحت لك جهة الاتصال بذلك. (24 ساعة)</target>
+      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve" approved="no">
+        <source>Share profile</source>
+        <target state="translated">شارك ملف التعريف</target>
+      </trans-unit>
+      <trans-unit id="Always use relay" xml:space="preserve" approved="no">
+        <source>Always use relay</source>
+        <target state="translated">استخدم الموجه دائمًا</target>
+      </trans-unit>
+      <trans-unit id="Address" xml:space="preserve" approved="no">
+        <source>Address</source>
+        <target state="translated">عنوان</target>
+      </trans-unit>
+      <trans-unit id="All data is erased when it is entered." xml:space="preserve" approved="no">
+        <source>All data is erased when it is entered.</source>
+        <target state="translated">يتم مسح جميع البيانات عند إدخالها.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve" approved="no">
+        <source>%d file(s) were deleted.</source>
+        <target state="translated">%d تم حذف الملف(ات).</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) were not downloaded.</source>
+        <target state="translated">%d لم يتم تنزيل الملف(ات).</target>
+      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve" approved="no">
+        <source>%d messages not forwarded</source>
+        <target state="translated">%d الرسائل لم يتم تحويلها</target>
+      </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve" approved="no">
+        <source>%d seconds(s)</source>
+        <target state="translated">%d ثواني</target>
+      </trans-unit>
+      <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target state="translated">**امسح / ألصِق الرابط**: للاتصال عبر الرابط الذي تلقيته.</target>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve" approved="no">
+        <source>1 year</source>
+        <target state="translated">سنة واحدة</target>
+      </trans-unit>
+      <trans-unit id="1-time link" xml:space="preserve" approved="no">
+        <source>1-time link</source>
+        <target state="translated">رابط لمرة واحدة</target>
+      </trans-unit>
+      <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve" approved="no">
+        <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target state="translated">يمكن استعمال الرابط لمرة واحدة *مع جهة اتصال واحدة فقط* - شاركه شخصياً أو عبر أي تطبيق مراسلة.</target>
+      </trans-unit>
+      <trans-unit id="Accent" xml:space="preserve" approved="no">
+        <source>Accent</source>
+        <target state="translated">لون تمييزي</target>
+      </trans-unit>
+      <trans-unit id="Accepted conditions" xml:space="preserve" approved="no">
+        <source>Accepted conditions</source>
+        <target state="translated">الشروط المتفق عليها</target>
+      </trans-unit>
+      <trans-unit id="All chats will be removed from the list (text), and the list deleted." xml:space="preserve" approved="no">
+        <source>All chats will be removed from the list (text), and the list deleted.</source>
+        <target state="translated">سيتم إزالة جميع الدردشات من القائمة (النص)، وحذف القائمة.</target>
+      </trans-unit>
+      <trans-unit id="Allow message reactions." xml:space="preserve" approved="no">
+        <source>Allow message reactions.</source>
+        <target state="translated">السماح بردود الفعل على الرسائل.</target>
+      </trans-unit>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">السماح بحذف الرسائل المرسلة بشكل لا رجعة فيه. (24 ساعة)</target>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">السماح بإرسال روابط SimpleX.</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">جارٍ انضمام بالفعل إلى المجموعة!</target>
+      </trans-unit>
+      <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve" approved="no">
+        <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
+        <target state="translated">يتم إنشاء ملف تعريف دردشة فارغ بالاسم المقدم، ويفتح التطبيق كالمعتاد.</target>
+      </trans-unit>
+      <trans-unit id="Authentication cancelled" xml:space="preserve" approved="no">
+        <source>Authentication cancelled</source>
+        <target state="translated">ألغيت المصادقة</target>
+      </trans-unit>
+      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve" approved="no">
+        <source>Audio/video calls are prohibited.</source>
+        <target state="translated">مكالمات الصوت/الفيديو محظورة.</target>
+      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve" approved="no">
+        <source>Better groups</source>
+        <target state="translated">مجموعات أفضل</target>
+      </trans-unit>
+      <trans-unit id="Background" xml:space="preserve" approved="no">
+        <source>Background</source>
+        <target state="translated">الخلفية</target>
+      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve" approved="no">
+        <source>Better calls</source>
+        <target state="translated">مكالمات أفضل</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">يمكنك أنت وجهة اتصالك حذف الرسائل المرسلة بشكل لا رجعة فيه. (24 ساعة)</target>
+      </trans-unit>
+      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
+        <source>Block member for all?</source>
+        <target state="translated">حظر العضو للجميع؟</target>
+      </trans-unit>
+      <trans-unit id="Blur media" xml:space="preserve" approved="no">
+        <source>Blur media</source>
+        <target state="translated">تمويه الوسائط</target>
+      </trans-unit>
+      <trans-unit id="Server type" xml:space="preserve" approved="no">
+        <source>Server type</source>
+        <target state="translated">نوع الخادم</target>
+      </trans-unit>
+      <trans-unit id="Server requires authorization to upload, check password" xml:space="preserve" approved="no">
+        <source>Server requires authorization to upload, check password</source>
+        <target state="translated">يتطلب الخادم إذنًا للرفع، تحقق من كلمة المرور</target>
+      </trans-unit>
+      <trans-unit id="Server version is incompatible with network settings." xml:space="preserve" approved="no">
+        <source>Server version is incompatible with network settings.</source>
+        <target state="translated">إصدار الخادم غير متوافق مع إعدادات الشبكة.</target>
+      </trans-unit>
+      <trans-unit id="Share with contacts" xml:space="preserve" approved="no">
+        <source>Share with contacts</source>
+        <target state="translated">مشاركة مع جهات الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Show:" xml:space="preserve" approved="no">
+        <source>Show:</source>
+        <target state="translated">عرض:</target>
+      </trans-unit>
+      <trans-unit id="SimpleX Address" xml:space="preserve" approved="no">
+        <source>SimpleX Address</source>
+        <target state="translated">عنوان SimpleX</target>
+      </trans-unit>
+      <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve" approved="no">
+        <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
+        <target state="translated">توصلت SimpleX Chat وFlux إلى اتفاق لتضمين الخوادم التي تديرها Flux في التطبيق.</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">السماح بالمكالمات؟</target>
+      </trans-unit>
+      <trans-unit id="App passcode is replaced with self-destruct passcode." xml:space="preserve" approved="no">
+        <source>App passcode is replaced with self-destruct passcode.</source>
+        <target state="translated">يتم استبدال رمز مرور التطبيق برمز مرور التدمير الذاتي.</target>
+      </trans-unit>
+      <trans-unit id="SimpleX Lock mode" xml:space="preserve" approved="no">
+        <source>SimpleX Lock mode</source>
+        <target state="translated">SimpleX وضع القفل</target>
+      </trans-unit>
+      <trans-unit id="Audio and video calls" xml:space="preserve" approved="no">
+        <source>Audio and video calls</source>
+        <target state="translated">مكالمات الصوت والفيديو</target>
+      </trans-unit>
+      <trans-unit id="App passcode" xml:space="preserve" approved="no">
+        <source>App passcode</source>
+        <target state="translated">رمز مرور التطبيق</target>
+      </trans-unit>
+      <trans-unit id="Bad message ID" xml:space="preserve" approved="no">
+        <source>Bad message ID</source>
+        <target state="translated">معرّف رسالة سيئ</target>
+      </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings." xml:space="preserve" approved="no">
+        <source>Server address is incompatible with network settings.</source>
+        <target state="translated">عنوان الخادم غير متوافق مع إعدادات الشبكة.</target>
+      </trans-unit>
+      <trans-unit id="Servers statistics will be reset - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Servers statistics will be reset - this cannot be undone!</source>
+        <target state="translated">سيتم تصفير إحصائيات الخوادم - لا يمكن التراجع عن هذا!</target>
+      </trans-unit>
+      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
+        <source>Allow to send files and media.</source>
+        <target state="translated">السماح بإرسال الملفات والوسائط.</target>
+      </trans-unit>
+      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve" approved="no">
+        <source>App encrypts new local files (except videos).</source>
+        <target state="translated">يُعمِّي الملفات المحلية الجديدة (باستثناء مقاطع الفيديو).</target>
+      </trans-unit>
+      <trans-unit id="Better messages" xml:space="preserve" approved="no">
+        <source>Better messages</source>
+        <target state="translated">رسائل أفضل</target>
+      </trans-unit>
+      <trans-unit id="Set passcode" xml:space="preserve" approved="no">
+        <source>Set passcode</source>
+        <target state="translated">عيّن رمز المرور</target>
+      </trans-unit>
+      <trans-unit id="Additional accent 2" xml:space="preserve" approved="no">
+        <source>Additional accent 2</source>
+        <target state="translated">لون إضافي ثانوي 2</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve" approved="no">
+        <source>Allow your contacts adding message reactions.</source>
+        <target state="translated">السماح لجهات اتصالك بإضافة ردود الفعل للرسالة.</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to call you." xml:space="preserve" approved="no">
+        <source>Allow your contacts to call you.</source>
+        <target state="translated">السماح لجهات اتصالك بالاتصال بك.</target>
+      </trans-unit>
+      <trans-unit id="Audio/video calls" xml:space="preserve" approved="no">
+        <source>Audio/video calls</source>
+        <target state="translated">مكالمات الصوت/الفيديو</target>
+      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve" approved="no">
+        <source>Better notifications</source>
+        <target state="translated">إشعارات أفضل</target>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve" approved="no">
+        <source>Better user experience</source>
+        <target state="translated">تجربة مستخدم أفضل</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">حظر</target>
+      </trans-unit>
+      <trans-unit id="Black" xml:space="preserve" approved="no">
+        <source>Black</source>
+        <target state="translated">أسود</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">حظر العضو؟</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">محظور من قبل المُدير</target>
+      </trans-unit>
+      <trans-unit id="Blur for better privacy." xml:space="preserve" approved="no">
+        <source>Blur for better privacy.</source>
+        <target state="translated">تمويه من أجل خصوصية أفضل.</target>
+      </trans-unit>
+      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve" approved="no">
+        <source>Show → on messages sent via private routing.</source>
+        <target state="translated">عرض ← على الرسائل المرسلة عبر التوجيه الخاص.</target>
+      </trans-unit>
+      <trans-unit id="Share from other apps." xml:space="preserve" approved="no">
+        <source>Share from other apps.</source>
+        <target state="translated">المشاركة من التطبيقات الأخرى.</target>
+      </trans-unit>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve" approved="no">
+        <source>Share this 1-time invite link</source>
+        <target state="translated">شارك رابط الدعوة هذا لمرة واحدة</target>
+      </trans-unit>
+      <trans-unit id="Set passphrase" xml:space="preserve" approved="no">
+        <source>Set passphrase</source>
+        <target state="translated">عيّن عبارة المرور</target>
+      </trans-unit>
+      <trans-unit id="Share address with contacts?" xml:space="preserve" approved="no">
+        <source>Share address with contacts?</source>
+        <target state="translated">مشاركة العنوان مع جهات الاتصال؟</target>
+      </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve" approved="no">
+        <source>Allow downgrade</source>
+        <target state="translated">السماح بالرجوع إلى إصدار سابق</target>
+      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
+        <source>Bad desktop address</source>
+        <target state="translated">عنوان سطح المكتب غير صالح</target>
+      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
+        <source>%1$@, %2$@</source>
+        <target state="translated">%1$@, %2$@</target>
+      </trans-unit>
+      <trans-unit id="All profiles" xml:space="preserve" approved="no">
+        <source>All profiles</source>
+        <target state="translated">جميع ملفات التعريف</target>
+      </trans-unit>
+      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve" approved="no">
+        <source>Authentication is required before the call is connected, but you may miss calls.</source>
+        <target state="translated">يتطلب التوثيق قبل الاتصال بالمكالمة، ولكن قد تفوتك المكالمات.</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">جارِ أرشفة قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve" approved="no">
+        <source>Settings were changed.</source>
+        <target state="translated">تم تغيير الإعدادات.</target>
+      </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve" approved="no">
+        <source>Better groups performance</source>
+        <target state="translated">أداء مجموعات أفضل</target>
+      </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve" approved="no">
+        <source>Better privacy and security</source>
+        <target state="translated">خصوصية وأمان أفضل</target>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve" approved="no">
+        <source>Better security ✅</source>
+        <target state="translated">أمان أفضل ✅</target>
+      </trans-unit>
+      <trans-unit id="Block for all" xml:space="preserve" approved="no">
+        <source>Block for all</source>
+        <target state="translated">حظر للجميع</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">حظر أعضاء المجموعة</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">حظر العضو</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve" approved="no">
+        <source>Both you and your contact can add message reactions.</source>
+        <target state="translated">يمكنك أنت وجهة اتصالك إضافة ردود فعل الرسائل.</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can make calls." xml:space="preserve" approved="no">
+        <source>Both you and your contact can make calls.</source>
+        <target state="translated">يمكنك أنت وجهة الاتصال إجراء مكالمات.</target>
+      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve" approved="no">
+        <source>Server</source>
+        <target state="translated">الخادم</target>
+      </trans-unit>
+      <trans-unit id="Server operators" xml:space="preserve" approved="no">
+        <source>Server operators</source>
+        <target state="translated">مُشغلي الخادم</target>
+      </trans-unit>
+      <trans-unit id="Server version is incompatible with your app: %@." xml:space="preserve" approved="no">
+        <source>Server version is incompatible with your app: %@.</source>
+        <target state="translated">إصدار الخادم غير متوافق مع التطبيق لديك: %@.</target>
+      </trans-unit>
+      <trans-unit id="Servers info" xml:space="preserve" approved="no">
+        <source>Servers info</source>
+        <target state="translated">معلومات الخوادم</target>
+      </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve" approved="no">
+        <source>Set chat name…</source>
+        <target state="translated">عيّن اسم الدردشة…</target>
+      </trans-unit>
+      <trans-unit id="Shape profile images" xml:space="preserve" approved="no">
+        <source>Shape profile images</source>
+        <target state="translated">شكّل الصور التعريفية</target>
+      </trans-unit>
+      <trans-unit id="Share address publicly" xml:space="preserve" approved="no">
+        <source>Share address publicly</source>
+        <target state="translated">شارك العنوان علناً</target>
+      </trans-unit>
+      <trans-unit id="Show developer options" xml:space="preserve" approved="no">
+        <source>Show developer options</source>
+        <target state="translated">عرض خيارات المطور</target>
+      </trans-unit>
+      <trans-unit id="SimpleX address" xml:space="preserve" approved="no">
+        <source>SimpleX address</source>
+        <target state="translated">عنوان SimpleX</target>
+      </trans-unit>
+      <trans-unit id="SimpleX address or 1-time link?" xml:space="preserve" approved="no">
+        <source>SimpleX address or 1-time link?</source>
+        <target state="translated">عنوان SimpleX أو رابط لمرة واحدة؟</target>
+      </trans-unit>
+      <trans-unit id="@'%@'" xml:space="preserve" approved="no">
+        <source>@'%@'</source>
+        <target state="translated">@'%@'</target>
+      </trans-unit>
+      <trans-unit id="@%@" xml:space="preserve" approved="no">
+        <source>@%@</source>
+        <target state="translated">@%@</target>
+      </trans-unit>
+      <trans-unit id="Active" xml:space="preserve" approved="no">
+        <source>Active</source>
+        <target state="translated">نشط</target>
+      </trans-unit>
+      <trans-unit id="Add friends" xml:space="preserve" approved="no">
+        <source>Add friends</source>
+        <target state="translated">أضف أصدقاء</target>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve" approved="no">
+        <source>Add list</source>
+        <target state="translated">أضف القائمة</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">سيتم إحباط تغيير العنوان. سيتم استخدام عنوان الاستلام القديم.</target>
+      </trans-unit>
+      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>All messages will be deleted - this cannot be undone!</source>
+        <target state="translated">سيتم حذف كافة الرسائل - لا يمكن التراجع عن هذا!</target>
+      </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve" approved="no">
+        <source>All reports will be archived for you.</source>
+        <target state="translated">سيتم أرشفة كافة البلاغات لك.</target>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected.</source>
+        <target state="translated">ستبقى جميع جهات اتصالك متصلة.</target>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
+        <target state="translated">ستبقى جميع جهات اتصالك متصلة. سيتم إرسال تحديث ملف التعريف إلى جهات اتصالك.</target>
+      </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" approved="no">
+        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target state="translated">جميع جهات الاتصال، المحادثات والملفات الخاصة بك سيتم تشفيرها بأمان ورفعها على شكل أجزاء إلى موجهات XFTP المُعدة.</target>
+      </trans-unit>
+      <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve" approved="no">
+        <source>Allow calls only if your contact allows them.</source>
+        <target state="translated">السماح بالمكالمات فقط إذا سمحت جهة اتصالك بذلك.</target>
+      </trans-unit>
+      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve" approved="no">
+        <source>Allow message reactions only if your contact allows them.</source>
+        <target state="translated">اسمح بردود الفعل على الرسائل فقط إذا سمحت جهة اتصالك بذلك.</target>
+      </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve" approved="no">
+        <source>Allow to report messsages to moderators.</source>
+        <target state="translated">السماح بالإبلاغ عن الرسائل إلى المشرفين.</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">اسمح لجهات اتصالك بحذف الرسائل المرسلة بشكل لا رجعة فيه. (24 ساعة)</target>
+      </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve" approved="no">
+        <source>Another reason</source>
+        <target state="translated">سبب آخر</target>
+      </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve" approved="no">
+        <source>App group:</source>
+        <target state="translated">مجموعة التطبيق:</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">طبّق لِ</target>
+      </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve" approved="no">
+        <source>Archive</source>
+        <target state="translated">أرشف</target>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve" approved="no">
+        <source>Archive %lld reports?</source>
+        <target state="translated">أرشف تقارير %lld؟</target>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve" approved="no">
+        <source>Archive all reports?</source>
+        <target state="translated">أرشفة كافة البلاغات؟</target>
+      </trans-unit>
+      <trans-unit id="Archive and upload" xml:space="preserve" approved="no">
+        <source>Archive and upload</source>
+        <target state="translated">أرشفة و رفع</target>
+      </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve" approved="no">
+        <source>Archive report</source>
+        <target state="translated">أرشف البلاغ</target>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve" approved="no">
+        <source>Archive report?</source>
+        <target state="translated">أرشف البلاغ؟</target>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve" approved="no">
+        <source>Archive reports</source>
+        <target state="translated">أرشف البلاغات</target>
+      </trans-unit>
+      <trans-unit id="Ask" xml:space="preserve" approved="no">
+        <source>Ask</source>
+        <target state="translated">اسأل</target>
+      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve" approved="no">
+        <source>Auto-accept settings</source>
+        <target state="translated">إعدادات القبول التلقائي</target>
+      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve" approved="no">
+        <source>Better message dates.</source>
+        <target state="translated">تواريخ أفضل للرسائل.</target>
+      </trans-unit>
+      <trans-unit id="Server added to operator %@." xml:space="preserve" approved="no">
+        <source>Server added to operator %@.</source>
+        <target state="translated">تمت إضافة الخادم إلى المشغل %@.</target>
+      </trans-unit>
+      <trans-unit id="Server address is incompatible with network settings: %@." xml:space="preserve" approved="no">
+        <source>Server address is incompatible with network settings: %@.</source>
+        <target state="translated">عنوان الخادم غير متوافق مع إعدادات الشبكة: %@.</target>
+      </trans-unit>
+      <trans-unit id="Server protocol changed." xml:space="preserve" approved="no">
+        <source>Server protocol changed.</source>
+        <target state="translated">تغيّر بروتوكول الخادم.</target>
+      </trans-unit>
+      <trans-unit id="SimpleX links are prohibited." xml:space="preserve" approved="no">
+        <source>SimpleX links are prohibited.</source>
+        <target state="translated">روابط SimpleX محظورة.</target>
+      </trans-unit>
+      <trans-unit id="Additional accent" xml:space="preserve" approved="no">
+        <source>Additional accent</source>
+        <target state="translated">لون إضافي ثانوي</target>
+      </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve" approved="no">
+        <source>Always use private routing.</source>
+        <target state="translated">استخدم دائمًا التوجيه الخاص.</target>
+      </trans-unit>
+      <trans-unit id="About operators" xml:space="preserve" approved="no">
+        <source>About operators</source>
+        <target state="translated">عن المُشغلين</target>
+      </trans-unit>
+      <trans-unit id="Add team members" xml:space="preserve" approved="no">
+        <source>Add team members</source>
+        <target state="translated">أضف أعضاء الفريق</target>
+      </trans-unit>
+      <trans-unit id="Added media &amp; file servers" xml:space="preserve" approved="no">
+        <source>Added media &amp; file servers</source>
+        <target state="translated">أُضيفت خوادم الوسائط والملفات</target>
+      </trans-unit>
+      <trans-unit id="Added message servers" xml:space="preserve" approved="no">
+        <source>Added message servers</source>
+        <target state="translated">أُضيفت خوادم الرسائل</target>
+      </trans-unit>
+      <trans-unit id="Address or 1-time link?" xml:space="preserve" approved="no">
+        <source>Address or 1-time link?</source>
+        <target state="translated">عنوان أو رابط لمرة واحدة؟</target>
+      </trans-unit>
+      <trans-unit id="Address settings" xml:space="preserve" approved="no">
+        <source>Address settings</source>
+        <target state="translated">إعدادات العنوان</target>
+      </trans-unit>
+      <trans-unit id="Allow sharing" xml:space="preserve" approved="no">
+        <source>Allow sharing</source>
+        <target state="translated">السماح بالمشاركة</target>
+      </trans-unit>
+      <trans-unit id="App data migration" xml:space="preserve" approved="no">
+        <source>App data migration</source>
+        <target state="translated">ترحيل بيانات التطبيق</target>
+      </trans-unit>
+      <trans-unit id="Archive contacts to chat later." xml:space="preserve" approved="no">
+        <source>Archive contacts to chat later.</source>
+        <target state="translated">أرشفة جهات الاتصال للدردشة لاحقًا.</target>
+      </trans-unit>
+      <trans-unit id="Better networking" xml:space="preserve" approved="no">
+        <source>Better networking</source>
+        <target state="translated">اتصال أفضل</target>
+      </trans-unit>
+      <trans-unit id="Session code" xml:space="preserve" approved="no">
+        <source>Session code</source>
+        <target state="translated">رمز الجلسة</target>
+      </trans-unit>
+      <trans-unit id="Set default theme" xml:space="preserve" approved="no">
+        <source>Set default theme</source>
+        <target state="translated">تعيين السمة الافتراضية</target>
+      </trans-unit>
+      <trans-unit id="Set it instead of system authentication." xml:space="preserve" approved="no">
+        <source>Set it instead of system authentication.</source>
+        <target state="translated">عيّنها بدلاً من استيثاق النظام.</target>
+      </trans-unit>
+      <trans-unit id="Set the message shown to new members!" xml:space="preserve" approved="no">
+        <source>Set the message shown to new members!</source>
+        <target state="translated">تعيين رسالة تظهر للأعضاء الجدد!</target>
+      </trans-unit>
+      <trans-unit id="Share 1-time link" xml:space="preserve" approved="no">
+        <source>Share 1-time link</source>
+        <target state="translated">مشاركة رابط ذو استخدام واحد</target>
+      </trans-unit>
+      <trans-unit id="Share 1-time link with a friend" xml:space="preserve" approved="no">
+        <source>Share 1-time link with a friend</source>
+        <target state="translated">شارك رابطًا لمرة واحدة مع صديق</target>
+      </trans-unit>
+      <trans-unit id="Share SimpleX address on social media." xml:space="preserve" approved="no">
+        <source>Share SimpleX address on social media.</source>
+        <target state="translated">شارك عنوان SimpleX على وسائل التواصل الاجتماعي.</target>
+      </trans-unit>
+      <trans-unit id="Share to SimpleX" xml:space="preserve" approved="no">
+        <source>Share to SimpleX</source>
+        <target state="translated">المشاركة لSimpleX</target>
+      </trans-unit>
+      <trans-unit id="Show calls in phone history" xml:space="preserve" approved="no">
+        <source>Show calls in phone history</source>
+        <target state="translated">عرض المكالمات في سجل الهاتف</target>
+      </trans-unit>
+      <trans-unit id="Show percentage" xml:space="preserve" approved="no">
+        <source>Show percentage</source>
+        <target state="translated">أظهِر النسبة المئوية</target>
+      </trans-unit>
+      <trans-unit id="SimpleX" xml:space="preserve" approved="no">
+        <source>SimpleX</source>
+        <target state="translated">SimpleX</target>
+      </trans-unit>
+      <trans-unit id="SimpleX Lock not enabled!" xml:space="preserve" approved="no">
+        <source>SimpleX Lock not enabled!</source>
+        <target state="translated">قفل SimpleX غير مفعّل!</target>
+      </trans-unit>
+      <trans-unit id="Bad message hash" xml:space="preserve" approved="no">
+        <source>Bad message hash</source>
+        <target state="translated">تجزئة رسالة سيئة</target>
+      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve" approved="no">
+        <source>App session</source>
+        <target state="translated">جلسة التطبيق</target>
+      </trans-unit>
+      <trans-unit id="SimpleX links not allowed" xml:space="preserve" approved="no">
+        <source>SimpleX links not allowed</source>
+        <target state="translated">روابط SimpleX غير مسموح بها</target>
+      </trans-unit>
+      <trans-unit id="All data is kept private on your device." xml:space="preserve" approved="no">
+        <source>All data is kept private on your device.</source>
+        <target state="translated">جميع البيانات تُحفظ بشكل خاص على جهازك.</target>
+      </trans-unit>
+      <trans-unit id="Archived contacts" xml:space="preserve" approved="no">
+        <source>Archived contacts</source>
+        <target state="translated">جهات الاتصال المؤرشفة</target>
+      </trans-unit>
+      <trans-unit id="Show message status" xml:space="preserve" approved="no">
+        <source>Show message status</source>
+        <target state="translated">أظهِر حالة الرسالة</target>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve" approved="no">
+        <source>Set message expiration in chats.</source>
+        <target state="translated">اضبط انتهاء صلاحية الرسالة في الدردشات.</target>
+      </trans-unit>
+      <trans-unit id="Server address" xml:space="preserve" approved="no">
+        <source>Server address</source>
+        <target state="translated">عنوان الخادم</target>
+      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve" approved="no">
+        <source>Show last messages</source>
+        <target state="translated">إظهار الرسائل الأخيرة</target>
+      </trans-unit>
+      <trans-unit id="Server operator changed." xml:space="preserve" approved="no">
+        <source>Server operator changed.</source>
+        <target state="translated">تغيّر مُشغل الخادم.</target>
+      </trans-unit>
+      <trans-unit id="SimpleX address and 1-time links are safe to share via any messenger." xml:space="preserve" approved="no">
+        <source>SimpleX address and 1-time links are safe to share via any messenger.</source>
+        <target state="translated">عنوان SimpleX والروابط لمرة واحدة آمنة للمشاركة عبر أي برنامج مُراسلة.</target>
+      </trans-unit>
+      <trans-unit id="Add your team members to the conversations." xml:space="preserve" approved="no">
+        <source>Add your team members to the conversations.</source>
+        <target state="translated">أضف أعضاء فريقك إلى المحادثات.</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">إعدادات متقدّمة</target>
+      </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve" approved="no">
+        <source>Add to list</source>
+        <target state="translated">أضف إلى القائمة</target>
+      </trans-unit>
+      <trans-unit id="Additional secondary" xml:space="preserve" approved="no">
+        <source>Additional secondary</source>
+        <target state="translated">ثانوي إضافي</target>
+      </trans-unit>
+      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
+        <source>Admins can block a member for all.</source>
+        <target state="translated">يمكن للمُدراء حظر عضو للجميع.</target>
+      </trans-unit>
+      <trans-unit id="All" xml:space="preserve" approved="no">
+        <source>All</source>
+        <target state="translated">الكل</target>
+      </trans-unit>
+      <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve" approved="no">
+        <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target state="translated">جميع الرسائل والملفات تُرسل **مشفرة من النهاية-إلى-النهاية**، مع أمان ما-بعد-الحوسبة-الكمية في الرسائل المباشرة.</target>
+      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve" approved="no">
+        <source>All new messages from %@ will be hidden!</source>
+        <target state="translated">جميع الرسائل الجديدة من %@ سيتم إخفاؤها!</target>
+      </trans-unit>
+      <trans-unit id="Auto-accept" xml:space="preserve" approved="no">
+        <source>Auto-accept</source>
+        <target state="translated">قبول تلقائي</target>
+      </trans-unit>
+      <trans-unit id="Change self-destruct mode" xml:space="preserve" approved="no">
+        <source>Change self-destruct mode</source>
+        <target state="translated">تغيير وضع التدمير الذاتي</target>
+      </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve" approved="no">
+        <source>Chat database exported</source>
+        <target state="translated">صُدرت قاعدة بيانات الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve" approved="no">
+        <source>Businesses</source>
+        <target state="translated">الشركات</target>
+      </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve" approved="no">
+        <source>Change automatic message deletion?</source>
+        <target state="translated">تغيير حذف الرسائل التلقائي؟</target>
+      </trans-unit>
+      <trans-unit id="Can't call contact" xml:space="preserve" approved="no">
+        <source>Can't call contact</source>
+        <target state="translated">لا يمكن مكالمة جهة الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Chat list" xml:space="preserve" approved="no">
+        <source>Chat list</source>
+        <target state="translated">قائمة الدردشات</target>
+      </trans-unit>
+      <trans-unit id="Calls prohibited!" xml:space="preserve" approved="no">
+        <source>Calls prohibited!</source>
+        <target state="translated">المكالمات ممنوعة!</target>
+      </trans-unit>
+      <trans-unit id="Change lock mode" xml:space="preserve" approved="no">
+        <source>Change lock mode</source>
+        <target state="translated">تغيير وضع القفل</target>
+      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve" approved="no">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <target state="translated">توقفت الدردشة. إذا كنت قد استخدمت قاعدة البيانات هذه بالفعل على جهاز آخر، فيجب عليك نقلها مرة أخرى قبل بدء الدردشة.</target>
+      </trans-unit>
+      <trans-unit id="Cellular" xml:space="preserve" approved="no">
+        <source>Cellular</source>
+        <target state="translated">خلوي</target>
+      </trans-unit>
+      <trans-unit id="Chat" xml:space="preserve" approved="no">
+        <source>Chat</source>
+        <target state="translated">الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Chat already exists!" xml:space="preserve" approved="no">
+        <source>Chat already exists!</source>
+        <target state="translated">الدردشة موجودة بالفعل!</target>
+      </trans-unit>
+      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target state="translated">سيتم حذف الدردشة لديك - لا يمكن التراجع عن هذا!</target>
+      </trans-unit>
+      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target state="translated">سيتم حذف الدردشة لجميع الأعضاء - لا يمكن التراجع عن هذا!</target>
+      </trans-unit>
+      <trans-unit id="Change self-destruct passcode" xml:space="preserve" approved="no">
+        <source>Change self-destruct passcode</source>
+        <target state="translated">تغيير رمز المرور التدمير الذاتي</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">الكاميرا غير متوفرة</target>
+      </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve" approved="no">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <target state="translated">تم تجاوز السعة - لم يتلق المُستلم الرسائل المُرسلة مسبقًا.</target>
+      </trans-unit>
+      <trans-unit id="Change passcode" xml:space="preserve" approved="no">
+        <source>Change passcode</source>
+        <target state="translated">تغيير رمز المرور</target>
+      </trans-unit>
+      <trans-unit id="Chat colors" xml:space="preserve" approved="no">
+        <source>Chat colors</source>
+        <target state="translated">ألوان الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Chat theme" xml:space="preserve" approved="no">
+        <source>Chat theme</source>
+        <target state="translated">سمة الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Business address" xml:space="preserve" approved="no">
+        <source>Business address</source>
+        <target state="translated">عنوان العمل التجاري</target>
+      </trans-unit>
+      <trans-unit id="Business chats" xml:space="preserve" approved="no">
+        <source>Business chats</source>
+        <target state="translated">دردشات العمل التجاري</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">ألغِ الترحيل</target>
+      </trans-unit>
+      <trans-unit id="Change chat profiles" xml:space="preserve" approved="no">
+        <source>Change chat profiles</source>
+        <target state="translated">غيّر ملفات تعريف الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Chat migrated!" xml:space="preserve" approved="no">
+        <source>Chat migrated!</source>
+        <target state="translated">رحّلت الدردشة!</target>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve" approved="no">
+        <source>Chat profile</source>
+        <target state="translated">ملف تعريف الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Contact deleted!" xml:space="preserve" approved="no">
+        <source>Contact deleted!</source>
+        <target state="translated">حُذفت جهة الاتصال!</target>
+      </trans-unit>
+      <trans-unit id="Conditions of use" xml:space="preserve" approved="no">
+        <source>Conditions of use</source>
+        <target state="translated">شروط الاستخدام</target>
+      </trans-unit>
+      <trans-unit id="Connecting" xml:space="preserve" approved="no">
+        <source>Connecting</source>
+        <target state="translated">جارِ الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve" approved="no">
+        <source>Connect incognito</source>
+        <target state="translated">اتصال متخفي</target>
+      </trans-unit>
+      <trans-unit id="Created at" xml:space="preserve" approved="no">
+        <source>Created at</source>
+        <target state="translated">أُنشئ في</target>
+      </trans-unit>
+      <trans-unit id="Connect via contact address" xml:space="preserve" approved="no">
+        <source>Connect via contact address</source>
+        <target state="translated">الاتصال عبر عنوان جهة الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Connected servers" xml:space="preserve" approved="no">
+        <source>Connected servers</source>
+        <target state="translated">الخوادم المتصلة</target>
+      </trans-unit>
+      <trans-unit id="standard end-to-end encryption" xml:space="preserve" approved="no">
+        <source>standard end-to-end encryption</source>
+        <target state="translated">التعمية القياسية بين الطرفين</target>
+      </trans-unit>
+      <trans-unit id="Delete up to 20 messages at once." xml:space="preserve" approved="no">
+        <source>Delete up to 20 messages at once.</source>
+        <target state="translated">حذف ما يصل إلى 20 رسالة في آن واحد.</target>
+      </trans-unit>
+      <trans-unit id="Connect to your friends faster." xml:space="preserve" approved="no">
+        <source>Connect to your friends faster.</source>
+        <target state="translated">تواصل مع أصدقائك بشكل أسرع.</target>
+      </trans-unit>
+      <trans-unit id="Developer options" xml:space="preserve" approved="no">
+        <source>Developer options</source>
+        <target state="translated">خيارات المطور</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?" xml:space="preserve" approved="no">
+        <source>Connect to yourself?</source>
+        <target state="translated">اتصل بنفسك؟</target>
+      </trans-unit>
+      <trans-unit id="Connect via one-time link" xml:space="preserve" approved="no">
+        <source>Connect via one-time link</source>
+        <target state="translated">اتصال عبر رابط لمرة واحدة</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own SimpleX address!</source>
+        <target state="translated">اتصل بنفسك؟
+هذا هو عنوان SimpleX الخاص بك!</target>
+      </trans-unit>
+      <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve" approved="no">
+        <source>Connecting to contact, please wait or check later!</source>
+        <target state="translated">جارِ الاتصال بجهة الاتصال، يُرجى الانتظار أو التحقق لاحقًا!</target>
+      </trans-unit>
+      <trans-unit id="Database upgrade" xml:space="preserve" approved="no">
+        <source>Database upgrade</source>
+        <target state="translated">ترقية قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve" approved="no">
+        <source>Create list</source>
+        <target state="translated">أنشئ قائمة</target>
+      </trans-unit>
+      <trans-unit id="Create profile" xml:space="preserve" approved="no">
+        <source>Create profile</source>
+        <target state="translated">إنشاء ملف تعريف</target>
+      </trans-unit>
+      <trans-unit id="Creating archive link" xml:space="preserve" approved="no">
+        <source>Creating archive link</source>
+        <target state="translated">جارِ إنشاء رابط الأرشيف</target>
+      </trans-unit>
+      <trans-unit id="Details" xml:space="preserve" approved="no">
+        <source>Details</source>
+        <target state="translated">التفاصيل</target>
+      </trans-unit>
+      <trans-unit id="Customize theme" xml:space="preserve" approved="no">
+        <source>Customize theme</source>
+        <target state="translated">تخصيص السمة</target>
+      </trans-unit>
+      <trans-unit id="Dark mode colors" xml:space="preserve" approved="no">
+        <source>Dark mode colors</source>
+        <target state="translated">ألوان الوضع الداكن</target>
+      </trans-unit>
+      <trans-unit id="Delete and notify contact" xml:space="preserve" approved="no">
+        <source>Delete and notify contact</source>
+        <target state="translated">حذف وإشعار جهة الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Deleted at: %@" xml:space="preserve" approved="no">
+        <source>Deleted at: %@</source>
+        <target state="translated">حُذفت في: %@</target>
+      </trans-unit>
+      <trans-unit id="Detailed statistics" xml:space="preserve" approved="no">
+        <source>Detailed statistics</source>
+        <target state="translated">إحصائيات مفصلة</target>
+      </trans-unit>
+      <trans-unit id="you are observer" xml:space="preserve" approved="no">
+        <source>you are observer</source>
+        <target state="translated">أنت المراقب</target>
+      </trans-unit>
+      <trans-unit id="you" xml:space="preserve" approved="no">
+        <source>you</source>
+        <target state="translated">أنت</target>
+      </trans-unit>
+      <trans-unit id="when IP hidden" xml:space="preserve" approved="no">
+        <source>when IP hidden</source>
+        <target state="translated">عندما يكون IP مخفيًا</target>
+      </trans-unit>
+      <trans-unit id="video" xml:space="preserve" approved="no">
+        <source>video</source>
+        <target state="translated">فيديو</target>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve" approved="no">
+        <source>Clear or delete group?</source>
+        <target state="translated">مسح أو حذف المجموعة؟</target>
+      </trans-unit>
+      <trans-unit id="Clear private notes?" xml:space="preserve" approved="no">
+        <source>Clear private notes?</source>
+        <target state="translated">مسح الملاحظات الخاصة؟</target>
+      </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve" approved="no">
+        <source>Community guidelines violation</source>
+        <target state="translated">انتهاك إرشادات المجتمع</target>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve" approved="no">
+        <source>Connection not ready.</source>
+        <target state="translated">الاتصال غير جاهز.</target>
+      </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve" approved="no">
+        <source>Connection requires encryption renegotiation.</source>
+        <target state="translated">يتطلب الاتصال إعادة التفاوض على التعمية.</target>
+      </trans-unit>
+      <trans-unit id="Contact is deleted." xml:space="preserve" approved="no">
+        <source>Contact is deleted.</source>
+        <target state="translated">حُذفت جهة الاتصال.</target>
+      </trans-unit>
+      <trans-unit id="Contacts" xml:space="preserve" approved="no">
+        <source>Contacts</source>
+        <target state="translated">جهات الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Create SimpleX address" xml:space="preserve" approved="no">
+        <source>Create SimpleX address</source>
+        <target state="translated">أنشئ عنوان SimpleX</target>
+      </trans-unit>
+      <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve" approved="no">
+        <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
+        <target state="translated">لا يمكن تحميل نص الشروط الحالية، يمكنك مراجعة الشروط عبر هذا الرابط:</target>
+      </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve" approved="no">
+        <source>Delete chat messages from your device.</source>
+        <target state="translated">احذف رسائل الدردشة من جهازك.</target>
+      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve" approved="no">
+        <source>Delete or moderate up to 200 messages.</source>
+        <target state="translated">حذف أو إشراف ما يصل إلى 200 رسالة.</target>
+      </trans-unit>
+      <trans-unit id="Delete profile" xml:space="preserve" approved="no">
+        <source>Delete profile</source>
+        <target state="translated">حذف ملف التعريف</target>
+      </trans-unit>
+      <trans-unit id="Desktop devices" xml:space="preserve" approved="no">
+        <source>Desktop devices</source>
+        <target state="translated">أجهزة سطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="set new profile picture" xml:space="preserve" approved="no">
+        <source>set new profile picture</source>
+        <target state="translated">عيّن صورة تعريفية جديدة</target>
+      </trans-unit>
+      <trans-unit id="weeks" xml:space="preserve" approved="no">
+        <source>weeks</source>
+        <target state="translated">أسابيع</target>
+      </trans-unit>
+      <trans-unit id="Chunks uploaded" xml:space="preserve" approved="no">
+        <source>Chunks uploaded</source>
+        <target state="translated">رُفع القطع</target>
+      </trans-unit>
+      <trans-unit id="Color mode" xml:space="preserve" approved="no">
+        <source>Color mode</source>
+        <target state="translated">وضع اللون</target>
+      </trans-unit>
+      <trans-unit id="Created" xml:space="preserve" approved="no">
+        <source>Created</source>
+        <target state="translated">أُنشئت</target>
+      </trans-unit>
+      <trans-unit id="Current Passcode" xml:space="preserve" approved="no">
+        <source>Current Passcode</source>
+        <target state="translated">رمز المرور الحالي</target>
+      </trans-unit>
+      <trans-unit id="Custom time" xml:space="preserve" approved="no">
+        <source>Custom time</source>
+        <target state="translated">وقت مخصّص</target>
+      </trans-unit>
+      <trans-unit id="Debug delivery" xml:space="preserve" approved="no">
+        <source>Debug delivery</source>
+        <target state="translated">تسليم التصحيح</target>
+      </trans-unit>
+      <trans-unit id="Deleted" xml:space="preserve" approved="no">
+        <source>Deleted</source>
+        <target state="translated">حُذفت</target>
+      </trans-unit>
+      <trans-unit id="Delete file" xml:space="preserve" approved="no">
+        <source>Delete file</source>
+        <target state="translated">حذف الملف</target>
+      </trans-unit>
+      <trans-unit id="unknown status" xml:space="preserve" approved="no">
+        <source>unknown status</source>
+        <target state="translated">حالة غير معروفة</target>
+      </trans-unit>
+      <trans-unit id="unknown servers" xml:space="preserve" approved="no">
+        <source>unknown servers</source>
+        <target state="translated">خوادم غير معروفة</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own one-time link!</source>
+        <target state="translated">اتصل بنفسك؟
+هذا هو الرابط الخاص بك لمرة واحدة!</target>
+      </trans-unit>
+      <trans-unit id="Connect with %@" xml:space="preserve" approved="no">
+        <source>Connect with %@</source>
+        <target state="translated">الاتصال ب%@</target>
+      </trans-unit>
+      <trans-unit id="Connected desktop" xml:space="preserve" approved="no">
+        <source>Connected desktop</source>
+        <target state="translated">سطح المكتب متصل</target>
+      </trans-unit>
+      <trans-unit id="Connected to desktop" xml:space="preserve" approved="no">
+        <source>Connected to desktop</source>
+        <target state="translated">متصل بسطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="Conversation deleted!" xml:space="preserve" approved="no">
+        <source>Conversation deleted!</source>
+        <target state="translated">حُذفت المحادثة!</target>
+      </trans-unit>
+      <trans-unit id="Create a group using a random profile." xml:space="preserve" approved="no">
+        <source>Create a group using a random profile.</source>
+        <target state="translated">أنشئ مجموعة باستخدام ملف تعريف عشوائي.</target>
+      </trans-unit>
+      <trans-unit id="Delete chat" xml:space="preserve" approved="no">
+        <source>Delete chat</source>
+        <target state="translated">احذف الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Delete chat profile" xml:space="preserve" approved="no">
+        <source>Delete chat profile</source>
+        <target state="translated">حذف ملف تعريف الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Delete chat?" xml:space="preserve" approved="no">
+        <source>Delete chat?</source>
+        <target state="translated">حذف الدردشة؟</target>
+      </trans-unit>
+      <trans-unit id="Delete database from this device" xml:space="preserve" approved="no">
+        <source>Delete database from this device</source>
+        <target state="translated">احذف قاعدة البيانات من هذا الجهاز</target>
+      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve" approved="no">
+        <source>Delivery</source>
+        <target state="translated">التوصيل</target>
+      </trans-unit>
+      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve" approved="no">
+        <source>Delivery receipts are disabled!</source>
+        <target state="translated">إيصالات التسليم مُعطَّلة!</target>
+      </trans-unit>
+      <trans-unit id="Connection terminated" xml:space="preserve" approved="no">
+        <source>Connection terminated</source>
+        <target state="translated">انتهى الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Create file" xml:space="preserve" approved="no">
+        <source>Create file</source>
+        <target state="translated">إنشاء ملف</target>
+      </trans-unit>
+      <trans-unit id="Create group" xml:space="preserve" approved="no">
+        <source>Create group</source>
+        <target state="translated">أنشئ مجموعة</target>
+      </trans-unit>
+      <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve" approved="no">
+        <source>Database IDs and Transport isolation option.</source>
+        <target state="translated">معرفات قاعدة البيانات وخيار عزل النقل.</target>
+      </trans-unit>
+      <trans-unit id="Database downgrade" xml:space="preserve" approved="no">
+        <source>Database downgrade</source>
+        <target state="translated">الرجوع إلى إصدار سابق من قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Delivery receipts!" xml:space="preserve" approved="no">
+        <source>Delivery receipts!</source>
+        <target state="translated">إيصالات التسليم!</target>
+      </trans-unit>
+      <trans-unit id="Desktop address" xml:space="preserve" approved="no">
+        <source>Desktop address</source>
+        <target state="translated">عنوان سطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="updated profile" xml:space="preserve" approved="no">
+        <source>updated profile</source>
+        <target state="translated">حدّثت ملف التعريف</target>
+      </trans-unit>
+      <trans-unit id="Connect to desktop" xml:space="preserve" approved="no">
+        <source>Connect to desktop</source>
+        <target state="translated">اتصل بسطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="Connecting to desktop" xml:space="preserve" approved="no">
+        <source>Connecting to desktop</source>
+        <target state="translated">جار الاتصال بسطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="Completed" xml:space="preserve" approved="no">
+        <source>Completed</source>
+        <target state="translated">اكتملت</target>
+      </trans-unit>
+      <trans-unit id="Connection notifications" xml:space="preserve" approved="no">
+        <source>Connection notifications</source>
+        <target state="translated">إشعارات الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Connection and servers status." xml:space="preserve" approved="no">
+        <source>Connection and servers status.</source>
+        <target state="translated">حالة الاتصال والخوادم.</target>
+      </trans-unit>
+      <trans-unit id="Continue" xml:space="preserve" approved="no">
+        <source>Continue</source>
+        <target state="translated">متابعة</target>
+      </trans-unit>
+      <trans-unit id="Connections" xml:space="preserve" approved="no">
+        <source>Connections</source>
+        <target state="translated">الاتصالات</target>
+      </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve" approved="no">
+        <source>Content violates conditions of use</source>
+        <target state="translated">المحتوى ينتهك شروط الاستخدام</target>
+      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve" approved="no">
+        <source>Corner</source>
+        <target state="translated">ركن</target>
+      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve" approved="no">
+        <source>Creating link…</source>
+        <target state="translated">جارِ إنشاء الرابط…</target>
+      </trans-unit>
+      <trans-unit id="Database ID: %d" xml:space="preserve" approved="no">
+        <source>Database ID: %d</source>
+        <target state="translated">معرّف قاعدة البيانات: %d</target>
+      </trans-unit>
+      <trans-unit id="Decryption error" xml:space="preserve" approved="no">
+        <source>Decryption error</source>
+        <target state="translated">خطأ في فك التعمية</target>
+      </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve" approved="no">
+        <source>Delete report</source>
+        <target state="translated">احذف البلاغ</target>
+      </trans-unit>
+      <trans-unit id="Delete without notification" xml:space="preserve" approved="no">
+        <source>Delete without notification</source>
+        <target state="translated">احذف دون إشعار</target>
+      </trans-unit>
+      <trans-unit id="Deleted at" xml:space="preserve" approved="no">
+        <source>Deleted at</source>
+        <target state="translated">حُذفت في</target>
+      </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve" approved="no">
+        <source>Clear group?</source>
+        <target state="translated">مسح المجموعة؟</target>
+      </trans-unit>
+      <trans-unit id="Compare file" xml:space="preserve" approved="no">
+        <source>Compare file</source>
+        <target state="translated">قارن الملف</target>
+      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve" approved="no">
+        <source>Connect automatically</source>
+        <target state="translated">اتصل تلقائيًا</target>
+      </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve" approved="no">
+        <source>Connection blocked</source>
+        <target state="translated">حُظر الاتصال</target>
+      </trans-unit>
+      <trans-unit id="unprotected" xml:space="preserve" approved="no">
+        <source>unprotected</source>
+        <target state="translated">غير محمي</target>
+      </trans-unit>
+      <trans-unit id="Deletion errors" xml:space="preserve" approved="no">
+        <source>Deletion errors</source>
+        <target state="translated">أخطاء الحذف</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for enabled operators after 30 days.</source>
+        <target state="translated">سيتم قبول الشروط للمُشغلين المفعّلين بعد 30 يومًا.</target>
+      </trans-unit>
+      <trans-unit id="Connection security" xml:space="preserve" approved="no">
+        <source>Connection security</source>
+        <target state="translated">أمان الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Contact will be deleted - this cannot be undone!</source>
+        <target state="translated">سيتم حذف جهة الاتصال - لا يمكن التراجع عن هذا!</target>
+      </trans-unit>
+      <trans-unit id="Copy error" xml:space="preserve" approved="no">
+        <source>Copy error</source>
+        <target state="translated">خطأ في النسخ</target>
+      </trans-unit>
+      <trans-unit id="Create 1-time link" xml:space="preserve" approved="no">
+        <source>Create 1-time link</source>
+        <target state="translated">أنشئ رابط لمرة واحدة</target>
+      </trans-unit>
+      <trans-unit id="Connected" xml:space="preserve" approved="no">
+        <source>Connected</source>
+        <target state="translated">متصل</target>
+      </trans-unit>
+      <trans-unit id="Current profile" xml:space="preserve" approved="no">
+        <source>Current profile</source>
+        <target state="translated">ملف التعريف الحالي</target>
+      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve" approved="no">
+        <source>Customizable message shape.</source>
+        <target state="translated">شكل الرسالة قابل للتخصيص.</target>
+      </trans-unit>
+      <trans-unit id="Chunks deleted" xml:space="preserve" approved="no">
+        <source>Chunks deleted</source>
+        <target state="translated">حُذفت القطع</target>
+      </trans-unit>
+      <trans-unit id="Chinese and Spanish interface" xml:space="preserve" approved="no">
+        <source>Chinese and Spanish interface</source>
+        <target state="translated">الواجهة الصينية والاسبانية</target>
+      </trans-unit>
+      <trans-unit id="Download" xml:space="preserve" approved="no">
+        <source>Download</source>
+        <target state="translated">نزّل</target>
+      </trans-unit>
+      <trans-unit id="Downloaded" xml:space="preserve" approved="no">
+        <source>Downloaded</source>
+        <target state="translated">نُزّلت</target>
+      </trans-unit>
+      <trans-unit id="Downloaded files" xml:space="preserve" approved="no">
+        <source>Downloaded files</source>
+        <target state="translated">الملفات التي نُزّلت</target>
+      </trans-unit>
+      <trans-unit id="Don't show again" xml:space="preserve" approved="no">
+        <source>Don't show again</source>
+        <target state="translated">لا تُظهر مرة أخرى</target>
+      </trans-unit>
+      <trans-unit id="Confirm contact deletion?" xml:space="preserve" approved="no">
+        <source>Confirm contact deletion?</source>
+        <target state="translated">تأكيد حذف جهة الاتصال؟</target>
+      </trans-unit>
+      <trans-unit id="Confirm database upgrades" xml:space="preserve" approved="no">
+        <source>Confirm database upgrades</source>
+        <target state="translated">تأكيد ترقيات قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Download failed" xml:space="preserve" approved="no">
+        <source>Download failed</source>
+        <target state="translated">فشل التنزيل</target>
+      </trans-unit>
+      <trans-unit id="Download file" xml:space="preserve" approved="no">
+        <source>Download file</source>
+        <target state="translated">نزّل الملف</target>
+      </trans-unit>
+      <trans-unit id="Downloading link details" xml:space="preserve" approved="no">
+        <source>Downloading link details</source>
+        <target state="translated">جارِ تنزيل تفاصيل الرابط</target>
+      </trans-unit>
+      <trans-unit id="Downloading archive" xml:space="preserve" approved="no">
+        <source>Downloading archive</source>
+        <target state="translated">جارِ تنزيل الأرشيف</target>
+      </trans-unit>
+      <trans-unit id="Don't enable" xml:space="preserve" approved="no">
+        <source>Don't enable</source>
+        <target state="translated">لا تُفعل</target>
+      </trans-unit>
+      <trans-unit id="Confirm upload" xml:space="preserve" approved="no">
+        <source>Confirm upload</source>
+        <target state="translated">أكّد الرفع</target>
+      </trans-unit>
+      <trans-unit id="Chunks downloaded" xml:space="preserve" approved="no">
+        <source>Chunks downloaded</source>
+        <target state="translated">نُزّلت القطع</target>
+      </trans-unit>
+      <trans-unit id="Confirm Passcode" xml:space="preserve" approved="no">
+        <source>Confirm Passcode</source>
+        <target state="translated">تأكيد رمز المرور</target>
+      </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve" approved="no">
+        <source>Confirm files from unknown servers.</source>
+        <target state="translated">تأكيد الملفات من خوادم غير معروفة.</target>
+      </trans-unit>
+      <trans-unit id="Confirm network settings" xml:space="preserve" approved="no">
+        <source>Confirm network settings</source>
+        <target state="translated">أكّد إعدادات الشبكة</target>
+      </trans-unit>
+      <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve" approved="no">
+        <source>Confirm that you remember database passphrase to migrate it.</source>
+        <target state="translated">تأكد من أنك تتذكر عبارة مرور قاعدة البيانات لترحيلها.</target>
+      </trans-unit>
+      <trans-unit id="Downgrade and open chat" xml:space="preserve" approved="no">
+        <source>Downgrade and open chat</source>
+        <target state="translated">الرجوع إلى إصدار سابق وفتح الدردشة</target>
+      </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve" approved="no">
+        <source>Don't miss important messages.</source>
+        <target state="translated">لا تفوت رسائل مهمة.</target>
+      </trans-unit>
+      <trans-unit id="E2E encrypted notifications." xml:space="preserve" approved="no">
+        <source>E2E encrypted notifications.</source>
+        <target state="translated">إشعارات مُشفرة بين الطرفين E2E</target>
+      </trans-unit>
+      <trans-unit id="Download errors" xml:space="preserve" approved="no">
+        <source>Download errors</source>
+        <target state="translated">أخطاء التنزيل</target>
+      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve" approved="no">
+        <source>Download files</source>
+        <target state="translated">نزّل الملفات</target>
+      </trans-unit>
+      <trans-unit id="Confirm password" xml:space="preserve" approved="no">
+        <source>Confirm password</source>
+        <target state="translated">تأكيد كلمة المرور</target>
+      </trans-unit>
+      <trans-unit id="Enable self-destruct" xml:space="preserve" approved="no">
+        <source>Enable self-destruct</source>
+        <target state="translated">تفعيل التدمير الذاتي</target>
+      </trans-unit>
+      <trans-unit id="Enable (keep overrides)" xml:space="preserve" approved="no">
+        <source>Enable (keep overrides)</source>
+        <target state="translated">تفعيل (الاحتفاظ بالتجاوزات)</target>
+      </trans-unit>
+      <trans-unit id="Enable Flux" xml:space="preserve" approved="no">
+        <source>Enable Flux</source>
+        <target state="translated">فعّل flux</target>
+      </trans-unit>
+      <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve" approved="no">
+        <source>Enable in direct chats (BETA)!</source>
+        <target state="translated">فعّل في الدردشات المباشرة (تجريبي)!</target>
+      </trans-unit>
+      <trans-unit id="Enable for all" xml:space="preserve" approved="no">
+        <source>Enable for all</source>
+        <target state="translated">تفعيل للجميع</target>
+      </trans-unit>
+      <trans-unit id="Enable lock" xml:space="preserve" approved="no">
+        <source>Enable lock</source>
+        <target state="translated">تفعيل القفل</target>
+      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve" approved="no">
+        <source>Enable camera access</source>
+        <target state="translated">فعّل الوصول إلى الكاميرا</target>
+      </trans-unit>
+      <trans-unit id="Enable self-destruct passcode" xml:space="preserve" approved="no">
+        <source>Enable self-destruct passcode</source>
+        <target state="translated">تفعيل رمز التدمير الذاتي</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">لا يمكن الاتصال بالعضو</target>
+      </trans-unit>
+      <trans-unit id="Color chats with the new themes." xml:space="preserve" approved="no">
+        <source>Color chats with the new themes.</source>
+        <target state="translated">محادثات ملونة مع السمات الجديدة.</target>
+      </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve" approved="no">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target state="translated">ستتم إزالة جميع الدردشات من القائمة %@، وسيتم حذف القائمة.</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
+        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target state="translated">البلغارية والفنلندية والتايلاندية والأوكرانية - شكرًا للمستخدمين و[Weblate] (https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
+      </trans-unit>
+      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve" approved="no">
+        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
+        <target state="translated">اختر _الترحيل من جهاز آخر_ على الجهاز الجديد وامسح رمز الاستجابة السريعة.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for the operator(s): **%@**.</source>
+        <target state="translated">سيتم قبول شروط المشغل (المشغلين): **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted on: %@.</source>
+        <target state="translated">سيتم قبول الشروط على: %@.</target>
+      </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve" approved="no">
+        <source>Confirmed</source>
+        <target state="translated">تم التأكيد</target>
+      </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve" approved="no">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target state="translated">تم حظر الاتصال من قبل مشغل الخادم:
+%@</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">لا يمكن الاتصال بالعضو</target>
+      </trans-unit>
+      <trans-unit id="Chat already exists" xml:space="preserve" approved="no">
+        <source>Chat already exists</source>
+        <target state="translated">الدردشة موجودة بالفعل</target>
+      </trans-unit>
+      <trans-unit id="Check messages every 20 min." xml:space="preserve" approved="no">
+        <source>Check messages every 20 min.</source>
+        <target state="translated">تحقق من الرسائل كل 20 دقيقة.</target>
+      </trans-unit>
+      <trans-unit id="Check messages when allowed." xml:space="preserve" approved="no">
+        <source>Check messages when allowed.</source>
+        <target state="translated">تحقق من الرسائل عندما يُسمح بذلك.</target>
+      </trans-unit>
+      <trans-unit id="Cannot forward message" xml:space="preserve" approved="no">
+        <source>Cannot forward message</source>
+        <target state="translated">لا يمكن إعادة توجيه الرسالة</target>
+      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve" approved="no">
+        <source>Chat preferences were changed.</source>
+        <target state="translated">تم تغيير تفضيلات المحادثة.</target>
+      </trans-unit>
+      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target state="translated">الشروط مقبولة بالفعل لهذا المشغل (المشغلين): **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target state="translated">سيتم قبول شروط المشغل (المشغلين): **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions accepted on: %@." xml:space="preserve" approved="no">
+        <source>Conditions accepted on: %@.</source>
+        <target state="translated">الشروط المقبولة على: %@.</target>
+      </trans-unit>
+      <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target state="translated">يتم قبول شروط المشغل (المشغلين): **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve" approved="no">
+        <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
+        <target state="translated">سيتم قبول الشروط تلقائيًا للمشغلين الممكّنين على: %@.</target>
+      </trans-unit>
+      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve" approved="no">
+        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
+        <target state="translated">أنشئ ملفًا شخصيًا جديدًا في [تطبيق سطح المكتب](https://simplex.chat/downloads/). 💻</target>
+      </trans-unit>
+      <trans-unit id="Error adding server" xml:space="preserve" approved="no">
+        <source>Error adding server</source>
+        <target state="translated">خطأ في إضافة الخادم</target>
+      </trans-unit>
+      <trans-unit id="Created at: %@" xml:space="preserve" approved="no">
+        <source>Created at: %@</source>
+        <target state="translated">تم الإنشاء في: %@</target>
+      </trans-unit>
+      <trans-unit id="Delete %lld messages of members?" xml:space="preserve" approved="no">
+        <source>Delete %lld messages of members?</source>
+        <target state="translated">حذف %lld الرسائل القديمة للأعضاء؟</target>
+      </trans-unit>
+      <trans-unit id="Disappearing message" xml:space="preserve" approved="no">
+        <source>Disappearing message</source>
+        <target state="translated">رسالة اختفاء</target>
+      </trans-unit>
+      <trans-unit id="Enabled" xml:space="preserve" approved="no">
+        <source>Enabled</source>
+        <target state="translated">ممكّنة</target>
+      </trans-unit>
+      <trans-unit id="Encrypted message: database migration error" xml:space="preserve" approved="no">
+        <source>Encrypted message: database migration error</source>
+        <target state="translated">رسالة مشفرة: خطأ في ترحيل قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve" approved="no">
+        <source>Delete list?</source>
+        <target state="translated">Delete list?</target>
+      </trans-unit>
+      <trans-unit id="Delivered even when Apple drops them." xml:space="preserve" approved="no">
+        <source>Delivered even when Apple drops them.</source>
+        <target state="translated">يتم تسليمها حتى عندما تسقطها شركة Apple.</target>
+      </trans-unit>
+      <trans-unit id="Destination server address of %@ is incompatible with forwarding server %@ settings." xml:space="preserve" approved="no">
+        <source>Destination server address of %@ is incompatible with forwarding server %@ settings.</source>
+        <target state="translated">عنوان خادم الوجهة %@ غير متوافق مع إعدادات خادم التوجيه %@.</target>
+      </trans-unit>
+      <trans-unit id="Destination server version of %@ is incompatible with forwarding server %@." xml:space="preserve" approved="no">
+        <source>Destination server version of %@ is incompatible with forwarding server %@.</source>
+        <target state="translated">إصدار خادم الوجهة لـ %@ غير متوافق مع خادم التوجيه %@.</target>
+      </trans-unit>
+      <trans-unit id="Don't create address" xml:space="preserve" approved="no">
+        <source>Don't create address</source>
+        <target state="translated">لا تنشئ عنوان</target>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve" approved="no">
+        <source>Done</source>
+        <target state="translated">تم</target>
+      </trans-unit>
+      <trans-unit id="Duration" xml:space="preserve" approved="no">
+        <source>Duration</source>
+        <target state="translated">المدة</target>
+      </trans-unit>
+      <trans-unit id="Encrypt local files" xml:space="preserve" approved="no">
+        <source>Encrypt local files</source>
+        <target state="translated">تشفير الملفات المحلية</target>
+      </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve" approved="no">
+        <source>Encryption renegotiation in progress.</source>
+        <target state="translated">إعادة التفاوض على التشفير قيد التنفيذ.</target>
+      </trans-unit>
+      <trans-unit id="Enter Passcode" xml:space="preserve" approved="no">
+        <source>Enter Passcode</source>
+        <target state="translated">أدخل رمز المرور</target>
+      </trans-unit>
+      <trans-unit id="Enter passphrase" xml:space="preserve" approved="no">
+        <source>Enter passphrase</source>
+        <target state="translated">قم بأدخل عبارة المرور</target>
+      </trans-unit>
+      <trans-unit id="Enter welcome message…" xml:space="preserve" approved="no">
+        <source>Enter welcome message…</source>
+        <target state="translated">أدخل رسالة ترحيب…</target>
+      </trans-unit>
+      <trans-unit id="Enter your name…" xml:space="preserve" approved="no">
+        <source>Enter your name…</source>
+        <target state="translated">أدخل اسمك…</target>
+      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve" approved="no">
+        <source>Error changing to incognito!</source>
+        <target state="translated">خطأ في التغيير إلى التصفح المتخفي!</target>
+      </trans-unit>
+      <trans-unit id="Delete %lld messages?" xml:space="preserve" approved="no">
+        <source>Delete %lld messages?</source>
+        <target state="translated">حذف %lld رسائل؟</target>
+      </trans-unit>
+      <trans-unit id="Error aborting address change" xml:space="preserve" approved="no">
+        <source>Error aborting address change</source>
+        <target state="translated">خطأ في إجهاض تغيير العنوان</target>
+      </trans-unit>
+      <trans-unit id="Disappears at" xml:space="preserve" approved="no">
+        <source>Disappears at</source>
+        <target state="translated">يختفي عند</target>
+      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve" approved="no">
+        <source>Do not use credentials with proxy.</source>
+        <target state="translated">لا تستخدم بيانات الاعتماد مع البروكسي.</target>
+      </trans-unit>
+      <trans-unit id="Error accepting conditions" xml:space="preserve" approved="no">
+        <source>Error accepting conditions</source>
+        <target state="translated">خطأ في قبول الشروط</target>
+      </trans-unit>
+      <trans-unit id="Enter password above to show!" xml:space="preserve" approved="no">
+        <source>Enter password above to show!</source>
+        <target state="translated">أدخل كلمة المرور أعلاه للعرض!</target>
+      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve" approved="no">
+        <source>Error changing connection profile</source>
+        <target state="translated">خطأ في تغيير ملف تعريف الاتصال</target>
+      </trans-unit>
+      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve" approved="no">
+        <source>Desktop app version %@ is not compatible with this app.</source>
+        <target state="translated">إصدار تطبيق سطح المكتب %@ غير متوافق مع هذا التطبيق.</target>
+      </trans-unit>
+      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve" approved="no">
+        <source>Encrypt stored files &amp; media</source>
+        <target state="translated">تشفير الملفات والوسائط المخزنة</target>
+      </trans-unit>
+      <trans-unit id="Enter this device name…" xml:space="preserve" approved="no">
+        <source>Enter this device name…</source>
+        <target state="translated">أدخل اسم الجهاز…</target>
+      </trans-unit>
+      <trans-unit id="Enter welcome message… (optional)" xml:space="preserve" approved="no">
+        <source>Enter welcome message… (optional)</source>
+        <target state="translated">أدخل رسالة ترحيب... (اختياري)</target>
+      </trans-unit>
+      <trans-unit id="Correct name to %@?" xml:space="preserve" approved="no">
+        <source>Correct name to %@?</source>
+        <target state="translated">الاسم الصحيح ل %@؟</target>
+      </trans-unit>
+      <trans-unit id="Delete member message?" xml:space="preserve" approved="no">
+        <source>Delete member message?</source>
+        <target state="translated">حذف رسالة العضو؟</target>
+      </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve" approved="no">
+        <source>Disable automatic message deletion?</source>
+        <target state="translated">تعطيل حذف الرسائل التلقائي؟</target>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve" approved="no">
+        <source>Disable delete messages</source>
+        <target state="translated">تعطيل حذف الرسائل</target>
+      </trans-unit>
+      <trans-unit id="Disable for all" xml:space="preserve" approved="no">
+        <source>Disable for all</source>
+        <target state="translated">تعطيل للجميع</target>
+      </trans-unit>
+      <trans-unit id="Disabled" xml:space="preserve" approved="no">
+        <source>Disabled</source>
+        <target state="translated">عاجز</target>
+      </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve" approved="no">
+        <source>Documents:</source>
+        <target state="translated">المستندات:</target>
+      </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve" approved="no">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target state="translated">باستخدامك SimpleX Chat، فإنك توافق على:
+- إرسال محتوى قانوني فقط في المجموعات العامة.
+- احترام المستخدمين الآخرين - ممنوع إرسال رسائل مزعجة.</target>
+      </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve" approved="no">
+        <source>Configure server operators</source>
+        <target state="translated">تكوين مشغلي الخادم</target>
+      </trans-unit>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve" approved="no">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target state="translated">تمكين التدفق في إعدادات الشبكة والخوادم لتحسين خصوصية البيانات الوصفية.</target>
+      </trans-unit>
+      <trans-unit id="Discover and join groups" xml:space="preserve" approved="no">
+        <source>Discover and join groups</source>
+        <target state="translated">اكتشف المجموعات وانضم إليها</target>
+      </trans-unit>
+      <trans-unit id="Discover via local network" xml:space="preserve" approved="no">
+        <source>Discover via local network</source>
+        <target state="translated">اكتشف عبر الشبكة المحلية</target>
+      </trans-unit>
+      <trans-unit id="Enabled for" xml:space="preserve" approved="no">
+        <source>Enabled for</source>
+        <target state="translated">ممكّن ل</target>
+      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve" approved="no">
+        <source>Encrypted message: app is stopped</source>
+        <target state="translated">رسالة مشفرة: تم إيقاف التطبيق</target>
+      </trans-unit>
+      <trans-unit id="Enter group name…" xml:space="preserve" approved="no">
+        <source>Enter group name…</source>
+        <target state="translated">أدخل اسم المجموعة…</target>
+      </trans-unit>
+      <trans-unit id="Do NOT use private routing." xml:space="preserve" approved="no">
+        <source>Do NOT use private routing.</source>
+        <target state="translated">لا تستخدم التوجيه الخاص.</target>
+      </trans-unit>
+      <trans-unit id="Encryption re-negotiation error" xml:space="preserve" approved="no">
+        <source>Encryption re-negotiation error</source>
+        <target state="translated">خطأ في إعادة تفاوض التشفير</target>
+      </trans-unit>
+      <trans-unit id="Connection with desktop stopped" xml:space="preserve" approved="no">
+        <source>Connection with desktop stopped</source>
+        <target state="translated">تم إيقاف الاتصال بسطح المكتب</target>
+      </trans-unit>
+      <trans-unit id="Destination server error: %@" xml:space="preserve" approved="no">
+        <source>Destination server error: %@</source>
+        <target state="translated">خطأ خادم الوجهة: %@</target>
+      </trans-unit>
+      <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve" approved="no">
+        <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
+        <target state="translated">لا ترسل الرسائل بشكل مباشر، حتى لو كان خادمك أو خادم الوجهة لا يدعم التوجيه الخاص.</target>
+      </trans-unit>
+      <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve" approved="no">
+        <source>Direct messages between members are prohibited in this chat.</source>
+        <target state="translated">يُحظر إرسال الرسائل المباشرة بين الأعضاء في هذه الدردشة.</target>
+      </trans-unit>
+      <trans-unit id="Disconnect desktop?" xml:space="preserve" approved="no">
+        <source>Disconnect desktop?</source>
+        <target state="translated">فصل سطح المكتب؟</target>
+      </trans-unit>
+      <trans-unit id="Disable (keep overrides)" xml:space="preserve" approved="no">
+        <source>Disable (keep overrides)</source>
+        <target state="translated">تعطيل (الاحتفاظ بالتجاوزات)</target>
+      </trans-unit>
+      <trans-unit id="Disappears at: %@" xml:space="preserve" approved="no">
+        <source>Disappears at: %@</source>
+        <target state="translated">يختفي عند: %@</target>
+      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve" approved="no">
+        <source>Do not send history to new members.</source>
+        <target state="translated">لا ترسل التاريخ إلى الأعضاء الجدد.</target>
+      </trans-unit>
+      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve" approved="no">
+        <source>Encryption re-negotiation failed.</source>
+        <target state="translated">فشل إعادة التفاوض على التشفير.</target>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ar" datatype="plaintext">
@@ -3925,4 +5805,80 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
     </body>
   </file>
+  <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="ar" datatype="plaintext">
+    <body>
+      <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve" approved="no">
+        <source>You can allow sharing in Privacy &amp; Security / SimpleX Lock settings.</source>
+        <target state="needs-translation">يمكنك السماح بالمشاركة في إعدادات الخصوصية والأمان / اعدادات "SimpleX Lock"</target>
+      </trans-unit>
+      <trans-unit id="Keychain error" xml:space="preserve" approved="no">
+        <source>Keychain error</source>
+        <target state="translated">خطأ في Keychain</target>
+      </trans-unit>
+      <trans-unit id="Invalid migration confirmation" xml:space="preserve" approved="no">
+        <source>Invalid migration confirmation</source>
+        <target state="translated">تأكيد الترحيل غير صالح</target>
+      </trans-unit>
+      <trans-unit id="%@" xml:space="preserve" approved="no">
+        <source>%@</source>
+        <target state="translated">%@</target>
+      </trans-unit>
+      <trans-unit id="Share" xml:space="preserve" approved="no">
+        <source>Share</source>
+        <target state="translated">مشاركة</target>
+      </trans-unit>
+      <trans-unit id="Incompatible database version" xml:space="preserve" approved="no">
+        <source>Incompatible database version</source>
+        <target state="translated">إصدار قاعدة بيانات غير متوافق</target>
+      </trans-unit>
+      <trans-unit id="File error" xml:space="preserve" approved="no">
+        <source>File error</source>
+        <target state="translated">خطأ في الملف</target>
+      </trans-unit>
+      <trans-unit id="Database downgrade required" xml:space="preserve" approved="no">
+        <source>Database downgrade required</source>
+        <target state="translated">مطلوب الرجوع إلى إصدار سابق من قاعدة البيانات‎</target>
+      </trans-unit>
+      <trans-unit id="Database encrypted!" xml:space="preserve" approved="no">
+        <source>Database encrypted!</source>
+        <target state="translated">قاعدة البيانات مُعمّاة!</target>
+      </trans-unit>
+      <trans-unit id="Wrong database passphrase" xml:space="preserve" approved="no">
+        <source>Wrong database passphrase</source>
+        <target state="translated">عبارة مرور قاعدة بيانات خاطئة</target>
+      </trans-unit>
+      <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve" approved="no">
+        <source>Selected chat preferences prohibit this message.</source>
+        <target state="translated">تفضيلات الدردشة المحدّدة تحظر هذه الرسالة.</target>
+      </trans-unit>
+      <trans-unit id="Database error" xml:space="preserve" approved="no">
+        <source>Database error</source>
+        <target state="translated">خطأ في قاعدة البيانات</target>
+      </trans-unit>
+      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve" approved="no">
+        <source>Database passphrase is required to open chat.</source>
+        <target state="translated">عبارة مرور قاعدة البيانات مطلوبة لفتح الدردشة.</target>
+      </trans-unit>
+      <trans-unit id="Error: %@" xml:space="preserve" approved="no">
+        <source>Error: %@</source>
+        <target state="translated">خطأ: %@</target>
+      </trans-unit>
+      <trans-unit id="Cancel" xml:space="preserve" approved="no">
+        <source>Cancel</source>
+        <target state="translated">إلغاء</target>
+      </trans-unit>
+      <trans-unit id="Large file!" xml:space="preserve" approved="no">
+        <source>Large file!</source>
+        <target state="translated">الملف كبير!</target>
+      </trans-unit>
+    </body>
+  </file>
+  <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="ar" datatype="plaintext">
+    <body>
+      <trans-unit id="From: %@" xml:space="preserve" approved="no">
+        <source>From: %@</source>
+        <target state="translated">من: %@</target>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff
index 4aa1f2213f..b5a217d8c0 100644
--- a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
+++ b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (може да се копира)</target>
@@ -132,6 +120,7 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
+        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -194,6 +183,10 @@
         <target>%d сек.</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d пропуснато(и) съобщение(я)</target>
@@ -264,11 +257,6 @@
         <target>%lld нови езици на интерфейса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld секунда(и)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld секунди</target>
@@ -319,11 +307,6 @@
         <target>%u пропуснати съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(ново)</target>
@@ -334,11 +317,6 @@
         <target>(това устройство v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Добави контакт**: за създаване на нов линк.</target>
@@ -403,11 +381,6 @@
         <target>\*удебелен*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -444,11 +417,6 @@
 - история на редактиране.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 сек</target>
@@ -462,7 +430,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 ден</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -477,15 +446,22 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 месец</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 седмица</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>Еднократен линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
@@ -507,11 +483,6 @@
         <target>30 секунди</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -568,21 +539,32 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>За операторите</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
         <source>Accent</source>
+        <target>Акцент</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept" xml:space="preserve">
         <source>Accept</source>
         <target>Приеми</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
+        <target>Приеми условията</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
@@ -599,22 +581,34 @@
         <source>Accept incognito</source>
         <target>Приеми инкогнито</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
+        <target>Приети условия</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
         <source>Acknowledged</source>
+        <target>Потвърден</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledgement errors" xml:space="preserve">
         <source>Acknowledgement errors</source>
+        <target>Грешки при потвърждението</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
+        <target>Активни връзки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
@@ -624,6 +618,11 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>Добави приятели</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -643,6 +642,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>Добави членове на екипа</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -650,6 +650,10 @@
         <target>Добави към друго устройство</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Добави съобщение при посрещане</target>
@@ -657,26 +661,32 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>Добавете членовете на вашия екип към разговорите.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>Добавени медийни и файлови сървъри</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>Добавени сървъри за съобщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
         <source>Additional accent</source>
+        <target>Допълнителен акцент</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent 2" xml:space="preserve">
         <source>Additional accent 2</source>
+        <target>Допълнителен акцент 2</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional secondary" xml:space="preserve">
         <source>Additional secondary</source>
+        <target>Допълнителен вторичен</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address" xml:space="preserve">
@@ -691,10 +701,12 @@
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
+        <target>Адрес или еднократен линк?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
+        <target>Настройки на адреса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -714,6 +726,11 @@
       </trans-unit>
       <trans-unit id="Advanced settings" xml:space="preserve">
         <source>Advanced settings</source>
+        <target>Разширени настройки</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
@@ -726,6 +743,10 @@
         <target>Всички чатове и съобщения ще бъдат изтрити - това не може да бъде отменено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Всички данни се изтриват при въвеждане.</target>
@@ -733,6 +754,7 @@
       </trans-unit>
       <trans-unit id="All data is kept private on your device." xml:space="preserve">
         <source>All data is kept private on your device.</source>
+        <target>Всички данни се съхраняват поверително на вашето устройство.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -761,8 +783,17 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
+        <target>Всички профили</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Всички ваши контакти ще останат свързани.</target>
@@ -790,6 +821,7 @@
       </trans-unit>
       <trans-unit id="Allow calls?" xml:space="preserve">
         <source>Allow calls?</source>
+        <target>Позволи обаждания?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
@@ -799,6 +831,7 @@
       </trans-unit>
       <trans-unit id="Allow downgrade" xml:space="preserve">
         <source>Allow downgrade</source>
+        <target>Позволи понижаване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
@@ -828,6 +861,7 @@
       </trans-unit>
       <trans-unit id="Allow sharing" xml:space="preserve">
         <source>Allow sharing</source>
+        <target>Позволи споделяне</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -835,6 +869,10 @@
         <target>Позволи необратимо изтриване на изпратените съобщения. (24 часа)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
         <target>Разрешаване на изпращане на SimpleX линкове.</target>
@@ -902,6 +940,7 @@
       </trans-unit>
       <trans-unit id="Always use private routing." xml:space="preserve">
         <source>Always use private routing.</source>
+        <target>Винаги използвай поверително рутиране.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
@@ -914,6 +953,10 @@
         <target>Създаен беше празен профил за чат с предоставеното име и приложението се отвари както обикновено.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Отговор на повикване</target>
@@ -939,6 +982,10 @@
         <target>Приложението криптира нови локални файлове (с изключение на видеоклипове).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Икона на приложението</target>
@@ -956,6 +1003,7 @@
       </trans-unit>
       <trans-unit id="App session" xml:space="preserve">
         <source>App session</source>
+        <target>Сесия на приложението</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
@@ -980,6 +1028,19 @@
       </trans-unit>
       <trans-unit id="Apply to" xml:space="preserve">
         <source>Apply to</source>
+        <target>Приложи към</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
@@ -989,10 +1050,24 @@
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
+        <target>Архивирайте контактите, за да разговаряте по-късно.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
+        <target>Архивирани контакти</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
@@ -1062,6 +1137,7 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
+        <target>Автоматично приемане на настройки</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1071,6 +1147,7 @@
       </trans-unit>
       <trans-unit id="Background" xml:space="preserve">
         <source>Background</source>
+        <target>Фон</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Bad desktop address" xml:space="preserve">
@@ -1090,6 +1167,7 @@
       </trans-unit>
       <trans-unit id="Better calls" xml:space="preserve">
         <source>Better calls</source>
+        <target>По-добри обаждания</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,8 +1175,13 @@
         <target>По-добри групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
+        <target>По-добри дати на съобщението.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
@@ -1108,22 +1191,31 @@
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
         <source>Better networking</source>
+        <target>Подобрена мрежа</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better notifications" xml:space="preserve">
         <source>Better notifications</source>
+        <target>Подобрени известия</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
+        <target>По-добра сигурност ✅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better user experience" xml:space="preserve">
         <source>Better user experience</source>
+        <target>Подобрен интерфейс</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
+        <target>Черна</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block" xml:space="preserve">
@@ -1163,10 +1255,12 @@
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
         <source>Blur for better privacy.</source>
+        <target>Размазване за по-добра поверителност.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
         <source>Blur media</source>
+        <target>Размазване на медия</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -1201,10 +1295,16 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>Бизнес адрес</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>Бизнес чатове</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1212,6 +1312,12 @@
         <target>Чрез чат профил (по подразбиране) или [чрез връзка](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Разговорът вече приключи!</target>
@@ -1224,6 +1330,7 @@
       </trans-unit>
       <trans-unit id="Calls prohibited!" xml:space="preserve">
         <source>Calls prohibited!</source>
+        <target>Обажданията са забранени!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Camera not available" xml:space="preserve">
@@ -1233,10 +1340,12 @@
       </trans-unit>
       <trans-unit id="Can't call contact" xml:space="preserve">
         <source>Can't call contact</source>
+        <target>Обаждането на контакта не е позволено</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't call member" xml:space="preserve">
         <source>Can't call member</source>
+        <target>Обаждането на члена не е позволено</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1257,7 +1366,7 @@
         <source>Cancel</source>
         <target>Отказ</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1280,6 +1389,7 @@
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <target>Капацитетът е надвишен - получателят не е получил предишно изпратените съобщения.</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
@@ -1292,8 +1402,13 @@
         <target>Промени</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
+        <target>Промени чат профилите</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
@@ -1340,7 +1455,7 @@
         <source>Change self-destruct passcode</source>
         <target>Промени кода за достъп за самоунищожение</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1365,7 +1480,7 @@
       </trans-unit>
       <trans-unit id="Chat database" xml:space="preserve">
         <source>Chat database</source>
-        <target>База данни за чата</target>
+        <target>База данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database deleted" xml:space="preserve">
@@ -1379,7 +1494,7 @@
       </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
-        <target>Базата данни на чат е импортирана</target>
+        <target>Базата данни на е импортирана</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat is running" xml:space="preserve">
@@ -1432,11 +1547,23 @@
         <source>Chat will be deleted for you - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Чатове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <note>No comment provided by engineer.</note>
@@ -1497,6 +1624,14 @@
         <target>Изчисти разговора?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Изчистване на лични бележки?</target>
@@ -1515,6 +1650,10 @@
         <source>Color mode</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Сравни файл</target>
@@ -1545,14 +1684,6 @@
         <source>Conditions of use</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <note>No comment provided by engineer.</note>
@@ -1570,6 +1701,10 @@
         <target>Конфигурирай ICE сървъри</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Потвърди</target>
@@ -1618,6 +1753,10 @@
         <target>Потвърди качването</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Свързване</target>
@@ -1731,6 +1870,10 @@ This is your own one-time link!</source>
         <source>Connection and servers status.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Грешка при свързване</target>
@@ -1741,6 +1884,15 @@ This is your own one-time link!</source>
         <target>Грешка при свързване (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <note>No comment provided by engineer.</note>
@@ -1750,6 +1902,10 @@ This is your own one-time link!</source>
         <target>Заявката за връзка е изпратена!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1824,6 +1980,10 @@ This is your own one-time link!</source>
         <target>Контактите могат да маркират съобщения за изтриване; ще можете да ги разглеждате.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Продължи</target>
@@ -1858,31 +2018,32 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
         <source>Create</source>
-        <target>Създай</target>
+        <target>Създаване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create 1-time link" xml:space="preserve">
         <source>Create 1-time link</source>
+        <target>Създаване на еднократна препратка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
         <source>Create SimpleX address</source>
-        <target>Създай SimpleX адрес</target>
+        <target>Създаване на адрес в SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create a group using a random profile." xml:space="preserve">
         <source>Create a group using a random profile.</source>
-        <target>Създай група с автоматично генериран профилл.</target>
+        <target>Създаване група с автоматично създаден профил.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create file" xml:space="preserve">
         <source>Create file</source>
-        <target>Създай файл</target>
+        <target>Създаване на файл</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Create group" xml:space="preserve">
         <source>Create group</source>
-        <target>Създай група</target>
+        <target>Създаване на група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
@@ -1895,6 +2056,10 @@ This is your own one-time link!</source>
         <target>Създай линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Създайте нов профил в [настолното приложение](https://simplex.chat/downloads/). 💻</target>
@@ -2105,8 +2270,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Изтрий</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2146,6 +2310,10 @@ This is your own one-time link!</source>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Изтрий чат профила</target>
@@ -2156,6 +2324,10 @@ This is your own one-time link!</source>
         <target>Изтриване на чат профила?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2234,6 +2406,10 @@ This is your own one-time link!</source>
         <target>Изтрий линк?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Изтрий съобщението на члена?</target>
@@ -2247,7 +2423,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Изтрий съобщенията</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2283,6 +2459,10 @@ This is your own one-time link!</source>
         <target>Изтрий опашка</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <note>No comment provided by engineer.</note>
@@ -2431,6 +2611,14 @@ This is your own one-time link!</source>
         <target>Деактивирай SimpleX заключване</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Деактивиране за всички</target>
@@ -2517,6 +2705,10 @@ This is your own one-time link!</source>
         <source>Do not use credentials with proxy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Не създавай адрес</target>
@@ -2527,9 +2719,17 @@ This is your own one-time link!</source>
         <target>Не активирай</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Не показвай отново</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2541,7 +2741,7 @@ This is your own one-time link!</source>
         <source>Download</source>
         <target>Изтегли</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2613,8 +2813,8 @@ This is your own one-time link!</source>
         <target>Активиране (запазване на промените)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2630,7 +2830,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Активиране на автоматично изтриване на съобщения?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2756,6 +2956,10 @@ This is your own one-time link!</source>
         <target>Неуспешно повторно договаряне на криптирането.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Въведете kодa за достъп</target>
@@ -2830,6 +3034,10 @@ This is your own one-time link!</source>
         <target>Грешка при приемане на заявка за контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Грешка при добавяне на член(ове)</target>
@@ -2862,6 +3070,10 @@ This is your own one-time link!</source>
         <source>Error changing to incognito!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2881,6 +3093,10 @@ This is your own one-time link!</source>
         <target>Грешка при създаване на групов линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Грешка при създаване на контакт с член</target>
@@ -2896,6 +3112,10 @@ This is your own one-time link!</source>
         <target>Грешка при създаване на профил!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Грешка при декриптирането на файла</target>
@@ -2903,9 +3123,13 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
-        <target>Грешка при изтриване на чат базата данни</target>
+        <target>Грешка при изтриване на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Грешка при изтриването на чата!</target>
@@ -2958,7 +3182,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error exporting chat database" xml:space="preserve">
         <source>Error exporting chat database</source>
-        <target>Грешка при експортиране на чат базата данни</target>
+        <target>Грешка при експортиране на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error exporting theme: %@" xml:space="preserve">
@@ -2967,7 +3191,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error importing chat database" xml:space="preserve">
         <source>Error importing chat database</source>
-        <target>Грешка при импортиране на чат базата данни</target>
+        <target>Грешка при импортиране на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error joining group" xml:space="preserve">
@@ -3001,10 +3225,18 @@ This is your own one-time link!</source>
         <source>Error reconnecting servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Грешка при отстраняване на член</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3015,6 +3247,10 @@ This is your own one-time link!</source>
         <target>Грешка при запазване на ICE сървърите</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Грешка при запазване на профила на групата</target>
@@ -3093,6 +3329,10 @@ This is your own one-time link!</source>
         <target>Грешка при синхронизиране на връзката</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Грешка при актуализиране на груповия линк</target>
@@ -3135,7 +3375,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Грешка: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3170,6 +3412,10 @@ This is your own one-time link!</source>
         <target>Разшири</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Експортирай база данни</target>
@@ -3209,25 +3455,42 @@ This is your own one-time link!</source>
         <target>Бързо и без чакане, докато подателят е онлайн!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>По-бързо присъединяване и по-надеждни съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Любим</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3348,6 +3611,10 @@ This is your own one-time link!</source>
         <target>Поправката не се поддържа от члена на групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3361,6 +3628,10 @@ This is your own one-time link!</source>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3471,6 +3742,10 @@ Error: %2$@</source>
         <target>GIF файлове и стикери</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <note>message preview</note>
@@ -3574,11 +3849,19 @@ Error: %2$@</source>
         <target>Групата ще бъде изтрита за вас - това не може да бъде отменено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Помощ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Скрит</target>
@@ -3637,6 +3920,10 @@ Error: %2$@</source>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Информация</target>
@@ -3718,7 +4005,7 @@ Error: %2$@</source>
       </trans-unit>
       <trans-unit id="Import chat database?" xml:space="preserve">
         <source>Import chat database?</source>
-        <target>Импортиране на чат база данни?</target>
+        <target>Импортиране на база данни?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Import database" xml:space="preserve">
@@ -3775,6 +4062,14 @@ More improvements are coming soon!</source>
         <target>Звуци по време на разговор</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Инкогнито</target>
@@ -3866,6 +4161,26 @@ More improvements are coming soon!</source>
         <source>Interface colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Невалиден QR код</target>
@@ -4134,6 +4449,18 @@ This is your link for group %@!</source>
         <target>Запомнени настолни устройства</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Съобщение на живо!</target>
@@ -4217,10 +4544,18 @@ This is your link for group %@!</source>
         <target>Член</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4244,6 +4579,10 @@ This is your link for group %@!</source>
         <target>Членът ще бъде премахнат от групата - това не може да бъде отменено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Членовете на групата могат да добавят реакции към съобщенията.</target>
@@ -4254,6 +4593,10 @@ This is your link for group %@!</source>
         <target>Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Членовете на групата могат да изпращат SimpleX линкове.</target>
@@ -4279,6 +4622,10 @@ This is your link for group %@!</source>
         <target>Членовете на групата могат да изпращат гласови съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <note>No comment provided by engineer.</note>
@@ -4379,6 +4726,10 @@ This is your link for group %@!</source>
         <target>Съобщенията от %@ ще бъдат показани!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <note>No comment provided by engineer.</note>
@@ -4476,6 +4827,10 @@ This is your link for group %@!</source>
         <target>Модерирано в: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Очаквайте скоро още подобрения!</target>
@@ -4503,7 +4858,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Без звук</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4552,6 +4911,10 @@ This is your link for group %@!</source>
         <target>Състояние на мрежата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Нов kод за достъп</target>
@@ -4612,6 +4975,10 @@ This is your link for group %@!</source>
         <target>Нова членска роля</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Ново съобщение</target>
@@ -4636,6 +5003,22 @@ This is your link for group %@!</source>
         <target>Приложението няма kод за достъп</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Няма избрани контакти</target>
@@ -4683,6 +5066,10 @@ This is your link for group %@!</source>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4731,6 +5118,14 @@ This is your link for group %@!</source>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Първата платформа без никакви потребителски идентификатори – поверителна по дизайн.</target>
@@ -4741,6 +5136,10 @@ This is your link for group %@!</source>
         <target>Несъвместим!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
@@ -4759,10 +5158,18 @@ This is your link for group %@!</source>
         <target>Известията са деактивирани!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4785,7 +5192,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ок</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4844,6 +5252,14 @@ Requires compatible VPN.</source>
         <target>Само собствениците на групата могат да активират гласови съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Само вие можете да добавяте реакции на съобщенията.</target>
@@ -4897,7 +5313,7 @@ Requires compatible VPN.</source>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Отвори</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -4927,6 +5343,10 @@ Requires compatible VPN.</source>
         <target>Отвори група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Отвори миграцията към друго устройство</target>
@@ -4973,6 +5393,10 @@ Requires compatible VPN.</source>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Други</target>
@@ -5156,6 +5580,22 @@ Error: %@</source>
         <target>Моля, съхранявайте паролата на сигурно място, НЯМА да можете да я промените, ако я загубите.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Полски интерфейс</target>
@@ -5202,16 +5642,28 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Поверителността преосмислена</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Поверителни имена на файлове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <note>No comment provided by engineer.</note>
@@ -5282,6 +5734,10 @@ Error: %@</source>
         <target>Забрани реакциите на съобщенията.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>Забранете изпращането на SimpleX линкове.</target>
@@ -5523,11 +5979,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Намалена консумация на батерията</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Отхвърляне</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5539,6 +6007,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Отхвърли заявката за контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Реле сървър се използва само ако е необходимо. Друга страна може да наблюдава вашия IP адрес.</target>
@@ -5622,6 +6094,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Отговори</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Задължително</target>
@@ -5706,9 +6222,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5756,13 +6276,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Запази</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Запази (и уведоми контактите)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Запази и уведоми контакта</target>
@@ -5787,6 +6311,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Запази профила на групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Запази паролата и отвори чата</target>
@@ -6014,6 +6542,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Изпращай известия</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Изпращайте въпроси и идеи</target>
@@ -6211,6 +6743,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Задай 1 ден</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Задай име на контакт…</target>
@@ -6230,6 +6766,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Задайте го вместо системната идентификация.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Задай kод за достъп</target>
@@ -6273,7 +6817,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Сподели</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6329,6 +6873,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Сподели с контактите</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Покажи QR код</target>
@@ -6422,6 +6970,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX адрес за контакт</target>
@@ -6516,6 +7068,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Някой</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Квадрат, кръг или нещо между тях.</target>
@@ -6599,6 +7156,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Спиране на чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <note>blur media</note>
@@ -6652,6 +7213,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Времето на изчакване за установяване на TCP връзка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6717,13 +7282,17 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Тестът е неуспешен на стъпка %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Тествай сървър</target>
@@ -6841,19 +7410,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Старата база данни не бе премахната по време на миграцията, тя може да бъде изтрита.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Профилът се споделя само с вашите контакти.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -6914,6 +7474,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Това действие не може да бъде отменено - съобщенията, изпратени и получени по-рано от избраното, ще бъдат изтрити. Може да отнеме няколко минути.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Това действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</target>
@@ -6959,10 +7523,18 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Това е вашят еднократен линк за връзка!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Тази настройка се прилага за съобщения в текущия ви профил **%@**.</target>
@@ -7066,6 +7638,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Избор на инкогнито при свързване.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <note>No comment provided by engineer.</note>
@@ -7226,13 +7802,17 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Уведомявай</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Непрочетено</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>На новите членове се изпращат до последните 100 съобщения.</target>
@@ -7257,6 +7837,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Актуализирането на настройките ще свърже отново клиента към всички сървъри.</target>
@@ -7312,6 +7896,14 @@ To connect, please ask your contact to create another connection link and check
         <target>Използвай сървърите на SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Използвай чата</target>
@@ -7372,6 +7964,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>Използвайте приложението по време на разговора.</target>
@@ -7381,6 +7977,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
@@ -7738,10 +8338,6 @@ Repeat join request?</source>
         <source>You can change it in Appearance settings.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -7828,6 +8424,10 @@ Repeat join request?</source>
         <target>Можете да видите отново линкът за покана в подробностите за връзката.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Не може да изпращате съобщения!</target>
@@ -7907,6 +8507,10 @@ Repeat connection request?</source>
         <target>Изпратихте покана за групата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Ще бъдете свързани с групата, когато устройството на домакина на групата е онлайн, моля, изчакайте или проверете по-късно!</target>
@@ -7971,14 +8575,9 @@ Repeat connection request?</source>
         <target>Вашите ICE сървъри</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Вашите SMP сървъри</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
-        <target>Вашият SimpleX адрес</target>
+        <target>Вашият адрес в SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your calls" xml:space="preserve">
@@ -7988,12 +8587,12 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your chat database" xml:space="preserve">
         <source>Your chat database</source>
-        <target>Вашата чат база данни</target>
+        <target>Вашата база данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat database is not encrypted - set passphrase to encrypt it." xml:space="preserve">
         <source>Your chat database is not encrypted - set passphrase to encrypt it.</source>
-        <target>Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.</target>
+        <target>Вашата база данни не е криптирана - задайте парола, за да я криптирате.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
@@ -8030,7 +8629,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
-        <target>Вашата текуща чат база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.</target>
+        <target>Вашата текуща база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your current profile" xml:space="preserve">
@@ -8058,6 +8657,11 @@ Repeat connection request?</source>
         <target>Вашият профил **%@** ще бъде споделен.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Профилът се споделя само с вашите контакти.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти. SimpleX сървърите не могат да видят вашия профил.</target>
@@ -8067,11 +8671,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Вашият профил, контакти и доставени съобщения се съхраняват на вашето устройство.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Вашият автоматично генериран профил</target>
@@ -8121,6 +8720,10 @@ Repeat connection request?</source>
         <target>по-горе, след това избери:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>обаждането прието</target>
@@ -8130,6 +8733,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>админ</target>
@@ -8150,6 +8757,10 @@ Repeat connection request?</source>
         <target>съгласуване на криптиране…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>всички членове</target>
@@ -8165,6 +8776,10 @@ Repeat connection request?</source>
         <target>и %lld други събития</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <note>No comment provided by engineer.</note>
@@ -8202,7 +8817,8 @@ Repeat connection request?</source>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>блокиран от админ</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8228,6 +8844,10 @@ Repeat connection request?</source>
         <target>повикване…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>отменен %@</target>
@@ -8333,6 +8953,14 @@ Repeat connection request?</source>
         <target>името на контакта %1$@ е променено на %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>контактът има e2e криптиране</target>
@@ -8343,6 +8971,10 @@ Repeat connection request?</source>
         <target>контактът няма e2e криптиране</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>създател</target>
@@ -8370,7 +9002,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>по подразбиране (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8394,7 +9027,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
-        <target>групата изтрита</target>
+        <target>групата е изтрита</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="different migration in the app/database: %@ / %@" xml:space="preserve">
@@ -8496,19 +9129,10 @@ Repeat connection request?</source>
         <target>грешка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>събитие се случи</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>препратено</target>
@@ -8519,6 +9143,10 @@ Repeat connection request?</source>
         <target>групата е изтрита</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>профилът на групата е актуализиран</target>
@@ -8642,6 +9270,10 @@ Repeat connection request?</source>
         <target>свързан</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <note>No comment provided by engineer.</note>
@@ -8671,19 +9303,19 @@ Repeat connection request?</source>
         <target>модерирано от %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>месеци</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>никога</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8705,6 +9337,10 @@ Repeat connection request?</source>
         <target>няма текст</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>наблюдател</target>
@@ -8714,8 +9350,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>изключено</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -8755,6 +9392,18 @@ Repeat connection request?</source>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>квантово устойчиво e2e криптиране</target>
@@ -8770,6 +9419,10 @@ Repeat connection request?</source>
         <target>получено потвърждение…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>отхвърлено повикване</target>
@@ -8790,6 +9443,10 @@ Repeat connection request?</source>
         <target>премахнат адрес за контакт</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>премахната профилна снимка</target>
@@ -8800,10 +9457,22 @@ Repeat connection request?</source>
         <target>ви острани</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>запазено</target>
@@ -8898,10 +9567,6 @@ last received msg: %2$@</source>
         <target>неизвестен статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <note>No comment provided by engineer.</note>
@@ -8989,6 +9654,10 @@ last received msg: %2$@</source>
         <target>вие</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>вие сте поканени в групата</target>
@@ -9063,7 +9732,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9100,7 +9769,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9122,13 +9791,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -9141,15 +9814,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9168,7 +9837,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="bg" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/contents.json b/apps/ios/SimpleX Localizations/bg.xcloc/contents.json
index 5356e25a2e..66d64e6539 100644
--- a/apps/ios/SimpleX Localizations/bg.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/bg.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "bg",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/bn.xcloc/Localized Contents/bn.xliff b/apps/ios/SimpleX Localizations/bn.xcloc/Localized Contents/bn.xliff
index 7002f790df..bf7753675e 100644
--- a/apps/ios/SimpleX Localizations/bn.xcloc/Localized Contents/bn.xliff	
+++ b/apps/ios/SimpleX Localizations/bn.xcloc/Localized Contents/bn.xliff	
@@ -3422,8 +3422,8 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff
index 668888c20e..fe0e02ccdf 100644
--- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
+++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (lze kopírovat)</target>
@@ -94,6 +82,7 @@
       </trans-unit>
       <trans-unit id="%@ downloaded" xml:space="preserve">
         <source>%@ downloaded</source>
+        <target>%@ staženo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -113,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>%@ server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>%@ servery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -130,6 +121,7 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
+        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -153,18 +145,22 @@
       </trans-unit>
       <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
         <source>%d file(s) are still being downloaded.</source>
+        <target>%d soubor(y) stále stahován(y).</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) failed to download." xml:space="preserve">
         <source>%d file(s) failed to download.</source>
+        <target>%d soubor(y) se nepodařilo stáhnout.</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were deleted." xml:space="preserve">
         <source>%d file(s) were deleted.</source>
+        <target>%d soubor(y) smazán(y).</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
         <source>%d file(s) were not downloaded.</source>
+        <target>%d soubor(y) nestažen(y).</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
@@ -191,6 +187,10 @@
         <target>%d sek</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d přeskočené zprávy</target>
@@ -232,14 +232,17 @@
       </trans-unit>
       <trans-unit id="%lld messages blocked" xml:space="preserve">
         <source>%lld messages blocked</source>
+        <target>%lld zprávy blokovaný</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages blocked by admin" xml:space="preserve">
         <source>%lld messages blocked by admin</source>
+        <target>%lld zprávy blokovaný adminem</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages marked deleted" xml:space="preserve">
         <source>%lld messages marked deleted</source>
+        <target>%lld zprávy označeno jako smazáno</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
@@ -256,11 +259,6 @@
         <target>%d nové jazyky rozhraní</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld vteřin</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld vteřin</target>
@@ -311,22 +309,13 @@
         <target>%u zpráv přeskočeno.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="(this device v%@)" xml:space="preserve">
         <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
+        <target>(toto zařízení v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
@@ -389,11 +378,6 @@
         <target>\*tučně*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -427,11 +411,6 @@
 - historie úprav.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <note>time to disappear</note>
@@ -444,7 +423,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 den</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -459,12 +439,18 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 měsíc</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 týden</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -489,11 +475,6 @@
         <target>30 vteřin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -560,8 +541,16 @@
         <source>Accept</source>
         <target>Přijmout</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -581,7 +570,11 @@
         <source>Accept incognito</source>
         <target>Přijmout inkognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -595,6 +588,10 @@
         <source>Acknowledgement errors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <note>No comment provided by engineer.</note>
@@ -608,6 +605,10 @@
         <source>Add friends</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Přidat profil</target>
@@ -632,6 +633,10 @@
         <target>Přidat do jiného zařízení</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Přidat uvítací zprávu</target>
@@ -697,6 +702,10 @@
         <source>Advanced settings</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Všechna data aplikace jsou smazána.</target>
@@ -707,6 +716,10 @@
         <target>Všechny chaty a zprávy budou smazány – tuto akci nelze vrátit zpět!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Všechna data se při zadání vymažou.</target>
@@ -742,6 +755,14 @@
         <source>All profiles</source>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Všechny vaše kontakty zůstanou připojeny.</target>
@@ -813,6 +834,10 @@
         <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 report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
@@ -889,6 +914,10 @@
         <target>Vytvořit prázdný chat profil se zadaným názvem a otevřít aplikaci jako obvykle.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Přijmout hovor</target>
@@ -913,6 +942,10 @@
         <target>Aplikace šifruje nové místní soubory (s výjimkou videí).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Ikona aplikace</target>
@@ -955,6 +988,18 @@
         <source>Apply to</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</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>
@@ -963,6 +1008,18 @@
         <source>Archive contacts to chat later.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <note>No comment provided by engineer.</note>
@@ -1066,6 +1123,10 @@
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <note>No comment provided by engineer.</note>
@@ -1083,6 +1144,10 @@
         <source>Better notifications</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <note>No comment provided by engineer.</note>
@@ -1169,11 +1234,21 @@
         <source>Business chats</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Podle chat profilu (výchozí) nebo [podle připojení](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Hovor již skončil!</target>
@@ -1218,7 +1293,7 @@
         <source>Cancel</source>
         <target>Zrušit</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1251,6 +1326,10 @@
         <target>Změnit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <note>authentication reason</note>
@@ -1299,7 +1378,7 @@
         <source>Change self-destruct passcode</source>
         <target>Změnit sebedestrukční heslo</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1389,11 +1468,23 @@
         <source>Chat will be deleted for you - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Chaty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <note>No comment provided by engineer.</note>
@@ -1453,6 +1544,14 @@
         <target>Vyčistit konverzaci?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <note>No comment provided by engineer.</note>
@@ -1470,6 +1569,10 @@
         <source>Color mode</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Porovnat soubor</target>
@@ -1500,14 +1603,6 @@
         <source>Conditions of use</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <note>No comment provided by engineer.</note>
@@ -1525,6 +1620,10 @@
         <target>Konfigurace serverů ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Potvrdit</target>
@@ -1570,6 +1669,10 @@
         <source>Confirm upload</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Připojit</target>
@@ -1671,6 +1774,10 @@ This is your own one-time link!</source>
         <source>Connection and servers status.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Chyba připojení</target>
@@ -1681,6 +1788,15 @@ This is your own one-time link!</source>
         <target>Chyba spojení (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <note>No comment provided by engineer.</note>
@@ -1690,6 +1806,10 @@ This is your own one-time link!</source>
         <target>Požadavek na připojení byl odeslán!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1763,6 +1883,10 @@ This is your own one-time link!</source>
         <target>Kontakty mohou označit zprávy ke smazání; vy je budete moci zobrazit.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Pokračovat</target>
@@ -1831,6 +1955,10 @@ This is your own one-time link!</source>
         <target>Vytvořit odkaz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Vytvořit nový profil v [desktop app](https://simplex.chat/downloads/). 💻</target>
@@ -1838,6 +1966,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create profile" xml:space="preserve">
         <source>Create profile</source>
+        <target>Vytvořte si profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -2036,8 +2165,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Smazat</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2075,6 +2203,10 @@ This is your own one-time link!</source>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Smazat chat profil</target>
@@ -2085,6 +2217,10 @@ This is your own one-time link!</source>
         <target>Smazat chat profil?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2162,6 +2298,10 @@ This is your own one-time link!</source>
         <target>Smazat odkaz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Smazat zprávu člena?</target>
@@ -2175,7 +2315,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Smazat zprávy</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2211,6 +2351,10 @@ This is your own one-time link!</source>
         <target>Odstranit frontu</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <note>No comment provided by engineer.</note>
@@ -2356,6 +2500,14 @@ This is your own one-time link!</source>
         <target>Vypnutí zámku SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Vypnout pro všechny</target>
@@ -2439,6 +2591,10 @@ This is your own one-time link!</source>
         <source>Do not use credentials with proxy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Nevytvářet adresu</target>
@@ -2449,9 +2605,17 @@ This is your own one-time link!</source>
         <target>Nepovolovat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Znovu neukazuj</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2462,7 +2626,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2531,8 +2695,8 @@ This is your own one-time link!</source>
         <target>Povolit (zachovat přepsání)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2548,7 +2712,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Povolit automatické mazání zpráv?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2668,6 +2832,10 @@ This is your own one-time link!</source>
         <source>Encryption re-negotiation failed.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Zadat heslo</target>
@@ -2738,6 +2906,10 @@ This is your own one-time link!</source>
         <target>Chyba při přijímání žádosti o kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Chyba přidávání člena(ů)</target>
@@ -2770,6 +2942,10 @@ This is your own one-time link!</source>
         <source>Error changing to incognito!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2789,6 +2965,10 @@ This is your own one-time link!</source>
         <target>Chyba při vytváření odkazu skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Chyba vytvoření kontaktu člena</target>
@@ -2803,6 +2983,10 @@ This is your own one-time link!</source>
         <target>Chyba při vytváření profilu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Chyba dešifrování souboru</target>
@@ -2813,6 +2997,10 @@ This is your own one-time link!</source>
         <target>Chyba při mazání databáze chatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Chyba při mazání chatu!</target>
@@ -2906,10 +3094,18 @@ This is your own one-time link!</source>
         <source>Error reconnecting servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Chyba při odebrání člena</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -2920,6 +3116,10 @@ This is your own one-time link!</source>
         <target>Chyba při ukládání serverů ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Chyba při ukládání profilu skupiny</target>
@@ -2996,6 +3196,10 @@ This is your own one-time link!</source>
         <target>Chyba synchronizace připojení</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Chyba aktualizace odkazu skupiny</target>
@@ -3036,7 +3240,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Chyba: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3070,6 +3276,10 @@ This is your own one-time link!</source>
         <source>Expand</source>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Export databáze</target>
@@ -3108,24 +3318,41 @@ This is your own one-time link!</source>
         <target>Rychle a bez čekání, než bude odesílatel online!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Oblíbené</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3243,6 +3470,10 @@ This is your own one-time link!</source>
         <target>Opravit nepodporované členem skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3256,6 +3487,10 @@ This is your own one-time link!</source>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3360,6 +3595,10 @@ Error: %2$@</source>
         <target>GIFy a nálepky</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <note>message preview</note>
@@ -3461,11 +3700,19 @@ Error: %2$@</source>
         <target>Skupina bude smazána pro vás - toto nelze vzít zpět!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Pomoc</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Skryté</target>
@@ -3523,6 +3770,10 @@ Error: %2$@</source>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Jak</target>
@@ -3655,6 +3906,14 @@ More improvements are coming soon!</source>
         <source>In-call sounds</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Inkognito</target>
@@ -3744,6 +4003,26 @@ More improvements are coming soon!</source>
         <source>Interface colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <note>No comment provided by engineer.</note>
@@ -3995,6 +4274,18 @@ This is your link for group %@!</source>
         <source>Linked desktops</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Živé zprávy!</target>
@@ -4078,10 +4369,18 @@ This is your link for group %@!</source>
         <target>Člen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4105,6 +4404,10 @@ This is your link for group %@!</source>
         <target>Člen bude odstraněn ze skupiny - toto nelze vzít zpět!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Členové skupin mohou přidávat reakce na zprávy.</target>
@@ -4115,6 +4418,10 @@ This is your link for group %@!</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="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <note>No comment provided by engineer.</note>
@@ -4139,6 +4446,10 @@ This is your link for group %@!</source>
         <target>Členové skupiny mohou posílat hlasové zprávy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <note>No comment provided by engineer.</note>
@@ -4236,6 +4547,10 @@ 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 in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <note>No comment provided by engineer.</note>
@@ -4324,6 +4639,10 @@ This is your link for group %@!</source>
         <target>Upraveno v: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Další vylepšení se chystají již brzy!</target>
@@ -4350,7 +4669,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Ztlumit</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4397,6 +4720,10 @@ This is your link for group %@!</source>
         <target>Stav sítě</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Nové heslo</target>
@@ -4456,6 +4783,10 @@ This is your link for group %@!</source>
         <target>Nová role člena</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Nová zpráva</target>
@@ -4480,6 +4811,22 @@ This is your link for group %@!</source>
         <target>Žádné heslo aplikace</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Nebyl vybrán žádný kontakt</target>
@@ -4527,6 +4874,10 @@ This is your link for group %@!</source>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4574,6 +4925,14 @@ This is your link for group %@!</source>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Bez uživatelských identifikátorů</target>
@@ -4583,6 +4942,10 @@ This is your link for group %@!</source>
         <source>Not compatible!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
@@ -4601,10 +4964,18 @@ This is your link for group %@!</source>
         <target>Oznámení jsou zakázána!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4626,7 +4997,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4685,6 +5057,14 @@ Vyžaduje povolení sítě VPN.</target>
         <target>Pouze majitelé skupin mohou povolit zasílání hlasových zpráv.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Reakce na zprávy můžete přidávat pouze vy.</target>
@@ -4738,7 +5118,7 @@ Vyžaduje povolení sítě VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Otevřít</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -4767,6 +5147,10 @@ Vyžaduje povolení sítě VPN.</target>
         <source>Open group</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</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>
@@ -4807,6 +5191,10 @@ Vyžaduje povolení sítě VPN.</target>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</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>
@@ -4981,6 +5369,22 @@ Error: %@</source>
         <target>Heslo uložte bezpečně, v případě jeho ztráty jej NEBUDE možné změnit.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Polské rozhraní</target>
@@ -5027,16 +5431,28 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Nové vymezení soukromí</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Soukromé názvy souborů</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <note>No comment provided by engineer.</note>
@@ -5105,6 +5521,10 @@ Error: %@</source>
         <target>Zakázat reakce na zprávy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
@@ -5340,11 +5760,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Snížení spotřeby baterie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Odmítnout</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5356,6 +5788,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Odmítnout žádost o kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Přenosový server se používá pouze v případě potřeby. Jiná strana může sledovat vaši IP adresu.</target>
@@ -5434,6 +5870,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Odpověď</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Povinné</target>
@@ -5517,9 +5997,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5566,13 +6050,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Uložit</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Uložit (a informovat kontakty)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Uložit a upozornit kontakt</target>
@@ -5597,6 +6085,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Uložení profilu skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Uložte heslo a otevřete chat</target>
@@ -5818,6 +6310,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Odeslat oznámení</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Zasílání otázek a nápadů</target>
@@ -6013,6 +6509,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Nastavit 1 den</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Nastavení jména kontaktu…</target>
@@ -6032,6 +6532,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Nastavte jej namísto ověřování systému.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Nastavit heslo</target>
@@ -6073,7 +6581,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Sdílet</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6128,6 +6636,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Sdílet s kontakty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <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>
@@ -6220,6 +6732,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX kontaktní adresa</target>
@@ -6312,6 +6828,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Někdo</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</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>
@@ -6391,6 +6912,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Stopping chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <note>blur media</note>
@@ -6444,6 +6969,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Časový limit připojení TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6506,13 +7035,17 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test selhal v kroku %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Testovací server</target>
@@ -6629,19 +7162,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <target>Stará databáze nebyla během přenášení odstraněna, lze ji smazat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Profil je sdílen pouze s vašimi kontakty.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -6701,6 +7225,10 @@ 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 - zprávy odeslané a přijaté dříve, než bylo zvoleno, budou smazány. Může to trvat několik minut.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Tuto akci nelze vzít zpět - váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</target>
@@ -6740,10 +7268,18 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <source>This is your own one-time link!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Toto nastavení platí pro zprávy ve vašem aktuálním chat profilu **%@**.</target>
@@ -6846,6 +7382,10 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <target>Změnit inkognito režim při připojení.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <note>No comment provided by engineer.</note>
@@ -6998,13 +7538,17 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Zrušit ztlumení</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Nepřečtený</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <note>No comment provided by engineer.</note>
@@ -7028,6 +7572,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Aktualizací nastavení se klient znovu připojí ke všem serverům.</target>
@@ -7081,6 +7629,14 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Používat servery SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Použijte chat</target>
@@ -7139,6 +7695,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
@@ -7147,6 +7707,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
@@ -7478,10 +8042,6 @@ Repeat join request?</source>
         <source>You can change it in Appearance settings.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -7565,6 +8125,10 @@ Repeat join request?</source>
         <source>You can view invitation link again in connection details.</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Nemůžete posílat zprávy!</target>
@@ -7641,6 +8205,10 @@ Repeat connection request?</source>
         <target>Odeslali jste pozvánku do skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Ke skupině budete připojeni, až bude zařízení hostitele skupiny online, vyčkejte prosím nebo se podívejte později!</target>
@@ -7703,11 +8271,6 @@ Repeat connection request?</source>
         <target>Vaše servery ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Vaše servery SMP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Vaše SimpleX adresa</target>
@@ -7789,6 +8352,11 @@ Repeat connection request?</source>
         <target>Váš profil **%@** bude sdílen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Profil je sdílen pouze s vašimi kontakty.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty. Servery SimpleX nevidí váš profil.</target>
@@ -7798,11 +8366,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Váš náhodný profil</target>
@@ -7852,6 +8415,10 @@ Repeat connection request?</source>
         <target>výše, pak vyberte:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>přijatý hovor</target>
@@ -7861,6 +8428,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>správce</target>
@@ -7880,6 +8451,10 @@ Repeat connection request?</source>
         <target>povoluji šifrování…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <note>feature role</note>
@@ -7893,6 +8468,10 @@ Repeat connection request?</source>
         <source>and %lld other events</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <note>No comment provided by engineer.</note>
@@ -7926,7 +8505,8 @@ Repeat connection request?</source>
       </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
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -7952,6 +8532,10 @@ Repeat connection request?</source>
         <target>volání…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>zrušeno %@</target>
@@ -8056,6 +8640,14 @@ Repeat connection request?</source>
         <source>contact %1$@ changed to %2$@</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>kontakt má šifrování e2e</target>
@@ -8066,6 +8658,10 @@ Repeat connection request?</source>
         <target>kontakt nemá šifrování e2e</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>tvůrce</target>
@@ -8093,7 +8689,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>výchozí (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8218,18 +8815,10 @@ Repeat connection request?</source>
         <target>chyba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</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>
@@ -8239,6 +8828,10 @@ Repeat connection request?</source>
         <target>skupina smazána</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>profil skupiny aktualizován</target>
@@ -8361,6 +8954,10 @@ Repeat connection request?</source>
         <target>připojeno</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <note>No comment provided by engineer.</note>
@@ -8390,19 +8987,19 @@ Repeat connection request?</source>
         <target>moderovaný %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>měsíců</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>nikdy</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8424,6 +9021,10 @@ Repeat connection request?</source>
         <target>žádný text</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>pozorovatel</target>
@@ -8433,8 +9034,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>vypnuto</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -8473,6 +9075,18 @@ Repeat connection request?</source>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
@@ -8487,6 +9101,10 @@ Repeat connection request?</source>
         <target>obdržel potvrzení…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>odmítnutý hovor</target>
@@ -8506,6 +9124,10 @@ Repeat connection request?</source>
         <source>removed contact address</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <note>profile update event chat item</note>
@@ -8515,10 +9137,22 @@ Repeat connection request?</source>
         <target>odstranil vás</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <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>
@@ -8606,10 +9240,6 @@ last received msg: %2$@</source>
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <note>No comment provided by engineer.</note>
@@ -8694,6 +9324,10 @@ last received msg: %2$@</source>
         <source>you</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</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>
@@ -8766,7 +9400,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -8802,7 +9436,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8824,13 +9458,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -8843,15 +9481,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8870,7 +9504,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/contents.json b/apps/ios/SimpleX Localizations/cs.xcloc/contents.json
index aaa2ed1ee0..9cd5922c24 100644
--- a/apps/ios/SimpleX Localizations/cs.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/cs.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "cs",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
index e993740f1c..b2e404c141 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
+++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (kann kopiert werden)</target>
@@ -202,6 +190,11 @@
         <target>%d s</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d Sekunde(n)</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d übersprungene Nachricht(en)</target>
@@ -272,11 +265,6 @@
         <target>%lld neue Sprachen für die Bedienoberfläche</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld Sekunde(n)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld Sekunden</target>
@@ -327,11 +315,6 @@
         <target>%u übersprungene Nachrichten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(Neu)</target>
@@ -342,11 +325,6 @@
         <target>(Dieses Gerät hat v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Kontakt hinzufügen**: Um einen neuen Einladungslink zu erstellen.</target>
@@ -412,11 +390,6 @@
         <target>\*fett*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - Nachrichtenverlauf bearbeiten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sek</target>
@@ -470,8 +438,9 @@
       </trans-unit>
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
-        <target>täglich</target>
-        <note>time interval</note>
+        <target>Älter als ein Tag</target>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -485,13 +454,20 @@
       </trans-unit>
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
-        <target>monatlich</target>
-        <note>time interval</note>
+        <target>Älter als ein Monat</target>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
-        <target>wöchentlich</target>
-        <note>time interval</note>
+        <target>Älter als eine Woche</target>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>Älter als ein Jahr</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 Sekunden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -579,7 +550,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
-        <target>Über Betreiber</target>
+        <target>Über die Betreiber</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -591,8 +562,18 @@
         <source>Accept</source>
         <target>Annehmen</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <target>Als Mitglied übernehmen</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <target>Als Beobachter übernehmen</target>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -613,7 +594,12 @@
         <source>Accept incognito</source>
         <target>Inkognito akzeptieren</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <target>Mitglied übernehmen</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -630,6 +616,11 @@
         <target>Fehler bei der Bestätigung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Aktiv</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Aktive Verbindungen</target>
@@ -645,6 +636,11 @@
         <target>Freunde aufnehmen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Liste hinzufügen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Profil hinzufügen</target>
@@ -652,12 +648,12 @@
       </trans-unit>
       <trans-unit id="Add server" xml:space="preserve">
         <source>Add server</source>
-        <target>Füge Server hinzu</target>
+        <target>Server hinzufügen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add servers by scanning QR codes." xml:space="preserve">
         <source>Add servers by scanning QR codes.</source>
-        <target>Fügen Sie Server durch Scannen der QR Codes hinzu.</target>
+        <target>Server durch Scannen von QR Codes hinzufügen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
@@ -670,6 +666,11 @@
         <target>Einem anderen Gerät hinzufügen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Zur Liste hinzufügen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Begrüßungsmeldung hinzufügen</target>
@@ -745,6 +746,11 @@
         <target>Erweiterte Einstellungen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Alle</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Werden die App-Daten komplett gelöscht.</target>
@@ -755,6 +761,11 @@
         <target>Es werden alle Chats und Nachrichten gelöscht. Dies kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Alle Chats werden von der Liste %@ entfernt und danach wird die Liste gelöscht.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Alle Daten werden gelöscht, sobald dieser eingegeben wird.</target>
@@ -795,6 +806,16 @@
         <target>Alle Profile</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Alle Meldungen werden für Sie archiviert.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>Alle Server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Alle Ihre Kontakte bleiben verbunden.</target>
@@ -870,6 +891,11 @@
         <target>Unwiederbringliches löschen von gesendeten Nachrichten erlauben. (24 Stunden)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Melden von Nachrichten an Moderatoren erlauben.</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>
         <target>Das Senden von SimpleX-Links erlauben.</target>
@@ -950,6 +976,11 @@
         <target>Es wurde ein leeres Chat-Profil mit dem eingegebenen Namen erstellt und die App öffnet wie gewohnt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Anderer Grund</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Anruf annehmen</target>
@@ -975,6 +1006,11 @@
         <target>Neue lokale Dateien (außer Video-Dateien) werden von der App verschlüsselt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>App-Gruppe:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>App-Icon</target>
@@ -1020,6 +1056,21 @@
         <target>Anwenden auf</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archiv</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archiviere %lld Meldungen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Alle Meldungen archivieren?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archivieren und Hochladen</target>
@@ -1030,6 +1081,21 @@
         <target>Kontakte für spätere Chats archivieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Meldung archivieren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Meldung archivieren?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Meldungen archivieren</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Archivierte Kontakte</target>
@@ -1140,6 +1206,11 @@
         <target>Bessere Gruppen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Bessere Leistung von Gruppen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Verbesserte Nachrichten-Datumsinformation</target>
@@ -1160,6 +1231,11 @@
         <target>Verbesserte Benachrichtigungen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Bessere(r) Security und Datenschutz</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Verbesserte Sicherheit ✅</target>
@@ -1217,7 +1293,7 @@
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
         <source>Blur media</source>
-        <target>Medium unscharf machen</target>
+        <target>Medium verpixeln</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -1260,11 +1336,25 @@
         <target>Geschäftliche Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Unternehmen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Per Chat-Profil (Voreinstellung) oder [per Verbindung](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>Durch die Nutzung von SimpleX Chat erklären Sie sich damit einverstanden:
+- nur legale Inhalte in öffentlichen Gruppen zu versenden.
+- andere Nutzer zu respektieren - kein Spam.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Anruf ist bereits beendet!</target>
@@ -1314,7 +1404,7 @@
         <source>Cancel</source>
         <target>Abbrechen</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1351,6 +1441,11 @@
         <target>Ändern</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Automatisches Löschen von Nachrichten ändern?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Chat-Profile wechseln</target>
@@ -1400,7 +1495,7 @@
         <source>Change self-destruct passcode</source>
         <target>Selbstzerstörungs-Zugangscode ändern</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1502,11 +1597,26 @@
         <target>Der Chat wird für Sie gelöscht. Dies kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <target>Chat mit Administratoren</target>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <target>Chat mit einem Mitglied</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <target>Chats mit Mitgliedern</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Alle 20min Nachrichten überprüfen.</target>
@@ -1572,6 +1682,16 @@
         <target>Chat-Inhalte entfernen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Gruppe entfernen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Gruppe entfernen oder löschen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Private Notizen entfernen?</target>
@@ -1592,6 +1712,11 @@
         <target>Farbvariante</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Verstoß gegen die Gemeinschaftsrichtlinien</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Datei vergleichen</target>
@@ -1627,16 +1752,6 @@
         <target>Nutzungsbedingungen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Die Nutzungsbedingungen der aktivierten Betreiber werden nach 30 Tagen akzeptiert.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Die Nutzungsbedingungen der/des Betreiber(s) werden akzeptiert: **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Die Nutzungsbedingungen der/des Betreiber(s) werden akzeptiert: **%@**.</target>
@@ -1657,6 +1772,11 @@
         <target>ICE-Server konfigurieren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Server-Betreiber konfigurieren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Bestätigen</target>
@@ -1707,6 +1827,11 @@
         <target>Hochladen bestätigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Bestätigt</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Verbinden</target>
@@ -1826,6 +1951,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Verbindungs- und Server-Status.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Verbindung blockiert</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Verbindungsfehler</target>
@@ -1836,6 +1966,18 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Verbindungsfehler (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>Die Verbindung wurde vom Server-Betreiber blockiert:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Verbindung noch nicht bereit.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Verbindungsbenachrichtigungen</target>
@@ -1846,6 +1988,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Verbindungsanfrage wurde gesendet!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>Die Verbindung erfordert eine Neuverhandlung der Verschlüsselung.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Verbindungs-Sicherheit</target>
@@ -1926,6 +2073,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Ihre Kontakte können Nachrichten zum Löschen markieren. Sie können diese Nachrichten trotzdem anschauen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Inhalt verletzt Nutzungsbedingungen</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Weiter</target>
@@ -2001,6 +2153,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Link erzeugen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Liste erstellen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Neues Profil in der [Desktop-App] erstellen (https://simplex.chat/downloads/). 💻</target>
@@ -2068,7 +2225,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Current profile" xml:space="preserve">
         <source>Current profile</source>
-        <target>Aktueller Profil</target>
+        <target>Aktuelles Profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
@@ -2218,8 +2375,7 @@ Das ist Ihr eigener Einmal-Link!</target>
         <source>Delete</source>
         <target>Löschen</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2261,6 +2417,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Chat löschen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Chat-Nachrichten von Ihrem Gerät löschen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Chat-Profil löschen</target>
@@ -2271,6 +2432,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Chat-Profil löschen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <target>Chat mit dem Mitglied löschen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>Chat löschen?</target>
@@ -2351,6 +2517,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Link löschen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Liste löschen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Nachricht des Mitglieds löschen?</target>
@@ -2364,11 +2535,11 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Nachrichten löschen</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
-        <target>Löschen der Nachrichten</target>
+        <target>Nachrichten löschen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete old database" xml:space="preserve">
@@ -2401,6 +2572,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Lösche Warteschlange</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Meldung löschen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Löschen Sie bis zu 20 Nachrichten auf einmal.</target>
@@ -2561,6 +2737,16 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>SimpleX-Sperre deaktivieren</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Automatisches Löschen von Nachrichten deaktivieren?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Löschen von Nachrichten deaktivieren</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Für Alle deaktivieren</target>
@@ -2651,6 +2837,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Verwenden Sie keine Anmeldeinformationen mit einem Proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Dokumente:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Keine Adresse erstellt</target>
@@ -2661,9 +2852,19 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Nicht aktivieren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Verpassen Sie keine wichtigen Nachrichten.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Nicht nochmals anzeigen</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Fertig</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2876,7 @@ Das ist Ihr eigener Einmal-Link!</target>
         <source>Download</source>
         <target>Herunterladen</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2752,9 +2953,9 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Aktivieren (vorgenommene Einstellungen bleiben erhalten)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Flux aktivieren</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Für einen besseren Metadatenschutz Flux in den Netzwerk- und Servereinstellungen aktivieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2770,7 +2971,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Automatisches Löschen von Nachrichten aktivieren?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2897,6 +3098,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Neuverhandlung der Verschlüsselung fehlgeschlagen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Die Neuverhandlung der Verschlüsselung läuft.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Zugangscode eingeben</target>
@@ -2972,6 +3178,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Annehmen der Kontaktanfrage</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <target>Fehler beim Übernehmen des Mitglieds</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Fehler beim Hinzufügen von Mitgliedern</target>
@@ -3007,6 +3218,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Wechseln zum Inkognito-Profil!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Fehler beim Überprüfen des Token-Status</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Fehler beim Verbinden mit dem Weiterleitungsserver %@. Bitte versuchen Sie es später erneut.</target>
@@ -3027,6 +3243,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Erzeugen des Gruppen-Links</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Fehler beim Erstellen der Liste</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Fehler beim Anlegen eines Mitglied-Kontaktes</target>
@@ -3042,6 +3263,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Erstellen des Profils!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Fehler beim Erstellen der Meldung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Fehler beim Entschlüsseln der Datei</target>
@@ -3052,6 +3278,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Löschen der Chat-Datenbank</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <target>Fehler beim Löschen des Chats mit dem Mitglied</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Fehler beim Löschen des Chats!</target>
@@ -3139,7 +3370,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
-        <target>Fehler beim Empfangen der Datei</target>
+        <target>Fehler beim Herunterladen der Datei</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
@@ -3152,10 +3383,20 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Wiederherstellen der Verbindungen zu den Servern</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Fehler beim Registrieren für Benachrichtigungen</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Fehler beim Entfernen des Mitglieds</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Fehler beim Umsortieren der Listen</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3167,6 +3408,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Speichern der ICE-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Fehler beim Speichern der Chat-Liste</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Fehler beim Speichern des Gruppenprofils</target>
@@ -3247,6 +3493,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Synchronisieren der Verbindung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Fehler beim Testen der Server-Verbindung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Fehler beim Aktualisieren des Gruppen-Links</target>
@@ -3290,7 +3541,9 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fehler: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3580,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Erweitern</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Abgelaufen</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Datenbank exportieren</target>
@@ -3367,20 +3625,35 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Schnell und ohne warten auf den Absender, bis er online ist!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Schnelleres löschen von Gruppen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Schnelleres versenden von Nachrichten.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favorit</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Favoriten</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Datei-Fehler</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,6 +3662,13 @@ Das ist Ihr eigener Einmal-Link!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Datei wurde vom Server-Betreiber blockiert:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Datei nicht gefunden - höchstwahrscheinlich wurde die Datei gelöscht oder der Transfer abgebrochen.</target>
@@ -3416,12 +3696,12 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="File will be received when your contact completes uploading it." xml:space="preserve">
         <source>File will be received when your contact completes uploading it.</source>
-        <target>Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</target>
+        <target>Die Datei wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="File will be received when your contact is online, please wait or check later!" xml:space="preserve">
         <source>File will be received when your contact is online, please wait or check later!</source>
-        <target>Die Datei wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</target>
+        <target>Die Datei wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="File: %@" xml:space="preserve">
@@ -3514,6 +3794,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Reparatur wird vom Gruppenmitglied nicht unterstützt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Für alle Moderatoren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>Für das Chat-Profil %@:</target>
@@ -3529,6 +3814,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Wenn Ihr Kontakt beispielsweise Nachrichten über einen SimpleX-Chatserver empfängt, wird Ihre App diese über einen der Server von Flux versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>Für mich</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>Für privates Routing</target>
@@ -3653,6 +3943,11 @@ Fehler: %2$@</target>
         <target>GIFs und Sticker</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Bei Erwähnung benachrichtigt werden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Guten Nachmittag!</target>
@@ -3758,11 +4053,21 @@ Fehler: %2$@</target>
         <target>Die Gruppe wird nur bei Ihnen gelöscht. Dies kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Gruppen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Hilfe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Helfen Sie Administratoren bei der Moderation ihrer Gruppen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Verborgen</target>
@@ -3823,6 +4128,11 @@ Fehler: %2$@</target>
         <target>Wie es die Privatsphäre schützt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Wie es funktioniert</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Anleitung</target>
@@ -3880,12 +4190,12 @@ Fehler: %2$@</target>
       </trans-unit>
       <trans-unit id="Image will be received when your contact completes uploading it." xml:space="preserve">
         <source>Image will be received when your contact completes uploading it.</source>
-        <target>Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</target>
+        <target>Das Bild wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Image will be received when your contact is online, please wait or check later!" xml:space="preserve">
         <source>Image will be received when your contact is online, please wait or check later!</source>
-        <target>Das Bild wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</target>
+        <target>Das Bild wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Immediately" xml:space="preserve">
@@ -3965,6 +4275,16 @@ Weitere Verbesserungen sind bald verfügbar!</target>
         <target>Klingeltöne</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Unangemessener Inhalt</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Unangemessenes Profil</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Inkognito</target>
@@ -4057,6 +4377,31 @@ Weitere Verbesserungen sind bald verfügbar!</target>
         <target>Interface-Farben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Ungültig</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Ungültig (falsches Token)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Ungültig (abgelaufen)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Ungültig (nicht registriert)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Ungültig (falsches Thema)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Ungültiger QR-Code</target>
@@ -4330,6 +4675,21 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Verknüpfte Desktops</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Liste</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>Der Listenname und das Emoji sollen für alle Listen unterschiedlich sein.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Listenname...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live Nachricht!</target>
@@ -4415,11 +4775,21 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Mitglied</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <target>Aufnahme von Mitgliedern</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Mitglied inaktiv</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Mitglieder-Meldungen</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>Die Rolle des Mitglieds wird auf "%@" geändert. Alle Chat-Mitglieder werden darüber informiert.</target>
@@ -4445,6 +4815,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Das Mitglied wird aus der Gruppe entfernt. Dies kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <target>Ein Mitglied wird der Gruppe beitreten. Übernehmen?</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Gruppenmitglieder können eine Reaktion auf Nachrichten geben.</target>
@@ -4455,9 +4830,14 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Gruppenmitglieder können gesendete Nachrichten unwiederbringlich löschen. (24 Stunden)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>Mitglieder können Nachrichten an Moderatoren melden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
-        <target>Gruppenmitglieder können SimpleX-Links senden.</target>
+        <target>Gruppenmitglieder können SimpleX-Links versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send direct messages." xml:space="preserve">
@@ -4467,12 +4847,12 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="Members can send disappearing messages." xml:space="preserve">
         <source>Members can send disappearing messages.</source>
-        <target>Gruppenmitglieder können verschwindende Nachrichten senden.</target>
+        <target>Gruppenmitglieder können verschwindende Nachrichten versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send files and media." xml:space="preserve">
         <source>Members can send files and media.</source>
-        <target>Gruppenmitglieder können Dateien und Medien senden.</target>
+        <target>Gruppenmitglieder können Dateien und Medien versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send voice messages." xml:space="preserve">
@@ -4480,6 +4860,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Gruppenmitglieder können Sprachnachrichten versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Erwähnung von Mitgliedern 👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menüs</target>
@@ -4590,6 +4975,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Die Nachrichten von %@ werden angezeigt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Nachrichten in diesem Chat werden nie gelöscht.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Empfangene Nachrichten</target>
@@ -4607,12 +4997,12 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </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>
-        <target>Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.</target>
+        <target>Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.</target>
         <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>
-        <target>Nachrichten, Dateien und Anrufe sind durch **Quantum-resistente E2E-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.</target>
+        <target>Nachrichten, Dateien und Anrufe sind durch **Quantum-resistente E2E-Verschlüsselung** mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
@@ -4690,6 +5080,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Moderiert um: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Mehr</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Weitere Verbesserungen sind bald verfügbar!</target>
@@ -4718,7 +5113,12 @@ Das ist Ihr Link für die Gruppe %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Stummschalten</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Alle stummschalten</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4770,6 +5170,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Netzwerkstatus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Neu</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Neuer Zugangscode</target>
@@ -4835,6 +5240,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Neue Mitgliedsrolle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <target>Ein neues Mitglied will der Gruppe beitreten.</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Neue Nachricht</target>
@@ -4860,6 +5270,26 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Kein App-Passwort</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Keine Chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Keine Chats gefunden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Keine Chats in der Liste %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <target>Keine Chats mit Mitgliedern</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Keine Kontakte ausgewählt</target>
@@ -4910,6 +5340,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Keine Medien- und Dateiserver.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Keine Nachricht</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Keine Nachrichten-Server.</target>
@@ -4942,7 +5377,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="No received or sent files" xml:space="preserve">
         <source>No received or sent files</source>
-        <target>Keine empfangenen oder gesendeten Dateien</target>
+        <target>Keine herunter- oder hochgeladenen Dateien</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No servers for private message routing." xml:space="preserve">
@@ -4952,7 +5387,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="No servers to receive files." xml:space="preserve">
         <source>No servers to receive files.</source>
-        <target>Keine Server für den Empfang von Dateien.</target>
+        <target>Keine Server für das Herunterladen von Dateien.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive messages." xml:space="preserve">
@@ -4965,6 +5400,16 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Keine Server für das Versenden von Dateien.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>Kein Token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Keine ungelesenen Chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Keine Benutzerkennungen.</target>
@@ -4975,6 +5420,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Nicht kompatibel!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Anmerkungen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Nichts ausgewählt</target>
@@ -4995,11 +5445,21 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Benachrichtigungen sind deaktiviert!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Benachrichtigungs-Fehler</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Datenschutz für Benachrichtigungen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Benachrichtigungs-Status</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5022,7 +5482,8 @@ Das ist Ihr Link für die Gruppe %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5083,6 +5544,16 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Sprachnachrichten können nur von Gruppen-Eigentümern aktiviert werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Nur Absender und Moderatoren sehen es</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Nur Sie und Moderatoren sehen es</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Nur Sie können Reaktionen auf Nachrichten geben.</target>
@@ -5136,7 +5607,7 @@ Dies erfordert die Aktivierung eines VPNs.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Öffnen</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5168,6 +5639,11 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Gruppe öffnen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <target>Link öffnen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Migration auf ein anderes Gerät öffnen</target>
@@ -5218,6 +5694,11 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Oder zum privaten Teilen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Chats in Listen verwalten</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Andere</target>
@@ -5409,6 +5890,26 @@ Fehler: %@</target>
         <target>Bitte bewahren Sie das Passwort sicher auf, Sie können es NICHT mehr ändern, wenn Sie es vergessen haben oder verlieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Bitte versuchen Sie, die Benachrichtigungen zu deaktivieren und wieder zu aktivieren.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <target>Bitte warten Sie auf die Überprüfung Ihrer Anfrage durch die Gruppen-Moderatoren, um der Gruppe beitreten zu können.</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Bitte warten Sie, bis die Token-Aktivierung abgeschlossen ist.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Bitte warten Sie auf die Registrierung des Tokens.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Polnische Bedienoberfläche</target>
@@ -5459,16 +5960,31 @@ Fehler: %@</target>
         <target>Schutz der Privatsphäre Ihrer Kunden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Datenschutz- und Nutzungsbedingungen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Datenschutz neu definiert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Private Chats, Gruppen und Ihre Kontakte sind für Server-Betreiber nicht zugänglich.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Neutrale Dateinamen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Medien mit anonymisierten Dateinamen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Privates Nachrichten-Routing</target>
@@ -5544,6 +6060,11 @@ Fehler: %@</target>
         <target>Reaktionen auf Nachrichten nicht erlauben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Melden von Nachrichten an Moderatoren nicht erlauben.</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>
         <target>Das Senden von SimpleX-Links nicht erlauben.</target>
@@ -5728,7 +6249,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
         <source>Receiving file will be stopped.</source>
-        <target>Der Empfang der Datei wird beendet.</target>
+        <target>Das Herunterladen der Datei wird beendet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving via" xml:space="preserve">
@@ -5801,11 +6322,26 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Reduzierter Batterieverbrauch</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Registrieren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Benachrichtigungs-Token registrieren?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Registriert</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Ablehnen</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5817,6 +6353,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Kontaktanfrage ablehnen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <target>Mitglied ablehnen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Relais-Server werden nur genutzt, wenn sie benötigt werden. Ihre IP-Adresse kann von Anderen erfasst werden.</target>
@@ -5902,6 +6443,61 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Antwort</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Melden</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Inhalt melden: Nur Gruppenmoderatoren werden es sehen.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Mitgliederprofil melden: Nur Gruppenmoderatoren werden es sehen.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Anderes melden: Nur Gruppenmoderatoren werden es sehen.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Grund der Meldung?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <target>Meldung wurde an die Moderatoren gesendet</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Spam melden: Nur Gruppenmoderatoren werden es sehen.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Verstoß melden: Nur Gruppenmoderatoren werden es sehen.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Meldung: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>Melden von Nachrichten an Moderatoren ist nicht erlaubt.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Meldungen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Erforderlich</target>
@@ -5992,10 +6588,15 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Nutzungsbedingungen einsehen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Später einsehen</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <target>Überprüfung der Mitglieder</target>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <target>Überprüfung der Mitglieder vor der Aufnahme ("Anklopfen").</target>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6034,7 +6635,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
-        <target>Dateien sicher empfangen</target>
+        <target>Dateien sicher herunterladen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
@@ -6046,13 +6647,18 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <source>Save</source>
         <target>Speichern</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Speichern (und Kontakte benachrichtigen)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <target>Speichern der Aufnahme-Einstellungen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Speichern und Kontakt benachrichtigen</target>
@@ -6078,6 +6684,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Gruppenprofil speichern</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Liste speichern</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Passwort speichern und Chat öffnen</target>
@@ -6318,6 +6929,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Benachrichtigungen senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Private Meldungen senden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Senden Sie Fragen und Ideen</target>
@@ -6533,6 +7149,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Einen Tag festlegen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Chat-Name festlegen…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Kontaktname festlegen…</target>
@@ -6553,6 +7174,16 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Anstelle der System-Authentifizierung festlegen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <target>Aufnahme von Mitgliedern festlegen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Verfallsdatum von Nachrichten in Chats festlegen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Zugangscode einstellen</target>
@@ -6597,7 +7228,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <source>Share</source>
         <target>Teilen</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6659,6 +7290,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Mit Kontakten teilen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Verkürzter Link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>QR-Code anzeigen</target>
@@ -6759,6 +7395,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>SimpleX-Adresse oder Einmal-Link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>SimpleX-Kanal-Link</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX-Kontaktadressen-Link</target>
@@ -6861,6 +7502,12 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Jemand</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Spam</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Quadratisch, kreisförmig oder irgendetwas dazwischen.</target>
@@ -6918,17 +7565,17 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Stop file" xml:space="preserve">
         <source>Stop file</source>
-        <target>Datei beenden</target>
+        <target>Herunterladen beenden</target>
         <note>cancel file action</note>
       </trans-unit>
       <trans-unit id="Stop receiving file?" xml:space="preserve">
         <source>Stop receiving file?</source>
-        <target>Den Empfang der Datei beenden?</target>
+        <target>Das Herunterladen der Datei beenden?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop sending file?" xml:space="preserve">
         <source>Stop sending file?</source>
-        <target>Das Senden der Datei beenden?</target>
+        <target>Das Hochladen der Datei beenden?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop sharing" xml:space="preserve">
@@ -6946,6 +7593,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Chat wird beendet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Ablage</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Hart</target>
@@ -7006,6 +7658,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Timeout der TCP-Verbindung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>TCP-Port für Nachrichtenübermittlung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7074,13 +7731,18 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Temporärer Datei-Fehler</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Der Test ist beim Schritt %@ fehlgeschlagen.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Benachrichtigungen testen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Teste Server</target>
@@ -7203,21 +7865,11 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Die alte Datenbank wurde während der Migration nicht entfernt. Sie kann gelöscht werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Das Profil wird nur mit Ihren Kontakten geteilt.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Dieselben Nutzungsbedingungen gelten auch für den Betreiber **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Dieselben Nutzungsbedingungen gelten auch für den/die Betreiber: **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>Der zweite voreingestellte Netzwerk-Betreiber in der App!</target>
@@ -7275,17 +7927,22 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
         <source>This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.</source>
-        <target>Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten.</target>
+        <target>Es werden alle herunter- und hochgeladenen Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten. Diese Aktion kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." xml:space="preserve">
         <source>This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes.</source>
-        <target>Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern.</target>
+        <target>Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern. Diese Aktion kann nicht rückgängig gemacht werden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Die älteren als die ausgewählten gesendeten und empfangenen Nachrichten in diesem Chat werden gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
-        <target>Diese Aktion kann nicht rückgängig gemacht werden! Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</target>
+        <target>Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren. Diese Aktion kann nicht rückgängig gemacht werden!</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">
@@ -7328,11 +7985,21 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Das ist Ihr eigener Einmal-Link!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>Für diesen Link wird eine neuere App-Version benötigt. Bitte aktualisieren Sie die App oder bitten Sie Ihren Kontakt einen kompatiblen Link zu senden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Dieser Link wurde schon mit einem anderen Mobiltelefon genutzt. Bitte erstellen sie einen neuen Link in der Desktop-App.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>Diese Nachricht wurde gelöscht oder bisher noch nicht empfangen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Diese Einstellung gilt für Nachrichten in Ihrem aktuellen Chat-Profil **%@**.</target>
@@ -7445,6 +8112,11 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
         <target>Inkognito beim Verbinden einschalten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Token-Status: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Deckkraft der Symbolleiste</target>
@@ -7610,13 +8282,18 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Stummschaltung aufheben</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Ungelesen</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Verbindungs-Link wird nicht unterstützt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Bis zu 100 der letzten Nachrichten werden an neue Mitglieder gesendet.</target>
@@ -7642,6 +8319,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Einstellungen aktualisieren?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Aktualisierte Nutzungsbedingungen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Die Aktualisierung der Einstellungen wird den Client wieder mit allen Servern verbinden.</target>
@@ -7702,6 +8384,16 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Verwenden Sie SimpleX-Chat-Server?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Solange kein Port konfiguriert ist, wird TCP-Port %@ genutzt.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>TCP-Port 443 nur für voreingestellte Server verwenden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Verwenden Sie Chat</target>
@@ -7767,6 +8459,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Verwende Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Kurze Links verwenden (BETA)</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>
         <target>Die App kann während eines Anrufs genutzt werden.</target>
@@ -7777,6 +8474,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Die App mit einer Hand bedienen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Web-Port nutzen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Benutzer-Auswahl</target>
@@ -7844,12 +8546,12 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Video will be received when your contact completes uploading it." xml:space="preserve">
         <source>Video will be received when your contact completes uploading it.</source>
-        <target>Das Video wird empfangen, sobald Ihr Kontakt das Hochladen beendet hat.</target>
+        <target>Das Video wird heruntergeladen, sobald Ihr Kontakt das Hochladen beendet hat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Video will be received when your contact is online, please wait or check later!" xml:space="preserve">
         <source>Video will be received when your contact is online, please wait or check later!</source>
-        <target>Das Video wird empfangen, wenn Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!</target>
+        <target>Das Video wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Videos and files up to 1gb" xml:space="preserve">
@@ -8149,11 +8851,6 @@ Verbindungsanfrage wiederholen?</target>
         <target>Kann von Ihnen in den Erscheinungsbild-Einstellungen geändert werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Sie können die Betreiber in den Netzwerk- und Servereinstellungen konfigurieren.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>Sie können die Server über die Einstellungen konfigurieren.</target>
@@ -8244,6 +8941,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Den Einladungslink können Sie in den Details der Verbindung nochmals sehen.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <target>Sie können Ihre Meldungen im Chat mit den Administratoren sehen.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Sie können keine Nachrichten versenden!</target>
@@ -8326,6 +9028,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Sie haben eine Gruppeneinladung gesendet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>Sie sollten Benachrichtigungen erhalten.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Sie werden mit der Gruppe verbunden, sobald das Endgerät des Gruppen-Hosts online ist. Bitte warten oder schauen Sie später nochmal nach!</target>
@@ -8363,7 +9070,7 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
         <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
-        <target>Sie werden von diesem Chat keine Nachrichten mehr erhalten. Der Nachrichtenverlauf wird beibehalten.</target>
+        <target>Sie werden von diesem Chat keine Nachrichten mehr erhalten. Der Nachrichtenverlauf bleibt erhalten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
@@ -8391,11 +9098,6 @@ Verbindungsanfrage wiederholen?</target>
         <target>Ihre ICE-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Ihre SMP-Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Ihre SimpleX-Adresse</target>
@@ -8468,7 +9170,7 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="Your privacy" xml:space="preserve">
         <source>Your privacy</source>
-        <target>Ihre Privatsphäre</target>
+        <target>Privatsphäre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your profile" xml:space="preserve">
@@ -8481,6 +9183,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Ihr Profil **%@** wird geteilt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt. SimpleX-Server können Ihr Profil nicht einsehen.</target>
@@ -8491,11 +9198,6 @@ Verbindungsanfrage wiederholen?</target>
         <target>Ihr Profil wurde geändert. Wenn Sie es speichern, wird das aktualisierte Profil an alle Ihre Kontakte gesendet.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Ihr Zufallsprofil</target>
@@ -8546,6 +9248,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Danach die gewünschte Aktion auswählen:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <target>%@ übernommen</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>Anruf angenommen</target>
@@ -8553,9 +9260,14 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="accepted invitation" xml:space="preserve">
         <source>accepted invitation</source>
-        <target>Einladung akzeptiert</target>
+        <target>Einladung angenommen</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <target>hat Sie übernommen</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>Admin</target>
@@ -8576,6 +9288,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Verschlüsselung zustimmen…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <target>alle</target>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>Alle Mitglieder</target>
@@ -8591,6 +9308,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>und %lld weitere Ereignisse</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>Archivierte Meldung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>Versuche</target>
@@ -8629,7 +9351,8 @@ Verbindungsanfrage wiederholen?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>wurde vom Administrator blockiert</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8656,6 +9379,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Anrufen…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <target>Es können keine Nachrichten gesendet werden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>abgebrochen %@</target>
@@ -8761,6 +9489,16 @@ Verbindungsanfrage wiederholen?</target>
         <target>Der Kontaktname wurde von %1$@ auf %2$@ geändert</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <target>Kontakt gelöscht</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <target>Kontakt deaktiviert</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>Kontakt nutzt E2E-Verschlüsselung</target>
@@ -8771,6 +9509,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Kontakt nutzt keine E2E-Verschlüsselung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <target>Kontakt nicht bereit</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>Ersteller</target>
@@ -8798,8 +9541,9 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
-        <target>Voreinstellung (%@)</target>
-        <note>pref value</note>
+        <target>Default (%@)</target>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8926,21 +9670,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Fehler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>Abgelaufen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>für einen besseren Metadatenschutz.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>weitergeleitet</target>
@@ -8951,6 +9685,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Gruppe gelöscht</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <target>Gruppe wird gelöscht</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>Gruppenprofil aktualisiert</target>
@@ -9076,6 +9815,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>ist der Gruppe beigetreten</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <target>Das Mitglied hat eine alte App-Version</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>Nachricht</target>
@@ -9106,20 +9850,20 @@ Verbindungsanfrage wiederholen?</target>
         <target>Von %@ moderiert</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>Moderator</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>Monate</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>Stummschalten</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>nie</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9141,6 +9885,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Kein Text</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <target>Nicht synchronisiert</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>Beobachter</target>
@@ -9150,8 +9899,9 @@ Verbindungsanfrage wiederholen?</target>
         <source>off</source>
         <target>Aus</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9193,6 +9943,21 @@ Verbindungsanfrage wiederholen?</target>
         <target>Peer-to-Peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>ausstehend</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>ausstehende Genehmigung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <target>Ausstehende Überprüfung</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>
         <target>Quantum-resistente E2E-Verschlüsselung</target>
@@ -9208,6 +9973,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Bestätigung erhalten…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>abgelehnt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>Abgelehnter Anruf</target>
@@ -9228,6 +9998,11 @@ Verbindungsanfrage wiederholen?</target>
         <target>Die Kontaktadresse wurde entfernt</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <target>Von der Gruppe entfernt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>Das Profil-Bild wurde entfernt</target>
@@ -9238,11 +10013,26 @@ Verbindungsanfrage wiederholen?</target>
         <target>hat Sie aus der Gruppe entfernt</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <target>Beitrittsanfrage abgelehnt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <target>Zur Verbindung aufgefordert</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <target>Überprüfung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <target>Von Administratoren überprüft</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>abgespeichert</target>
@@ -9342,11 +10132,6 @@ Zuletzt empfangene Nachricht: %2$@</target>
         <target>unbekannter Gruppenmitglieds-Status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>Stummschaltung aufheben</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>Ungeschützt</target>
@@ -9437,6 +10222,11 @@ Zuletzt empfangene Nachricht: %2$@</target>
         <target>Profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <target>Sie haben dieses Mitglied übernommen</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>Sie sind zu der Gruppe eingeladen</target>
@@ -9511,7 +10301,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9541,14 +10331,14 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
         <source>SimpleX needs access to Photo Library for saving captured and received media</source>
-        <target>SimpleX benötigt Zugriff auf das Fotoalbum, um selbst gemachte oder empfangene Bilder zu speichern</target>
+        <target>SimpleX benötigt Zugriff auf das Fotoalbum, um selbst gemachte oder heruntergeladene Bilder zu speichern</target>
         <note>Privacy - Photo Library Additions Usage Description</note>
       </trans-unit>
     </body>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9570,7 +10360,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9578,6 +10368,11 @@ Zuletzt empfangene Nachricht: %2$@</target>
         <target>%d neue Ereignisse</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>Von %d Chat(s)</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>Von: %@</target>
@@ -9593,16 +10388,11 @@ Zuletzt empfangene Nachricht: %2$@</target>
         <target>Neue Nachrichten</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Neue Nachrichten in %d Chats</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9617,14 +10407,14 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="NSHumanReadableCopyright" xml:space="preserve">
         <source>Copyright © 2024 SimpleX Chat. All rights reserved.</source>
-        <target>Copyright © 2024 SimpleX Chat. Alle Rechte vorbehalten.</target>
+        <target>Copyright © 2025 SimpleX Chat. Alle Rechte vorbehalten.</target>
         <note>Copyright (human-readable)</note>
       </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
@@ -9659,17 +10449,17 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
         <source>Currently maximum supported file size is %@.</source>
-        <target>Die maximale erlaubte Dateigröße beträgt aktuell %@.</target>
+        <target>Die maximal erlaubte Dateigröße beträgt aktuell %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database downgrade required" xml:space="preserve">
         <source>Database downgrade required</source>
-        <target>Datenbank-Herabstufung erforderlich</target>
+        <target>Datenbank-Herunterstufung ist erforderlich</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database encrypted!" xml:space="preserve">
         <source>Database encrypted!</source>
-        <target>Datenbank verschlüsselt!</target>
+        <target>Datenbank ist verschlüsselt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database error" xml:space="preserve">
@@ -9684,7 +10474,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
         <source>Database passphrase is required to open chat.</source>
-        <target>Ein Datenbank-Passwort ist erforderlich, um den Chat zu öffnen.</target>
+        <target>Um den Chat zu öffnen, ist ein Datenbank-Passwort ist erforderlich.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database upgrade required" xml:space="preserve">
@@ -9709,7 +10499,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <target>Dateifehler</target>
+        <target>Datei-Fehler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incompatible database version" xml:space="preserve">
@@ -9744,12 +10534,12 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="Open the app to downgrade the database." xml:space="preserve">
         <source>Open the app to downgrade the database.</source>
-        <target>Öffne die App, um die Datenbank herabzustufen.</target>
+        <target>Öffnen Sie die App, um die Datenbank herunterzustufen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open the app to upgrade the database." xml:space="preserve">
         <source>Open the app to upgrade the database.</source>
-        <target>Öffne die App, um die Datenbank zu aktualisieren.</target>
+        <target>Öffnen Sie die App, um die Datenbank zu aktualisieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Passphrase" xml:space="preserve">
@@ -9759,7 +10549,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="Please create a profile in the SimpleX app" xml:space="preserve">
         <source>Please create a profile in the SimpleX app</source>
-        <target>Bitte erstelle ein Profil in der SimpleX-App</target>
+        <target>Bitte erstellen Sie ein Profil in der SimpleX-App</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
@@ -9809,7 +10599,7 @@ Zuletzt empfangene Nachricht: %2$@</target>
       </trans-unit>
       <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve">
         <source>You can allow sharing in Privacy &amp; Security / SimpleX Lock settings.</source>
-        <target>Du kannst das Teilen in den Einstellungen zu Datenschutz &amp; Sicherheit - SimpleX-Sperre erlauben.</target>
+        <target>Sie können das Teilen in den Einstellungen zu Datenschutz &amp; Sicherheit / SimpleX-Sperre erlauben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
     </body>
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/contents.json b/apps/ios/SimpleX Localizations/de.xcloc/contents.json
index 18b517d802..e8d71cf38c 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/de.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "de",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/el.xcloc/Localized Contents/el.xliff b/apps/ios/SimpleX Localizations/el.xcloc/Localized Contents/el.xliff
index b601d1fa74..fc1846942c 100644
--- a/apps/ios/SimpleX Localizations/el.xcloc/Localized Contents/el.xliff	
+++ b/apps/ios/SimpleX Localizations/el.xcloc/Localized Contents/el.xliff	
@@ -3043,8 +3043,8 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
index cebd6c90d1..5982f620b8 100644
--- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
+++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (can be copied)</target>
@@ -202,6 +190,11 @@
         <target>%d sec</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d seconds(s)</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d skipped message(s)</target>
@@ -272,11 +265,6 @@
         <target>%lld new interface languages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld second(s)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld seconds</target>
@@ -327,11 +315,6 @@
         <target>%u messages skipped.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(new)</target>
@@ -342,11 +325,6 @@
         <target>(this device v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Create 1-time link**: to create and share a new invitation link.</target>
@@ -412,11 +390,6 @@
         <target>\*bold*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - editing history.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sec</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 day</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +455,19 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 month</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 week</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 year</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 seconds</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -591,8 +562,18 @@
         <source>Accept</source>
         <target>Accept</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <target>Accept as member</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <target>Accept as observer</target>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -613,7 +594,12 @@
         <source>Accept incognito</source>
         <target>Accept incognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <target>Accept member</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -630,6 +616,11 @@
         <target>Acknowledgement errors</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Active</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Active connections</target>
@@ -645,6 +636,11 @@
         <target>Add friends</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Add list</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Add profile</target>
@@ -670,6 +666,11 @@
         <target>Add to another device</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Add to list</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Add welcome message</target>
@@ -745,6 +746,11 @@
         <target>Advanced settings</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>All</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>All app data is deleted.</target>
@@ -755,6 +761,11 @@
         <target>All chats and messages will be deleted - this cannot be undone!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>All chats will be removed from the list %@, and the list deleted.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>All data is erased when it is entered.</target>
@@ -795,6 +806,16 @@
         <target>All profiles</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>All reports will be archived for you.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>All servers</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>All your contacts will remain connected.</target>
@@ -870,6 +891,11 @@
         <target>Allow to irreversibly delete sent messages. (24 hours)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Allow to report messsages to moderators.</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>
         <target>Allow to send SimpleX links.</target>
@@ -950,6 +976,11 @@
         <target>An empty chat profile with the provided name is created, and the app opens as usual.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Another reason</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Answer call</target>
@@ -975,6 +1006,11 @@
         <target>App encrypts new local files (except videos).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>App group:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>App icon</target>
@@ -1020,6 +1056,21 @@
         <target>Apply to</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archive</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archive %lld reports?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Archive all reports?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archive and upload</target>
@@ -1030,6 +1081,21 @@
         <target>Archive contacts to chat later.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Archive report</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Archive report?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Archive reports</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Archived contacts</target>
@@ -1140,6 +1206,11 @@
         <target>Better groups</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Better groups performance</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Better message dates.</target>
@@ -1160,6 +1231,11 @@
         <target>Better notifications</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Better privacy and security</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Better security ✅</target>
@@ -1260,11 +1336,25 @@
         <target>Business chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Businesses</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Call already ended!</target>
@@ -1314,7 +1404,7 @@
         <source>Cancel</source>
         <target>Cancel</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1351,6 +1441,11 @@
         <target>Change</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Change automatic message deletion?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Change chat profiles</target>
@@ -1400,7 +1495,7 @@
         <source>Change self-destruct passcode</source>
         <target>Change self-destruct passcode</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1502,11 +1597,26 @@
         <target>Chat will be deleted for you - this cannot be undone!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <target>Chat with admins</target>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <target>Chat with member</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <target>Chats with members</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Check messages every 20 min.</target>
@@ -1572,6 +1682,16 @@
         <target>Clear conversation?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Clear group?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Clear or delete group?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Clear private notes?</target>
@@ -1592,6 +1712,11 @@
         <target>Color mode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Community guidelines violation</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Compare file</target>
@@ -1627,16 +1752,6 @@
         <target>Conditions of use</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Conditions will be accepted for enabled operators after 30 days.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Conditions will be accepted for operator(s): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Conditions will be accepted for the operator(s): **%@**.</target>
@@ -1657,6 +1772,11 @@
         <target>Configure ICE servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Configure server operators</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Confirm</target>
@@ -1707,6 +1827,11 @@
         <target>Confirm upload</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Confirmed</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Connect</target>
@@ -1826,6 +1951,11 @@ This is your own one-time link!</target>
         <target>Connection and servers status.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Connection blocked</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Connection error</target>
@@ -1836,6 +1966,18 @@ This is your own one-time link!</target>
         <target>Connection error (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>Connection is blocked by server operator:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Connection not ready.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Connection notifications</target>
@@ -1846,6 +1988,11 @@ This is your own one-time link!</target>
         <target>Connection request sent!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>Connection requires encryption renegotiation.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Connection security</target>
@@ -1926,6 +2073,11 @@ This is your own one-time link!</target>
         <target>Contacts can mark messages for deletion; you will be able to view them.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Content violates conditions of use</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Continue</target>
@@ -2001,6 +2153,11 @@ This is your own one-time link!</target>
         <target>Create link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Create list</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</target>
@@ -2218,8 +2375,7 @@ This is your own one-time link!</target>
         <source>Delete</source>
         <target>Delete</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2261,6 +2417,11 @@ This is your own one-time link!</target>
         <target>Delete chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Delete chat messages from your device.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Delete chat profile</target>
@@ -2271,6 +2432,11 @@ This is your own one-time link!</target>
         <target>Delete chat profile?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <target>Delete chat with member?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>Delete chat?</target>
@@ -2351,6 +2517,11 @@ This is your own one-time link!</target>
         <target>Delete link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Delete list?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Delete member message?</target>
@@ -2364,7 +2535,7 @@ This is your own one-time link!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Delete messages</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2401,6 +2572,11 @@ This is your own one-time link!</target>
         <target>Delete queue</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Delete report</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Delete up to 20 messages at once.</target>
@@ -2561,6 +2737,16 @@ This is your own one-time link!</target>
         <target>Disable SimpleX Lock</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Disable automatic message deletion?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Disable delete messages</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Disable for all</target>
@@ -2651,6 +2837,11 @@ This is your own one-time link!</target>
         <target>Do not use credentials with proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Documents:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Don't create address</target>
@@ -2661,9 +2852,19 @@ This is your own one-time link!</target>
         <target>Don't enable</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Don't miss important messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Don't show again</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Done</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2876,7 @@ This is your own one-time link!</target>
         <source>Download</source>
         <target>Download</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2752,9 +2953,9 @@ This is your own one-time link!</target>
         <target>Enable (keep overrides)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Enable Flux</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Enable Flux in Network &amp; servers settings for better metadata privacy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2770,7 +2971,7 @@ This is your own one-time link!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Enable automatic message deletion?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2897,6 +3098,11 @@ This is your own one-time link!</target>
         <target>Encryption re-negotiation failed.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Encryption renegotiation in progress.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Enter Passcode</target>
@@ -2972,6 +3178,11 @@ This is your own one-time link!</target>
         <target>Error accepting contact request</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <target>Error accepting member</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Error adding member(s)</target>
@@ -3007,6 +3218,11 @@ This is your own one-time link!</target>
         <target>Error changing to incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Error checking token status</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Error connecting to forwarding server %@. Please try later.</target>
@@ -3027,6 +3243,11 @@ This is your own one-time link!</target>
         <target>Error creating group link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Error creating list</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Error creating member contact</target>
@@ -3042,6 +3263,11 @@ This is your own one-time link!</target>
         <target>Error creating profile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Error creating report</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Error decrypting file</target>
@@ -3052,6 +3278,11 @@ This is your own one-time link!</target>
         <target>Error deleting chat database</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <target>Error deleting chat with member</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Error deleting chat!</target>
@@ -3152,10 +3383,20 @@ This is your own one-time link!</target>
         <target>Error reconnecting servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Error registering for notifications</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Error removing member</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Error reordering lists</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3167,6 +3408,11 @@ This is your own one-time link!</target>
         <target>Error saving ICE servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Error saving chat list</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Error saving group profile</target>
@@ -3247,6 +3493,11 @@ This is your own one-time link!</target>
         <target>Error synchronizing connection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Error testing server connection</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Error updating group link</target>
@@ -3290,7 +3541,9 @@ This is your own one-time link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3580,11 @@ This is your own one-time link!</target>
         <target>Expand</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Expired</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Export database</target>
@@ -3367,20 +3625,35 @@ This is your own one-time link!</target>
         <target>Fast and no wait until the sender is online!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Faster deletion of groups.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Faster joining and more reliable messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Faster sending messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favorite</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Favorites</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>File error</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,6 +3662,13 @@ This is your own one-time link!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>File is blocked by server operator:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>File not found - most likely file was deleted or cancelled.</target>
@@ -3514,6 +3794,11 @@ This is your own one-time link!</target>
         <target>Fix not supported by group member</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>For all moderators</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>For chat profile %@:</target>
@@ -3529,6 +3814,11 @@ This is your own one-time link!</target>
         <target>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>For me</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>For private routing</target>
@@ -3653,6 +3943,11 @@ Error: %2$@</target>
         <target>GIFs and stickers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Get notified when mentioned.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Good afternoon!</target>
@@ -3758,11 +4053,21 @@ Error: %2$@</target>
         <target>Group will be deleted for you - this cannot be undone!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Help</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Help admins moderating their groups.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Hidden</target>
@@ -3823,6 +4128,11 @@ Error: %2$@</target>
         <target>How it helps privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>How it works</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>How to</target>
@@ -3965,6 +4275,16 @@ More improvements are coming soon!</target>
         <target>In-call sounds</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Inappropriate content</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Inappropriate profile</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -4057,6 +4377,31 @@ More improvements are coming soon!</target>
         <target>Interface colors</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Invalid</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Invalid (bad token)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Invalid (expired)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Invalid (unregistered)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Invalid (wrong topic)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Invalid QR code</target>
@@ -4330,6 +4675,21 @@ This is your link for group %@!</target>
         <target>Linked desktops</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>List</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>List name and emoji should be different for all lists.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>List name...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live message!</target>
@@ -4415,11 +4775,21 @@ This is your link for group %@!</target>
         <target>Member</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <target>Member admission</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Member inactive</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Member reports</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>Member role will be changed to "%@". All chat members will be notified.</target>
@@ -4445,6 +4815,11 @@ This is your link for group %@!</target>
         <target>Member will be removed from group - this cannot be undone!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <target>Member will join the group, accept member?</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Members can add message reactions.</target>
@@ -4455,6 +4830,11 @@ This is your link for group %@!</target>
         <target>Members can irreversibly delete sent messages. (24 hours)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>Members can report messsages to moderators.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Members can send SimpleX links.</target>
@@ -4480,6 +4860,11 @@ This is your link for group %@!</target>
         <target>Members can send voice messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Mention members 👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menus</target>
@@ -4590,6 +4975,11 @@ This is your link for group %@!</target>
         <target>Messages from %@ will be shown!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Messages in this chat will never be deleted.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Messages received</target>
@@ -4690,6 +5080,11 @@ This is your link for group %@!</target>
         <target>Moderated at: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>More</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>More improvements are coming soon!</target>
@@ -4718,7 +5113,12 @@ This is your link for group %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Mute</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Mute all</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4770,6 +5170,11 @@ This is your link for group %@!</target>
         <target>Network status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>New</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>New Passcode</target>
@@ -4835,6 +5240,11 @@ This is your link for group %@!</target>
         <target>New member role</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <target>New member wants to join the group.</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>New message</target>
@@ -4860,6 +5270,26 @@ This is your link for group %@!</target>
         <target>No app password</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>No chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>No chats found</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>No chats in list %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <target>No chats with members</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>No contacts selected</target>
@@ -4910,6 +5340,11 @@ This is your link for group %@!</target>
         <target>No media &amp; file servers.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>No message</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>No message servers.</target>
@@ -4965,6 +5400,16 @@ This is your link for group %@!</target>
         <target>No servers to send files.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>No token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>No unread chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>No user identifiers.</target>
@@ -4975,6 +5420,11 @@ This is your link for group %@!</target>
         <target>Not compatible!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Notes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Nothing selected</target>
@@ -4995,11 +5445,21 @@ This is your link for group %@!</target>
         <target>Notifications are disabled!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Notifications error</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Notifications privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Notifications status</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5022,7 +5482,8 @@ This is your link for group %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5083,6 +5544,16 @@ Requires compatible VPN.</target>
         <target>Only group owners can enable voice messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Only sender and moderators see it</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Only you and moderators see it</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Only you can add message reactions.</target>
@@ -5136,7 +5607,7 @@ Requires compatible VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Open</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5168,6 +5639,11 @@ Requires compatible VPN.</target>
         <target>Open group</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <target>Open link?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Open migration to another device</target>
@@ -5218,6 +5694,11 @@ Requires compatible VPN.</target>
         <target>Or to share privately</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Organize chats into lists</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Other</target>
@@ -5409,6 +5890,26 @@ Error: %@</target>
         <target>Please store passphrase securely, you will NOT be able to change it if you lose it.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Please try to disable and re-enable notfications.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <target>Please wait for group moderators to review your request to join the group.</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Please wait for token activation to complete.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Please wait for token to be registered.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Polish interface</target>
@@ -5459,16 +5960,31 @@ Error: %@</target>
         <target>Privacy for your customers.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Privacy policy and conditions of use.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Privacy redefined</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Private chats, groups and your contacts are not accessible to server operators.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Private filenames</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Private media file names.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Private message routing</target>
@@ -5544,6 +6060,11 @@ Error: %@</target>
         <target>Prohibit messages reactions.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Prohibit reporting messages to moderators.</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>
         <target>Prohibit sending SimpleX links.</target>
@@ -5801,11 +6322,26 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Reduced battery usage</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Register</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Register notification token?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Registered</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Reject</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5817,6 +6353,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Reject contact request</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <target>Reject member?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Relay server is only used if necessary. Another party can observe your IP address.</target>
@@ -5902,6 +6443,61 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Reply</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Report</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Report content: only group moderators will see it.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Report member profile: only group moderators will see it.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Report other: only group moderators will see it.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Report reason?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <target>Report sent to moderators</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Report spam: only group moderators will see it.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Report violation: only group moderators will see it.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Report: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>Reporting messages to moderators is prohibited.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Reports</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Required</target>
@@ -5992,10 +6588,15 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Review conditions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Review later</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <target>Review members</target>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <target>Review members before admitting ("knocking").</target>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6046,13 +6647,18 @@ Enable in *Network &amp; servers* settings.</target>
         <source>Save</source>
         <target>Save</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Save (and notify contacts)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <target>Save admission settings?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Save and notify contact</target>
@@ -6078,6 +6684,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Save group profile</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Save list</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Save passphrase and open chat</target>
@@ -6318,6 +6929,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Send notifications</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Send private reports</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Send questions and ideas</target>
@@ -6533,6 +7149,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Set 1 day</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Set chat name…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Set contact name…</target>
@@ -6553,6 +7174,16 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Set it instead of system authentication.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <target>Set member admission</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Set message expiration in chats.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Set passcode</target>
@@ -6597,7 +7228,7 @@ Enable in *Network &amp; servers* settings.</target>
         <source>Share</source>
         <target>Share</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6659,6 +7290,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Share with contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Short link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Show QR code</target>
@@ -6759,6 +7395,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>SimpleX address or 1-time link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>SimpleX channel link</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX contact address</target>
@@ -6861,6 +7502,12 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Somebody</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Spam</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Square, circle, or anything in between.</target>
@@ -6946,6 +7593,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Stopping chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Storage</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Strong</target>
@@ -7006,6 +7658,11 @@ Enable in *Network &amp; servers* settings.</target>
         <target>TCP connection timeout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>TCP port for messaging</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7074,13 +7731,18 @@ Enable in *Network &amp; servers* settings.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Temporary file error</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test failed at step %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Test notifications</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Test server</target>
@@ -7203,21 +7865,11 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>The old database was not removed during the migration, it can be deleted.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>The profile is only shared with your contacts.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>The same conditions will apply to operator **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>The same conditions will apply to operator(s): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>The second preset operator in the app!</target>
@@ -7283,6 +7935,11 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</target>
@@ -7328,11 +7985,21 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>This is your own one-time link!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>This link was used with another mobile device, please create a new link on the desktop.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>This message was deleted or not received yet.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>This setting applies to messages in your current chat profile **%@**.</target>
@@ -7445,6 +8112,11 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Toggle incognito when connecting.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Token status: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Toolbar opacity</target>
@@ -7610,13 +8282,18 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Unmute</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Unread</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Unsupported connection link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Up to 100 last messages are sent to new members.</target>
@@ -7642,6 +8319,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Update settings?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Updated conditions</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Updating settings will re-connect the client to all servers.</target>
@@ -7702,6 +8384,16 @@ To connect, please ask your contact to create another connection link and check
         <target>Use SimpleX Chat servers?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Use TCP port %@ when no port is specified.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>Use TCP port 443 for preset servers only.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Use chat</target>
@@ -7767,6 +8459,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Use servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Use short links (BETA)</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>
         <target>Use the app while in the call.</target>
@@ -7777,6 +8474,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Use the app with one hand.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Use web port</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>User selection</target>
@@ -8149,11 +8851,6 @@ Repeat join request?</target>
         <target>You can change it in Appearance settings.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>You can configure operators in Network &amp; servers settings.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>You can configure servers via settings.</target>
@@ -8244,6 +8941,11 @@ Repeat join request?</target>
         <target>You can view invitation link again in connection details.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <target>You can view your reports in Chat with admins.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>You can't send messages!</target>
@@ -8326,6 +9028,11 @@ Repeat connection request?</target>
         <target>You sent group invitation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>You should receive notifications.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>You will be connected to group when the group host's device is online, please wait or check later!</target>
@@ -8391,11 +9098,6 @@ Repeat connection request?</target>
         <target>Your ICE servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Your SMP servers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Your SimpleX address</target>
@@ -8481,6 +9183,11 @@ Repeat connection request?</target>
         <target>Your profile **%@** will be shared.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Your profile is stored on your device and only shared with your contacts.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</target>
@@ -8491,11 +9198,6 @@ Repeat connection request?</target>
         <target>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Your profile, contacts and delivered messages are stored on your device.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Your random profile</target>
@@ -8546,6 +9248,11 @@ Repeat connection request?</target>
         <target>above, then choose:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <target>accepted %@</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>accepted call</target>
@@ -8556,6 +9263,11 @@ Repeat connection request?</target>
         <target>accepted invitation</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <target>accepted you</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>admin</target>
@@ -8576,6 +9288,11 @@ Repeat connection request?</target>
         <target>agreeing encryption…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <target>all</target>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>all members</target>
@@ -8591,6 +9308,11 @@ Repeat connection request?</target>
         <target>and %lld other events</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>archived report</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>attempts</target>
@@ -8629,7 +9351,8 @@ Repeat connection request?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>blocked by admin</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8656,6 +9379,11 @@ Repeat connection request?</target>
         <target>calling…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <target>can't send messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>cancelled %@</target>
@@ -8761,6 +9489,16 @@ Repeat connection request?</target>
         <target>contact %1$@ changed to %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <target>contact deleted</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <target>contact disabled</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>contact has e2e encryption</target>
@@ -8771,6 +9509,11 @@ Repeat connection request?</target>
         <target>contact has no e2e encryption</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <target>contact not ready</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>creator</target>
@@ -8799,7 +9542,8 @@ Repeat connection request?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>default (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8926,21 +9670,11 @@ Repeat connection request?</target>
         <target>error</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>expired</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>for better metadata privacy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>forwarded</target>
@@ -8951,6 +9685,11 @@ Repeat connection request?</target>
         <target>group deleted</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <target>group is deleted</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>group profile updated</target>
@@ -9076,6 +9815,11 @@ Repeat connection request?</target>
         <target>connected</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <target>member has old version</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>message</target>
@@ -9106,20 +9850,20 @@ Repeat connection request?</target>
         <target>moderated by %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>moderator</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>months</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>mute</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>never</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9141,6 +9885,11 @@ Repeat connection request?</target>
         <target>no text</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <target>not synchronized</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>observer</target>
@@ -9150,8 +9899,9 @@ Repeat connection request?</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9193,6 +9943,21 @@ Repeat connection request?</target>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>pending</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>pending approval</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <target>pending review</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>
         <target>quantum resistant e2e encryption</target>
@@ -9208,6 +9973,11 @@ Repeat connection request?</target>
         <target>received confirmation…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>rejected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>rejected call</target>
@@ -9228,6 +9998,11 @@ Repeat connection request?</target>
         <target>removed contact address</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <target>removed from group</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>removed profile picture</target>
@@ -9238,11 +10013,26 @@ Repeat connection request?</target>
         <target>removed you</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <target>request to join rejected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <target>requested to connect</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <target>review</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <target>reviewed by admins</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>saved</target>
@@ -9342,11 +10132,6 @@ last received msg: %2$@</target>
         <target>unknown status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>unmute</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>unprotected</target>
@@ -9437,6 +10222,11 @@ last received msg: %2$@</target>
         <target>you</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <target>you accepted this member</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>you are invited to group</target>
@@ -9511,7 +10301,7 @@ last received msg: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9548,7 +10338,7 @@ last received msg: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9570,7 +10360,7 @@ last received msg: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9578,6 +10368,11 @@ last received msg: %2$@</target>
         <target>%d new events</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>From %d chat(s)</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>From: %@</target>
@@ -9593,16 +10388,11 @@ last received msg: %2$@</target>
         <target>New messages</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>New messages in %d chats</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9624,7 +10414,7 @@ last received msg: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/contents.json b/apps/ios/SimpleX Localizations/en.xcloc/contents.json
index 2f39a1f1ee..ec2accf27e 100644
--- a/apps/ios/SimpleX Localizations/en.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/en.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "en",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff
index 08522cc617..3c3ae9ff46 100644
--- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
+++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (puede copiarse)</target>
@@ -202,6 +190,11 @@
         <target>%d segundo(s)</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d segundos</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d mensaje(s) omitido(s)</target>
@@ -272,11 +265,6 @@
         <target>%lld idiomas de interfaz nuevos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld segundo(s)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld segundos</target>
@@ -327,11 +315,6 @@
         <target>%u mensaje(s) omitido(s).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(nuevo)</target>
@@ -342,11 +325,6 @@
         <target>(este dispositivo v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Añadir contacto**: crea un enlace de invitación nuevo.</target>
@@ -374,7 +352,7 @@
       </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>**Atención**: NO podrás recuperar o cambiar la contraseña si la pierdes.</target>
+        <target>**Atención**: Si la pierdes NO podrás recuperar o cambiar la contraseña.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." xml:space="preserve">
@@ -412,11 +390,6 @@
         <target>\*bold*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - historial de edición.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 seg</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>un dia</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +455,19 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>un mes</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>una semana</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 año</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 segundos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -554,7 +525,7 @@
         <source>A separate TCP connection will be used **for each contact and group member**.
 **Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.</source>
         <target>Se usará una conexión TCP independiente **por cada contacto y miembro de grupo**.
-**Atención**: si tienes muchas conexiones, tu consumo de batería y tráfico pueden ser sustancialmente mayores y algunas conexiones pueden fallar.</target>
+**Atención**: si tienes muchas conexiones, tu consumo de batería y tráfico pueden aumentar bastante y algunas conexiones pueden fallar.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort" xml:space="preserve">
@@ -591,8 +562,16 @@
         <source>Accept</source>
         <target>Aceptar</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -613,7 +592,11 @@
         <source>Accept incognito</source>
         <target>Aceptar incógnito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -630,6 +613,11 @@
         <target>Errores de confirmación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Activo</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Conexiones activas</target>
@@ -645,6 +633,11 @@
         <target>Añadir amigos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Añadir lista</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Añadir perfil</target>
@@ -670,6 +663,11 @@
         <target>Añadir a otro dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Añadir a la lista</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Añadir mensaje de bienvenida</target>
@@ -677,7 +675,7 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
-        <target>Añade a los miembros de tu equipo a las conversaciones.</target>
+        <target>Añade a miembros de tu equipo a las conversaciones.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
@@ -722,7 +720,7 @@
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
-        <target>Configuración de dirección</target>
+        <target>Configurar dirección</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -745,6 +743,11 @@
         <target>Configuración avanzada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Todo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Todos los datos de la aplicación se eliminarán.</target>
@@ -752,9 +755,14 @@
       </trans-unit>
       <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>All chats and messages will be deleted - this cannot be undone!</source>
-        <target>Se eliminarán todos los chats y mensajes. ¡No podrá deshacerse!</target>
+        <target>Se eliminarán todos los chats y mensajes. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Todos los chats se quitarán de la lista %@ y esta será eliminada.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Al introducirlo todos los datos son eliminados.</target>
@@ -777,12 +785,12 @@
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>All messages will be deleted - this cannot be undone!</source>
-        <target>Todos los mensajes serán borrados. ¡No podrá deshacerse!</target>
+        <target>Todos los mensajes serán eliminados. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve">
         <source>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</source>
-        <target>Se eliminarán todos los mensajes SOLO para tí. ¡No podrá deshacerse!</target>
+        <target>Se eliminarán todos los mensajes SOLO para tí. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
@@ -795,6 +803,16 @@
         <target>Todos los perfiles</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Todos los informes serán archivados para ti.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>Todos los servidores</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Todos tus contactos permanecerán conectados.</target>
@@ -870,6 +888,11 @@
         <target>Se permite la eliminación irreversible de mensajes. (24 horas)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Permitir informar de mensajes a los moderadores.</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>
         <target>Se permite enviar enlaces SimpleX.</target>
@@ -950,6 +973,11 @@
         <target>Se creará un perfil vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Otro motivo</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Responder llamada</target>
@@ -975,9 +1003,14 @@
         <target>Cifrado de los nuevos archivos locales (excepto vídeos).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>Grupo app:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
-        <target>Icono aplicación</target>
+        <target>Icono de la aplicación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App passcode" xml:space="preserve">
@@ -992,7 +1025,7 @@
       </trans-unit>
       <trans-unit id="App session" xml:space="preserve">
         <source>App session</source>
-        <target>Sesión de aplicación</target>
+        <target>por sesión</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
@@ -1020,6 +1053,21 @@
         <target>Aplicar a</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archivar</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>¿Archivar %lld informes?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>¿Archivar todos los informes?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archivar y subir</target>
@@ -1030,6 +1078,21 @@
         <target>Archiva contactos para charlar más tarde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Archivar informe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>¿Archivar informe?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Archivar informes</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Contactos archivados</target>
@@ -1140,6 +1203,11 @@
         <target>Grupos mejorados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Rendimiento de grupos mejorado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Sistema de fechas mejorado.</target>
@@ -1160,6 +1228,11 @@
         <target>Notificaciones mejoradas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Privacidad y seguridad mejoradas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Seguridad mejorada ✅</target>
@@ -1260,11 +1333,25 @@
         <target>Chats empresariales</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Empresas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Mediante perfil (predeterminado) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>Al usar SimpleX Chat, aceptas:
+- enviar únicamente contenido legal en los grupos públicos.
+- respetar a los demás usuarios – spam prohibido.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>¡La llamada ha terminado!</target>
@@ -1314,7 +1401,7 @@
         <source>Cancel</source>
         <target>Cancelar</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1351,6 +1438,11 @@
         <target>Cambiar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>¿Modificar la eliminación automática de mensajes?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Cambiar perfil de usuario</target>
@@ -1400,7 +1492,7 @@
         <source>Change self-destruct passcode</source>
         <target>Cambiar código autodestrucción</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1494,12 +1586,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <target>El chat será eliminado para todos los miembros. ¡No podrá deshacerse!</target>
+        <target>El chat será eliminado para todos los miembros. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
-        <target>El chat será eliminado para tí. ¡No podrá deshacerse!</target>
+        <target>El chat será eliminado para tí. ¡No puede deshacerse!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1507,6 +1607,10 @@
         <target>Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Comprobar mensajes cada 20 min.</target>
@@ -1572,9 +1676,19 @@
         <target>¿Vaciar conversación?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>¿Vaciar grupo?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>¿Vaciar o eliminar grupo?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
-        <target>¿Borrar notas privadas?</target>
+        <target>¿Eliminar notas privadas?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Clear verification" xml:space="preserve">
@@ -1592,6 +1706,11 @@
         <target>Modo de color</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Violación de las normas de la comunidad</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Comparar archivo</target>
@@ -1627,16 +1746,6 @@
         <target>Condiciones de uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Las condiciones de los operadores habilitados serán aceptadas después de 30 días.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Las condiciones serán aceptadas para el/los operador(es): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Las condiciones serán aceptadas para el/los operador(es): **%@**.</target>
@@ -1657,6 +1766,11 @@
         <target>Configure servidores ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Configurar operadores de servidores</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Confirmar</target>
@@ -1707,6 +1821,11 @@
         <target>Confirmar subida</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Confirmado</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Conectar</target>
@@ -1826,6 +1945,11 @@ This is your own one-time link!</source>
         <target>Estado de tu conexión y servidores.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Conexión bloqueada</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Error conexión</target>
@@ -1836,6 +1960,18 @@ This is your own one-time link!</source>
         <target>Error de conexión (Autenticación)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>Conexión bloqueada por el operador del servidor:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Conexión no establecida.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Notificaciones de conexión</target>
@@ -1846,6 +1982,11 @@ This is your own one-time link!</source>
         <target>¡Solicitud de conexión enviada!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>La conexión requiere renegociar el cifrado.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Seguridad de conexión</target>
@@ -1913,7 +2054,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact will be deleted - this cannot be undone!</source>
-        <target>El contacto será eliminado. ¡No podrá deshacerse!</target>
+        <target>El contacto será eliminado. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
@@ -1926,6 +2067,11 @@ This is your own one-time link!</source>
         <target>Tus contactos sólo pueden marcar los mensajes para eliminar. Tu podrás verlos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>El contenido viola las condiciones de uso</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Continuar</target>
@@ -2001,6 +2147,11 @@ This is your own one-time link!</source>
         <target>Crear enlace</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Crear lista</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Crea perfil nuevo en la [aplicación para PC](https://simplex.Descargas/de chat/). 💻</target>
@@ -2218,8 +2369,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Eliminar</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2261,6 +2411,11 @@ This is your own one-time link!</source>
         <target>Eliminar chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Elimina los mensajes del dispositivo.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Eliminar perfil</target>
@@ -2271,6 +2426,10 @@ This is your own one-time link!</source>
         <target>¿Eliminar perfil?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>¿Eliminar chat?</target>
@@ -2351,6 +2510,11 @@ This is your own one-time link!</source>
         <target>¿Eliminar enlace?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>¿Eliminar lista?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>¿Eliminar el mensaje de miembro?</target>
@@ -2363,8 +2527,8 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
-        <target>Eliminar mensaje</target>
-        <note>No comment provided by engineer.</note>
+        <target>Activar</target>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2383,7 +2547,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
         <source>Delete or moderate up to 200 messages.</source>
-        <target>Borra o modera hasta 200 mensajes a la vez.</target>
+        <target>Elimina o modera hasta 200 mensajes a la vez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -2401,6 +2565,11 @@ This is your own one-time link!</source>
         <target>Eliminar cola</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Eliminar informe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Elimina hasta 20 mensajes a la vez.</target>
@@ -2561,6 +2730,16 @@ This is your own one-time link!</source>
         <target>Desactivar Bloqueo SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>¿Desactivar la eliminación automática de mensajes?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Desactivar</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Desactivar para todos</target>
@@ -2651,6 +2830,11 @@ This is your own one-time link!</source>
         <target>No uses credenciales con proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Documentos:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>No crear dirección SimpleX</target>
@@ -2661,9 +2845,19 @@ This is your own one-time link!</source>
         <target>No activar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>No pierdas los mensajes importantes.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>No volver a mostrar</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Hecho</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2869,7 @@ This is your own one-time link!</source>
         <source>Download</source>
         <target>Descargar</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2752,9 +2946,9 @@ This is your own one-time link!</source>
         <target>Activar (conservar anulaciones)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Habilita Flux</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Habilitar Flux en la configuración de Red y servidores para mejorar la privacidad de los metadatos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2770,7 +2964,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>¿Activar eliminación automática de mensajes?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2839,7 +3033,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Encrypt local files" xml:space="preserve">
         <source>Encrypt local files</source>
-        <target>Cifra archivos locales</target>
+        <target>Cifrar archivos locales</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
@@ -2897,6 +3091,11 @@ This is your own one-time link!</source>
         <target>Renegociación de cifrado fallida.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Renegociación de cifrado en curso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Introduce Código</target>
@@ -2929,7 +3128,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Enter server manually" xml:space="preserve">
         <source>Enter server manually</source>
-        <target>Introduce el servidor manualmente</target>
+        <target>Añadir manualmente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter this device name…" xml:space="preserve">
@@ -2972,6 +3171,10 @@ This is your own one-time link!</source>
         <target>Error al aceptar solicitud del contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Error al añadir miembro(s)</target>
@@ -3007,6 +3210,11 @@ This is your own one-time link!</source>
         <target>¡Error al cambiar a incógnito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Error al verificar el estado del token</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Error al conectar con el servidor de reenvío %@. Por favor, inténtalo más tarde.</target>
@@ -3027,6 +3235,11 @@ This is your own one-time link!</source>
         <target>Error al crear enlace de grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Error al crear lista</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Error al establecer contacto con el miembro</target>
@@ -3042,6 +3255,11 @@ This is your own one-time link!</source>
         <target>¡Error al crear perfil!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Error al crear informe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Error al descifrar el archivo</target>
@@ -3052,6 +3270,10 @@ This is your own one-time link!</source>
         <target>Error al eliminar base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>¡Error al eliminar chat!</target>
@@ -3152,10 +3374,20 @@ This is your own one-time link!</source>
         <target>Error al reconectar con los servidores</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Error al registrarse para notificaciones</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
-        <target>Error al eliminar miembro</target>
-        <note>No comment provided by engineer.</note>
+        <target>Error al expulsar miembro</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Error al reorganizar listas</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3167,6 +3399,11 @@ This is your own one-time link!</source>
         <target>Error al guardar servidores ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Error al guardar listas</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Error al guardar perfil de grupo</target>
@@ -3247,6 +3484,11 @@ This is your own one-time link!</source>
         <target>Error al sincronizar conexión</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Error al testar la conexión al servidor</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Error al actualizar enlace de grupo</target>
@@ -3290,7 +3532,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3571,11 @@ This is your own one-time link!</source>
         <target>Expandir</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Expirado</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Exportar base de datos</target>
@@ -3367,20 +3616,35 @@ This is your own one-time link!</source>
         <target>¡Rápido y sin necesidad de esperar a que el remitente esté en línea!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Eliminación más rápida de grupos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Mensajería más segura y conexión más rápida.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Envío más rápido de mensajes.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favoritos</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Favoritos</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Error de archivo</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,9 +3653,16 @@ This is your own one-time link!</source>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Archivo bloqueado por el operador del servidor
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
-        <target>Archivo no encontrado, probablemente haya sido borrado o cancelado.</target>
+        <target>Archivo no encontrado, probablemente haya sido eliminado o cancelado.</target>
         <note>file error text</note>
       </trans-unit>
       <trans-unit id="File server error: %@" xml:space="preserve">
@@ -3514,6 +3785,11 @@ This is your own one-time link!</source>
         <target>Corrección no compatible con miembro del grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Para todos los moderadores</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>Para el perfil de chat %@:</target>
@@ -3529,9 +3805,14 @@ This is your own one-time link!</source>
         <target>Si por ejemplo tu contacto recibe los mensajes a través de un servidor de SimpleX Chat, tu aplicación los entregará a través de un servidor de Flux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>para mí</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
-        <target>Para el enrutamiento privado</target>
+        <target>Para enrutamiento privado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For social media" xml:space="preserve">
@@ -3653,6 +3934,11 @@ Error: %2$@</target>
         <target>GIFs y stickers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Las menciones ahora se notifican.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>¡Buenas tardes!</target>
@@ -3750,12 +4036,17 @@ Error: %2$@</target>
       </trans-unit>
       <trans-unit id="Group will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for all members - this cannot be undone!</source>
-        <target>El grupo será eliminado para todos los miembros. ¡No podrá deshacerse!</target>
+        <target>El grupo será eliminado para todos los miembros. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for you - this cannot be undone!</source>
-        <target>El grupo será eliminado para tí. ¡No podrá deshacerse!</target>
+        <target>El grupo será eliminado para tí. ¡No puede deshacerse!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
@@ -3763,6 +4054,11 @@ Error: %2$@</target>
         <target>Ayuda</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Ayuda a los admins a moderar sus grupos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Oculto</target>
@@ -3823,6 +4119,11 @@ Error: %2$@</target>
         <target>Cómo ayuda a la privacidad</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Cómo funciona</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Cómo</target>
@@ -3965,6 +4266,16 @@ More improvements are coming soon!</source>
         <target>Sonido de llamada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Contenido inapropiado</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Perfil inapropiado</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incógnito</target>
@@ -4057,6 +4368,31 @@ More improvements are coming soon!</source>
         <target>Colores del interfaz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>No válido</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>No válido (token incorrecto)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>No válido (expirado)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>No válido (no registrado)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>No válido (tópico incorrecto)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Código QR no válido</target>
@@ -4330,6 +4666,21 @@ This is your link for group %@!</source>
         <target>Ordenadores enlazados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Lista</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>El nombre y el emoji deben ser diferentes en todas las listas.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Nombre de la lista...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>¡Mensaje en vivo!</target>
@@ -4415,11 +4766,20 @@ This is your link for group %@!</source>
         <target>Miembro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Miembro inactivo</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Informes de miembros</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>El rol del miembro cambiará a "%@" y todos serán notificados.</target>
@@ -4437,14 +4797,18 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from chat - this cannot be undone!</source>
-        <target>El miembro será eliminado del chat. ¡No podrá deshacerse!</target>
+        <target>El miembro será eliminado del chat. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from group - this cannot be undone!</source>
-        <target>El miembro será expulsado del grupo. ¡No podrá deshacerse!</target>
+        <target>El miembro será expulsado del grupo. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Los miembros pueden añadir reacciones a los mensajes.</target>
@@ -4455,6 +4819,11 @@ This is your link for group %@!</source>
         <target>Los miembros del grupo pueden eliminar mensajes de forma irreversible. (24 horas)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>Los miembros pueden informar de mensajes a los moderadores.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Los miembros del grupo pueden enviar enlaces SimpleX.</target>
@@ -4480,6 +4849,11 @@ This is your link for group %@!</source>
         <target>Los miembros del grupo pueden enviar mensajes de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Menciona a miembros 👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menus</target>
@@ -4590,6 +4964,11 @@ This is your link for group %@!</source>
         <target>¡Los mensajes de %@ serán mostrados!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Los mensajes de esta conversación nunca se eliminan.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Mensajes recibidos</target>
@@ -4602,7 +4981,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
         <source>Messages were deleted after you selected them.</source>
-        <target>Los mensajes han sido borrados después de seleccionarlos.</target>
+        <target>Los mensajes han sido eliminados después de seleccionarlos.</target>
         <note>alert message</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">
@@ -4690,6 +5069,11 @@ This is your link for group %@!</source>
         <target>Moderado: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Más</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>¡Pronto habrá más mejoras!</target>
@@ -4718,7 +5102,12 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Silenciar</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Silenciar todo</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4770,6 +5159,11 @@ This is your link for group %@!</source>
         <target>Estado de la red</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Nuevo</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Código Nuevo</target>
@@ -4782,7 +5176,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
         <source>New SOCKS credentials will be used for each server.</source>
-        <target>Se usarán credenciales SOCKS nuevas por cada servidor.</target>
+        <target>Se usarán credenciales SOCKS nuevas para cada servidor.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
@@ -4835,6 +5229,10 @@ This is your link for group %@!</source>
         <target>Nuevo rol de miembro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Mensaje nuevo</target>
@@ -4860,6 +5258,25 @@ This is your link for group %@!</source>
         <target>Sin contraseña de la aplicación</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Sin chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Ningún chat encontrado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Sin chats en la lista %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Ningún contacto seleccionado</target>
@@ -4907,12 +5324,17 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No media &amp; file servers." xml:space="preserve">
         <source>No media &amp; file servers.</source>
-        <target>Ningún servidor de archivos y multimedia.</target>
+        <target>Sin servidores para archivos y multimedia.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Ningún mensaje</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
-        <target>Ningún servidor de mensajes.</target>
+        <target>Sin servidores para mensajes.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No network connection" xml:space="preserve">
@@ -4937,7 +5359,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No push server" xml:space="preserve">
         <source>No push server</source>
-        <target>Ningún servidor push</target>
+        <target>Sin servidores push</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No received or sent files" xml:space="preserve">
@@ -4947,24 +5369,34 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No servers for private message routing." xml:space="preserve">
         <source>No servers for private message routing.</source>
-        <target>Ningún servidor para enrutamiento privado.</target>
+        <target>Sin servidores para enrutamiento privado.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive files." xml:space="preserve">
         <source>No servers to receive files.</source>
-        <target>Ningún servidor para recibir archivos.</target>
+        <target>Sin servidores para recibir archivos.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive messages." xml:space="preserve">
         <source>No servers to receive messages.</source>
-        <target>Ningún servidor para recibir mensajes.</target>
+        <target>Sin servidores para recibir mensajes.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to send files." xml:space="preserve">
         <source>No servers to send files.</source>
-        <target>Ningún servidor para enviar archivos.</target>
+        <target>Sin servidores para enviar archivos.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>¡Sin token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Ningún chat sin leer</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Sin identificadores de usuario.</target>
@@ -4975,6 +5407,11 @@ This is your link for group %@!</source>
         <target>¡No compatible!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Notas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Nada seleccionado</target>
@@ -4995,11 +5432,21 @@ This is your link for group %@!</source>
         <target>¡Las notificaciones están desactivadas!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Error en notificaciones</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Privacidad en las notificaciones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Estado notificaciones</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5022,7 +5469,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5065,7 +5513,7 @@ Requiere activación de la VPN.</target>
       </trans-unit>
       <trans-unit id="Only delete conversation" xml:space="preserve">
         <source>Only delete conversation</source>
-        <target>Sólo borrar la conversación</target>
+        <target>Eliminar sólo la conversación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -5083,6 +5531,16 @@ Requiere activación de la VPN.</target>
         <target>Sólo los propietarios del grupo pueden activar los mensajes de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Solo el remitente y el moderador pueden verlo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Solo tú y los moderadores podéis verlo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Sólo tú puedes añadir reacciones a los mensajes.</target>
@@ -5136,7 +5594,7 @@ Requiere activación de la VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Abrir</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5168,6 +5626,10 @@ Requiere activación de la VPN.</target>
         <target>Grupo abierto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Abrir menú migración a otro dispositivo</target>
@@ -5210,7 +5672,7 @@ Requiere activación de la VPN.</target>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
         <source>Or show this code</source>
-        <target>O muestra este código QR</target>
+        <target>O muestra el código QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or to share privately" xml:space="preserve">
@@ -5218,6 +5680,11 @@ Requiere activación de la VPN.</target>
         <target>O para compartir en privado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Organiza tus chats en listas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Otro</target>
@@ -5409,6 +5876,25 @@ Error: %@</target>
         <target>Guarda la contraseña de forma segura, NO podrás cambiarla si la pierdes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Por favor, intenta desactivar y reactivar las notificaciones.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Por favor, espera a que el token de activación se complete.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Por favor, espera a que el token se registre.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Interfaz en polaco</target>
@@ -5459,16 +5945,31 @@ Error: %@</target>
         <target>Privacidad para tus clientes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Política de privacidad y condiciones de uso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Privacidad redefinida</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Los chats privados, los grupos y tus contactos no son accesibles para los operadores de servidores.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Nombres de archivos privados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Nombres privados en archivos de media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Enrutamiento privado de mensajes</target>
@@ -5544,6 +6045,11 @@ Error: %@</target>
         <target>No se permiten reacciones a los mensajes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>No se permite informar de mensajes a los moderadores.</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>
         <target>No se permite enviar enlaces SimpleX.</target>
@@ -5576,7 +6082,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Protect app screen" xml:space="preserve">
         <source>Protect app screen</source>
-        <target>Proteger la pantalla de la aplicación</target>
+        <target>Proteger la pantalla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
@@ -5638,7 +6144,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Reachable chat toolbar" xml:space="preserve">
         <source>Reachable chat toolbar</source>
-        <target>Barra de herramientas accesible</target>
+        <target>Barra de menú accesible</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="React…" xml:space="preserve">
@@ -5773,7 +6279,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Reconnect server to force message delivery. It uses additional traffic." xml:space="preserve">
         <source>Reconnect server to force message delivery. It uses additional traffic.</source>
-        <target>Reconectar el servidor para forzar la entrega de mensajes. Usa tráfico adicional.</target>
+        <target>Reconectar con el servidor para forzar la entrega de mensajes. Se usa tráfico adicional.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reconnect server?" xml:space="preserve">
@@ -5801,11 +6307,26 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Reducción del uso de batería</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Registrar</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>¿Registrar el token de notificaciones?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Registrado</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Rechazar</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5817,6 +6338,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Rechazar solicitud de contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>El servidor de retransmisión sólo se usa en caso de necesidad. Un tercero podría ver tu IP.</target>
@@ -5902,6 +6427,60 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Responder</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Informe</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Informar de contenido: sólo los moderadores del grupo lo verán.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Informar del perfil de un miembro: sólo los moderadores del grupo lo verán.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Informar de otros: sólo los moderadores del grupo lo verán.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>¿Motivo del informe?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Informar de spam: sólo los moderadores del grupo lo verán.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Informar de violación: sólo los moderadores del grupo lo verán.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Informe: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>No se permite informar de mensajes a los moderadores.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Informes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Obligatorio</target>
@@ -5992,10 +6571,13 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Revisar condiciones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Revisar más tarde</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6046,13 +6628,17 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <source>Save</source>
         <target>Guardar</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Guardar (y notificar contactos)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Guardar y notificar contacto</target>
@@ -6078,6 +6664,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Guardar perfil de grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Guardar lista</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Guardar contraseña y abrir el chat</target>
@@ -6175,7 +6766,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Scan server QR code" xml:space="preserve">
         <source>Scan server QR code</source>
-        <target>Escanear código QR del servidor</target>
+        <target>Escanear código QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Search" xml:space="preserve">
@@ -6318,6 +6909,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Enviar notificaciones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Envía informes privados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Consultas y sugerencias</target>
@@ -6520,7 +7116,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Servers statistics will be reset - this cannot be undone!" xml:space="preserve">
         <source>Servers statistics will be reset - this cannot be undone!</source>
-        <target>Las estadísticas de los servidores serán restablecidas. ¡No podrá deshacerse!</target>
+        <target>Las estadísticas de los servidores serán restablecidas. ¡No puede deshacerse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Session code" xml:space="preserve">
@@ -6533,6 +7129,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Establecer 1 día</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Nombre para el chat…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Escribe el nombre del contacto…</target>
@@ -6553,6 +7154,15 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Úsalo en lugar de la autenticación del sistema.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Establece el vencimiento para los mensajes en los chats.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Código autodestrucción</target>
@@ -6597,7 +7207,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <source>Share</source>
         <target>Compartir</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6641,7 +7251,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Comparte perfil</target>
+        <target>Perfil a compartir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6659,6 +7269,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Compartir con contactos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Enlace corto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Mostrar código QR</target>
@@ -6716,7 +7331,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
         <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <target>Simplex Chat y Flux han acordado incluir servidores operados por Flux en la aplicación</target>
+        <target>Simplex Chat y Flux han acordado incluir en la aplicación servidores operados por Flux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
@@ -6751,7 +7366,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="SimpleX address and 1-time links are safe to share via any messenger." xml:space="preserve">
         <source>SimpleX address and 1-time links are safe to share via any messenger.</source>
-        <target>Compartir los enlaces de un uso y las direcciones SimpleX es seguro a través de cualquier medio.</target>
+        <target>Compartir enlaces de un solo uso y direcciones SimpleX es seguro a través de cualquier medio.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address or 1-time link?" xml:space="preserve">
@@ -6759,6 +7374,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>¿Dirección SimpleX o enlace de un uso?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>Enlace de canal SimpleX</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>Dirección de contacto SimpleX</target>
@@ -6821,7 +7441,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Small groups (max 20)" xml:space="preserve">
         <source>Small groups (max 20)</source>
-        <target>Grupos pequeños (máx. 20)</target>
+        <target>Grupos pequeños (max. 20)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Soft" xml:space="preserve">
@@ -6861,6 +7481,12 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Alguien</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Spam</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Cuadrada, circular o cualquier forma intermedia.</target>
@@ -6908,7 +7534,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." xml:space="preserve">
         <source>Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped.</source>
-        <target>Para poder exportar, importar o eliminar la base de datos primero debes parar SimpleX. Mientras tanto no podrás recibir ni enviar mensajes.</target>
+        <target>Para exportar, importar o eliminar la base de datos debes parar SimpleX. Mientra tanto no podrás enviar ni recibir mensajes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat?" xml:space="preserve">
@@ -6946,6 +7572,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Parando chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Almacenamiento</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Fuerte</target>
@@ -6958,7 +7589,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Subscribed" xml:space="preserve">
         <source>Subscribed</source>
-        <target>Suscrito</target>
+        <target>Suscritas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Subscription errors" xml:space="preserve">
@@ -7006,6 +7637,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Timeout de la conexión TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>Puerto TCP para mensajes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7074,13 +7710,18 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Error en archivo temporal</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Prueba no superada en el paso %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Probar notificaciones</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Probar servidor</target>
@@ -7140,7 +7781,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
         <source>The code you scanned is not a SimpleX link QR code.</source>
-        <target>El código QR escaneado no es un enlace SimpleX.</target>
+        <target>El código QR escaneado no es un enlace de SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The connection reached the limit of undelivered messages, your contact may be offline." xml:space="preserve">
@@ -7203,21 +7844,11 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>La base de datos antigua no se eliminó durante la migración, puede eliminarse.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>El perfil sólo se comparte con tus contactos.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Las mismas condiciones se aplicarán al operador **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Las mismas condiciones se aplicarán a el/los operador(es) **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>¡Segundo operador predefinido!</target>
@@ -7235,17 +7866,17 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The servers for new connections of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new connections of your current chat profile **%@**.</source>
-        <target>Lista de servidores para las conexiones nuevas del perfil **%@**.</target>
+        <target>Servidores para conexiones nuevas en tu perfil **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The servers for new files of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new files of your current chat profile **%@**.</source>
-        <target>Los servidores para archivos nuevos en tu perfil actual **%@**.</target>
+        <target>Servidores para enviar archivos en tu perfil **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
         <source>The text you pasted is not a SimpleX link.</source>
-        <target>El texto pegado no es un enlace SimpleX.</target>
+        <target>El texto pegado no es un enlace de SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
@@ -7283,6 +7914,11 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>Esta acción es irreversible. Se eliminarán los mensajes enviados y recibidos anteriores a la selección. Podría tardar varios minutos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Todos los mensajes previos al período seleccionado serán eliminados del chat. ¡No puede deshacerse!</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Esta acción es irreversible. Tu perfil, contactos, mensajes y archivos se perderán irreversiblemente.</target>
@@ -7328,11 +7964,21 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
         <target>¡Este es tu propio enlace de un solo uso!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>Este enlace requiere una versión más reciente de la aplicación. Por favor, actualiza la aplicación o pide a tu contacto un enlace compatible.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Este enlace ha sido usado en otro dispositivo móvil, por favor crea un enlace nuevo en el ordenador.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>El mensaje ha sido eliminado o aún no se ha recibido.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Esta configuración se aplica a los mensajes del perfil actual **%@**.</target>
@@ -7387,7 +8033,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="To protect your privacy, SimpleX uses separate IDs for each of your contacts." xml:space="preserve">
         <source>To protect your privacy, SimpleX uses separate IDs for each of your contacts.</source>
-        <target>Para proteger tu privacidad, en lugar de los identificadores de usuario que usan el resto de plataformas, SimpleX dispone de identificadores para las colas de mensajes, independientes para cada uno de tus contactos.</target>
+        <target>Para proteger tu privacidad, SimpleX usa identificadores distintos para cada uno de tus contactos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To receive" xml:space="preserve">
@@ -7427,7 +8073,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="To use the servers of **%@**, accept conditions of use." xml:space="preserve">
         <source>To use the servers of **%@**, accept conditions of use.</source>
-        <target>Para usar los servidores de **%@**, acepta las condiciones de uso.</target>
+        <target>Para usar los servidores de **%@**, debes aceptar las condiciones de uso.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To verify end-to-end encryption with your contact compare (or scan) the code on your devices." xml:space="preserve">
@@ -7445,6 +8091,11 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>Activa incógnito al conectar.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Estado token: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Opacidad barra</target>
@@ -7512,7 +8163,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="Unblock member for all?" xml:space="preserve">
         <source>Unblock member for all?</source>
-        <target>¿Desbloquear miembro para todos?</target>
+        <target>¿Desbloquear el miembro para todos?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock member?" xml:space="preserve">
@@ -7583,7 +8234,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       <trans-unit id="Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.&#10;To connect, please ask your contact to create another connection link and check that you have a stable network connection." xml:space="preserve">
         <source>Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.
 To connect, please ask your contact to create another connection link and check that you have a stable network connection.</source>
-        <target>A menos que tu contacto haya eliminado la conexión o el enlace haya sido usado, podría ser un error. Por favor, notifícalo.
+        <target>A menos que tu contacto haya eliminado la conexión o el enlace se haya usado, podría ser un error. Por favor, notifícalo.
 Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión de red.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -7610,13 +8261,18 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Activar audio</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>No leído</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Enlace de conexión no compatible</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Hasta 100 últimos mensajes son enviados a los miembros nuevos.</target>
@@ -7642,9 +8298,14 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>¿Actualizar configuración?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Condiciones actualizadas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
-        <target>Al actualizar la configuración el cliente se reconectará a todos los servidores.</target>
+        <target>Para actualizar la configuración el cliente se reconectará a todos los servidores.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upgrade and open chat" xml:space="preserve">
@@ -7702,6 +8363,16 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>¿Usar servidores SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Se usa el puerto TCP %@ cuando no se ha especificado otro.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>Usar puerto TCP 443 solo en servidores predefinidos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Usar Chat</target>
@@ -7714,17 +8385,17 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
       </trans-unit>
       <trans-unit id="Use for files" xml:space="preserve">
         <source>Use for files</source>
-        <target>Usar para archivos</target>
+        <target>Uso para archivos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for messages" xml:space="preserve">
         <source>Use for messages</source>
-        <target>Usar para mensajes</target>
+        <target>Uso para mensajes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
-        <target>Usar para conexiones nuevas</target>
+        <target>Para conexiones nuevas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use from desktop" xml:space="preserve">
@@ -7754,7 +8425,7 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
       </trans-unit>
       <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
         <source>Use private routing with unknown servers.</source>
-        <target>Usar enrutamiento privado con servidores de retransmisión desconocidos.</target>
+        <target>Usar enrutamiento privado con servidores de mensaje desconocidos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
@@ -7767,6 +8438,11 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Usar servidores</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Usar enlaces cortos (BETA)</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>
         <target>Usar la aplicación durante la llamada.</target>
@@ -7777,6 +8453,11 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Usa la aplicación con una sola mano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Usar puerto web</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Selección de usuarios</target>
@@ -8136,7 +8817,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You are not connected to these servers. Private routing is used to deliver messages to them." xml:space="preserve">
         <source>You are not connected to these servers. Private routing is used to deliver messages to them.</source>
-        <target>No estás conectado a estos servidores. Para enviarles mensajes se usa el enrutamiento privado.</target>
+        <target>No tienes conexión directa a estos servidores. Los mensajes destinados a estos usan enrutamiento privado.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can accept calls from lock screen, without device and app authentication." xml:space="preserve">
@@ -8149,11 +8830,6 @@ Repeat join request?</source>
         <target>Puedes cambiar la posición de la barra desde el menú Apariencia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Puedes configurar los operadores desde Servidores y Redes.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>Puedes configurar los servidores a través de su configuración.</target>
@@ -8244,6 +8920,10 @@ Repeat join request?</source>
         <target>Podrás ver el enlace de invitación en detalles de conexión.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>¡No puedes enviar mensajes!</target>
@@ -8308,7 +8988,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
         <source>You need to allow your contact to call to be able to call them.</source>
-        <target>Necesitas permitir que tus contacto llamen para poder llamarles.</target>
+        <target>Debes permitir que tus contacto te llamen para poder llamarles.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -8326,6 +9006,11 @@ Repeat connection request?</source>
         <target>Has enviado una invitación de grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>Deberías recibir notificaciones.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Te conectarás al grupo cuando el dispositivo del anfitrión esté en línea, por favor espera o revisa más tarde.</target>
@@ -8391,11 +9076,6 @@ Repeat connection request?</source>
         <target>Servidores ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Servidores SMP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Mi dirección SimpleX</target>
@@ -8481,6 +9161,11 @@ Repeat connection request?</source>
         <target>El perfil **%@** será compartido.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>El perfil sólo se comparte con tus contactos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos. Los servidores SimpleX no pueden ver tu perfil.</target>
@@ -8491,11 +9176,6 @@ Repeat connection request?</source>
         <target>Tu perfil ha sido modificado. Si lo guardas la actualización será enviada a todos tus contactos.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Tu perfil, contactos y mensajes se almacenan en tu dispositivo.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Tu perfil aleatorio</target>
@@ -8546,6 +9226,10 @@ Repeat connection request?</source>
         <target>y después elige:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>llamada aceptada</target>
@@ -8556,6 +9240,10 @@ Repeat connection request?</source>
         <target>invitación aceptada</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>administrador</target>
@@ -8576,6 +9264,10 @@ Repeat connection request?</source>
         <target>acordando cifrado…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>todos los miembros</target>
@@ -8591,6 +9283,11 @@ Repeat connection request?</source>
         <target>y %lld evento(s) más</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>informes archivados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>intentos</target>
@@ -8629,7 +9326,8 @@ Repeat connection request?</source>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>bloqueado por administrador</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8656,6 +9354,10 @@ Repeat connection request?</source>
         <target>llamando…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>cancelado %@</target>
@@ -8713,7 +9415,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
-        <target>conectando</target>
+        <target>conectando...</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting (accepted)" xml:space="preserve">
@@ -8761,6 +9463,14 @@ Repeat connection request?</source>
         <target>el contacto %1$@ ha cambiado a %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>el contacto dispone de cifrado de extremo a extremo</target>
@@ -8771,6 +9481,10 @@ Repeat connection request?</source>
         <target>el contacto no dispone de cifrado de extremo a extremo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>creador</target>
@@ -8799,7 +9513,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>predeterminado (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8823,7 +9538,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
         <source>deleted group</source>
-        <target>grupo eliminado</target>
+        <target>ha eliminado el grupo</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="different migration in the app/database: %@ / %@" xml:space="preserve">
@@ -8926,21 +9641,11 @@ Repeat connection request?</source>
         <target>error</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>evento ocurrido</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>expirados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>para mejorar la privacidad de los metadatos.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>reenviado</target>
@@ -8951,6 +9656,10 @@ Repeat connection request?</source>
         <target>grupo eliminado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>perfil de grupo actualizado</target>
@@ -9076,6 +9785,10 @@ Repeat connection request?</source>
         <target>conectado</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>mensaje</target>
@@ -9106,20 +9819,20 @@ Repeat connection request?</source>
         <target>moderado por %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>moderador</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>meses</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>silenciar</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>nunca</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9141,6 +9854,10 @@ Repeat connection request?</source>
         <target>sin texto</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>observador</target>
@@ -9150,8 +9867,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>desactivado</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9193,6 +9911,20 @@ Repeat connection request?</source>
         <target>p2p</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>pendiente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>pendiente de aprobación</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>cifrado e2e resistente a tecnología cuántica</target>
@@ -9208,6 +9940,11 @@ Repeat connection request?</source>
         <target>confirmación recibida…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>rechazado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>llamada rechazada</target>
@@ -9228,6 +9965,10 @@ Repeat connection request?</source>
         <target>dirección de contacto eliminada</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>ha eliminado la imagen del perfil</target>
@@ -9238,11 +9979,23 @@ Repeat connection request?</source>
         <target>te ha expulsado</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <target>solicitado para conectar</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>guardado</target>
@@ -9342,11 +10095,6 @@ last received msg: %2$@</source>
         <target>estado desconocido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>activar sonido</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>con IP desprotegida</target>
@@ -9437,6 +10185,10 @@ last received msg: %2$@</source>
         <target>tu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>has sido invitado a un grupo</target>
@@ -9511,7 +10263,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9548,7 +10300,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9570,7 +10322,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9578,6 +10330,11 @@ last received msg: %2$@</source>
         <target>%d evento(s) nuevo(s)</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>De %d chat(s)</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>De: %@</target>
@@ -9593,16 +10350,11 @@ last received msg: %2$@</source>
         <target>Mensajes nuevos</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Mensajes nuevos en %d chat(s)</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9624,7 +10376,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/es.xcloc/contents.json b/apps/ios/SimpleX Localizations/es.xcloc/contents.json
index 340591e607..80cffac8d2 100644
--- a/apps/ios/SimpleX Localizations/es.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/es.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "es",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff
index 2caa98e25b..7c93c5b0bb 100644
--- a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
+++ b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (voidaan kopioida)</target>
@@ -189,6 +177,10 @@
         <target>%d sek</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d ohitettua viestiä</target>
@@ -254,11 +246,6 @@
         <target>%lld uutta käyttöliittymän kieltä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld sekunti(a)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld sekuntia</target>
@@ -309,11 +296,6 @@
         <target>%u viestit ohitettu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <note>No comment provided by engineer.</note>
@@ -322,11 +304,6 @@
         <source>(this device v%@)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <note>No comment provided by engineer.</note>
@@ -387,11 +364,6 @@
         <target>\*bold*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -422,11 +394,6 @@
 - historian muokkaaminen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <note>time to disappear</note>
@@ -439,7 +406,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 päivä</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -454,12 +422,18 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 kuukausi</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 viikko</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -484,11 +458,6 @@
         <target>30 sekuntia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -555,8 +524,16 @@
         <source>Accept</source>
         <target>Hyväksy</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -576,7 +553,11 @@
         <source>Accept incognito</source>
         <target>Hyväksy tuntematon</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -590,6 +571,10 @@
         <source>Acknowledgement errors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <note>No comment provided by engineer.</note>
@@ -603,6 +588,10 @@
         <source>Add friends</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Lisää profiili</target>
@@ -627,6 +616,10 @@
         <target>Lisää toiseen laitteeseen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Lisää tervetuloviesti</target>
@@ -692,6 +685,10 @@
         <source>Advanced settings</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Kaikki sovelluksen tiedot poistetaan.</target>
@@ -702,6 +699,10 @@
         <target>Kaikki keskustelut ja viestit poistetaan - tätä ei voi kumota!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Kaikki tiedot poistetaan, kun se syötetään.</target>
@@ -737,6 +738,14 @@
         <source>All profiles</source>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Kaikki kontaktisi pysyvät yhteydessä.</target>
@@ -808,6 +817,10 @@
         <target>Salli lähetettyjen viestien peruuttamaton poistaminen. (24 tuntia)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
@@ -884,6 +897,10 @@
         <target>Luodaan tyhjä chat-profiili annetulla nimellä, ja sovellus avautuu normaalisti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Vastaa puheluun</target>
@@ -907,6 +924,10 @@
         <source>App encrypts new local files (except videos).</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Sovelluksen kuvake</target>
@@ -949,6 +970,18 @@
         <source>Apply to</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</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>
@@ -957,6 +990,18 @@
         <source>Archive contacts to chat later.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <note>No comment provided by engineer.</note>
@@ -1060,6 +1105,10 @@
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <note>No comment provided by engineer.</note>
@@ -1077,6 +1126,10 @@
         <source>Better notifications</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <note>No comment provided by engineer.</note>
@@ -1162,11 +1215,21 @@
         <source>Business chats</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Chat-profiilin mukaan (oletus) tai [yhteyden mukaan](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Puhelu on jo päättynyt!</target>
@@ -1211,7 +1274,7 @@
         <source>Cancel</source>
         <target>Peruuta</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1244,6 +1307,10 @@
         <target>Muuta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <note>authentication reason</note>
@@ -1292,7 +1359,7 @@
         <source>Change self-destruct passcode</source>
         <target>Vaihda itsetuhoutuva pääsykoodi</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1382,11 +1449,23 @@
         <source>Chat will be deleted for you - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Keskustelut</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <note>No comment provided by engineer.</note>
@@ -1446,6 +1525,14 @@
         <target>Tyhjennä keskustelu?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <note>No comment provided by engineer.</note>
@@ -1463,6 +1550,10 @@
         <source>Color mode</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Vertaa tiedostoa</target>
@@ -1493,14 +1584,6 @@
         <source>Conditions of use</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <note>No comment provided by engineer.</note>
@@ -1518,6 +1601,10 @@
         <target>Määritä ICE-palvelimet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Vahvista</target>
@@ -1563,6 +1650,10 @@
         <source>Confirm upload</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Yhdistä</target>
@@ -1664,6 +1755,10 @@ This is your own one-time link!</source>
         <source>Connection and servers status.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Yhteysvirhe</target>
@@ -1674,6 +1769,15 @@ This is your own one-time link!</source>
         <target>Yhteysvirhe (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <note>No comment provided by engineer.</note>
@@ -1683,6 +1787,10 @@ This is your own one-time link!</source>
         <target>Yhteyspyyntö lähetetty!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1756,6 +1864,10 @@ This is your own one-time link!</source>
         <target>Kontaktit voivat merkitä viestit poistettaviksi; voit katsella niitä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Jatka</target>
@@ -1824,6 +1936,10 @@ This is your own one-time link!</source>
         <target>Luo linkki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Luo uusi profiili [työpöytäsovelluksessa](https://simplex.chat/downloads/). 💻</target>
@@ -1831,6 +1947,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create profile" xml:space="preserve">
         <source>Create profile</source>
+        <target>Luo profiilisi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -2029,8 +2146,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Poista</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2068,6 +2184,10 @@ This is your own one-time link!</source>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Poista keskusteluprofiili</target>
@@ -2078,6 +2198,10 @@ This is your own one-time link!</source>
         <target>Poista keskusteluprofiili?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2155,6 +2279,10 @@ This is your own one-time link!</source>
         <target>Poista linkki?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Poista jäsenviesti?</target>
@@ -2168,7 +2296,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Poista viestit</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2204,6 +2332,10 @@ This is your own one-time link!</source>
         <target>Poista jono</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <note>No comment provided by engineer.</note>
@@ -2349,6 +2481,14 @@ This is your own one-time link!</source>
         <target>Poista SimpleX Lock käytöstä</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Poista käytöstä kaikilta</target>
@@ -2432,6 +2572,10 @@ This is your own one-time link!</source>
         <source>Do not use credentials with proxy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Älä luo osoitetta</target>
@@ -2442,9 +2586,17 @@ This is your own one-time link!</source>
         <target>Älä salli</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Älä näytä uudelleen</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2455,7 +2607,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2524,8 +2676,8 @@ This is your own one-time link!</source>
         <target>Salli (pidä ohitukset)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2541,7 +2693,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Ota automaattinen viestien poisto käyttöön?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2660,6 +2812,10 @@ This is your own one-time link!</source>
         <source>Encryption re-negotiation failed.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Syötä pääsykoodi</target>
@@ -2730,6 +2886,10 @@ This is your own one-time link!</source>
         <target>Virhe kontaktipyynnön hyväksymisessä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Virhe lisättäessä jäseniä</target>
@@ -2762,6 +2922,10 @@ This is your own one-time link!</source>
         <source>Error changing to incognito!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2781,6 +2945,10 @@ This is your own one-time link!</source>
         <target>Virhe ryhmälinkin luomisessa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <note>No comment provided by engineer.</note>
@@ -2794,6 +2962,10 @@ This is your own one-time link!</source>
         <target>Virhe profiilin luomisessa!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Virhe tiedoston salauksen purussa</target>
@@ -2804,6 +2976,10 @@ This is your own one-time link!</source>
         <target>Virhe keskustelujen tietokannan poistamisessa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Virhe keskutelun poistamisessa!</target>
@@ -2897,10 +3073,18 @@ This is your own one-time link!</source>
         <source>Error reconnecting servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Virhe poistettaessa jäsentä</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -2911,6 +3095,10 @@ This is your own one-time link!</source>
         <target>Virhe ICE-palvelimien tallentamisessa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Virhe ryhmäprofiilin tallentamisessa</target>
@@ -2986,6 +3174,10 @@ This is your own one-time link!</source>
         <target>Virhe yhteyden synkronoinnissa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Virhe ryhmälinkin päivittämisessä</target>
@@ -3026,7 +3218,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Virhe: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3060,6 +3254,10 @@ This is your own one-time link!</source>
         <source>Expand</source>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Vie tietokanta</target>
@@ -3098,24 +3296,41 @@ This is your own one-time link!</source>
         <target>Nopea ja ei odotusta, kunnes lähettäjä on online-tilassa!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Suosikki</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3233,6 +3448,10 @@ This is your own one-time link!</source>
         <target>Ryhmän jäsen ei tue korjausta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3246,6 +3465,10 @@ This is your own one-time link!</source>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3350,6 +3573,10 @@ Error: %2$@</source>
         <target>GIFit ja tarrat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <note>message preview</note>
@@ -3451,11 +3678,19 @@ Error: %2$@</source>
         <target>Ryhmä poistetaan sinulta - tätä ei voi perua!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Apua</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Piilotettu</target>
@@ -3513,6 +3748,10 @@ Error: %2$@</source>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Miten</target>
@@ -3645,6 +3884,14 @@ More improvements are coming soon!</source>
         <source>In-call sounds</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -3734,6 +3981,26 @@ More improvements are coming soon!</source>
         <source>Interface colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <note>No comment provided by engineer.</note>
@@ -3985,6 +4252,18 @@ This is your link for group %@!</source>
         <source>Linked desktops</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live-viesti!</target>
@@ -4068,10 +4347,18 @@ This is your link for group %@!</source>
         <target>Jäsen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4095,6 +4382,10 @@ This is your link for group %@!</source>
         <target>Jäsen poistetaan ryhmästä - tätä ei voi perua!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Ryhmän jäsenet voivat lisätä viestireaktioita.</target>
@@ -4105,6 +4396,10 @@ This is your link for group %@!</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="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <note>No comment provided by engineer.</note>
@@ -4129,6 +4424,10 @@ This is your link for group %@!</source>
         <target>Ryhmän jäsenet voivat lähettää ääniviestejä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <note>No comment provided by engineer.</note>
@@ -4226,6 +4525,10 @@ 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 in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <note>No comment provided by engineer.</note>
@@ -4314,6 +4617,10 @@ This is your link for group %@!</source>
         <target>Moderoitu klo: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Lisää parannuksia on tulossa pian!</target>
@@ -4340,7 +4647,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Mykistä</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4387,6 +4698,10 @@ This is your link for group %@!</source>
         <target>Verkon tila</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Uusi pääsykoodi</target>
@@ -4445,6 +4760,10 @@ This is your link for group %@!</source>
         <target>Uusi jäsenrooli</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Uusi viesti</target>
@@ -4469,6 +4788,22 @@ This is your link for group %@!</source>
         <target>Ei sovelluksen salasanaa</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Kontakteja ei ole valittu</target>
@@ -4516,6 +4851,10 @@ This is your link for group %@!</source>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4563,6 +4902,14 @@ This is your link for group %@!</source>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Ensimmäinen alusta ilman käyttäjätunnisteita – suunniteltu yksityiseksi.</target>
@@ -4572,6 +4919,10 @@ This is your link for group %@!</source>
         <source>Not compatible!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
@@ -4590,10 +4941,18 @@ This is your link for group %@!</source>
         <target>Ilmoitukset on poistettu käytöstä!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4615,7 +4974,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4674,6 +5034,14 @@ Edellyttää VPN:n sallimista.</target>
         <target>Vain ryhmän omistajat voivat ottaa ääniviestit käyttöön.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Vain sinä voit lisätä viestireaktioita.</target>
@@ -4726,7 +5094,7 @@ Edellyttää VPN:n sallimista.</target>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -4755,6 +5123,10 @@ Edellyttää VPN:n sallimista.</target>
         <source>Open group</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</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>
@@ -4795,6 +5167,10 @@ Edellyttää VPN:n sallimista.</target>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</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>
@@ -4969,6 +5345,22 @@ Error: %@</source>
         <target>Säilytä tunnuslause turvallisesti, ET voi muuttaa sitä, jos kadotat sen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Puolalainen käyttöliittymä</target>
@@ -5015,16 +5407,28 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Yksityisyys uudelleen määritettynä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Yksityiset tiedostonimet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <note>No comment provided by engineer.</note>
@@ -5093,6 +5497,10 @@ Error: %@</source>
         <target>Estä viestireaktiot.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
@@ -5328,11 +5736,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Pienempi akun käyttö</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Hylkää</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5344,6 +5764,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Hylkää yhteyspyyntö</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Välityspalvelinta käytetään vain tarvittaessa. Toinen osapuoli voi tarkkailla IP-osoitettasi.</target>
@@ -5422,6 +5846,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Vastaa</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Pakollinen</target>
@@ -5505,9 +5973,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5554,13 +6026,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Tallenna</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Tallenna (ja ilmoita kontakteille)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Tallenna ja ilmoita kontaktille</target>
@@ -5585,6 +6061,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Tallenna ryhmäprofiili</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Tallenna tunnuslause ja avaa keskustelu</target>
@@ -5805,6 +6285,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Lähetys ilmoitukset</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Lähetä kysymyksiä ja ideoita</target>
@@ -6000,6 +6484,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Aseta 1 päivä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Aseta kontaktin nimi…</target>
@@ -6019,6 +6507,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Aseta se järjestelmän todennuksen sijaan.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Aseta pääsykoodi</target>
@@ -6060,7 +6556,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Jaa</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6115,6 +6611,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Jaa kontaktien kanssa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <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>
@@ -6207,6 +6707,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX-yhteystiedot</target>
@@ -6298,6 +6802,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Joku</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</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>
@@ -6377,6 +6886,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Stopping chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <note>blur media</note>
@@ -6430,6 +6943,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP-yhteyden aikakatkaisu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6492,13 +7009,17 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Testi epäonnistui vaiheessa %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Testipalvelin</target>
@@ -6615,19 +7136,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Vanhaa tietokantaa ei poistettu siirron aikana, se voidaan kuitenkin poistaa.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Profiili jaetaan vain kontaktiesi kanssa.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -6687,6 +7199,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <target>Tätä toimintoa ei voi kumota - valittua aikaisemmin lähetetyt ja vastaanotetut viestit poistetaan. Tämä voi kestää useita minuutteja.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Tätä toimintoa ei voi kumota - profiilisi, kontaktisi, viestisi ja tiedostosi poistuvat peruuttamattomasti.</target>
@@ -6726,10 +7242,18 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
         <source>This is your own one-time link!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Tämä asetus koskee nykyisen keskusteluprofiilisi viestejä *%@**.</target>
@@ -6831,6 +7355,10 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
         <source>Toggle incognito when connecting.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <note>No comment provided by engineer.</note>
@@ -6983,13 +7511,17 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Poista mykistys</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Lukematon</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <note>No comment provided by engineer.</note>
@@ -7013,6 +7545,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Asetusten päivittäminen yhdistää asiakkaan uudelleen kaikkiin palvelimiin.</target>
@@ -7066,6 +7602,14 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Käytä SimpleX Chat palvelimia?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Käytä chattia</target>
@@ -7124,6 +7668,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
@@ -7132,6 +7680,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
@@ -7463,10 +8015,6 @@ Repeat join request?</source>
         <source>You can change it in Appearance settings.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -7550,6 +8098,10 @@ Repeat join request?</source>
         <source>You can view invitation link again in connection details.</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Et voi lähettää viestejä!</target>
@@ -7626,6 +8178,10 @@ Repeat connection request?</source>
         <target>Lähetit ryhmäkutsun</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Sinut yhdistetään ryhmään, kun ryhmän isännän laite on online-tilassa, odota tai tarkista myöhemmin!</target>
@@ -7688,11 +8244,6 @@ Repeat connection request?</source>
         <target>ICE-palvelimesi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>SMP-palvelimesi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>SimpleX-osoitteesi</target>
@@ -7774,6 +8325,11 @@ Repeat connection request?</source>
         <target>Profiilisi **%@** jaetaan.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Profiili jaetaan vain kontaktiesi kanssa.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa. SimpleX-palvelimet eivät näe profiiliasi.</target>
@@ -7783,11 +8339,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Profiilisi, kontaktisi ja toimitetut viestit tallennetaan laitteellesi.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Satunnainen profiilisi</target>
@@ -7837,6 +8388,10 @@ Repeat connection request?</source>
         <target>edellä, valitse sitten:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>hyväksytty puhelu</target>
@@ -7846,6 +8401,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>ylläpitäjä</target>
@@ -7865,6 +8424,10 @@ Repeat connection request?</source>
         <target>hyväksyy salausta…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <note>feature role</note>
@@ -7878,6 +8441,10 @@ Repeat connection request?</source>
         <source>and %lld other events</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <note>No comment provided by engineer.</note>
@@ -7911,7 +8478,8 @@ Repeat connection request?</source>
       </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
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -7937,6 +8505,10 @@ Repeat connection request?</source>
         <target>soittaa…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>peruutettu %@</target>
@@ -8040,6 +8612,14 @@ Repeat connection request?</source>
         <source>contact %1$@ changed to %2$@</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>kontaktilla on e2e-salaus</target>
@@ -8050,6 +8630,10 @@ Repeat connection request?</source>
         <target>kontaktilla ei ole e2e-salausta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>luoja</target>
@@ -8077,7 +8661,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>oletusarvo (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8202,19 +8787,10 @@ Repeat connection request?</source>
         <target>virhe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>tapahtuma tapahtui</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</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>
@@ -8224,6 +8800,10 @@ Repeat connection request?</source>
         <target>ryhmä poistettu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>ryhmäprofiili päivitetty</target>
@@ -8346,6 +8926,10 @@ Repeat connection request?</source>
         <target>yhdistetty</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <note>No comment provided by engineer.</note>
@@ -8375,19 +8959,19 @@ Repeat connection request?</source>
         <target>%@ moderoi</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>kuukautta</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>ei koskaan</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8409,6 +8993,10 @@ Repeat connection request?</source>
         <target>ei tekstiä</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>tarkkailija</target>
@@ -8418,8 +9006,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>pois</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -8458,6 +9047,18 @@ Repeat connection request?</source>
         <target>vertais</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
@@ -8472,6 +9073,10 @@ Repeat connection request?</source>
         <target>vahvistus saatu…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>hylätty puhelu</target>
@@ -8491,6 +9096,10 @@ Repeat connection request?</source>
         <source>removed contact address</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <note>profile update event chat item</note>
@@ -8500,10 +9109,22 @@ Repeat connection request?</source>
         <target>poisti sinut</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <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>
@@ -8590,10 +9211,6 @@ last received msg: %2$@</source>
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <note>No comment provided by engineer.</note>
@@ -8678,6 +9295,10 @@ last received msg: %2$@</source>
         <source>you</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</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>
@@ -8750,7 +9371,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -8786,7 +9407,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8808,13 +9429,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -8827,15 +9452,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8854,7 +9475,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="fi" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/fi.xcloc/contents.json b/apps/ios/SimpleX Localizations/fi.xcloc/contents.json
index 78ce40cec5..11f7a4861c 100644
--- a/apps/ios/SimpleX Localizations/fi.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/fi.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "fi",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff
index 148156b07c..80b3428cfe 100644
--- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
+++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (peut être copié)</target>
@@ -114,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>Serveur %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>Serveurs %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -200,6 +190,11 @@
         <target>%d sec</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d seconde(s)</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d message·s sauté·s</target>
@@ -270,11 +265,6 @@
         <target>%lld nouvelles langues d'interface</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld seconde·s</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld secondes</target>
@@ -325,11 +315,6 @@
         <target>%u messages sautés.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(nouveau)</target>
@@ -340,11 +325,6 @@
         <target>(cet appareil v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Ajouter un contact** : pour créer un nouveau lien d'invitation.</target>
@@ -382,6 +362,7 @@
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
         <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target>**Scanner / Coller** : pour vous connecter via un lien que vous avez reçu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -409,11 +390,6 @@
         <target>\*gras*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -450,11 +426,6 @@
 - l'historique de modification.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sec</target>
@@ -468,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 jour</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -483,19 +455,28 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 mois</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 semaine</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 an</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>Lien unique</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target>Le lien unique peut être utilisé *avec un seul contact* - partagez le en personne ou via n'importe quelle messagerie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -513,11 +494,6 @@
         <target>30 secondes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -574,6 +550,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>À propos des opérateurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -585,11 +562,20 @@
         <source>Accept</source>
         <target>Accepter</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
+        <target>Accepter les conditions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
@@ -606,10 +592,15 @@
         <source>Accept incognito</source>
         <target>Accepter en incognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
+        <target>Conditions acceptées</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
@@ -622,6 +613,11 @@
         <target>Erreur d'accusé de réception</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Actif</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Connections actives</target>
@@ -634,6 +630,12 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>Ajouter des amis</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Ajouter une liste</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -653,6 +655,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>Ajouter des membres à l'équipe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -660,6 +663,11 @@
         <target>Ajouter à un autre appareil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Ajouter à la liste</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Ajouter un message d'accueil</target>
@@ -667,14 +675,17 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>Ajoutez les membres de votre équipe aux conversations.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>Ajout de serveurs de médias et de fichiers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>Ajout de serveurs de messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
@@ -704,10 +715,12 @@
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
+        <target>Adresse ou lien unique ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
+        <target>Paramètres de l'adresse</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -730,6 +743,11 @@
         <target>Paramètres avancés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Tout</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Toutes les données de l'application sont supprimées.</target>
@@ -740,6 +758,11 @@
         <target>Toutes les discussions et tous les messages seront supprimés - il est impossible de revenir en arrière !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Tous les chats seront supprimés de la liste %@, et la liste sera supprimée.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Toutes les données sont effacées lorsqu'il est saisi.</target>
@@ -757,6 +780,7 @@
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
         <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target>Tous les messages et fichiers sont envoyés **chiffrés de bout en bout**, avec une sécurité post-quantique dans les messages directs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
@@ -779,6 +803,15 @@
         <target>Tous les profiles</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Tous les rapports seront archivés pour vous.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Tous vos contacts resteront connectés.</target>
@@ -854,6 +887,11 @@
         <target>Autoriser la suppression irréversible de messages envoyés. (24 heures)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Permettre de signaler des messages aux modérateurs.</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>
         <target>Autorise l'envoi de liens SimpleX.</target>
@@ -934,6 +972,11 @@
         <target>Un profil de chat vierge portant le nom fourni est créé et l'application s'ouvre normalement.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Autre raison</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Répondre à l'appel</target>
@@ -959,6 +1002,10 @@
         <target>L'application chiffre les nouveaux fichiers locaux (sauf les vidéos).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Icône de l'app</target>
@@ -1004,6 +1051,21 @@
         <target>Appliquer à</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archiver</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archiver les rapports %lld ?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Archiver tous les rapports ?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archiver et téléverser</target>
@@ -1014,6 +1076,21 @@
         <target>Archiver les contacts pour discuter plus tard.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Archiver le rapport</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Archiver le rapport ?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Archiver les rapports</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Contacts archivés</target>
@@ -1124,6 +1201,11 @@
         <target>Des groupes plus performants</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Meilleure performance des groupes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Meilleures dates de messages.</target>
@@ -1144,6 +1226,11 @@
         <target>Notifications améliorées</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Meilleure protection de la privacité et de la sécurité</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Sécurité accrue ✅</target>
@@ -1236,10 +1323,17 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>Adresse professionnelle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>Discussions professionnelles</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Entreprises</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1247,6 +1341,15 @@
         <target>Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>En utilisant SimpleX Chat, vous acceptez de :
+- n'envoyer que du contenu légal dans les groupes publics.
+- respecter les autres utilisateurs - pas de spam.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Appel déjà terminé !</target>
@@ -1296,7 +1399,7 @@
         <source>Cancel</source>
         <target>Annuler</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1333,8 +1436,14 @@
         <target>Changer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Modifier la suppression automatique des messages ?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
+        <target>Changer de profil de discussion</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
@@ -1381,18 +1490,21 @@
         <source>Change self-destruct passcode</source>
         <target>Modifier le code d'autodestruction</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
+        <target>Discussions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists" xml:space="preserve">
         <source>Chat already exists</source>
+        <target>La discussion existe déjà</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists!" xml:space="preserve">
         <source>Chat already exists!</source>
+        <target>La discussion existe déjà !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat colors" xml:space="preserve">
@@ -1472,10 +1584,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target>La discussion sera supprimé pour tous les membres - cela ne peut pas être annulé !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target>Le discussion sera supprimé pour vous - il n'est pas possible de revenir en arrière !</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1483,12 +1605,18 @@
         <target>Discussions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
+        <target>Consulter les messages toutes les 20 minutes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check messages when allowed." xml:space="preserve">
         <source>Check messages when allowed.</source>
+        <target>Consulter les messages quand c'est possible.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check server address and try again." xml:space="preserve">
@@ -1546,6 +1674,16 @@
         <target>Effacer la conversation ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Vider le groupe ?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Vider ou supprimer le groupe ?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Effacer les notes privées ?</target>
@@ -1566,6 +1704,11 @@
         <target>Mode de couleur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Infraction aux règles communautaires</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Comparer le fichier</target>
@@ -1583,38 +1726,37 @@
       </trans-unit>
       <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
         <source>Conditions accepted on: %@.</source>
+        <target>Conditions acceptées le : %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target>Les conditions sont acceptées pour le(s) opérateur(s) : **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
         <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target>Les conditions sont déjà acceptées pour ces opérateurs : **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions of use" xml:space="preserve">
         <source>Conditions of use</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target>Conditions d'utilisation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
+        <target>Les conditions seront acceptées pour le(s) opérateur(s) : **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve">
         <source>Conditions will be accepted on: %@.</source>
+        <target>Les conditions seront acceptées le : %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve">
         <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
+        <target>Les conditions seront automatiquement acceptées pour les opérateurs activés le : %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1622,6 +1764,11 @@
         <target>Configurer les serveurs ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Configurer les opérateurs de serveur</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Confirmer</target>
@@ -1672,6 +1819,11 @@
         <target>Confirmer la transmission</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Confirmé</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Se connecter</target>
@@ -1791,6 +1943,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>État de la connexion et des serveurs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Connexion bloquée</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Erreur de connexion</target>
@@ -1801,6 +1958,18 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de connexion (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>La connexion est bloquée par l'opérateur du serveur :
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>La connexion n'est pas prête.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Notifications de connexion</target>
@@ -1811,8 +1980,14 @@ Il s'agit de votre propre lien unique !</target>
         <target>Demande de connexion envoyée !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>La connexion nécessite une renégociation du cryptage.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
+        <target>Sécurité des connexions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection terminated" xml:space="preserve">
@@ -1890,6 +2065,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Vos contacts peuvent marquer les messages pour les supprimer ; vous pourrez les consulter.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Le contenu enfreint les conditions d'utilisation</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Continuer</target>
@@ -1932,6 +2112,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Create 1-time link" xml:space="preserve">
         <source>Create 1-time link</source>
+        <target>Créer un lien unique</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
@@ -1964,6 +2145,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Créer un lien</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Créer une liste</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Créer un nouveau profil sur [l'application de bureau](https://simplex.chat/downloads/). 💻</target>
@@ -2021,6 +2207,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve">
         <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
+        <target>Le texte sur les conditions actuelles n'a pas pu être chargé. Vous pouvez consulter les conditions en cliquant sur ce lien :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Current passphrase…" xml:space="preserve">
@@ -2180,8 +2367,7 @@ Il s'agit de votre propre lien unique !</target>
         <source>Delete</source>
         <target>Supprimer</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2220,6 +2406,12 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Delete chat" xml:space="preserve">
         <source>Delete chat</source>
+        <target>Supprimer la discussion</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Supprimer les messages de chat de votre appareil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
@@ -2232,8 +2424,13 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer le profil du chat ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
+        <target>Supprimer la discussion ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2311,6 +2508,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer le lien ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Supprimer la liste ?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Supprimer le message de ce membre ?</target>
@@ -2324,7 +2526,7 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Supprimer les messages</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2361,6 +2563,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer la file d'attente</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Supprimer le rapport</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Supprimez jusqu'à 20 messages à la fois.</target>
@@ -2398,6 +2605,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Delivered even when Apple drops them." xml:space="preserve">
         <source>Delivered even when Apple drops them.</source>
+        <target>Distribués même quand Apple les oublie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
@@ -2502,6 +2710,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
         <source>Direct messages between members are prohibited in this chat.</source>
+        <target>Les messages directs entre membres sont interdits dans cette discussion.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
@@ -2519,6 +2728,16 @@ Il s'agit de votre propre lien unique !</target>
         <target>Désactiver SimpleX Lock</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Désactiver la suppression automatique des messages ?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Désactiver la suppression des messages</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Désactiver pour tous</target>
@@ -2609,6 +2828,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Ne pas utiliser d'identifiants avec le proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Documents:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Ne pas créer d'adresse</target>
@@ -2619,9 +2843,19 @@ Il s'agit de votre propre lien unique !</target>
         <target>Ne pas activer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Ne manquez pas les messages importants.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Ne plus afficher</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Terminé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2633,7 +2867,7 @@ Il s'agit de votre propre lien unique !</target>
         <source>Download</source>
         <target>Télécharger</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2687,6 +2921,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="E2E encrypted notifications." xml:space="preserve">
         <source>E2E encrypted notifications.</source>
+        <target>Notifications chiffrées E2E.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Edit" xml:space="preserve">
@@ -2709,8 +2944,9 @@ Il s'agit de votre propre lien unique !</target>
         <target>Activer (conserver les remplacements)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Activez Flux dans les paramètres du réseau et des serveurs pour une meilleure confidentialité des métadonnées.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2726,7 +2962,7 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Activer la suppression automatique des messages ?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2853,6 +3089,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>La renégociation du chiffrement a échoué.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Renégociation du chiffrement en cours.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Entrer le code d'accès</target>
@@ -2920,6 +3161,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Error accepting conditions" xml:space="preserve">
         <source>Error accepting conditions</source>
+        <target>Erreur lors de la validation des conditions</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -2927,6 +3169,10 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de validation de la demande de contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Erreur lors de l'ajout de membre·s</target>
@@ -2934,6 +3180,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Error adding server" xml:space="preserve">
         <source>Error adding server</source>
+        <target>Erreur lors de l'ajout du serveur</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2961,6 +3208,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors du passage en mode incognito !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Erreur lors de la vérification de l'état du jeton (token)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Erreur de connexion au serveur de redirection %@. Veuillez réessayer plus tard.</target>
@@ -2981,6 +3233,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors de la création du lien du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Erreur lors de la création de la liste</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Erreur lors de la création du contact du membre</target>
@@ -2996,6 +3253,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors de la création du profil !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Erreur lors de la création du rapport</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Erreur lors du déchiffrement du fichier</target>
@@ -3006,6 +3268,10 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors de la suppression de la base de données du chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Erreur lors de la suppression du chat !</target>
@@ -3078,6 +3344,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Error loading servers" xml:space="preserve">
         <source>Error loading servers</source>
+        <target>Erreur de chargement des serveurs</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
@@ -3105,10 +3372,20 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de reconnexion des serveurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Erreur lors de l'inscription aux notifications</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Erreur lors de la suppression d'un membre</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Erreur lors de la réorganisation des listes</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3120,6 +3397,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors de la sauvegarde des serveurs ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Erreur lors de l'enregistrement de la liste des chats</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Erreur lors de la sauvegarde du profil de groupe</target>
@@ -3137,6 +3419,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Error saving servers" xml:space="preserve">
         <source>Error saving servers</source>
+        <target>Erreur d'enregistrement des serveurs</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
@@ -3199,6 +3482,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de synchronisation de connexion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Erreur lors du test de connexion au serveur</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Erreur lors de la mise à jour du lien de groupe</target>
@@ -3211,6 +3499,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Error updating server" xml:space="preserve">
         <source>Error updating server</source>
+        <target>Erreur de mise à jour du serveur</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error updating settings" xml:space="preserve">
@@ -3241,7 +3530,9 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Erreur : %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3260,6 +3551,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Errors in servers configuration." xml:space="preserve">
         <source>Errors in servers configuration.</source>
+        <target>Erreurs dans la configuration des serveurs.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
@@ -3277,6 +3569,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Étendre</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Expiré</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Exporter la base de données</target>
@@ -3317,20 +3614,35 @@ Il s'agit de votre propre lien unique !</target>
         <target>Rapide et ne nécessitant pas d'attendre que l'expéditeur soit en ligne !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Suppression plus rapide des groupes.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Connexion plus rapide et messages plus fiables.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Envoi plus rapide des messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favoris</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Favoris</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Erreur de fichier</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3339,6 +3651,13 @@ Il s'agit de votre propre lien unique !</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Le fichier est bloqué par l'opérateur du serveur :
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Fichier introuvable - le fichier a probablement été supprimé ou annulé.</target>
@@ -3464,8 +3783,13 @@ Il s'agit de votre propre lien unique !</target>
         <target>Correction non prise en charge par un membre du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
+        <target>Pour le profil de discussion %@ :</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="For console" xml:space="preserve">
@@ -3475,14 +3799,21 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." xml:space="preserve">
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
+        <target>Par exemple, si votre contact reçoit des messages via un serveur SimpleX Chat, votre application les transmettra via un serveur Flux.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
+        <target>Pour le routage privé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For social media" xml:space="preserve">
         <source>For social media</source>
+        <target>Pour les réseaux sociaux</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forward" xml:space="preserve">
@@ -3599,6 +3930,10 @@ Erreur : %2$@</target>
         <target>GIFs et stickers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Bonjour !</target>
@@ -3704,11 +4039,19 @@ Erreur : %2$@</target>
         <target>Le groupe va être supprimé pour vous - impossible de revenir en arrière !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Aide</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Caché</target>
@@ -3761,12 +4104,18 @@ Erreur : %2$@</target>
       </trans-unit>
       <trans-unit id="How it affects privacy" xml:space="preserve">
         <source>How it affects privacy</source>
+        <target>L'impact sur la vie privée</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How it helps privacy" xml:space="preserve">
         <source>How it helps privacy</source>
+        <target>Comment il contribue à la protection de la vie privée</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Comment faire</target>
@@ -3909,6 +4258,14 @@ D'autres améliorations sont à venir !</target>
         <target>Sons d'appel</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -4001,6 +4358,26 @@ D'autres améliorations sont à venir !</target>
         <target>Couleurs d'interface</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Code QR invalide</target>
@@ -4063,6 +4440,7 @@ D'autres améliorations sont à venir !</target>
       </trans-unit>
       <trans-unit id="Invite to chat" xml:space="preserve">
         <source>Invite to chat</source>
+        <target>Inviter à discuter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invite to group" xml:space="preserve">
@@ -4225,10 +4603,12 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Leave chat" xml:space="preserve">
         <source>Leave chat</source>
+        <target>Quitter la discussion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave chat?" xml:space="preserve">
         <source>Leave chat?</source>
+        <target>Quitter la discussion ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -4271,6 +4651,18 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Bureaux liés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Message dynamique !</target>
@@ -4356,13 +4748,22 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Membre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Membre inactif</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
+        <target>Le rôle du membre sera modifié pour « %@ ». Tous les membres du chat seront notifiés.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
@@ -4377,6 +4778,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from chat - this cannot be undone!</source>
+        <target>Le membre sera retiré de la discussion - cela ne peut pas être annulé !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
@@ -4384,6 +4786,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Ce membre sera retiré du groupe - impossible de revenir en arrière !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Les membres du groupe peuvent ajouter des réactions aux messages.</target>
@@ -4394,6 +4800,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Les membres du groupe peuvent envoyer des liens SimpleX.</target>
@@ -4419,6 +4829,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Les membres du groupe peuvent envoyer des messages vocaux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menus</target>
@@ -4529,6 +4943,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Les messages de %@ seront affichés !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Messages reçus</target>
@@ -4629,6 +5047,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Modéré à : %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Plus d'améliorations à venir !</target>
@@ -4641,6 +5063,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="More reliable notifications" xml:space="preserve">
         <source>More reliable notifications</source>
+        <target>Notifications plus fiables</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -4656,7 +5079,11 @@ Voici votre lien pour le groupe %@ !</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Muet</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4680,6 +5107,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Network decentralization" xml:space="preserve">
         <source>Network decentralization</source>
+        <target>Décentralisation du réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
@@ -4694,6 +5122,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Network operator" xml:space="preserve">
         <source>Network operator</source>
+        <target>Opérateur de réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network settings" xml:space="preserve">
@@ -4706,6 +5135,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>État du réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Nouveau code d'accès</target>
@@ -4753,6 +5186,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="New events" xml:space="preserve">
         <source>New events</source>
+        <target>Nouveaux événements</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="New in %@" xml:space="preserve">
@@ -4770,6 +5204,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Nouveau rôle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Nouveau message</target>
@@ -4782,6 +5220,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="New server" xml:space="preserve">
         <source>New server</source>
+        <target>Nouveau serveur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No" xml:space="preserve">
@@ -4794,6 +5233,22 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Pas de mot de passe pour l'app</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Aucun contact sélectionné</target>
@@ -4841,10 +5296,16 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="No media &amp; file servers." xml:space="preserve">
         <source>No media &amp; file servers.</source>
+        <target>Pas de serveurs de médias et de fichiers.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
+        <target>Pas de serveurs de messages.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No network connection" xml:space="preserve">
@@ -4879,20 +5340,32 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="No servers for private message routing." xml:space="preserve">
         <source>No servers for private message routing.</source>
+        <target>Pas de serveurs pour le routage privé des messages.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive files." xml:space="preserve">
         <source>No servers to receive files.</source>
+        <target>Pas de serveurs pour recevoir des fichiers.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive messages." xml:space="preserve">
         <source>No servers to receive messages.</source>
+        <target>Pas de serveurs pour recevoir des messages.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to send files." xml:space="preserve">
         <source>No servers to send files.</source>
+        <target>Pas de serveurs pour envoyer des fichiers.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Aucun identifiant d'utilisateur.</target>
@@ -4903,6 +5376,10 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Non compatible !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Aucune sélection</target>
@@ -4923,10 +5400,19 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Les notifications sont désactivées !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
+        <target>Notifications sécurisées</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4949,7 +5435,8 @@ Voici votre lien pour le groupe %@ !</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4982,6 +5469,7 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
         <source>Only chat owners can change preferences.</source>
+        <target>Seuls les propriétaires peuvent modifier les préférences.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
@@ -5009,6 +5497,14 @@ Nécessite l'activation d'un VPN.</target>
         <target>Seuls les propriétaires de groupes peuvent activer les messages vocaux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Vous seul pouvez ajouter des réactions aux messages.</target>
@@ -5062,7 +5558,7 @@ Nécessite l'activation d'un VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Ouvrir</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5071,6 +5567,7 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Open changes" xml:space="preserve">
         <source>Open changes</source>
+        <target>Ouvrir les modifications</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open chat" xml:space="preserve">
@@ -5085,6 +5582,7 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Open conditions" xml:space="preserve">
         <source>Open conditions</source>
+        <target>Ouvrir les conditions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open group" xml:space="preserve">
@@ -5092,6 +5590,10 @@ Nécessite l'activation d'un VPN.</target>
         <target>Ouvrir le groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Ouvrir le transfert vers un autre appareil</target>
@@ -5104,14 +5606,17 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Operator" xml:space="preserve">
         <source>Operator</source>
+        <target>Opérateur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Operator server" xml:space="preserve">
         <source>Operator server</source>
+        <target>Serveur de l'opérateur</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Or import archive file" xml:space="preserve">
         <source>Or import archive file</source>
+        <target>Ou importer un fichier d'archive</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
@@ -5136,6 +5641,11 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Or to share privately" xml:space="preserve">
         <source>Or to share privately</source>
+        <target>Ou à partager en privé</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
@@ -5329,6 +5839,22 @@ Erreur : %@</target>
         <target>Veuillez conserver votre phrase secrète en lieu sûr, vous NE pourrez PAS la changer si vous la perdez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Interface en polonais</target>
@@ -5356,6 +5882,7 @@ Erreur : %@</target>
       </trans-unit>
       <trans-unit id="Preset servers" xml:space="preserve">
         <source>Preset servers</source>
+        <target>Serveurs prédéfinis</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preview" xml:space="preserve">
@@ -5375,6 +5902,11 @@ Erreur : %@</target>
       </trans-unit>
       <trans-unit id="Privacy for your customers." xml:space="preserve">
         <source>Privacy for your customers.</source>
+        <target>Respect de la vie privée de vos clients.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
@@ -5382,11 +5914,19 @@ Erreur : %@</target>
         <target>La vie privée redéfinie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Noms de fichiers privés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Routage privé des messages</target>
@@ -5462,6 +6002,10 @@ Erreur : %@</target>
         <target>Interdire les réactions aux messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>Interdire l'envoi de liens SimpleX.</target>
@@ -5719,11 +6263,23 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Réduction de la consommation de batterie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Rejeter</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5735,6 +6291,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Rejeter la demande de contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Le serveur relais n'est utilisé que si nécessaire. Un tiers peut observer votre adresse IP.</target>
@@ -5820,6 +6380,50 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Répondre</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Requis</target>
@@ -5907,11 +6511,16 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Review conditions" xml:space="preserve">
         <source>Review conditions</source>
+        <target>Vérifier les conditions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5962,13 +6571,17 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <source>Save</source>
         <target>Enregistrer</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Enregistrer (et en informer les contacts)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Enregistrer et en informer le contact</target>
@@ -5994,6 +6607,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Enregistrer le profil du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Enregistrer la phrase secrète et ouvrir le chat</target>
@@ -6234,6 +6851,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Envoi de notifications</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Envoyez vos questions et idées</target>
@@ -6361,6 +6982,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Server added to operator %@." xml:space="preserve">
         <source>Server added to operator %@.</source>
+        <target>Serveur ajouté à l'opérateur %@.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
@@ -6380,14 +7002,17 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Server operator changed." xml:space="preserve">
         <source>Server operator changed.</source>
+        <target>L'opérateur du serveur a changé.</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Server operators" xml:space="preserve">
         <source>Server operators</source>
+        <target>Opérateurs de serveur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server protocol changed." xml:space="preserve">
         <source>Server protocol changed.</source>
+        <target>Le protocole du serveur a été modifié.</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
@@ -6445,6 +7070,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Définir 1 jour</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Définir le nom du contact…</target>
@@ -6465,6 +7094,14 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Il permet de remplacer l'authentification du système.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Définir le code d'accès</target>
@@ -6509,7 +7146,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <source>Share</source>
         <target>Partager</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6518,10 +7155,12 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Share 1-time link with a friend" xml:space="preserve">
         <source>Share 1-time link with a friend</source>
+        <target>Partager un lien unique avec un ami</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share SimpleX address on social media." xml:space="preserve">
         <source>Share SimpleX address on social media.</source>
+        <target>Partagez votre adresse SimpleX sur les réseaux sociaux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share address" xml:space="preserve">
@@ -6531,6 +7170,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Share address publicly" xml:space="preserve">
         <source>Share address publicly</source>
+        <target>Partager publiquement votre adresse</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share address with contacts?" xml:space="preserve">
@@ -6568,6 +7208,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Partager avec vos contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Afficher le code QR</target>
@@ -6625,6 +7269,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
         <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
+        <target>SimpleX Chat et Flux ont conclu un accord pour inclure les serveurs exploités par Flux dans l'application.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
@@ -6659,12 +7304,18 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="SimpleX address and 1-time links are safe to share via any messenger." xml:space="preserve">
         <source>SimpleX address and 1-time links are safe to share via any messenger.</source>
+        <target>Les adresses SimpleX et les liens à usage unique peuvent être partagés en toute sécurité via n'importe quelle messagerie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address or 1-time link?" xml:space="preserve">
         <source>SimpleX address or 1-time link?</source>
+        <target>Adresse SimpleX ou lien unique ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>Adresse de contact SimpleX</target>
@@ -6758,6 +7409,8 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       <trans-unit id="Some servers failed the test:&#10;%@" xml:space="preserve">
         <source>Some servers failed the test:
 %@</source>
+        <target>Certains serveurs ont échoué le test :
+%@</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
@@ -6765,6 +7418,11 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Quelqu'un</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Carré, circulaire, ou toute autre forme intermédiaire.</target>
@@ -6850,6 +7508,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Arrêt du chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Fort</target>
@@ -6910,6 +7572,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Délai de connexion TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6937,6 +7603,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
+        <target>Appuyez sur Créer une adresse SimpleX dans le menu pour la créer ultérieurement.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap button " xml:space="preserve">
@@ -6977,13 +7644,17 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Erreur de fichier temporaire</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Échec du test à l'étape %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Tester le serveur</target>
@@ -7028,6 +7699,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="The app protects your privacy by using different operators in each conversation." xml:space="preserve">
         <source>The app protects your privacy by using different operators in each conversation.</source>
+        <target>L'application protège votre vie privée en utilisant des opérateurs différents pour chaque conversation.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
@@ -7047,6 +7719,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="The connection reached the limit of undelivered messages, your contact may be offline." xml:space="preserve">
         <source>The connection reached the limit of undelivered messages, your contact may be offline.</source>
+        <target>La connexion a atteint la limite des messages non délivrés, votre contact est peut-être hors ligne.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
@@ -7104,21 +7777,14 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>L'ancienne base de données n'a pas été supprimée lors de la migration, elle peut être supprimée.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Le profil n'est partagé qu'avec vos contacts.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
+        <target>Les mêmes conditions s'appliquent à l'opérateur **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
+        <target>Le deuxième opérateur prédéfini de l'application !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
@@ -7138,6 +7804,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="The servers for new files of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new files of your current chat profile **%@**.</source>
+        <target>Les serveurs pour les nouveaux fichiers de votre profil de chat actuel **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
@@ -7157,6 +7824,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="These conditions will also apply for: **%@**." xml:space="preserve">
         <source>These conditions will also apply for: **%@**.</source>
+        <target>Ces conditions s'appliquent également aux : **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
@@ -7179,6 +7847,10 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Cette action ne peut être annulée - les messages envoyés et reçus avant la date sélectionnée seront supprimés. Cela peut prendre plusieurs minutes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Cette action ne peut être annulée - votre profil, vos contacts, vos messages et vos fichiers seront irréversiblement perdus.</target>
@@ -7224,11 +7896,19 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Voici votre propre lien unique !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Ce lien a été utilisé avec un autre appareil mobile, veuillez créer un nouveau lien sur le bureau.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Ce paramètre s'applique aux messages de votre profil de chat actuel **%@**.</target>
@@ -7261,6 +7941,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="To protect against your link being replaced, you can compare contact security codes." xml:space="preserve">
         <source>To protect against your link being replaced, you can compare contact security codes.</source>
+        <target>Pour vous protéger contre le remplacement de votre lien, vous pouvez comparer les codes de sécurité des contacts.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To protect timezone, image/voice files use UTC." xml:space="preserve">
@@ -7287,6 +7968,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="To receive" xml:space="preserve">
         <source>To receive</source>
+        <target>Pour recevoir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
@@ -7311,6 +7993,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="To send" xml:space="preserve">
         <source>To send</source>
+        <target>Pour envoyer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
@@ -7320,6 +8003,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="To use the servers of **%@**, accept conditions of use." xml:space="preserve">
         <source>To use the servers of **%@**, accept conditions of use.</source>
+        <target>Pour utiliser les serveurs de **%@**, acceptez les conditions d'utilisation.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To verify end-to-end encryption with your contact compare (or scan) the code on your devices." xml:space="preserve">
@@ -7337,6 +8021,10 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Basculer en mode incognito lors de la connexion.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Opacité de la barre d'outils</target>
@@ -7414,6 +8102,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="Undelivered messages" xml:space="preserve">
         <source>Undelivered messages</source>
+        <target>Messages non distribués</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
@@ -7501,13 +8190,17 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Démute</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Non lu</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Les 100 derniers messages sont envoyés aux nouveaux membres.</target>
@@ -7533,6 +8226,10 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Mettre à jour les paramètres ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>La mise à jour des ces paramètres reconnectera le client à tous les serveurs.</target>
@@ -7575,6 +8272,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Use %@" xml:space="preserve">
         <source>Use %@</source>
+        <target>Utiliser %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -7592,6 +8290,14 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser les serveurs SimpleX Chat ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Utiliser le chat</target>
@@ -7604,10 +8310,12 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Use for files" xml:space="preserve">
         <source>Use for files</source>
+        <target>Utiliser pour les fichiers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for messages" xml:space="preserve">
         <source>Use for messages</source>
+        <target>Utiliser pour les messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
@@ -7652,6 +8360,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Use servers" xml:space="preserve">
         <source>Use servers</source>
+        <target>Utiliser les serveurs</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
@@ -7664,6 +8377,10 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser l'application d'une main.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Sélection de l'utilisateur</target>
@@ -7746,6 +8463,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="View conditions" xml:space="preserve">
         <source>View conditions</source>
+        <target>Voir les conditions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="View security code" xml:space="preserve">
@@ -7755,6 +8473,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="View updated conditions" xml:space="preserve">
         <source>View updated conditions</source>
+        <target>Voir les conditions mises à jour</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Visible history" xml:space="preserve">
@@ -7869,6 +8588,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="When more than one operator is enabled, none of them has metadata to learn who communicates with whom." xml:space="preserve">
         <source>When more than one operator is enabled, none of them has metadata to learn who communicates with whom.</source>
+        <target>Lorsque plusieurs opérateurs sont activés, aucun d'entre eux ne dispose de métadonnées permettant de savoir qui communique avec qui.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." xml:space="preserve">
@@ -7968,6 +8688,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="You are already connected with %@." xml:space="preserve">
         <source>You are already connected with %@.</source>
+        <target>Vous êtes déjà connecté avec %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connecting to %@." xml:space="preserve">
@@ -8032,12 +8753,9 @@ Répéter la demande d'adhésion ?</target>
         <target>Vous pouvez choisir de le modifier dans les paramètres d'apparence.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
+        <target>Vous pouvez configurer les serveurs via les paramètres.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
@@ -8082,6 +8800,7 @@ Répéter la demande d'adhésion ?</target>
       </trans-unit>
       <trans-unit id="You can set connection name, to remember who the link was shared with." xml:space="preserve">
         <source>You can set connection name, to remember who the link was shared with.</source>
+        <target>Vous pouvez définir un nom de connexion pour vous rappeler avec qui le lien a été partagé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -8124,6 +8843,10 @@ Répéter la demande d'adhésion ?</target>
         <target>Vous pouvez à nouveau consulter le lien d'invitation dans les détails de la connexion.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Vous ne pouvez pas envoyer de messages !</target>
@@ -8206,6 +8929,10 @@ Répéter la demande de connexion ?</target>
         <target>Vous avez envoyé une invitation de groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Vous serez connecté·e au groupe lorsque l'appareil de l'hôte sera en ligne, veuillez attendre ou vérifier plus tard !</target>
@@ -8243,6 +8970,7 @@ Répéter la demande de connexion ?</target>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
         <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
+        <target>Vous ne recevrez plus de messages de cette discussion. L'historique sera préservé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
@@ -8270,11 +8998,6 @@ Répéter la demande de connexion ?</target>
         <target>Vos serveurs ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Vos serveurs SMP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Votre adresse SimpleX</target>
@@ -8360,6 +9083,11 @@ Répéter la demande de connexion ?</target>
         <target>Votre profil **%@** sera partagé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Le profil n'est partagé qu'avec vos contacts.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts. Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
@@ -8370,11 +9098,6 @@ Répéter la demande de connexion ?</target>
         <target>Votre profil a été modifié. Si vous l'enregistrez, le profil mis à jour sera envoyé à tous vos contacts.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Votre profil aléatoire</target>
@@ -8387,6 +9110,7 @@ Répéter la demande de connexion ?</target>
       </trans-unit>
       <trans-unit id="Your servers" xml:space="preserve">
         <source>Your servers</source>
+        <target>Vos serveurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your settings" xml:space="preserve">
@@ -8424,6 +9148,10 @@ Répéter la demande de connexion ?</target>
         <target>ci-dessus, puis choisissez :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>appel accepté</target>
@@ -8431,8 +9159,13 @@ Répéter la demande de connexion ?</target>
       </trans-unit>
       <trans-unit id="accepted invitation" xml:space="preserve">
         <source>accepted invitation</source>
+        <target>invitation acceptée</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>admin</target>
@@ -8453,6 +9186,10 @@ Répéter la demande de connexion ?</target>
         <target>négociation du chiffrement…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>tous les membres</target>
@@ -8468,6 +9205,10 @@ Répéter la demande de connexion ?</target>
         <target>et %lld autres événements</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>tentatives</target>
@@ -8506,7 +9247,8 @@ Répéter la demande de connexion ?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>bloqué par l'administrateur</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8533,6 +9275,10 @@ Répéter la demande de connexion ?</target>
         <target>appel…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>annulé %@</target>
@@ -8638,6 +9384,14 @@ Répéter la demande de connexion ?</target>
         <target>le contact %1$@ est devenu %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>Ce contact a le chiffrement de bout en bout</target>
@@ -8648,6 +9402,10 @@ Répéter la demande de connexion ?</target>
         <target>Ce contact n'a pas le chiffrement de bout en bout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>créateur</target>
@@ -8676,7 +9434,8 @@ Répéter la demande de connexion ?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>défaut (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8803,20 +9562,11 @@ Répéter la demande de connexion ?</target>
         <target>erreur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>expiré</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>transféré</target>
@@ -8827,6 +9577,10 @@ Répéter la demande de connexion ?</target>
         <target>groupe supprimé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>mise à jour du profil de groupe</target>
@@ -8952,6 +9706,10 @@ Répéter la demande de connexion ?</target>
         <target>est connecté·e</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>message</target>
@@ -8982,20 +9740,19 @@ Répéter la demande de connexion ?</target>
         <target>modéré par %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>mois</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>muet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>jamais</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9017,6 +9774,10 @@ Répéter la demande de connexion ?</target>
         <target>aucun texte</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>observateur</target>
@@ -9026,8 +9787,9 @@ Répéter la demande de connexion ?</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9069,6 +9831,18 @@ Répéter la demande de connexion ?</target>
         <target>pair-à-pair</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>chiffrement e2e résistant post-quantique</target>
@@ -9084,6 +9858,10 @@ Répéter la demande de connexion ?</target>
         <target>confimation reçu…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>appel rejeté</target>
@@ -9104,6 +9882,10 @@ Répéter la demande de connexion ?</target>
         <target>suppression de l'adresse de contact</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>suppression de la photo de profil</target>
@@ -9114,10 +9896,23 @@ Répéter la demande de connexion ?</target>
         <target>vous a retiré</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
+        <target>demande à se connecter</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>enregistré</target>
@@ -9217,11 +10012,6 @@ dernier message reçu : %2$@</target>
         <target>statut inconnu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>démuter</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>non protégé</target>
@@ -9312,6 +10102,10 @@ dernier message reçu : %2$@</target>
         <target>vous</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>vous êtes invité·e au groupe</target>
@@ -9386,7 +10180,7 @@ dernier message reçu : %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9423,7 +10217,7 @@ dernier message reçu : %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9445,34 +10239,38 @@ dernier message reçu : %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
+        <target>%d nouveaux événements</target>
+        <note>notification body</note>
+      </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
         <note>notification body</note>
       </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
+        <target>De : %@</target>
         <note>notification body</note>
       </trans-unit>
       <trans-unit id="New events" xml:space="preserve">
         <source>New events</source>
+        <target>Nouveaux événements</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="New messages" xml:space="preserve">
         <source>New messages</source>
+        <target>Nouveaux messages</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9494,7 +10292,7 @@ dernier message reçu : %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/contents.json b/apps/ios/SimpleX Localizations/fr.xcloc/contents.json
index 22d271b92e..d026c874ec 100644
--- a/apps/ios/SimpleX Localizations/fr.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/fr.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "fr",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff b/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff
index 08f46bb056..f76d7eba1e 100644
--- a/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff	
+++ b/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff	
@@ -3569,8 +3569,8 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/hr.xcloc/Localized Contents/hr.xliff b/apps/ios/SimpleX Localizations/hr.xcloc/Localized Contents/hr.xliff
index 2fd96e3492..6ad4d159c7 100644
--- a/apps/ios/SimpleX Localizations/hr.xcloc/Localized Contents/hr.xliff	
+++ b/apps/ios/SimpleX Localizations/hr.xcloc/Localized Contents/hr.xliff	
@@ -114,12 +114,12 @@
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve">
         <source>%lld</source>
-        <target></target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld %@" xml:space="preserve">
         <source>%lld %@</source>
-        <target></target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
@@ -144,12 +144,12 @@
       </trans-unit>
       <trans-unit id="%lldd" xml:space="preserve">
         <source>%lldd</source>
-        <target></target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldh" xml:space="preserve">
         <source>%lldh</source>
-        <target></target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldk" xml:space="preserve">
@@ -158,7 +158,7 @@
       </trans-unit>
       <trans-unit id="%lldm" xml:space="preserve">
         <source>%lldm</source>
-        <target></target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldmth" xml:space="preserve">
@@ -173,12 +173,14 @@
         <source>%lldw</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
+      <trans-unit id="(" xml:space="preserve" approved="no">
         <source>(</source>
+        <target state="translated">(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
+      <trans-unit id=")" xml:space="preserve" approved="no">
         <source>)</source>
+        <target state="translated">)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve" approved="no">
@@ -248,22 +250,22 @@
       </trans-unit>
       <trans-unit id="1 day" xml:space="preserve" approved="no">
         <source>1 day</source>
-        <target state="needs-translation">1 dan</target>
+        <target state="translated">1 dan</target>
         <note>message ttl</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve" approved="no">
         <source>1 hour</source>
-        <target state="needs-translation">1 sat</target>
+        <target state="translated">1 sat</target>
         <note>message ttl</note>
       </trans-unit>
       <trans-unit id="1 month" xml:space="preserve" approved="no">
         <source>1 month</source>
-        <target state="needs-translation">1 mjesec</target>
+        <target state="translated">1 mesec</target>
         <note>message ttl</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve" approved="no">
         <source>1 week</source>
-        <target state="needs-translation">1 tjedan</target>
+        <target state="translated">1 nedelja</target>
         <note>message ttl</note>
       </trans-unit>
       <trans-unit id="2 weeks" xml:space="preserve" approved="no">
@@ -1518,16 +1520,19 @@
         <source>Immune to spam</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Import" xml:space="preserve">
+      <trans-unit id="Import" xml:space="preserve" approved="no">
         <source>Import</source>
+        <target state="translated">Uvesti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Import chat database?" xml:space="preserve">
+      <trans-unit id="Import chat database?" xml:space="preserve" approved="no">
         <source>Import chat database?</source>
+        <target state="translated">Uvesti data bazu razgovora?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Import database" xml:space="preserve">
+      <trans-unit id="Import database" xml:space="preserve" approved="no">
         <source>Import database</source>
+        <target state="translated">Uvesti data bazu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved privacy and security" xml:space="preserve">
@@ -1688,12 +1693,14 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>Live message!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Live messages" xml:space="preserve">
+      <trans-unit id="Live messages" xml:space="preserve" approved="no">
         <source>Live messages</source>
+        <target state="translated">Žive poruke</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Local name" xml:space="preserve">
+      <trans-unit id="Local name" xml:space="preserve" approved="no">
         <source>Local name</source>
+        <target state="translated">Lokalno ime</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Local profile data only" xml:space="preserve">
@@ -2612,8 +2619,8 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -3152,8 +3159,9 @@ SimpleX servers cannot see your profile.</source>
         <source>\_italic_</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="`a + b`" xml:space="preserve">
+      <trans-unit id="`a + b`" xml:space="preserve" approved="no">
         <source>\`a + b`</source>
+        <target state="translated">\`a + b`</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="above, then choose:" xml:space="preserve">
@@ -3613,6 +3621,110 @@ SimpleX servers cannot see your profile.</source>
         <source>\~strike~</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="translated"># %@</target>
+      </trans-unit>
+      <trans-unit id="%@ server" xml:space="preserve" approved="no">
+        <source>%@ server</source>
+        <target state="translated">%@ server</target>
+      </trans-unit>
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
+        <source>%@ servers</source>
+        <target state="translated">%@ serveri</target>
+      </trans-unit>
+      <trans-unit id="Import failed" xml:space="preserve" approved="no">
+        <source>Import failed</source>
+        <target state="translated">Uvoz neuspešan</target>
+      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">%@ preuzeto</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@ otpremljeno</target>
+      </trans-unit>
+      <trans-unit id="1 minute" xml:space="preserve" approved="no">
+        <source>1 minute</source>
+        <target state="translated">1 minut</target>
+      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve" approved="no">
+        <source>Password</source>
+        <target state="translated">Šifra</target>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## Istorija</target>
+      </trans-unit>
+      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
+        <source>%@ (current)</source>
+        <target state="translated">%@ (trenutan)</target>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ i %@</target>
+      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ povezan</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 sek</target>
+      </trans-unit>
+      <trans-unit id="5 minutes" xml:space="preserve" approved="no">
+        <source>5 minutes</source>
+        <target state="translated">5 minuta</target>
+      </trans-unit>
+      <trans-unit id="%@ (current):" xml:space="preserve" approved="no">
+        <source>%@ (current):</source>
+        <target state="translated">%@ (trenutan):</target>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ i %@ su povezani</target>
+      </trans-unit>
+      <trans-unit id="%@:" xml:space="preserve" approved="no">
+        <source>%@:</source>
+        <target state="translated">%@:</target>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ u %2$@:</target>
+      </trans-unit>
+      <trans-unit id="30 seconds" xml:space="preserve" approved="no">
+        <source>30 seconds</source>
+        <target state="translated">30 sekundi</target>
+      </trans-unit>
+      <trans-unit id="Password to show" xml:space="preserve" approved="no">
+        <source>Password to show</source>
+        <target state="translated">Prikazati šifru</target>
+      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
+        <source>%1$@, %2$@</source>
+        <target state="translated">%1$@, %2$@</target>
+      </trans-unit>
+      <trans-unit id="0s" xml:space="preserve" approved="no">
+        <source>0s</source>
+        <target state="translated">0s</target>
+      </trans-unit>
+      <trans-unit id="Import theme" xml:space="preserve" approved="no">
+        <source>Import theme</source>
+        <target state="translated">Uvesti temu</target>
+      </trans-unit>
+      <trans-unit id="Immediately" xml:space="preserve" approved="no">
+        <source>Immediately</source>
+        <target state="translated">Odmah</target>
+      </trans-unit>
+      <trans-unit id="Address settings" xml:space="preserve" approved="no">
+        <source>Address settings</source>
+        <target state="translated">Podešavanje adrese</target>
+      </trans-unit>
+      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
+        <source>Admins can block a member for all.</source>
+        <target state="needs-translation">Administratori mogu da blokiraju</target>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="hr" datatype="plaintext">
diff --git a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff
index 231c33523d..5fd4c21027 100644
--- a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
+++ b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (másolható)</target>
@@ -39,7 +27,7 @@
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve">
         <source>## In reply to</source>
-        <target>## Válaszul erre:</target>
+        <target>## Válaszul erre</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
@@ -104,7 +92,7 @@
       </trans-unit>
       <trans-unit id="%@ is not verified" xml:space="preserve">
         <source>%@ is not verified</source>
-        <target>%@ nem hitelesített</target>
+        <target>%@ nincs hitelesítve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ is verified" xml:space="preserve">
@@ -164,7 +152,7 @@
       </trans-unit>
       <trans-unit id="%d file(s) failed to download." xml:space="preserve">
         <source>%d file(s) failed to download.</source>
-        <target>%d fájlt nem sikerült letölteni.</target>
+        <target>Nem sikerült letölteni %d fájlt.</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were deleted." xml:space="preserve">
@@ -202,6 +190,11 @@
         <target>%d mp</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d másodperc</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d üzenet kihagyva</target>
@@ -224,12 +217,12 @@
       </trans-unit>
       <trans-unit id="%lld contact(s) selected" xml:space="preserve">
         <source>%lld contact(s) selected</source>
-        <target>%lld ismerős kiválasztva</target>
+        <target>%lld partner kijelölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve">
         <source>%lld file(s) with total size of %@</source>
-        <target>%lld fájl, amely(ek)nek teljes mérete: %@</target>
+        <target>%lld fájl, %@ összméretben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld group events" xml:space="preserve">
@@ -254,7 +247,7 @@
       </trans-unit>
       <trans-unit id="%lld messages marked deleted" xml:space="preserve">
         <source>%lld messages marked deleted</source>
-        <target>%lld törlésre megjelölt üzenet</target>
+        <target>%lld üzenet megjelölve törlésre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
@@ -272,24 +265,19 @@
         <target>%lld új kezelőfelületi nyelv</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld másodperc</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
-        <target>%lld másodperc</target>
+        <target>%lld mp</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldd" xml:space="preserve">
         <source>%lldd</source>
-        <target>%lldd</target>
+        <target>%lldn</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldh" xml:space="preserve">
         <source>%lldh</source>
-        <target>%lldh</target>
+        <target>%lldó</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldk" xml:space="preserve">
@@ -299,27 +287,27 @@
       </trans-unit>
       <trans-unit id="%lldm" xml:space="preserve">
         <source>%lldm</source>
-        <target>%lldm</target>
+        <target>%lldp</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldmth" xml:space="preserve">
         <source>%lldmth</source>
-        <target>%lldmth</target>
+        <target>%lldh</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%llds" xml:space="preserve">
         <source>%llds</source>
-        <target>%llds</target>
+        <target>%lldmp</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldw" xml:space="preserve">
         <source>%lldw</source>
-        <target>%lldw</target>
+        <target>%lldhét</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%u messages failed to decrypt." xml:space="preserve">
         <source>%u messages failed to decrypt.</source>
-        <target>%u üzenet visszafejtése sikertelen.</target>
+        <target>Nem sikerült visszafejteni %u üzenetet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%u messages skipped." xml:space="preserve">
@@ -327,11 +315,6 @@
         <target>%u üzenet kihagyva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(új)</target>
@@ -342,14 +325,9 @@
         <target>(ez az eszköz: v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
-        <target>**Ismerős hozzáadása:** új meghívó-hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.</target>
+        <target>**Partner hozzáadása:** új meghívási hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
@@ -359,7 +337,7 @@
       </trans-unit>
       <trans-unit id="**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata." xml:space="preserve">
         <source>**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata.</source>
-        <target>**Privátabb:** 20 percenként ellenőrzi az új üzeneteket. Az eszköztoken megosztásra kerül a SimpleX Chat-kiszolgálóval, de az nem, hogy hány ismerőse vagy üzenete van.</target>
+        <target>**Privátabb:** 20 percenként ellenőrzi az új üzeneteket. Az eszköztoken meg lesz osztva a SimpleX Chat-kiszolgálóval, de az nem, hogy hány partnere vagy üzenete van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Most private**: do not use SimpleX Chat push server. The app will check messages in background, when the system allows it, depending on how often you use the app." xml:space="preserve">
@@ -369,17 +347,17 @@
       </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>
-        <target>**Megjegyzés:** ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja az ismerőseitől érkező üzenetek visszafejtését.</target>
+        <target>**Megjegyzés:** ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja a partnereitől érkező üzenetek visszafejtését.</target>
         <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>**Megjegyzés:** NEM tudja visszaállítani vagy megváltoztatni jelmondatát, ha elveszíti azt.</target>
+        <target>**Megjegyzés:** NEM fogja tudni helyreállítani, vagy módosítani a jelmondatot abban az esetben, ha elveszíti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." xml:space="preserve">
         <source>**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from.</source>
-        <target>**Megjegyzés:** az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.</target>
+        <target>**Megjegyzés:** az eszköztoken és az értesítések el lesznek küldve a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
@@ -394,7 +372,7 @@
       </trans-unit>
       <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve">
         <source>**Warning**: the archive will be removed.</source>
-        <target>**Figyelmeztetés:** az archívum eltávolításra kerül.</target>
+        <target>**Figyelmeztetés:** az archívum el lesz távolítva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
@@ -412,11 +390,6 @@
         <target>\*félkövér*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -431,7 +404,7 @@
 - a bit better groups.
 - and more!</source>
         <target>- stabilabb üzenetkézbesítés.
-- valamivel jobb csoportok.
+- picit továbbfejlesztett csoportok.
 - és még sok más!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -439,8 +412,8 @@
         <source>- optionally notify deleted contacts.
 - profile names with spaces.
 - and more!</source>
-        <target>- értesíti az ismerősöket a törlésről (nem kötelező)
-- profil nevek szóközökkel
+        <target>- partnerek értesítése a törlésről (nem kötelező)
+- profilnevek szóközökkel
 - és még sok más!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -448,16 +421,11 @@
         <source>- voice messages up to 5 minutes.
 - custom time to disappear.
 - editing history.</source>
-        <target>- 5 perc hosszúságú hangüzenetek.
-- egyedi üzenet-eltűnési időkorlát.
+        <target>- legfeljebb 5 perc hosszúságú hangüzenetek.
+- egyéni üzenet-eltűnési időkorlát.
 - előzmények szerkesztése.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 mp</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 nap</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,21 +455,28 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 hónap</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 hét</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 év</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
-        <target>Egyszer használható meghívó-hivatkozás</target>
+        <target>Egyszer használható meghívó</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
-        <target>Az egyszer használható meghívó-hivatkozás csak *egyetlen ismerőssel használható* - személyesen vagy bármilyen üzenetküldőn keresztül megosztható.</target>
+        <target>Az egyszer használható meghívó egy hivatkozás és *csak egyetlen partnerrel használható* – személyesen vagy bármilyen üzenetváltó-alkalmazáson keresztül megosztható.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -518,11 +494,6 @@
         <target>30 másodperc</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -532,17 +503,17 @@
       </trans-unit>
       <trans-unit id="A few more things" xml:space="preserve">
         <source>A few more things</source>
-        <target>Még néhány dolog</target>
+        <target>Néhány további dolog</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A new contact" xml:space="preserve">
         <source>A new contact</source>
-        <target>Egy új ismerős</target>
+        <target>Egy új partner</target>
         <note>notification title</note>
       </trans-unit>
       <trans-unit id="A new random profile will be shared." xml:space="preserve">
         <source>A new random profile will be shared.</source>
-        <target>Egy új, véletlenszerű profil kerül megosztásra.</target>
+        <target>Egy új, véletlenszerű profil lesz megosztva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -553,7 +524,7 @@
       <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve">
         <source>A separate TCP connection will be used **for each contact and group member**.
 **Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.</source>
-        <target>**Az összes ismerőséhez és csoporttaghoz** külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.
+        <target>**Az összes partneréhez és csoporttaghoz** külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.
 **Megjegyzés:** ha sok kapcsolata van, az akkumulátor-használat és az adatforgalom jelentősen megnövekedhet, és néhány kapcsolódási kísérlet sikertelen lehet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -564,17 +535,17 @@
       </trans-unit>
       <trans-unit id="Abort changing address" xml:space="preserve">
         <source>Abort changing address</source>
-        <target>Címváltoztatás megszakítása</target>
+        <target>Cím módosításának megszakítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort changing address?" xml:space="preserve">
         <source>Abort changing address?</source>
-        <target>Címváltoztatás megszakítása??</target>
+        <target>Megszakítja a cím módosítását?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="About SimpleX Chat" xml:space="preserve">
         <source>About SimpleX Chat</source>
-        <target>SimpleX Chat névjegye</target>
+        <target>A SimpleX Chat névjegye</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
@@ -584,15 +555,25 @@
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
         <source>Accent</source>
-        <target>Kiemelés</target>
+        <target>Kiemelőszín</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept" xml:space="preserve">
         <source>Accept</source>
         <target>Elfogadás</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <target>Befogadás tagként</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <target>Befogadás megfigyelőként</target>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -601,19 +582,24 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Kapcsolatkérés elfogadása?</target>
+        <target>Elfogadja a meghívási kérést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
         <source>Accept contact request from %@?</source>
-        <target>Elfogadja %@ kapcsolatkérését?</target>
+        <target>Elfogadja %@ meghívási kérését?</target>
         <note>notification body</note>
       </trans-unit>
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
-        <target>Fogadás inkognitóban</target>
+        <target>Elfogadás inkognitóban</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <target>Tag befogadása</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -622,14 +608,19 @@
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
         <source>Acknowledged</source>
-        <target>Nyugtázva</target>
+        <target>Visszaigazolt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledgement errors" xml:space="preserve">
         <source>Acknowledgement errors</source>
-        <target>Nyugtázott hibák</target>
+        <target>Visszaigazolási hibák</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Aktív</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Aktív kapcsolatok száma</target>
@@ -637,7 +628,7 @@
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
-        <target>Cím hozzáadása a profilhoz, hogy az ismerősei megoszthassák másokkal. A profilfrissítés elküldésre kerül az ismerősei számára.</target>
+        <target>Cím hozzáadása a profilhoz, hogy a partnerei megoszthassák másokkal. A profilfrissítés el lesz küldve partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
@@ -645,6 +636,11 @@
         <target>Barátok hozzáadása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Lista hozzáadása</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Profil hozzáadása</target>
@@ -662,7 +658,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
-        <target>Csapattagok hozzáadása</target>
+        <target>Munkatársak hozzáadása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -670,6 +666,11 @@
         <target>Hozzáadás egy másik eszközhöz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Hozzáadás listához</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Üdvözlőüzenet hozzáadása</target>
@@ -677,7 +678,7 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
-        <target>Adja hozzá csapattagjait a beszélgetésekhez.</target>
+        <target>Adja hozzá a munkatársait a beszélgetésekhez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
@@ -692,17 +693,17 @@
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
         <source>Additional accent</source>
-        <target>További kiemelés</target>
+        <target>További kiemelőszín</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent 2" xml:space="preserve">
         <source>Additional accent 2</source>
-        <target>További kiemelés 2</target>
+        <target>További kiemelőszín 2</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional secondary" xml:space="preserve">
         <source>Additional secondary</source>
-        <target>További másodlagos</target>
+        <target>További másodlagos szín</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address" xml:space="preserve">
@@ -712,12 +713,12 @@
       </trans-unit>
       <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve">
         <source>Address change will be aborted. Old receiving address will be used.</source>
-        <target>A cím módosítása megszakad. A régi fogadási cím kerül felhasználásra.</target>
+        <target>A cím módosítása meg fog szakadni. A régi fogadási cím lesz használva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
-        <target>Cím vagy egyszer használható meghívó-hivatkozás?</target>
+        <target>Cím vagy egyszer használható meghívó?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
@@ -732,7 +733,7 @@
       </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>Az adminisztrátorok hivatkozásokat hozhatnak létre a csoportokhoz való kapcsolódáshoz.</target>
+        <target>Az adminisztrátorok hivatkozásokat hozhatnak létre a csoportokhoz való csatlakozáshoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Advanced network settings" xml:space="preserve">
@@ -745,6 +746,11 @@
         <target>Speciális beállítások</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Összes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Az összes alkalmazásadat törölve.</target>
@@ -752,17 +758,22 @@
       </trans-unit>
       <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>All chats and messages will be deleted - this cannot be undone!</source>
-        <target>Az összes csevegés és üzenet törlésre kerül - ez a művelet nem vonható vissza!</target>
+        <target>Az összes csevegés és üzenet törölve lesz – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Az összes csevegés el lesz távolítva a(z) %@ nevű listáról, és a lista is törölve lesz.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
-        <target>A jelkód megadása után az összes adat törlésre kerül.</target>
+        <target>A jelkód megadása után az összes adat törölve lesz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All data is kept private on your device." xml:space="preserve">
         <source>All data is kept private on your device.</source>
-        <target>Az összes adat biztonságban van az eszközén.</target>
+        <target>Az összes adat privát módon van tárolva az eszközén.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -772,22 +783,22 @@
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
         <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
-        <target>Az összes üzenetet és fájlt **végpontok közötti titkosítással** küldi, a közvetlen üzenetekben pedig kvantumrezisztens biztonsággal.</target>
+        <target>Az összes üzenet és fájl **végpontok közötti titkosítással**, a közvetlen üzenetek továbbá kvantumbiztos titkosítással is rendelkeznek.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>All messages will be deleted - this cannot be undone!</source>
-        <target>Az összes üzenet törlésre kerül – ez a művelet nem vonható vissza!</target>
+        <target>Az összes üzenet törölve lesz – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve">
         <source>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</source>
-        <target>Az összes üzenet törlésre kerül - ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.</target>
+        <target>Az összes üzenet törölve lesz – ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
         <source>All new messages from %@ will be hidden!</source>
-        <target>Az összes új üzenet elrejtésre kerül tőle: %@!</target>
+        <target>%@ összes új üzenete el lesz rejtve!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
@@ -795,19 +806,29 @@
         <target>Összes profil</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Az összes jelentés archiválva lesz az Ön számára.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>Összes kiszolgáló</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
-        <target>Az összes ismerősével kapcsolatban marad.</target>
+        <target>Az összes partnerével kapcsolatban marad.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve">
         <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
-        <target>Az ismerőseivel kapcsolatban marad. A profil-változtatások frissítésre kerülnek az ismerősöknél.</target>
+        <target>A partnereivel kapcsolatban marad. A profilfrissítés el lesz küldve a partnerei számára.</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>
-        <target>Az összes ismerőse, -beszélgetése és -fájlja biztonságosan titkosításra kerülnek, melyek részletekben feltöltődnek a beállított XFTP-közvetítő-kiszolgálóra.</target>
+        <target>Az összes partnere, -beszélgetése és -fájlja biztonságosan titkosítva lesz, majd töredékekre bontva feltöltődnek a beállított XFTP-továbbítókiszolgálókra.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow" xml:space="preserve">
@@ -817,17 +838,17 @@
       </trans-unit>
       <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve">
         <source>Allow calls only if your contact allows them.</source>
-        <target>A hívások kezdeményezése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>A hívások kezdeményezése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow calls?" xml:space="preserve">
         <source>Allow calls?</source>
-        <target>Hívások engedélyezése?</target>
+        <target>Engedélyezi a hívásokat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
-        <target>Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi az Ön számára.</target>
+        <target>Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi az Ön számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow downgrade" xml:space="preserve">
@@ -837,17 +858,17 @@
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
-        <target>Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)</target>
+        <target>Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi. (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
         <source>Allow message reactions only if your contact allows them.</source>
-        <target>Az üzenetreakciók küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>A reakciók hozzáadása az üzenetekhez csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions." xml:space="preserve">
         <source>Allow message reactions.</source>
-        <target>Üzenetreakciók engedélyezése.</target>
+        <target>A reakciók hozzáadása az üzenetekhez engedélyezve van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
@@ -867,7 +888,12 @@
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Allow to irreversibly delete sent messages. (24 hours)</source>
-        <target>Elküldött üzenetek végleges törlésének engedélyezése. (24 óra)</target>
+        <target>Az elküldött üzenetek végleges törlése engedélyezve van. (24 óra)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Az üzenetek jelentése a moderátorok felé engedélyezve van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
@@ -877,47 +903,47 @@
       </trans-unit>
       <trans-unit id="Allow to send files and media." xml:space="preserve">
         <source>Allow to send files and media.</source>
-        <target>Fájlok és médiatartalmak küldésének engedélyezése.</target>
+        <target>A fájlok- és a médiatartalmak küldése engedélyezve van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to send voice messages." xml:space="preserve">
         <source>Allow to send voice messages.</source>
-        <target>Hangüzenetek küldésének engedélyezése.</target>
+        <target>A hangüzenetek küldése engedélyezve van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
         <source>Allow voice messages only if your contact allows them.</source>
-        <target>A hangüzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</target>
+        <target>A hangüzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow voice messages?" xml:space="preserve">
         <source>Allow voice messages?</source>
-        <target>Hangüzenetek engedélyezése?</target>
+        <target>Engedélyezi a hangüzeneteket?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve">
         <source>Allow your contacts adding message reactions.</source>
-        <target>Az üzenetreakciók küldése engedélyezve van az ismerősei számára.</target>
+        <target>A reakciók hozzáadása az üzenetekhez engedélyezve van a partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to call you." xml:space="preserve">
         <source>Allow your contacts to call you.</source>
-        <target>A hívások kezdeményezése engedélyezve van az ismerősei számára.</target>
+        <target>A hívások kezdeményezése engedélyezve van a partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
-        <target>Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)</target>
+        <target>Az elküldött üzenetek végleges törlése engedélyezve van a partnerei számára. (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
         <source>Allow your contacts to send disappearing messages.</source>
-        <target>Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.</target>
+        <target>Az eltűnő üzenetek küldésének engedélyezése a partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
-        <target>A hangüzenetek küldése engedélyezve van az ismerősei számára.</target>
+        <target>A hangüzenetek küldése engedélyezve van a partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Already connected?" xml:space="preserve">
@@ -942,14 +968,19 @@
       </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
-        <target>Mindig használjon közvetítő-kiszolgálót</target>
+        <target>Mindig használjon továbbítókiszolgálót</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve">
         <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
-        <target>Egy üres csevegési profil jön létre a megadott névvel, és az alkalmazás a szokásos módon megnyílik.</target>
+        <target>Egy üres csevegési profil lesz létrehozva a megadott névvel, és az alkalmazás a szokásos módon megnyílik.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Egyéb indoklás</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Hívás fogadása</target>
@@ -962,7 +993,7 @@
       </trans-unit>
       <trans-unit id="App build: %@" xml:space="preserve">
         <source>App build: %@</source>
-        <target>Az alkalmazás build száma: %@</target>
+        <target>Az alkalmazás összeállítási száma: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App data migration" xml:space="preserve">
@@ -975,6 +1006,11 @@
         <target>Az alkalmazás titkosítja a helyi fájlokat (a videók kivételével).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>Alkalmazáscsoport:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Alkalmazásikon</target>
@@ -987,7 +1023,7 @@
       </trans-unit>
       <trans-unit id="App passcode is replaced with self-destruct passcode." xml:space="preserve">
         <source>App passcode is replaced with self-destruct passcode.</source>
-        <target>Az alkalmazás jelkód helyettesítésre kerül egy önmegsemmisítő jelkóddal.</target>
+        <target>Az alkalmazás-jelkód helyettesítve lesz egy önmegsemmisítő-jelkóddal.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App session" xml:space="preserve">
@@ -997,12 +1033,12 @@
       </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
-        <target>Alkalmazás verzió</target>
+        <target>Az alkalmazás verziója</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App version: v%@" xml:space="preserve">
         <source>App version: v%@</source>
-        <target>Alkalmazás verzió: v%@</target>
+        <target>Az alkalmazás verziója: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Appearance" xml:space="preserve">
@@ -1020,6 +1056,21 @@
         <target>Alkalmazás erre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archívum</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archivál %lld jelentést?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Archiválja az összes jelentést?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archiválás és feltöltés</target>
@@ -1027,12 +1078,27 @@
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
-        <target>Az ismerősök archiválása a későbbi csevegéshez.</target>
+        <target>A partnerek archiválása a későbbi csevegéshez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Jelentés archiválása</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Archiválja a jelentést?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Jelentések archiválása</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
-        <target>Archivált ismerősök</target>
+        <target>Archivált partnerek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
@@ -1042,7 +1108,7 @@
       </trans-unit>
       <trans-unit id="Attach" xml:space="preserve">
         <source>Attach</source>
-        <target>Csatolás</target>
+        <target>Mellékelés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Audio &amp; video calls" xml:space="preserve">
@@ -1057,7 +1123,7 @@
       </trans-unit>
       <trans-unit id="Audio/video calls" xml:space="preserve">
         <source>Audio/video calls</source>
-        <target>Hang-/videóhívások</target>
+        <target>Hang- és videóhívások</target>
         <note>chat feature</note>
       </trans-unit>
       <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
@@ -1092,7 +1158,7 @@
       </trans-unit>
       <trans-unit id="Auto-accept contact requests" xml:space="preserve">
         <source>Auto-accept contact requests</source>
-        <target>Kapcsolatkérések automatikus elfogadása</target>
+        <target>Meghívási kérések automatikus elfogadása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Auto-accept images" xml:space="preserve">
@@ -1117,7 +1183,7 @@
       </trans-unit>
       <trans-unit id="Bad desktop address" xml:space="preserve">
         <source>Bad desktop address</source>
-        <target>Hibás számítógép cím</target>
+        <target>Érvénytelen számítógépcím</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Bad message ID" xml:space="preserve">
@@ -1127,7 +1193,7 @@
       </trans-unit>
       <trans-unit id="Bad message hash" xml:space="preserve">
         <source>Bad message hash</source>
-        <target>Hibás az üzenet hasító értéke</target>
+        <target>Érvénytelen az üzenet hasítóértéke</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better calls" xml:space="preserve">
@@ -1137,7 +1203,12 @@
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
-        <target>Javított csoportok</target>
+        <target>Továbbfejlesztett csoportok</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Továbbfejlesztett, gyorsabb csoportok</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
@@ -1147,7 +1218,7 @@
       </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
-        <target>Jobb üzenetek</target>
+        <target>Továbbfejlesztett üzenetek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
@@ -1160,6 +1231,11 @@
         <target>Továbbfejlesztett értesítések</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Továbbfejlesztett adatvédelem és biztonság</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Továbbfejlesztett biztonság ✅</target>
@@ -1182,7 +1258,7 @@
       </trans-unit>
       <trans-unit id="Block for all" xml:space="preserve">
         <source>Block for all</source>
-        <target>Letiltás az összes tag számára</target>
+        <target>Letiltás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block group members" xml:space="preserve">
@@ -1192,22 +1268,22 @@
       </trans-unit>
       <trans-unit id="Block member" xml:space="preserve">
         <source>Block member</source>
-        <target>Tag letiltása</target>
+        <target>Letiltás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member for all?" xml:space="preserve">
         <source>Block member for all?</source>
-        <target>Az összes tag számára letiltja ezt a tagot?</target>
+        <target>Az összes tag számára letiltja a tagot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member?" xml:space="preserve">
         <source>Block member?</source>
-        <target>Tag letiltása?</target>
+        <target>Letiltja a tagot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blocked by admin" xml:space="preserve">
         <source>Blocked by admin</source>
-        <target>Az adminisztrátor letiltotta</target>
+        <target>Letiltva az adminisztrátor által</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
@@ -1222,12 +1298,12 @@
       </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
-        <target>Mindkét fél is hozzáadhat üzenetreakciókat.</target>
+        <target>Mindkét fél hozzáadhat az üzenetekhez reakciókat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
-        <target>Mindkét fél törölheti véglegesen az elküldött üzeneteket. (24 óra)</target>
+        <target>Mindkét fél véglegesen törölheti az elküldött üzeneteket. (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
@@ -1260,11 +1336,25 @@
         <target>Üzleti csevegések</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Üzleti</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>A csevegési profillal (alapértelmezett), vagy a [kapcsolattal] (https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BÉTA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>A SimpleX Chat használatával Ön elfogadja, hogy:
+- csak elfogadott tartalmakat tesz közzé a nyilvános csoportokban.
+- tiszteletben tartja a többi felhasználót, és nem küld kéretlen tartalmat senkinek.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>A hívás már befejeződött!</target>
@@ -1287,7 +1377,7 @@
       </trans-unit>
       <trans-unit id="Can't call contact" xml:space="preserve">
         <source>Can't call contact</source>
-        <target>Nem lehet felhívni az ismerőst</target>
+        <target>Nem lehet felhívni a partnert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't call member" xml:space="preserve">
@@ -1297,12 +1387,12 @@
       </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
         <source>Can't invite contact!</source>
-        <target>Nem lehet meghívni az ismerőst!</target>
+        <target>Nem lehet meghívni a partnert!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't invite contacts!" xml:space="preserve">
         <source>Can't invite contacts!</source>
-        <target>Nem lehet meghívni az ismerősöket!</target>
+        <target>Nem lehet meghívni a partnereket!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't message member" xml:space="preserve">
@@ -1314,7 +1404,7 @@
         <source>Cancel</source>
         <target>Mégse</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1338,7 +1428,7 @@
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
-        <target>Kapacitás túllépés - a címzett nem kapta meg a korábban elküldött üzeneteket.</target>
+        <target>Kapacitás túllépés – a címzett nem kapta meg a korábban elküldött üzeneteket.</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Cellular" xml:space="preserve">
@@ -1348,59 +1438,64 @@
       </trans-unit>
       <trans-unit id="Change" xml:space="preserve">
         <source>Change</source>
-        <target>Változtatás</target>
+        <target>Módosítás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Módosítja az automatikus üzenettörlést?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
-        <target>Csevegési profilok megváltoztatása</target>
+        <target>Csevegési profilok módosítása</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
         <source>Change database passphrase?</source>
-        <target>Adatbázis-jelmondat megváltoztatása?</target>
+        <target>Módosítja az adatbázis jelmondatát?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change lock mode" xml:space="preserve">
         <source>Change lock mode</source>
-        <target>Zárolási mód megváltoztatása</target>
+        <target>Zárolási mód módosítása</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change member role?" xml:space="preserve">
         <source>Change member role?</source>
-        <target>Tag szerepkörének megváltoztatása?</target>
+        <target>Módosítja a tag szerepkörét?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change passcode" xml:space="preserve">
         <source>Change passcode</source>
-        <target>Jelkód megváltoztatása</target>
+        <target>Jelkód módosítása</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change receiving address" xml:space="preserve">
         <source>Change receiving address</source>
-        <target>A fogadó cím megváltoztatása</target>
+        <target>Fogadási cím módosítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change receiving address?" xml:space="preserve">
         <source>Change receiving address?</source>
-        <target>Megváltoztatja a fogadó címet?</target>
+        <target>Módosítja a fogadási címet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change role" xml:space="preserve">
         <source>Change role</source>
-        <target>Szerepkör megváltoztatása</target>
+        <target>Szerepkör módosítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change self-destruct mode" xml:space="preserve">
         <source>Change self-destruct mode</source>
-        <target>Önmegsemmisítő mód megváltoztatása</target>
+        <target>Önmegsemmisítő-mód módosítása</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change self-destruct passcode" xml:space="preserve">
         <source>Change self-destruct passcode</source>
-        <target>Önmegsemmisító jelkód megváltoztatása</target>
+        <target>Önmegsemmisítő-jelkód módosítása</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1454,17 +1549,17 @@
       </trans-unit>
       <trans-unit id="Chat is stopped" xml:space="preserve">
         <source>Chat is stopped</source>
-        <target>A csevegés leállt</target>
+        <target>A csevegés megállt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
         <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
-        <target>A csevegés leállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés megkezdése előtt.</target>
+        <target>A csevegés megállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés elindítása előtt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat list" xml:space="preserve">
         <source>Chat list</source>
-        <target>Csevegőlista</target>
+        <target>Csevegési lista</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1479,7 +1574,7 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>A csevegési beállítások megváltoztak.</target>
+        <target>A csevegési beállítások módosultak.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Chat profile" xml:space="preserve">
@@ -1494,12 +1589,22 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
-        <target>A csevegés minden tag számára törlésre kerül - ezt a műveletet nem lehet visszavonni!</target>
+        <target>A csevegés minden tag számára törölve lesz – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
-        <target>A csevegés törlésre kerül az Ön számára - ezt a műveletet nem lehet visszavonni!</target>
+        <target>A csevegés törölve lesz az Ön számára – ez a művelet nem vonható vissza!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <target>Csevegés az adminisztrátorokkal</target>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <target>Csevegés a taggal</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1507,6 +1612,11 @@
         <target>Csevegések</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <target>Csevegés a tagokkal</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Üzenetek ellenőrzése 20 percenként.</target>
@@ -1544,17 +1654,17 @@
       </trans-unit>
       <trans-unit id="Chunks deleted" xml:space="preserve">
         <source>Chunks deleted</source>
-        <target>Törölt fájltöredékek</target>
+        <target>Törölt töredékek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chunks downloaded" xml:space="preserve">
         <source>Chunks downloaded</source>
-        <target>Letöltött fájltöredékek</target>
+        <target>Letöltött töredékek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chunks uploaded" xml:space="preserve">
         <source>Chunks uploaded</source>
-        <target>Feltöltött fájltöredékek</target>
+        <target>Feltöltött töredékek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Clear" xml:space="preserve">
@@ -1569,12 +1679,22 @@
       </trans-unit>
       <trans-unit id="Clear conversation?" xml:space="preserve">
         <source>Clear conversation?</source>
-        <target>Üzenetek kiürítése?</target>
+        <target>Kiüríti az üzeneteket?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Kiüríti a csoportot?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Csoport kiürítése vagy törlése?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
-        <target>Privát jegyzetek kiürítése?</target>
+        <target>Kiüríti a privát jegyzeteket?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Clear verification" xml:space="preserve">
@@ -1592,14 +1712,19 @@
         <target>Színmód</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Közösségi irányelvek megsértése</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
-        <target>Fájl összehasonlítás</target>
+        <target>Fájl-összehasonlítás</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Compare security codes with your contacts." xml:space="preserve">
         <source>Compare security codes with your contacts.</source>
-        <target>Biztonsági kódok összehasonlítása az ismerősökével.</target>
+        <target>Biztonsági kódok összehasonlítása a partnerekével.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Completed" xml:space="preserve">
@@ -1609,7 +1734,7 @@
       </trans-unit>
       <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
         <source>Conditions accepted on: %@.</source>
-        <target>Feltételek elfogadva ekkor: %@.</target>
+        <target>Feltételek elfogadásának ideje: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve">
@@ -1627,16 +1752,6 @@
         <target>Használati feltételek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>A feltételek 30 nap elteltével lesznek elfogadva az engedélyezett üzemeltető számára.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>A feltételek el lesznek fogadva a következő üzemeltető(k) számára: **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>A feltételek el lesznek fogadva a következő üzemeltető(k) számára: **%@**.</target>
@@ -1644,12 +1759,12 @@
       </trans-unit>
       <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve">
         <source>Conditions will be accepted on: %@.</source>
-        <target>A feltételek ekkor lesznek elfogadva: %@.</target>
+        <target>A feltételek el lesznek fogadva a következő időpontban: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve">
         <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
-        <target>A feltételek automatikusan elfogadásra kerülnek az engedélyezett üzemeltető számára: %@.</target>
+        <target>A feltételek automatikusan el lesznek fogadva az engedélyezett üzemeltetők számára a következő időpontban: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1657,6 +1772,11 @@
         <target>ICE-kiszolgálók beállítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Kiszolgálóüzemeltetők beállítása</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Megerősítés</target>
@@ -1669,7 +1789,7 @@
       </trans-unit>
       <trans-unit id="Confirm contact deletion?" xml:space="preserve">
         <source>Confirm contact deletion?</source>
-        <target>Biztosan törli az ismerőst?</target>
+        <target>Biztosan törli a partnert?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm database upgrades" xml:space="preserve">
@@ -1707,6 +1827,11 @@
         <target>Feltöltés megerősítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Megerősítve</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Kapcsolódás</target>
@@ -1729,26 +1854,26 @@
       </trans-unit>
       <trans-unit id="Connect to your friends faster." xml:space="preserve">
         <source>Connect to your friends faster.</source>
-        <target>Kapcsolódjon gyorsabban az ismerőseihez.</target>
+        <target>Kapcsolódjon gyorsabban a partnereihez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?" xml:space="preserve">
         <source>Connect to yourself?</source>
-        <target>Kapcsolódás saját magához?</target>
+        <target>Kapcsolódik saját magához?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
         <source>Connect to yourself?
 This is your own SimpleX address!</source>
-        <target>Kapcsolódás saját magához?
-Ez az Ön SimpleX-címe!</target>
+        <target>Kapcsolódik saját magához?
+Ez a saját SimpleX-címe!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
         <source>Connect to yourself?
 This is your own one-time link!</source>
-        <target>Kapcsolódás saját magához?
-Ez az Ön egyszer használható meghívó-hivatkozása!</target>
+        <target>Kapcsolódik saját magához?
+Ez a saját egyszer használható meghívója!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via contact address" xml:space="preserve">
@@ -1763,7 +1888,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>Kapcsolódás egyszer használható meghívó-hivatkozáson keresztül</target>
+        <target>Kapcsolódás egyszer használható meghívón keresztül</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect with %@" xml:space="preserve">
@@ -1808,7 +1933,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
         <source>Connecting to contact, please wait or check later!</source>
-        <target>Kapcsolódás az ismerőshöz, várjon vagy ellenőrizze később!</target>
+        <target>Kapcsolódás a partnerhez, várjon vagy ellenőrizze később!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting to desktop" xml:space="preserve">
@@ -1826,6 +1951,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Kapcsolatok- és kiszolgálók állapotának megjelenítése.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>A kapcsolat le van tiltva</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Kapcsolódási hiba</target>
@@ -1836,6 +1966,18 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Kapcsolódási hiba (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>A kiszolgáló üzemeltetője letiltotta a kapcsolatot:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>A kapcsolat nem áll készen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Kapcsolódási értesítések</target>
@@ -1843,7 +1985,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
-        <target>Kapcsolatkérés elküldve!</target>
+        <target>Meghívási kérés elküldve!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>A kapcsolat titkosítása újraegyeztetést igényel.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
@@ -1873,32 +2020,32 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Contact allows" xml:space="preserve">
         <source>Contact allows</source>
-        <target>Ismerős engedélyezi</target>
+        <target>Partner engedélyezi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact already exists" xml:space="preserve">
         <source>Contact already exists</source>
-        <target>Az ismerős már létezik</target>
+        <target>A partner már létezik</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact deleted!" xml:space="preserve">
         <source>Contact deleted!</source>
-        <target>Ismerős törölve!</target>
+        <target>Partner törölve!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
         <source>Contact hidden:</source>
-        <target>Ismerős elrejtve:</target>
+        <target>Rejtett név:</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Contact is connected" xml:space="preserve">
         <source>Contact is connected</source>
-        <target>Ismerőse kapcsolódott</target>
+        <target>Partnere kapcsolódott</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Contact is deleted." xml:space="preserve">
         <source>Contact is deleted.</source>
-        <target>Törölt ismerős.</target>
+        <target>Törölt partner.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact name" xml:space="preserve">
@@ -1908,24 +2055,29 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Contact preferences" xml:space="preserve">
         <source>Contact preferences</source>
-        <target>Ismerős beállításai</target>
+        <target>Partnerbeállítások</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact will be deleted - this cannot be undone!</source>
-        <target>Az ismerős törlésre fog kerülni - ez a művelet nem vonható vissza!</target>
+        <target>A partner törölve lesz – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
         <source>Contacts</source>
-        <target>Ismerősök</target>
+        <target>Partnerek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
         <source>Contacts can mark messages for deletion; you will be able to view them.</source>
-        <target>Az ismerősei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.</target>
+        <target>A partnerei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>A tartalom sérti a használati feltételeket</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Folytatás</target>
@@ -1948,7 +2100,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Core version: v%@" xml:space="preserve">
         <source>Core version: v%@</source>
-        <target>Alapverziószám: v%@</target>
+        <target>Fő verzió: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
@@ -1958,7 +2110,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
-        <target>Név javítása erre: %@?</target>
+        <target>Helyesbíti a nevet a következőre: %@?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
@@ -1968,7 +2120,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Create 1-time link" xml:space="preserve">
         <source>Create 1-time link</source>
-        <target>Egyszer használható meghívó-hivatkozás létrehozása</target>
+        <target>Egyszer használható meghívó létrehozása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
@@ -1978,7 +2130,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Create a group using a random profile." xml:space="preserve">
         <source>Create a group using a random profile.</source>
-        <target>Csoport létrehozása véletlenszerűen létrehozott profillal.</target>
+        <target>Csoport létrehozása véletlenszerű profillal.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create file" xml:space="preserve">
@@ -2001,6 +2153,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Hivatkozás létrehozása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Lista létrehozása</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Új profil létrehozása a [számítógép-alkalmazásban](https://simplex.chat/downloads/). 💻</target>
@@ -2013,7 +2170,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
         <source>Create queue</source>
-        <target>Sorbaállítás létrehozása</target>
+        <target>Sorba állítás létrehozása</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Create secret group" xml:space="preserve">
@@ -2033,12 +2190,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Created at" xml:space="preserve">
         <source>Created at</source>
-        <target>Létrehozva ekkor:</target>
+        <target>Létrehozva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created at: %@" xml:space="preserve">
         <source>Created at: %@</source>
-        <target>Létrehozva ekkor: %@</target>
+        <target>Létrehozva: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Creating archive link" xml:space="preserve">
@@ -2058,7 +2215,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve">
         <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
-        <target>A jelenlegi feltételek szövegét nem lehetett betölteni, a feltételeket ezen a hivatkozáson keresztül vizsgálhatja felül:</target>
+        <target>A jelenlegi feltételek szövegét nem lehetett betölteni, a feltételeket a következő hivatkozáson keresztül vizsgálhatja felül:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Current passphrase…" xml:space="preserve">
@@ -2073,17 +2230,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
         <source>Currently maximum supported file size is %@.</source>
-        <target>Jelenleg a maximális támogatott fájlméret %@.</target>
+        <target>Jelenleg támogatott legnagyobb fájl méret: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Custom time" xml:space="preserve">
         <source>Custom time</source>
-        <target>Személyreszabott idő</target>
+        <target>Egyéni időköz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Customizable message shape." xml:space="preserve">
         <source>Customizable message shape.</source>
-        <target>Testreszabható üzenetbuborékok.</target>
+        <target>Személyre szabható üzenetbuborékok.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
@@ -2113,7 +2270,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve">
         <source>Database IDs and Transport isolation option.</source>
-        <target>Adatbázis-azonosítók és átvitel-izolációs beállítások.</target>
+        <target>Adatbázis-azonosítók és átvitelelkülönítési beállítások.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database downgrade" xml:space="preserve">
@@ -2129,14 +2286,14 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       <trans-unit id="Database encryption passphrase will be updated and stored in the keychain.&#10;" xml:space="preserve">
         <source>Database encryption passphrase will be updated and stored in the keychain.
 </source>
-        <target>Az adatbázis titkosítási jelmondata frissítve lesz és a kulcstartóban kerül tárolásra.
+        <target>Az adatbázis titkosítási jelmondata frissülni fog és a kulcstartóban lesz tárolva.
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database encryption passphrase will be updated.&#10;" xml:space="preserve">
         <source>Database encryption passphrase will be updated.
 </source>
-        <target>Az datbázis titkosítási jelmondata frissítve lesz.
+        <target>Az adatbázis titkosítási jelmondata frissítve lesz.
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -2147,12 +2304,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Database is encrypted using a random passphrase, you can change it." xml:space="preserve">
         <source>Database is encrypted using a random passphrase, you can change it.</source>
-        <target>Az adatbázis egy véletlenszerű jelmondattal van titkosítva, ami megváltoztatható.</target>
+        <target>Az adatbázis egy véletlenszerű jelmondattal van titkosítva, amelyet szabadon módosíthat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database is encrypted using a random passphrase. Please change it before exporting." xml:space="preserve">
         <source>Database is encrypted using a random passphrase. Please change it before exporting.</source>
-        <target>Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt változtassa meg.</target>
+        <target>Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt módosítsa.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase" xml:space="preserve">
@@ -2167,7 +2324,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
         <source>Database passphrase is different from saved in the keychain.</source>
-        <target>Az adatbázis jelmondata eltér a kulcstartóban mentettől.</target>
+        <target>Az adatbázis jelmondata nem egyezik a kulcstartóba mentettől.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
@@ -2183,20 +2340,20 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       <trans-unit id="Database will be encrypted and the passphrase stored in the keychain.&#10;" xml:space="preserve">
         <source>Database will be encrypted and the passphrase stored in the keychain.
 </source>
-        <target>Az adatbázis titkosítva lesz, a jelmondat pedig a kulcstartóban kerül tárolásra.
+        <target>Az adatbázis titkosítva lesz, a jelmondat pedig a kulcstartóban lesz tárolva.
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database will be encrypted.&#10;" xml:space="preserve">
         <source>Database will be encrypted.
 </source>
-        <target>Az adatbázis titkosításra kerül.
+        <target>Az adatbázis titkosítva lesz.
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database will be migrated when the app restarts" xml:space="preserve">
         <source>Database will be migrated when the app restarts</source>
-        <target>Az adatbázis az alkalmazás újraindításakor átköltöztetésre kerül</target>
+        <target>Az adatbázis az alkalmazás újraindításakor lesz átköltöztetve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Debug delivery" xml:space="preserve">
@@ -2211,19 +2368,18 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Decryption error" xml:space="preserve">
         <source>Decryption error</source>
-        <target>Titkosítás visszafejtési hiba</target>
+        <target>Titkosításvisszafejtési hiba</target>
         <note>message decrypt error item</note>
       </trans-unit>
       <trans-unit id="Delete" xml:space="preserve">
         <source>Delete</source>
         <target>Törlés</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
-        <target>Tagok %lld üzenetének törlése?</target>
+        <target>Törli a tagok %lld üzenetét?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages?" xml:space="preserve">
@@ -2238,7 +2394,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete address?" xml:space="preserve">
         <source>Delete address?</source>
-        <target>Cím törlése?</target>
+        <target>Törli a címet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete after" xml:space="preserve">
@@ -2253,7 +2409,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete and notify contact" xml:space="preserve">
         <source>Delete and notify contact</source>
-        <target>Törlés, és az ismerős értesítése</target>
+        <target>Törlés, és a partner értesítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat" xml:space="preserve">
@@ -2261,6 +2417,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Csevegés törlése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Csevegési üzenetek törlése a saját eszközéről.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Csevegési profil törlése</target>
@@ -2268,12 +2429,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete chat profile?" xml:space="preserve">
         <source>Delete chat profile?</source>
-        <target>Csevegési profil törlése?</target>
+        <target>Törli a csevegési profilt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <target>Törli a taggal való csevegést?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
-        <target>Csevegés törlése?</target>
+        <target>Törli a csevegést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2283,12 +2449,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete contact" xml:space="preserve">
         <source>Delete contact</source>
-        <target>Ismerős törlése</target>
+        <target>Partner törlése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete contact?" xml:space="preserve">
         <source>Delete contact?</source>
-        <target>Ismerős törlése?</target>
+        <target>Törli a partnert?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -2308,7 +2474,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete files and media?" xml:space="preserve">
         <source>Delete files and media?</source>
-        <target>Fájlok és a médiatartalmak törlése?</target>
+        <target>Törli a fájl- és a médiatartalmakat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete files for all chat profiles" xml:space="preserve">
@@ -2333,7 +2499,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete group?" xml:space="preserve">
         <source>Delete group?</source>
-        <target>Csoport törlése?</target>
+        <target>Törli a csoportot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete invitation" xml:space="preserve">
@@ -2343,28 +2509,33 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete link" xml:space="preserve">
         <source>Delete link</source>
-        <target>Hivatkozás törlése</target>
+        <target>Törlés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete link?" xml:space="preserve">
         <source>Delete link?</source>
-        <target>Hivatkozás törlése?</target>
+        <target>Törli a hivatkozást?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Törli a listát?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
-        <target>Csoporttag üzenetének törlése?</target>
+        <target>Törli a tag üzenetét?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete message?" xml:space="preserve">
         <source>Delete message?</source>
-        <target>Üzenet törlése?</target>
+        <target>Törli az üzenetet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Üzenetek törlése</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2378,7 +2549,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete old database?" xml:space="preserve">
         <source>Delete old database?</source>
-        <target>Régi adatbázis törlése?</target>
+        <target>Törli a régi adatbázist?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
@@ -2388,7 +2559,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
-        <target>Függőben lévő ismerőskérelem törlése?</target>
+        <target>Törli a függőben lévő meghívót?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete profile" xml:space="preserve">
@@ -2398,9 +2569,14 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete queue" xml:space="preserve">
         <source>Delete queue</source>
-        <target>Sorbaállítás törlése</target>
+        <target>Sorba állítás törlése</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Jelentés törlése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Legfeljebb 20 üzenet egyszerre való törlése.</target>
@@ -2408,7 +2584,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete user profile?" xml:space="preserve">
         <source>Delete user profile?</source>
-        <target>Felhasználói profil törlése?</target>
+        <target>Törli a felhasználói profilt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete without notification" xml:space="preserve">
@@ -2423,12 +2599,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Deleted at" xml:space="preserve">
         <source>Deleted at</source>
-        <target>Törölve ekkor:</target>
+        <target>Törölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Deleted at: %@" xml:space="preserve">
         <source>Deleted at: %@</source>
-        <target>Törölve ekkor: %@</target>
+        <target>Törölve: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Deletion errors" xml:space="preserve">
@@ -2448,7 +2624,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
         <source>Delivery receipts are disabled!</source>
-        <target>A kézbesítési jelentések ki vannak kapcsolva!</target>
+        <target>A kézbesítési jelentések le vannak tiltva!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
@@ -2468,7 +2644,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
         <source>Desktop app version %@ is not compatible with this app.</source>
-        <target>A számítógép-alkalmazás verziója %@ nem kompatibilis ezzel az alkalmazással.</target>
+        <target>A számítógép-alkalmazás verziója (%@) nem kompatibilis ezzel az alkalmazással.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Desktop devices" xml:space="preserve">
@@ -2478,17 +2654,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Destination server address of %@ is incompatible with forwarding server %@ settings." xml:space="preserve">
         <source>Destination server address of %@ is incompatible with forwarding server %@ settings.</source>
-        <target>A(z) %@ célkiszolgáló címe nem kompatibilis a(z) %@ továbbító kiszolgáló beállításaival.</target>
+        <target>A(z) %@ célkiszolgáló címe nem kompatibilis a(z) %@ továbbítókiszolgáló beállításaival.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Destination server error: %@" xml:space="preserve">
         <source>Destination server error: %@</source>
-        <target>Célkiszolgáló hiba: %@</target>
+        <target>Célkiszolgáló-hiba: %@</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Destination server version of %@ is incompatible with forwarding server %@." xml:space="preserve">
         <source>Destination server version of %@ is incompatible with forwarding server %@.</source>
-        <target>A(z) %@ célkiszolgáló verziója nem kompatibilis a(z) %@ továbbító kiszolgálóval.</target>
+        <target>A(z) %@ célkiszolgáló verziója nem kompatibilis a(z) %@ továbbítókiszolgálóval.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Detailed statistics" xml:space="preserve">
@@ -2533,7 +2709,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
         <source>Different names, avatars and transport isolation.</source>
-        <target>Különböző nevek, profilképek és átvitel-izoláció.</target>
+        <target>Különböző nevek, profilképek és átvitelizoláció.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages" xml:space="preserve">
@@ -2548,7 +2724,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
         <source>Direct messages between members are prohibited.</source>
-        <target>A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.</target>
+        <target>A tagok közötti közvetlen üzenetek le vannak tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2561,9 +2737,19 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>SimpleX-zár kikapcsolása</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Letiltja az automatikus üzenettörlést?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Üzenetek törlésének letiltása</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
-        <target>Letiltás az összes tag számára</target>
+        <target>Letiltás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disabled" xml:space="preserve">
@@ -2588,17 +2774,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Disappearing messages are prohibited." xml:space="preserve">
         <source>Disappearing messages are prohibited.</source>
-        <target>Az eltűnő üzenetek küldése le van tiltva ebben a csoportban.</target>
+        <target>Az eltűnő üzenetek küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disappears at" xml:space="preserve">
         <source>Disappears at</source>
-        <target>Eltűnik ekkor:</target>
+        <target>Eltűnik</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disappears at: %@" xml:space="preserve">
         <source>Disappears at: %@</source>
-        <target>Eltűnik ekkor: %@</target>
+        <target>Eltűnik: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Disconnect" xml:space="preserve">
@@ -2608,12 +2794,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Disconnect desktop?" xml:space="preserve">
         <source>Disconnect desktop?</source>
-        <target>Számítógép leválasztása?</target>
+        <target>Leválasztja a számítógépet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
-        <target>Helyi csoportok felfedezése és csatlakozás</target>
+        <target>Csoportok felfedezése és csatlakozás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Discover via local network" xml:space="preserve">
@@ -2623,17 +2809,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Do NOT send messages directly, even if your or destination server does not support private routing." xml:space="preserve">
         <source>Do NOT send messages directly, even if your or destination server does not support private routing.</source>
-        <target>Ne küldjön üzeneteket közvetlenül, még akkor sem, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
+        <target>NE küldjön üzeneteket közvetlenül, még akkor sem, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
         <source>Do NOT use SimpleX for emergency calls.</source>
-        <target>NE használja a SimpleX-et segélyhívásokhoz.</target>
+        <target>NE használja a SimpleXet segélyhívásokhoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use private routing." xml:space="preserve">
         <source>Do NOT use private routing.</source>
-        <target>Ne használjon privát útválasztást.</target>
+        <target>NE használjon privát útválasztást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do it later" xml:space="preserve">
@@ -2643,7 +2829,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Do not send history to new members." xml:space="preserve">
         <source>Do not send history to new members.</source>
-        <target>Az előzmények ne kerüljenek elküldésre az új tagok számára.</target>
+        <target>Az előzmények ne legyenek elküldve az új tagok számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
@@ -2651,6 +2837,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Ne használja a hitelesítőadatokat proxyval.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Dokumentumok:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Ne hozzon létre címet</target>
@@ -2661,9 +2852,19 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Ne engedélyezze</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Ne maradjon le a fontos üzenetekről.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Ne mutasd újra</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Kész</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2876,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <source>Download</source>
         <target>Letöltés</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2719,7 +2920,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Duplicate display name!" xml:space="preserve">
         <source>Duplicate display name!</source>
-        <target>Duplikált megjelenített név!</target>
+        <target>Duplikált megjelenítendő név!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Duration" xml:space="preserve">
@@ -2739,7 +2940,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Edit group profile" xml:space="preserve">
         <source>Edit group profile</source>
-        <target>A csoport profiljának szerkesztése</target>
+        <target>Csoportprofil szerkesztése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable" xml:space="preserve">
@@ -2752,9 +2953,9 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Engedélyezés (felülírások megtartásával)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Flux engedélyezése</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>A Flux kiszolgálókat engedélyezheti a beállításokban, a „Hálózat és kiszolgálók” menüben, a metaadatok jobb védelme érdekében.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2769,8 +2970,8 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
-        <target>Automatikus üzenet törlés engedélyezése?</target>
-        <note>No comment provided by engineer.</note>
+        <target>Engedélyezi az automatikus üzenettörlést?</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2789,7 +2990,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
         <source>Enable instant notifications?</source>
-        <target>Azonnali értesítések engedélyezése?</target>
+        <target>Engedélyezi az azonnali értesítéseket?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable lock" xml:space="preserve">
@@ -2804,7 +3005,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enable periodic notifications?" xml:space="preserve">
         <source>Enable periodic notifications?</source>
-        <target>Időszakos értesítések engedélyezése?</target>
+        <target>Engedélyezi az időszakos értesítéseket?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable self-destruct" xml:space="preserve">
@@ -2814,7 +3015,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enable self-destruct passcode" xml:space="preserve">
         <source>Enable self-destruct passcode</source>
-        <target>Önmegsemmisítő jelkód engedélyezése</target>
+        <target>Önmegsemmisítő-jelkód engedélyezése</target>
         <note>set passcode view</note>
       </trans-unit>
       <trans-unit id="Enabled" xml:space="preserve">
@@ -2824,7 +3025,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enabled for" xml:space="preserve">
         <source>Enabled for</source>
-        <target>Számukra engedélyezve:</target>
+        <target>Számukra engedélyezve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt" xml:space="preserve">
@@ -2834,7 +3035,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Encrypt database?" xml:space="preserve">
         <source>Encrypt database?</source>
-        <target>Adatbázis titkosítása?</target>
+        <target>Titkosítja az adatbázist?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt local files" xml:space="preserve">
@@ -2859,7 +3060,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
         <source>Encrypted message: app is stopped</source>
-        <target>Titkosított üzenet: az alkalmazás leállt</target>
+        <target>Titkosított üzenet: az alkalmazás megállt</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Encrypted message: database error" xml:space="preserve">
@@ -2889,17 +3090,22 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
         <source>Encryption re-negotiation error</source>
-        <target>Titkosítás újraegyeztetési hiba</target>
+        <target>Hiba történt a titkosítás újraegyeztetésekor</target>
         <note>message decrypt error item</note>
       </trans-unit>
       <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
         <source>Encryption re-negotiation failed.</source>
-        <target>Sikertelen titkosítás-újraegyeztetés.</target>
+        <target>Nem sikerült a titkosítást újraegyeztetni.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>A titkosítás újraegyeztetése folyamatban van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
-        <target>Jelkód megadása</target>
+        <target>Adja meg a jelkódot</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter correct passphrase." xml:space="preserve">
@@ -2909,27 +3115,27 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enter group name…" xml:space="preserve">
         <source>Enter group name…</source>
-        <target>Csoportnév megadása…</target>
+        <target>Adja meg a csoport nevét…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase" xml:space="preserve">
         <source>Enter passphrase</source>
-        <target>Jelmondat megadása</target>
+        <target>Adja meg a jelmondatot</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
         <source>Enter passphrase…</source>
-        <target>Jelmondat megadása…</target>
+        <target>Adja meg a jelmondatot…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter password above to show!" xml:space="preserve">
         <source>Enter password above to show!</source>
-        <target>Jelszó megadása a megjelenítéshez!</target>
+        <target>Adja meg a jelszót fentebb a megjelenítéshez!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter server manually" xml:space="preserve">
         <source>Enter server manually</source>
-        <target>Kiszolgáló megadása kézzel</target>
+        <target>Adja meg a kiszolgálót kézzel</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter this device name…" xml:space="preserve">
@@ -2939,12 +3145,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
-        <target>Üdvözlőüzenet megadása…</target>
+        <target>Adja meg az üdvözlőüzenetet…</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter welcome message… (optional)" xml:space="preserve">
         <source>Enter welcome message… (optional)</source>
-        <target>Üdvözlőüzenet megadása… (nem kötelező)</target>
+        <target>Adja meg az üdvözlőüzenetet… (nem kötelező)</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter your name…" xml:space="preserve">
@@ -2959,252 +3165,292 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Error aborting address change" xml:space="preserve">
         <source>Error aborting address change</source>
-        <target>Hiba a cím megváltoztatásának megszakításakor</target>
+        <target>Hiba történt a cím módosításának megszakításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error accepting conditions" xml:space="preserve">
         <source>Error accepting conditions</source>
-        <target>Hiba a feltételek elfogadásakor</target>
+        <target>Hiba történt a feltételek elfogadásakor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error accepting contact request" xml:space="preserve">
         <source>Error accepting contact request</source>
-        <target>Hiba történt a kapcsolatkérés elfogadásakor</target>
+        <target>Hiba történt a meghívási kérés elfogadásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <target>Hiba a tag befogadásakor</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
-        <target>Hiba a tag(ok) hozzáadásakor</target>
+        <target>Hiba történt a tag(ok) hozzáadásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error adding server" xml:space="preserve">
         <source>Error adding server</source>
-        <target>Hiba a kiszolgáló hozzáadásakor</target>
+        <target>Hiba történt a kiszolgáló hozzáadásakor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
         <source>Error changing address</source>
-        <target>Hiba a cím megváltoztatásakor</target>
+        <target>Hiba történt a cím módosításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Hiba a kapcsolati profilra való váltáskor</target>
+        <target>Hiba történt a kapcsolati profilra való váltáskor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
-        <target>Hiba a szerepkör megváltoztatásakor</target>
+        <target>Hiba történt a szerepkör módosításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing setting" xml:space="preserve">
         <source>Error changing setting</source>
-        <target>Hiba a beállítás megváltoztatásakor</target>
+        <target>Hiba történt a beállítás módosításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>Hiba az inkognitóprofilra való váltáskor!</target>
+        <target>Hiba történt az inkognitóprofilra való váltáskor!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Hiba történt a token állapotának ellenőrzésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
-        <target>Hiba a(z) %@ továbbító kiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</target>
+        <target>Hiba történt a(z) %@ továbbítókiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating address" xml:space="preserve">
         <source>Error creating address</source>
-        <target>Hiba a cím létrehozásakor</target>
+        <target>Hiba történt a cím létrehozásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating group" xml:space="preserve">
         <source>Error creating group</source>
-        <target>Hiba a csoport létrehozásakor</target>
+        <target>Hiba történt a csoport létrehozásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating group link" xml:space="preserve">
         <source>Error creating group link</source>
-        <target>Hiba a csoporthivatkozás létrehozásakor</target>
+        <target>Hiba történt a csoporthivatkozás létrehozásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Hiba történt a lista létrehozásakor</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Hiba az ismerőssel történő kapcsolat létrehozásában</target>
+        <target>Hiba történt a partnerrel történő kapcsolat létrehozásában</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating message" xml:space="preserve">
         <source>Error creating message</source>
-        <target>Hiba az üzenet létrehozásakor</target>
+        <target>Hiba történt az üzenet létrehozásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
-        <target>Hiba a profil létrehozásakor!</target>
+        <target>Hiba történt a profil létrehozásakor!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Hiba történt a jelentés létrehozásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
-        <target>Hiba a fájl visszafejtésekor</target>
+        <target>Hiba történt a fájl visszafejtésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
-        <target>Hiba a csevegési adatbázis törlésekor</target>
+        <target>Hiba történt a csevegési adatbázis törlésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <target>Hiba a taggal való csevegés törlésekor</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
-        <target>Hiba a csevegés törlésekor!</target>
+        <target>Hiba történt a csevegés törlésekor!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting connection" xml:space="preserve">
         <source>Error deleting connection</source>
-        <target>Hiba a kapcsolat törlésekor</target>
+        <target>Hiba történt a kapcsolat törlésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting database" xml:space="preserve">
         <source>Error deleting database</source>
-        <target>Hiba az adatbázis törlésekor</target>
+        <target>Hiba történt az adatbázis törlésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting old database" xml:space="preserve">
         <source>Error deleting old database</source>
-        <target>Hiba a régi adatbázis törlésekor</target>
+        <target>Hiba történt a régi adatbázis törlésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting token" xml:space="preserve">
         <source>Error deleting token</source>
-        <target>Hiba a token törlésekor</target>
+        <target>Hiba történt a token törlésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting user profile" xml:space="preserve">
         <source>Error deleting user profile</source>
-        <target>Hiba a felhasználó-profil törlésekor</target>
+        <target>Hiba történt a felhasználói profil törlésekor</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>
-        <target>Hiba az archívum letöltésekor</target>
+        <target>Hiba történt az archívum letöltésekor</target>
         <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>Hiba a kézbesítési jelentések engedélyezésekor!</target>
+        <target>Hiba történt a kézbesítési jelentések engedélyezésekor!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling notifications" xml:space="preserve">
         <source>Error enabling notifications</source>
-        <target>Hiba az értesítések engedélyezésekor</target>
+        <target>Hiba történt az értesítések engedélyezésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error encrypting database" xml:space="preserve">
         <source>Error encrypting database</source>
-        <target>Hiba az adatbázis titkosításakor</target>
+        <target>Hiba történt az adatbázis titkosításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error exporting chat database" xml:space="preserve">
         <source>Error exporting chat database</source>
-        <target>Hiba a csevegési adatbázis exportálásakor</target>
+        <target>Hiba történt a csevegési adatbázis exportálásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error exporting theme: %@" xml:space="preserve">
         <source>Error exporting theme: %@</source>
-        <target>Hiba a téma exportálásakor: %@</target>
+        <target>Hiba történt a téma exportálásakor: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error importing chat database" xml:space="preserve">
         <source>Error importing chat database</source>
-        <target>Hiba a csevegési adatbázis importálásakor</target>
+        <target>Hiba történt a csevegési adatbázis importálásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error joining group" xml:space="preserve">
         <source>Error joining group</source>
-        <target>Hiba a csoporthoz való csatlakozáskor</target>
+        <target>Hiba történt a csoporthoz való csatlakozáskor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error loading servers" xml:space="preserve">
         <source>Error loading servers</source>
-        <target>Hiba a kiszolgálók betöltésekor</target>
+        <target>Hiba történt a kiszolgálók betöltésekor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Hiba a beallítások átköltöztetésekor</target>
+        <target>Hiba történt a beállítások átköltöztetésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
         <source>Error opening chat</source>
-        <target>Hiba a csevegés megnyitásakor</target>
+        <target>Hiba történt a csevegés megnyitásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
-        <target>Hiba a fájl fogadásakor</target>
+        <target>Hiba történt a fájl fogadásakor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
-        <target>Hiba a kiszolgálóhoz való újrakapcsolódáskor</target>
+        <target>Hiba történt a kiszolgálóhoz való újrakapcsolódáskor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting servers" xml:space="preserve">
         <source>Error reconnecting servers</source>
-        <target>Hiba a kiszolgálókhoz való újrakapcsolódáskor</target>
+        <target>Hiba történt a kiszolgálókhoz való újrakapcsolódáskor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Hiba történt az értesítések regisztrálásakor</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
-        <target>Hiba a tag eltávolításakor</target>
-        <note>No comment provided by engineer.</note>
+        <target>Hiba történt a tag eltávolításakor</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Hiba történt a listák újrarendezésekor</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
-        <target>Hiba a statisztikák visszaállításakor</target>
+        <target>Hiba történt a statisztikák visszaállításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error saving ICE servers" xml:space="preserve">
         <source>Error saving ICE servers</source>
-        <target>Hiba az ICE-kiszolgálók mentésekor</target>
+        <target>Hiba történt az ICE-kiszolgálók mentésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Hiba történt a csevegési lista mentésekor</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
-        <target>Hiba a csoportprofil mentésekor</target>
+        <target>Hiba történt a csoportprofil mentésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error saving passcode" xml:space="preserve">
         <source>Error saving passcode</source>
-        <target>Hiba a jelkód mentésekor</target>
+        <target>Hiba történt a jelkód mentésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error saving passphrase to keychain" xml:space="preserve">
         <source>Error saving passphrase to keychain</source>
-        <target>Hiba a jelmondat kulcstartóba történő mentésekor</target>
+        <target>Hiba történt a jelmondat kulcstartóba történő mentésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error saving servers" xml:space="preserve">
         <source>Error saving servers</source>
-        <target>Hiba a kiszolgálók mentésekor</target>
+        <target>Hiba történt a kiszolgálók mentésekor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
         <source>Error saving settings</source>
-        <target>Hiba a beállítások mentésekor</target>
+        <target>Hiba történt a beállítások mentésekor</target>
         <note>when migrating</note>
       </trans-unit>
       <trans-unit id="Error saving user password" xml:space="preserve">
         <source>Error saving user password</source>
-        <target>Hiba a felhasználói jelszó mentésekor</target>
+        <target>Hiba történt a felhasználó jelszavának mentésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error scanning code: %@" xml:space="preserve">
         <source>Error scanning code: %@</source>
-        <target>Hiba a kód beolvasásakor: %@</target>
+        <target>Hiba történt a kód beolvasásakor: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending email" xml:space="preserve">
         <source>Error sending email</source>
-        <target>Hiba az e-mail küldésekor</target>
+        <target>Hiba történt az e-mail elküldésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
@@ -3214,7 +3460,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
-        <target>Hiba az üzenet küldésekor</target>
+        <target>Hiba történt az üzenet elküldésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
@@ -3224,42 +3470,47 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Error starting chat" xml:space="preserve">
         <source>Error starting chat</source>
-        <target>Hiba a csevegés elindításakor</target>
+        <target>Hiba történt a csevegés elindításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error stopping chat" xml:space="preserve">
         <source>Error stopping chat</source>
-        <target>Hiba a csevegés megállításakor</target>
+        <target>Hiba történt a csevegés megállításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Hiba a profilváltáskor</target>
+        <target>Hiba történt a profilváltáskor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
-        <target>Hiba a profilváltásakor!</target>
+        <target>Hiba történt a profilváltáskor!</target>
         <note>alertTitle</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
-        <target>Hiba a kapcsolat szinkronizálásakor</target>
+        <target>Hiba történt a kapcsolat szinkronizálásakor</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Hiba történt a kiszolgáló kapcsolatának tesztelésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
-        <target>Hiba a csoporthivatkozás frissítésekor</target>
+        <target>Hiba történt a csoporthivatkozás frissítésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error updating message" xml:space="preserve">
         <source>Error updating message</source>
-        <target>Hiba az üzenet frissítésekor</target>
+        <target>Hiba történt az üzenet frissítésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error updating server" xml:space="preserve">
         <source>Error updating server</source>
-        <target>Hiba a kiszolgáló frissítésekor</target>
+        <target>Hiba történt a kiszolgáló frissítésekor</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error updating settings" xml:space="preserve">
@@ -3269,17 +3520,17 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Error updating user privacy" xml:space="preserve">
         <source>Error updating user privacy</source>
-        <target>Hiba a felhasználói adatvédelem frissítésekor</target>
+        <target>Hiba történt a felhasználói adatvédelem frissítésekor</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>
-        <target>Hiba az archívum feltöltésekor</target>
+        <target>Hiba történt az archívum feltöltésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error verifying passphrase:" xml:space="preserve">
         <source>Error verifying passphrase:</source>
-        <target>Hiba a jelmondat hitelesítésekor:</target>
+        <target>Hiba történt a jelmondat hitelesítésekor:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: " xml:space="preserve">
@@ -3290,7 +3541,9 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Hiba: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3580,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Kibontás</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Lejárt</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Adatbázis exportálása</target>
@@ -3367,20 +3625,35 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Gyors és nem kell várni, amíg a feladó online lesz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Gyorsabb csoporttörlés.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Gyorsabb csatlakozás és megbízhatóbb üzenetkézbesítés.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Gyorsabb üzenetküldés.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Kedvenc</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Kedvencek</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Fájlhiba</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,24 +3662,31 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>A kiszolgáló üzemeltetője letiltotta a fájlt:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
-        <target>A fájl nem található - valószínűleg a fájlt törölték vagy visszavonták.</target>
+        <target>A fájl nem található – valószínűleg a fájlt törölték vagy visszavonták.</target>
         <note>file error text</note>
       </trans-unit>
       <trans-unit id="File server error: %@" xml:space="preserve">
         <source>File server error: %@</source>
-        <target>Fájlkiszolgáló hiba: %@</target>
+        <target>Fájlkiszolgáló-hiba: %@</target>
         <note>file error text</note>
       </trans-unit>
       <trans-unit id="File status" xml:space="preserve">
         <source>File status</source>
-        <target>Fájlállapot</target>
+        <target>Fájl állapota</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="File status: %@" xml:space="preserve">
         <source>File status: %@</source>
-        <target>Fájlállapot: %@</target>
+        <target>Fájl állapota: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="File will be deleted from servers." xml:space="preserve">
@@ -3446,7 +3726,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
-        <target>A fájlok- és a médiatartalmak le vannak tiltva ebben a csoportban.</target>
+        <target>A fájlok- és a médiatartalmak küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Files and media not allowed" xml:space="preserve">
@@ -3506,7 +3786,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Fix not supported by contact" xml:space="preserve">
         <source>Fix not supported by contact</source>
-        <target>Ismerős általi javítás nem támogatott</target>
+        <target>Partner általi javítás nem támogatott</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fix not supported by group member" xml:space="preserve">
@@ -3514,6 +3794,11 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
         <target>Csoporttag általi javítás nem támogatott</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Az összes moderátor számára</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>A(z) %@ nevű csevegési profilhoz:</target>
@@ -3526,7 +3811,12 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." xml:space="preserve">
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
-        <target>Például, ha az Ön ismerőse egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.</target>
+        <target>Például, ha a partnere egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, akkor az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>Csak magamnak</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
@@ -3546,7 +3836,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Forward %d message(s)?" xml:space="preserve">
         <source>Forward %d message(s)?</source>
-        <target>%d üzenet továbbítása?</target>
+        <target>Továbbít %d üzenetet?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
@@ -3561,7 +3851,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Forward messages without files?" xml:space="preserve">
         <source>Forward messages without files?</source>
-        <target>Üzenetek továbbítása fájlok nélkül?</target>
+        <target>Továbbítja az üzeneteket fájlok nélkül?</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
@@ -3576,7 +3866,7 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Forwarded from" xml:space="preserve">
         <source>Forwarded from</source>
-        <target>Továbbítva innen:</target>
+        <target>Továbbítva innen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding %lld messages" xml:space="preserve">
@@ -3586,30 +3876,30 @@ Ez az Ön egyszer használható meghívó-hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
-        <target>A(z) %@ továbbító-kiszolgáló nem tudott csatlakozni a(z) %@ célkiszolgálóhoz. Próbálja meg később.</target>
+        <target>A(z) %@ továbbítókiszolgáló nem tudott kapcsolódni a(z) %@ célkiszolgálóhoz. Próbálja meg később.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server address is incompatible with network settings: %@." xml:space="preserve">
         <source>Forwarding server address is incompatible with network settings: %@.</source>
-        <target>A továbbító-kiszolgáló címe nem kompatibilis a hálózati beállításokkal: %@.</target>
+        <target>A továbbítókiszolgáló címe nem kompatibilis a hálózati beállításokkal: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server version is incompatible with network settings: %@." xml:space="preserve">
         <source>Forwarding server version is incompatible with network settings: %@.</source>
-        <target>A továbbító-kiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %@.</target>
+        <target>A továbbítókiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
         <source>Forwarding server: %1$@
 Destination server error: %2$@</source>
-        <target>Továbbító-kiszolgáló: %1$@
-Célkiszolgáló hiba:%2$@</target>
+        <target>Továbbítókiszolgáló: %1$@
+Célkiszolgáló-hiba: %2$@</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Forwarding server: %@&#10;Error: %@" xml:space="preserve">
         <source>Forwarding server: %1$@
 Error: %2$@</source>
-        <target>Továbbító-kiszolgáló: %1$@
+        <target>Továbbítókiszolgáló: %1$@
 Hiba: %2$@</target>
         <note>snd error text</note>
       </trans-unit>
@@ -3635,12 +3925,12 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
         <source>Fully decentralized – visible only to members.</source>
-        <target>Teljesen decentralizált - csak a tagok számára látható.</target>
+        <target>Teljesen decentralizált – csak a tagok számára látható.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
-        <target>Teljesen újra implementálva - háttérben történő működés!</target>
+        <target>Teljesen újra implementálva – háttérben történő működés!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Further reduced battery usage" xml:space="preserve">
@@ -3653,6 +3943,11 @@ Hiba: %2$@</target>
         <target>GIF-ek és matricák</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Kapjon értesítést, ha megemlítik.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Jó napot!</target>
@@ -3685,7 +3980,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Group full name (optional)" xml:space="preserve">
         <source>Group full name (optional)</source>
-        <target>Csoport teljes neve (nem kötelező)</target>
+        <target>A csoport teljes neve (nem kötelező)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group image" xml:space="preserve">
@@ -3725,7 +4020,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Group moderation" xml:space="preserve">
         <source>Group moderation</source>
-        <target>Csoport moderáció</target>
+        <target>Csoport moderálása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group preferences" xml:space="preserve">
@@ -3750,12 +4045,17 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Group will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for all members - this cannot be undone!</source>
-        <target>A csoport törlésre kerül az összes tag számára - ez a művelet nem vonható vissza!</target>
+        <target>A csoport törölve lesz az összes tag számára – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Group will be deleted for you - this cannot be undone!</source>
-        <target>A csoport törlésre kerül az Ön számára - ez a művelet nem vonható vissza!</target>
+        <target>A csoport törölve lesz az Ön számára – ez a művelet nem vonható vissza!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Csoportok</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
@@ -3763,6 +4063,11 @@ Hiba: %2$@</target>
         <target>Súgó</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Segítsen az adminisztrátoroknak a csoportjaik moderálásában.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Se név, se üzenet</target>
@@ -3795,7 +4100,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Hide:" xml:space="preserve">
         <source>Hide:</source>
-        <target>Elrejtés:</target>
+        <target>Elrejtve:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="History" xml:space="preserve">
@@ -3805,7 +4110,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="History is not sent to new members." xml:space="preserve">
         <source>History is not sent to new members.</source>
-        <target>Az előzmények nem kerülnek elküldésre az új tagok számára.</target>
+        <target>Az előzmények nem lesznek elküldve az új tagok számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
@@ -3823,6 +4128,11 @@ Hiba: %2$@</target>
         <target>Hogyan segíti az adatvédelmet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Hogyan működik</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Hogyan</target>
@@ -3830,12 +4140,12 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="How to use it" xml:space="preserve">
         <source>How to use it</source>
-        <target>Hogyan használja</target>
+        <target>Használati útmutató</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How to use your servers" xml:space="preserve">
         <source>How to use your servers</source>
-        <target>Saját kiszolgálók használata</target>
+        <target>Hogyan használja a saját kiszolgálóit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Hungarian interface" xml:space="preserve">
@@ -3860,17 +4170,17 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
         <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
-        <target>Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen eltávolításra kerül!</target>
+        <target>Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen el lesz távolítva!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="If you enter your self-destruct passcode while opening the app:" xml:space="preserve">
         <source>If you enter your self-destruct passcode while opening the app:</source>
-        <target>Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:</target>
+        <target>Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő-jelkódot:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." xml:space="preserve">
         <source>If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app).</source>
-        <target>Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).</target>
+        <target>Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor fel lesz ajánlva az adatbázis átköltöztetése).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Ignore" xml:space="preserve">
@@ -3895,7 +4205,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Immune to spam" xml:space="preserve">
         <source>Immune to spam</source>
-        <target>Spam és visszaélések elleni védelem</target>
+        <target>Védett a kéretlen tartalommal szemben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Import" xml:space="preserve">
@@ -3905,7 +4215,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="Import chat database?" xml:space="preserve">
         <source>Import chat database?</source>
-        <target>Csevegési adatbázis importálása?</target>
+        <target>Importálja a csevegési adatbázist?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Import database" xml:space="preserve">
@@ -3957,7 +4267,7 @@ További fejlesztések hamarosan!</target>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
-        <target>Válasz neki</target>
+        <target>Válaszul erre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In-call sounds" xml:space="preserve">
@@ -3965,6 +4275,16 @@ További fejlesztések hamarosan!</target>
         <target>Bejövő hívás csengőhangja</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Kifogásolt tartalom</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Kifogásolt profil</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Inkognitó</target>
@@ -3982,7 +4302,7 @@ További fejlesztések hamarosan!</target>
       </trans-unit>
       <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
         <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>Az inkognitómód védi személyes adatait azáltal, hogy az összes ismerőséhez új, véletlenszerű profilt használ.</target>
+        <target>Az inkognitómód úgy védi a személyes adatait, hogy az összes partneréhez új, véletlenszerű profilt használ.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -4037,13 +4357,13 @@ További fejlesztések hamarosan!</target>
       </trans-unit>
       <trans-unit id="Instant" xml:space="preserve">
         <source>Instant</source>
-        <target>Azonnal</target>
+        <target>Azonnali</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Instant push notifications will be hidden!&#10;" xml:space="preserve">
         <source>Instant push notifications will be hidden!
 </source>
-        <target>Az azonnali push-értesítések elrejtésre kerülnek!
+        <target>Az azonnali push-értesítések el lesznek rejtve!
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4057,6 +4377,31 @@ További fejlesztések hamarosan!</target>
         <target>Kezelőfelület színei</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Érvénytelen</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Érvénytelen (hibás token)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Érvénytelen (lejárt)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Érvénytelen (nincs regisztrálva)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Érvénytelen (rossz topic)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Érvénytelen QR-kód</target>
@@ -4139,17 +4484,17 @@ További fejlesztések hamarosan!</target>
       </trans-unit>
       <trans-unit id="Irreversible message deletion is prohibited." xml:space="preserve">
         <source>Irreversible message deletion is prohibited.</source>
-        <target>Az üzenetek végleges törlése le van tiltva ebben a csoportban.</target>
+        <target>Az üzenetek végleges törlése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
         <source>It allows having many anonymous connections without any shared data between them in a single chat profile.</source>
-        <target>Lehetővé teszi, hogy egyetlen csevegőprofilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.</target>
+        <target>Lehetővé teszi, hogy egyetlen csevegési profilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It can happen when you or your connection used the old database backup." xml:space="preserve">
         <source>It can happen when you or your connection used the old database backup.</source>
-        <target>Ez akkor fordulhat elő, ha Ön vagy az ismerőse régi adatbázis biztonsági mentést használt.</target>
+        <target>Ez akkor fordulhat elő, ha Ön vagy a partnere egy régi adatbázis biztonsági mentését használta.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It can happen when:&#10;1. The messages expired in the sending client after 2 days or on the server after 30 days.&#10;2. Message decryption failed, because you or your contact used old database backup.&#10;3. The connection was compromised." xml:space="preserve">
@@ -4159,7 +4504,7 @@ További fejlesztések hamarosan!</target>
 3. The connection was compromised.</source>
         <target>Ez akkor fordulhat elő, ha:
 1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.
-2. Az üzenet visszafejtése sikertelen volt, mert vagy az ismerőse régebbi adatbázis biztonsági mentést használt.
+2. Nem sikerült az üzenetet visszafejteni, mert Ön, vagy a partnere egy régi adatbázis biztonsági mentését használta.
 3. A kapcsolat sérült.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4217,7 +4562,7 @@ További fejlesztések hamarosan!</target>
         <source>Join your group?
 This is your link for group %@!</source>
         <target>Csatlakozik a csoportjához?
-Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
+Ez a saját hivatkozása a(z) %@ nevű csoporthoz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
@@ -4227,7 +4572,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Keep" xml:space="preserve">
         <source>Keep</source>
-        <target>Megtart</target>
+        <target>Megtartás</target>
         <note>alert action</note>
       </trans-unit>
       <trans-unit id="Keep conversation" xml:space="preserve">
@@ -4242,7 +4587,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Keep unused invitation?" xml:space="preserve">
         <source>Keep unused invitation?</source>
-        <target>Fel nem használt meghívó megtartása?</target>
+        <target>Megtartja a fel nem használt meghívót?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
@@ -4287,7 +4632,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Leave chat?" xml:space="preserve">
         <source>Leave chat?</source>
-        <target>Csevegés elhagyása?</target>
+        <target>Elhagyja a csevegést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -4297,7 +4642,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Leave group?" xml:space="preserve">
         <source>Leave group?</source>
-        <target>Csoport elhagyása?</target>
+        <target>Elhagyja a csoportot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Let's talk in SimpleX Chat" xml:space="preserve">
@@ -4330,6 +4675,21 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Társított számítógépek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Lista</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>Az összes lista nevének és emodzsijának különbözőnek kell lennie.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Lista neve…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Élő üzenet!</target>
@@ -4372,7 +4732,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve">
         <source>Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated.</source>
-        <target>Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.</target>
+        <target>Győződjön meg arról, hogy a megadott WebRTC ICE-kiszolgálók címei megfelelő formátumúak, soronként elkülönítettek, és nincsenek duplikálva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mark deleted for everyone" xml:space="preserve">
@@ -4402,7 +4762,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Media &amp; file servers" xml:space="preserve">
         <source>Media &amp; file servers</source>
-        <target>Média és fájlkiszolgálók</target>
+        <target>Média- és fájlkiszolgálók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
@@ -4415,69 +4775,94 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Tag</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <target>Tagbefogadás</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Inaktív tag</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Tagok jelentései</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
-        <target>A tag szerepeköre meg fog változni a következőre: "%@". A csevegés tagjai értesítést fognak kapni.</target>
+        <target>A tag szerepköre a következőre fog módosulni: „%@”. A csevegés összes tagja értesítést fog kapni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All group members will be notified.</source>
-        <target>A tag szerepköre meg fog változni erre: „%@”. A csoportban az összes tag értesítve lesz.</target>
+        <target>A tag szerepköre a következőre fog módosulni: „%@”. A csoport az összes tagja értesítést fog kapni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve">
         <source>Member role will be changed to "%@". The member will receive a new invitation.</source>
-        <target>A tag szerepköre meg fog változni erre: „%@”. A tag új meghívást fog kapni.</target>
+        <target>A tag szerepköre a következőre fog módosulni: „%@”. A tag új meghívást fog kapni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from chat - this cannot be undone!</source>
-        <target>A tag el lesz távolítva a csevegésből - ezt a műveletet nem lehet visszavonni!</target>
+        <target>A tag el lesz távolítva a csevegésből – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from group - this cannot be undone!</source>
-        <target>A tag eltávolítása a csoportból - ez a művelet nem vonható vissza!</target>
+        <target>A tag el lesz távolítva a csoportból – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <target>A tag csatlakozni akar a csoporthoz, befogadja a tagot?</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
-        <target>Csoporttagok üzenetreakciókat adhatnak hozzá.</target>
+        <target>A tagok reakciókat adhatnak hozzá az üzenetekhez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>A csoport tagjai véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</target>
+        <target>A tagok véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>A tagok jelenthetik az üzeneteket a moderátorok felé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
-        <target>A csoport tagjai küldhetnek SimpleX-hivatkozásokat.</target>
+        <target>A tagok küldhetnek SimpleX-hivatkozásokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send direct messages." xml:space="preserve">
         <source>Members can send direct messages.</source>
-        <target>A csoport tagjai küldhetnek egymásnak közvetlen üzeneteket.</target>
+        <target>A tagok küldhetnek egymásnak közvetlen üzeneteket.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send disappearing messages." xml:space="preserve">
         <source>Members can send disappearing messages.</source>
-        <target>A csoport tagjai küldhetnek eltűnő üzeneteket.</target>
+        <target>A tagok küldhetnek eltűnő üzeneteket.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send files and media." xml:space="preserve">
         <source>Members can send files and media.</source>
-        <target>A csoport tagjai küldhetnek fájlokat és médiatartalmakat.</target>
+        <target>A tagok küldhetnek fájlokat és médiatartalmakat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send voice messages." xml:space="preserve">
         <source>Members can send voice messages.</source>
-        <target>A csoport tagjai küldhetnek hangüzeneteket.</target>
+        <target>A tagok küldhetnek hangüzeneteket.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Tagok említése 👋</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
@@ -4517,7 +4902,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message queue info" xml:space="preserve">
         <source>Message queue info</source>
-        <target>Üzenet-sorbaállítási információ</target>
+        <target>Üzenetsorbaállítási információ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message reactions" xml:space="preserve">
@@ -4527,12 +4912,12 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message reactions are prohibited in this chat." xml:space="preserve">
         <source>Message reactions are prohibited in this chat.</source>
-        <target>Az üzenetreakciók küldése le van tiltva ebben a csevegésben.</target>
+        <target>A reakciók hozzáadása az üzenetekhez le van tiltva ebben a csevegésben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message reactions are prohibited." xml:space="preserve">
         <source>Message reactions are prohibited.</source>
-        <target>Az üzenetreakciók küldése le van tiltva ebben a csoportban.</target>
+        <target>A reakciók hozzáadása az üzenetekhez le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message reception" xml:space="preserve">
@@ -4547,7 +4932,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Üzenetbuborék formája</target>
+        <target>Üzenetbuborék alakja</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4557,12 +4942,12 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message status" xml:space="preserve">
         <source>Message status</source>
-        <target>Üzenetállapot</target>
+        <target>Üzenet állapota</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message status: %@" xml:space="preserve">
         <source>Message status: %@</source>
-        <target>Üzenetállapot: %@</target>
+        <target>Üzenet állapota: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Message text" xml:space="preserve">
@@ -4587,9 +4972,14 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
         <source>Messages from %@ will be shown!</source>
-        <target>A(z) %@ által írt üzenetek megjelennek!</target>
+        <target>%@ összes üzenete meg fog jelenni!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Az ebben a csevegésben lévő üzenetek soha nem lesznek törölve.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Fogadott üzenetek</target>
@@ -4602,17 +4992,17 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
         <source>Messages were deleted after you selected them.</source>
-        <target>Az üzeneteket törölték miután kiválasztotta őket.</target>
+        <target>Az üzeneteket törölték miután kijelölte őket.</target>
         <note>alert message</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>
-        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.</target>
+        <target>Az üzenetek, a fájlok és a hívások **végpontok közötti titkosítással**, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.</target>
         <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>
-        <target>Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.</target>
+        <target>Az üzenetek, a fájlok és a hívások **végpontok közötti kvantumbiztos titkosítással**, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
@@ -4657,7 +5047,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
         <source>Migration error:</source>
-        <target>Átköltöztetés hiba:</target>
+        <target>Átköltöztetési hiba:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." xml:space="preserve">
@@ -4682,14 +5072,19 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Moderated at" xml:space="preserve">
         <source>Moderated at</source>
-        <target>Moderálva ekkor:</target>
+        <target>Moderálva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Moderated at: %@" xml:space="preserve">
         <source>Moderated at: %@</source>
-        <target>Moderálva ekkor: %@</target>
+        <target>Moderálva: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Továbbiak</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Hamarosan további fejlesztések érkeznek!</target>
@@ -4707,18 +5102,23 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
         <source>Most likely this connection is deleted.</source>
-        <target>Valószínűleg ez a kapcsolat törlésre került.</target>
+        <target>Valószínűleg ez a kapcsolat törölve lett.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
-        <target>Több csevegőprofil</target>
+        <target>Több csevegési profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Némítás</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Összes némítása</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4737,7 +5137,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Network connection" xml:space="preserve">
         <source>Network connection</source>
-        <target>Internetkapcsolat</target>
+        <target>Hálózati kapcsolat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network decentralization" xml:space="preserve">
@@ -4747,7 +5147,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
         <source>Network issues - message expired after many attempts to send it.</source>
-        <target>Hálózati problémák - az üzenet többszöri elküldési kísérlet után lejárt.</target>
+        <target>Hálózati problémák – az üzenet többszöri elküldési kísérlet után lejárt.</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Network management" xml:space="preserve">
@@ -4757,7 +5157,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Network operator" xml:space="preserve">
         <source>Network operator</source>
-        <target>Hálózati üzemeltető</target>
+        <target>Hálózatüzemeltető</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network settings" xml:space="preserve">
@@ -4770,6 +5170,11 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Hálózat állapota</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Új</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Új jelkód</target>
@@ -4787,7 +5192,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
-        <target>Új beszélgetés</target>
+        <target>Új csevegés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New chat experience 🎉" xml:space="preserve">
@@ -4797,7 +5202,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="New contact request" xml:space="preserve">
         <source>New contact request</source>
-        <target>Új kapcsolatkérés</target>
+        <target>Új meghívási kérés</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="New contact:" xml:space="preserve">
@@ -4812,7 +5217,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
-        <target>Új megjelenítési név</target>
+        <target>Új megjelenítendő név</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New events" xml:space="preserve">
@@ -4835,6 +5240,11 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Új tag szerepköre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <target>Új tag szeretne csatlakozni a csoporthoz.</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Új üzenet</target>
@@ -4860,14 +5270,34 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Nincs alkalmazás jelszó</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Nincsenek csevegések</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Nem találhatók csevegések</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Nincsenek csevegések a(z) %@ nevű listában</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <target>Nincsenek csevegések a tagokkal</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
-        <target>Nincs kiválasztva ismerős</target>
+        <target>Nincs partner kijelölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No contacts to add" xml:space="preserve">
         <source>No contacts to add</source>
-        <target>Nincs hozzáadandó ismerős</target>
+        <target>Nincs hozzáadandó partner</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No delivery information" xml:space="preserve">
@@ -4877,7 +5307,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
-        <target>Nincs kiszüléktoken!</target>
+        <target>Nincs készüléktoken!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No direct connection yet, message is forwarded by admin." xml:space="preserve">
@@ -4910,6 +5340,11 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Nincsenek média- és fájlkiszolgálók.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Nincs üzenet</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Nincsenek üzenet-kiszolgálók.</target>
@@ -4952,12 +5387,12 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="No servers to receive files." xml:space="preserve">
         <source>No servers to receive files.</source>
-        <target>Nincsenek fájlfogadó-kiszolgálók.</target>
+        <target>Nincsenek fájlfogadási kiszolgálók.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive messages." xml:space="preserve">
         <source>No servers to receive messages.</source>
-        <target>Nincsenek üzenetfogadó-kiszolgálók.</target>
+        <target>Nincsenek üzenetfogadási kiszolgálók.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to send files." xml:space="preserve">
@@ -4965,9 +5400,19 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Nincsenek fájlküldő-kiszolgálók.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>Nincs token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Nincsenek olvasatlan csevegések</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
-        <target>Nincsenek felhasználó-azonosítók.</target>
+        <target>Nincsenek felhasználói azonosítók.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Not compatible!" xml:space="preserve">
@@ -4975,9 +5420,14 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Nem kompatibilis!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Jegyzetek</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
-        <target>Nincs kiválasztva semmi</target>
+        <target>Nincs semmi kijelölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Nothing to forward!" xml:space="preserve">
@@ -4995,11 +5445,21 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
         <target>Az értesítések le vannak tiltva!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Értesítési hiba</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Értesítési adatvédelem</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Értesítések állapota</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5022,7 +5482,8 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Rendben</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5031,7 +5492,7 @@ Ez az Ön hivatkozása a(z) %@ nevű csoporthoz!</target>
       </trans-unit>
       <trans-unit id="One-time invitation link" xml:space="preserve">
         <source>One-time invitation link</source>
-        <target>Egyszer használható meghívó-hivatkozás</target>
+        <target>Egyszer használható meghívó</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Onion hosts will be **required** for connection.&#10;Requires compatible VPN." xml:space="preserve">
@@ -5050,17 +5511,17 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Onion hosts will not be used." xml:space="preserve">
         <source>Onion hosts will not be used.</source>
-        <target>Onion-kiszolgálók nem lesznek használva.</target>
+        <target>Az onion-kiszolgálók nem lesznek használva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
         <source>Only chat owners can change preferences.</source>
-        <target>Csak a csevegés tulajdonosai módosíthatják a beállításokat.</target>
+        <target>Csak a csevegés tulajdonosai módosíthatják a csevegési beállításokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
         <source>Only client devices store user profiles, contacts, groups, and messages.</source>
-        <target>Csak az eszközök alkalmazásai tárolják a felhasználó-profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.</target>
+        <target>A felhasználói profilok, partnerek, csoportok és üzenetek csak az eszközön vannak tárolva a kliensen belül.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only delete conversation" xml:space="preserve">
@@ -5070,27 +5531,37 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
         <source>Only group owners can change group preferences.</source>
-        <target>Csak a csoporttulajdonosok módosíthatják a csoportbeállításokat.</target>
+        <target>Csak a csoport tulajdonosai módosíthatják a csoportbeállításokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
         <source>Only group owners can enable files and media.</source>
-        <target>Csak a csoporttulajdonosok engedélyezhetik a fájlok- és a médiatartalmak küldését.</target>
+        <target>Csak a csoport tulajdonosai engedélyezhetik a fájlok- és a médiatartalmak küldését.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
         <source>Only group owners can enable voice messages.</source>
-        <target>Csak a csoporttulajdonosok engedélyezhetik a hangüzenetek küldését.</target>
+        <target>Csak a csoport tulajdonosai engedélyezhetik a hangüzenetek küldését.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Csak a küldő és a moderátorok látják</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Csak Ön és a moderátorok látják</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
-        <target>Csak Ön adhat hozzá üzenetreakciókat.</target>
+        <target>Csak Ön adhat hozzá reakciókat az üzenetekhez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
         <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
-        <target>Véglegesen csak Ön törölhet üzeneteket (ismerőse csak törlésre jelölheti meg őket ). (24 óra)</target>
+        <target>Véglegesen csak Ön törölhet üzeneteket (partnere csak törlésre jelölheti meg őket ). (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only you can make calls." xml:space="preserve">
@@ -5110,33 +5581,33 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Only your contact can add message reactions." xml:space="preserve">
         <source>Only your contact can add message reactions.</source>
-        <target>Csak az ismerőse tud üzenetreakciókat küldeni.</target>
+        <target>Csak a partnere adhat hozzá reakciókat az üzenetekhez.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
         <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
-        <target>Csak az ismerőse tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)</target>
+        <target>Csak a partnere tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only your contact can make calls." xml:space="preserve">
         <source>Only your contact can make calls.</source>
-        <target>Csak az ismerőse tud hívást indítani.</target>
+        <target>Csak a partnere tud hívást indítani.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only your contact can send disappearing messages." xml:space="preserve">
         <source>Only your contact can send disappearing messages.</source>
-        <target>Csak az ismerőse tud eltűnő üzeneteket küldeni.</target>
+        <target>Csak a partnere tud eltűnő üzeneteket küldeni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
-        <target>Csak az ismerőse tud hangüzeneteket küldeni.</target>
+        <target>Csak a partnere tud hangüzeneteket küldeni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Megnyitás</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5145,7 +5616,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Open changes" xml:space="preserve">
         <source>Open changes</source>
-        <target>Változások megnyitása</target>
+        <target>Módosítások megtekintése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open chat" xml:space="preserve">
@@ -5155,7 +5626,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Open chat console" xml:space="preserve">
         <source>Open chat console</source>
-        <target>Csevegés konzol megnyitása</target>
+        <target>Csevegési konzol megnyitása</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Open conditions" xml:space="preserve">
@@ -5168,9 +5639,14 @@ VPN engedélyezése szükséges.</target>
         <target>Csoport megnyitása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <target>Megnyitja a hivatkozást?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
-        <target>Átköltöztetés megkezdése egy másik eszközre</target>
+        <target>Átköltöztetés indítása egy másik eszközre</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
@@ -5185,7 +5661,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Operator server" xml:space="preserve">
         <source>Operator server</source>
-        <target>Kiszolgáló üzemeltető</target>
+        <target>Kiszolgáló-üzemeltető</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Or import archive file" xml:space="preserve">
@@ -5218,6 +5694,11 @@ VPN engedélyezése szükséges.</target>
         <target>Vagy a privát megosztáshoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Csevegések listákba szervezése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>További</target>
@@ -5247,7 +5728,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Passcode changed!" xml:space="preserve">
         <source>Passcode changed!</source>
-        <target>A jelkód megváltozott!</target>
+        <target>A jelkód módosult!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Passcode entry" xml:space="preserve">
@@ -5257,7 +5738,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Passcode not changed!" xml:space="preserve">
         <source>Passcode not changed!</source>
-        <target>A jelkód nem változott!</target>
+        <target>A jelkód nem módosult!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Passcode set!" xml:space="preserve">
@@ -5272,7 +5753,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
-        <target>Jelszó megjelenítése</target>
+        <target>Jelszó a megjelenítéshez</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Past member %@" xml:space="preserve">
@@ -5307,7 +5788,7 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Periodic" xml:space="preserve">
         <source>Periodic</source>
-        <target>Rendszeresen</target>
+        <target>Időszakos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Permanent decryption error" xml:space="preserve">
@@ -5327,12 +5808,12 @@ VPN engedélyezése szükséges.</target>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
         <source>Please ask your contact to enable calls.</source>
-        <target>Kérje meg az ismerősét, hogy engedélyezze a hívásokat.</target>
+        <target>Kérje meg a partnerét, hogy engedélyezze a hívásokat.</target>
         <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>Kérje meg az ismerősét, hogy engedélyezze a hangüzenetek küldését.</target>
+        <target>Kérje meg a partnerét, hogy engedélyezze a hangüzenetek küldését.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please check that mobile and desktop are connected to the same local network, and that desktop firewall allows the connection.&#10;Please share any other issues with the developers." xml:space="preserve">
@@ -5344,17 +5825,17 @@ Minden további problémát osszon meg a fejlesztőkkel.</target>
       </trans-unit>
       <trans-unit id="Please check that you used the correct link or ask your contact to send you another one." xml:space="preserve">
         <source>Please check that you used the correct link or ask your contact to send you another one.</source>
-        <target>Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg az ismerősét, hogy küldjön egy másikat.</target>
+        <target>Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg a partnerét, hogy küldjön egy másikat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please check your network connection with %@ and try again." xml:space="preserve">
         <source>Please check your network connection with %@ and try again.</source>
-        <target>Ellenőrizze a hálózati kapcsolatát a következővel: %@, és próbálja újra.</target>
+        <target>Ellenőrizze a hálózati kapcsolatát a vele: %@, és próbálja újra.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please check yours and your contact preferences." xml:space="preserve">
         <source>Please check yours and your contact preferences.</source>
-        <target>Ellenőrizze a saját- és az ismerőse beállításait.</target>
+        <target>Ellenőrizze a saját- és a partnere beállításait.</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">
@@ -5376,17 +5857,17 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Please enter correct current passphrase." xml:space="preserve">
         <source>Please enter correct current passphrase.</source>
-        <target>Adja meg a helyes, jelenlegi jelmondatát.</target>
+        <target>Adja meg a helyes, jelenlegi jelmondatot.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please enter the previous password after restoring database backup. This action can not be undone." xml:space="preserve">
         <source>Please enter the previous password after restoring database backup. This action can not be undone.</source>
-        <target>Előző jelszó megadása az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.</target>
+        <target>Adja meg a korábbi jelszót az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please remember or store it securely - there is no way to recover a lost passcode!" xml:space="preserve">
         <source>Please remember or store it securely - there is no way to recover a lost passcode!</source>
-        <target>Jegyezze fel vagy tárolja el biztonságosan - az elveszett jelkódot nem lehet visszaállítani!</target>
+        <target>Jegyezze fel vagy tárolja el biztonságosan – az elveszett jelkódot nem lehet visszaállítani!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please report it to the developers." xml:space="preserve">
@@ -5406,9 +5887,29 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Please store passphrase securely, you will NOT be able to change it if you lose it." xml:space="preserve">
         <source>Please store passphrase securely, you will NOT be able to change it if you lose it.</source>
-        <target>Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja megváltoztatni.</target>
+        <target>Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja módosítani.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Próbálja meg letiltani és újra engedélyezni az értesítéseket.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <target>Várja meg, amíg a csoport moderátorai áttekintik a csoporthoz való csatlakozási kérelmét.</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Várjon, amíg a token aktiválása befejeződik.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Várjon a token regisztrálására.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Lengyel kezelőfelület</target>
@@ -5431,7 +5932,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Preset server address" xml:space="preserve">
         <source>Preset server address</source>
-        <target>Előre beállított kiszolgáló címe</target>
+        <target>Az előre beállított kiszolgáló címe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preset servers" xml:space="preserve">
@@ -5456,12 +5957,22 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Privacy for your customers." xml:space="preserve">
         <source>Privacy for your customers.</source>
-        <target>Az Ön ügyfeleinek adatvédelme.</target>
+        <target>Saját ügyfeleinek adatvédelme.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Adatvédelmi szabályzat és felhasználási feltételek.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
-        <target>Adatvédelem újraértelmezve</target>
+        <target>Újraértelmezett adatvédelem</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>A privát csevegések, a csoportok és a partnerek nem érhetők el a szerver üzemeltetői számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
@@ -5469,6 +5980,11 @@ Hiba: %@</target>
         <target>Privát fájlnevek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Privát nevek a médiafájlokhoz.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Privát üzenet-útválasztás</target>
@@ -5491,7 +6007,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Private routing error" xml:space="preserve">
         <source>Private routing error</source>
-        <target>Privát útválasztáshiba</target>
+        <target>Privát útválasztási hiba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
@@ -5521,7 +6037,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Profile update will be sent to your contacts." xml:space="preserve">
         <source>Profile update will be sent to your contacts.</source>
-        <target>A profilfrissítés elküldésre került az ismerősök számára.</target>
+        <target>A profilfrissítés el lesz küldve a partnerei számára.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Prohibit audio/video calls." xml:space="preserve">
@@ -5531,17 +6047,22 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit irreversible message deletion." xml:space="preserve">
         <source>Prohibit irreversible message deletion.</source>
-        <target>Az üzenetek véglegesen való törlése le van tiltva.</target>
+        <target>Az elküldött üzenetek végleges törlése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit message reactions." xml:space="preserve">
         <source>Prohibit message reactions.</source>
-        <target>Az üzenetreakciók küldése le van tiltva.</target>
+        <target>A reakciók hozzáadása az üzenethez le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit messages reactions." xml:space="preserve">
         <source>Prohibit messages reactions.</source>
-        <target>Az üzenetreakciók tiltása.</target>
+        <target>A reakciók hozzáadása az üzenetekhez le van tiltva.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Az üzenetek a moderátorok felé történő jelentésének megtiltása.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
@@ -5561,7 +6082,7 @@ Hiba: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit sending files and media." xml:space="preserve">
         <source>Prohibit sending files and media.</source>
-        <target>Fájlok- és a médiatartalmak küldésének letiltása.</target>
+        <target>A fájlok- és a médiatartalmak küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending voice messages." xml:space="preserve">
@@ -5582,8 +6103,8 @@ Hiba: %@</target>
       <trans-unit id="Protect your IP address from the messaging relays chosen by your contacts.&#10;Enable in *Network &amp; servers* settings." xml:space="preserve">
         <source>Protect your IP address from the messaging relays chosen by your contacts.
 Enable in *Network &amp; servers* settings.</source>
-        <target>Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.
-Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.</target>
+        <target>Védje az IP-címét a partnerei által kiválasztott üzenetváltási továbbítókiszolgálókkal szemben.
+Engedélyezze a *Hálózat és kiszolgálók* menüben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
@@ -5598,7 +6119,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Protocol timeout per KB" xml:space="preserve">
         <source>Protocol timeout per KB</source>
-        <target>Protokoll időtúllépése KB-onként</target>
+        <target>Protokoll időtúllépése kB-onként</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Proxied" xml:space="preserve">
@@ -5628,7 +6149,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
-        <target>Kvantumrezisztens titkosítás</target>
+        <target>Kvantumbiztos titkosítás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -5688,12 +6209,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
-        <target>Fogadva ekkor:</target>
+        <target>Fogadva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Received at: %@" xml:space="preserve">
         <source>Received at: %@</source>
-        <target>Fogadva ekkor: %@</target>
+        <target>Fogadva: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Received file event" xml:space="preserve">
@@ -5723,7 +6244,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
         <source>Receiving address will be changed to a different server. Address change will complete after sender comes online.</source>
-        <target>A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.</target>
+        <target>A fogadási cím egy másik kiszolgálóra fog módosulni. A cím módosítása a feladó online állapotba kerülése után fejeződik be.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -5733,7 +6254,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Receiving via" xml:space="preserve">
         <source>Receiving via</source>
-        <target>Fogadás a</target>
+        <target>Fogadás a következőn keresztül:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="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)." xml:space="preserve">
@@ -5768,7 +6289,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Reconnect all servers?" xml:space="preserve">
         <source>Reconnect all servers?</source>
-        <target>Újrakapcsolódás az összes kiszolgálóhoz?</target>
+        <target>Újrakapcsolódik az összes kiszolgálóhoz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reconnect server to force message delivery. It uses additional traffic." xml:space="preserve">
@@ -5778,22 +6299,22 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Reconnect server?" xml:space="preserve">
         <source>Reconnect server?</source>
-        <target>Újrakapcsolódás a kiszolgálóhoz?</target>
+        <target>Újrakapcsolódik a kiszolgálóhoz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reconnect servers?" xml:space="preserve">
         <source>Reconnect servers?</source>
-        <target>Újrakapcsolódás a kiszolgálókhoz?</target>
+        <target>Újrakapcsolódik a kiszolgálókhoz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Record updated at" xml:space="preserve">
         <source>Record updated at</source>
-        <target>A bejegyzés frissítve</target>
+        <target>Bejegyzés frissítve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Record updated at: %@" xml:space="preserve">
         <source>Record updated at: %@</source>
-        <target>A bejegyzés frissítve: %@</target>
+        <target>Bejegyzés frissítve: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Reduced battery usage" xml:space="preserve">
@@ -5801,11 +6322,26 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Csökkentett akkumulátor-használat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Regisztrálás</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Regisztrálja az értesítési tokent?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Regisztrálva</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Elutasítás</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5814,17 +6350,22 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Reject contact request" xml:space="preserve">
         <source>Reject contact request</source>
-        <target>Kapcsolatkérés elutasítása</target>
+        <target>Meghívási kérés elutasítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <target>Elutasítja a tagot?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
-        <target>A közvetítő-kiszolgáló csak szükség esetén kerül használatra. Egy másik fél megfigyelheti az IP-címet.</target>
+        <target>A továbbítókiszolgáló csak szükség esetén lesz használva. Egy másik fél megfigyelheti az IP-címét.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Relay server protects your IP address, but it can observe the duration of the call." xml:space="preserve">
         <source>Relay server protects your IP address, but it can observe the duration of the call.</source>
-        <target>A közvetítő-kiszolgáló megvédi az IP-címet, de megfigyelheti a hívás időtartamát.</target>
+        <target>A továbbítókiszolgáló megvédi az IP-címét, de megfigyelheti a hívás időtartamát.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove" xml:space="preserve">
@@ -5834,7 +6375,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>Archívum eltávolítása?</target>
+        <target>Eltávolítja az archívumot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5849,17 +6390,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Remove member?" xml:space="preserve">
         <source>Remove member?</source>
-        <target>Biztosan eltávolítja?</target>
+        <target>Eltávolítja a tagot?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove passphrase from keychain?" xml:space="preserve">
         <source>Remove passphrase from keychain?</source>
-        <target>Jelmondat eltávolítása a kulcstartóból?</target>
+        <target>Eltávolítja a jelmondatot a kulcstartóból?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Renegotiate" xml:space="preserve">
         <source>Renegotiate</source>
-        <target>Újraegyzetetés</target>
+        <target>Újraegyeztetés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Renegotiate encryption" xml:space="preserve">
@@ -5869,12 +6410,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Renegotiate encryption?" xml:space="preserve">
         <source>Renegotiate encryption?</source>
-        <target>Titkosítás újraegyeztetése?</target>
+        <target>Újraegyezteti a titkosítást?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat connection request?" xml:space="preserve">
         <source>Repeat connection request?</source>
-        <target>Kapcsolatkérés megismétlése?</target>
+        <target>Megismétli a meghívási kérést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
@@ -5889,7 +6430,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
         <source>Repeat join request?</source>
-        <target>Csatlakozáskérés megismétlése?</target>
+        <target>Megismétli a meghívási kérést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
@@ -5902,6 +6443,61 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Válasz</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Jelentés</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Tartalom jelentése: csak a csoport moderátorai látják.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Tag profiljának jelentése: csak a csoport moderátorai látják.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Egyéb jelentés: csak a csoport moderátorai látják.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Jelentés indoklása?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <target>A jelentés el lett küldve a moderátoroknak</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Kéretlen tartalom jelentése: csak a csoport moderátorai látják.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Szabálysértés jelentése: csak a csoport moderátorai látják.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Jelentés: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>Az üzenetek jelentése a moderátorok felé le van tiltva.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Jelentések</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Szükséges</target>
@@ -5924,7 +6520,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Reset all statistics?" xml:space="preserve">
         <source>Reset all statistics?</source>
-        <target>Az összes statisztika visszaállítása?</target>
+        <target>Visszaállítja az összes statisztikát?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset colors" xml:space="preserve">
@@ -5969,12 +6565,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Restore database backup?" xml:space="preserve">
         <source>Restore database backup?</source>
-        <target>Adatbázismentés visszaállítása?</target>
+        <target>Visszaállítja az adatbázismentést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Restore database error" xml:space="preserve">
         <source>Restore database error</source>
-        <target>Hiba az adatbázis visszaállításakor</target>
+        <target>Hiba történt az adatbázis visszaállításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Retry" xml:space="preserve">
@@ -5992,10 +6588,15 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Feltételek felülvizsgálata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Felülvizsgálat később</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <target>Tagok áttekintése</target>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <target>Tagok áttekintése a befogadás előtt (kopogtatás).</target>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6009,7 +6610,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Revoke file?" xml:space="preserve">
         <source>Revoke file?</source>
-        <target>Fájl visszavonása?</target>
+        <target>Visszavonja a fájlt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Role" xml:space="preserve">
@@ -6029,7 +6630,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="SOCKS proxy" xml:space="preserve">
         <source>SOCKS proxy</source>
-        <target>SOCKS proxy</target>
+        <target>SOCKS-proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
@@ -6046,16 +6647,21 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <source>Save</source>
         <target>Mentés</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
-        <target>Mentés és az ismerősök értesítése</target>
+        <target>Mentés (és a partnerek értesítése)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <target>Elmenti a befogadási beállításokat?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
-        <target>Mentés és az ismerős értesítése</target>
+        <target>Mentés és a partner értesítése</target>
         <note>alert button</note>
       </trans-unit>
       <trans-unit id="Save and notify group members" xml:space="preserve">
@@ -6078,6 +6684,11 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Csoportprofil mentése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Lista mentése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Jelmondat mentése és a csevegés megnyitása</target>
@@ -6090,7 +6701,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Save preferences?" xml:space="preserve">
         <source>Save preferences?</source>
-        <target>Beállítások mentése?</target>
+        <target>Menti a beállításokat?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Save profile password" xml:space="preserve">
@@ -6105,17 +6716,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Save servers?" xml:space="preserve">
         <source>Save servers?</source>
-        <target>Kiszolgálók mentése?</target>
+        <target>Menti a kiszolgálókat?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Save welcome message?" xml:space="preserve">
         <source>Save welcome message?</source>
-        <target>Üdvözlőüzenet mentése?</target>
+        <target>Menti az üdvözlőüzenetet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>Profil mentése?</target>
+        <target>Menti a profilt?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -6125,12 +6736,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </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>A mentett WebRTC ICE-kiszolgálók eltávolításra kerülnek</target>
+        <target>A mentett WebRTC ICE-kiszolgálók el lesznek távolítva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Saved from" xml:space="preserve">
         <source>Saved from</source>
-        <target>Elmentve innen:</target>
+        <target>Elmentve innen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Saved message" xml:space="preserve">
@@ -6160,7 +6771,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Scan QR code from desktop" xml:space="preserve">
         <source>Scan QR code from desktop</source>
-        <target>QR-kód beolvasása számítógépről</target>
+        <target>QR-kód beolvasása a számítógépről</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
@@ -6170,7 +6781,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Scan security code from your contact's app." xml:space="preserve">
         <source>Scan security code from your contact's app.</source>
-        <target>Biztonsági kód beolvasása az ismerősének alkalmazásából.</target>
+        <target>Biztonsági kód beolvasása a partnere alkalmazásából.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Scan server QR code" xml:space="preserve">
@@ -6185,7 +6796,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Search bar accepts invitation links." xml:space="preserve">
         <source>Search bar accepts invitation links.</source>
-        <target>A keresősáv elfogadja a meghívó-hivatkozásokat.</target>
+        <target>A keresősáv elfogadja a meghívási hivatkozásokat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
@@ -6195,12 +6806,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Secondary" xml:space="preserve">
         <source>Secondary</source>
-        <target>Másodlagos</target>
+        <target>Másodlagos szín</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Secure queue" xml:space="preserve">
         <source>Secure queue</source>
-        <target>Biztonságos sorbaállítás</target>
+        <target>Biztonságos sorba állítás</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Secured" xml:space="preserve">
@@ -6220,22 +6831,22 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Select" xml:space="preserve">
         <source>Select</source>
-        <target>Kiválasztás</target>
+        <target>Kijelölés</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Csevegési profil kiválasztása</target>
+        <target>Csevegési profil kijelölése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
-        <target>%lld kiválasztva</target>
+        <target>%lld kijelölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
         <source>Selected chat preferences prohibit this message.</source>
-        <target>A kiválasztott csevegési beállítások tiltják ezt az üzenetet.</target>
+        <target>A kijelölt csevegési beállítások tiltják ezt az üzenetet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Self-destruct" xml:space="preserve">
@@ -6245,17 +6856,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Self-destruct passcode" xml:space="preserve">
         <source>Self-destruct passcode</source>
-        <target>Önmegsemmisítési jelkód</target>
+        <target>Önmegsemmisítő-jelkód</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Self-destruct passcode changed!" xml:space="preserve">
         <source>Self-destruct passcode changed!</source>
-        <target>Az önmegsemmisítési jelkód megváltozott!</target>
+        <target>Az önmegsemmisítő-jelkód módosult!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Self-destruct passcode enabled!" xml:space="preserve">
         <source>Self-destruct passcode enabled!</source>
-        <target>Az önmegsemmisítési jelkód engedélyezve!</target>
+        <target>Az önmegsemmisítő-jelkód engedélyezve!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send" xml:space="preserve">
@@ -6265,7 +6876,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Send a live message - it will update for the recipient(s) as you type it" xml:space="preserve">
         <source>Send a live message - it will update for the recipient(s) as you type it</source>
-        <target>Élő üzenet küldése - a címzett(ek) számára frissül, ahogy beírja</target>
+        <target>Élő üzenet küldése – az üzenet a címzett(ek) számára valós időben frissül, ahogy Ön beírja az üzenetet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send delivery receipts to" xml:space="preserve">
@@ -6290,7 +6901,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Send link previews" xml:space="preserve">
         <source>Send link previews</source>
-        <target>Hivatkozás előnézetek küldése</target>
+        <target>Hivatkozás előnézete</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send live message" xml:space="preserve">
@@ -6305,12 +6916,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
         <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
-        <target>Közvetlen üzenetküldés, ha az IP-cím védett és az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
+        <target>Közvetlen üzenetküldés, ha az IP-cím védett és a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send messages directly when your or destination server does not support private routing." xml:space="preserve">
         <source>Send messages directly when your or destination server does not support private routing.</source>
-        <target>Közvetlen üzenetküldés, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
+        <target>Közvetlen üzenetküldés, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve">
@@ -6318,9 +6929,14 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Értesítések küldése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Privát jelentések küldése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
-        <target>Ötletek és kérdések beküldése</target>
+        <target>Ötletek és javaslatok</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send receipts" xml:space="preserve">
@@ -6330,12 +6946,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
         <source>Send them from gallery or custom keyboards.</source>
-        <target>Küldje el őket galériából vagy egyedi billentyűzetekről.</target>
+        <target>Küldje el őket a galériából vagy az egyéni billentyűzetekről.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
         <source>Send up to 100 last messages to new members.</source>
-        <target>Az utolsó 100 üzenet elküldése az új tagoknak.</target>
+        <target>Legfeljebb az utolsó 100 üzenet elküldése az új tagok számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
@@ -6345,17 +6961,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
-        <target>A küldő törölhette a kapcsolatkérést.</target>
+        <target>A küldője törölhette a meghívási kérést.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
         <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
-        <target>A kézbesítési jelentések küldése engedélyezésre kerül az összes látható csevegési profilban lévő összes ismerőse számára.</target>
+        <target>A kézbesítési jelentések küldése engedélyezve lesz az összes látható csevegési profilban lévő összes partnere számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
         <source>Sending delivery receipts will be enabled for all contacts.</source>
-        <target>A kézbesítési jelentés küldése az összes ismerőse számára engedélyezésre kerül.</target>
+        <target>A kézbesítési jelentések küldése az összes partnere számára engedélyezve lesz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -6365,7 +6981,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is disabled for %lld contacts</source>
-        <target>A kézbesítési jelentések le vannak tiltva %lld ismerősnél</target>
+        <target>A kézbesítési jelentések le vannak tiltva %lld partnernél</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
@@ -6375,7 +6991,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
-        <target>A kézbesítési jelentések engedélyezve vannak %lld ismerősnél</target>
+        <target>A kézbesítési jelentések engedélyezve vannak %lld partnernél</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
@@ -6385,17 +7001,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
         <source>Sending via</source>
-        <target>Küldés ezen keresztül</target>
+        <target>Küldés a következőn keresztül:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sent at" xml:space="preserve">
         <source>Sent at</source>
-        <target>Elküldve ekkor:</target>
+        <target>Elküldve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sent at: %@" xml:space="preserve">
         <source>Sent at: %@</source>
-        <target>Elküldve ekkor: %@</target>
+        <target>Elküldve: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Sent directly" xml:space="preserve">
@@ -6420,7 +7036,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sent messages will be deleted after set time." xml:space="preserve">
         <source>Sent messages will be deleted after set time.</source>
-        <target>Az elküldött üzenetek törlésre kerülnek a beállított idő után.</target>
+        <target>Az elküldött üzenetek törölve lesznek a beállított idő után.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sent reply" xml:space="preserve">
@@ -6435,7 +7051,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Sent via proxy" xml:space="preserve">
         <source>Sent via proxy</source>
-        <target>Proxyn keresztül küldve</target>
+        <target>Proxyn keresztül küldött</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server" xml:space="preserve">
@@ -6465,27 +7081,27 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Server operator changed." xml:space="preserve">
         <source>Server operator changed.</source>
-        <target>A kiszolgáló üzemeltetője megváltozott.</target>
+        <target>A kiszolgáló üzemeltetője módosult.</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Server operators" xml:space="preserve">
         <source>Server operators</source>
-        <target>Kiszolgáló-üzemeltetők</target>
+        <target>Kiszolgálóüzemeltetők</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server protocol changed." xml:space="preserve">
         <source>Server protocol changed.</source>
-        <target>A kiszolgáló-protokoll megváltozott.</target>
+        <target>A kiszolgáló-protokoll módosult.</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Server requires authorization to create queues, check password" xml:space="preserve">
         <source>Server requires authorization to create queues, check password</source>
-        <target>A kiszolgálónak engedélyre van szüksége a sorbaállítás létrehozásához, ellenőrizze jelszavát</target>
+        <target>A kiszolgálónak engedélyre van szüksége a sorba állítás létrehozásához, ellenőrizze a jelszavát</target>
         <note>server test error</note>
       </trans-unit>
       <trans-unit id="Server requires authorization to upload, check password" xml:space="preserve">
         <source>Server requires authorization to upload, check password</source>
-        <target>A kiszolgálónak engedélyre van szüksége a várólisták feltöltéséhez, ellenőrizze jelszavát</target>
+        <target>A kiszolgálónak hitelesítésre van szüksége a feltöltéshez, ellenőrizze jelszavát</target>
         <note>server test error</note>
       </trans-unit>
       <trans-unit id="Server test failed!" xml:space="preserve">
@@ -6520,7 +7136,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Servers statistics will be reset - this cannot be undone!" xml:space="preserve">
         <source>Servers statistics will be reset - this cannot be undone!</source>
-        <target>A kiszolgálók statisztikái visszaállnak - ez a művelet nem vonható vissza!</target>
+        <target>A kiszolgálók statisztikái visszaállnak – ez a művelet nem vonható vissza!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Session code" xml:space="preserve">
@@ -6533,9 +7149,14 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Beállítva 1 nap</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Csevegés nevének beállítása…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
-        <target>Ismerős nevének beállítása…</target>
+        <target>Partner nevének beállítása…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set default theme" xml:space="preserve">
@@ -6550,7 +7171,17 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Set it instead of system authentication." xml:space="preserve">
         <source>Set it instead of system authentication.</source>
-        <target>Rendszerhitelesítés helyetti beállítás.</target>
+        <target>Beállítás a rendszer-hitelesítés helyett.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <target>Tagbefogadás beállítása</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Üzenetek eltűnési idejének módosítása a csevegésekben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
@@ -6570,7 +7201,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Set the message shown to new members!" xml:space="preserve">
         <source>Set the message shown to new members!</source>
-        <target>Megjelenő üzenet beállítása az új tagok számára!</target>
+        <target>Megjelenítendő üzenet beállítása az új tagok számára!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set timeouts for proxy/VPN" xml:space="preserve">
@@ -6585,28 +7216,28 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>A beállítások megváltoztak.</target>
+        <target>A beállítások módosultak.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
         <source>Shape profile images</source>
-        <target>Profilkép alakzat</target>
+        <target>Profilkép alakzata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
         <source>Share</source>
         <target>Megosztás</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
-        <target>Egyszer használható hivatkozás megosztása</target>
+        <target>Egyszer használható meghívó megosztása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share 1-time link with a friend" xml:space="preserve">
         <source>Share 1-time link with a friend</source>
-        <target>Egyszer használható meghívó-hivatkozás megosztása egy baráttal</target>
+        <target>Egyszer használható meghívó megosztása egy baráttal</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share SimpleX address on social media." xml:space="preserve">
@@ -6626,7 +7257,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Share address with contacts?" xml:space="preserve">
         <source>Share address with contacts?</source>
-        <target>Megosztja a címet az ismerőseivel?</target>
+        <target>Megosztja a címet a partnereivel?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Share from other apps." xml:space="preserve">
@@ -6636,7 +7267,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Share link" xml:space="preserve">
         <source>Share link</source>
-        <target>Hivatkozás megosztása</target>
+        <target>Megosztás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
@@ -6646,17 +7277,22 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
-        <target>Egyszer használható meghívó-hivatkozás megosztása</target>
+        <target>Ennek az egyszer használható meghívónak a megosztása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share to SimpleX" xml:space="preserve">
         <source>Share to SimpleX</source>
-        <target>Megosztás a SimpleX-ben</target>
+        <target>Megosztás a SimpleXben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share with contacts" xml:space="preserve">
         <source>Share with contacts</source>
-        <target>Megosztás az ismerősökkel</target>
+        <target>Megosztás a partnerekkel</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Rövid hivatkozás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
@@ -6676,12 +7312,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Show last messages" xml:space="preserve">
         <source>Show last messages</source>
-        <target>Szobák utolsó üzeneteinek megjelenítése a listanézetben</target>
+        <target>Legutóbbi üzenet előnézetének megjelenítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show message status" xml:space="preserve">
         <source>Show message status</source>
-        <target>Üzenetállapot megjelenítése</target>
+        <target>Üzenet állapotának megjelenítése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show percentage" xml:space="preserve">
@@ -6701,7 +7337,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Show:" xml:space="preserve">
         <source>Show:</source>
-        <target>Megjelenítés:</target>
+        <target>Megjelenítve:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX" xml:space="preserve">
@@ -6751,14 +7387,19 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="SimpleX address and 1-time links are safe to share via any messenger." xml:space="preserve">
         <source>SimpleX address and 1-time links are safe to share via any messenger.</source>
-        <target>A SimpleX-cím és az egyszer használható meghívó-hivatkozás biztonságosan megosztható bármilyen üzenetküldőn keresztül.</target>
+        <target>A SimpleX-cím és az egyszer használható meghívó biztonságosan megosztható bármilyen üzenetváltó-alkalmazáson keresztül.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address or 1-time link?" xml:space="preserve">
         <source>SimpleX address or 1-time link?</source>
-        <target>SimpleX-cím vagy egyszer használható meghívó-hivatkozás?</target>
+        <target>SimpleX-cím vagy egyszer használható meghívó?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>SimpleX-csatornahivatkozás</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX kapcsolattartási cím</target>
@@ -6781,7 +7422,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="SimpleX links are prohibited." xml:space="preserve">
         <source>SimpleX links are prohibited.</source>
-        <target>A SimpleX-hivatkozások küldése le van tiltva ebben a csoportban.</target>
+        <target>A SimpleX-hivatkozások küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX links not allowed" xml:space="preserve">
@@ -6791,12 +7432,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
         <source>SimpleX one-time invitation</source>
-        <target>Egyszer használható SimpleX-meghívó-hivatkozás</target>
+        <target>Egyszer használható SimpleX-meghívó</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
         <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>A SimpleX Chat biztonsága a Trail of Bits által lett felülvizsgálva.</target>
+        <target>A SimpleX-protokollokat a Trail of Bits auditálta.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6836,7 +7477,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
         <source>Some file(s) were not exported:</source>
-        <target>Néhány fájl nem került exportálásra:</target>
+        <target>Néhány fájl nem lett exportálva:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
@@ -6861,6 +7502,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Valaki</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Kéretlen tartalom</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Négyzet, kör vagy bármi a kettő között.</target>
@@ -6873,7 +7520,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Start chat?" xml:space="preserve">
         <source>Start chat?</source>
-        <target>Csevegés indítása?</target>
+        <target>Elindítja a csevegést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Start migration" xml:space="preserve">
@@ -6883,7 +7530,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Starting from %@." xml:space="preserve">
         <source>Starting from %@.</source>
-        <target>Kezdve ettől %@.</target>
+        <target>Statisztikagyűjtés kezdete: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Statistics" xml:space="preserve">
@@ -6913,7 +7560,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Stop chat?" xml:space="preserve">
         <source>Stop chat?</source>
-        <target>Csevegési szolgáltatás megállítása?</target>
+        <target>Megállítja a csevegést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop file" xml:space="preserve">
@@ -6923,12 +7570,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Stop receiving file?" xml:space="preserve">
         <source>Stop receiving file?</source>
-        <target>Fájlfogadás megállítása?</target>
+        <target>Megállítja a fájlfogadást?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop sending file?" xml:space="preserve">
         <source>Stop sending file?</source>
-        <target>Fájlküldés megállítása?</target>
+        <target>Megállítja a fájlküldést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop sharing" xml:space="preserve">
@@ -6938,7 +7585,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Stop sharing address?" xml:space="preserve">
         <source>Stop sharing address?</source>
-        <target>Címmegosztás megállítása?</target>
+        <target>Megállítja a címmegosztást?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
@@ -6946,6 +7593,11 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
         <target>Csevegés megállítása folyamatban</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Tárhely</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Erős</target>
@@ -6983,7 +7635,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
         <source>Switch chat profile for 1-time invitations.</source>
-        <target>Csevegési profilváltás az egyszer használható meghívó-hivatkozásokhoz.</target>
+        <target>Csevegési profilváltás az egyszer használható meghívókhoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="System" xml:space="preserve">
@@ -6993,17 +7645,22 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="System authentication" xml:space="preserve">
         <source>System authentication</source>
-        <target>Rendszerhitelesítés</target>
+        <target>Rendszer-hitelesítés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP connection" xml:space="preserve">
         <source>TCP connection</source>
-        <target>TCP kapcsolat</target>
+        <target>TCP-kapcsolat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
         <source>TCP connection timeout</source>
-        <target>TCP kapcsolat időtúllépése</target>
+        <target>TCP-kapcsolat időtúllépése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>TCP-port az üzenetváltáshoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
@@ -7058,7 +7715,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Tap to join incognito" xml:space="preserve">
         <source>Tap to join incognito</source>
-        <target>Koppintson ide az inkognitóban való csatlakozáshoz</target>
+        <target>Koppintson ide az inkognitóban való kapcsolódáshoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap to paste link" xml:space="preserve">
@@ -7068,19 +7725,24 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Tap to scan" xml:space="preserve">
         <source>Tap to scan</source>
-        <target>Koppintson ide a QR-kód beolvasáshoz</target>
+        <target>Koppintson ide a QR-kód beolvasásához</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <target>Ideiglenesfájl-hiba</target>
-        <note>No comment provided by engineer.</note>
+        <target>Ideiglenes fájlhiba</target>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
-        <target>A teszt sikertelen volt a(z) %@ lépésnél.</target>
+        <target>A teszt a(z) %@ lépésnél sikertelen volt.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Értesítések tesztelése</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Kiszolgáló tesztelése</target>
@@ -7103,29 +7765,29 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
       </trans-unit>
       <trans-unit id="Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve">
         <source>Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target>Köszönet a felhasználóknak – [hozzájárulás a Weblate-en keresztül](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
+        <target>Köszönet a felhasználóknak [a Weblate-en való közreműködésért](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Thanks to the users – contribute via Weblate!" xml:space="preserve">
         <source>Thanks to the users – contribute via Weblate!</source>
-        <target>Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</target>
+        <target>Köszönet a felhasználóknak a Weblate-en való közreműködésért!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The ID of the next message is incorrect (less or equal to the previous).&#10;It can happen because of some bug or when the connection is compromised." xml:space="preserve">
         <source>The ID of the next message is incorrect (less or equal to the previous).
 It can happen because of some bug or when the connection is compromised.</source>
-        <target>A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).
-Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
+        <target>A következő üzenet azonosítója érvénytelen (kisebb vagy egyenlő az előzővel).
+Ez valamilyen hiba vagy sérült kapcsolat esetén fordulhat elő.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The app can notify you when you receive messages or contact requests - please open settings to enable." xml:space="preserve">
         <source>The app can notify you when you receive messages or contact requests - please open settings to enable.</source>
-        <target>Az alkalmazás értesíteni fogja, amikor üzeneteket vagy kapcsolatkéréseket kap – beállítások megnyitása az engedélyezéshez.</target>
+        <target>Az alkalmazás értesíteni fogja, amikor üzeneteket vagy meghívási kéréseket kap – ezt a beállítások menüben engedélyezheti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The app protects your privacy by using different operators in each conversation." xml:space="preserve">
         <source>The app protects your privacy by using different operators in each conversation.</source>
-        <target>Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetésben más-más üzemeltetőket használ.</target>
+        <target>Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetéshez más-más üzemeltetőt használ.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
@@ -7135,7 +7797,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
         <source>The attempt to change database passphrase was not completed.</source>
-        <target>Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.</target>
+        <target>Az adatbázis jelmondatának módosítására tett kísérlet nem fejeződött be.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
@@ -7145,7 +7807,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The connection reached the limit of undelivered messages, your contact may be offline." xml:space="preserve">
         <source>The connection reached the limit of undelivered messages, your contact may be offline.</source>
-        <target>A kapcsolat elérte a kézbesítetlen üzenetek számának határát, az Ön ismerőse lehet, hogy offline állapotban van.</target>
+        <target>A kapcsolat elérte a kézbesítetlen üzenetek számának határát, a partnere lehet, hogy offline állapotban van.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
@@ -7155,7 +7817,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve">
         <source>The contact you shared this link with will NOT be able to connect!</source>
-        <target>Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!</target>
+        <target>A partnere, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The created archive is available via app Settings / Database / Old database archive." xml:space="preserve">
@@ -7170,17 +7832,17 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The future of messaging" xml:space="preserve">
         <source>The future of messaging</source>
-        <target>A privát üzenetküldés következő generációja</target>
+        <target>Az üzenetváltás jövője</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
-        <target>Az előző üzenet hasító értéke különbözik.</target>
+        <target>Az előző üzenet hasítóértéke különbözik.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The message will be deleted for all members." xml:space="preserve">
         <source>The message will be deleted for all members.</source>
-        <target>Az üzenet az összes tag számára törlésre kerül.</target>
+        <target>Az üzenet az összes tag számára törölve lesz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The message will be marked as moderated for all members." xml:space="preserve">
@@ -7190,7 +7852,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The messages will be deleted for all members." xml:space="preserve">
         <source>The messages will be deleted for all members.</source>
-        <target>Az üzenetek az összes tag számára törlésre kerülnek.</target>
+        <target>Az üzenetek az összes tag számára törölve lesznek.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The messages will be marked as moderated for all members." xml:space="preserve">
@@ -7200,22 +7862,12 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The old database was not removed during the migration, it can be deleted." xml:space="preserve">
         <source>The old database was not removed during the migration, it can be deleted.</source>
-        <target>A régi adatbázis nem került eltávolításra az átköltöztetéskor, így törölhető.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>A profilja csak az ismerőseivel kerül megosztásra.</target>
+        <target>A régi adatbázis nem lett eltávolítva az átköltöztetéskor, ezért törölhető.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
-        <target>Ugyanezek a feltételek lesznek elfogadva a következő üzemeltetőre is: **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető(k)re is: **%@**.</target>
+        <target>Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető számára is: **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
@@ -7235,12 +7887,12 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The servers for new connections of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new connections of your current chat profile **%@**.</source>
-        <target>A jelenlegi csevegési profilhoz tartozó új kapcsolatok kiszolgálói **%@**.</target>
+        <target>A jelenlegi **%@** nevű csevegési profiljához tartozó új kapcsolatok kiszolgálói.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The servers for new files of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new files of your current chat profile **%@**.</source>
-        <target>Az Ön jelenlegi **%@** nevű csevegőprofiljához tartozó új fájlok kiszolgálói.</target>
+        <target>A jelenlegi **%@** nevű csevegési profiljához tartozó új fájlok kiszolgálói.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
@@ -7250,7 +7902,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>A feltöltött adatbázis-archívum véglegesen eltávolításra kerül a kiszolgálókról.</target>
+        <target>A feltöltött adatbázis-archívum véglegesen el lesz távolítva a kiszolgálókról.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -7265,27 +7917,32 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
         <source>These settings are for your current profile **%@**.</source>
-        <target>Ezek a beállítások csak a jelenlegi (**%@**) profiljára vonatkoznak.</target>
+        <target>Ezek a beállítások csak a jelenlegi **%@** nevű csevegési profiljára vonatkoznak.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
         <source>They can be overridden in contact and group settings.</source>
-        <target>Ezek felülbírálhatók az ismerős- és csoportbeállításokban.</target>
+        <target>Ezek felülbírálhatók a partner- és csoportbeállításokban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
         <source>This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.</source>
-        <target>Ez a művelet nem vonható vissza - az összes fogadott és küldött fájl a médiatartalmakkal együtt törlésre kerül. Az alacsony felbontású képek viszont megmaradnak.</target>
+        <target>Ez a művelet nem vonható vissza – az összes fogadott és küldött fájl a médiatartalmakkal együtt törölve lesznek. Az alacsony felbontású képek viszont megmaradnak.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." xml:space="preserve">
         <source>This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes.</source>
-        <target>Ez a művelet nem vonható vissza - a kiválasztottnál korábban küldött és fogadott üzenetek törlésre kerülnek. Ez több percet is igénybe vehet.</target>
+        <target>Ez a művelet nem vonható vissza – a kijelöltnél korábban küldött és fogadott üzenetek törölve lesznek. Ez több percet is igénybe vehet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Ez a művelet nem vonható vissza – a kijelölt üzenettől korábban küldött és fogadott üzenetek törölve lesznek a csevegésből.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
-        <target>Ez a művelet nem vonható vissza - profiljai, ismerősei, üzenetei és fájljai visszafordíthatatlanul törlésre kerülnek.</target>
+        <target>Ez a művelet nem vonható vissza – profiljai, partnerei, üzenetei és fájljai véglegesen törölve lesznek.</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">
@@ -7295,7 +7952,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </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>
-        <target>Ez a csevegés végpontok közötti kvantumrezisztens tikosítással védett.</target>
+        <target>Ez a csevegés végpontok közötti kvantumbiztos titkosítással védett.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -7305,12 +7962,12 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
         <source>This display name is invalid. Please choose another name.</source>
-        <target>Ez a megjelenített név érvénytelen. Válasszon egy másik nevet.</target>
+        <target>Ez a megjelenítendő név érvénytelen. Válasszon egy másik nevet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
-        <target>Ennek a csoportnak több mint %lld tagja van, a kézbesítési jelentések nem kerülnek elküldésre.</target>
+        <target>Ennek a csoportnak több mint %lld tagja van, a kézbesítési jelentések nem lesznek elküldve.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -7320,12 +7977,17 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
         <source>This is your own SimpleX address!</source>
-        <target>Ez az Ön SimpleX-címe!</target>
+        <target>Ez a saját SimpleX-címe!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This is your own one-time link!" xml:space="preserve">
         <source>This is your own one-time link!</source>
-        <target>Ez az Ön egyszer használható meghívó-hivatkozása!</target>
+        <target>Ez a saját egyszer használható meghívója!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>Ez a hivatkozás újabb alkalmazásverziót igényel. Frissítse az alkalmazást vagy kérjen egy kompatibilis hivatkozást a partnerétől.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
@@ -7333,9 +7995,14 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
         <target>Ezt a hivatkozást egy másik hordozható eszközön már használták, hozzon létre egy új hivatkozást a számítógépén.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>Ez az üzenet törölve lett vagy még nem érkezett meg.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
-        <target>Ez a beállítás csak a jelenlegi (**%@**) profiljában lévő üzenetekre vonatkozik.</target>
+        <target>Ez a beállítás csak az Ön jelenlegi **%@** nevű csevegési profiljában lévő üzenetekre vonatkozik.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Title" xml:space="preserve">
@@ -7350,7 +8017,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="To connect, your contact can scan QR code or use the link in the app." xml:space="preserve">
         <source>To connect, your contact can scan QR code or use the link in the app.</source>
-        <target>A kapcsolódáshoz az ismerőse beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</target>
+        <target>A kapcsolódáshoz a partnere beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To hide unwanted messages." xml:space="preserve">
@@ -7365,7 +8032,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="To protect against your link being replaced, you can compare contact security codes." xml:space="preserve">
         <source>To protect against your link being replaced, you can compare contact security codes.</source>
-        <target>A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat az ismerősével.</target>
+        <target>A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat a partnerével.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To protect timezone, image/voice files use UTC." xml:space="preserve">
@@ -7387,7 +8054,7 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="To protect your privacy, SimpleX uses separate IDs for each of your contacts." xml:space="preserve">
         <source>To protect your privacy, SimpleX uses separate IDs for each of your contacts.</source>
-        <target>Az adatvédelem érdekében (a más csevegési platformokon megszokott felhasználó-azonosítók helyett) a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, az összes ismerőséhez különbözőt.</target>
+        <target>Adatainak védelme érdekében a SimpleX külön üzenet-azonosítókat használ minden egyes kapcsolatához.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To receive" xml:space="preserve">
@@ -7412,7 +8079,7 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." xml:space="preserve">
         <source>To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page.</source>
-        <target>Rejtett profilja megjelenítéséhez írja be a teljes jelszavát a keresőmezőbe a **Csevegési profilok** menüben.</target>
+        <target>Rejtett profilja felfedéséhez adja meg a teljes jelszót a keresőmezőben, a **Csevegési profilok** menüben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To send" xml:space="preserve">
@@ -7432,19 +8099,24 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="To verify end-to-end encryption with your contact compare (or scan) the code on your devices." xml:space="preserve">
         <source>To verify end-to-end encryption with your contact compare (or scan) the code on your devices.</source>
-        <target>A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) az ismerőse eszközén lévő kóddal.</target>
+        <target>A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) a partnere eszközén lévő kóddal.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Csevegőlista átváltása:</target>
+        <target>Csevegési lista átváltása:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
         <source>Toggle incognito when connecting.</source>
-        <target>Inkognitómód használata kapcsolódáskor.</target>
+        <target>Inkognitóra váltás kapcsolódáskor.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Token állapota: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Eszköztár átlátszatlansága</target>
@@ -7457,7 +8129,7 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
-        <target>Átvitel-izoláció módja</target>
+        <target>Átvitelelkülönítés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Transport sessions" xml:space="preserve">
@@ -7467,12 +8139,12 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
         <source>Trying to connect to the server used to receive messages from this contact (error: %@).</source>
-        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál (hiba: %@).</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál (hiba: %@).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Trying to connect to the server used to receive messages from this contact." xml:space="preserve">
         <source>Trying to connect to the server used to receive messages from this contact.</source>
-        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Turkish interface" xml:space="preserve">
@@ -7502,7 +8174,7 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="Unblock for all" xml:space="preserve">
         <source>Unblock for all</source>
-        <target>Letiltás feloldása az összes tag számára</target>
+        <target>Feloldás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock member" xml:space="preserve">
@@ -7517,7 +8189,7 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       </trans-unit>
       <trans-unit id="Unblock member?" xml:space="preserve">
         <source>Unblock member?</source>
-        <target>Tag feloldása?</target>
+        <target>Feloldja a tag letiltását?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Undelivered messages" xml:space="preserve">
@@ -7583,8 +8255,8 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
       <trans-unit id="Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.&#10;To connect, please ask your contact to create another connection link and check that you have a stable network connection." xml:space="preserve">
         <source>Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.
 To connect, please ask your contact to create another connection link and check that you have a stable network connection.</source>
-        <target>Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.
-A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
+        <target>Hacsak a partnere nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.
+A kapcsolódáshoz kérje meg a partnerét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unlink" xml:space="preserve">
@@ -7594,7 +8266,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Unlink desktop?" xml:space="preserve">
         <source>Unlink desktop?</source>
-        <target>Számítógép szétkapcsolása?</target>
+        <target>Leválasztja a számítógépet?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
@@ -7610,16 +8282,21 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Némítás megszüntetése</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Olvasatlan</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Nem támogatott kapcsolattartási hivatkozás</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
-        <target>Legfeljebb az utolsó 100 üzenet kerül elküldésre az új tagok számára.</target>
+        <target>Legfeljebb az utolsó 100 üzenet lesz elküldve az új tagok számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Update" xml:space="preserve">
@@ -7629,17 +8306,22 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Update database passphrase" xml:space="preserve">
         <source>Update database passphrase</source>
-        <target>Adatbázis-jelmondat megváltoztatása</target>
+        <target>Az adatbázis jelmondatának módosítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Update network settings?" xml:space="preserve">
         <source>Update network settings?</source>
-        <target>Hálózati beállítások megváltoztatása?</target>
+        <target>Módosítja a hálózati beállításokat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Update settings?" xml:space="preserve">
         <source>Update settings?</source>
-        <target>Beállítások frissítése?</target>
+        <target>Frissíti a beállításokat?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Frissített feltételek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -7694,7 +8376,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Use SOCKS proxy" xml:space="preserve">
         <source>Use SOCKS proxy</source>
-        <target>SOCKS proxy használata</target>
+        <target>SOCKS-proxy használata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
@@ -7702,9 +8384,19 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
         <target>SimpleX Chat-kiszolgálók használata?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>A következő TCP-port használata, amikor nincs port megadva: %@.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>A 443-as TCP-port használata kizárólag az előre beállított kiszolgálokhoz.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
-        <target>Csevegés használata</target>
+        <target>SimpleX Chat használata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use current profile" xml:space="preserve">
@@ -7749,7 +8441,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Use private routing with unknown servers when IP address is not protected." xml:space="preserve">
         <source>Use private routing with unknown servers when IP address is not protected.</source>
-        <target>Használjon privát útválasztást ismeretlen kiszolgálókkal, ha az IP-cím nem védett.</target>
+        <target>Használjon privát útválasztást az ismeretlen kiszolgálókkal, ha az IP-cím nem védett.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use private routing with unknown servers." xml:space="preserve">
@@ -7767,6 +8459,11 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
         <target>Kiszolgálók használata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Rövid hivatkozások használata (béta)</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>
         <target>Használja az alkalmazást hívás közben.</target>
@@ -7777,9 +8474,14 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
         <target>Használja az alkalmazást egy kézzel.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Webport használata</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
-        <target>Felhasználó kiválasztása</target>
+        <target>Felhasználó kijelölése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Username" xml:space="preserve">
@@ -7834,7 +8536,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
         <source>Via secure quantum resistant protocol.</source>
-        <target>Biztonságos kvantumrezisztens-protokollon keresztül.</target>
+        <target>Biztonságos kvantumbiztos protokollon keresztül.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Video call" xml:space="preserve">
@@ -7854,7 +8556,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Videos and files up to 1gb" xml:space="preserve">
         <source>Videos and files up to 1gb</source>
-        <target>Videók és fájlok 1Gb méretig</target>
+        <target>Videók és fájlok legfeljebb 1GB méretig</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="View conditions" xml:space="preserve">
@@ -7889,7 +8591,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Voice messages are prohibited." xml:space="preserve">
         <source>Voice messages are prohibited.</source>
-        <target>A hangüzenetek küldése le van tiltva ebben a csoportban.</target>
+        <target>A hangüzenetek küldése le van tiltva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Voice messages not allowed" xml:space="preserve">
@@ -7899,7 +8601,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Voice messages prohibited!" xml:space="preserve">
         <source>Voice messages prohibited!</source>
-        <target>A hangüzenetek le vannak tilva!</target>
+        <target>A hangüzenetek le vannak tiltva!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Voice message…" xml:space="preserve">
@@ -7929,7 +8631,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Wallpaper accent" xml:space="preserve">
         <source>Wallpaper accent</source>
-        <target>Háttérkép kiemelés</target>
+        <target>Háttérkép kiemelőszíne</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wallpaper background" xml:space="preserve">
@@ -7939,7 +8641,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </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>
-        <target>Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, továbbá üzenetkézbesítési hibákat okozhat</target>
+        <target>Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, mert üzenetkézbesítési hibákat okoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -7954,7 +8656,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Welcome %@!" xml:space="preserve">
         <source>Welcome %@!</source>
-        <target>Üdvözöllek %@!</target>
+        <target>Üdvözöljük %@!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Welcome message" xml:space="preserve">
@@ -7984,7 +8686,7 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="When more than one operator is enabled, none of them has metadata to learn who communicates with whom." xml:space="preserve">
         <source>When more than one operator is enabled, none of them has metadata to learn who communicates with whom.</source>
-        <target>Amikor egynél több hálózati üzemeltető van engedélyezve, egyikük sem rendelkezik olyan metaadatokkal ahhoz, hogy felderítse, ki kommunikál kivel.</target>
+        <target>Amikor egynél több üzemeltető van engedélyezve, akkor egyik sem rendelkezik olyan metaadatokkal, amelyekből megtudható, hogy ki kivel kommunikál.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." xml:space="preserve">
@@ -8024,32 +8726,32 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to file servers." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to file servers.</source>
-        <target>Tor vagy VPN nélkül az IP-címe látható lesz a fájlkiszolgálók számára.</target>
+        <target>Tor vagy VPN nélkül az IP-címe láthatóvá válik a fájlkiszolgálók számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <target>Tor vagy VPN nélkül az IP-címe látható lesz a következő XFTP-közvetítő-kiszolgálók számára: %@.</target>
+        <target>Tor vagy VPN nélkül az IP-címe láthatóvá válik a következő XFTP-továbbítókiszolgálók számára: %@.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
-        <target>Hibás adatbázis-jelmondat</target>
+        <target>Érvénytelen adatbázis-jelmondat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong key or unknown connection - most likely this connection is deleted." xml:space="preserve">
         <source>Wrong key or unknown connection - most likely this connection is deleted.</source>
-        <target>Hibás kulcs vagy ismeretlen kapcsolat - valószínűleg ez a kapcsolat törlődött.</target>
+        <target>Érvénytelen kulcs vagy ismeretlen kapcsolat – valószínűleg ez a kapcsolat törlődött.</target>
         <note>snd error text</note>
       </trans-unit>
       <trans-unit id="Wrong key or unknown file chunk address - most likely file is deleted." xml:space="preserve">
         <source>Wrong key or unknown file chunk address - most likely file is deleted.</source>
-        <target>Hibás kulcs vagy ismeretlen fájltöredék cím - valószínűleg a fájl törlődött.</target>
+        <target>Érvénytelen kulcs vagy ismeretlen fájltöredékcím – valószínűleg a fájl törlődött.</target>
         <note>file error text</note>
       </trans-unit>
       <trans-unit id="Wrong passphrase!" xml:space="preserve">
         <source>Wrong passphrase!</source>
-        <target>Hibás jelmondat!</target>
+        <target>Érvénytelen jelmondat!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="XFTP server" xml:space="preserve">
@@ -8074,12 +8776,12 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="You already have a chat profile with the same display name. Please choose another name." xml:space="preserve">
         <source>You already have a chat profile with the same display name. Please choose another name.</source>
-        <target>Már van egy csevegési profil ugyanezzel a megjelenített névvel. Válasszon egy másik nevet.</target>
+        <target>Már van egy csevegési profil ugyanezzel a megjelenítendő névvel. Válasszon egy másik nevet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connected to %@." xml:space="preserve">
         <source>You are already connected to %@.</source>
-        <target>Ön már kapcsolódva van ehhez: %@.</target>
+        <target>Ön már kapcsolódott a következőhöz: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connected with %@." xml:space="preserve">
@@ -8089,12 +8791,12 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       </trans-unit>
       <trans-unit id="You are already connecting to %@." xml:space="preserve">
         <source>You are already connecting to %@.</source>
-        <target>Már folyamatban van a kapcsolódás ehhez: %@.</target>
+        <target>A kapcsolódás már folyamatban van a következőhöz: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
         <source>You are already connecting via this one-time link!</source>
-        <target>A kapcsolódás már folyamatban van ezen az egyszer használható meghívó-hivatkozáson keresztül!</target>
+        <target>A kapcsolódás már folyamatban van ezen az egyszer használható meghívón keresztül!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already in group %@." xml:space="preserve">
@@ -8120,18 +8822,18 @@ A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapc
       <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
         <source>You are already joining the group!
 Repeat join request?</source>
-        <target>Csatlakozás folyamatban!
-Csatlakozáskérés megismétlése?</target>
+        <target>A csatlakozás már folyamatban van a csoporthoz!
+Megismétli a meghívási kérést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
         <source>You are connected to the server used to receive messages from this contact.</source>
-        <target>Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</target>
+        <target>Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.</target>
         <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>Meghívást kapott a csoportba</target>
+        <target>Ön meghívást kapott a csoportba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are not connected to these servers. Private routing is used to deliver messages to them." xml:space="preserve">
@@ -8149,11 +8851,6 @@ Csatlakozáskérés megismétlése?</target>
         <target>Ezt a „Megjelenés” menüben módosíthatja.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Az üzemeltetőket a „Hálózat és kiszolgálók” beállításaban konfigurálhatja.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>A kiszolgálókat a „Hálózat és kiszolgálók” menüben konfigurálhatja.</target>
@@ -8171,7 +8868,7 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
         <source>You can enable them later via app Privacy &amp; Security settings.</source>
-        <target>Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüjében.</target>
+        <target>Később engedélyezheti őket az „Adatvédelem és biztonság” menüben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
@@ -8181,12 +8878,12 @@ Csatlakozáskérés megismétlése?</target>
       </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>Elrejtheti vagy lenémíthatja a felhasználó -profiljait - csúsztassa jobbra a profilt.</target>
+        <target>Elrejtheti vagy lenémíthatja a felhasználó -profiljait – csúsztassa jobbra a profilt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
         <source>You can make it visible to your SimpleX contacts via Settings.</source>
-        <target>Láthatóvá teheti a SimpleXbeli ismerősei számára a „Beállításokban”.</target>
+        <target>Láthatóvá teheti a SimpleXbeli partnerei számára a „Beállításokban”.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can now chat with %@" xml:space="preserve">
@@ -8196,12 +8893,12 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can send messages to %@ from Archived contacts." xml:space="preserve">
         <source>You can send messages to %@ from Archived contacts.</source>
-        <target>Az „Archivált ismerősökből” továbbra is küldhet üzeneteket neki: %@.</target>
+        <target>Az „Archivált partnerekből” továbbra is küldhet üzeneteket neki: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can set connection name, to remember who the link was shared with." xml:space="preserve">
         <source>You can set connection name, to remember who the link was shared with.</source>
-        <target>Beállíthatja az ismerős nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.</target>
+        <target>Beállíthatja a partner nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -8211,12 +8908,12 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it." xml:space="preserve">
         <source>You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.</source>
-        <target>Megoszthat egy hivatkozást vagy QR-kódot - így bárki csatlakozhat a csoporthoz. Ha a csoport később törlésre kerül, akkor nem fogja elveszíteni annak tagjait.</target>
+        <target>Megoszthat egy hivatkozást vagy QR-kódot – így bárki csatlakozhat a csoporthoz. Ha a csoportot Ön később törli, akkor nem fogja elveszíteni annak tagjait.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can share this address with your contacts to let them connect with **%@**." xml:space="preserve">
         <source>You can share this address with your contacts to let them connect with **%@**.</source>
-        <target>Megoszthatja ezt a címet az ismerőseivel, hogy kapcsolatba léphessenek Önnel a(z) **%@** nevű profilján keresztül.</target>
+        <target>Megoszthatja ezt a SimpleX-címet a partnereivel, hogy kapcsolatba léphessenek vele: **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can start chat via app Settings / Database or by restarting the app" xml:space="preserve">
@@ -8226,7 +8923,7 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
         <source>You can still view conversation with %@ in the list of chats.</source>
-        <target>A(z) %@ nevű ismerősével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.</target>
+        <target>A(z) %@ nevű partnerével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -8241,7 +8938,12 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
         <source>You can view invitation link again in connection details.</source>
-        <target>A meghívó-hivatkozást újra megtekintheti a kapcsolat részleteinél.</target>
+        <target>A meghívási hivatkozást újra megtekintheti a kapcsolat részleteinél.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <target>A jelentéseket megtekintheti a „Csevegés az adminisztrátorokkal” menüben.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
@@ -8261,34 +8963,34 @@ Csatlakozáskérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
         <source>You have already requested connection via this address!</source>
-        <target>Már küldött egy kapcsolatkérést ezen a címen keresztül!</target>
+        <target>Már küldött egy meghívási kérést ezen a címen keresztül!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
         <source>You have already requested connection!
 Repeat connection request?</source>
-        <target>Már küldött egy kapcsolódási kérelmet!
-Kapcsolatkérés megismétlése?</target>
+        <target>Ön már küldött egy meghívási kérést!
+Megismétli a meghívási kérést?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You have to enter passphrase every time the app starts - it is not stored on the device." xml:space="preserve">
         <source>You have to enter passphrase every time the app starts - it is not stored on the device.</source>
-        <target>A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul - nem az eszközön kerül tárolásra.</target>
+        <target>A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul – nem az eszközön van tárolva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You invited a contact" xml:space="preserve">
         <source>You invited a contact</source>
-        <target>Meghívta egy ismerősét</target>
+        <target>Ön meghívta egy partnerét</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You joined this group" xml:space="preserve">
         <source>You joined this group</source>
-        <target>Csatlakozott ehhez a csoporthoz</target>
+        <target>Ön csatlakozott ehhez a csoporthoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You joined this group. Connecting to inviting group member." xml:space="preserve">
         <source>You joined this group. Connecting to inviting group member.</source>
-        <target>Csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.</target>
+        <target>Ön csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You may migrate the exported database." xml:space="preserve">
@@ -8303,17 +9005,17 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
         <source>You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts.</source>
-        <target>A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi ismerősétől.</target>
+        <target>A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi partnerétől.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
         <source>You need to allow your contact to call to be able to call them.</source>
-        <target>Engedélyeznie kell a hívásokat az ismerőse számára, hogy fel tudják hívni egymást.</target>
+        <target>Engedélyeznie kell a hívásokat a partnere számára, hogy fel tudják hívni egymást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
         <source>You need to allow your contact to send voice messages to be able to send them.</source>
-        <target>Engedélyeznie kell a hangüzenetek küldését az ismerőse számára, hogy hangüzeneteket küldhessenek egymásnak.</target>
+        <target>Engedélyeznie kell a hangüzenetek küldését a partnere számára, hogy hangüzeneteket küldhessenek egymásnak.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You rejected group invitation" xml:space="preserve">
@@ -8326,6 +9028,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>Csoportmeghívó elküldve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>Ön megkapja az értesítéseket.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
@@ -8338,17 +9045,17 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
-        <target>Akkor lesz kapcsolódva, ha a kapcsolatkérése elfogadásra kerül, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva, ha a meghívási kérése el lesz fogadva, várjon, vagy ellenőrizze később!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will be connected when your contact's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your contact's device is online, please wait or check later!</source>
-        <target>Akkor lesz kapcsolódva, amikor az ismerősének eszköze online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva, amikor a partnerének az eszköze online lesz, várjon, vagy ellenőrizze később!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will be required to authenticate when you start or resume the app after 30 seconds in background." xml:space="preserve">
         <source>You will be required to authenticate when you start or resume the app after 30 seconds in background.</source>
-        <target>Az alkalmazás indításakor, vagy 30 másodpercnyi háttérben töltött idő után az alkalmazáshoz visszatérve hitelesítés szükséges.</target>
+        <target>Az alkalmazás elindításához vagy 30 másodpercnyi háttérben töltött idő után, az alkalmazáshoz való visszatéréshez hitelesítésre lesz szükség.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will connect to all group members." xml:space="preserve">
@@ -8373,17 +9080,17 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You won't lose your contacts if you later delete your address." xml:space="preserve">
         <source>You won't lose your contacts if you later delete your address.</source>
-        <target>Nem veszíti el az ismerőseit, ha később törli a címét.</target>
+        <target>Nem veszíti el a partnereit, ha később törli a címét.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile" xml:space="preserve">
         <source>You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile</source>
-        <target>Egy olyan ismerősét próbálja meghívni, akivel inkognitóprofilt osztott meg abban a csoportban, amelyben a saját fő profilja van használatban</target>
+        <target>Egy olyan partnerét próbálja meghívni, akivel inkognitóprofilt osztott meg abban a csoportban, amelyben a fő profilja van használatban</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You're using an incognito profile for this group - to prevent sharing your main profile inviting contacts is not allowed" xml:space="preserve">
         <source>You're using an incognito profile for this group - to prevent sharing your main profile inviting contacts is not allowed</source>
-        <target>Inkognitóprofilt használ ehhez a csoporthoz - fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva</target>
+        <target>Inkognitóprofilt használ ehhez a csoporthoz – fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your ICE servers" xml:space="preserve">
@@ -8391,11 +9098,6 @@ Kapcsolatkérés megismétlése?</target>
         <target>Saját ICE-kiszolgálók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Saját SMP-kiszolgálók</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Profil SimpleX-címe</target>
@@ -8418,7 +9120,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Csevegési beállítások</target>
+        <target>Az Ön csevegési beállításai</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -8433,17 +9135,17 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
-        <target>Az ismerőse olyan fájlt küldött, amely meghaladja a jelenleg támogatott maximális méretet (%@).</target>
+        <target>A partnere a jelenleg megengedett maximális méretű (%@) fájlnál nagyobbat küldött.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contacts can allow full message deletion." xml:space="preserve">
         <source>Your contacts can allow full message deletion.</source>
-        <target>Az ismerősei engedélyezhetik a teljes üzenet törlést.</target>
+        <target>A partnerei engedélyezhetik a teljes üzenet törlését.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contacts will remain connected." xml:space="preserve">
         <source>Your contacts will remain connected.</source>
-        <target>Az ismerősei továbbra is kapcsolódva maradnak.</target>
+        <target>A partnerei továbbra is kapcsolódva maradnak.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
@@ -8453,7 +9155,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
-        <target>A jelenlegi csevegési adatbázis TÖRLŐDNI FOG, és a HELYÉRE az importált adatbázis kerül.</target>
+        <target>A jelenlegi csevegési adatbázis TÖRÖLVE és CSERÉLVE lesz az importáltra.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your current profile" xml:space="preserve">
@@ -8478,24 +9180,24 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
-        <target>A(z) **%@** nevű profilja megosztásra fog kerülni.</target>
+        <target>A(z) **%@** nevű profilja meg lesz osztva.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>A profilja az eszközén van tárolva és csak a partnereivel van megosztva.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
-        <target>A profilja az eszközön van tárolva és csak az ismerőseivel kerül megosztásra. A SimpleX-kiszolgálók nem láthatják a profilját.</target>
+        <target>A profilja az eszközén van tárolva és csak a partnereivel van megosztva. A SimpleX-kiszolgálók nem láthatják a profilját.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>A profilja megváltozott. Ha elmenti, a frissített profil elküldésre kerül az összes ismerősének.</target>
+        <target>A profilja módosult. Ha elmenti, a profilfrissítés el lesz küldve a partnerei számára.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>A profilja, az ismerősei és az elküldött üzenetei az eszközön kerülnek tárolásra.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Véletlenszerű profil</target>
@@ -8508,7 +9210,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="Your servers" xml:space="preserve">
         <source>Your servers</source>
-        <target>Az Ön kiszolgálói</target>
+        <target>Saját kiszolgálók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your settings" xml:space="preserve">
@@ -8518,7 +9220,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" xml:space="preserve">
         <source>[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)</source>
-        <target>[Hozzájárulás](https://github.com/simplex-chat/simplex-chat#contribute)</target>
+        <target>[Közreműködés](https://github.com/simplex-chat/simplex-chat#contribute)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="[Send us email](mailto:chat@simplex.chat)" xml:space="preserve">
@@ -8546,9 +9248,14 @@ Kapcsolatkérés megismétlése?</target>
         <target>gombra fent, majd válassza ki:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <target>befogadta őt: %@</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
-        <target>elfogadott hívás</target>
+        <target>fogadott hívás</target>
         <note>call status</note>
       </trans-unit>
       <trans-unit id="accepted invitation" xml:space="preserve">
@@ -8556,6 +9263,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>elfogadott meghívó</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <target>befogadta Önt</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>adminisztrátor</target>
@@ -8576,6 +9288,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>titkosítás elfogadása…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <target>összes</target>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>összes tag</target>
@@ -8591,6 +9308,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>és további %lld esemény</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>archivált jelentés</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>próbálkozások</target>
@@ -8613,7 +9335,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="bad message hash" xml:space="preserve">
         <source>bad message hash</source>
-        <target>hibás az üzenet hasító értéke</target>
+        <target>érvénytelen az üzenet hasítóértéke</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="blocked" xml:space="preserve">
@@ -8623,13 +9345,14 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="blocked %@" xml:space="preserve">
         <source>blocked %@</source>
-        <target>letiltotta %@-t</target>
+        <target>letiltotta őt: %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>letiltva az adminisztrátor által</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8656,6 +9379,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>hívás…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <target>nem lehet üzeneteket küldeni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>%@ visszavonva</target>
@@ -8663,32 +9391,32 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="changed address for you" xml:space="preserve">
         <source>changed address for you</source>
-        <target>cím megváltoztatva</target>
+        <target>módosította a címet az Ön számára</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="changed role of %@ to %@" xml:space="preserve">
         <source>changed role of %1$@ to %2$@</source>
-        <target>%1$@ szerepkörét megváltoztatta erre: %2$@</target>
+        <target>a következőre módosította %1$@ szerepkörét: „%2$@”</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="changed your role to %@" xml:space="preserve">
         <source>changed your role to %@</source>
-        <target>megváltoztatta az Ön szerepkörét erre: %@</target>
+        <target>a következőre módosította az Ön szerepkörét: „%@”</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="changing address for %@…" xml:space="preserve">
         <source>changing address for %@…</source>
-        <target>cím megváltoztatása nála: %@…</target>
+        <target>cím módosítása %@ számára…</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="changing address…" xml:space="preserve">
         <source>changing address…</source>
-        <target>cím megváltoztatása…</target>
+        <target>cím módosítása…</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="colored" xml:space="preserve">
         <source>colored</source>
-        <target>színes</target>
+        <target>színezett</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="complete" xml:space="preserve">
@@ -8728,12 +9456,12 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="connecting (introduced)" xml:space="preserve">
         <source>connecting (introduced)</source>
-        <target>kapcsolódás (bejelentve)</target>
+        <target>kapcsolódás (bemutatkozva)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting (introduction invitation)" xml:space="preserve">
         <source>connecting (introduction invitation)</source>
-        <target>kapcsolódás (bemutatkozó-meghívó)</target>
+        <target>kapcsolódás (bemutatkozó meghívó)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting call" xml:space="preserve">
@@ -8758,17 +9486,32 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="contact %@ changed to %@" xml:space="preserve">
         <source>contact %1$@ changed to %2$@</source>
-        <target>%1$@ megváltoztatta a nevét erre: %2$@</target>
+        <target>%1$@ a következőre módosította a nevét: %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <target>partner törölve</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <target>partner letiltva</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
-        <target>az ismerősnél az e2e titkosítás elérhető</target>
+        <target>a partner e2e titkosítással rendelkezik</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="contact has no e2e encryption" xml:space="preserve">
         <source>contact has no e2e encryption</source>
-        <target>az ismerősnél az e2e titkosítás nem elérhető</target>
+        <target>a partner nem rendelkezik e2e titkosítással</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <target>a kapcsolat nem áll készen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
@@ -8778,12 +9521,12 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="custom" xml:space="preserve">
         <source>custom</source>
-        <target>egyedi</target>
+        <target>egyéni</target>
         <note>dropdown time picker choice</note>
       </trans-unit>
       <trans-unit id="database version is newer than the app, but no down migration for: %@" xml:space="preserve">
         <source>database version is newer than the app, but no down migration for: %@</source>
-        <target>az adatbázis verziója újabb, mint az alkalmazásé, de nincs visszafelé átköltöztetés ehhez: %@</target>
+        <target>az adatbázis verziója újabb, mint az alkalmazásé, de a visszafelé történő átköltöztetés viszont nem lehetséges a következőhöz: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="days" xml:space="preserve">
@@ -8799,7 +9542,8 @@ Kapcsolatkérés megismétlése?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>alapértelmezett (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8818,7 +9562,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="deleted contact" xml:space="preserve">
         <source>deleted contact</source>
-        <target>törölt ismerős</target>
+        <target>törölt partner</target>
         <note>rcv direct event chat item</note>
       </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
@@ -8828,7 +9572,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="different migration in the app/database: %@ / %@" xml:space="preserve">
         <source>different migration in the app/database: %@ / %@</source>
-        <target>különböző átköltöztetések az alkalmazásban/adatbázisban: %@ / %@</target>
+        <target>különböző átköltöztetés az alkalmazásban/adatbázisban: %@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="direct" xml:space="preserve">
@@ -8863,7 +9607,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="enabled for contact" xml:space="preserve">
         <source>enabled for contact</source>
-        <target>engedélyezve az ismerős számára</target>
+        <target>engedélyezve a partner számára</target>
         <note>enabled status</note>
       </trans-unit>
       <trans-unit id="enabled for you" xml:space="preserve">
@@ -8888,27 +9632,27 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="encryption ok for %@" xml:space="preserve">
         <source>encryption ok for %@</source>
-        <target>titkosítás rendben vele: %@</target>
+        <target>titkosítás rendben %@ számára</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
         <source>encryption re-negotiation allowed</source>
-        <target>titkosítás újraegyeztetés engedélyezve</target>
+        <target>a titkosítás újraegyeztetése engedélyezve van</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
         <source>encryption re-negotiation allowed for %@</source>
-        <target>titkosítás újraegyeztetés engedélyezve vele: %@</target>
+        <target>a titkosítás újraegyeztetése engedélyezve van %@ számára</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation required" xml:space="preserve">
         <source>encryption re-negotiation required</source>
-        <target>titkosítás újraegyeztetés szükséges</target>
+        <target>a titkosítás újraegyeztetése szükséges</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
         <source>encryption re-negotiation required for %@</source>
-        <target>titkosítás újraegyeztetés szükséges %@ számára</target>
+        <target>a titkosítás újraegyeztetése szükséges %@ számára</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="ended" xml:space="preserve">
@@ -8926,21 +9670,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>hiba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>esemény történt</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>lejárt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>a metaadatok jobb védelme érdekében.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>továbbított</target>
@@ -8951,6 +9685,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>a csoport törölve</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <target>csoport törölve</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>csoportprofil frissítve</target>
@@ -8963,12 +9702,12 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="iOS Keychain is used to securely store passphrase - it allows receiving push notifications." xml:space="preserve">
         <source>iOS Keychain is used to securely store passphrase - it allows receiving push notifications.</source>
-        <target>Az iOS kulcstartó a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.</target>
+        <target>Az iOS kulcstartó a jelmondat biztonságos tárolására szolgál – lehetővé teszi a push-értesítések fogadását.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications." xml:space="preserve">
         <source>iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications.</source>
-        <target>Az iOS kulcstartó az alkalmazás újraindítása, vagy a jelmondat módosítása után a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.</target>
+        <target>Az iOS kulcstartó biztonságosan fogja tárolni a jelmondatot az alkalmazás újraindítása, vagy a jelmondat módosítása után – lehetővé teszi a push-értesítések fogadását.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="inactive" xml:space="preserve">
@@ -8988,7 +9727,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="incognito via one-time link" xml:space="preserve">
         <source>incognito via one-time link</source>
-        <target>inkognitó egy egyszer használható meghívó-hivatkozáson keresztül</target>
+        <target>inkognitó egy egyszer használható meghívón keresztül</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="indirect (%d)" xml:space="preserve">
@@ -9033,12 +9772,12 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="invited to connect" xml:space="preserve">
         <source>invited to connect</source>
-        <target>meghívta, hogy csatlakozzon</target>
+        <target>Függőben lévő meghívó</target>
         <note>chat list item title</note>
       </trans-unit>
       <trans-unit id="invited via your group link" xml:space="preserve">
         <source>invited via your group link</source>
-        <target>meghíva az Ön csoporthivatkozásán keresztül</target>
+        <target>meghíva a saját csoporthivatkozásán keresztül</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="italic" xml:space="preserve">
@@ -9048,7 +9787,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="join as %@" xml:space="preserve">
         <source>join as %@</source>
-        <target>csatlakozás mint: %@</target>
+        <target>csatlakozás mint %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="left" xml:space="preserve">
@@ -9068,7 +9807,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="member %@ changed to %@" xml:space="preserve">
         <source>member %1$@ changed to %2$@</source>
-        <target>%1$@ megváltoztatta a nevét erre: %2$@</target>
+        <target>%1$@ a következőre módosította a nevét: %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
@@ -9076,6 +9815,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>kapcsolódott</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <target>a tag régi verziót használ</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>üzenet</target>
@@ -9106,20 +9850,20 @@ Kapcsolatkérés megismétlése?</target>
         <target>moderálva lett %@ által</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>moderátor</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>hónap</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>némítás</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>soha</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9141,6 +9885,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>nincs szöveg</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <target>nincs szinkronizálva</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>megfigyelő</target>
@@ -9150,8 +9899,9 @@ Kapcsolatkérés megismétlése?</target>
         <source>off</source>
         <target>kikapcsolva</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9160,7 +9910,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="offered %@: %@" xml:space="preserve">
         <source>offered %1$@: %2$@</source>
-        <target>ajánlotta %1$@: %2$@-kor</target>
+        <target>ajánlotta: %1$@, ekkor: %2$@</target>
         <note>feature offered item</note>
       </trans-unit>
       <trans-unit id="on" xml:space="preserve">
@@ -9190,12 +9940,27 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="peer-to-peer" xml:space="preserve">
         <source>peer-to-peer</source>
-        <target>ponttól-pontig</target>
+        <target>egyenrangú</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>függőben</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>jóváhagyásra vár</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <target>függőben lévő áttekintés</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>
-        <target>végpontok közötti kvantumrezisztens titkosítás</target>
+        <target>végpontok közötti kvantumbiztos titkosítás</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -9208,6 +9973,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>visszaigazolás fogadása…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>elutasítva</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>elutasított hívás</target>
@@ -9228,6 +9998,11 @@ Kapcsolatkérés megismétlése?</target>
         <target>eltávolította a kapcsolattartási címet</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <target>eltávolítva a csoportból</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>eltávolította a profilképét</target>
@@ -9238,11 +10013,26 @@ Kapcsolatkérés megismétlése?</target>
         <target>eltávolította Önt</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <target>csatlakozási kérelem elutasítva</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
-        <target>kérelmezve a kapcsolódáshoz</target>
+        <target>Függőben lévő meghívási kérelem</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <target>áttekintés</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <target>áttekintve a moderátorok által</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>mentett</target>
@@ -9275,7 +10065,7 @@ Kapcsolatkérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="security code changed" xml:space="preserve">
         <source>security code changed</source>
-        <target>a biztonsági kód megváltozott</target>
+        <target>a biztonsági kód módosult</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
@@ -9287,14 +10077,14 @@ Kapcsolatkérés megismétlése?</target>
         <source>server queue info: %1$@
 
 last received msg: %2$@</source>
-        <target>a kiszolgáló üzenet-sorbaállítási információi: %1$@
+        <target>a kiszolgáló sorbaállítási információi: %1$@
 
 utoljára fogadott üzenet: %2$@</target>
         <note>queue info</note>
       </trans-unit>
       <trans-unit id="set new contact address" xml:space="preserve">
         <source>set new contact address</source>
-        <target>új kapcsolattartási cím beállítása</target>
+        <target>új kapcsolattartási címet állított be</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="set new profile picture" xml:space="preserve">
@@ -9319,7 +10109,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="this contact" xml:space="preserve">
         <source>this contact</source>
-        <target>ez az ismerős</target>
+        <target>ez a partner</target>
         <note>notification title</note>
       </trans-unit>
       <trans-unit id="unblocked %@" xml:space="preserve">
@@ -9342,11 +10132,6 @@ utoljára fogadott üzenet: %2$@</target>
         <target>ismeretlen állapot</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>némítás megszüntetése</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>nem védett</target>
@@ -9374,7 +10159,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="via contact address link" xml:space="preserve">
         <source>via contact address link</source>
-        <target>kapcsolattartási cím-hivatkozáson keresztül</target>
+        <target>a kapcsolattartási címhivatkozáson keresztül</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="via group link" xml:space="preserve">
@@ -9384,12 +10169,12 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="via one-time link" xml:space="preserve">
         <source>via one-time link</source>
-        <target>egyszer használható meghívó-hivatkozáson keresztül</target>
+        <target>egy egyszer használható meghívón keresztül</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="via relay" xml:space="preserve">
         <source>via relay</source>
-        <target>közvetítő-kiszolgálón keresztül</target>
+        <target>egy továbbítókiszolgálón keresztül</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="video" xml:space="preserve">
@@ -9437,9 +10222,14 @@ utoljára fogadott üzenet: %2$@</target>
         <target>Ön</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <target>Ön befogadta ezt a tagot</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
-        <target>meghívást kapott a csoportba</target>
+        <target>Ön meghívást kapott a csoportba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="you are observer" xml:space="preserve">
@@ -9454,22 +10244,22 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="you changed address" xml:space="preserve">
         <source>you changed address</source>
-        <target>cím megváltoztatva</target>
+        <target>Ön módosította a címet</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="you changed address for %@" xml:space="preserve">
         <source>you changed address for %@</source>
-        <target>cím megváltoztatva nála: %@</target>
+        <target>Ön módosította a címet %@ számára</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="you changed role for yourself to %@" xml:space="preserve">
         <source>you changed role for yourself to %@</source>
-        <target>saját szerepköre megváltozott erre: %@</target>
+        <target>Ön a következőre módosította a saját szerepkörét: „%@”</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you changed role of %@ to %@" xml:space="preserve">
         <source>you changed role of %1$@ to %2$@</source>
-        <target>Ön megváltoztatta %1$@ szerepkörét erre: %@</target>
+        <target>Ön a következőre módosította %1$@ szerepkörét: „%2$@”</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you left" xml:space="preserve">
@@ -9484,12 +10274,12 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="you shared one-time link" xml:space="preserve">
         <source>you shared one-time link</source>
-        <target>Ön egy egyszer használható meghívó-hivatkozást osztott meg</target>
+        <target>Ön egy egyszer használható meghívót osztott meg</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="you shared one-time link incognito" xml:space="preserve">
         <source>you shared one-time link incognito</source>
-        <target>Ön egy egyszer használható meghívó-hivatkozást osztott meg inkognitóban</target>
+        <target>Ön egy egyszer használható meghívót osztott meg inkognitóban</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="you unblocked %@" xml:space="preserve">
@@ -9511,7 +10301,7 @@ utoljára fogadott üzenet: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9531,7 +10321,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
         <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <target>A SimpleX helyi hálózati hozzáférést használ, hogy lehetővé tegye a felhasználói csevegőprofil használatát számítógépen keresztül ugyanazon a hálózaton.</target>
+        <target>A SimpleX helyi hálózati hozzáférést használ, hogy lehetővé tegye a felhasználói csevegési profil használatát számítógépen keresztül ugyanazon a hálózaton.</target>
         <note>Privacy - Local Network Usage Description</note>
       </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
@@ -9548,7 +10338,7 @@ utoljára fogadott üzenet: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9570,7 +10360,7 @@ utoljára fogadott üzenet: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9578,6 +10368,11 @@ utoljára fogadott üzenet: %2$@</target>
         <target>%d új esemény</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>%d csevegésből</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>Tőle: %@</target>
@@ -9593,16 +10388,11 @@ utoljára fogadott üzenet: %2$@</target>
         <target>Új üzenetek</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Új üzenetek %d csevegésben</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9624,7 +10414,7 @@ utoljára fogadott üzenet: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="hu" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
@@ -9634,7 +10424,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="App is locked!" xml:space="preserve">
         <source>App is locked!</source>
-        <target>Az alkalmazás zárolva!</target>
+        <target>Az alkalmazás zárolva van!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
@@ -9659,7 +10449,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
         <source>Currently maximum supported file size is %@.</source>
-        <target>Jelenleg a maximálisan támogatott fájlméret: %@.</target>
+        <target>Jelenleg támogatott legnagyobb fájl méret: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database downgrade required" xml:space="preserve">
@@ -9679,12 +10469,12 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
         <source>Database passphrase is different from saved in the keychain.</source>
-        <target>Az adatbázis jelmondata eltér a kulcstartóban lévőtől.</target>
+        <target>Az adatbázis jelmondata nem egyezik a kulcstartóba mentettől.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
         <source>Database passphrase is required to open chat.</source>
-        <target>Adatbázis-jelmondat szükséges a csevegés megnyitásához.</target>
+        <target>A csevegés megnyitásához adja meg az adatbázis jelmondatát.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database upgrade required" xml:space="preserve">
@@ -9694,12 +10484,12 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Error preparing file" xml:space="preserve">
         <source>Error preparing file</source>
-        <target>Hiba a fájl előkészítésekor</target>
+        <target>Hiba történt a fájl előkészítésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error preparing message" xml:space="preserve">
         <source>Error preparing message</source>
-        <target>Hiba az üzenet előkészítésekor</target>
+        <target>Hiba történt az üzenet előkészítésekor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: %@" xml:space="preserve">
@@ -9764,7 +10554,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
         <source>Selected chat preferences prohibit this message.</source>
-        <target>A kiválasztott csevegési beállítások tiltják ezt az üzenetet.</target>
+        <target>A kijelölt csevegési beállítások tiltják ezt az üzenetet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending a message takes longer than expected." xml:space="preserve">
@@ -9784,7 +10574,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Slow network?" xml:space="preserve">
         <source>Slow network?</source>
-        <target>Lassú internetkapcsolat?</target>
+        <target>Lassú a hálózata?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unknown database error: %@" xml:space="preserve">
@@ -9804,7 +10594,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
-        <target>Hibás adatbázis-jelmondat</target>
+        <target>Érvénytelen adatbázis-jelmondat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/hu.xcloc/contents.json b/apps/ios/SimpleX Localizations/hu.xcloc/contents.json
index 0b16198498..c07ec0f900 100644
--- a/apps/ios/SimpleX Localizations/hu.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/hu.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "hu",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff
index d785acda81..d3c2a139cc 100644
--- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
+++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (può essere copiato)</target>
@@ -202,6 +190,11 @@
         <target>%d sec</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d secondo/i</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d messaggio/i saltato/i</target>
@@ -272,11 +265,6 @@
         <target>%lld nuove lingue dell'interfaccia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld secondo/i</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld secondi</target>
@@ -327,11 +315,6 @@
         <target>%u messaggi saltati.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(nuovo)</target>
@@ -342,11 +325,6 @@
         <target>(questo dispositivo v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Aggiungi contatto**: per creare un nuovo link di invito.</target>
@@ -412,11 +390,6 @@
         <target>\*grassetto*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - cronologia delle modifiche.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sec</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 giorno</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +455,19 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 mese</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 settimana</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 anno</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 secondi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -579,6 +550,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>Info sugli operatori</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -590,8 +562,18 @@
         <source>Accept</source>
         <target>Accetta</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <target>Accetta come membro</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <target>Accetta come osservatore</target>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -612,7 +594,12 @@
         <source>Accept incognito</source>
         <target>Accetta in incognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <target>Accetta membro</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -629,6 +616,11 @@
         <target>Errori di riconoscimento</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Attivo</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Connessioni attive</target>
@@ -644,6 +636,11 @@
         <target>Aggiungi amici</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Aggiungi elenco</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Aggiungi profilo</target>
@@ -669,6 +666,11 @@
         <target>Aggiungi ad un altro dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Aggiungi ad un elenco</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Aggiungi messaggio di benvenuto</target>
@@ -744,6 +746,11 @@
         <target>Impostazioni avanzate</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Tutte</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Tutti i dati dell'app vengono eliminati.</target>
@@ -754,6 +761,11 @@
         <target>Tutte le chat e i messaggi verranno eliminati. Non è reversibile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Tutte le chat verranno rimosse dall'elenco %@ e l'elenco eliminato.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Tutti i dati vengono cancellati quando inserito.</target>
@@ -794,6 +806,16 @@
         <target>Tutti gli profili</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Tutte le segnalazioni verranno archiviate per te.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>Tutti i server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Tutti i tuoi contatti resteranno connessi.</target>
@@ -869,6 +891,11 @@
         <target>Permetti di eliminare irreversibilmente i messaggi inviati. (24 ore)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Consenti di segnalare messaggi ai moderatori.</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>
         <target>Consenti di inviare link di SimpleX.</target>
@@ -949,6 +976,11 @@
         <target>Viene creato un profilo di chat vuoto con il nome scelto e l'app si apre come al solito.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Altro motivo</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Rispondi alla chiamata</target>
@@ -974,6 +1006,11 @@
         <target>L'app cripta i nuovi file locali (eccetto i video).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>Gruppo app:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Icona app</target>
@@ -1019,6 +1056,21 @@
         <target>Applica a</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archivia</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archiviare %lld segnalazioni?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Archiviare tutte le segnalazioni?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archivia e carica</target>
@@ -1029,6 +1081,21 @@
         <target>Archivia contatti per chattare più tardi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Archivia la segnalazione</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Archiviare la segnalazione?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Archivia segnalazioni</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Contatti archiviati</target>
@@ -1139,6 +1206,11 @@
         <target>Gruppi migliorati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Prestazioni dei gruppi migliorate</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Date dei messaggi migliorate.</target>
@@ -1159,6 +1231,11 @@
         <target>Notifiche migliorate</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Privacy e sicurezza migliori</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Sicurezza migliorata ✅</target>
@@ -1259,11 +1336,25 @@
         <target>Chat di lavoro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Lavorative</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Per profilo di chat (predefinito) o [per connessione](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>Usando SimpleX Chat accetti di:
+- inviare solo contenuto legale nei gruppi pubblici.
+- rispettare gli altri utenti - niente spam.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Chiamata già terminata!</target>
@@ -1313,7 +1404,7 @@
         <source>Cancel</source>
         <target>Annulla</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1350,6 +1441,11 @@
         <target>Cambia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Cambiare l'eliminazione automatica dei messaggi?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Modifica profili utente</target>
@@ -1399,7 +1495,7 @@
         <source>Change self-destruct passcode</source>
         <target>Cambia codice di autodistruzione</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1501,11 +1597,26 @@
         <target>La chat verrà eliminata solo per te, non è reversibile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <target>Chat con amministratori</target>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <target>Chatta con il membro</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <target>Chat con membri</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Controlla i messaggi ogni 20 min.</target>
@@ -1571,6 +1682,16 @@
         <target>Svuotare la conversazione?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Svuotare il gruppo?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Svuotare o eliminare il gruppo?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Svuotare le note private?</target>
@@ -1591,6 +1712,11 @@
         <target>Modalità di colore</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Violazione delle linee guida della comunità</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Confronta file</target>
@@ -1626,16 +1752,6 @@
         <target>Condizioni d'uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Le condizioni verranno accettate per gli operatori attivati dopo 30 giorni.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Le condizioni verranno accettate per gli operatori: **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Le condizioni verranno accettate per gli operatori: **%@**.</target>
@@ -1656,6 +1772,11 @@
         <target>Configura server ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Configura gli operatori dei server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Conferma</target>
@@ -1706,6 +1827,11 @@
         <target>Conferma caricamento</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Confermato</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Connetti</target>
@@ -1825,6 +1951,11 @@ Questo è il tuo link una tantum!</target>
         <target>Stato della connessione e dei server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Connessione bloccata</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Errore di connessione</target>
@@ -1835,6 +1966,18 @@ Questo è il tuo link una tantum!</target>
         <target>Errore di connessione (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>La connessione è bloccata dall'operatore del server:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Connessione non pronta.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Notifiche di connessione</target>
@@ -1845,6 +1988,11 @@ Questo è il tuo link una tantum!</target>
         <target>Richiesta di connessione inviata!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>La connessione richiede la rinegoziazione della crittografia.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Sicurezza della connessione</target>
@@ -1925,6 +2073,11 @@ Questo è il tuo link una tantum!</target>
         <target>I contatti possono contrassegnare i messaggi per l'eliminazione; potrai vederli.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Il contenuto viola le condizioni di utilizzo</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Continua</target>
@@ -2000,6 +2153,11 @@ Questo è il tuo link una tantum!</target>
         <target>Crea link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Crea elenco</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Crea un nuovo profilo nell'[app desktop](https://simplex.chat/downloads/). 💻</target>
@@ -2217,8 +2375,7 @@ Questo è il tuo link una tantum!</target>
         <source>Delete</source>
         <target>Elimina</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2260,6 +2417,11 @@ Questo è il tuo link una tantum!</target>
         <target>Elimina chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Elimina i messaggi di chat dal tuo dispositivo.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Elimina il profilo di chat</target>
@@ -2270,6 +2432,11 @@ Questo è il tuo link una tantum!</target>
         <target>Eliminare il profilo di chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <target>Eliminare la chat con il membro?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>Eliminare la chat?</target>
@@ -2350,6 +2517,11 @@ Questo è il tuo link una tantum!</target>
         <target>Eliminare il link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Eliminare l'elenco?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Eliminare il messaggio del membro?</target>
@@ -2363,7 +2535,7 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Elimina messaggi</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2400,6 +2572,11 @@ Questo è il tuo link una tantum!</target>
         <target>Elimina coda</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Elimina la segnalazione</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Elimina fino a 20 messaggi contemporaneamente.</target>
@@ -2560,6 +2737,16 @@ Questo è il tuo link una tantum!</target>
         <target>Disattiva SimpleX Lock</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Disattivare l'eliminazione automatica dei messaggi?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Disattiva eliminazione messaggi</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Disattiva per tutti</target>
@@ -2650,6 +2837,11 @@ Questo è il tuo link una tantum!</target>
         <target>Non usare credenziali con proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Documenti:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Non creare un indirizzo</target>
@@ -2660,9 +2852,19 @@ Questo è il tuo link una tantum!</target>
         <target>Non attivare</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Non perdere messaggi importanti.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Non mostrare più</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Fatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2674,7 +2876,7 @@ Questo è il tuo link una tantum!</target>
         <source>Download</source>
         <target>Scarica</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2751,9 +2953,9 @@ Questo è il tuo link una tantum!</target>
         <target>Attiva (mantieni sostituzioni)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Attiva Flux</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Attiva Flux nelle impostazioni "Rete e server" per una migliore privacy dei metadati.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2769,7 +2971,7 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Attivare l'eliminazione automatica dei messaggi?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2896,6 +3098,11 @@ Questo è il tuo link una tantum!</target>
         <target>Rinegoziazione crittografia fallita.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Rinegoziazione della crittografia in corso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Inserisci il codice di accesso</target>
@@ -2971,6 +3178,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nell'accettazione della richiesta di contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <target>Errore di accettazione del membro</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Errore di aggiunta membro/i</target>
@@ -3006,6 +3218,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nel passaggio a incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Errore di controllo dello stato del token</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Errore di connessione al server di inoltro %@. Riprova più tardi.</target>
@@ -3026,6 +3243,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nella creazione del link del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Errore nella creazione dell'elenco</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Errore di creazione del contatto</target>
@@ -3041,6 +3263,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nella creazione del profilo!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Errore nella creazione del resoconto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Errore decifrando il file</target>
@@ -3051,6 +3278,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nell'eliminazione del database della chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <target>Errore di eliminazione della chat con il membro</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Errore nell'eliminazione della chat!</target>
@@ -3151,10 +3383,20 @@ Questo è il tuo link una tantum!</target>
         <target>Errore di riconnessione ai server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Errore di registrazione per le notifiche</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Errore nella rimozione del membro</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Errore riordinando gli elenchi</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3166,6 +3408,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nel salvataggio dei server ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Errore nel salvataggio dell'elenco di chat</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Errore nel salvataggio del profilo del gruppo</target>
@@ -3246,6 +3493,11 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nella sincronizzazione della connessione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Errore provando la connessione al server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Errore nell'aggiornamento del link del gruppo</target>
@@ -3289,7 +3541,9 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Errore: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3326,6 +3580,11 @@ Questo è il tuo link una tantum!</target>
         <target>Espandi</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Scaduto</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Esporta database</target>
@@ -3366,20 +3625,35 @@ Questo è il tuo link una tantum!</target>
         <target>Veloce e senza aspettare che il mittente sia in linea!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Eliminazione dei gruppi più veloce.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Ingresso più veloce e messaggi più affidabili.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Invio dei messaggi più veloce.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Preferito</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Preferite</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Errore del file</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3388,6 +3662,13 @@ Questo è il tuo link una tantum!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Il file è bloccato dall'operatore del server:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>File non trovato - probabilmente è stato eliminato o annullato.</target>
@@ -3513,6 +3794,11 @@ Questo è il tuo link una tantum!</target>
         <target>Correzione non supportata dal membro del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Per tutti i moderatori</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>Per il profilo di chat %@:</target>
@@ -3528,6 +3814,11 @@ Questo è il tuo link una tantum!</target>
         <target>Ad esempio, se il tuo contatto riceve messaggi tramite un server di SimpleX Chat, la tua app li consegnerà tramite un server Flux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>Per me</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>Per l'instradamento privato</target>
@@ -3652,6 +3943,11 @@ Errore: %2$@</target>
         <target>GIF e adesivi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Ricevi una notifica quando menzionato.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Buon pomeriggio!</target>
@@ -3757,11 +4053,21 @@ Errore: %2$@</target>
         <target>Il gruppo verrà eliminato per te. Non è reversibile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Gruppi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Aiuto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Aiuta gli amministratori a moderare i loro gruppi.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Nascosta</target>
@@ -3822,6 +4128,11 @@ Errore: %2$@</target>
         <target>Come aiuta la privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Come funziona</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Come si fa</target>
@@ -3964,6 +4275,16 @@ Altri miglioramenti sono in arrivo!</target>
         <target>Suoni nelle chiamate</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Contenuto inappropriato</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Profilo inappropriato</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -4056,6 +4377,31 @@ Altri miglioramenti sono in arrivo!</target>
         <target>Colori dell'interfaccia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Non valido</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Non valido (token corrotto)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Non valido (scaduto)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Non valido (non registrato)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Non valido (argomento sbagliato)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Codice QR non valido</target>
@@ -4329,6 +4675,21 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Desktop collegati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Elenco</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>Il nome dell'elenco e l'emoji dovrebbero essere diversi per tutte le liste.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Nome elenco...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Messaggio in diretta!</target>
@@ -4414,11 +4775,21 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Membro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <target>Ammissione del membro</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Membro inattivo</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Segnalazioni dei membri</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>Il ruolo del membro verrà cambiato in "%@". Verranno notificati tutti i membri della chat.</target>
@@ -4444,6 +4815,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Il membro verrà rimosso dal gruppo, non è reversibile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <target>Il membro entrerà nel gruppo, accettarlo?</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>I membri del gruppo possono aggiungere reazioni ai messaggi.</target>
@@ -4454,6 +4830,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>I membri del gruppo possono eliminare irreversibilmente i messaggi inviati. (24 ore)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>I membri possono segnalare messaggi ai moderatori.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>I membri del gruppo possono inviare link di Simplex.</target>
@@ -4479,6 +4860,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>I membri del gruppo possono inviare messaggi vocali.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Menziona i membri 👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menu</target>
@@ -4589,6 +4975,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>I messaggi da %@ verranno mostrati!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>I messaggi in questa chat non verranno mai eliminati.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Messaggi ricevuti</target>
@@ -4689,6 +5080,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Moderato il: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Altro</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Altri miglioramenti sono in arrivo!</target>
@@ -4717,7 +5113,12 @@ Questo è il tuo link per il gruppo %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Silenzia</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Silenzia tutto</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4769,6 +5170,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Stato della rete</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Nuovo</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Nuovo codice di accesso</target>
@@ -4834,6 +5240,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nuovo ruolo del membro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <target>Un nuovo membro vuole entrare nel gruppo.</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Nuovo messaggio</target>
@@ -4859,6 +5270,26 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nessuna password dell'app</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Nessuna chat</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Nessuna chat trovata</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Nessuna chat nell'elenco %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <target>Nessuna chat con membri</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Nessun contatto selezionato</target>
@@ -4909,6 +5340,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nessun server di multimediali e file.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Nessun messaggio</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Nessun server dei messaggi.</target>
@@ -4964,6 +5400,16 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nessun server per inviare file.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>Nessun token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Nessuna chat non letta</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Nessun identificatore utente.</target>
@@ -4974,6 +5420,11 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Non compatibile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Note</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Nessuna selezione</target>
@@ -4994,11 +5445,21 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Le notifiche sono disattivate!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Errore delle notifiche</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Privacy delle notifiche</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Stato delle notifiche</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5021,7 +5482,8 @@ Questo è il tuo link per il gruppo %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5082,6 +5544,16 @@ Richiede l'attivazione della VPN.</target>
         <target>Solo i proprietari del gruppo possono attivare i messaggi vocali.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Solo il mittente e i moderatori lo vedono</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Solo tu e i moderatori lo vedete</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Solo tu puoi aggiungere reazioni ai messaggi.</target>
@@ -5135,7 +5607,7 @@ Richiede l'attivazione della VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Apri</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5167,6 +5639,11 @@ Richiede l'attivazione della VPN.</target>
         <target>Apri gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <target>Aprire il link?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Apri migrazione ad un altro dispositivo</target>
@@ -5217,6 +5694,11 @@ Richiede l'attivazione della VPN.</target>
         <target>O per condividere in modo privato</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Organizza le chat in elenchi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Altro</target>
@@ -5408,6 +5890,26 @@ Errore: %@</target>
         <target>Conserva la password in modo sicuro, NON potrai cambiarla se la perdi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Prova a disattivare e riattivare le notifiche.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <target>Attendi che i moderatori del gruppo revisionino la tua richiesta di entrare nel gruppo.</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Attendi il completamento dell'attivazione del token.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Attendi la registrazione del token.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Interfaccia polacca</target>
@@ -5458,16 +5960,31 @@ Errore: %@</target>
         <target>Privacy per i tuoi clienti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Informativa sulla privacy e condizioni d'uso.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Privacy ridefinita</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Le chat private, i gruppi e i tuoi contatti non sono accessibili agli operatori dei server.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Nomi di file privati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Nomi privati dei file multimediali.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Instradamento privato dei messaggi</target>
@@ -5543,6 +6060,11 @@ Errore: %@</target>
         <target>Proibisci le reazioni ai messaggi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Vieta di segnalare messaggi ai moderatori.</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>
         <target>Vieta l'invio di link di SimpleX.</target>
@@ -5800,11 +6322,26 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Consumo di batteria ridotto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Registra</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Registrare il token di notifica?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Registrato</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Rifiuta</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5816,6 +6353,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Rifiuta la richiesta di contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <target>Rifiutare il membro?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Il server relay viene usato solo se necessario. Un altro utente può osservare il tuo indirizzo IP.</target>
@@ -5901,6 +6443,61 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Rispondi</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Segnala</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Segnala contenuto: solo i moderatori del gruppo lo vedranno.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Segnala profilo: solo i moderatori del gruppo lo vedranno.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Segnala altro: solo i moderatori del gruppo lo vedranno.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Motivo della segnalazione?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <target>Segnalazione inviata ai moderatori</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Segnala spam: solo i moderatori del gruppo lo vedranno.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Segnala violazione: solo i moderatori del gruppo lo vedranno.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Segnalazione: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>È vietato segnalare messaggi ai moderatori.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Segnalazioni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Obbligatorio</target>
@@ -5991,10 +6588,15 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Leggi le condizioni</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Leggi più tardi</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <target>Revisiona i membri</target>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <target>Revisiona i membri prima di ammetterli ("bussare").</target>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6045,13 +6647,18 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <source>Save</source>
         <target>Salva</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Salva (e avvisa i contatti)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <target>Salvare le impostazioni di ammissione?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Salva e avvisa il contatto</target>
@@ -6077,6 +6684,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Salva il profilo del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Salva elenco</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Salva la password e apri la chat</target>
@@ -6317,6 +6929,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Invia notifiche</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Invia segnalazioni private</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Invia domande e idee</target>
@@ -6532,6 +7149,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Imposta 1 giorno</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Imposta il nome della chat…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Imposta nome del contatto…</target>
@@ -6552,6 +7174,16 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Impostalo al posto dell'autenticazione di sistema.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <target>Imposta l'ammissione del membro</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Imposta la scadenza dei messaggi nelle chat.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Imposta codice</target>
@@ -6596,7 +7228,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <source>Share</source>
         <target>Condividi</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6658,6 +7290,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Condividi con i contatti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Link breve</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Mostra codice QR</target>
@@ -6715,7 +7352,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
         <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
-        <target>SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell'app</target>
+        <target>SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell'app.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
@@ -6758,6 +7395,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Indirizzo SimpleX o link una tantum?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>Link del canale SimpleX</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>Indirizzo di contatto SimpleX</target>
@@ -6860,6 +7502,12 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Qualcuno</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Spam</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Quadrata, circolare o qualsiasi forma tra le due.</target>
@@ -6945,6 +7593,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Arresto della chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Archiviazione</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Forte</target>
@@ -7005,6 +7658,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Scadenza connessione TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>Porta TCP per i messaggi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7073,13 +7731,18 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Errore del file temporaneo</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test fallito al passo %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Prova le notifiche</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Prova server</target>
@@ -7202,21 +7865,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Il database vecchio non è stato rimosso durante la migrazione, può essere eliminato.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Il profilo è condiviso solo con i tuoi contatti.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Le stesse condizioni si applicheranno all'operatore **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Le stesse condizioni si applicheranno agli operatori **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>Il secondo operatore preimpostato nell'app!</target>
@@ -7282,6 +7935,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Questa azione non può essere annullata: i messaggi inviati e ricevuti prima di quanto selezionato verranno eliminati. Potrebbe richiedere diversi minuti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Questa azione non è reversibile: i messaggi inviati e ricevuti in questa chat prima della selezione verranno eliminati.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Questa azione non può essere annullata: il tuo profilo, i contatti, i messaggi e i file andranno persi in modo irreversibile.</target>
@@ -7327,11 +7985,21 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Questo è il tuo link una tantum!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>Questo link richiede una versione più recente dell'app. Aggiornala o chiedi al tuo contatto di inviare un link compatibile.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Questo link è stato usato con un altro dispositivo mobile, creane uno nuovo sul desktop.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>Questo messaggio è stato eliminato o non ancora ricevuto.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Questa impostazione si applica ai messaggi del profilo di chat attuale **%@**.</target>
@@ -7444,6 +8112,11 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Attiva/disattiva l'incognito quando ti colleghi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Stato del token: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Opacità barra degli strumenti</target>
@@ -7609,13 +8282,18 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Riattiva notifiche</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Non letto</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Link di connessione non supportato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Vengono inviati ai nuovi membri fino a 100 ultimi messaggi.</target>
@@ -7641,6 +8319,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Aggiornare le impostazioni?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Condizioni aggiornate</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>L'aggiornamento delle impostazioni riconnetterà il client a tutti i server.</target>
@@ -7701,6 +8384,16 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usare i server di SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Usa la porta TCP %@ quando non è specificata alcuna porta.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>Usa la porta TCP 443 solo per i server preimpostati.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Usa la chat</target>
@@ -7766,6 +8459,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa i server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Usa link brevi (BETA)</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>
         <target>Usa l'app mentre sei in chiamata.</target>
@@ -7776,6 +8474,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa l'app con una mano sola.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Usa porta web</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Selezione utente</target>
@@ -8148,11 +8851,6 @@ Ripetere la richiesta di ingresso?</target>
         <target>Puoi cambiarlo nelle impostazioni dell'aspetto.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Puoi configurare gli operatori nelle impostazioni di rete e server.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>Puoi configurare i server nelle impostazioni.</target>
@@ -8243,6 +8941,11 @@ Ripetere la richiesta di ingresso?</target>
         <target>Puoi vedere di nuovo il link di invito nei dettagli di connessione.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <target>Puoi vedere le tue segnalazioni nella chat con gli amministratori.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Non puoi inviare messaggi!</target>
@@ -8325,6 +9028,11 @@ Ripetere la richiesta di connessione?</target>
         <target>Hai inviato un invito al gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>Dovresti ricevere le notifiche.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Verrai connesso/a al gruppo quando il dispositivo dell'host del gruppo sarà in linea, attendi o controlla più tardi!</target>
@@ -8390,11 +9098,6 @@ Ripetere la richiesta di connessione?</target>
         <target>I tuoi server ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>I tuoi server SMP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Il tuo indirizzo SimpleX</target>
@@ -8480,6 +9183,11 @@ Ripetere la richiesta di connessione?</target>
         <target>Verrà condiviso il tuo profilo **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Il profilo è condiviso solo con i tuoi contatti.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Il tuo profilo è memorizzato sul tuo dispositivo e condiviso solo con i tuoi contatti. I server di SimpleX non possono vedere il tuo profilo.</target>
@@ -8490,11 +9198,6 @@ Ripetere la richiesta di connessione?</target>
         <target>Il tuo profilo è stato cambiato. Se lo salvi, il profilo aggiornato verrà inviato a tutti i tuoi contatti.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Il tuo profilo, i contatti e i messaggi recapitati sono memorizzati sul tuo dispositivo.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Il tuo profilo casuale</target>
@@ -8545,6 +9248,11 @@ Ripetere la richiesta di connessione?</target>
         <target>sopra, quindi scegli:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <target>%@ accettato</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>chiamata accettata</target>
@@ -8552,8 +9260,14 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="accepted invitation" xml:space="preserve">
         <source>accepted invitation</source>
+        <target>invito accettato</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <target>ti ha accettato/a</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>amministratore</target>
@@ -8574,6 +9288,11 @@ Ripetere la richiesta di connessione?</target>
         <target>concordando la crittografia…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <target>tutti</target>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>tutti i membri</target>
@@ -8589,6 +9308,11 @@ Ripetere la richiesta di connessione?</target>
         <target>e altri %lld eventi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>segnalazione archiviata</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>tentativi</target>
@@ -8627,7 +9351,8 @@ Ripetere la richiesta di connessione?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>bloccato dall'amministratore</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8654,6 +9379,11 @@ Ripetere la richiesta di connessione?</target>
         <target>chiamata…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <target>impossibile inviare messaggi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>annullato %@</target>
@@ -8759,6 +9489,16 @@ Ripetere la richiesta di connessione?</target>
         <target>contatto %1$@ cambiato in %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <target>contatto eliminato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <target>contatto disattivato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>il contatto ha la crittografia e2e</target>
@@ -8769,6 +9509,11 @@ Ripetere la richiesta di connessione?</target>
         <target>il contatto non ha la crittografia e2e</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <target>contatto non pronto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>creatore</target>
@@ -8797,7 +9542,8 @@ Ripetere la richiesta di connessione?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>predefinito (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8924,21 +9670,11 @@ Ripetere la richiesta di connessione?</target>
         <target>errore</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>evento accaduto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>scaduto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>per una migliore privacy dei metadati.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>inoltrato</target>
@@ -8949,6 +9685,11 @@ Ripetere la richiesta di connessione?</target>
         <target>gruppo eliminato</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <target>il gruppo è eliminato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>profilo del gruppo aggiornato</target>
@@ -9066,7 +9807,7 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="member %@ changed to %@" xml:space="preserve">
         <source>member %1$@ changed to %2$@</source>
-        <target>membro %1$@ cambiato in %2$@</target>
+        <target>il membro %1$@ è diventato %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
@@ -9074,6 +9815,11 @@ Ripetere la richiesta di connessione?</target>
         <target>si è connesso/a</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <target>il membro ha una versione vecchia</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>messaggio</target>
@@ -9104,20 +9850,20 @@ Ripetere la richiesta di connessione?</target>
         <target>moderato da %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>moderatore</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>mesi</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>silenzia</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>mai</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9139,6 +9885,11 @@ Ripetere la richiesta di connessione?</target>
         <target>nessun testo</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <target>non sincronizzato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>osservatore</target>
@@ -9148,8 +9899,9 @@ Ripetere la richiesta di connessione?</target>
         <source>off</source>
         <target>off</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9191,6 +9943,21 @@ Ripetere la richiesta di connessione?</target>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>in attesa</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>in attesa di approvazione</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <target>in attesa di revisione</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>
         <target>crittografia e2e resistente alla quantistica</target>
@@ -9206,6 +9973,11 @@ Ripetere la richiesta di connessione?</target>
         <target>conferma ricevuta…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>rifiutato</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>chiamata rifiutata</target>
@@ -9226,6 +9998,11 @@ Ripetere la richiesta di connessione?</target>
         <target>indirizzo di contatto rimosso</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <target>rimosso dal gruppo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>immagine del profilo rimossa</target>
@@ -9236,10 +10013,26 @@ Ripetere la richiesta di connessione?</target>
         <target>ti ha rimosso/a</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <target>richiesta di entrare rifiutata</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
+        <target>richiesto di connettersi</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <target>revisiona</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <target>revisionato dagli amministratori</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>salvato</target>
@@ -9339,11 +10132,6 @@ ultimo msg ricevuto: %2$@</target>
         <target>stato sconosciuto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>riattiva notifiche</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>non protetto</target>
@@ -9434,6 +10222,11 @@ ultimo msg ricevuto: %2$@</target>
         <target>tu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <target>hai accettato questo membro</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>sei stato/a invitato/a al gruppo</target>
@@ -9508,7 +10301,7 @@ ultimo msg ricevuto: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9545,7 +10338,7 @@ ultimo msg ricevuto: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9567,7 +10360,7 @@ ultimo msg ricevuto: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9575,6 +10368,11 @@ ultimo msg ricevuto: %2$@</target>
         <target>%d nuovi eventi</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>Da %d chat</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>Da: %@</target>
@@ -9590,16 +10388,11 @@ ultimo msg ricevuto: %2$@</target>
         <target>Nuovi messaggi</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Nuovi messaggi in %d chat</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9621,7 +10414,7 @@ ultimo msg ricevuto: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/it.xcloc/contents.json b/apps/ios/SimpleX Localizations/it.xcloc/contents.json
index 13870ab8dd..a42f254bd9 100644
--- a/apps/ios/SimpleX Localizations/it.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/it.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "it",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff
index 72e68cff48..2a7bfa8df1 100644
--- a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
+++ b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (コピー可能)</target>
@@ -59,7 +47,7 @@
       </trans-unit>
       <trans-unit id="%@ (current)" xml:space="preserve">
         <source>%@ (current)</source>
-        <target>%@ （現在）</target>
+        <target>%@ (現在)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ (current):" xml:space="preserve">
@@ -114,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>%@ サーバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>%@ サーバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -132,6 +122,7 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
+        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -156,18 +147,22 @@
       </trans-unit>
       <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
         <source>%d file(s) are still being downloaded.</source>
+        <target>%d 個のファイルをダウンロードしています。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) failed to download." xml:space="preserve">
         <source>%d file(s) failed to download.</source>
+        <target>%d 個のファイルがダウンロードに失敗しました。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were deleted." xml:space="preserve">
         <source>%d file(s) were deleted.</source>
+        <target>%d 個のファイルが削除されました。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
         <source>%d file(s) were not downloaded.</source>
+        <target>%d 個のファイルがダウンロードされていません。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
@@ -177,6 +172,7 @@
       </trans-unit>
       <trans-unit id="%d messages not forwarded" xml:space="preserve">
         <source>%d messages not forwarded</source>
+        <target>%d 個のメッセージが未転送</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
@@ -194,6 +190,10 @@
         <target>%d 秒</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d 件のスキップされたメッセージ</target>
@@ -206,7 +206,7 @@
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve">
         <source>%lld</source>
-        <target>%lld</target>
+        <target/>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld %@" xml:space="preserve">
@@ -264,11 +264,6 @@
         <target>%lldつの新しいインターフェース言語</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld 秒</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld 秒</target>
@@ -319,11 +314,6 @@
         <target>%u 件のメッセージがスキップされました。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(新規)</target>
@@ -334,11 +324,6 @@
         <target>(このデバイス v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**コンタクトの追加**: 新しい招待リンクを作成するか、受け取ったリンクから接続します。</target>
@@ -376,6 +361,7 @@
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
         <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target>**QRスキャン / リンクの貼り付け**: 受け取ったリンクで接続する。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -403,15 +389,13 @@
         <target>\*太字*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
 - faster and more stable.</source>
+        <target>- [ディレクトリサービス](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) に接続 (ベータ)!
+- 配信証明を送信する (最大 20 人まで)。
+- より速く、より安定。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve">
@@ -427,6 +411,9 @@
         <source>- optionally notify deleted contacts.
 - profile names with spaces.
 - and more!</source>
+        <target>- 任意で削除された連絡先へ通知します。
+- プロフィール名に空白を含めることができます。
+- and more!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
@@ -438,11 +425,6 @@
 - 編集履歴。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 秒</target>
@@ -456,7 +438,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1日</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -471,19 +454,27 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1ヶ月</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1週間</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>使い捨てリンク</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target>使い捨てリンクは、*ひとつの連絡先にのみ* 使用できます - 対面または任意のチャットで共有してください。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -501,11 +492,6 @@
         <target>30秒</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -572,8 +558,16 @@
         <source>Accept</source>
         <target>承諾</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -593,7 +587,11 @@
         <source>Accept incognito</source>
         <target>シークレットモードで承諾</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -607,6 +605,10 @@
         <source>Acknowledgement errors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <note>No comment provided by engineer.</note>
@@ -620,6 +622,10 @@
         <source>Add friends</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>プロフィールを追加</target>
@@ -644,6 +650,10 @@
         <target>別の端末に追加</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>ウェルカムメッセージを追加</target>
@@ -655,10 +665,12 @@
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>追加されたメディア &amp; ファイルサーバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>追加されたメッセージサーバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
@@ -707,6 +719,11 @@
       </trans-unit>
       <trans-unit id="Advanced settings" xml:space="preserve">
         <source>Advanced settings</source>
+        <target>詳細設定</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
@@ -719,6 +736,10 @@
         <target>全チャットとメッセージが削除されます(※元に戻せません※)！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>入力するとすべてのデータが消去されます。</target>
@@ -752,8 +773,17 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
+        <target>すべてのプロフィール</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>あなたの連絡先が繋がったまま継続します。</target>
@@ -794,7 +824,7 @@
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
-        <target>送信相手も永久メッセージ削除を許可する時のみに許可する。</target>
+        <target>送信相手も永久メッセージ削除を許可する時のみに許可する。(24時間)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
@@ -819,6 +849,7 @@
       </trans-unit>
       <trans-unit id="Allow sharing" xml:space="preserve">
         <source>Allow sharing</source>
+        <target>共有を許可</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -826,6 +857,10 @@
         <target>送信済みメッセージの永久削除を許可する。(24時間)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
         <target>SimpleXリンクの送信を許可。</target>
@@ -893,6 +928,7 @@
       </trans-unit>
       <trans-unit id="Always use private routing." xml:space="preserve">
         <source>Always use private routing.</source>
+        <target>プライベートルーティングを常に使用する。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
@@ -905,6 +941,10 @@
         <target>指定された名前の空のチャット プロファイルが作成され、アプリが通常どおり開きます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>通話に応答</target>
@@ -930,6 +970,10 @@
         <target>アプリは新しいローカルファイル（ビデオを除く）を暗号化します。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>アプリのアイコン</target>
@@ -961,25 +1005,52 @@
       </trans-unit>
       <trans-unit id="Appearance" xml:space="preserve">
         <source>Appearance</source>
-        <target>見た目</target>
+        <target>アピアランス</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Apply" xml:space="preserve">
         <source>Apply</source>
+        <target>適用</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Apply to" xml:space="preserve">
         <source>Apply to</source>
+        <target>に適用する</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
+        <target>アーカイブとアップロード</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <note>No comment provided by engineer.</note>
@@ -1083,6 +1154,10 @@
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <note>No comment provided by engineer.</note>
@@ -1100,6 +1175,10 @@
         <source>Better notifications</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <note>No comment provided by engineer.</note>
@@ -1186,11 +1265,21 @@
         <source>Business chats</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>チャット プロファイル経由 (デフォルト) または [接続経由](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>通話は既に終了してます！</target>
@@ -1235,7 +1324,7 @@
         <source>Cancel</source>
         <target>中止</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1268,6 +1357,10 @@
         <target>変更</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <note>authentication reason</note>
@@ -1316,7 +1409,7 @@
         <source>Change self-destruct passcode</source>
         <target>自己破壊パスコードを変更する</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1407,11 +1500,23 @@
         <source>Chat will be deleted for you - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>チャット</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <note>No comment provided by engineer.</note>
@@ -1473,6 +1578,14 @@
         <target>ダイアログのクリアしますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>プライベートノートを消しますか？</target>
@@ -1492,6 +1605,10 @@
         <target>色設定</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>ファイルを比較</target>
@@ -1523,14 +1640,6 @@
         <source>Conditions of use</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <note>No comment provided by engineer.</note>
@@ -1548,6 +1657,10 @@
         <target>ICEサーバを設定</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>確認</target>
@@ -1593,6 +1706,10 @@
         <source>Confirm upload</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>接続</target>
@@ -1701,7 +1818,11 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>接続とサーバーのステータス</target>
+        <target>接続とサーバーのステータス。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -1714,6 +1835,15 @@ This is your own one-time link!</source>
         <target>接続エラー (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <note>No comment provided by engineer.</note>
@@ -1723,6 +1853,10 @@ This is your own one-time link!</source>
         <target>接続リクエストを送信しました！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1797,6 +1931,10 @@ This is your own one-time link!</source>
         <target>連絡先はメッセージを削除対象とすることができます。あなたには閲覧可能です。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>続ける</target>
@@ -1865,6 +2003,10 @@ This is your own one-time link!</source>
         <target>リンクを生成する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>[デスクトップアプリ](https://simplex.chat/downloads/)で新しいプロファイルを作成します。 💻</target>
@@ -1872,6 +2014,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create profile" xml:space="preserve">
         <source>Create profile</source>
+        <target>プロフィールを作成する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -2073,8 +2216,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>削除</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2112,6 +2254,10 @@ This is your own one-time link!</source>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>チャットのプロフィールを削除する</target>
@@ -2122,6 +2268,10 @@ This is your own one-time link!</source>
         <target>チャットのプロフィールを削除しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2199,6 +2349,10 @@ This is your own one-time link!</source>
         <target>リンクを削除しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>メンバーのメッセージを削除しますか？</target>
@@ -2212,7 +2366,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>メッセージを削除</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2248,6 +2402,10 @@ This is your own one-time link!</source>
         <target>待ち行列を削除</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <note>No comment provided by engineer.</note>
@@ -2395,6 +2553,14 @@ This is your own one-time link!</source>
         <target>SimpleXロックを無効にする</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>すべて無効</target>
@@ -2478,9 +2644,13 @@ This is your own one-time link!</source>
         <source>Do not use credentials with proxy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
-        <target>アドレスを作成しないでください</target>
+        <target>アドレスを作成しない</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't enable" xml:space="preserve">
@@ -2488,9 +2658,17 @@ This is your own one-time link!</source>
         <target>有効にしない</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>次から表示しない</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2501,7 +2679,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2570,8 +2748,8 @@ This is your own one-time link!</source>
         <target>有効にする（設定の優先を維持）</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2587,7 +2765,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>自動メッセージ削除を有効にしますか？</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2707,6 +2885,10 @@ This is your own one-time link!</source>
         <source>Encryption re-negotiation failed.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>パスコードを入力</target>
@@ -2777,6 +2959,10 @@ This is your own one-time link!</source>
         <target>連絡先リクエストの承諾にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>メンバー追加にエラー発生</target>
@@ -2809,6 +2995,10 @@ This is your own one-time link!</source>
         <source>Error changing to incognito!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2828,6 +3018,10 @@ This is your own one-time link!</source>
         <target>グループリンク生成にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>メンバー連絡先の作成中にエラーが発生</target>
@@ -2842,6 +3036,10 @@ This is your own one-time link!</source>
         <target>プロフィール作成にエラー発生！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>ファイルの復号エラー</target>
@@ -2852,6 +3050,10 @@ This is your own one-time link!</source>
         <target>チャットデータベース削除にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>チャット削除にエラー発生！</target>
@@ -2944,10 +3146,18 @@ This is your own one-time link!</source>
         <source>Error reconnecting servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>メンバー除名にエラー発生</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -2958,6 +3168,10 @@ This is your own one-time link!</source>
         <target>ICEサーバ保存にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>グループのプロフィール保存にエラー発生</target>
@@ -3033,6 +3247,10 @@ This is your own one-time link!</source>
         <target>接続の同期エラー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>グループのリンクのアップデートにエラー発生</target>
@@ -3073,7 +3291,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>エラー : %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3107,6 +3327,10 @@ This is your own one-time link!</source>
         <source>Expand</source>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>データベースをエキスポート</target>
@@ -3145,24 +3369,41 @@ This is your own one-time link!</source>
         <target>送信者がオンラインになるまでの待ち時間がなく、速い！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>お気に入り</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3280,6 +3521,10 @@ This is your own one-time link!</source>
         <target>グループメンバーによる修正はサポートされていません</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3293,6 +3538,10 @@ This is your own one-time link!</source>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3397,6 +3646,10 @@ Error: %2$@</source>
         <target>GIFとステッカー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <note>message preview</note>
@@ -3498,11 +3751,19 @@ Error: %2$@</source>
         <target>あなたにとってグループが削除されます (※元に戻せません※)！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>ヘルプ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>プライベート</target>
@@ -3560,6 +3821,10 @@ Error: %2$@</source>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>使い方</target>
@@ -3692,6 +3957,14 @@ More improvements are coming soon!</source>
         <source>In-call sounds</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>シークレットモード</target>
@@ -3762,7 +4035,7 @@ More improvements are coming soon!</source>
       </trans-unit>
       <trans-unit id="Instant" xml:space="preserve">
         <source>Instant</source>
-        <target>すぐに</target>
+        <target>即時</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Instant push notifications will be hidden!&#10;" xml:space="preserve">
@@ -3781,6 +4054,26 @@ More improvements are coming soon!</source>
         <source>Interface colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <note>No comment provided by engineer.</note>
@@ -4032,6 +4325,18 @@ This is your link for group %@!</source>
         <source>Linked desktops</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>ライブメッセージ！</target>
@@ -4115,10 +4420,18 @@ This is your link for group %@!</source>
         <target>メンバー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4142,6 +4455,10 @@ This is your link for group %@!</source>
         <target>メンバーをグループから除名する (※元に戻せません※)！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>グループメンバーはメッセージへのリアクションを追加できます。</target>
@@ -4152,6 +4469,10 @@ This is your link for group %@!</source>
         <target>グループのメンバーがメッセージを完全削除することができます。(24時間)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <note>No comment provided by engineer.</note>
@@ -4176,6 +4497,10 @@ This is your link for group %@!</source>
         <target>グループのメンバーが音声メッセージを送信できます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <note>No comment provided by engineer.</note>
@@ -4272,6 +4597,10 @@ 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 in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <note>No comment provided by engineer.</note>
@@ -4300,6 +4629,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>別の端末から移行</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
@@ -4344,7 +4674,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migrations:" xml:space="preserve">
         <source>Migrations:</source>
-        <target>移行</target>
+        <target>移行:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Moderate" xml:space="preserve">
@@ -4362,6 +4692,10 @@ This is your link for group %@!</source>
         <target>モデレーターによって介入済み: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>まだまだ改善してまいります！</target>
@@ -4388,7 +4722,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>ミュート</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4435,6 +4773,10 @@ This is your link for group %@!</source>
         <target>ネットワーク状況</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>新しいパスコード</target>
@@ -4494,6 +4836,10 @@ This is your link for group %@!</source>
         <target>新しいメンバーの役割</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>新しいメッセージ</target>
@@ -4518,6 +4864,22 @@ This is your link for group %@!</source>
         <target>アプリのパスワードはありません</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>連絡先が選択されてません</target>
@@ -4565,6 +4927,10 @@ This is your link for group %@!</source>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4612,6 +4978,14 @@ This is your link for group %@!</source>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>世界初のユーザーIDのないプラットフォーム｜設計も元からプライベート。</target>
@@ -4621,6 +4995,10 @@ This is your link for group %@!</source>
         <source>Not compatible!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
@@ -4639,10 +5017,18 @@ This is your link for group %@!</source>
         <target>通知が無効になっています!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4664,7 +5050,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>OK</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4723,6 +5110,14 @@ VPN を有効にする必要があります。</target>
         <target>音声メッセージを利用可能に設定できるのはグループのオーナーだけです。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>メッセージへのリアクションを追加できるのは、あなただけです。</target>
@@ -4776,7 +5171,7 @@ VPN を有効にする必要があります。</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>開く</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -4805,6 +5200,10 @@ VPN を有効にする必要があります。</target>
         <source>Open group</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</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>
@@ -4845,6 +5244,10 @@ VPN を有効にする必要があります。</target>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</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>
@@ -5019,6 +5422,22 @@ Error: %@</source>
         <target>パスフレーズを失くさないように保管してください。失くすと変更できなくなります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>ポーランド語UI</target>
@@ -5065,16 +5484,28 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>プライバシーの基準を新境地に</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>プライベートなファイル名</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <note>No comment provided by engineer.</note>
@@ -5085,6 +5516,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
+        <target>プライベートノート</target>
         <note>name of notes to self</note>
       </trans-unit>
       <trans-unit id="Private routing" xml:space="preserve">
@@ -5143,6 +5575,10 @@ Error: %@</source>
         <target>メッセージへのリアクションは禁止されています。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
@@ -5377,11 +5813,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>電池使用量低減</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>拒否</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5393,6 +5841,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>連絡要求を拒否する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>中継サーバーは必要な場合にのみ使用されます。 別の当事者があなたの IP アドレスを監視できます。</target>
@@ -5471,6 +5923,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>返信</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>必須</target>
@@ -5554,9 +6050,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5603,13 +6103,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>保存</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>保存（連絡先に通知）</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>保存して、連絡先にに知らせる</target>
@@ -5634,6 +6138,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>グループプロフィールの保存</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>パスフレーズをを保存して、チャットを開始</target>
@@ -5854,6 +6362,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>通知を送信する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>質問やアイデアを送る</target>
@@ -6042,6 +6554,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>1日に設定</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>連絡先の名前を設定…</target>
@@ -6061,6 +6577,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>システム認証の代わりに設定します。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>パスコードを設定する</target>
@@ -6102,7 +6626,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>共有する</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6157,6 +6681,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>連絡先と共有する</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <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>
@@ -6249,6 +6777,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX連絡先アドレス</target>
@@ -6341,6 +6873,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>誰か</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</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>
@@ -6420,6 +6957,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Stopping chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <note>blur media</note>
@@ -6473,6 +7014,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP接続タイムアウト</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6535,13 +7080,17 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>テストはステップ %@ で失敗しました。</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>テストサーバ</target>
@@ -6658,19 +7207,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>古いデータベースは移行時に削除されなかったので、削除することができます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>プロフィールは連絡先にしか共有されません。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -6730,6 +7270,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>選択中の以前の送受信したメッセージが削除されます (※元に戻せません※)。数分かかります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>あなたのプロフィール、連絡先、メッセージ、ファイルが完全削除されます (※元に戻せません※)。</target>
@@ -6768,10 +7312,18 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>This is your own one-time link!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>この設定は現在のチャットプロフィール **%@** のメッセージに適用されます。</target>
@@ -6873,6 +7425,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>Toggle incognito when connecting.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <note>No comment provided by engineer.</note>
@@ -7025,13 +7581,17 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>ミュート解除</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>未読</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <note>No comment provided by engineer.</note>
@@ -7055,6 +7615,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>設定を更新すると、全サーバにクライントの再接続が行われます。</target>
@@ -7108,6 +7672,14 @@ To connect, please ask your contact to create another connection link and check
         <target>SimpleX チャット サーバーを使用しますか?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>チャット</target>
@@ -7166,6 +7738,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
@@ -7174,6 +7750,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
@@ -7505,10 +8085,6 @@ Repeat join request?</source>
         <source>You can change it in Appearance settings.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -7539,6 +8115,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
         <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <target>設定でSimpleXの連絡先に表示させることができます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can now chat with %@" xml:space="preserve">
@@ -7592,6 +8169,10 @@ Repeat join request?</source>
         <source>You can view invitation link again in connection details.</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>メッセージを送信できませんでした！</target>
@@ -7668,6 +8249,10 @@ Repeat connection request?</source>
         <target>グループの招待を送りました</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>グループのホスト端末がオンラインになったら、接続されます。後でチェックするか、しばらくお待ちください！</target>
@@ -7730,11 +8315,6 @@ Repeat connection request?</source>
         <target>あなたのICEサーバ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>あなたのSMPサーバ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>あなたのSimpleXアドレス</target>
@@ -7816,6 +8396,11 @@ Repeat connection request?</source>
         <target>あなたのプロファイル **%@** が共有されます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>プロフィールは連絡先にしか共有されません。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>プロフィールはデバイスに保存され、連絡先とのみ共有されます。 SimpleX サーバーはあなたのプロファイルを参照できません。</target>
@@ -7825,11 +8410,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>あなたのプロフィール、連絡先、送信したメッセージがご自分の端末に保存されます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>あなたのランダム・プロフィール</target>
@@ -7879,6 +8459,10 @@ Repeat connection request?</source>
         <target>上で選んでください：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>受けた通話</target>
@@ -7888,6 +8472,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>管理者</target>
@@ -7907,6 +8495,10 @@ Repeat connection request?</source>
         <target>暗号化に同意しています…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <note>feature role</note>
@@ -7920,6 +8512,10 @@ Repeat connection request?</source>
         <source>and %lld other events</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <note>No comment provided by engineer.</note>
@@ -7953,7 +8549,8 @@ Repeat connection request?</source>
       </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
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -7979,6 +8576,10 @@ Repeat connection request?</source>
         <target>発信中…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>キャンセルされました %@</target>
@@ -8082,6 +8683,14 @@ Repeat connection request?</source>
         <source>contact %1$@ changed to %2$@</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>連絡先はエンドツーエンド暗号化があります</target>
@@ -8092,6 +8701,10 @@ Repeat connection request?</source>
         <target>連絡先はエンドツーエンド暗号化がありません</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>作成者</target>
@@ -8119,7 +8732,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>デフォルト (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8244,19 +8858,10 @@ Repeat connection request?</source>
         <target>エラー</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>イベント発生</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</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>
@@ -8266,6 +8871,10 @@ Repeat connection request?</source>
         <target>グループ削除済み</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>グループのプロフィールが更新されました</target>
@@ -8388,6 +8997,10 @@ Repeat connection request?</source>
         <target>接続中</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <note>No comment provided by engineer.</note>
@@ -8417,19 +9030,19 @@ Repeat connection request?</source>
         <target>%@ によってモデレートされた</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>月</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>一度も</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8451,6 +9064,10 @@ Repeat connection request?</source>
         <target>テキストなし</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>オブザーバー</target>
@@ -8460,8 +9077,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>オフ</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -8500,6 +9118,18 @@ Repeat connection request?</source>
         <target>P2P</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
@@ -8514,6 +9144,10 @@ Repeat connection request?</source>
         <target>確認を受け取りました…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>拒否した通話</target>
@@ -8533,6 +9167,10 @@ Repeat connection request?</source>
         <source>removed contact address</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <note>profile update event chat item</note>
@@ -8542,10 +9180,22 @@ Repeat connection request?</source>
         <target>あなたを除名しました</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <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>
@@ -8632,10 +9282,6 @@ last received msg: %2$@</source>
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <note>No comment provided by engineer.</note>
@@ -8720,6 +9366,10 @@ last received msg: %2$@</source>
         <source>you</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>グループ招待が届きました</target>
@@ -8792,7 +9442,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -8828,7 +9478,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8850,13 +9500,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -8869,15 +9523,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8896,7 +9546,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="ja" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/ja.xcloc/contents.json b/apps/ios/SimpleX Localizations/ja.xcloc/contents.json
index 604a21be97..ce6052fc44 100644
--- a/apps/ios/SimpleX Localizations/ja.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/ja.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "ja",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/ko.xcloc/Localized Contents/ko.xliff b/apps/ios/SimpleX Localizations/ko.xcloc/Localized Contents/ko.xliff
index 9aaa83afc3..019f63cbc0 100644
--- a/apps/ios/SimpleX Localizations/ko.xcloc/Localized Contents/ko.xliff	
+++ b/apps/ios/SimpleX Localizations/ko.xcloc/Localized Contents/ko.xliff	
@@ -24,216 +24,264 @@
         <source>   </source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
+      <trans-unit id=" (" xml:space="preserve" approved="no">
         <source> (</source>
+        <target state="translated"> (</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=" (can be copied)" xml:space="preserve">
+      <trans-unit id=" (can be copied)" xml:space="preserve" approved="no">
         <source> (can be copied)</source>
+        <target state="translated"> (복사 가능)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="!1 colored!" xml:space="preserve">
+      <trans-unit id="!1 colored!" xml:space="preserve" approved="no">
         <source>!1 colored!</source>
+        <target state="translated">!1 색상 적용됨!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="#secret#" xml:space="preserve">
+      <trans-unit id="#secret#" xml:space="preserve" approved="no">
         <source>#secret#</source>
+        <target state="translated">#비밀#</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@" xml:space="preserve">
+      <trans-unit id="%@" xml:space="preserve" approved="no">
         <source>%@</source>
+        <target state="translated">%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ %@" xml:space="preserve">
+      <trans-unit id="%@ %@" xml:space="preserve" approved="no">
         <source>%@ %@</source>
+        <target state="translated">%@ %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ / %@" xml:space="preserve">
+      <trans-unit id="%@ / %@" xml:space="preserve" approved="no">
         <source>%@ / %@</source>
+        <target state="translated">%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ is connected!" xml:space="preserve">
+      <trans-unit id="%@ is connected!" xml:space="preserve" approved="no">
         <source>%@ is connected!</source>
+        <target state="translated">%@이(가) 연결되었습니다!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@ is not verified" xml:space="preserve">
+      <trans-unit id="%@ is not verified" xml:space="preserve" approved="no">
         <source>%@ is not verified</source>
+        <target state="translated">%@은(는) 인증되지 않았습니다</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ is verified" xml:space="preserve">
+      <trans-unit id="%@ is verified" xml:space="preserve" approved="no">
         <source>%@ is verified</source>
+        <target state="translated">%@ 은(는) 인증되었습니다</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ wants to connect!" xml:space="preserve">
+      <trans-unit id="%@ wants to connect!" xml:space="preserve" approved="no">
         <source>%@ wants to connect!</source>
+        <target state="translated">%@ 연결을 원함!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%d days" xml:space="preserve">
+      <trans-unit id="%d days" xml:space="preserve" approved="no">
         <source>%d days</source>
+        <target state="translated">%d 일</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d hours" xml:space="preserve">
+      <trans-unit id="%d hours" xml:space="preserve" approved="no">
         <source>%d hours</source>
+        <target state="translated">%d 시간</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d min" xml:space="preserve">
+      <trans-unit id="%d min" xml:space="preserve" approved="no">
         <source>%d min</source>
+        <target state="translated">%d 분</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d months" xml:space="preserve">
+      <trans-unit id="%d months" xml:space="preserve" approved="no">
         <source>%d months</source>
+        <target state="translated">%d 개월</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d sec" xml:space="preserve">
+      <trans-unit id="%d sec" xml:space="preserve" approved="no">
         <source>%d sec</source>
+        <target state="translated">%d 초</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d skipped message(s)" xml:space="preserve">
+      <trans-unit id="%d skipped message(s)" xml:space="preserve" approved="no">
         <source>%d skipped message(s)</source>
+        <target state="translated">건너뛰기 메시지 %d개</target>
         <note>integrity error chat item</note>
       </trans-unit>
-      <trans-unit id="%lld" xml:space="preserve">
+      <trans-unit id="%lld" xml:space="preserve" approved="no">
         <source>%lld</source>
+        <target state="translated">%lld</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld %@" xml:space="preserve">
+      <trans-unit id="%lld %@" xml:space="preserve" approved="no">
         <source>%lld %@</source>
+        <target state="translated">%lld %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld contact(s) selected" xml:space="preserve">
+      <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
         <source>%lld contact(s) selected</source>
+        <target state="translated">%lld명의 연락처 선택됨</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve">
+      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve" approved="no">
         <source>%lld file(s) with total size of %@</source>
+        <target state="translated">총 크기가 %@인 파일 %lld 개</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld members" xml:space="preserve">
+      <trans-unit id="%lld members" xml:space="preserve" approved="no">
         <source>%lld members</source>
+        <target state="translated">%lld명의 멤버</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
+      <trans-unit id="%lld second(s)" xml:space="preserve" approved="no">
         <source>%lld second(s)</source>
+        <target state="translated">%lld 초</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lldd" xml:space="preserve">
+      <trans-unit id="%lldd" xml:space="preserve" approved="no">
         <source>%lldd</source>
+        <target state="translated">%lldd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lldh" xml:space="preserve">
+      <trans-unit id="%lldh" xml:space="preserve" approved="no">
         <source>%lldh</source>
+        <target state="translated">%lldh</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lldk" xml:space="preserve">
+      <trans-unit id="%lldk" xml:space="preserve" approved="no">
         <source>%lldk</source>
+        <target state="translated">%lldk</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lldm" xml:space="preserve">
+      <trans-unit id="%lldm" xml:space="preserve" approved="no">
         <source>%lldm</source>
+        <target state="translated">%lldm</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lldmth" xml:space="preserve">
+      <trans-unit id="%lldmth" xml:space="preserve" approved="no">
         <source>%lldmth</source>
+        <target state="translated">%lldmth</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%llds" xml:space="preserve">
         <source>%llds</source>
+        <target></target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldw" xml:space="preserve">
         <source>%lldw</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
+      <trans-unit id="(" xml:space="preserve" approved="no">
         <source>(</source>
+        <target state="translated">(</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
+      <trans-unit id=")" xml:space="preserve" approved="no">
         <source>)</source>
+        <target state="translated">)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
         <source>**Create link / QR code** for your contact to use.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata." xml:space="preserve">
+      <trans-unit id="**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata." xml:space="preserve" approved="no">
         <source>**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata.</source>
+        <target state="translated">**비공개**: 20분마다 새로운 메시지를 확인합니다. 푸시 서버에는 장치 토큰만 공유됩니다. 연락처 수나 메세지 메타데이터가 표시되지 않습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Most private**: do not use SimpleX Chat push server. The app will check messages in background, when the system allows it, depending on how often you use the app." xml:space="preserve">
+      <trans-unit id="**Most private**: do not use SimpleX Chat push server. The app will check messages in background, when the system allows it, depending on how often you use the app." xml:space="preserve" approved="no">
         <source>**Most private**: do not use SimpleX Chat push server. The app will check messages in background, when the system allows it, depending on how often you use the app.</source>
+        <target state="translated">**비공개**: SimpleX 채팅 푸시 서버를 사용하지 마세요. 앱은 사용 빈도에 따라 시스템이 허용하는 백그라운드에서 메세지를 확인합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
         <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</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">
+      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve" approved="no">
         <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
+        <target state="translated">**참고**: 비밀번호를 분실하면 복구하거나 변경할 수 없습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." xml:space="preserve">
+      <trans-unit id="**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." xml:space="preserve" approved="no">
         <source>**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from.</source>
+        <target state="translated">**권장**: 디바이스 토큰과 종단 간 암호화 알림이 SimpleX 채팅 푸시 서버로 전송되지만 메세지 내용, 크기 또는 발신자가 표시되지 않습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
         <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
+      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve" approved="no">
         <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
+        <target state="translated">**경고**: 즉각적인 푸시 알림은 암호문을 키체인에 저장해야 합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
+      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve" approved="no">
         <source>**e2e encrypted** audio call</source>
+        <target state="translated">**e2e** 오디오 통화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**e2e encrypted** video call" xml:space="preserve">
+      <trans-unit id="**e2e encrypted** video call" xml:space="preserve" approved="no">
         <source>**e2e encrypted** video call</source>
+        <target state="translated">**e2e 암호화** 영상 통화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="*bold*" xml:space="preserve">
         <source>\*bold*</source>
+        <target></target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
+      <trans-unit id=", " xml:space="preserve" approved="no">
         <source>, </source>
+        <target state="translated">, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
+      <trans-unit id="." xml:space="preserve" approved="no">
         <source>.</source>
+        <target state="translated">.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="1 day" xml:space="preserve">
+      <trans-unit id="1 day" xml:space="preserve" approved="no">
         <source>1 day</source>
+        <target state="translated">1일</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="1 hour" xml:space="preserve">
+      <trans-unit id="1 hour" xml:space="preserve" approved="no">
         <source>1 hour</source>
+        <target state="translated">1시간</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="1 month" xml:space="preserve">
+      <trans-unit id="1 month" xml:space="preserve" approved="no">
         <source>1 month</source>
+        <target state="translated">1개월</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="1 week" xml:space="preserve">
+      <trans-unit id="1 week" xml:space="preserve" approved="no">
         <source>1 week</source>
+        <target state="translated">1주</target>
         <note>message ttl</note>
       </trans-unit>
       <trans-unit id="2 weeks" xml:space="preserve">
         <source>2 weeks</source>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="6" xml:space="preserve">
+      <trans-unit id="6" xml:space="preserve" approved="no">
         <source>6</source>
+        <target state="translated">6</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
+      <trans-unit id=": " xml:space="preserve" approved="no">
         <source>: </source>
+        <target state="translated">: </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="A new contact" xml:space="preserve">
+      <trans-unit id="A new contact" xml:space="preserve" approved="no">
         <source>A new contact</source>
+        <target state="translated">새로운 연결</target>
         <note>notification title</note>
       </trans-unit>
       <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
@@ -244,29 +292,34 @@
         <source>A random profile will be sent to your contact</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
+      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve" approved="no">
         <source>A separate TCP connection will be used **for each chat profile you have in the app**.</source>
+        <target state="translated">앱에 있는 각 채팅 프로필**마다 별도의 TCP 연결이 사용됩니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve">
+      <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve" approved="no">
         <source>A separate TCP connection will be used **for each contact and group member**.
 **Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.</source>
+        <target state="translated">각 연락처 및 그룹 구성원**마다 별도의 TCP 연결이 사용됩니다.
+**참고**: 연결이 많으면 배터리와 트래픽 소비가 상당히 증가하고 일부 연결이 실패할 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="About SimpleX" xml:space="preserve">
         <source>About SimpleX</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="About SimpleX Chat" xml:space="preserve">
+      <trans-unit id="About SimpleX Chat" xml:space="preserve" approved="no">
         <source>About SimpleX Chat</source>
+        <target state="translated">SimpleX Chat에 대하여</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent color" xml:space="preserve">
         <source>Accent color</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Accept" xml:space="preserve">
+      <trans-unit id="Accept" xml:space="preserve" approved="no">
         <source>Accept</source>
+        <target state="translated">승인</target>
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
@@ -274,12 +327,14 @@
         <source>Accept contact</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
+      <trans-unit id="Accept contact request from %@?" xml:space="preserve" approved="no">
         <source>Accept contact request from %@?</source>
+        <target state="translated">%@의 연락 요청을 수락하시겠습니까?</target>
         <note>notification body</note>
       </trans-unit>
-      <trans-unit id="Accept incognito" xml:space="preserve">
+      <trans-unit id="Accept incognito" xml:space="preserve" approved="no">
         <source>Accept incognito</source>
+        <target state="translated">인정하지 않음</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept requests" xml:space="preserve">
@@ -290,192 +345,233 @@
         <source>Add preset servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add profile" xml:space="preserve">
+      <trans-unit id="Add profile" xml:space="preserve" approved="no">
         <source>Add profile</source>
+        <target state="translated">프로필 추가하기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve">
+      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve" approved="no">
         <source>Add servers by scanning QR codes.</source>
+        <target state="translated">QR 코드를 스캔하여 서버를 추가합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add server" xml:space="preserve">
+      <trans-unit id="Add server" xml:space="preserve" approved="no">
         <source>Add server</source>
+        <target state="translated">서버 추가하기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add to another device" xml:space="preserve">
+      <trans-unit id="Add to another device" xml:space="preserve" approved="no">
         <source>Add to another device</source>
+        <target state="translated">다른 장치에 추가하기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add welcome message" xml:space="preserve">
+      <trans-unit id="Add welcome message" xml:space="preserve" approved="no">
         <source>Add welcome message</source>
+        <target state="translated">환영 메세지 추가하기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
+      <trans-unit id="Admins can create the links to join groups." xml:space="preserve" approved="no">
         <source>Admins can create the links to join groups.</source>
+        <target state="translated">관리자는 그룹에 가입할 수 있는 링크를 만들 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Advanced network settings" xml:space="preserve">
+      <trans-unit id="Advanced network settings" xml:space="preserve" approved="no">
         <source>Advanced network settings</source>
+        <target state="translated">고급 네트워크 설정</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve">
+      <trans-unit id="All chats and messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
         <source>All chats and messages will be deleted - this cannot be undone!</source>
+        <target state="translated">모든 채팅과 메세지가 삭제됩니다. - 수정 불가능!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All group members will remain connected." xml:space="preserve">
+      <trans-unit id="All group members will remain connected." xml:space="preserve" approved="no">
         <source>All group members will remain connected.</source>
+        <target state="translated">모든 그룹 구성원은 연결 상태를 유지합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve">
+      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve" approved="no">
         <source>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</source>
+        <target state="translated">모든 메세지가 삭제됩니다 - 수정할 수 없습니다! 메세지는 오직 당신만을 위해 삭제될 것입니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected" xml:space="preserve">
         <source>All your contacts will remain connected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow" xml:space="preserve">
+      <trans-unit id="Allow" xml:space="preserve" approved="no">
         <source>Allow</source>
+        <target state="translated">승인</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
+      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve" approved="no">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
+        <target state="translated">연락처가 메세지를 허용하는 경우에만 메세지 삭제를 허용합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
+      <trans-unit id="Allow sending direct messages to members." xml:space="preserve" approved="no">
         <source>Allow sending direct messages to members.</source>
+        <target state="translated">회원에게 직접 메시지를 보낼 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow sending disappearing messages." xml:space="preserve" approved="no">
         <source>Allow sending disappearing messages.</source>
+        <target state="translated">사라지는 메시지를 보내는 것을 허용합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow to send voice messages." xml:space="preserve" approved="no">
         <source>Allow to send voice messages.</source>
+        <target state="translated">음성 메세지를 보낼 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
+      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve" approved="no">
         <source>Allow voice messages only if your contact allows them.</source>
+        <target state="translated">연락처가 음성 메세지를 허용하는 경우에만 음성 메세지를 허용합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages?" xml:space="preserve">
+      <trans-unit id="Allow voice messages?" xml:space="preserve" approved="no">
         <source>Allow voice messages?</source>
+        <target state="translated">음성 메세지를 허용 하겠습니까?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow your contacts to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send disappearing messages.</source>
+        <target state="translated">연락처가 사라지는 메시지를 보낼 수 있도록 허용합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send voice messages.</source>
+        <target state="translated">연락처가 음성 메시지를 보낼 수 있도록 허용합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connected?" xml:space="preserve">
+      <trans-unit id="Already connected?" xml:space="preserve" approved="no">
         <source>Already connected?</source>
+        <target state="translated">이미 연결되었나요?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Always use relay" xml:space="preserve">
+      <trans-unit id="Always use relay" xml:space="preserve" approved="no">
         <source>Always use relay</source>
+        <target state="translated">항상 릴레이 사용</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Answer call" xml:space="preserve">
+      <trans-unit id="Answer call" xml:space="preserve" approved="no">
         <source>Answer call</source>
+        <target state="translated">응답 전화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App build: %@" xml:space="preserve">
+      <trans-unit id="App build: %@" xml:space="preserve" approved="no">
         <source>App build: %@</source>
+        <target state="translated">앱 빌드: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App icon" xml:space="preserve">
+      <trans-unit id="App icon" xml:space="preserve" approved="no">
         <source>App icon</source>
+        <target state="translated">앱 아이콘</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version" xml:space="preserve">
+      <trans-unit id="App version" xml:space="preserve" approved="no">
         <source>App version</source>
+        <target state="translated">앱 버전</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version: v%@" xml:space="preserve">
+      <trans-unit id="App version: v%@" xml:space="preserve" approved="no">
         <source>App version: v%@</source>
+        <target state="translated">앱 버전: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Appearance" xml:space="preserve">
+      <trans-unit id="Appearance" xml:space="preserve" approved="no">
         <source>Appearance</source>
+        <target state="translated">출석</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Attach" xml:space="preserve">
+      <trans-unit id="Attach" xml:space="preserve" approved="no">
         <source>Attach</source>
+        <target state="translated">첨부</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio &amp; video calls" xml:space="preserve">
+      <trans-unit id="Audio &amp; video calls" xml:space="preserve" approved="no">
         <source>Audio &amp; video calls</source>
+        <target state="translated">음성 &amp; 영상 통화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio and video calls" xml:space="preserve">
+      <trans-unit id="Audio and video calls" xml:space="preserve" approved="no">
         <source>Audio and video calls</source>
+        <target state="translated">음성 및 영상 통화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication failed" xml:space="preserve">
+      <trans-unit id="Authentication failed" xml:space="preserve" approved="no">
         <source>Authentication failed</source>
+        <target state="translated">인증 실패</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve">
+      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve" approved="no">
         <source>Authentication is required before the call is connected, but you may miss calls.</source>
+        <target state="translated">통화가 연결되기 전에 인증이 필요하지만, 통화를 놓칠 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication unavailable" xml:space="preserve">
+      <trans-unit id="Authentication unavailable" xml:space="preserve" approved="no">
         <source>Authentication unavailable</source>
+        <target state="translated">인증 사용 불가</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Auto-accept contact requests" xml:space="preserve">
+      <trans-unit id="Auto-accept contact requests" xml:space="preserve" approved="no">
         <source>Auto-accept contact requests</source>
+        <target state="translated">연락처 요청 자동 수락</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Auto-accept images" xml:space="preserve">
+      <trans-unit id="Auto-accept images" xml:space="preserve" approved="no">
         <source>Auto-accept images</source>
+        <target state="translated">이미지 자동 수락</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Automatically" xml:space="preserve">
         <source>Automatically</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Back" xml:space="preserve">
+      <trans-unit id="Back" xml:space="preserve" approved="no">
         <source>Back</source>
+        <target state="translated">뒤로가기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
         <source>Both you and your contact can irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Both you and your contact can send disappearing messages." xml:space="preserve">
+      <trans-unit id="Both you and your contact can send disappearing messages." xml:space="preserve" approved="no">
         <source>Both you and your contact can send disappearing messages.</source>
+        <target state="translated">당신과 당신의 연락처 모두 사라지는 메시지를 보낼 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
+      <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve" approved="no">
         <source>Both you and your contact can send voice messages.</source>
+        <target state="translated">당신과 당신의 연락처 모두 음성 메시지를 보낼 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
+      <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve" approved="no">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
+        <target state="translated">채팅 프로필(기본값) 또는 [연결](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Call already ended!" xml:space="preserve">
+      <trans-unit id="Call already ended!" xml:space="preserve" approved="no">
         <source>Call already ended!</source>
+        <target state="translated">통화가 이미 종료되었습니다!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Calls" xml:space="preserve">
+      <trans-unit id="Calls" xml:space="preserve" approved="no">
         <source>Calls</source>
+        <target state="translated">통화</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't delete user profile!" xml:space="preserve">
@@ -487,8 +583,9 @@
         <target state="translated">주소를 초대할 수 없습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't invite contacts!" xml:space="preserve">
+      <trans-unit id="Can't invite contacts!" xml:space="preserve" approved="no">
         <source>Can't invite contacts!</source>
+        <target state="translated">연락처를 초대할 수 없습니다!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve" approved="no">
@@ -511,8 +608,9 @@
         <target state="translated">변경</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Change database passphrase?" xml:space="preserve">
+      <trans-unit id="Change database passphrase?" xml:space="preserve" approved="no">
         <source>Change database passphrase?</source>
+        <target state="translated">데이터베이스 암호 변경?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Change member role?" xml:space="preserve" approved="no">
@@ -540,16 +638,19 @@
         <target state="translated">채팅 기록 보관함</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat console" xml:space="preserve">
+      <trans-unit id="Chat console" xml:space="preserve" approved="no">
         <source>Chat console</source>
+        <target state="translated">채팅 콘솔</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat database" xml:space="preserve">
+      <trans-unit id="Chat database" xml:space="preserve" approved="no">
         <source>Chat database</source>
+        <target state="translated">채팅 데이터베이스</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat database deleted" xml:space="preserve">
+      <trans-unit id="Chat database deleted" xml:space="preserve" approved="no">
         <source>Chat database deleted</source>
+        <target state="translated">채팅 데이터베이스 삭제</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve" approved="no">
@@ -557,80 +658,98 @@
         <target state="translated">채팅 데이터베이스를 가져옴</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat is running" xml:space="preserve">
+      <trans-unit id="Chat is running" xml:space="preserve" approved="no">
         <source>Chat is running</source>
+        <target state="translated">채팅이 실행 중입니다</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat is stopped" xml:space="preserve">
+      <trans-unit id="Chat is stopped" xml:space="preserve" approved="no">
         <source>Chat is stopped</source>
+        <target state="translated">채팅이 중단되었습니다</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chat preferences" xml:space="preserve">
+      <trans-unit id="Chat preferences" xml:space="preserve" approved="no">
         <source>Chat preferences</source>
+        <target state="translated">채팅 환경설정</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chats" xml:space="preserve">
+      <trans-unit id="Chats" xml:space="preserve" approved="no">
         <source>Chats</source>
+        <target state="translated">채팅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Check server address and try again." xml:space="preserve">
+      <trans-unit id="Check server address and try again." xml:space="preserve" approved="no">
         <source>Check server address and try again.</source>
+        <target state="translated">서버 주소를 확인한 후 다시 시도합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Chinese and Spanish interface" xml:space="preserve">
+      <trans-unit id="Chinese and Spanish interface" xml:space="preserve" approved="no">
         <source>Chinese and Spanish interface</source>
+        <target state="translated">중국어 및 스페인어 환경</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Choose file" xml:space="preserve">
+      <trans-unit id="Choose file" xml:space="preserve" approved="no">
         <source>Choose file</source>
+        <target state="translated">파일 선택</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Choose from library" xml:space="preserve">
+      <trans-unit id="Choose from library" xml:space="preserve" approved="no">
         <source>Choose from library</source>
+        <target state="translated">라이브러리에서 선택</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear" xml:space="preserve">
+      <trans-unit id="Clear" xml:space="preserve" approved="no">
         <source>Clear</source>
+        <target state="translated">정리</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear conversation" xml:space="preserve">
+      <trans-unit id="Clear conversation" xml:space="preserve" approved="no">
         <source>Clear conversation</source>
+        <target state="translated">대화 삭제</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear conversation?" xml:space="preserve">
+      <trans-unit id="Clear conversation?" xml:space="preserve" approved="no">
         <source>Clear conversation?</source>
+        <target state="translated">대화 삭제?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Clear verification" xml:space="preserve">
+      <trans-unit id="Clear verification" xml:space="preserve" approved="no">
         <source>Clear verification</source>
+        <target state="translated">인증 삭제</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Colors" xml:space="preserve">
         <source>Colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Compare security codes with your contacts." xml:space="preserve">
+      <trans-unit id="Compare security codes with your contacts." xml:space="preserve" approved="no">
         <source>Compare security codes with your contacts.</source>
+        <target state="translated">보안 코드를 연락처와 비교합니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Configure ICE servers" xml:space="preserve">
+      <trans-unit id="Configure ICE servers" xml:space="preserve" approved="no">
         <source>Configure ICE servers</source>
+        <target state="translated">ICE 서버 구성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Confirm" xml:space="preserve">
+      <trans-unit id="Confirm" xml:space="preserve" approved="no">
         <source>Confirm</source>
+        <target state="translated">확인</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Confirm new passphrase…" xml:space="preserve">
+      <trans-unit id="Confirm new passphrase…" xml:space="preserve" approved="no">
         <source>Confirm new passphrase…</source>
+        <target state="translated">새 암호 확인…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Confirm password" xml:space="preserve">
+      <trans-unit id="Confirm password" xml:space="preserve" approved="no">
         <source>Confirm password</source>
+        <target state="translated">비밀번호 확인</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect" xml:space="preserve">
+      <trans-unit id="Connect" xml:space="preserve" approved="no">
         <source>Connect</source>
+        <target state="translated">연결</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Connect via contact link?" xml:space="preserve">
@@ -641,8 +760,9 @@
         <source>Connect via group link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect via link" xml:space="preserve">
+      <trans-unit id="Connect via link" xml:space="preserve" approved="no">
         <source>Connect via link</source>
+        <target state="translated">링크를 통해 연결</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via link / QR code" xml:space="preserve">
@@ -653,174 +773,210 @@
         <source>Connect via one-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting server…" xml:space="preserve">
+      <trans-unit id="Connecting server…" xml:space="preserve" approved="no">
         <source>Connecting to server…</source>
+        <target state="translated">서버에 연결중…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connecting server… (error: %@)" xml:space="preserve">
+      <trans-unit id="Connecting server… (error: %@)" xml:space="preserve" approved="no">
         <source>Connecting to server… (error: %@)</source>
+        <target state="translated">서버에 연결중...(오류: %@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection" xml:space="preserve">
+      <trans-unit id="Connection" xml:space="preserve" approved="no">
         <source>Connection</source>
+        <target state="translated">연결</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection error" xml:space="preserve">
+      <trans-unit id="Connection error" xml:space="preserve" approved="no">
         <source>Connection error</source>
+        <target state="translated">연결 오류</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection error (AUTH)" xml:space="preserve">
+      <trans-unit id="Connection error (AUTH)" xml:space="preserve" approved="no">
         <source>Connection error (AUTH)</source>
+        <target state="translated">연결 에러 (인증)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection request" xml:space="preserve">
         <source>Connection request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection request sent!" xml:space="preserve">
+      <trans-unit id="Connection request sent!" xml:space="preserve" approved="no">
         <source>Connection request sent!</source>
+        <target state="translated">연결 요청이 전송되었습니다!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connection timeout" xml:space="preserve">
+      <trans-unit id="Connection timeout" xml:space="preserve" approved="no">
         <source>Connection timeout</source>
+        <target state="translated">연결 시간초과</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact allows" xml:space="preserve">
+      <trans-unit id="Contact allows" xml:space="preserve" approved="no">
         <source>Contact allows</source>
+        <target state="translated">연락 가능</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact already exists" xml:space="preserve">
+      <trans-unit id="Contact already exists" xml:space="preserve" approved="no">
         <source>Contact already exists</source>
+        <target state="translated">연결이 이미 존재</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact and all messages will be deleted - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact hidden:" xml:space="preserve">
+      <trans-unit id="Contact hidden:" xml:space="preserve" approved="no">
         <source>Contact hidden:</source>
+        <target state="translated">숨겨진 연락처:</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="Contact is connected" xml:space="preserve">
+      <trans-unit id="Contact is connected" xml:space="preserve" approved="no">
         <source>Contact is connected</source>
+        <target state="translated">연락처가 연결되었습니다</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Contact is not connected yet!" xml:space="preserve">
         <source>Contact is not connected yet!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact name" xml:space="preserve">
+      <trans-unit id="Contact name" xml:space="preserve" approved="no">
         <source>Contact name</source>
+        <target state="translated">연락처 이름</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact preferences" xml:space="preserve">
+      <trans-unit id="Contact preferences" xml:space="preserve" approved="no">
         <source>Contact preferences</source>
+        <target state="translated">연락처 선호도</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact requests" xml:space="preserve">
         <source>Contact requests</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
+      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve" approved="no">
         <source>Contacts can mark messages for deletion; you will be able to view them.</source>
+        <target state="translated">연락처는 메세지를 삭제하도록 표시할 수 있으며, 이를 확인할 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Copy" xml:space="preserve">
+      <trans-unit id="Copy" xml:space="preserve" approved="no">
         <source>Copy</source>
+        <target state="translated">복사</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Core built at: %@" xml:space="preserve">
         <source>Core built at: %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Core version: v%@" xml:space="preserve">
+      <trans-unit id="Core version: v%@" xml:space="preserve" approved="no">
         <source>Core version: v%@</source>
+        <target state="translated">코어 버전: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create" xml:space="preserve">
+      <trans-unit id="Create" xml:space="preserve" approved="no">
         <source>Create</source>
+        <target state="translated">생성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create address" xml:space="preserve">
         <source>Create address</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create group link" xml:space="preserve">
+      <trans-unit id="Create group link" xml:space="preserve" approved="no">
         <source>Create group link</source>
+        <target state="translated">그룹 링크 생성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create link" xml:space="preserve">
+      <trans-unit id="Create link" xml:space="preserve" approved="no">
         <source>Create link</source>
+        <target state="translated">링크 생성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create one-time invitation link" xml:space="preserve">
         <source>Create one-time invitation link</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create queue" xml:space="preserve">
+      <trans-unit id="Create queue" xml:space="preserve" approved="no">
         <source>Create queue</source>
+        <target state="translated">큐 생성</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Create secret group" xml:space="preserve">
+      <trans-unit id="Create secret group" xml:space="preserve" approved="no">
         <source>Create secret group</source>
+        <target state="translated">비밀 그룹 생성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create your profile" xml:space="preserve">
+      <trans-unit id="Create your profile" xml:space="preserve" approved="no">
         <source>Create your profile</source>
+        <target state="translated">프로필 생성</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created on %@" xml:space="preserve">
         <source>Created on %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Current passphrase…" xml:space="preserve">
+      <trans-unit id="Current passphrase…" xml:space="preserve" approved="no">
         <source>Current passphrase…</source>
+        <target state="translated">현재 암호…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
+      <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve" approved="no">
         <source>Currently maximum supported file size is %@.</source>
+        <target state="translated">현재 지원되는 최대 파일 크기는 %@입니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Dark" xml:space="preserve">
+      <trans-unit id="Dark" xml:space="preserve" approved="no">
         <source>Dark</source>
+        <target state="translated">다크</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database ID" xml:space="preserve">
+      <trans-unit id="Database ID" xml:space="preserve" approved="no">
         <source>Database ID</source>
+        <target state="translated">데이터베이스 아이디</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encrypted!" xml:space="preserve">
+      <trans-unit id="Database encrypted!" xml:space="preserve" approved="no">
         <source>Database encrypted!</source>
+        <target state="translated">데이터베이스 암호화됨!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encryption passphrase will be updated and stored in the keychain.&#10;" xml:space="preserve">
+      <trans-unit id="Database encryption passphrase will be updated and stored in the keychain.&#10;" xml:space="preserve" approved="no">
         <source>Database encryption passphrase will be updated and stored in the keychain.
 </source>
+        <target state="translated">데이터베이스 암호화 키가 키체인에 저장됩니다.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database encryption passphrase will be updated.&#10;" xml:space="preserve">
+      <trans-unit id="Database encryption passphrase will be updated.&#10;" xml:space="preserve" approved="no">
         <source>Database encryption passphrase will be updated.
 </source>
+        <target state="translated">데이터베이스 암호화 키가 업데이트됩니다.
+</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database error" xml:space="preserve">
+      <trans-unit id="Database error" xml:space="preserve" approved="no">
         <source>Database error</source>
+        <target state="translated">데이터베이스 오류</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database is encrypted using a random passphrase, you can change it." xml:space="preserve">
+      <trans-unit id="Database is encrypted using a random passphrase, you can change it." xml:space="preserve" approved="no">
         <source>Database is encrypted using a random passphrase, you can change it.</source>
+        <target state="translated">데이터베이스는 임의의 암호를 사용하여 암호화되므로 변경할 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database is encrypted using a random passphrase. Please change it before exporting." xml:space="preserve">
+      <trans-unit id="Database is encrypted using a random passphrase. Please change it before exporting." xml:space="preserve" approved="no">
         <source>Database is encrypted using a random passphrase. Please change it before exporting.</source>
+        <target state="translated">데이터베이스는 임의의 암호를 사용하여 암호화됩니다. 내보내기 전에 변경하십시오.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase" xml:space="preserve">
+      <trans-unit id="Database passphrase" xml:space="preserve" approved="no">
         <source>Database passphrase</source>
+        <target state="translated">데이터베이스 암호화 키</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Database passphrase &amp; export" xml:space="preserve">
+      <trans-unit id="Database passphrase &amp; export" xml:space="preserve" approved="no">
         <source>Database passphrase &amp; export</source>
+        <target state="translated">데이터베이스 암호화 키 &amp; 내보내기</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
@@ -2009,8 +2165,9 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>Open user profiles</source>
         <note>authentication reason</note>
       </trans-unit>
-      <trans-unit id="Anybody can host servers." xml:space="preserve">
+      <trans-unit id="Anybody can host servers." xml:space="preserve" approved="no">
         <source>Anybody can host servers.</source>
+        <target state="translated">누구나 서버를 호스팅할 수 있습니다.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
@@ -2710,8 +2867,8 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -3784,6 +3941,1186 @@ SimpleX servers cannot see your profile.</source>
         <target state="translated">새로운 멤버에게 최대 100개의 마지막 메시지 보내기.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## 기록</target>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## 에 대한 답변</target>
+      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">%@ 다운로드됨</target>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="translated"># %@</target>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ 그리고 %@</target>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%2$@의 %1$@:</target>
+      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ 연결됨</target>
+      </trans-unit>
+      <trans-unit id="%@ (current):" xml:space="preserve" approved="no">
+        <source>%@ (current):</source>
+        <target state="translated">%@ (현재):</target>
+      </trans-unit>
+      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
+        <source>%@ (current)</source>
+        <target state="translated">%@ (현재)</target>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ 및 %@이(가) 연결되었습니다</target>
+      </trans-unit>
+      <trans-unit id="%@ server" xml:space="preserve" approved="no">
+        <source>%@ server</source>
+        <target state="translated">%@서버</target>
+      </trans-unit>
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
+        <source>%@ servers</source>
+        <target state="translated">%@서버들</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ 과 %lld 멤버들</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) are still being downloaded.</source>
+        <target state="translated">%d 개의 파일 다운로드중.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve" approved="no">
+        <source>%d file(s) were deleted.</source>
+        <target state="translated">%d개의 파일이 삭제됨.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) were not downloaded.</source>
+        <target state="translated">%d개의 파일이 다운로드 되지 않음.</target>
+      </trans-unit>
+      <trans-unit id="%d weeks" xml:space="preserve" approved="no">
+        <source>%d weeks</source>
+        <target state="translated">%d 주</target>
+      </trans-unit>
+      <trans-unit id="%lld seconds" xml:space="preserve" approved="no">
+        <source>%lld seconds</source>
+        <target state="translated">%lld 초</target>
+      </trans-unit>
+      <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve" approved="no">
+        <source>**Create 1-time link**: to create and share a new invitation link.</source>
+        <target state="translated">**1회 링크 생성** : 새 초대 링크를 생성하고 공유합니다.</target>
+      </trans-unit>
+      <trans-unit id="1-time link" xml:space="preserve" approved="no">
+        <source>1-time link</source>
+        <target state="translated">일회성 링크</target>
+      </trans-unit>
+      <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve" approved="no">
+        <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target state="translated">일회용 링크는 *한 번의 연락처로만* 사용할 수 있으며, 대면 또는 메신저를 통해 공유할 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">몇 가지 더</target>
+      </trans-unit>
+      <trans-unit id="Accept conditions" xml:space="preserve" approved="no">
+        <source>Accept conditions</source>
+        <target state="translated">조건 수락</target>
+      </trans-unit>
+      <trans-unit id="Accepted conditions" xml:space="preserve" approved="no">
+        <source>Accepted conditions</source>
+        <target state="translated">수락된 조건</target>
+      </trans-unit>
+      <trans-unit id="Active connections" xml:space="preserve" approved="no">
+        <source>Active connections</source>
+        <target state="translated">연결 활성화</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@업로드됨</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">연결 요청을 수락하시겠습니까?</target>
+      </trans-unit>
+      <trans-unit id="%lld minutes" xml:space="preserve" approved="no">
+        <source>%lld minutes</source>
+        <target state="translated">%lld 분</target>
+      </trans-unit>
+      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve" approved="no">
+        <source>**Warning**: the archive will be removed.</source>
+        <target state="translated">**경고**: 보관물이 제거됩니다.</target>
+      </trans-unit>
+      <trans-unit id="5 minutes" xml:space="preserve" approved="no">
+        <source>5 minutes</source>
+        <target state="translated">5 분</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">주소 변경 중단</target>
+      </trans-unit>
+      <trans-unit id="Acknowledgement errors" xml:space="preserve" approved="no">
+        <source>Acknowledgement errors</source>
+        <target state="translated">확인 오류</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">중단</target>
+      </trans-unit>
+      <trans-unit id="%u messages failed to decrypt." xml:space="preserve" approved="no">
+        <source>%u messages failed to decrypt.</source>
+        <target state="translated">%u개의 메세지를 번역하는데 실패함.</target>
+      </trans-unit>
+      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
+        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
+        <target state="translated">연락처가 다른 사람과 공유할 수 있도록 프로필에 주소를 추가합니다. 프로필 업데이트가 연락처로 전송됩니다.</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
+        <source>%lld messages blocked by admin</source>
+        <target state="translated">관리자에 의해 차단된 %lld개의 메세지</target>
+      </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" approved="no">
+        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
+        <target state="translated">**참고**: 두 장치에서 동일한 데이터베이스를 사용하면 보안 보호를 위해 연결에서 메세지를 해독할 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
+        <source>**Create group**: to create a new group.</source>
+        <target state="translated">**그룹 생성** : 새로운 그룹을 생성합니다.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve" approved="no">
+        <source>%d file(s) failed to download.</source>
+        <target state="translated">%d개의 파일을 다운로드하는데 실패함.</target>
+      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve" approved="no">
+        <source>%d messages not forwarded</source>
+        <target state="translated">%d개의 메세지가 전달되지 않음</target>
+      </trans-unit>
+      <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target state="translated">**스캔/붙여넣기 링크**: 받은 링크를 통해 연결합니다.</target>
+      </trans-unit>
+      <trans-unit id="About operators" xml:space="preserve" approved="no">
+        <source>About operators</source>
+        <target state="translated">연산자 정보</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">주소 변경이 중단됩니다. 이전 수신 주소가 사용됩니다.</target>
+      </trans-unit>
+      <trans-unit id="%@:" xml:space="preserve" approved="no">
+        <source>%@:</source>
+        <target state="translated">%@:</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">%lld개의 메세지가 차단됨</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">삭제된 메세지 %lld 개</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- 보다 안정적인 메세지 전달.
+- 조금 더 나은 그룹.
+- 그리고 더!</target>
+      </trans-unit>
+      <trans-unit id="0s" xml:space="preserve" approved="no">
+        <source>0s</source>
+        <target state="translated">0초</target>
+      </trans-unit>
+      <trans-unit id="1 minute" xml:space="preserve" approved="no">
+        <source>1 minute</source>
+        <target state="translated">1분</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">주소 변경을 중단하시겠습니까?</target>
+      </trans-unit>
+      <trans-unit id="30 seconds" xml:space="preserve" approved="no">
+        <source>30 seconds</source>
+        <target state="translated">30초</target>
+      </trans-unit>
+      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve" approved="no">
+        <source>- voice messages up to 5 minutes.
+- custom time to disappear.
+- editing history.</source>
+        <target state="translated">- 음성 메세지 최대 5분.
+- 사라지는 맞춤형 시간.
+- 편집 기록.</target>
+      </trans-unit>
+      <trans-unit id="Add friends" xml:space="preserve" approved="no">
+        <source>Add friends</source>
+        <target state="translated">친구 추가</target>
+      </trans-unit>
+      <trans-unit id="Add team members" xml:space="preserve" approved="no">
+        <source>Add team members</source>
+        <target state="translated">팀원 추가하기</target>
+      </trans-unit>
+      <trans-unit id="Add your team members to the conversations." xml:space="preserve" approved="no">
+        <source>Add your team members to the conversations.</source>
+        <target state="translated">대화에 팀원을 추가하세요.</target>
+      </trans-unit>
+      <trans-unit id="%u messages skipped." xml:space="preserve" approved="no">
+        <source>%u messages skipped.</source>
+        <target state="translated">메세지 %u개를 건너뜀.</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ 그리고 %lld 다른 멤버들이 연결됨</target>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
+        <source>%lld messages moderated by %@</source>
+        <target state="translated">%@ 에 의해 중재된 %lld 개의 메세지</target>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld개의 새로운 인터페이스 언어</target>
+      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
+        <source>%1$@, %2$@</source>
+        <target state="translated">%1$@, %2$@</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- 선택적으로 삭제된 연락처를 통지합니다.
+- 공백이 있는 프로필 이름.
+- 그리고 더!</target>
+      </trans-unit>
+      <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve" approved="no">
+        <source>&lt;p&gt;Hi!&lt;/p&gt;
+&lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
+        <target state="translated">&lt;p&gt;안녕하세요!/p&gt;
+&lt;p&gt;&lt;a href="%@"&gt;SimpleX 채팅을 통해 저에게 연결하세요 &lt;/a&gt;&lt;/p&gt;</target>
+      </trans-unit>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
+        <source>A new random profile will be shared.</source>
+        <target state="translated">새로운 랜덤 프로필이 공유될 것입니다.</target>
+      </trans-unit>
+      <trans-unit id="Acknowledged" xml:space="preserve" approved="no">
+        <source>Acknowledged</source>
+        <target state="translated">인정된</target>
+      </trans-unit>
+      <trans-unit id="Additional accent 2" xml:space="preserve" approved="no">
+        <source>Additional accent 2</source>
+        <target state="translated">추가 악센트2</target>
+      </trans-unit>
+      <trans-unit id="Added media &amp; file servers" xml:space="preserve" approved="no">
+        <source>Added media &amp; file servers</source>
+        <target state="translated">미디어 및 파일 서버 추가</target>
+      </trans-unit>
+      <trans-unit id="Added message servers" xml:space="preserve" approved="no">
+        <source>Added message servers</source>
+        <target state="translated">추가된 메세지 서버</target>
+      </trans-unit>
+      <trans-unit id="Additional accent" xml:space="preserve" approved="no">
+        <source>Additional accent</source>
+        <target state="translated">추가 악센트</target>
+      </trans-unit>
+      <trans-unit id="Additional secondary" xml:space="preserve" approved="no">
+        <source>Additional secondary</source>
+        <target state="translated">추가적 보조</target>
+      </trans-unit>
+      <trans-unit id="Address" xml:space="preserve" approved="no">
+        <source>Address</source>
+        <target state="translated">주소</target>
+      </trans-unit>
+      <trans-unit id="Address or 1-time link?" xml:space="preserve" approved="no">
+        <source>Address or 1-time link?</source>
+        <target state="translated">주소 또는 일회성 링크?</target>
+      </trans-unit>
+      <trans-unit id="Address settings" xml:space="preserve" approved="no">
+        <source>Address settings</source>
+        <target state="translated">주소 세팅</target>
+      </trans-unit>
+      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
+        <source>Admins can block a member for all.</source>
+        <target state="translated">관리자는 모두를 위해 회원을 차단할 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
+        <source>%lld group events</source>
+        <target state="translated">%lld개의 그룹 이벤트</target>
+      </trans-unit>
+      <trans-unit id="All app data is deleted." xml:space="preserve" approved="no">
+        <source>All app data is deleted.</source>
+        <target state="translated">모든 앱 데이터가 삭제됩니다.</target>
+      </trans-unit>
+      <trans-unit id="All data is erased when it is entered." xml:space="preserve" approved="no">
+        <source>All data is erased when it is entered.</source>
+        <target state="translated">입력하면 모든 데이터가 삭제됩니다.</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 초</target>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">(이 장치 v%@)</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(새로운)</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">고급 설정</target>
+      </trans-unit>
+      <trans-unit id="All data is kept private on your device." xml:space="preserve" approved="no">
+        <source>All data is kept private on your device.</source>
+        <target state="translated">모든 데이터는 기기에서 비공개로 유지됩니다.</target>
+      </trans-unit>
+      <trans-unit id="All profiles" xml:space="preserve" approved="no">
+        <source>All profiles</source>
+        <target state="translated">전체 프로필</target>
+      </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" approved="no">
+        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target state="translated">모든 연락처, 대화 및 파일은 안전하게 암호화되어 구성된 XFTP 릴레이에 청크로 업로드됩니다.</target>
+      </trans-unit>
+      <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve" approved="no">
+        <source>Allow calls only if your contact allows them.</source>
+        <target state="translated">허용된 연락처만 통화가 가능합니다.</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">통화 허용?</target>
+      </trans-unit>
+      <trans-unit id="Allow downgrade" xml:space="preserve" approved="no">
+        <source>Allow downgrade</source>
+        <target state="translated">강등 허용</target>
+      </trans-unit>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target state="translated">연락처가 허용하는 경우에만 수정 불가능한 메세지 삭제를 허용합니다. (24시간)</target>
+      </trans-unit>
+      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
+        <source>Allow to send files and media.</source>
+        <target state="translated">파일과 미디어를 전송할 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">보관된 데이터베이스</target>
+      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve" approved="no">
+        <source>Better calls</source>
+        <target state="translated">더 나은 통화</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">차단</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for enabled operators after 30 days.</source>
+        <target state="translated">30일 후에 활성화된 운영자에 대한 조건이 수락될 것입니다.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted on: %@.</source>
+        <target state="translated">조건은 다음과 같습니다: %@.</target>
+      </trans-unit>
+      <trans-unit id="Connect via one-time link" xml:space="preserve" approved="no">
+        <source>Connect via one-time link</source>
+        <target state="translated">일회성 링크를 통해 연결</target>
+      </trans-unit>
+      <trans-unit id="Connected desktop" xml:space="preserve" approved="no">
+        <source>Connected desktop</source>
+        <target state="translated">데스크톱과 연결됨</target>
+      </trans-unit>
+      <trans-unit id="Connected servers" xml:space="preserve" approved="no">
+        <source>Connected servers</source>
+        <target state="translated">연결된 서버</target>
+      </trans-unit>
+      <trans-unit id="Connection security" xml:space="preserve" approved="no">
+        <source>Connection security</source>
+        <target state="translated">연결 보안</target>
+      </trans-unit>
+      <trans-unit id="Connection terminated" xml:space="preserve" approved="no">
+        <source>Connection terminated</source>
+        <target state="translated">종료된 연결</target>
+      </trans-unit>
+      <trans-unit id="Connection with desktop stopped" xml:space="preserve" approved="no">
+        <source>Connection with desktop stopped</source>
+        <target state="translated">데스크톱과의 연결이 중지됨</target>
+      </trans-unit>
+      <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve" approved="no">
+        <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
+        <target state="translated">현재 조건 텍스트를 로드할 수 없습니다. 이 링크를 통해 조건을 검토할 수 있습니다:</target>
+      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
+        <source>Bad desktop address</source>
+        <target state="translated">잘못된 데스크톱 주소</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">카메라가 사용 불가능합니다</target>
+      </trans-unit>
+      <trans-unit id="Custom time" xml:space="preserve" approved="no">
+        <source>Custom time</source>
+        <target state="translated">사용자 지정 시간</target>
+      </trans-unit>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">보낸 메시지를 되돌릴 수 없도록 삭제합니다. (24시간)</target>
+      </trans-unit>
+      <trans-unit id="Allow message reactions." xml:space="preserve" approved="no">
+        <source>Allow message reactions.</source>
+        <target state="translated">메세지 응답 허용.</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve" approved="no">
+        <source>Allow your contacts adding message reactions.</source>
+        <target state="translated">연락처가 메세지 응답을 추가하도록 허용합니다.</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">이미 연결 중입니다!</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">그룹에 참가하는 중입니다!</target>
+      </trans-unit>
+      <trans-unit id="Archive and upload" xml:space="preserve" approved="no">
+        <source>Archive and upload</source>
+        <target state="translated">기록 및 업로드</target>
+      </trans-unit>
+      <trans-unit id="Chat colors" xml:space="preserve" approved="no">
+        <source>Chat colors</source>
+        <target state="translated">채팅 색깔</target>
+      </trans-unit>
+      <trans-unit id="Chat list" xml:space="preserve" approved="no">
+        <source>Chat list</source>
+        <target state="translated">채팅 목록</target>
+      </trans-unit>
+      <trans-unit id="Completed" xml:space="preserve" approved="no">
+        <source>Completed</source>
+        <target state="translated">완료됨</target>
+      </trans-unit>
+      <trans-unit id="Copy error" xml:space="preserve" approved="no">
+        <source>Copy error</source>
+        <target state="translated">복사 오류</target>
+      </trans-unit>
+      <trans-unit id="Create SimpleX address" xml:space="preserve" approved="no">
+        <source>Create SimpleX address</source>
+        <target state="translated">SimpleX 주소 생성</target>
+      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve" approved="no">
+        <source>Creating link…</source>
+        <target state="translated">생성 링크…</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">관리자에 의해 차단됨</target>
+      </trans-unit>
+      <trans-unit id="Connect to desktop" xml:space="preserve" approved="no">
+        <source>Connect to desktop</source>
+        <target state="translated">데스크톱에 연결</target>
+      </trans-unit>
+      <trans-unit id="Created at" xml:space="preserve" approved="no">
+        <source>Created at</source>
+        <target state="translated">에 생성됨</target>
+      </trans-unit>
+      <trans-unit id="Created at: %@" xml:space="preserve" approved="no">
+        <source>Created at: %@</source>
+        <target state="translated">생성 위치: %@</target>
+      </trans-unit>
+      <trans-unit id="Change self-destruct passcode" xml:space="preserve" approved="no">
+        <source>Change self-destruct passcode</source>
+        <target state="translated">자기-파괴 비밀번호 변경</target>
+      </trans-unit>
+      <trans-unit id="Create file" xml:space="preserve" approved="no">
+        <source>Create file</source>
+        <target state="translated">파일 생성</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">연락처가 보낸 메세지를 되돌릴 수 없도록 삭제할 수 있도록 허용합니다. (24시간)</target>
+      </trans-unit>
+      <trans-unit id="App data migration" xml:space="preserve" approved="no">
+        <source>App data migration</source>
+        <target state="translated">앱 데이터 이동</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">적용 대상</target>
+      </trans-unit>
+      <trans-unit id="Block for all" xml:space="preserve" approved="no">
+        <source>Block for all</source>
+        <target state="translated">모두를 위한 차단</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve" approved="no">
+        <source>Both you and your contact can add message reactions.</source>
+        <target state="translated">당신과 당신의 연락처 모두 메세지 반응을 추가할 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="Calls prohibited!" xml:space="preserve" approved="no">
+        <source>Calls prohibited!</source>
+        <target state="translated">통화 금지!</target>
+      </trans-unit>
+      <trans-unit id="Change self-destruct mode" xml:space="preserve" approved="no">
+        <source>Change self-destruct mode</source>
+        <target state="translated">자기-파괴 모드 변경</target>
+      </trans-unit>
+      <trans-unit id="Contacts" xml:space="preserve" approved="no">
+        <source>Contacts</source>
+        <target state="translated">연락처</target>
+      </trans-unit>
+      <trans-unit id="Create group" xml:space="preserve" approved="no">
+        <source>Create group</source>
+        <target state="translated">그룹 생성</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can make calls." xml:space="preserve" approved="no">
+        <source>Both you and your contact can make calls.</source>
+        <target state="translated">당신과 당신의 연락처 모두 전화를 걸 수 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="App passcode" xml:space="preserve" approved="no">
+        <source>App passcode</source>
+        <target state="translated">앱 비밀번호</target>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
+        <target state="translated">당신의 모든 연락은 연결되어 있습니다. 프로필 업데이트가 모든 연락으로 전송됩니다.</target>
+      </trans-unit>
+      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve" approved="no">
+        <source>App encrypts new local files (except videos).</source>
+        <target state="translated">앱은 새로운 로컬 파일을 암호화합니다 (동영상 제외).</target>
+      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve" approved="no">
+        <source>Chat preferences were changed.</source>
+        <target state="translated">채팅 환경설정이 변경되었습니다.</target>
+      </trans-unit>
+      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve" approved="no">
+        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
+        <target state="translated">[데스크톱 앱]에 새로운 프로필 생성(https://simplex.chat/downloads/).💻</target>
+      </trans-unit>
+      <trans-unit id="Contact is deleted." xml:space="preserve" approved="no">
+        <source>Contact is deleted.</source>
+        <target state="translated">연락처가 삭제되었습니다.</target>
+      </trans-unit>
+      <trans-unit id="Continue" xml:space="preserve" approved="no">
+        <source>Continue</source>
+        <target state="translated">계속</target>
+      </trans-unit>
+      <trans-unit id="Current Passcode" xml:space="preserve" approved="no">
+        <source>Current Passcode</source>
+        <target state="translated">현재 비밀번호</target>
+      </trans-unit>
+      <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve" approved="no">
+        <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
+        <target state="translated">제공된 이름으로 빈 채팅 프로필이 생성되고 앱이 정상적으로 열립니다.</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to call you." xml:space="preserve" approved="no">
+        <source>Allow your contacts to call you.</source>
+        <target state="translated">연락처가 전화할 수 있도록 허용합니다.</target>
+      </trans-unit>
+      <trans-unit id="Allow sharing" xml:space="preserve" approved="no">
+        <source>Allow sharing</source>
+        <target state="translated">공유 허용</target>
+      </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve" approved="no">
+        <source>Always use private routing.</source>
+        <target state="translated">항상 개인 경로를 사용합니다.</target>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve" approved="no">
+        <source>Better user experience</source>
+        <target state="translated">더 나은 사용자 경험</target>
+      </trans-unit>
+      <trans-unit id="Change lock mode" xml:space="preserve" approved="no">
+        <source>Change lock mode</source>
+        <target state="translated">잠금 모드 변경</target>
+      </trans-unit>
+      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve" approved="no">
+        <source>Allow message reactions only if your contact allows them.</source>
+        <target state="translated">연락처가 메세지 응답을 허용하는 경우에만 메세지 응답을 허용합니다.</target>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve" approved="no">
+        <source>Better security ✅</source>
+        <target state="translated">더 나은 안전✅</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">당신과 당신의 연락처 모두 보낸 메세지를 되돌릴 수 없습니다. (24시간)</target>
+      </trans-unit>
+      <trans-unit id="Confirm contact deletion?" xml:space="preserve" approved="no">
+        <source>Confirm contact deletion?</source>
+        <target state="translated">연락처 삭제를 확인하시겠습니까?</target>
+      </trans-unit>
+      <trans-unit id="Can't call contact" xml:space="preserve" approved="no">
+        <source>Can't call contact</source>
+        <target state="translated">연락처에 전화할 수 없습니다</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
+        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target state="translated">불가리아어, 핀란드어, 태국어, 우크라이나어 - 사용자 여러분과 [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)에 감사드립니다!</target>
+      </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve" approved="no">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <target state="translated">용량 초과 - 수신자가 이전에 보낸 메세지를 받지 못했습니다.</target>
+      </trans-unit>
+      <trans-unit id="Chat" xml:space="preserve" approved="no">
+        <source>Chat</source>
+        <target state="translated">채팅</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own one-time link!</source>
+        <target state="translated">자신에게 연결할까요?
+이것은 당신만의 일회성 링크입니다!</target>
+      </trans-unit>
+      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve" approved="no">
+        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
+        <target state="translated">새 기기에서 _다른 기기에서 이동_을 선택하고 QR 코드를 스캔합니다.</target>
+      </trans-unit>
+      <trans-unit id="Connecting to desktop" xml:space="preserve" approved="no">
+        <source>Connecting to desktop</source>
+        <target state="translated">데스크톱에 연결중</target>
+      </trans-unit>
+      <trans-unit id="Connect with %@" xml:space="preserve" approved="no">
+        <source>Connect with %@</source>
+        <target state="translated">%@와 연결</target>
+      </trans-unit>
+      <trans-unit id="Archived contacts" xml:space="preserve" approved="no">
+        <source>Archived contacts</source>
+        <target state="translated">보관된 연락처</target>
+      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve" approved="no">
+        <source>Better message dates.</source>
+        <target state="translated">더 나은 메세지 날짜.</target>
+      </trans-unit>
+      <trans-unit id="Better networking" xml:space="preserve" approved="no">
+        <source>Better networking</source>
+        <target state="translated">더 나은 네트워킹</target>
+      </trans-unit>
+      <trans-unit id="Check messages when allowed." xml:space="preserve" approved="no">
+        <source>Check messages when allowed.</source>
+        <target state="translated">허용될 때 메시지를 확인합니다.</target>
+      </trans-unit>
+      <trans-unit id="Compare file" xml:space="preserve" approved="no">
+        <source>Compare file</source>
+        <target state="translated">파일 비교</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve" approved="no">
+        <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
+        <target state="translated">다음 조건은 활성화된 운영자에 대해 자동으로 수락됩니다: %@.</target>
+      </trans-unit>
+      <trans-unit id="Confirm upload" xml:space="preserve" approved="no">
+        <source>Confirm upload</source>
+        <target state="translated">업로드 확인</target>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve" approved="no">
+        <source>Connect incognito</source>
+        <target state="translated">비밀 연결</target>
+      </trans-unit>
+      <trans-unit id="Connect to your friends faster." xml:space="preserve" approved="no">
+        <source>Connect to your friends faster.</source>
+        <target state="translated">친구들과 더 빨리 연결하세요.</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?" xml:space="preserve" approved="no">
+        <source>Connect to yourself?</source>
+        <target state="translated">자신과 연결할까요?</target>
+      </trans-unit>
+      <trans-unit id="Created" xml:space="preserve" approved="no">
+        <source>Created</source>
+        <target state="translated">생성됨</target>
+      </trans-unit>
+      <trans-unit id="Creating archive link" xml:space="preserve" approved="no">
+        <source>Creating archive link</source>
+        <target state="translated">기록 링크 생성하기</target>
+      </trans-unit>
+      <trans-unit id="Auto-accept" xml:space="preserve" approved="no">
+        <source>Auto-accept</source>
+        <target state="translated">자동 수락</target>
+      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve" approved="no">
+        <source>All new messages from %@ will be hidden!</source>
+        <target state="translated">%@로부터의 모든 새 메세지가 숨겨집니다!</target>
+      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve" approved="no">
+        <source>Auto-accept settings</source>
+        <target state="translated">자동-수락 설정</target>
+      </trans-unit>
+      <trans-unit id="Archive contacts to chat later." xml:space="preserve" approved="no">
+        <source>Archive contacts to chat later.</source>
+        <target state="translated">나중에 채팅할 연락처를 보관합니다.</target>
+      </trans-unit>
+      <trans-unit id="Background" xml:space="preserve" approved="no">
+        <source>Background</source>
+        <target state="translated">배경</target>
+      </trans-unit>
+      <trans-unit id="Bad message hash" xml:space="preserve" approved="no">
+        <source>Bad message hash</source>
+        <target state="translated">잘못된 메세지 hash</target>
+      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve" approved="no">
+        <source>Better groups</source>
+        <target state="translated">더 나은 그룹</target>
+      </trans-unit>
+      <trans-unit id="Better messages" xml:space="preserve" approved="no">
+        <source>Better messages</source>
+        <target state="translated">더 나은 메세지</target>
+      </trans-unit>
+      <trans-unit id="Chunks downloaded" xml:space="preserve" approved="no">
+        <source>Chunks downloaded</source>
+        <target state="translated">다운로드된 청크</target>
+      </trans-unit>
+      <trans-unit id="Chunks deleted" xml:space="preserve" approved="no">
+        <source>Chunks deleted</source>
+        <target state="translated">삭제된 청크</target>
+      </trans-unit>
+      <trans-unit id="Chunks uploaded" xml:space="preserve" approved="no">
+        <source>Chunks uploaded</source>
+        <target state="translated">업로드 된 청크</target>
+      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve" approved="no">
+        <source>Corner</source>
+        <target state="translated">코너</target>
+      </trans-unit>
+      <trans-unit id="Correct name to %@?" xml:space="preserve" approved="no">
+        <source>Correct name to %@?</source>
+        <target state="translated">%@의 정확한 이름은?</target>
+      </trans-unit>
+      <trans-unit id="Create a group using a random profile." xml:space="preserve" approved="no">
+        <source>Create a group using a random profile.</source>
+        <target state="translated">랜덤 프로필을 사용하여 그룹을 만듭니다.</target>
+      </trans-unit>
+      <trans-unit id="Authentication cancelled" xml:space="preserve" approved="no">
+        <source>Authentication cancelled</source>
+        <target state="translated">인증 취소</target>
+      </trans-unit>
+      <trans-unit id="Confirm Passcode" xml:space="preserve" approved="no">
+        <source>Confirm Passcode</source>
+        <target state="translated">비밀번호 확인</target>
+      </trans-unit>
+      <trans-unit id="Confirm database upgrades" xml:space="preserve" approved="no">
+        <source>Confirm database upgrades</source>
+        <target state="translated">데이터베이스 업그레이드 확인</target>
+      </trans-unit>
+      <trans-unit id="Blur media" xml:space="preserve" approved="no">
+        <source>Blur media</source>
+        <target state="translated">가려진 미디어</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">그룹 구성원 차단</target>
+      </trans-unit>
+      <trans-unit id="Connected" xml:space="preserve" approved="no">
+        <source>Connected</source>
+        <target state="translated">연결됨</target>
+      </trans-unit>
+      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>All messages will be deleted - this cannot be undone!</source>
+        <target state="translated">모든 메세지가 삭제됩니다 - 수정할 수 없습니다!</target>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected.</source>
+        <target state="translated">당신의 모든 연락은 계속 연결되어 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">SinpleX 링크 전송 허용.</target>
+      </trans-unit>
+      <trans-unit id="Bad message ID" xml:space="preserve" approved="no">
+        <source>Bad message ID</source>
+        <target state="translated">잘못된 메세지 ID</target>
+      </trans-unit>
+      <trans-unit id="Black" xml:space="preserve" approved="no">
+        <source>Black</source>
+        <target state="translated">블랙</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">차단 구성원</target>
+      </trans-unit>
+      <trans-unit id="Connected to desktop" xml:space="preserve" approved="no">
+        <source>Connected to desktop</source>
+        <target state="translated">데스크톱과 연결됨</target>
+      </trans-unit>
+      <trans-unit id="App passcode is replaced with self-destruct passcode." xml:space="preserve" approved="no">
+        <source>App passcode is replaced with self-destruct passcode.</source>
+        <target state="translated">앱 비밀번호는 자체-파괴 비밀번호로 대체됩니다.</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">적용</target>
+      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve" approved="no">
+        <source>Better notifications</source>
+        <target state="translated">더 나은 공지</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">차단 멤버?</target>
+      </trans-unit>
+      <trans-unit id="Blur for better privacy." xml:space="preserve" approved="no">
+        <source>Blur for better privacy.</source>
+        <target state="translated">더 나은 개인정보를 위해 흐림.</target>
+      </trans-unit>
+      <trans-unit id="Business address" xml:space="preserve" approved="no">
+        <source>Business address</source>
+        <target state="translated">사업체 주소</target>
+      </trans-unit>
+      <trans-unit id="Business chats" xml:space="preserve" approved="no">
+        <source>Business chats</source>
+        <target state="translated">비즈니스 채팅</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">회원에게 전화할 수 없습니다</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">멤버에게 메세지를 보낼 수 없습니다</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">이동 취소</target>
+      </trans-unit>
+      <trans-unit id="Change chat profiles" xml:space="preserve" approved="no">
+        <source>Change chat profiles</source>
+        <target state="translated">채팅 프로필 변경</target>
+      </trans-unit>
+      <trans-unit id="Chat already exists" xml:space="preserve" approved="no">
+        <source>Chat already exists</source>
+        <target state="translated">채팅이 이미 존재합니다</target>
+      </trans-unit>
+      <trans-unit id="Chat already exists!" xml:space="preserve" approved="no">
+        <source>Chat already exists!</source>
+        <target state="translated">채팅이 이미 존재합니다!</target>
+      </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve" approved="no">
+        <source>Chat database exported</source>
+        <target state="translated">채팅 데이터베이스 내보내기</target>
+      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve" approved="no">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <target state="translated">채팅이 중지되었습니다. 이미 다른 장치에서 이 데이터베이스를 사용하고 있다면 채팅을 시작하기 전에 다시 전송해야 합니다.</target>
+      </trans-unit>
+      <trans-unit id="Chat migrated!" xml:space="preserve" approved="no">
+        <source>Chat migrated!</source>
+        <target state="translated">채팅 이동!</target>
+      </trans-unit>
+      <trans-unit id="Chat theme" xml:space="preserve" approved="no">
+        <source>Chat theme</source>
+        <target state="translated">채팅 테마</target>
+      </trans-unit>
+      <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target state="translated">채팅은 모든 회원에게 삭제됩니다 - 이는 되돌릴 수 없습니다!</target>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve" approved="no">
+        <source>Chat profile</source>
+        <target state="translated">채팅 프로필</target>
+      </trans-unit>
+      <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target state="translated">채팅은 삭제됩니다 - 되돌릴 수 없습니다!</target>
+      </trans-unit>
+      <trans-unit id="Check messages every 20 min." xml:space="preserve" approved="no">
+        <source>Check messages every 20 min.</source>
+        <target state="translated">20분마다 메시지를 확인합니다.</target>
+      </trans-unit>
+      <trans-unit id="Color chats with the new themes." xml:space="preserve" approved="no">
+        <source>Color chats with the new themes.</source>
+        <target state="translated">새로운 테마로 채팅을 색칠하세요.</target>
+      </trans-unit>
+      <trans-unit id="Color mode" xml:space="preserve" approved="no">
+        <source>Color mode</source>
+        <target state="translated">색깔 모드</target>
+      </trans-unit>
+      <trans-unit id="Clear private notes?" xml:space="preserve" approved="no">
+        <source>Clear private notes?</source>
+        <target state="translated">개인 메모를 지우시겠습니까?</target>
+      </trans-unit>
+      <trans-unit id="Conditions accepted on: %@." xml:space="preserve" approved="no">
+        <source>Conditions accepted on: %@.</source>
+        <target state="translated">조건이 수락됨: %@.</target>
+      </trans-unit>
+      <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target state="translated">운영자의 조건이 허용됩니다: **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions of use" xml:space="preserve" approved="no">
+        <source>Conditions of use</source>
+        <target state="translated">이용 조건</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target state="translated">운영자 조건이 수락됩니다: **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions will be accepted for the operator(s): **%@**.</source>
+        <target state="translated">운영자 조건이 수락됩니다.: **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve" approved="no">
+        <source>Confirm that you remember database passphrase to migrate it.</source>
+        <target state="translated">이동하는데에 필요한 데이터베이스 비밀번호를 기억하는지 확인합니다.</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own SimpleX address!</source>
+        <target state="translated">자신과 연결할까요?
+이것은 당신의 SimpleX 주소입니다!</target>
+      </trans-unit>
+      <trans-unit id="Connect via contact address" xml:space="preserve" approved="no">
+        <source>Connect via contact address</source>
+        <target state="translated">연락처 주소로 연결</target>
+      </trans-unit>
+      <trans-unit id="Connecting" xml:space="preserve" approved="no">
+        <source>Connecting</source>
+        <target state="translated">연결중</target>
+      </trans-unit>
+      <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve" approved="no">
+        <source>Connecting to contact, please wait or check later!</source>
+        <target state="translated">연락처에 연결 중이니 기다려 주시거나 나중에 확인해 주세요!</target>
+      </trans-unit>
+      <trans-unit id="Connection and servers status." xml:space="preserve" approved="no">
+        <source>Connection and servers status.</source>
+        <target state="translated">연결 및 서버 상태.</target>
+      </trans-unit>
+      <trans-unit id="Connection notifications" xml:space="preserve" approved="no">
+        <source>Connection notifications</source>
+        <target state="translated">연결 공지</target>
+      </trans-unit>
+      <trans-unit id="Connections" xml:space="preserve" approved="no">
+        <source>Connections</source>
+        <target state="translated">연결</target>
+      </trans-unit>
+      <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Contact will be deleted - this cannot be undone!</source>
+        <target state="translated">연락처가 삭제됩니다 - 취소할 수 없습니다!</target>
+      </trans-unit>
+      <trans-unit id="Conversation deleted!" xml:space="preserve" approved="no">
+        <source>Conversation deleted!</source>
+        <target state="translated">대화가 삭제되었습니다!</target>
+      </trans-unit>
+      <trans-unit id="Create 1-time link" xml:space="preserve" approved="no">
+        <source>Create 1-time link</source>
+        <target state="translated">일회성 링크 생성</target>
+      </trans-unit>
+      <trans-unit id="Create profile" xml:space="preserve" approved="no">
+        <source>Create profile</source>
+        <target state="translated">프로필 생성</target>
+      </trans-unit>
+      <trans-unit id="Audio/video calls" xml:space="preserve" approved="no">
+        <source>Audio/video calls</source>
+        <target state="translated">음성/영상 통화</target>
+      </trans-unit>
+      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve" approved="no">
+        <source>Audio/video calls are prohibited.</source>
+        <target state="translated">음성/영상 통화는 금지되어 있습니다.</target>
+      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve" approved="no">
+        <source>App session</source>
+        <target state="translated">앱 세션</target>
+      </trans-unit>
+      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
+        <source>Block member for all?</source>
+        <target state="translated">모두를 위한 차단 멤버?</target>
+      </trans-unit>
+      <trans-unit id="Cannot forward message" xml:space="preserve" approved="no">
+        <source>Cannot forward message</source>
+        <target state="translated">메세지를 전달할 수 없습니다</target>
+      </trans-unit>
+      <trans-unit id="Confirm network settings" xml:space="preserve" approved="no">
+        <source>Confirm network settings</source>
+        <target state="translated">네트워크 설정 확인</target>
+      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve" approved="no">
+        <source>Connect automatically</source>
+        <target state="translated">자동으로 연결</target>
+      </trans-unit>
+      <trans-unit id="Confirm files from unknown servers." xml:space="preserve" approved="no">
+        <source>Confirm files from unknown servers.</source>
+        <target state="translated">알 수 없는 서버에서 파일을 확인합니다.</target>
+      </trans-unit>
+      <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve" approved="no">
+        <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target state="translated">이 운영자들에 대한 조건은 이미 받아들여지고 있습니다: **%@**.</target>
+      </trans-unit>
+      <trans-unit id="Contact deleted!" xml:space="preserve" approved="no">
+        <source>Contact deleted!</source>
+        <target state="translated">연락처 삭제!</target>
+      </trans-unit>
+      <trans-unit id="Current profile" xml:space="preserve" approved="no">
+        <source>Current profile</source>
+        <target state="translated">현재 프로필</target>
+      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve" approved="no">
+        <source>Customizable message shape.</source>
+        <target state="translated">사용자 지정 가능한 메세지 형태.</target>
+      </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve" approved="no">
+        <source>%d seconds(s)</source>
+        <target state="translated">%d 초</target>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve" approved="no">
+        <source>1 year</source>
+        <target state="translated">1년</target>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve" approved="no">
+        <source>Add list</source>
+        <target state="translated">리스트 추가</target>
+      </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve" approved="no">
+        <source>Add to list</source>
+        <target state="translated">리스트에 추가</target>
+      </trans-unit>
+      <trans-unit id="All" xml:space="preserve" approved="no">
+        <source>All</source>
+        <target state="translated">모두</target>
+      </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve" approved="no">
+        <source>Allow to report messsages to moderators.</source>
+        <target state="translated">메시지를 신고하는것을 허용합니다.</target>
+      </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve" approved="no">
+        <source>Another reason</source>
+        <target state="translated">다른 이유</target>
+      </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve" approved="no">
+        <source>App group:</source>
+        <target state="translated">앱 그룹:</target>
+      </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve" approved="no">
+        <source>Archive</source>
+        <target state="translated">아카이브</target>
+      </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve" approved="no">
+        <source>Archive report</source>
+        <target state="translated">신고 아카이브</target>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve" approved="no">
+        <source>Archive report?</source>
+        <target state="translated">신고를 아카이브할까요?</target>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve" approved="no">
+        <source>Archive reports</source>
+        <target state="translated">신고 아카이브</target>
+      </trans-unit>
+      <trans-unit id="Ask" xml:space="preserve" approved="no">
+        <source>Ask</source>
+        <target state="translated">묻기</target>
+      </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve" approved="no">
+        <source>Clear group?</source>
+        <target state="translated">그룹을 비울까요?</target>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve" approved="no">
+        <source>Clear or delete group?</source>
+        <target state="translated">그룹을 비우거나 삭제할까요?</target>
+      </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve" approved="no">
+        <source>Community guidelines violation</source>
+        <target state="translated">커뮤니티 지침 위반</target>
+      </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve" approved="no">
+        <source>Connection blocked</source>
+        <target state="translated">연결 차단됨</target>
+      </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve" approved="no">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target state="translated">서버 관리자에 의해 연결이 차단되었습니다:
+%@</target>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve" approved="no">
+        <source>Connection not ready.</source>
+        <target state="translated">연결 준비되지 않음.</target>
+      </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve" approved="no">
+        <source>Connection requires encryption renegotiation.</source>
+        <target state="translated">연결에는 암호화 재협상이 필요합니다.</target>
+      </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve" approved="no">
+        <source>Content violates conditions of use</source>
+        <target state="translated">내용은 사용 규정을 위반합니다</target>
+      </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve" approved="no">
+        <source>Create list</source>
+        <target state="translated">리스트 추가</target>
+      </trans-unit>
+      <trans-unit id="Database ID: %d" xml:space="preserve" approved="no">
+        <source>Database ID: %d</source>
+        <target state="translated">데이터베이스 아이디: %d</target>
+      </trans-unit>
+      <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve" approved="no">
+        <source>Database IDs and Transport isolation option.</source>
+        <target state="translated">데이터베이스 ID 및 전송 격리 옵션.</target>
+      </trans-unit>
+      <trans-unit id="Database downgrade" xml:space="preserve" approved="no">
+        <source>Database downgrade</source>
+        <target state="translated">데이터베이스 다운그레이드</target>
+      </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve" approved="no">
+        <source>Better groups performance</source>
+        <target state="translated">더 나은 그룹 성능</target>
+      </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve" approved="no">
+        <source>Confirmed</source>
+        <target state="translated">확인함</target>
+      </trans-unit>
+      <trans-unit id="Active" xml:space="preserve" approved="no">
+        <source>Active</source>
+        <target state="translated">활성화됨</target>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve" approved="no">
+        <source>Archive all reports?</source>
+        <target state="translated">모든 신고를 아카이브할까요?</target>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve" approved="no">
+        <source>Businesses</source>
+        <target state="translated">비즈니스</target>
+      </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve" approved="no">
+        <source>Better privacy and security</source>
+        <target state="translated">더 나은 프라이버시 및 보안</target>
+      </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve" approved="no">
+        <source>Change automatic message deletion?</source>
+        <target state="translated">자동 메시지 삭제를 변경할까요?</target>
+      </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve" approved="no">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target state="translated">모든 채팅은 %@ 리스트에서 제거되고 리스트는 삭제됩니다.</target>
+      </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve" approved="no">
+        <source>All reports will be archived for you.</source>
+        <target state="translated">모든 보고서는 사용자를 위해 보관됩니다.</target>
+      </trans-unit>
+      <trans-unit id="Accent" xml:space="preserve" approved="no">
+        <source>Accent</source>
+        <target state="translated">강조</target>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve" approved="no">
+        <source>Archive %lld reports?</source>
+        <target state="translated">%lld 신고를 아카이브할까요?</target>
+      </trans-unit>
+      <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve" approved="no">
+        <source>- connect to [directory service](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) (BETA)!
+- delivery receipts (up to 20 members).
+- faster and more stable.</source>
+        <target state="translated">- [경로 서비스](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) (BETA) 에 연결중!
+- 전달 확인 (최대 20 명의 멤버).
+- 더 빠르고 안정적입니다.</target>
+      </trans-unit>
+      <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve" approved="no">
+        <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target state="translated">모든 메시지와 파일은 **종간단 암호화 (E2EE)**되며, 개인 메시지는 양자 보안이 적용됩니다.</target>
+      </trans-unit>
+      <trans-unit id="Customize theme" xml:space="preserve" approved="no">
+        <source>Customize theme</source>
+        <target state="translated">테마 사용자 지정</target>
+      </trans-unit>
+      <trans-unit id="Dark mode colors" xml:space="preserve" approved="no">
+        <source>Dark mode colors</source>
+        <target state="translated">다크 모드 색상들</target>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ko" datatype="plaintext">
diff --git a/apps/ios/SimpleX Localizations/lt.xcloc/Localized Contents/lt.xliff b/apps/ios/SimpleX Localizations/lt.xcloc/Localized Contents/lt.xliff
index 54a713478f..0f795170c6 100644
--- a/apps/ios/SimpleX Localizations/lt.xcloc/Localized Contents/lt.xliff	
+++ b/apps/ios/SimpleX Localizations/lt.xcloc/Localized Contents/lt.xliff	
@@ -2631,8 +2631,8 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff
index ab3499a4dc..d0b430cf02 100644
--- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
+++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (kan gekopieerd worden)</target>
@@ -202,6 +190,11 @@
         <target>%d sec</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d seconden</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d overgeslagen bericht(en)</target>
@@ -272,11 +265,6 @@
         <target>%lld nieuwe interface-talen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld seconde(n)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld seconden</target>
@@ -327,11 +315,6 @@
         <target>%u berichten zijn overgeslagen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(nieuw)</target>
@@ -342,11 +325,6 @@
         <target>(dit apparaat v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Contact toevoegen**: om een nieuwe uitnodigingslink aan te maken, of verbinding te maken via een link die u heeft ontvangen.</target>
@@ -412,11 +390,6 @@
         <target>\*vetgedrukt*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - bewerkingsgeschiedenis.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sec</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 dag</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +455,19 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 maand</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 week</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 jaar</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 seconden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -591,8 +562,16 @@
         <source>Accept</source>
         <target>Accepteer</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -613,7 +592,11 @@
         <source>Accept incognito</source>
         <target>Accepteer incognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -630,6 +613,11 @@
         <target>Bevestigingsfouten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>actief</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Actieve verbindingen</target>
@@ -645,6 +633,11 @@
         <target>Vrienden toevoegen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Lijst toevoegen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Profiel toevoegen</target>
@@ -670,6 +663,11 @@
         <target>Toevoegen aan een ander apparaat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Toevoegen aan lijst</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Welkom bericht toevoegen</target>
@@ -745,6 +743,11 @@
         <target>Geavanceerde instellingen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>alle</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Alle app-gegevens worden verwijderd.</target>
@@ -755,6 +758,11 @@
         <target>Alle chats en berichten worden verwijderd, dit kan niet ongedaan worden gemaakt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Alle chats worden uit de lijst %@ verwijderd en de lijst wordt verwijderd.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Alle gegevens worden bij het invoeren gewist.</target>
@@ -795,6 +803,15 @@
         <target>Alle profielen</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Alle rapporten worden voor u gearchiveerd.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Al uw contacten blijven verbonden.</target>
@@ -870,6 +887,11 @@
         <target>Sta toe om verzonden berichten definitief te verwijderen. (24 uur)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Hiermee kunt u berichten rapporteren aan moderators.</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>
         <target>Sta toe dat SimpleX-links worden verzonden.</target>
@@ -950,6 +972,11 @@
         <target>Er wordt een leeg chatprofiel met de opgegeven naam gemaakt en de app wordt zoals gewoonlijk geopend.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Een andere reden</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Beantwoord oproep</target>
@@ -975,6 +1002,11 @@
         <target>App versleutelt nieuwe lokale bestanden (behalve video's).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>App-groep:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>App icon</target>
@@ -1020,6 +1052,21 @@
         <target>Toepassen op</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archief</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>%lld rapporten archiveren?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Alle rapporten archiveren?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archiveren en uploaden</target>
@@ -1030,6 +1077,21 @@
         <target>Archiveer contacten om later te chatten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Rapport archiveren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Rapport archiveren?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Rapporten archiveren</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Gearchiveerde contacten</target>
@@ -1140,6 +1202,11 @@
         <target>Betere groepen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Betere prestaties van groepen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Betere datums voor berichten.</target>
@@ -1160,6 +1227,11 @@
         <target>Betere meldingen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Betere privacy en veiligheid</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Betere beveiliging ✅</target>
@@ -1260,11 +1332,25 @@
         <target>Zakelijke chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>bedrijven</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Via chatprofiel (standaard) of [via verbinding](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>Door SimpleX Chat te gebruiken, gaat u ermee akkoord:
+- alleen legale content te versturen in openbare groepen.
+- andere gebruikers te respecteren – geen spam.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Oproep al beëindigd!</target>
@@ -1314,7 +1400,7 @@
         <source>Cancel</source>
         <target>Annuleren</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1351,6 +1437,11 @@
         <target>Veranderen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Automatisch verwijderen van berichten wijzigen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Gebruikersprofielen wijzigen</target>
@@ -1400,7 +1491,7 @@
         <source>Change self-destruct passcode</source>
         <target>Zelfvernietigings code wijzigen</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1502,11 +1593,23 @@
         <target>De chat wordt voor je verwijderd - dit kan niet ongedaan worden gemaakt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Controleer uw berichten elke 20 minuten.</target>
@@ -1572,6 +1675,16 @@
         <target>Gesprek wissen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Groep wissen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Groep wissen of verwijderen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Privénotities verwijderen?</target>
@@ -1592,6 +1705,11 @@
         <target>Kleur mode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Schending van de communityrichtlijnen</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Bestand vergelijken</target>
@@ -1627,16 +1745,6 @@
         <target>Gebruiksvoorwaarden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Voor ingeschakelde operators worden de voorwaarden na 30 dagen geaccepteerd.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Voorwaarden worden geaccepteerd voor operator(s): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Voorwaarden worden geaccepteerd voor de operator(s): **%@**.</target>
@@ -1657,6 +1765,11 @@
         <target>ICE servers configureren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Serveroperators configureren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Bevestigen</target>
@@ -1707,6 +1820,11 @@
         <target>Bevestig het uploaden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Bevestigd</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Verbind</target>
@@ -1826,6 +1944,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Verbindings- en serverstatus.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Verbinding geblokkeerd</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Verbindingsfout</target>
@@ -1836,6 +1959,18 @@ Dit is uw eigen eenmalige link!</target>
         <target>Verbindingsfout (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>Verbinding is geblokkeerd door serveroperator:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Verbinding nog niet klaar.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Verbindingsmeldingen</target>
@@ -1846,6 +1981,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Verbindingsverzoek verzonden!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>Verbinding vereist heronderhandeling over encryptie.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Beveiliging van de verbinding</target>
@@ -1926,6 +2066,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Contact personen kunnen berichten markeren voor verwijdering; u kunt ze wel bekijken.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Inhoud schendt de gebruiksvoorwaarden</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Doorgaan</target>
@@ -2001,6 +2146,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Maak link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Maak een lijst</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Maak een nieuw profiel aan in [desktop-app](https://simplex.chat/downloads/). 💻</target>
@@ -2218,8 +2368,7 @@ Dit is uw eigen eenmalige link!</target>
         <source>Delete</source>
         <target>Verwijderen</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2261,6 +2410,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Chat verwijderen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Verwijder chatberichten van uw apparaat.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Chatprofiel verwijderen</target>
@@ -2271,6 +2425,10 @@ Dit is uw eigen eenmalige link!</target>
         <target>Chatprofiel verwijderen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>Chat verwijderen?</target>
@@ -2351,6 +2509,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Link verwijderen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Lijst verwijderen?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Bericht van lid verwijderen?</target>
@@ -2364,7 +2527,7 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Verwijder berichten</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2401,6 +2564,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Wachtrij verwijderen</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Rapport verwijderen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Verwijder maximaal 20 berichten tegelijk.</target>
@@ -2561,6 +2729,16 @@ Dit is uw eigen eenmalige link!</target>
         <target>SimpleX Vergrendelen uitschakelen</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Automatisch verwijderen van berichten uitschakelen?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Berichten verwijderen uitschakelen</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Uitschakelen voor iedereen</target>
@@ -2651,6 +2829,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Gebruik geen inloggegevens met proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Documenten:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Maak geen adres aan</target>
@@ -2661,9 +2844,19 @@ Dit is uw eigen eenmalige link!</target>
         <target>Niet inschakelen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Mis geen belangrijke berichten.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Niet meer weergeven</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Klaar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2868,7 @@ Dit is uw eigen eenmalige link!</target>
         <source>Download</source>
         <target>Downloaden</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2752,9 +2945,9 @@ Dit is uw eigen eenmalige link!</target>
         <target>Inschakelen (overschrijvingen behouden)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Flux inschakelen</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Schakel Flux in bij Netwerk- en serverinstellingen voor betere privacy van metagegevens.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2770,7 +2963,7 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Automatisch verwijderen van berichten aanzetten?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2897,6 +3090,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Opnieuw onderhandelen over de codering is mislukt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Er wordt opnieuw onderhandeld over de encryptie.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Voer toegangscode in</target>
@@ -2972,6 +3170,10 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij het accepteren van een contactverzoek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Fout bij het toevoegen van leden</target>
@@ -3007,6 +3209,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij het overschakelen naar incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Fout bij het controleren van de tokenstatus</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Fout bij het verbinden met doorstuurserver %@. Probeer het later opnieuw.</target>
@@ -3027,6 +3234,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij maken van groep link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Fout bij het aanmaken van de lijst</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Fout bij aanmaken contact</target>
@@ -3042,6 +3254,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij aanmaken van profiel!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Fout bij het rapporteren</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Fout bij het ontsleutelen van bestand</target>
@@ -3052,6 +3269,10 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij het verwijderen van de chat database</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Fout bij verwijderen gesprek!</target>
@@ -3152,10 +3373,20 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij opnieuw verbinden van servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Fout bij registreren voor meldingen</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Fout bij verwijderen van lid</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Fout bij het opnieuw ordenen van lijsten</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3167,6 +3398,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij opslaan van ICE servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Fout bij het opslaan van chatlijst</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Fout bij opslaan van groep profiel</target>
@@ -3247,6 +3483,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij het synchroniseren van de verbinding</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Fout bij het testen van de serververbinding</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Fout bij bijwerken van groep link</target>
@@ -3290,7 +3531,9 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fout: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3570,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Uitklappen</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Verlopen</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Database exporteren</target>
@@ -3367,20 +3615,35 @@ Dit is uw eigen eenmalige link!</target>
         <target>Snel en niet wachten tot de afzender online is!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Sneller verwijderen van groepen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Snellere deelname en betrouwbaardere berichten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Sneller verzenden van berichten.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favoriet</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Favorieten</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Bestandsfout</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,6 +3652,13 @@ Dit is uw eigen eenmalige link!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Bestand is geblokkeerd door serveroperator:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Bestand niet gevonden - hoogstwaarschijnlijk is het bestand verwijderd of geannuleerd.</target>
@@ -3514,6 +3784,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Herstel wordt niet ondersteund door groepslid</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Voor alle moderators</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>Voor chatprofiel %@:</target>
@@ -3529,6 +3804,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Als uw contactpersoon bijvoorbeeld berichten ontvangt via een SimpleX Chat-server, worden deze door uw app via een Flux-server verzonden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>Voor mij</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>Voor privé-routering</target>
@@ -3653,6 +3933,11 @@ Fout: %2$@</target>
         <target>GIF's en stickers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Ontvang een melding als u vermeld wordt.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Goedemiddag!</target>
@@ -3758,11 +4043,21 @@ Fout: %2$@</target>
         <target>De groep wordt voor u verwijderd, dit kan niet ongedaan worden gemaakt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Groepen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Help</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Help beheerders bij het modereren van hun groepen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Verborgen</target>
@@ -3823,6 +4118,11 @@ Fout: %2$@</target>
         <target>Hoe het de privacy helpt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Hoe het werkt</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Hoe</target>
@@ -3965,6 +4265,16 @@ Binnenkort meer verbeteringen!</target>
         <target>Geluiden tijdens het bellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Ongepaste inhoud</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Ongepast profiel</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -4057,6 +4367,31 @@ Binnenkort meer verbeteringen!</target>
         <target>Interface kleuren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Ongeldig</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Ongeldig (ongeldig token)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Ongeldig (verlopen)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Ongeldig (niet geregistreerd)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Ongeldig (verkeerd onderwerp)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Ongeldige QR-code</target>
@@ -4185,7 +4520,7 @@ Binnenkort meer verbeteringen!</target>
       </trans-unit>
       <trans-unit id="Join" xml:space="preserve">
         <source>Join</source>
-        <target>Word lid van</target>
+        <target>Word lid</target>
         <note>swipe action</note>
       </trans-unit>
       <trans-unit id="Join group" xml:space="preserve">
@@ -4330,6 +4665,21 @@ Dit is jouw link voor groep %@!</target>
         <target>Gelinkte desktops</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Lijst</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>De naam en emoji van de lijst moeten voor alle lijsten verschillend zijn.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Naam van lijst...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Live bericht!</target>
@@ -4415,11 +4765,20 @@ Dit is jouw link voor groep %@!</target>
         <target>Lid</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Lid inactief</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Ledenrapporten</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>De rol van het lid wordt gewijzigd naar "%@". Alle chatleden worden op de hoogte gebracht.</target>
@@ -4445,6 +4804,10 @@ Dit is jouw link voor groep %@!</target>
         <target>Lid wordt uit de groep verwijderd, dit kan niet ongedaan worden gemaakt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Groepsleden kunnen bericht reacties toevoegen.</target>
@@ -4455,6 +4818,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Groepsleden kunnen verzonden berichten onherroepelijk verwijderen. (24 uur)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>Leden kunnen berichten melden bij moderators.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Groepsleden kunnen SimpleX-links verzenden.</target>
@@ -4480,6 +4848,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Groepsleden kunnen spraak berichten verzenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Vermeld leden 👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menu's</target>
@@ -4590,6 +4963,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Berichten van %@ worden getoond!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Berichten in deze chat zullen nooit worden verwijderd.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Berichten ontvangen</target>
@@ -4690,6 +5068,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Gemodereerd op: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Meer</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Meer verbeteringen volgen snel!</target>
@@ -4718,7 +5101,12 @@ Dit is jouw link voor groep %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Dempen</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Alles dempen</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4770,6 +5158,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Netwerk status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Nieuw</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Nieuwe toegangscode</target>
@@ -4835,6 +5228,10 @@ Dit is jouw link voor groep %@!</target>
         <target>Nieuwe leden rol</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>nieuw bericht</target>
@@ -4860,6 +5257,25 @@ Dit is jouw link voor groep %@!</target>
         <target>Geen app wachtwoord</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Geen chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Geen chats gevonden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Geen chats in lijst %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Geen contacten geselecteerd</target>
@@ -4910,6 +5326,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Geen media- en bestandsservers.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Geen bericht</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Geen berichtenservers.</target>
@@ -4965,6 +5386,16 @@ Dit is jouw link voor groep %@!</target>
         <target>Geen servers om bestanden te verzenden.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>Geen token!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Geen ongelezen chats</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Geen gebruikers-ID's.</target>
@@ -4975,6 +5406,11 @@ Dit is jouw link voor groep %@!</target>
         <target>Niet compatibel!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Notities</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Niets geselecteerd</target>
@@ -4995,11 +5431,21 @@ Dit is jouw link voor groep %@!</target>
         <target>Meldingen zijn uitgeschakeld!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Meldingsfout</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Privacy van meldingen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Meldingsstatus</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5022,7 +5468,8 @@ Dit is jouw link voor groep %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>OK</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5083,6 +5530,16 @@ Vereist het inschakelen van VPN.</target>
         <target>Alleen groep eigenaren kunnen spraak berichten inschakelen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Alleen de verzender en moderators zien het</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Alleen jij en moderators zien het</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Alleen jij kunt bericht reacties toevoegen.</target>
@@ -5136,7 +5593,7 @@ Vereist het inschakelen van VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Open</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5168,6 +5625,10 @@ Vereist het inschakelen van VPN.</target>
         <target>Open groep</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Open de migratie naar een ander apparaat</target>
@@ -5218,6 +5679,11 @@ Vereist het inschakelen van VPN.</target>
         <target>Of om privé te delen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Organiseer chats in lijsten</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Ander</target>
@@ -5409,6 +5875,25 @@ Fout: %@</target>
         <target>Bewaar het wachtwoord veilig, u kunt deze NIET wijzigen als u het kwijtraakt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Probeer meldingen uit en weer in te schakelen.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Wacht tot de tokenactivering voltooid is.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Wacht tot het token is geregistreerd.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Poolse interface</target>
@@ -5459,16 +5944,31 @@ Fout: %@</target>
         <target>Privacy voor uw klanten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Privacybeleid en gebruiksvoorwaarden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Privacy opnieuw gedefinieerd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Privéchats, groepen en uw contacten zijn niet toegankelijk voor serverbeheerders.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Privé bestandsnamen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Namen van persoonlijke mediabestanden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Routering van privéberichten</target>
@@ -5544,6 +6044,11 @@ Fout: %@</target>
         <target>Berichten reacties verbieden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Het melden van berichten aan moderators is niet toegestaan.</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>
         <target>Verbied het verzenden van SimpleX-links</target>
@@ -5801,11 +6306,26 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Verminderd batterijgebruik</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Register</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Meldingstoken registreren?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Geregistreerd</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Afwijzen</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5817,6 +6337,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Contactverzoek afwijzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Relay server wordt alleen gebruikt als dat nodig is. Een andere partij kan uw IP-adres zien.</target>
@@ -5902,6 +6426,60 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Antwoord</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>rapporteren</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Inhoud melden: alleen groepsmoderators kunnen dit zien.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Rapporteer ledenprofiel: alleen groepsmoderators kunnen dit zien.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Anders melden: alleen groepsmoderators kunnen het zien.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Reden melding?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Spam melden: alleen groepsmoderators kunnen het zien.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Rapporteer overtreding: alleen groepsmoderators kunnen dit zien.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>rapporteer: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>Het is niet toegestaan om berichten aan moderators te melden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Rapporten</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Vereist</target>
@@ -5992,10 +6570,13 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Voorwaarden bekijken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Later beoordelen</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6046,13 +6627,17 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <source>Save</source>
         <target>Opslaan</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Bewaar (en informeer contacten)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Opslaan en Contact melden</target>
@@ -6078,9 +6663,14 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Groep profiel opslaan</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Lijst opslaan</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
-        <target>Bewaar het wachtwoord en open je chats</target>
+        <target>Wachtwoord opslaan en open je chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save passphrase in Keychain" xml:space="preserve">
@@ -6318,6 +6908,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Meldingen verzenden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Rapporteer privé</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Stuur vragen en ideeën</target>
@@ -6533,6 +7128,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Stel 1 dag in</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Stel chatnaam in…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Contactnaam instellen…</target>
@@ -6553,6 +7153,15 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Stel het in in plaats van systeemverificatie.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Stel de berichtvervaldatum in chats in.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Toegangscode instellen</target>
@@ -6597,7 +7206,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <source>Share</source>
         <target>Deel</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6659,6 +7268,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Delen met contacten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Toon QR-code</target>
@@ -6759,6 +7372,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>SimpleX adres of eenmalige link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX contact adres</target>
@@ -6861,6 +7478,12 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Iemand</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Spam</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Vierkant, cirkel of iets daartussenin.</target>
@@ -6946,6 +7569,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Chat stoppen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Opslag</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Krachtig</target>
@@ -6953,7 +7581,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
         <source>Submit</source>
-        <target>Indienen</target>
+        <target>Bevestigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Subscribed" xml:space="preserve">
@@ -7006,6 +7634,11 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Timeout van TCP-verbinding</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>TCP-poort voor berichtenuitwisseling</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7074,13 +7707,18 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Tijdelijke bestandsfout</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test mislukt bij stap %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Testmeldingen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Server test</target>
@@ -7203,21 +7841,11 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
         <target>De oude database is niet verwijderd tijdens de migratie, deze kan worden verwijderd.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Het profiel wordt alleen gedeeld met uw contacten.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Dezelfde voorwaarden gelden voor operator **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Dezelfde voorwaarden gelden voor operator(s): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>De tweede vooraf ingestelde operator in de app!</target>
@@ -7283,6 +7911,11 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
         <target>Deze actie kan niet ongedaan worden gemaakt, de berichten die eerder zijn verzonden en ontvangen dan geselecteerd, worden verwijderd. Het kan enkele minuten duren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Deze actie kan niet ongedaan worden gemaakt. De berichten die eerder in deze chat zijn verzonden en ontvangen dan geselecteerd, worden verwijderd.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan definitief verloren.</target>
@@ -7300,7 +7933,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
         <source>This device name</source>
-        <target>Deze apparaatnaam</target>
+        <target>Naam van dit apparaat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
@@ -7328,11 +7961,20 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
         <target>Dit is uw eigen eenmalige link!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Deze link is gebruikt met een ander mobiel apparaat. Maak een nieuwe link op de desktop.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>Dit bericht is verwijderd of nog niet ontvangen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Deze instelling is van toepassing op berichten in je huidige chatprofiel **%@**.</target>
@@ -7445,6 +8087,11 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
         <target>Schakel incognito in tijdens het verbinden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Tokenstatus: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>De transparantie van de werkbalk</target>
@@ -7610,13 +8257,17 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Dempen opheffen</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Ongelezen</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Er worden maximaal 100 laatste berichten naar nieuwe leden verzonden.</target>
@@ -7642,6 +8293,11 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Instellingen actualiseren?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Bijgewerkte voorwaarden</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Door de instellingen bij te werken, wordt de client opnieuw verbonden met alle servers.</target>
@@ -7702,6 +8358,15 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>SimpleX Chat servers gebruiken?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Gebruik TCP-poort %@ als er geen poort is opgegeven.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Gebruik chat</target>
@@ -7767,6 +8432,10 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Gebruik servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>Gebruik de app tijdens het gesprek.</target>
@@ -7777,6 +8446,11 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Gebruik de app met één hand.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Gebruik een webpoort</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Gebruikersselectie</target>
@@ -7789,7 +8463,7 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
-        <target>SimpleX Chat servers gebruiken.</target>
+        <target>Gebruik SimpleX Chat servers.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify code with desktop" xml:space="preserve">
@@ -8149,11 +8823,6 @@ Deelnameverzoek herhalen?</target>
         <target>U kunt dit wijzigen in de instellingen onder uiterlijk.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>U kunt operators configureren in Netwerk- en serverinstellingen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>U kunt servers configureren via instellingen.</target>
@@ -8244,6 +8913,10 @@ Deelnameverzoek herhalen?</target>
         <target>U kunt de uitnodigingslink opnieuw bekijken in de verbindingsdetails.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Je kunt geen berichten versturen!</target>
@@ -8326,6 +8999,11 @@ Verbindingsverzoek herhalen?</target>
         <target>Je hebt een groep uitnodiging verzonden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>U zou meldingen moeten ontvangen.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Je wordt verbonden met de groep wanneer het apparaat van de groep host online is, even geduld a.u.b. of controleer het later!</target>
@@ -8391,11 +9069,6 @@ Verbindingsverzoek herhalen?</target>
         <target>Uw ICE servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Uw SMP servers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Uw SimpleX adres</target>
@@ -8481,6 +9154,11 @@ Verbindingsverzoek herhalen?</target>
         <target>Uw profiel **%@** wordt gedeeld.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Het profiel wordt alleen gedeeld met uw contacten.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten. SimpleX servers kunnen uw profiel niet zien.</target>
@@ -8491,11 +9169,6 @@ Verbindingsverzoek herhalen?</target>
         <target>Je profiel is gewijzigd. Als je het opslaat, wordt het bijgewerkte profiel naar al je contacten verzonden.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Je willekeurige profiel</target>
@@ -8546,6 +9219,10 @@ Verbindingsverzoek herhalen?</target>
         <target>hier boven, kies dan:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>geaccepteerde oproep</target>
@@ -8556,6 +9233,10 @@ Verbindingsverzoek herhalen?</target>
         <target>geaccepteerde uitnodiging</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>Beheerder</target>
@@ -8576,6 +9257,10 @@ Verbindingsverzoek herhalen?</target>
         <target>versleuteling overeenkomen…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>alle leden</target>
@@ -8591,6 +9276,11 @@ Verbindingsverzoek herhalen?</target>
         <target>en %lld andere gebeurtenissen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>gearchiveerd rapport</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>pogingen</target>
@@ -8623,13 +9313,14 @@ Verbindingsverzoek herhalen?</target>
       </trans-unit>
       <trans-unit id="blocked %@" xml:space="preserve">
         <source>blocked %@</source>
-        <target>geblokkeerd %@</target>
+        <target>blokkeerde %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>geblokkeerd door beheerder</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8656,6 +9347,10 @@ Verbindingsverzoek herhalen?</target>
         <target>bellen…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>geannuleerd %@</target>
@@ -8761,6 +9456,14 @@ Verbindingsverzoek herhalen?</target>
         <target>contactpersoon %1$@ gewijzigd in %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>contact heeft e2e-codering</target>
@@ -8771,6 +9474,10 @@ Verbindingsverzoek herhalen?</target>
         <target>contact heeft geen e2e versleuteling</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>creator</target>
@@ -8799,7 +9506,8 @@ Verbindingsverzoek herhalen?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>standaard (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8926,21 +9634,11 @@ Verbindingsverzoek herhalen?</target>
         <target>fout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>gebeurtenis gebeurd</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>verlopen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>voor betere privacy van metagegevens.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>doorgestuurd</target>
@@ -8951,6 +9649,10 @@ Verbindingsverzoek herhalen?</target>
         <target>groep verwijderd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>groep profiel bijgewerkt</target>
@@ -9076,6 +9778,10 @@ Verbindingsverzoek herhalen?</target>
         <target>is toegetreden</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>bericht</target>
@@ -9106,20 +9812,20 @@ Verbindingsverzoek herhalen?</target>
         <target>gemodereerd door %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>moderator</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>maanden</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>dempen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>nooit</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9141,6 +9847,10 @@ Verbindingsverzoek herhalen?</target>
         <target>geen tekst</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>Waarnemer</target>
@@ -9150,8 +9860,9 @@ Verbindingsverzoek herhalen?</target>
         <source>off</source>
         <target>uit</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9193,6 +9904,20 @@ Verbindingsverzoek herhalen?</target>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>In behandeling</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>in afwachting van goedkeuring</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>quantum bestendige e2e-codering</target>
@@ -9208,6 +9933,11 @@ Verbindingsverzoek herhalen?</target>
         <target>bevestiging ontvangen…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>afgewezen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>geweigerde oproep</target>
@@ -9228,6 +9958,10 @@ Verbindingsverzoek herhalen?</target>
         <target>contactadres verwijderd</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>profielfoto verwijderd</target>
@@ -9238,11 +9972,23 @@ Verbindingsverzoek herhalen?</target>
         <target>heeft je verwijderd</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
-        <target>gevraagd om verbinding te maken</target>
+        <target>verzocht om verbinding te maken</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>opgeslagen</target>
@@ -9299,7 +10045,7 @@ laatst ontvangen bericht: %2$@</target>
       </trans-unit>
       <trans-unit id="set new profile picture" xml:space="preserve">
         <source>set new profile picture</source>
-        <target>nieuwe profielfoto instellen</target>
+        <target>nieuwe profielfoto</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
@@ -9342,11 +10088,6 @@ laatst ontvangen bericht: %2$@</target>
         <target>onbekende status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>dempen opheffen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>onbeschermd</target>
@@ -9437,6 +10178,10 @@ laatst ontvangen bericht: %2$@</target>
         <target>jij</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>je bent uitgenodigd voor de groep</target>
@@ -9511,7 +10256,7 @@ laatst ontvangen bericht: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9548,7 +10293,7 @@ laatst ontvangen bericht: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9570,7 +10315,7 @@ laatst ontvangen bericht: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9578,6 +10323,10 @@ laatst ontvangen bericht: %2$@</target>
         <target>‐%d nieuwe gebeurtenissen</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>Van: %@</target>
@@ -9593,16 +10342,11 @@ laatst ontvangen bericht: %2$@</target>
         <target>Nieuwe berichten</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Nieuwe berichten in %d chats</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9624,7 +10368,7 @@ laatst ontvangen bericht: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="nl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/contents.json b/apps/ios/SimpleX Localizations/nl.xcloc/contents.json
index 4c631c367e..4b8d468de2 100644
--- a/apps/ios/SimpleX Localizations/nl.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/nl.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "nl",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff
index 8cfdf56f66..3255489efd 100644
--- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
+++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (można skopiować)</target>
@@ -114,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>%@ serwer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>%@ serwery/ów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -200,6 +190,11 @@
         <target>%d sek</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d sekundach</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d pominięte wiadomość(i)</target>
@@ -270,11 +265,6 @@
         <target>%lld nowe języki interfejsu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld sekund(y)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld sekund</target>
@@ -325,11 +315,6 @@
         <target>%u pominiętych wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(nowy)</target>
@@ -340,11 +325,6 @@
         <target>(to urządzenie v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Dodaj kontakt**: aby utworzyć nowy link z zaproszeniem lub połączyć się za pomocą otrzymanego linku.</target>
@@ -382,6 +362,7 @@
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
         <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target>**Zeskanuj / Wklej link**: aby połączyć się za pomocą otrzymanego linku.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -409,11 +390,6 @@
         <target>\*pogrubiony*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -450,11 +426,6 @@
 - historia edycji.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 sek</target>
@@ -468,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 dzień</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -483,19 +455,28 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 miesiąc</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 tydzień</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 roku</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>link jednorazowy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target>Link jednorazowy może być użyty *tylko z jednym kontaktem* - udostępnij go osobiście lub przez dowolny komunikator.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -513,11 +494,6 @@
         <target>30 sekund</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -574,6 +550,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>O operatorach</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -585,11 +562,20 @@
         <source>Accept</source>
         <target>Akceptuj</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
+        <target>Zaakceptuj warunki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
@@ -606,10 +592,15 @@
         <source>Accept incognito</source>
         <target>Akceptuj incognito</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
+        <target>Zaakceptowano warunki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
@@ -622,6 +613,11 @@
         <target>Błędy potwierdzenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Aktywne</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Aktywne połączenia</target>
@@ -634,6 +630,12 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>Dodaj znajomych</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Dodaj listę</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -653,6 +655,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>Dodaj członków zespołu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -660,6 +663,11 @@
         <target>Dodaj do innego urządzenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Dodaj do listy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Dodaj wiadomość powitalną</target>
@@ -667,14 +675,17 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>Dodaj członków zespołu do konwersacji.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>Dodano serwery multimediów i plików</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>Dodano serwery wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
@@ -704,10 +715,12 @@
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
+        <target>Adres czy jednorazowy link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
+        <target>Ustawienia adresu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -730,6 +743,11 @@
         <target>Zaawansowane ustawienia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Wszystko</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Wszystkie dane aplikacji są usunięte.</target>
@@ -740,6 +758,11 @@
         <target>Wszystkie czaty i wiadomości zostaną usunięte - nie można tego cofnąć!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Wszystkie rozmowy zostaną usunięte z listy %@, a lista usunięta.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Wszystkie dane są usuwane po jego wprowadzeniu.</target>
@@ -757,6 +780,7 @@
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
         <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target>Wszystkie wiadomości i pliki są wysyłane **z szyfrowaniem end-to-end**, z bezpieczeństwem postkwantowym w wiadomościach bezpośrednich.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
@@ -779,6 +803,15 @@
         <target>Wszystkie profile</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Wszystkie raporty zostaną dla Ciebie zarchiwizowane.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Wszystkie Twoje kontakty pozostaną połączone.</target>
@@ -854,6 +887,11 @@
         <target>Zezwól na nieodwracalne usunięcie wysłanych wiadomości. (24 godziny)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Zezwól na zgłaszanie wiadomości moderatorom.</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>
         <target>Zezwól na wysyłanie linków SimpleX.</target>
@@ -934,6 +972,11 @@
         <target>Tworzony jest pusty profil czatu o podanej nazwie, a aplikacja otwiera się jak zwykle.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Inny powód</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Odbierz połączenie</target>
@@ -959,6 +1002,11 @@
         <target>Aplikacja szyfruje nowe lokalne pliki (bez filmów).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>Grupa aplikacji:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Ikona aplikacji</target>
@@ -1004,6 +1052,21 @@
         <target>Zastosuj dla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Archiwizuj</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Archiwizować %lld reports?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Archiwizować wszystkie zgłoszenia?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Archiwizuj i prześlij</target>
@@ -1014,6 +1077,21 @@
         <target>Archiwizuj kontakty aby porozmawiać później.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Archiwizuj zgłoszenie</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Archiwizować zgłoszenie?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Archiwizuj zgłoszenia</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Zarchiwizowane kontakty</target>
@@ -1116,6 +1194,7 @@
       </trans-unit>
       <trans-unit id="Better calls" xml:space="preserve">
         <source>Better calls</source>
+        <target>Lepsze połączenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
@@ -1123,8 +1202,13 @@
         <target>Lepsze grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
+        <target>Lepsze daty wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
@@ -1139,14 +1223,21 @@
       </trans-unit>
       <trans-unit id="Better notifications" xml:space="preserve">
         <source>Better notifications</source>
+        <target>Lepsze powiadomienia</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
+        <target>Lepsze zabezpieczenia ✅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better user experience" xml:space="preserve">
         <source>Better user experience</source>
+        <target>Lepszy interfejs użytkownika</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -1231,10 +1322,17 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>Adres firmowy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>Czaty biznesowe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Firmy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1242,6 +1340,12 @@
         <target>Według profilu czatu (domyślnie) lub [według połączenia](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Połączenie już zakończone!</target>
@@ -1291,7 +1395,7 @@
         <source>Cancel</source>
         <target>Anuluj</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1328,8 +1432,13 @@
         <target>Zmień</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
+        <target>Zmień profil czatu</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
@@ -1376,18 +1485,21 @@
         <source>Change self-destruct passcode</source>
         <target>Zmień pin samozniszczenia</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
+        <target>Czat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists" xml:space="preserve">
         <source>Chat already exists</source>
+        <target>Czat już istnieje</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists!" xml:space="preserve">
         <source>Chat already exists!</source>
+        <target>Czat już istnieje!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat colors" xml:space="preserve">
@@ -1412,12 +1524,12 @@
       </trans-unit>
       <trans-unit id="Chat database exported" xml:space="preserve">
         <source>Chat database exported</source>
-        <target>Wyeksportowano bazę danych czatu</target>
+        <target>Wyeksportowano bazę danych czatów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
         <source>Chat database imported</source>
-        <target>Zaimportowano bazę danych czatu</target>
+        <target>Zaimportowano bazę danych czatów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat is running" xml:space="preserve">
@@ -1467,10 +1579,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target>Czat zostanie usunięty dla wszystkich członków – tej operacji nie można cofnąć!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target>Czat zostanie usunięty dla Ciebie – tej operacji nie można cofnąć!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1478,12 +1600,18 @@
         <target>Czaty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
+        <target>Sprawdzaj wiadomości co 20 min.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check messages when allowed." xml:space="preserve">
         <source>Check messages when allowed.</source>
+        <target>Sprawdź wiadomości, gdy będzie to dopuszczone.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check server address and try again." xml:space="preserve">
@@ -1541,6 +1669,14 @@
         <target>Wyczyścić rozmowę?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Wyczyścić prywatne notatki?</target>
@@ -1561,6 +1697,10 @@
         <target>Tryb koloru</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Porównaj plik</target>
@@ -1578,26 +1718,22 @@
       </trans-unit>
       <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
         <source>Conditions accepted on: %@.</source>
+        <target>Warunki zaakceptowane dnia: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target>Warunki zostały zaakceptowane przez operatora(-ów): **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
         <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target>Warunki zostały już zaakceptowane przez tego(-ych) operatora(-ów): **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions of use" xml:space="preserve">
         <source>Conditions of use</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target>Warunki użytkowania</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
@@ -1617,6 +1753,10 @@
         <target>Skonfiguruj serwery ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Potwierdź</target>
@@ -1667,6 +1807,10 @@
         <target>Potwierdź wgranie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Połącz</target>
@@ -1786,6 +1930,10 @@ To jest twój jednorazowy link!</target>
         <target>Stan połączenia i serwerów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Błąd połączenia</target>
@@ -1796,6 +1944,15 @@ To jest twój jednorazowy link!</target>
         <target>Błąd połączenia (UWIERZYTELNIANIE)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Powiadomienia o połączeniu</target>
@@ -1806,6 +1963,10 @@ To jest twój jednorazowy link!</target>
         <target>Prośba o połączenie wysłana!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1885,6 +2046,10 @@ To jest twój jednorazowy link!</target>
         <target>Kontakty mogą oznaczać wiadomości do usunięcia; będziesz mógł je zobaczyć.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Kontynuuj</target>
@@ -1959,6 +2124,10 @@ To jest twój jednorazowy link!</target>
         <target>Utwórz link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Utwórz nowy profil w [aplikacji desktopowej](https://simplex.chat/downloads/). 💻</target>
@@ -2174,8 +2343,7 @@ To jest twój jednorazowy link!</target>
         <source>Delete</source>
         <target>Usuń</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2216,6 +2384,10 @@ To jest twój jednorazowy link!</target>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Usuń profil czatu</target>
@@ -2226,6 +2398,10 @@ To jest twój jednorazowy link!</target>
         <target>Usunąć profil czatu?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2305,6 +2481,10 @@ To jest twój jednorazowy link!</target>
         <target>Usunąć link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Usunąć wiadomość członka?</target>
@@ -2318,7 +2498,7 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Usuń wiadomości</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2354,6 +2534,10 @@ To jest twój jednorazowy link!</target>
         <target>Usuń kolejkę</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Usuń do 20 wiadomości na raz.</target>
@@ -2512,6 +2696,14 @@ To jest twój jednorazowy link!</target>
         <target>Wyłącz blokadę SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Wyłącz dla wszystkich</target>
@@ -2602,6 +2794,10 @@ To jest twój jednorazowy link!</target>
         <target>Nie używaj danych logowania do proxy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Nie twórz adresu</target>
@@ -2612,9 +2808,17 @@ To jest twój jednorazowy link!</target>
         <target>Nie włączaj</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Nie pokazuj ponownie</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2626,7 +2830,7 @@ To jest twój jednorazowy link!</target>
         <source>Download</source>
         <target>Pobierz</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2702,8 +2906,8 @@ To jest twój jednorazowy link!</target>
         <target>Włącz (zachowaj nadpisania)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2719,7 +2923,7 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Czy włączyć automatyczne usuwanie wiadomości?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2846,6 +3050,10 @@ To jest twój jednorazowy link!</target>
         <target>Renegocjacja szyfrowania nie powiodła się.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Wprowadź Pin</target>
@@ -2920,6 +3128,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd przyjmowania prośby o kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Błąd dodawania członka(ów)</target>
@@ -2954,6 +3166,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd zmiany na incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.</target>
@@ -2974,6 +3190,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd tworzenia linku grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Błąd tworzenia kontaktu członka</target>
@@ -2989,6 +3209,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd tworzenia profilu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Błąd odszyfrowania pliku</target>
@@ -2999,6 +3223,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd usuwania bazy danych czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Błąd usuwania czatu!</target>
@@ -3098,10 +3326,18 @@ To jest twój jednorazowy link!</target>
         <target>Błąd ponownego łączenia serwerów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Błąd usuwania członka</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3113,6 +3349,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd zapisu serwerów ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Błąd zapisu profilu grupy</target>
@@ -3192,6 +3432,10 @@ To jest twój jednorazowy link!</target>
         <target>Błąd synchronizacji połączenia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Błąd aktualizacji linku grupy</target>
@@ -3234,7 +3478,9 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Błąd: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3270,6 +3516,10 @@ To jest twój jednorazowy link!</target>
         <target>Rozszerz</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Eksportuj bazę danych</target>
@@ -3310,20 +3560,32 @@ To jest twój jednorazowy link!</target>
         <target>Szybko i bez czekania aż nadawca będzie online!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Szybsze dołączenie i bardziej niezawodne wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Ulubione</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Błąd pliku</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3332,6 +3594,11 @@ To jest twój jednorazowy link!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Nie odnaleziono pliku - najprawdopodobniej plik został usunięty lub anulowany.</target>
@@ -3457,6 +3724,10 @@ To jest twój jednorazowy link!</target>
         <target>Naprawa nie jest obsługiwana przez członka grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3470,6 +3741,10 @@ To jest twój jednorazowy link!</target>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3591,6 +3866,10 @@ Błąd: %2$@</target>
         <target>GIF-y i naklejki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Dzień dobry!</target>
@@ -3696,11 +3975,19 @@ Błąd: %2$@</target>
         <target>Grupa zostanie usunięta dla Ciebie - nie można tego cofnąć!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Pomoc</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Ukryte</target>
@@ -3759,6 +4046,10 @@ Błąd: %2$@</target>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Jak</target>
@@ -3899,6 +4190,14 @@ More improvements are coming soon!</source>
         <target>Dźwięki w rozmowie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Incognito</target>
@@ -3991,6 +4290,26 @@ More improvements are coming soon!</source>
         <target>Kolory interfejsu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Nieprawidłowy kod QR</target>
@@ -4261,6 +4580,18 @@ To jest twój link do grupy %@!</target>
         <target>Połączone komputery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Wiadomość na żywo!</target>
@@ -4346,11 +4677,19 @@ To jest twój link do grupy %@!</target>
         <target>Członek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Członek nieaktywny</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4374,6 +4713,10 @@ To jest twój link do grupy %@!</target>
         <target>Członek zostanie usunięty z grupy - nie można tego cofnąć!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Członkowie grupy mogą dodawać reakcje wiadomości.</target>
@@ -4384,6 +4727,10 @@ To jest twój link do grupy %@!</target>
         <target>Członkowie grupy mogą nieodwracalnie usuwać wysłane wiadomości. (24 godziny)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Członkowie grupy mogą wysyłać linki SimpleX.</target>
@@ -4409,6 +4756,10 @@ To jest twój link do grupy %@!</target>
         <target>Członkowie grupy mogą wysyłać wiadomości głosowe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menu</target>
@@ -4519,6 +4870,10 @@ To jest twój link do grupy %@!</target>
         <target>Wiadomości od %@ zostaną pokazane!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Otrzymane wiadomości</target>
@@ -4619,6 +4974,10 @@ To jest twój link do grupy %@!</target>
         <target>Moderowany o: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Więcej ulepszeń już wkrótce!</target>
@@ -4646,7 +5005,11 @@ To jest twój link do grupy %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Wycisz</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4696,6 +5059,10 @@ To jest twój link do grupy %@!</target>
         <target>Status sieci</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Nowy Pin</target>
@@ -4760,6 +5127,10 @@ To jest twój link do grupy %@!</target>
         <target>Nowa rola członka</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Nowa wiadomość</target>
@@ -4784,6 +5155,22 @@ To jest twój link do grupy %@!</target>
         <target>Brak hasła aplikacji</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Nie wybrano kontaktów</target>
@@ -4833,6 +5220,10 @@ To jest twój link do grupy %@!</target>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4883,6 +5274,14 @@ To jest twój link do grupy %@!</target>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Brak identyfikatorów użytkownika.</target>
@@ -4893,6 +5292,10 @@ To jest twój link do grupy %@!</target>
         <target>Nie kompatybilny!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Nic nie jest zaznaczone</target>
@@ -4913,10 +5316,18 @@ To jest twój link do grupy %@!</target>
         <target>Powiadomienia są wyłączone!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4939,7 +5350,8 @@ To jest twój link do grupy %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4999,6 +5411,14 @@ Wymaga włączenia VPN.</target>
         <target>Tylko właściciele grup mogą włączyć wiadomości głosowe.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Tylko Ty możesz dodawać reakcje wiadomości.</target>
@@ -5052,7 +5472,7 @@ Wymaga włączenia VPN.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Otwórz</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5082,6 +5502,10 @@ Wymaga włączenia VPN.</target>
         <target>Grupa otwarta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Otwórz migrację na innym urządzeniu</target>
@@ -5128,6 +5552,10 @@ Wymaga włączenia VPN.</target>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Inne</target>
@@ -5319,6 +5747,22 @@ Błąd: %@</target>
         <target>Przechowuj kod dostępu w bezpieczny sposób, w przypadku jego utraty NIE będzie można go zmienić.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Polski interfejs</target>
@@ -5367,16 +5811,28 @@ Błąd: %@</target>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Redefinicja prywatności</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Prywatne nazwy plików</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Trasowanie prywatnych wiadomości</target>
@@ -5452,6 +5908,10 @@ Błąd: %@</target>
         <target>Zabroń reakcje wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>Zabroń wysyłania linków SimpleX.</target>
@@ -5709,11 +6169,23 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zmniejszone zużycie baterii</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Odrzuć</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5725,6 +6197,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Odrzuć prośbę kontaktu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Serwer przekaźnikowy jest używany tylko w razie potrzeby. Inna strona może obserwować Twój adres IP.</target>
@@ -5810,6 +6286,50 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Odpowiedz</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Wymagane</target>
@@ -5899,9 +6419,13 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5952,13 +6476,17 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <source>Save</source>
         <target>Zapisz</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Zapisz (i powiadom kontakty)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Zapisz i powiadom kontakt</target>
@@ -5984,6 +6512,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zapisz profil grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Zapisz hasło i otwórz czat</target>
@@ -6224,6 +6756,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Wyślij powiadomienia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Wyślij pytania i pomysły</target>
@@ -6435,6 +6971,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Ustaw 1 dzień</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Ustaw nazwę kontaktu…</target>
@@ -6455,6 +6995,14 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Ustaw go zamiast uwierzytelniania systemowego.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Ustaw pin</target>
@@ -6499,7 +7047,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <source>Share</source>
         <target>Udostępnij</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6558,6 +7106,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Udostępnij kontaktom</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Pokaż kod QR</target>
@@ -6655,6 +7207,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>Adres kontaktowy SimpleX</target>
@@ -6754,6 +7310,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Ktoś</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Kwadrat, okrąg lub cokolwiek pomiędzy.</target>
@@ -6839,6 +7400,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zatrzymywanie czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Silne</target>
@@ -6897,6 +7462,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Limit czasu połączenia TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6964,13 +7533,17 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Tymczasowy błąd pliku</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test nie powiódł się na etapie %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Przetestuj serwer</target>
@@ -7091,19 +7664,10 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Stara baza danych nie została usunięta podczas migracji, można ją usunąć.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Profil jest udostępniany tylko Twoim kontaktom.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -7166,6 +7730,10 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>Tego działania nie można cofnąć - wiadomości wysłane i odebrane wcześniej niż wybrane zostaną usunięte. Może to potrwać kilka minut.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Tego działania nie można cofnąć - Twój profil, kontakty, wiadomości i pliki zostaną nieodwracalnie utracone.</target>
@@ -7211,11 +7779,19 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
         <target>To jest twój jednorazowy link!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Ten link dostał użyty z innym urządzeniem mobilnym, proszę stworzyć nowy link na komputerze.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>To ustawienie dotyczy wiadomości Twojego bieżącego profilu czatu **%@**.</target>
@@ -7324,6 +7900,10 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
         <target>Przełącz incognito przy połączeniu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Nieprzezroczystość paska narzędzi</target>
@@ -7488,13 +8068,17 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Wyłącz wyciszenie</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Nieprzeczytane</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Do nowych członków wysyłanych jest do 100 ostatnich wiadomości.</target>
@@ -7520,6 +8104,10 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Zaktualizować ustawienia?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Aktualizacja ustawień spowoduje ponowne połączenie klienta ze wszystkimi serwerami.</target>
@@ -7579,6 +8167,14 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Użyć serwerów SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Użyj czatu</target>
@@ -7641,6 +8237,10 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>Używaj aplikacji podczas połączenia.</target>
@@ -7651,6 +8251,10 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Korzystaj z aplikacji jedną ręką.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Wybór użytkownika</target>
@@ -8019,10 +8623,6 @@ Powtórzyć prośbę dołączenia?</target>
         <target>Możesz to zmienić w ustawieniach wyglądu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -8111,6 +8711,10 @@ Powtórzyć prośbę dołączenia?</target>
         <target>Możesz zobaczyć link zaproszenia ponownie w szczegółach połączenia.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Nie możesz wysyłać wiadomości!</target>
@@ -8193,6 +8797,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>Wysłałeś zaproszenie do grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Zostaniesz połączony do grupy, gdy urządzenie gospodarza grupy będzie online, proszę czekać lub sprawdzić później!</target>
@@ -8257,11 +8865,6 @@ Powtórzyć prośbę połączenia?</target>
         <target>Twoje serwery ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Twoje serwery SMP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Twój adres SimpleX</target>
@@ -8347,6 +8950,11 @@ Powtórzyć prośbę połączenia?</target>
         <target>Twój profil **%@** zostanie udostępniony.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Profil jest udostępniany tylko Twoim kontaktom.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Twój profil jest przechowywany na urządzeniu i udostępniany tylko Twoim kontaktom. Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
@@ -8357,11 +8965,6 @@ Powtórzyć prośbę połączenia?</target>
         <target>Twój profil został zmieniony. Jeśli go zapiszesz, zaktualizowany profil zostanie wysłany do wszystkich kontaktów.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Twój profil, kontakty i dostarczone wiadomości są przechowywane na Twoim urządzeniu.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Twój losowy profil</target>
@@ -8374,6 +8977,7 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="Your servers" xml:space="preserve">
         <source>Your servers</source>
+        <target>Twoje serwery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your settings" xml:space="preserve">
@@ -8411,6 +9015,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>powyżej, a następnie wybierz:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>zaakceptowane połączenie</target>
@@ -8420,6 +9028,10 @@ Powtórzyć prośbę połączenia?</target>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>administrator</target>
@@ -8440,6 +9052,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>uzgadnianie szyfrowania…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>wszyscy członkowie</target>
@@ -8455,6 +9071,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>i %lld innych wydarzeń</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>próby</target>
@@ -8493,7 +9113,8 @@ Powtórzyć prośbę połączenia?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>zablokowany przez admina</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8520,6 +9141,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>dzwonie…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>anulowany %@</target>
@@ -8625,6 +9250,14 @@ Powtórzyć prośbę połączenia?</target>
         <target>kontakt %1$@ zmieniony na %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>kontakt posiada szyfrowanie e2e</target>
@@ -8635,6 +9268,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>kontakt nie posiada szyfrowania e2e</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>twórca</target>
@@ -8663,7 +9300,8 @@ Powtórzyć prośbę połączenia?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>domyślne (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8790,20 +9428,11 @@ Powtórzyć prośbę połączenia?</target>
         <target>błąd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>nowe wydarzenie</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>wygasły</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>przekazane dalej</target>
@@ -8814,6 +9443,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>grupa usunięta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>zaktualizowano profil grupy</target>
@@ -8939,6 +9572,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>połączony</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>wiadomość</target>
@@ -8969,20 +9606,19 @@ Powtórzyć prośbę połączenia?</target>
         <target>moderowany przez %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>miesiące</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>wycisz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>nigdy</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9004,6 +9640,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>brak tekstu</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>obserwator</target>
@@ -9013,8 +9653,9 @@ Powtórzyć prośbę połączenia?</target>
         <source>off</source>
         <target>wyłączony</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9056,6 +9697,18 @@ Powtórzyć prośbę połączenia?</target>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>kwantowo odporne szyfrowanie e2e</target>
@@ -9071,6 +9724,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>otrzymano potwierdzenie…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>odrzucone połączenie</target>
@@ -9091,6 +9748,10 @@ Powtórzyć prośbę połączenia?</target>
         <target>usunięto adres kontaktu</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>usunięto zdjęcie profilu</target>
@@ -9101,10 +9762,22 @@ Powtórzyć prośbę połączenia?</target>
         <target>usunął cię</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>zapisane</target>
@@ -9204,11 +9877,6 @@ ostatnia otrzymana wiadomość: %2$@</target>
         <target>nieznany status</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>wyłącz wyciszenie</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>niezabezpieczony</target>
@@ -9299,6 +9967,10 @@ ostatnia otrzymana wiadomość: %2$@</target>
         <target>Ty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>jesteś zaproszony do grupy</target>
@@ -9373,7 +10045,7 @@ ostatnia otrzymana wiadomość: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9410,7 +10082,7 @@ ostatnia otrzymana wiadomość: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9432,13 +10104,17 @@ ostatnia otrzymana wiadomość: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -9451,15 +10127,11 @@ ostatnia otrzymana wiadomość: %2$@</target>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9481,7 +10153,7 @@ ostatnia otrzymana wiadomość: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="pl" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/contents.json b/apps/ios/SimpleX Localizations/pl.xcloc/contents.json
index 0074d85662..c79fba1c1e 100644
--- a/apps/ios/SimpleX Localizations/pl.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/pl.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "pl",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff b/apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff
index 93ba6f357b..bbb6c7d22a 100644
--- a/apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff	
+++ b/apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff	
@@ -3002,8 +3002,8 @@ We will be adding server redundancy to prevent lost messages.</source>
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve" approved="no">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve" approved="no">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <target state="translated">O perfil é compartilhado apenas com seus contatos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
diff --git a/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff b/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff
index de1787bdad..bc8bf79da1 100644
--- a/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff	
+++ b/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff	
@@ -3146,8 +3146,8 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>The old database was not removed during the migration, it can be deleted.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
index 5809c65216..2ec1130718 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (можно скопировать)</target>
@@ -144,7 +132,7 @@
       </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
         <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ и %lld других членов соединены</target>
+        <target>установлено соединение с %@, %@ и %lld другими членами группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
@@ -179,7 +167,7 @@
       </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
-        <target>%d ч.</target>
+        <target>%d час.</target>
         <note>time interval</note>
       </trans-unit>
       <trans-unit id="%d messages not forwarded" xml:space="preserve">
@@ -202,6 +190,11 @@
         <target>%d сек</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d секунд</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d пропущенных сообщение(й)</target>
@@ -239,7 +232,7 @@
       </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve">
         <source>%lld members</source>
-        <target>Членов группы: %lld</target>
+        <target>%lld членов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages blocked" xml:space="preserve">
@@ -272,11 +265,6 @@
         <target>%lld новых языков интерфейса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld секунд</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld секунд</target>
@@ -327,11 +315,6 @@
         <target>%u сообщений пропущено.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(новое)</target>
@@ -342,11 +325,6 @@
         <target>(это устройство v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Добавить контакт**: создать и поделиться новой ссылкой-приглашением.</target>
@@ -412,11 +390,6 @@
         <target>\*жирный*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +426,6 @@
 - история редактирования.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 сек</target>
@@ -471,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 день</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +455,19 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 месяц</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 неделю</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 год</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +494,6 @@
         <target>30 секунд</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -553,8 +524,8 @@
       <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve">
         <source>A separate TCP connection will be used **for each contact and group member**.
 **Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.</source>
-        <target>Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться **для каждого контакта и члена группы**.
-**Обратите внимание**: если у Вас много контактов, потребление батареи и трафика может быть значительно выше, и некоторые соединения могут не работать.</target>
+        <target>Будет использовано отдельное TCP соединение **для каждого контакта и члена группы**.
+**Примечание**: Чем больше подключений, тем быстрее разряжается батарея и расходуется трафик, а некоторые соединения могут отваливаться.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort" xml:space="preserve">
@@ -591,8 +562,18 @@
         <source>Accept</source>
         <target>Принять</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <target>Принять в группу</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <target>Принять как читателя</target>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -613,7 +594,12 @@
         <source>Accept incognito</source>
         <target>Принять инкогнито</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <target>Принять члена</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -630,6 +616,11 @@
         <target>Ошибки подтверждения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>Активный</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Активные соединения</target>
@@ -645,6 +636,11 @@
         <target>Добавить друзей</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>Добавить список</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>Добавить профиль</target>
@@ -670,6 +666,11 @@
         <target>Добавить на другое устройство</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>Добавить в список</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Добавить приветственное сообщение</target>
@@ -745,6 +746,11 @@
         <target>Настройки сети</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>Все</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Все данные приложения будут удалены.</target>
@@ -755,6 +761,11 @@
         <target>Все чаты и сообщения будут удалены - это нельзя отменить!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>Все чаты будут удалены из списка %@, и список удален.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Все данные удаляются при его вводе.</target>
@@ -767,7 +778,7 @@
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">
         <source>All group members will remain connected.</source>
-        <target>Все члены группы, которые соединились через эту ссылку, останутся в группе.</target>
+        <target>Все члены группы останутся соединены.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
@@ -795,6 +806,16 @@
         <target>Все профили</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>Все сообщения о нарушениях будут заархивированы для вас.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>Все серверы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Все контакты, которые соединились через этот адрес, сохранятся.</target>
@@ -852,7 +873,7 @@
       </trans-unit>
       <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
         <source>Allow sending direct messages to members.</source>
-        <target>Разрешить посылать прямые сообщения членам группы.</target>
+        <target>Разрешить личные сообщения членам группы.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
@@ -870,6 +891,11 @@
         <target>Разрешить необратимо удалять отправленные сообщения. (24 часа)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>Разрешить отправлять сообщения о нарушениях модераторам.</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>
         <target>Разрешить отправлять ссылки SimpleX.</target>
@@ -950,6 +976,11 @@
         <target>Будет создан пустой профиль чата с указанным именем, и приложение откроется в обычном режиме.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>Другая причина</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Принять звонок</target>
@@ -975,6 +1006,11 @@
         <target>Приложение шифрует новые локальные файлы (кроме видео).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>Группа приложения:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Иконка</target>
@@ -1020,6 +1056,21 @@
         <target>Применить к</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>Архивировать</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>Архивировать %lld сообщений о нарушениях?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>Архивировать все сообщения о нарушениях?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Архивировать и загрузить</target>
@@ -1030,6 +1081,21 @@
         <target>Архивируйте контакты чтобы продолжить переписку.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>Архивировать сообщение о нарушении</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>Архивировать сообщение о нарушении?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>Архивировать сообщения о нарушениях</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Архивированные контакты</target>
@@ -1140,6 +1206,11 @@
         <target>Улучшенные группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>Улучшенная производительность групп</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Улучшенные даты сообщений.</target>
@@ -1160,6 +1231,11 @@
         <target>Улучшенные уведомления</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>Улучшенная конфиденциальность и безопасность</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Улучшенная безопасность ✅</target>
@@ -1187,7 +1263,7 @@
       </trans-unit>
       <trans-unit id="Block group members" xml:space="preserve">
         <source>Block group members</source>
-        <target>Блокируйте членов группы</target>
+        <target>Заблокировать членов группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member" xml:space="preserve">
@@ -1197,7 +1273,7 @@
       </trans-unit>
       <trans-unit id="Block member for all?" xml:space="preserve">
         <source>Block member for all?</source>
-        <target>Заблокировать члена для всех?</target>
+        <target>Заблокировать для всех?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member?" xml:space="preserve">
@@ -1260,11 +1336,25 @@
         <target>Бизнес разговоры</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>Бизнесы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>По профилю чата или [по соединению](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>Используя SimpleX Chat, Вы согласны:
+- отправлять только законные сообщения в публичных группах.
+- уважать других пользователей – не отправлять спам.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Звонок уже завершен!</target>
@@ -1292,7 +1382,7 @@
       </trans-unit>
       <trans-unit id="Can't call member" xml:space="preserve">
         <source>Can't call member</source>
-        <target>Не удается позвонить члену группы</target>
+        <target>Не удаётся позвонить члену группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1307,14 +1397,14 @@
       </trans-unit>
       <trans-unit id="Can't message member" xml:space="preserve">
         <source>Can't message member</source>
-        <target>Не удается написать члену группы</target>
+        <target>Не удаётся отправить сообщение члену группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
         <source>Cancel</source>
         <target>Отменить</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1351,6 +1441,11 @@
         <target>Поменять</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>Измененить автоматическое удаление сообщений?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Поменять профили</target>
@@ -1400,7 +1495,7 @@
         <source>Change self-destruct passcode</source>
         <target>Изменить код самоуничтожения</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1502,11 +1597,26 @@
         <target>Разговор будет удален для Вас - это действие нельзя отменить!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <target>Чат с админами</target>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <target>Чат с членом группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>Чаты</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <target>Чаты с членами группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Проверять сообщения каждые 20 минут.</target>
@@ -1572,6 +1682,16 @@
         <target>Очистить разговор?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>Очистить группу?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>Очистить или удалить группу?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Очистить личные заметки?</target>
@@ -1592,6 +1712,11 @@
         <target>Режим цветов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>Нарушение правил группы</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Сравнение файла</target>
@@ -1627,16 +1752,6 @@
         <target>Условия использования</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Условия будут приняты для включенных операторов через 30 дней.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Условия будут приняты для оператора(ов): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Условия будут приняты для оператора(ов): **%@**.</target>
@@ -1657,6 +1772,11 @@
         <target>Настройка ICE серверов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>Настроить операторов серверов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Подтвердить</target>
@@ -1707,6 +1827,11 @@
         <target>Подтвердить загрузку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>Подтвержденный</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Соединиться</target>
@@ -1826,6 +1951,11 @@ This is your own one-time link!</source>
         <target>Состояние соединения и серверов.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>Соединение заблокировано</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Ошибка соединения</target>
@@ -1836,6 +1966,18 @@ This is your own one-time link!</source>
         <target>Ошибка соединения (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>Соединение заблокировано сервером оператора:
+%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>Соединение не готово.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Уведомления по соединениям</target>
@@ -1846,6 +1988,11 @@ This is your own one-time link!</source>
         <target>Запрос на соединение отправлен!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>Соединение требует повторного согласования шифрования.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Безопасность соединения</target>
@@ -1926,6 +2073,11 @@ This is your own one-time link!</source>
         <target>Контакты могут помечать сообщения для удаления; Вы сможете просмотреть их.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>Содержание нарушает условия использования</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Продолжить</target>
@@ -2001,6 +2153,11 @@ This is your own one-time link!</source>
         <target>Создать ссылку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>Создать список</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Создайте новый профиль в [приложении для компьютера](https://simplex.chat/downloads/). 💻</target>
@@ -2218,8 +2375,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Удалить</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2261,6 +2417,11 @@ This is your own one-time link!</source>
         <target>Удалить разговор</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>Удалить сообщения с вашего устройства.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>Удалить профиль чата</target>
@@ -2271,6 +2432,11 @@ This is your own one-time link!</source>
         <target>Удалить профиль?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <target>Удалить чат с членом группы?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <target>Удалить разговор?</target>
@@ -2351,6 +2517,11 @@ This is your own one-time link!</source>
         <target>Удалить ссылку?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>Удалить список?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Удалить сообщение участника?</target>
@@ -2364,7 +2535,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Удалить сообщения</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2401,6 +2572,11 @@ This is your own one-time link!</source>
         <target>Удаление очереди</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>Удалить сообщение о нарушении</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Удаляйте до 20 сообщений за раз.</target>
@@ -2543,12 +2719,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
         <source>Direct messages between members are prohibited in this chat.</source>
-        <target>Прямые сообщения между членами запрещены в этом разговоре.</target>
+        <target>Личные сообщения запрещены в этой группе.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
         <source>Direct messages between members are prohibited.</source>
-        <target>Прямые сообщения между членами группы запрещены.</target>
+        <target>Прямые сообщения между членами запрещены.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2561,6 +2737,16 @@ This is your own one-time link!</source>
         <target>Отключить блокировку SimpleX</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>Отключить автоматическое удаление сообщений?</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>Отключить удаление сообщений</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Выключить для всех</target>
@@ -2651,6 +2837,11 @@ This is your own one-time link!</source>
         <target>Не использовать учетные данные с прокси.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>Документы:</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Не создавать адрес</target>
@@ -2661,9 +2852,19 @@ This is your own one-time link!</source>
         <target>Не включать</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>Не пропустите важные сообщения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Не показывать</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>Готово</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2675,7 +2876,7 @@ This is your own one-time link!</source>
         <source>Download</source>
         <target>Загрузить</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2752,9 +2953,9 @@ This is your own one-time link!</source>
         <target>Включить (кроме исключений)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Включить Flux</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>Включите Flux в настройках Сеть и серверы для лучшей конфиденциальности метаданных.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2770,7 +2971,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Включить автоматическое удаление сообщений?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2897,6 +3098,11 @@ This is your own one-time link!</source>
         <target>Ошибка нового соглашения о шифровании.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>Выполняется повторное согласование шифрования.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Введите Код</target>
@@ -2972,6 +3178,11 @@ This is your own one-time link!</source>
         <target>Ошибка при принятии запроса на соединение</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <target>Ошибка вступления члена группы</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Ошибка при добавлении членов группы</target>
@@ -3007,6 +3218,11 @@ This is your own one-time link!</source>
         <target>Ошибка при смене на Инкогнито!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <target>Ошибка проверки статуса токена</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Ошибка подключения к пересылающему серверу %@. Попробуйте позже.</target>
@@ -3027,9 +3243,14 @@ This is your own one-time link!</source>
         <target>Ошибка при создании ссылки группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>Ошибка создания списка</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
-        <target>Ошибка создания контакта с членом группы</target>
+        <target>Ошибка при создании контакта</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating message" xml:space="preserve">
@@ -3042,6 +3263,11 @@ This is your own one-time link!</source>
         <target>Ошибка создания профиля!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>Ошибка создания сообщения о нарушении</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Ошибка расшифровки файла</target>
@@ -3052,6 +3278,11 @@ This is your own one-time link!</source>
         <target>Ошибка при удалении данных чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <target>Ошибка при удалении чата с членом группы</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Ошибка при удалении чата!</target>
@@ -3152,10 +3383,20 @@ This is your own one-time link!</source>
         <target>Ошибка переподключения к серверам</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>Ошибка регистрации для уведомлений</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Ошибка при удалении члена группы</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>Ошибка сортировки списков</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3167,6 +3408,11 @@ This is your own one-time link!</source>
         <target>Ошибка при сохранении ICE серверов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>Ошибка сохранения списка чатов</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Ошибка при сохранении профиля группы</target>
@@ -3209,7 +3455,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
-        <target>Ошибка отправки приглашения члену группы</target>
+        <target>Ошибка при отправке приглашения члену</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -3247,6 +3493,11 @@ This is your own one-time link!</source>
         <target>Ошибка синхронизации соединения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>Ошибка проверки соединения с сервером</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Ошибка обновления ссылки группы</target>
@@ -3290,7 +3541,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Ошибка: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3327,6 +3580,11 @@ This is your own one-time link!</source>
         <target>Раскрыть</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>Истекший</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Экспорт архива чата</target>
@@ -3367,20 +3625,35 @@ This is your own one-time link!</source>
         <target>Быстрые и не нужно ждать, когда отправитель онлайн!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>Ускорено удаление групп.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Быстрое вступление и надежная доставка сообщений.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>Ускорена отправка сообщений.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Избранный</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>Избранное</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Ошибка файла</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3389,6 +3662,13 @@ This is your own one-time link!</source>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>Файл заблокирован оператором сервера:
+%@.</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Файл не найден - скорее всего, файл был удален или отменен.</target>
@@ -3511,7 +3791,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Fix not supported by group member" xml:space="preserve">
         <source>Fix not supported by group member</source>
-        <target>Починка не поддерживается членом группы</target>
+        <target>Починка не поддерживается членом группы.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>Для всех модераторов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
@@ -3529,6 +3814,11 @@ This is your own one-time link!</source>
         <target>Например, если Ваш контакт получает сообщения через сервер SimpleX Chat, Ваше приложение доставит их через сервер Flux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>Для меня</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>Для доставки сообщений</target>
@@ -3653,6 +3943,11 @@ Error: %2$@</source>
         <target>ГИФ файлы и стикеры</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>Уведомления, когда Вас упомянули.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Добрый день!</target>
@@ -3758,11 +4053,21 @@ Error: %2$@</source>
         <target>Группа будет удалена для Вас - это действие нельзя отменить!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>Группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Помощь</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>Помогайте администраторам модерировать их группы.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Скрытое</target>
@@ -3823,6 +4128,11 @@ Error: %2$@</source>
         <target>Как это улучшает конфиденциальность</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>Как это работает</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Инфо</target>
@@ -3964,6 +4274,16 @@ More improvements are coming soon!</source>
         <target>Звуки во время звонков</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>Неприемлемый контент</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>Неприемлемый профиль</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Инкогнито</target>
@@ -4056,6 +4376,31 @@ More improvements are coming soon!</source>
         <target>Цвета интерфейса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>Недействительный</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Недействительный (плохой токен)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>Недействительный (истекший)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>Недействительный (незарегистрированный)</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>Недействительный (плохой заголовок)</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Неверный QR код</target>
@@ -4329,6 +4674,21 @@ This is your link for group %@!</source>
         <target>Связанные компьютеры</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>Список</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>Название списка и эмодзи должны быть разными для всех списков.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>Имя списка...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Живое сообщение!</target>
@@ -4414,11 +4774,21 @@ This is your link for group %@!</source>
         <target>Член группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <target>Приём членов в группу</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Член неактивен</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>Сообщения о нарушениях</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <target>Роль участника будет изменена на "%@". Все участники разговора получат уведомление.</target>
@@ -4426,12 +4796,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All group members will be notified.</source>
-        <target>Роль члена группы будет изменена на "%@". Все члены группы получат сообщение.</target>
+        <target>Роль члена будет изменена на "%@". Все члены группы получат уведомление.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve">
         <source>Member role will be changed to "%@". The member will receive a new invitation.</source>
-        <target>Роль члена группы будет изменена на "%@". Будет отправлено новое приглашение.</target>
+        <target>Роль члена будет изменена на "%@". Будет отправлено новое приглашение.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
@@ -4444,39 +4814,54 @@ This is your link for group %@!</source>
         <target>Член группы будет удален - это действие нельзя отменить!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <target>Участник хочет присоединиться к группе. Принять?</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
-        <target>Члены группы могут добавлять реакции на сообщения.</target>
+        <target>Члены могут добавлять реакции на сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
         <source>Members can irreversibly delete sent messages. (24 hours)</source>
-        <target>Члены группы могут необратимо удалять отправленные сообщения. (24 часа)</target>
+        <target>Члены могут необратимо удалять отправленные сообщения. (24 часа)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>Члены группы могут пожаловаться модераторам.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
-        <target>Члены группы могут отправлять ссылки SimpleX.</target>
+        <target>Члены могут отправлять ссылки SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send direct messages." xml:space="preserve">
         <source>Members can send direct messages.</source>
-        <target>Члены группы могут посылать прямые сообщения.</target>
+        <target>Члены могут посылать прямые сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send disappearing messages." xml:space="preserve">
         <source>Members can send disappearing messages.</source>
-        <target>Члены группы могут посылать исчезающие сообщения.</target>
+        <target>Члены могут посылать исчезающие сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send files and media." xml:space="preserve">
         <source>Members can send files and media.</source>
-        <target>Члены группы могут слать файлы и медиа.</target>
+        <target>Члены могут слать файлы и медиа.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Members can send voice messages." xml:space="preserve">
         <source>Members can send voice messages.</source>
-        <target>Члены группы могут отправлять голосовые сообщения.</target>
+        <target>Члены могут отправлять голосовые сообщения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>Упоминайте участников 👋</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
@@ -4589,6 +4974,11 @@ This is your link for group %@!</source>
         <target>Сообщения от %@ будут показаны!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>Сообщения в этом чате никогда не будут удалены.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Получено сообщений</target>
@@ -4689,6 +5079,11 @@ This is your link for group %@!</source>
         <target>Модерировано: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>Больше</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Дополнительные улучшения скоро!</target>
@@ -4717,7 +5112,12 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Без звука</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>Все без звука</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4769,6 +5169,11 @@ This is your link for group %@!</source>
         <target>Состояние сети</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>Новый</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Новый Код</target>
@@ -4834,6 +5239,11 @@ This is your link for group %@!</source>
         <target>Роль члена группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <target>Новый участник хочет присоединиться к группе.</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Новое сообщение</target>
@@ -4859,6 +5269,26 @@ This is your link for group %@!</source>
         <target>Нет кода доступа</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>Нет чатов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>Чаты не найдены</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>Нет чатов в списке %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <target>Нет чатов с членами группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Контакты не выбраны</target>
@@ -4909,6 +5339,11 @@ This is your link for group %@!</source>
         <target>Нет серверов файлов и медиа.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>Нет сообщения</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Нет серверов сообщений.</target>
@@ -4964,6 +5399,16 @@ This is your link for group %@!</source>
         <target>Нет серверов для отправки файлов.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>Нет токена!</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>Нет непрочитанных чатов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Без идентификаторов пользователей.</target>
@@ -4974,6 +5419,11 @@ This is your link for group %@!</source>
         <target>Несовместимая версия!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>Заметки</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Ничего не выбрано</target>
@@ -4994,18 +5444,28 @@ This is your link for group %@!</source>
         <target>Уведомления выключены</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>Ошибка уведомлений</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Конфиденциальность уведомлений</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>Статус уведомлений</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
 - disable members ("observer" role)</source>
         <target>Теперь админы могут:
 - удалять сообщения членов.
-- приостанавливать членов (роль "наблюдатель")</target>
+- приостанавливать членов (роль наблюдатель)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="OK" xml:space="preserve">
@@ -5021,7 +5481,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ок</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5082,6 +5543,16 @@ Requires compatible VPN.</source>
         <target>Только владельцы группы могут разрешить голосовые сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>Только отправитель и модераторы видят это</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>Только вы и модераторы видят это</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Только Вы можете добавлять реакции на сообщения.</target>
@@ -5135,7 +5606,7 @@ Requires compatible VPN.</source>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Открыть</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5167,6 +5638,11 @@ Requires compatible VPN.</source>
         <target>Открыть группу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <target>Открыть ссылку?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Открытие миграции на другое устройство</target>
@@ -5217,6 +5693,11 @@ Requires compatible VPN.</source>
         <target>Или поделиться конфиденциально</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>Организуйте чаты в списки</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Другaя сеть</target>
@@ -5301,7 +5782,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Pending" xml:space="preserve">
         <source>Pending</source>
-        <target>В ожидании</target>
+        <target>Ожидает</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Periodic" xml:space="preserve">
@@ -5408,6 +5889,26 @@ Error: %@</source>
         <target>Пожалуйста, надежно сохраните пароль, Вы НЕ сможете его поменять, если потеряете.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <target>Попробуйте выключить и снова включить уведомления.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <target>Пожалуйста, подождите, пока модераторы группы рассмотрят ваш запрос на вступление.</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <target>Пожалуйста, дождитесь завершения активации токена.</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <target>Пожалуйста, дождитесь регистрации токена.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Польский интерфейс</target>
@@ -5458,16 +5959,31 @@ Error: %@</source>
         <target>Конфиденциальность для ваших покупателей.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>Политика конфиденциальности и условия использования.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Более конфиденциальный</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>Частные разговоры, группы и Ваши контакты недоступны для операторов серверов.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Защищенные имена файлов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <target>Конфиденциальные названия медиафайлов.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Конфиденциальная доставка сообщений</target>
@@ -5543,6 +6059,11 @@ Error: %@</source>
         <target>Запретить реакции на сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <target>Запретить жаловаться модераторам группы.</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>
         <target>Запретить отправку ссылок SimpleX.</target>
@@ -5800,11 +6321,26 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Уменьшенное потребление батареи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <target>Зарегистрировать</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <target>Зарегистрировать токен уведомлений?</target>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <target>Зарегистрирован</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Отклонить</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5816,6 +6352,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Отклонить запрос</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <target>Отклонить участника?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Relay сервер используется только при необходимости. Другая сторона может видеть Ваш IP адрес.</target>
@@ -5901,6 +6442,61 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Ответить</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <target>Пожаловаться</target>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <target>Пожаловаться на сообщение: увидят только модераторы группы.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <target>Пожаловаться на профиль: увидят только модераторы группы.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <target>Пожаловаться: увидят только модераторы группы.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <target>Причина сообщения?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <target>Жалоба отправлена модераторам</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <target>Пожаловаться на спам: увидят только модераторы группы.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <target>Пожаловаться на нарушение: увидят только модераторы группы.</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <target>Сообщение о нарушении: %@</target>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <target>Сообщения о нарушениях запрещены в этой группе.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <target>Сообщения о нарушениях</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Обязательно</target>
@@ -5991,10 +6587,15 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Посмотреть условия</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Посмотреть позже</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <target>Одобрять членов</target>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <target>Одобрять членов для вступления в группу.</target>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6045,13 +6646,18 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Сохранить</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Сохранить (и уведомить контакты)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <target>Сохранить настройки вступления?</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Сохранить и уведомить контакт</target>
@@ -6077,6 +6683,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Сохранить профиль группы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>Сохранить список</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Сохранить пароль и открыть чат</target>
@@ -6317,6 +6928,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Отправлять уведомления</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <target>Вы можете сообщить о нарушениях</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Отправьте вопросы и идеи</target>
@@ -6532,6 +7148,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Установить 1 день</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <target>Имя чата…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Имя контакта…</target>
@@ -6552,6 +7173,16 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Установите код вместо системной аутентификации.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <target>Приём членов в группу</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <target>Установите срок хранения сообщений в чатах.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Установить код доступа</target>
@@ -6596,7 +7227,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Поделиться</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6658,6 +7289,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Поделиться с контактами</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <target>Короткая ссылка</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Показать QR код</target>
@@ -6758,6 +7394,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Адрес SimpleX или одноразовая ссылка?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>SimpleX ссылка канала</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX ссылка-контакт</target>
@@ -6860,6 +7501,12 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Контакт</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <target>Спам</target>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Квадрат, круг и все, что между ними.</target>
@@ -6945,6 +7592,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Остановка чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <target>Хранилище</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Сильное</target>
@@ -7005,6 +7657,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Таймаут TCP соединения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <target>TCP-порт для отправки сообщений</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7073,13 +7730,18 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Временная ошибка файла</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Ошибка теста на шаге %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <target>Протестировать уведомления</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Тестировать сервер</target>
@@ -7202,21 +7864,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Предыдущая версия данных чата не удалена при перемещении, её можно удалить.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Профиль отправляется только Вашим контактам.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Те же самые условия будут приняты для оператора **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Те же самые условия будут приняты для оператора(ов): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>Второй оператор серверов в приложении!</target>
@@ -7282,6 +7934,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Это действие нельзя отменить — все сообщения, отправленные или полученные раньше чем выбрано, будут удалены. Это может занять несколько минут.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target>Это действие нельзя отменить - сообщения в этом чате, отправленные или полученные раньше чем выбрано, будут удалены.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Это действие нельзя отменить — Ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</target>
@@ -7309,7 +7966,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
         <source>This group has over %lld members, delivery receipts are not sent.</source>
-        <target>В группе более %lld членов, отчёты о доставке выключены.</target>
+        <target>В этой группе более %lld членов, отчёты о доставке не отправляются.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -7327,11 +7984,21 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Это ваша собственная одноразовая ссылка!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <target>Эта ссылка требует новую версию. Обновите приложение или попросите Ваш контакт прислать совместимую ссылку.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Эта ссылка была использована на другом мобильном, пожалуйста, создайте новую ссылку на компьютере.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <target>Это сообщение было удалено или еще не получено.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Эта настройка применяется к сообщениям в Вашем текущем профиле чата **%@**.</target>
@@ -7444,6 +8111,11 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Установите режим Инкогнито при соединении.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <target>Статус токена: %@.</target>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Прозрачность тулбара</target>
@@ -7609,13 +8281,18 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Уведомлять</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Не прочитано</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <target>Ссылка не поддерживается</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>До 100 последних сообщений отправляются новым членам.</target>
@@ -7641,6 +8318,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Обновить настройки?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <target>Обновленные условия</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Обновление настроек приведет к сбросу и установке нового соединения со всеми серверами.</target>
@@ -7701,6 +8383,16 @@ To connect, please ask your contact to create another connection link and check
         <target>Использовать серверы предосталенные SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <target>Использовать TCP-порт %@, когда порт не указан.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <target>Использовать TCP-порт 443 только для серверов по умолчанию.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Использовать чат</target>
@@ -7766,6 +8458,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Использовать серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <target>Короткие ссылки (БЕТА)</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>
         <target>Используйте приложение во время звонка.</target>
@@ -7776,6 +8473,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Используйте приложение одной рукой.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <target>Использовать веб-порт</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Выбор пользователя</target>
@@ -8148,11 +8850,6 @@ Repeat join request?</source>
         <target>Вы можете изменить это в настройках Интерфейса.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Вы можете настроить операторов в настройках Сети и серверов.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>Вы можете настроить серверы позже.</target>
@@ -8243,6 +8940,11 @@ Repeat join request?</source>
         <target>Вы можете увидеть ссылку-приглашение снова открыв соединение.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <target>Вы можете найти Ваши жалобы в Чате с админами.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Вы не можете отправлять сообщения!</target>
@@ -8325,6 +9027,11 @@ Repeat connection request?</source>
         <target>Вы отправили приглашение в группу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <target>Вы должны получать уведомления.</target>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Соединение с группой будет установлено, когда хост группы будет онлайн. Пожалуйста, подождите или проверьте позже!</target>
@@ -8390,11 +9097,6 @@ Repeat connection request?</source>
         <target>Ваши ICE серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Ваши SMP серверы</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Ваш адрес SimpleX</target>
@@ -8480,6 +9182,11 @@ Repeat connection request?</source>
         <target>Будет отправлен Ваш профиль **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Ваш профиль храниться на Вашем устройстве и отправляется только контактам.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам. SimpleX серверы не могут получить доступ к Вашему профилю.</target>
@@ -8490,11 +9197,6 @@ Repeat connection request?</source>
         <target>Ваш профиль был изменен. Если вы сохраните его, обновленный профиль будет отправлен всем вашим контактам.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Ваш профиль, контакты и доставленные сообщения хранятся на Вашем устройстве.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Случайный профиль</target>
@@ -8545,6 +9247,11 @@ Repeat connection request?</source>
         <target>наверху, затем выберите:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <target>принят %@</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>принятый звонок</target>
@@ -8555,6 +9262,11 @@ Repeat connection request?</source>
         <target>принятое приглашение</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <target>Вы приняты</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>админ</target>
@@ -8575,6 +9287,11 @@ Repeat connection request?</source>
         <target>шифрование согласовывается…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <target>все</target>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>все члены</target>
@@ -8590,6 +9307,11 @@ Repeat connection request?</source>
         <target>и %lld других событий</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <target>заархивированное сообщение о нарушении</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>попытки</target>
@@ -8628,7 +9350,8 @@ Repeat connection request?</source>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>заблокировано администратором</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8655,6 +9378,11 @@ Repeat connection request?</source>
         <target>входящий звонок…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <target>нельзя отправлять</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>отменил(a) %@</target>
@@ -8760,6 +9488,16 @@ Repeat connection request?</source>
         <target>контакт %1$@ изменён на %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <target>контакт удален</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <target>контакт выключен</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>у контакта есть e2e шифрование</target>
@@ -8770,6 +9508,11 @@ Repeat connection request?</source>
         <target>у контакта нет e2e шифрования</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <target>контакт не готов</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>создатель</target>
@@ -8798,7 +9541,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>по умолчанию (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8925,21 +9669,11 @@ Repeat connection request?</source>
         <target>ошибка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>событие произошло</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>истекло</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>для лучшей конфиденциальности метаданных.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>переслано</target>
@@ -8950,6 +9684,11 @@ Repeat connection request?</source>
         <target>группа удалена</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <target>группа удалена</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>профиль группы обновлен</target>
@@ -9075,6 +9814,11 @@ Repeat connection request?</source>
         <target>соединен(а)</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <target>член имеет старую версию</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>написать</target>
@@ -9105,20 +9849,20 @@ Repeat connection request?</source>
         <target>удалено %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <target>модератор</target>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>месяцев</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>без звука</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>никогда</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9140,6 +9884,11 @@ Repeat connection request?</source>
         <target>нет текста</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <target>не синхронизирован</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>читатель</target>
@@ -9149,8 +9898,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>нет</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9192,6 +9942,21 @@ Repeat connection request?</source>
         <target>peer-to-peer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <target>ожидает</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <target>ожидает утверждения</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <target>ожидает одобрения</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>
         <target>квантово-устойчивое e2e шифрование</target>
@@ -9207,6 +9972,11 @@ Repeat connection request?</source>
         <target>получено подтверждение…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <target>отклонён</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>отклонённый звонок</target>
@@ -9227,6 +9997,11 @@ Repeat connection request?</source>
         <target>удалён адрес контакта</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <target>удален из группы</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>удалена картинка профиля</target>
@@ -9237,11 +10012,26 @@ Repeat connection request?</source>
         <target>удалил(а) Вас из группы</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <target>запрос на вступление отклонён</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <target>запрошено соединение</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <target>рассмотрение</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <target>одобрен админами</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>сохранено</target>
@@ -9341,11 +10131,6 @@ last received msg: %2$@</source>
         <target>неизвестный статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>уведомлять</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>незащищённый</target>
@@ -9436,6 +10221,11 @@ last received msg: %2$@</source>
         <target>Вы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <target>Вы приняли этого члена</target>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>Вы приглашены в группу</target>
@@ -9510,7 +10300,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9547,7 +10337,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9569,7 +10359,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9577,6 +10367,11 @@ last received msg: %2$@</source>
         <target>%d новых сообщений</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <target>Из %d чатов</target>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>От: %@</target>
@@ -9592,16 +10387,11 @@ last received msg: %2$@</source>
         <target>Новые сообщения</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Новые сообщения в %d разговоре(ах)</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9623,7 +10413,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="ru" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/contents.json b/apps/ios/SimpleX Localizations/ru.xcloc/contents.json
index a28b0ed489..b49b25d653 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "ru",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff
index 4317787f67..528219b13a 100644
--- a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
+++ b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (สามารถคัดลอกได้)</target>
@@ -184,6 +172,10 @@
         <target>%d วินาที</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d ข้อความที่ถูกข้าม</target>
@@ -248,11 +240,6 @@
         <source>%lld new interface languages</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld วินาที</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld วินาที</target>
@@ -303,11 +290,6 @@
         <target>%u ข้อความที่ถูกข้าม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <note>No comment provided by engineer.</note>
@@ -316,11 +298,6 @@
         <source>(this device v%@)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <note>No comment provided by engineer.</note>
@@ -381,11 +358,6 @@
         <target>\*ตัวหนา*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -416,11 +388,6 @@
 - ประวัติการแก้ไข</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <note>time to disappear</note>
@@ -433,7 +400,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 วัน</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -448,12 +416,18 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 เดือน</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 สัปดาห์</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -478,11 +452,6 @@
         <target>30 วินาที</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -548,8 +517,16 @@
         <source>Accept</source>
         <target>รับ</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -568,7 +545,11 @@
         <source>Accept incognito</source>
         <target>ยอมรับโหมดไม่ระบุตัวตน</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -582,6 +563,10 @@
         <source>Acknowledgement errors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <note>No comment provided by engineer.</note>
@@ -595,6 +580,10 @@
         <source>Add friends</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
         <target>เพิ่มโปรไฟล์</target>
@@ -619,6 +608,10 @@
         <target>เพิ่มเข้าไปในอุปกรณ์อื่น</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>เพิ่มข้อความต้อนรับ</target>
@@ -684,6 +677,10 @@
         <source>Advanced settings</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>ข้อมูลแอปทั้งหมดถูกลบแล้ว.</target>
@@ -694,6 +691,10 @@
         <target>แชทและข้อความทั้งหมดจะถูกลบ - การดำเนินการนี้ไม่สามารถยกเลิกได้!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>ข้อมูลทั้งหมดจะถูกลบเมื่อถูกป้อน</target>
@@ -729,6 +730,14 @@
         <source>All profiles</source>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>ผู้ติดต่อทั้งหมดของคุณจะยังคงเชื่อมต่ออยู่.</target>
@@ -800,6 +809,10 @@
         <target>อนุญาตให้ลบข้อความที่ส่งไปแล้วอย่างถาวร</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
@@ -876,6 +889,10 @@
         <target>โปรไฟล์แชทที่ว่างเปล่าพร้อมชื่อที่ให้ไว้ได้ถูกสร้างขึ้นและแอปจะเปิดตามปกติ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>รับสาย</target>
@@ -899,6 +916,10 @@
         <source>App encrypts new local files (except videos).</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>ไอคอนแอป</target>
@@ -941,6 +962,18 @@
         <source>Apply to</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</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>
@@ -949,6 +982,18 @@
         <source>Archive contacts to chat later.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <note>No comment provided by engineer.</note>
@@ -1052,6 +1097,10 @@
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <note>No comment provided by engineer.</note>
@@ -1069,6 +1118,10 @@
         <source>Better notifications</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <note>No comment provided by engineer.</note>
@@ -1154,11 +1207,21 @@
         <source>Business chats</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>ตามโปรไฟล์แชท (ค่าเริ่มต้น) หรือ [โดยการเชื่อมต่อ](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (เบต้า)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>สิ้นสุดการโทรแล้ว!</target>
@@ -1203,7 +1266,7 @@
         <source>Cancel</source>
         <target>ยกเลิก</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1236,6 +1299,10 @@
         <target>เปลี่ยน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <note>authentication reason</note>
@@ -1284,7 +1351,7 @@
         <source>Change self-destruct passcode</source>
         <target>เปลี่ยนรหัสผ่านแบบทำลายตัวเอง</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
@@ -1374,11 +1441,23 @@
         <source>Chat will be deleted for you - this cannot be undone!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
         <target>แชท</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <note>No comment provided by engineer.</note>
@@ -1438,6 +1517,14 @@
         <target>ลบการสนทนา?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <note>No comment provided by engineer.</note>
@@ -1455,6 +1542,10 @@
         <source>Color mode</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>เปรียบเทียบไฟล์</target>
@@ -1485,14 +1576,6 @@
         <source>Conditions of use</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <note>No comment provided by engineer.</note>
@@ -1510,6 +1593,10 @@
         <target>กำหนดค่าเซิร์ฟเวอร์ ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>ยืนยัน</target>
@@ -1555,6 +1642,10 @@
         <source>Confirm upload</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>เชื่อมต่อ</target>
@@ -1654,6 +1745,10 @@ This is your own one-time link!</source>
         <source>Connection and servers status.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>การเชื่อมต่อผิดพลาด</target>
@@ -1664,6 +1759,15 @@ This is your own one-time link!</source>
         <target>การเชื่อมต่อผิดพลาด (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <note>No comment provided by engineer.</note>
@@ -1673,6 +1777,10 @@ This is your own one-time link!</source>
         <target>ส่งคําขอเชื่อมต่อแล้ว!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <note>No comment provided by engineer.</note>
@@ -1746,6 +1854,10 @@ This is your own one-time link!</source>
         <target>ผู้ติดต่อสามารถทําเครื่องหมายข้อความเพื่อลบได้ คุณจะสามารถดูได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>ดำเนินการต่อ</target>
@@ -1814,6 +1926,10 @@ This is your own one-time link!</source>
         <target>สร้างลิงค์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <note>No comment provided by engineer.</note>
@@ -2018,8 +2134,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>ลบ</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2057,6 +2172,10 @@ This is your own one-time link!</source>
         <source>Delete chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
         <target>ลบโปรไฟล์แชท</target>
@@ -2067,6 +2186,10 @@ This is your own one-time link!</source>
         <target>ลบโปรไฟล์แชทไหม?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
         <note>No comment provided by engineer.</note>
@@ -2144,6 +2267,10 @@ This is your own one-time link!</source>
         <target>ลบลิงค์ ไหม?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>ลบข้อความสมาชิก?</target>
@@ -2157,7 +2284,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>ลบข้อความ</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2193,6 +2320,10 @@ This is your own one-time link!</source>
         <target>ลบคิว</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <note>No comment provided by engineer.</note>
@@ -2337,6 +2468,14 @@ This is your own one-time link!</source>
         <target>ปิดการใช้งาน SimpleX Lock</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>ปิดการใช้งานสำหรับทุกคน</target>
@@ -2419,6 +2558,10 @@ This is your own one-time link!</source>
         <source>Do not use credentials with proxy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>อย่าสร้างที่อยู่</target>
@@ -2429,9 +2572,17 @@ This is your own one-time link!</source>
         <target>อย่าเปิดใช้งาน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>ไม่ต้องแสดงอีก</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2442,7 +2593,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2511,8 +2662,8 @@ This is your own one-time link!</source>
         <target>เปิดใช้งาน (เก็บการแทนที่)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2528,7 +2679,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>เปิดใช้งานการลบข้อความอัตโนมัติ?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2646,6 +2797,10 @@ This is your own one-time link!</source>
         <source>Encryption re-negotiation failed.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>ใส่รหัสผ่าน</target>
@@ -2716,6 +2871,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการรับคำขอติดต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>เกิดข้อผิดพลาดในการเพิ่มสมาชิก</target>
@@ -2748,6 +2907,10 @@ This is your own one-time link!</source>
         <source>Error changing to incognito!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2767,6 +2930,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการสร้างลิงก์กลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <note>No comment provided by engineer.</note>
@@ -2780,6 +2947,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการสร้างโปรไฟล์!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <note>No comment provided by engineer.</note>
@@ -2789,6 +2960,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการลบฐานข้อมูลแชท</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>เกิดข้อผิดพลาดในการลบแชท!</target>
@@ -2882,10 +3057,18 @@ This is your own one-time link!</source>
         <source>Error reconnecting servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>เกิดข้อผิดพลาดในการลบสมาชิก</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -2896,6 +3079,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการบันทึกเซิร์ฟเวอร์ ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>เกิดข้อผิดพลาดในการบันทึกโปรไฟล์กลุ่ม</target>
@@ -2971,6 +3158,10 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการซิงโครไนซ์การเชื่อมต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>เกิดข้อผิดพลาดในการอัปเดตลิงก์กลุ่ม</target>
@@ -3011,7 +3202,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>ข้อผิดพลาด: % @</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3045,6 +3238,10 @@ This is your own one-time link!</source>
         <source>Expand</source>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>ส่งออกฐานข้อมูล</target>
@@ -3083,24 +3280,41 @@ This is your own one-time link!</source>
         <target>รวดเร็วและไม่ต้องรอจนกว่าผู้ส่งจะออนไลน์!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>ที่ชอบ</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3218,6 +3432,10 @@ This is your own one-time link!</source>
         <target>การแก้ไขไม่สนับสนุนโดยสมาชิกกลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <note>servers error</note>
@@ -3231,6 +3449,10 @@ This is your own one-time link!</source>
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <note>No comment provided by engineer.</note>
@@ -3335,6 +3557,10 @@ Error: %2$@</source>
         <target>GIFs และสติกเกอร์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <note>message preview</note>
@@ -3436,11 +3662,19 @@ Error: %2$@</source>
         <target>กลุ่มจะถูกลบสำหรับคุณ - ไม่สามารถยกเลิกได้!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>ความช่วยเหลือ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>ซ่อนอยู่</target>
@@ -3498,6 +3732,10 @@ Error: %2$@</source>
         <source>How it helps privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>วิธี</target>
@@ -3630,6 +3868,14 @@ More improvements are coming soon!</source>
         <source>In-call sounds</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>ไม่ระบุตัวตน</target>
@@ -3718,6 +3964,26 @@ More improvements are coming soon!</source>
         <source>Interface colors</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <note>No comment provided by engineer.</note>
@@ -3968,6 +4234,18 @@ This is your link for group %@!</source>
         <source>Linked desktops</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>ข้อความสด!</target>
@@ -4051,10 +4329,18 @@ This is your link for group %@!</source>
         <target>สมาชิก</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
         <note>No comment provided by engineer.</note>
@@ -4078,6 +4364,10 @@ This is your link for group %@!</source>
         <target>สมาชิกจะถูกลบออกจากกลุ่ม - ไม่สามารถยกเลิกได้!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้</target>
@@ -4088,6 +4378,10 @@ This is your link for group %@!</source>
         <target>สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <note>No comment provided by engineer.</note>
@@ -4112,6 +4406,10 @@ This is your link for group %@!</source>
         <target>สมาชิกกลุ่มสามารถส่งข้อความเสียง</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <note>No comment provided by engineer.</note>
@@ -4209,6 +4507,10 @@ 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 in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <note>No comment provided by engineer.</note>
@@ -4297,6 +4599,10 @@ This is your link for group %@!</source>
         <target>กลั่นกรองที่: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>การปรับปรุงเพิ่มเติมกำลังจะมาเร็ว ๆ นี้!</target>
@@ -4322,7 +4628,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>ปิดเสียง</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4369,6 +4679,10 @@ This is your link for group %@!</source>
         <target>สถานะเครือข่าย</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>รหัสผ่านใหม่</target>
@@ -4427,6 +4741,10 @@ This is your link for group %@!</source>
         <target>บทบาทของสมาชิกใหม่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>ข้อความใหม่</target>
@@ -4451,6 +4769,22 @@ This is your link for group %@!</source>
         <target>ไม่มีรหัสผ่านสำหรับแอป</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>ไม่ได้เลือกผู้ติดต่อ</target>
@@ -4497,6 +4831,10 @@ This is your link for group %@!</source>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4544,6 +4882,14 @@ This is your link for group %@!</source>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>แพลตฟอร์มแรกที่ไม่มีตัวระบุผู้ใช้ - ถูกออกแบบให้เป็นส่วนตัว</target>
@@ -4553,6 +4899,10 @@ This is your link for group %@!</source>
         <source>Not compatible!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
@@ -4571,10 +4921,18 @@ This is your link for group %@!</source>
         <target>ปิดการแจ้งเตือน!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4596,7 +4954,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>ตกลง</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4653,6 +5012,14 @@ Requires compatible VPN.</source>
         <target>เฉพาะเจ้าของกลุ่มเท่านั้นที่สามารถเปิดใช้งานข้อความเสียงได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>มีเพียงคุณเท่านั้นที่สามารถแสดงปฏิกิริยาต่อข้อความได้</target>
@@ -4705,7 +5072,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -4734,6 +5101,10 @@ Requires compatible VPN.</source>
         <source>Open group</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</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>
@@ -4774,6 +5145,10 @@ Requires compatible VPN.</source>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</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>
@@ -4948,6 +5323,22 @@ Error: %@</source>
         <target>โปรดจัดเก็บรหัสผ่านอย่างปลอดภัย คุณจะไม่สามารถเปลี่ยนรหัสผ่านได้หากคุณทำรหัสผ่านหาย</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>อินเตอร์เฟซภาษาโปแลนด์</target>
@@ -4994,16 +5385,28 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>นิยามความเป็นส่วนตัวใหม่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>ชื่อไฟล์ส่วนตัว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <note>No comment provided by engineer.</note>
@@ -5072,6 +5475,10 @@ Error: %@</source>
         <target>ห้ามแสดงปฏิกิริยาต่อข้อความ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
@@ -5306,11 +5713,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ลดการใช้แบตเตอรี่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>ปฏิเสธ</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5321,6 +5740,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ปฏิเสธคำขอติดต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>ใช้เซิร์ฟเวอร์รีเลย์ในกรณีที่จำเป็นเท่านั้น บุคคลอื่นสามารถสังเกตที่อยู่ IP ของคุณได้</target>
@@ -5399,6 +5822,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ตอบ</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>ที่จำเป็น</target>
@@ -5482,9 +5949,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5531,13 +6002,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>บันทึก</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>บันทึก (และแจ้งผู้ติดต่อ)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>บันทึกและแจ้งผู้ติดต่อ</target>
@@ -5562,6 +6037,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>บันทึกโปรไฟล์กลุ่ม</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>บันทึกรหัสผ่านและเปิดแชท</target>
@@ -5782,6 +6261,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ส่งการแจ้งเตือน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>ส่งคําถามและความคิด</target>
@@ -5975,6 +6458,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ตั้ง 1 วัน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>ตั้งชื่อผู้ติดต่อ…</target>
@@ -5994,6 +6481,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ตั้งแทนการรับรองความถูกต้องของระบบ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>ตั้งรหัสผ่าน</target>
@@ -6035,7 +6530,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>แชร์</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6090,6 +6585,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>แชร์กับผู้ติดต่อ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <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>
@@ -6181,6 +6680,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>ที่อยู่ติดต่อ SimpleX</target>
@@ -6271,6 +6774,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>ใครบางคน</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</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>
@@ -6350,6 +6858,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Stopping chat</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <note>blur media</note>
@@ -6403,6 +6915,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>หมดเวลาการเชื่อมต่อ TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6465,13 +6981,17 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>การทดสอบล้มเหลวในขั้นตอน %@</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>เซิร์ฟเวอร์ทดสอบ</target>
@@ -6589,19 +7109,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>ฐานข้อมูลเก่าไม่ได้ถูกลบในระหว่างการย้ายข้อมูล แต่สามารถลบได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>โปรไฟล์นี้แชร์กับผู้ติดต่อของคุณเท่านั้น</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -6660,6 +7171,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>การดำเนินการนี้ไม่สามารถเลิกทำได้ - ข้อความที่ส่งและรับก่อนหน้าที่เลือกไว้จะถูกลบ อาจใช้เวลาหลายนาที</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>การดำเนินการนี้ไม่สามารถยกเลิกได้ - โปรไฟล์ ผู้ติดต่อ ข้อความ และไฟล์ของคุณจะสูญหายไปอย่างถาวร</target>
@@ -6698,10 +7213,18 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>This is your own one-time link!</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>การตั้งค่านี้ใช้กับข้อความในโปรไฟล์แชทปัจจุบันของคุณ **%@**</target>
@@ -6803,6 +7326,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>Toggle incognito when connecting.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <note>No comment provided by engineer.</note>
@@ -6955,13 +7482,17 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>เปิดเสียง</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>เปลี่ยนเป็นยังไม่ได้อ่าน</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <note>No comment provided by engineer.</note>
@@ -6985,6 +7516,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Update settings?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>การอัปเดตการตั้งค่าจะเชื่อมต่อไคลเอนต์กับเซิร์ฟเวอร์ทั้งหมดอีกครั้ง</target>
@@ -7038,6 +7573,14 @@ To connect, please ask your contact to create another connection link and check
         <target>ใช้เซิร์ฟเวอร์ SimpleX Chat ไหม?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>ใช้แชท</target>
@@ -7094,6 +7637,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
@@ -7102,6 +7649,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <note>No comment provided by engineer.</note>
@@ -7433,10 +7984,6 @@ Repeat join request?</source>
         <source>You can change it in Appearance settings.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -7520,6 +8067,10 @@ Repeat join request?</source>
         <source>You can view invitation link again in connection details.</source>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>คุณไม่สามารถส่งข้อความได้!</target>
@@ -7595,6 +8146,10 @@ Repeat connection request?</source>
         <target>คุณส่งคำเชิญเข้าร่วมกลุ่มแล้ว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>คุณจะเชื่อมต่อกับกลุ่มเมื่ออุปกรณ์โฮสต์ของกลุ่มออนไลน์อยู่ โปรดรอหรือตรวจสอบภายหลัง!</target>
@@ -7657,11 +8212,6 @@ Repeat connection request?</source>
         <target>เซิร์ฟเวอร์ ICE ของคุณ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>เซิร์ฟเวอร์ SMP ของคุณ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>ที่อยู่ SimpleX ของคุณ</target>
@@ -7742,6 +8292,11 @@ Repeat connection request?</source>
         <source>Your profile **%@** will be shared.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>โปรไฟล์นี้แชร์กับผู้ติดต่อของคุณเท่านั้น</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>โปรไฟล์ของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณและแชร์กับผู้ติดต่อของคุณเท่านั้น เซิร์ฟเวอร์ SimpleX ไม่สามารถดูโปรไฟล์ของคุณได้</target>
@@ -7751,11 +8306,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>โปรไฟล์ รายชื่อผู้ติดต่อ และข้อความที่ส่งของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>โปรไฟล์แบบสุ่มของคุณ</target>
@@ -7805,6 +8355,10 @@ Repeat connection request?</source>
         <target>ด้านบน จากนั้นเลือก:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>รับสายแล้ว</target>
@@ -7814,6 +8368,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>ผู้ดูแลระบบ</target>
@@ -7833,6 +8391,10 @@ Repeat connection request?</source>
         <target>เห็นด้วยกับการ encryption…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <note>feature role</note>
@@ -7846,6 +8408,10 @@ Repeat connection request?</source>
         <source>and %lld other events</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <note>No comment provided by engineer.</note>
@@ -7879,7 +8445,8 @@ Repeat connection request?</source>
       </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
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -7905,6 +8472,10 @@ Repeat connection request?</source>
         <target>กำลังโทร…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>ยกเลิก %@</target>
@@ -8008,6 +8579,14 @@ Repeat connection request?</source>
         <source>contact %1$@ changed to %2$@</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>ผู้ติดต่อมีการ encrypt จากต้นจนจบ</target>
@@ -8018,6 +8597,10 @@ Repeat connection request?</source>
         <target>ผู้ติดต่อไม่มีการ encrypt จากต้นจนจบ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>ผู้สร้าง</target>
@@ -8045,7 +8628,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>ค่าเริ่มต้น (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8169,18 +8753,10 @@ Repeat connection request?</source>
         <target>ผิดพลาด</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</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>
@@ -8190,6 +8766,10 @@ Repeat connection request?</source>
         <target>ลบกลุ่มแล้ว</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>อัปเดตโปรไฟล์กลุ่มแล้ว</target>
@@ -8312,6 +8892,10 @@ Repeat connection request?</source>
         <target>เชื่อมต่อสำเร็จ</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <note>No comment provided by engineer.</note>
@@ -8341,19 +8925,19 @@ Repeat connection request?</source>
         <target>กลั่นกรองโดย %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>เดือน</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>ไม่เคย</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8375,6 +8959,10 @@ Repeat connection request?</source>
         <target>ไม่มีข้อความ</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>ผู้สังเกตการณ์</target>
@@ -8384,8 +8972,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>ปิด</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -8424,6 +9013,18 @@ Repeat connection request?</source>
         <target>เพื่อนต่อเพื่อน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
@@ -8438,6 +9039,10 @@ Repeat connection request?</source>
         <target>ได้รับการยืนยัน…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>สายถูกปฏิเสธ</target>
@@ -8457,6 +9062,10 @@ Repeat connection request?</source>
         <source>removed contact address</source>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <note>profile update event chat item</note>
@@ -8466,10 +9075,22 @@ Repeat connection request?</source>
         <target>ลบคุณออกแล้ว</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <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>
@@ -8556,10 +9177,6 @@ last received msg: %2$@</source>
         <source>unknown status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <note>No comment provided by engineer.</note>
@@ -8644,6 +9261,10 @@ last received msg: %2$@</source>
         <source>you</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>คุณได้รับเชิญให้เข้าร่วมกลุ่ม</target>
@@ -8716,7 +9337,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -8752,7 +9373,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8774,13 +9395,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -8793,15 +9418,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -8820,7 +9441,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="th" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/th.xcloc/contents.json b/apps/ios/SimpleX Localizations/th.xcloc/contents.json
index 4562ab8385..ee6ee63ea9 100644
--- a/apps/ios/SimpleX Localizations/th.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/th.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "th",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff
index 261752aefc..d17a272016 100644
--- a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
+++ b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (kopyalanabilir)</target>
@@ -114,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>%@ sunucu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>%@ sunucular</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -200,6 +190,10 @@
         <target>%d saniye</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d okunmamış mesaj(lar)</target>
@@ -270,11 +264,6 @@
         <target>%lld yeni arayüz dilleri</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld saniye</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld saniye</target>
@@ -325,11 +314,6 @@
         <target>%u mesajlar atlandı.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(yeni)</target>
@@ -340,11 +324,6 @@
         <target>(bu cihaz v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Kişi ekle**: yeni bir davet bağlantısı oluşturmak için, ya da aldığın bağlantıyla bağlan.</target>
@@ -382,6 +361,7 @@
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
         <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target>edindiğiniz bağlantı aracılığıyla bağlanmak için **Linki tarayın/yapıştırın**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -409,11 +389,6 @@
         <target>\*kalın*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -450,11 +425,6 @@
 - düzenleme geçmişi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 saniye</target>
@@ -468,7 +438,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 gün</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -483,19 +454,27 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 ay</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 hafta</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>tek kullanımlık bağlantı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target>Tek kullanımlık bağlantı *sadece bir kişi ile* kullanılabilir - kişiyle veya uygulama içinden paylaş.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -513,11 +492,6 @@
         <target>30 saniye</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -574,6 +548,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>Operatörler hakkında</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -585,11 +560,20 @@
         <source>Accept</source>
         <target>Kabul et</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
+        <target>Koşulları kabul et</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
@@ -606,10 +590,15 @@
         <source>Accept incognito</source>
         <target>Takma adla kabul et</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
+        <target>Kabul edilmiş koşullar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
@@ -622,6 +611,10 @@
         <target>Onay hataları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Aktif bağlantılar</target>
@@ -634,6 +627,11 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>Arkadaş ekle</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -653,6 +651,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>Takım üyesi ekle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -660,6 +659,10 @@
         <target>Başka bir cihaza ekle</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Karşılama mesajı ekleyin</target>
@@ -667,14 +670,17 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>Takım üyelerini konuşmalara ekle.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>medya ve dosya sunucuları eklendi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>Mesaj sunucuları eklendi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
@@ -704,10 +710,12 @@
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
+        <target>adres mi yoksa tek kullanımlık bağlantı mı?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
+        <target>Adres seçenekleri</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -730,6 +738,10 @@
         <target>Gelişmiş ayarlar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Tüm uygulama verileri silinir.</target>
@@ -740,6 +752,10 @@
         <target>Tüm konuşmalar ve mesajlar silinecektir. Bu, geri alınamaz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Kullanıldığında bütün veriler silinir.</target>
@@ -757,6 +773,7 @@
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
         <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target>Bütün mesajlar ve dosyalar **uçtan-uca şifrelemeli** gönderilir, doğrudan mesajlarda kuantum güvenlik ile birlikte.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
@@ -779,6 +796,14 @@
         <target>Tüm Profiller</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Konuştuğun kişilerin tümü bağlı kalacaktır.</target>
@@ -854,6 +879,10 @@
         <target>Gönderilen mesajların kalıcı olarak silinmesine izin ver. (24 saat içinde)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
         <target>SimpleX bağlantıları göndilmesine izin ver.</target>
@@ -934,6 +963,10 @@
         <target>Verilen adla boş bir sohbet profili oluşturulur ve uygulama her zamanki gibi açılır.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Aramayı cevapla</target>
@@ -959,6 +992,10 @@
         <target>Uygulama yerel dosyaları şifreler (videolar dışında).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Uygulama simgesi</target>
@@ -1004,6 +1041,18 @@
         <target>Şuna uygula</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Arşivle ve yükle</target>
@@ -1014,6 +1063,18 @@
         <target>Daha sonra görüşmek için kişileri arşivleyin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Arşivli kişiler</target>
@@ -1124,6 +1185,10 @@
         <target>Daha iyi gruplar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Daha iyi mesaj tarihleri.</target>
@@ -1144,6 +1209,10 @@
         <target>Daha iyi bildirimler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Daha iyi güvenlik ✅</target>
@@ -1236,10 +1305,16 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>İş adresi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>İş konuşmaları</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1247,6 +1322,12 @@
         <target>Sohbet profiline göre (varsayılan) veya [bağlantıya göre](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Arama çoktan bitti!</target>
@@ -1296,7 +1377,7 @@
         <source>Cancel</source>
         <target>İptal et</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1333,8 +1414,13 @@
         <target>Değiştir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
+        <target>Sohbet profillerini değiştir</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
@@ -1381,18 +1467,21 @@
         <source>Change self-destruct passcode</source>
         <target>Kendini yok eden parolayı değiştir</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
+        <target>Sohbet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists" xml:space="preserve">
         <source>Chat already exists</source>
+        <target>Sohbet zaten mevcut</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists!" xml:space="preserve">
         <source>Chat already exists!</source>
+        <target>Sohbet zaten mevcut!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat colors" xml:space="preserve">
@@ -1472,10 +1561,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target>Sohbet bütün üyeler için silinecek - bu geri alınamaz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target>Sohbet senden silinecek - bu geri alınamaz!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1483,12 +1582,18 @@
         <target>Sohbetler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
+        <target>Her 20 dakikada mesajları kontrol et.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check messages when allowed." xml:space="preserve">
         <source>Check messages when allowed.</source>
+        <target>İzin verildiğinde mesajları kontrol et.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check server address and try again." xml:space="preserve">
@@ -1546,6 +1651,14 @@
         <target>Sohbet temizlensin mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Gizli notlar temizlensin mi?</target>
@@ -1566,6 +1679,10 @@
         <target>Renk modu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Dosya karşılaştır</target>
@@ -1583,38 +1700,37 @@
       </trans-unit>
       <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
         <source>Conditions accepted on: %@.</source>
+        <target>Şuradaki koşullar kabul edildi: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target>Koşullar operatör(ler) için kabul edildi: **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
         <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target>Koşullar çoktan operatör(ler) tarafından kabul edildi: **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions of use" xml:space="preserve">
         <source>Conditions of use</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target>Kullanım koşulları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
+        <target>Koşullar bu operatör(ler) için kabul edilecektir: **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve">
         <source>Conditions will be accepted on: %@.</source>
+        <target>Koşullar şu tarihte kabul edilecektir: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve">
         <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
+        <target>Koşullar etkin operatörler için şu tarihte otomatik olarak kabul edilecektir: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1622,6 +1738,10 @@
         <target>ICE sunucularını ayarla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Onayla</target>
@@ -1672,6 +1792,10 @@
         <target>Yüklemeyi onayla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Bağlan</target>
@@ -1791,6 +1915,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı ve sunucuların durumu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Bağlantı hatası</target>
@@ -1801,6 +1929,15 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı hatası (DOĞRULAMA)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Bağlantı bildirimleri</target>
@@ -1811,8 +1948,13 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı daveti gönderildi!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
+        <target>Bağlantı güvenliği</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection terminated" xml:space="preserve">
@@ -1890,6 +2032,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Kişiler silinmesi için mesajları işaretleyebilir; onları görüntüleyebilirsin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Devam et</target>
@@ -1932,6 +2078,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Create 1-time link" xml:space="preserve">
         <source>Create 1-time link</source>
+        <target>Tek kullanımlık bağlantı oluştur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
@@ -1964,6 +2111,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı oluştur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>[bilgisayar uygulaması] nda yeni bir profil oluştur(https://simplex.chat/downloads/). 💻</target>
@@ -2021,6 +2172,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve">
         <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
+        <target>Şu anki koşulların yazısı yüklenemiyor, bu bağlantıdan koşullara inceleyebilirsin:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Current passphrase…" xml:space="preserve">
@@ -2180,8 +2332,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <source>Delete</source>
         <target>Sil</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2220,6 +2371,11 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Delete chat" xml:space="preserve">
         <source>Delete chat</source>
+        <target>Sohbeti sil</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
@@ -2232,8 +2388,13 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Sohbet profili silinsin mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
+        <target>Sohbet silinsin mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2311,6 +2472,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı silinsin mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Kişinin mesajı silinsin mi?</target>
@@ -2324,7 +2489,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Mesajları sil</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2361,6 +2526,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Sırayı sil</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Tek seferde en fazla 20 mesaj silin.</target>
@@ -2502,6 +2671,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
         <source>Direct messages between members are prohibited in this chat.</source>
+        <target>Üyeler arası doğrudan mesajlar bu sohbette yasaktır.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
@@ -2519,6 +2689,14 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>SimpleX Kilidini devre dışı bırak</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Herkes için devre dışı bırak</target>
@@ -2609,6 +2787,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Kimlik bilgilerini proxy ile kullanmayın.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Adres oluşturma</target>
@@ -2619,9 +2801,17 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Etkinleştirme</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Yeniden gösterme</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2633,7 +2823,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <source>Download</source>
         <target>İndir</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2687,6 +2877,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="E2E encrypted notifications." xml:space="preserve">
         <source>E2E encrypted notifications.</source>
+        <target>Uçtan uca şifrelenmiş bildirimler.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Edit" xml:space="preserve">
@@ -2709,8 +2900,8 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Etkinleştir (geçersiz kılmaları koru)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2726,7 +2917,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Otomatik mesaj silme etkinleştirilsin mi?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2853,6 +3044,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Şifreleme yeniden anlaşma başarısız oldu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Şifre gir</target>
@@ -2920,6 +3115,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Error accepting conditions" xml:space="preserve">
         <source>Error accepting conditions</source>
+        <target>Koşulları kabul ederken hata oluştu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -2927,6 +3123,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı isteği kabul edilirken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Üye(ler) eklenirken hata oluştu</target>
@@ -2934,6 +3134,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Error adding server" xml:space="preserve">
         <source>Error adding server</source>
+        <target>Sunucu eklenirken hata oluştu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2961,6 +3162,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Gizli moduna geçerken hata oluştu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Yönlendirme sunucusu %@'ya bağlanırken hata oluştu. Lütfen daha sonra deneyin.</target>
@@ -2981,6 +3186,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Grup bağlantısı oluşturulurken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Kişi iletişimi oluşturulurken hata oluştu</target>
@@ -2996,6 +3205,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Profil oluşturulurken hata oluştu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Dosya şifresi çözülürken hata oluştu</target>
@@ -3006,6 +3219,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Sohbet veritabanı silinirken sorun oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Sohbet silinirken hata oluştu!</target>
@@ -3078,6 +3295,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Error loading servers" xml:space="preserve">
         <source>Error loading servers</source>
+        <target>Sunucular yüklenirken hata oluştu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
@@ -3105,10 +3323,18 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Hata sunuculara yeniden bağlanılıyor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Kişiyi silerken sorun oluştu</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3120,6 +3346,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>ICE sunucularını kaydedirken sorun oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Grup profili kaydedilirken sorun oluştu</target>
@@ -3137,6 +3367,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Error saving servers" xml:space="preserve">
         <source>Error saving servers</source>
+        <target>Sunucular kaydedilirken hata oluştu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
@@ -3199,6 +3430,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Bağlantı senkronizasyonunda hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Grup bağlantısı güncellenirken hata oluştu</target>
@@ -3211,6 +3446,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Error updating server" xml:space="preserve">
         <source>Error updating server</source>
+        <target>Sunucu güncellenirken hata oluştu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error updating settings" xml:space="preserve">
@@ -3241,7 +3477,9 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Hata: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3260,6 +3498,7 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="Errors in servers configuration." xml:space="preserve">
         <source>Errors in servers configuration.</source>
+        <target>Sunucular yapılandırılırken hatalar oluştu.</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
@@ -3277,6 +3516,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Genişlet</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Veritabanını dışarı aktar</target>
@@ -3317,20 +3560,32 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Hızlı ve gönderici çevrimiçi olana kadar beklemek yok!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Daha hızlı katılma ve daha güvenilir mesajlar.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Favori</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Dosya hatası</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3339,6 +3594,11 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Dosya bulunamadı - muhtemelen dosya silindi veya göderim iptal edildi.</target>
@@ -3464,8 +3724,13 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Düzeltme grup üyesi tarafından desteklenmiyor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
+        <target>Sohbet profili için %@:</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="For console" xml:space="preserve">
@@ -3475,14 +3740,21 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
       </trans-unit>
       <trans-unit id="For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." xml:space="preserve">
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
+        <target>Örneğin, eğer kişiniz SimpleX Sohbet sunucusundan mesajları alıyorsa, uygulamanız bu mesajları Flux sunucusundan iletecektir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
+        <target>Gizli yönlendirme için</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For social media" xml:space="preserve">
         <source>For social media</source>
+        <target>Sosyal medya için</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forward" xml:space="preserve">
@@ -3599,6 +3871,10 @@ Hata: %2$@</target>
         <target>GİFler ve çıkartmalar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>İyi öğlenler!</target>
@@ -3704,11 +3980,19 @@ Hata: %2$@</target>
         <target>Grup senden silinecektir - bu geri alınamaz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Yardım</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Gizlenmiş</target>
@@ -3761,12 +4045,18 @@ Hata: %2$@</target>
       </trans-unit>
       <trans-unit id="How it affects privacy" xml:space="preserve">
         <source>How it affects privacy</source>
+        <target>Gizliliğinizi nasıl etkiler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How it helps privacy" xml:space="preserve">
         <source>How it helps privacy</source>
+        <target>Gizliliğinizi nasıl arttırır</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Nasıl yapılır</target>
@@ -3909,6 +4199,14 @@ Daha fazla iyileştirme yakında geliyor!</target>
         <target>Arama içi sesler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Gizli</target>
@@ -4001,6 +4299,26 @@ Daha fazla iyileştirme yakında geliyor!</target>
         <target>Arayüz renkleri</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Geçersiz QR kodu</target>
@@ -4063,6 +4381,7 @@ Daha fazla iyileştirme yakında geliyor!</target>
       </trans-unit>
       <trans-unit id="Invite to chat" xml:space="preserve">
         <source>Invite to chat</source>
+        <target>Sohbete davet et</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invite to group" xml:space="preserve">
@@ -4225,10 +4544,12 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Leave chat" xml:space="preserve">
         <source>Leave chat</source>
+        <target>Sohbetten ayrıl</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave chat?" xml:space="preserve">
         <source>Leave chat?</source>
+        <target>Sohbetten ayrılsın mı?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -4271,6 +4592,18 @@ Bu senin grup için bağlantın %@!</target>
         <target>Bağlanmış bilgisayarlar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Canlı mesaj!</target>
@@ -4356,13 +4689,22 @@ Bu senin grup için bağlantın %@!</target>
         <target>Kişi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Üye inaktif</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
+        <target>Üye rolü "%@" olarak değiştirilecektir. Tüm sohbet üyeleri bilgilendirilecektir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
@@ -4384,6 +4726,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Üye gruptan çıkarılacaktır - bu geri alınamaz!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Grup üyeleri mesaj tepkileri ekleyebilir.</target>
@@ -4394,6 +4740,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Grup üyeleri SimpleX bağlantıları gönderebilir.</target>
@@ -4419,6 +4769,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Grup üyeleri sesli mesajlar gönderebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Menüler</target>
@@ -4529,6 +4883,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>%@ den gelen mesajlar gösterilecektir!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Mesajlar alındı</target>
@@ -4629,6 +4987,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>%@ de yönetildi</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Daha fazla geliştirmeler yakında geliyor!</target>
@@ -4656,7 +5018,11 @@ Bu senin grup için bağlantın %@!</target>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Sustur</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4706,6 +5072,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Ağ durumu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Yeni şifre</target>
@@ -4770,6 +5140,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Yeni üye rolü</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Yeni mesaj</target>
@@ -4794,6 +5168,22 @@ Bu senin grup için bağlantın %@!</target>
         <target>Uygulama şifresi yok</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Hiçbir kişi seçilmedi</target>
@@ -4843,6 +5233,10 @@ Bu senin grup için bağlantın %@!</target>
         <source>No media &amp; file servers.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <note>servers error</note>
@@ -4893,6 +5287,14 @@ Bu senin grup için bağlantın %@!</target>
         <source>No servers to send files.</source>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Herhangi bir kullanıcı tanımlayıcısı yok.</target>
@@ -4903,6 +5305,10 @@ Bu senin grup için bağlantın %@!</target>
         <target>Uyumlu değil!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Hiçbir şey seçilmedi</target>
@@ -4923,10 +5329,18 @@ Bu senin grup için bağlantın %@!</target>
         <target>Bildirimler devre dışı!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4949,7 +5363,8 @@ Bu senin grup için bağlantın %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Tamam</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5009,6 +5424,14 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <target>Yalnızca grup sahipleri sesli mesajları etkinleştirebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Sadece siz mesaj tepkileri ekleyebilirsiniz.</target>
@@ -5062,7 +5485,7 @@ VPN'nin etkinleştirilmesi gerekir.</target>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Aç</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5092,6 +5515,10 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <target>Grubu aç</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Başka bir cihaza açık geçiş</target>
@@ -5138,6 +5565,10 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <source>Or to share privately</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Diğer</target>
@@ -5329,6 +5760,22 @@ Hata: %@</target>
         <target>Lütfen parolayı güvenli bir şekilde saklayın, kaybederseniz parolayı DEĞİŞTİREMEZSİNİZ.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Lehçe arayüz</target>
@@ -5377,16 +5824,28 @@ Hata: %@</target>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>Gizlilik yeniden tanımlandı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Gizli dosya adları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Gizli mesaj yönlendirme</target>
@@ -5462,6 +5921,10 @@ Hata: %@</target>
         <target>Mesajlarda tepkileri yasakla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>SimpleX bağlantısı gönderimini yasakla.</target>
@@ -5719,11 +6182,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Azaltılmış pil kullanımı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Reddet</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5735,6 +6210,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Bağlanma isteğini reddet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Yönlendirici sunucusu yalnızca gerekli olduğunda kullanılır. Başka bir taraf IP adresinizi gözlemleyebilir.</target>
@@ -5820,6 +6299,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Yanıtla</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Gerekli</target>
@@ -5909,9 +6432,13 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Review conditions</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -5962,13 +6489,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Kaydet</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Kaydet (ve kişilere bildir)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Kaydet ve kişilere bildir</target>
@@ -5994,6 +6525,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Grup profilini kaydet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Parolayı kaydet ve sohbeti aç</target>
@@ -6234,6 +6769,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Bildirimler gönder</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Fikirler ve sorular gönderin</target>
@@ -6445,6 +6984,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>1 günlüğüne ayarla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Kişi adı gir…</target>
@@ -6465,6 +7008,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Sistem kimlik doğrulaması yerine ayarla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Şifre ayarla</target>
@@ -6509,7 +7060,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Paylaş</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6568,6 +7119,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Kişilerle paylaş</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>QR kodunu göster</target>
@@ -6665,6 +7220,10 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SimpleX address or 1-time link?</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX kişi adresi</target>
@@ -6765,6 +7324,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Biri</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Kare,daire, veya aralarında herhangi bir şey.</target>
@@ -6850,6 +7414,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Sohbeti durdurma</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Güçlü</target>
@@ -6910,6 +7478,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP bağlantı zaman aşımı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6977,13 +7549,17 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Geçici dosya hatası</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Test %@ adımında başarısız oldu.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Sunucuyu test et</target>
@@ -7104,19 +7680,10 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
         <target>Eski veritabanı geçiş sırasında kaldırılmadı, silinebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Profil sadece kişilerinle paylaşılacak.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -7179,6 +7746,10 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
         <target>Bu işlem geri alınamaz - seçilenden daha önce gönderilen ve alınan mesajlar silinecektir. Bu işlem birkaç dakika sürebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Bu işlem geri alınamaz - profiliniz, kişileriniz, mesajlarınız ve dosyalarınız geri döndürülemez şekilde kaybolacaktır.</target>
@@ -7224,11 +7795,19 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
         <target>Bu senin kendi tek kullanımlık bağlantın!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Bu bağlantı başka bir mobil cihazda kullanıldı, lütfen masaüstünde yeni bir bağlantı oluşturun.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Bu ayar, geçerli sohbet profiliniz **%@** deki mesajlara uygulanır.</target>
@@ -7337,6 +7916,10 @@ Bu özellik etkinleştirilmeden önce kimlik doğrulamayı tamamlamanız istenec
         <target>Bağlanırken gizli moda geçiş yap.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Araç çubuğu opaklığı</target>
@@ -7501,13 +8084,17 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Susturmayı kaldır</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Okunmamış</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Yeni üyelere 100e kadar en son mesajlar gönderildi.</target>
@@ -7533,6 +8120,10 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Ayarları güncelleyelim mi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Ayarların güncellenmesi, istemciyi tüm sunuculara yeniden bağlayacaktır.</target>
@@ -7592,6 +8183,14 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>SimpleX Chat sunucuları kullanılsın mı?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Sohbeti kullan</target>
@@ -7654,6 +8253,10 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>Görüşme sırasında uygulamayı kullanın.</target>
@@ -7664,6 +8267,10 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
         <target>Uygulamayı tek elle kullan.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Kullanıcı seçimi</target>
@@ -8032,10 +8639,6 @@ Katılma isteği tekrarlansın mı?</target>
         <target>Görünüm ayarlarından değiştirebilirsiniz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -8124,6 +8727,10 @@ Katılma isteği tekrarlansın mı?</target>
         <target>Bağlantı detaylarından davet bağlantısını yeniden görüntüleyebilirsin.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Mesajlar gönderemezsiniz!</target>
@@ -8206,6 +8813,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>Grup daveti gönderdiniz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Grup sahibinin cihazı çevrimiçi olduğunda gruba bağlanacaksınız, lütfen bekleyin veya daha sonra kontrol edin!</target>
@@ -8270,11 +8881,6 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>ICE sunucularınız</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>SMP sunucularınız</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>SimpleX adresin</target>
@@ -8360,6 +8966,11 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>Profiliniz **%@** paylaşılacaktır.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Profil sadece kişilerinle paylaşılacak.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Profiliniz cihazınızda saklanır ve sadece kişilerinizle paylaşılır. SimpleX sunucuları profilinizi göremez.</target>
@@ -8370,11 +8981,6 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>Profiliniz değiştirildi. Kaydederseniz, güncellenmiş profil tüm kişilerinize gönderilecektir.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Profiliniz, kişileriniz ve gönderilmiş mesajlar cihazınızda saklanır.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Rasgele profiliniz</target>
@@ -8424,6 +9030,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>yukarı çıkın, ardından seçin:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>kabul edilen arama</target>
@@ -8433,6 +9043,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>yönetici</target>
@@ -8453,6 +9067,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>şifreleme kabul ediliyor…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>bütün üyeler</target>
@@ -8468,6 +9086,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>ve %lld diğer etkinlikler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>denemeler</target>
@@ -8506,7 +9128,8 @@ Bağlantı isteği tekrarlansın mı?</target>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>yönetici tarafından engellendi</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8533,6 +9156,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>aranıyor…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>%@ iptal edildi</target>
@@ -8638,6 +9265,14 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>%1$@ kişisi %2$@ olarak değişti</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>kişi uçtan uca şifrelemeye sahiptir</target>
@@ -8648,6 +9283,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>kişi uçtan uca şifrelemeye sahip değildir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>oluşturan</target>
@@ -8676,7 +9315,8 @@ Bağlantı isteği tekrarlansın mı?</target>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>varsayılan (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8803,20 +9443,11 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>hata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>etkinlik yaşandı</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>Süresi dolmuş</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>iletildi</target>
@@ -8827,6 +9458,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>grup silindi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>grup profili güncellendi</target>
@@ -8952,6 +9587,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>bağlanıldı</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>mesaj</target>
@@ -8982,20 +9621,19 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>%@ tarafından yönetilmekte</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>aylar</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>Sessiz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>asla</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9017,6 +9655,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>metin yok</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>gözlemci</target>
@@ -9026,8 +9668,9 @@ Bağlantı isteği tekrarlansın mı?</target>
         <source>off</source>
         <target>kapalı</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9069,6 +9712,18 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>eşler arası</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>kuantuma dayanıklı e2e şifreleme</target>
@@ -9084,6 +9739,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>onaylama alındı…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>geri çevrilmiş çağrı</target>
@@ -9104,6 +9763,10 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>kişi adresi silindi</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>profil fotoğrafı silindi</target>
@@ -9114,10 +9777,22 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>sen kaldırıldın</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>kaydedildi</target>
@@ -9217,11 +9892,6 @@ son alınan msj: %2$@</target>
         <target>bilinmeyen durum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>susturmayı kaldır</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>korumasız</target>
@@ -9312,6 +9982,10 @@ son alınan msj: %2$@</target>
         <target>sen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>gruba davet edildiniz</target>
@@ -9386,7 +10060,7 @@ son alınan msj: %2$@</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9423,7 +10097,7 @@ son alınan msj: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9445,13 +10119,17 @@ son alınan msj: %2$@</target>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -9464,15 +10142,11 @@ son alınan msj: %2$@</target>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9494,7 +10168,7 @@ son alınan msj: %2$@</target>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="tr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/contents.json b/apps/ios/SimpleX Localizations/tr.xcloc/contents.json
index 6f74640a6b..2e32ea2080 100644
--- a/apps/ios/SimpleX Localizations/tr.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/tr.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "tr",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff
index d7dcc58dcd..687393cfab 100644
--- a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
+++ b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> (можна скопіювати)</target>
@@ -202,6 +190,10 @@
         <target>%d сек</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
         <target>%d пропущено повідомлення(ь)</target>
@@ -272,11 +264,6 @@
         <target>%lld нові мови інтерфейсу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld секунд(и)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld секунд</target>
@@ -327,11 +314,6 @@
         <target>%u повідомлень пропущено.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(новий)</target>
@@ -342,11 +324,6 @@
         <target>(цей пристрій v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**Додати контакт**: створити нове посилання-запрошення.</target>
@@ -412,11 +389,6 @@
         <target>\*жирний*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -453,11 +425,6 @@
 - історія редагування.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 сек</target>
@@ -471,7 +438,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1 день</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -486,12 +454,18 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1 місяць</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1 тиждень</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
@@ -518,11 +492,6 @@
         <target>30 секунд</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -579,6 +548,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>Про операторів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -590,8 +560,16 @@
         <source>Accept</source>
         <target>Прийняти</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
@@ -612,7 +590,11 @@
         <source>Accept incognito</source>
         <target>Прийняти інкогніто</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
@@ -629,6 +611,10 @@
         <target>Помилки підтвердження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>Активні з'єднання</target>
@@ -641,6 +627,11 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>Додайте друзів</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -660,6 +651,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>Додайте учасників команди</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -667,6 +659,10 @@
         <target>Додати до іншого пристрою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>Додати вітальне повідомлення</target>
@@ -674,6 +670,7 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>Додайте членів своєї команди до розмов.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
@@ -741,6 +738,10 @@
         <target>Додаткові налаштування</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>Всі дані програми видаляються.</target>
@@ -751,6 +752,10 @@
         <target>Всі чати та повідомлення будуть видалені - це неможливо скасувати!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>Всі дані стираються при введенні.</target>
@@ -791,6 +796,14 @@
         <target>Всі профілі</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>Всі ваші контакти залишаться на зв'язку.</target>
@@ -866,6 +879,10 @@
         <target>Дозволяє безповоротно видаляти надіслані повідомлення. (24 години)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <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>
         <target>Дозволити надсилати посилання SimpleX.</target>
@@ -946,6 +963,10 @@
         <target>Створюється порожній профіль чату з вказаним ім'ям, і додаток відкривається у звичайному режимі.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>Відповісти на дзвінок</target>
@@ -971,6 +992,10 @@
         <target>Додаток шифрує нові локальні файли (крім відео).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Іконка програми</target>
@@ -1016,6 +1041,18 @@
         <target>Звертатися до</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>Архівування та завантаження</target>
@@ -1026,6 +1063,18 @@
         <target>Архівуйте контакти, щоб поспілкуватися пізніше.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>Архівні контакти</target>
@@ -1136,6 +1185,10 @@
         <target>Кращі групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
         <target>Кращі дати повідомлень.</target>
@@ -1156,6 +1209,10 @@
         <target>Кращі сповіщення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
         <target>Краща безпека ✅</target>
@@ -1248,10 +1305,16 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>Адреса підприємства</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>Ділові чати</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1259,6 +1322,12 @@
         <target>Через профіль чату (за замовчуванням) або [за з'єднанням](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>Дзвінок вже закінчився!</target>
@@ -1308,7 +1377,7 @@
         <source>Cancel</source>
         <target>Скасувати</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1345,6 +1414,10 @@
         <target>Зміна</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
         <target>Зміна профілів користувачів</target>
@@ -1394,18 +1467,21 @@
         <source>Change self-destruct passcode</source>
         <target>Змінити пароль самознищення</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
+        <target>Чат</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists" xml:space="preserve">
         <source>Chat already exists</source>
+        <target>Чат вже існує</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists!" xml:space="preserve">
         <source>Chat already exists!</source>
+        <target>Чат вже існує!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat colors" xml:space="preserve">
@@ -1485,10 +1561,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target>Чат буде видалено для всіх учасників - цю дію неможливо скасувати!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target>Чат буде видалено для вас - цю дію неможливо скасувати!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1496,6 +1582,10 @@
         <target>Чати</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
         <target>Перевіряйте повідомлення кожні 20 хв.</target>
@@ -1561,6 +1651,14 @@
         <target>Відверта розмова?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>Чисті приватні нотатки?</target>
@@ -1581,6 +1679,10 @@
         <target>Колірний режим</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>Порівняти файл</target>
@@ -1616,16 +1718,6 @@
         <target>Умови використання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <target>Умови будуть прийняті для ввімкнених операторів через 30 днів.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
-        <target>Умови приймаються для оператора(ів): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
         <target>Для оператора(ів) приймаються умови: **%@**.</target>
@@ -1646,6 +1738,10 @@
         <target>Налаштування серверів ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>Підтвердити</target>
@@ -1696,6 +1792,10 @@
         <target>Підтвердити завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>Підключіться</target>
@@ -1815,6 +1915,10 @@ This is your own one-time link!</source>
         <target>Стан з'єднання та серверів.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>Помилка підключення</target>
@@ -1825,6 +1929,15 @@ This is your own one-time link!</source>
         <target>Помилка підключення (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>Сповіщення про підключення</target>
@@ -1835,6 +1948,10 @@ This is your own one-time link!</source>
         <target>Запит на підключення відправлено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
         <target>Безпека з'єднання</target>
@@ -1915,6 +2032,10 @@ This is your own one-time link!</source>
         <target>Контакти можуть позначати повідомлення для видалення; ви зможете їх переглянути.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>Продовжуйте</target>
@@ -1990,6 +2111,10 @@ This is your own one-time link!</source>
         <target>Створити посилання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>Створіть новий профіль у [desktop app](https://simplex.chat/downloads/). 💻</target>
@@ -2207,8 +2332,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>Видалити</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2247,6 +2371,11 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete chat" xml:space="preserve">
         <source>Delete chat</source>
+        <target>Видалити чат</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
@@ -2259,8 +2388,13 @@ This is your own one-time link!</source>
         <target>Видалити профіль чату?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
+        <target>Видалити чат?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2338,6 +2472,10 @@ This is your own one-time link!</source>
         <target>Видалити посилання?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>Видалити повідомлення учасника?</target>
@@ -2351,7 +2489,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>Видалити повідомлення</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2388,6 +2526,10 @@ This is your own one-time link!</source>
         <target>Видалити чергу</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>Видаляйте до 20 повідомлень одночасно.</target>
@@ -2530,6 +2672,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
         <source>Direct messages between members are prohibited in this chat.</source>
+        <target>У цьому чаті заборонені прямі повідомлення між учасниками.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
@@ -2547,6 +2690,14 @@ This is your own one-time link!</source>
         <target>Вимкнути SimpleX Lock</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>Вимкнути для всіх</target>
@@ -2637,6 +2788,10 @@ This is your own one-time link!</source>
         <target>Не використовуйте облікові дані з проксі.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Не створювати адресу</target>
@@ -2647,9 +2802,17 @@ This is your own one-time link!</source>
         <target>Не вмикати</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>Більше не показувати</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2661,7 +2824,7 @@ This is your own one-time link!</source>
         <source>Download</source>
         <target>Завантажити</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2738,9 +2901,8 @@ This is your own one-time link!</source>
         <target>Увімкнути (зберегти перевизначення)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
-        <target>Увімкнути Flux</target>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2756,7 +2918,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>Увімкнути автоматичне видалення повідомлень?</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2883,6 +3045,10 @@ This is your own one-time link!</source>
         <target>Повторне узгодження шифрування не вдалося.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>Введіть пароль</target>
@@ -2958,6 +3124,10 @@ This is your own one-time link!</source>
         <target>Помилка при прийнятті запиту на контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>Помилка додавання користувача(ів)</target>
@@ -2993,6 +3163,10 @@ This is your own one-time link!</source>
         <target>Помилка переходу на інкогніто!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Помилка підключення до сервера переадресації %@. Спробуйте пізніше.</target>
@@ -3013,6 +3187,10 @@ This is your own one-time link!</source>
         <target>Помилка створення посилання на групу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>Помилка при створенні контакту користувача</target>
@@ -3028,6 +3206,10 @@ This is your own one-time link!</source>
         <target>Помилка створення профілю!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>Помилка розшифрування файлу</target>
@@ -3038,6 +3220,10 @@ This is your own one-time link!</source>
         <target>Помилка видалення бази даних чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>Помилка видалення чату!</target>
@@ -3138,10 +3324,18 @@ This is your own one-time link!</source>
         <target>Помилка перепідключення серверів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>Помилка видалення учасника</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3153,6 +3347,10 @@ This is your own one-time link!</source>
         <target>Помилка збереження серверів ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>Помилка збереження профілю групи</target>
@@ -3233,6 +3431,10 @@ This is your own one-time link!</source>
         <target>Помилка синхронізації з'єднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>Помилка оновлення посилання на групу</target>
@@ -3276,7 +3478,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Помилка: %@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3313,6 +3517,10 @@ This is your own one-time link!</source>
         <target>Розгорнути</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>Експорт бази даних</target>
@@ -3353,20 +3561,32 @@ This is your own one-time link!</source>
         <target>Швидко і без очікування, поки відправник буде онлайн!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>Швидше приєднання та надійніші повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>Улюблений</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>Помилка файлу</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
@@ -3375,6 +3595,11 @@ This is your own one-time link!</source>
 %@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Файл не знайдено - найімовірніше, файл було видалено або скасовано.</target>
@@ -3500,6 +3725,10 @@ This is your own one-time link!</source>
         <target>Виправлення не підтримується учасником групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
         <target>Для профілю чату %@:</target>
@@ -3515,6 +3744,10 @@ This is your own one-time link!</source>
         <target>Наприклад, якщо ваш контакт отримує повідомлення через сервер SimpleX Chat, ваш додаток доставлятиме їх через сервер Flux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
         <target>Для приватної маршрутизації</target>
@@ -3639,6 +3872,10 @@ Error: %2$@</source>
         <target>GIF-файли та наклейки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>Доброго дня!</target>
@@ -3744,11 +3981,19 @@ Error: %2$@</source>
         <target>Група буде видалена для вас - це не може бути скасовано!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>Довідка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>Приховано</target>
@@ -3809,6 +4054,10 @@ Error: %2$@</source>
         <target>Як це захищає приватність</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>Як зробити</target>
@@ -3951,6 +4200,14 @@ More improvements are coming soon!</source>
         <target>Звуки вхідного дзвінка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>Інкогніто</target>
@@ -4043,6 +4300,26 @@ More improvements are coming soon!</source>
         <target>Кольори інтерфейсу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>Неправильний QR-код</target>
@@ -4105,6 +4382,7 @@ More improvements are coming soon!</source>
       </trans-unit>
       <trans-unit id="Invite to chat" xml:space="preserve">
         <source>Invite to chat</source>
+        <target>Запросити в чат</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invite to group" xml:space="preserve">
@@ -4267,10 +4545,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Leave chat" xml:space="preserve">
         <source>Leave chat</source>
+        <target>Вийти з чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave chat?" xml:space="preserve">
         <source>Leave chat?</source>
+        <target>Залишити чат?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -4313,6 +4593,18 @@ This is your link for group %@!</source>
         <target>Пов'язані робочі столи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>Живе повідомлення!</target>
@@ -4398,13 +4690,22 @@ This is your link for group %@!</source>
         <target>Учасник</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>Користувач неактивний</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
+        <target>Роль учасника буде змінено на "%@". Усі учасники чату отримають сповіщення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
@@ -4419,6 +4720,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from chat - this cannot be undone!</source>
+        <target>Учасника буде видалено з чату – це неможливо скасувати!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
@@ -4426,6 +4728,10 @@ This is your link for group %@!</source>
         <target>Учасник буде видалений з групи - це неможливо скасувати!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>Учасники групи можуть додавати реакції на повідомлення.</target>
@@ -4436,6 +4742,10 @@ This is your link for group %@!</source>
         <target>Учасники групи можуть безповоротно видаляти надіслані повідомлення. (24 години)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>Учасники групи можуть надсилати посилання SimpleX.</target>
@@ -4461,6 +4771,10 @@ This is your link for group %@!</source>
         <target>Учасники групи можуть надсилати голосові повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>Меню</target>
@@ -4571,6 +4885,10 @@ This is your link for group %@!</source>
         <target>Повідомлення від %@ будуть показані!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>Отримані повідомлення</target>
@@ -4671,6 +4989,10 @@ This is your link for group %@!</source>
         <target>Модерується за: %@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>Незабаром буде ще більше покращень!</target>
@@ -4699,7 +5021,11 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Вимкнути звук</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4751,6 +5077,10 @@ This is your link for group %@!</source>
         <target>Стан мережі</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>Новий пароль</target>
@@ -4816,6 +5146,10 @@ This is your link for group %@!</source>
         <target>Нова роль учасника</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>Нове повідомлення</target>
@@ -4841,6 +5175,22 @@ This is your link for group %@!</source>
         <target>Немає пароля програми</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>Не вибрано жодного контакту</target>
@@ -4891,6 +5241,10 @@ This is your link for group %@!</source>
         <target>Ніяких медіа та файлових серверів.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
         <target>Ніяких серверів повідомлень.</target>
@@ -4946,6 +5300,14 @@ This is your link for group %@!</source>
         <target>Немає серверів для надсилання файлів.</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>Ніяких ідентифікаторів користувачів.</target>
@@ -4956,6 +5318,10 @@ This is your link for group %@!</source>
         <target>Не сумісні!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>Нічого не вибрано</target>
@@ -4976,11 +5342,19 @@ This is your link for group %@!</source>
         <target>Сповіщення вимкнено!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
         <target>Сповіщення про приватність</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -5003,7 +5377,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Гаразд</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -5036,6 +5411,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
         <source>Only chat owners can change preferences.</source>
+        <target>Лише власники чату можуть змінювати налаштування.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
@@ -5063,6 +5439,14 @@ Requires compatible VPN.</source>
         <target>Тільки власники груп можуть вмикати голосові повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>Тільки ви можете додавати реакції на повідомлення.</target>
@@ -5116,7 +5500,7 @@ Requires compatible VPN.</source>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>Відкрито</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5148,6 +5532,10 @@ Requires compatible VPN.</source>
         <target>Відкрита група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>Відкрита міграція на інший пристрій</target>
@@ -5170,6 +5558,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Or import archive file" xml:space="preserve">
         <source>Or import archive file</source>
+        <target>Або імпортуйте архівний файл</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
@@ -5197,6 +5586,10 @@ Requires compatible VPN.</source>
         <target>Або поділитися приватно</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
         <source>Other</source>
         <target>Інше</target>
@@ -5388,6 +5781,22 @@ Error: %@</source>
         <target>Будь ласка, зберігайте пароль надійно, ви НЕ зможете змінити його, якщо втратите.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>Польський інтерфейс</target>
@@ -5435,6 +5844,11 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Privacy for your customers." xml:space="preserve">
         <source>Privacy for your customers.</source>
+        <target>Конфіденційність для ваших клієнтів.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
@@ -5442,11 +5856,19 @@ Error: %@</source>
         <target>Конфіденційність переглянута</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>Приватні імена файлів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>Маршрутизація приватних повідомлень</target>
@@ -5522,6 +5944,10 @@ Error: %@</source>
         <target>Заборонити реакції на повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>Заборонити надсилання посилань SimpleX.</target>
@@ -5779,11 +6205,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Зменшення використання акумулятора</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>Відхилити</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5795,6 +6233,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Відхилити запит на контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>Релейний сервер використовується тільки в разі потреби. Інша сторона може бачити вашу IP-адресу.</target>
@@ -5880,6 +6322,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Відповісти</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>Потрібно</target>
@@ -5970,10 +6456,13 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Умови перегляду</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <target>Перегляньте пізніше</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
@@ -6024,13 +6513,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>Зберегти</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>Зберегти (і повідомити контактам)</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>Зберегти та повідомити контакт</target>
@@ -6056,6 +6549,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Зберегти профіль групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>Збережіть пароль і відкрийте чат</target>
@@ -6296,6 +6793,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Надсилати сповіщення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>Надсилайте запитання та ідеї</target>
@@ -6511,6 +7012,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Встановити 1 день</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>Встановити ім'я контакту…</target>
@@ -6531,6 +7036,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Встановіть його замість аутентифікації системи.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>Встановити пароль</target>
@@ -6575,7 +7088,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>Поділіться</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6637,6 +7150,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Поділіться з контактами</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>Показати QR-код</target>
@@ -6694,6 +7211,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
         <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
+        <target>SimpleX Chat і Flux уклали угоду про включення серверів, керованих Flux, у додаток.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
@@ -6736,6 +7254,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>SimpleX адреса або одноразове посилання?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>Контактна адреса SimpleX</target>
@@ -6838,6 +7360,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Хтось</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>Квадрат, коло або щось середнє між ними.</target>
@@ -6923,6 +7450,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Зупинка чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>Сильний</target>
@@ -6983,6 +7514,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Тайм-аут TCP-з'єднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -7010,6 +7545,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
+        <target>Натисніть «Створити адресу SimpleX» у меню, щоб створити її пізніше.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap button " xml:space="preserve">
@@ -7050,13 +7586,17 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>Тимчасова помилка файлу</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>Тест завершився невдало на кроці %@.</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>Тестовий сервер</target>
@@ -7179,21 +7719,11 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Стара база даних не була видалена під час міграції, її можна видалити.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>Профіль доступний лише вашим контактам.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <target>Такі ж умови діятимуть і для оператора **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <target>Такі ж умови будуть застосовуватися до оператора(ів): **%@**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <target>Другий попередньо встановлений оператор у застосунку!</target>
@@ -7259,6 +7789,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Цю дію неможливо скасувати - повідомлення, надіслані та отримані раніше, ніж вибрані, будуть видалені. Це може зайняти кілька хвилин.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>Цю дію неможливо скасувати - ваш профіль, контакти, повідомлення та файли будуть безповоротно втрачені.</target>
@@ -7304,11 +7838,19 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>Це ваше власне одноразове посилання!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>Це посилання було використано з іншого мобільного пристрою, будь ласка, створіть нове посилання на робочому столі.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>Це налаштування застосовується до повідомлень у вашому поточному профілі чату **%@**.</target>
@@ -7421,6 +7963,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Увімкніть інкогніто при підключенні.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>Непрозорість панелі інструментів</target>
@@ -7586,13 +8132,17 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>Увімкнути звук</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>Непрочитане</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>Новим користувачам надсилається до 100 останніх повідомлень.</target>
@@ -7618,6 +8168,10 @@ To connect, please ask your contact to create another connection link and check
         <target>Оновити налаштування?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>Оновлення налаштувань призведе до перепідключення клієнта до всіх серверів.</target>
@@ -7678,6 +8232,14 @@ To connect, please ask your contact to create another connection link and check
         <target>Використовувати сервери SimpleX Chat?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>Використовуйте чат</target>
@@ -7743,6 +8305,10 @@ To connect, please ask your contact to create another connection link and check
         <target>Використовуйте сервери</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>Використовуйте додаток під час розмови.</target>
@@ -7753,6 +8319,10 @@ To connect, please ask your contact to create another connection link and check
         <target>Використовуйте додаток однією рукою.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Вибір користувача</target>
@@ -8060,6 +8630,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="You are already connected with %@." xml:space="preserve">
         <source>You are already connected with %@.</source>
+        <target>Ви вже підключені до %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connecting to %@." xml:space="preserve">
@@ -8124,11 +8695,6 @@ Repeat join request?</source>
         <target>Ви можете змінити його в налаштуваннях зовнішнього вигляду.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <target>Ви можете налаштувати операторів у налаштуваннях Мережі та серверів.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <target>Ви можете налаштувати сервери за допомогою налаштувань.</target>
@@ -8219,6 +8785,10 @@ Repeat join request?</source>
         <target>Ви можете переглянути посилання на запрошення ще раз у деталях підключення.</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Ви не можете надсилати повідомлення!</target>
@@ -8301,6 +8871,10 @@ Repeat connection request?</source>
         <target>Ви надіслали запрошення до групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>Ви будете підключені до групи, коли пристрій господаря групи буде в мережі, будь ласка, зачекайте або перевірте пізніше!</target>
@@ -8338,6 +8912,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this chat. Chat history will be preserved." xml:space="preserve">
         <source>You will stop receiving messages from this chat. Chat history will be preserved.</source>
+        <target>Ви більше не будете отримувати повідомлення з цього чату. Історія чату буде збережена.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will stop receiving messages from this group. Chat history will be preserved." xml:space="preserve">
@@ -8365,11 +8940,6 @@ Repeat connection request?</source>
         <target>Ваші сервери ICE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>Ваші SMP-сервери</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>Ваша адреса SimpleX</target>
@@ -8455,6 +9025,11 @@ Repeat connection request?</source>
         <target>Ваш профіль **%@** буде опублікований.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>Профіль доступний лише вашим контактам.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>Ваш профіль зберігається на вашому пристрої і доступний лише вашим контактам. Сервери SimpleX не бачать ваш профіль.</target>
@@ -8465,11 +9040,6 @@ Repeat connection request?</source>
         <target>Ваш профіль було змінено. Якщо ви збережете його, оновлений профіль буде надіслано всім вашим контактам.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>Ваш профіль, контакти та доставлені повідомлення зберігаються на вашому пристрої.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>Ваш випадковий профіль</target>
@@ -8520,6 +9090,10 @@ Repeat connection request?</source>
         <target>вище, а потім обирайте:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>прийнято виклик</target>
@@ -8527,8 +9101,13 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="accepted invitation" xml:space="preserve">
         <source>accepted invitation</source>
+        <target>прийняте запрошення</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>адмін</target>
@@ -8549,6 +9128,10 @@ Repeat connection request?</source>
         <target>узгодження шифрування…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>всі учасники</target>
@@ -8564,6 +9147,10 @@ Repeat connection request?</source>
         <target>та %lld інших подій</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>спроби</target>
@@ -8602,7 +9189,8 @@ Repeat connection request?</source>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>заблоковано адміністратором</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8629,6 +9217,10 @@ Repeat connection request?</source>
         <target>дзвоніть…</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>скасовано %@</target>
@@ -8734,6 +9326,14 @@ Repeat connection request?</source>
         <target>контакт %1$@ змінено на %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>контакт має шифрування e2e</target>
@@ -8744,6 +9344,10 @@ Repeat connection request?</source>
         <target>контакт не має шифрування e2e</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>творець</target>
@@ -8772,7 +9376,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>за замовчуванням (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8899,21 +9504,11 @@ Repeat connection request?</source>
         <target>помилка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>відбулася подія</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>закінчився</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <target>для кращої конфіденційності метаданих.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>переслано</target>
@@ -8924,6 +9519,10 @@ Repeat connection request?</source>
         <target>групу видалено</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>оновлено профіль групи</target>
@@ -9049,6 +9648,10 @@ Repeat connection request?</source>
         <target>з'єднаний</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>повідомлення</target>
@@ -9079,20 +9682,19 @@ Repeat connection request?</source>
         <target>модерується %@</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>місяців</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>приглушити</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>ніколи</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -9114,6 +9716,10 @@ Repeat connection request?</source>
         <target>без тексту</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>спостерігач</target>
@@ -9123,8 +9729,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>вимкнено</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9166,6 +9773,18 @@ Repeat connection request?</source>
         <target>одноранговий</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>квантово-стійке шифрування e2e</target>
@@ -9181,6 +9800,10 @@ Repeat connection request?</source>
         <target>отримали підтвердження…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>відхилений виклик</target>
@@ -9201,6 +9824,10 @@ Repeat connection request?</source>
         <target>видалено контактну адресу</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>видалено зображення профілю</target>
@@ -9211,10 +9838,23 @@ Repeat connection request?</source>
         <target>прибрали вас</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
+        <target>запит на підключення</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>збережено</target>
@@ -9314,11 +9954,6 @@ last received msg: %2$@</source>
         <target>невідомий статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>увімкнути звук</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>незахищені</target>
@@ -9409,6 +10044,10 @@ last received msg: %2$@</source>
         <target>ти</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>вас запрошують до групи</target>
@@ -9483,7 +10122,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9520,7 +10159,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9542,7 +10181,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
@@ -9550,6 +10189,10 @@ last received msg: %2$@</source>
         <target>%d нових подій</target>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <target>Від: %@</target>
@@ -9565,16 +10208,11 @@ last received msg: %2$@</source>
         <target>Нові повідомлення</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <target>Нові повідомлення в чатах %d</target>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9596,7 +10234,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="uk" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/contents.json b/apps/ios/SimpleX Localizations/uk.xcloc/contents.json
index 38238e7802..a93c702952 100644
--- a/apps/ios/SimpleX Localizations/uk.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/uk.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "uk",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff
index d6e548c6be..06ce8d4950 100644
--- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
+++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
@@ -2,21 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
-      <trans-unit id="&#10;" xml:space="preserve">
-        <source>
-</source>
-        <target>
-</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
-        <source> (</source>
-        <target> (</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve">
         <source> (can be copied)</source>
         <target> （可复制）</target>
@@ -114,10 +102,12 @@
       </trans-unit>
       <trans-unit id="%@ server" xml:space="preserve">
         <source>%@ server</source>
+        <target>服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ servers" xml:space="preserve">
         <source>%@ servers</source>
+        <target>服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
@@ -132,6 +122,7 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
+        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -156,18 +147,22 @@
       </trans-unit>
       <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
         <source>%d file(s) are still being downloaded.</source>
+        <target>仍在下载 %d 个文件。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) failed to download." xml:space="preserve">
         <source>%d file(s) failed to download.</source>
+        <target>%d 个文件下载失败。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were deleted." xml:space="preserve">
         <source>%d file(s) were deleted.</source>
+        <target>已刪除 %d 个文件。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
         <source>%d file(s) were not downloaded.</source>
+        <target>未能下载 %d 个文件。</target>
         <note>forward confirmation reason</note>
       </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
@@ -177,6 +172,7 @@
       </trans-unit>
       <trans-unit id="%d messages not forwarded" xml:space="preserve">
         <source>%d messages not forwarded</source>
+        <target>未转发 %d 条消息</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
@@ -194,9 +190,14 @@
         <target>%d 秒</target>
         <note>time interval</note>
       </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve">
+        <source>%d seconds(s)</source>
+        <target>%d 秒</target>
+        <note>delete after time</note>
+      </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
-        <target>%d 跳过消息</target>
+        <target>跳过的 %d 条消息</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="%d weeks" xml:space="preserve">
@@ -264,11 +265,6 @@
         <target>%lld 种新的界面语言</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
-        <source>%lld second(s)</source>
-        <target>%lld 秒</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld seconds" xml:space="preserve">
         <source>%lld seconds</source>
         <target>%lld 秒</target>
@@ -319,11 +315,6 @@
         <target>已跳过 %u 条消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="(" xml:space="preserve">
-        <source>(</source>
-        <target>(</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="(new)" xml:space="preserve">
         <source>(new)</source>
         <target>(新)</target>
@@ -334,11 +325,6 @@
         <target>(此设备 v%@)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=")" xml:space="preserve">
-        <source>)</source>
-        <target>)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve">
         <source>**Create 1-time link**: to create and share a new invitation link.</source>
         <target>**添加联系人**: 创建新的邀请链接，或通过您收到的链接进行连接.</target>
@@ -376,6 +362,7 @@
       </trans-unit>
       <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve">
         <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target>**扫描/粘贴链接**：用您收到的链接连接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
@@ -403,11 +390,6 @@
         <target>\*加粗*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=", " xml:space="preserve">
-        <source>, </source>
-        <target>, </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="- connect to [directory service](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) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
         <source>- connect to [directory service](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) (BETA)!
 - delivery receipts (up to 20 members).
@@ -444,11 +426,6 @@
 - 编辑消息历史。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="." xml:space="preserve">
-        <source>.</source>
-        <target>.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="0 sec" xml:space="preserve">
         <source>0 sec</source>
         <target>0 秒</target>
@@ -462,7 +439,8 @@
       <trans-unit id="1 day" xml:space="preserve">
         <source>1 day</source>
         <target>1天</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 hour" xml:space="preserve">
         <source>1 hour</source>
@@ -477,19 +455,28 @@
       <trans-unit id="1 month" xml:space="preserve">
         <source>1 month</source>
         <target>1月</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
       </trans-unit>
       <trans-unit id="1 week" xml:space="preserve">
         <source>1 week</source>
         <target>1周</target>
-        <note>time interval</note>
+        <note>delete after time
+time interval</note>
+      </trans-unit>
+      <trans-unit id="1 year" xml:space="preserve">
+        <source>1 year</source>
+        <target>1 年</target>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="1-time link" xml:space="preserve">
         <source>1-time link</source>
+        <target>一次性链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1-time link can be used *with one contact only* - share in person or via any messenger." xml:space="preserve">
         <source>1-time link can be used *with one contact only* - share in person or via any messenger.</source>
+        <target>一次性链接*只能给一名联系人*使用。当面或使用聊天应用分享链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="5 minutes" xml:space="preserve">
@@ -507,11 +494,6 @@
         <target>30秒</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=": " xml:space="preserve">
-        <source>: </source>
-        <target>: </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve">
         <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
@@ -568,6 +550,7 @@
       </trans-unit>
       <trans-unit id="About operators" xml:space="preserve">
         <source>About operators</source>
+        <target>关于运营方</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent" xml:space="preserve">
@@ -579,11 +562,20 @@
         <source>Accept</source>
         <target>接受</target>
         <note>accept contact request via notification
-   accept incoming call via notification
-   swipe action</note>
+accept incoming call via notification
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept as member" xml:space="preserve">
+        <source>Accept as member</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Accept as observer" xml:space="preserve">
+        <source>Accept as observer</source>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Accept conditions" xml:space="preserve">
         <source>Accept conditions</source>
+        <target>接受条款</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
@@ -600,10 +592,15 @@
         <source>Accept incognito</source>
         <target>接受隐身聊天</target>
         <note>accept contact request via notification
-   swipe action</note>
+swipe action</note>
+      </trans-unit>
+      <trans-unit id="Accept member" xml:space="preserve">
+        <source>Accept member</source>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Accepted conditions" xml:space="preserve">
         <source>Accepted conditions</source>
+        <target>已接受的条款</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
@@ -616,6 +613,11 @@
         <target>确认错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Active" xml:space="preserve">
+        <source>Active</source>
+        <target>活跃</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
         <source>Active connections</source>
         <target>活动连接</target>
@@ -628,6 +630,12 @@
       </trans-unit>
       <trans-unit id="Add friends" xml:space="preserve">
         <source>Add friends</source>
+        <target>添加好友</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Add list" xml:space="preserve">
+        <source>Add list</source>
+        <target>添加列表</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add profile" xml:space="preserve">
@@ -647,6 +655,7 @@
       </trans-unit>
       <trans-unit id="Add team members" xml:space="preserve">
         <source>Add team members</source>
+        <target>添加团队成员</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add to another device" xml:space="preserve">
@@ -654,6 +663,11 @@
         <target>添加另一设备</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Add to list" xml:space="preserve">
+        <source>Add to list</source>
+        <target>添加到列表</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Add welcome message" xml:space="preserve">
         <source>Add welcome message</source>
         <target>添加欢迎信息</target>
@@ -661,14 +675,17 @@
       </trans-unit>
       <trans-unit id="Add your team members to the conversations." xml:space="preserve">
         <source>Add your team members to the conversations.</source>
+        <target>将你的团队成员加入对话。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added media &amp; file servers" xml:space="preserve">
         <source>Added media &amp; file servers</source>
+        <target>已添加媒体和文件服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Added message servers" xml:space="preserve">
         <source>Added message servers</source>
+        <target>已添加消息服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Additional accent" xml:space="preserve">
@@ -698,10 +715,12 @@
       </trans-unit>
       <trans-unit id="Address or 1-time link?" xml:space="preserve">
         <source>Address or 1-time link?</source>
+        <target>地址还是一次性链接？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Address settings" xml:space="preserve">
         <source>Address settings</source>
+        <target>地址设置</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -724,6 +743,11 @@
         <target>高级设置</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All" xml:space="preserve">
+        <source>All</source>
+        <target>全部</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All app data is deleted." xml:space="preserve">
         <source>All app data is deleted.</source>
         <target>已删除所有应用程序数据。</target>
@@ -734,6 +758,11 @@
         <target>所有聊天记录和消息将被删除——这一行为无法撤销！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="All chats will be removed from the list %@, and the list deleted." xml:space="preserve">
+        <source>All chats will be removed from the list %@, and the list deleted.</source>
+        <target>列表 %@ 和其中全部聊天将被删除。</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
         <target>所有数据在输入后将被删除。</target>
@@ -751,6 +780,7 @@
       </trans-unit>
       <trans-unit id="All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." xml:space="preserve">
         <source>All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages.</source>
+        <target>所有消息和文件均通过**端到端加密**发送；私信以量子安全方式发送。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
@@ -773,6 +803,16 @@
         <target>所有配置文件</target>
         <note>profile dropdown</note>
       </trans-unit>
+      <trans-unit id="All reports will be archived for you." xml:space="preserve">
+        <source>All reports will be archived for you.</source>
+        <target>将为你存档所有举报。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All servers" xml:space="preserve">
+        <source>All servers</source>
+        <target>全部服务器</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
         <target>所有联系人会保持连接。</target>
@@ -848,6 +888,11 @@
         <target>允许不可撤回地删除已发送消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow to report messsages to moderators." xml:space="preserve">
+        <source>Allow to report messsages to moderators.</source>
+        <target>允许向 moderators 举报消息。</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>
         <target>允许发送 SimpleX 链接。</target>
@@ -928,6 +973,11 @@
         <target>已创建一个包含所提供名字的空白聊天资料，应用程序照常打开。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Another reason" xml:space="preserve">
+        <source>Another reason</source>
+        <target>另一个理由</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
         <source>Answer call</source>
         <target>接听来电</target>
@@ -953,6 +1003,11 @@
         <target>应用程序为新的本地文件（视频除外）加密。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="App group:" xml:space="preserve">
+        <source>App group:</source>
+        <target>应用组：</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>应用程序图标</target>
@@ -970,6 +1025,7 @@
       </trans-unit>
       <trans-unit id="App session" xml:space="preserve">
         <source>App session</source>
+        <target>应用会话</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
@@ -997,6 +1053,21 @@
         <target>应用于</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive" xml:space="preserve">
+        <source>Archive</source>
+        <target>存档</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive %lld reports?" xml:space="preserve">
+        <source>Archive %lld reports?</source>
+        <target>存档 %lld 个举报？</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive all reports?" xml:space="preserve">
+        <source>Archive all reports?</source>
+        <target>存档所有举报？</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
         <target>存档和上传</target>
@@ -1007,6 +1078,21 @@
         <target>存档联系人以便稍后聊天.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Archive report" xml:space="preserve">
+        <source>Archive report</source>
+        <target>存档举报</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive report?" xml:space="preserve">
+        <source>Archive report?</source>
+        <target>存档举报？</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive reports" xml:space="preserve">
+        <source>Archive reports</source>
+        <target>存档举报</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
         <target>已存档的联系人</target>
@@ -1079,6 +1165,7 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
+        <target>自动接受设置</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1108,6 +1195,7 @@
       </trans-unit>
       <trans-unit id="Better calls" xml:space="preserve">
         <source>Better calls</source>
+        <target>更佳的通话</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
@@ -1115,8 +1203,14 @@
         <target>更佳的群组</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Better groups performance" xml:space="preserve">
+        <source>Better groups performance</source>
+        <target>更好的群性能</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Better message dates." xml:space="preserve">
         <source>Better message dates.</source>
+        <target>更好的消息日期。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
@@ -1131,14 +1225,22 @@
       </trans-unit>
       <trans-unit id="Better notifications" xml:space="preserve">
         <source>Better notifications</source>
+        <target>更佳的通知</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better privacy and security" xml:space="preserve">
+        <source>Better privacy and security</source>
+        <target>更好的隐私和安全</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better security ✅" xml:space="preserve">
         <source>Better security ✅</source>
+        <target>更佳的安全性✅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better user experience" xml:space="preserve">
         <source>Better user experience</source>
+        <target>更佳的使用体验</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -1223,10 +1325,17 @@
       </trans-unit>
       <trans-unit id="Business address" xml:space="preserve">
         <source>Business address</source>
+        <target>企业地址</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Business chats" xml:space="preserve">
         <source>Business chats</source>
+        <target>企业聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Businesses" xml:space="preserve">
+        <source>Businesses</source>
+        <target>企业</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -1234,6 +1343,15 @@
         <target>通过聊天资料（默认）或者[通过连接](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="By using SimpleX Chat you agree to:&#10;- send only legal content in public groups.&#10;- respect other users – no spam." xml:space="preserve">
+        <source>By using SimpleX Chat you agree to:
+- send only legal content in public groups.
+- respect other users – no spam.</source>
+        <target>使用 SimpleX Chat 代表您同意：
+- 在公开群中只发送合法内容
+- 尊重其他用户 – 没有垃圾信息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
         <source>Call already ended!</source>
         <target>通话已结束！</target>
@@ -1283,7 +1401,7 @@
         <source>Cancel</source>
         <target>取消</target>
         <note>alert action
-   alert button</note>
+alert button</note>
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
@@ -1320,8 +1438,14 @@
         <target>更改</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Change automatic message deletion?" xml:space="preserve">
+        <source>Change automatic message deletion?</source>
+        <target>更改消息自动删除设置？</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Change chat profiles" xml:space="preserve">
         <source>Change chat profiles</source>
+        <target>更改聊天资料</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Change database passphrase?" xml:space="preserve">
@@ -1368,18 +1492,21 @@
         <source>Change self-destruct passcode</source>
         <target>更改自毁密码</target>
         <note>authentication reason
-   set passcode view</note>
+set passcode view</note>
       </trans-unit>
       <trans-unit id="Chat" xml:space="preserve">
         <source>Chat</source>
+        <target>聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists" xml:space="preserve">
         <source>Chat already exists</source>
+        <target>聊天已存在</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat already exists!" xml:space="preserve">
         <source>Chat already exists!</source>
+        <target>聊天已存在！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat colors" xml:space="preserve">
@@ -1444,6 +1571,7 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
+        <target>聊天偏好设置已修改。</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Chat profile" xml:space="preserve">
@@ -1458,10 +1586,20 @@
       </trans-unit>
       <trans-unit id="Chat will be deleted for all members - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for all members - this cannot be undone!</source>
+        <target>将为所有成员删除聊天 - 此操作无法撤销！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat will be deleted for you - this cannot be undone!" xml:space="preserve">
         <source>Chat will be deleted for you - this cannot be undone!</source>
+        <target>将为你删除聊天 - 此操作无法撤销！</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Chat with admins" xml:space="preserve">
+        <source>Chat with admins</source>
+        <note>chat toolbar</note>
+      </trans-unit>
+      <trans-unit id="Chat with member" xml:space="preserve">
+        <source>Chat with member</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1469,12 +1607,18 @@
         <target>聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Chats with members" xml:space="preserve">
+        <source>Chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Check messages every 20 min." xml:space="preserve">
         <source>Check messages every 20 min.</source>
+        <target>每 20 分钟检查消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check messages when allowed." xml:space="preserve">
         <source>Check messages when allowed.</source>
+        <target>在被允许时检查消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check server address and try again." xml:space="preserve">
@@ -1532,6 +1676,16 @@
         <target>清除对话吗？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Clear group?" xml:space="preserve">
+        <source>Clear group?</source>
+        <target>清除群？</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Clear or delete group?" xml:space="preserve">
+        <source>Clear or delete group?</source>
+        <target>清除还是删除群？</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
         <target>清除私密笔记？</target>
@@ -1552,6 +1706,11 @@
         <target>颜色模式</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Community guidelines violation" xml:space="preserve">
+        <source>Community guidelines violation</source>
+        <target>违反社区指导方针</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Compare file" xml:space="preserve">
         <source>Compare file</source>
         <target>对比文件</target>
@@ -1569,38 +1728,37 @@
       </trans-unit>
       <trans-unit id="Conditions accepted on: %@." xml:space="preserve">
         <source>Conditions accepted on: %@.</source>
+        <target>已于 %@ 接受条款。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions are accepted for the operator(s): **%@**.</source>
+        <target>已接受运营方 **%@** 的条款。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions are already accepted for these operator(s): **%@**." xml:space="preserve">
         <source>Conditions are already accepted for these operator(s): **%@**.</source>
+        <target>已经接受下列运营方的条款：**%@**。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions of use" xml:space="preserve">
         <source>Conditions of use</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for enabled operators after 30 days." xml:space="preserve">
-        <source>Conditions will be accepted for enabled operators after 30 days.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Conditions will be accepted for operator(s): **%@**." xml:space="preserve">
-        <source>Conditions will be accepted for operator(s): **%@**.</source>
+        <target>使用条款</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted for the operator(s): **%@**." xml:space="preserve">
         <source>Conditions will be accepted for the operator(s): **%@**.</source>
+        <target>将接受下列运营方的条款：**%@**。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be accepted on: %@." xml:space="preserve">
         <source>Conditions will be accepted on: %@.</source>
+        <target>将于 %@ 接受条款。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Conditions will be automatically accepted for enabled operators on: %@." xml:space="preserve">
         <source>Conditions will be automatically accepted for enabled operators on: %@.</source>
+        <target>将在 %@ 自动接受启用的运营方的条款。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1608,6 +1766,11 @@
         <target>配置 ICE 服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Configure server operators" xml:space="preserve">
+        <source>Configure server operators</source>
+        <target>配置服务器运营方</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Confirm" xml:space="preserve">
         <source>Confirm</source>
         <target>确认</target>
@@ -1658,6 +1821,11 @@
         <target>确认上传</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Confirmed" xml:space="preserve">
+        <source>Confirmed</source>
+        <target>已确定</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
         <source>Connect</source>
         <target>连接</target>
@@ -1777,6 +1945,11 @@ This is your own one-time link!</source>
         <target>连接和服务器状态。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection blocked" xml:space="preserve">
+        <source>Connection blocked</source>
+        <target>连接被阻止</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
         <source>Connection error</source>
         <target>连接错误</target>
@@ -1787,6 +1960,17 @@ This is your own one-time link!</source>
         <target>连接错误（AUTH）</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection is blocked by server operator:&#10;%@" xml:space="preserve">
+        <source>Connection is blocked by server operator:
+%@</source>
+        <target>连接被运营方 %@ 阻止</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connection not ready." xml:space="preserve">
+        <source>Connection not ready.</source>
+        <target>连接未就绪。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
         <target>连接通知</target>
@@ -1797,8 +1981,14 @@ This is your own one-time link!</source>
         <target>已发送连接请求！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection requires encryption renegotiation." xml:space="preserve">
+        <source>Connection requires encryption renegotiation.</source>
+        <target>连接需要加密重协商。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection security" xml:space="preserve">
         <source>Connection security</source>
+        <target>连接安全性</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection terminated" xml:space="preserve">
@@ -1876,6 +2066,11 @@ This is your own one-time link!</source>
         <target>联系人可以将信息标记为删除；您将可以查看这些信息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Content violates conditions of use" xml:space="preserve">
+        <source>Content violates conditions of use</source>
+        <target>内容违反使用条款</target>
+        <note>blocking reason</note>
+      </trans-unit>
       <trans-unit id="Continue" xml:space="preserve">
         <source>Continue</source>
         <target>继续</target>
@@ -1903,6 +2098,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
+        <target>拐角</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1917,6 +2113,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create 1-time link" xml:space="preserve">
         <source>Create 1-time link</source>
+        <target>创建一次性链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
@@ -1949,6 +2146,11 @@ This is your own one-time link!</source>
         <target>创建链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Create list" xml:space="preserve">
+        <source>Create list</source>
+        <target>创建列表</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
         <target>在[桌面应用程序](https://simplex.chat/downloads/)中创建新的个人资料。 💻</target>
@@ -2006,6 +2208,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Current conditions text couldn't be loaded, you can review conditions via this link:" xml:space="preserve">
         <source>Current conditions text couldn't be loaded, you can review conditions via this link:</source>
+        <target>无法加载当前条款文本，你可以通过此链接审阅条款：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Current passphrase…" xml:space="preserve">
@@ -2030,6 +2233,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Customizable message shape." xml:space="preserve">
         <source>Customizable message shape.</source>
+        <target>可自定义消息形状。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
@@ -2164,8 +2368,7 @@ This is your own one-time link!</source>
         <source>Delete</source>
         <target>删除</target>
         <note>alert action
-   chat item action
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
@@ -2204,6 +2407,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete chat" xml:space="preserve">
         <source>Delete chat</source>
+        <target>删除聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delete chat messages from your device." xml:space="preserve">
+        <source>Delete chat messages from your device.</source>
+        <target>从你的设备删除聊天消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
@@ -2216,8 +2425,13 @@ This is your own one-time link!</source>
         <target>删除聊天资料？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete chat with member?" xml:space="preserve">
+        <source>Delete chat with member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete chat?" xml:space="preserve">
         <source>Delete chat?</source>
+        <target>删除聊天？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2295,6 +2509,11 @@ This is your own one-time link!</source>
         <target>删除链接？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Delete list?" xml:space="preserve">
+        <source>Delete list?</source>
+        <target>删除列表？</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
         <target>删除成员消息？</target>
@@ -2308,7 +2527,7 @@ This is your own one-time link!</source>
       <trans-unit id="Delete messages" xml:space="preserve">
         <source>Delete messages</source>
         <target>删除消息</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
       </trans-unit>
       <trans-unit id="Delete messages after" xml:space="preserve">
         <source>Delete messages after</source>
@@ -2327,6 +2546,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
         <source>Delete or moderate up to 200 messages.</source>
+        <target>允许自行删除或管理员移除最多200条消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -2344,6 +2564,11 @@ This is your own one-time link!</source>
         <target>删除队列</target>
         <note>server test step</note>
       </trans-unit>
+      <trans-unit id="Delete report" xml:space="preserve">
+        <source>Delete report</source>
+        <target>删除举报</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
         <target>一次最多删除 20 条信息。</target>
@@ -2381,6 +2606,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delivered even when Apple drops them." xml:space="preserve">
         <source>Delivered even when Apple drops them.</source>
+        <target>已送达，即使苹果已将其删除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
@@ -2465,7 +2691,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
         <source>Device authentication is disabled. Turning off SimpleX Lock.</source>
-        <target>设备验证被禁用。关闭 SimpleX 锁定。</target>
+        <target>设备验证已禁用。 SimpleX 已解锁。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
@@ -2485,11 +2711,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited in this chat." xml:space="preserve">
         <source>Direct messages between members are prohibited in this chat.</source>
+        <target>此群禁止成员间私信。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages between members are prohibited." xml:space="preserve">
         <source>Direct messages between members are prohibited.</source>
-        <target>此群中禁止成员之间私信。</target>
+        <target>此群禁止成员间私信。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
@@ -2502,6 +2729,16 @@ This is your own one-time link!</source>
         <target>禁用 SimpleX 锁定</target>
         <note>authentication reason</note>
       </trans-unit>
+      <trans-unit id="Disable automatic message deletion?" xml:space="preserve">
+        <source>Disable automatic message deletion?</source>
+        <target>禁用消息自动销毁？</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Disable delete messages" xml:space="preserve">
+        <source>Disable delete messages</source>
+        <target>停用消息删除</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
         <source>Disable for all</source>
         <target>全部禁用</target>
@@ -2589,6 +2826,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
         <source>Do not use credentials with proxy.</source>
+        <target>代理不使用身份验证凭据。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Documents:" xml:space="preserve">
+        <source>Documents:</source>
+        <target>文档：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
@@ -2601,9 +2844,19 @@ This is your own one-time link!</source>
         <target>不要启用</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Don't miss important messages." xml:space="preserve">
+        <source>Don't miss important messages.</source>
+        <target>不错过重要消息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
         <target>不再显示</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <target>完成</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2615,7 +2868,7 @@ This is your own one-time link!</source>
         <source>Download</source>
         <target>下载</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2634,6 +2887,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Download files" xml:space="preserve">
         <source>Download files</source>
+        <target>下载文件</target>
         <note>alert action</note>
       </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
@@ -2668,6 +2922,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="E2E encrypted notifications." xml:space="preserve">
         <source>E2E encrypted notifications.</source>
+        <target>端到端加密的通知。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Edit" xml:space="preserve">
@@ -2690,8 +2945,9 @@ This is your own one-time link!</source>
         <target>启用（保持覆盖）</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enable Flux" xml:space="preserve">
-        <source>Enable Flux</source>
+      <trans-unit id="Enable Flux in Network &amp; servers settings for better metadata privacy." xml:space="preserve">
+        <source>Enable Flux in Network &amp; servers settings for better metadata privacy.</source>
+        <target>在“网络&amp;服务器”设置中启用 Flux，更好地保护元数据隐私。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
@@ -2707,7 +2963,7 @@ This is your own one-time link!</source>
       <trans-unit id="Enable automatic message deletion?" xml:space="preserve">
         <source>Enable automatic message deletion?</source>
         <target>启用自动删除消息？</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
@@ -2834,6 +3090,11 @@ This is your own one-time link!</source>
         <target>加密重协商失败了。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Encryption renegotiation in progress." xml:space="preserve">
+        <source>Encryption renegotiation in progress.</source>
+        <target>正进行加密重协商。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
         <source>Enter Passcode</source>
         <target>输入密码</target>
@@ -2901,6 +3162,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error accepting conditions" xml:space="preserve">
         <source>Error accepting conditions</source>
+        <target>接受条款出错</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error accepting contact request" xml:space="preserve">
@@ -2908,6 +3170,10 @@ This is your own one-time link!</source>
         <target>接受联系人请求错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error accepting member" xml:space="preserve">
+        <source>Error accepting member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error adding member(s)" xml:space="preserve">
         <source>Error adding member(s)</source>
         <target>添加成员错误</target>
@@ -2915,6 +3181,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error adding server" xml:space="preserve">
         <source>Error adding server</source>
+        <target>添加服务器出错</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2924,6 +3191,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
+        <target>更改连接资料出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2938,6 +3206,11 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
+        <target>切换至隐身聊天出错！</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Error checking token status" xml:space="preserve">
+        <source>Error checking token status</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2960,6 +3233,11 @@ This is your own one-time link!</source>
         <target>创建群组链接错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating list" xml:space="preserve">
+        <source>Error creating list</source>
+        <target>创建列表出错</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
         <target>创建成员联系人时出错</target>
@@ -2975,6 +3253,11 @@ This is your own one-time link!</source>
         <target>创建资料错误！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error creating report" xml:space="preserve">
+        <source>Error creating report</source>
+        <target>创建举报出错</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
         <target>解密文件时出错</target>
@@ -2985,6 +3268,10 @@ This is your own one-time link!</source>
         <target>删除聊天数据库错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error deleting chat with member" xml:space="preserve">
+        <source>Error deleting chat with member</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error deleting chat!" xml:space="preserve">
         <source>Error deleting chat!</source>
         <target>删除聊天错误！</target>
@@ -3057,10 +3344,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error loading servers" xml:space="preserve">
         <source>Error loading servers</source>
+        <target>加载服务器出错</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
+        <target>迁移设置出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -3083,10 +3372,20 @@ This is your own one-time link!</source>
         <target>重新连接服务器时出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error registering for notifications" xml:space="preserve">
+        <source>Error registering for notifications</source>
+        <target>注册消息推送出错</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error removing member" xml:space="preserve">
         <source>Error removing member</source>
         <target>删除成员错误</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Error reordering lists" xml:space="preserve">
+        <source>Error reordering lists</source>
+        <target>重排列表出错</target>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error resetting statistics" xml:space="preserve">
         <source>Error resetting statistics</source>
@@ -3098,6 +3397,11 @@ This is your own one-time link!</source>
         <target>保存 ICE 服务器错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error saving chat list" xml:space="preserve">
+        <source>Error saving chat list</source>
+        <target>保存聊天列表出错</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Error saving group profile" xml:space="preserve">
         <source>Error saving group profile</source>
         <target>保存群组资料错误</target>
@@ -3115,6 +3419,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error saving servers" xml:space="preserve">
         <source>Error saving servers</source>
+        <target>保存服务器出错</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
@@ -3164,6 +3469,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
+        <target>切换配置文件出错</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
@@ -3176,6 +3482,11 @@ This is your own one-time link!</source>
         <target>同步连接错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Error testing server connection" xml:space="preserve">
+        <source>Error testing server connection</source>
+        <target>检验服务器连接出错</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
         <source>Error updating group link</source>
         <target>更新群组链接错误</target>
@@ -3188,6 +3499,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error updating server" xml:space="preserve">
         <source>Error updating server</source>
+        <target>更新服务器出错</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Error updating settings" xml:space="preserve">
@@ -3218,7 +3530,9 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>错误： ％@</target>
-        <note>alert message</note>
+        <note>alert message
+file error text
+snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3237,6 +3551,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Errors in servers configuration." xml:space="preserve">
         <source>Errors in servers configuration.</source>
+        <target>服务器配置有错误。</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
@@ -3254,6 +3569,11 @@ This is your own one-time link!</source>
         <target>展开</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Expired" xml:space="preserve">
+        <source>Expired</source>
+        <target>已过期</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
         <source>Export database</source>
         <target>导出数据库</target>
@@ -3294,26 +3614,50 @@ This is your own one-time link!</source>
         <target>快速且无需等待发件人在线！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster deletion of groups." xml:space="preserve">
+        <source>Faster deletion of groups.</source>
+        <target>更快地删除群。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
         <target>加入速度更快、信息更可靠。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Faster sending messages." xml:space="preserve">
+        <source>Faster sending messages.</source>
+        <target>更快发送消息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
         <source>Favorite</source>
         <target>最喜欢</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target>收藏</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
         <target>文件错误</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="File errors:&#10;%@" xml:space="preserve">
         <source>File errors:
 %@</source>
+        <target>文件错误：
+%@</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="File is blocked by server operator:&#10;%@." xml:space="preserve">
+        <source>File is blocked by server operator:
+%@.</source>
+        <target>文件被服务器运营方阻止：
+%@。</target>
+        <note>file error text</note>
+      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>找不到文件 - 很可能文件已被删除或取消。</target>
@@ -3439,8 +3783,14 @@ This is your own one-time link!</source>
         <target>修复群组成员不支持的问题</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="For all moderators" xml:space="preserve">
+        <source>For all moderators</source>
+        <target>所有 moderators</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="For chat profile %@:" xml:space="preserve">
         <source>For chat profile %@:</source>
+        <target>为聊天资料 %@：</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="For console" xml:space="preserve">
@@ -3450,14 +3800,22 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." xml:space="preserve">
         <source>For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</source>
+        <target>比如，如果你通过 SimpleX 服务器收到消息，应用会通过 Flux 服务器传送它们。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="For me" xml:space="preserve">
+        <source>For me</source>
+        <target>仅自己</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For private routing" xml:space="preserve">
         <source>For private routing</source>
+        <target>用于私密路由</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="For social media" xml:space="preserve">
         <source>For social media</source>
+        <target>用于社交媒体</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forward" xml:space="preserve">
@@ -3467,6 +3825,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Forward %d message(s)?" xml:space="preserve">
         <source>Forward %d message(s)?</source>
+        <target>转发 %d 条消息？</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
@@ -3476,14 +3835,17 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Forward messages" xml:space="preserve">
         <source>Forward messages</source>
+        <target>已转发的消息</target>
         <note>alert action</note>
       </trans-unit>
       <trans-unit id="Forward messages without files?" xml:space="preserve">
         <source>Forward messages without files?</source>
+        <target>仅转发消息不转发文件？</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
         <source>Forward up to 20 messages at once.</source>
+        <target>一次转发最多20条消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
@@ -3498,6 +3860,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Forwarding %lld messages" xml:space="preserve">
         <source>Forwarding %lld messages</source>
+        <target>正在转发 %lld 条消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
@@ -3569,6 +3932,11 @@ Error: %2$@</source>
         <target>GIF 和贴纸</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Get notified when mentioned." xml:space="preserve">
+        <source>Get notified when mentioned.</source>
+        <target>被提及时收到通知。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Good afternoon!" xml:space="preserve">
         <source>Good afternoon!</source>
         <target>下午好！</target>
@@ -3674,11 +4042,21 @@ Error: %2$@</source>
         <target>将为您删除群组——此操作无法撤消！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Groups" xml:space="preserve">
+        <source>Groups</source>
+        <target>群</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Help" xml:space="preserve">
         <source>Help</source>
         <target>帮助</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Help admins moderating their groups." xml:space="preserve">
+        <source>Help admins moderating their groups.</source>
+        <target>帮助管理员管理群组。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Hidden" xml:space="preserve">
         <source>Hidden</source>
         <target>隐藏</target>
@@ -3731,12 +4109,19 @@ Error: %2$@</source>
       </trans-unit>
       <trans-unit id="How it affects privacy" xml:space="preserve">
         <source>How it affects privacy</source>
+        <target>它如何影响隐私</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How it helps privacy" xml:space="preserve">
         <source>How it helps privacy</source>
+        <target>它如何帮助隐私</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="How it works" xml:space="preserve">
+        <source>How it works</source>
+        <target>工作原理</target>
+        <note>alert button</note>
+      </trans-unit>
       <trans-unit id="How to" xml:space="preserve">
         <source>How to</source>
         <target>如何</target>
@@ -3764,6 +4149,7 @@ Error: %2$@</source>
       </trans-unit>
       <trans-unit id="IP address" xml:space="preserve">
         <source>IP address</source>
+        <target>IP 地址</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
@@ -3844,6 +4230,8 @@ Error: %2$@</source>
       <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
         <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
+        <target>改善传送，降低流量使用。
+更多改进即将推出！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -3876,6 +4264,16 @@ More improvements are coming soon!</source>
         <target>通话声音</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Inappropriate content" xml:space="preserve">
+        <source>Inappropriate content</source>
+        <target>不当内容</target>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Inappropriate profile" xml:space="preserve">
+        <source>Inappropriate profile</source>
+        <target>不当个人资料</target>
+        <note>report reason</note>
+      </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
         <target>隐身聊天</target>
@@ -3968,6 +4366,31 @@ More improvements are coming soon!</source>
         <target>界面颜色</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Invalid" xml:space="preserve">
+        <source>Invalid</source>
+        <target>无效</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (bad token)" xml:space="preserve">
+        <source>Invalid (bad token)</source>
+        <target>Token 无效</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (expired)" xml:space="preserve">
+        <source>Invalid (expired)</source>
+        <target>无效（已过期）</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (unregistered)" xml:space="preserve">
+        <source>Invalid (unregistered)</source>
+        <target>无效（未注册）</target>
+        <note>token status text</note>
+      </trans-unit>
+      <trans-unit id="Invalid (wrong topic)" xml:space="preserve">
+        <source>Invalid (wrong topic)</source>
+        <target>无效（话题有误）</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
         <target>无效的二维码</target>
@@ -4030,6 +4453,7 @@ More improvements are coming soon!</source>
       </trans-unit>
       <trans-unit id="Invite to chat" xml:space="preserve">
         <source>Invite to chat</source>
+        <target>邀请加入聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invite to group" xml:space="preserve">
@@ -4192,10 +4616,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Leave chat" xml:space="preserve">
         <source>Leave chat</source>
+        <target>离开聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave chat?" xml:space="preserve">
         <source>Leave chat?</source>
+        <target>离开聊天？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Leave group" xml:space="preserve">
@@ -4238,6 +4664,21 @@ This is your link for group %@!</source>
         <target>已链接桌面</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="List" xml:space="preserve">
+        <source>List</source>
+        <target>列表</target>
+        <note>swipe action</note>
+      </trans-unit>
+      <trans-unit id="List name and emoji should be different for all lists." xml:space="preserve">
+        <source>List name and emoji should be different for all lists.</source>
+        <target>所有列表的名称和表情符号都应不同。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="List name..." xml:space="preserve">
+        <source>List name...</source>
+        <target>列表名…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
         <source>Live message!</source>
         <target>实时消息！</target>
@@ -4323,13 +4764,23 @@ This is your link for group %@!</source>
         <target>成员</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member admission" xml:space="preserve">
+        <source>Member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Member inactive" xml:space="preserve">
         <source>Member inactive</source>
         <target>成员不活跃</target>
         <note>item status text</note>
       </trans-unit>
+      <trans-unit id="Member reports" xml:space="preserve">
+        <source>Member reports</source>
+        <target>成员举报</target>
+        <note>chat feature</note>
+      </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All chat members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All chat members will be notified.</source>
+        <target>将变更成员角色为“%@”。所有成员都会收到通知。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
@@ -4344,6 +4795,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Member will be removed from chat - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from chat - this cannot be undone!</source>
+        <target>将从聊天中删除成员 - 此操作无法撤销！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
@@ -4351,6 +4803,10 @@ This is your link for group %@!</source>
         <target>成员将被移出群组——此操作无法撤消！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Member will join the group, accept member?" xml:space="preserve">
+        <source>Member will join the group, accept member?</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Members can add message reactions." xml:space="preserve">
         <source>Members can add message reactions.</source>
         <target>群组成员可以添加信息回应。</target>
@@ -4361,6 +4817,11 @@ This is your link for group %@!</source>
         <target>群组成员可以不可撤回地删除已发送的消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Members can report messsages to moderators." xml:space="preserve">
+        <source>Members can report messsages to moderators.</source>
+        <target>成员可以向 moderators 举报消息。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Members can send SimpleX links." xml:space="preserve">
         <source>Members can send SimpleX links.</source>
         <target>群成员可发送 SimpleX 链接。</target>
@@ -4386,6 +4847,11 @@ This is your link for group %@!</source>
         <target>群组成员可以发送语音消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Mention members 👋" xml:space="preserve">
+        <source>Mention members 👋</source>
+        <target>提及成员👋</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Menus" xml:space="preserve">
         <source>Menus</source>
         <target>菜单</target>
@@ -4453,6 +4919,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
+        <target>消息形状</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4495,6 +4962,11 @@ This is your link for group %@!</source>
         <target>将显示来自 %@ 的消息！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Messages in this chat will never be deleted." xml:space="preserve">
+        <source>Messages in this chat will never be deleted.</source>
+        <target>此聊天中的消息永远不会被删除。</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="Messages received" xml:space="preserve">
         <source>Messages received</source>
         <target>收到的消息</target>
@@ -4507,6 +4979,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
         <source>Messages were deleted after you selected them.</source>
+        <target>在你选中消息后这些消息已被删除。</target>
         <note>alert message</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">
@@ -4594,6 +5067,11 @@ This is your link for group %@!</source>
         <target>已被管理员移除于：%@</target>
         <note>copied message info</note>
       </trans-unit>
+      <trans-unit id="More" xml:space="preserve">
+        <source>More</source>
+        <target>更多</target>
+        <note>swipe action</note>
+      </trans-unit>
       <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
         <target>更多改进即将推出！</target>
@@ -4606,6 +5084,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="More reliable notifications" xml:space="preserve">
         <source>More reliable notifications</source>
+        <target>更可靠的通知</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -4621,7 +5100,12 @@ This is your link for group %@!</source>
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>静音</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
+      </trans-unit>
+      <trans-unit id="Mute all" xml:space="preserve">
+        <source>Mute all</source>
+        <target>全部静音</target>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
@@ -4645,6 +5129,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Network decentralization" xml:space="preserve">
         <source>Network decentralization</source>
+        <target>网络去中心化</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network issues - message expired after many attempts to send it." xml:space="preserve">
@@ -4659,6 +5144,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Network operator" xml:space="preserve">
         <source>Network operator</source>
+        <target>网络运营方</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Network settings" xml:space="preserve">
@@ -4671,6 +5157,11 @@ This is your link for group %@!</source>
         <target>网络状态</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New" xml:space="preserve">
+        <source>New</source>
+        <target>新</target>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
         <target>新密码</target>
@@ -4678,10 +5169,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
         <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>每次启动应用都会使用新的 SOCKS 凭据。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
         <source>New SOCKS credentials will be used for each server.</source>
+        <target>每个服务器都会使用新的 SOCKS 凭据。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
@@ -4716,6 +5209,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New events" xml:space="preserve">
         <source>New events</source>
+        <target>新事件</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="New in %@" xml:space="preserve">
@@ -4733,6 +5227,10 @@ This is your link for group %@!</source>
         <target>新成员角色</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="New member wants to join the group." xml:space="preserve">
+        <source>New member wants to join the group.</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
         <target>新消息</target>
@@ -4745,6 +5243,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New server" xml:space="preserve">
         <source>New server</source>
+        <target>新服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No" xml:space="preserve">
@@ -4757,6 +5256,25 @@ This is your link for group %@!</source>
         <target>没有应用程序密码</target>
         <note>Authentication unavailable</note>
       </trans-unit>
+      <trans-unit id="No chats" xml:space="preserve">
+        <source>No chats</source>
+        <target>无聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats found" xml:space="preserve">
+        <source>No chats found</source>
+        <target>找不到聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats in list %@" xml:space="preserve">
+        <source>No chats in list %@</source>
+        <target>列表 %@ 中无聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No chats with members" xml:space="preserve">
+        <source>No chats with members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
         <target>未选择联系人</target>
@@ -4804,10 +5322,17 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No media &amp; file servers." xml:space="preserve">
         <source>No media &amp; file servers.</source>
+        <target>无媒体和文件服务器。</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No message" xml:space="preserve">
+        <source>No message</source>
+        <target>无消息</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No message servers." xml:space="preserve">
         <source>No message servers.</source>
+        <target>无消息服务器。</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No network connection" xml:space="preserve">
@@ -4817,10 +5342,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No permission to record speech" xml:space="preserve">
         <source>No permission to record speech</source>
+        <target>无录音权限</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No permission to record video" xml:space="preserve">
         <source>No permission to record video</source>
+        <target>无录像权限</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -4840,20 +5367,34 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No servers for private message routing." xml:space="preserve">
         <source>No servers for private message routing.</source>
+        <target>无私密消息路由服务器。</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive files." xml:space="preserve">
         <source>No servers to receive files.</source>
+        <target>无文件接收服务器。</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to receive messages." xml:space="preserve">
         <source>No servers to receive messages.</source>
+        <target>无消息接收服务器。</target>
         <note>servers error</note>
       </trans-unit>
       <trans-unit id="No servers to send files." xml:space="preserve">
         <source>No servers to send files.</source>
+        <target>无文件发送服务器。</target>
         <note>servers error</note>
       </trans-unit>
+      <trans-unit id="No token!" xml:space="preserve">
+        <source>No token!</source>
+        <target>无 token！</target>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="No unread chats" xml:space="preserve">
+        <source>No unread chats</source>
+        <target>没有未读聊天</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="No user identifiers." xml:space="preserve">
         <source>No user identifiers.</source>
         <target>没有用户标识符。</target>
@@ -4864,6 +5405,11 @@ This is your link for group %@!</source>
         <target>不兼容！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notes" xml:space="preserve">
+        <source>Notes</source>
+        <target>附注</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
         <target>未选中任何内容</target>
@@ -4871,6 +5417,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Nothing to forward!" xml:space="preserve">
         <source>Nothing to forward!</source>
+        <target>无可转发！</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
@@ -4883,10 +5430,21 @@ This is your link for group %@!</source>
         <target>通知被禁用！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications error" xml:space="preserve">
+        <source>Notifications error</source>
+        <target>通知错误</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Notifications privacy" xml:space="preserve">
         <source>Notifications privacy</source>
+        <target>通知隐私</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Notifications status" xml:space="preserve">
+        <source>Notifications status</source>
+        <target>通知状态</target>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
@@ -4909,7 +5467,8 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>好的</target>
-        <note>alert button</note>
+        <note>alert action
+alert button</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4942,6 +5501,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Only chat owners can change preferences." xml:space="preserve">
         <source>Only chat owners can change preferences.</source>
+        <target>仅聊天所有人可更改首选项。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only client devices store user profiles, contacts, groups, and messages." xml:space="preserve">
@@ -4969,6 +5529,16 @@ Requires compatible VPN.</source>
         <target>只有群主可以启用语音信息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only sender and moderators see it" xml:space="preserve">
+        <source>Only sender and moderators see it</source>
+        <target>仅发送人和moderators能看到</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Only you and moderators see it" xml:space="preserve">
+        <source>Only you and moderators see it</source>
+        <target>只有你和moderators能看到</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
         <source>Only you can add message reactions.</source>
         <target>只有您可以添加消息回应。</target>
@@ -5022,7 +5592,7 @@ Requires compatible VPN.</source>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
         <target>打开</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert action</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
@@ -5031,6 +5601,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Open changes" xml:space="preserve">
         <source>Open changes</source>
+        <target>打开更改</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open chat" xml:space="preserve">
@@ -5045,6 +5616,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Open conditions" xml:space="preserve">
         <source>Open conditions</source>
+        <target>打开条款</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open group" xml:space="preserve">
@@ -5052,6 +5624,10 @@ Requires compatible VPN.</source>
         <target>打开群</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open link?" xml:space="preserve">
+        <source>Open link?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
         <target>打开迁移到另一台设备</target>
@@ -5064,14 +5640,17 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Operator" xml:space="preserve">
         <source>Operator</source>
+        <target>运营方</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Operator server" xml:space="preserve">
         <source>Operator server</source>
+        <target>运营方服务器</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Or import archive file" xml:space="preserve">
         <source>Or import archive file</source>
+        <target>或者导入或者导入压缩文件</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
@@ -5096,6 +5675,12 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Or to share privately" xml:space="preserve">
         <source>Or to share privately</source>
+        <target>或者私下分享</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Organize chats into lists" xml:space="preserve">
+        <source>Organize chats into lists</source>
+        <target>将聊天组织到列表</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Other" xml:space="preserve">
@@ -5145,6 +5730,7 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Password" xml:space="preserve">
         <source>Password</source>
+        <target>密码</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
@@ -5286,6 +5872,22 @@ Error: %@</source>
         <target>请安全地保存密码，如果您丢失了密码，您将无法更改它。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Please try to disable and re-enable notfications." xml:space="preserve">
+        <source>Please try to disable and re-enable notfications.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for group moderators to review your request to join the group." xml:space="preserve">
+        <source>Please wait for group moderators to review your request to join the group.</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token activation to complete." xml:space="preserve">
+        <source>Please wait for token activation to complete.</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Please wait for token to be registered." xml:space="preserve">
+        <source>Please wait for token to be registered.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="Polish interface" xml:space="preserve">
         <source>Polish interface</source>
         <target>波兰语界面</target>
@@ -5333,16 +5935,30 @@ Error: %@</source>
         <source>Privacy for your customers.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Privacy policy and conditions of use." xml:space="preserve">
+        <source>Privacy policy and conditions of use.</source>
+        <target>隐私政策和使用条款。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Privacy redefined" xml:space="preserve">
         <source>Privacy redefined</source>
         <target>重新定义隐私</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private chats, groups and your contacts are not accessible to server operators." xml:space="preserve">
+        <source>Private chats, groups and your contacts are not accessible to server operators.</source>
+        <target>服务器运营方无法访问私密聊天、群组和你的联系人。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private filenames" xml:space="preserve">
         <source>Private filenames</source>
         <target>私密文件名</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Private media file names." xml:space="preserve">
+        <source>Private media file names.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Private message routing" xml:space="preserve">
         <source>Private message routing</source>
         <target>私有消息路由</target>
@@ -5418,6 +6034,10 @@ Error: %@</source>
         <target>禁止消息回应。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Prohibit reporting messages to moderators." xml:space="preserve">
+        <source>Prohibit reporting messages to moderators.</source>
+        <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>
         <target>禁止发送 SimpleX 链接。</target>
@@ -5674,11 +6294,23 @@ Enable in *Network &amp; servers* settings.</source>
         <target>减少电池使用量</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Register" xml:space="preserve">
+        <source>Register</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Register notification token?" xml:space="preserve">
+        <source>Register notification token?</source>
+        <note>token info</note>
+      </trans-unit>
+      <trans-unit id="Registered" xml:space="preserve">
+        <source>Registered</source>
+        <note>token status text</note>
+      </trans-unit>
       <trans-unit id="Reject" xml:space="preserve">
         <source>Reject</source>
         <target>拒绝</target>
         <note>reject incoming call via notification
-   swipe action</note>
+swipe action</note>
       </trans-unit>
       <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
         <source>Reject (sender NOT notified)</source>
@@ -5690,6 +6322,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>拒绝联系人请求</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Reject member?" xml:space="preserve">
+        <source>Reject member?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
         <target>中继服务器仅在必要时使用。其他人可能会观察到您的IP地址。</target>
@@ -5774,6 +6410,50 @@ Enable in *Network &amp; servers* settings.</source>
         <target>回复</target>
         <note>chat item action</note>
       </trans-unit>
+      <trans-unit id="Report" xml:space="preserve">
+        <source>Report</source>
+        <note>chat item action</note>
+      </trans-unit>
+      <trans-unit id="Report content: only group moderators will see it." xml:space="preserve">
+        <source>Report content: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report member profile: only group moderators will see it." xml:space="preserve">
+        <source>Report member profile: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report other: only group moderators will see it." xml:space="preserve">
+        <source>Report other: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report reason?" xml:space="preserve">
+        <source>Report reason?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Report sent to moderators" xml:space="preserve">
+        <source>Report sent to moderators</source>
+        <note>alert title</note>
+      </trans-unit>
+      <trans-unit id="Report spam: only group moderators will see it." xml:space="preserve">
+        <source>Report spam: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report violation: only group moderators will see it." xml:space="preserve">
+        <source>Report violation: only group moderators will see it.</source>
+        <note>report reason</note>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve">
+        <source>Report: %@</source>
+        <note>report in notification</note>
+      </trans-unit>
+      <trans-unit id="Reporting messages to moderators is prohibited." xml:space="preserve">
+        <source>Reporting messages to moderators is prohibited.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve">
+        <source>Reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Required" xml:space="preserve">
         <source>Required</source>
         <target>必须</target>
@@ -5861,25 +6541,30 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Review conditions" xml:space="preserve">
         <source>Review conditions</source>
+        <target>审阅条款</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Review later" xml:space="preserve">
-        <source>Review later</source>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Review members" xml:space="preserve">
+        <source>Review members</source>
+        <note>admission stage</note>
+      </trans-unit>
+      <trans-unit id="Review members before admitting (&quot;knocking&quot;)." xml:space="preserve">
+        <source>Review members before admitting ("knocking").</source>
+        <note>admission stage description</note>
       </trans-unit>
       <trans-unit id="Revoke" xml:space="preserve">
         <source>Revoke</source>
-        <target>撤销</target>
+        <target>吊销</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Revoke file" xml:space="preserve">
         <source>Revoke file</source>
-        <target>撤销文件</target>
+        <target>吊销文件</target>
         <note>cancel file action</note>
       </trans-unit>
       <trans-unit id="Revoke file?" xml:space="preserve">
         <source>Revoke file?</source>
-        <target>撤销文件？</target>
+        <target>吊销文件？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Role" xml:space="preserve">
@@ -5889,7 +6574,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Run chat" xml:space="preserve">
         <source>Run chat</source>
-        <target>运行聊天程序</target>
+        <target>运行聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SMP server" xml:space="preserve">
@@ -5915,13 +6600,17 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Save</source>
         <target>保存</target>
         <note>alert button
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Save (and notify contacts)" xml:space="preserve">
         <source>Save (and notify contacts)</source>
         <target>保存（并通知联系人）</target>
         <note>alert button</note>
       </trans-unit>
+      <trans-unit id="Save admission settings?" xml:space="preserve">
+        <source>Save admission settings?</source>
+        <note>alert title</note>
+      </trans-unit>
       <trans-unit id="Save and notify contact" xml:space="preserve">
         <source>Save and notify contact</source>
         <target>保存并通知联系人</target>
@@ -5947,6 +6636,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>保存群组资料</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve">
+        <source>Save list</source>
+        <target>保存列表</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
         <target>保存密码并打开聊天</target>
@@ -5984,6 +6678,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
+        <target>保存您的个人资料？</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -6008,6 +6703,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Saving %lld messages" xml:space="preserve">
         <source>Saving %lld messages</source>
+        <target>正在保存 %lld 条消息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
@@ -6184,6 +6880,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>发送通知</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Send private reports" xml:space="preserve">
+        <source>Send private reports</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve">
         <source>Send questions and ideas</source>
         <target>发送问题和想法</target>
@@ -6394,6 +7094,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>设定1天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set chat name…" xml:space="preserve">
+        <source>Set chat name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve">
         <source>Set contact name…</source>
         <target>设置联系人姓名……</target>
@@ -6414,6 +7118,14 @@ Enable in *Network &amp; servers* settings.</source>
         <target>设置它以代替系统身份验证。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Set member admission" xml:space="preserve">
+        <source>Set member admission</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve">
+        <source>Set message expiration in chats.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Set passcode" xml:space="preserve">
         <source>Set passcode</source>
         <target>设置密码</target>
@@ -6457,7 +7169,7 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Share</source>
         <target>分享</target>
         <note>alert action
-   chat item action</note>
+chat item action</note>
       </trans-unit>
       <trans-unit id="Share 1-time link" xml:space="preserve">
         <source>Share 1-time link</source>
@@ -6515,6 +7227,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>与联系人分享</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Short link" xml:space="preserve">
+        <source>Short link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
         <target>显示二维码</target>
@@ -6572,6 +7288,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." xml:space="preserve">
         <source>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</source>
+        <target>SimpleX Chat 与 Flux 达成了协议，将由 Flux 控制的服务器纳入 SimpleX 应用。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Chat security was audited by Trail of Bits." xml:space="preserve">
@@ -6606,12 +7323,19 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="SimpleX address and 1-time links are safe to share via any messenger." xml:space="preserve">
         <source>SimpleX address and 1-time links are safe to share via any messenger.</source>
+        <target>可以通过任何消息应用安全分享 SimpleX 地址和一次性链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address or 1-time link?" xml:space="preserve">
         <source>SimpleX address or 1-time link?</source>
+        <target>SimpleX 地址或一次性链接？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SimpleX channel link" xml:space="preserve">
+        <source>SimpleX channel link</source>
+        <target>SimpleX 频道链接</target>
+        <note>simplex link type</note>
+      </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
         <target>SimpleX 联系地址</target>
@@ -6619,12 +7343,12 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve">
         <source>SimpleX encrypted message or connection event</source>
-        <target>SimpleX 加密消息或连接项目</target>
+        <target>SimpleX 加密的消息或连接事件</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="SimpleX group link" xml:space="preserve">
         <source>SimpleX group link</source>
-        <target>SimpleX 群组链接</target>
+        <target>SimpleX 群链接</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="SimpleX links" xml:space="preserve">
@@ -6649,6 +7373,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
         <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <target>SimpleX 协议由 Trail of Bits 审阅。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6683,6 +7408,7 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
+        <target>部分应用设置未被迁移。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6710,6 +7436,11 @@ Enable in *Network &amp; servers* settings.</source>
         <target>某人</target>
         <note>notification title</note>
       </trans-unit>
+      <trans-unit id="Spam" xml:space="preserve">
+        <source>Spam</source>
+        <note>blocking reason
+report reason</note>
+      </trans-unit>
       <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
         <source>Square, circle, or anything in between.</source>
         <target>方形、圆形、或两者之间的任意形状.</target>
@@ -6795,6 +7526,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>正在停止聊天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve">
+        <source>Storage</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
         <target>加粗</target>
@@ -6853,6 +7588,10 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP 连接超时</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="TCP port for messaging" xml:space="preserve">
+        <source>TCP port for messaging</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
         <target>TCP_KEEPCNT</target>
@@ -6919,13 +7658,17 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Temporary file error" xml:space="preserve">
         <source>Temporary file error</source>
         <target>临时文件错误</target>
-        <note>No comment provided by engineer.</note>
+        <note>file error alert title</note>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
         <target>在步骤 %@ 上测试失败。</target>
         <note>server test failure</note>
       </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve">
+        <source>Test notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
         <source>Test server</source>
         <target>测试服务器</target>
@@ -7046,19 +7789,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>旧数据库在迁移过程中没有被移除，可以删除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
-        <source>The profile is only shared with your contacts.</source>
-        <target>该资料仅与您的联系人共享。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve">
         <source>The same conditions will apply to operator **%@**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The same conditions will apply to operator(s): **%@**." xml:space="preserve">
-        <source>The same conditions will apply to operator(s): **%@**.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="The second preset operator in the app!" xml:space="preserve">
         <source>The second preset operator in the app!</source>
         <note>No comment provided by engineer.</note>
@@ -7120,6 +7854,10 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>此操作无法撤消——早于所选的发送和接收的消息将被删除。 这可能需要几分钟时间。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve">
         <source>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</source>
         <target>此操作无法撤消——您的个人资料、联系人、消息和文件将不可撤回地丢失。</target>
@@ -7165,11 +7903,19 @@ It can happen because of some bug or when the connection is compromised.</source
         <target>这是你自己的一次性链接！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." xml:space="preserve">
+        <source>This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
         <source>This link was used with another mobile device, please create a new link on the desktop.</source>
         <target>此链接已在其他移动设备上使用，请在桌面上创建新链接。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="This message was deleted or not received yet." xml:space="preserve">
+        <source>This message was deleted or not received yet.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
         <target>此设置适用于您当前聊天资料 **%@** 中的消息。</target>
@@ -7276,6 +8022,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>在连接时切换隐身模式。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Token status: %@." xml:space="preserve">
+        <source>Token status: %@.</source>
+        <note>token status</note>
+      </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
         <target>工具栏不透明度</target>
@@ -7440,13 +8190,17 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Unmute" xml:space="preserve">
         <source>Unmute</source>
         <target>取消静音</target>
-        <note>swipe action</note>
+        <note>notification label action</note>
       </trans-unit>
       <trans-unit id="Unread" xml:space="preserve">
         <source>Unread</source>
         <target>未读</target>
         <note>swipe action</note>
       </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve">
+        <source>Unsupported connection link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
         <target>给新成员发送了最多 100 条历史消息。</target>
@@ -7472,6 +8226,10 @@ To connect, please ask your contact to create another connection link and check
         <target>更新设置？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Updated conditions" xml:space="preserve">
+        <source>Updated conditions</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
         <source>Updating settings will re-connect the client to all servers.</source>
         <target>更新设置会将客户端重新连接到所有服务器。</target>
@@ -7530,6 +8288,14 @@ To connect, please ask your contact to create another connection link and check
         <target>使用 SimpleX Chat 服务器？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use TCP port %@ when no port is specified." xml:space="preserve">
+        <source>Use TCP port %@ when no port is specified.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Use TCP port 443 for preset servers only." xml:space="preserve">
+        <source>Use TCP port 443 for preset servers only.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
         <source>Use chat</source>
         <target>使用聊天</target>
@@ -7592,6 +8358,10 @@ To connect, please ask your contact to create another connection link and check
         <source>Use servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve">
+        <source>Use short links (BETA)</source>
+        <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>
         <target>通话时使用本应用.</target>
@@ -7602,6 +8372,10 @@ To connect, please ask your contact to create another connection link and check
         <target>用一只手使用应用程序。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Use web port" xml:space="preserve">
+        <source>Use web port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>用户选择</target>
@@ -7969,10 +8743,6 @@ Repeat join request?</source>
         <target>您可以在外观设置中更改它。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You can configure operators in Network &amp; servers settings." xml:space="preserve">
-        <source>You can configure operators in Network &amp; servers settings.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="You can configure servers via settings." xml:space="preserve">
         <source>You can configure servers via settings.</source>
         <note>No comment provided by engineer.</note>
@@ -8061,6 +8831,10 @@ Repeat join request?</source>
         <target>您可以在连接详情中再次查看邀请链接。</target>
         <note>alert message</note>
       </trans-unit>
+      <trans-unit id="You can view your reports in Chat with admins." xml:space="preserve">
+        <source>You can view your reports in Chat with admins.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>您无法发送消息！</target>
@@ -8143,6 +8917,10 @@ Repeat connection request?</source>
         <target>您发送了群组邀请</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You should receive notifications." xml:space="preserve">
+        <source>You should receive notifications.</source>
+        <note>token info</note>
+      </trans-unit>
       <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
         <target>您将在组主设备上线时连接到该群组，请稍等或稍后再检查！</target>
@@ -8207,11 +8985,6 @@ Repeat connection request?</source>
         <target>您的 ICE 服务器</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your SMP servers" xml:space="preserve">
-        <source>Your SMP servers</source>
-        <target>您的 SMP 服务器</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your SimpleX address" xml:space="preserve">
         <source>Your SimpleX address</source>
         <target>您的 SimpleX 地址</target>
@@ -8294,6 +9067,11 @@ Repeat connection request?</source>
         <target>您的个人资料 **%@** 将被共享。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
+        <target>该资料仅与您的联系人共享。</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
         <target>您的资料存储在您的设备上并仅与您的联系人共享。 SimpleX 服务器无法看到您的资料。</target>
@@ -8303,11 +9081,6 @@ Repeat connection request?</source>
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
-        <source>Your profile, contacts and delivered messages are stored on your device.</source>
-        <target>您的资料、联系人和发送的消息存储在您的设备上。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
         <source>Your random profile</source>
         <target>您的随机资料</target>
@@ -8357,6 +9130,10 @@ Repeat connection request?</source>
         <target>上面，然后选择：</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="accepted %@" xml:space="preserve">
+        <source>accepted %@</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="accepted call" xml:space="preserve">
         <source>accepted call</source>
         <target>已接受通话</target>
@@ -8366,6 +9143,10 @@ Repeat connection request?</source>
         <source>accepted invitation</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="accepted you" xml:space="preserve">
+        <source>accepted you</source>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="admin" xml:space="preserve">
         <source>admin</source>
         <target>管理员</target>
@@ -8386,6 +9167,10 @@ Repeat connection request?</source>
         <target>同意加密…</target>
         <note>chat item text</note>
       </trans-unit>
+      <trans-unit id="all" xml:space="preserve">
+        <source>all</source>
+        <note>member criteria value</note>
+      </trans-unit>
       <trans-unit id="all members" xml:space="preserve">
         <source>all members</source>
         <target>所有成员</target>
@@ -8401,6 +9186,10 @@ Repeat connection request?</source>
         <target>和 %lld 其他事件</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="archived report" xml:space="preserve">
+        <source>archived report</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="attempts" xml:space="preserve">
         <source>attempts</source>
         <target>尝试</target>
@@ -8439,7 +9228,8 @@ Repeat connection request?</source>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
         <target>由管理员封禁</target>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item
+marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
         <source>bold</source>
@@ -8466,6 +9256,10 @@ Repeat connection request?</source>
         <target>呼叫中……</target>
         <note>call status</note>
       </trans-unit>
+      <trans-unit id="can't send messages" xml:space="preserve">
+        <source>can't send messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="cancelled %@" xml:space="preserve">
         <source>cancelled %@</source>
         <target>已取消 %@</target>
@@ -8571,6 +9365,14 @@ Repeat connection request?</source>
         <target>联系人 %1$@ 已更改为 %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="contact deleted" xml:space="preserve">
+        <source>contact deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="contact disabled" xml:space="preserve">
+        <source>contact disabled</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
         <source>contact has e2e encryption</source>
         <target>联系人具有端到端加密</target>
@@ -8581,6 +9383,10 @@ Repeat connection request?</source>
         <target>联系人没有端到端加密</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="contact not ready" xml:space="preserve">
+        <source>contact not ready</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="creator" xml:space="preserve">
         <source>creator</source>
         <target>创建者</target>
@@ -8609,7 +9415,8 @@ Repeat connection request?</source>
       <trans-unit id="default (%@)" xml:space="preserve">
         <source>default (%@)</source>
         <target>默认 (%@)</target>
-        <note>pref value</note>
+        <note>delete after time
+pref value</note>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
@@ -8658,7 +9465,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="duplicates" xml:space="preserve">
         <source>duplicates</source>
-        <target>复本</target>
+        <target>副本</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="e2e encrypted" xml:space="preserve">
@@ -8736,20 +9543,11 @@ Repeat connection request?</source>
         <target>错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>发生的事</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
         <target>过期</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="for better metadata privacy." xml:space="preserve">
-        <source>for better metadata privacy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
         <source>forwarded</source>
         <target>已转发</target>
@@ -8760,6 +9558,10 @@ Repeat connection request?</source>
         <target>群组已删除</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="group is deleted" xml:space="preserve">
+        <source>group is deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group profile updated" xml:space="preserve">
         <source>group profile updated</source>
         <target>群组资料已更新</target>
@@ -8885,6 +9687,10 @@ Repeat connection request?</source>
         <target>已连接</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="member has old version" xml:space="preserve">
+        <source>member has old version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
         <target>消息</target>
@@ -8915,20 +9721,19 @@ Repeat connection request?</source>
         <target>由 %@ 审核</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
+      <trans-unit id="moderator" xml:space="preserve">
+        <source>moderator</source>
+        <note>member role</note>
+      </trans-unit>
       <trans-unit id="months" xml:space="preserve">
         <source>months</source>
         <target>月</target>
         <note>time unit</note>
       </trans-unit>
-      <trans-unit id="mute" xml:space="preserve">
-        <source>mute</source>
-        <target>静音</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="never" xml:space="preserve">
         <source>never</source>
         <target>从不</target>
-        <note>No comment provided by engineer.</note>
+        <note>delete after time</note>
       </trans-unit>
       <trans-unit id="new message" xml:space="preserve">
         <source>new message</source>
@@ -8950,6 +9755,10 @@ Repeat connection request?</source>
         <target>无文本</target>
         <note>copied message info in history</note>
       </trans-unit>
+      <trans-unit id="not synchronized" xml:space="preserve">
+        <source>not synchronized</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="observer" xml:space="preserve">
         <source>observer</source>
         <target>观察者</target>
@@ -8959,8 +9768,9 @@ Repeat connection request?</source>
         <source>off</source>
         <target>关闭</target>
         <note>enabled status
-   group pref value
-   time to disappear</note>
+group pref value
+member criteria value
+time to disappear</note>
       </trans-unit>
       <trans-unit id="offered %@" xml:space="preserve">
         <source>offered %@</source>
@@ -9002,6 +9812,18 @@ Repeat connection request?</source>
         <target>点对点</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="pending" xml:space="preserve">
+        <source>pending</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending approval" xml:space="preserve">
+        <source>pending approval</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="pending review" xml:space="preserve">
+        <source>pending review</source>
+        <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>
         <target>抗量子端到端加密</target>
@@ -9017,6 +9839,10 @@ Repeat connection request?</source>
         <target>已受到确认……</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="rejected" xml:space="preserve">
+        <source>rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="rejected call" xml:space="preserve">
         <source>rejected call</source>
         <target>拒接来电</target>
@@ -9037,6 +9863,10 @@ Repeat connection request?</source>
         <target>删除了联系地址</target>
         <note>profile update event chat item</note>
       </trans-unit>
+      <trans-unit id="removed from group" xml:space="preserve">
+        <source>removed from group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
         <target>删除了资料图片</target>
@@ -9047,10 +9877,22 @@ Repeat connection request?</source>
         <target>已将您移除</target>
         <note>rcv group event chat item</note>
       </trans-unit>
+      <trans-unit id="request to join rejected" xml:space="preserve">
+        <source>request to join rejected</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="requested to connect" xml:space="preserve">
         <source>requested to connect</source>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="review" xml:space="preserve">
+        <source>review</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="reviewed by admins" xml:space="preserve">
+        <source>reviewed by admins</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="saved" xml:space="preserve">
         <source>saved</source>
         <target>已保存</target>
@@ -9150,11 +9992,6 @@ last received msg: %2$@</source>
         <target>未知状态</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="unmute" xml:space="preserve">
-        <source>unmute</source>
-        <target>取消静音</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
         <source>unprotected</source>
         <target>未受保护</target>
@@ -9245,6 +10082,10 @@ last received msg: %2$@</source>
         <target>您</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="you accepted this member" xml:space="preserve">
+        <source>you accepted this member</source>
+        <note>snd group event chat item</note>
+      </trans-unit>
       <trans-unit id="you are invited to group" xml:space="preserve">
         <source>you are invited to group</source>
         <target>您被邀请加入群组</target>
@@ -9319,7 +10160,7 @@ last received msg: %2$@</source>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -9356,7 +10197,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9378,13 +10219,17 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX NSE/en.lproj/Localizable.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%d new events" xml:space="preserve">
         <source>%d new events</source>
         <note>notification body</note>
       </trans-unit>
+      <trans-unit id="From %d chat(s)" xml:space="preserve">
+        <source>From %d chat(s)</source>
+        <note>notification body</note>
+      </trans-unit>
       <trans-unit id="From: %@" xml:space="preserve">
         <source>From: %@</source>
         <note>notification body</note>
@@ -9397,15 +10242,11 @@ last received msg: %2$@</source>
         <source>New messages</source>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New messages in %d chats" xml:space="preserve">
-        <source>New messages in %d chats</source>
-        <note>notification body</note>
-      </trans-unit>
     </body>
   </file>
   <file original="SimpleX SE/en.lproj/InfoPlist.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -9427,7 +10268,7 @@ last received msg: %2$@</source>
   </file>
   <file original="SimpleX SE/en.lproj/Localizable.strings" source-language="en" target-language="zh-Hans" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="16.2" build-num="16C5032a"/>
     </header>
     <body>
       <trans-unit id="%@" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/contents.json b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/contents.json
index 6416a2d8fa..91977b0744 100644
--- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/contents.json	
+++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/contents.json	
@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "zh-Hans",
   "toolInfo" : {
-    "toolBuildNumber" : "15F31d",
+    "toolBuildNumber" : "16C5032a",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.4"
+    "toolVersion" : "16.2"
   },
   "version" : "1.0"
 }
\ No newline at end of file
diff --git a/apps/ios/SimpleX Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff b/apps/ios/SimpleX Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff
index 93b9725131..3ea46ee364 100644
--- a/apps/ios/SimpleX Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff	
+++ b/apps/ios/SimpleX Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff	
@@ -109,7 +109,7 @@
       </trans-unit>
       <trans-unit id="%d skipped message(s)" xml:space="preserve" approved="no">
         <source>%d skipped message(s)</source>
-        <target state="translated">%d錯過了訊息</target>
+        <target state="translated">錯過的 %d 則訊息</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve" approved="no">
@@ -124,17 +124,17 @@
       </trans-unit>
       <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
         <source>%lld contact(s) selected</source>
-        <target state="translated">%lld 已選擇聯絡人(s)</target>
+        <target state="translated">已選擇 %lld 個聯絡人</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve" approved="no">
         <source>%lld file(s) with total size of %@</source>
-        <target state="translated">%lld 檔案(s) 的總共大小為%@</target>
+        <target state="translated">%lld 個檔案，總共大小 %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve" approved="no">
         <source>%lld members</source>
-        <target state="translated">%lld 成員</target>
+        <target state="translated">%lld 個成員</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve" approved="no">
@@ -224,7 +224,7 @@
       </trans-unit>
       <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve" approved="no">
         <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
-        <target state="translated">**警告**：即時推送訊息通知需要數據庫的密碼儲存在資料庫中。</target>
+        <target state="translated">**警告**：即時推送訊息通知需要將數據庫的密碼儲存在資料庫中。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**e2e encrypted** audio call" xml:space="preserve" approved="no">
@@ -2704,12 +2704,12 @@ We will be adding server redundancy to prevent lost messages.</source>
       </trans-unit>
       <trans-unit id="Send link previews" xml:space="preserve" approved="no">
         <source>Send link previews</source>
-        <target state="translated">傳送可以預覽的連結</target>
+        <target state="translated">傳送連結預覽</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send live message" xml:space="preserve" approved="no">
         <source>Send live message</source>
-        <target state="translated">傳送實況的訊息</target>
+        <target state="translated">傳送實時訊息</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send notifications" xml:space="preserve" approved="no">
@@ -2724,7 +2724,7 @@ We will be adding server redundancy to prevent lost messages.</source>
       </trans-unit>
       <trans-unit id="Send questions and ideas" xml:space="preserve" approved="no">
         <source>Send questions and ideas</source>
-        <target state="translated">傳送問題和想法給開發者</target>
+        <target state="translated">給開發者提問題和想法</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve" approved="no">
@@ -2774,7 +2774,7 @@ We will be adding server redundancy to prevent lost messages.</source>
       </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve" approved="no">
         <source>Set 1 day</source>
-        <target state="translated">設定為1天</target>
+        <target state="translated">設定為 1 天</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set contact name…" xml:space="preserve" approved="no">
@@ -3022,7 +3022,7 @@ We will be adding server redundancy to prevent lost messages.</source>
       </trans-unit>
       <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve" approved="no">
         <source>The connection you accepted will be cancelled!</source>
-        <target state="translated">你所接受的連接將被取消！</target>
+        <target state="translated">你接受的連接將被取消！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve" approved="no">
@@ -3054,14 +3054,14 @@ We will be adding server redundancy to prevent lost messages.</source>
         <target state="translated">舊的數據庫在遷移過程中沒有被移除，可以刪除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve" approved="no">
-        <source>The profile is only shared with your contacts.</source>
+      <trans-unit id="Your profile is stored on your device and only shared with your contacts." xml:space="preserve" approved="no">
+        <source>Your profile is stored on your device and only shared with your contacts.</source>
         <target state="translated">你的個人檔案只會和你的聯絡人分享。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve" approved="no">
         <source>The sender will NOT be notified</source>
-        <target state="translated">發送者不會接收到通知</target>
+        <target state="translated">發送者不會收到通知</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Theme" xml:space="preserve" approved="no">
@@ -3071,12 +3071,12 @@ We will be adding server redundancy to prevent lost messages.</source>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve" approved="no">
         <source>This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.</source>
-        <target state="translated">這操作不能還原 - 所有已經接收和傳送的檔案和媒體檔案將刪除。低解析度圖片將保留。</target>
+        <target state="translated">這操作不能還原 - 將刪除所有已經接收和傳送的檔案和媒體。將保留低解析度圖片。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." xml:space="preserve" approved="no">
         <source>This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes.</source>
-        <target state="translated">這操作無法撤銷 - 早於所選擇的時間發送和接收的訊息將被刪除。這可能需要幾分鐘的時間。</target>
+        <target state="translated">這操作無法撤銷 - 早於所選時間的收發訊息將被刪除。可能需要幾分鐘。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." xml:space="preserve" approved="no">
@@ -3263,7 +3263,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve" approved="no">
         <source>Use for new connections</source>
-        <target state="translated">用於新的連接</target>
+        <target state="translated">用於新的連線</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve" approved="no">
@@ -3283,7 +3283,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve" approved="no">
         <source>Verify connection security</source>
-        <target state="translated">驗證連接安全性</target>
+        <target state="translated">驗證連線安全性</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve" approved="no">
@@ -4163,7 +4163,7 @@ SimpleX 伺服器並不會看到你的個人檔案。</target>
       </trans-unit>
       <trans-unit id="via contact address link" xml:space="preserve" approved="no">
         <source>via contact address link</source>
-        <target state="translated">透過聯絡人的邀請連結連接</target>
+        <target state="translated">透過聯絡人的邀請連結連線</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="via group link" xml:space="preserve" approved="no">
@@ -4173,7 +4173,7 @@ SimpleX 伺服器並不會看到你的個人檔案。</target>
       </trans-unit>
       <trans-unit id="via one-time link" xml:space="preserve" approved="no">
         <source>via one-time link</source>
-        <target state="translated">透過一次性連結連接</target>
+        <target state="translated">透過一次性連結連線</target>
         <note>chat list item description</note>
       </trans-unit>
       <trans-unit id="via relay" xml:space="preserve" approved="no">
@@ -4702,7 +4702,7 @@ Available in v5.1</source>
       </trans-unit>
       <trans-unit id="%u messages failed to decrypt." xml:space="preserve" approved="no">
         <source>%u messages failed to decrypt.</source>
-        <target state="translated">%u 訊息解密失敗。</target>
+        <target state="translated">%u 則訊息解密失敗。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%u messages skipped." xml:space="preserve" approved="no">
@@ -5152,7 +5152,7 @@ Available in v5.1</source>
       </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve" approved="no">
         <source>Tap to activate profile.</source>
-        <target state="translated">點擊以激活配置檔案。</target>
+        <target state="translated">點擊以激活設定檔。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="There should be at least one visible user profile." xml:space="preserve" approved="no">
@@ -6034,7 +6034,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
         <source>%lld messages marked deleted</source>
-        <target state="translated">%lld 條訊息已刪除</target>
+        <target state="translated">%lld 則訊息已標記為刪除</target>
       </trans-unit>
       <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
         <source>Already connecting!</source>
@@ -6046,7 +6046,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="(new)" xml:space="preserve" approved="no">
         <source>(new)</source>
-        <target state="translated">(新)</target>
+        <target state="translated">（新）</target>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
         <source>%@, %@ and %lld other members connected</source>
@@ -6112,6 +6112,374 @@ It can happen because of some bug or when the connection is compromised.</source
         <source>Background</source>
         <target state="translated">後台</target>
       </trans-unit>
+      <trans-unit id="SimpleX links not allowed" xml:space="preserve" approved="no">
+        <source>SimpleX links not allowed</source>
+        <target state="translated">不允許 SimpleX 連結</target>
+      </trans-unit>
+      <trans-unit id="Voice messages not allowed" xml:space="preserve" approved="no">
+        <source>Voice messages not allowed</source>
+        <target state="translated">不允許語音訊息</target>
+      </trans-unit>
+      <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve" approved="no">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <target state="translated">您貼在這裡的連結不是 SimpleX 連結。</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve" approved="no">
+        <source>%d file(s) were deleted.</source>
+        <target state="translated">已刪除 %d 個檔案。</target>
+      </trans-unit>
+      <trans-unit id="Reset to app theme" xml:space="preserve" approved="no">
+        <source>Reset to app theme</source>
+        <target state="translated">重設至應用程式主題</target>
+      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve" approved="no">
+        <source>Retry</source>
+        <target state="translated">重試</target>
+      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve" approved="no">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target state="translated">上傳的資料庫存檔將從伺服器永久移除。</target>
+      </trans-unit>
+      <trans-unit id="Shape profile images" xml:space="preserve" approved="no">
+        <source>Shape profile images</source>
+        <target state="translated">塑造個人資料圖片</target>
+      </trans-unit>
+      <trans-unit id="**Scan / Paste link**: to connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Scan / Paste link**: to connect via a link you received.</source>
+        <target state="translated">**掃描／貼上連結**：以透過您收到的連結連線。</target>
+      </trans-unit>
+      <trans-unit id="Reports" xml:space="preserve" approved="no">
+        <source>Reports</source>
+        <target state="translated">舉報</target>
+      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve" approved="no">
+        <source>Use SOCKS proxy</source>
+        <target state="translated">使用 SOCKS 代理</target>
+      </trans-unit>
+      <trans-unit id="Reset all statistics" xml:space="preserve" approved="no">
+        <source>Reset all statistics</source>
+        <target state="translated">重設所有統計數據</target>
+      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve" approved="no">
+        <source>SOCKS proxy</source>
+        <target state="translated">SOCKS 代理</target>
+      </trans-unit>
+      <trans-unit id="Send message to enable calls." xml:space="preserve" approved="no">
+        <source>Send message to enable calls.</source>
+        <target state="translated">發送訊息以啟用通話功能。</target>
+      </trans-unit>
+      <trans-unit id="Send direct message to connect" xml:space="preserve" approved="no">
+        <source>Send direct message to connect</source>
+        <target state="translated">直接發送訊息以連結</target>
+      </trans-unit>
+      <trans-unit id="Scale" xml:space="preserve" approved="no">
+        <source>Scale</source>
+        <target state="translated">顯示比例</target>
+      </trans-unit>
+      <trans-unit id="Sent via proxy" xml:space="preserve" approved="no">
+        <source>Sent via proxy</source>
+        <target state="translated">通過代理發送</target>
+      </trans-unit>
+      <trans-unit id="Servers info" xml:space="preserve" approved="no">
+        <source>Servers info</source>
+        <target state="translated">伺服器訊息</target>
+      </trans-unit>
+      <trans-unit id="Set message expiration in chats." xml:space="preserve" approved="no">
+        <source>Set message expiration in chats.</source>
+        <target state="translated">設定聊天中訊息期限。</target>
+      </trans-unit>
+      <trans-unit id="Share SimpleX address on social media." xml:space="preserve" approved="no">
+        <source>Share SimpleX address on social media.</source>
+        <target state="translated">在社交媒體上分享 SimpleX 聯絡地址。</target>
+      </trans-unit>
+      <trans-unit id="Storage" xml:space="preserve" approved="no">
+        <source>Storage</source>
+        <target state="translated">存儲</target>
+      </trans-unit>
+      <trans-unit id="Starting from %@." xml:space="preserve" approved="no">
+        <source>Starting from %@.</source>
+        <target state="translated">開始於 %@。</target>
+      </trans-unit>
+      <trans-unit id="The second tick we missed! ✅" xml:space="preserve" approved="no">
+        <source>The second tick we missed! ✅</source>
+        <target state="translated">我們錯過的第二個勾選！ ✅</target>
+      </trans-unit>
+      <trans-unit id="Themes" xml:space="preserve" approved="no">
+        <source>Themes</source>
+        <target state="translated">主題</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve" approved="no">
+        <source>%d file(s) failed to download.</source>
+        <target state="translated">%d 個檔案下載失敗。</target>
+      </trans-unit>
+      <trans-unit id="Session code" xml:space="preserve" approved="no">
+        <source>Session code</source>
+        <target state="translated">會話代碼</target>
+      </trans-unit>
+      <trans-unit id="Servers statistics will be reset - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>Servers statistics will be reset - this cannot be undone!</source>
+        <target state="translated">伺服器統計資料將被重設 - 此操作無法撤銷！</target>
+      </trans-unit>
+      <trans-unit id="**Create 1-time link**: to create and share a new invitation link." xml:space="preserve" approved="no">
+        <source>**Create 1-time link**: to create and share a new invitation link.</source>
+        <target state="translated">**建立一次性連結**：建立並分享新邀請連結。</target>
+      </trans-unit>
+      <trans-unit id="Set default theme" xml:space="preserve" approved="no">
+        <source>Set default theme</source>
+        <target state="translated">設定缺省主題</target>
+      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
+        <source>%lld group events</source>
+        <target state="translated">%lld 個群組事件</target>
+      </trans-unit>
+      <trans-unit id="Reset all statistics?" xml:space="preserve" approved="no">
+        <source>Reset all statistics?</source>
+        <target state="translated">重設所有統計數據？</target>
+      </trans-unit>
+      <trans-unit id="%@ server" xml:space="preserve" approved="no">
+        <source>%@ server</source>
+        <target state="translated">%@ 伺服器</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) were not downloaded.</source>
+        <target state="translated">%d 個檔案未下載。</target>
+      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve" approved="no">
+        <source>%d messages not forwarded</source>
+        <target state="translated">%d 則訊息未轉發</target>
+      </trans-unit>
+      <trans-unit id="Test notifications" xml:space="preserve" approved="no">
+        <source>Test notifications</source>
+        <target state="translated">测试通知</target>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">（此設備 v%@）</target>
+      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve" approved="no">
+        <source>Settings were changed.</source>
+        <target state="translated">設定已更改。</target>
+      </trans-unit>
+      <trans-unit id="This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." xml:space="preserve" approved="no">
+        <source>This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</source>
+        <target state="translated">這操作不能撤銷 - 此聊天中早於所選訊息的收發訊息將被刪除。</target>
+      </trans-unit>
+      <trans-unit id="Subscription errors" xml:space="preserve" approved="no">
+        <source>Subscription errors</source>
+        <target state="translated">訂閱錯誤</target>
+      </trans-unit>
+      <trans-unit id="Report" xml:space="preserve" approved="no">
+        <source>Report</source>
+        <target state="translated">舉報</target>
+      </trans-unit>
+      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve" approved="no">
+        <source>Send messages directly when IP address is protected and your or destination server does not support private routing.</source>
+        <target state="translated">當 IP 位址受保護且您或目的地伺服器不支援私人路由時，直接傳送訊息。</target>
+      </trans-unit>
+      <trans-unit id="Reset to user theme" xml:space="preserve" approved="no">
+        <source>Reset to user theme</source>
+        <target state="translated">重設為使用者主題</target>
+      </trans-unit>
+      <trans-unit id="Use short links (BETA)" xml:space="preserve" approved="no">
+        <source>Use short links (BETA)</source>
+        <target state="translated">使用短連結（Beta）</target>
+      </trans-unit>
+      <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve" approved="no">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <target state="translated">最多 100 則最後的訊息會傳送至新成員。</target>
+      </trans-unit>
+      <trans-unit id="%d seconds(s)" xml:space="preserve" approved="no">
+        <source>%d seconds(s)</source>
+        <target state="translated">%d 秒</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) are still being downloaded.</source>
+        <target state="translated">仍在下載 %d 個檔案。</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
+        <source>%lld messages blocked by admin</source>
+        <target state="translated">%lld 則訊息被管理員封鎖</target>
+      </trans-unit>
+      <trans-unit id="Report: %@" xml:space="preserve" approved="no">
+        <source>Report: %@</source>
+        <target state="translated">舉報：%@</target>
+      </trans-unit>
+      <trans-unit id="Review conditions" xml:space="preserve" approved="no">
+        <source>Review conditions</source>
+        <target state="translated">檢視使用條款</target>
+      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve" approved="no">
+        <source>Search or paste SimpleX link</source>
+        <target state="translated">搜尋或貼上 SimpleX 連結</target>
+      </trans-unit>
+      <trans-unit id="Sent directly" xml:space="preserve" approved="no">
+        <source>Sent directly</source>
+        <target state="translated">已直接發送</target>
+      </trans-unit>
+      <trans-unit id="SimpleX links are prohibited." xml:space="preserve" approved="no">
+        <source>SimpleX links are prohibited.</source>
+        <target state="translated">這群組禁止 SimpleX 連結。</target>
+      </trans-unit>
+      <trans-unit id="Uploaded files" xml:space="preserve" approved="no">
+        <source>Uploaded files</source>
+        <target state="translated">已上傳的檔案</target>
+      </trans-unit>
+      <trans-unit id="Use %@" xml:space="preserve" approved="no">
+        <source>Use %@</source>
+        <target state="translated">使用 %@</target>
+      </trans-unit>
+      <trans-unit id="Upload errors" xml:space="preserve" approved="no">
+        <source>Upload errors</source>
+        <target state="translated">上傳錯誤</target>
+      </trans-unit>
+      <trans-unit id="Use servers" xml:space="preserve" approved="no">
+        <source>Use servers</source>
+        <target state="translated">使用伺服器</target>
+      </trans-unit>
+      <trans-unit id="security code changed" xml:space="preserve" approved="no">
+        <source>security code changed</source>
+        <target state="translated">安全碼已變更</target>
+      </trans-unit>
+      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve" approved="no">
+        <source>These settings are for your current profile **%@**.</source>
+        <target state="translated">這些設定是針對您目前的設定檔 **%@**。</target>
+      </trans-unit>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve" approved="no">
+        <source>They can be overridden in contact and group settings.</source>
+        <target state="translated">您可在連絡人和群組設定中覆寫它們。</target>
+      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
+        <source>%1$@, %2$@</source>
+        <target state="translated">%1$@, %2$@</target>
+      </trans-unit>
+      <trans-unit id="Verify connections" xml:space="preserve" approved="no">
+        <source>Verify connections</source>
+        <target state="translated">驗證連線</target>
+      </trans-unit>
+      <trans-unit id="Verify connection" xml:space="preserve" approved="no">
+        <source>Verify connection</source>
+        <target state="translated">驗證連線</target>
+      </trans-unit>
+      <trans-unit id="Verify passphrase" xml:space="preserve" approved="no">
+        <source>Verify passphrase</source>
+        <target state="translated">驗證密碼</target>
+      </trans-unit>
+      <trans-unit id="Verify code with desktop" xml:space="preserve" approved="no">
+        <source>Verify code with desktop</source>
+        <target state="translated">使用桌上電腦驗證代碼</target>
+      </trans-unit>
+      <trans-unit id="Save list" xml:space="preserve" approved="no">
+        <source>Save list</source>
+        <target state="translated">儲存列表</target>
+      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve" approved="no">
+        <source>Saving %lld messages</source>
+        <target state="translated">正在儲存 %lld 則訊息</target>
+      </trans-unit>
+      <trans-unit id="search" xml:space="preserve" approved="no">
+        <source>search</source>
+        <target state="translated">搜尋</target>
+      </trans-unit>
+      <trans-unit id="requested to connect" xml:space="preserve" approved="no">
+        <source>requested to connect</source>
+        <target state="translated">已請求連結</target>
+      </trans-unit>
+      <trans-unit id="saved" xml:space="preserve" approved="no">
+        <source>saved</source>
+        <target state="translated">已儲存</target>
+      </trans-unit>
+      <trans-unit id="video" xml:space="preserve" approved="no">
+        <source>video</source>
+        <target state="translated">視訊</target>
+      </trans-unit>
+      <trans-unit id="Tap to Connect" xml:space="preserve" approved="no">
+        <source>Tap to Connect</source>
+        <target state="translated">點擊以連結</target>
+      </trans-unit>
+      <trans-unit id="Unsupported connection link" xml:space="preserve" approved="no">
+        <source>Unsupported connection link</source>
+        <target state="translated">未受支持的連線連結</target>
+      </trans-unit>
+      <trans-unit id="Saved from" xml:space="preserve" approved="no">
+        <source>Saved from</source>
+        <target state="translated">儲存自</target>
+      </trans-unit>
+      <trans-unit id="Saved" xml:space="preserve" approved="no">
+        <source>Saved</source>
+        <target state="translated">已儲存</target>
+      </trans-unit>
+      <trans-unit id="Scan / Paste link" xml:space="preserve" approved="no">
+        <source>Scan / Paste link</source>
+        <target state="translated">掃描／貼上連結</target>
+      </trans-unit>
+      <trans-unit id="SimpleX" xml:space="preserve" approved="no">
+        <source>SimpleX</source>
+        <target state="translated">SimpleX</target>
+      </trans-unit>
+      <trans-unit id="Use the app while in the call." xml:space="preserve" approved="no">
+        <source>Use the app while in the call.</source>
+        <target state="translated">在通話時使用此應用程式。</target>
+      </trans-unit>
+      <trans-unit id="v%@" xml:space="preserve" approved="no">
+        <source>v%@</source>
+        <target state="translated">v%@</target>
+      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve" approved="no">
+        <source>Save your profile?</source>
+        <target state="translated">儲存設定檔？</target>
+      </trans-unit>
+      <trans-unit id="Use for messages" xml:space="preserve" approved="no">
+        <source>Use for messages</source>
+        <target state="translated">用於訊息</target>
+      </trans-unit>
+      <trans-unit id="Uploading archive" xml:space="preserve" approved="no">
+        <source>Uploading archive</source>
+        <target state="translated">正在上傳檔案庫</target>
+      </trans-unit>
+      <trans-unit id="Unlink" xml:space="preserve" approved="no">
+        <source>Unlink</source>
+        <target state="translated">從桌上電腦解除連結</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">已封鎖 %d 則訊息</target>
+      </trans-unit>
+      <trans-unit id="The same conditions will apply to operator **%@**." xml:space="preserve" approved="no">
+        <source>The same conditions will apply to operator **%@**.</source>
+        <target state="translated">相同條件也適用於 **%@** 操作員。</target>
+      </trans-unit>
+      <trans-unit id="These conditions will also apply for: **%@**." xml:space="preserve" approved="no">
+        <source>These conditions will also apply for: **%@**.</source>
+        <target state="translated">這些條件也適用於：**%@**。</target>
+      </trans-unit>
+      <trans-unit id="Upload failed" xml:space="preserve" approved="no">
+        <source>Upload failed</source>
+        <target state="translated">上傳失敗</target>
+      </trans-unit>
+      <trans-unit id="Use the app with one hand." xml:space="preserve" approved="no">
+        <source>Use the app with one hand.</source>
+        <target state="translated">單手使用此應用程式。</target>
+      </trans-unit>
+      <trans-unit id="Safely receive files" xml:space="preserve" approved="no">
+        <source>Safely receive files</source>
+        <target state="translated">安全地接收檔案</target>
+      </trans-unit>
+      <trans-unit id="Saved message" xml:space="preserve" approved="no">
+        <source>Saved message</source>
+        <target state="translated">已儲存的訊息</target>
+      </trans-unit>
+      <trans-unit id="Use from desktop" xml:space="preserve" approved="no">
+        <source>Use from desktop</source>
+        <target state="translated">在桌上電腦上使用</target>
+      </trans-unit>
+      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve" approved="no">
+        <source>Via secure quantum resistant protocol.</source>
+        <target state="translated">使用量子安全的協定。</target>
+      </trans-unit>
+      <trans-unit id="Uploaded" xml:space="preserve" approved="no">
+        <source>Uploaded</source>
+        <target state="translated">已上傳</target>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hant" datatype="plaintext">
diff --git a/apps/ios/SimpleX NSE/NSEAPITypes.swift b/apps/ios/SimpleX NSE/NSEAPITypes.swift
new file mode 100644
index 0000000000..35a838fff9
--- /dev/null
+++ b/apps/ios/SimpleX NSE/NSEAPITypes.swift	
@@ -0,0 +1,127 @@
+//
+//  APITypes.swift
+//  SimpleX
+//
+//  Created by EP on 01/05/2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SimpleXChat
+
+enum NSEChatCommand: ChatCmdProtocol {
+    case showActiveUser
+    case startChat(mainApp: Bool, enableSndFiles: Bool)
+    case apiActivateChat(restoreChat: Bool)
+    case apiSuspendChat(timeoutMicroseconds: Int)
+    case apiSetNetworkConfig(networkConfig: NetCfg)
+    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
+    case apiSetEncryptLocalFiles(enable: Bool)
+    case apiGetNtfConns(nonce: String, encNtfInfo: String)
+    case apiGetConnNtfMessages(connMsgReqs: [ConnMsgReq])
+    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
+    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
+    
+    var cmdString: String {
+        switch self {
+        case .showActiveUser: return "/u"
+        case let .startChat(mainApp, enableSndFiles): return "/_start main=\(onOff(mainApp)) snd_files=\(onOff(enableSndFiles))"
+        case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
+        case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
+        case let .apiSetNetworkConfig(networkConfig): return "/_network \(encodeJSON(networkConfig))"
+        case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder):
+            return "/set file paths \(encodeJSON(AppFilePaths(appFilesFolder: filesFolder, appTempFolder: tempFolder, appAssetsFolder: assetsFolder)))"
+        case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
+        case let .apiGetNtfConns(nonce, encNtfInfo): return "/_ntf conns \(nonce) \(encNtfInfo)"
+        case let .apiGetConnNtfMessages(connMsgReqs): return "/_ntf conn messages \(connMsgReqs.map { $0.cmdString }.joined(separator: ","))"
+        case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
+        case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
+        }
+    }
+
+    private func onOffParam(_ param: String, _ b: Bool?) -> String {
+        if let b = b {
+            " \(param)=\(onOff(b))"
+        } else {
+            ""
+        }
+    }
+}
+
+enum NSEChatResponse: Decodable, ChatAPIResult {
+    case activeUser(user: User)
+    case chatStarted
+    case chatRunning
+    case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
+    case ntfConns(ntfConns: [NtfConn])
+    case connNtfMessages(receivedMsgs: [RcvNtfMsgInfo])
+    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
+    case cmdOk(user_: UserRef?)
+    
+    var responseType: String {
+        switch self {
+        case .activeUser: "activeUser"
+        case .chatStarted: "chatStarted"
+        case .chatRunning: "chatRunning"
+        case .rcvFileAccepted: "rcvFileAccepted"
+        case .ntfConns: "ntfConns"
+        case .connNtfMessages: "connNtfMessages"
+        case .ntfMessage: "ntfMessage"
+        case .cmdOk: "cmdOk"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case let .activeUser(user): return String(describing: user)
+        case .chatStarted: return noDetails
+        case .chatRunning: return noDetails
+        case let .rcvFileAccepted(u, chatItem): return withUser(u, String(describing: chatItem))
+        case let .ntfConns(ntfConns): return String(describing: ntfConns)
+        case let .connNtfMessages(receivedMsgs): return "receivedMsgs: \(String(describing: receivedMsgs))"
+        case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
+        case .cmdOk: return noDetails
+        }
+    }
+}
+
+enum NSEChatEvent: Decodable, ChatAPIResult {
+    case chatSuspended
+    case contactConnected(user: UserRef, contact: Contact, userCustomProfile: Profile?)
+    case receivedContactRequest(user: UserRef, contactRequest: UserContactRequest)
+    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case rcvFileSndCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
+    case sndFileComplete(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileRcvCancelled(user: UserRef, chatItem_: AChatItem?, sndFileTransfer: SndFileTransfer)
+    case callInvitation(callInvitation: RcvCallInvitation)
+    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
+    
+    var responseType: String {
+        switch self {
+        case .chatSuspended: "chatSuspended"
+        case .contactConnected: "contactConnected"
+        case .receivedContactRequest: "receivedContactRequest"
+        case .newChatItems: "newChatItems"
+        case .rcvFileSndCancelled: "rcvFileSndCancelled"
+        case .sndFileComplete: "sndFileComplete"
+        case .sndFileRcvCancelled: "sndFileRcvCancelled"
+        case .callInvitation: "callInvitation"
+        case .ntfMessage: "ntfMessage"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case .chatSuspended: return noDetails
+        case let .contactConnected(u, contact, _): return withUser(u, String(describing: contact))
+        case let .receivedContactRequest(u, contactRequest): return withUser(u, String(describing: contactRequest))
+        case let .newChatItems(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case let .rcvFileSndCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileComplete(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .sndFileRcvCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .callInvitation(inv): return String(describing: inv)
+        case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
+        }
+    }    
+}
diff --git a/apps/ios/SimpleX NSE/NotificationService.swift b/apps/ios/SimpleX NSE/NotificationService.swift
index ce80adf38f..176da2481e 100644
--- a/apps/ios/SimpleX NSE/NotificationService.swift	
+++ b/apps/ios/SimpleX NSE/NotificationService.swift	
@@ -22,12 +22,6 @@ let nseSuspendSchedule: SuspendSchedule = (2, 4)
 
 let fastNSESuspendSchedule: SuspendSchedule = (1, 1)
 
-enum NSENotification {
-    case nse(UNMutableNotificationContent)
-    case callkit(RcvCallInvitation)
-    case empty
-}
-
 public enum NSENotificationData {
     case connectionEvent(_ user: User, _ connEntity: ConnectionEntity)
     case contactConnected(_ user: any UserLike, _ contact: Contact)
@@ -37,6 +31,7 @@ public enum NSENotificationData {
     case msgInfo(NtfMsgAckInfo)
     case noNtf
 
+    @inline(__always)
     var callInvitation: RcvCallInvitation? {
         switch self {
         case let .callInvitation(invitation): invitation
@@ -56,8 +51,9 @@ public enum NSENotificationData {
         }
     }
 
+    @inline(__always)
     var notificationEvent: NSENotificationData? {
-        return switch self {
+        switch self {
         case .connectionEvent: self
         case .contactConnected: self
         case .contactRequest: self
@@ -68,9 +64,10 @@ public enum NSENotificationData {
         }
     }
 
-    var newMsgData: (any UserLike, ChatInfo)? {
-        return switch self {
-        case let .messageReceived(user, cInfo, _): (user, cInfo)
+    @inline(__always)
+    var newMsgNtf: NSENotificationData? {
+        switch self {
+        case .messageReceived: self
         default: nil
         }
     }
@@ -81,20 +78,25 @@ public enum NSENotificationData {
 // or when background notification is received.
 class NSEThreads {
     static let shared = NSEThreads()
-    static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
+    private let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
     private var allThreads: Set<UUID> = []
-    var activeThreads: [(UUID, NotificationService)] = []
-    var droppedNotifications: [(ChatId, NSENotificationData)] = []
+    private var activeThreads: [(threadId: UUID, nse: NotificationService)] = []
+    private var droppedNotifications: [(entityId: ChatId, ntf: NSENotificationData)] = []
 
+    @inline(__always)
+    private init() {} // only shared instance can be used
+
+    @inline(__always)
     func newThread() -> UUID {
-        NSEThreads.queue.sync {
+        queue.sync {
             let (_, t) = allThreads.insert(UUID())
             return t
         }
     }
 
+    @inline(__always)
     func startThread(_ t: UUID, _ service: NotificationService) {
-        NSEThreads.queue.sync {
+        queue.sync {
             if allThreads.contains(t) {
                 activeThreads.append((t, service))
             } else {
@@ -103,24 +105,111 @@ class NSEThreads {
         }
     }
 
+    // atomically:
+    // - checks that passed NSE instance can start processing passed notification entity,
+    // - adds it to the passed NSE instance,
+    // - marks as started, if no other NSE instance is processing it.
+    // Making all these steps atomic prevents a race condition between threads when both will be added and none will be started
+    @inline(__always)
+    func startEntity(_ nse: NotificationService, _ ntfEntity: NotificationEntity) -> Bool {
+        queue.sync {
+            // checking that none of activeThreads with another NSE instance processes the same entity and is not ready
+            let canStart = !activeThreads.contains(where: { (tId, otherNSE) in
+                tId != nse.threadId
+                && otherNSE.notificationEntities.contains(where: { (id, otherEntity) in
+                    id == ntfEntity.entityId
+                    && otherEntity.expectedMsg != nil
+                })
+            })
+            // atomically add entity to passed NSE instance
+            let id = ntfEntity.entityId
+            nse.notificationEntities[id] = ntfEntity
+            if canStart {
+                // and set as started, so it cannot be chosen to start by another NSE entity in nextThread
+                nse.notificationEntities[id]?.startedProcessingNewMsgs = true
+            }
+            return canStart
+        }
+    }
+
+    @inline(__always)
+    func addDroppedNtf(_ id: ChatId, _ ntf: NSENotificationData) {
+        queue.sync { droppedNotifications.append((id, ntf)) }
+    }
+
+    // atomically remove and return first dropped notification for the passed entity
+    @inline(__always)
+    func takeDroppedNtf(_ ntfEntity: NotificationEntity) -> (entityId: ChatId, ntf: NSENotificationData)? {
+        queue.sync {
+            if droppedNotifications.isEmpty {
+                nil
+            } else if let i = droppedNotifications.firstIndex(where: { (id, _) in id == ntfEntity.entityId }) {
+                droppedNotifications.remove(at: i)
+            } else {
+                nil
+            }
+        }
+    }
+
+    // passes notification for processing to NSE instance chosen by rcvEntityThread
+    @inline(__always)
     func processNotification(_ id: ChatId, _ ntf: NSENotificationData) async -> Void {
-        if let (_, nse) = rcvEntityThread(id),
-           nse.expectedMessages[id]?.shouldProcessNtf ?? false {
-            nse.processReceivedNtf(id, ntf, signalReady: true)
+        if let (nse, ntfEntity, expectedMsg) = rcvEntityThread(id, ntf) {
+            logger.debug("NotificationService processNotification \(id): found nse thread expecting message")
+            if nse.processReceivedNtf(ntfEntity, expectedMsg, ntf) {
+                nse.finalizeEntity(id)
+            }
         }
     }
 
-    private func rcvEntityThread(_ id: ChatId) -> (UUID, NotificationService)? {
-        NSEThreads.queue.sync {
+    // atomically:
+    // - chooses active NSE instance that is ready to process notifications and expects message for passed entity ID
+    // - returns all dependencies for processing (notification entity and expected message)
+    // - adds notification to droppedNotifications if no ready NSE instance is found for the entity
+    @inline(__always)
+    private func rcvEntityThread(_ id: ChatId, _ ntf: NSENotificationData) -> (NotificationService, NotificationEntity, NtfMsgInfo)? {
+        queue.sync {
             // this selects the earliest thread that:
-            // 1) has this connection in nse.expectedMessages
-            // 2) has not completed processing messages for this connection (not ready)
-            activeThreads.first(where: { (_, nse) in nse.expectedMessages[id]?.ready == false })
+            // 1) has this connection entity in nse.notificationEntitites
+            // 2) has not completed processing messages for this connection entity (not ready)
+            let r = activeThreads.lazy.compactMap({ (_, nse) in
+                let ntfEntity = nse.notificationEntities[id]
+                return if let ntfEntity, let expectedMsg = ntfEntity.expectedMsg, ntfEntity.shouldProcessNtf {
+                    (nse, ntfEntity, expectedMsg)
+                } else {
+                    nil
+                }
+            }).first
+            if r == nil { droppedNotifications.append((id, ntf)) }
+            return r
         }
     }
 
+    // Atomically mark entity in the passed NSE instance as not expecting messages,
+    // and signal the next NSE instance with this entity to start its processing.
+    @inline(__always)
+    func signalNextThread(_ nse: NotificationService, _ id: ChatId) {
+        queue.sync {
+            nse.notificationEntities[id]?.expectedMsg = nil
+            nse.notificationEntities[id]?.shouldProcessNtf = false
+            let next = activeThreads.first(where: { (_, nseNext) in
+                if let ntfEntity = nseNext.notificationEntities[id] {
+                    ntfEntity.expectedMsg != nil && !ntfEntity.startedProcessingNewMsgs
+                } else {
+                    false
+                }
+            })
+            if let (tNext, nseNext) = next {
+                if let t = nse.threadId { logger.debug("NotificationService thread \(t): signalNextThread: signal next thread \(tNext) for entity \(id)") }
+                nseNext.notificationEntities[id]?.startedProcessingNewMsgs = true
+                nseNext.notificationEntities[id]?.semaphore.signal()
+            }
+        }
+    }
+
+    @inline(__always)
     func endThread(_ t: UUID) -> Bool {
-        NSEThreads.queue.sync {
+        queue.sync {
             let tActive: UUID? = if let index = activeThreads.firstIndex(where: { $0.0 == t }) {
                 activeThreads.remove(at: index).0
             } else {
@@ -137,21 +226,53 @@ class NSEThreads {
         }
     }
 
+    @inline(__always)
     var noThreads: Bool {
         allThreads.isEmpty
     }
 }
 
-struct ExpectedMessage {
-    var ntfConn: UserNtfConn
-    var receiveConnId: String?
-    var expectedMsgId: String?
-    var allowedGetNextAttempts: Int
-    var msgBestAttemptNtf: NSENotificationData?
-    var ready: Bool
-    var shouldProcessNtf: Bool
-    var startedProcessingNewMsgs: Bool
-    var semaphore: DispatchSemaphore
+// NotificationEntity is a processing state for notifications from a single connection entity (message queue).
+// Each NSE instance within NSE process can have more than one NotificationEntity.
+// NotificationEntities of an NSE instance are processed concurrently, as messages arrive in any order.
+// NotificationEntities for the same connection across multiple NSE instances (NSEThreads) are processed sequentially, so that the earliest NSE instance receives the earliest messages.
+// The reason for this complexity is to process all required messages within allotted 30 seconds,
+// accounting for the possibility that multiple notifications may be delivered concurrently. 
+struct NotificationEntity {
+    var ntfConn: NtfConn
+    var entityId: ChatId
+
+    // expectedMsg == nil means that entity already has the best attempt to deliver, and no more messages are expected.
+    // It happens when:
+    // - the user is muted (set to nil in mkNotificationEntity)
+    // - apiGetNtfConns returns that there are no new messages (msgId in notification matches previously received),
+    // - messaging server fails to respond or replies that there are no messages (apiGetConnNtfMessages / getConnNtfMessage),
+    // - the message is received with the correct ID or timestamp (set to nil in signalNextThread).
+    var expectedMsg: NtfMsgInfo?
+    var allowedGetNextAttempts: Int = 3
+    var msgBestAttemptNtf: NSENotificationData
+
+    // startedProcessingNewMsgs determines that the entity stared processing events once it processed dropped notifications.
+    // It remains true when shouldProcessNtf is set to false, to prevent NSE from being chosen as the next for the entity.
+    // It is atomically set to true by startThead or by nextThread
+    var startedProcessingNewMsgs: Bool = false
+
+    // shouldProcessNtf determines that NSE should process events for this entity,
+    // it is atomically set:
+    // - to true in processDroppedNotifications in case dropped notification is not chosen for delivery, and more messages are needed.
+    // - to false in nextThread
+    var shouldProcessNtf: Bool = false
+
+    // this semaphone is used to wait for another NSE instance processing events for the same entity
+    var semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
+
+    var connMsgReq: ConnMsgReq? {
+        if let expectedMsg {
+            ConnMsgReq(msgConnId: ntfConn.agentConnId, msgDbQueueId: ntfConn.agentDbQueueId, msgTs: expectedMsg.msgTs)
+        } else {
+            nil
+        }
+    }
 }
 
 // Notification service extension creates a new instance of the class and calls didReceive for each notification.
@@ -161,36 +282,46 @@ struct ExpectedMessage {
 class NotificationService: UNNotificationServiceExtension {
     var contentHandler: ((UNNotificationContent) -> Void)?
     // served as notification if no message attempts (msgBestAttemptNtf) could be produced
-    var serviceBestAttemptNtf: NSENotification?
+    var serviceBestAttemptNtf: UNMutableNotificationContent?
     var badgeCount: Int = 0
     // thread is added to allThreads here - if thread did not start chat,
     // chat does not need to be suspended but NSE state still needs to be set to "suspended".
     var threadId: UUID? = NSEThreads.shared.newThread()
-    var expectedMessages: Dictionary<String, ExpectedMessage> = [:] // key is receiveEntityId
+    var notificationEntities: Dictionary<String, NotificationEntity> = [:] // key is entityId
     var appSubscriber: AppSubscriber?
     var returnedSuspension = false
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         logger.debug("DEBUGGING: NotificationService.didReceive")
-        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
-        setServiceBestAttemptNtf(ntf)
+        let receivedNtf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
+        setServiceBestAttemptNtf(receivedNtf)
         self.contentHandler = contentHandler
         registerGroupDefaults()
         let appState = appStateGroupDefault.get()
         logger.debug("NotificationService: app is \(appState.rawValue)")
         switch appState {
         case .stopped:
+//            Use this block to debug notificaitons delivery in CLI, with "ejected" database and stopped chat
+//            if let nrData = ntfRequestData(request) {
+//                logger.debug("NotificationService get notification connections: /_ntf conns \(nrData.nonce) \(nrData.encNtfInfo)")
+//                contentHandler(receivedNtf)
+//                return;
+//            }
             setBadgeCount()
-            setServiceBestAttemptNtf(createAppStoppedNtf(badgeCount))
-            deliverBestAttemptNtf()
+            contentHandler(createAppStoppedNtf(badgeCount))
         case .suspended:
-            receiveNtfMessages(request, contentHandler)
+            setExpirationTimer()
+            receiveNtfMessages(request)
         case .suspending:
+            // while application is suspending, the current instance will be waiting
+            setExpirationTimer()
             Task {
                 let state: AppState = await withCheckedContinuation { cont in
+                    // this subscriber uses message delivery via NSFileCoordinator to communicate between the app and NSE
                     appSubscriber = appStateSubscriber { s in
                         if s == .suspended { appSuspension(s) }
                     }
+                    // this is a fallback timeout, in case message from the app does not arrive
                     DispatchQueue.global().asyncAfter(deadline: .now() + Double(appSuspendTimeout) + 1) {
                         logger.debug("NotificationService: appSuspension timeout")
                         appSuspension(appStateGroupDefault.get())
@@ -206,119 +337,179 @@ class NotificationService: UNNotificationServiceExtension {
                     }
                 }
                 logger.debug("NotificationService: app state is now \(state.rawValue)")
-                if state.inactive {
-                    receiveNtfMessages(request, contentHandler)
+                if state.inactive && self.contentHandler != nil {
+                    receiveNtfMessages(request)
                 } else {
-                    deliverBestAttemptNtf()
+                    contentHandler(receivedNtf)
                 }
             }
-        case .active: contentHandler(UNMutableNotificationContent())
-        case .activating: contentHandler(UNMutableNotificationContent())
-        case .bgRefresh: contentHandler(UNMutableNotificationContent())
+        case .active: contentHandler(receivedNtf)
+        case .activating: contentHandler(receivedNtf)
+        case .bgRefresh: contentHandler(receivedNtf)
         }
     }
 
-    func receiveNtfMessages(_ request: UNNotificationRequest, _ contentHandler: @escaping (UNNotificationContent) -> Void) {
+    // This timer compensates for the scenarios when serviceExtensionTimeWillExpire does not fire at all.
+    // It is not clear why in some cases it does not fire, possibly it is a bug,
+    // or it depends on what the current thread is doing at the moment.
+    // If notification is not delivered and not cancelled, no further notifications will be processed.
+    @inline(__always)
+    private func setExpirationTimer() -> Void {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 30) {
+            self.deliverBestAttemptNtf(urgent: true)
+        }
+    }
+
+    @inline(__always)
+    private func ntfRequestData(_ request: UNNotificationRequest) -> (nonce: String, encNtfInfo: String)? {
+        if let ntfData = request.content.userInfo["notificationData"] as? [AnyHashable : Any],
+           let nonce = ntfData["nonce"] as? String,
+           let encNtfInfo = ntfData["message"] as? String {
+            (nonce, encNtfInfo)
+        } else {
+            nil
+        }
+    }
+
+    // This function triggers notification message delivery for connection entities referenced in the notification.
+    // Notification may reference multiple connection entities (message queues) in order to compensate for Apple servers
+    // only delivering the latest notification, so it allows receiving messages from up to 6 contacts and groups from a
+    // single notification. This aggregation is handled by a notification server and is delivered via APNS servers in
+    // e2e encrypted envelope, and the app core prevents duplicate processing by keeping track of the last processed message.
+
+    // The process steps:
+    // 0. apiGetConnNtfMessages or getConnNtfMessage get messages from the server for passed connection entities.
+    // We don't know in advance which chat events will be delivered from app core for a given notification,
+    // it may be a message, but it can also be contact request, various protocol confirmations, calls, etc.,
+    // this function only returns metadata for the expected chat events.
+    // This metadata is correlated with .ntfMessage core event / .msgInfo notification marker -
+    // this marker allows determining when some message completed processing.
+    // 1. receiveMessages: singleton loop receiving events from core.
+    // 2. receivedMsgNtf: maps core events to notification events.
+    // 3. NSEThreads.shared.processNotification: chooses which notification service instance in the current process should process notification.
+    // While most of the time we observe that notifications are delivered sequentially, nothing in the documentation confirms it is sequential,
+    // and from various sources it follows that each instance executes in its own thread, so concurrency is expected.
+    // 4. processReceivedNtf: one of the instances of NSE processes notification event, deciding whether to request further messages
+    // for a given connection entity (via getConnNtfMessage) or that the correct message was received and notification can be delivered (deliverBestAttemptNtf).
+    // It is based on .msgInfo markers that indicate that message with a given timestamp was processed.
+    // 5. deliverBestAttemptNtf: is called multiple times, once each connection receives enough messages (based on .msgInfo marker).
+    // If further messages are expected, this function does nothing (unless it is called with urgent flag from timeout/expiration handlers).
+    func receiveNtfMessages(_ request: UNNotificationRequest) {
         logger.debug("NotificationService: receiveNtfMessages")
         if case .documents = dbContainerGroupDefault.get() {
             deliverBestAttemptNtf()
             return
         }
-        let userInfo = request.content.userInfo
-        if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
-           let nonce = ntfData["nonce"] as? String,
-           let encNtfInfo = ntfData["message"] as? String,
-           // check it here again
+        if let nrData = ntfRequestData(request),
+           // Check that the app is still inactive before starting the core.
            appStateGroupDefault.get().inactive {
             // thread is added to activeThreads tracking set here - if thread started chat it needs to be suspended
-            if let t = threadId { NSEThreads.shared.startThread(t, self) }
+            guard let t = threadId else { return }
+            NSEThreads.shared.startThread(t, self)
             let dbStatus = startChat()
+            // If database is opened successfully, get the list of connection entities (group members, contacts)
+            // that are referenced in the encrypted notification metadata.
             if case .ok = dbStatus,
-               let ntfConns = apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo) {
+               let ntfConns = apiGetNtfConns(nonce: nrData.nonce, encNtfInfo: nrData.encNtfInfo) {
                 logger.debug("NotificationService: receiveNtfMessages: apiGetNtfConns ntfConns count = \(ntfConns.count)")
+                // uncomment localDisplayName in ConnectionEntity
+                // logger.debug("NotificationService: receiveNtfMessages: apiGetNtfConns ntfConns \(String(describing: ntfConns.map { $0.connEntity.localDisplayName }))")
 
-                for ntfConn in ntfConns {
-                    addExpectedMessage(ntfConn: ntfConn)
-                }
+                // Prepare expected messages - they will be delivered to the reception loop in this chain:
+                // They are atomically added to the instance notificationEntities inside msgReqs loop, to avoid any race conditions.
+                let ntfEntities = ntfConns.compactMap(mkNotificationEntity)
 
-                let connIdsToGet = expectedMessages.compactMap { (id, _) in
-                    let started = NSEThreads.queue.sync {
-                        let canStart = checkCanStart(id)
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: can start: \(canStart)") }
-                        if canStart {
-                            processDroppedNotifications(id)
-                            expectedMessages[id]?.startedProcessingNewMsgs = true
-                            expectedMessages[id]?.shouldProcessNtf = true
-                        }
-                        return canStart
-                    }
-                    if started {
-                        return expectedMessages[id]?.receiveConnId
-                    } else {
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) waiting on semaphore") }
-                        expectedMessages[id]?.semaphore.wait()
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) proceeding after semaphore") }
-                        Task {
-                            NSEThreads.queue.sync {
-                                processDroppedNotifications(id)
-                                expectedMessages[id]?.startedProcessingNewMsgs = true
-                                expectedMessages[id]?.shouldProcessNtf = true
+                // collect notification message requests for all connection entities
+                let msgReqs: [(chatId: String, connMsgReq: ConnMsgReq)] = ntfEntities.compactMap { ntfEntity -> (chatId: String, connMsgReq: ConnMsgReq)? in
+                    // No need to request messages for connection entities that are "ready",
+                    // e.g. for muted users or when the message is not expected based on notification.
+                    let id = ntfEntity.entityId
+                    if let expectedMsg = ntfEntity.expectedMsg {
+                        if NSEThreads.shared.startEntity(self, ntfEntity) { // atomically checks and adds ntfEntity to NSE
+                            // process any notifications "postponed" by the previous instance
+                            let completed = processDroppedNotifications(ntfEntity, expectedMsg)
+                            return if !completed, let connMsgReq = notificationEntities[id]?.connMsgReq {
+                                (id, connMsgReq)
+                            } else {
+                                nil
                             }
-                            if let connId = expectedMessages[id]?.receiveConnId {
-                                let _ = getConnNtfMessage(connId: connId)
+                        } else {
+                            // wait for another instance processing the same connection entity
+                            logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) waiting on semaphore")
+                            // this semaphore will be released by signalNextThread function, that looks up the instance
+                            // waiting for the connection entity via activeThreads in NSEThreads
+                            notificationEntities[id]?.semaphore.wait()
+                            logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) proceeding after semaphore")
+                            Task {
+                                // process any notifications "postponed" by the previous instance
+                                let completed = processDroppedNotifications(ntfEntity, expectedMsg)
+                                // Request messages from the server for this connection entity.
+                                // It triggers event delivery to receiveMessages loop (see above).
+                                if !completed, let connMsgReq = notificationEntities[id]?.connMsgReq,
+                                   let rcvMsg = getConnNtfMessage(connMsgReq: connMsgReq),
+                                   rcvMsg.noMsg {
+                                    // if server returns error or "no message", deliver what we have for this connection entity.
+                                    finalizeEntity(id) // also releases any waiting threads for this entity
+                                }
                             }
+                            return nil
                         }
+                    } else { // no expected message
+                        notificationEntities[id] = ntfEntity
                         return nil
                     }
                 }
 
-                if !connIdsToGet.isEmpty {
-                    if let r = apiGetConnNtfMessages(connIds: connIdsToGet) {
-                        logger.debug("NotificationService: receiveNtfMessages: apiGetConnNtfMessages count = \(r.count)")
+                // Request messages for all connection entities that were not used by other instances.
+                // It triggers event delivery to receiveMessages loop (see above).
+                if !msgReqs.isEmpty,
+                   let rcvMsgs = apiGetConnNtfMessages(connMsgReqs: msgReqs.map { $0.connMsgReq }) {
+                    for i in 0 ..< min(msgReqs.count, rcvMsgs.count) { // a sanity check, API always returns the same size
+                        if rcvMsgs[i].noMsg {
+                            // mark entity as ready if there are no message on the server (or on error)
+                            finalizeEntity(msgReqs[i].chatId)
+                        }
                     }
-                    return
                 }
             } else if let dbStatus = dbStatus {
                 setServiceBestAttemptNtf(createErrorNtf(dbStatus, badgeCount))
             }
         }
+        // try to deliver the best attempt before exiting
         deliverBestAttemptNtf()
     }
 
-    func addExpectedMessage(ntfConn: UserNtfConn) {
-        if let connEntity = ntfConn.connEntity_,
-           let receiveEntityId = connEntity.id, ntfConn.expectedMsg_ != nil {
-            let expectedMsgId = ntfConn.expectedMsg_?.msgId
-            logger.debug("NotificationService: addExpectedMessage: expectedMsgId = \(expectedMsgId ?? "nil", privacy: .private)")
-            expectedMessages[receiveEntityId] = ExpectedMessage(
+    @inline(__always)
+    func mkNotificationEntity(ntfConn: NtfConn) -> NotificationEntity? {
+        if let rcvEntityId = ntfConn.connEntity.id {
+            // don't receive messages for muted user profile
+            let expectedMsg: NtfMsgInfo? = if ntfConn.user.showNotifications { ntfConn.expectedMsg_ } else { nil }
+            return NotificationEntity(
                 ntfConn: ntfConn,
-                receiveConnId: connEntity.conn.agentConnId,
-                expectedMsgId: expectedMsgId,
-                allowedGetNextAttempts: 3,
-                msgBestAttemptNtf: ntfConn.defaultBestAttemptNtf,
-                ready: false,
-                shouldProcessNtf: false,
-                startedProcessingNewMsgs: false,
-                semaphore: DispatchSemaphore(value: 0)
+                entityId: rcvEntityId,
+                expectedMsg: expectedMsg,
+                msgBestAttemptNtf: defaultBestAttemptNtf(ntfConn)
             )
         }
+        return nil
     }
 
-    func checkCanStart(_ entityId: String) -> Bool {
-        return !NSEThreads.shared.activeThreads.contains(where: {
-            (tId, nse) in tId != threadId && nse.expectedMessages.contains(where: { $0.key == entityId })
-        })
-    }
-
-    func processDroppedNotifications(_ entityId: String) {
-        if !NSEThreads.shared.droppedNotifications.isEmpty {
-            let messagesToProcess = NSEThreads.shared.droppedNotifications.filter { (eId, _) in eId == entityId }
-            NSEThreads.shared.droppedNotifications.removeAll(where: { (eId, _) in eId == entityId })
-            for (index, (_, ntf)) in messagesToProcess.enumerated() {
-                if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entity \(entityId, privacy: .private): processing dropped notification \(index, privacy: .private)") }
-                processReceivedNtf(entityId, ntf, signalReady: false)
+    // Processes notifications received and postponed by the previous NSE instance
+    func processDroppedNotifications(_ ntfEntity: NotificationEntity, _ expectedMsg: NtfMsgInfo) -> Bool {
+        var completed = false
+        while !completed {
+            if let dropped = NSEThreads.shared.takeDroppedNtf(ntfEntity) {
+                completed = processReceivedNtf(ntfEntity, expectedMsg, dropped.ntf)
+            } else {
+                break
             }
         }
+        if completed {
+            finalizeEntity(ntfEntity.entityId)
+        } else {
+            notificationEntities[ntfEntity.entityId]?.shouldProcessNtf = true
+        }
+        return completed
     }
 
     override func serviceExtensionTimeWillExpire() {
@@ -326,73 +517,70 @@ class NotificationService: UNNotificationServiceExtension {
         deliverBestAttemptNtf(urgent: true)
     }
 
+    @inline(__always)
     var expectingMoreMessages: Bool {
-        !expectedMessages.allSatisfy { $0.value.ready }
+        notificationEntities.contains { $0.value.expectedMsg != nil }
     }
 
-    func processReceivedNtf(_ id: ChatId, _ ntf: NSENotificationData, signalReady: Bool) {
-        guard let expectedMessage = expectedMessages[id] else {
-            return
-        }
-        guard let expectedMsgTs = expectedMessage.ntfConn.expectedMsg_?.msgTs else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
-            return
-        }
+    // processReceivedNtf returns "completed" - true when no more messages for the passed entity should be processed by the current NSE instance.
+    // This is used to call finalizeEntity(id) and by processDroppedNotifications to decide if further processing is needed.
+    func processReceivedNtf(_ ntfEntity: NotificationEntity, _ expectedMsg: NtfMsgInfo, _ ntf: NSENotificationData) -> Bool {
+        let id = ntfEntity.entityId
         if case let .msgInfo(info) = ntf {
-            if info.msgId == expectedMessage.expectedMsgId {
+            if info.msgId == expectedMsg.msgId {
+                // The message for this instance is processed, no more expected, deliver.
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): expected")
-                expectedMessages[id]?.expectedMsgId = nil
-                if signalReady { entityReady(id) }
-                self.deliverBestAttemptNtf()
-            } else if let msgTs = info.msgTs_, msgTs > expectedMsgTs {
+                return true
+            } else if let msgTs = info.msgTs_, msgTs > expectedMsg.msgTs {
+                // Otherwise check timestamp - if it is after the currently expected timestamp, preserve .msgInfo marker for the next instance.
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, let other instance to process it, stopping this one")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
-                self.deliverBestAttemptNtf()
-            } else if (expectedMessages[id]?.allowedGetNextAttempts ?? 0) > 0, let receiveConnId = expectedMessages[id]?.receiveConnId {
+                NSEThreads.shared.addDroppedNtf(id, ntf)
+                return true
+            } else if ntfEntity.allowedGetNextAttempts > 0, let connMsgReq = ntfEntity.connMsgReq {
+                // Otherwise this instance expects more messages, and still has allowed attempts -
+                // request more messages with getConnNtfMessage.
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, get next message")
-                expectedMessages[id]?.allowedGetNextAttempts -= 1
-                if let receivedMsg = getConnNtfMessage(connId: receiveConnId) {
-                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(receivedMsg.msgId, privacy: .private)")
+                notificationEntities[id]?.allowedGetNextAttempts -= 1
+                let receivedMsg = getConnNtfMessage(connMsgReq: connMsgReq)
+                if case let .info(msg) = receivedMsg, let msg {
+                    // Server delivered message, it will be processed in the loop - see the comments in receiveNtfMessages.
+                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(msg.msgId, privacy: .private)")
+                    return false
                 } else {
+                    // Server reported no messages or error, deliver what we have.
                     logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private): no next message, deliver best attempt")
-                    NSEThreads.shared.droppedNotifications.append((id, ntf))
-                    if signalReady { entityReady(id) }
-                    self.deliverBestAttemptNtf()
+                    return true
                 }
             } else {
+                // Current instance needs more messages, but ran out of attempts - deliver what we have.
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unknown message, let other instance to process it")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
-                self.deliverBestAttemptNtf()
+                return true
             }
-        } else if expectedMessage.ntfConn.user.showNotifications {
+        } else if ntfEntity.ntfConn.user.showNotifications {
+            // This is the notification event for the user with enabled notifications.
             logger.debug("NotificationService processNtf: setting best attempt")
             if ntf.notificationEvent != nil {
                 setBadgeCount()
             }
-            let prevBestAttempt = expectedMessages[id]?.msgBestAttemptNtf
-            if prevBestAttempt?.callInvitation != nil {
-                if ntf.callInvitation != nil { // replace with newer call
-                    expectedMessages[id]?.msgBestAttemptNtf = ntf
-                } // otherwise keep call as best attempt
-            } else {
-                expectedMessages[id]?.msgBestAttemptNtf = ntf
-            }
+            // If previous "best attempt" is not a call, or if the current notification is a call, replace best attempt.
+            // NOTE: we are delaying it until notification marker to make sure we are not delivering stale calls that can't be connected.
+            // A better logic could be to check whether we have a call in the best attempt while processing .msgInfo marker above.
+            // If the best attempt is a call, and its marker is received, and the call is recent (e.g., the last 30 seconds), it would deliver at once,
+            // instead of requesting further messages.
+            if ntfEntity.msgBestAttemptNtf.callInvitation == nil || ntf.callInvitation != nil {
+                notificationEntities[id]?.msgBestAttemptNtf = ntf
+            } // otherwise keep call as best attempt
+            return false
         } else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
+            // We should not get to this branch, as notifications are not delivered for muted users.
+            return true
         }
     }
 
-    func entityReady(_ entityId: ChatId) {
-        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: entity \(entityId, privacy: .private)") }
-        expectedMessages[entityId]?.ready = true
-        if let (tNext, nse) = NSEThreads.shared.activeThreads.first(where: { (_, nse) in nse.expectedMessages[entityId]?.startedProcessingNewMsgs == false }) {
-            if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: signal next thread \(tNext, privacy: .private) for entity \(entityId, privacy: .private)") }
-            nse.expectedMessages[entityId]?.semaphore.signal()
-        }
+    func finalizeEntity(_ entityId: ChatId) {
+        if let t = threadId { logger.debug("NotificationService thread \(t): entityReady: entity \(entityId)") }
+        NSEThreads.shared.signalNextThread(self, entityId)
+        deliverBestAttemptNtf()
     }
 
     func setBadgeCount() {
@@ -400,17 +588,22 @@ class NotificationService: UNNotificationServiceExtension {
         ntfBadgeCountGroupDefault.set(badgeCount)
     }
 
+    @inline(__always)
     func setServiceBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
         logger.debug("NotificationService.setServiceBestAttemptNtf")
-        serviceBestAttemptNtf = .nse(ntf)
+        serviceBestAttemptNtf = ntf
     }
 
     private func deliverBestAttemptNtf(urgent: Bool = false) {
-        if (urgent || !expectingMoreMessages) {
+        logger.debug("NotificationService.deliverBestAttemptNtf urgent: \(urgent) expectingMoreMessages: \(self.expectingMoreMessages)")
+        if let handler = contentHandler, urgent || !expectingMoreMessages {
+            if urgent {
+                contentHandler = nil
+            }
             logger.debug("NotificationService.deliverBestAttemptNtf")
             // stop processing other messages
-            for (key, _) in expectedMessages {
-                expectedMessages[key]?.shouldProcessNtf = false
+            for (key, _) in notificationEntities {
+                notificationEntities[key]?.shouldProcessNtf = false
             }
 
             let suspend: Bool
@@ -420,26 +613,28 @@ class NotificationService: UNNotificationServiceExtension {
             } else {
                 suspend = false
             }
-            deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
+            deliverCallkitOrNotification(urgent: urgent, suspend: suspend, handler: handler)
         }
     }
 
-    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if useCallKit() && expectedMessages.contains(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }) {
+    @inline(__always)
+    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false, handler: @escaping (UNNotificationContent) -> Void) {
+        let callInv = notificationEntities.lazy.compactMap({ $0.value.msgBestAttemptNtf.callInvitation }).first
+        if callInv != nil && useCallKit() {
             logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
+            // suspending NSE even though there may be other notifications
+            // to allow the app to process callkit call
             if urgent {
-                // suspending NSE even though there may be other notifications
-                // to allow the app to process callkit call
                 suspendChat(0)
-                deliverNotification()
+                deliverNotification(handler, callInv)
             } else {
-                // suspending NSE with delay and delivering after the suspension
+                // when not "urgent", suspending NSE with delay and delivering after the suspension
                 // because pushkit notification must be processed without delay
-                // to avoid app termination
+                // to avoid app termination.
                 DispatchQueue.global().asyncAfter(deadline: .now() + fastNSESuspendSchedule.delay) {
                     suspendChat(fastNSESuspendSchedule.timeout)
                     DispatchQueue.global().asyncAfter(deadline: .now() + Double(fastNSESuspendSchedule.timeout)) {
-                        self.deliverNotification()
+                        self.deliverNotification(handler, callInv)
                     }
                 }
             }
@@ -458,66 +653,71 @@ class NotificationService: UNNotificationServiceExtension {
                     }
                 }
             }
-            deliverNotification()
+            deliverNotification(handler, callInv)
         }
     }
 
-    private func deliverNotification() {
-        if let handler = contentHandler, let ntf = prepareNotification() {
-            contentHandler = nil
+    private func deliverNotification(_ handler: @escaping (UNNotificationContent) -> Void, _ callInv: RcvCallInvitation?) {
+        if let serviceNtf = serviceBestAttemptNtf {
             serviceBestAttemptNtf = nil
-            switch ntf {
-            case let .nse(content):
-                content.badge = badgeCount as NSNumber
-                handler(content)
-            case let .callkit(invitation):
-                logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
-                CXProvider.reportNewIncomingVoIPPushPayload([
-                    "displayName": invitation.contact.displayName,
-                    "contactId": invitation.contact.id,
-                    "callUUID": invitation.callUUID ?? "",
-                    "media": invitation.callType.media.rawValue,
-                    "callTs": invitation.callTs.timeIntervalSince1970
-                ]) { error in
-                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    handler(error == nil ? UNMutableNotificationContent() : createCallInvitationNtf(invitation, self.badgeCount))
+            contentHandler = nil
+            if let callInv {
+                if useCallKit() {
+                    logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(callInv.contact.id)")
+                    CXProvider.reportNewIncomingVoIPPushPayload([
+                        "displayName": callInv.contact.displayName,
+                        "contactId": callInv.contact.id,
+                        "callUUID": callInv.callUUID ?? "",
+                        "media": callInv.callType.media.rawValue,
+                        "callTs": callInv.callTs.timeIntervalSince1970
+                    ]) { error in
+                        logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
+                        handler(error == nil ? UNMutableNotificationContent() : createCallInvitationNtf(callInv, self.badgeCount))
+                    }
+                } else {
+                    handler(createCallInvitationNtf(callInv, badgeCount))
                 }
-            case .empty:
-                handler(UNMutableNotificationContent()) // used to mute notifications that did not unsubscribe yet
-            }
-        }
-    }
-
-    private func prepareNotification() -> NSENotification? {
-        if expectedMessages.isEmpty {
-            return serviceBestAttemptNtf
-        } else if let callNtfKV = expectedMessages.first(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }),
-                  let callInv = callNtfKV.value.msgBestAttemptNtf?.callInvitation,
-                  let callNtf = callNtfKV.value.msgBestAttemptNtf {
-            return useCallKit() ? .callkit(callInv) : .nse(callNtf.notificationContent(badgeCount))
-        } else {
-            let ntfEvents = expectedMessages.compactMap { $0.value.msgBestAttemptNtf?.notificationEvent }
-            if ntfEvents.isEmpty {
-                return .empty
-            } else if let ntfEvent = ntfEvents.count == 1 ? ntfEvents.first : nil {
-                return .nse(ntfEvent.notificationContent(badgeCount))
+            } else if notificationEntities.isEmpty {
+                handler(serviceNtf)
             } else {
-                return .nse(createJointNtf(ntfEvents))
+                handler(prepareNotification())
             }
         }
     }
 
-    private func createJointNtf(_ ntfEvents: [NSENotificationData]) -> UNMutableNotificationContent {
+    @inline(__always)
+    private func prepareNotification() -> UNMutableNotificationContent {
+        // uncomment localDisplayName in ConnectionEntity
+        // let conns = self.notificationEntities.compactMap { $0.value.ntfConn.connEntity.localDisplayName }
+        // logger.debug("NotificationService prepareNotification for \(String(describing: conns))")
+        let ntfs = notificationEntities.compactMap { $0.value.msgBestAttemptNtf.notificationEvent }
+        let newMsgNtfs = ntfs.compactMap({ $0.newMsgNtf })
+        let useNtfs = if newMsgNtfs.isEmpty { ntfs } else { newMsgNtfs }
+        return createNtf(useNtfs)
+        
+        func createNtf(_ ntfs: [NSENotificationData]) -> UNMutableNotificationContent {
+            logger.debug("NotificationService prepareNotification: \(ntfs.count) events")
+            return switch ntfs.count {
+            case 0: UNMutableNotificationContent() // used to mute notifications that did not unsubscribe yet
+            case 1: ntfs[0].notificationContent(badgeCount)
+            default: createJointNtf(ntfs)
+            }
+        }
+    }
+
+    // NOTE: this can be improved when there are two or more connection entity events when no messages were delivered.
+    // Possibly, it is better to postpone this improvement until message priority is added to prevent notifications in muted groups,
+    // unless it is a mention, a reply or some other high priority message marked for notification delivery.
+    @inline(__always)
+    private func createJointNtf(_ ntfs: [NSENotificationData]) -> UNMutableNotificationContent {
         let previewMode = ntfPreviewModeGroupDefault.get()
-        let newMsgsData: [(any UserLike, ChatInfo)] = ntfEvents.compactMap { $0.newMsgData }
-        if !newMsgsData.isEmpty, let userId = newMsgsData.first?.0.userId {
-            let newMsgsChats: [ChatInfo] = newMsgsData.map { $0.1 }
-            let uniqueChatsNames = uniqueNewMsgsChatsNames(newMsgsChats)
-            var body: String
-            if previewMode == .hidden {
-                body = String.localizedStringWithFormat(NSLocalizedString("New messages in %d chats", comment: "notification body"), uniqueChatsNames.count)
+        logger.debug("NotificationService.createJointNtf ntfs: \(ntfs.count)")
+        let (userId, chatsNames) = newMsgsChatsNames(ntfs)
+        if !chatsNames.isEmpty, let userId {
+            let body = if previewMode == .hidden {
+                String.localizedStringWithFormat(NSLocalizedString("From %d chat(s)", comment: "notification body"), chatsNames.count)
             } else {
-                body = String.localizedStringWithFormat(NSLocalizedString("From: %@", comment: "notification body"), newMsgsChatsNamesStr(uniqueChatsNames))
+                String.localizedStringWithFormat(NSLocalizedString("From: %@", comment: "notification body"), newMsgsChatsNamesStr(chatsNames))
             }
             return createNotification(
                 categoryIdentifier: ntfCategoryManyEvents,
@@ -530,24 +730,32 @@ class NotificationService: UNNotificationServiceExtension {
             return createNotification(
                 categoryIdentifier: ntfCategoryManyEvents,
                 title: NSLocalizedString("New events", comment: "notification"),
-                body: String.localizedStringWithFormat(NSLocalizedString("%d new events", comment: "notification body"), ntfEvents.count),
+                body: String.localizedStringWithFormat(NSLocalizedString("%d new events", comment: "notification body"), ntfs.count),
                 badgeCount: badgeCount
             )
         }
     }
 
-    private func uniqueNewMsgsChatsNames(_ newMsgsChats: [ChatInfo]) -> [String] {
+    @inline(__always)
+    private func newMsgsChatsNames(_ ntfs: [NSENotificationData]) ->  (Int64?, [String]) {
         var seenChatIds = Set<ChatId>()
-        var uniqueChatsNames: [String] = []
-        for chat in newMsgsChats {
-            if !seenChatIds.contains(chat.id) {
-                seenChatIds.insert(chat.id)
-                uniqueChatsNames.append(chat.chatViewName)
+        var chatsNames: [String] = []
+        var userId: Int64?
+        for ntf in ntfs {
+            switch ntf {
+            case let .messageReceived(user, chat, _):
+                if seenChatIds.isEmpty { userId = user.userId }
+                if !seenChatIds.contains(chat.id) {
+                    seenChatIds.insert(chat.id)
+                    chatsNames.append(chat.chatViewName)
+                }
+            default: ()
             }
         }
-        return uniqueChatsNames
+        return (userId, chatsNames)
     }
 
+    @inline(__always)
     private func newMsgsChatsNamesStr(_ names: [String]) -> String {
         return switch names.count {
         case 1: names[0]
@@ -566,9 +774,8 @@ class NSEChatState {
     static let shared = NSEChatState()
     private var value_ = NSEState.created
 
-    var value: NSEState {
-        value_
-    }
+    @inline(__always)
+    var value: NSEState { value_ }
 
     func set(_ state: NSEState) {
         nseStateGroupDefault.set(state)
@@ -576,7 +783,7 @@ class NSEChatState {
         value_ = state
     }
 
-    init() {
+    private init() {
         // This is always set to .created state, as in case previous start of NSE crashed in .active state, it is stored correctly.
         // Otherwise the app will be activating slower
         set(.created)
@@ -624,7 +831,7 @@ func startChat() -> DBMigrationResult? {
 
     startLock.wait()
     defer { startLock.signal() }
-    
+
     if hasChatCtrl() {
         return switch NSEChatState.shared.value {
         case .created: doStartChat()
@@ -654,7 +861,7 @@ func doStartChat() -> DBMigrationResult? {
     let state = NSEChatState.shared.value
     NSEChatState.shared.set(.starting)
     if let user = apiGetActiveUser() {
-        logger.debug("NotificationService active user \(String(describing: user))")
+        logger.debug("NotificationService active user \(user.displayName)")
         do {
             try setNetworkConfig(networkConfig)
             try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
@@ -747,12 +954,18 @@ func receiveMessages() async {
     }
 
     func receiveMsg() async {
-        if let msg = await chatRecvMsg() {
+        switch await chatRecvMsg() {
+        case let .result(msg):
             logger.debug("NotificationService receiveMsg: message")
             if let (id, ntf) = await receivedMsgNtf(msg) {
                 logger.debug("NotificationService receiveMsg: notification")
                 await NSEThreads.shared.processNotification(id, ntf)
             }
+        case let .error(err):
+            logger.error("NotificationService receivedMsgNtf error: \(String(describing: err))")
+        case let .invalid(type, _):
+            logger.error("NotificationService receivedMsgNtf invalid: \(type)")
+        case .none: ()
         }
     }
 
@@ -762,17 +975,20 @@ func receiveMessages() async {
     }
 }
 
-func chatRecvMsg() async -> ChatResponse? {
+func chatRecvMsg() async -> APIResult<NSEChatEvent>? {
     await withCheckedContinuation { cont in
-        let resp = recvSimpleXMsg()
+        let resp: APIResult<NSEChatEvent>? = recvSimpleXMsg()
         cont.resume(returning: resp)
     }
 }
 
 private let isInChina = SKStorefront().countryCode == "CHN"
+
+@inline(__always)
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }
 
-func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)? {
+@inline(__always)
+func receivedMsgNtf(_ res: NSEChatEvent) async -> (String, NSENotificationData)? {
     logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
     switch res {
     case let .contactConnected(user, contact, _):
@@ -789,8 +1005,13 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)?
             if let file = cItem.autoReceiveFile() {
                 cItem = autoReceiveFile(file) ?? cItem
             }
-            let ntf: NSENotificationData = (cInfo.ntfsEnabled && cItem.showNotification) ? .messageReceived(user, cInfo, cItem) : .noNtf
-            return (chatItem.chatId, ntf)
+            let ntf: NSENotificationData = (cInfo.ntfsEnabled(chatItem: cItem) && cItem.showNotification) ? .messageReceived(user, cInfo, cItem) : .noNtf
+            let chatIdOrMemberId = if case let .groupRcv(groupMember) = chatItem.chatItem.chatDir {
+                groupMember.id
+            } else {
+                chatItem.chatInfo.id
+            }
+            return (chatIdOrMemberId, ntf)
         } else {
             return nil
         }
@@ -813,15 +1034,10 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)?
     case .chatSuspended:
         chatSuspended()
         return nil
-    case let .chatError(_, err):
-        logger.error("NotificationService receivedMsgNtf error: \(String(describing: err))")
-        return nil
-    default:
-        logger.debug("NotificationService receivedMsgNtf ignored event: \(res.responseType)")
-        return nil
     }
 }
 
+@inline(__always)
 func updateNetCfg() {
     let newNetConfig = getNetCfg()
     if newNetConfig != networkConfig {
@@ -836,14 +1052,14 @@ func updateNetCfg() {
 }
 
 func apiGetActiveUser() -> User? {
-    let r = sendSimpleXCmd(.showActiveUser)
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.showActiveUser)
     logger.debug("apiGetActiveUser sendSimpleXCmd response: \(r.responseType)")
     switch r {
-    case let .activeUser(user): return user
-    case .chatCmdError(_, .error(.noActiveUser)):
+    case let .result(.activeUser(user)): return user
+    case .error(.error(.noActiveUser)):
         logger.debug("apiGetActiveUser sendSimpleXCmd no active user")
         return nil
-    case let .chatCmdError(_, err):
+    case let .error(err):
         logger.debug("apiGetActiveUser sendSimpleXCmd error: \(String(describing: err))")
         return nil
     default:
@@ -853,101 +1069,93 @@ func apiGetActiveUser() -> User? {
 }
 
 func apiStartChat() throws -> Bool {
-    let r = sendSimpleXCmd(.startChat(mainApp: false, enableSndFiles: false))
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.startChat(mainApp: false, enableSndFiles: false))
     switch r {
-    case .chatStarted: return true
-    case .chatRunning: return false
-    default: throw r
+    case .result(.chatStarted): return true
+    case .result(.chatRunning): return false
+    default: throw r.unexpected
     }
 }
 
 func apiActivateChat() -> Bool {
     chatReopenStore()
-    let r = sendSimpleXCmd(.apiActivateChat(restoreChat: false))
-    if case .cmdOk = r { return true }
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiActivateChat(restoreChat: false))
+    if case .result(.cmdOk) = r { return true }
     logger.error("NotificationService apiActivateChat error: \(String(describing: r))")
     return false
 }
 
 func apiSuspendChat(timeoutMicroseconds: Int) -> Bool {
-    let r = sendSimpleXCmd(.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
-    if case .cmdOk = r { return true }
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
+    if case .result(.cmdOk) = r { return true }
     logger.error("NotificationService apiSuspendChat error: \(String(describing: r))")
     return false
 }
 
 func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String) throws {
-    let r = sendSimpleXCmd(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
 func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = sendSimpleXCmd(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiSetEncryptLocalFiles(enable: enable))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
-func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
+func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [NtfConn]? {
+    guard apiGetActiveUser() != nil else {
+        logger.debug("NotificationService: no active user")
+        return nil
+    }
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo))
+    if case let .result(.ntfConns(ntfConns)) = r {
+        logger.debug("NotificationService apiGetNtfConns response ntfConns: \(ntfConns.count) conections")
+        return ntfConns
+    } else if case let .error(error) = r {
+        logger.debug("NotificationService apiGetNtfMessage error response: \(String.init(describing: error))")
+    } else {
+        logger.debug("NotificationService apiGetNtfMessage ignored response: \(r.responseType) \(String.init(describing: r))")
+    }
+    return nil
+}
+
+func apiGetConnNtfMessages(connMsgReqs: [ConnMsgReq]) -> [RcvNtfMsgInfo]? {
     guard apiGetActiveUser() != nil else {
         logger.debug("no active user")
         return nil
     }
-    let r = sendSimpleXCmd(.apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfConns(ntfConns) = r {
-        logger.debug("apiGetNtfConns response ntfConns: \(ntfConns.count)")
-        return ntfConns.compactMap { toUserNtfConn($0) }
-    } else if case let .chatCmdError(_, error) = r {
-        logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
-    } else {
-        logger.debug("apiGetNtfMessage ignored response: \(r.responseType) \(String.init(describing: r))")
+//    logger.debug("NotificationService apiGetConnNtfMessages command: \(NSEChatCommand.apiGetConnNtfMessages(connMsgReqs: connMsgReqs).cmdString)")
+    logger.debug("NotificationService apiGetConnNtfMessages requests: \(connMsgReqs.count)")
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiGetConnNtfMessages(connMsgReqs: connMsgReqs))
+    if case let .result(.connNtfMessages(msgs)) = r {
+//        logger.debug("NotificationService apiGetConnNtfMessages responses: \(String(describing: msgs))")
+        logger.debug("NotificationService apiGetConnNtfMessages responses: total \(msgs.count), expecting messages \(msgs.count { !$0.noMsg }), errors \(msgs.count { $0.isError })")
+        return msgs
     }
+    logger.debug("NotificationService apiGetConnNtfMessages error: \(responseError(r.unexpected))")
     return nil
 }
 
-func toUserNtfConn(_ ntfConn: NtfConn) -> UserNtfConn? {
-    if let user = ntfConn.user_ {
-        return UserNtfConn(user: user, connEntity_: ntfConn.connEntity_, expectedMsg_: ntfConn.expectedMsg_)
-    } else {
-        return nil
-    }
-}
-
-func apiGetConnNtfMessages(connIds: [String]) -> [NtfMsgInfo?]? {
-    guard apiGetActiveUser() != nil else {
-        logger.debug("no active user")
-        return nil
-    }
-    let r = sendSimpleXCmd(.apiGetConnNtfMessages(connIds: connIds))
-    if case let .connNtfMessages(receivedMsgs) = r {
-        logger.debug("apiGetConnNtfMessages response receivedMsgs: \(receivedMsgs.count)")
-        return receivedMsgs
-    }
-    logger.debug("apiGetConnNtfMessages error: \(responseError(r))")
-    return nil
-}
-
-func getConnNtfMessage(connId: String) -> NtfMsgInfo? {
-    let r_ = apiGetConnNtfMessages(connIds: [connId])
-    if let r = r_, let receivedMsg = r.count == 1 ? r.first : nil {
-        return receivedMsg
-    }
-    return nil
+func getConnNtfMessage(connMsgReq: ConnMsgReq) -> RcvNtfMsgInfo? {
+    let r = apiGetConnNtfMessages(connMsgReqs: [connMsgReq])
+    return if let r, r.count > 0 { r[0] } else { nil }
 }
 
 func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
     let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
-    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
-    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
-    logger.error("receiveFile error: \(responseError(r))")
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
+    if case let .result(.rcvFileAccepted(_, chatItem)) = r { return chatItem }
+    logger.error("receiveFile error: \(responseError(r.unexpected))")
     return nil
 }
 
 func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
     let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
-    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted))
-    if case .cmdOk = r { return }
-    logger.error("setFileToReceive error: \(responseError(r))")
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.setFileToReceive(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted))
+    if case .result(.cmdOk) = r { return }
+    logger.error("setFileToReceive error: \(responseError(r.unexpected))")
 }
 
 func autoReceiveFile(_ file: CIFile) -> ChatItem? {
@@ -964,38 +1172,32 @@ func autoReceiveFile(_ file: CIFile) -> ChatItem? {
 }
 
 func setNetworkConfig(_ cfg: NetCfg) throws {
-    let r = sendSimpleXCmd(.apiSetNetworkConfig(networkConfig: cfg))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<NSEChatResponse> = sendSimpleXCmd(NSEChatCommand.apiSetNetworkConfig(networkConfig: cfg))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
-struct UserNtfConn {
-    var user: User
-    var connEntity_: ConnectionEntity?
-    var expectedMsg_: NtfMsgInfo?
-
-    var defaultBestAttemptNtf: NSENotificationData {
-        return if !user.showNotifications {
-            .noNtf
-        } else if let connEntity = connEntity_ {
-            switch connEntity {
-            case let .rcvDirectMsgConnection(_, contact):
-                contact?.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case let .rcvGroupMsgConnection(_, groupInfo, _):
-                groupInfo.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case .sndFileConnection: .noNtf
-            case .rcvFileConnection: .noNtf
-            case let .userContactConnection(_, userContact):
-                userContact.groupId == nil
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            }
-        } else {
-            .noNtf
+func defaultBestAttemptNtf(_ ntfConn: NtfConn) -> NSENotificationData {
+    let user = ntfConn.user
+    let connEntity = ntfConn.connEntity
+    return if !user.showNotifications {
+        .noNtf
+    } else {
+        switch ntfConn.connEntity {
+        case let .rcvDirectMsgConnection(_, contact):
+            contact?.chatSettings.enableNtfs == .all
+            ? .connectionEvent(user, connEntity)
+            : .noNtf
+        case let .rcvGroupMsgConnection(_, groupInfo, _):
+            groupInfo.chatSettings.enableNtfs == .all
+            ? .connectionEvent(user, connEntity)
+            : .noNtf
+        case .sndFileConnection: .noNtf
+        case .rcvFileConnection: .noNtf
+        case let .userContactConnection(_, userContact):
+            userContact.groupId == nil
+            ? .connectionEvent(user, connEntity)
+            : .noNtf
         }
     }
 }
diff --git a/apps/ios/SimpleX NSE/de.lproj/Localizable.strings b/apps/ios/SimpleX NSE/de.lproj/Localizable.strings
index f9779c6e05..ec502c53c6 100644
--- a/apps/ios/SimpleX NSE/de.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/de.lproj/Localizable.strings	
@@ -1,6 +1,9 @@
 /* notification body */
 "%d new events" = "%d neue Ereignisse";
 
+/* notification body */
+"From %d chat(s)" = "Von %d Chat(s)";
+
 /* notification body */
 "From: %@" = "Von: %@";
 
@@ -10,6 +13,3 @@
 /* notification */
 "New messages" = "Neue Nachrichten";
 
-/* notification body */
-"New messages in %d chats" = "Neue Nachrichten in %d Chats";
-
diff --git a/apps/ios/SimpleX NSE/es.lproj/Localizable.strings b/apps/ios/SimpleX NSE/es.lproj/Localizable.strings
index fb190400e1..685eb3d93d 100644
--- a/apps/ios/SimpleX NSE/es.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/es.lproj/Localizable.strings	
@@ -1,6 +1,9 @@
 /* notification body */
 "%d new events" = "%d evento(s) nuevo(s)";
 
+/* notification body */
+"From %d chat(s)" = "De %d chat(s)";
+
 /* notification body */
 "From: %@" = "De: %@";
 
@@ -10,6 +13,3 @@
 /* notification */
 "New messages" = "Mensajes nuevos";
 
-/* notification body */
-"New messages in %d chats" = "Mensajes nuevos en %d chat(s)";
-
diff --git a/apps/ios/SimpleX NSE/fr.lproj/Localizable.strings b/apps/ios/SimpleX NSE/fr.lproj/Localizable.strings
index 5ef592ec70..999bb3608f 100644
--- a/apps/ios/SimpleX NSE/fr.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/fr.lproj/Localizable.strings	
@@ -1,7 +1,12 @@
-/* 
-  Localizable.strings
-  SimpleX
+/* notification body */
+"%d new events" = "%d nouveaux événements";
+
+/* notification body */
+"From: %@" = "De : %@";
+
+/* notification */
+"New events" = "Nouveaux événements";
+
+/* notification */
+"New messages" = "Nouveaux messages";
 
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
diff --git a/apps/ios/SimpleX NSE/hu.lproj/Localizable.strings b/apps/ios/SimpleX NSE/hu.lproj/Localizable.strings
index e64c98df9e..a6330b93db 100644
--- a/apps/ios/SimpleX NSE/hu.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/hu.lproj/Localizable.strings	
@@ -1,6 +1,9 @@
 /* notification body */
 "%d new events" = "%d új esemény";
 
+/* notification body */
+"From %d chat(s)" = "%d csevegésből";
+
 /* notification body */
 "From: %@" = "Tőle: %@";
 
@@ -10,6 +13,3 @@
 /* notification */
 "New messages" = "Új üzenetek";
 
-/* notification body */
-"New messages in %d chats" = "Új üzenetek %d csevegésben";
-
diff --git a/apps/ios/SimpleX NSE/it.lproj/Localizable.strings b/apps/ios/SimpleX NSE/it.lproj/Localizable.strings
index 31f463eb5b..a6c1ec215b 100644
--- a/apps/ios/SimpleX NSE/it.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/it.lproj/Localizable.strings	
@@ -1,6 +1,9 @@
 /* notification body */
 "%d new events" = "%d nuovi eventi";
 
+/* notification body */
+"From %d chat(s)" = "Da %d chat";
+
 /* notification body */
 "From: %@" = "Da: %@";
 
@@ -10,6 +13,3 @@
 /* notification */
 "New messages" = "Nuovi messaggi";
 
-/* notification body */
-"New messages in %d chats" = "Nuovi messaggi in %d chat";
-
diff --git a/apps/ios/SimpleX NSE/nl.lproj/Localizable.strings b/apps/ios/SimpleX NSE/nl.lproj/Localizable.strings
index 4cf91689b5..12d1e01f1d 100644
--- a/apps/ios/SimpleX NSE/nl.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/nl.lproj/Localizable.strings	
@@ -10,6 +10,3 @@
 /* notification */
 "New messages" = "Nieuwe berichten";
 
-/* notification body */
-"New messages in %d chats" = "Nieuwe berichten in %d chats";
-
diff --git a/apps/ios/SimpleX NSE/pl.lproj/Localizable.strings b/apps/ios/SimpleX NSE/pl.lproj/Localizable.strings
index 5ef592ec70..3a577620a0 100644
--- a/apps/ios/SimpleX NSE/pl.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/pl.lproj/Localizable.strings	
@@ -1,7 +1,3 @@
-/* 
-  Localizable.strings
-  SimpleX
+/* notification body */
+"New messages in %d chats" = "Nowe wiadomości w %d czatach";
 
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
diff --git a/apps/ios/SimpleX NSE/ru.lproj/Localizable.strings b/apps/ios/SimpleX NSE/ru.lproj/Localizable.strings
index 6ba39ccc63..cf082a166d 100644
--- a/apps/ios/SimpleX NSE/ru.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/ru.lproj/Localizable.strings	
@@ -1,6 +1,9 @@
 /* notification body */
 "%d new events" = "%d новых сообщений";
 
+/* notification body */
+"From %d chat(s)" = "Из %d чатов";
+
 /* notification body */
 "From: %@" = "От: %@";
 
@@ -10,6 +13,3 @@
 /* notification */
 "New messages" = "Новые сообщения";
 
-/* notification body */
-"New messages in %d chats" = "Новые сообщения в %d разговоре(ах)";
-
diff --git a/apps/ios/SimpleX NSE/uk.lproj/Localizable.strings b/apps/ios/SimpleX NSE/uk.lproj/Localizable.strings
index 69cc53bff1..ceace71e34 100644
--- a/apps/ios/SimpleX NSE/uk.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX NSE/uk.lproj/Localizable.strings	
@@ -10,6 +10,3 @@
 /* notification */
 "New messages" = "Нові повідомлення";
 
-/* notification body */
-"New messages in %d chats" = "Нові повідомлення в чатах %d";
-
diff --git a/apps/ios/SimpleX SE/ShareAPI.swift b/apps/ios/SimpleX SE/ShareAPI.swift
index fcb78c64b1..2b3e8068ae 100644
--- a/apps/ios/SimpleX SE/ShareAPI.swift	
+++ b/apps/ios/SimpleX SE/ShareAPI.swift	
@@ -13,91 +13,93 @@ import SimpleXChat
 let logger = Logger()
 
 func apiGetActiveUser() throws -> User? {
-    let r = sendSimpleXCmd(.showActiveUser)
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.showActiveUser)
     switch r {
-    case let .activeUser(user): return user
-    case .chatCmdError(_, .error(.noActiveUser)): return nil
-    default: throw r
+    case let .result(.activeUser(user)): return user
+    case .error(.error(.noActiveUser)): return nil
+    default: throw r.unexpected
     }
 }
 
 func apiStartChat() throws -> Bool {
-    let r = sendSimpleXCmd(.startChat(mainApp: false, enableSndFiles: true))
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.startChat(mainApp: false, enableSndFiles: true))
     switch r {
-    case .chatStarted: return true
-    case .chatRunning: return false
-    default: throw r
+    case .result(.chatStarted): return true
+    case .result(.chatRunning): return false
+    default: throw r.unexpected
     }
 }
 
 func apiSetNetworkConfig(_ cfg: NetCfg) throws {
-    let r = sendSimpleXCmd(.apiSetNetworkConfig(networkConfig: cfg))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiSetNetworkConfig(networkConfig: cfg))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
 func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String) throws {
-    let r = sendSimpleXCmd(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
 func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = sendSimpleXCmd(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiSetEncryptLocalFiles(enable: enable))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
 func apiGetChats(userId: User.ID) throws -> Array<ChatData> {
-    let r = sendSimpleXCmd(.apiGetChats(userId: userId))
-    if case let .apiChats(user: _, chats: chats) = r { return chats }
-    throw r
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiGetChats(userId: userId))
+    if case let .result(.apiChats(user: _, chats: chats)) = r { return chats }
+    throw r.unexpected
 }
 
 func apiSendMessages(
     chatInfo: ChatInfo,
     composedMessages: [ComposedMessage]
 ) throws -> [AChatItem] {
-    let r = sendSimpleXCmd(
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(
         chatInfo.chatType == .local
-        ? .apiCreateChatItems(
+        ? SEChatCommand.apiCreateChatItems(
             noteFolderId: chatInfo.apiId,
             composedMessages: composedMessages
         )
-        : .apiSendMessages(
+        : SEChatCommand.apiSendMessages(
             type: chatInfo.chatType,
             id: chatInfo.apiId,
+            scope: chatInfo.groupChatScope(),
             live: false,
             ttl: nil,
             composedMessages: composedMessages
         )
     )
-    if case let .newChatItems(_, chatItems) = r {
+    if case let .result(.newChatItems(_, chatItems)) = r {
         return chatItems
     } else {
         for composedMessage in composedMessages {
             if let filePath = composedMessage.fileSource?.filePath { removeFile(filePath) }
         }
-        throw r
+        throw r.unexpected
     }
 }
 
 func apiActivateChat() throws {
     chatReopenStore()
-    let r = sendSimpleXCmd(.apiActivateChat(restoreChat: false))
-    if case .cmdOk = r { return }
-    throw r
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiActivateChat(restoreChat: false))
+    if case .result(.cmdOk) = r { return }
+    throw r.unexpected
 }
 
 func apiSuspendChat(expired: Bool) {
-    let r = sendSimpleXCmd(.apiSuspendChat(timeoutMicroseconds: expired ? 0 : 3_000000))
+    let r: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiSuspendChat(timeoutMicroseconds: expired ? 0 : 3_000000))
     // Block until `chatSuspended` received or 3 seconds has passed
     var suspended = false
-    if case .cmdOk = r, !expired {
+    if case .result(.cmdOk) = r, !expired {
         let startTime = CFAbsoluteTimeGetCurrent()
         while CFAbsoluteTimeGetCurrent() - startTime < 3 {
-            switch recvSimpleXMsg(messageTimeout: 3_500000) {
-            case .chatSuspended:
+            let msg: APIResult<SEChatEvent>? = recvSimpleXMsg(messageTimeout: 3_500000)
+            switch msg {
+            case .result(.chatSuspended):
                 suspended = false
                 break
             default: continue
@@ -105,9 +107,133 @@ func apiSuspendChat(expired: Bool) {
         }
     }
     if !suspended {
-        _ = sendSimpleXCmd(.apiSuspendChat(timeoutMicroseconds: 0))
+        let _r1: APIResult<SEChatResponse> = sendSimpleXCmd(SEChatCommand.apiSuspendChat(timeoutMicroseconds: 0))
     }
     logger.debug("close store")
     chatCloseStore()
     SEChatState.shared.set(.inactive)
 }
+
+enum SEChatCommand: ChatCmdProtocol {
+    case showActiveUser
+    case startChat(mainApp: Bool, enableSndFiles: Bool)
+    case apiActivateChat(restoreChat: Bool)
+    case apiSuspendChat(timeoutMicroseconds: Int)
+    case apiSetNetworkConfig(networkConfig: NetCfg)
+    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
+    case apiSetEncryptLocalFiles(enable: Bool)
+    case apiGetChats(userId: Int64)
+    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
+    case apiSendMessages(type: ChatType, id: Int64, scope: GroupChatScope?, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
+    
+    var cmdString: String {
+        switch self {
+        case .showActiveUser: return "/u"
+        case let .startChat(mainApp, enableSndFiles): return "/_start main=\(onOff(mainApp)) snd_files=\(onOff(enableSndFiles))"
+        case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
+        case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
+        case let .apiSetNetworkConfig(networkConfig): return "/_network \(encodeJSON(networkConfig))"
+        case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder):
+            return "/set file paths \(encodeJSON(AppFilePaths(appFilesFolder: filesFolder, appTempFolder: tempFolder, appAssetsFolder: assetsFolder)))"
+        case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
+        case let .apiGetChats(userId): return "/_get chats \(userId) pcc=on"
+        case let .apiCreateChatItems(noteFolderId, composedMessages):
+            let msgs = encodeJSON(composedMessages)
+            return "/_create *\(noteFolderId) json \(msgs)"
+        case let .apiSendMessages(type, id, scope, live, ttl, composedMessages):
+            let msgs = encodeJSON(composedMessages)
+            let ttlStr = ttl != nil ? "\(ttl!)" : "default"
+            return "/_send \(ref(type, id, scope: scope)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
+        }
+    }
+    
+    func ref(_ type: ChatType, _ id: Int64, scope: GroupChatScope?) -> String {
+        "\(type.rawValue)\(id)\(scopeRef(scope: scope))"
+    }
+
+    func scopeRef(scope: GroupChatScope?) -> String {
+        switch (scope) {
+        case .none: ""
+        case let .memberSupport(groupMemberId_):
+            if let groupMemberId = groupMemberId_ {
+                "(_support:\(groupMemberId))"
+            } else {
+                "(_support)"
+            }
+        }
+    }
+}
+
+enum SEChatResponse: Decodable, ChatAPIResult {
+    case activeUser(user: User)
+    case chatStarted
+    case chatRunning
+    case apiChats(user: UserRef, chats: [ChatData])
+    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case cmdOk(user_: UserRef?)
+    
+    var responseType: String {
+        switch self {
+        case .activeUser: "activeUser"
+        case .chatStarted: "chatStarted"
+        case .chatRunning: "chatRunning"
+        case .apiChats: "apiChats"
+        case .newChatItems: "newChatItems"
+        case .cmdOk: "cmdOk"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case let .activeUser(user): return String(describing: user)
+        case .chatStarted: return noDetails
+        case .chatRunning: return noDetails
+        case let .apiChats(u, chats): return withUser(u, String(describing: chats))
+        case let .newChatItems(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case .cmdOk: return noDetails
+        }
+    }
+
+    static func fallbackResult(_ type: String, _ json: NSDictionary) -> SEChatResponse? {
+        if type == "apiChats", let r = parseApiChats(json) {
+            .apiChats(user: r.user, chats: r.chats)
+        } else {
+            nil
+        }
+    }
+}
+
+enum SEChatEvent: Decodable, ChatAPIResult {
+    case chatSuspended
+    case sndFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
+    case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
+    case chatItemsStatusesUpdated(user: UserRef, chatItems: [AChatItem])
+    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
+    case sndFileWarning(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
+    
+    var responseType: String {
+        switch self {
+        case .chatSuspended: "chatSuspended"
+        case .sndFileProgressXFTP: "sndFileProgressXFTP"
+        case .sndFileCompleteXFTP: "sndFileCompleteXFTP"
+        case .chatItemsStatusesUpdated: "chatItemsStatusesUpdated"
+        case .sndFileError: "sndFileError"
+        case .sndFileWarning: "sndFileWarning"
+        }
+    }
+    
+    var details: String {
+        switch self {
+        case .chatSuspended: return noDetails
+        case let .sndFileProgressXFTP(u, chatItem, _, sentSize, totalSize): return withUser(u, "chatItem: \(String(describing: chatItem))\nsentSize: \(sentSize)\ntotalSize: \(totalSize)")
+        case let .sndFileCompleteXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
+        case let .chatItemsStatusesUpdated(u, chatItems):
+            let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+            return withUser(u, itemsString)
+        case let .sndFileError(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
+        case let .sndFileWarning(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
+        }
+    }    
+}
diff --git a/apps/ios/SimpleX SE/ShareModel.swift b/apps/ios/SimpleX SE/ShareModel.swift
index 21908026b2..12a775f85c 100644
--- a/apps/ios/SimpleX SE/ShareModel.swift	
+++ b/apps/ios/SimpleX SE/ShareModel.swift	
@@ -179,7 +179,7 @@ class ShareModel: ObservableObject {
                 resetChatCtrl() // Clears retained migration result
                 registerGroupDefaults()
                 haskell_init_se()
-                let (_, result) = chatMigrateInit(dbKey, confirmMigrations: defaultMigrationConfirmation())
+                let (_, result) = chatMigrateInit(dbKey, confirmMigrations: defaultMigrationConfirmation(), backgroundMode: false)
                 if let e = migrationError(result) { return e }
                 try apiSetAppFilePaths(
                     filesFolder: getAppFilesDirectory().path,
@@ -303,8 +303,9 @@ class ShareModel: ObservableObject {
                     }
                 }
             }
-            switch recvSimpleXMsg(messageTimeout: 1_000_000) {
-            case let .sndFileProgressXFTP(_, ci, _, sentSize, totalSize):
+            let r: APIResult<SEChatEvent>? = recvSimpleXMsg(messageTimeout: 1_000_000)
+            switch r {
+            case let .result(.sndFileProgressXFTP(_, ci, _, sentSize, totalSize)):
                 guard isMessage(for: ci) else { continue }
                 networkTimeout = CFAbsoluteTimeGetCurrent()
                 await MainActor.run {
@@ -313,14 +314,14 @@ class ShareModel: ObservableObject {
                         bottomBar = .loadingBar(progress: progress)
                     }
                 }
-            case let .sndFileCompleteXFTP(_, ci, _):
+            case let .result(.sndFileCompleteXFTP(_, ci, _)):
                 guard isMessage(for: ci) else { continue }
                 if isGroupChat {
                     await MainActor.run { bottomBar = .loadingSpinner }
                 }
                 await ch.completeFile()
                 if await !ch.isRunning { break }
-            case let .chatItemsStatusesUpdated(_, chatItems):
+            case let .result(.chatItemsStatusesUpdated(_, chatItems)):
                 guard let ci = chatItems.last else { continue }
                 guard isMessage(for: ci) else { continue }
                 if let (title, message) = ci.chatItem.meta.itemStatus.statusInfo {
@@ -342,17 +343,15 @@ class ShareModel: ObservableObject {
                         }
                     }
                 }
-            case let .sndFileError(_, ci, _, errorMessage):
+            case let .result(.sndFileError(_, ci, _, errorMessage)):
                 guard isMessage(for: ci) else { continue }
                 if let ci { cleanupFile(ci) }
                 return ErrorAlert(title: "File error", message: "\(fileErrorInfo(ci) ?? errorMessage)")
-            case let .sndFileWarning(_, ci, _, errorMessage):
+            case let .result(.sndFileWarning(_, ci, _, errorMessage)):
                 guard isMessage(for: ci) else { continue }
                 if let ci { cleanupFile(ci) }
                 return ErrorAlert(title: "File error", message: "\(fileErrorInfo(ci) ?? errorMessage)")
-            case let .chatError(_, chatError):
-                return ErrorAlert(chatError)
-            case let .chatCmdError(_, chatError):
+            case let .error(chatError):
                 return ErrorAlert(chatError)
             default: continue
             }
diff --git a/apps/ios/SimpleX SE/ShareView.swift b/apps/ios/SimpleX SE/ShareView.swift
index f2b9de9f72..07180ffa1b 100644
--- a/apps/ios/SimpleX SE/ShareView.swift	
+++ b/apps/ios/SimpleX SE/ShareView.swift	
@@ -160,7 +160,7 @@ struct ShareView: View {
         }
     }
 
-    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
+    private func linkPreview(_ linkPreview: LinkPreview) -> some View {
         previewArea {
             HStack(alignment: .center, spacing: 8) {
                 if let uiImage = imageFromBase64(linkPreview.image) {
diff --git a/apps/ios/SimpleX SE/de.lproj/InfoPlist.strings b/apps/ios/SimpleX SE/de.lproj/InfoPlist.strings
index 48f774742e..4a387a4361 100644
--- a/apps/ios/SimpleX SE/de.lproj/InfoPlist.strings	
+++ b/apps/ios/SimpleX SE/de.lproj/InfoPlist.strings	
@@ -5,5 +5,5 @@
 "CFBundleName" = "SimpleX SE";
 
 /* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Alle Rechte vorbehalten.";
+"NSHumanReadableCopyright" = "Copyright © 2025 SimpleX Chat. Alle Rechte vorbehalten.";
 
diff --git a/apps/ios/SimpleX SE/de.lproj/Localizable.strings b/apps/ios/SimpleX SE/de.lproj/Localizable.strings
index 081d7f8c66..4c10694986 100644
--- a/apps/ios/SimpleX SE/de.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX SE/de.lproj/Localizable.strings	
@@ -17,13 +17,13 @@
 "Comment" = "Kommentieren";
 
 /* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Die maximale erlaubte Dateigröße beträgt aktuell %@.";
+"Currently maximum supported file size is %@." = "Die maximal erlaubte Dateigröße beträgt aktuell %@.";
 
 /* No comment provided by engineer. */
-"Database downgrade required" = "Datenbank-Herabstufung erforderlich";
+"Database downgrade required" = "Datenbank-Herunterstufung ist erforderlich";
 
 /* No comment provided by engineer. */
-"Database encrypted!" = "Datenbank verschlüsselt!";
+"Database encrypted!" = "Datenbank ist verschlüsselt!";
 
 /* No comment provided by engineer. */
 "Database error" = "Datenbankfehler";
@@ -32,7 +32,7 @@
 "Database passphrase is different from saved in the keychain." = "Das Datenbank-Passwort unterscheidet sich vom im Schlüsselbund gespeicherten.";
 
 /* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Ein Datenbank-Passwort ist erforderlich, um den Chat zu öffnen.";
+"Database passphrase is required to open chat." = "Um den Chat zu öffnen, ist ein Datenbank-Passwort ist erforderlich.";
 
 /* No comment provided by engineer. */
 "Database upgrade required" = "Datenbank-Aktualisierung erforderlich";
@@ -47,7 +47,7 @@
 "Error: %@" = "Fehler: %@";
 
 /* No comment provided by engineer. */
-"File error" = "Dateifehler";
+"File error" = "Datei-Fehler";
 
 /* No comment provided by engineer. */
 "Incompatible database version" = "Datenbank-Version nicht kompatibel";
@@ -68,16 +68,16 @@
 "Ok" = "OK";
 
 /* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Öffne die App, um die Datenbank herabzustufen.";
+"Open the app to downgrade the database." = "Öffnen Sie die App, um die Datenbank herunterzustufen.";
 
 /* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Öffne die App, um die Datenbank zu aktualisieren.";
+"Open the app to upgrade the database." = "Öffnen Sie die App, um die Datenbank zu aktualisieren.";
 
 /* No comment provided by engineer. */
 "Passphrase" = "Passwort";
 
 /* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Bitte erstelle ein Profil in der SimpleX-App";
+"Please create a profile in the SimpleX app" = "Bitte erstellen Sie ein Profil in der SimpleX-App";
 
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Diese Nachricht ist wegen der gewählten Chat-Einstellungen nicht erlaubt.";
@@ -107,5 +107,5 @@
 "Wrong database passphrase" = "Falsches Datenbank-Passwort";
 
 /* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Du kannst das Teilen in den Einstellungen zu Datenschutz & Sicherheit - SimpleX-Sperre erlauben.";
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Sie können das Teilen in den Einstellungen zu Datenschutz & Sicherheit / SimpleX-Sperre erlauben.";
 
diff --git a/apps/ios/SimpleX SE/hu.lproj/Localizable.strings b/apps/ios/SimpleX SE/hu.lproj/Localizable.strings
index 94f18db853..2fedf0e6f1 100644
--- a/apps/ios/SimpleX SE/hu.lproj/Localizable.strings	
+++ b/apps/ios/SimpleX SE/hu.lproj/Localizable.strings	
@@ -2,7 +2,7 @@
 "%@" = "%@";
 
 /* No comment provided by engineer. */
-"App is locked!" = "Az alkalmazás zárolva!";
+"App is locked!" = "Az alkalmazás zárolva van!";
 
 /* No comment provided by engineer. */
 "Cancel" = "Mégse";
@@ -17,7 +17,7 @@
 "Comment" = "Hozzászólás";
 
 /* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Jelenleg a maximálisan támogatott fájlméret: %@.";
+"Currently maximum supported file size is %@." = "Jelenleg támogatott legnagyobb fájl méret: %@.";
 
 /* No comment provided by engineer. */
 "Database downgrade required" = "Adatbázis visszafejlesztése szükséges";
@@ -29,19 +29,19 @@
 "Database error" = "Adatbázishiba";
 
 /* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata eltér a kulcstartóban lévőtől.";
+"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata nem egyezik a kulcstartóba mentettől.";
 
 /* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Adatbázis-jelmondat szükséges a csevegés megnyitásához.";
+"Database passphrase is required to open chat." = "A csevegés megnyitásához adja meg az adatbázis jelmondatát.";
 
 /* No comment provided by engineer. */
 "Database upgrade required" = "Adatbázis fejlesztése szükséges";
 
 /* No comment provided by engineer. */
-"Error preparing file" = "Hiba a fájl előkészítésekor";
+"Error preparing file" = "Hiba történt a fájl előkészítésekor";
 
 /* No comment provided by engineer. */
-"Error preparing message" = "Hiba az üzenet előkészítésekor";
+"Error preparing message" = "Hiba történt az üzenet előkészítésekor";
 
 /* No comment provided by engineer. */
 "Error: %@" = "Hiba: %@";
@@ -80,7 +80,7 @@
 "Please create a profile in the SimpleX app" = "Hozzon létre egy profilt a SimpleX alkalmazásban";
 
 /* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "A kiválasztott csevegési beállítások tiltják ezt az üzenetet.";
+"Selected chat preferences prohibit this message." = "A kijelölt csevegési beállítások tiltják ezt az üzenetet.";
 
 /* No comment provided by engineer. */
 "Sending a message takes longer than expected." = "Az üzenet elküldése a vártnál tovább tart.";
@@ -92,7 +92,7 @@
 "Share" = "Megosztás";
 
 /* No comment provided by engineer. */
-"Slow network?" = "Lassú internetkapcsolat?";
+"Slow network?" = "Lassú a hálózata?";
 
 /* No comment provided by engineer. */
 "Unknown database error: %@" = "Ismeretlen adatbázishiba: %@";
@@ -104,7 +104,7 @@
 "Wait" = "Várjon";
 
 /* No comment provided by engineer. */
-"Wrong database passphrase" = "Hibás adatbázis-jelmondat";
+"Wrong database passphrase" = "Érvénytelen adatbázis-jelmondat";
 
 /* No comment provided by engineer. */
 "You can allow sharing in Privacy & Security / SimpleX Lock settings." = "A megosztást az Adatvédelem és biztonság / SimpleX-zár menüben engedélyezheti.";
diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj
index 641c1e9fd1..42e36a78c9 100644
--- a/apps/ios/SimpleX.xcodeproj/project.pbxproj
+++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj
@@ -166,17 +166,22 @@
 		647F090E288EA27B00644C40 /* GroupMemberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647F090D288EA27B00644C40 /* GroupMemberInfoView.swift */; };
 		648010AB281ADD15009009B9 /* CIFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648010AA281ADD15009009B9 /* CIFileView.swift */; };
 		648679AB2BC96A74006456E7 /* ChatItemForwardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */; };
-		649B28DD2CFE07CF00536B68 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28D82CFE07CF00536B68 /* libffi.a */; };
-		649B28DE2CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a */; };
-		649B28DF2CFE07CF00536B68 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DA2CFE07CF00536B68 /* libgmpxx.a */; };
-		649B28E02CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a */; };
-		649B28E12CFE07CF00536B68 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649B28DC2CFE07CF00536B68 /* libgmp.a */; };
 		649BCDA0280460FD00C3A862 /* ComposeImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCD9F280460FD00C3A862 /* ComposeImageView.swift */; };
 		649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCDA12805D6EF00C3A862 /* CIImageView.swift */; };
+		64A779F62DBFB9F200FDEF2F /* MemberAdmissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A779F52DBFB9F200FDEF2F /* MemberAdmissionView.swift */; };
+		64A779F82DBFDBF200FDEF2F /* MemberSupportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A779F72DBFDBF200FDEF2F /* MemberSupportView.swift */; };
+		64A779FC2DC1040000FDEF2F /* SecondaryChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A779FB2DC1040000FDEF2F /* SecondaryChatView.swift */; };
+		64A779FE2DC3AFF200FDEF2F /* MemberSupportChatToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A779FD2DC3AFF200FDEF2F /* MemberSupportChatToolbar.swift */; };
+		64A77A022DC4AD6100FDEF2F /* ContextPendingMemberActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A77A012DC4AD6100FDEF2F /* ContextPendingMemberActionsView.swift */; };
 		64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
 		64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */; };
 		64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */; };
 		64C3B0212A0D359700E19930 /* CustomTimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C3B0202A0D359700E19930 /* CustomTimePicker.swift */; };
+		64C8299D2D54AEEE006B9E89 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C829982D54AEED006B9E89 /* libgmp.a */; };
+		64C8299E2D54AEEE006B9E89 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C829992D54AEEE006B9E89 /* libffi.a */; };
+		64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a */; };
+		64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a */; };
+		64C829A12D54AEEE006B9E89 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299C2D54AEEE006B9E89 /* libgmpxx.a */; };
 		64D0C2C029F9688300B38D5F /* UserAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2BF29F9688300B38D5F /* UserAddressView.swift */; };
 		64D0C2C229FA57AB00B38D5F /* UserAddressLearnMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2C129FA57AB00B38D5F /* UserAddressLearnMore.swift */; };
 		64D0C2C629FAC1EC00B38D5F /* AddContactLearnMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */; };
@@ -198,13 +203,19 @@
 		8C8118722C220B5B00E6FC94 /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 8C8118712C220B5B00E6FC94 /* Yams */; };
 		8C81482C2BD91CD4002CBEC3 /* AudioDevicePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C81482B2BD91CD4002CBEC3 /* AudioDevicePicker.swift */; };
 		8C9BC2652C240D5200875A27 /* ThemeModeEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */; };
+		8CAD466F2D15A8100078D18F /* ChatScrollHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD466E2D15A8100078D18F /* ChatScrollHelpers.swift */; };
+		8CAEF1502D11A6A000240F00 /* ChatItemsLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CAEF14F2D11A6A000240F00 /* ChatItemsLoader.swift */; };
+		8CB15EA02CFDA30600C28209 /* ChatItemsMerger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB15E9F2CFDA30600C28209 /* ChatItemsMerger.swift */; };
 		8CB3476C2CF5CFFA006787A5 /* Ink in Frameworks */ = {isa = PBXBuildFile; productRef = 8CB3476B2CF5CFFA006787A5 /* Ink */; };
 		8CB3476E2CF5F58B006787A5 /* ConditionsWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3476D2CF5F58B006787A5 /* ConditionsWebView.swift */; };
 		8CBC14862D357CDB00BBD901 /* StorageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CBC14852D357CDB00BBD901 /* StorageView.swift */; };
+		8CC317442D4FEB9B00292A20 /* EndlessScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC317432D4FEB9B00292A20 /* EndlessScrollView.swift */; };
+		8CC317462D4FEBA800292A20 /* ScrollViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC317452D4FEBA800292A20 /* ScrollViewCells.swift */; };
 		8CC4ED902BD7B8530078AEE8 /* CallAudioDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */; };
 		8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC956ED2BC0041000412A11 /* NetworkObserver.swift */; };
 		8CE848A32C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */; };
 		B70A39732D24090D00E80A5F /* TagListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A39722D24090D00E80A5F /* TagListView.swift */; };
+		B70CE9E62D4BE5930080F36D /* GroupMentions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70CE9E52D4BE5930080F36D /* GroupMentions.swift */; };
 		B728945B2D0C62BF00F7A19A /* ElegantEmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = B728945A2D0C62BF00F7A19A /* ElegantEmojiPicker */; };
 		B73EFE532CE5FA3500C778EA /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B73EFE522CE5FA3500C778EA /* CreateSimpleXAddress.swift */; };
 		B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */; };
@@ -224,7 +235,6 @@
 		CEE723B12C3BD3D70009AE93 /* SimpleX SE.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		CEE723F02C3D25C70009AE93 /* ShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723EF2C3D25C70009AE93 /* ShareView.swift */; };
 		CEE723F22C3D25ED0009AE93 /* ShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723F12C3D25ED0009AE93 /* ShareModel.swift */; };
-		CEEA861D2C2ABCB50084E1EA /* ReverseList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEA861C2C2ABCB50084E1EA /* ReverseList.swift */; };
 		CEFB2EDF2CA1BCC7004B1ECE /* SheetRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFB2EDE2CA1BCC7004B1ECE /* SheetRepresentable.swift */; };
 		D7197A1829AE89660055C05A /* WebRTC in Frameworks */ = {isa = PBXBuildFile; productRef = D7197A1729AE89660055C05A /* WebRTC */; };
 		D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A9087294BD7A70047C86D /* NativeTextEditor.swift */; };
@@ -237,6 +247,8 @@
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
 		E5DCF9982C5906FF007928CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9962C5906FF007928CC /* InfoPlist.strings */; };
+		E5DDBE6E2DC4106800A0EFF0 /* AppAPITypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5DDBE6D2DC4106200A0EFF0 /* AppAPITypes.swift */; };
+		E5DDBE702DC4217900A0EFF0 /* NSEAPITypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5DDBE6F2DC4217900A0EFF0 /* NSEAPITypes.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -518,17 +530,22 @@
 		648010AA281ADD15009009B9 /* CIFileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIFileView.swift; sourceTree = "<group>"; };
 		648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemForwardingView.swift; sourceTree = "<group>"; };
 		6493D667280ED77F007A76FB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		649B28D82CFE07CF00536B68 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a"; sourceTree = "<group>"; };
-		649B28DA2CFE07CF00536B68 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a"; sourceTree = "<group>"; };
-		649B28DC2CFE07CF00536B68 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 		649BCD9F280460FD00C3A862 /* ComposeImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeImageView.swift; sourceTree = "<group>"; };
 		649BCDA12805D6EF00C3A862 /* CIImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIImageView.swift; sourceTree = "<group>"; };
+		64A779F52DBFB9F200FDEF2F /* MemberAdmissionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberAdmissionView.swift; sourceTree = "<group>"; };
+		64A779F72DBFDBF200FDEF2F /* MemberSupportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberSupportView.swift; sourceTree = "<group>"; };
+		64A779FB2DC1040000FDEF2F /* SecondaryChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryChatView.swift; sourceTree = "<group>"; };
+		64A779FD2DC3AFF200FDEF2F /* MemberSupportChatToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberSupportChatToolbar.swift; sourceTree = "<group>"; };
+		64A77A012DC4AD6100FDEF2F /* ContextPendingMemberActionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextPendingMemberActionsView.swift; sourceTree = "<group>"; };
 		64AA1C6827EE10C800AC7277 /* ContextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextItemView.swift; sourceTree = "<group>"; };
 		64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedItemView.swift; sourceTree = "<group>"; };
 		64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemInfoView.swift; sourceTree = "<group>"; };
 		64C3B0202A0D359700E19930 /* CustomTimePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTimePicker.swift; sourceTree = "<group>"; };
+		64C829982D54AEED006B9E89 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		64C829992D54AEEE006B9E89 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a"; sourceTree = "<group>"; };
+		64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a"; sourceTree = "<group>"; };
+		64C8299C2D54AEEE006B9E89 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 		64D0C2BF29F9688300B38D5F /* UserAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAddressView.swift; sourceTree = "<group>"; };
 		64D0C2C129FA57AB00B38D5F /* UserAddressLearnMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAddressLearnMore.swift; sourceTree = "<group>"; };
 		64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactLearnMore.swift; sourceTree = "<group>"; };
@@ -550,12 +567,18 @@
 		8C852B072C1086D100BA61E8 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		8C86EBE42C0DAE4F00E12243 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
 		8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeModeEditor.swift; sourceTree = "<group>"; };
+		8CAD466E2D15A8100078D18F /* ChatScrollHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatScrollHelpers.swift; sourceTree = "<group>"; };
+		8CAEF14F2D11A6A000240F00 /* ChatItemsLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemsLoader.swift; sourceTree = "<group>"; };
+		8CB15E9F2CFDA30600C28209 /* ChatItemsMerger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemsMerger.swift; sourceTree = "<group>"; };
 		8CB3476D2CF5F58B006787A5 /* ConditionsWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsWebView.swift; sourceTree = "<group>"; };
 		8CBC14852D357CDB00BBD901 /* StorageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageView.swift; sourceTree = "<group>"; };
+		8CC317432D4FEB9B00292A20 /* EndlessScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EndlessScrollView.swift; sourceTree = "<group>"; };
+		8CC317452D4FEBA800292A20 /* ScrollViewCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewCells.swift; sourceTree = "<group>"; };
 		8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallAudioDeviceManager.swift; sourceTree = "<group>"; };
 		8CC956ED2BC0041000412A11 /* NetworkObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkObserver.swift; sourceTree = "<group>"; };
 		8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableChatItemToolbars.swift; sourceTree = "<group>"; };
 		B70A39722D24090D00E80A5F /* TagListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagListView.swift; sourceTree = "<group>"; };
+		B70CE9E52D4BE5930080F36D /* GroupMentions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupMentions.swift; sourceTree = "<group>"; };
 		B73EFE522CE5FA3500C778EA /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListNavLink.swift; sourceTree = "<group>"; };
 		B79ADAFE2CE4EF930083DFFD /* AddressCreationCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressCreationCard.swift; sourceTree = "<group>"; };
@@ -574,7 +597,6 @@
 		CEE723D42C3C21F50009AE93 /* SimpleX SE.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX SE.entitlements"; sourceTree = "<group>"; };
 		CEE723EF2C3D25C70009AE93 /* ShareView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareView.swift; sourceTree = "<group>"; };
 		CEE723F12C3D25ED0009AE93 /* ShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareModel.swift; sourceTree = "<group>"; };
-		CEEA861C2C2ABCB50084E1EA /* ReverseList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReverseList.swift; sourceTree = "<group>"; };
 		CEFB2EDE2CA1BCC7004B1ECE /* SheetRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetRepresentable.swift; sourceTree = "<group>"; };
 		D72A9087294BD7A70047C86D /* NativeTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeTextEditor.swift; sourceTree = "<group>"; };
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -633,6 +655,8 @@
 		E5DCF9A62C590731007928CC /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A72C590732007928CC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A82C590732007928CC /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		E5DDBE6D2DC4106200A0EFF0 /* AppAPITypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAPITypes.swift; sourceTree = "<group>"; };
+		E5DDBE6F2DC4217900A0EFF0 /* NSEAPITypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSEAPITypes.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -673,14 +697,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				649B28DF2CFE07CF00536B68 /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				649B28E12CFE07CF00536B68 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				649B28E02CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a in Frameworks */,
+				64C8299D2D54AEEE006B9E89 /* libgmp.a in Frameworks */,
+				64C8299E2D54AEEE006B9E89 /* libffi.a in Frameworks */,
+				64C829A12D54AEEE006B9E89 /* libgmpxx.a in Frameworks */,
+				64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a in Frameworks */,
+				64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				649B28DE2CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a in Frameworks */,
-				649B28DD2CFE07CF00536B68 /* libffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -735,6 +759,8 @@
 		5C5F4AC227A5E9AF00B51EF1 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
+				8CC317452D4FEBA800292A20 /* ScrollViewCells.swift */,
+				8CC317432D4FEB9B00292A20 /* EndlessScrollView.swift */,
 				6440CA01288AEC770062C672 /* Group */,
 				5CE4407427ADB657007B033A /* ChatItem */,
 				5CEACCE527DE977C000BD591 /* ComposeMessage */,
@@ -745,11 +771,13 @@
 				5CE4407127ADB1D0007B033A /* Emoji.swift */,
 				5CADE79B292131E900072E13 /* ContactPreferencesView.swift */,
 				5CBE6C11294487F7002D9531 /* VerifyCodeView.swift */,
-				CEEA861C2C2ABCB50084E1EA /* ReverseList.swift */,
 				5CBE6C132944CC12002D9531 /* ScanCodeView.swift */,
 				64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */,
 				648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */,
 				8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */,
+				8CB15E9F2CFDA30600C28209 /* ChatItemsMerger.swift */,
+				8CAEF14F2D11A6A000240F00 /* ChatItemsLoader.swift */,
+				8CAD466E2D15A8100078D18F /* ChatScrollHelpers.swift */,
 			);
 			path = Chat;
 			sourceTree = "<group>";
@@ -757,11 +785,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				649B28D82CFE07CF00536B68 /* libffi.a */,
-				649B28DC2CFE07CF00536B68 /* libgmp.a */,
-				649B28DA2CFE07CF00536B68 /* libgmpxx.a */,
-				649B28D92CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte-ghc9.6.3.a */,
-				649B28DB2CFE07CF00536B68 /* libHSsimplex-chat-6.3.0.1-3BhXD2AWEfb4OJmT8vyXte.a */,
+				64C829992D54AEEE006B9E89 /* libffi.a */,
+				64C829982D54AEED006B9E89 /* libgmp.a */,
+				64C8299C2D54AEEE006B9E89 /* libgmpxx.a */,
+				64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F-ghc9.6.3.a */,
+				64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.0.2-K4qWCwk6PxbL8qHn42QC4F.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -781,6 +809,7 @@
 		5C764E87279CBC8E000C6508 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				E5DDBE6D2DC4106200A0EFF0 /* AppAPITypes.swift */,
 				5C764E88279CBCB3000C6508 /* ChatModel.swift */,
 				5C2E260627A2941F00F70299 /* SimpleXAPI.swift */,
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
@@ -976,6 +1005,7 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
+				E5DDBE6F2DC4217900A0EFF0 /* NSEAPITypes.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -992,9 +1022,9 @@
 				5CDCAD7228188CFF00503DA2 /* ChatTypes.swift */,
 				5CDCAD7428188D2900503DA2 /* APITypes.swift */,
 				5C5E5D3C282447AB00B0488A /* CallTypes.swift */,
+				5CDCAD7D2818941F00503DA2 /* API.swift */,
 				CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */,
 				5C9FD96A27A56D4D0075386C /* JSON.swift */,
-				5CDCAD7D2818941F00503DA2 /* API.swift */,
 				5CDCAD80281A7E2700503DA2 /* Notifications.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
 				CE2AD9CD2C452A4D00E844E3 /* ChatUtils.swift */,
@@ -1056,6 +1086,7 @@
 				644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */,
 				D72A9087294BD7A70047C86D /* NativeTextEditor.swift */,
 				6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */,
+				64A77A012DC4AD6100FDEF2F /* ContextPendingMemberActionsView.swift */,
 			);
 			path = ComposeMessage;
 			sourceTree = "<group>";
@@ -1096,6 +1127,11 @@
 				5C9C2DA42894777E00CC63B1 /* GroupProfileView.swift */,
 				6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */,
 				1841516F0CE5992B0EDFB377 /* GroupWelcomeView.swift */,
+				B70CE9E52D4BE5930080F36D /* GroupMentions.swift */,
+				64A779F52DBFB9F200FDEF2F /* MemberAdmissionView.swift */,
+				64A779F72DBFDBF200FDEF2F /* MemberSupportView.swift */,
+				64A779FB2DC1040000FDEF2F /* SecondaryChatView.swift */,
+				64A779FD2DC3AFF200FDEF2F /* MemberSupportChatToolbar.swift */,
 			);
 			path = Group;
 			sourceTree = "<group>";
@@ -1405,13 +1441,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CEEA861D2C2ABCB50084E1EA /* ReverseList.swift in Sources */,
 				64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */,
+				8CC317442D4FEB9B00292A20 /* EndlessScrollView.swift in Sources */,
 				640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */,
 				6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */,
 				640743612CD360E600158442 /* ChooseServerOperators.swift in Sources */,
+				64A779FE2DC3AFF200FDEF2F /* MemberSupportChatToolbar.swift in Sources */,
 				5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */,
 				5C55A923283CEDE600C4E99E /* SoundPlayer.swift in Sources */,
+				64A779F82DBFDBF200FDEF2F /* MemberSupportView.swift in Sources */,
 				5C93292F29239A170090FFF9 /* ProtocolServersView.swift in Sources */,
 				5CB924D727A8563F00ACCCDD /* SettingsView.swift in Sources */,
 				B79ADAFF2CE4EF930083DFFD /* AddressCreationCard.swift in Sources */,
@@ -1424,6 +1462,7 @@
 				5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */,
 				644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */,
 				6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */,
+				8CC317462D4FEBA800292A20 /* ScrollViewCells.swift in Sources */,
 				5C93293129239BED0090FFF9 /* ProtocolServerView.swift in Sources */,
 				5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */,
 				8C74C3EC2C1B92A900039E77 /* Theme.swift in Sources */,
@@ -1445,6 +1484,7 @@
 				5CB634AF29E4BB7D0066AD6B /* SetAppPasscodeView.swift in Sources */,
 				5C10D88828EED12E00E58BF0 /* ContactConnectionInfo.swift in Sources */,
 				5CBE6C12294487F7002D9531 /* VerifyCodeView.swift in Sources */,
+				64A779FC2DC1040000FDEF2F /* SecondaryChatView.swift in Sources */,
 				3CDBCF4227FAE51000354CDD /* ComposeLinkView.swift in Sources */,
 				648679AB2BC96A74006456E7 /* ChatItemForwardingView.swift in Sources */,
 				3CDBCF4827FF621E00354CDD /* CILinkView.swift in Sources */,
@@ -1452,6 +1492,7 @@
 				B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */,
 				5C10D88A28F187F300E58BF0 /* FullScreenMediaView.swift in Sources */,
 				D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */,
+				B70CE9E62D4BE5930080F36D /* GroupMentions.swift in Sources */,
 				CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */,
 				64D0C2C629FAC1EC00B38D5F /* AddContactLearnMore.swift in Sources */,
 				5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */,
@@ -1486,6 +1527,7 @@
 				5CB346E72868D76D001FD2EF /* NotificationsView.swift in Sources */,
 				647F090E288EA27B00644C40 /* GroupMemberInfoView.swift in Sources */,
 				646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */,
+				64A77A022DC4AD6100FDEF2F /* ContextPendingMemberActionsView.swift in Sources */,
 				8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
@@ -1512,10 +1554,12 @@
 				5C6BA667289BD954009B8ECC /* DismissSheets.swift in Sources */,
 				5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */,
 				6407BA83295DA85D0082BA18 /* CIInvalidJSONView.swift in Sources */,
+				8CAD466F2D15A8100078D18F /* ChatScrollHelpers.swift in Sources */,
 				644EFFDE292BCD9D00525D5B /* ComposeVoiceView.swift in Sources */,
 				5CA059EB279559F40002BEB4 /* SimpleXApp.swift in Sources */,
 				64D0C2C029F9688300B38D5F /* UserAddressView.swift in Sources */,
 				6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */,
+				E5DDBE6E2DC4106800A0EFF0 /* AppAPITypes.swift in Sources */,
 				8C9BC2652C240D5200875A27 /* ThemeModeEditor.swift in Sources */,
 				5CB346E92869E8BA001FD2EF /* PushEnvironment.swift in Sources */,
 				5C55A91F283AD0E400C4E99E /* CallManager.swift in Sources */,
@@ -1523,6 +1567,7 @@
 				5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */,
 				CEA6E91C2CBD21B0002B5DB4 /* UserDefault.swift in Sources */,
 				5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */,
+				8CAEF1502D11A6A000240F00 /* ChatItemsLoader.swift in Sources */,
 				5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */,
 				5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */,
 				8C81482C2BD91CD4002CBEC3 /* AudioDevicePicker.swift in Sources */,
@@ -1561,7 +1606,9 @@
 				1841560FD1CD447955474C1D /* UserProfilesView.swift in Sources */,
 				64C3B0212A0D359700E19930 /* CustomTimePicker.swift in Sources */,
 				8CC4ED902BD7B8530078AEE8 /* CallAudioDeviceManager.swift in Sources */,
+				64A779F62DBFB9F200FDEF2F /* MemberAdmissionView.swift in Sources */,
 				18415C6C56DBCEC2CBBD2F11 /* WebRTCClient.swift in Sources */,
+				8CB15EA02CFDA30600C28209 /* ChatItemsMerger.swift in Sources */,
 				184152CEF68D2336FC2EBCB0 /* CallViewRenderers.swift in Sources */,
 				5CB634AD29E46CF70066AD6B /* LocalAuthView.swift in Sources */,
 				18415FEFE153C5920BFB7828 /* GroupWelcomeView.swift in Sources */,
@@ -1586,6 +1633,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
+				E5DDBE702DC4217900A0EFF0 /* NSEAPITypes.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1943,7 +1991,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1968,7 +2016,8 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
+				OTHER_LDFLAGS = "-Wl,-stack_size,0x1000000";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1992,7 +2041,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -2017,7 +2066,8 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
+				OTHER_LDFLAGS = "-Wl,-stack_size,0x1000000";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -2033,11 +2083,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2053,11 +2103,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2078,7 +2128,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2093,7 +2143,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2115,7 +2165,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2130,7 +2180,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2152,7 +2202,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2178,7 +2228,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2203,7 +2253,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2229,7 +2279,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2254,7 +2304,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2269,7 +2319,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2288,7 +2338,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 260;
+				CURRENT_PROJECT_VERSION = 279;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2303,7 +2353,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.3;
+				MARKETING_VERSION = 6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
diff --git a/apps/ios/SimpleXChat/API.swift b/apps/ios/SimpleXChat/API.swift
index 987f7f3d41..0dd3483fd7 100644
--- a/apps/ios/SimpleXChat/API.swift
+++ b/apps/ios/SimpleXChat/API.swift
@@ -46,7 +46,7 @@ public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: Migratio
     var cConfirm = confirm.rawValue.cString(using: .utf8)!
     // the last parameter of chat_migrate_init is used to return the pointer to chat controller
     let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, backgroundMode ? 1 : 0, &chatController)!
-    let dbRes = dbMigrationResult(fromCString(cjson))
+    let dbRes = dbMigrationResult(dataFromCString(cjson))
     let encrypted = dbKey != ""
     let keychainErr = dbRes == .ok && useKeychain && encrypted && !kcDatabasePassword.set(dbKey)
     let result = (encrypted, keychainErr ? .errorKeychain : dbRes)
@@ -63,7 +63,7 @@ public func chatInitTemporaryDatabase(url: URL, key: String? = nil, confirmation
     var cKey = dbKey.cString(using: .utf8)!
     var cConfirm = confirmation.rawValue.cString(using: .utf8)!
     let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, 0, &temporaryController)!
-    return (dbMigrationResult(fromCString(cjson)), temporaryController)
+    return (dbMigrationResult(dataFromCString(cjson)), temporaryController)
 }
 
 public func chatInitControllerRemovingDatabases() {
@@ -110,27 +110,42 @@ public func resetChatCtrl() {
     migrationResult = nil
 }
 
-public func sendSimpleXCmd(_ cmd: ChatCommand, _ ctrl: chat_ctrl? = nil) -> ChatResponse {
-    var c = cmd.cmdString.cString(using: .utf8)!
-    let cjson  = chat_send_cmd(ctrl ?? getChatCtrl(), &c)!
-    return chatResponse(fromCString(cjson))
+@inline(__always)
+public func sendSimpleXCmd<R: ChatAPIResult>(_ cmd: ChatCmdProtocol, _ ctrl: chat_ctrl? = nil) -> APIResult<R> {
+    if let d = sendSimpleXCmdStr(cmd.cmdString, ctrl) {    
+        decodeAPIResult(d)
+    } else {
+        APIResult.error(.invalidJSON(json: nil))
+    }
+}
+
+@inline(__always)
+public func sendSimpleXCmdStr(_ cmd: String, _ ctrl: chat_ctrl? = nil) -> Data? {
+    var c = cmd.cString(using: .utf8)!
+    return if let cjson = chat_send_cmd(ctrl ?? getChatCtrl(), &c) {
+        dataFromCString(cjson)
+    } else {
+        nil
+    }
 }
 
 // in microseconds
 public let MESSAGE_TIMEOUT: Int32 = 15_000_000
 
-public func recvSimpleXMsg(_ ctrl: chat_ctrl? = nil, messageTimeout: Int32 = MESSAGE_TIMEOUT) -> ChatResponse? {
-    if let cjson = chat_recv_msg_wait(ctrl ?? getChatCtrl(), messageTimeout) {
-        let s = fromCString(cjson)
-        return s == "" ? nil : chatResponse(s)
+@inline(__always)
+public func recvSimpleXMsg<R: ChatAPIResult>(_ ctrl: chat_ctrl? = nil, messageTimeout: Int32 = MESSAGE_TIMEOUT) -> APIResult<R>? {
+    if let cjson = chat_recv_msg_wait(ctrl ?? getChatCtrl(), messageTimeout),
+       let d = dataFromCString(cjson) {
+        decodeAPIResult(d)
+    } else {
+        nil
     }
-    return nil
 }
 
 public func parseSimpleXMarkdown(_ s: String) -> [FormattedText]? {
     var c = s.cString(using: .utf8)!
     if let cjson = chat_parse_markdown(&c) {
-        if let d = fromCString(cjson).data(using: .utf8) {
+        if let d = dataFromCString(cjson) {
             do {
                 let r = try jsonDecoder.decode(ParsedMarkdown.self, from: d)
                 return r.formattedText
@@ -154,7 +169,7 @@ struct ParsedMarkdown: Decodable {
 public func parseServerAddress(_ s: String) -> ServerAddress? {
     var c = s.cString(using: .utf8)!
     if let cjson = chat_parse_server(&c) {
-         if let d = fromCString(cjson).data(using: .utf8) {
+         if let d = dataFromCString(cjson) {
             do {
                 let r = try jsonDecoder.decode(ParsedServerAddress.self, from: d)
                 return r.serverAddress
@@ -171,67 +186,34 @@ struct ParsedServerAddress: Decodable {
     var parseError: String
 }
 
+@inline(__always)
 public func fromCString(_ c: UnsafeMutablePointer<CChar>) -> String {
     let s = String.init(cString: c)
     free(c)
     return s
 }
 
-public func chatResponse(_ s: String) -> ChatResponse {
-    let d = s.data(using: .utf8)!
-    // TODO is there a way to do it without copying the data? e.g:
-    //    let p = UnsafeMutableRawPointer.init(mutating: UnsafeRawPointer(cjson))
-    //    let d = Data.init(bytesNoCopy: p, count: strlen(cjson), deallocator: .free)
-    do {
-        let r = try jsonDecoder.decode(APIResponse.self, from: d)
-        return r.resp
-    } catch {
-        logger.error("chatResponse jsonDecoder.decode error: \(error.localizedDescription)")
+@inline(__always)
+public func dataFromCString(_ c: UnsafeMutablePointer<CChar>) -> Data? {
+    let len = strlen(c)
+    if len > 0 {
+        return Data(bytesNoCopy: c, count: len, deallocator: .free)
+    } else {
+        free(c)
+        return nil
     }
-    
-    var type: String?
-    var json: String?
-    if let j = try? JSONSerialization.jsonObject(with: d) as? NSDictionary {
-        if let jResp = j["resp"] as? NSDictionary, jResp.count == 1 || jResp.count == 2 {
-            type = jResp.allKeys[0] as? String
-            if jResp.count == 2 && type == "_owsf" {
-                type = jResp.allKeys[1] as? String
-            }
-            if type == "apiChats" {
-                if let jApiChats = jResp["apiChats"] as? NSDictionary,
-                   let user: UserRef = try? decodeObject(jApiChats["user"] as Any),
-                   let jChats = jApiChats["chats"] as? NSArray {
-                    let chats = jChats.map { jChat in
-                        if let chatData = try? parseChatData(jChat) {
-                            return chatData
-                        }
-                        return ChatData.invalidJSON(serializeJSON(jChat, options: .prettyPrinted) ?? "")
-                    }
-                    return .apiChats(user: user, chats: chats)
-                }
-            } else if type == "apiChat" {
-                if let jApiChat = jResp["apiChat"] as? NSDictionary,
-                   let user: UserRef = try? decodeObject(jApiChat["user"] as Any),
-                   let jChat = jApiChat["chat"] as? NSDictionary,
-                   let chat = try? parseChatData(jChat) {
-                    return .apiChat(user: user, chat: chat)
-                }
-            } else if type == "chatCmdError" {
-                if let jError = jResp["chatCmdError"] as? NSDictionary {
-                    return .chatCmdError(user_: decodeUser_(jError), chatError: .invalidJSON(json: errorJson(jError) ?? ""))
-                }
-            } else if type == "chatError" {
-                if let jError = jResp["chatError"] as? NSDictionary {
-                    return .chatError(user_: decodeUser_(jError), chatError: .invalidJSON(json: errorJson(jError) ?? ""))
-                }
-            }
-        }
-        json = serializeJSON(j, options: .prettyPrinted)
-    }
-    return ChatResponse.response(type: type ?? "invalid", json: json ?? s)
 }
 
-private func decodeUser_(_ jDict: NSDictionary) -> UserRef? {
+@inline(__always)
+public func dataToString(_ d: Data?) -> String {
+    if let d {
+        String(data: d, encoding: .utf8) ?? "invalid string"
+    } else {
+        "no data"
+    }
+}
+
+public func decodeUser_(_ jDict: NSDictionary) -> UserRef? {
     if let user_ = jDict["user_"] {
         try? decodeObject(user_ as Any)
     } else {
@@ -239,7 +221,7 @@ private func decodeUser_(_ jDict: NSDictionary) -> UserRef? {
     }
 }
 
-private func errorJson(_ jDict: NSDictionary) -> String? {
+public func errorJson(_ jDict: NSDictionary) -> Data? {
     if let chatError = jDict["chatError"] {
         serializeJSON(chatError)
     } else {
@@ -247,10 +229,15 @@ private func errorJson(_ jDict: NSDictionary) -> String? {
     }
 }
 
-func parseChatData(_ jChat: Any) throws -> ChatData {
+public func parseChatData(_ jChat: Any, _ jNavInfo: Any? = nil) throws -> (ChatData, NavigationInfo) {
     let jChatDict = jChat as! NSDictionary
     let chatInfo: ChatInfo = try decodeObject(jChatDict["chatInfo"]!)
     let chatStats: ChatStats = try decodeObject(jChatDict["chatStats"]!)
+    let navInfo: NavigationInfo = if let jNavInfo = jNavInfo as? NSDictionary, let jNav = jNavInfo["navInfo"] {
+        try decodeObject(jNav)
+    } else {
+        NavigationInfo()
+    }
     let jChatItems = jChatDict["chatItems"] as! NSArray
     let chatItems = jChatItems.map { jCI in
         if let ci: ChatItem = try? decodeObject(jCI) {
@@ -259,16 +246,18 @@ func parseChatData(_ jChat: Any) throws -> ChatData {
         return ChatItem.invalidJSON(
             chatDir: decodeProperty(jCI, "chatDir"),
             meta: decodeProperty(jCI, "meta"),
-            json: serializeJSON(jCI, options: .prettyPrinted) ?? ""
+            json: serializeJSON(jCI, options: .prettyPrinted)
         )
     }
-    return ChatData(chatInfo: chatInfo, chatItems: chatItems, chatStats: chatStats)
+    return (ChatData(chatInfo: chatInfo, chatItems: chatItems, chatStats: chatStats), navInfo)
 }
 
-func decodeObject<T: Decodable>(_ obj: Any) throws -> T {
+@inline(__always)
+public func decodeObject<T: Decodable>(_ obj: Any) throws -> T {
     try jsonDecoder.decode(T.self, from: JSONSerialization.data(withJSONObject: obj))
 }
 
+@inline(__always)
 func decodeProperty<T: Decodable>(_ obj: Any, _ prop: NSString) -> T? {
     if let jProp = (obj as? NSDictionary)?[prop] {
         return try? decodeObject(jProp)
@@ -276,28 +265,52 @@ func decodeProperty<T: Decodable>(_ obj: Any, _ prop: NSString) -> T? {
     return nil
 }
 
-func serializeJSON(_ obj: Any, options: JSONSerialization.WritingOptions = []) -> String? {
-    if let d = try? JSONSerialization.data(withJSONObject: obj, options: options) {
-        return String(decoding: d, as: UTF8.self)
+@inline(__always)
+func getOWSF(_ obj: NSDictionary, _ prop: NSString) -> (type: String, object: NSDictionary)? {
+    if let j = obj[prop] as? NSDictionary, j.count == 1 || j.count == 2 {
+        var type = j.allKeys[0] as? String
+        if j.count == 2 && type == "_owsf" {
+            type = j.allKeys[1] as? String
+        }
+        if let type {
+            return (type, j)
+        }
     }
     return nil
 }
 
-public func responseError(_ err: Error) -> String {
-    if let r = err as? ChatResponse {
-        switch r {
-        case let .chatCmdError(_, chatError): return chatErrorString(chatError)
-        case let .chatError(_, chatError): return chatErrorString(chatError)
-        default: return "\(String(describing: r.responseType)), details: \(String(describing: r.details))"
-        }
+@inline(__always)
+public func serializeJSON(_ obj: Any, options: JSONSerialization.WritingOptions = []) -> Data? {
+    if let d = try? JSONSerialization.data(withJSONObject: obj, options: options) {
+        dataPrefix(d)
     } else {
-        return String(describing: err)
+        nil
     }
 }
 
-func chatErrorString(_ err: ChatError) -> String {
-    if case let .invalidJSON(json) = err { return json }
-    return String(describing: err)
+let MAX_JSON_VIEW_LENGTH = 2048
+
+@inline(__always)
+public func dataPrefix(_ d: Data) -> Data {
+    d.count > MAX_JSON_VIEW_LENGTH
+    ? Data(d.prefix(MAX_JSON_VIEW_LENGTH))
+    : d
+}
+
+public func responseError(_ err: Error) -> String {
+    if let e = err as? ChatError {
+        chatErrorString(e)
+    } else {
+        String(describing: err)
+    }
+}
+
+public func chatErrorString(_ err: ChatError) -> String {
+    switch err {
+    case let .invalidJSON(json): dataToString(json)
+    case let .unexpectedResult(type): "unexpected result: \(type)"
+    default: String(describing: err)
+    }
 }
 
 public enum DBMigrationResult: Decodable, Equatable {
@@ -336,15 +349,15 @@ public enum MTRError: Decodable, Equatable {
     case different(appMigration: String, dbMigration: String)
 }
 
-func dbMigrationResult(_ s: String) -> DBMigrationResult {
-    let d = s.data(using: .utf8)!
-// TODO is there a way to do it without copying the data? e.g:
-//    let p = UnsafeMutableRawPointer.init(mutating: UnsafeRawPointer(cjson))
-//    let d = Data.init(bytesNoCopy: p, count: strlen(cjson), deallocator: .free)
-    do {
-        return try jsonDecoder.decode(DBMigrationResult.self, from: d)
-    } catch let error {
-        logger.error("chatResponse jsonDecoder.decode error: \(error.localizedDescription)")
-        return .unknown(json: s)
+func dbMigrationResult(_ d: Data?) -> DBMigrationResult {
+    if let d {
+        do {
+            return try jsonDecoder.decode(DBMigrationResult.self, from: d)
+        } catch let error {
+            logger.error("chatResponse jsonDecoder.decode error: \(error.localizedDescription)")
+            return .unknown(json: dataToString(d))
+        }
+    } else {
+        return .unknown(json: "no data")
     }
 }
diff --git a/apps/ios/SimpleXChat/APITypes.swift b/apps/ios/SimpleXChat/APITypes.swift
index 4ae9bda0f2..b8d2361ac8 100644
--- a/apps/ios/SimpleXChat/APITypes.swift
+++ b/apps/ios/SimpleXChat/APITypes.swift
@@ -13,1687 +13,183 @@ import Network
 public let jsonDecoder = getJSONDecoder()
 public let jsonEncoder = getJSONEncoder()
 
-public enum ChatCommand {
-    case showActiveUser
-    case createActiveUser(profile: Profile?, pastTimestamp: Bool)
-    case listUsers
-    case apiSetActiveUser(userId: Int64, viewPwd: String?)
-    case setAllContactReceipts(enable: Bool)
-    case apiSetUserContactReceipts(userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings)
-    case apiSetUserGroupReceipts(userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings)
-    case apiHideUser(userId: Int64, viewPwd: String)
-    case apiUnhideUser(userId: Int64, viewPwd: String)
-    case apiMuteUser(userId: Int64)
-    case apiUnmuteUser(userId: Int64)
-    case apiDeleteUser(userId: Int64, delSMPQueues: Bool, viewPwd: String?)
-    case startChat(mainApp: Bool, enableSndFiles: Bool)
-    case checkChatRunning
-    case apiStopChat
-    case apiActivateChat(restoreChat: Bool)
-    case apiSuspendChat(timeoutMicroseconds: Int)
-    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
-    case apiSetEncryptLocalFiles(enable: Bool)
-    case apiExportArchive(config: ArchiveConfig)
-    case apiImportArchive(config: ArchiveConfig)
-    case apiDeleteStorage
-    case apiStorageEncryption(config: DBEncryptionConfig)
-    case testStorageEncryption(key: String)
-    case apiSaveSettings(settings: AppSettings)
-    case apiGetSettings(settings: AppSettings)
-    case apiGetChatTags(userId: Int64)
-    case apiGetChats(userId: Int64)
-    case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
-    case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
-    case apiSendMessages(type: ChatType, id: Int64, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
-    case apiCreateChatTag(tag: ChatTagData)
-    case apiSetChatTags(type: ChatType, id: Int64, tagIds: [Int64])
-    case apiDeleteChatTag(tagId: Int64)
-    case apiUpdateChatTag(tagId: Int64, tagData: ChatTagData)
-    case apiReorderChatTags(tagIds: [Int64])
-    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
-    case apiReportMessage(groupId: Int64, chatItemId: Int64, reportReason: ReportReason, reportText: String)
-    case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
-    case apiDeleteChatItem(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode)
-    case apiDeleteMemberChatItem(groupId: Int64, itemIds: [Int64])
-    case apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction)
-    case apiGetReactionMembers(userId: Int64, groupId: Int64, itemId: Int64, reaction: MsgReaction)
-    case apiPlanForwardChatItems(toChatType: ChatType, toChatId: Int64, itemIds: [Int64])
-    case apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?)
-    case apiGetNtfToken
-    case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
-    case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
-    case apiDeleteToken(token: DeviceToken)
-    case apiGetNtfConns(nonce: String, encNtfInfo: String)
-    case apiGetConnNtfMessages(connIds: [String])
-    case apiNewGroup(userId: Int64, incognito: Bool, groupProfile: GroupProfile)
-    case apiAddMember(groupId: Int64, contactId: Int64, memberRole: GroupMemberRole)
-    case apiJoinGroup(groupId: Int64)
-    case apiMemberRole(groupId: Int64, memberId: Int64, memberRole: GroupMemberRole)
-    case apiBlockMemberForAll(groupId: Int64, memberId: Int64, blocked: Bool)
-    case apiRemoveMember(groupId: Int64, memberId: Int64)
-    case apiLeaveGroup(groupId: Int64)
-    case apiListMembers(groupId: Int64)
-    case apiUpdateGroupProfile(groupId: Int64, groupProfile: GroupProfile)
-    case apiCreateGroupLink(groupId: Int64, memberRole: GroupMemberRole)
-    case apiGroupLinkMemberRole(groupId: Int64, memberRole: GroupMemberRole)
-    case apiDeleteGroupLink(groupId: Int64)
-    case apiGetGroupLink(groupId: Int64)
-    case apiCreateMemberContact(groupId: Int64, groupMemberId: Int64)
-    case apiSendMemberContactInvitation(contactId: Int64, msg: MsgContent)
-    case apiTestProtoServer(userId: Int64, server: String)
-    case apiGetServerOperators
-    case apiSetServerOperators(operators: [ServerOperator])
-    case apiGetUserServers(userId: Int64)
-    case apiSetUserServers(userId: Int64, userServers: [UserOperatorServers])
-    case apiValidateServers(userId: Int64, userServers: [UserOperatorServers])
-    case apiGetUsageConditions
-    case apiSetConditionsNotified(conditionsId: Int64)
-    case apiAcceptConditions(conditionsId: Int64, operatorIds: [Int64])
-    case apiSetChatItemTTL(userId: Int64, seconds: Int64)
-    case apiGetChatItemTTL(userId: Int64)
-    case apiSetChatTTL(userId: Int64, type: ChatType, id: Int64, seconds: Int64?)
-    case apiSetNetworkConfig(networkConfig: NetCfg)
-    case apiGetNetworkConfig
-    case apiSetNetworkInfo(networkInfo: UserNetworkInfo)
-    case reconnectAllServers
-    case reconnectServer(userId: Int64, smpServer: String)
-    case apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings)
-    case apiSetMemberSettings(groupId: Int64, groupMemberId: Int64, memberSettings: GroupMemberSettings)
-    case apiContactInfo(contactId: Int64)
-    case apiGroupMemberInfo(groupId: Int64, groupMemberId: Int64)
-    case apiContactQueueInfo(contactId: Int64)
-    case apiGroupMemberQueueInfo(groupId: Int64, groupMemberId: Int64)
-    case apiSwitchContact(contactId: Int64)
-    case apiSwitchGroupMember(groupId: Int64, groupMemberId: Int64)
-    case apiAbortSwitchContact(contactId: Int64)
-    case apiAbortSwitchGroupMember(groupId: Int64, groupMemberId: Int64)
-    case apiSyncContactRatchet(contactId: Int64, force: Bool)
-    case apiSyncGroupMemberRatchet(groupId: Int64, groupMemberId: Int64, force: Bool)
-    case apiGetContactCode(contactId: Int64)
-    case apiGetGroupMemberCode(groupId: Int64, groupMemberId: Int64)
-    case apiVerifyContact(contactId: Int64, connectionCode: String?)
-    case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
-    case apiAddContact(userId: Int64, incognito: Bool)
-    case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
-    case apiChangeConnectionUser(connId: Int64, userId: Int64)
-    case apiConnectPlan(userId: Int64, connReq: String)
-    case apiConnect(userId: Int64, incognito: Bool, connReq: String)
-    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
-    case apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode)
-    case apiClearChat(type: ChatType, id: Int64)
-    case apiListContacts(userId: Int64)
-    case apiUpdateProfile(userId: Int64, profile: Profile)
-    case apiSetContactPrefs(contactId: Int64, preferences: Preferences)
-    case apiSetContactAlias(contactId: Int64, localAlias: String)
-    case apiSetGroupAlias(groupId: Int64, localAlias: String)
-    case apiSetConnectionAlias(connId: Int64, localAlias: String)
-    case apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?)
-    case apiSetChatUIThemes(chatId: String, themes: ThemeModeOverrides?)
-    case apiCreateMyAddress(userId: Int64)
-    case apiDeleteMyAddress(userId: Int64)
-    case apiShowMyAddress(userId: Int64)
-    case apiSetProfileAddress(userId: Int64, on: Bool)
-    case apiAddressAutoAccept(userId: Int64, autoAccept: AutoAccept?)
-    case apiAcceptContact(incognito: Bool, contactReqId: Int64)
-    case apiRejectContact(contactReqId: Int64)
-    // WebRTC calls
-    case apiSendCallInvitation(contact: Contact, callType: CallType)
-    case apiRejectCall(contact: Contact)
-    case apiSendCallOffer(contact: Contact, callOffer: WebRTCCallOffer)
-    case apiSendCallAnswer(contact: Contact, answer: WebRTCSession)
-    case apiSendCallExtraInfo(contact: Contact, extraInfo: WebRTCExtraInfo)
-    case apiEndCall(contact: Contact)
-    case apiGetCallInvitations
-    case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
-    // WebRTC calls /
-    case apiGetNetworkStatuses
-    case apiChatRead(type: ChatType, id: Int64)
-    case apiChatItemsRead(type: ChatType, id: Int64, itemIds: [Int64])
-    case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
-    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
-    case cancelFile(fileId: Int64)
-    // remote desktop commands
-    case setLocalDeviceName(displayName: String)
-    case connectRemoteCtrl(xrcpInvitation: String)
-    case findKnownRemoteCtrl
-    case confirmRemoteCtrl(remoteCtrlId: Int64)
-    case verifyRemoteCtrlSession(sessionCode: String)
-    case listRemoteCtrls
-    case stopRemoteCtrl
-    case deleteRemoteCtrl(remoteCtrlId: Int64)
-    case apiUploadStandaloneFile(userId: Int64, file: CryptoFile)
-    case apiDownloadStandaloneFile(userId: Int64, url: String, file: CryptoFile)
-    case apiStandaloneFileInfo(url: String)
-    // misc
-    case showVersion
-    case getAgentSubsTotal(userId: Int64)
-    case getAgentServersSummary(userId: Int64)
-    case resetAgentServersStats
-    case string(String)
-
-    public var cmdString: String {
-        get {
-            switch self {
-            case .showActiveUser: return "/u"
-            case let .createActiveUser(profile, pastTimestamp):
-                let user = NewUser(profile: profile, pastTimestamp: pastTimestamp)
-                return "/_create user \(encodeJSON(user))"
-            case .listUsers: return "/users"
-            case let .apiSetActiveUser(userId, viewPwd): return "/_user \(userId)\(maybePwd(viewPwd))"
-            case let .setAllContactReceipts(enable): return "/set receipts all \(onOff(enable))"
-            case let .apiSetUserContactReceipts(userId, userMsgReceiptSettings):
-                let umrs = userMsgReceiptSettings
-                return "/_set receipts contacts \(userId) \(onOff(umrs.enable)) clear_overrides=\(onOff(umrs.clearOverrides))"
-            case let .apiSetUserGroupReceipts(userId, userMsgReceiptSettings):
-                let umrs = userMsgReceiptSettings
-                return "/_set receipts groups \(userId) \(onOff(umrs.enable)) clear_overrides=\(onOff(umrs.clearOverrides))"
-            case let .apiHideUser(userId, viewPwd): return "/_hide user \(userId) \(encodeJSON(viewPwd))"
-            case let .apiUnhideUser(userId, viewPwd): return "/_unhide user \(userId) \(encodeJSON(viewPwd))"
-            case let .apiMuteUser(userId): return "/_mute user \(userId)"
-            case let .apiUnmuteUser(userId): return "/_unmute user \(userId)"
-            case let .apiDeleteUser(userId, delSMPQueues, viewPwd): return "/_delete user \(userId) del_smp=\(onOff(delSMPQueues))\(maybePwd(viewPwd))"
-            case let .startChat(mainApp, enableSndFiles): return "/_start main=\(onOff(mainApp)) snd_files=\(onOff(enableSndFiles))"
-            case .checkChatRunning: return "/_check running"
-            case .apiStopChat: return "/_stop"
-            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
-            case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
-            case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder): return "/set file paths \(encodeJSON(AppFilePaths(appFilesFolder: filesFolder, appTempFolder: tempFolder, appAssetsFolder: assetsFolder)))"
-            case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
-            case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
-            case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
-            case .apiDeleteStorage: return "/_db delete"
-            case let .apiStorageEncryption(cfg): return "/_db encryption \(encodeJSON(cfg))"
-            case let .testStorageEncryption(key): return "/db test key \(key)"
-            case let .apiSaveSettings(settings): return "/_save app settings \(encodeJSON(settings))"
-            case let .apiGetSettings(settings): return "/_get app settings \(encodeJSON(settings))"
-            case let .apiGetChatTags(userId): return "/_get tags \(userId)"
-            case let .apiGetChats(userId): return "/_get chats \(userId) pcc=on"
-            case let .apiGetChat(type, id, pagination, search): return "/_get chat \(ref(type, id)) \(pagination.cmdString)" +
-                (search == "" ? "" : " search=\(search)")
-            case let .apiGetChatItemInfo(type, id, itemId): return "/_get item info \(ref(type, id)) \(itemId)"
-            case let .apiSendMessages(type, id, live, ttl, composedMessages):
-                let msgs = encodeJSON(composedMessages)
-                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
-            case let .apiCreateChatTag(tag): return "/_create tag \(encodeJSON(tag))"
-            case let .apiSetChatTags(type, id, tagIds): return "/_tags \(ref(type, id)) \(tagIds.map({ "\($0)" }).joined(separator: ","))"
-            case let .apiDeleteChatTag(tagId): return "/_delete tag \(tagId)"
-            case let .apiUpdateChatTag(tagId, tagData): return "/_update tag \(tagId) \(encodeJSON(tagData))"
-            case let .apiReorderChatTags(tagIds): return "/_reorder tags \(tagIds.map({ "\($0)" }).joined(separator: ","))"
-            case let .apiCreateChatItems(noteFolderId, composedMessages):
-                let msgs = encodeJSON(composedMessages)
-                return "/_create *\(noteFolderId) json \(msgs)"
-            case let .apiReportMessage(groupId, chatItemId, reportReason, reportText):
-                return "/_report #\(groupId) \(chatItemId) reason=\(reportReason) \(reportText)"
-            case let .apiUpdateChatItem(type, id, itemId, mc, live): return "/_update item \(ref(type, id)) \(itemId) live=\(onOff(live)) \(mc.cmdString)"
-            case let .apiDeleteChatItem(type, id, itemIds, mode): return "/_delete item \(ref(type, id)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) \(mode.rawValue)"
-            case let .apiDeleteMemberChatItem(groupId, itemIds): return "/_delete member item #\(groupId) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
-            case let .apiChatItemReaction(type, id, itemId, add, reaction): return "/_reaction \(ref(type, id)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
-            case let .apiGetReactionMembers(userId, groupId, itemId, reaction): return "/_reaction members \(userId) #\(groupId) \(itemId) \(encodeJSON(reaction))"
-            case let .apiPlanForwardChatItems(type, id, itemIds): return "/_forward plan \(ref(type, id)) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
-            case let .apiForwardChatItems(toChatType, toChatId, fromChatType, fromChatId, itemIds, ttl):
-                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) ttl=\(ttlStr)"
-            case .apiGetNtfToken: return "/_ntf get "
-            case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
-            case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
-            case let .apiDeleteToken(token): return "/_ntf delete \(token.cmdString)"
-            case let .apiGetNtfConns(nonce, encNtfInfo): return "/_ntf conns \(nonce) \(encNtfInfo)"
-            case let .apiGetConnNtfMessages(connIds): return "/_ntf conn messages \(connIds.joined(separator: ","))"
-            case let .apiNewGroup(userId, incognito, groupProfile): return "/_group \(userId) incognito=\(onOff(incognito)) \(encodeJSON(groupProfile))"
-            case let .apiAddMember(groupId, contactId, memberRole): return "/_add #\(groupId) \(contactId) \(memberRole)"
-            case let .apiJoinGroup(groupId): return "/_join #\(groupId)"
-            case let .apiMemberRole(groupId, memberId, memberRole): return "/_member role #\(groupId) \(memberId) \(memberRole.rawValue)"
-            case let .apiBlockMemberForAll(groupId, memberId, blocked): return "/_block #\(groupId) \(memberId) blocked=\(onOff(blocked))"
-            case let .apiRemoveMember(groupId, memberId): return "/_remove #\(groupId) \(memberId)"
-            case let .apiLeaveGroup(groupId): return "/_leave #\(groupId)"
-            case let .apiListMembers(groupId): return "/_members #\(groupId)"
-            case let .apiUpdateGroupProfile(groupId, groupProfile): return "/_group_profile #\(groupId) \(encodeJSON(groupProfile))"
-            case let .apiCreateGroupLink(groupId, memberRole): return "/_create link #\(groupId) \(memberRole)"
-            case let .apiGroupLinkMemberRole(groupId, memberRole): return "/_set link role #\(groupId) \(memberRole)"
-            case let .apiDeleteGroupLink(groupId): return "/_delete link #\(groupId)"
-            case let .apiGetGroupLink(groupId): return "/_get link #\(groupId)"
-            case let .apiCreateMemberContact(groupId, groupMemberId): return "/_create member contact #\(groupId) \(groupMemberId)"
-            case let .apiSendMemberContactInvitation(contactId, mc): return "/_invite member contact @\(contactId) \(mc.cmdString)"
-            case let .apiTestProtoServer(userId, server): return "/_server test \(userId) \(server)"
-            case .apiGetServerOperators: return "/_operators"
-            case let .apiSetServerOperators(operators): return "/_operators \(encodeJSON(operators))"
-            case let .apiGetUserServers(userId): return "/_servers \(userId)"
-            case let .apiSetUserServers(userId, userServers): return "/_servers \(userId) \(encodeJSON(userServers))"
-            case let .apiValidateServers(userId, userServers): return "/_validate_servers \(userId) \(encodeJSON(userServers))"
-            case .apiGetUsageConditions: return "/_conditions"
-            case let .apiSetConditionsNotified(conditionsId): return "/_conditions_notified \(conditionsId)"
-            case let .apiAcceptConditions(conditionsId, operatorIds): return "/_accept_conditions \(conditionsId) \(joinedIds(operatorIds))"
-            case let .apiSetChatItemTTL(userId, seconds): return "/_ttl \(userId) \(chatItemTTLStr(seconds: seconds))"
-            case let .apiGetChatItemTTL(userId): return "/_ttl \(userId)"
-            case let .apiSetChatTTL(userId, type, id, seconds): return "/_ttl \(userId) \(ref(type, id)) \(chatItemTTLStr(seconds: seconds))"
-            case let .apiSetNetworkConfig(networkConfig): return "/_network \(encodeJSON(networkConfig))"
-            case .apiGetNetworkConfig: return "/network"
-            case let .apiSetNetworkInfo(networkInfo): return "/_network info \(encodeJSON(networkInfo))"
-            case .reconnectAllServers: return "/reconnect"
-            case let .reconnectServer(userId, smpServer): return "/reconnect \(userId) \(smpServer)"
-            case let .apiSetChatSettings(type, id, chatSettings): return "/_settings \(ref(type, id)) \(encodeJSON(chatSettings))"
-            case let .apiSetMemberSettings(groupId, groupMemberId, memberSettings): return "/_member settings #\(groupId) \(groupMemberId) \(encodeJSON(memberSettings))"
-            case let .apiContactInfo(contactId): return "/_info @\(contactId)"
-            case let .apiGroupMemberInfo(groupId, groupMemberId): return "/_info #\(groupId) \(groupMemberId)"
-            case let .apiContactQueueInfo(contactId): return "/_queue info @\(contactId)"
-            case let .apiGroupMemberQueueInfo(groupId, groupMemberId): return "/_queue info #\(groupId) \(groupMemberId)"
-            case let .apiSwitchContact(contactId): return "/_switch @\(contactId)"
-            case let .apiSwitchGroupMember(groupId, groupMemberId): return "/_switch #\(groupId) \(groupMemberId)"
-            case let .apiAbortSwitchContact(contactId): return "/_abort switch @\(contactId)"
-            case let .apiAbortSwitchGroupMember(groupId, groupMemberId): return "/_abort switch #\(groupId) \(groupMemberId)"
-            case let .apiSyncContactRatchet(contactId, force): if force {
-                return "/_sync @\(contactId) force=on"
-            } else {
-                return "/_sync @\(contactId)"
-            }
-            case let .apiSyncGroupMemberRatchet(groupId, groupMemberId, force): if force {
-                return "/_sync #\(groupId) \(groupMemberId) force=on"
-            } else {
-                return "/_sync #\(groupId) \(groupMemberId)"
-            }
-            case let .apiGetContactCode(contactId): return "/_get code @\(contactId)"
-            case let .apiGetGroupMemberCode(groupId, groupMemberId): return "/_get code #\(groupId) \(groupMemberId)"
-            case let .apiVerifyContact(contactId, .some(connectionCode)): return "/_verify code @\(contactId) \(connectionCode)"
-            case let .apiVerifyContact(contactId, .none): return "/_verify code @\(contactId)"
-            case let .apiVerifyGroupMember(groupId, groupMemberId, .some(connectionCode)): return "/_verify code #\(groupId) \(groupMemberId) \(connectionCode)"
-            case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
-            case let .apiAddContact(userId, incognito): return "/_connect \(userId) incognito=\(onOff(incognito))"
-            case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
-            case let .apiChangeConnectionUser(connId, userId): return "/_set conn user :\(connId) \(userId)"
-            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
-            case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
-            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
-            case let .apiDeleteChat(type, id, chatDeleteMode): return "/_delete \(ref(type, id)) \(chatDeleteMode.cmdString)"
-            case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
-            case let .apiListContacts(userId): return "/_contacts \(userId)"
-            case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
-            case let .apiSetContactPrefs(contactId, preferences): return "/_set prefs @\(contactId) \(encodeJSON(preferences))"
-            case let .apiSetContactAlias(contactId, localAlias): return "/_set alias @\(contactId) \(localAlias.trimmingCharacters(in: .whitespaces))"
-            case let .apiSetGroupAlias(groupId, localAlias): return "/_set alias #\(groupId) \(localAlias.trimmingCharacters(in: .whitespaces))"
-            case let .apiSetConnectionAlias(connId, localAlias): return "/_set alias :\(connId) \(localAlias.trimmingCharacters(in: .whitespaces))"
-            case let .apiSetUserUIThemes(userId, themes): return "/_set theme user \(userId) \(themes != nil ? encodeJSON(themes) : "")"
-            case let .apiSetChatUIThemes(chatId, themes): return "/_set theme \(chatId) \(themes != nil ? encodeJSON(themes) : "")"
-            case let .apiCreateMyAddress(userId): return "/_address \(userId)"
-            case let .apiDeleteMyAddress(userId): return "/_delete_address \(userId)"
-            case let .apiShowMyAddress(userId): return "/_show_address \(userId)"
-            case let .apiSetProfileAddress(userId, on): return "/_profile_address \(userId) \(onOff(on))"
-            case let .apiAddressAutoAccept(userId, autoAccept): return "/_auto_accept \(userId) \(AutoAccept.cmdString(autoAccept))"
-            case let .apiAcceptContact(incognito, contactReqId): return "/_accept incognito=\(onOff(incognito)) \(contactReqId)"
-            case let .apiRejectContact(contactReqId): return "/_reject \(contactReqId)"
-            case let .apiSendCallInvitation(contact, callType): return "/_call invite @\(contact.apiId) \(encodeJSON(callType))"
-            case let .apiRejectCall(contact): return "/_call reject @\(contact.apiId)"
-            case let .apiSendCallOffer(contact, callOffer): return "/_call offer @\(contact.apiId) \(encodeJSON(callOffer))"
-            case let .apiSendCallAnswer(contact, answer): return "/_call answer @\(contact.apiId) \(encodeJSON(answer))"
-            case let .apiSendCallExtraInfo(contact, extraInfo): return "/_call extra @\(contact.apiId) \(encodeJSON(extraInfo))"
-            case let .apiEndCall(contact): return "/_call end @\(contact.apiId)"
-            case .apiGetCallInvitations: return "/_call get"
-            case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
-            case .apiGetNetworkStatuses: return "/_network_statuses"
-            case let .apiChatRead(type, id): return "/_read chat \(ref(type, id))"
-            case let .apiChatItemsRead(type, id, itemIds): return "/_read chat items \(ref(type, id)) \(joinedIds(itemIds))"
-            case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
-            case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
-            case let .cancelFile(fileId): return "/fcancel \(fileId)"
-            case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
-            case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
-            case .findKnownRemoteCtrl: return "/find remote ctrl"
-            case let .confirmRemoteCtrl(rcId): return "/confirm remote ctrl \(rcId)"
-            case let .verifyRemoteCtrlSession(sessCode): return "/verify remote ctrl \(sessCode)"
-            case .listRemoteCtrls: return "/list remote ctrls"
-            case .stopRemoteCtrl: return "/stop remote ctrl"
-            case let .deleteRemoteCtrl(rcId): return "/delete remote ctrl \(rcId)"
-            case let .apiUploadStandaloneFile(userId, file): return "/_upload \(userId) \(file.filePath)"
-            case let .apiDownloadStandaloneFile(userId, link, file): return "/_download \(userId) \(link) \(file.filePath)"
-            case let .apiStandaloneFileInfo(link): return "/_download info \(link)"
-            case .showVersion: return "/version"
-            case let .getAgentSubsTotal(userId): return "/get subs total \(userId)"
-            case let .getAgentServersSummary(userId): return "/get servers summary \(userId)"
-            case .resetAgentServersStats: return "/reset servers stats"
-            case let .string(str): return str
-            }
-        }
-    }
-
-    public var cmdType: String {
-        get {
-            switch self {
-            case .showActiveUser: return "showActiveUser"
-            case .createActiveUser: return "createActiveUser"
-            case .listUsers: return "listUsers"
-            case .apiSetActiveUser: return "apiSetActiveUser"
-            case .setAllContactReceipts: return "setAllContactReceipts"
-            case .apiSetUserContactReceipts: return "apiSetUserContactReceipts"
-            case .apiSetUserGroupReceipts: return "apiSetUserGroupReceipts"
-            case .apiHideUser: return "apiHideUser"
-            case .apiUnhideUser: return "apiUnhideUser"
-            case .apiMuteUser: return "apiMuteUser"
-            case .apiUnmuteUser: return "apiUnmuteUser"
-            case .apiDeleteUser: return "apiDeleteUser"
-            case .startChat: return "startChat"
-            case .checkChatRunning: return "checkChatRunning"
-            case .apiStopChat: return "apiStopChat"
-            case .apiActivateChat: return "apiActivateChat"
-            case .apiSuspendChat: return "apiSuspendChat"
-            case .apiSetAppFilePaths: return "apiSetAppFilePaths"
-            case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
-            case .apiExportArchive: return "apiExportArchive"
-            case .apiImportArchive: return "apiImportArchive"
-            case .apiDeleteStorage: return "apiDeleteStorage"
-            case .apiStorageEncryption: return "apiStorageEncryption"
-            case .testStorageEncryption: return "testStorageEncryption"
-            case .apiSaveSettings: return "apiSaveSettings"
-            case .apiGetSettings: return "apiGetSettings"
-            case .apiGetChatTags: return "apiGetChatTags"
-            case .apiGetChats: return "apiGetChats"
-            case .apiGetChat: return "apiGetChat"
-            case .apiGetChatItemInfo: return "apiGetChatItemInfo"
-            case .apiSendMessages: return "apiSendMessages"
-            case .apiCreateChatTag: return "apiCreateChatTag"
-            case .apiSetChatTags: return "apiSetChatTags"
-            case .apiDeleteChatTag: return "apiDeleteChatTag"
-            case .apiUpdateChatTag: return "apiUpdateChatTag"
-            case .apiReorderChatTags: return "apiReorderChatTags"
-            case .apiCreateChatItems: return "apiCreateChatItems"
-            case .apiReportMessage: return "apiReportMessage"
-            case .apiUpdateChatItem: return "apiUpdateChatItem"
-            case .apiDeleteChatItem: return "apiDeleteChatItem"
-            case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
-            case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
-            case .apiChatItemReaction: return "apiChatItemReaction"
-            case .apiGetReactionMembers: return "apiGetReactionMembers"
-            case .apiPlanForwardChatItems: return "apiPlanForwardChatItems"
-            case .apiForwardChatItems: return "apiForwardChatItems"
-            case .apiGetNtfToken: return "apiGetNtfToken"
-            case .apiRegisterToken: return "apiRegisterToken"
-            case .apiVerifyToken: return "apiVerifyToken"
-            case .apiDeleteToken: return "apiDeleteToken"
-            case .apiGetNtfConns: return "apiGetNtfConns"
-            case .apiGetConnNtfMessages: return "apiGetConnNtfMessages"
-            case .apiNewGroup: return "apiNewGroup"
-            case .apiAddMember: return "apiAddMember"
-            case .apiJoinGroup: return "apiJoinGroup"
-            case .apiMemberRole: return "apiMemberRole"
-            case .apiBlockMemberForAll: return "apiBlockMemberForAll"
-            case .apiRemoveMember: return "apiRemoveMember"
-            case .apiLeaveGroup: return "apiLeaveGroup"
-            case .apiListMembers: return "apiListMembers"
-            case .apiUpdateGroupProfile: return "apiUpdateGroupProfile"
-            case .apiCreateGroupLink: return "apiCreateGroupLink"
-            case .apiGroupLinkMemberRole: return "apiGroupLinkMemberRole"
-            case .apiDeleteGroupLink: return "apiDeleteGroupLink"
-            case .apiGetGroupLink: return "apiGetGroupLink"
-            case .apiCreateMemberContact: return "apiCreateMemberContact"
-            case .apiSendMemberContactInvitation: return "apiSendMemberContactInvitation"
-            case .apiTestProtoServer: return "apiTestProtoServer"
-            case .apiGetServerOperators: return "apiGetServerOperators"
-            case .apiSetServerOperators: return "apiSetServerOperators"
-            case .apiGetUserServers: return "apiGetUserServers"
-            case .apiSetUserServers: return "apiSetUserServers"
-            case .apiValidateServers: return "apiValidateServers"
-            case .apiGetUsageConditions: return "apiGetUsageConditions"
-            case .apiSetConditionsNotified: return "apiSetConditionsNotified"
-            case .apiAcceptConditions: return "apiAcceptConditions"
-            case .apiSetChatItemTTL: return "apiSetChatItemTTL"
-            case .apiGetChatItemTTL: return "apiGetChatItemTTL"
-            case .apiSetChatTTL: return "apiSetChatTTL"
-            case .apiSetNetworkConfig: return "apiSetNetworkConfig"
-            case .apiGetNetworkConfig: return "apiGetNetworkConfig"
-            case .apiSetNetworkInfo: return "apiSetNetworkInfo"
-            case .reconnectAllServers: return "reconnectAllServers"
-            case .reconnectServer: return "reconnectServer"
-            case .apiSetChatSettings: return "apiSetChatSettings"
-            case .apiSetMemberSettings: return "apiSetMemberSettings"
-            case .apiContactInfo: return "apiContactInfo"
-            case .apiGroupMemberInfo: return "apiGroupMemberInfo"
-            case .apiContactQueueInfo: return "apiContactQueueInfo"
-            case .apiGroupMemberQueueInfo: return "apiGroupMemberQueueInfo"
-            case .apiSwitchContact: return "apiSwitchContact"
-            case .apiSwitchGroupMember: return "apiSwitchGroupMember"
-            case .apiAbortSwitchContact: return "apiAbortSwitchContact"
-            case .apiAbortSwitchGroupMember: return "apiAbortSwitchGroupMember"
-            case .apiSyncContactRatchet: return "apiSyncContactRatchet"
-            case .apiSyncGroupMemberRatchet: return "apiSyncGroupMemberRatchet"
-            case .apiGetContactCode: return "apiGetContactCode"
-            case .apiGetGroupMemberCode: return "apiGetGroupMemberCode"
-            case .apiVerifyContact: return "apiVerifyContact"
-            case .apiVerifyGroupMember: return "apiVerifyGroupMember"
-            case .apiAddContact: return "apiAddContact"
-            case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
-            case .apiChangeConnectionUser: return "apiChangeConnectionUser"
-            case .apiConnectPlan: return "apiConnectPlan"
-            case .apiConnect: return "apiConnect"
-            case .apiDeleteChat: return "apiDeleteChat"
-            case .apiClearChat: return "apiClearChat"
-            case .apiListContacts: return "apiListContacts"
-            case .apiUpdateProfile: return "apiUpdateProfile"
-            case .apiSetContactPrefs: return "apiSetContactPrefs"
-            case .apiSetContactAlias: return "apiSetContactAlias"
-            case .apiSetGroupAlias: return "apiSetGroupAlias"
-            case .apiSetConnectionAlias: return "apiSetConnectionAlias"
-            case .apiSetUserUIThemes: return "apiSetUserUIThemes"
-            case .apiSetChatUIThemes: return "apiSetChatUIThemes"
-            case .apiCreateMyAddress: return "apiCreateMyAddress"
-            case .apiDeleteMyAddress: return "apiDeleteMyAddress"
-            case .apiShowMyAddress: return "apiShowMyAddress"
-            case .apiSetProfileAddress: return "apiSetProfileAddress"
-            case .apiAddressAutoAccept: return "apiAddressAutoAccept"
-            case .apiAcceptContact: return "apiAcceptContact"
-            case .apiRejectContact: return "apiRejectContact"
-            case .apiSendCallInvitation: return "apiSendCallInvitation"
-            case .apiRejectCall: return "apiRejectCall"
-            case .apiSendCallOffer: return "apiSendCallOffer"
-            case .apiSendCallAnswer: return "apiSendCallAnswer"
-            case .apiSendCallExtraInfo: return "apiSendCallExtraInfo"
-            case .apiEndCall: return "apiEndCall"
-            case .apiGetCallInvitations: return "apiGetCallInvitations"
-            case .apiCallStatus: return "apiCallStatus"
-            case .apiGetNetworkStatuses: return "apiGetNetworkStatuses"
-            case .apiChatRead: return "apiChatRead"
-            case .apiChatItemsRead: return "apiChatItemsRead"
-            case .apiChatUnread: return "apiChatUnread"
-            case .receiveFile: return "receiveFile"
-            case .setFileToReceive: return "setFileToReceive"
-            case .cancelFile: return "cancelFile"
-            case .setLocalDeviceName: return "setLocalDeviceName"
-            case .connectRemoteCtrl: return "connectRemoteCtrl"
-            case .findKnownRemoteCtrl: return "findKnownRemoteCtrl"
-            case .confirmRemoteCtrl: return "confirmRemoteCtrl"
-            case .verifyRemoteCtrlSession: return "verifyRemoteCtrlSession"
-            case .listRemoteCtrls: return "listRemoteCtrls"
-            case .stopRemoteCtrl: return "stopRemoteCtrl"
-            case .deleteRemoteCtrl: return "deleteRemoteCtrl"
-            case .apiUploadStandaloneFile: return "apiUploadStandaloneFile"
-            case .apiDownloadStandaloneFile: return "apiDownloadStandaloneFile"
-            case .apiStandaloneFileInfo: return "apiStandaloneFileInfo"
-            case .showVersion: return "showVersion"
-            case .getAgentSubsTotal: return "getAgentSubsTotal"
-            case .getAgentServersSummary: return "getAgentServersSummary"
-            case .resetAgentServersStats: return "resetAgentServersStats"
-            case .string: return "console command"
-            }
-        }
-    }
-
-    func ref(_ type: ChatType, _ id: Int64) -> String {
-        "\(type.rawValue)\(id)"
-    }
-
-    func joinedIds(_ ids: [Int64]) -> String {
-        ids.map { "\($0)" }.joined(separator: ",")
-    }
-
-    func chatItemTTLStr(seconds: Int64?) -> String {
-        if let seconds = seconds {
-            return String(seconds)
-        } else {
-            return "default"
-        }
-    }
-
-    public var obfuscated: ChatCommand {
-        switch self {
-        case let .apiStorageEncryption(cfg):
-            return .apiStorageEncryption(config: DBEncryptionConfig(currentKey: obfuscate(cfg.currentKey), newKey: obfuscate(cfg.newKey)))
-        case let .apiSetActiveUser(userId, viewPwd):
-            return .apiSetActiveUser(userId: userId, viewPwd: obfuscate(viewPwd))
-        case let .apiHideUser(userId, viewPwd):
-            return .apiHideUser(userId: userId, viewPwd: obfuscate(viewPwd))
-        case let .apiUnhideUser(userId, viewPwd):
-            return .apiUnhideUser(userId: userId, viewPwd: obfuscate(viewPwd))
-        case let .apiDeleteUser(userId, delSMPQueues, viewPwd):
-            return .apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: obfuscate(viewPwd))
-        case let .testStorageEncryption(key):
-            return .testStorageEncryption(key: obfuscate(key))
-        default: return self
-        }
-    }
-
-    private func obfuscate(_ s: String) -> String {
-        s == "" ? "" : "***"
-    }
-
-    private func obfuscate(_ s: String?) -> String? {
-        if let s = s {
-            return obfuscate(s)
-        }
-        return nil
-    }
-
-    private func onOffParam(_ param: String, _ b: Bool?) -> String {
-        if let b = b {
-            return " \(param)=\(onOff(b))"
-        }
-        return ""
-    }
-
-    private func maybePwd(_ pwd: String?) -> String {
-        pwd == "" || pwd == nil ? "" : " " + encodeJSON(pwd)
-    }
+public protocol ChatCmdProtocol {
+    var cmdString: String { get }
 }
 
-private func onOff(_ b: Bool) -> String {
+@inline(__always)
+public func onOff(_ b: Bool) -> String {
     b ? "on" : "off"
 }
 
-public struct APIResponse: Decodable {
-    var resp: ChatResponse
-}
-
-public enum ChatResponse: Decodable, Error {
-    case response(type: String, json: String)
-    case activeUser(user: User)
-    case usersList(users: [UserInfo])
-    case chatStarted
-    case chatRunning
-    case chatStopped
-    case chatSuspended
-    case apiChats(user: UserRef, chats: [ChatData])
-    case apiChat(user: UserRef, chat: ChatData)
-    case chatTags(user: UserRef, userTags: [ChatTag])
-    case chatItemInfo(user: UserRef, chatItem: AChatItem, chatItemInfo: ChatItemInfo)
-    case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
-    case serverOperatorConditions(conditions: ServerOperatorConditions)
-    case userServers(user: UserRef, userServers: [UserOperatorServers])
-    case userServersValidation(user: UserRef, serverErrors: [UserServersError])
-    case usageConditions(usageConditions: UsageConditions, conditionsText: String, acceptedConditions: UsageConditions?)
-    case chatItemTTL(user: UserRef, chatItemTTL: Int64?)
-    case networkConfig(networkConfig: NetCfg)
-    case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
-    case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
-    case queueInfo(user: UserRef, rcvMsgInfo: RcvMsgInfo?, queueInfo: ServerQueueInfo)
-    case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactSwitchAborted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberSwitchAborted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactSwitch(user: UserRef, contact: Contact, switchProgress: SwitchProgress)
-    case groupMemberSwitch(user: UserRef, groupInfo: GroupInfo, member: GroupMember, switchProgress: SwitchProgress)
-    case contactRatchetSyncStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
-    case groupMemberRatchetSyncStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
-    case contactRatchetSync(user: UserRef, contact: Contact, ratchetSyncProgress: RatchetSyncProgress)
-    case groupMemberRatchetSync(user: UserRef, groupInfo: GroupInfo, member: GroupMember, ratchetSyncProgress: RatchetSyncProgress)
-    case contactVerificationReset(user: UserRef, contact: Contact)
-    case groupMemberVerificationReset(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case contactCode(user: UserRef, contact: Contact, connectionCode: String)
-    case groupMemberCode(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionCode: String)
-    case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
-    case tagsUpdated(user: UserRef, userTags: [ChatTag], chatTags: [Int64])
-    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
-    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
-    case connectionUserChanged(user: UserRef, fromConnection: PendingContactConnection, toConnection: PendingContactConnection, newUser: UserRef)
-    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
-    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
-    case contactAlreadyExists(user: UserRef, contact: Contact)
-    case contactDeleted(user: UserRef, contact: Contact)
-    case contactDeletedByContact(user: UserRef, contact: Contact)
-    case chatCleared(user: UserRef, chatInfo: ChatInfo)
-    case userProfileNoChange(user: User)
-    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
-    case userPrivacy(user: User, updatedUser: User)
-    case contactAliasUpdated(user: UserRef, toContact: Contact)
-    case groupAliasUpdated(user: UserRef, toGroup: GroupInfo)
-    case connectionAliasUpdated(user: UserRef, toConnection: PendingContactConnection)
-    case contactPrefsUpdated(user: User, fromContact: Contact, toContact: Contact)
-    case userContactLink(user: User, contactLink: UserContactLink)
-    case userContactLinkUpdated(user: User, contactLink: UserContactLink)
-    case userContactLinkCreated(user: User, connReqContact: String)
-    case userContactLinkDeleted(user: User)
-    case contactConnected(user: UserRef, contact: Contact, userCustomProfile: Profile?)
-    case contactConnecting(user: UserRef, contact: Contact)
-    case contactSndReady(user: UserRef, contact: Contact)
-    case receivedContactRequest(user: UserRef, contactRequest: UserContactRequest)
-    case acceptingContactRequest(user: UserRef, contact: Contact)
-    case contactRequestRejected(user: UserRef)
-    case contactUpdated(user: UserRef, toContact: Contact)
-    case groupMemberUpdated(user: UserRef, groupInfo: GroupInfo, fromMember: GroupMember, toMember: GroupMember)
-    case networkStatus(networkStatus: NetworkStatus, connections: [String])
-    case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
-    case groupSubscribed(user: UserRef, groupInfo: GroupRef)
-    case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
-    case groupEmpty(user: UserRef, groupInfo: GroupInfo)
-    case userContactLinkSubscribed
-    case newChatItems(user: UserRef, chatItems: [AChatItem])
-    case groupChatItemsDeleted(user: UserRef, groupInfo: GroupInfo, chatItemIDs: Set<Int64>, byUser: Bool, member_: GroupMember?)
-    case forwardPlan(user: UserRef, chatItemIds: [Int64], forwardConfirmation: ForwardConfirmation?)
-    case chatItemsStatusesUpdated(user: UserRef, chatItems: [AChatItem])
-    case chatItemUpdated(user: UserRef, chatItem: AChatItem)
-    case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
-    case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
-    case reactionMembers(user: UserRef, memberReactions: [MemberReaction])
-    case chatItemsDeleted(user: UserRef, chatItemDeletions: [ChatItemDeletion], byUser: Bool)
-    case contactsList(user: UserRef, contacts: [Contact])
-    // group events
-    case groupCreated(user: UserRef, groupInfo: GroupInfo)
-    case sentGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, member: GroupMember)
-    case userAcceptedGroupSent(user: UserRef, groupInfo: GroupInfo, hostContact: Contact?)
-    case groupLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember)
-    case businessLinkConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, fromContact: Contact)
-    case userDeletedMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case leftMemberUser(user: UserRef, groupInfo: GroupInfo)
-    case groupMembers(user: UserRef, group: Group)
-    case receivedGroupInvitation(user: UserRef, groupInfo: GroupInfo, contact: Contact, memberRole: GroupMemberRole)
-    case groupDeletedUser(user: UserRef, groupInfo: GroupInfo)
-    case joinedGroupMemberConnecting(user: UserRef, groupInfo: GroupInfo, hostMember: GroupMember, member: GroupMember)
-    case memberRole(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
-    case memberRoleUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember, fromRole: GroupMemberRole, toRole: GroupMemberRole)
-    case memberBlockedForAll(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, member: GroupMember, blocked: Bool)
-    case memberBlockedForAllUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember, blocked: Bool)
-    case deletedMemberUser(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case deletedMember(user: UserRef, groupInfo: GroupInfo, byMember: GroupMember, deletedMember: GroupMember)
-    case leftMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case groupDeleted(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case contactsMerged(user: UserRef, intoContact: Contact, mergedContact: Contact)
-    case groupInvitation(user: UserRef, groupInfo: GroupInfo) // unused
-    case userJoinedGroup(user: UserRef, groupInfo: GroupInfo)
-    case joinedGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember)
-    case connectedToGroupMember(user: UserRef, groupInfo: GroupInfo, member: GroupMember, memberContact: Contact?)
-    case groupRemoved(user: UserRef, groupInfo: GroupInfo) // unused
-    case groupUpdated(user: UserRef, toGroup: GroupInfo)
-    case groupLinkCreated(user: UserRef, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
-    case groupLink(user: UserRef, groupInfo: GroupInfo, connReqContact: String, memberRole: GroupMemberRole)
-    case groupLinkDeleted(user: UserRef, groupInfo: GroupInfo)
-    case newMemberContact(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
-    case newMemberContactSentInv(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
-    case newMemberContactReceivedInv(user: UserRef, contact: Contact, groupInfo: GroupInfo, member: GroupMember)
-    // receiving file events
-    case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
-    case rcvFileAcceptedSndCancelled(user: UserRef, rcvFileTransfer: RcvFileTransfer)
-    case standaloneFileInfo(fileMeta: MigrationFileLinkData?)
-    case rcvStandaloneFileCreated(user: UserRef, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileStart(user: UserRef, chatItem: AChatItem) // send by chats
-    case rcvFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, receivedSize: Int64, totalSize: Int64, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileComplete(user: UserRef, chatItem: AChatItem)
-    case rcvStandaloneFileComplete(user: UserRef, targetPath: String, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileCancelled(user: UserRef, chatItem_: AChatItem?, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileSndCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileError(user: UserRef, chatItem_: AChatItem?, agentError: AgentErrorType, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileWarning(user: UserRef, chatItem_: AChatItem?, agentError: AgentErrorType, rcvFileTransfer: RcvFileTransfer)
-    // sending file events
-    case sndFileStart(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileComplete(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileRcvCancelled(user: UserRef, chatItem_: AChatItem?, sndFileTransfer: SndFileTransfer)
-    case sndFileCancelled(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
-    case sndStandaloneFileCreated(user: UserRef, fileTransferMeta: FileTransferMeta) // returned by _upload
-    case sndFileStartXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta) // not used
-    case sndFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
-    case sndFileRedirectStartXFTP(user: UserRef, fileTransferMeta: FileTransferMeta, redirectMeta: FileTransferMeta)
-    case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
-    case sndStandaloneFileComplete(user: UserRef, fileTransferMeta: FileTransferMeta, rcvURIs: [String])
-    case sndFileCancelledXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
-    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
-    case sndFileWarning(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, errorMessage: String)
-    // call events
-    case callInvitation(callInvitation: RcvCallInvitation)
-    case callOffer(user: UserRef, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
-    case callAnswer(user: UserRef, contact: Contact, answer: WebRTCSession)
-    case callExtraInfo(user: UserRef, contact: Contact, extraInfo: WebRTCExtraInfo)
-    case callEnded(user: UserRef, contact: Contact)
-    case callInvitations(callInvitations: [RcvCallInvitation])
-    case ntfTokenStatus(status: NtfTknStatus)
-    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode, ntfServer: String)
-    case ntfConns(ntfConns: [NtfConn])
-    case connNtfMessages(receivedMsgs: [NtfMsgInfo?])
-    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
-    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
-    case contactDisabled(user: UserRef, contact: Contact)
-    // remote desktop responses/events
-    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
-    case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo, ctrlAppInfo_: CtrlAppInfo?, appVersion: String, compatible: Bool)
-    case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
-    case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
-    case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
-    // pq
-    case contactPQEnabled(user: UserRef, contact: Contact, pqEnabled: Bool)
-    // misc
-    case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
-    case cmdOk(user: UserRef?)
-    case agentSubsTotal(user: UserRef, subsTotal: SMPServerSubs, hasSession: Bool)
-    case agentServersSummary(user: UserRef, serversSummary: PresentedServersSummary)
-    case agentSubsSummary(user: UserRef, subsSummary: SMPServerSubs)
-    case chatCmdError(user_: UserRef?, chatError: ChatError)
-    case chatError(user_: UserRef?, chatError: ChatError)
-    case archiveExported(archiveErrors: [ArchiveError])
-    case archiveImported(archiveErrors: [ArchiveError])
-    case appSettings(appSettings: AppSettings)
-
-    public var responseType: String {
-        get {
-            switch self {
-            case let .response(type, _): return "* \(type)"
-            case .activeUser: return "activeUser"
-            case .usersList: return "usersList"
-            case .chatStarted: return "chatStarted"
-            case .chatRunning: return "chatRunning"
-            case .chatStopped: return "chatStopped"
-            case .chatSuspended: return "chatSuspended"
-            case .apiChats: return "apiChats"
-            case .apiChat: return "apiChat"
-            case .chatTags: return "chatTags"
-            case .chatItemInfo: return "chatItemInfo"
-            case .serverTestResult: return "serverTestResult"
-            case .serverOperatorConditions: return "serverOperators"
-            case .userServers: return "userServers"
-            case .userServersValidation: return "userServersValidation"
-            case .usageConditions: return "usageConditions"
-            case .chatItemTTL: return "chatItemTTL"
-            case .networkConfig: return "networkConfig"
-            case .contactInfo: return "contactInfo"
-            case .groupMemberInfo: return "groupMemberInfo"
-            case .queueInfo: return "queueInfo"
-            case .contactSwitchStarted: return "contactSwitchStarted"
-            case .groupMemberSwitchStarted: return "groupMemberSwitchStarted"
-            case .contactSwitchAborted: return "contactSwitchAborted"
-            case .groupMemberSwitchAborted: return "groupMemberSwitchAborted"
-            case .contactSwitch: return "contactSwitch"
-            case .groupMemberSwitch: return "groupMemberSwitch"
-            case .contactRatchetSyncStarted: return "contactRatchetSyncStarted"
-            case .groupMemberRatchetSyncStarted: return "groupMemberRatchetSyncStarted"
-            case .contactRatchetSync: return "contactRatchetSync"
-            case .groupMemberRatchetSync: return "groupMemberRatchetSync"
-            case .contactVerificationReset: return "contactVerificationReset"
-            case .groupMemberVerificationReset: return "groupMemberVerificationReset"
-            case .contactCode: return "contactCode"
-            case .groupMemberCode: return "groupMemberCode"
-            case .connectionVerified: return "connectionVerified"
-            case .tagsUpdated: return "tagsUpdated"
-            case .invitation: return "invitation"
-            case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
-            case .connectionUserChanged: return "connectionUserChanged"
-            case .connectionPlan: return "connectionPlan"
-            case .sentConfirmation: return "sentConfirmation"
-            case .sentInvitation: return "sentInvitation"
-            case .sentInvitationToContact: return "sentInvitationToContact"
-            case .contactAlreadyExists: return "contactAlreadyExists"
-            case .contactDeleted: return "contactDeleted"
-            case .contactDeletedByContact: return "contactDeletedByContact"
-            case .chatCleared: return "chatCleared"
-            case .userProfileNoChange: return "userProfileNoChange"
-            case .userProfileUpdated: return "userProfileUpdated"
-            case .userPrivacy: return "userPrivacy"
-            case .contactAliasUpdated: return "contactAliasUpdated"
-            case .groupAliasUpdated: return "groupAliasUpdated"
-            case .connectionAliasUpdated: return "connectionAliasUpdated"
-            case .contactPrefsUpdated: return "contactPrefsUpdated"
-            case .userContactLink: return "userContactLink"
-            case .userContactLinkUpdated: return "userContactLinkUpdated"
-            case .userContactLinkCreated: return "userContactLinkCreated"
-            case .userContactLinkDeleted: return "userContactLinkDeleted"
-            case .contactConnected: return "contactConnected"
-            case .contactConnecting: return "contactConnecting"
-            case .contactSndReady: return "contactSndReady"
-            case .receivedContactRequest: return "receivedContactRequest"
-            case .acceptingContactRequest: return "acceptingContactRequest"
-            case .contactRequestRejected: return "contactRequestRejected"
-            case .contactUpdated: return "contactUpdated"
-            case .groupMemberUpdated: return "groupMemberUpdated"
-            case .networkStatus: return "networkStatus"
-            case .networkStatuses: return "networkStatuses"
-            case .groupSubscribed: return "groupSubscribed"
-            case .memberSubErrors: return "memberSubErrors"
-            case .groupEmpty: return "groupEmpty"
-            case .userContactLinkSubscribed: return "userContactLinkSubscribed"
-            case .newChatItems: return "newChatItems"
-            case .groupChatItemsDeleted: return "groupChatItemsDeleted"
-            case .forwardPlan: return "forwardPlan"
-            case .chatItemsStatusesUpdated: return "chatItemsStatusesUpdated"
-            case .chatItemUpdated: return "chatItemUpdated"
-            case .chatItemNotChanged: return "chatItemNotChanged"
-            case .chatItemReaction: return "chatItemReaction"
-            case .reactionMembers: return "reactionMembers"
-            case .chatItemsDeleted: return "chatItemsDeleted"
-            case .contactsList: return "contactsList"
-            case .groupCreated: return "groupCreated"
-            case .sentGroupInvitation: return "sentGroupInvitation"
-            case .userAcceptedGroupSent: return "userAcceptedGroupSent"
-            case .groupLinkConnecting: return "groupLinkConnecting"
-            case .businessLinkConnecting: return "businessLinkConnecting"
-            case .userDeletedMember: return "userDeletedMember"
-            case .leftMemberUser: return "leftMemberUser"
-            case .groupMembers: return "groupMembers"
-            case .receivedGroupInvitation: return "receivedGroupInvitation"
-            case .groupDeletedUser: return "groupDeletedUser"
-            case .joinedGroupMemberConnecting: return "joinedGroupMemberConnecting"
-            case .memberRole: return "memberRole"
-            case .memberRoleUser: return "memberRoleUser"
-            case .memberBlockedForAll: return "memberBlockedForAll"
-            case .memberBlockedForAllUser: return "memberBlockedForAllUser"
-            case .deletedMemberUser: return "deletedMemberUser"
-            case .deletedMember: return "deletedMember"
-            case .leftMember: return "leftMember"
-            case .groupDeleted: return "groupDeleted"
-            case .contactsMerged: return "contactsMerged"
-            case .groupInvitation: return "groupInvitation"
-            case .userJoinedGroup: return "userJoinedGroup"
-            case .joinedGroupMember: return "joinedGroupMember"
-            case .connectedToGroupMember: return "connectedToGroupMember"
-            case .groupRemoved: return "groupRemoved"
-            case .groupUpdated: return "groupUpdated"
-            case .groupLinkCreated: return "groupLinkCreated"
-            case .groupLink: return "groupLink"
-            case .groupLinkDeleted: return "groupLinkDeleted"
-            case .newMemberContact: return "newMemberContact"
-            case .newMemberContactSentInv: return "newMemberContactSentInv"
-            case .newMemberContactReceivedInv: return "newMemberContactReceivedInv"
-            case .rcvFileAccepted: return "rcvFileAccepted"
-            case .rcvFileAcceptedSndCancelled: return "rcvFileAcceptedSndCancelled"
-            case .standaloneFileInfo: return "standaloneFileInfo"
-            case .rcvStandaloneFileCreated: return "rcvStandaloneFileCreated"
-            case .rcvFileStart: return "rcvFileStart"
-            case .rcvFileProgressXFTP: return "rcvFileProgressXFTP"
-            case .rcvFileComplete: return "rcvFileComplete"
-            case .rcvStandaloneFileComplete: return "rcvStandaloneFileComplete"
-            case .rcvFileCancelled: return "rcvFileCancelled"
-            case .rcvFileSndCancelled: return "rcvFileSndCancelled"
-            case .rcvFileError: return "rcvFileError"
-            case .rcvFileWarning: return "rcvFileWarning"
-            case .sndFileStart: return "sndFileStart"
-            case .sndFileComplete: return "sndFileComplete"
-            case .sndFileCancelled: return "sndFileCancelled"
-            case .sndStandaloneFileCreated: return "sndStandaloneFileCreated"
-            case .sndFileStartXFTP: return "sndFileStartXFTP"
-            case .sndFileProgressXFTP: return "sndFileProgressXFTP"
-            case .sndFileRedirectStartXFTP: return "sndFileRedirectStartXFTP"
-            case .sndFileRcvCancelled: return "sndFileRcvCancelled"
-            case .sndFileCompleteXFTP: return "sndFileCompleteXFTP"
-            case .sndStandaloneFileComplete: return "sndStandaloneFileComplete"
-            case .sndFileCancelledXFTP: return "sndFileCancelledXFTP"
-            case .sndFileError: return "sndFileError"
-            case .sndFileWarning: return "sndFileWarning"
-            case .callInvitation: return "callInvitation"
-            case .callOffer: return "callOffer"
-            case .callAnswer: return "callAnswer"
-            case .callExtraInfo: return "callExtraInfo"
-            case .callEnded: return "callEnded"
-            case .callInvitations: return "callInvitations"
-            case .ntfTokenStatus: return "ntfTokenStatus"
-            case .ntfToken: return "ntfToken"
-            case .ntfConns: return "ntfConns"
-            case .connNtfMessages: return "connNtfMessages"
-            case .ntfMessage: return "ntfMessage"
-            case .contactConnectionDeleted: return "contactConnectionDeleted"
-            case .contactDisabled: return "contactDisabled"
-            case .remoteCtrlList: return "remoteCtrlList"
-            case .remoteCtrlFound: return "remoteCtrlFound"
-            case .remoteCtrlConnecting: return "remoteCtrlConnecting"
-            case .remoteCtrlSessionCode: return "remoteCtrlSessionCode"
-            case .remoteCtrlConnected: return "remoteCtrlConnected"
-            case .remoteCtrlStopped: return "remoteCtrlStopped"
-            case .contactPQEnabled: return "contactPQEnabled"
-            case .versionInfo: return "versionInfo"
-            case .cmdOk: return "cmdOk"
-            case .agentSubsTotal: return "agentSubsTotal"
-            case .agentServersSummary: return "agentServersSummary"
-            case .agentSubsSummary: return "agentSubsSummary"
-            case .chatCmdError: return "chatCmdError"
-            case .chatError: return "chatError"
-            case .archiveExported: return "archiveExported"
-            case .archiveImported: return "archiveImported"
-            case .appSettings: return "appSettings"
-            }
-        }
-    }
-
-    public var details: String {
-        get {
-            switch self {
-            case let .response(_, json): return json
-            case let .activeUser(user): return String(describing: user)
-            case let .usersList(users): return String(describing: users)
-            case .chatStarted: return noDetails
-            case .chatRunning: return noDetails
-            case .chatStopped: return noDetails
-            case .chatSuspended: return noDetails
-            case let .apiChats(u, chats): return withUser(u, String(describing: chats))
-            case let .apiChat(u, chat): return withUser(u, String(describing: chat))
-            case let .chatTags(u, userTags): return withUser(u, "userTags: \(String(describing: userTags))")
-            case let .chatItemInfo(u, chatItem, chatItemInfo): return withUser(u, "chatItem: \(String(describing: chatItem))\nchatItemInfo: \(String(describing: chatItemInfo))")
-            case let .serverTestResult(u, server, testFailure): return withUser(u, "server: \(server)\nresult: \(String(describing: testFailure))")
-            case let .serverOperatorConditions(conditions): return "conditions: \(String(describing: conditions))"
-            case let .userServers(u, userServers): return withUser(u, "userServers: \(String(describing: userServers))")
-            case let .userServersValidation(u, serverErrors): return withUser(u, "serverErrors: \(String(describing: serverErrors))")
-            case let .usageConditions(usageConditions, _, acceptedConditions): return "usageConditions: \(String(describing: usageConditions))\nacceptedConditions: \(String(describing: acceptedConditions))"
-            case let .chatItemTTL(u, chatItemTTL): return withUser(u, String(describing: chatItemTTL))
-            case let .networkConfig(networkConfig): return String(describing: networkConfig)
-            case let .contactInfo(u, contact, connectionStats_, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats_: \(String(describing: connectionStats_))\ncustomUserProfile: \(String(describing: customUserProfile))")
-            case let .groupMemberInfo(u, groupInfo, member, connectionStats_): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats_: \(String(describing: connectionStats_))")
-            case let .queueInfo(u, rcvMsgInfo, queueInfo):
-                let msgInfo = if let info = rcvMsgInfo { encodeJSON(info) } else { "none" }
-                return withUser(u, "rcvMsgInfo: \(msgInfo)\nqueueInfo: \(encodeJSON(queueInfo))")
-            case let .contactSwitchStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .groupMemberSwitchStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .contactSwitchAborted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .groupMemberSwitchAborted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .contactSwitch(u, contact, switchProgress): return withUser(u, "contact: \(String(describing: contact))\nswitchProgress: \(String(describing: switchProgress))")
-            case let .groupMemberSwitch(u, groupInfo, member, switchProgress): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nswitchProgress: \(String(describing: switchProgress))")
-            case let .contactRatchetSyncStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .groupMemberRatchetSyncStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
-            case let .contactRatchetSync(u, contact, ratchetSyncProgress): return withUser(u, "contact: \(String(describing: contact))\nratchetSyncProgress: \(String(describing: ratchetSyncProgress))")
-            case let .groupMemberRatchetSync(u, groupInfo, member, ratchetSyncProgress): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nratchetSyncProgress: \(String(describing: ratchetSyncProgress))")
-            case let .contactVerificationReset(u, contact): return withUser(u, "contact: \(String(describing: contact))")
-            case let .groupMemberVerificationReset(u, groupInfo, member): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))")
-            case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
-            case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
-            case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .tagsUpdated(u, userTags, chatTags): return withUser(u, "userTags: \(String(describing: userTags))\nchatTags: \(String(describing: chatTags))")
-            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
-            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
-            case let .connectionUserChanged(u, fromConnection, toConnection, newUser): return withUser(u, "fromConnection: \(String(describing: fromConnection))\ntoConnection: \(String(describing: toConnection))\newUserId: \(String(describing: newUser.userId))")
-            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
-            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
-            case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
-            case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
-            case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
-            case let .contactDeletedByContact(u, contact): return withUser(u, String(describing: contact))
-            case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
-            case .userProfileNoChange: return noDetails
-            case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
-            case let .userPrivacy(u, updatedUser): return withUser(u, String(describing: updatedUser))
-            case let .contactAliasUpdated(u, toContact): return withUser(u, String(describing: toContact))
-            case let .groupAliasUpdated(u, toGroup): return withUser(u, String(describing: toGroup))
-            case let .connectionAliasUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
-            case let .contactPrefsUpdated(u, fromContact, toContact): return withUser(u, "fromContact: \(String(describing: fromContact))\ntoContact: \(String(describing: toContact))")
-            case let .userContactLink(u, contactLink): return withUser(u, contactLink.responseDetails)
-            case let .userContactLinkUpdated(u, contactLink): return withUser(u, contactLink.responseDetails)
-            case let .userContactLinkCreated(u, connReq): return withUser(u, connReq)
-            case .userContactLinkDeleted: return noDetails
-            case let .contactConnected(u, contact, _): return withUser(u, String(describing: contact))
-            case let .contactConnecting(u, contact): return withUser(u, String(describing: contact))
-            case let .contactSndReady(u, contact): return withUser(u, String(describing: contact))
-            case let .receivedContactRequest(u, contactRequest): return withUser(u, String(describing: contactRequest))
-            case let .acceptingContactRequest(u, contact): return withUser(u, String(describing: contact))
-            case .contactRequestRejected: return noDetails
-            case let .contactUpdated(u, toContact): return withUser(u, String(describing: toContact))
-            case let .groupMemberUpdated(u, groupInfo, fromMember, toMember): return withUser(u, "groupInfo: \(groupInfo)\nfromMember: \(fromMember)\ntoMember: \(toMember)")
-            case let .networkStatus(status, conns): return "networkStatus: \(String(describing: status))\nconnections: \(String(describing: conns))"
-            case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
-            case let .groupSubscribed(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .memberSubErrors(u, memberSubErrors): return withUser(u, String(describing: memberSubErrors))
-            case let .groupEmpty(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case .userContactLinkSubscribed: return noDetails
-            case let .newChatItems(u, chatItems):
-                let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
-                return withUser(u, itemsString)
-            case let .groupChatItemsDeleted(u, gInfo, chatItemIDs, byUser, member_):
-                return withUser(u, "chatItemIDs: \(String(describing: chatItemIDs))\ngroupInfo: \(String(describing: gInfo))\nbyUser: \(byUser)\nmember_: \(String(describing: member_))")
-            case let .forwardPlan(u, chatItemIds, forwardConfirmation): return withUser(u, "items: \(chatItemIds) forwardConfirmation: \(String(describing: forwardConfirmation))")
-            case let .chatItemsStatusesUpdated(u, chatItems):
-                let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
-                return withUser(u, itemsString)
-            case let .chatItemUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .chatItemNotChanged(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .chatItemReaction(u, added, reaction): return withUser(u, "added: \(added)\n\(String(describing: reaction))")
-            case let .reactionMembers(u, reaction): return withUser(u, "memberReactions: \(String(describing: reaction))")
-            case let .chatItemsDeleted(u, items, byUser):
-                let itemsString = items.map { item in
-                    "deletedChatItem:\n\(String(describing: item.deletedChatItem))\ntoChatItem:\n\(String(describing: item.toChatItem))" }.joined(separator: "\n")
-                return withUser(u, itemsString + "\nbyUser: \(byUser)")
-            case let .contactsList(u, contacts): return withUser(u, String(describing: contacts))
-            case let .groupCreated(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .sentGroupInvitation(u, groupInfo, contact, member): return withUser(u, "groupInfo: \(groupInfo)\ncontact: \(contact)\nmember: \(member)")
-            case let .userAcceptedGroupSent(u, groupInfo, hostContact): return withUser(u, "groupInfo: \(groupInfo)\nhostContact: \(String(describing: hostContact))")
-            case let .groupLinkConnecting(u, groupInfo, hostMember): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))")
-            case let .businessLinkConnecting(u, groupInfo, hostMember, fromContact): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(String(describing: hostMember))\nfromContact: \(String(describing: fromContact))")
-            case let .userDeletedMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
-            case let .leftMemberUser(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .groupMembers(u, group): return withUser(u, String(describing: group))
-            case let .receivedGroupInvitation(u, groupInfo, contact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\ncontact: \(contact)\nmemberRole: \(memberRole)")
-            case let .groupDeletedUser(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .joinedGroupMemberConnecting(u, groupInfo, hostMember, member): return withUser(u, "groupInfo: \(groupInfo)\nhostMember: \(hostMember)\nmember: \(member)")
-            case let .memberRole(u, groupInfo, byMember, member, fromRole, toRole): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\nmember: \(member)\nfromRole: \(fromRole)\ntoRole: \(toRole)")
-            case let .memberRoleUser(u, groupInfo, member, fromRole, toRole): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)\nfromRole: \(fromRole)\ntoRole: \(toRole)")
-            case let .memberBlockedForAll(u, groupInfo, byMember, member, blocked): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\nmember: \(member)\nblocked: \(blocked)")
-            case let .memberBlockedForAllUser(u, groupInfo, member, blocked): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)\nblocked: \(blocked)")
-            case let .deletedMemberUser(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
-            case let .deletedMember(u, groupInfo, byMember, deletedMember): return withUser(u, "groupInfo: \(groupInfo)\nbyMember: \(byMember)\ndeletedMember: \(deletedMember)")
-            case let .leftMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
-            case let .groupDeleted(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
-            case let .contactsMerged(u, intoContact, mergedContact): return withUser(u, "intoContact: \(intoContact)\nmergedContact: \(mergedContact)")
-            case let .groupInvitation(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .userJoinedGroup(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .joinedGroupMember(u, groupInfo, member): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)")
-            case let .connectedToGroupMember(u, groupInfo, member, memberContact): return withUser(u, "groupInfo: \(groupInfo)\nmember: \(member)\nmemberContact: \(String(describing: memberContact))")
-            case let .groupRemoved(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .groupUpdated(u, toGroup): return withUser(u, String(describing: toGroup))
-            case let .groupLinkCreated(u, groupInfo, connReqContact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\nconnReqContact: \(connReqContact)\nmemberRole: \(memberRole)")
-            case let .groupLink(u, groupInfo, connReqContact, memberRole): return withUser(u, "groupInfo: \(groupInfo)\nconnReqContact: \(connReqContact)\nmemberRole: \(memberRole)")
-            case let .groupLinkDeleted(u, groupInfo): return withUser(u, String(describing: groupInfo))
-            case let .newMemberContact(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
-            case let .newMemberContactSentInv(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
-            case let .newMemberContactReceivedInv(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
-            case let .rcvFileAccepted(u, chatItem): return withUser(u, String(describing: chatItem))
-            case .rcvFileAcceptedSndCancelled: return noDetails
-            case let .standaloneFileInfo(fileMeta): return String(describing: fileMeta)
-            case .rcvStandaloneFileCreated: return noDetails
-            case let .rcvFileStart(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .rcvFileProgressXFTP(u, chatItem, receivedSize, totalSize, _): return withUser(u, "chatItem: \(String(describing: chatItem))\nreceivedSize: \(receivedSize)\ntotalSize: \(totalSize)")
-            case let .rcvStandaloneFileComplete(u, targetPath, _): return withUser(u, targetPath)
-            case let .rcvFileComplete(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .rcvFileCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .rcvFileSndCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .rcvFileError(u, chatItem, agentError, _): return withUser(u, "agentError: \(String(describing: agentError))\nchatItem: \(String(describing: chatItem))")
-            case let .rcvFileWarning(u, chatItem, agentError, _): return withUser(u, "agentError: \(String(describing: agentError))\nchatItem: \(String(describing: chatItem))")
-            case let .sndFileStart(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileComplete(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileCancelled(u, chatItem, _, _): return withUser(u, String(describing: chatItem))
-            case .sndStandaloneFileCreated: return noDetails
-            case let .sndFileStartXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileRcvCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileProgressXFTP(u, chatItem, _, sentSize, totalSize): return withUser(u, "chatItem: \(String(describing: chatItem))\nsentSize: \(sentSize)\ntotalSize: \(totalSize)")
-            case let .sndFileRedirectStartXFTP(u, _, redirectMeta): return withUser(u, String(describing: redirectMeta))
-            case let .sndFileCompleteXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndStandaloneFileComplete(u, _, rcvURIs): return withUser(u, String(rcvURIs.count))
-            case let .sndFileCancelledXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileError(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
-            case let .sndFileWarning(u, chatItem, _, err): return withUser(u, "error: \(String(describing: err))\nchatItem: \(String(describing: chatItem))")
-            case let .callInvitation(inv): return String(describing: inv)
-            case let .callOffer(u, contact, callType, offer, sharedKey, askConfirmation): return withUser(u, "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")\naskConfirmation: \(askConfirmation)\noffer: \(String(describing: offer))")
-            case let .callAnswer(u, contact, answer): return withUser(u, "contact: \(contact.id)\nanswer: \(String(describing: answer))")
-            case let .callExtraInfo(u, contact, extraInfo): return withUser(u, "contact: \(contact.id)\nextraInfo: \(String(describing: extraInfo))")
-            case let .callEnded(u, contact): return withUser(u, "contact: \(contact.id)")
-            case let .callInvitations(invs): return String(describing: invs)
-            case let .ntfTokenStatus(status): return String(describing: status)
-            case let .ntfToken(token, status, ntfMode, ntfServer): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)\nntfServer: \(ntfServer)"
-            case let .ntfConns(ntfConns): return String(describing: ntfConns)
-            case let .connNtfMessages(receivedMsgs): return "receivedMsgs: \(String(describing: receivedMsgs))"
-            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
-            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
-            case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
-            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
-            case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
-            case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
-            case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nsessionCode: \(sessionCode)"
-            case let .remoteCtrlConnected(remoteCtrl): return String(describing: remoteCtrl)
-            case let .remoteCtrlStopped(rcsState, rcStopReason): return "rcsState: \(String(describing: rcsState))\nrcStopReason: \(String(describing: rcStopReason))"
-            case let .contactPQEnabled(u, contact, pqEnabled): return withUser(u, "contact: \(String(describing: contact))\npqEnabled: \(pqEnabled)")
-            case let .versionInfo(versionInfo, chatMigrations, agentMigrations): return "\(String(describing: versionInfo))\n\nchat migrations: \(chatMigrations.map(\.upName))\n\nagent migrations: \(agentMigrations.map(\.upName))"
-            case .cmdOk: return noDetails
-            case let .agentSubsTotal(u, subsTotal, hasSession): return withUser(u, "subsTotal: \(String(describing: subsTotal))\nhasSession: \(hasSession)")
-            case let .agentServersSummary(u, serversSummary): return withUser(u, String(describing: serversSummary))
-            case let .agentSubsSummary(u, subsSummary): return withUser(u, String(describing: subsSummary))
-            case let .chatCmdError(u, chatError): return withUser(u, String(describing: chatError))
-            case let .chatError(u, chatError): return withUser(u, String(describing: chatError))
-            case let .archiveExported(archiveErrors): return String(describing: archiveErrors)
-            case let .archiveImported(archiveErrors): return String(describing: archiveErrors)
-            case let .appSettings(appSettings): return String(describing: appSettings)
-            }
-        }
-    }
-
-    private var noDetails: String { get { "\(responseType): no details" } }
-
-    private func withUser(_ u: (any UserLike)?, _ s: String) -> String {
-        if let id = u?.userId {
-            return "userId: \(id)\n\(s)"
-        }
-        return s
-    }
-}
-
-public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
-    switch chatResponse {
-    case let .chatCmdError(_, .error(error)): return error
-    case let .chatError(_, .error(error)): return error
-    default: return nil
-    }
-}
-
-public enum ChatDeleteMode: Codable {
-    case full(notify: Bool)
-    case entity(notify: Bool)
-    case messages
-
-    var cmdString: String {
-        switch self {
-        case let .full(notify): "full notify=\(onOff(notify))"
-        case let .entity(notify): "entity notify=\(onOff(notify))"
-        case .messages: "messages"
-        }
-    }
-
-    public var isEntity: Bool {
-        switch self {
-        case .entity: return true
-        default: return false
-        }
-    }
-}
-
-public enum ConnectionPlan: Decodable, Hashable {
-    case invitationLink(invitationLinkPlan: InvitationLinkPlan)
-    case contactAddress(contactAddressPlan: ContactAddressPlan)
-    case groupLink(groupLinkPlan: GroupLinkPlan)
-}
-
-public enum InvitationLinkPlan: Decodable, Hashable {
-    case ok
-    case ownLink
-    case connecting(contact_: Contact?)
-    case known(contact: Contact)
-}
-
-public enum ContactAddressPlan: Decodable, Hashable {
-    case ok
-    case ownLink
-    case connectingConfirmReconnect
-    case connectingProhibit(contact: Contact)
-    case known(contact: Contact)
-    case contactViaAddress(contact: Contact)
-}
-
-public enum GroupLinkPlan: Decodable, Hashable {
-    case ok
-    case ownLink(groupInfo: GroupInfo)
-    case connectingConfirmReconnect
-    case connectingProhibit(groupInfo_: GroupInfo?)
-    case known(groupInfo: GroupInfo)
-}
-
-struct NewUser: Encodable {
-    var profile: Profile?
-    var pastTimestamp: Bool
-}
-
-public enum ChatPagination {
-    case last(count: Int)
-    case after(chatItemId: Int64, count: Int)
-    case before(chatItemId: Int64, count: Int)
-    case around(chatItemId: Int64, count: Int)
-
-    var cmdString: String {
-        switch self {
-        case let .last(count): return "count=\(count)"
-        case let .after(chatItemId, count): return "after=\(chatItemId) count=\(count)"
-        case let .before(chatItemId, count): return "before=\(chatItemId) count=\(count)"
-        case let .around(chatItemId, count): return "around=\(chatItemId) count=\(count)"
-        }
-    }
-}
-
-public struct ChatTagData: Encodable {
-    public var emoji: String?
-    public var text: String
+public enum APIResult<R>: Decodable where R: Decodable, R: ChatAPIResult {
+    case result(R)
+    case error(ChatError)
+    case invalid(type: String, json: Data)
     
-    public init(emoji: String?, text: String) {
-        self.emoji = emoji
-        self.text = text
+    public var responseType: String {
+        switch self {
+        case let .result(r): r.responseType
+        case let .error(e): "error \(e.errorType)"
+        case let .invalid(type, _): "* \(type)"
+        }
     }
+    
+    public var unexpected: ChatError {
+        switch self {
+        case let .result(r): .unexpectedResult(type: r.responseType)
+        case let .error(e): e
+        case let .invalid(type, _): .unexpectedResult(type: "* \(type)")
+        }
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        if container.contains(.result) {
+            let result = try container.decode(R.self, forKey: .result)
+            self = .result(result)
+        } else {
+            let error = try container.decode(ChatError.self, forKey: .error)
+            self = .error(error)
+        }
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case result, error
+    }
+}
+
+public protocol ChatAPIResult: Decodable {
+    var responseType: String { get }
+    var details: String { get }
+    static func fallbackResult(_ type: String, _ json: NSDictionary) -> Self?
+}
+
+extension ChatAPIResult {
+    public var noDetails: String { "\(self.responseType): no details" }
+    
+    @inline(__always)
+    public static func fallbackResult(_ type: String, _ json: NSDictionary) -> Self? {
+        nil
+    }
+    
+    @inline(__always)
+    public var unexpected: ChatError {
+        .unexpectedResult(type: self.responseType)
+    }
+}
+
+public func decodeAPIResult<R: ChatAPIResult>(_ d: Data) -> APIResult<R> {
+//    print("decodeAPIResult \(String(describing: R.self))")
+    do {
+//        return try withStackSizeLimit { try jsonDecoder.decode(APIResult<R>.self, from: d) }
+        return try jsonDecoder.decode(APIResult<R>.self, from: d)
+    } catch {}
+    if let j = try? JSONSerialization.jsonObject(with: d) as? NSDictionary {
+        if let (_, jErr) = getOWSF(j, "error") {
+            return APIResult.error(.invalidJSON(json: errorJson(jErr))) as APIResult<R>
+        } else if let (type, jRes) = getOWSF(j, "result") {
+            return if let r = R.fallbackResult(type, jRes) {
+                APIResult.result(r)
+            } else {
+                APIResult.invalid(type: type, json: dataPrefix(d))
+            }
+        }
+    }
+    return APIResult.invalid(type: "invalid", json: dataPrefix(d))
+}
+
+// Default stack size for the main thread is 1mb, for secondary threads - 512 kb.
+// This function can be used to test what size is used (or to increase available stack size).
+// Stack size must be a multiple of system page size (16kb).
+//private let stackSizeLimit: Int = 256 * 1024
+//
+//private func withStackSizeLimit<T>(_ f: @escaping () throws -> T) throws -> T {
+//    let semaphore = DispatchSemaphore(value: 0)
+//    var result: Result<T, Error>?
+//    let thread = Thread {
+//        do {
+//            result = .success(try f())
+//        } catch {
+//            result = .failure(error)
+//        }
+//        semaphore.signal()
+//    }
+//
+//    thread.stackSize = stackSizeLimit
+//    thread.qualityOfService = Thread.current.qualityOfService
+//    thread.start()
+//
+//    semaphore.wait()
+//
+//    switch result! {
+//    case let .success(r): return r
+//    case let .failure(e): throw e
+//    }
+//}
+
+public func parseApiChats(_ jResp: NSDictionary) -> (user: UserRef, chats: [ChatData])? {
+    if let jApiChats = jResp["apiChats"] as? NSDictionary,
+       let user: UserRef = try? decodeObject(jApiChats["user"] as Any),
+       let jChats = jApiChats["chats"] as? NSArray {
+        let chats = jChats.map { jChat in
+            if let chatData = try? parseChatData(jChat) {
+                return chatData.0
+            }
+            return ChatData.invalidJSON(serializeJSON(jChat, options: .prettyPrinted))
+        }
+        return (user, chats)
+    } else {
+        return nil
+    }
+}
+
+public func withUser(_ u: (any UserLike)?, _ s: String) -> String {
+    if let id = u?.userId {
+        return "userId: \(id)\n\(s)"
+    }
+    return s
+}
+
+public struct CreatedConnLink: Decodable, Hashable {
+    public var connFullLink: String
+    public var connShortLink: String?
+
+    public init(connFullLink: String, connShortLink: String?) {
+        self.connFullLink = connFullLink
+        self.connShortLink = connShortLink
+    }
+
+    public func simplexChatUri(short: Bool = true) -> String {
+        short ? (connShortLink ?? simplexChatLink(connFullLink)) : simplexChatLink(connFullLink)
+    }
+}
+
+public func simplexChatLink(_ uri: String) -> String {
+    uri.starts(with: "simplex:/")
+    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
+    : uri
 }
 
 public struct ComposedMessage: Encodable {
     public var fileSource: CryptoFile?
     var quotedItemId: Int64?
     public var msgContent: MsgContent
+    public var mentions: [String: Int64]
 
-    public init(fileSource: CryptoFile? = nil, quotedItemId: Int64? = nil, msgContent: MsgContent) {
+    public init(fileSource: CryptoFile? = nil, quotedItemId: Int64? = nil, msgContent: MsgContent, mentions: [String: Int64] = [:]) {
         self.fileSource = fileSource
         self.quotedItemId = quotedItemId
         self.msgContent = msgContent
+        self.mentions = mentions
     }
 }
 
-public struct ArchiveConfig: Encodable {
-    var archivePath: String
-    var disableCompression: Bool?
-
-    public init(archivePath: String, disableCompression: Bool? = nil) {
-        self.archivePath = archivePath
-        self.disableCompression = disableCompression
-    }
-}
-
-public struct DBEncryptionConfig: Codable {
-    public init(currentKey: String, newKey: String) {
-        self.currentKey = currentKey
-        self.newKey = newKey
-    }
-
-    public var currentKey: String
-    public var newKey: String
-}
-
 public enum ServerProtocol: String, Decodable {
     case smp
     case xftp
 }
 
-public enum OperatorTag: String, Codable {
-    case simplex = "simplex"
-    case flux = "flux"
-}
-
-public struct ServerOperatorInfo {
-    public var description: [String]
-    public var website: URL
-    public var selfhost: (text: String, link: URL)? = nil
-    public var logo: String
-    public var largeLogo: String
-    public var logoDarkMode: String
-    public var largeLogoDarkMode: String
-}
-
-public let operatorsInfo: Dictionary<OperatorTag, ServerOperatorInfo> = [
-    .simplex: ServerOperatorInfo(
-        description: [
-            "SimpleX Chat is the first communication network that has no user profile IDs of any kind, not even random numbers or identity keys.",
-            "SimpleX Chat Ltd develops the communication software for SimpleX network."
-        ],
-        website: URL(string: "https://simplex.chat")!,
-        logo: "decentralized",
-        largeLogo: "logo",
-        logoDarkMode: "decentralized-light",
-        largeLogoDarkMode: "logo-light"
-    ),
-    .flux: ServerOperatorInfo(
-        description: [
-            "Flux is the largest decentralized cloud, based on a global network of user-operated nodes.",
-            "Flux offers a powerful, scalable, and affordable cutting edge technology platform for all.",
-            "Flux operates servers in SimpleX network to improve its privacy and decentralization."
-        ],
-        website: URL(string: "https://runonflux.com")!,
-        selfhost: (text: "Self-host SimpleX servers on Flux", link: URL(string: "https://home.runonflux.io/apps/marketplace?q=simplex")!),
-        logo: "flux_logo_symbol",
-        largeLogo: "flux_logo",
-        logoDarkMode: "flux_logo_symbol",
-        largeLogoDarkMode: "flux_logo-light"
-    ),
-]
-
-public struct UsageConditions: Decodable {
-    public var conditionsId: Int64
-    public var conditionsCommit: String
-    public var notifiedAt: Date?
-    public var createdAt: Date
-
-    public static var sampleData = UsageConditions(
-        conditionsId: 1,
-        conditionsCommit: "11a44dc1fd461a93079f897048b46998db55da5c",
-        notifiedAt: nil,
-        createdAt: Date.now
-    )
-}
-
-public enum UsageConditionsAction: Decodable {
-    case review(operators: [ServerOperator], deadline: Date?, showNotice: Bool)
-    case accepted(operators: [ServerOperator])
-
-    public var showNotice: Bool {
-        switch self {
-        case let .review(_, _, showNotice): showNotice
-        case .accepted: false
-        }
-    }
-}
-
-public struct ServerOperatorConditions: Decodable {
-    public var serverOperators: [ServerOperator]
-    public var currentConditions: UsageConditions
-    public var conditionsAction: UsageConditionsAction?
-
-    public static var empty = ServerOperatorConditions(
-        serverOperators: [],
-        currentConditions: UsageConditions(conditionsId: 0, conditionsCommit: "empty", notifiedAt: nil, createdAt: .now),
-        conditionsAction: nil
-    )
-}
-
-public enum ConditionsAcceptance: Equatable, Codable, Hashable {
-    case accepted(acceptedAt: Date?, autoAccepted: Bool)
-    // If deadline is present, it means there's a grace period to review and accept conditions during which user can continue to use the operator.
-    // No deadline indicates it's required to accept conditions for the operator to start using it.
-    case required(deadline: Date?)
-
-    public var conditionsAccepted: Bool {
-        switch self {
-        case .accepted: true
-        case .required: false
-        }
-    }
-
-    public var usageAllowed: Bool {
-        switch self {
-        case .accepted: true
-        case let .required(deadline): deadline != nil
-        }
-    }
-}
-
-public struct ServerOperator: Identifiable, Equatable, Codable {
-    public var operatorId: Int64
-    public var operatorTag: OperatorTag?
-    public var tradeName: String
-    public var legalName: String?
-    public var serverDomains: [String]
-    public var conditionsAcceptance: ConditionsAcceptance
-    public var enabled: Bool
-    public var smpRoles: ServerRoles
-    public var xftpRoles: ServerRoles
-
-    public var id: Int64 { operatorId }
-
-    public static func == (l: ServerOperator, r: ServerOperator) -> Bool {
-        l.operatorId == r.operatorId && l.operatorTag == r.operatorTag && l.tradeName == r.tradeName && l.legalName == r.legalName &&
-        l.serverDomains == r.serverDomains && l.conditionsAcceptance == r.conditionsAcceptance && l.enabled == r.enabled &&
-        l.smpRoles == r.smpRoles && l.xftpRoles == r.xftpRoles
-    }
-
-    public var legalName_: String {
-        legalName ?? tradeName
-    }
-
-    public var info: ServerOperatorInfo {
-        return if let operatorTag = operatorTag {
-            operatorsInfo[operatorTag] ?? ServerOperator.dummyOperatorInfo
-        } else {
-            ServerOperator.dummyOperatorInfo
-        }
-    }
-
-    public static let dummyOperatorInfo = ServerOperatorInfo(
-        description: ["Default"],
-        website: URL(string: "https://simplex.chat")!,
-        logo: "decentralized",
-        largeLogo: "logo",
-        logoDarkMode: "decentralized-light",
-        largeLogoDarkMode: "logo-light"
-    )
-
-    public func logo(_ colorScheme: ColorScheme) -> String {
-        colorScheme == .light ? info.logo : info.logoDarkMode
-    }
-
-    public func largeLogo(_ colorScheme: ColorScheme) -> String {
-        colorScheme == .light ? info.largeLogo : info.largeLogoDarkMode
-    }
-
-    public static var sampleData1 = ServerOperator(
-        operatorId: 1,
-        operatorTag: .simplex,
-        tradeName: "SimpleX Chat",
-        legalName: "SimpleX Chat Ltd",
-        serverDomains: ["simplex.im"],
-        conditionsAcceptance: .accepted(acceptedAt: nil, autoAccepted: false),
-        enabled: true,
-        smpRoles: ServerRoles(storage: true, proxy: true),
-        xftpRoles: ServerRoles(storage: true, proxy: true)
-    )
-}
-
-public struct ServerRoles: Equatable, Codable {
-    public var storage: Bool
-    public var proxy: Bool
-}
-
-public struct UserOperatorServers: Identifiable, Equatable, Codable {
-    public var `operator`: ServerOperator?
-    public var smpServers: [UserServer]
-    public var xftpServers: [UserServer]
-
-    public var id: String {
-        if let op = self.operator {
-            "\(op.operatorId)"
-        } else {
-            "nil operator"
-        }
-    }
-
-    public var operator_: ServerOperator {
-        get {
-            self.operator ?? ServerOperator(
-                operatorId: 0,
-                operatorTag: nil,
-                tradeName: "",
-                legalName: "",
-                serverDomains: [],
-                conditionsAcceptance: .accepted(acceptedAt: nil, autoAccepted: false),
-                enabled: false,
-                smpRoles: ServerRoles(storage: true, proxy: true),
-                xftpRoles: ServerRoles(storage: true, proxy: true)
-            )
-        }
-        set { `operator` = newValue }
-    }
-    
-    public static var sampleData1 = UserOperatorServers(
-        operator: ServerOperator.sampleData1,
-        smpServers: [UserServer.sampleData.preset],
-        xftpServers: [UserServer.sampleData.xftpPreset]
-    )
-
-    public static var sampleDataNilOperator = UserOperatorServers(
-        operator: nil,
-        smpServers: [UserServer.sampleData.preset],
-        xftpServers: [UserServer.sampleData.xftpPreset]
-    )
-}
-
-public enum UserServersError: Decodable {
-    case noServers(protocol: ServerProtocol, user: UserRef?)
-    case storageMissing(protocol: ServerProtocol, user: UserRef?)
-    case proxyMissing(protocol: ServerProtocol, user: UserRef?)
-    case duplicateServer(protocol: ServerProtocol, duplicateServer: String, duplicateHost: String)
-
-    public var globalError: String? {
-        switch self {
-        case let .noServers(`protocol`, _):
-            switch `protocol` {
-            case .smp: return globalSMPError
-            case .xftp: return globalXFTPError
-            }
-        case let .storageMissing(`protocol`, _):
-            switch `protocol` {
-            case .smp: return globalSMPError
-            case .xftp: return globalXFTPError
-            }
-        case let .proxyMissing(`protocol`, _):
-            switch `protocol` {
-            case .smp: return globalSMPError
-            case .xftp: return globalXFTPError
-            }
-        default: return nil
-        }
-    }
-
-    public var globalSMPError: String? {
-        switch self {
-        case let .noServers(.smp, user):
-            let text = NSLocalizedString("No message servers.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        case let .storageMissing(.smp, user):
-            let text = NSLocalizedString("No servers to receive messages.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        case let .proxyMissing(.smp, user):
-            let text = NSLocalizedString("No servers for private message routing.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        default:
-            return nil
-        }
-    }
-
-    public var globalXFTPError: String? {
-        switch self {
-        case let .noServers(.xftp, user):
-            let text = NSLocalizedString("No media & file servers.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        case let .storageMissing(.xftp, user):
-            let text = NSLocalizedString("No servers to send files.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        case let .proxyMissing(.xftp, user):
-            let text = NSLocalizedString("No servers to receive files.", comment: "servers error")
-            if let user = user {
-                return userStr(user) + " " + text
-            } else {
-                return text
-            }
-        default:
-            return nil
-        }
-    }
-
-    private func userStr(_ user: UserRef) -> String {
-        String.localizedStringWithFormat(NSLocalizedString("For chat profile %@:", comment: "servers error"), user.localDisplayName)
-    }
-}
-
-public struct UserServer: Identifiable, Equatable, Codable, Hashable {
-    public var serverId: Int64?
-    public var server: String
-    public var preset: Bool
-    public var tested: Bool?
-    public var enabled: Bool
-    public var deleted: Bool
-    var createdAt = Date()
-
-    public init(serverId: Int64?, server: String, preset: Bool, tested: Bool?, enabled: Bool, deleted: Bool) {
-        self.serverId = serverId
-        self.server = server
-        self.preset = preset
-        self.tested = tested
-        self.enabled = enabled
-        self.deleted = deleted
-    }
-
-    public static func == (l: UserServer, r: UserServer) -> Bool {
-        l.serverId == r.serverId && l.server == r.server && l.preset == r.preset && l.tested == r.tested &&
-        l.enabled == r.enabled && l.deleted == r.deleted
-    }
-
-    public var id: String { "\(server) \(createdAt)" }
-
-    public static var empty = UserServer(serverId: nil, server: "", preset: false, tested: nil, enabled: false, deleted: false)
-
-    public var isEmpty: Bool {
-        server.trimmingCharacters(in: .whitespaces) == ""
-    }
-
-    public struct SampleData {
-        public var preset: UserServer
-        public var custom: UserServer
-        public var untested: UserServer
-        public var xftpPreset: UserServer
-    }
-
-    public static var sampleData = SampleData(
-        preset: UserServer(
-            serverId: 1,
-            server: "smp://abcd@smp8.simplex.im",
-            preset: true,
-            tested: true,
-            enabled: true,
-            deleted: false
-        ),
-        custom: UserServer(
-            serverId: 2,
-            server: "smp://abcd@smp9.simplex.im",
-            preset: false,
-            tested: false,
-            enabled: false,
-            deleted: false
-        ),
-        untested: UserServer(
-            serverId: 3,
-            server: "smp://abcd@smp10.simplex.im",
-            preset: false,
-            tested: nil,
-            enabled: true,
-            deleted: false
-        ),
-        xftpPreset: UserServer(
-            serverId: 4,
-            server: "xftp://abcd@xftp8.simplex.im",
-            preset: true,
-            tested: true,
-            enabled: true,
-            deleted: false
-        )
-    )
-
-    enum CodingKeys: CodingKey {
-        case serverId
-        case server
-        case preset
-        case tested
-        case enabled
-        case deleted
-    }
-}
-
-public enum ProtocolTestStep: String, Decodable, Equatable {
-    case connect
-    case disconnect
-    case createQueue
-    case secureQueue
-    case deleteQueue
-    case createFile
-    case uploadFile
-    case downloadFile
-    case compareFile
-    case deleteFile
-
-    var text: String {
-        switch self {
-        case .connect: return NSLocalizedString("Connect", comment: "server test step")
-        case .disconnect: return NSLocalizedString("Disconnect", comment: "server test step")
-        case .createQueue: return NSLocalizedString("Create queue", comment: "server test step")
-        case .secureQueue: return NSLocalizedString("Secure queue", comment: "server test step")
-        case .deleteQueue: return NSLocalizedString("Delete queue", comment: "server test step")
-        case .createFile: return NSLocalizedString("Create file", comment: "server test step")
-        case .uploadFile: return NSLocalizedString("Upload file", comment: "server test step")
-        case .downloadFile: return NSLocalizedString("Download file", comment: "server test step")
-        case .compareFile: return NSLocalizedString("Compare file", comment: "server test step")
-        case .deleteFile: return NSLocalizedString("Delete file", comment: "server test step")
-        }
-    }
-}
-
-public struct ProtocolTestFailure: Decodable, Error, Equatable {
-    public var testStep: ProtocolTestStep
-    public var testError: AgentErrorType
-
-    public static func == (l: ProtocolTestFailure, r: ProtocolTestFailure) -> Bool {
-        l.testStep == r.testStep
-    }
-
-    public var localizedDescription: String {
-        let err = String.localizedStringWithFormat(NSLocalizedString("Test failed at step %@.", comment: "server test failure"), testStep.text)
-        switch testError {
-        case .SMP(_, .AUTH):
-            return err + " " + NSLocalizedString("Server requires authorization to create queues, check password", comment: "server test error")
-        case .XFTP(.AUTH):
-            return err + " " + NSLocalizedString("Server requires authorization to upload, check password", comment: "server test error")
-        case .BROKER(_, .NETWORK):
-            return err + " " + NSLocalizedString("Possibly, certificate fingerprint in server address is incorrect", comment: "server test error")
-        default:
-            return err
-        }
-    }
-}
-
 public struct ServerAddress: Decodable {
     public var serverProtocol: ServerProtocol
     public var hostnames: [String]
@@ -1744,7 +240,7 @@ public struct NetCfg: Codable, Equatable {
     public var sessionMode = TransportSessionMode.user
     public var smpProxyMode: SMPProxyMode = .always
     public var smpProxyFallback: SMPProxyFallback = .allowProtected
-    public var smpWebPort = false
+    public var smpWebPortServers: SMPWebPortServers = .preset
     public var tcpConnectTimeout: Int // microseconds
     public var tcpTimeout: Int // microseconds
     public var tcpTimeoutPerKb: Int // microseconds
@@ -1769,7 +265,7 @@ public struct NetCfg: Codable, Equatable {
         rcvConcurrency: 8,
         smpPingInterval: 1200_000_000
     )
-    
+
     public var withProxyTimeouts: NetCfg {
         var cfg = self
         cfg.tcpConnectTimeout = NetCfg.proxyDefaults.tcpConnectTimeout
@@ -1779,7 +275,7 @@ public struct NetCfg: Codable, Equatable {
         cfg.smpPingInterval = NetCfg.proxyDefaults.smpPingInterval
         return cfg
     }
-    
+
     public var hasProxyTimeouts: Bool {
         tcpConnectTimeout == NetCfg.proxyDefaults.tcpConnectTimeout &&
         tcpTimeout == NetCfg.proxyDefaults.tcpTimeout &&
@@ -1840,6 +336,20 @@ public enum SMPProxyFallback: String, Codable, SelectableItem {
     public static let values: [SMPProxyFallback] = [.allow, .allowProtected, .prohibit]
 }
 
+public enum SMPWebPortServers: String, Codable, CaseIterable {
+    case all = "all"
+    case preset = "preset"
+    case off = "off"
+    
+    public var text: LocalizedStringKey {
+        switch self {
+        case .all: "All servers"
+        case .preset: "Preset servers"
+        case .off: "Off"
+        }
+    }
+}
+
 public enum OnionHosts: String, Identifiable {
     case no
     case prefer
@@ -1912,7 +422,7 @@ public struct NetworkProxy: Equatable, Codable {
     public static var def: NetworkProxy {
         NetworkProxy()
     }
-    
+
     public var valid: Bool {
         let hostOk = switch NWEndpoint.Host(host) {
         case .ipv4: true
@@ -1923,7 +433,7 @@ public struct NetworkProxy: Equatable, Codable {
                 port > 0 && port <= 65535 &&
                 NetworkProxy.validCredential(username) && NetworkProxy.validCredential(password)
     }
-    
+
     public static func validCredential(_ s: String) -> Bool {
         !s.contains(":") && !s.contains("@")
     }
@@ -1959,56 +469,6 @@ public enum NetworkProxyAuth: String, Codable {
     case isolate
 }
 
-public enum NetworkStatus: Decodable, Equatable {
-    case unknown
-    case connected
-    case disconnected
-    case error(connectionError: String)
-
-    public var statusString: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "connected"
-            case .error: return "error"
-            default: return "connecting"
-            }
-        }
-    }
-
-    public var statusExplanation: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "You are connected to the server used to receive messages from this contact."
-            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-            default: return "Trying to connect to the server used to receive messages from this contact."
-            }
-        }
-    }
-
-    public var imageName: String {
-        get {
-            switch self {
-            case .unknown: return "circle.dotted"
-            case .connected: return "circle.fill"
-            case .disconnected: return "ellipsis.circle.fill"
-            case .error: return "exclamationmark.circle.fill"
-            }
-        }
-    }
-}
-
-public enum ForwardConfirmation: Decodable, Hashable {
-    case filesNotAccepted(fileIds: [Int64])
-    case filesInProgress(filesCount: Int)
-    case filesMissing(filesCount: Int)
-    case filesFailed(filesCount: Int)
-}
-
-public struct ConnNetworkStatus: Decodable {
-    public var agentConnId: String
-    public var networkStatus: NetworkStatus
-}
-
 public struct ChatSettings: Codable, Hashable {
     public var enableNtfs: MsgFilter
     public var sendRcpts: Bool?
@@ -2023,19 +483,54 @@ public struct ChatSettings: Codable, Hashable {
     public static let defaults: ChatSettings = ChatSettings(enableNtfs: .all, sendRcpts: nil, favorite: false)
 }
 
+public struct NavigationInfo: Decodable {
+    public var afterUnread: Int = 0
+    public var afterTotal: Int = 0
+
+    public init(afterUnread: Int = 0, afterTotal: Int = 0) {
+        self.afterUnread = afterUnread
+        self.afterTotal = afterTotal
+    }
+}
+
 public enum MsgFilter: String, Codable, Hashable {
     case none
     case all
     case mentions
-}
-
-public struct UserMsgReceiptSettings: Codable {
-    public var enable: Bool
-    public var clearOverrides: Bool
-
-    public init(enable: Bool, clearOverrides: Bool) {
-        self.enable = enable
-        self.clearOverrides = clearOverrides
+    
+    public func nextMode(mentions: Bool) -> MsgFilter {
+        switch self {
+        case .all: mentions ? .mentions : .none
+        case .mentions: .none
+        case .none: .all
+        }
+    }
+    
+    public func text(mentions: Bool) -> String {
+        switch self {
+        case .all: NSLocalizedString("Unmute", comment: "notification label action")
+        case .mentions: NSLocalizedString("Mute", comment: "notification label action")
+        case .none:
+            mentions
+            ? NSLocalizedString("Mute all", comment: "notification label action")
+            : NSLocalizedString("Mute", comment: "notification label action")
+        }
+    }
+    
+    public var icon: String {
+        return switch self {
+        case .all: "speaker.wave.2"
+        case .mentions: "speaker.badge.exclamationmark"
+        case .none: "speaker.slash"
+        }
+    }
+    
+    public var iconFilled: String {
+        return switch self {
+        case .all: "speaker.wave.2.fill"
+        case .mentions: "speaker.badge.exclamationmark.fill"
+        case .none: "speaker.slash.fill"
+        }
     }
 }
 
@@ -2106,108 +601,11 @@ public enum RatchetSyncState: String, Decodable {
     case agreed
 }
 
-public struct UserContactLink: Decodable, Hashable {
-    public var connReqContact: String
-    public var autoAccept: AutoAccept?
-
-    public init(connReqContact: String, autoAccept: AutoAccept? = nil) {
-        self.connReqContact = connReqContact
-        self.autoAccept = autoAccept
-    }
-
-    var responseDetails: String {
-        "connReqContact: \(connReqContact)\nautoAccept: \(AutoAccept.cmdString(autoAccept))"
-    }
-}
-
-public struct AutoAccept: Codable, Hashable {
-    public var businessAddress: Bool
-    public var acceptIncognito: Bool
-    public var autoReply: MsgContent?
-
-    public init(businessAddress: Bool, acceptIncognito: Bool, autoReply: MsgContent? = nil) {
-        self.businessAddress = businessAddress
-        self.acceptIncognito = acceptIncognito
-        self.autoReply = autoReply
-    }
-
-    static func cmdString(_ autoAccept: AutoAccept?) -> String {
-        guard let autoAccept = autoAccept else { return "off" }
-        var s = "on"
-        if autoAccept.acceptIncognito {
-            s += " incognito=on"
-        } else if autoAccept.businessAddress {
-            s += " business"
-        }
-        guard let msg = autoAccept.autoReply else { return s }
-        return s + " " + msg.cmdString
-    }
-}
-
 public protocol SelectableItem: Identifiable, Equatable {
     var label: LocalizedStringKey { get }
     static var values: [Self] { get }
 }
 
-public struct DeviceToken: Decodable {
-    var pushProvider: PushProvider
-    var token: String
-
-    public init(pushProvider: PushProvider, token: String) {
-        self.pushProvider = pushProvider
-        self.token = token
-    }
-
-    public var cmdString: String {
-        "\(pushProvider) \(token)"
-    }
-}
-
-public enum PushEnvironment: String {
-    case development
-    case production
-}
-
-public enum PushProvider: String, Decodable {
-    case apns_dev
-    case apns_prod
-
-    public init(env: PushEnvironment) {
-        switch env {
-        case .development: self = .apns_dev
-        case .production: self = .apns_prod
-        }
-    }
-}
-
-// This notification mode is for app core, UI uses AppNotificationsMode.off to mean completely disable,
-// and .local for periodic background checks
-public enum NotificationsMode: String, Decodable, SelectableItem {
-    case off = "OFF"
-    case periodic = "PERIODIC"
-    case instant = "INSTANT"
-
-    public var label: LocalizedStringKey {
-        switch self {
-        case .off: "No push server"
-        case .periodic: "Periodic"
-        case .instant: "Instant"
-        }
-    }
-    
-    public var icon: String {
-        switch self {
-        case .off: return "arrow.clockwise"
-        case .periodic: return "timer"
-        case .instant: return "bolt"
-        }
-    }
-
-    public var id: String { self.rawValue }
-
-    public static var values: [NotificationsMode] = [.instant, .periodic, .off]
-}
-
 public enum NotificationPreviewMode: String, SelectableItem, Codable {
     case hidden
     case contact
@@ -2226,63 +624,6 @@ public enum NotificationPreviewMode: String, SelectableItem, Codable {
     public static var values: [NotificationPreviewMode] = [.message, .contact, .hidden]
 }
 
-public enum PrivacyChatListOpenLinksMode: String, CaseIterable, Codable, RawRepresentable, Identifiable {
-    case yes
-    case no
-    case ask
-
-    public var id: Self { self }
-
-    public var text: LocalizedStringKey {
-        switch self {
-        case .yes: return "Yes"
-        case .no: return "No"
-        case .ask: return "Ask"
-        }
-    }
-}
-
-public struct RemoteCtrlInfo: Decodable {
-    public var remoteCtrlId: Int64
-    public var ctrlDeviceName: String
-    public var sessionState: RemoteCtrlSessionState?
-
-    public var deviceViewName: String {
-        ctrlDeviceName == "" ? "\(remoteCtrlId)" : ctrlDeviceName
-    }
-}
-
-public enum RemoteCtrlSessionState: Decodable {
-    case starting
-    case searching
-    case connecting
-    case pendingConfirmation(sessionCode: String)
-    case connected(sessionCode: String)
-}
-
-public enum RemoteCtrlStopReason: Decodable {
-    case discoveryFailed(chatError: ChatError)
-    case connectionFailed(chatError: ChatError)
-    case setupFailed(chatError: ChatError)
-    case disconnected
-}
-
-public struct CtrlAppInfo: Decodable {
-    public var appVersionRange: AppVersionRange
-    public var deviceName: String
-}
-
-public struct AppVersionRange: Decodable {
-    public var minVersion: String
-    public var maxVersion: String
-}
-
-public struct CoreVersionInfo: Decodable {
-    public var version: String
-    public var simplexmqVersion: String
-    public var simplexmqCommit: String
-}
-
 public func decodeJSON<T: Decodable>(_ json: String) -> T? {
     if let data = json.data(using: .utf8) {
         return try? jsonDecoder.decode(T.self, from: data)
@@ -2299,13 +640,26 @@ private func encodeCJSON<T: Encodable>(_ value: T) -> [CChar] {
     encodeJSON(value).cString(using: .utf8)!
 }
 
-public enum ChatError: Decodable, Hashable {
+public enum ChatError: Decodable, Hashable, Error {
     case error(errorType: ChatErrorType)
     case errorAgent(agentError: AgentErrorType)
     case errorStore(storeError: StoreError)
     case errorDatabase(databaseError: DatabaseError)
     case errorRemoteCtrl(remoteCtrlError: RemoteCtrlError)
-    case invalidJSON(json: String)
+    case invalidJSON(json: Data?) // additional case used to pass errors that failed to parse
+    case unexpectedResult(type: String) // additional case used to pass unexpected responses
+    
+    public var errorType: String {
+        switch self {
+        case .error: "chat"
+        case .errorAgent: "agent"
+        case .errorStore: "store"
+        case .errorDatabase: "database"
+        case .errorRemoteCtrl: "remoteCtrl"
+        case .invalidJSON: "invalid"
+        case let .unexpectedResult(type): "! \(type)"
+        }
+    }
 }
 
 public enum ChatErrorType: Decodable, Hashable {
@@ -2328,8 +682,8 @@ public enum ChatErrorType: Decodable, Hashable {
     case chatNotStarted
     case chatNotStopped
     case chatStoreChanged
-    case connectionPlan(connectionPlan: ConnectionPlan)
     case invalidConnReq
+    case unsupportedConnReq
     case invalidChatMessage(connection: Connection, message: String)
     case contactNotReady(contact: Contact)
     case contactNotActive(contact: Contact)
@@ -2445,6 +799,7 @@ public enum StoreError: Decodable, Hashable {
     case hostMemberIdNotFound(groupId: Int64)
     case contactNotFoundByFileId(fileId: Int64)
     case noGroupSndStatus(itemId: Int64, groupMemberId: Int64)
+    case dBException(message: String)
 }
 
 public enum DatabaseError: Decodable, Hashable {
@@ -2634,425 +989,14 @@ public enum RemoteCtrlError: Decodable, Hashable {
     case protocolError
 }
 
-public struct MigrationFileLinkData: Codable {
-    let networkConfig: NetworkConfig?
-
-    public init(networkConfig: NetworkConfig) {
-        self.networkConfig = networkConfig
-    }
-
-    public struct NetworkConfig: Codable {
-        let socksProxy: String?
-        let networkProxy: NetworkProxy?
-        let hostMode: HostMode?
-        let requiredHostMode: Bool?
-
-        public init(socksProxy: String?, networkProxy: NetworkProxy?, hostMode: HostMode?, requiredHostMode: Bool?) {
-            self.socksProxy = socksProxy
-            self.networkProxy = networkProxy
-            self.hostMode = hostMode
-            self.requiredHostMode = requiredHostMode
-        }
-
-        public func transformToPlatformSupported() -> NetworkConfig {
-            return if let hostMode, let requiredHostMode {
-                NetworkConfig(
-                    socksProxy: nil,
-                    networkProxy: nil,
-                    hostMode: hostMode == .onionViaSocks ? .onionHost : hostMode,
-                    requiredHostMode: requiredHostMode
-                )
-            } else { self }
-        }
-    }
-
-    public func addToLink(link: String) -> String {
-        "\(link)&data=\(encodeJSON(self).addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!)"
-    }
-
-    public static func readFromLink(link: String) -> MigrationFileLinkData? {
-//        standaloneFileInfo(link)
-        nil
-    }
-}
-
-public struct AppSettings: Codable, Equatable {
-    public var networkConfig: NetCfg? = nil
-    public var networkProxy: NetworkProxy? = nil
-    public var privacyEncryptLocalFiles: Bool? = nil
-    public var privacyAskToApproveRelays: Bool? = nil
-    public var privacyAcceptImages: Bool? = nil
-    public var privacyLinkPreviews: Bool? = nil
-    public var privacyChatListOpenLinks: PrivacyChatListOpenLinksMode? = nil
-    public var privacyShowChatPreviews: Bool? = nil
-    public var privacySaveLastDraft: Bool? = nil
-    public var privacyProtectScreen: Bool? = nil
-    public var privacyMediaBlurRadius: Int? = nil
-    public var notificationMode: AppSettingsNotificationMode? = nil
-    public var notificationPreviewMode: NotificationPreviewMode? = nil
-    public var webrtcPolicyRelay: Bool? = nil
-    public var webrtcICEServers: [String]? = nil
-    public var confirmRemoteSessions: Bool? = nil
-    public var connectRemoteViaMulticast: Bool? = nil
-    public var connectRemoteViaMulticastAuto: Bool? = nil
-    public var developerTools: Bool? = nil
-    public var confirmDBUpgrades: Bool? = nil
-    public var androidCallOnLockScreen: AppSettingsLockScreenCalls? = nil
-    public var iosCallKitEnabled: Bool? = nil
-    public var iosCallKitCallsInRecents: Bool? = nil
-    public var uiProfileImageCornerRadius: Double? = nil
-    public var uiChatItemRoundness: Double? = nil
-    public var uiChatItemTail: Bool? = nil
-    public var uiColorScheme: String? = nil
-    public var uiDarkColorScheme: String? = nil
-    public var uiCurrentThemeIds: [String: String]? = nil
-    public var uiThemes: [ThemeOverrides]? = nil
-    public var oneHandUI: Bool? = nil
-    public var chatBottomBar: Bool? = nil
-    
-    public func prepareForExport() -> AppSettings {
-        var empty = AppSettings()
-        let def = AppSettings.defaults
-        if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
-        if networkProxy != def.networkProxy { empty.networkProxy = networkProxy }
-        if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
-        if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
-        if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
-        if privacyLinkPreviews != def.privacyLinkPreviews { empty.privacyLinkPreviews = privacyLinkPreviews }
-        if privacyChatListOpenLinks != def.privacyChatListOpenLinks { empty.privacyChatListOpenLinks = privacyChatListOpenLinks }
-        if privacyShowChatPreviews != def.privacyShowChatPreviews { empty.privacyShowChatPreviews = privacyShowChatPreviews }
-        if privacySaveLastDraft != def.privacySaveLastDraft { empty.privacySaveLastDraft = privacySaveLastDraft }
-        if privacyProtectScreen != def.privacyProtectScreen { empty.privacyProtectScreen = privacyProtectScreen }
-        if privacyMediaBlurRadius != def.privacyMediaBlurRadius { empty.privacyMediaBlurRadius = privacyMediaBlurRadius }
-        if notificationMode != def.notificationMode { empty.notificationMode = notificationMode }
-        if notificationPreviewMode != def.notificationPreviewMode { empty.notificationPreviewMode = notificationPreviewMode }
-        if webrtcPolicyRelay != def.webrtcPolicyRelay { empty.webrtcPolicyRelay = webrtcPolicyRelay }
-        if webrtcICEServers != def.webrtcICEServers { empty.webrtcICEServers = webrtcICEServers }
-        if confirmRemoteSessions != def.confirmRemoteSessions { empty.confirmRemoteSessions = confirmRemoteSessions }
-        if connectRemoteViaMulticast != def.connectRemoteViaMulticast {empty.connectRemoteViaMulticast = connectRemoteViaMulticast }
-        if connectRemoteViaMulticastAuto != def.connectRemoteViaMulticastAuto { empty.connectRemoteViaMulticastAuto = connectRemoteViaMulticastAuto }
-        if developerTools != def.developerTools { empty.developerTools = developerTools }
-        if confirmDBUpgrades != def.confirmDBUpgrades { empty.confirmDBUpgrades = confirmDBUpgrades }
-        if androidCallOnLockScreen != def.androidCallOnLockScreen { empty.androidCallOnLockScreen = androidCallOnLockScreen }
-        if iosCallKitEnabled != def.iosCallKitEnabled { empty.iosCallKitEnabled = iosCallKitEnabled }
-        if iosCallKitCallsInRecents != def.iosCallKitCallsInRecents { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
-        if uiProfileImageCornerRadius != def.uiProfileImageCornerRadius { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
-        if uiChatItemRoundness != def.uiChatItemRoundness { empty.uiChatItemRoundness = uiChatItemRoundness }
-        if uiChatItemTail != def.uiChatItemTail { empty.uiChatItemTail = uiChatItemTail }
-        if uiColorScheme != def.uiColorScheme { empty.uiColorScheme = uiColorScheme }
-        if uiDarkColorScheme != def.uiDarkColorScheme { empty.uiDarkColorScheme = uiDarkColorScheme }
-        if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
-        if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
-        if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
-        if chatBottomBar != def.chatBottomBar { empty.chatBottomBar = chatBottomBar }
-        return empty
-    }
-
-    public static var defaults: AppSettings {
-        AppSettings (
-            networkConfig: NetCfg.defaults,
-            networkProxy: NetworkProxy.def,
-            privacyEncryptLocalFiles: true,
-            privacyAskToApproveRelays: true,
-            privacyAcceptImages: true,
-            privacyLinkPreviews: true,
-            privacyChatListOpenLinks: .ask,
-            privacyShowChatPreviews: true,
-            privacySaveLastDraft: true,
-            privacyProtectScreen: false,
-            privacyMediaBlurRadius: 0,
-            notificationMode: AppSettingsNotificationMode.instant,
-            notificationPreviewMode: NotificationPreviewMode.message,
-            webrtcPolicyRelay: true,
-            webrtcICEServers: [],
-            confirmRemoteSessions: false,
-            connectRemoteViaMulticast: true,
-            connectRemoteViaMulticastAuto: true,
-            developerTools: false,
-            confirmDBUpgrades: false,
-            androidCallOnLockScreen: AppSettingsLockScreenCalls.show,
-            iosCallKitEnabled: true,
-            iosCallKitCallsInRecents: false,
-            uiProfileImageCornerRadius: 22.5,
-            uiChatItemRoundness: 0.75,
-            uiChatItemTail: true,
-            uiColorScheme: DefaultTheme.SYSTEM_THEME_NAME,
-            uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
-            uiCurrentThemeIds: nil as [String: String]?,
-            uiThemes: nil as [ThemeOverrides]?,
-            oneHandUI: true,
-            chatBottomBar: true
-        )
-    }
-}
-
-public enum AppSettingsNotificationMode: String, Codable {
-    case off
-    case periodic
-    case instant
-
-    public func toNotificationsMode() -> NotificationsMode {
-        switch self {
-        case .instant: .instant
-        case .periodic: .periodic
-        case .off: .off
-        }
-    }
-
-    public static func from(_ mode: NotificationsMode) -> AppSettingsNotificationMode {
-        switch mode {
-        case .instant: .instant
-        case .periodic: .periodic
-        case .off: .off
-        }
-    }
-}
-
-//public enum NotificationPreviewMode: Codable {
-//    case hidden
-//    case contact
-//    case message
-//}
-
-public enum AppSettingsLockScreenCalls: String, Codable {
-    case disable
-    case show
-    case accept
-}
-
-public struct UserNetworkInfo: Codable, Equatable {
-    public let networkType: UserNetworkType
-    public let online: Bool
-
-    public init(networkType: UserNetworkType, online: Bool) {
-        self.networkType = networkType
-        self.online = online
-    }
-}
-
-public enum UserNetworkType: String, Codable {
-    case none
-    case cellular
-    case wifi
-    case ethernet
-    case other
-
-    public var text: LocalizedStringKey {
-        switch self {
-        case .none: "No network connection"
-        case .cellular: "Cellular"
-        case .wifi: "WiFi"
-        case .ethernet: "Wired ethernet"
-        case .other: "Other"
-        }
-    }
-}
-
-public struct RcvMsgInfo: Codable {
-    var msgId: Int64
-    var msgDeliveryId: Int64
-    var msgDeliveryStatus: String
-    var agentMsgId: Int64
-    var agentMsgMeta: String
-}
-
-public struct ServerQueueInfo: Codable {
-    var server: String
-    var rcvId: String
-    var sndId: String
-    var ntfId: String?
-    var status: String
-    var info: QueueInfo
-}
-
-public struct QueueInfo: Codable {
-    var qiSnd: Bool
-    var qiNtf: Bool
-    var qiSub: QSub?
-    var qiSize: Int
-    var qiMsg: MsgInfo?
-}
-
-public struct QSub: Codable {
-    var qSubThread: QSubThread
-    var qDelivered: String?
-}
-
-public enum QSubThread: String, Codable {
-    case noSub
-    case subPending
-    case subThread
-    case prohibitSub
-}
-
-public struct MsgInfo: Codable {
-    var msgId: String
-    var msgTs: Date
-    var msgType: MsgType
-}
-
-public enum MsgType: String, Codable {
-    case message
-    case quota
-}
-
 public struct AppFilePaths: Encodable {
     public let appFilesFolder: String
     public let appTempFolder: String
     public let appAssetsFolder: String
-}
-
-public struct PresentedServersSummary: Codable {
-    public var statsStartedAt: Date
-    public var allUsersSMP: SMPServersSummary
-    public var allUsersXFTP: XFTPServersSummary
-    public var currentUserSMP: SMPServersSummary
-    public var currentUserXFTP: XFTPServersSummary
-}
-
-public struct SMPServersSummary: Codable {
-    public var smpTotals: SMPTotals
-    public var currentlyUsedSMPServers: [SMPServerSummary]
-    public var previouslyUsedSMPServers: [SMPServerSummary]
-    public var onlyProxiedSMPServers: [SMPServerSummary]
-}
-
-public struct SMPTotals: Codable {
-    public var sessions: ServerSessions
-    public var subs: SMPServerSubs
-    public var stats: AgentSMPServerStatsData
-}
-
-public struct SMPServerSummary: Codable, Identifiable {
-    public var smpServer: String
-    public var known: Bool?
-    public var sessions: ServerSessions?
-    public var subs: SMPServerSubs?
-    public var stats: AgentSMPServerStatsData?
-
-    public var id: String { smpServer }
-
-    public var hasSubs: Bool { subs != nil }
-
-    public var sessionsOrNew: ServerSessions { sessions ?? ServerSessions.newServerSessions }
-
-    public var subsOrNew: SMPServerSubs { subs ?? SMPServerSubs.newSMPServerSubs }
-}
-
-public struct ServerSessions: Codable {
-    public var ssConnected: Int
-    public var ssErrors: Int
-    public var ssConnecting: Int
-
-    static public var newServerSessions = ServerSessions(
-        ssConnected: 0,
-        ssErrors: 0,
-        ssConnecting: 0
-    )
-
-    public var hasSess: Bool { ssConnected > 0 }
-}
-
-public struct SMPServerSubs: Codable {
-    public var ssActive: Int
-    public var ssPending: Int
-
-    public init(ssActive: Int, ssPending: Int) {
-        self.ssActive = ssActive
-        self.ssPending = ssPending
-    }
-
-    static public var newSMPServerSubs = SMPServerSubs(
-        ssActive: 0,
-        ssPending: 0
-    )
-
-    public var total: Int { ssActive + ssPending }
-
-    public var shareOfActive: Double {
-        guard total != 0 else { return 0.0 }
-        return Double(ssActive) / Double(total)
+    
+    public init(appFilesFolder: String, appTempFolder: String, appAssetsFolder: String) {
+        self.appFilesFolder = appFilesFolder
+        self.appTempFolder = appTempFolder
+        self.appAssetsFolder = appAssetsFolder
     }
 }
-
-public struct AgentSMPServerStatsData: Codable {
-    public var _sentDirect: Int
-    public var _sentViaProxy: Int
-    public var _sentProxied: Int
-    public var _sentDirectAttempts: Int
-    public var _sentViaProxyAttempts: Int
-    public var _sentProxiedAttempts: Int
-    public var _sentAuthErrs: Int
-    public var _sentQuotaErrs: Int
-    public var _sentExpiredErrs: Int
-    public var _sentOtherErrs: Int
-    public var _recvMsgs: Int
-    public var _recvDuplicates: Int
-    public var _recvCryptoErrs: Int
-    public var _recvErrs: Int
-    public var _ackMsgs: Int
-    public var _ackAttempts: Int
-    public var _ackNoMsgErrs: Int
-    public var _ackOtherErrs: Int
-    public var _connCreated: Int
-    public var _connSecured: Int
-    public var _connCompleted: Int
-    public var _connDeleted: Int
-    public var _connDelAttempts: Int
-    public var _connDelErrs: Int
-    public var _connSubscribed: Int
-    public var _connSubAttempts: Int
-    public var _connSubIgnored: Int
-    public var _connSubErrs: Int
-    public var _ntfKey: Int
-    public var _ntfKeyAttempts: Int
-    public var _ntfKeyDeleted: Int
-    public var _ntfKeyDeleteAttempts: Int
-}
-
-public struct XFTPServersSummary: Codable {
-    public var xftpTotals: XFTPTotals
-    public var currentlyUsedXFTPServers: [XFTPServerSummary]
-    public var previouslyUsedXFTPServers: [XFTPServerSummary]
-}
-
-public struct XFTPTotals: Codable {
-    public var sessions: ServerSessions
-    public var stats: AgentXFTPServerStatsData
-}
-
-public struct XFTPServerSummary: Codable, Identifiable {
-    public var xftpServer: String
-    public var known: Bool?
-    public var sessions: ServerSessions?
-    public var stats: AgentXFTPServerStatsData?
-    public var rcvInProgress: Bool
-    public var sndInProgress: Bool
-    public var delInProgress: Bool
-
-    public var id: String { xftpServer }
-}
-
-public struct AgentXFTPServerStatsData: Codable {
-    public var _uploads: Int
-    public var _uploadsSize: Int64
-    public var _uploadAttempts: Int
-    public var _uploadErrs: Int
-    public var _downloads: Int
-    public var _downloadsSize: Int64
-    public var _downloadAttempts: Int
-    public var _downloadAuthErrs: Int
-    public var _downloadErrs: Int
-    public var _deletions: Int
-    public var _deleteAttempts: Int
-    public var _deleteErrs: Int
-}
-
-public struct AgentNtfServerStatsData: Codable {
-    public var _ntfCreated: Int
-    public var _ntfCreateAttempts: Int
-    public var _ntfChecked: Int
-    public var _ntfCheckAttempts: Int
-    public var _ntfDeleted: Int
-    public var _ntfDelAttempts: Int
-}
diff --git a/apps/ios/SimpleXChat/AppGroup.swift b/apps/ios/SimpleXChat/AppGroup.swift
index c754f0740d..29ccab7357 100644
--- a/apps/ios/SimpleXChat/AppGroup.swift
+++ b/apps/ios/SimpleXChat/AppGroup.swift
@@ -40,6 +40,7 @@ let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
 let GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE = "networkSMPProxyMode"
 let GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK = "networkSMPProxyFallback"
+let GROUP_DEFAULT_NETWORK_SMP_WEB_PORT_SERVERS = "networkSMPWebPortServers"
 let GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT = "networkTCPConnectTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT = "networkTCPTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB = "networkTCPTimeoutPerKb"
@@ -71,6 +72,7 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_NETWORK_SESSION_MODE: TransportSessionMode.session.rawValue,
         GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.unknown.rawValue,
         GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allowProtected.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_WEB_PORT_SERVERS: SMPWebPortServers.preset.rawValue,
         GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT: NetCfg.defaults.tcpConnectTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT: NetCfg.defaults.tcpTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB: NetCfg.defaults.tcpTimeoutPerKb,
@@ -249,6 +251,12 @@ public let networkSMPProxyFallbackGroupDefault = EnumDefault<SMPProxyFallback>(
     withDefault: .allowProtected
 )
 
+public let networkSMPWebPortServersDefault = EnumDefault<SMPWebPortServers>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NETWORK_SMP_WEB_PORT_SERVERS,
+    withDefault: .preset
+)
+
 public let storeDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_STORE_DB_PASSPHRASE)
 
 public let initialRandomDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE)
@@ -303,12 +311,14 @@ public class EnumDefault<T: RawRepresentable> where T.RawValue == String {
 }
 
 public class BoolDefault: Default<Bool> {
+    @inline(__always)
     public func get() -> Bool {
         self.defaults.bool(forKey: self.key)
     }
 }
 
 public class IntDefault: Default<Int> {
+    @inline(__always)
     public func get() -> Int {
         self.defaults.integer(forKey: self.key)
     }
@@ -318,11 +328,13 @@ public class Default<T> {
     var defaults: UserDefaults
     var key: String
 
+    @inline(__always)
     public init(defaults: UserDefaults = UserDefaults.standard, forKey: String) {
         self.defaults = defaults
         self.key = forKey
     }
 
+    @inline(__always)
     public func set(_ value: T) {
         defaults.set(value, forKey: key)
         defaults.synchronize()
@@ -336,6 +348,7 @@ public func getNetCfg() -> NetCfg {
     let sessionMode = networkSessionModeGroupDefault.get()
     let smpProxyMode = networkSMPProxyModeGroupDefault.get()
     let smpProxyFallback = networkSMPProxyFallbackGroupDefault.get()
+    let smpWebPortServers = networkSMPWebPortServersDefault.get()
     let tcpConnectTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
     let tcpTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
     let tcpTimeoutPerKb = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
@@ -359,7 +372,7 @@ public func getNetCfg() -> NetCfg {
         sessionMode: sessionMode,
         smpProxyMode: smpProxyMode,
         smpProxyFallback: smpProxyFallback,
-        smpWebPort: false,
+        smpWebPortServers: smpWebPortServers,
         tcpConnectTimeout: tcpConnectTimeout,
         tcpTimeout: tcpTimeout,
         tcpTimeoutPerKb: tcpTimeoutPerKb,
@@ -378,6 +391,7 @@ public func setNetCfg(_ cfg: NetCfg, networkProxy: NetworkProxy?) {
     networkSMPProxyFallbackGroupDefault.set(cfg.smpProxyFallback)
     let socksProxy = networkProxy?.toProxyString()
     groupDefaults.set(socksProxy, forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY)
+    networkSMPWebPortServersDefault.set(cfg.smpWebPortServers)
     groupDefaults.set(cfg.tcpConnectTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeoutPerKb, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index ae49ee3f3f..9a82c912dd 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -15,6 +15,9 @@ public let CREATE_MEMBER_CONTACT_VERSION = 2
 // version to receive reports (MCReport)
 public let REPORTS_VERSION = 12
 
+// support group knocking (MsgScope)
+public let GROUP_KNOCKING_VERSION = 15
+
 public let contentModerationPostLink = URL(string: "https://simplex.chat/blog/20250114-simplex-network-large-groups-privacy-preserving-content-moderation.html#preventing-server-abuse-without-compromising-e2e-encryption")!
 
 public struct User: Identifiable, Decodable, UserLike, NamedChat, Hashable {
@@ -711,6 +714,7 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
     case voice
     case files
     case simplexLinks
+    case reports
     case history
 
     public var id: Self { self }
@@ -731,6 +735,7 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
         case .voice: true
         case .files: true
         case .simplexLinks: true
+        case .reports: false
         case .history: false
         }
     }
@@ -744,6 +749,7 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
         case .voice: return NSLocalizedString("Voice messages", comment: "chat feature")
         case .files: return NSLocalizedString("Files and media", comment: "chat feature")
         case .simplexLinks: return NSLocalizedString("SimpleX links", comment: "chat feature")
+        case .reports: return NSLocalizedString("Member reports", comment: "chat feature")
         case .history: return NSLocalizedString("Visible history", comment: "chat feature")
         }
     }
@@ -757,6 +763,7 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
         case .voice: return "mic"
         case .files: return "doc"
         case .simplexLinks: return "link.circle"
+        case .reports: return "flag"
         case .history: return "clock"
         }
     }
@@ -770,6 +777,7 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
         case .voice: return "mic.fill"
         case .files: return "doc.fill"
         case .simplexLinks: return "link.circle.fill"
+        case .reports: return "flag.fill"
         case .history: return "clock.fill"
         }
     }
@@ -819,6 +827,11 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
                 case .on: return "Allow to send SimpleX links."
                 case .off: return "Prohibit sending SimpleX links."
                 }
+            case .reports:
+                switch enabled {
+                case .on: return "Allow to report messsages to moderators."
+                case .off: return "Prohibit reporting messages to moderators."
+                }
             case .history:
                 switch enabled {
                 case .on: return "Send up to 100 last messages to new members."
@@ -862,6 +875,11 @@ public enum GroupFeature: String, Decodable, Feature, Hashable {
                 case .on: return "Members can send SimpleX links."
                 case .off: return "SimpleX links are prohibited."
                 }
+            case .reports:
+                switch enabled {
+                case .on: return "Members can report messsages to moderators."
+                case .off: return "Reporting messages to moderators is prohibited."
+                }
             case .history:
                 switch enabled {
                 case .on: return "Up to 100 last messages are sent to new members."
@@ -1007,6 +1025,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
     public var voice: RoleGroupPreference
     public var files: RoleGroupPreference
     public var simplexLinks: RoleGroupPreference
+    public var reports: GroupPreference
     public var history: GroupPreference
 
     public init(
@@ -1017,6 +1036,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         voice: RoleGroupPreference,
         files: RoleGroupPreference,
         simplexLinks: RoleGroupPreference,
+        reports: GroupPreference,
         history: GroupPreference
     ) {
         self.timedMessages = timedMessages
@@ -1026,6 +1046,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         self.voice = voice
         self.files = files
         self.simplexLinks = simplexLinks
+        self.reports = reports
         self.history = history
     }
 
@@ -1037,6 +1058,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         voice: RoleGroupPreference(enable: .on, role: nil),
         files: RoleGroupPreference(enable: .on, role: nil),
         simplexLinks: RoleGroupPreference(enable: .on, role: nil),
+        reports: GroupPreference(enable: .on),
         history: GroupPreference(enable: .on)
     )
 }
@@ -1049,6 +1071,7 @@ public struct GroupPreferences: Codable, Hashable {
     public var voice: RoleGroupPreference?
     public var files: RoleGroupPreference?
     public var simplexLinks: RoleGroupPreference?
+    public var reports: GroupPreference?
     public var history: GroupPreference?
 
     public init(
@@ -1059,6 +1082,7 @@ public struct GroupPreferences: Codable, Hashable {
         voice: RoleGroupPreference? = nil,
         files: RoleGroupPreference? = nil,
         simplexLinks: RoleGroupPreference? = nil,
+        reports: GroupPreference? = nil,
         history: GroupPreference? = nil
     ) {
         self.timedMessages = timedMessages
@@ -1068,6 +1092,7 @@ public struct GroupPreferences: Codable, Hashable {
         self.voice = voice
         self.files = files
         self.simplexLinks = simplexLinks
+        self.reports = reports
         self.history = history
     }
 
@@ -1079,6 +1104,7 @@ public struct GroupPreferences: Codable, Hashable {
         voice: RoleGroupPreference(enable: .on, role: nil),
         files: RoleGroupPreference(enable: .on, role: nil),
         simplexLinks: RoleGroupPreference(enable: .on, role: nil),
+        reports: GroupPreference(enable: .on),
         history: GroupPreference(enable: .on)
     )
 }
@@ -1092,6 +1118,7 @@ public func toGroupPreferences(_ fullPreferences: FullGroupPreferences) -> Group
         voice: fullPreferences.voice,
         files: fullPreferences.files,
         simplexLinks: fullPreferences.simplexLinks,
+        reports: fullPreferences.reports,
         history: fullPreferences.history
     )
 }
@@ -1173,11 +1200,11 @@ public enum GroupFeatureEnabled: String, Codable, Identifiable, Hashable {
 
 public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
     case direct(contact: Contact)
-    case group(groupInfo: GroupInfo)
+    case group(groupInfo: GroupInfo, groupChatScope: GroupChatScopeInfo?)
     case local(noteFolder: NoteFolder)
     case contactRequest(contactRequest: UserContactRequest)
     case contactConnection(contactConnection: PendingContactConnection)
-    case invalidJSON(json: String)
+    case invalidJSON(json: Data?)
 
     private static let invalidChatName = NSLocalizedString("invalid chat", comment: "invalid chat data")
 
@@ -1187,7 +1214,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.localDisplayName
-            case let .group(groupInfo): return groupInfo.localDisplayName
+            case let .group(groupInfo, _): return groupInfo.localDisplayName
             case .local: return ""
             case let .contactRequest(contactRequest): return contactRequest.localDisplayName
             case let .contactConnection(contactConnection): return contactConnection.localDisplayName
@@ -1200,7 +1227,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.displayName
-            case let .group(groupInfo): return groupInfo.displayName
+            case let .group(groupInfo, _): return groupInfo.displayName
             case .local: return ChatInfo.privateNotesChatName
             case let .contactRequest(contactRequest): return contactRequest.displayName
             case let .contactConnection(contactConnection): return contactConnection.displayName
@@ -1213,7 +1240,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.fullName
-            case let .group(groupInfo): return groupInfo.fullName
+            case let .group(groupInfo, _): return groupInfo.fullName
             case .local: return ""
             case let .contactRequest(contactRequest): return contactRequest.fullName
             case let .contactConnection(contactConnection): return contactConnection.fullName
@@ -1226,7 +1253,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.image
-            case let .group(groupInfo): return groupInfo.image
+            case let .group(groupInfo, _): return groupInfo.image
             case .local: return nil
             case let .contactRequest(contactRequest): return contactRequest.image
             case let .contactConnection(contactConnection): return contactConnection.image
@@ -1239,7 +1266,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.localAlias
-            case let .group(groupInfo): return groupInfo.localAlias
+            case let .group(groupInfo, _): return groupInfo.localAlias
             case .local: return ""
             case let .contactRequest(contactRequest): return contactRequest.localAlias
             case let .contactConnection(contactConnection): return contactConnection.localAlias
@@ -1252,7 +1279,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.id
-            case let .group(groupInfo): return groupInfo.id
+            case let .group(groupInfo, _): return groupInfo.id
             case let .local(noteFolder): return noteFolder.id
             case let .contactRequest(contactRequest): return contactRequest.id
             case let .contactConnection(contactConnection): return contactConnection.id
@@ -1278,7 +1305,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.apiId
-            case let .group(groupInfo): return groupInfo.apiId
+            case let .group(groupInfo, _): return groupInfo.apiId
             case let .local(noteFolder): return noteFolder.apiId
             case let .contactRequest(contactRequest): return contactRequest.apiId
             case let .contactConnection(contactConnection): return contactConnection.apiId
@@ -1291,7 +1318,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         get {
             switch self {
             case let .direct(contact): return contact.ready
-            case let .group(groupInfo): return groupInfo.ready
+            case let .group(groupInfo, _): return groupInfo.ready
             case let .local(noteFolder): return noteFolder.ready
             case let .contactRequest(contactRequest): return contactRequest.ready
             case let .contactConnection(contactConnection): return contactConnection.ready
@@ -1309,24 +1336,60 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         }
     }
 
-    public var sendMsgEnabled: Bool {
+    public var userCantSendReason: (composeLabel: LocalizedStringKey, alertMessage: LocalizedStringKey?)? {
         get {
             switch self {
-            case let .direct(contact): return contact.sendMsgEnabled
-            case let .group(groupInfo): return groupInfo.sendMsgEnabled
-            case let .local(noteFolder): return noteFolder.sendMsgEnabled
-            case let .contactRequest(contactRequest): return contactRequest.sendMsgEnabled
-            case let .contactConnection(contactConnection): return contactConnection.sendMsgEnabled
-            case .invalidJSON: return false
+            case let .direct(contact):
+                // TODO [short links] this will have additional statuses for pending contact requests before they are accepted
+                if contact.nextSendGrpInv { return nil }
+                if !contact.active { return ("contact deleted", nil) }
+                if !contact.sndReady { return ("contact not ready", nil) }
+                if contact.activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false { return ("not synchronized", nil) }
+                if contact.activeConn?.connDisabled ?? true { return ("contact disabled", nil) }
+                return nil
+            case let .group(groupInfo, groupChatScope):
+                if groupInfo.membership.memberActive {
+                    switch(groupChatScope) {
+                    case .none:
+                        if groupInfo.membership.memberPending { return ("reviewed by admins", "Please contact group admin.") }
+                        if groupInfo.membership.memberRole == .observer { return ("you are observer", "Please contact group admin.") }
+                        return nil
+                    case let .some(.memberSupport(groupMember_: .some(supportMember))):
+                        if supportMember.versionRange.maxVersion < GROUP_KNOCKING_VERSION && !supportMember.memberPending {
+                            return ("member has old version", nil)
+                        }
+                        return nil
+                    case .some(.memberSupport(groupMember_: .none)):
+                        return nil
+                    }
+                } else {
+                    switch groupInfo.membership.memberStatus {
+                    case .memRejected: return ("request to join rejected", nil)
+                    case .memGroupDeleted: return ("group is deleted", nil)
+                    case .memRemoved: return ("removed from group", nil)
+                    case .memLeft: return ("you left", nil)
+                    default: return ("can't send messages", nil)
+                    }
+                }
+            case .local:
+                return nil
+            case .contactRequest:
+                return ("can't send messages", nil)
+            case .contactConnection:
+                return ("can't send messages", nil)
+            case .invalidJSON:
+                return ("can't send messages", nil)
             }
         }
     }
 
+    public var sendMsgEnabled: Bool { userCantSendReason == nil }
+
     public var incognito: Bool {
         get {
             switch self {
             case let .direct(contact): return contact.contactConnIncognito
-            case let .group(groupInfo): return groupInfo.membership.memberIncognito
+            case let .group(groupInfo, _): return groupInfo.membership.memberIncognito
             case .local: return false
             case .contactRequest: return false
             case let .contactConnection(contactConnection): return contactConnection.incognito
@@ -1351,7 +1414,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
     
     public var groupInfo: GroupInfo? {
         switch self {
-        case let .group(groupInfo): return groupInfo
+        case let .group(groupInfo, _): return groupInfo
         default: return nil
         }
     }
@@ -1368,7 +1431,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             case .voice: return cups.voice.enabled.forUser
             case .calls: return cups.calls.enabled.forUser
             }
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             let prefs = groupInfo.fullGroupPreferences
             switch feature {
             case .timedMessages: return prefs.timedMessages.on
@@ -1391,7 +1454,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         case let .direct(contact):
             let pref = contact.mergedPreferences.timedMessages
             return pref.enabled.forUser ? pref.userPreference.preference.ttl : nil
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             let pref = groupInfo.fullGroupPreferences.timedMessages
             return pref.on ? pref.ttl : nil
         default:
@@ -1416,7 +1479,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             } else {
                 return .other
             }
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             if !groupInfo.fullGroupPreferences.voice.on(for: groupInfo.membership) {
                 return .groupOwnerCan
             } else {
@@ -1448,22 +1511,45 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         }
     }
 
-    public var ntfsEnabled: Bool {
-        self.chatSettings?.enableNtfs == .all
+    public func groupChatScope() -> GroupChatScope? {
+        switch self {
+        case let .group(_, groupChatScope): groupChatScope?.toChatScope()
+        default: nil
+        }
+    }
+
+    public func ntfsEnabled(chatItem: ChatItem) -> Bool {
+        ntfsEnabled(chatItem.meta.userMention)
+    }
+    
+    public func ntfsEnabled(_ userMention: Bool) -> Bool {
+        switch self.chatSettings?.enableNtfs {
+        case .all: true
+        case .mentions: userMention
+        default: false
+        }
     }
 
     public var chatSettings: ChatSettings? {
         switch self {
         case let .direct(contact): return contact.chatSettings
-        case let .group(groupInfo): return groupInfo.chatSettings
+        case let .group(groupInfo, _): return groupInfo.chatSettings
         default: return nil
         }
     }
     
+    public var nextNtfMode: MsgFilter? {
+        self.chatSettings?.enableNtfs.nextMode(mentions: hasMentions)
+    }
+
+    public var hasMentions: Bool {
+        if case .group = self { true } else { false }
+    }
+
     public var chatTags: [Int64]? {
         switch self {
         case let .direct(contact): return contact.chatTags
-        case let .group(groupInfo): return groupInfo.chatTags
+        case let .group(groupInfo, _): return groupInfo.chatTags
         default: return nil
         }
     }
@@ -1471,7 +1557,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
     var createdAt: Date {
         switch self {
         case let .direct(contact): return contact.createdAt
-        case let .group(groupInfo): return groupInfo.createdAt
+        case let .group(groupInfo, _): return groupInfo.createdAt
         case let .local(noteFolder): return noteFolder.createdAt
         case let .contactRequest(contactRequest): return contactRequest.createdAt
         case let .contactConnection(contactConnection): return contactConnection.createdAt
@@ -1482,7 +1568,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
     public var updatedAt: Date {
         switch self {
         case let .direct(contact): return contact.updatedAt
-        case let .group(groupInfo): return groupInfo.updatedAt
+        case let .group(groupInfo, _): return groupInfo.updatedAt
         case let .local(noteFolder): return noteFolder.updatedAt
         case let .contactRequest(contactRequest): return contactRequest.updatedAt
         case let .contactConnection(contactConnection): return contactConnection.updatedAt
@@ -1493,7 +1579,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
     public var chatTs: Date {
         switch self {
         case let .direct(contact): return contact.chatTs ?? contact.updatedAt
-        case let .group(groupInfo): return groupInfo.chatTs ?? groupInfo.updatedAt
+        case let .group(groupInfo, _): return groupInfo.chatTs ?? groupInfo.updatedAt
         case let .local(noteFolder): return noteFolder.chatTs
         case let .contactRequest(contactRequest): return contactRequest.updatedAt
         case let .contactConnection(contactConnection): return contactConnection.updatedAt
@@ -1509,7 +1595,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             } else {
                 ChatTTL.userDefault(globalTTL)
             }
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             return if let ciTTL = groupInfo.chatItemTTL {
                 ChatTTL.chat(ChatItemTTL(ciTTL))
             } else {
@@ -1529,7 +1615,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
 
     public static var sampleData: ChatInfo.SampleData = SampleData(
         direct: ChatInfo.direct(contact: Contact.sampleData),
-        group: ChatInfo.group(groupInfo: GroupInfo.sampleData),
+        group: ChatInfo.group(groupInfo: GroupInfo.sampleData, groupChatScope: nil),
         local: ChatInfo.local(noteFolder: NoteFolder.sampleData),
         contactRequest: ChatInfo.contactRequest(contactRequest: UserContactRequest.sampleData),
         contactConnection: ChatInfo.contactConnection(contactConnection: PendingContactConnection.getSampleData())
@@ -1549,7 +1635,7 @@ public struct ChatData: Decodable, Identifiable, Hashable, ChatLike {
         self.chatStats = chatStats
     }
     
-    public static func invalidJSON(_ json: String) -> ChatData {
+    public static func invalidJSON(_ json: Data?) -> ChatData {
         ChatData(
             chatInfo: .invalidJSON(json: json),
             chatItems: [],
@@ -1559,20 +1645,55 @@ public struct ChatData: Decodable, Identifiable, Hashable, ChatLike {
 }
 
 public struct ChatStats: Decodable, Hashable {
-    public init(unreadCount: Int = 0, reportsCount: Int = 0, minUnreadItemId: Int64 = 0, unreadChat: Bool = false) {
+    public init(
+        unreadCount: Int = 0,
+        unreadMentions: Int = 0,
+        reportsCount: Int = 0,
+        minUnreadItemId: Int64 = 0,
+        unreadChat: Bool = false
+    ) {
         self.unreadCount = unreadCount
+        self.unreadMentions = unreadMentions
         self.reportsCount = reportsCount
         self.minUnreadItemId = minUnreadItemId
         self.unreadChat = unreadChat
     }
 
     public var unreadCount: Int = 0
+    public var unreadMentions: Int = 0
     // actual only via getChats() and getChat(.initial), otherwise, zero
     public var reportsCount: Int = 0
     public var minUnreadItemId: Int64 = 0
+    // actual only via getChats(), otherwise, false
     public var unreadChat: Bool = false
 }
 
+public enum GroupChatScope: Decodable {
+    case memberSupport(groupMemberId_: Int64?)
+}
+
+public func sameChatScope(_ scope1: GroupChatScope, _ scope2: GroupChatScope) -> Bool {
+    switch (scope1, scope2) {
+    case let (.memberSupport(groupMemberId1_), .memberSupport(groupMemberId2_)):
+        return groupMemberId1_ == groupMemberId2_
+    }
+}
+
+public enum GroupChatScopeInfo: Decodable, Hashable {
+    case memberSupport(groupMember_: GroupMember?)
+
+    public func toChatScope() -> GroupChatScope {
+        switch self {
+        case let .memberSupport(groupMember_):
+            if let groupMember = groupMember_ {
+                return .memberSupport(groupMemberId_: groupMember.groupMemberId)
+            } else {
+                return .memberSupport(groupMemberId_: nil)
+            }
+        }
+    }
+}
+
 public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
     public var contactId: Int64
     var localDisplayName: ContactName
@@ -1599,15 +1720,6 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
     public var ready: Bool { get { activeConn?.connStatus == .ready } }
     public var sndReady: Bool { get { ready || activeConn?.connStatus == .sndReady } }
     public var active: Bool { get { contactStatus == .active } }
-    public var sendMsgEnabled: Bool { get {
-        (
-            sndReady
-            && active
-            && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false)
-            && !(activeConn?.connDisabled ?? true)
-        )
-        || nextSendGrpInv
-    } }
     public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
     public var displayName: String { localAlias == "" ? profile.displayName : localAlias }
     public var fullName: String { get { profile.fullName } }
@@ -1786,7 +1898,6 @@ public struct UserContactRequest: Decodable, NamedChat, Hashable {
     public var id: ChatId { get { "<@\(contactRequestId)" } }
     public var apiId: Int64 { get { contactRequestId } }
     var ready: Bool { get { true } }
-    public var sendMsgEnabled: Bool { get { false } }
     public var displayName: String { get { profile.displayName } }
     public var fullName: String { get { profile.fullName } }
     public var image: String? { get { profile.image } }
@@ -1810,7 +1921,7 @@ public struct PendingContactConnection: Decodable, NamedChat, Hashable {
     public var viaContactUri: Bool
     public var groupLinkId: String?
     public var customUserProfileId: Int64?
-    public var connReqInv: String?
+    public var connLinkInv: CreatedConnLink?
     public var localAlias: String
     var createdAt: Date
     public var updatedAt: Date
@@ -1818,7 +1929,6 @@ public struct PendingContactConnection: Decodable, NamedChat, Hashable {
     public var id: ChatId { get { ":\(pccConnId)" } }
     public var apiId: Int64 { get { pccConnId } }
     var ready: Bool { get { false } }
-    public var sendMsgEnabled: Bool { get { false } }
     var localDisplayName: String {
         get { String.localizedStringWithFormat(NSLocalizedString("connection:%@", comment: "connection information"), pccConnId) }
     }
@@ -1938,17 +2048,16 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
     public var businessChat: BusinessChatInfo?
     public var fullGroupPreferences: FullGroupPreferences
     public var membership: GroupMember
-    public var hostConnCustomUserProfileId: Int64?
     public var chatSettings: ChatSettings
     var createdAt: Date
     var updatedAt: Date
     var chatTs: Date?
     public var uiThemes: ThemeModeOverrides?
+    public var membersRequireAttention: Int
 
     public var id: ChatId { get { "#\(groupId)" } }
     public var apiId: Int64 { get { groupId } }
     public var ready: Bool { get { true } }
-    public var sendMsgEnabled: Bool { get { membership.memberActive } }
     public var displayName: String { localAlias == "" ? groupProfile.displayName : localAlias }
     public var fullName: String { get { groupProfile.fullName } }
     public var image: String? { get { groupProfile.image } }
@@ -1961,23 +2070,27 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat, Hashable {
     }
 
     public var canDelete: Bool {
-        return membership.memberRole == .owner || !membership.memberCurrent
+        return membership.memberRole == .owner || !membership.memberCurrentOrPending
     }
 
     public var canAddMembers: Bool {
         return membership.memberRole >= .admin && membership.memberActive
     }
 
+    public var canModerate: Bool {
+        return membership.memberRole >= .moderator && membership.memberActive
+    }
+
     public static let sampleData = GroupInfo(
         groupId: 1,
         localDisplayName: "team",
         groupProfile: GroupProfile.sampleData,
         fullGroupPreferences: FullGroupPreferences.sampleData,
         membership: GroupMember.sampleData,
-        hostConnCustomUserProfileId: nil,
         chatSettings: ChatSettings.defaults,
         createdAt: .now,
         updatedAt: .now,
+        membersRequireAttention: 0,
         chatTags: [],
         localAlias: ""
     )
@@ -1989,12 +2102,20 @@ public struct GroupRef: Decodable, Hashable {
 }
 
 public struct GroupProfile: Codable, NamedChat, Hashable {
-    public init(displayName: String, fullName: String, description: String? = nil, image: String? = nil, groupPreferences: GroupPreferences? = nil) {
+    public init(
+        displayName: String,
+        fullName: String,
+        description: String? = nil,
+        image: String? = nil,
+        groupPreferences: GroupPreferences? = nil,
+        memberAdmission: GroupMemberAdmission? = nil
+    ) {
         self.displayName = displayName
         self.fullName = fullName
         self.description = description
         self.image = image
         self.groupPreferences = groupPreferences
+        self.memberAdmission = memberAdmission
     }
 
     public var displayName: String
@@ -2002,14 +2123,48 @@ public struct GroupProfile: Codable, NamedChat, Hashable {
     public var description: String?
     public var image: String?
     public var groupPreferences: GroupPreferences?
+    public var memberAdmission: GroupMemberAdmission?
     public var localAlias: String { "" }
 
+    public var memberAdmission_: GroupMemberAdmission {
+        get { self.memberAdmission ?? GroupMemberAdmission() }
+        set { memberAdmission = newValue }
+    }
+
     public static let sampleData = GroupProfile(
         displayName: "team",
         fullName: "My Team"
     )
 }
 
+public struct GroupMemberAdmission: Codable, Hashable {
+    public var review: MemberCriteria?
+
+    public init(
+        review: MemberCriteria? = nil
+    ) {
+        self.review = review
+    }
+
+    public static let sampleData = GroupMemberAdmission(
+        review: .all
+    )
+}
+
+public enum MemberCriteria: String, Codable, Identifiable, Hashable {
+    case all
+
+    public static var values: [MemberCriteria] { [.all] }
+
+    public var id: Self { self }
+
+    public var text: String {
+        switch self {
+        case .all: return NSLocalizedString("all", comment: "member criteria value")
+        }
+    }
+}
+
 public struct BusinessChatInfo: Decodable, Hashable {
     public var chatType: BusinessChatType
     public var businessId: String
@@ -2036,6 +2191,7 @@ public struct GroupMember: Identifiable, Decodable, Hashable {
     public var memberContactId: Int64?
     public var memberContactProfileId: Int64
     public var activeConn: Connection?
+    public var supportChat: GroupSupportChat?
     public var memberChatVRange: VersionRange
 
     public var id: String { "#\(groupId) @\(groupMemberId)" }
@@ -2087,14 +2243,27 @@ public struct GroupMember: Identifiable, Decodable, Hashable {
         ? String.localizedStringWithFormat(NSLocalizedString("Past member %@", comment: "past/unknown group member"), name)
         : name
     }
+    
+    public var localAliasAndFullName: String {
+        get {
+            let p = memberProfile
+            let fullName = p.displayName + (p.fullName == "" || p.fullName == p.displayName ? "" : " / \(p.fullName)")
+            let name = p.localAlias == "" ? fullName : "\(p.localAlias) (\(fullName))"
+
+            return pastMember(name)
+        }
+    }
 
     public var memberActive: Bool {
         switch memberStatus {
+        case .memRejected: return false
         case .memRemoved: return false
         case .memLeft: return false
         case .memGroupDeleted: return false
         case .memUnknown: return false
         case .memInvited: return false
+        case .memPendingApproval: return true
+        case .memPendingReview: return true
         case .memIntroduced: return false
         case .memIntroInvited: return false
         case .memAccepted: return false
@@ -2107,11 +2276,14 @@ public struct GroupMember: Identifiable, Decodable, Hashable {
 
     public var memberCurrent: Bool {
         switch memberStatus {
+        case .memRejected: return false
         case .memRemoved: return false
         case .memLeft: return false
         case .memGroupDeleted: return false
         case .memUnknown: return false
         case .memInvited: return false
+        case .memPendingApproval: return false
+        case .memPendingReview: return false
         case .memIntroduced: return true
         case .memIntroInvited: return true
         case .memAccepted: return true
@@ -2122,6 +2294,18 @@ public struct GroupMember: Identifiable, Decodable, Hashable {
         }
     }
 
+    public var memberPending: Bool {
+        switch memberStatus {
+        case .memPendingApproval: return true
+        case .memPendingReview: return true
+        default: return false
+        }
+    }
+
+    public var memberCurrentOrPending: Bool {
+        memberCurrent || memberPending
+    }
+
     public func canBeRemoved(groupInfo: GroupInfo) -> Bool {
         let userRole = groupInfo.membership.memberRole
         return memberStatus != .memRemoved && memberStatus != .memLeft
@@ -2175,6 +2359,13 @@ public struct GroupMember: Identifiable, Decodable, Hashable {
     )
 }
 
+public struct GroupSupportChat: Codable, Hashable {
+    public var chatTs: Date
+    public var unread: Int
+    public var memberAttention: Int
+    public var mentions: Int
+}
+
 public struct GroupMemberSettings: Codable, Hashable {
     public var showMessages: Bool
 }
@@ -2237,11 +2428,14 @@ public enum GroupMemberCategory: String, Decodable, Hashable {
 }
 
 public enum GroupMemberStatus: String, Decodable, Hashable {
+    case memRejected = "rejected"
     case memRemoved = "removed"
     case memLeft = "left"
     case memGroupDeleted = "deleted"
     case memUnknown = "unknown"
     case memInvited = "invited"
+    case memPendingApproval = "pending_approval"
+    case memPendingReview = "pending_review"
     case memIntroduced = "introduced"
     case memIntroInvited = "intro-inv"
     case memAccepted = "accepted"
@@ -2252,11 +2446,14 @@ public enum GroupMemberStatus: String, Decodable, Hashable {
 
     public var text: LocalizedStringKey {
         switch self {
+        case .memRejected: return "rejected"
         case .memRemoved: return "removed"
         case .memLeft: return "left"
         case .memGroupDeleted: return "group deleted"
         case .memUnknown: return "unknown status"
         case .memInvited: return "invited"
+        case .memPendingApproval: return "pending approval"
+        case .memPendingReview: return "pending review"
         case .memIntroduced: return "connecting (introduced)"
         case .memIntroInvited: return "connecting (introduction invitation)"
         case .memAccepted: return "connecting (accepted)"
@@ -2269,11 +2466,14 @@ public enum GroupMemberStatus: String, Decodable, Hashable {
 
     public var shortText: LocalizedStringKey {
         switch self {
+        case .memRejected: return "rejected"
         case .memRemoved: return "removed"
         case .memLeft: return "left"
         case .memGroupDeleted: return "group deleted"
         case .memUnknown: return "unknown"
         case .memInvited: return "invited"
+        case .memPendingApproval: return "pending"
+        case .memPendingReview: return "review"
         case .memIntroduced: return "connecting"
         case .memIntroInvited: return "connecting"
         case .memAccepted: return "connecting"
@@ -2296,7 +2496,6 @@ public struct NoteFolder: Identifiable, Decodable, NamedChat, Hashable {
     public var id: ChatId { get { "*\(noteFolderId)" } }
     public var apiId: Int64 { get { noteFolderId } }
     public var ready: Bool { get { true } }
-    public var sendMsgEnabled: Bool { get { true } }
     public var displayName: String { get { ChatInfo.privateNotesChatName } }
     public var fullName: String { get { "" } }
     public var image: String? { get { nil } }
@@ -2338,16 +2537,29 @@ public enum ConnectionEntity: Decodable, Hashable {
 
     public var id: String? {
         switch self {
-        case let .rcvDirectMsgConnection(_, contact):
-            return contact?.id
+        case let .rcvDirectMsgConnection(conn, contact):
+            contact?.id ?? conn.id
         case let .rcvGroupMsgConnection(_, _, groupMember):
-            return groupMember.id
+            groupMember.id
         case let .userContactConnection(_, userContact):
-            return userContact.id
+            userContact.id
         default:
-            return nil
+            nil
         }
     }
+    
+    // public var localDisplayName: String? {
+    //     switch self {
+    //     case let .rcvDirectMsgConnection(conn, contact):
+    //         if let name = contact?.localDisplayName { "@\(name)" } else { conn.id }
+    //     case let .rcvGroupMsgConnection(_, g, m):
+    //         "#\(g.localDisplayName) @\(m.localDisplayName)"
+    //     case let .userContactConnection(_, userContact):
+    //         userContact.id
+    //     default:
+    //         nil
+    //     }
+    // }
 
     public var conn: Connection {
         switch self {
@@ -2361,10 +2573,11 @@ public enum ConnectionEntity: Decodable, Hashable {
 }
 
 public struct NtfConn: Decodable, Hashable {
-    public var user_: User?
-    public var connEntity_: ConnectionEntity?
+    public var user: User
+    public var agentConnId: String
+    public var agentDbQueueId: Int64
+    public var connEntity: ConnectionEntity
     public var expectedMsg_: NtfMsgInfo?
-
 }
 
 public struct NtfMsgInfo: Decodable, Hashable {
@@ -2372,6 +2585,44 @@ public struct NtfMsgInfo: Decodable, Hashable {
     public var msgTs: Date
 }
 
+public enum RcvNtfMsgInfo: Decodable {
+    case info(ntfMsgInfo: NtfMsgInfo?)
+    case error(ntfMsgError: AgentErrorType)
+    
+    @inline(__always)
+    public var noMsg: Bool {
+        if case let .info(msg) = self { msg == nil } else { true }
+    }
+
+    @inline(__always)
+    public var isError: Bool {
+        if case .error = self { true } else { false }
+    }
+}
+
+let iso8601DateFormatter = {
+    let f = ISO8601DateFormatter()
+    f.formatOptions = [.withInternetDateTime]
+    return f
+}()
+
+// used in apiGetConnNtfMessages
+public struct ConnMsgReq {
+    public var msgConnId: String
+    public var msgDbQueueId: Int64
+    public var msgTs: Date // SystemTime encodes as a number, should be taken from NtfMsgInfo
+
+    public init(msgConnId: String, msgDbQueueId: Int64, msgTs: Date) {
+        self.msgConnId = msgConnId
+        self.msgDbQueueId = msgDbQueueId
+        self.msgTs = msgTs
+    }
+
+    public var cmdString: String {
+        "\(msgConnId):\(msgDbQueueId):\(iso8601DateFormatter.string(from: msgTs))"
+    }
+}
+
 public struct NtfMsgAckInfo: Decodable, Hashable {
     public var msgId: String
     public var msgTs_: Date?
@@ -2385,12 +2636,27 @@ public struct ChatItemDeletion: Decodable, Hashable {
 public struct AChatItem: Decodable, Hashable {
     public var chatInfo: ChatInfo
     public var chatItem: ChatItem
+}
 
-    public var chatId: String {
-        if case let .groupRcv(groupMember) = chatItem.chatDir {
-            return groupMember.id
-        }
-        return chatInfo.id
+public struct CIMentionMember: Decodable, Hashable {
+    public var groupMemberId: Int64
+    public var displayName: String
+    public var localAlias: String?
+    public var memberRole: GroupMemberRole
+}
+
+public struct CIMention: Decodable, Hashable {
+    public var memberId: String
+    public var memberRef: CIMentionMember?
+    
+    public init(groupMember m: GroupMember) {
+        self.memberId = m.memberId
+        self.memberRef = CIMentionMember(
+            groupMemberId: m.groupMemberId,
+            displayName: m.memberProfile.displayName,
+            localAlias: m.memberProfile.localAlias,
+            memberRole: m.memberRole
+        )
     }
 }
 
@@ -2412,11 +2678,12 @@ public struct CIReaction: Decodable, Hashable {
 }
 
 public struct ChatItem: Identifiable, Decodable, Hashable {
-    public init(chatDir: CIDirection, meta: CIMeta, content: CIContent, formattedText: [FormattedText]? = nil, quotedItem: CIQuote? = nil, reactions: [CIReactionCount] = [], file: CIFile? = nil) {
+    public init(chatDir: CIDirection, meta: CIMeta, content: CIContent, formattedText: [FormattedText]? = nil, mentions: [String: CIMention]? = nil, quotedItem: CIQuote? = nil, reactions: [CIReactionCount] = [], file: CIFile? = nil) {
         self.chatDir = chatDir
         self.meta = meta
         self.content = content
         self.formattedText = formattedText
+        self.mentions = mentions
         self.quotedItem = quotedItem
         self.reactions = reactions
         self.file = file
@@ -2426,6 +2693,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
     public var meta: CIMeta
     public var content: CIContent
     public var formattedText: [FormattedText]?
+    public var mentions: [String: CIMention]?
     public var quotedItem: CIQuote?
     public var reactions: [CIReactionCount]
     public var file: CIFile?
@@ -2434,7 +2702,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
     public var isLiveDummy: Bool = false
 
     private enum CodingKeys: String, CodingKey {
-        case chatDir, meta, content, formattedText, quotedItem, reactions, file
+        case chatDir, meta, content, formattedText, mentions, quotedItem, reactions, file
     }
 
     public var id: Int64 { meta.itemId }
@@ -2487,12 +2755,15 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
             case .userDeleted: nil
             case .groupDeleted: nil
             case .memberCreatedContact: nil
+            case .newMemberPendingReview: nil
             default: .rcvGroupEvent
             }
         case let .sndGroupEvent(event):
             switch event {
             case .userRole: nil
             case .userLeft: nil
+            case .memberAccepted: nil
+            case .userPendingReview: nil
             default: .sndGroupEvent
             }
         default:
@@ -2525,6 +2796,8 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
             switch rcvGroupEvent {
             case .groupUpdated: return false
             case .memberConnected: return false
+            case .memberAccepted: return false
+            case .userAccepted: return false
             case .memberRole: return false
             case .memberBlocked: return false
             case .userRole: return true
@@ -2536,6 +2809,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
             case .invitedViaGroupLink: return false
             case .memberCreatedContact: return false
             case .memberProfileUpdated: return false
+            case .newMemberPendingReview: return true
             }
         case .sndGroupEvent: return false
         case .rcvConnEvent: return false
@@ -2604,12 +2878,12 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
 
     public func memberToModerate(_ chatInfo: ChatInfo) -> (GroupInfo, GroupMember?)? {
         switch (chatInfo, chatDir) {
-        case let (.group(groupInfo), .groupRcv(groupMember)):
+        case let (.group(groupInfo, _), .groupRcv(groupMember)):
             let m = groupInfo.membership
             return m.memberRole >= .admin && m.memberRole >= groupMember.memberRole && meta.itemDeleted == nil
                     ? (groupInfo, groupMember)
                     : nil
-        case let (.group(groupInfo), .groupSnd):
+        case let (.group(groupInfo, _), .groupSnd):
             let m = groupInfo.membership
             return m.memberRole >= .admin ? (groupInfo, nil) : nil
         default: return nil
@@ -2745,6 +3019,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
                 itemDeleted: nil,
                 itemEdited: false,
                 itemLive: false,
+                userMention: false,
                 deletable: false,
                 editable: false
             ),
@@ -2767,6 +3042,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
                 itemDeleted: nil,
                 itemEdited: false,
                 itemLive: false,
+                userMention: false,
                 deletable: false,
                 editable: false
             ),
@@ -2789,6 +3065,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
                 itemDeleted: nil,
                 itemEdited: false,
                 itemLive: true,
+                userMention: false,
                 deletable: false,
                 editable: false
             ),
@@ -2800,7 +3077,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
         return item
     }
 
-    public static func invalidJSON(chatDir: CIDirection?, meta: CIMeta?, json: String) -> ChatItem {
+    public static func invalidJSON(chatDir: CIDirection?, meta: CIMeta?, json: Data?) -> ChatItem {
         ChatItem(
             chatDir: chatDir ?? .directSnd,
             meta: meta ?? .invalidJSON,
@@ -2862,6 +3139,7 @@ public struct CIMeta: Decodable, Hashable {
     public var itemEdited: Bool
     public var itemTimed: CITimed?
     public var itemLive: Bool?
+    public var userMention: Bool
     public var deletable: Bool
     public var editable: Bool
 
@@ -2886,6 +3164,7 @@ public struct CIMeta: Decodable, Hashable {
             itemDeleted: itemDeleted,
             itemEdited: itemEdited,
             itemLive: itemLive,
+            userMention: false,
             deletable: deletable,
             editable: editable
         )
@@ -2902,6 +3181,7 @@ public struct CIMeta: Decodable, Hashable {
             itemDeleted: nil,
             itemEdited: false,
             itemLive: false,
+            userMention: false,
             deletable: false,
             editable: false
         )
@@ -2985,6 +3265,21 @@ public enum CIStatus: Decodable, Hashable {
         }
     }
 
+    // as in corresponds to SENT response from agent, opposed to `sent` which means snd status
+    public var isSent: Bool {
+        switch self {
+        case .sndNew: false
+        case .sndSent: true
+        case .sndRcvd: false
+        case .sndErrorAuth: true
+        case .sndError: true
+        case .sndWarning: true
+        case .rcvNew: false
+        case .rcvRead: false
+        case .invalid: false
+        }
+    }
+
     public func statusIcon(_ metaColor: Color, _ paleMetaColor: Color, _ primaryColor: Color = .accentColor) -> (Image, Color)? {
         switch self {
         case .sndNew: nil
@@ -3038,6 +3333,17 @@ public enum CIStatus: Decodable, Hashable {
     }
 }
 
+public func shouldKeepOldSndCIStatus(oldStatus: CIStatus, newStatus: CIStatus) -> Bool {
+    switch (oldStatus, newStatus) {
+    case (.sndRcvd, let new) where !new.isSndRcvd:
+        return true
+    case (let old, .sndNew) where old.isSent:
+        return true
+    default:
+        return false
+    }
+}
+
 public enum SndError: Decodable, Hashable {
     case auth
     case quota
@@ -3182,6 +3488,20 @@ public enum CIForwardedFrom: Decodable, Hashable {
         }
     }
 
+    public var chatTypeApiIdMsgId: (ChatType, Int64, ChatItem.ID?)? {
+        switch self {
+        case .unknown: nil
+        case let .contact(_, _, contactId, msgId):
+            if let contactId {
+                (ChatType.direct, contactId, msgId)
+            } else { nil }
+        case let .group(_, _, groupId, msgId):
+            if let groupId {
+                (ChatType.group, groupId, msgId)
+            } else { nil }
+        }
+    }
+
     public func text(_ chatType: ChatType) -> LocalizedStringKey {
         chatType == .local
         ? (chatName == "" ? "saved" : "saved from \(chatName)")
@@ -3230,7 +3550,7 @@ public enum CIContent: Decodable, ItemContent, Hashable {
     case rcvDirectE2EEInfo(e2eeInfo: E2EEInfo)
     case sndGroupE2EEInfo(e2eeInfo: E2EEInfo)
     case rcvGroupE2EEInfo(e2eeInfo: E2EEInfo)
-    case invalidJSON(json: String)
+    case invalidJSON(json: Data?)
 
     public var text: String {
         get {
@@ -3450,8 +3770,12 @@ extension MsgReaction: Decodable {
             let type = try container.decode(String.self, forKey: CodingKeys.type)
             switch type {
             case "emoji":
-                let emoji = try container.decode(MREmojiChar.self, forKey: CodingKeys.emoji)
-                self = .emoji(emoji: emoji)
+                do {
+                    let emoji = try container.decode(MREmojiChar.self, forKey: CodingKeys.emoji)
+                    self = .emoji(emoji: emoji)
+                } catch {
+                    self = .unknown(type: "emoji")
+                }
             default:
                 self = .unknown(type: type)
             }
@@ -3725,7 +4049,7 @@ public enum FileError: Decodable, Equatable, Hashable {
     public var errorInfo: String {
         switch self {
         case .auth: NSLocalizedString("Wrong key or unknown file chunk address - most likely file is deleted.", comment: "file error text")
-        case let .blocked(_, info): NSLocalizedString("File is blocked by server operator:\n\(info.reason.text).", comment: "file error text")
+        case let .blocked(_, info): String.localizedStringWithFormat(NSLocalizedString("File is blocked by server operator:\n%@.", comment: "file error text"), info.reason.text)
         case .noFile: NSLocalizedString("File not found - most likely file was deleted or cancelled.", comment: "file error text")
         case let .relay(srvError): String.localizedStringWithFormat(NSLocalizedString("File server error: %@", comment: "file error text"), srvError.errorInfo)
         case let .other(fileError): String.localizedStringWithFormat(NSLocalizedString("Error: %@", comment: "file error text"), fileError)
@@ -3809,7 +4133,7 @@ public enum MsgContent: Equatable, Hashable {
         }
     }
 
-    var cmdString: String {
+    public var cmdString: String {
         "json \(encodeJSON(self))"
     }
 
@@ -3919,10 +4243,26 @@ extension MsgContent: Encodable {
     }
 }
 
+public enum MsgContentTag: String {
+    case text
+    case link
+    case image
+    case video
+    case voice
+    case file
+    case report
+}
+
 public struct FormattedText: Decodable, Hashable {
     public var text: String
     public var format: Format?
 
+    public static func plain(_ text: String) -> [FormattedText] {
+        text.isEmpty
+        ? []
+        : [FormattedText(text: text, format: nil)]
+    }
+
     public var isSecret: Bool {
         if case .secret = format { true } else { false }
     }
@@ -3937,6 +4277,7 @@ public enum Format: Decodable, Equatable, Hashable {
     case colored(color: FormatColor)
     case uri
     case simplexLink(linkType: SimplexLinkType, simplexUri: String, smpHosts: [String])
+    case mention(memberName: String)
     case email
     case phone
 
@@ -3954,12 +4295,14 @@ public enum SimplexLinkType: String, Decodable, Hashable {
     case contact
     case invitation
     case group
+    case channel
 
     public var description: String {
         switch self {
         case .contact: return NSLocalizedString("SimpleX contact address", comment: "simplex link type")
         case .invitation: return NSLocalizedString("SimpleX one-time invitation", comment: "simplex link type")
         case .group: return NSLocalizedString("SimpleX group link", comment: "simplex link type")
+        case .channel: return NSLocalizedString("SimpleX channel link", comment: "simplex link type")
         }
     }
 }
@@ -3974,18 +4317,16 @@ public enum FormatColor: String, Decodable, Hashable {
     case black = "black"
     case white = "white"
 
-    public var uiColor: Color {
-        get {
-            switch (self) {
-            case .red: return .red
-            case .green: return .green
-            case .blue: return .blue
-            case .yellow: return .yellow
-            case .cyan: return .cyan
-            case .magenta: return .purple
-            case .black: return .primary
-            case .white: return .primary
-            }
+    public var uiColor: Color? {
+        switch (self) {
+        case .red: .red
+        case .green: .green
+        case .blue: .blue
+        case .yellow: .yellow
+        case .cyan: .cyan
+        case .magenta: .purple
+        case .black: nil
+        case .white: nil
         }
     }
 }
@@ -4010,6 +4351,14 @@ public enum ReportReason: Hashable {
         case let .unknown(type): return type
         }
     }
+    
+    public var attrString: NSAttributedString {
+        let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body)
+        return NSAttributedString(string: text.isEmpty ? self.text : "\(self.text): ", attributes: [
+            .font: UIFont(descriptor: descr.withSymbolicTraits(.traitItalic) ?? descr, size: 0),
+            .foregroundColor: UIColor(Color.red)
+        ])
+    }
 }
 
 extension ReportReason: Encodable {
@@ -4061,9 +4410,61 @@ public enum NtfTknStatus: String, Decodable, Hashable {
     case new = "NEW"
     case registered = "REGISTERED"
     case invalid = "INVALID"
+    case invalidBad = "INVALID,BAD"
+    case invalidTopic = "INVALID,TOPIC"
+    case invalidExpired = "INVALID,EXPIRED"
+    case invalidUnregistered = "INVALID,UNREGISTERED"
     case confirmed = "CONFIRMED"
     case active = "ACTIVE"
     case expired = "EXPIRED"
+
+    public var workingToken: Bool {
+        switch self {
+        case .new: true
+        case .registered: true
+        case .invalid: false
+        case .invalidBad: false
+        case .invalidTopic: false
+        case .invalidExpired: false
+        case .invalidUnregistered: false
+        case .confirmed: true
+        case .active: true
+        case .expired: false
+        }
+    }
+
+    public var text: String {
+        switch self {
+        case .new: NSLocalizedString("New", comment: "token status text")
+        case .registered: NSLocalizedString("Registered", comment: "token status text")
+        case .invalid: NSLocalizedString("Invalid", comment: "token status text")
+        case .invalidBad: NSLocalizedString("Invalid (bad token)", comment: "token status text")
+        case .invalidTopic: NSLocalizedString("Invalid (wrong topic)", comment: "token status text")
+        case .invalidExpired: NSLocalizedString("Invalid (expired)", comment: "token status text")
+        case .invalidUnregistered: NSLocalizedString("Invalid (unregistered)", comment: "token status text")
+        case .confirmed: NSLocalizedString("Confirmed", comment: "token status text")
+        case .active: NSLocalizedString("Active", comment: "token status text")
+        case .expired: NSLocalizedString("Expired", comment: "token status text")
+        }
+    }
+    
+    public func info(register: Bool) -> String {
+        switch self {
+        case .new: return NSLocalizedString("Please wait for token to be registered.", comment: "token info")
+        case .registered: fallthrough
+        case .confirmed: return NSLocalizedString("Please wait for token activation to complete.", comment: "token info")
+        case .active: return NSLocalizedString("You should receive notifications.", comment: "token info")
+        case .invalid: fallthrough
+        case .invalidBad: fallthrough
+        case .invalidTopic: fallthrough
+        case .invalidExpired: fallthrough
+        case .invalidUnregistered: fallthrough
+        case .expired:
+            return register
+            ? NSLocalizedString("Register notification token?", comment: "token info")
+            : NSLocalizedString("Please try to disable and re-enable notfications.", comment: "token info")
+        }
+    }
 }
 
 public struct SndFileTransfer: Decodable, Hashable {
@@ -4189,6 +4590,8 @@ public enum RcvDirectEvent: Decodable, Hashable {
 public enum RcvGroupEvent: Decodable, Hashable {
     case memberAdded(groupMemberId: Int64, profile: Profile)
     case memberConnected
+    case memberAccepted(groupMemberId: Int64, profile: Profile)
+    case userAccepted
     case memberLeft
     case memberRole(groupMemberId: Int64, profile: Profile, role: GroupMemberRole)
     case memberBlocked(groupMemberId: Int64, profile: Profile, blocked: Bool)
@@ -4200,12 +4603,16 @@ public enum RcvGroupEvent: Decodable, Hashable {
     case invitedViaGroupLink
     case memberCreatedContact
     case memberProfileUpdated(fromProfile: Profile, toProfile: Profile)
+    case newMemberPendingReview
 
     var text: String {
         switch self {
         case let .memberAdded(_, profile):
             return String.localizedStringWithFormat(NSLocalizedString("invited %@", comment: "rcv group event chat item"), profile.profileViewName)
         case .memberConnected: return NSLocalizedString("member connected", comment: "rcv group event chat item")
+        case let .memberAccepted(_, profile):
+            return String.localizedStringWithFormat(NSLocalizedString("accepted %@", comment: "rcv group event chat item"), profile.profileViewName)
+        case .userAccepted: return NSLocalizedString("accepted you", comment: "rcv group event chat item")
         case .memberLeft: return NSLocalizedString("left", comment: "rcv group event chat item")
         case let .memberRole(_, profile, role):
             return  String.localizedStringWithFormat(NSLocalizedString("changed role of %@ to %@", comment: "rcv group event chat item"), profile.profileViewName, role.text)
@@ -4225,6 +4632,7 @@ public enum RcvGroupEvent: Decodable, Hashable {
         case .invitedViaGroupLink: return NSLocalizedString("invited via your group link", comment: "rcv group event chat item")
         case .memberCreatedContact: return NSLocalizedString("connected directly", comment: "rcv group event chat item")
         case let .memberProfileUpdated(fromProfile, toProfile): return profileUpdatedText(fromProfile, toProfile)
+        case .newMemberPendingReview: return NSLocalizedString("New member wants to join the group.", comment: "rcv group event chat item")
         }
     }
 
@@ -4249,6 +4657,8 @@ public enum SndGroupEvent: Decodable, Hashable {
     case memberDeleted(groupMemberId: Int64, profile: Profile)
     case userLeft
     case groupUpdated(groupProfile: GroupProfile)
+    case memberAccepted(groupMemberId: Int64, profile: Profile)
+    case userPendingReview
 
     var text: String {
         switch self {
@@ -4266,6 +4676,9 @@ public enum SndGroupEvent: Decodable, Hashable {
             return String.localizedStringWithFormat(NSLocalizedString("you removed %@", comment: "snd group event chat item"), profile.profileViewName)
         case .userLeft: return NSLocalizedString("you left", comment: "snd group event chat item")
         case .groupUpdated: return NSLocalizedString("group profile updated", comment: "snd group event chat item")
+        case .memberAccepted: return NSLocalizedString("you accepted this member", comment: "snd group event chat item")
+        case .userPendingReview:
+            return NSLocalizedString("Please wait for group moderators to review your request to join the group.", comment: "snd group event chat item")
         }
     }
 }
diff --git a/apps/ios/SimpleXChat/ChatUtils.swift b/apps/ios/SimpleXChat/ChatUtils.swift
index 2bf861f437..6f80629932 100644
--- a/apps/ios/SimpleXChat/ChatUtils.swift
+++ b/apps/ios/SimpleXChat/ChatUtils.swift
@@ -16,7 +16,7 @@ public protocol ChatLike {
 
 extension ChatLike {
     public func groupFeatureEnabled(_ feature: GroupFeature) -> Bool {
-        if case let .group(groupInfo) = self.chatInfo {
+        if case let .group(groupInfo, _) = self.chatInfo {
             let p = groupInfo.fullGroupPreferences
             return switch feature {
             case .timedMessages: p.timedMessages.on
@@ -27,6 +27,7 @@ extension ChatLike {
             case .files: p.files.on(for: groupInfo.membership)
             case .simplexLinks: p.simplexLinks.on(for: groupInfo.membership)
             case .history: p.history.on
+            case .reports: p.reports.on
             }
         } else {
             return true
@@ -81,9 +82,9 @@ public func foundChat(_ chat: ChatLike, _ searchStr: String) -> Bool {
 
 private func canForwardToChat(_ cInfo: ChatInfo) -> Bool {
     switch cInfo {
-    case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
-    case let .group(groupInfo): groupInfo.sendMsgEnabled
-    case let .local(noteFolder): noteFolder.sendMsgEnabled
+    case let .direct(contact): cInfo.sendMsgEnabled && !contact.nextSendGrpInv
+    case .group: cInfo.sendMsgEnabled
+    case .local: cInfo.sendMsgEnabled
     case .contactRequest: false
     case .contactConnection: false
     case .invalidJSON: false
@@ -93,7 +94,7 @@ private func canForwardToChat(_ cInfo: ChatInfo) -> Bool {
 public func chatIconName(_ cInfo: ChatInfo) -> String {
     switch cInfo {
     case .direct: "person.crop.circle.fill"
-    case let .group(groupInfo):
+    case let .group(groupInfo, _):
         switch groupInfo.businessChat?.chatType {
         case .none: "person.2.circle.fill"
         case .business: "briefcase.circle.fill"
diff --git a/apps/ios/SimpleXChat/CryptoFile.swift b/apps/ios/SimpleXChat/CryptoFile.swift
index 0e539ba97c..dfe833f832 100644
--- a/apps/ios/SimpleXChat/CryptoFile.swift
+++ b/apps/ios/SimpleXChat/CryptoFile.swift
@@ -18,10 +18,10 @@ public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
     memcpy(ptr, (data as NSData).bytes, data.count)
     var cPath = path.cString(using: .utf8)!
     let cjson = chat_write_file(getChatCtrl(), &cPath, ptr, Int32(data.count))!
-    let d = fromCString(cjson).data(using: .utf8)!
+    let d = dataFromCString(cjson)! // TODO [unsafe]
     switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
     case let .result(cfArgs): return cfArgs
-    case let .error(err): throw RuntimeError(err)
+    case let .error(err): throw RuntimeError(err) // TODO [unsafe]
     }
 }
 
@@ -51,10 +51,10 @@ public func encryptCryptoFile(fromPath: String, toPath: String) throws -> Crypto
     var cFromPath = fromPath.cString(using: .utf8)!
     var cToPath = toPath.cString(using: .utf8)!
     let cjson = chat_encrypt_file(getChatCtrl(), &cFromPath, &cToPath)!
-    let d = fromCString(cjson).data(using: .utf8)!
+    let d = dataFromCString(cjson)! // TODO [unsafe]
     switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
     case let .result(cfArgs): return cfArgs
-    case let .error(err): throw RuntimeError(err)
+    case let .error(err): throw RuntimeError(err) // TODO [unsafe]
     }
 }
 
diff --git a/apps/ios/SimpleXChat/ErrorAlert.swift b/apps/ios/SimpleXChat/ErrorAlert.swift
index 5b9acc4fca..a433d2313b 100644
--- a/apps/ios/SimpleXChat/ErrorAlert.swift
+++ b/apps/ios/SimpleXChat/ErrorAlert.swift
@@ -37,22 +37,18 @@ public struct ErrorAlert: Error {
     }
 
     public init(_ error: any Error) {
-        self = if let chatResponse = error as? ChatResponse {
-            ErrorAlert(chatResponse)
+        self = if let e = error as? ChatError {
+            ErrorAlert(e)
         } else {
-            ErrorAlert(LocalizedStringKey(error.localizedDescription))
+            ErrorAlert("\(error.localizedDescription)")
         }
     }
 
     public init(_ chatError: ChatError) {
-        self = ErrorAlert("\(chatErrorString(chatError))")
-    }
-
-    public init(_ chatResponse: ChatResponse) {
-        self = if let networkErrorAlert = getNetworkErrorAlert(chatResponse) {
+        self = if let networkErrorAlert = getNetworkErrorAlert(chatError) {
             networkErrorAlert
         } else {
-            ErrorAlert("\(responseError(chatResponse))")
+            ErrorAlert("\(chatErrorString(chatError))")
         }
     }
 }
@@ -94,22 +90,21 @@ extension View {
     }
 }
 
-public func getNetworkErrorAlert(_ r: ChatResponse) -> ErrorAlert? {
-    switch r {
-    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
-        return ErrorAlert(title: "Connection timeout", message: "Please check your network connection with \(serverHostname(addr)) and try again.")
-    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .NETWORK))):
-        return ErrorAlert(title: "Connection error", message: "Please check your network connection with \(serverHostname(addr)) and try again.")
-    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .HOST))):
-        return ErrorAlert(title: "Connection error", message: "Server address is incompatible with network settings: \(serverHostname(addr)).")
-    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TRANSPORT(.version)))):
-        return ErrorAlert(title: "Connection error", message: "Server version is incompatible with your app: \(serverHostname(addr)).")
-    case let .chatCmdError(_, .errorAgent(.SMP(serverAddress, .PROXY(proxyErr)))):
-        return smpProxyErrorAlert(proxyErr, serverAddress)
-    case let .chatCmdError(_, .errorAgent(.PROXY(proxyServer, relayServer, .protocolError(.PROXY(proxyErr))))):
-        return proxyDestinationErrorAlert(proxyErr, proxyServer, relayServer)
-    default:
-        return nil
+public func getNetworkErrorAlert(_ e: ChatError) -> ErrorAlert? {
+    switch e {
+    case let .errorAgent(.BROKER(addr, .TIMEOUT)):
+        ErrorAlert(title: "Connection timeout", message: "Please check your network connection with \(serverHostname(addr)) and try again.")
+    case let .errorAgent(.BROKER(addr, .NETWORK)):
+        ErrorAlert(title: "Connection error", message: "Please check your network connection with \(serverHostname(addr)) and try again.")
+    case let .errorAgent(.BROKER(addr, .HOST)):
+        ErrorAlert(title: "Connection error", message: "Server address is incompatible with network settings: \(serverHostname(addr)).")
+    case let .errorAgent(.BROKER(addr, .TRANSPORT(.version))):
+        ErrorAlert(title: "Connection error", message: "Server version is incompatible with your app: \(serverHostname(addr)).")
+    case let .errorAgent(.SMP(serverAddress, .PROXY(proxyErr))):
+        smpProxyErrorAlert(proxyErr, serverAddress)
+    case let .errorAgent(.PROXY(proxyServer, relayServer, .protocolError(.PROXY(proxyErr)))):
+        proxyDestinationErrorAlert(proxyErr, proxyServer, relayServer)
+    default: nil
     }
 }
 
diff --git a/apps/ios/SimpleXChat/Notifications.swift b/apps/ios/SimpleXChat/Notifications.swift
index a922e3a816..70db4476d5 100644
--- a/apps/ios/SimpleXChat/Notifications.swift
+++ b/apps/ios/SimpleXChat/Notifications.swift
@@ -62,7 +62,7 @@ public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact,
 public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem, _ badgeCount: Int) -> UNMutableNotificationContent {
     let previewMode = ntfPreviewModeGroupDefault.get()
     var title: String
-    if case let .group(groupInfo) = cInfo, case let .groupRcv(groupMember) = cItem.chatDir {
+    if case let .group(groupInfo, _) = cInfo, case let .groupRcv(groupMember) = cItem.chatDir {
         title = groupMsgNtfTitle(groupInfo, groupMember, hideContent: previewMode == .hidden)
     } else {
         title = previewMode == .hidden ? contactHidden : "\(cInfo.chatViewName):"
@@ -203,6 +203,11 @@ func hideSecrets(_ cItem: ChatItem) -> String {
         }
         return res
     } else {
-        return cItem.text
+        let mc = cItem.content.msgContent
+        if case let .report(text, reason) = mc {
+            return String.localizedStringWithFormat(NSLocalizedString("Report: %@", comment: "report in notification"), text.isEmpty ? reason.text : text)
+        } else {
+            return cItem.text
+        }
     }
 }
diff --git a/apps/ios/SimpleXChat/dummy.m b/apps/ios/SimpleXChat/dummy.m
index 64fbc32dd3..d26e108520 100644
--- a/apps/ios/SimpleXChat/dummy.m
+++ b/apps/ios/SimpleXChat/dummy.m
@@ -21,4 +21,13 @@ DIR *opendir$INODE64(const char *name) {
     return opendir(name);
 }
 
+int readdir$INODE64(DIR *restrict dirp, struct dirent *restrict entry,
+                      struct dirent **restrict result) {
+    return readdir_r(dirp, entry, result);
+}
+
+DIR *fdopendir$INODE64(const char *name) {
+    return opendir(name);
+}
+
 #endif
diff --git a/apps/ios/SimpleXChat/hs_init.c b/apps/ios/SimpleXChat/hs_init.c
index 4731e7b829..e75173d6cf 100644
--- a/apps/ios/SimpleXChat/hs_init.c
+++ b/apps/ios/SimpleXChat/hs_init.c
@@ -29,10 +29,10 @@ void haskell_init_nse(void) {
     char *argv[] = {
         "simplex",
         "+RTS", // requires `hs_init_with_rtsopts`
-        "-A1m", // chunk size for new allocations
-        "-H1m", // initial heap size
+        "-A256k", // chunk size for new allocations
+        "-H512k", // initial heap size
         "-F0.5", // heap growth triggering GC
-        "-Fd1", // memory return
+        "-Fd0.3", // memory return
         "-c", // compacting garbage collector
         0
     };
diff --git a/apps/ios/bg.lproj/Localizable.strings b/apps/ios/bg.lproj/Localizable.strings
index f2059d5627..1f4ff88f78 100644
--- a/apps/ios/bg.lproj/Localizable.strings
+++ b/apps/ios/bg.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (може да се копира)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- гласови съобщения до 5 минути.\n- персонализирано време за изчезване.\n- история на редактиране.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 цветно!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(ново)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(това устройство v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Допринеси](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -148,6 +127,9 @@
 /* notification title */
 "%@ wants to connect!" = "%@ иска да се свърже!";
 
+/* format for date separator in chat */
+"%@, %@" = "%1$@, %2$@";
+
 /* No comment provided by engineer. */
 "%@, %@ and %lld members" = "%@, %@ и %lld членове";
 
@@ -214,9 +196,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld нови езици на интерфейса";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld секунда(и)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld секунди";
 
@@ -262,7 +241,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 ден";
 
 /* time interval */
@@ -271,12 +251,17 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 минута";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 месец";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 седмица";
 
+/* No comment provided by engineer. */
+"1-time link" = "Еднократен линк";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5 минути";
 
@@ -310,17 +295,26 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Откажи смяна на адрес?";
 
+/* No comment provided by engineer. */
+"About operators" = "За операторите";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "За SimpleX Chat";
 
 /* No comment provided by engineer. */
 "above, then choose:" = "по-горе, след това избери:";
 
+/* No comment provided by engineer. */
+"Accent" = "Акцент";
+
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Приеми";
 
+/* No comment provided by engineer. */
+"Accept conditions" = "Приеми условията";
+
 /* No comment provided by engineer. */
 "Accept connection request?" = "Приемане на заявка за връзка?";
 
@@ -328,15 +322,30 @@
 "Accept contact request from %@?" = "Приемане на заявка за контакт от %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Приеми инкогнито";
 
 /* call status */
 "accepted call" = "обаждането прието";
 
+/* No comment provided by engineer. */
+"Accepted conditions" = "Приети условия";
+
+/* No comment provided by engineer. */
+"Acknowledged" = "Потвърден";
+
+/* No comment provided by engineer. */
+"Acknowledgement errors" = "Грешки при потвърждението";
+
+/* No comment provided by engineer. */
+"Active connections" = "Активни връзки";
+
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Добавете адрес към вашия профил, така че вашите контакти да могат да го споделят с други хора. Актуализацията на профила ще бъде изпратена до вашите контакти.";
 
+/* No comment provided by engineer. */
+"Add friends" = "Добави приятели";
+
 /* No comment provided by engineer. */
 "Add profile" = "Добави профил";
 
@@ -346,18 +355,45 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Добави сървъри чрез сканиране на QR кодове.";
 
+/* No comment provided by engineer. */
+"Add team members" = "Добави членове на екипа";
+
 /* No comment provided by engineer. */
 "Add to another device" = "Добави към друго устройство";
 
 /* No comment provided by engineer. */
 "Add welcome message" = "Добави съобщение при посрещане";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "Добавете членовете на вашия екип към разговорите.";
+
+/* No comment provided by engineer. */
+"Added media & file servers" = "Добавени медийни и файлови сървъри";
+
+/* No comment provided by engineer. */
+"Added message servers" = "Добавени сървъри за съобщения";
+
+/* No comment provided by engineer. */
+"Additional accent" = "Допълнителен акцент";
+
+/* No comment provided by engineer. */
+"Additional accent 2" = "Допълнителен акцент 2";
+
+/* No comment provided by engineer. */
+"Additional secondary" = "Допълнителен вторичен";
+
 /* No comment provided by engineer. */
 "Address" = "Адрес";
 
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "Промяната на адреса ще бъде прекъсната. Ще се използва старият адрес за получаване.";
 
+/* No comment provided by engineer. */
+"Address or 1-time link?" = "Адрес или еднократен линк?";
+
+/* No comment provided by engineer. */
+"Address settings" = "Настройки на адреса";
+
 /* member role */
 "admin" = "админ";
 
@@ -373,6 +409,9 @@
 /* No comment provided by engineer. */
 "Advanced network settings" = "Разширени мрежови настройки";
 
+/* No comment provided by engineer. */
+"Advanced settings" = "Разширени настройки";
+
 /* chat item text */
 "agreeing encryption for %@…" = "съгласуване на криптиране за %@…";
 
@@ -388,6 +427,9 @@
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Всички данни се изтриват при въвеждане.";
 
+/* No comment provided by engineer. */
+"All data is kept private on your device." = "Всички данни се съхраняват поверително на вашето устройство.";
+
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Всички членове на групата ще останат свързани.";
 
@@ -403,6 +445,9 @@
 /* No comment provided by engineer. */
 "All new messages from %@ will be hidden!" = "Всички нови съобщения от %@ ще бъдат скрити!";
 
+/* profile dropdown */
+"All profiles" = "Всички профили";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Всички ваши контакти ще останат свързани.";
 
@@ -418,9 +463,15 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Позволи обаждания само ако вашият контакт ги разрешава.";
 
+/* No comment provided by engineer. */
+"Allow calls?" = "Позволи обаждания?";
+
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Позволи изчезващи съобщения само ако вашият контакт ги разрешава.";
 
+/* No comment provided by engineer. */
+"Allow downgrade" = "Позволи понижаване";
+
 /* No comment provided by engineer. */
 "Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Позволи необратимо изтриване на съобщение само ако вашият контакт го рарешава. (24 часа)";
 
@@ -436,6 +487,9 @@
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Разреши изпращането на изчезващи съобщения.";
 
+/* No comment provided by engineer. */
+"Allow sharing" = "Позволи споделяне";
+
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Позволи необратимо изтриване на изпратените съобщения. (24 часа)";
 
@@ -481,6 +535,9 @@
 /* pref value */
 "always" = "винаги";
 
+/* No comment provided by engineer. */
+"Always use private routing." = "Винаги използвай поверително рутиране.";
+
 /* No comment provided by engineer. */
 "Always use relay" = "Винаги използвай реле";
 
@@ -514,6 +571,9 @@
 /* No comment provided by engineer. */
 "App passcode is replaced with self-destruct passcode." = "Кода за достъп до приложение се заменя с код за самоунищожение.";
 
+/* No comment provided by engineer. */
+"App session" = "Сесия на приложението";
+
 /* No comment provided by engineer. */
 "App version" = "Версия на приложението";
 
@@ -526,9 +586,18 @@
 /* No comment provided by engineer. */
 "Apply" = "Приложи";
 
+/* No comment provided by engineer. */
+"Apply to" = "Приложи към";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Архивиране и качване";
 
+/* No comment provided by engineer. */
+"Archive contacts to chat later." = "Архивирайте контактите, за да разговаряте по-късно.";
+
+/* No comment provided by engineer. */
+"Archived contacts" = "Архивирани контакти";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Архивиране на база данни";
 
@@ -574,9 +643,15 @@
 /* No comment provided by engineer. */
 "Auto-accept images" = "Автоматично приемане на изображения";
 
+/* alert title */
+"Auto-accept settings" = "Автоматично приемане на настройки";
+
 /* No comment provided by engineer. */
 "Back" = "Назад";
 
+/* No comment provided by engineer. */
+"Background" = "Фон";
+
 /* No comment provided by engineer. */
 "Bad desktop address" = "Грешен адрес на настолното устройство";
 
@@ -592,12 +667,33 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Лошо ID на съобщението";
 
+/* No comment provided by engineer. */
+"Better calls" = "По-добри обаждания";
+
 /* No comment provided by engineer. */
 "Better groups" = "По-добри групи";
 
+/* No comment provided by engineer. */
+"Better message dates." = "По-добри дати на съобщението.";
+
 /* No comment provided by engineer. */
 "Better messages" = "По-добри съобщения";
 
+/* No comment provided by engineer. */
+"Better networking" = "Подобрена мрежа";
+
+/* No comment provided by engineer. */
+"Better notifications" = "Подобрени известия";
+
+/* No comment provided by engineer. */
+"Better security ✅" = "По-добра сигурност ✅";
+
+/* No comment provided by engineer. */
+"Better user experience" = "Подобрен интерфейс";
+
+/* No comment provided by engineer. */
+"Black" = "Черна";
+
 /* No comment provided by engineer. */
 "Block" = "Блокирай";
 
@@ -622,12 +718,19 @@
 /* rcv group event chat item */
 "blocked %@" = "блокиран %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "блокиран от админ";
 
 /* No comment provided by engineer. */
 "Blocked by admin" = "Блокиран от админ";
 
+/* No comment provided by engineer. */
+"Blur for better privacy." = "Размазване за по-добра поверителност.";
+
+/* No comment provided by engineer. */
+"Blur media" = "Размазване на медия";
+
 /* No comment provided by engineer. */
 "bold" = "удебелен";
 
@@ -649,6 +752,12 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Български, финландски, тайландски и украински - благодарение на потребителите и [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
+/* No comment provided by engineer. */
+"Business address" = "Бизнес адрес";
+
+/* No comment provided by engineer. */
+"Business chats" = "Бизнес чатове";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Чрез чат профил (по подразбиране) или [чрез връзка](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).";
 
@@ -667,9 +776,18 @@
 /* No comment provided by engineer. */
 "Calls" = "Обаждания";
 
+/* No comment provided by engineer. */
+"Calls prohibited!" = "Обажданията са забранени!";
+
 /* No comment provided by engineer. */
 "Camera not available" = "Камерата е неодстъпна";
 
+/* No comment provided by engineer. */
+"Can't call contact" = "Обаждането на контакта не е позволено";
+
+/* No comment provided by engineer. */
+"Can't call member" = "Обаждането на члена не е позволено";
+
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Не може да покани контакта!";
 
@@ -677,7 +795,7 @@
 "Can't invite contacts!" = "Не може да поканят контактите!";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Отказ";
 
 /* No comment provided by engineer. */
@@ -692,12 +810,18 @@
 /* alert title */
 "Cannot receive file" = "Файлът не може да бъде получен";
 
+/* snd error text */
+"Capacity exceeded - recipient did not receive previously sent messages." = "Капацитетът е надвишен - получателят не е получил предишно изпратените съобщения.";
+
 /* No comment provided by engineer. */
 "Cellular" = "Мобилна мрежа";
 
 /* No comment provided by engineer. */
 "Change" = "Промени";
 
+/* authentication reason */
+"Change chat profiles" = "Промени чат профилите";
+
 /* No comment provided by engineer. */
 "Change database passphrase?" = "Промяна на паролата на базата данни?";
 
@@ -723,7 +847,7 @@
 "Change self-destruct mode" = "Промени режима на самоунищожение";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Промени кода за достъп за самоунищожение";
 
 /* chat item text */
@@ -745,13 +869,13 @@
 "Chat console" = "Конзола";
 
 /* No comment provided by engineer. */
-"Chat database" = "База данни за чата";
+"Chat database" = "База данни";
 
 /* No comment provided by engineer. */
 "Chat database deleted" = "Базата данни на чата е изтрита";
 
 /* No comment provided by engineer. */
-"Chat database imported" = "Базата данни на чат е импортирана";
+"Chat database imported" = "Базата данни на е импортирана";
 
 /* No comment provided by engineer. */
 "Chat is running" = "Чатът работи";
@@ -991,16 +1115,19 @@
 "Correct name to %@?" = "Поправи име на %@?";
 
 /* No comment provided by engineer. */
-"Create" = "Създай";
+"Create" = "Създаване";
 
 /* No comment provided by engineer. */
-"Create a group using a random profile." = "Създай група с автоматично генериран профилл.";
+"Create 1-time link" = "Създаване на еднократна препратка";
+
+/* No comment provided by engineer. */
+"Create a group using a random profile." = "Създаване група с автоматично създаден профил.";
 
 /* server test step */
-"Create file" = "Създай файл";
+"Create file" = "Създаване на файл";
 
 /* No comment provided by engineer. */
-"Create group" = "Създай група";
+"Create group" = "Създаване на група";
 
 /* No comment provided by engineer. */
 "Create group link" = "Създай групов линк";
@@ -1021,7 +1148,7 @@
 "Create secret group" = "Създай тайна група";
 
 /* No comment provided by engineer. */
-"Create SimpleX address" = "Създай SimpleX адрес";
+"Create SimpleX address" = "Създаване на адрес в SimpleX";
 
 /* No comment provided by engineer. */
 "Create your profile" = "Създай своя профил";
@@ -1125,7 +1252,8 @@
 /* message decrypt error item */
 "Decryption error" = "Грешка при декриптиране";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "по подразбиране (%@)";
 
 /* No comment provided by engineer. */
@@ -1135,8 +1263,7 @@
 "default (yes)" = "по подразбиране (да)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Изтрий";
 
 /* No comment provided by engineer. */
@@ -1211,7 +1338,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Изтрий съобщението?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Изтрий съобщенията";
 
 /* No comment provided by engineer. */
@@ -1248,7 +1375,7 @@
 "deleted contact" = "изтрит контакт";
 
 /* rcv group event chat item */
-"deleted group" = "групата изтрита";
+"deleted group" = "групата е изтрита";
 
 /* No comment provided by engineer. */
 "Delivery" = "Доставка";
@@ -1358,14 +1485,14 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Не активирай";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Не показвай отново";
 
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Понижи версията и отвори чата";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Изтегли";
 
 /* No comment provided by engineer. */
@@ -1404,7 +1531,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Активиране (запазване на промените)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Активиране на автоматично изтриване на съобщения?";
 
 /* No comment provided by engineer. */
@@ -1603,7 +1730,7 @@
 "Error decrypting file" = "Грешка при декриптирането на файла";
 
 /* No comment provided by engineer. */
-"Error deleting chat database" = "Грешка при изтриване на чат базата данни";
+"Error deleting chat database" = "Грешка при изтриване на базата данни";
 
 /* No comment provided by engineer. */
 "Error deleting chat!" = "Грешка при изтриването на чата!";
@@ -1636,10 +1763,10 @@
 "Error encrypting database" = "Грешка при криптиране на базата данни";
 
 /* No comment provided by engineer. */
-"Error exporting chat database" = "Грешка при експортиране на чат базата данни";
+"Error exporting chat database" = "Грешка при експортиране на базата данни";
 
 /* No comment provided by engineer. */
-"Error importing chat database" = "Грешка при импортиране на чат базата данни";
+"Error importing chat database" = "Грешка при импортиране на базата данни";
 
 /* No comment provided by engineer. */
 "Error joining group" = "Грешка при присъединяване към група";
@@ -1650,7 +1777,7 @@
 /* alert title */
 "Error receiving file" = "Грешка при получаване на файл";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Грешка при отстраняване на член";
 
 /* No comment provided by engineer. */
@@ -1719,7 +1846,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Грешка: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Грешка: %@";
 
 /* No comment provided by engineer. */
@@ -1731,9 +1860,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Дори когато е деактивиран в разговора.";
 
-/* No comment provided by engineer. */
-"event happened" = "събитие се случи";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Изход без запазване";
 
@@ -2014,7 +2140,7 @@
 "Import" = "Импортиране";
 
 /* No comment provided by engineer. */
-"Import chat database?" = "Импортиране на чат база данни?";
+"Import chat database?" = "Импортиране на база данни?";
 
 /* No comment provided by engineer. */
 "Import database" = "Импортиране на база данни";
@@ -2493,7 +2619,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Множество профили за чат";
 
-/* swipe action */
+/* notification label action */
 "Mute" = "Без звук";
 
 /* No comment provided by engineer. */
@@ -2517,7 +2643,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Състояние на мрежата";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "никога";
 
 /* No comment provided by engineer. */
@@ -2620,8 +2746,9 @@
 "observer" = "наблюдател";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "изключено";
 
 /* blur media */
@@ -2633,7 +2760,8 @@
 /* feature offered item */
 "offered %@: %@" = "предлага %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ок";
 
 /* No comment provided by engineer. */
@@ -2699,7 +2827,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Само вашият контакт може да изпраща гласови съобщения.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Отвори";
 
 /* No comment provided by engineer. */
@@ -3006,7 +3134,7 @@
 "Reduced battery usage" = "Намалена консумация на батерията";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Отхвърляне";
 
 /* No comment provided by engineer. */
@@ -3133,7 +3261,7 @@
 "Safer groups" = "По-безопасни групи";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Запази";
 
 /* alert button */
@@ -3389,7 +3517,7 @@
 "Shape profile images" = "Променете формата на профилните изображения";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Сподели";
 
 /* No comment provided by engineer. */
@@ -3650,9 +3778,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Старата база данни не бе премахната по време на миграцията, тя може да бъде изтрита.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Профилът се споделя само с вашите контакти.";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Втората отметка, която пропуснахме! ✅";
 
@@ -3836,7 +3961,7 @@
 /* authentication reason */
 "Unlock app" = "Отключи приложението";
 
-/* swipe action */
+/* notification label action */
 "Unmute" = "Уведомявай";
 
 /* swipe action */
@@ -4281,10 +4406,10 @@
 "Your calls" = "Вашите обаждания";
 
 /* No comment provided by engineer. */
-"Your chat database" = "Вашата чат база данни";
+"Your chat database" = "Вашата база данни";
 
 /* No comment provided by engineer. */
-"Your chat database is not encrypted - set passphrase to encrypt it." = "Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.";
+"Your chat database is not encrypted - set passphrase to encrypt it." = "Вашата база данни не е криптирана - задайте парола, за да я криптирате.";
 
 /* No comment provided by engineer. */
 "Your chat profiles" = "Вашите чат профили";
@@ -4299,7 +4424,7 @@
 "Your contacts will remain connected." = "Вашите контакти ще останат свързани.";
 
 /* No comment provided by engineer. */
-"Your current chat database will be DELETED and REPLACED with the imported one." = "Вашата текуща чат база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.";
+"Your current chat database will be DELETED and REPLACED with the imported one." = "Вашата текуща база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.";
 
 /* No comment provided by engineer. */
 "Your current profile" = "Вашият текущ профил";
@@ -4320,10 +4445,10 @@
 "Your profile **%@** will be shared." = "Вашият профил **%@** ще бъде споделен.";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти. SimpleX сървърите не могат да видят вашия профил.";
+"Your profile is stored on your device and only shared with your contacts." = "Профилът се споделя само с вашите контакти.";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Вашият профил, контакти и доставени съобщения се съхраняват на вашето устройство.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти. SimpleX сървърите не могат да видят вашия профил.";
 
 /* No comment provided by engineer. */
 "Your random profile" = "Вашият автоматично генериран профил";
@@ -4335,8 +4460,5 @@
 "Your settings" = "Вашите настройки";
 
 /* No comment provided by engineer. */
-"Your SimpleX address" = "Вашият SimpleX адрес";
-
-/* No comment provided by engineer. */
-"Your SMP servers" = "Вашите SMP сървъри";
+"Your SimpleX address" = "Вашият адрес в SimpleX";
 
diff --git a/apps/ios/cs.lproj/Localizable.strings b/apps/ios/cs.lproj/Localizable.strings
index 837e76ebbf..a3a6ca8215 100644
--- a/apps/ios/cs.lproj/Localizable.strings
+++ b/apps/ios/cs.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (lze kopírovat)";
 
@@ -19,23 +13,11 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 5 minutové hlasové zprávy.\n- vlastní čas mizení.\n- historie úprav.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 barevný!";
 
 /* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
-/* No comment provided by engineer. */
-")" = ")";
+"(this device v%@)" = "(toto zařízení v%@)";
 
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Přispějte](https://github.com/simplex-chat/simplex-chat#contribute)";
@@ -109,6 +91,9 @@
 /* No comment provided by engineer. */
 "%@ connected" = "%@ připojen";
 
+/* No comment provided by engineer. */
+"%@ downloaded" = "%@ staženo";
+
 /* notification title */
 "%@ is connected!" = "%@ je připojen!";
 
@@ -118,9 +103,18 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ je ověřený";
 
+/* No comment provided by engineer. */
+"%@ server" = "%@ server";
+
+/* No comment provided by engineer. */
+"%@ servers" = "%@ servery";
+
 /* notification title */
 "%@ wants to connect!" = "%@ se chce připojit!";
 
+/* format for date separator in chat */
+"%@, %@" = "%1$@, %2$@";
+
 /* No comment provided by engineer. */
 "%@, %@ and %lld other members connected" = "%@, %@ a %lld ostatní členové připojeni";
 
@@ -130,6 +124,18 @@
 /* time interval */
 "%d days" = "%d dní";
 
+/* forward confirmation reason */
+"%d file(s) are still being downloaded." = "%d soubor(y) stále stahován(y).";
+
+/* forward confirmation reason */
+"%d file(s) failed to download." = "%d soubor(y) se nepodařilo stáhnout.";
+
+/* forward confirmation reason */
+"%d file(s) were deleted." = "%d soubor(y) smazán(y).";
+
+/* forward confirmation reason */
+"%d file(s) were not downloaded." = "%d soubor(y) nestažen(y).";
+
 /* time interval */
 "%d hours" = "%d hodin";
 
@@ -163,15 +169,21 @@
 /* No comment provided by engineer. */
 "%lld members" = "%lld členové";
 
+/* No comment provided by engineer. */
+"%lld messages blocked" = "%lld zprávy blokovaný";
+
+/* No comment provided by engineer. */
+"%lld messages blocked by admin" = "%lld zprávy blokovaný adminem";
+
+/* No comment provided by engineer. */
+"%lld messages marked deleted" = "%lld zprávy označeno jako smazáno";
+
 /* No comment provided by engineer. */
 "%lld minutes" = "%lld minut";
 
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%d nové jazyky rozhraní";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld vteřin";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld vteřin";
 
@@ -214,7 +226,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 den";
 
 /* time interval */
@@ -223,10 +236,12 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minutu";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 měsíc";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 týden";
 
 /* No comment provided by engineer. */
@@ -269,8 +284,8 @@
 "above, then choose:" = "výše, pak vyberte:";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Přijmout";
 
 /* No comment provided by engineer. */
@@ -280,7 +295,7 @@
 "Accept contact request from %@?" = "Přijmout žádost o kontakt od %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Přijmout inkognito";
 
 /* call status */
@@ -545,7 +560,7 @@
 "Can't invite contacts!" = "Nelze pozvat kontakty!";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Zrušit";
 
 /* feature offered item */
@@ -585,7 +600,7 @@
 "Change self-destruct mode" = "Změnit režim sebedestrukce";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Změnit sebedestrukční heslo";
 
 /* chat item text */
@@ -807,6 +822,9 @@
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Vytvořit nový profil v [desktop app](https://simplex.chat/downloads/). 💻";
 
+/* No comment provided by engineer. */
+"Create profile" = "Vytvořte si profil";
+
 /* server test step */
 "Create queue" = "Vytvořit frontu";
 
@@ -906,7 +924,8 @@
 /* message decrypt error item */
 "Decryption error" = "Chyba dešifrování";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "výchozí (%@)";
 
 /* No comment provided by engineer. */
@@ -916,8 +935,7 @@
 "default (yes)" = "výchozí (ano)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Smazat";
 
 /* No comment provided by engineer. */
@@ -983,7 +1001,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Smazat zprávu?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Smazat zprávy";
 
 /* No comment provided by engineer. */
@@ -1109,7 +1127,7 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Nepovolovat";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Znovu neukazuj";
 
 /* No comment provided by engineer. */
@@ -1142,7 +1160,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Povolit (zachovat přepsání)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Povolit automatické mazání zpráv?";
 
 /* No comment provided by engineer. */
@@ -1349,7 +1367,7 @@
 /* alert title */
 "Error receiving file" = "Chyba při příjmu souboru";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Chyba při odebrání člena";
 
 /* No comment provided by engineer. */
@@ -1406,7 +1424,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Chyba: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Chyba: %@";
 
 /* No comment provided by engineer. */
@@ -2012,7 +2032,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Více chatovacích profilů";
 
-/* swipe action */
+/* notification label action */
 "Mute" = "Ztlumit";
 
 /* No comment provided by engineer. */
@@ -2030,7 +2050,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Stav sítě";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "nikdy";
 
 /* notification */
@@ -2124,8 +2144,9 @@
 "observer" = "pozorovatel";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "vypnuto";
 
 /* blur media */
@@ -2137,7 +2158,8 @@
 /* feature offered item */
 "offered %@: %@" = "nabídl %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -2200,7 +2222,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Hlasové zprávy může odesílat pouze váš kontakt.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Otevřít";
 
 /* No comment provided by engineer. */
@@ -2432,7 +2454,7 @@
 "Reduced battery usage" = "Snížení spotřeby baterie";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Odmítnout";
 
 /* No comment provided by engineer. */
@@ -2532,7 +2554,7 @@
 "Run chat" = "Spustit chat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Uložit";
 
 /* alert button */
@@ -2746,7 +2768,7 @@
 "Settings" = "Nastavení";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Sdílet";
 
 /* No comment provided by engineer. */
@@ -2968,9 +2990,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Stará databáze nebyla během přenášení odstraněna, lze ji smazat.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Profil je sdílen pouze s vašimi kontakty.";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Druhé zaškrtnutí jsme přehlédli! ✅";
 
@@ -3100,7 +3119,7 @@
 /* authentication reason */
 "Unlock app" = "Odemknout aplikaci";
 
-/* swipe action */
+/* notification label action */
 "Unmute" = "Zrušit ztlumení";
 
 /* swipe action */
@@ -3452,10 +3471,10 @@
 "Your profile **%@** will be shared." = "Váš profil **%@** bude sdílen.";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty. Servery SimpleX nevidí váš profil.";
+"Your profile is stored on your device and only shared with your contacts." = "Profil je sdílen pouze s vašimi kontakty.";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty. Servery SimpleX nevidí váš profil.";
 
 /* No comment provided by engineer. */
 "Your random profile" = "Váš náhodný profil";
@@ -3469,6 +3488,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Vaše SimpleX adresa";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Vaše servery SMP";
-
diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings
index cad89ed29a..4be4ad96ba 100644
--- a/apps/ios/de.lproj/Localizable.strings
+++ b/apps/ios/de.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (kann kopiert werden)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- Bis zu 5 Minuten lange Sprachnachrichten\n- Zeitdauer für verschwindende Nachrichten anpassen\n- Nachrichtenverlauf bearbeiten";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 farbig!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(Neu)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(Dieses Gerät hat v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Unterstützen Sie uns](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d s";
 
+/* delete after time */
+"%d seconds(s)" = "%d Sekunde(n)";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d übersprungene Nachricht(en)";
 
@@ -241,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld neue Sprachen für die Bedienoberfläche";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld Sekunde(n)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld Sekunden";
 
@@ -289,8 +268,9 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
-"1 day" = "täglich";
+/* delete after time
+time interval */
+"1 day" = "Älter als ein Tag";
 
 /* time interval */
 "1 hour" = "1 Stunde";
@@ -298,11 +278,16 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 Minute";
 
-/* time interval */
-"1 month" = "monatlich";
+/* delete after time
+time interval */
+"1 month" = "Älter als ein Monat";
 
-/* time interval */
-"1 week" = "wöchentlich";
+/* delete after time
+time interval */
+"1 week" = "Älter als eine Woche";
+
+/* delete after time */
+"1 year" = "Älter als ein Jahr";
 
 /* No comment provided by engineer. */
 "1-time link" = "Einmal-Link";
@@ -344,7 +329,7 @@
 "Abort changing address?" = "Wechsel der Empfängeradresse beenden?";
 
 /* No comment provided by engineer. */
-"About operators" = "Über Betreiber";
+"About operators" = "Über die Betreiber";
 
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "Über SimpleX Chat";
@@ -356,10 +341,16 @@
 "Accent" = "Akzent";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Annehmen";
 
+/* alert action */
+"Accept as member" = "Als Mitglied übernehmen";
+
+/* alert action */
+"Accept as observer" = "Als Beobachter übernehmen";
+
 /* No comment provided by engineer. */
 "Accept conditions" = "Nutzungsbedingungen akzeptieren";
 
@@ -370,9 +361,15 @@
 "Accept contact request from %@?" = "Die Kontaktanfrage von %@ annehmen?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Inkognito akzeptieren";
 
+/* alert title */
+"Accept member" = "Mitglied übernehmen";
+
+/* rcv group event chat item */
+"accepted %@" = "%@ übernommen";
+
 /* call status */
 "accepted call" = "Anruf angenommen";
 
@@ -380,7 +377,10 @@
 "Accepted conditions" = "Akzeptierte Nutzungsbedingungen";
 
 /* chat list item title */
-"accepted invitation" = "Einladung akzeptiert";
+"accepted invitation" = "Einladung angenommen";
+
+/* rcv group event chat item */
+"accepted you" = "hat Sie übernommen";
 
 /* No comment provided by engineer. */
 "Acknowledged" = "Bestätigt";
@@ -388,6 +388,9 @@
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Fehler bei der Bestätigung";
 
+/* token status text */
+"Active" = "Aktiv";
+
 /* No comment provided by engineer. */
 "Active connections" = "Aktive Verbindungen";
 
@@ -397,14 +400,17 @@
 /* No comment provided by engineer. */
 "Add friends" = "Freunde aufnehmen";
 
+/* No comment provided by engineer. */
+"Add list" = "Liste hinzufügen";
+
 /* No comment provided by engineer. */
 "Add profile" = "Profil hinzufügen";
 
 /* No comment provided by engineer. */
-"Add server" = "Füge Server hinzu";
+"Add server" = "Server hinzufügen";
 
 /* No comment provided by engineer. */
-"Add servers by scanning QR codes." = "Fügen Sie Server durch Scannen der QR Codes hinzu.";
+"Add servers by scanning QR codes." = "Server durch Scannen von QR Codes hinzufügen.";
 
 /* No comment provided by engineer. */
 "Add team members" = "Team-Mitglieder aufnehmen";
@@ -412,6 +418,9 @@
 /* No comment provided by engineer. */
 "Add to another device" = "Einem anderen Gerät hinzufügen";
 
+/* No comment provided by engineer. */
+"Add to list" = "Zur Liste hinzufügen";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Begrüßungsmeldung hinzufügen";
 
@@ -469,12 +478,21 @@
 /* chat item text */
 "agreeing encryption…" = "Verschlüsselung zustimmen…";
 
+/* member criteria value */
+"all" = "alle";
+
+/* No comment provided by engineer. */
+"All" = "Alle";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Werden die App-Daten komplett gelöscht.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Es werden alle Chats und Nachrichten gelöscht. Dies kann nicht rückgängig gemacht werden!";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Alle Chats werden von der Liste %@ entfernt und danach wird die Liste gelöscht.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Alle Daten werden gelöscht, sobald dieser eingegeben wird.";
 
@@ -502,6 +520,12 @@
 /* profile dropdown */
 "All profiles" = "Alle Profile";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Alle Meldungen werden für Sie archiviert.";
+
+/* No comment provided by engineer. */
+"All servers" = "Alle Server";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Alle Ihre Kontakte bleiben verbunden.";
 
@@ -547,6 +571,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Unwiederbringliches löschen von gesendeten Nachrichten erlauben. (24 Stunden)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Melden von Nachrichten an Moderatoren erlauben.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Das Senden von Dateien und Medien erlauben.";
 
@@ -601,6 +628,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "und %lld weitere Ereignisse";
 
+/* report reason */
+"Another reason" = "Anderer Grund";
+
 /* No comment provided by engineer. */
 "Answer call" = "Anruf annehmen";
 
@@ -616,6 +646,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Neue lokale Dateien (außer Video-Dateien) werden von der App verschlüsselt.";
 
+/* No comment provided by engineer. */
+"App group:" = "App-Gruppe:";
+
 /* No comment provided by engineer. */
 "App icon" = "App-Icon";
 
@@ -643,15 +676,36 @@
 /* No comment provided by engineer. */
 "Apply to" = "Anwenden auf";
 
+/* No comment provided by engineer. */
+"Archive" = "Archiv";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Archiviere %lld Meldungen?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Alle Meldungen archivieren?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archivieren und Hochladen";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Kontakte für spätere Chats archivieren.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Meldung archivieren";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Meldung archivieren?";
+
+/* swipe action */
+"Archive reports" = "Meldungen archivieren";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Archivierte Kontakte";
 
+/* No comment provided by engineer. */
+"archived report" = "Archivierte Meldung";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Datenbank wird archiviert";
 
@@ -730,6 +784,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Bessere Gruppen";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Bessere Leistung von Gruppen";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Verbesserte Nachrichten-Datumsinformation";
 
@@ -742,6 +799,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Verbesserte Benachrichtigungen";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Bessere(r) Security und Datenschutz";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Verbesserte Sicherheit ✅";
 
@@ -775,7 +835,8 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ wurde blockiert";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "wurde vom Administrator blockiert";
 
 /* No comment provided by engineer. */
@@ -785,7 +846,7 @@
 "Blur for better privacy." = "Für bessere Privatsphäre verpixeln.";
 
 /* No comment provided by engineer. */
-"Blur media" = "Medium unscharf machen";
+"Blur media" = "Medium verpixeln";
 
 /* No comment provided by engineer. */
 "bold" = "fett";
@@ -814,9 +875,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Geschäftliche Chats";
 
+/* No comment provided by engineer. */
+"Businesses" = "Unternehmen";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Per Chat-Profil (Voreinstellung) oder [per Verbindung](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "Durch die Nutzung von SimpleX Chat erklären Sie sich damit einverstanden:\n- nur legale Inhalte in öffentlichen Gruppen zu versenden.\n- andere Nutzer zu respektieren - kein Spam.";
+
 /* No comment provided by engineer. */
 "call" = "Anrufen";
 
@@ -856,8 +923,11 @@
 /* No comment provided by engineer. */
 "Can't message member" = "Mitglied kann nicht benachrichtigt werden";
 
+/* No comment provided by engineer. */
+"can't send messages" = "Es können keine Nachrichten gesendet werden";
+
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Abbrechen";
 
 /* No comment provided by engineer. */
@@ -884,6 +954,9 @@
 /* No comment provided by engineer. */
 "Change" = "Ändern";
 
+/* alert title */
+"Change automatic message deletion?" = "Automatisches Löschen von Nachrichten ändern?";
+
 /* authentication reason */
 "Change chat profiles" = "Chat-Profile wechseln";
 
@@ -912,7 +985,7 @@
 "Change self-destruct mode" = "Selbstzerstörungs-Modus ändern";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Selbstzerstörungs-Zugangscode ändern";
 
 /* chat item text */
@@ -990,9 +1063,18 @@
 /* No comment provided by engineer. */
 "Chat will be deleted for you - this cannot be undone!" = "Der Chat wird für Sie gelöscht. Dies kann nicht rückgängig gemacht werden!";
 
+/* chat toolbar */
+"Chat with admins" = "Chat mit Administratoren";
+
+/* No comment provided by engineer. */
+"Chat with member" = "Chat mit einem Mitglied";
+
 /* No comment provided by engineer. */
 "Chats" = "Chats";
 
+/* No comment provided by engineer. */
+"Chats with members" = "Chats mit Mitgliedern";
+
 /* No comment provided by engineer. */
 "Check messages every 20 min." = "Alle 20min Nachrichten überprüfen.";
 
@@ -1032,6 +1114,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Chat-Inhalte entfernen?";
 
+/* No comment provided by engineer. */
+"Clear group?" = "Gruppe entfernen?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Gruppe entfernen oder löschen?";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "Private Notizen entfernen?";
 
@@ -1047,6 +1135,9 @@
 /* No comment provided by engineer. */
 "colored" = "farbig";
 
+/* report reason */
+"Community guidelines violation" = "Verstoß gegen die Gemeinschaftsrichtlinien";
+
 /* server test step */
 "Compare file" = "Datei vergleichen";
 
@@ -1071,12 +1162,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Nutzungsbedingungen";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Die Nutzungsbedingungen der aktivierten Betreiber werden nach 30 Tagen akzeptiert.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Die Nutzungsbedingungen der/des Betreiber(s) werden akzeptiert: **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Die Nutzungsbedingungen der/des Betreiber(s) werden akzeptiert: **%@**.";
 
@@ -1089,6 +1174,9 @@
 /* No comment provided by engineer. */
 "Configure ICE servers" = "ICE-Server konfigurieren";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Server-Betreiber konfigurieren";
+
 /* No comment provided by engineer. */
 "Confirm" = "Bestätigen";
 
@@ -1119,6 +1207,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Hochladen bestätigen";
 
+/* token status text */
+"Confirmed" = "Bestätigt";
+
 /* server test step */
 "Connect" = "Verbinden";
 
@@ -1218,6 +1309,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Verbindungs- und Server-Status.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Verbindung blockiert";
+
 /* No comment provided by engineer. */
 "Connection error" = "Verbindungsfehler";
 
@@ -1227,12 +1321,21 @@
 /* chat list item title (it should not be shown */
 "connection established" = "Verbindung hergestellt";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "Die Verbindung wurde vom Server-Betreiber blockiert:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "Verbindung noch nicht bereit.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Verbindungsbenachrichtigungen";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "Verbindungsanfrage wurde gesendet!";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "Die Verbindung erfordert eine Neuverhandlung der Verschlüsselung.";
+
 /* No comment provided by engineer. */
 "Connection security" = "Verbindungs-Sicherheit";
 
@@ -1260,9 +1363,15 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Der Kontakt ist bereits vorhanden";
 
+/* No comment provided by engineer. */
+"contact deleted" = "Kontakt gelöscht";
+
 /* No comment provided by engineer. */
 "Contact deleted!" = "Kontakt gelöscht!";
 
+/* No comment provided by engineer. */
+"contact disabled" = "Kontakt deaktiviert";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "Kontakt nutzt E2E-Verschlüsselung";
 
@@ -1281,6 +1390,9 @@
 /* No comment provided by engineer. */
 "Contact name" = "Kontaktname";
 
+/* No comment provided by engineer. */
+"contact not ready" = "Kontakt nicht bereit";
+
 /* No comment provided by engineer. */
 "Contact preferences" = "Kontakt-Präferenzen";
 
@@ -1293,6 +1405,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "Ihre Kontakte können Nachrichten zum Löschen markieren. Sie können diese Nachrichten trotzdem anschauen.";
 
+/* blocking reason */
+"Content violates conditions of use" = "Inhalt verletzt Nutzungsbedingungen";
+
 /* No comment provided by engineer. */
 "Continue" = "Weiter";
 
@@ -1335,6 +1450,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Link erzeugen";
 
+/* No comment provided by engineer. */
+"Create list" = "Liste erstellen";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Neues Profil in der [Desktop-App] erstellen (https://simplex.chat/downloads/). 💻";
 
@@ -1381,7 +1499,7 @@
 "Current passphrase…" = "Aktuelles Passwort…";
 
 /* No comment provided by engineer. */
-"Current profile" = "Aktueller Profil";
+"Current profile" = "Aktuelles Profil";
 
 /* No comment provided by engineer. */
 "Currently maximum supported file size is %@." = "Die derzeit maximal unterstützte Dateigröße beträgt %@.";
@@ -1476,8 +1594,9 @@
 /* No comment provided by engineer. */
 "decryption errors" = "Entschlüsselungs-Fehler";
 
-/* pref value */
-"default (%@)" = "Voreinstellung (%@)";
+/* delete after time
+pref value */
+"default (%@)" = "Default (%@)";
 
 /* No comment provided by engineer. */
 "default (no)" = "Voreinstellung (Nein)";
@@ -1486,8 +1605,7 @@
 "default (yes)" = "Voreinstellung (Ja)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Löschen";
 
 /* No comment provided by engineer. */
@@ -1514,12 +1632,18 @@
 /* No comment provided by engineer. */
 "Delete chat" = "Chat löschen";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Chat-Nachrichten von Ihrem Gerät löschen.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Chat-Profil löschen";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Chat-Profil löschen?";
 
+/* alert title */
+"Delete chat with member?" = "Chat mit dem Mitglied löschen?";
+
 /* No comment provided by engineer. */
 "Delete chat?" = "Chat löschen?";
 
@@ -1568,17 +1692,20 @@
 /* No comment provided by engineer. */
 "Delete link?" = "Link löschen?";
 
+/* alert title */
+"Delete list?" = "Liste löschen?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "Nachricht des Mitglieds löschen?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Die Nachricht löschen?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Nachrichten löschen";
 
 /* No comment provided by engineer. */
-"Delete messages after" = "Löschen der Nachrichten";
+"Delete messages after" = "Nachrichten löschen";
 
 /* No comment provided by engineer. */
 "Delete old database" = "Alte Datenbank löschen";
@@ -1598,6 +1725,9 @@
 /* server test step */
 "Delete queue" = "Lösche Warteschlange";
 
+/* No comment provided by engineer. */
+"Delete report" = "Meldung löschen";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Löschen Sie bis zu 20 Nachrichten auf einmal.";
 
@@ -1706,6 +1836,12 @@
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Deaktivieren (vorgenommene Einstellungen bleiben erhalten)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Automatisches Löschen von Nachrichten deaktivieren?";
+
+/* alert button */
+"Disable delete messages" = "Löschen von Nachrichten deaktivieren";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Für Alle deaktivieren";
 
@@ -1766,6 +1902,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "SimpleX NICHT für Notrufe nutzen.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Dokumente:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "Keine Adresse erstellt";
 
@@ -1773,13 +1912,19 @@
 "Don't enable" = "Nicht aktivieren";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Verpassen Sie keine wichtigen Nachrichten.";
+
+/* alert action */
 "Don't show again" = "Nicht nochmals anzeigen";
 
+/* No comment provided by engineer. */
+"Done" = "Fertig";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Datenbank herabstufen und den Chat öffnen";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Herunterladen";
 
 /* No comment provided by engineer. */
@@ -1836,14 +1981,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Aktivieren (vorgenommene Einstellungen bleiben erhalten)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Automatisches Löschen von Nachrichten aktivieren?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Kamera-Zugriff aktivieren";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Flux aktivieren";
+"Enable Flux in Network & servers settings for better metadata privacy." = "Für einen besseren Metadatenschutz Flux in den Netzwerk- und Servereinstellungen aktivieren.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Für Alle aktivieren";
@@ -1956,6 +2101,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "Neuaushandlung der Verschlüsselung von %@ notwendig";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Die Neuverhandlung der Verschlüsselung läuft.";
+
 /* No comment provided by engineer. */
 "ended" = "beendet";
 
@@ -2010,6 +2158,9 @@
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Fehler beim Annehmen der Kontaktanfrage";
 
+/* alert title */
+"Error accepting member" = "Fehler beim Übernehmen des Mitglieds";
+
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Fehler beim Hinzufügen von Mitgliedern";
 
@@ -2031,6 +2182,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "Fehler beim Wechseln zum Inkognito-Profil!";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Fehler beim Überprüfen des Token-Status";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Fehler beim Verbinden mit dem Weiterleitungsserver %@. Bitte versuchen Sie es später erneut.";
 
@@ -2043,6 +2197,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Fehler beim Erzeugen des Gruppen-Links";
 
+/* alert title */
+"Error creating list" = "Fehler beim Erstellen der Liste";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "Fehler beim Anlegen eines Mitglied-Kontaktes";
 
@@ -2052,12 +2209,18 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "Fehler beim Erstellen des Profils!";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Fehler beim Erstellen der Meldung";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Fehler beim Entschlüsseln der Datei";
 
 /* No comment provided by engineer. */
 "Error deleting chat database" = "Fehler beim Löschen der Chat-Datenbank";
 
+/* alert title */
+"Error deleting chat with member" = "Fehler beim Löschen des Chats mit dem Mitglied";
+
 /* No comment provided by engineer. */
 "Error deleting chat!" = "Fehler beim Löschen des Chats!";
 
@@ -2110,7 +2273,7 @@
 "Error opening chat" = "Fehler beim Öffnen des Chats";
 
 /* alert title */
-"Error receiving file" = "Fehler beim Empfangen der Datei";
+"Error receiving file" = "Fehler beim Herunterladen der Datei";
 
 /* No comment provided by engineer. */
 "Error reconnecting server" = "Fehler beim Wiederherstellen der Verbindung zum Server";
@@ -2118,12 +2281,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Fehler beim Wiederherstellen der Verbindungen zu den Servern";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "Fehler beim Registrieren für Benachrichtigungen";
+
+/* alert title */
 "Error removing member" = "Fehler beim Entfernen des Mitglieds";
 
+/* alert title */
+"Error reordering lists" = "Fehler beim Umsortieren der Listen";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Fehler beim Zurücksetzen der Statistiken";
 
+/* alert title */
+"Error saving chat list" = "Fehler beim Speichern der Chat-Liste";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Fehler beim Speichern des Gruppenprofils";
 
@@ -2175,6 +2347,9 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Fehler beim Synchronisieren der Verbindung";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Fehler beim Testen der Server-Verbindung";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Fehler beim Aktualisieren des Gruppen-Links";
 
@@ -2199,7 +2374,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Fehler: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Fehler: %@";
 
 /* No comment provided by engineer. */
@@ -2217,9 +2394,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Auch wenn sie im Chat deaktiviert sind.";
 
-/* No comment provided by engineer. */
-"event happened" = "event happened";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Beenden ohne Speichern";
 
@@ -2229,6 +2403,9 @@
 /* No comment provided by engineer. */
 "expired" = "Abgelaufen";
 
+/* token status text */
+"Expired" = "Abgelaufen";
+
 /* No comment provided by engineer. */
 "Export database" = "Datenbank exportieren";
 
@@ -2253,18 +2430,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Schnell und ohne warten auf den Absender, bis er online ist!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Schnelleres löschen von Gruppen.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Schnelleres versenden von Nachrichten.";
+
 /* swipe action */
 "Favorite" = "Favorit";
 
 /* No comment provided by engineer. */
+"Favorites" = "Favoriten";
+
+/* file error alert title */
 "File error" = "Datei-Fehler";
 
 /* alert message */
 "File errors:\n%@" = "Datei-Fehler:\n%@";
 
+/* file error text */
+"File is blocked by server operator:\n%@." = "Datei wurde vom Server-Betreiber blockiert:\n%@.";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "Datei nicht gefunden - höchstwahrscheinlich wurde die Datei gelöscht oder der Transfer abgebrochen.";
 
@@ -2281,10 +2470,10 @@
 "File will be deleted from servers." = "Die Datei wird von den Servern gelöscht.";
 
 /* No comment provided by engineer. */
-"File will be received when your contact completes uploading it." = "Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.";
+"File will be received when your contact completes uploading it." = "Die Datei wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.";
 
 /* No comment provided by engineer. */
-"File will be received when your contact is online, please wait or check later!" = "Die Datei wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!";
+"File will be received when your contact is online, please wait or check later!" = "Die Datei wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!";
 
 /* No comment provided by engineer. */
 "File: %@" = "Datei: %@";
@@ -2341,7 +2530,7 @@
 "Fix not supported by group member" = "Reparatur wird vom Gruppenmitglied nicht unterstützt";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "für einen besseren Metadatenschutz.";
+"For all moderators" = "Für alle Moderatoren";
 
 /* servers error */
 "For chat profile %@:" = "Für das Chat-Profil %@:";
@@ -2352,6 +2541,9 @@
 /* No comment provided by engineer. */
 "For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Wenn Ihr Kontakt beispielsweise Nachrichten über einen SimpleX-Chatserver empfängt, wird Ihre App diese über einen der Server von Flux versenden.";
 
+/* No comment provided by engineer. */
+"For me" = "Für mich";
+
 /* No comment provided by engineer. */
 "For private routing" = "Für privates Routing";
 
@@ -2424,6 +2616,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Weiter reduzierter Batterieverbrauch";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Bei Erwähnung benachrichtigt werden.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIFs und Sticker";
 
@@ -2463,6 +2658,9 @@
 /* No comment provided by engineer. */
 "Group invitation is no longer valid, it was removed by sender." = "Die Gruppeneinladung ist nicht mehr gültig, da sie vom Absender entfernt wurde.";
 
+/* No comment provided by engineer. */
+"group is deleted" = "Gruppe wird gelöscht";
+
 /* No comment provided by engineer. */
 "Group link" = "Gruppen-Link";
 
@@ -2496,9 +2694,15 @@
 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "Die Gruppe wird nur bei Ihnen gelöscht. Dies kann nicht rückgängig gemacht werden!";
 
+/* No comment provided by engineer. */
+"Groups" = "Gruppen";
+
 /* No comment provided by engineer. */
 "Help" = "Hilfe";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Helfen Sie Administratoren bei der Moderation ihrer Gruppen.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Verborgen";
 
@@ -2535,6 +2739,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Wie es die Privatsphäre schützt";
 
+/* alert button */
+"How it works" = "Wie es funktioniert";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Wie SimpleX funktioniert";
 
@@ -2569,10 +2776,10 @@
 "Ignore" = "Ignorieren";
 
 /* No comment provided by engineer. */
-"Image will be received when your contact completes uploading it." = "Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.";
+"Image will be received when your contact completes uploading it." = "Das Bild wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.";
 
 /* No comment provided by engineer. */
-"Image will be received when your contact is online, please wait or check later!" = "Das Bild wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!";
+"Image will be received when your contact is online, please wait or check later!" = "Das Bild wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!";
 
 /* No comment provided by engineer. */
 "Immediately" = "Sofort";
@@ -2622,6 +2829,12 @@
 /* No comment provided by engineer. */
 "inactive" = "Inaktiv";
 
+/* report reason */
+"Inappropriate content" = "Unangemessener Inhalt";
+
+/* report reason */
+"Inappropriate profile" = "Unangemessenes Profil";
+
 /* No comment provided by engineer. */
 "Incognito" = "Inkognito";
 
@@ -2688,6 +2901,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Interface-Farben";
 
+/* token status text */
+"Invalid" = "Ungültig";
+
+/* token status text */
+"Invalid (bad token)" = "Ungültig (falsches Token)";
+
+/* token status text */
+"Invalid (expired)" = "Ungültig (abgelaufen)";
+
+/* token status text */
+"Invalid (unregistered)" = "Ungültig (nicht registriert)";
+
+/* token status text */
+"Invalid (wrong topic)" = "Ungültig (falsches Thema)";
+
 /* invalid chat data */
 "invalid chat" = "Ungültiger Chat";
 
@@ -2889,6 +3117,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Verknüpfte Desktops";
 
+/* swipe action */
+"List" = "Liste";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "Der Listenname und das Emoji sollen für alle Listen unterschiedlich sein.";
+
+/* No comment provided by engineer. */
+"List name..." = "Listenname...";
+
 /* No comment provided by engineer. */
 "LIVE" = "LIVE";
 
@@ -2952,12 +3189,21 @@
 /* profile update event chat item */
 "member %@ changed to %@" = "Der Mitgliedsname von %1$@ wurde auf %2$@ geändert";
 
+/* No comment provided by engineer. */
+"Member admission" = "Aufnahme von Mitgliedern";
+
 /* rcv group event chat item */
 "member connected" = "ist der Gruppe beigetreten";
 
+/* No comment provided by engineer. */
+"member has old version" = "Das Mitglied hat eine alte App-Version";
+
 /* item status text */
 "Member inactive" = "Mitglied inaktiv";
 
+/* chat feature */
+"Member reports" = "Mitglieder-Meldungen";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All chat members will be notified." = "Die Rolle des Mitglieds wird auf \"%@\" geändert. Alle Chat-Mitglieder werden darüber informiert.";
 
@@ -2973,27 +3219,36 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Das Mitglied wird aus der Gruppe entfernt. Dies kann nicht rückgängig gemacht werden!";
 
+/* alert message */
+"Member will join the group, accept member?" = "Ein Mitglied wird der Gruppe beitreten. Übernehmen?";
+
 /* No comment provided by engineer. */
 "Members can add message reactions." = "Gruppenmitglieder können eine Reaktion auf Nachrichten geben.";
 
 /* No comment provided by engineer. */
 "Members can irreversibly delete sent messages. (24 hours)" = "Gruppenmitglieder können gesendete Nachrichten unwiederbringlich löschen. (24 Stunden)";
 
+/* No comment provided by engineer. */
+"Members can report messsages to moderators." = "Mitglieder können Nachrichten an Moderatoren melden.";
+
 /* No comment provided by engineer. */
 "Members can send direct messages." = "Gruppenmitglieder können Direktnachrichten versenden.";
 
 /* No comment provided by engineer. */
-"Members can send disappearing messages." = "Gruppenmitglieder können verschwindende Nachrichten senden.";
+"Members can send disappearing messages." = "Gruppenmitglieder können verschwindende Nachrichten versenden.";
 
 /* No comment provided by engineer. */
-"Members can send files and media." = "Gruppenmitglieder können Dateien und Medien senden.";
+"Members can send files and media." = "Gruppenmitglieder können Dateien und Medien versenden.";
 
 /* No comment provided by engineer. */
-"Members can send SimpleX links." = "Gruppenmitglieder können SimpleX-Links senden.";
+"Members can send SimpleX links." = "Gruppenmitglieder können SimpleX-Links versenden.";
 
 /* No comment provided by engineer. */
 "Members can send voice messages." = "Gruppenmitglieder können Sprachnachrichten versenden.";
 
+/* No comment provided by engineer. */
+"Mention members 👋" = "Erwähnung von Mitgliedern 👋";
+
 /* No comment provided by engineer. */
 "Menus" = "Menüs";
 
@@ -3066,6 +3321,9 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "Die Nachrichten von %@ werden angezeigt!";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "Nachrichten in diesem Chat werden nie gelöscht.";
+
 /* No comment provided by engineer. */
 "Messages received" = "Empfangene Nachrichten";
 
@@ -3076,10 +3334,10 @@
 "Messages were deleted after you selected them." = "Die Nachrichten wurden gelöscht, nachdem Sie sie ausgewählt hatten.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.";
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Nachrichten, Dateien und Anrufe sind durch **Quantum-resistente E2E-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.";
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Nachrichten, Dateien und Anrufe sind durch **Quantum-resistente E2E-Verschlüsselung** mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.";
 
 /* No comment provided by engineer. */
 "Migrate device" = "Gerät migrieren";
@@ -3138,9 +3396,15 @@
 /* marked deleted chat item preview text */
 "moderated by %@" = "Von %@ moderiert";
 
+/* member role */
+"moderator" = "Moderator";
+
 /* time unit */
 "months" = "Monate";
 
+/* swipe action */
+"More" = "Mehr";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Weitere Verbesserungen sind bald verfügbar!";
 
@@ -3156,12 +3420,12 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Mehrere Chat-Profile";
 
-/* No comment provided by engineer. */
-"mute" = "Stummschalten";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Stummschalten";
 
+/* notification label action */
+"Mute all" = "Alle stummschalten";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Bei Inaktivität stummgeschaltet!";
 
@@ -3192,9 +3456,12 @@
 /* No comment provided by engineer. */
 "Network status" = "Netzwerkstatus";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "nie";
 
+/* token status text */
+"New" = "Neu";
+
 /* No comment provided by engineer. */
 "New chat" = "Neuer Chat";
 
@@ -3225,6 +3492,9 @@
 /* No comment provided by engineer. */
 "New member role" = "Neue Mitgliedsrolle";
 
+/* rcv group event chat item */
+"New member wants to join the group." = "Ein neues Mitglied will der Gruppe beitreten.";
+
 /* notification */
 "new message" = "Neue Nachricht";
 
@@ -3255,6 +3525,18 @@
 /* Authentication unavailable */
 "No app password" = "Kein App-Passwort";
 
+/* No comment provided by engineer. */
+"No chats" = "Keine Chats";
+
+/* No comment provided by engineer. */
+"No chats found" = "Keine Chats gefunden";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Keine Chats in der Liste %@";
+
+/* No comment provided by engineer. */
+"No chats with members" = "Keine Chats mit Mitgliedern";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "Keine Kontakte ausgewählt";
 
@@ -3288,6 +3570,9 @@
 /* servers error */
 "No media & file servers." = "Keine Medien- und Dateiserver.";
 
+/* No comment provided by engineer. */
+"No message" = "Keine Nachricht";
+
 /* servers error */
 "No message servers." = "Keine Nachrichten-Server.";
 
@@ -3307,13 +3592,13 @@
 "No push server" = "Lokal";
 
 /* No comment provided by engineer. */
-"No received or sent files" = "Keine empfangenen oder gesendeten Dateien";
+"No received or sent files" = "Keine herunter- oder hochgeladenen Dateien";
 
 /* servers error */
 "No servers for private message routing." = "Keine Server für privates Nachrichten-Routing.";
 
 /* servers error */
-"No servers to receive files." = "Keine Server für den Empfang von Dateien.";
+"No servers to receive files." = "Keine Server für das Herunterladen von Dateien.";
 
 /* servers error */
 "No servers to receive messages." = "Keine Server für den Empfang von Nachrichten.";
@@ -3324,12 +3609,24 @@
 /* copied message info in history */
 "no text" = "Kein Text";
 
+/* alert title */
+"No token!" = "Kein Token!";
+
+/* No comment provided by engineer. */
+"No unread chats" = "Keine ungelesenen Chats";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "Keine Benutzerkennungen.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "Nicht kompatibel!";
 
+/* No comment provided by engineer. */
+"not synchronized" = "Nicht synchronisiert";
+
+/* No comment provided by engineer. */
+"Notes" = "Anmerkungen";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "Nichts ausgewählt";
 
@@ -3342,9 +3639,15 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Benachrichtigungen sind deaktiviert!";
 
+/* alert title */
+"Notifications error" = "Benachrichtigungs-Fehler";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Datenschutz für Benachrichtigungen";
 
+/* alert title */
+"Notifications status" = "Benachrichtigungs-Status";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Administratoren können nun\n- Nachrichten von Gruppenmitgliedern löschen\n- Gruppenmitglieder deaktivieren (\"Beobachter\"-Rolle)";
 
@@ -3352,8 +3655,9 @@
 "observer" = "Beobachter";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "Aus";
 
 /* blur media */
@@ -3365,7 +3669,8 @@
 /* feature offered item */
 "offered %@: %@" = "angeboten %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -3407,6 +3712,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "Sprachnachrichten können nur von Gruppen-Eigentümern aktiviert werden.";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "Nur Absender und Moderatoren sehen es";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "Nur Sie und Moderatoren sehen es";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Nur Sie können Reaktionen auf Nachrichten geben.";
 
@@ -3437,7 +3748,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Nur Ihr Kontakt kann Sprachnachrichten versenden.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Öffnen";
 
 /* No comment provided by engineer. */
@@ -3455,6 +3766,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Gruppe öffnen";
 
+/* alert title */
+"Open link?" = "Link öffnen?";
+
 /* authentication reason */
 "Open migration to another device" = "Migration auf ein anderes Gerät öffnen";
 
@@ -3488,6 +3802,9 @@
 /* No comment provided by engineer. */
 "Or to share privately" = "Oder zum privaten Teilen";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Chats in Listen verwalten";
+
 /* No comment provided by engineer. */
 "other" = "Andere";
 
@@ -3545,9 +3862,18 @@
 /* No comment provided by engineer. */
 "peer-to-peer" = "Peer-to-Peer";
 
+/* No comment provided by engineer. */
+"pending" = "ausstehend";
+
 /* No comment provided by engineer. */
 "Pending" = "Ausstehend";
 
+/* No comment provided by engineer. */
+"pending approval" = "ausstehende Genehmigung";
+
+/* No comment provided by engineer. */
+"pending review" = "Ausstehende Überprüfung";
+
 /* No comment provided by engineer. */
 "Periodic" = "Periodisch";
 
@@ -3614,6 +3940,18 @@
 /* No comment provided by engineer. */
 "Please store passphrase securely, you will NOT be able to change it if you lose it." = "Bitte bewahren Sie das Passwort sicher auf, Sie können es NICHT mehr ändern, wenn Sie es vergessen haben oder verlieren.";
 
+/* token info */
+"Please try to disable and re-enable notfications." = "Bitte versuchen Sie, die Benachrichtigungen zu deaktivieren und wieder zu aktivieren.";
+
+/* snd group event chat item */
+"Please wait for group moderators to review your request to join the group." = "Bitte warten Sie auf die Überprüfung Ihrer Anfrage durch die Gruppen-Moderatoren, um der Gruppe beitreten zu können.";
+
+/* token info */
+"Please wait for token activation to complete." = "Bitte warten Sie, bis die Token-Aktivierung abgeschlossen ist.";
+
+/* token info */
+"Please wait for token to be registered." = "Bitte warten Sie auf die Registrierung des Tokens.";
+
 /* No comment provided by engineer. */
 "Polish interface" = "Polnische Bedienoberfläche";
 
@@ -3644,12 +3982,21 @@
 /* No comment provided by engineer. */
 "Privacy for your customers." = "Schutz der Privatsphäre Ihrer Kunden.";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "Datenschutz- und Nutzungsbedingungen.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Datenschutz neu definiert";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "Private Chats, Gruppen und Ihre Kontakte sind für Server-Betreiber nicht zugänglich.";
+
 /* No comment provided by engineer. */
 "Private filenames" = "Neutrale Dateinamen";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Medien mit anonymisierten Dateinamen.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Privates Nachrichten-Routing";
 
@@ -3695,6 +4042,9 @@
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Reaktionen auf Nachrichten nicht erlauben.";
 
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "Melden von Nachrichten an Moderatoren nicht erlauben.";
+
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "Das Senden von Direktnachrichten an Gruppenmitglieder nicht erlauben.";
 
@@ -3813,7 +4163,7 @@
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Die Empfängeradresse wird auf einen anderen Server geändert. Der Adresswechsel wird abgeschlossen, wenn der Absender wieder online ist.";
 
 /* No comment provided by engineer. */
-"Receiving file will be stopped." = "Der Empfang der Datei wird beendet.";
+"Receiving file will be stopped." = "Das Herunterladen der Datei wird beendet.";
 
 /* No comment provided by engineer. */
 "Receiving via" = "Empfangen über";
@@ -3857,8 +4207,17 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Reduzierter Batterieverbrauch";
 
+/* No comment provided by engineer. */
+"Register" = "Registrieren";
+
+/* token info */
+"Register notification token?" = "Benachrichtigungs-Token registrieren?";
+
+/* token status text */
+"Registered" = "Registriert";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Ablehnen";
 
 /* No comment provided by engineer. */
@@ -3867,6 +4226,12 @@
 /* No comment provided by engineer. */
 "Reject contact request" = "Kontaktanfrage ablehnen";
 
+/* alert title */
+"Reject member?" = "Mitglied ablehnen?";
+
+/* No comment provided by engineer. */
+"rejected" = "abgelehnt";
+
 /* call status */
 "rejected call" = "Abgelehnter Anruf";
 
@@ -3903,6 +4268,9 @@
 /* profile update event chat item */
 "removed contact address" = "Die Kontaktadresse wurde entfernt";
 
+/* No comment provided by engineer. */
+"removed from group" = "Von der Gruppe entfernt";
+
 /* profile update event chat item */
 "removed profile picture" = "Das Profil-Bild wurde entfernt";
 
@@ -3936,6 +4304,42 @@
 /* chat item action */
 "Reply" = "Antwort";
 
+/* chat item action */
+"Report" = "Melden";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Inhalt melden: Nur Gruppenmoderatoren werden es sehen.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Mitgliederprofil melden: Nur Gruppenmoderatoren werden es sehen.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Anderes melden: Nur Gruppenmoderatoren werden es sehen.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "Grund der Meldung?";
+
+/* alert title */
+"Report sent to moderators" = "Meldung wurde an die Moderatoren gesendet";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Spam melden: Nur Gruppenmoderatoren werden es sehen.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Verstoß melden: Nur Gruppenmoderatoren werden es sehen.";
+
+/* report in notification */
+"Report: %@" = "Meldung: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "Melden von Nachrichten an Moderatoren ist nicht erlaubt.";
+
+/* No comment provided by engineer. */
+"Reports" = "Meldungen";
+
+/* No comment provided by engineer. */
+"request to join rejected" = "Beitrittsanfrage abgelehnt";
+
 /* chat list item title */
 "requested to connect" = "Zur Verbindung aufgefordert";
 
@@ -3991,10 +4395,19 @@
 "Reveal" = "Aufdecken";
 
 /* No comment provided by engineer. */
-"Review conditions" = "Nutzungsbedingungen einsehen";
+"review" = "Überprüfung";
 
 /* No comment provided by engineer. */
-"Review later" = "Später einsehen";
+"Review conditions" = "Nutzungsbedingungen einsehen";
+
+/* admission stage */
+"Review members" = "Überprüfung der Mitglieder";
+
+/* admission stage description */
+"Review members before admitting (\"knocking\")." = "Überprüfung der Mitglieder vor der Aufnahme (\"Anklopfen\").";
+
+/* No comment provided by engineer. */
+"reviewed by admins" = "Von Administratoren überprüft";
 
 /* No comment provided by engineer. */
 "Revoke" = "Widerrufen";
@@ -4012,18 +4425,21 @@
 "Run chat" = "Chat starten";
 
 /* No comment provided by engineer. */
-"Safely receive files" = "Dateien sicher empfangen";
+"Safely receive files" = "Dateien sicher herunterladen";
 
 /* No comment provided by engineer. */
 "Safer groups" = "Sicherere Gruppen";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Speichern";
 
 /* alert button */
 "Save (and notify contacts)" = "Speichern (und Kontakte benachrichtigen)";
 
+/* alert title */
+"Save admission settings?" = "Speichern der Aufnahme-Einstellungen?";
+
 /* alert button */
 "Save and notify contact" = "Speichern und Kontakt benachrichtigen";
 
@@ -4039,6 +4455,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "Gruppenprofil speichern";
 
+/* No comment provided by engineer. */
+"Save list" = "Liste speichern";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "Passwort speichern und Chat öffnen";
 
@@ -4207,6 +4626,9 @@
 /* No comment provided by engineer. */
 "Send notifications" = "Benachrichtigungen senden";
 
+/* No comment provided by engineer. */
+"Send private reports" = "Private Meldungen senden";
+
 /* No comment provided by engineer. */
 "Send questions and ideas" = "Senden Sie Fragen und Ideen";
 
@@ -4339,6 +4761,9 @@
 /* No comment provided by engineer. */
 "Set 1 day" = "Einen Tag festlegen";
 
+/* No comment provided by engineer. */
+"Set chat name…" = "Chat-Name festlegen…";
+
 /* No comment provided by engineer. */
 "Set contact name…" = "Kontaktname festlegen…";
 
@@ -4351,6 +4776,12 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Anstelle der System-Authentifizierung festlegen.";
 
+/* No comment provided by engineer. */
+"Set member admission" = "Aufnahme von Mitgliedern festlegen";
+
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Verfallsdatum von Nachrichten in Chats festlegen.";
+
 /* profile update event chat item */
 "set new contact address" = "Es wurde eine neue Kontaktadresse festgelegt";
 
@@ -4382,7 +4813,7 @@
 "Shape profile images" = "Form der Profil-Bilder";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Teilen";
 
 /* No comment provided by engineer. */
@@ -4421,6 +4852,9 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Mit Kontakten teilen";
 
+/* No comment provided by engineer. */
+"Short link" = "Verkürzter Link";
+
 /* No comment provided by engineer. */
 "Show → on messages sent via private routing." = "Bei Nachrichten, die über privates Routing versendet wurden, → anzeigen.";
 
@@ -4463,6 +4897,9 @@
 /* No comment provided by engineer. */
 "SimpleX address or 1-time link?" = "SimpleX-Adresse oder Einmal-Link?";
 
+/* simplex link type */
+"SimpleX channel link" = "SimpleX-Kanal-Link";
+
 /* No comment provided by engineer. */
 "SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX-Chat und Flux haben vereinbart, die von Flux betriebenen Server in die App aufzunehmen.";
 
@@ -4547,6 +4984,10 @@
 /* notification title */
 "Somebody" = "Jemand";
 
+/* blocking reason
+report reason */
+"Spam" = "Spam";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Quadratisch, kreisförmig oder irgendetwas dazwischen.";
 
@@ -4584,13 +5025,13 @@
 "Stop chat?" = "Chat beenden?";
 
 /* cancel file action */
-"Stop file" = "Datei beenden";
+"Stop file" = "Herunterladen beenden";
 
 /* No comment provided by engineer. */
-"Stop receiving file?" = "Den Empfang der Datei beenden?";
+"Stop receiving file?" = "Das Herunterladen der Datei beenden?";
 
 /* No comment provided by engineer. */
-"Stop sending file?" = "Das Senden der Datei beenden?";
+"Stop sending file?" = "Das Hochladen der Datei beenden?";
 
 /* alert action */
 "Stop sharing" = "Teilen beenden";
@@ -4604,6 +5045,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Chat wird beendet";
 
+/* No comment provided by engineer. */
+"Storage" = "Ablage";
+
 /* No comment provided by engineer. */
 "strike" = "durchstreichen";
 
@@ -4673,6 +5117,9 @@
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Timeout der TCP-Verbindung";
 
+/* No comment provided by engineer. */
+"TCP port for messaging" = "TCP-Port für Nachrichtenübermittlung";
+
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
 
@@ -4682,12 +5129,15 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Temporärer Datei-Fehler";
 
 /* server test failure */
 "Test failed at step %@." = "Der Test ist beim Schritt %@ fehlgeschlagen.";
 
+/* No comment provided by engineer. */
+"Test notifications" = "Benachrichtigungen testen";
+
 /* No comment provided by engineer. */
 "Test server" = "Teste Server";
 
@@ -4760,15 +5210,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Die alte Datenbank wurde während der Migration nicht entfernt. Sie kann gelöscht werden.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Das Profil wird nur mit Ihren Kontakten geteilt.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Dieselben Nutzungsbedingungen gelten auch für den Betreiber **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Dieselben Nutzungsbedingungen gelten auch für den/die Betreiber: **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "Der zweite voreingestellte Netzwerk-Betreiber in der App!";
 
@@ -4803,13 +5247,16 @@
 "They can be overridden in contact and group settings." = "Sie können in den Kontakteinstellungen überschrieben werden.";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten.";
+"This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Es werden alle herunter- und hochgeladenen Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten. Diese Aktion kann nicht rückgängig gemacht werden!";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern.";
+"This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern. Diese Aktion kann nicht rückgängig gemacht werden!";
+
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Die älteren als die ausgewählten gesendeten und empfangenen Nachrichten in diesem Chat werden gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Diese Aktion kann nicht rückgängig gemacht werden! Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.";
+"This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren. Diese Aktion kann nicht rückgängig gemacht werden!";
 
 /* E2EE info chat item */
 "This chat is protected by end-to-end encryption." = "Dieser Chat ist durch Ende-zu-Ende-Verschlüsselung geschützt.";
@@ -4838,9 +5285,15 @@
 /* No comment provided by engineer. */
 "This is your own SimpleX address!" = "Das ist Ihre eigene SimpleX-Adresse!";
 
+/* No comment provided by engineer. */
+"This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." = "Für diesen Link wird eine neuere App-Version benötigt. Bitte aktualisieren Sie die App oder bitten Sie Ihren Kontakt einen kompatiblen Link zu senden.";
+
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Dieser Link wurde schon mit einem anderen Mobiltelefon genutzt. Bitte erstellen sie einen neuen Link in der Desktop-App.";
 
+/* No comment provided by engineer. */
+"This message was deleted or not received yet." = "Diese Nachricht wurde gelöscht oder bisher noch nicht empfangen.";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Diese Einstellung gilt für Nachrichten in Ihrem aktuellen Chat-Profil **%@**.";
 
@@ -4907,6 +5360,9 @@
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Inkognito beim Verbinden einschalten.";
 
+/* token status */
+"Token status: %@." = "Token-Status: %@.";
+
 /* No comment provided by engineer. */
 "Toolbar opacity" = "Deckkraft der Symbolleiste";
 
@@ -5015,10 +5471,7 @@
 /* authentication reason */
 "Unlock app" = "App entsperren";
 
-/* No comment provided by engineer. */
-"unmute" = "Stummschaltung aufheben";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Stummschaltung aufheben";
 
 /* No comment provided by engineer. */
@@ -5027,6 +5480,9 @@
 /* swipe action */
 "Unread" = "Ungelesen";
 
+/* No comment provided by engineer. */
+"Unsupported connection link" = "Verbindungs-Link wird nicht unterstützt";
+
 /* No comment provided by engineer. */
 "Up to 100 last messages are sent to new members." = "Bis zu 100 der letzten Nachrichten werden an neue Mitglieder gesendet.";
 
@@ -5042,6 +5498,9 @@
 /* No comment provided by engineer. */
 "Update settings?" = "Einstellungen aktualisieren?";
 
+/* No comment provided by engineer. */
+"Updated conditions" = "Aktualisierte Nutzungsbedingungen";
+
 /* rcv group event chat item */
 "updated group profile" = "Aktualisiertes Gruppenprofil";
 
@@ -5117,18 +5576,30 @@
 /* No comment provided by engineer. */
 "Use servers" = "Verwende Server";
 
+/* No comment provided by engineer. */
+"Use short links (BETA)" = "Kurze Links verwenden (BETA)";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Verwenden Sie SimpleX-Chat-Server?";
 
 /* No comment provided by engineer. */
 "Use SOCKS proxy" = "SOCKS-Proxy nutzen";
 
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "Solange kein Port konfiguriert ist, wird TCP-Port %@ genutzt.";
+
+/* No comment provided by engineer. */
+"Use TCP port 443 for preset servers only." = "TCP-Port 443 nur für voreingestellte Server verwenden.";
+
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Die App kann während eines Anrufs genutzt werden.";
 
 /* No comment provided by engineer. */
 "Use the app with one hand." = "Die App mit einer Hand bedienen.";
 
+/* No comment provided by engineer. */
+"Use web port" = "Web-Port nutzen";
+
 /* No comment provided by engineer. */
 "User selection" = "Benutzer-Auswahl";
 
@@ -5193,10 +5664,10 @@
 "video call (not e2e encrypted)" = "Videoanruf (nicht E2E verschlüsselt)";
 
 /* No comment provided by engineer. */
-"Video will be received when your contact completes uploading it." = "Das Video wird empfangen, sobald Ihr Kontakt das Hochladen beendet hat.";
+"Video will be received when your contact completes uploading it." = "Das Video wird heruntergeladen, sobald Ihr Kontakt das Hochladen beendet hat.";
 
 /* No comment provided by engineer. */
-"Video will be received when your contact is online, please wait or check later!" = "Das Video wird empfangen, wenn Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!";
+"Video will be received when your contact is online, please wait or check later!" = "Das Video wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!";
 
 /* No comment provided by engineer. */
 "Videos and files up to 1gb" = "Videos und Dateien bis zu 1GB";
@@ -5348,6 +5819,9 @@
 /* No comment provided by engineer. */
 "You accepted connection" = "Sie haben die Verbindung akzeptiert";
 
+/* snd group event chat item */
+"you accepted this member" = "Sie haben dieses Mitglied übernommen";
+
 /* No comment provided by engineer. */
 "You allow" = "Sie erlauben";
 
@@ -5405,9 +5879,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Kann von Ihnen in den Erscheinungsbild-Einstellungen geändert werden.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Sie können die Betreiber in den Netzwerk- und Servereinstellungen konfigurieren.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "Sie können die Server über die Einstellungen konfigurieren.";
 
@@ -5462,6 +5933,9 @@
 /* alert message */
 "You can view invitation link again in connection details." = "Den Einladungslink können Sie in den Details der Verbindung nochmals sehen.";
 
+/* alert message */
+"You can view your reports in Chat with admins." = "Sie können Ihre Meldungen im Chat mit den Administratoren sehen.";
+
 /* No comment provided by engineer. */
 "You can't send messages!" = "Sie können keine Nachrichten versenden!";
 
@@ -5534,6 +6008,9 @@
 /* chat list item description */
 "you shared one-time link incognito" = "Sie haben Inkognito einen Einmal-Link geteilt";
 
+/* token info */
+"You should receive notifications." = "Sie sollten Benachrichtigungen erhalten.";
+
 /* snd group event chat item */
 "you unblocked %@" = "Sie haben %@ freigegeben";
 
@@ -5559,7 +6036,7 @@
 "You will still receive calls and notifications from muted profiles when they are active." = "Sie können Anrufe und Benachrichtigungen auch von stummgeschalteten Profilen empfangen, solange diese aktiv sind.";
 
 /* No comment provided by engineer. */
-"You will stop receiving messages from this chat. Chat history will be preserved." = "Sie werden von diesem Chat keine Nachrichten mehr erhalten. Der Nachrichtenverlauf wird beibehalten.";
+"You will stop receiving messages from this chat. Chat history will be preserved." = "Sie werden von diesem Chat keine Nachrichten mehr erhalten. Der Nachrichtenverlauf bleibt erhalten.";
 
 /* No comment provided by engineer. */
 "You will stop receiving messages from this group. Chat history will be preserved." = "Sie werden von dieser Gruppe keine Nachrichten mehr erhalten. Der Nachrichtenverlauf wird beibehalten.";
@@ -5619,7 +6096,7 @@
 "Your preferences" = "Ihre Präferenzen";
 
 /* No comment provided by engineer. */
-"Your privacy" = "Ihre Privatsphäre";
+"Your privacy" = "Privatsphäre";
 
 /* No comment provided by engineer. */
 "Your profile" = "Mein Profil";
@@ -5627,15 +6104,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Ihr Profil **%@** wird geteilt.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt. SimpleX-Server können Ihr Profil nicht einsehen.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Ihr Profil wurde geändert. Wenn Sie es speichern, wird das aktualisierte Profil an alle Ihre Kontakte gesendet.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Ihr Zufallsprofil";
 
@@ -5651,6 +6128,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Ihre SimpleX-Adresse";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Ihre SMP-Server";
-
diff --git a/apps/ios/de.lproj/SimpleX--iOS--InfoPlist.strings b/apps/ios/de.lproj/SimpleX--iOS--InfoPlist.strings
index 0dee85ad95..e0554c9fb6 100644
--- a/apps/ios/de.lproj/SimpleX--iOS--InfoPlist.strings
+++ b/apps/ios/de.lproj/SimpleX--iOS--InfoPlist.strings
@@ -14,5 +14,5 @@
 "NSMicrophoneUsageDescription" = "SimpleX benötigt Zugriff auf das Mikrofon, um Audio- und Videoanrufe und die Aufnahme von Sprachnachrichten zu ermöglichen.";
 
 /* Privacy - Photo Library Additions Usage Description */
-"NSPhotoLibraryAddUsageDescription" = "SimpleX benötigt Zugriff auf das Fotoalbum, um selbst gemachte oder empfangene Bilder zu speichern";
+"NSPhotoLibraryAddUsageDescription" = "SimpleX benötigt Zugriff auf das Fotoalbum, um selbst gemachte oder heruntergeladene Bilder zu speichern";
 
diff --git a/apps/ios/es.lproj/Localizable.strings b/apps/ios/es.lproj/Localizable.strings
index e7570f177e..a8782c401f 100644
--- a/apps/ios/es.lproj/Localizable.strings
+++ b/apps/ios/es.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (puede copiarse)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- mensajes de voz de hasta 5 minutos.\n- tiempo personalizado para mensajes temporales.\n- historial de edición.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 coloreado!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(nuevo)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(este dispositivo v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Contribuye](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -77,7 +56,7 @@
 "**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." = "**Recuarda**: usar la misma base de datos en dos dispositivos hará que falle el descifrado de mensajes como protección de seguridad.";
 
 /* No comment provided by engineer. */
-"**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Atención**: NO podrás recuperar o cambiar la contraseña si la pierdes.";
+"**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Atención**: Si la pierdes NO podrás recuperar o cambiar la contraseña.";
 
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Recomendado**: el token del dispositivo y las notificaciones se envían al servidor de notificaciones de SimpleX Chat, pero no el contenido del mensaje, su tamaño o su procedencia.";
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d segundo(s)";
 
+/* delete after time */
+"%d seconds(s)" = "%d segundos";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d mensaje(s) omitido(s)";
 
@@ -241,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld idiomas de interfaz nuevos";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld segundo(s)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld segundos";
 
@@ -289,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "un dia";
 
 /* time interval */
@@ -298,12 +278,17 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minuto";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "un mes";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "una semana";
 
+/* delete after time */
+"1 year" = "1 año";
+
 /* No comment provided by engineer. */
 "1-time link" = "Enlace de un uso";
 
@@ -332,7 +317,7 @@
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Se usará una conexión TCP independiente **por cada perfil que tengas en la aplicación**.";
 
 /* No comment provided by engineer. */
-"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." = "Se usará una conexión TCP independiente **por cada contacto y miembro de grupo**.\n**Atención**: si tienes muchas conexiones, tu consumo de batería y tráfico pueden ser sustancialmente mayores y algunas conexiones pueden fallar.";
+"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." = "Se usará una conexión TCP independiente **por cada contacto y miembro de grupo**.\n**Atención**: si tienes muchas conexiones, tu consumo de batería y tráfico pueden aumentar bastante y algunas conexiones pueden fallar.";
 
 /* No comment provided by engineer. */
 "Abort" = "Cancelar";
@@ -356,8 +341,8 @@
 "Accent" = "Color";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Aceptar";
 
 /* No comment provided by engineer. */
@@ -370,7 +355,7 @@
 "Accept contact request from %@?" = "¿Aceptar solicitud de contacto de %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Aceptar incógnito";
 
 /* call status */
@@ -388,6 +373,9 @@
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Errores de confirmación";
 
+/* token status text */
+"Active" = "Activo";
+
 /* No comment provided by engineer. */
 "Active connections" = "Conexiones activas";
 
@@ -397,6 +385,9 @@
 /* No comment provided by engineer. */
 "Add friends" = "Añadir amigos";
 
+/* No comment provided by engineer. */
+"Add list" = "Añadir lista";
+
 /* No comment provided by engineer. */
 "Add profile" = "Añadir perfil";
 
@@ -412,11 +403,14 @@
 /* No comment provided by engineer. */
 "Add to another device" = "Añadir a otro dispositivo";
 
+/* No comment provided by engineer. */
+"Add to list" = "Añadir a la lista";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Añadir mensaje de bienvenida";
 
 /* No comment provided by engineer. */
-"Add your team members to the conversations." = "Añade a los miembros de tu equipo a las conversaciones.";
+"Add your team members to the conversations." = "Añade a miembros de tu equipo a las conversaciones.";
 
 /* No comment provided by engineer. */
 "Added media & file servers" = "Servidores de archivos y multimedia añadidos";
@@ -443,7 +437,7 @@
 "Address or 1-time link?" = "¿Dirección o enlace de un uso?";
 
 /* No comment provided by engineer. */
-"Address settings" = "Configuración de dirección";
+"Address settings" = "Configurar dirección";
 
 /* member role */
 "admin" = "administrador";
@@ -469,11 +463,17 @@
 /* chat item text */
 "agreeing encryption…" = "acordando cifrado…";
 
+/* No comment provided by engineer. */
+"All" = "Todo";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Todos los datos de la aplicación se eliminarán.";
 
 /* No comment provided by engineer. */
-"All chats and messages will be deleted - this cannot be undone!" = "Se eliminarán todos los chats y mensajes. ¡No podrá deshacerse!";
+"All chats and messages will be deleted - this cannot be undone!" = "Se eliminarán todos los chats y mensajes. ¡No puede deshacerse!";
+
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Todos los chats se quitarán de la lista %@ y esta será eliminada.";
 
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Al introducirlo todos los datos son eliminados.";
@@ -491,10 +491,10 @@
 "All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Todos los mensajes y archivos son enviados **cifrados de extremo a extremo** y con seguridad de cifrado postcuántico en mensajes directos.";
 
 /* No comment provided by engineer. */
-"All messages will be deleted - this cannot be undone!" = "Todos los mensajes serán borrados. ¡No podrá deshacerse!";
+"All messages will be deleted - this cannot be undone!" = "Todos los mensajes serán eliminados. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
-"All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Se eliminarán todos los mensajes SOLO para tí. ¡No podrá deshacerse!";
+"All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Se eliminarán todos los mensajes SOLO para tí. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
 "All new messages from %@ will be hidden!" = "¡Los mensajes nuevos de %@ estarán ocultos!";
@@ -502,6 +502,12 @@
 /* profile dropdown */
 "All profiles" = "Todos los perfiles";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Todos los informes serán archivados para ti.";
+
+/* No comment provided by engineer. */
+"All servers" = "Todos los servidores";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Todos tus contactos permanecerán conectados.";
 
@@ -547,6 +553,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Se permite la eliminación irreversible de mensajes. (24 horas)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Permitir informar de mensajes a los moderadores.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Se permite enviar archivos y multimedia.";
 
@@ -601,6 +610,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "y %lld evento(s) más";
 
+/* report reason */
+"Another reason" = "Otro motivo";
+
 /* No comment provided by engineer. */
 "Answer call" = "Responder llamada";
 
@@ -617,7 +629,10 @@
 "App encrypts new local files (except videos)." = "Cifrado de los nuevos archivos locales (excepto vídeos).";
 
 /* No comment provided by engineer. */
-"App icon" = "Icono aplicación";
+"App group:" = "Grupo app:";
+
+/* No comment provided by engineer. */
+"App icon" = "Icono de la aplicación";
 
 /* No comment provided by engineer. */
 "App passcode" = "Código de acceso de la aplicación";
@@ -626,7 +641,7 @@
 "App passcode is replaced with self-destruct passcode." = "El código de acceso será reemplazado por código de autodestrucción.";
 
 /* No comment provided by engineer. */
-"App session" = "Sesión de aplicación";
+"App session" = "por sesión";
 
 /* No comment provided by engineer. */
 "App version" = "Versión de la aplicación";
@@ -643,15 +658,36 @@
 /* No comment provided by engineer. */
 "Apply to" = "Aplicar a";
 
+/* No comment provided by engineer. */
+"Archive" = "Archivar";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "¿Archivar %lld informes?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "¿Archivar todos los informes?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archivar y subir";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Archiva contactos para charlar más tarde.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Archivar informe";
+
+/* No comment provided by engineer. */
+"Archive report?" = "¿Archivar informe?";
+
+/* swipe action */
+"Archive reports" = "Archivar informes";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Contactos archivados";
 
+/* No comment provided by engineer. */
+"archived report" = "informes archivados";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Archivando base de datos";
 
@@ -730,6 +766,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Grupos mejorados";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Rendimiento de grupos mejorado";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Sistema de fechas mejorado.";
 
@@ -742,6 +781,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Notificaciones mejoradas";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Privacidad y seguridad mejoradas";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Seguridad mejorada ✅";
 
@@ -775,7 +817,8 @@
 /* rcv group event chat item */
 "blocked %@" = "ha bloqueado a %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "bloqueado por administrador";
 
 /* No comment provided by engineer. */
@@ -814,9 +857,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Chats empresariales";
 
+/* No comment provided by engineer. */
+"Businesses" = "Empresas";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Mediante perfil (predeterminado) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "Al usar SimpleX Chat, aceptas:\n- enviar únicamente contenido legal en los grupos públicos.\n- respetar a los demás usuarios – spam prohibido.";
+
 /* No comment provided by engineer. */
 "call" = "llamada";
 
@@ -857,7 +906,7 @@
 "Can't message member" = "No se pueden enviar mensajes al miembro";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Cancelar";
 
 /* No comment provided by engineer. */
@@ -884,6 +933,9 @@
 /* No comment provided by engineer. */
 "Change" = "Cambiar";
 
+/* alert title */
+"Change automatic message deletion?" = "¿Modificar la eliminación automática de mensajes?";
+
 /* authentication reason */
 "Change chat profiles" = "Cambiar perfil de usuario";
 
@@ -912,7 +964,7 @@
 "Change self-destruct mode" = "Cambiar el modo de autodestrucción";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Cambiar código autodestrucción";
 
 /* chat item text */
@@ -985,10 +1037,10 @@
 "Chat theme" = "Tema de chat";
 
 /* No comment provided by engineer. */
-"Chat will be deleted for all members - this cannot be undone!" = "El chat será eliminado para todos los miembros. ¡No podrá deshacerse!";
+"Chat will be deleted for all members - this cannot be undone!" = "El chat será eliminado para todos los miembros. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
-"Chat will be deleted for you - this cannot be undone!" = "El chat será eliminado para tí. ¡No podrá deshacerse!";
+"Chat will be deleted for you - this cannot be undone!" = "El chat será eliminado para tí. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
 "Chats" = "Chats";
@@ -1033,7 +1085,13 @@
 "Clear conversation?" = "¿Vaciar conversación?";
 
 /* No comment provided by engineer. */
-"Clear private notes?" = "¿Borrar notas privadas?";
+"Clear group?" = "¿Vaciar grupo?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "¿Vaciar o eliminar grupo?";
+
+/* No comment provided by engineer. */
+"Clear private notes?" = "¿Eliminar notas privadas?";
 
 /* No comment provided by engineer. */
 "Clear verification" = "Eliminar verificación";
@@ -1047,6 +1105,9 @@
 /* No comment provided by engineer. */
 "colored" = "coloreado";
 
+/* report reason */
+"Community guidelines violation" = "Violación de las normas de la comunidad";
+
 /* server test step */
 "Compare file" = "Comparar archivo";
 
@@ -1071,12 +1132,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Condiciones de uso";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Las condiciones de los operadores habilitados serán aceptadas después de 30 días.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Las condiciones serán aceptadas para el/los operador(es): **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Las condiciones serán aceptadas para el/los operador(es): **%@**.";
 
@@ -1089,6 +1144,9 @@
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configure servidores ICE";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Configurar operadores de servidores";
+
 /* No comment provided by engineer. */
 "Confirm" = "Confirmar";
 
@@ -1119,6 +1177,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Confirmar subida";
 
+/* token status text */
+"Confirmed" = "Confirmado";
+
 /* server test step */
 "Connect" = "Conectar";
 
@@ -1177,7 +1238,7 @@
 "Connected to desktop" = "Conectado con ordenador";
 
 /* No comment provided by engineer. */
-"connecting" = "conectando";
+"connecting" = "conectando...";
 
 /* No comment provided by engineer. */
 "Connecting" = "Conectando";
@@ -1218,6 +1279,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Estado de tu conexión y servidores.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Conexión bloqueada";
+
 /* No comment provided by engineer. */
 "Connection error" = "Error conexión";
 
@@ -1227,12 +1291,21 @@
 /* chat list item title (it should not be shown */
 "connection established" = "conexión establecida";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "Conexión bloqueada por el operador del servidor:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "Conexión no establecida.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Notificaciones de conexión";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "¡Solicitud de conexión enviada!";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "La conexión requiere renegociar el cifrado.";
+
 /* No comment provided by engineer. */
 "Connection security" = "Seguridad de conexión";
 
@@ -1285,7 +1358,7 @@
 "Contact preferences" = "Preferencias de contacto";
 
 /* No comment provided by engineer. */
-"Contact will be deleted - this cannot be undone!" = "El contacto será eliminado. ¡No podrá deshacerse!";
+"Contact will be deleted - this cannot be undone!" = "El contacto será eliminado. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
 "Contacts" = "Contactos";
@@ -1293,6 +1366,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "Tus contactos sólo pueden marcar los mensajes para eliminar. Tu podrás verlos.";
 
+/* blocking reason */
+"Content violates conditions of use" = "El contenido viola las condiciones de uso";
+
 /* No comment provided by engineer. */
 "Continue" = "Continuar";
 
@@ -1335,6 +1411,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Crear enlace";
 
+/* No comment provided by engineer. */
+"Create list" = "Crear lista";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Crea perfil nuevo en la [aplicación para PC](https://simplex.Descargas/de chat/). 💻";
 
@@ -1476,7 +1555,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "errores de descifrado";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "predeterminado (%@)";
 
 /* No comment provided by engineer. */
@@ -1486,8 +1566,7 @@
 "default (yes)" = "predeterminado (sí)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Eliminar";
 
 /* No comment provided by engineer. */
@@ -1514,6 +1593,9 @@
 /* No comment provided by engineer. */
 "Delete chat" = "Eliminar chat";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Elimina los mensajes del dispositivo.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Eliminar perfil";
 
@@ -1568,14 +1650,17 @@
 /* No comment provided by engineer. */
 "Delete link?" = "¿Eliminar enlace?";
 
+/* alert title */
+"Delete list?" = "¿Eliminar lista?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "¿Eliminar el mensaje de miembro?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "¿Eliminar mensaje?";
 
-/* No comment provided by engineer. */
-"Delete messages" = "Eliminar mensaje";
+/* alert button */
+"Delete messages" = "Activar";
 
 /* No comment provided by engineer. */
 "Delete messages after" = "Eliminar en";
@@ -1587,7 +1672,7 @@
 "Delete old database?" = "¿Eliminar base de datos antigua?";
 
 /* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Borra o modera hasta 200 mensajes a la vez.";
+"Delete or moderate up to 200 messages." = "Elimina o modera hasta 200 mensajes a la vez.";
 
 /* No comment provided by engineer. */
 "Delete pending connection?" = "¿Eliminar conexión pendiente?";
@@ -1598,6 +1683,9 @@
 /* server test step */
 "Delete queue" = "Eliminar cola";
 
+/* No comment provided by engineer. */
+"Delete report" = "Eliminar informe";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Elimina hasta 20 mensajes a la vez.";
 
@@ -1623,7 +1711,7 @@
 "deleted contact" = "contacto eliminado";
 
 /* rcv group event chat item */
-"deleted group" = "grupo eliminado";
+"deleted group" = "ha eliminado el grupo";
 
 /* No comment provided by engineer. */
 "Deletion errors" = "Errores de eliminación";
@@ -1706,6 +1794,12 @@
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Desactivar (conservando anulaciones)";
 
+/* alert title */
+"Disable automatic message deletion?" = "¿Desactivar la eliminación automática de mensajes?";
+
+/* alert button */
+"Disable delete messages" = "Desactivar";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Desactivar para todos";
 
@@ -1766,6 +1860,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NO uses SimpleX para llamadas de emergencia.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Documentos:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "No crear dirección SimpleX";
 
@@ -1773,13 +1870,19 @@
 "Don't enable" = "No activar";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "No pierdas los mensajes importantes.";
+
+/* alert action */
 "Don't show again" = "No volver a mostrar";
 
+/* No comment provided by engineer. */
+"Done" = "Hecho";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Degradar y abrir Chat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Descargar";
 
 /* No comment provided by engineer. */
@@ -1836,14 +1939,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Activar (conservar anulaciones)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "¿Activar eliminación automática de mensajes?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Permitir acceso a la cámara";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Habilita Flux";
+"Enable Flux in Network & servers settings for better metadata privacy." = "Habilitar Flux en la configuración de Red y servidores para mejorar la privacidad de los metadatos.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Activar para todos";
@@ -1897,7 +2000,7 @@
 "Encrypt database?" = "¿Cifrar base de datos?";
 
 /* No comment provided by engineer. */
-"Encrypt local files" = "Cifra archivos locales";
+"Encrypt local files" = "Cifrar archivos locales";
 
 /* No comment provided by engineer. */
 "Encrypt stored files & media" = "Cifra archivos almacenados y multimedia";
@@ -1956,6 +2059,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "se requiere renegociar el cifrado para %@";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Renegociación de cifrado en curso.";
+
 /* No comment provided by engineer. */
 "ended" = "finalizado";
 
@@ -1981,7 +2087,7 @@
 "Enter password above to show!" = "¡Introduce la contraseña arriba para mostrar!";
 
 /* No comment provided by engineer. */
-"Enter server manually" = "Introduce el servidor manualmente";
+"Enter server manually" = "Añadir manualmente";
 
 /* No comment provided by engineer. */
 "Enter this device name…" = "Nombre de este dispositivo…";
@@ -2031,6 +2137,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "¡Error al cambiar a incógnito!";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Error al verificar el estado del token";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Error al conectar con el servidor de reenvío %@. Por favor, inténtalo más tarde.";
 
@@ -2043,6 +2152,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Error al crear enlace de grupo";
 
+/* alert title */
+"Error creating list" = "Error al crear lista";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "Error al establecer contacto con el miembro";
 
@@ -2052,6 +2164,9 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "¡Error al crear perfil!";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Error al crear informe";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Error al descifrar el archivo";
 
@@ -2118,12 +2233,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Error al reconectar con los servidores";
 
-/* No comment provided by engineer. */
-"Error removing member" = "Error al eliminar miembro";
+/* alert title */
+"Error registering for notifications" = "Error al registrarse para notificaciones";
+
+/* alert title */
+"Error removing member" = "Error al expulsar miembro";
+
+/* alert title */
+"Error reordering lists" = "Error al reorganizar listas";
 
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Error al restablecer las estadísticas";
 
+/* alert title */
+"Error saving chat list" = "Error al guardar listas";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Error al guardar perfil de grupo";
 
@@ -2175,6 +2299,9 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Error al sincronizar conexión";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Error al testar la conexión al servidor";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Error al actualizar enlace de grupo";
 
@@ -2199,7 +2326,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Error: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Error: %@";
 
 /* No comment provided by engineer. */
@@ -2217,9 +2346,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Incluso si está desactivado para la conversación.";
 
-/* No comment provided by engineer. */
-"event happened" = "evento ocurrido";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Salir sin guardar";
 
@@ -2229,6 +2355,9 @@
 /* No comment provided by engineer. */
 "expired" = "expirados";
 
+/* token status text */
+"Expired" = "Expirado";
+
 /* No comment provided by engineer. */
 "Export database" = "Exportar base de datos";
 
@@ -2253,20 +2382,32 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "¡Rápido y sin necesidad de esperar a que el remitente esté en línea!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Eliminación más rápida de grupos.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Mensajería más segura y conexión más rápida.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Envío más rápido de mensajes.";
+
 /* swipe action */
 "Favorite" = "Favoritos";
 
 /* No comment provided by engineer. */
+"Favorites" = "Favoritos";
+
+/* file error alert title */
 "File error" = "Error de archivo";
 
 /* alert message */
 "File errors:\n%@" = "Error(es) de archivo\n%@";
 
 /* file error text */
-"File not found - most likely file was deleted or cancelled." = "Archivo no encontrado, probablemente haya sido borrado o cancelado.";
+"File is blocked by server operator:\n%@." = "Archivo bloqueado por el operador del servidor\n%@.";
+
+/* file error text */
+"File not found - most likely file was deleted or cancelled." = "Archivo no encontrado, probablemente haya sido eliminado o cancelado.";
 
 /* file error text */
 "File server error: %@" = "Error del servidor de archivos: %@";
@@ -2341,7 +2482,7 @@
 "Fix not supported by group member" = "Corrección no compatible con miembro del grupo";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "para mejorar la privacidad de los metadatos.";
+"For all moderators" = "Para todos los moderadores";
 
 /* servers error */
 "For chat profile %@:" = "Para el perfil de chat %@:";
@@ -2353,7 +2494,10 @@
 "For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Si por ejemplo tu contacto recibe los mensajes a través de un servidor de SimpleX Chat, tu aplicación los entregará a través de un servidor de Flux.";
 
 /* No comment provided by engineer. */
-"For private routing" = "Para el enrutamiento privado";
+"For me" = "para mí";
+
+/* No comment provided by engineer. */
+"For private routing" = "Para enrutamiento privado";
 
 /* No comment provided by engineer. */
 "For social media" = "Para redes sociales";
@@ -2424,6 +2568,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Reducción consumo de batería";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Las menciones ahora se notifican.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIFs y stickers";
 
@@ -2491,14 +2638,20 @@
 "Group welcome message" = "Mensaje de bienvenida en grupos";
 
 /* No comment provided by engineer. */
-"Group will be deleted for all members - this cannot be undone!" = "El grupo será eliminado para todos los miembros. ¡No podrá deshacerse!";
+"Group will be deleted for all members - this cannot be undone!" = "El grupo será eliminado para todos los miembros. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
-"Group will be deleted for you - this cannot be undone!" = "El grupo será eliminado para tí. ¡No podrá deshacerse!";
+"Group will be deleted for you - this cannot be undone!" = "El grupo será eliminado para tí. ¡No puede deshacerse!";
+
+/* No comment provided by engineer. */
+"Groups" = "Grupos";
 
 /* No comment provided by engineer. */
 "Help" = "Ayuda";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Ayuda a los admins a moderar sus grupos.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Oculto";
 
@@ -2535,6 +2688,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Cómo ayuda a la privacidad";
 
+/* alert button */
+"How it works" = "Cómo funciona";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Cómo funciona SimpleX";
 
@@ -2622,6 +2778,12 @@
 /* No comment provided by engineer. */
 "inactive" = "inactivo";
 
+/* report reason */
+"Inappropriate content" = "Contenido inapropiado";
+
+/* report reason */
+"Inappropriate profile" = "Perfil inapropiado";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incógnito";
 
@@ -2688,6 +2850,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Colores del interfaz";
 
+/* token status text */
+"Invalid" = "No válido";
+
+/* token status text */
+"Invalid (bad token)" = "No válido (token incorrecto)";
+
+/* token status text */
+"Invalid (expired)" = "No válido (expirado)";
+
+/* token status text */
+"Invalid (unregistered)" = "No válido (no registrado)";
+
+/* token status text */
+"Invalid (wrong topic)" = "No válido (tópico incorrecto)";
+
 /* invalid chat data */
 "invalid chat" = "chat no válido";
 
@@ -2889,6 +3066,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Ordenadores enlazados";
 
+/* swipe action */
+"List" = "Lista";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "El nombre y el emoji deben ser diferentes en todas las listas.";
+
+/* No comment provided by engineer. */
+"List name..." = "Nombre de la lista...";
+
 /* No comment provided by engineer. */
 "LIVE" = "EN VIVO";
 
@@ -2958,6 +3144,9 @@
 /* item status text */
 "Member inactive" = "Miembro inactivo";
 
+/* chat feature */
+"Member reports" = "Informes de miembros";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All chat members will be notified." = "El rol del miembro cambiará a \"%@\" y todos serán notificados.";
 
@@ -2968,10 +3157,10 @@
 "Member role will be changed to \"%@\". The member will receive a new invitation." = "El rol del miembro cambiará a \"%@\" y recibirá una invitación nueva.";
 
 /* No comment provided by engineer. */
-"Member will be removed from chat - this cannot be undone!" = "El miembro será eliminado del chat. ¡No podrá deshacerse!";
+"Member will be removed from chat - this cannot be undone!" = "El miembro será eliminado del chat. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
-"Member will be removed from group - this cannot be undone!" = "El miembro será expulsado del grupo. ¡No podrá deshacerse!";
+"Member will be removed from group - this cannot be undone!" = "El miembro será expulsado del grupo. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
 "Members can add message reactions." = "Los miembros pueden añadir reacciones a los mensajes.";
@@ -2979,6 +3168,9 @@
 /* No comment provided by engineer. */
 "Members can irreversibly delete sent messages. (24 hours)" = "Los miembros del grupo pueden eliminar mensajes de forma irreversible. (24 horas)";
 
+/* No comment provided by engineer. */
+"Members can report messsages to moderators." = "Los miembros pueden informar de mensajes a los moderadores.";
+
 /* No comment provided by engineer. */
 "Members can send direct messages." = "Los miembros del grupo pueden enviar mensajes directos.";
 
@@ -2994,6 +3186,9 @@
 /* No comment provided by engineer. */
 "Members can send voice messages." = "Los miembros del grupo pueden enviar mensajes de voz.";
 
+/* No comment provided by engineer. */
+"Mention members 👋" = "Menciona a miembros 👋";
+
 /* No comment provided by engineer. */
 "Menus" = "Menus";
 
@@ -3066,6 +3261,9 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "¡Los mensajes de %@ serán mostrados!";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "Los mensajes de esta conversación nunca se eliminan.";
+
 /* No comment provided by engineer. */
 "Messages received" = "Mensajes recibidos";
 
@@ -3073,7 +3271,7 @@
 "Messages sent" = "Mensajes enviados";
 
 /* alert message */
-"Messages were deleted after you selected them." = "Los mensajes han sido borrados después de seleccionarlos.";
+"Messages were deleted after you selected them." = "Los mensajes han sido eliminados después de seleccionarlos.";
 
 /* No comment provided by engineer. */
 "Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Los mensajes, archivos y llamadas están protegidos mediante **cifrado de extremo a extremo** con secreto perfecto hacía adelante, repudio y recuperación tras ataque.";
@@ -3138,9 +3336,15 @@
 /* marked deleted chat item preview text */
 "moderated by %@" = "moderado por %@";
 
+/* member role */
+"moderator" = "moderador";
+
 /* time unit */
 "months" = "meses";
 
+/* swipe action */
+"More" = "Más";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "¡Pronto habrá más mejoras!";
 
@@ -3156,12 +3360,12 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Múltiples perfiles";
 
-/* No comment provided by engineer. */
-"mute" = "silenciar";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Silenciar";
 
+/* notification label action */
+"Mute all" = "Silenciar todo";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "¡Silenciado cuando está inactivo!";
 
@@ -3192,9 +3396,12 @@
 /* No comment provided by engineer. */
 "Network status" = "Estado de la red";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "nunca";
 
+/* token status text */
+"New" = "Nuevo";
+
 /* No comment provided by engineer. */
 "New chat" = "Nuevo chat";
 
@@ -3244,7 +3451,7 @@
 "New SOCKS credentials will be used every time you start the app." = "Se usarán credenciales SOCKS nuevas cada vez que inicies la aplicación.";
 
 /* No comment provided by engineer. */
-"New SOCKS credentials will be used for each server." = "Se usarán credenciales SOCKS nuevas por cada servidor.";
+"New SOCKS credentials will be used for each server." = "Se usarán credenciales SOCKS nuevas para cada servidor.";
 
 /* pref value */
 "no" = "no";
@@ -3255,6 +3462,15 @@
 /* Authentication unavailable */
 "No app password" = "Sin contraseña de la aplicación";
 
+/* No comment provided by engineer. */
+"No chats" = "Sin chats";
+
+/* No comment provided by engineer. */
+"No chats found" = "Ningún chat encontrado";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Sin chats en la lista %@";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "Ningún contacto seleccionado";
 
@@ -3286,10 +3502,13 @@
 "No info, try to reload" = "No hay información, intenta recargar";
 
 /* servers error */
-"No media & file servers." = "Ningún servidor de archivos y multimedia.";
+"No media & file servers." = "Sin servidores para archivos y multimedia.";
+
+/* No comment provided by engineer. */
+"No message" = "Ningún mensaje";
 
 /* servers error */
-"No message servers." = "Ningún servidor de mensajes.";
+"No message servers." = "Sin servidores para mensajes.";
 
 /* No comment provided by engineer. */
 "No network connection" = "Sin conexión de red";
@@ -3304,32 +3523,41 @@
 "No permission to record voice message" = "Sin permiso para grabar mensajes de voz";
 
 /* No comment provided by engineer. */
-"No push server" = "Ningún servidor push";
+"No push server" = "Sin servidores push";
 
 /* No comment provided by engineer. */
 "No received or sent files" = "Sin archivos recibidos o enviados";
 
 /* servers error */
-"No servers for private message routing." = "Ningún servidor para enrutamiento privado.";
+"No servers for private message routing." = "Sin servidores para enrutamiento privado.";
 
 /* servers error */
-"No servers to receive files." = "Ningún servidor para recibir archivos.";
+"No servers to receive files." = "Sin servidores para recibir archivos.";
 
 /* servers error */
-"No servers to receive messages." = "Ningún servidor para recibir mensajes.";
+"No servers to receive messages." = "Sin servidores para recibir mensajes.";
 
 /* servers error */
-"No servers to send files." = "Ningún servidor para enviar archivos.";
+"No servers to send files." = "Sin servidores para enviar archivos.";
 
 /* copied message info in history */
 "no text" = "sin texto";
 
+/* alert title */
+"No token!" = "¡Sin token!";
+
+/* No comment provided by engineer. */
+"No unread chats" = "Ningún chat sin leer";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "Sin identificadores de usuario.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "¡No compatible!";
 
+/* No comment provided by engineer. */
+"Notes" = "Notas";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "Nada seleccionado";
 
@@ -3342,9 +3570,15 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "¡Las notificaciones están desactivadas!";
 
+/* alert title */
+"Notifications error" = "Error en notificaciones";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Privacidad en las notificaciones";
 
+/* alert title */
+"Notifications status" = "Estado notificaciones";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Ahora los administradores pueden:\n- eliminar mensajes de los miembros.\n- desactivar el rol miembro (a rol \"observador\")";
 
@@ -3352,8 +3586,9 @@
 "observer" = "observador";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "desactivado";
 
 /* blur media */
@@ -3365,7 +3600,8 @@
 /* feature offered item */
 "offered %@: %@" = "ofrecido %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -3396,7 +3632,7 @@
 "Only client devices store user profiles, contacts, groups, and messages." = "Sólo los dispositivos cliente almacenan perfiles de usuario, contactos, grupos y mensajes enviados con **cifrado de extremo a extremo de 2 capas**.";
 
 /* No comment provided by engineer. */
-"Only delete conversation" = "Sólo borrar la conversación";
+"Only delete conversation" = "Eliminar sólo la conversación";
 
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Sólo los propietarios pueden modificar las preferencias del grupo.";
@@ -3407,6 +3643,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "Sólo los propietarios del grupo pueden activar los mensajes de voz.";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "Solo el remitente y el moderador pueden verlo";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "Solo tú y los moderadores podéis verlo";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Sólo tú puedes añadir reacciones a los mensajes.";
 
@@ -3437,7 +3679,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Sólo tu contacto puede enviar mensajes de voz.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Abrir";
 
 /* No comment provided by engineer. */
@@ -3483,11 +3725,14 @@
 "Or securely share this file link" = "O comparte de forma segura este enlace al archivo";
 
 /* No comment provided by engineer. */
-"Or show this code" = "O muestra este código QR";
+"Or show this code" = "O muestra el código QR";
 
 /* No comment provided by engineer. */
 "Or to share privately" = "O para compartir en privado";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Organiza tus chats en listas";
+
 /* No comment provided by engineer. */
 "other" = "otros";
 
@@ -3545,9 +3790,15 @@
 /* No comment provided by engineer. */
 "peer-to-peer" = "p2p";
 
+/* No comment provided by engineer. */
+"pending" = "pendiente";
+
 /* No comment provided by engineer. */
 "Pending" = "Pendientes";
 
+/* No comment provided by engineer. */
+"pending approval" = "pendiente de aprobación";
+
 /* No comment provided by engineer. */
 "Periodic" = "Periódicamente";
 
@@ -3614,6 +3865,15 @@
 /* No comment provided by engineer. */
 "Please store passphrase securely, you will NOT be able to change it if you lose it." = "Guarda la contraseña de forma segura, NO podrás cambiarla si la pierdes.";
 
+/* token info */
+"Please try to disable and re-enable notfications." = "Por favor, intenta desactivar y reactivar las notificaciones.";
+
+/* token info */
+"Please wait for token activation to complete." = "Por favor, espera a que el token de activación se complete.";
+
+/* token info */
+"Please wait for token to be registered." = "Por favor, espera a que el token se registre.";
+
 /* No comment provided by engineer. */
 "Polish interface" = "Interfaz en polaco";
 
@@ -3644,12 +3904,21 @@
 /* No comment provided by engineer. */
 "Privacy for your customers." = "Privacidad para tus clientes.";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "Política de privacidad y condiciones de uso.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Privacidad redefinida";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "Los chats privados, los grupos y tus contactos no son accesibles para los operadores de servidores.";
+
 /* No comment provided by engineer. */
 "Private filenames" = "Nombres de archivos privados";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Nombres privados en archivos de media.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Enrutamiento privado de mensajes";
 
@@ -3695,6 +3964,9 @@
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "No se permiten reacciones a los mensajes.";
 
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "No se permite informar de mensajes a los moderadores.";
+
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "No se permiten mensajes directos entre miembros.";
 
@@ -3711,7 +3983,7 @@
 "Prohibit sending voice messages." = "No se permiten mensajes de voz.";
 
 /* No comment provided by engineer. */
-"Protect app screen" = "Proteger la pantalla de la aplicación";
+"Protect app screen" = "Proteger la pantalla";
 
 /* No comment provided by engineer. */
 "Protect IP address" = "Proteger dirección IP";
@@ -3753,7 +4025,7 @@
 "Rate the app" = "Valora la aplicación";
 
 /* No comment provided by engineer. */
-"Reachable chat toolbar" = "Barra de herramientas accesible";
+"Reachable chat toolbar" = "Barra de menú accesible";
 
 /* chat item menu */
 "React…" = "Reacciona…";
@@ -3840,7 +4112,7 @@
 "Reconnect all servers?" = "¿Reconectar todos los servidores?";
 
 /* No comment provided by engineer. */
-"Reconnect server to force message delivery. It uses additional traffic." = "Reconectar el servidor para forzar la entrega de mensajes. Usa tráfico adicional.";
+"Reconnect server to force message delivery. It uses additional traffic." = "Reconectar con el servidor para forzar la entrega de mensajes. Se usa tráfico adicional.";
 
 /* No comment provided by engineer. */
 "Reconnect server?" = "¿Reconectar servidor?";
@@ -3857,8 +4129,17 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Reducción del uso de batería";
 
+/* No comment provided by engineer. */
+"Register" = "Registrar";
+
+/* token info */
+"Register notification token?" = "¿Registrar el token de notificaciones?";
+
+/* token status text */
+"Registered" = "Registrado";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Rechazar";
 
 /* No comment provided by engineer. */
@@ -3867,6 +4148,9 @@
 /* No comment provided by engineer. */
 "Reject contact request" = "Rechazar solicitud de contacto";
 
+/* No comment provided by engineer. */
+"rejected" = "rechazado";
+
 /* call status */
 "rejected call" = "llamada rechazada";
 
@@ -3936,6 +4220,36 @@
 /* chat item action */
 "Reply" = "Responder";
 
+/* chat item action */
+"Report" = "Informe";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Informar de contenido: sólo los moderadores del grupo lo verán.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Informar del perfil de un miembro: sólo los moderadores del grupo lo verán.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Informar de otros: sólo los moderadores del grupo lo verán.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "¿Motivo del informe?";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Informar de spam: sólo los moderadores del grupo lo verán.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Informar de violación: sólo los moderadores del grupo lo verán.";
+
+/* report in notification */
+"Report: %@" = "Informe: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "No se permite informar de mensajes a los moderadores.";
+
+/* No comment provided by engineer. */
+"Reports" = "Informes";
+
 /* chat list item title */
 "requested to connect" = "solicitado para conectar";
 
@@ -3993,9 +4307,6 @@
 /* No comment provided by engineer. */
 "Review conditions" = "Revisar condiciones";
 
-/* No comment provided by engineer. */
-"Review later" = "Revisar más tarde";
-
 /* No comment provided by engineer. */
 "Revoke" = "Revocar";
 
@@ -4018,7 +4329,7 @@
 "Safer groups" = "Grupos más seguros";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Guardar";
 
 /* alert button */
@@ -4039,6 +4350,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "Guardar perfil de grupo";
 
+/* No comment provided by engineer. */
+"Save list" = "Guardar lista";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "Guardar contraseña y abrir el chat";
 
@@ -4103,7 +4417,7 @@
 "Scan security code from your contact's app." = "Escanea el código de seguridad desde la aplicación de tu contacto.";
 
 /* No comment provided by engineer. */
-"Scan server QR code" = "Escanear código QR del servidor";
+"Scan server QR code" = "Escanear código QR";
 
 /* No comment provided by engineer. */
 "search" = "buscar";
@@ -4207,6 +4521,9 @@
 /* No comment provided by engineer. */
 "Send notifications" = "Enviar notificaciones";
 
+/* No comment provided by engineer. */
+"Send private reports" = "Envía informes privados";
+
 /* No comment provided by engineer. */
 "Send questions and ideas" = "Consultas y sugerencias";
 
@@ -4331,7 +4648,7 @@
 "Servers info" = "Info servidores";
 
 /* No comment provided by engineer. */
-"Servers statistics will be reset - this cannot be undone!" = "Las estadísticas de los servidores serán restablecidas. ¡No podrá deshacerse!";
+"Servers statistics will be reset - this cannot be undone!" = "Las estadísticas de los servidores serán restablecidas. ¡No puede deshacerse!";
 
 /* No comment provided by engineer. */
 "Session code" = "Código de sesión";
@@ -4339,6 +4656,9 @@
 /* No comment provided by engineer. */
 "Set 1 day" = "Establecer 1 día";
 
+/* No comment provided by engineer. */
+"Set chat name…" = "Nombre para el chat…";
+
 /* No comment provided by engineer. */
 "Set contact name…" = "Escribe el nombre del contacto…";
 
@@ -4351,6 +4671,9 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Úsalo en lugar de la autenticación del sistema.";
 
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Establece el vencimiento para los mensajes en los chats.";
+
 /* profile update event chat item */
 "set new contact address" = "nueva dirección de contacto";
 
@@ -4382,7 +4705,7 @@
 "Shape profile images" = "Dar forma a las imágenes de perfil";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Compartir";
 
 /* No comment provided by engineer. */
@@ -4407,7 +4730,7 @@
 "Share link" = "Compartir enlace";
 
 /* No comment provided by engineer. */
-"Share profile" = "Comparte perfil";
+"Share profile" = "Perfil a compartir";
 
 /* No comment provided by engineer. */
 "Share SimpleX address on social media." = "Comparte tu dirección SimpleX en redes sociales.";
@@ -4421,6 +4744,9 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Compartir con contactos";
 
+/* No comment provided by engineer. */
+"Short link" = "Enlace corto";
+
 /* No comment provided by engineer. */
 "Show → on messages sent via private routing." = "Mostrar → en mensajes con enrutamiento privado.";
 
@@ -4458,13 +4784,16 @@
 "SimpleX Address" = "Dirección SimpleX";
 
 /* No comment provided by engineer. */
-"SimpleX address and 1-time links are safe to share via any messenger." = "Compartir los enlaces de un uso y las direcciones SimpleX es seguro a través de cualquier medio.";
+"SimpleX address and 1-time links are safe to share via any messenger." = "Compartir enlaces de un solo uso y direcciones SimpleX es seguro a través de cualquier medio.";
 
 /* No comment provided by engineer. */
 "SimpleX address or 1-time link?" = "¿Dirección SimpleX o enlace de un uso?";
 
+/* simplex link type */
+"SimpleX channel link" = "Enlace de canal SimpleX";
+
 /* No comment provided by engineer. */
-"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "Simplex Chat y Flux han acordado incluir servidores operados por Flux en la aplicación";
+"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "Simplex Chat y Flux han acordado incluir en la aplicación servidores operados por Flux.";
 
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "La seguridad de SimpleX Chat ha sido auditada por Trail of Bits.";
@@ -4518,7 +4847,7 @@
 "Skipped messages" = "Mensajes omitidos";
 
 /* No comment provided by engineer. */
-"Small groups (max 20)" = "Grupos pequeños (máx. 20)";
+"Small groups (max 20)" = "Grupos pequeños (max. 20)";
 
 /* No comment provided by engineer. */
 "SMP server" = "Servidor SMP";
@@ -4547,6 +4876,10 @@
 /* notification title */
 "Somebody" = "Alguien";
 
+/* blocking reason
+report reason */
+"Spam" = "Spam";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Cuadrada, circular o cualquier forma intermedia.";
 
@@ -4578,7 +4911,7 @@
 "Stop chat" = "Parar SimpleX";
 
 /* No comment provided by engineer. */
-"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "Para poder exportar, importar o eliminar la base de datos primero debes parar SimpleX. Mientras tanto no podrás recibir ni enviar mensajes.";
+"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "Para exportar, importar o eliminar la base de datos debes parar SimpleX. Mientra tanto no podrás enviar ni recibir mensajes.";
 
 /* No comment provided by engineer. */
 "Stop chat?" = "¿Parar Chat?";
@@ -4604,6 +4937,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Parando chat";
 
+/* No comment provided by engineer. */
+"Storage" = "Almacenamiento";
+
 /* No comment provided by engineer. */
 "strike" = "tachado";
 
@@ -4614,7 +4950,7 @@
 "Submit" = "Enviar";
 
 /* No comment provided by engineer. */
-"Subscribed" = "Suscrito";
+"Subscribed" = "Suscritas";
 
 /* No comment provided by engineer. */
 "Subscription errors" = "Errores de suscripción";
@@ -4673,6 +5009,9 @@
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Timeout de la conexión TCP";
 
+/* No comment provided by engineer. */
+"TCP port for messaging" = "Puerto TCP para mensajes";
+
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
 
@@ -4682,12 +5021,15 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Error en archivo temporal";
 
 /* server test failure */
 "Test failed at step %@." = "Prueba no superada en el paso %@.";
 
+/* No comment provided by engineer. */
+"Test notifications" = "Probar notificaciones";
+
 /* No comment provided by engineer. */
 "Test server" = "Probar servidor";
 
@@ -4719,7 +5061,7 @@
 "The attempt to change database passphrase was not completed." = "El intento de cambiar la contraseña de la base de datos no se ha completado.";
 
 /* No comment provided by engineer. */
-"The code you scanned is not a SimpleX link QR code." = "El código QR escaneado no es un enlace SimpleX.";
+"The code you scanned is not a SimpleX link QR code." = "El código QR escaneado no es un enlace de SimpleX.";
 
 /* No comment provided by engineer. */
 "The connection reached the limit of undelivered messages, your contact may be offline." = "La conexión ha alcanzado el límite de mensajes no entregados. es posible que tu contacto esté desconectado.";
@@ -4760,15 +5102,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "La base de datos antigua no se eliminó durante la migración, puede eliminarse.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "El perfil sólo se comparte con tus contactos.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Las mismas condiciones se aplicarán al operador **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Las mismas condiciones se aplicarán a el/los operador(es) **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "¡Segundo operador predefinido!";
 
@@ -4779,13 +5115,13 @@
 "The sender will NOT be notified" = "El remitente NO será notificado";
 
 /* No comment provided by engineer. */
-"The servers for new connections of your current chat profile **%@**." = "Lista de servidores para las conexiones nuevas del perfil **%@**.";
+"The servers for new connections of your current chat profile **%@**." = "Servidores para conexiones nuevas en tu perfil **%@**.";
 
 /* No comment provided by engineer. */
-"The servers for new files of your current chat profile **%@**." = "Los servidores para archivos nuevos en tu perfil actual **%@**.";
+"The servers for new files of your current chat profile **%@**." = "Servidores para enviar archivos en tu perfil **%@**.";
 
 /* No comment provided by engineer. */
-"The text you pasted is not a SimpleX link." = "El texto pegado no es un enlace SimpleX.";
+"The text you pasted is not a SimpleX link." = "El texto pegado no es un enlace de SimpleX.";
 
 /* No comment provided by engineer. */
 "The uploaded database archive will be permanently removed from the servers." = "El archivo de bases de datos subido será eliminado permanentemente de los servidores.";
@@ -4808,6 +5144,9 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Esta acción es irreversible. Se eliminarán los mensajes enviados y recibidos anteriores a la selección. Podría tardar varios minutos.";
 
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Todos los mensajes previos al período seleccionado serán eliminados del chat. ¡No puede deshacerse!";
+
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Esta acción es irreversible. Tu perfil, contactos, mensajes y archivos se perderán irreversiblemente.";
 
@@ -4838,9 +5177,15 @@
 /* No comment provided by engineer. */
 "This is your own SimpleX address!" = "¡Esta es tu propia dirección SimpleX!";
 
+/* No comment provided by engineer. */
+"This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." = "Este enlace requiere una versión más reciente de la aplicación. Por favor, actualiza la aplicación o pide a tu contacto un enlace compatible.";
+
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Este enlace ha sido usado en otro dispositivo móvil, por favor crea un enlace nuevo en el ordenador.";
 
+/* No comment provided by engineer. */
+"This message was deleted or not received yet." = "El mensaje ha sido eliminado o aún no se ha recibido.";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Esta configuración se aplica a los mensajes del perfil actual **%@**.";
 
@@ -4872,7 +5217,7 @@
 "To protect your IP address, private routing uses your SMP servers to deliver messages." = "Para proteger tu dirección IP, el enrutamiento privado usa tu lista de servidores SMP para enviar mensajes.";
 
 /* No comment provided by engineer. */
-"To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Para proteger tu privacidad, en lugar de los identificadores de usuario que usan el resto de plataformas, SimpleX dispone de identificadores para las colas de mensajes, independientes para cada uno de tus contactos.";
+"To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Para proteger tu privacidad, SimpleX usa identificadores distintos para cada uno de tus contactos.";
 
 /* No comment provided by engineer. */
 "To receive" = "Para recibir";
@@ -4896,7 +5241,7 @@
 "To support instant push notifications the chat database has to be migrated." = "Para permitir las notificaciones automáticas instantáneas, la base de datos se debe migrar.";
 
 /* No comment provided by engineer. */
-"To use the servers of **%@**, accept conditions of use." = "Para usar los servidores de **%@**, acepta las condiciones de uso.";
+"To use the servers of **%@**, accept conditions of use." = "Para usar los servidores de **%@**, debes aceptar las condiciones de uso.";
 
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Para verificar el cifrado de extremo a extremo con tu contacto, compara (o escanea) el código en ambos dispositivos.";
@@ -4907,6 +5252,9 @@
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Activa incógnito al conectar.";
 
+/* token status */
+"Token status: %@." = "Estado token: %@.";
+
 /* No comment provided by engineer. */
 "Toolbar opacity" = "Opacidad barra";
 
@@ -4947,7 +5295,7 @@
 "Unblock member" = "Desbloquear miembro";
 
 /* No comment provided by engineer. */
-"Unblock member for all?" = "¿Desbloquear miembro para todos?";
+"Unblock member for all?" = "¿Desbloquear el miembro para todos?";
 
 /* No comment provided by engineer. */
 "Unblock member?" = "¿Desbloquear miembro?";
@@ -5001,7 +5349,7 @@
 "Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." = "A menos que utilices la interfaz de llamadas de iOS, activa el modo No molestar para evitar interrupciones.";
 
 /* No comment provided by engineer. */
-"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "A menos que tu contacto haya eliminado la conexión o el enlace haya sido usado, podría ser un error. Por favor, notifícalo.\nPara conectarte pide a tu contacto que cree otro enlace y comprueba la conexión de red.";
+"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "A menos que tu contacto haya eliminado la conexión o el enlace se haya usado, podría ser un error. Por favor, notifícalo.\nPara conectarte pide a tu contacto que cree otro enlace y comprueba la conexión de red.";
 
 /* No comment provided by engineer. */
 "Unlink" = "Desenlazar";
@@ -5015,10 +5363,7 @@
 /* authentication reason */
 "Unlock app" = "Desbloquear aplicación";
 
-/* No comment provided by engineer. */
-"unmute" = "activar sonido";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Activar audio";
 
 /* No comment provided by engineer. */
@@ -5027,6 +5372,9 @@
 /* swipe action */
 "Unread" = "No leído";
 
+/* No comment provided by engineer. */
+"Unsupported connection link" = "Enlace de conexión no compatible";
+
 /* No comment provided by engineer. */
 "Up to 100 last messages are sent to new members." = "Hasta 100 últimos mensajes son enviados a los miembros nuevos.";
 
@@ -5042,6 +5390,9 @@
 /* No comment provided by engineer. */
 "Update settings?" = "¿Actualizar configuración?";
 
+/* No comment provided by engineer. */
+"Updated conditions" = "Condiciones actualizadas";
+
 /* rcv group event chat item */
 "updated group profile" = "ha actualizado el perfil del grupo";
 
@@ -5049,7 +5400,7 @@
 "updated profile" = "perfil actualizado";
 
 /* No comment provided by engineer. */
-"Updating settings will re-connect the client to all servers." = "Al actualizar la configuración el cliente se reconectará a todos los servidores.";
+"Updating settings will re-connect the client to all servers." = "Para actualizar la configuración el cliente se reconectará a todos los servidores.";
 
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Actualizar y abrir Chat";
@@ -5085,13 +5436,13 @@
 "Use current profile" = "Usar perfil actual";
 
 /* No comment provided by engineer. */
-"Use for files" = "Usar para archivos";
+"Use for files" = "Uso para archivos";
 
 /* No comment provided by engineer. */
-"Use for messages" = "Usar para mensajes";
+"Use for messages" = "Uso para mensajes";
 
 /* No comment provided by engineer. */
-"Use for new connections" = "Usar para conexiones nuevas";
+"Use for new connections" = "Para conexiones nuevas";
 
 /* No comment provided by engineer. */
 "Use from desktop" = "Usar desde ordenador";
@@ -5109,7 +5460,7 @@
 "Use private routing with unknown servers when IP address is not protected." = "Usar enrutamiento privado con servidores desconocidos cuando tu dirección IP no está protegida.";
 
 /* No comment provided by engineer. */
-"Use private routing with unknown servers." = "Usar enrutamiento privado con servidores de retransmisión desconocidos.";
+"Use private routing with unknown servers." = "Usar enrutamiento privado con servidores de mensaje desconocidos.";
 
 /* No comment provided by engineer. */
 "Use server" = "Usar servidor";
@@ -5117,18 +5468,30 @@
 /* No comment provided by engineer. */
 "Use servers" = "Usar servidores";
 
+/* No comment provided by engineer. */
+"Use short links (BETA)" = "Usar enlaces cortos (BETA)";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "¿Usar servidores SimpleX Chat?";
 
 /* No comment provided by engineer. */
 "Use SOCKS proxy" = "Usar proxy SOCKS";
 
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "Se usa el puerto TCP %@ cuando no se ha especificado otro.";
+
+/* No comment provided by engineer. */
+"Use TCP port 443 for preset servers only." = "Usar puerto TCP 443 solo en servidores predefinidos.";
+
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Usar la aplicación durante la llamada.";
 
 /* No comment provided by engineer. */
 "Use the app with one hand." = "Usa la aplicación con una sola mano.";
 
+/* No comment provided by engineer. */
+"Use web port" = "Usar puerto web";
+
 /* No comment provided by engineer. */
 "User selection" = "Selección de usuarios";
 
@@ -5391,7 +5754,7 @@
 "You are invited to group" = "Has sido invitado a un grupo";
 
 /* No comment provided by engineer. */
-"You are not connected to these servers. Private routing is used to deliver messages to them." = "No estás conectado a estos servidores. Para enviarles mensajes se usa el enrutamiento privado.";
+"You are not connected to these servers. Private routing is used to deliver messages to them." = "No tienes conexión directa a estos servidores. Los mensajes destinados a estos usan enrutamiento privado.";
 
 /* No comment provided by engineer. */
 "you are observer" = "Tu rol es observador";
@@ -5405,9 +5768,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Puedes cambiar la posición de la barra desde el menú Apariencia.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Puedes configurar los operadores desde Servidores y Redes.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "Puedes configurar los servidores a través de su configuración.";
 
@@ -5514,7 +5874,7 @@
 "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Debes usar la versión más reciente de tu base de datos ÚNICAMENTE en un dispositivo, de lo contrario podrías dejar de recibir mensajes de algunos contactos.";
 
 /* No comment provided by engineer. */
-"You need to allow your contact to call to be able to call them." = "Necesitas permitir que tus contacto llamen para poder llamarles.";
+"You need to allow your contact to call to be able to call them." = "Debes permitir que tus contacto te llamen para poder llamarles.";
 
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Para poder enviar mensajes de voz antes debes permitir que tu contacto pueda enviarlos.";
@@ -5534,6 +5894,9 @@
 /* chat list item description */
 "you shared one-time link incognito" = "has compartido enlace de un solo uso en modo incógnito";
 
+/* token info */
+"You should receive notifications." = "Deberías recibir notificaciones.";
+
 /* snd group event chat item */
 "you unblocked %@" = "has desbloqueado a %@";
 
@@ -5627,15 +5990,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "El perfil **%@** será compartido.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "El perfil sólo se comparte con tus contactos.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos. Los servidores SimpleX no pueden ver tu perfil.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Tu perfil ha sido modificado. Si lo guardas la actualización será enviada a todos tus contactos.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Tu perfil, contactos y mensajes se almacenan en tu dispositivo.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Tu perfil aleatorio";
 
@@ -5651,6 +6014,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Mi dirección SimpleX";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Servidores SMP";
-
diff --git a/apps/ios/fi.lproj/Localizable.strings b/apps/ios/fi.lproj/Localizable.strings
index f0987f3e1b..8e489f7a71 100644
--- a/apps/ios/fi.lproj/Localizable.strings
+++ b/apps/ios/fi.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (voidaan kopioida)";
 
@@ -16,24 +10,9 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- ääniviestit enintään 5 minuuttia.\n- mukautettu katoamisaika.\n- historian muokkaaminen.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 värillinen!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Osallistu](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -160,9 +139,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld uutta käyttöliittymän kieltä";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld sekunti(a)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld sekuntia";
 
@@ -205,7 +181,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 päivä";
 
 /* time interval */
@@ -214,10 +191,12 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minuutti";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 kuukausi";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 viikko";
 
 /* No comment provided by engineer. */
@@ -260,8 +239,8 @@
 "above, then choose:" = "edellä, valitse sitten:";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Hyväksy";
 
 /* No comment provided by engineer. */
@@ -271,7 +250,7 @@
 "Accept contact request from %@?" = "Hyväksy kontaktipyyntö %@:ltä?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Hyväksy tuntematon";
 
 /* call status */
@@ -530,7 +509,7 @@
 "Can't invite contacts!" = "Kontakteja ei voi kutsua!";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Peruuta";
 
 /* feature offered item */
@@ -570,7 +549,7 @@
 "Change self-destruct mode" = "Vaihda itsetuhotilaa";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Vaihda itsetuhoutuva pääsykoodi";
 
 /* chat item text */
@@ -789,6 +768,9 @@
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Luo uusi profiili [työpöytäsovelluksessa](https://simplex.chat/downloads/). 💻";
 
+/* No comment provided by engineer. */
+"Create profile" = "Luo profiilisi";
+
 /* server test step */
 "Create queue" = "Luo jono";
 
@@ -888,7 +870,8 @@
 /* message decrypt error item */
 "Decryption error" = "Salauksen purkuvirhe";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "oletusarvo (%@)";
 
 /* No comment provided by engineer. */
@@ -898,8 +881,7 @@
 "default (yes)" = "oletusarvo (kyllä)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Poista";
 
 /* No comment provided by engineer. */
@@ -965,7 +947,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Poista viesti?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Poista viestit";
 
 /* No comment provided by engineer. */
@@ -1091,7 +1073,7 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Älä salli";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Älä näytä uudelleen";
 
 /* No comment provided by engineer. */
@@ -1124,7 +1106,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Salli (pidä ohitukset)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Ota automaattinen viestien poisto käyttöön?";
 
 /* No comment provided by engineer. */
@@ -1325,7 +1307,7 @@
 /* alert title */
 "Error receiving file" = "Virhe tiedoston vastaanottamisessa";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Virhe poistettaessa jäsentä";
 
 /* No comment provided by engineer. */
@@ -1379,7 +1361,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Virhe: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Virhe: %@";
 
 /* No comment provided by engineer. */
@@ -1391,9 +1375,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Jopa kun ei käytössä keskustelussa.";
 
-/* No comment provided by engineer. */
-"event happened" = "tapahtuma tapahtui";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Poistu tallentamatta";
 
@@ -1988,7 +1969,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Useita keskusteluprofiileja";
 
-/* swipe action */
+/* notification label action */
 "Mute" = "Mykistä";
 
 /* No comment provided by engineer. */
@@ -2006,7 +1987,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Verkon tila";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "ei koskaan";
 
 /* notification */
@@ -2097,8 +2078,9 @@
 "observer" = "tarkkailija";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "pois";
 
 /* blur media */
@@ -2110,7 +2092,8 @@
 /* feature offered item */
 "offered %@: %@" = "tarjottu %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -2402,7 +2385,7 @@
 "Reduced battery usage" = "Pienempi akun käyttö";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Hylkää";
 
 /* No comment provided by engineer. */
@@ -2502,7 +2485,7 @@
 "Run chat" = "Käynnistä chat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Tallenna";
 
 /* alert button */
@@ -2710,7 +2693,7 @@
 "Settings" = "Asetukset";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Jaa";
 
 /* No comment provided by engineer. */
@@ -2929,9 +2912,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Vanhaa tietokantaa ei poistettu siirron aikana, se voidaan kuitenkin poistaa.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Profiili jaetaan vain kontaktiesi kanssa.";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Toinen kuittaus, joka uupui! ✅";
 
@@ -3058,7 +3038,7 @@
 /* authentication reason */
 "Unlock app" = "Avaa sovellus";
 
-/* swipe action */
+/* notification label action */
 "Unmute" = "Poista mykistys";
 
 /* swipe action */
@@ -3410,10 +3390,10 @@
 "Your profile **%@** will be shared." = "Profiilisi **%@** jaetaan.";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa. SimpleX-palvelimet eivät näe profiiliasi.";
+"Your profile is stored on your device and only shared with your contacts." = "Profiili jaetaan vain kontaktiesi kanssa.";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Profiilisi, kontaktisi ja toimitetut viestit tallennetaan laitteellesi.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa. SimpleX-palvelimet eivät näe profiiliasi.";
 
 /* No comment provided by engineer. */
 "Your random profile" = "Satunnainen profiilisi";
@@ -3427,6 +3407,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "SimpleX-osoitteesi";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "SMP-palvelimesi";
-
diff --git a/apps/ios/fr.lproj/Localizable.strings b/apps/ios/fr.lproj/Localizable.strings
index 6b973e75d0..9b570a5ae9 100644
--- a/apps/ios/fr.lproj/Localizable.strings
+++ b/apps/ios/fr.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (peut être copié)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- messages vocaux pouvant durer jusqu'à 5 minutes.\n- délai personnalisé de disparition.\n- l'historique de modification.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 coloré!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(nouveau)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(cet appareil v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Contribuer](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -82,6 +61,9 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Recommandé** : le token de l'appareil et les notifications sont envoyés au serveur de notifications SimpleX, mais pas le contenu du message, sa taille ou son auteur.";
 
+/* No comment provided by engineer. */
+"**Scan / Paste link**: to connect via a link you received." = "**Scanner / Coller** : pour vous connecter via un lien que vous avez reçu.";
+
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Avertissement** : les notifications push instantanées nécessitent une phrase secrète enregistrée dans la keychain.";
 
@@ -142,6 +124,12 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ est vérifié·e";
 
+/* No comment provided by engineer. */
+"%@ server" = "Serveur %@";
+
+/* No comment provided by engineer. */
+"%@ servers" = "Serveurs %@";
+
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ envoyé";
 
@@ -190,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d sec";
 
+/* delete after time */
+"%d seconds(s)" = "%d seconde(s)";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d message·s sauté·s";
 
@@ -232,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld nouvelles langues d'interface";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld seconde·s";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld secondes";
 
@@ -280,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 jour";
 
 /* time interval */
@@ -289,12 +278,23 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minute";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 mois";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 semaine";
 
+/* delete after time */
+"1 year" = "1 an";
+
+/* No comment provided by engineer. */
+"1-time link" = "Lien unique";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "Le lien unique peut être utilisé *avec un seul contact* - partagez le en personne ou via n'importe quelle messagerie.";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5 minutes";
 
@@ -328,6 +328,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Abandonner le changement d'adresse ?";
 
+/* No comment provided by engineer. */
+"About operators" = "À propos des opérateurs";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "À propos de SimpleX Chat";
 
@@ -338,10 +341,13 @@
 "Accent" = "Principale";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Accepter";
 
+/* No comment provided by engineer. */
+"Accept conditions" = "Accepter les conditions";
+
 /* No comment provided by engineer. */
 "Accept connection request?" = "Accepter la demande de connexion ?";
 
@@ -349,24 +355,39 @@
 "Accept contact request from %@?" = "Accepter la demande de contact de %@ ?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Accepter en incognito";
 
 /* call status */
 "accepted call" = "appel accepté";
 
+/* No comment provided by engineer. */
+"Accepted conditions" = "Conditions acceptées";
+
+/* chat list item title */
+"accepted invitation" = "invitation acceptée";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Reçu avec accusé de réception";
 
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Erreur d'accusé de réception";
 
+/* token status text */
+"Active" = "Actif";
+
 /* No comment provided by engineer. */
 "Active connections" = "Connections actives";
 
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Ajoutez une adresse à votre profil, afin que vos contacts puissent la partager avec d'autres personnes. La mise à jour du profil sera envoyée à vos contacts.";
 
+/* No comment provided by engineer. */
+"Add friends" = "Ajouter des amis";
+
+/* No comment provided by engineer. */
+"Add list" = "Ajouter une liste";
+
 /* No comment provided by engineer. */
 "Add profile" = "Ajouter un profil";
 
@@ -376,12 +397,27 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Ajoutez des serveurs en scannant des codes QR.";
 
+/* No comment provided by engineer. */
+"Add team members" = "Ajouter des membres à l'équipe";
+
 /* No comment provided by engineer. */
 "Add to another device" = "Ajouter à un autre appareil";
 
+/* No comment provided by engineer. */
+"Add to list" = "Ajouter à la liste";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Ajouter un message d'accueil";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "Ajoutez les membres de votre équipe aux conversations.";
+
+/* No comment provided by engineer. */
+"Added media & file servers" = "Ajout de serveurs de médias et de fichiers";
+
+/* No comment provided by engineer. */
+"Added message servers" = "Ajout de serveurs de messages";
+
 /* No comment provided by engineer. */
 "Additional accent" = "Accent additionnel";
 
@@ -397,6 +433,12 @@
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "Le changement d'adresse sera annulé. L'ancienne adresse de réception sera utilisée.";
 
+/* No comment provided by engineer. */
+"Address or 1-time link?" = "Adresse ou lien unique ?";
+
+/* No comment provided by engineer. */
+"Address settings" = "Paramètres de l'adresse";
+
 /* member role */
 "admin" = "admin";
 
@@ -421,12 +463,18 @@
 /* chat item text */
 "agreeing encryption…" = "négociation du chiffrement…";
 
+/* No comment provided by engineer. */
+"All" = "Tout";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Toutes les données de l'application sont supprimées.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Toutes les discussions et tous les messages seront supprimés - il est impossible de revenir en arrière !";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Tous les chats seront supprimés de la liste %@, et la liste sera supprimée.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Toutes les données sont effacées lorsqu'il est saisi.";
 
@@ -439,6 +487,9 @@
 /* feature role */
 "all members" = "tous les membres";
 
+/* No comment provided by engineer. */
+"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Tous les messages et fichiers sont envoyés **chiffrés de bout en bout**, avec une sécurité post-quantique dans les messages directs.";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "Tous les messages seront supprimés - il n'est pas possible de revenir en arrière !";
 
@@ -451,6 +502,9 @@
 /* profile dropdown */
 "All profiles" = "Tous les profiles";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Tous les rapports seront archivés pour vous.";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Tous vos contacts resteront connectés.";
 
@@ -496,6 +550,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Autoriser la suppression irréversible de messages envoyés. (24 heures)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Permettre de signaler des messages aux modérateurs.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Permet l'envoi de fichiers et de médias.";
 
@@ -550,6 +607,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "et %lld autres événements";
 
+/* report reason */
+"Another reason" = "Autre raison";
+
 /* No comment provided by engineer. */
 "Answer call" = "Répondre à l'appel";
 
@@ -592,12 +652,30 @@
 /* No comment provided by engineer. */
 "Apply to" = "Appliquer à";
 
+/* No comment provided by engineer. */
+"Archive" = "Archiver";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Archiver les rapports %lld ?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Archiver tous les rapports ?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiver et téléverser";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Archiver les contacts pour discuter plus tard.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Archiver le rapport";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Archiver le rapport ?";
+
+/* swipe action */
+"Archive reports" = "Archiver les rapports";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Contacts archivés";
 
@@ -679,6 +757,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Des groupes plus performants";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Meilleure performance des groupes";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Meilleures dates de messages.";
 
@@ -691,6 +772,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Notifications améliorées";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Meilleure protection de la privacité et de la sécurité";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Sécurité accrue ✅";
 
@@ -724,7 +808,8 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ bloqué";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "bloqué par l'administrateur";
 
 /* No comment provided by engineer. */
@@ -757,9 +842,21 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Bulgare, finnois, thaïlandais et ukrainien - grâce aux utilisateurs et à [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat) !";
 
+/* No comment provided by engineer. */
+"Business address" = "Adresse professionnelle";
+
+/* No comment provided by engineer. */
+"Business chats" = "Discussions professionnelles";
+
+/* No comment provided by engineer. */
+"Businesses" = "Entreprises";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "En utilisant SimpleX Chat, vous acceptez de :\n- n'envoyer que du contenu légal dans les groupes publics.\n- respecter les autres utilisateurs - pas de spam.";
+
 /* No comment provided by engineer. */
 "call" = "appeler";
 
@@ -800,7 +897,7 @@
 "Can't message member" = "Impossible d'envoyer un message à ce membre";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Annuler";
 
 /* No comment provided by engineer. */
@@ -827,6 +924,12 @@
 /* No comment provided by engineer. */
 "Change" = "Changer";
 
+/* alert title */
+"Change automatic message deletion?" = "Modifier la suppression automatique des messages ?";
+
+/* authentication reason */
+"Change chat profiles" = "Changer de profil de discussion";
+
 /* No comment provided by engineer. */
 "Change database passphrase?" = "Changer la phrase secrète de la base de données ?";
 
@@ -852,7 +955,7 @@
 "Change self-destruct mode" = "Modifier le mode d'autodestruction";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Modifier le code d'autodestruction";
 
 /* chat item text */
@@ -870,6 +973,15 @@
 /* chat item text */
 "changing address…" = "changement d'adresse…";
 
+/* No comment provided by engineer. */
+"Chat" = "Discussions";
+
+/* No comment provided by engineer. */
+"Chat already exists" = "La discussion existe déjà";
+
+/* No comment provided by engineer. */
+"Chat already exists!" = "La discussion existe déjà !";
+
 /* No comment provided by engineer. */
 "Chat colors" = "Couleurs de chat";
 
@@ -915,9 +1027,21 @@
 /* No comment provided by engineer. */
 "Chat theme" = "Thème de chat";
 
+/* No comment provided by engineer. */
+"Chat will be deleted for all members - this cannot be undone!" = "La discussion sera supprimé pour tous les membres - cela ne peut pas être annulé !";
+
+/* No comment provided by engineer. */
+"Chat will be deleted for you - this cannot be undone!" = "Le discussion sera supprimé pour vous - il n'est pas possible de revenir en arrière !";
+
 /* No comment provided by engineer. */
 "Chats" = "Discussions";
 
+/* No comment provided by engineer. */
+"Check messages every 20 min." = "Consulter les messages toutes les 20 minutes.";
+
+/* No comment provided by engineer. */
+"Check messages when allowed." = "Consulter les messages quand c'est possible.";
+
 /* alert title */
 "Check server address and try again." = "Vérifiez l'adresse du serveur et réessayez.";
 
@@ -951,6 +1075,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Effacer la conversation ?";
 
+/* No comment provided by engineer. */
+"Clear group?" = "Vider le groupe ?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Vider ou supprimer le groupe ?";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "Effacer les notes privées ?";
 
@@ -966,6 +1096,9 @@
 /* No comment provided by engineer. */
 "colored" = "coloré";
 
+/* report reason */
+"Community guidelines violation" = "Infraction aux règles communautaires";
+
 /* server test step */
 "Compare file" = "Comparer le fichier";
 
@@ -978,9 +1111,33 @@
 /* No comment provided by engineer. */
 "Completed" = "Complétées";
 
+/* No comment provided by engineer. */
+"Conditions accepted on: %@." = "Conditions acceptées le : %@.";
+
+/* No comment provided by engineer. */
+"Conditions are accepted for the operator(s): **%@**." = "Les conditions sont acceptées pour le(s) opérateur(s) : **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions are already accepted for these operator(s): **%@**." = "Les conditions sont déjà acceptées pour ces opérateurs : **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions of use" = "Conditions d'utilisation";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted for the operator(s): **%@**." = "Les conditions seront acceptées pour le(s) opérateur(s) : **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted on: %@." = "Les conditions seront acceptées le : %@.";
+
+/* No comment provided by engineer. */
+"Conditions will be automatically accepted for enabled operators on: %@." = "Les conditions seront automatiquement acceptées pour les opérateurs activés le : %@.";
+
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configurer les serveurs ICE";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Configurer les opérateurs de serveur";
+
 /* No comment provided by engineer. */
 "Confirm" = "Confirmer";
 
@@ -1011,6 +1168,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Confirmer la transmission";
 
+/* token status text */
+"Confirmed" = "Confirmé";
+
 /* server test step */
 "Connect" = "Se connecter";
 
@@ -1110,6 +1270,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "État de la connexion et des serveurs.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Connexion bloquée";
+
 /* No comment provided by engineer. */
 "Connection error" = "Erreur de connexion";
 
@@ -1119,12 +1282,24 @@
 /* chat list item title (it should not be shown */
 "connection established" = "connexion établie";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "La connexion est bloquée par l'opérateur du serveur :\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "La connexion n'est pas prête.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Notifications de connexion";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "Demande de connexion envoyée !";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "La connexion nécessite une renégociation du cryptage.";
+
+/* No comment provided by engineer. */
+"Connection security" = "Sécurité des connexions";
+
 /* No comment provided by engineer. */
 "Connection terminated" = "Connexion terminée";
 
@@ -1182,6 +1357,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "Vos contacts peuvent marquer les messages pour les supprimer ; vous pourrez les consulter.";
 
+/* blocking reason */
+"Content violates conditions of use" = "Le contenu enfreint les conditions d'utilisation";
+
 /* No comment provided by engineer. */
 "Continue" = "Continuer";
 
@@ -1206,6 +1384,9 @@
 /* No comment provided by engineer. */
 "Create" = "Créer";
 
+/* No comment provided by engineer. */
+"Create 1-time link" = "Créer un lien unique";
+
 /* No comment provided by engineer. */
 "Create a group using a random profile." = "Création de groupes via un profil aléatoire.";
 
@@ -1221,6 +1402,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Créer un lien";
 
+/* No comment provided by engineer. */
+"Create list" = "Créer une liste";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Créer un nouveau profil sur [l'application de bureau](https://simplex.chat/downloads/). 💻";
 
@@ -1257,6 +1441,9 @@
 /* No comment provided by engineer. */
 "creator" = "créateur";
 
+/* No comment provided by engineer. */
+"Current conditions text couldn't be loaded, you can review conditions via this link:" = "Le texte sur les conditions actuelles n'a pas pu être chargé. Vous pouvez consulter les conditions en cliquant sur ce lien :";
+
 /* No comment provided by engineer. */
 "Current Passcode" = "Code d'accès actuel";
 
@@ -1359,7 +1546,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "Erreurs de déchiffrement";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "défaut (%@)";
 
 /* No comment provided by engineer. */
@@ -1369,8 +1557,7 @@
 "default (yes)" = "par défaut (oui)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Supprimer";
 
 /* No comment provided by engineer. */
@@ -1394,12 +1581,21 @@
 /* No comment provided by engineer. */
 "Delete and notify contact" = "Supprimer et en informer le contact";
 
+/* No comment provided by engineer. */
+"Delete chat" = "Supprimer la discussion";
+
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Supprimer les messages de chat de votre appareil.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Supprimer le profil de chat";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Supprimer le profil du chat ?";
 
+/* No comment provided by engineer. */
+"Delete chat?" = "Supprimer la discussion ?";
+
 /* No comment provided by engineer. */
 "Delete connection" = "Supprimer la connexion";
 
@@ -1445,13 +1641,16 @@
 /* No comment provided by engineer. */
 "Delete link?" = "Supprimer le lien ?";
 
+/* alert title */
+"Delete list?" = "Supprimer la liste ?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "Supprimer le message de ce membre ?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Supprimer le message ?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Supprimer les messages";
 
 /* No comment provided by engineer. */
@@ -1475,6 +1674,9 @@
 /* server test step */
 "Delete queue" = "Supprimer la file d'attente";
 
+/* No comment provided by engineer. */
+"Delete report" = "Supprimer le rapport";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Supprimez jusqu'à 20 messages à la fois.";
 
@@ -1505,6 +1707,9 @@
 /* No comment provided by engineer. */
 "Deletion errors" = "Erreurs de suppression";
 
+/* No comment provided by engineer. */
+"Delivered even when Apple drops them." = "Distribués même quand Apple les oublie.";
+
 /* No comment provided by engineer. */
 "Delivery" = "Distribution";
 
@@ -1571,12 +1776,21 @@
 /* chat feature */
 "Direct messages" = "Messages directs";
 
+/* No comment provided by engineer. */
+"Direct messages between members are prohibited in this chat." = "Les messages directs entre membres sont interdits dans cette discussion.";
+
 /* No comment provided by engineer. */
 "Direct messages between members are prohibited." = "Les messages directs entre membres sont interdits dans ce groupe.";
 
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Désactiver (conserver les remplacements)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Désactiver la suppression automatique des messages ?";
+
+/* alert button */
+"Disable delete messages" = "Désactiver la suppression des messages";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Désactiver pour tous";
 
@@ -1637,6 +1851,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "N'utilisez PAS SimpleX pour les appels d'urgence.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Documents:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "Ne pas créer d'adresse";
 
@@ -1644,13 +1861,19 @@
 "Don't enable" = "Ne pas activer";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Ne manquez pas les messages importants.";
+
+/* alert action */
 "Don't show again" = "Ne plus afficher";
 
+/* No comment provided by engineer. */
+"Done" = "Terminé";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Rétrograder et ouvrir le chat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Télécharger";
 
 /* No comment provided by engineer. */
@@ -1692,6 +1915,9 @@
 /* No comment provided by engineer. */
 "e2e encrypted" = "chiffré de bout en bout";
 
+/* No comment provided by engineer. */
+"E2E encrypted notifications." = "Notifications chiffrées E2E.";
+
 /* chat item action */
 "Edit" = "Modifier";
 
@@ -1704,12 +1930,15 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Activer (conserver les remplacements)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Activer la suppression automatique des messages ?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Autoriser l'accès à la caméra";
 
+/* No comment provided by engineer. */
+"Enable Flux in Network & servers settings for better metadata privacy." = "Activez Flux dans les paramètres du réseau et des serveurs pour une meilleure confidentialité des métadonnées.";
+
 /* No comment provided by engineer. */
 "Enable for all" = "Activer pour tous";
 
@@ -1821,6 +2050,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "renégociation de chiffrement requise pour %@";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Renégociation du chiffrement en cours.";
+
 /* No comment provided by engineer. */
 "ended" = "terminé";
 
@@ -1869,12 +2101,18 @@
 /* No comment provided by engineer. */
 "Error aborting address change" = "Erreur lors de l'annulation du changement d'adresse";
 
+/* alert title */
+"Error accepting conditions" = "Erreur lors de la validation des conditions";
+
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Erreur de validation de la demande de contact";
 
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Erreur lors de l'ajout de membre·s";
 
+/* alert title */
+"Error adding server" = "Erreur lors de l'ajout du serveur";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Erreur de changement d'adresse";
 
@@ -1890,6 +2128,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "Erreur lors du passage en mode incognito !";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Erreur lors de la vérification de l'état du jeton (token)";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Erreur de connexion au serveur de redirection %@. Veuillez réessayer plus tard.";
 
@@ -1902,6 +2143,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Erreur lors de la création du lien du groupe";
 
+/* alert title */
+"Error creating list" = "Erreur lors de la création de la liste";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "Erreur lors de la création du contact du membre";
 
@@ -1911,6 +2155,9 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "Erreur lors de la création du profil !";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Erreur lors de la création du rapport";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Erreur lors du déchiffrement du fichier";
 
@@ -1959,6 +2206,9 @@
 /* No comment provided by engineer. */
 "Error joining group" = "Erreur lors de la liaison avec le groupe";
 
+/* alert title */
+"Error loading servers" = "Erreur de chargement des serveurs";
+
 /* No comment provided by engineer. */
 "Error migrating settings" = "Erreur lors de la migration des paramètres";
 
@@ -1974,12 +2224,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Erreur de reconnexion des serveurs";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "Erreur lors de l'inscription aux notifications";
+
+/* alert title */
 "Error removing member" = "Erreur lors de la suppression d'un membre";
 
+/* alert title */
+"Error reordering lists" = "Erreur lors de la réorganisation des listes";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Erreur de réinitialisation des statistiques";
 
+/* alert title */
+"Error saving chat list" = "Erreur lors de l'enregistrement de la liste des chats";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Erreur lors de la sauvegarde du profil de groupe";
 
@@ -1992,6 +2251,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Erreur lors de l'enregistrement de la phrase de passe dans la keychain";
 
+/* alert title */
+"Error saving servers" = "Erreur d'enregistrement des serveurs";
+
 /* when migrating */
 "Error saving settings" = "Erreur lors de l'enregistrement des paramètres";
 
@@ -2028,12 +2290,18 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Erreur de synchronisation de connexion";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Erreur lors du test de connexion au serveur";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Erreur lors de la mise à jour du lien de groupe";
 
 /* No comment provided by engineer. */
 "Error updating message" = "Erreur lors de la mise à jour du message";
 
+/* alert title */
+"Error updating server" = "Erreur de mise à jour du serveur";
+
 /* No comment provided by engineer. */
 "Error updating settings" = "Erreur lors de la mise à jour des paramètres";
 
@@ -2049,7 +2317,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Erreur : ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Erreur : %@";
 
 /* No comment provided by engineer. */
@@ -2061,11 +2331,11 @@
 /* No comment provided by engineer. */
 "Errors" = "Erreurs";
 
-/* No comment provided by engineer. */
-"Even when disabled in the conversation." = "Même s'il est désactivé dans la conversation.";
+/* servers error */
+"Errors in servers configuration." = "Erreurs dans la configuration des serveurs.";
 
 /* No comment provided by engineer. */
-"event happened" = "event happened";
+"Even when disabled in the conversation." = "Même s'il est désactivé dans la conversation.";
 
 /* No comment provided by engineer. */
 "Exit without saving" = "Quitter sans enregistrer";
@@ -2076,6 +2346,9 @@
 /* No comment provided by engineer. */
 "expired" = "expiré";
 
+/* token status text */
+"Expired" = "Expiré";
+
 /* No comment provided by engineer. */
 "Export database" = "Exporter la base de données";
 
@@ -2100,18 +2373,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Rapide et ne nécessitant pas d'attendre que l'expéditeur soit en ligne !";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Suppression plus rapide des groupes.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Connexion plus rapide et messages plus fiables.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Envoi plus rapide des messages.";
+
 /* swipe action */
 "Favorite" = "Favoris";
 
 /* No comment provided by engineer. */
+"Favorites" = "Favoris";
+
+/* file error alert title */
 "File error" = "Erreur de fichier";
 
 /* alert message */
 "File errors:\n%@" = "Erreurs de fichier :\n%@";
 
+/* file error text */
+"File is blocked by server operator:\n%@." = "Le fichier est bloqué par l'opérateur du serveur :\n%@.";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "Fichier introuvable - le fichier a probablement été supprimé ou annulé.";
 
@@ -2187,9 +2472,21 @@
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "Correction non prise en charge par un membre du groupe";
 
+/* servers error */
+"For chat profile %@:" = "Pour le profil de discussion %@ :";
+
 /* No comment provided by engineer. */
 "For console" = "Pour la console";
 
+/* No comment provided by engineer. */
+"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Par exemple, si votre contact reçoit des messages via un serveur SimpleX Chat, votre application les transmettra via un serveur Flux.";
+
+/* No comment provided by engineer. */
+"For private routing" = "Pour le routage privé";
+
+/* No comment provided by engineer. */
+"For social media" = "Pour les réseaux sociaux";
+
 /* chat item action */
 "Forward" = "Transférer";
 
@@ -2361,6 +2658,12 @@
 /* time unit */
 "hours" = "heures";
 
+/* No comment provided by engineer. */
+"How it affects privacy" = "L'impact sur la vie privée";
+
+/* No comment provided by engineer. */
+"How it helps privacy" = "Comment il contribue à la protection de la vie privée";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Comment SimpleX fonctionne";
 
@@ -2565,6 +2868,9 @@
 /* No comment provided by engineer. */
 "Invite members" = "Inviter des membres";
 
+/* No comment provided by engineer. */
+"Invite to chat" = "Inviter à discuter";
+
 /* No comment provided by engineer. */
 "Invite to group" = "Inviter au groupe";
 
@@ -2679,6 +2985,12 @@
 /* swipe action */
 "Leave" = "Quitter";
 
+/* No comment provided by engineer. */
+"Leave chat" = "Quitter la discussion";
+
+/* No comment provided by engineer. */
+"Leave chat?" = "Quitter la discussion ?";
+
 /* No comment provided by engineer. */
 "Leave group" = "Quitter le groupe";
 
@@ -2775,12 +3087,18 @@
 /* item status text */
 "Member inactive" = "Membre inactif";
 
+/* No comment provided by engineer. */
+"Member role will be changed to \"%@\". All chat members will be notified." = "Le rôle du membre sera modifié pour « %@ ». Tous les membres du chat seront notifiés.";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "Le rôle du membre sera changé pour \"%@\". Tous les membres du groupe en seront informés.";
 
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". The member will receive a new invitation." = "Le rôle du membre sera changé pour \"%@\". Ce membre recevra une nouvelle invitation.";
 
+/* No comment provided by engineer. */
+"Member will be removed from chat - this cannot be undone!" = "Le membre sera retiré de la discussion - cela ne peut pas être annulé !";
+
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Ce membre sera retiré du groupe - impossible de revenir en arrière !";
 
@@ -2958,16 +3276,16 @@
 /* No comment provided by engineer. */
 "More reliable network connection." = "Connexion réseau plus fiable.";
 
+/* No comment provided by engineer. */
+"More reliable notifications" = "Notifications plus fiables";
+
 /* item status description */
 "Most likely this connection is deleted." = "Connexion probablement supprimée.";
 
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Différents profils de chat";
 
-/* No comment provided by engineer. */
-"mute" = "muet";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Muet";
 
 /* No comment provided by engineer. */
@@ -2982,19 +3300,25 @@
 /* No comment provided by engineer. */
 "Network connection" = "Connexion au réseau";
 
+/* No comment provided by engineer. */
+"Network decentralization" = "Décentralisation du réseau";
+
 /* snd error text */
 "Network issues - message expired after many attempts to send it." = "Problèmes de réseau - le message a expiré après plusieurs tentatives d'envoi.";
 
 /* No comment provided by engineer. */
 "Network management" = "Gestion du réseau";
 
+/* No comment provided by engineer. */
+"Network operator" = "Opérateur de réseau";
+
 /* No comment provided by engineer. */
 "Network settings" = "Paramètres réseau";
 
 /* No comment provided by engineer. */
 "Network status" = "État du réseau";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "jamais";
 
 /* No comment provided by engineer. */
@@ -3015,6 +3339,9 @@
 /* No comment provided by engineer. */
 "New display name" = "Nouveau nom d'affichage";
 
+/* notification */
+"New events" = "Nouveaux événements";
+
 /* No comment provided by engineer. */
 "New in %@" = "Nouveautés de la %@";
 
@@ -3036,6 +3363,9 @@
 /* No comment provided by engineer. */
 "New passphrase…" = "Nouvelle phrase secrète…";
 
+/* No comment provided by engineer. */
+"New server" = "Nouveau serveur";
+
 /* No comment provided by engineer. */
 "New SOCKS credentials will be used every time you start the app." = "De nouveaux identifiants SOCKS seront utilisés chaque fois que vous démarrerez l'application.";
 
@@ -3081,6 +3411,12 @@
 /* No comment provided by engineer. */
 "No info, try to reload" = "Pas d'info, essayez de recharger";
 
+/* servers error */
+"No media & file servers." = "Pas de serveurs de médias et de fichiers.";
+
+/* servers error */
+"No message servers." = "Pas de serveurs de messages.";
+
 /* No comment provided by engineer. */
 "No network connection" = "Pas de connexion au réseau";
 
@@ -3099,6 +3435,18 @@
 /* No comment provided by engineer. */
 "No received or sent files" = "Aucun fichier reçu ou envoyé";
 
+/* servers error */
+"No servers for private message routing." = "Pas de serveurs pour le routage privé des messages.";
+
+/* servers error */
+"No servers to receive files." = "Pas de serveurs pour recevoir des fichiers.";
+
+/* servers error */
+"No servers to receive messages." = "Pas de serveurs pour recevoir des messages.";
+
+/* servers error */
+"No servers to send files." = "Pas de serveurs pour envoyer des fichiers.";
+
 /* copied message info in history */
 "no text" = "aucun texte";
 
@@ -3120,6 +3468,9 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Les notifications sont désactivées !";
 
+/* No comment provided by engineer. */
+"Notifications privacy" = "Notifications sécurisées";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Désormais, les administrateurs peuvent :\n- supprimer les messages des membres.\n- désactiver des membres (rôle \"observateur\")";
 
@@ -3127,8 +3478,9 @@
 "observer" = "observateur";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "off";
 
 /* blur media */
@@ -3140,7 +3492,8 @@
 /* feature offered item */
 "offered %@: %@" = "propose %1$@ : %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -3164,6 +3517,9 @@
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Les hôtes .onion ne seront pas utilisés.";
 
+/* No comment provided by engineer. */
+"Only chat owners can change preferences." = "Seuls les propriétaires peuvent modifier les préférences.";
+
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages." = "Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un **chiffrement de bout en bout à deux couches**.";
 
@@ -3209,15 +3565,21 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Seul votre contact peut envoyer des messages vocaux.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Ouvrir";
 
+/* No comment provided by engineer. */
+"Open changes" = "Ouvrir les modifications";
+
 /* No comment provided by engineer. */
 "Open chat" = "Ouvrir le chat";
 
 /* authentication reason */
 "Open chat console" = "Ouvrir la console du chat";
 
+/* No comment provided by engineer. */
+"Open conditions" = "Ouvrir les conditions";
+
 /* No comment provided by engineer. */
 "Open group" = "Ouvrir le groupe";
 
@@ -3230,6 +3592,15 @@
 /* No comment provided by engineer. */
 "Opening app…" = "Ouverture de l'app…";
 
+/* No comment provided by engineer. */
+"Operator" = "Opérateur";
+
+/* alert title */
+"Operator server" = "Serveur de l'opérateur";
+
+/* No comment provided by engineer. */
+"Or import archive file" = "Ou importer un fichier d'archive";
+
 /* No comment provided by engineer. */
 "Or paste archive link" = "Ou coller le lien de l'archive";
 
@@ -3242,6 +3613,9 @@
 /* No comment provided by engineer. */
 "Or show this code" = "Ou montrez ce code";
 
+/* No comment provided by engineer. */
+"Or to share privately" = "Ou à partager en privé";
+
 /* No comment provided by engineer. */
 "other" = "autre";
 
@@ -3383,6 +3757,9 @@
 /* No comment provided by engineer. */
 "Preset server address" = "Adresse du serveur prédéfinie";
 
+/* No comment provided by engineer. */
+"Preset servers" = "Serveurs prédéfinis";
+
 /* No comment provided by engineer. */
 "Preview" = "Aperçu";
 
@@ -3392,6 +3769,9 @@
 /* No comment provided by engineer. */
 "Privacy & security" = "Vie privée et sécurité";
 
+/* No comment provided by engineer. */
+"Privacy for your customers." = "Respect de la vie privée de vos clients.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "La vie privée redéfinie";
 
@@ -3606,7 +3986,7 @@
 "Reduced battery usage" = "Réduction de la consommation de batterie";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Rejeter";
 
 /* No comment provided by engineer. */
@@ -3684,6 +4064,9 @@
 /* chat item action */
 "Reply" = "Répondre";
 
+/* chat list item title */
+"requested to connect" = "demande à se connecter";
+
 /* No comment provided by engineer. */
 "Required" = "Requis";
 
@@ -3735,6 +4118,9 @@
 /* chat item action */
 "Reveal" = "Révéler";
 
+/* No comment provided by engineer. */
+"Review conditions" = "Vérifier les conditions";
+
 /* No comment provided by engineer. */
 "Revoke" = "Révoquer";
 
@@ -3757,7 +4143,7 @@
 "Safer groups" = "Groupes plus sûrs";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Enregistrer";
 
 /* alert button */
@@ -4021,6 +4407,9 @@
 /* No comment provided by engineer. */
 "Server" = "Serveur";
 
+/* alert message */
+"Server added to operator %@." = "Serveur ajouté à l'opérateur %@.";
+
 /* No comment provided by engineer. */
 "Server address" = "Adresse du serveur";
 
@@ -4030,6 +4419,15 @@
 /* srv error text. */
 "Server address is incompatible with network settings." = "L'adresse du serveur est incompatible avec les paramètres du réseau.";
 
+/* alert title */
+"Server operator changed." = "L'opérateur du serveur a changé.";
+
+/* No comment provided by engineer. */
+"Server operators" = "Opérateurs de serveur";
+
+/* alert title */
+"Server protocol changed." = "Le protocole du serveur a été modifié.";
+
 /* queue info */
 "server queue info: %@\n\nlast received msg: %@" = "info sur la file d'attente du serveur : %1$@\n\ndernier message reçu : %2$@";
 
@@ -4109,15 +4507,21 @@
 "Shape profile images" = "Images de profil modelable";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Partager";
 
 /* No comment provided by engineer. */
 "Share 1-time link" = "Partager un lien unique";
 
+/* No comment provided by engineer. */
+"Share 1-time link with a friend" = "Partager un lien unique avec un ami";
+
 /* No comment provided by engineer. */
 "Share address" = "Partager l'adresse";
 
+/* No comment provided by engineer. */
+"Share address publicly" = "Partager publiquement votre adresse";
+
 /* alert title */
 "Share address with contacts?" = "Partager l'adresse avec vos contacts ?";
 
@@ -4130,6 +4534,9 @@
 /* No comment provided by engineer. */
 "Share profile" = "Partager le profil";
 
+/* No comment provided by engineer. */
+"Share SimpleX address on social media." = "Partagez votre adresse SimpleX sur les réseaux sociaux.";
+
 /* No comment provided by engineer. */
 "Share this 1-time invite link" = "Partagez ce lien d'invitation unique";
 
@@ -4175,6 +4582,15 @@
 /* No comment provided by engineer. */
 "SimpleX Address" = "Adresse SimpleX";
 
+/* No comment provided by engineer. */
+"SimpleX address and 1-time links are safe to share via any messenger." = "Les adresses SimpleX et les liens à usage unique peuvent être partagés en toute sécurité via n'importe quelle messagerie.";
+
+/* No comment provided by engineer. */
+"SimpleX address or 1-time link?" = "Adresse SimpleX ou lien unique ?";
+
+/* No comment provided by engineer. */
+"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat et Flux ont conclu un accord pour inclure les serveurs exploités par Flux dans l'application.";
+
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "La sécurité de SimpleX Chat a été auditée par Trail of Bits.";
 
@@ -4250,6 +4666,9 @@
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import:" = "L'importation a entraîné des erreurs non fatales :";
 
+/* alert message */
+"Some servers failed the test:\n%@" = "Certains serveurs ont échoué le test :\n%@";
+
 /* notification title */
 "Somebody" = "Quelqu'un";
 
@@ -4352,6 +4771,9 @@
 /* No comment provided by engineer. */
 "Tap button " = "Appuyez sur le bouton ";
 
+/* No comment provided by engineer. */
+"Tap Create SimpleX address in the menu to create it later." = "Appuyez sur Créer une adresse SimpleX dans le menu pour la créer ultérieurement.";
+
 /* No comment provided by engineer. */
 "Tap to activate profile." = "Appuyez pour activer un profil.";
 
@@ -4385,7 +4807,7 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Erreur de fichier temporaire";
 
 /* server test failure */
@@ -4412,6 +4834,9 @@
 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "L'application peut vous avertir lorsque vous recevez des messages ou des demandes de contact - veuillez ouvrir les paramètres pour les activer.";
 
+/* No comment provided by engineer. */
+"The app protects your privacy by using different operators in each conversation." = "L'application protège votre vie privée en utilisant des opérateurs différents pour chaque conversation.";
+
 /* No comment provided by engineer. */
 "The app will ask to confirm downloads from unknown file servers (except .onion)." = "L'application demandera de confirmer les téléchargements à partir de serveurs de fichiers inconnus (sauf .onion).";
 
@@ -4421,6 +4846,9 @@
 /* No comment provided by engineer. */
 "The code you scanned is not a SimpleX link QR code." = "Le code scanné n'est pas un code QR de lien SimpleX.";
 
+/* No comment provided by engineer. */
+"The connection reached the limit of undelivered messages, your contact may be offline." = "La connexion a atteint la limite des messages non délivrés, votre contact est peut-être hors ligne.";
+
 /* No comment provided by engineer. */
 "The connection you accepted will be cancelled!" = "La connexion que vous avez acceptée sera annulée !";
 
@@ -4458,7 +4886,10 @@
 "The old database was not removed during the migration, it can be deleted." = "L'ancienne base de données n'a pas été supprimée lors de la migration, elle peut être supprimée.";
 
 /* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Le profil n'est partagé qu'avec vos contacts.";
+"The same conditions will apply to operator **%@**." = "Les mêmes conditions s'appliquent à l'opérateur **%@**.";
+
+/* No comment provided by engineer. */
+"The second preset operator in the app!" = "Le deuxième opérateur prédéfini de l'application !";
 
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Le deuxième coche que nous avons manqué ! ✅";
@@ -4469,6 +4900,9 @@
 /* No comment provided by engineer. */
 "The servers for new connections of your current chat profile **%@**." = "Les serveurs pour les nouvelles connexions de votre profil de chat actuel **%@**.";
 
+/* No comment provided by engineer. */
+"The servers for new files of your current chat profile **%@**." = "Les serveurs pour les nouveaux fichiers de votre profil de chat actuel **%@**.";
+
 /* No comment provided by engineer. */
 "The text you pasted is not a SimpleX link." = "Le texte collé n'est pas un lien SimpleX.";
 
@@ -4478,6 +4912,9 @@
 /* No comment provided by engineer. */
 "Themes" = "Thèmes";
 
+/* No comment provided by engineer. */
+"These conditions will also apply for: **%@**." = "Ces conditions s'appliquent également aux : **%@**.";
+
 /* No comment provided by engineer. */
 "These settings are for your current profile **%@**." = "Ces paramètres s'appliquent à votre profil actuel **%@**.";
 
@@ -4541,6 +4978,9 @@
 /* No comment provided by engineer. */
 "To make a new connection" = "Pour établir une nouvelle connexion";
 
+/* No comment provided by engineer. */
+"To protect against your link being replaced, you can compare contact security codes." = "Pour vous protéger contre le remplacement de votre lien, vous pouvez comparer les codes de sécurité des contacts.";
+
 /* No comment provided by engineer. */
 "To protect timezone, image/voice files use UTC." = "Pour préserver le fuseau horaire, les fichiers image/voix utilisent le système UTC.";
 
@@ -4553,6 +4993,9 @@
 /* No comment provided by engineer. */
 "To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Pour protéger votre vie privée, au lieu d’IDs utilisés par toutes les autres plateformes, SimpleX a des IDs pour les queues de messages, distinctes pour chacun de vos contacts.";
 
+/* No comment provided by engineer. */
+"To receive" = "Pour recevoir";
+
 /* No comment provided by engineer. */
 "To record speech please grant permission to use Microphone." = "Si vous souhaitez enregistrer une conversation, veuillez autoriser l'utilisation du microphone.";
 
@@ -4565,9 +5008,15 @@
 /* No comment provided by engineer. */
 "To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Pour révéler votre profil caché, entrez le mot de passe dans le champ de recherche de la page **Vos profils de chat**.";
 
+/* No comment provided by engineer. */
+"To send" = "Pour envoyer";
+
 /* No comment provided by engineer. */
 "To support instant push notifications the chat database has to be migrated." = "Pour prendre en charge les notifications push instantanées, la base de données du chat doit être migrée.";
 
+/* No comment provided by engineer. */
+"To use the servers of **%@**, accept conditions of use." = "Pour utiliser les serveurs de **%@**, acceptez les conditions d'utilisation.";
+
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Pour vérifier le chiffrement de bout en bout avec votre contact, comparez (ou scannez) le code sur vos appareils.";
 
@@ -4625,6 +5074,9 @@
 /* rcv group event chat item */
 "unblocked %@" = "%@ débloqué";
 
+/* No comment provided by engineer. */
+"Undelivered messages" = "Messages non distribués";
+
 /* No comment provided by engineer. */
 "Unexpected migration state" = "État de la migration inattendu";
 
@@ -4682,10 +5134,7 @@
 /* authentication reason */
 "Unlock app" = "Déverrouiller l'app";
 
-/* No comment provided by engineer. */
-"unmute" = "démuter";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Démute";
 
 /* No comment provided by engineer. */
@@ -4742,12 +5191,21 @@
 /* No comment provided by engineer. */
 "Use .onion hosts" = "Utiliser les hôtes .onions";
 
+/* No comment provided by engineer. */
+"Use %@" = "Utiliser %@";
+
 /* No comment provided by engineer. */
 "Use chat" = "Utiliser le chat";
 
 /* No comment provided by engineer. */
 "Use current profile" = "Utiliser le profil actuel";
 
+/* No comment provided by engineer. */
+"Use for files" = "Utiliser pour les fichiers";
+
+/* No comment provided by engineer. */
+"Use for messages" = "Utiliser pour les messages";
+
 /* No comment provided by engineer. */
 "Use for new connections" = "Utiliser pour les nouvelles connexions";
 
@@ -4772,6 +5230,9 @@
 /* No comment provided by engineer. */
 "Use server" = "Utiliser ce serveur";
 
+/* No comment provided by engineer. */
+"Use servers" = "Utiliser les serveurs";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Utiliser les serveurs SimpleX Chat ?";
 
@@ -4856,9 +5317,15 @@
 /* No comment provided by engineer. */
 "Videos and files up to 1gb" = "Vidéos et fichiers jusqu'à 1Go";
 
+/* No comment provided by engineer. */
+"View conditions" = "Voir les conditions";
+
 /* No comment provided by engineer. */
 "View security code" = "Afficher le code de sécurité";
 
+/* No comment provided by engineer. */
+"View updated conditions" = "Voir les conditions mises à jour";
+
 /* chat feature */
 "Visible history" = "Historique visible";
 
@@ -4940,6 +5407,9 @@
 /* No comment provided by engineer. */
 "when IP hidden" = "lorsque l'IP est masquée";
 
+/* No comment provided by engineer. */
+"When more than one operator is enabled, none of them has metadata to learn who communicates with whom." = "Lorsque plusieurs opérateurs sont activés, aucun d'entre eux ne dispose de métadonnées permettant de savoir qui communique avec qui.";
+
 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Lorsque vous partagez un profil incognito avec quelqu'un, ce profil sera utilisé pour les groupes auxquels il vous invite.";
 
@@ -5003,6 +5473,9 @@
 /* No comment provided by engineer. */
 "You are already connected to %@." = "Vous êtes déjà connecté·e à %@ via ce lien.";
 
+/* No comment provided by engineer. */
+"You are already connected with %@." = "Vous êtes déjà connecté avec %@.";
+
 /* No comment provided by engineer. */
 "You are already connecting to %@." = "Vous êtes déjà en train de vous connecter à %@.";
 
@@ -5048,6 +5521,9 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Vous pouvez choisir de le modifier dans les paramètres d'apparence.";
 
+/* No comment provided by engineer. */
+"You can configure servers via settings." = "Vous pouvez configurer les serveurs via les paramètres.";
+
 /* No comment provided by engineer. */
 "You can create it later" = "Vous pouvez la créer plus tard";
 
@@ -5072,6 +5548,9 @@
 /* No comment provided by engineer. */
 "You can send messages to %@ from Archived contacts." = "Vous pouvez envoyer des messages à %@ à partir des contacts archivés.";
 
+/* No comment provided by engineer. */
+"You can set connection name, to remember who the link was shared with." = "Vous pouvez définir un nom de connexion pour vous rappeler avec qui le lien a été partagé.";
+
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Vous pouvez configurer l'aperçu des notifications sur l'écran de verrouillage via les paramètres.";
 
@@ -5192,6 +5671,9 @@
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Vous continuerez à recevoir des appels et des notifications des profils mis en sourdine lorsqu'ils sont actifs.";
 
+/* No comment provided by engineer. */
+"You will stop receiving messages from this chat. Chat history will be preserved." = "Vous ne recevrez plus de messages de cette discussion. L'historique sera préservé.";
+
 /* No comment provided by engineer. */
 "You will stop receiving messages from this group. Chat history will be preserved." = "Vous ne recevrez plus de messages de ce groupe. L'historique du chat sera conservé.";
 
@@ -5258,27 +5740,27 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Votre profil **%@** sera partagé.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Le profil n'est partagé qu'avec vos contacts.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts. Les serveurs SimpleX ne peuvent pas voir votre profil.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Votre profil a été modifié. Si vous l'enregistrez, le profil mis à jour sera envoyé à tous vos contacts.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Votre profil aléatoire";
 
 /* No comment provided by engineer. */
 "Your server address" = "Votre adresse de serveur";
 
+/* No comment provided by engineer. */
+"Your servers" = "Vos serveurs";
+
 /* No comment provided by engineer. */
 "Your settings" = "Vos paramètres";
 
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Votre adresse SimpleX";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Vos serveurs SMP";
-
diff --git a/apps/ios/hu.lproj/Localizable.strings b/apps/ios/hu.lproj/Localizable.strings
index 2ba51d1e13..9a1da01665 100644
--- a/apps/ios/hu.lproj/Localizable.strings
+++ b/apps/ios/hu.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (másolható)";
 
@@ -14,29 +8,17 @@
 "- connect to [directory service](simplex:/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) (BETA)!\n- delivery receipts (up to 20 members).\n- faster and more stable." = "- kapcsolódás a [könyvtár szolgáltatáshoz](simplex:/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) (BETA)!\n- kézbesítési jelentések (legfeljebb 20 tag).\n- gyorsabb és stabilabb.";
 
 /* No comment provided by engineer. */
-"- more stable message delivery.\n- a bit better groups.\n- and more!" = "- stabilabb üzenetkézbesítés.\n- valamivel jobb csoportok.\n- és még sok más!";
+"- more stable message delivery.\n- a bit better groups.\n- and more!" = "- stabilabb üzenetkézbesítés.\n- picit továbbfejlesztett csoportok.\n- és még sok más!";
 
 /* No comment provided by engineer. */
-"- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!" = "- értesíti az ismerősöket a törlésről (nem kötelező)\n- profil nevek szóközökkel\n- és még sok más!";
+"- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!" = "- partnerek értesítése a törlésről (nem kötelező)\n- profilnevek szóközökkel\n- és még sok más!";
 
 /* No comment provided by engineer. */
-"- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 5 perc hosszúságú hangüzenetek.\n- egyedi üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.";
-
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
+"- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- legfeljebb 5 perc hosszúságú hangüzenetek.\n- egyéni üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.";
 
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 színezett!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(új)";
 
@@ -44,10 +26,7 @@
 "(this device v%@)" = "(ez az eszköz: v%@)";
 
 /* No comment provided by engineer. */
-")" = ")";
-
-/* No comment provided by engineer. */
-"[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Hozzájárulás](https://github.com/simplex-chat/simplex-chat#contribute)";
+"[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Közreműködés](https://github.com/simplex-chat/simplex-chat#contribute)";
 
 /* No comment provided by engineer. */
 "[Send us email](mailto:chat@simplex.chat)" = "[Küldjön nekünk e-mailt](mailto:chat@simplex.chat)";
@@ -56,7 +35,7 @@
 "[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Csillagozás a GitHubon](https://github.com/simplex-chat/simplex-chat)";
 
 /* No comment provided by engineer. */
-"**Create 1-time link**: to create and share a new invitation link." = "**Ismerős hozzáadása:** új meghívó-hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.";
+"**Create 1-time link**: to create and share a new invitation link." = "**Partner hozzáadása:** új meghívási hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.";
 
 /* No comment provided by engineer. */
 "**Create group**: to create a new group." = "**Csoport létrehozása:** új csoport létrehozásához.";
@@ -68,19 +47,19 @@
 "**e2e encrypted** video call" = "**e2e titkosított** videóhívás";
 
 /* No comment provided by engineer. */
-"**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata." = "**Privátabb:** 20 percenként ellenőrzi az új üzeneteket. Az eszköztoken megosztásra kerül a SimpleX Chat-kiszolgálóval, de az nem, hogy hány ismerőse vagy üzenete van.";
+"**More private**: check new messages every 20 minutes. Only device token is shared with our push server. It doesn't see how many contacts you have, or any message metadata." = "**Privátabb:** 20 percenként ellenőrzi az új üzeneteket. Az eszköztoken meg lesz osztva a SimpleX Chat-kiszolgálóval, de az nem, hogy hány partnere vagy üzenete van.";
 
 /* No comment provided by engineer. */
 "**Most private**: do not use SimpleX Chat push server. The app will check messages in background, when the system allows it, depending on how often you use the app." = "**Legprivátabb:** ne használja a SimpleX Chat értesítési kiszolgálót, rendszeresen ellenőrizze az üzeneteket a háttérben (attól függően, hogy milyen gyakran használja az alkalmazást).";
 
 /* No comment provided by engineer. */
-"**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." = "**Megjegyzés:** ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja az ismerőseitől érkező üzenetek visszafejtését.";
+"**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." = "**Megjegyzés:** ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja a partnereitől érkező üzenetek visszafejtését.";
 
 /* No comment provided by engineer. */
-"**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Megjegyzés:** NEM tudja visszaállítani vagy megváltoztatni jelmondatát, ha elveszíti azt.";
+"**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Megjegyzés:** NEM fogja tudni helyreállítani, vagy módosítani a jelmondatot abban az esetben, ha elveszíti.";
 
 /* No comment provided by engineer. */
-"**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Megjegyzés:** az eszköztoken és az értesítések elküldésre kerülnek a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.";
+"**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Megjegyzés:** az eszköztoken és az értesítések el lesznek küldve a SimpleX Chat értesítési kiszolgálóra, kivéve az üzenet tartalma, mérete vagy az, hogy kitől származik.";
 
 /* No comment provided by engineer. */
 "**Scan / Paste link**: to connect via a link you received." = "**Hivatkozás beolvasása / beillesztése**: egy kapott hivatkozáson keresztüli kapcsolódáshoz.";
@@ -89,7 +68,7 @@
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Figyelmeztetés:** Az azonnali push-értesítésekhez a kulcstartóban tárolt jelmondat megadása szükséges.";
 
 /* No comment provided by engineer. */
-"**Warning**: the archive will be removed." = "**Figyelmeztetés:** az archívum eltávolításra kerül.";
+"**Warning**: the archive will be removed." = "**Figyelmeztetés:** az archívum el lesz távolítva.";
 
 /* No comment provided by engineer. */
 "*bold*" = "\\*félkövér*";
@@ -101,7 +80,7 @@
 "## History" = "## Előzmények";
 
 /* copied message info */
-"## In reply to" = "## Válaszul erre:";
+"## In reply to" = "## Válaszul erre";
 
 /* No comment provided by engineer. */
 "#secret#" = "#titok#";
@@ -140,7 +119,7 @@
 "%@ is connected!" = "%@ kapcsolódott!";
 
 /* No comment provided by engineer. */
-"%@ is not verified" = "%@ nem hitelesített";
+"%@ is not verified" = "%@ nincs hitelesítve";
 
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ hitelesítve";
@@ -176,7 +155,7 @@
 "%d file(s) are still being downloaded." = "%d fájl letöltése még folyamatban van.";
 
 /* forward confirmation reason */
-"%d file(s) failed to download." = "%d fájlt nem sikerült letölteni.";
+"%d file(s) failed to download." = "Nem sikerült letölteni %d fájlt.";
 
 /* forward confirmation reason */
 "%d file(s) were deleted." = "%d fájl törölve lett.";
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d mp";
 
+/* delete after time */
+"%d seconds(s)" = "%d másodperc";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d üzenet kihagyva";
 
@@ -212,10 +194,10 @@
 "%lld %@" = "%lld %@";
 
 /* No comment provided by engineer. */
-"%lld contact(s) selected" = "%lld ismerős kiválasztva";
+"%lld contact(s) selected" = "%lld partner kijelölve";
 
 /* No comment provided by engineer. */
-"%lld file(s) with total size of %@" = "%lld fájl, amely(ek)nek teljes mérete: %@";
+"%lld file(s) with total size of %@" = "%lld fájl, %@ összméretben";
 
 /* No comment provided by engineer. */
 "%lld group events" = "%lld csoportesemény";
@@ -230,7 +212,7 @@
 "%lld messages blocked by admin" = "%lld üzenetet letiltott az adminisztrátor";
 
 /* No comment provided by engineer. */
-"%lld messages marked deleted" = "%lld törlésre megjelölt üzenet";
+"%lld messages marked deleted" = "%lld üzenet megjelölve törlésre";
 
 /* No comment provided by engineer. */
 "%lld messages moderated by %@" = "%@ %lld üzenetet moderált";
@@ -242,34 +224,31 @@
 "%lld new interface languages" = "%lld új kezelőfelületi nyelv";
 
 /* No comment provided by engineer. */
-"%lld second(s)" = "%lld másodperc";
+"%lld seconds" = "%lld mp";
 
 /* No comment provided by engineer. */
-"%lld seconds" = "%lld másodperc";
+"%lldd" = "%lldn";
 
 /* No comment provided by engineer. */
-"%lldd" = "%lldd";
-
-/* No comment provided by engineer. */
-"%lldh" = "%lldh";
+"%lldh" = "%lldó";
 
 /* No comment provided by engineer. */
 "%lldk" = "%lldk";
 
 /* No comment provided by engineer. */
-"%lldm" = "%lldm";
+"%lldm" = "%lldp";
 
 /* No comment provided by engineer. */
-"%lldmth" = "%lldmth";
+"%lldmth" = "%lldh";
 
 /* No comment provided by engineer. */
-"%llds" = "%llds";
+"%llds" = "%lldmp";
 
 /* No comment provided by engineer. */
-"%lldw" = "%lldw";
+"%lldw" = "%lldhét";
 
 /* No comment provided by engineer. */
-"%u messages failed to decrypt." = "%u üzenet visszafejtése sikertelen.";
+"%u messages failed to decrypt." = "Nem sikerült visszafejteni %u üzenetet.";
 
 /* No comment provided by engineer. */
 "%u messages skipped." = "%u üzenet kihagyva.";
@@ -289,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 nap";
 
 /* time interval */
@@ -298,17 +278,22 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 perc";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 hónap";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 hét";
 
-/* No comment provided by engineer. */
-"1-time link" = "Egyszer használható meghívó-hivatkozás";
+/* delete after time */
+"1 year" = "1 év";
 
 /* No comment provided by engineer. */
-"1-time link can be used *with one contact only* - share in person or via any messenger." = "Az egyszer használható meghívó-hivatkozás csak *egyetlen ismerőssel használható* - személyesen vagy bármilyen üzenetküldőn keresztül megosztható.";
+"1-time link" = "Egyszer használható meghívó";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "Az egyszer használható meghívó egy hivatkozás és *csak egyetlen partnerrel használható* – személyesen vagy bármilyen üzenetváltó-alkalmazáson keresztül megosztható.";
 
 /* No comment provided by engineer. */
 "5 minutes" = "5 perc";
@@ -320,61 +305,73 @@
 "30 seconds" = "30 másodperc";
 
 /* No comment provided by engineer. */
-"A few more things" = "Még néhány dolog";
+"A few more things" = "Néhány további dolog";
 
 /* notification title */
-"A new contact" = "Egy új ismerős";
+"A new contact" = "Egy új partner";
 
 /* No comment provided by engineer. */
-"A new random profile will be shared." = "Egy új, véletlenszerű profil kerül megosztásra.";
+"A new random profile will be shared." = "Egy új, véletlenszerű profil lesz megosztva.";
 
 /* No comment provided by engineer. */
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "**Az összes csevegési profiljához az alkalmazásban** külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.";
 
 /* No comment provided by engineer. */
-"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." = "**Az összes ismerőséhez és csoporttaghoz** külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.\n**Megjegyzés:** ha sok kapcsolata van, az akkumulátor-használat és az adatforgalom jelentősen megnövekedhet, és néhány kapcsolódási kísérlet sikertelen lehet.";
+"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." = "**Az összes partneréhez és csoporttaghoz** külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.\n**Megjegyzés:** ha sok kapcsolata van, az akkumulátor-használat és az adatforgalom jelentősen megnövekedhet, és néhány kapcsolódási kísérlet sikertelen lehet.";
 
 /* No comment provided by engineer. */
 "Abort" = "Megszakítás";
 
 /* No comment provided by engineer. */
-"Abort changing address" = "Címváltoztatás megszakítása";
+"Abort changing address" = "Cím módosításának megszakítása";
 
 /* No comment provided by engineer. */
-"Abort changing address?" = "Címváltoztatás megszakítása??";
+"Abort changing address?" = "Megszakítja a cím módosítását?";
 
 /* No comment provided by engineer. */
 "About operators" = "Az üzemeltetőkről";
 
 /* No comment provided by engineer. */
-"About SimpleX Chat" = "SimpleX Chat névjegye";
+"About SimpleX Chat" = "A SimpleX Chat névjegye";
 
 /* No comment provided by engineer. */
 "above, then choose:" = "gombra fent, majd válassza ki:";
 
 /* No comment provided by engineer. */
-"Accent" = "Kiemelés";
+"Accent" = "Kiemelőszín";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Elfogadás";
 
+/* alert action */
+"Accept as member" = "Befogadás tagként";
+
+/* alert action */
+"Accept as observer" = "Befogadás megfigyelőként";
+
 /* No comment provided by engineer. */
 "Accept conditions" = "Feltételek elfogadása";
 
 /* No comment provided by engineer. */
-"Accept connection request?" = "Kapcsolatkérés elfogadása?";
+"Accept connection request?" = "Elfogadja a meghívási kérést?";
 
 /* notification body */
-"Accept contact request from %@?" = "Elfogadja %@ kapcsolatkérését?";
+"Accept contact request from %@?" = "Elfogadja %@ meghívási kérését?";
 
 /* accept contact request via notification
-   swipe action */
-"Accept incognito" = "Fogadás inkognitóban";
+swipe action */
+"Accept incognito" = "Elfogadás inkognitóban";
+
+/* alert title */
+"Accept member" = "Tag befogadása";
+
+/* rcv group event chat item */
+"accepted %@" = "befogadta őt: %@";
 
 /* call status */
-"accepted call" = "elfogadott hívás";
+"accepted call" = "fogadott hívás";
 
 /* No comment provided by engineer. */
 "Accepted conditions" = "Elfogadott feltételek";
@@ -382,21 +379,30 @@
 /* chat list item title */
 "accepted invitation" = "elfogadott meghívó";
 
-/* No comment provided by engineer. */
-"Acknowledged" = "Nyugtázva";
+/* rcv group event chat item */
+"accepted you" = "befogadta Önt";
 
 /* No comment provided by engineer. */
-"Acknowledgement errors" = "Nyugtázott hibák";
+"Acknowledged" = "Visszaigazolt";
+
+/* No comment provided by engineer. */
+"Acknowledgement errors" = "Visszaigazolási hibák";
+
+/* token status text */
+"Active" = "Aktív";
 
 /* No comment provided by engineer. */
 "Active connections" = "Aktív kapcsolatok száma";
 
 /* No comment provided by engineer. */
-"Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Cím hozzáadása a profilhoz, hogy az ismerősei megoszthassák másokkal. A profilfrissítés elküldésre kerül az ismerősei számára.";
+"Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Cím hozzáadása a profilhoz, hogy a partnerei megoszthassák másokkal. A profilfrissítés el lesz küldve partnerei számára.";
 
 /* No comment provided by engineer. */
 "Add friends" = "Barátok hozzáadása";
 
+/* No comment provided by engineer. */
+"Add list" = "Lista hozzáadása";
+
 /* No comment provided by engineer. */
 "Add profile" = "Profil hozzáadása";
 
@@ -407,16 +413,19 @@
 "Add servers by scanning QR codes." = "Kiszolgáló hozzáadása QR-kód beolvasásával.";
 
 /* No comment provided by engineer. */
-"Add team members" = "Csapattagok hozzáadása";
+"Add team members" = "Munkatársak hozzáadása";
 
 /* No comment provided by engineer. */
 "Add to another device" = "Hozzáadás egy másik eszközhöz";
 
+/* No comment provided by engineer. */
+"Add to list" = "Hozzáadás listához";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Üdvözlőüzenet hozzáadása";
 
 /* No comment provided by engineer. */
-"Add your team members to the conversations." = "Adja hozzá csapattagjait a beszélgetésekhez.";
+"Add your team members to the conversations." = "Adja hozzá a munkatársait a beszélgetésekhez.";
 
 /* No comment provided by engineer. */
 "Added media & file servers" = "Hozzáadott média- és fájlkiszolgálók";
@@ -425,22 +434,22 @@
 "Added message servers" = "Hozzáadott üzenetkiszolgálók";
 
 /* No comment provided by engineer. */
-"Additional accent" = "További kiemelés";
+"Additional accent" = "További kiemelőszín";
 
 /* No comment provided by engineer. */
-"Additional accent 2" = "További kiemelés 2";
+"Additional accent 2" = "További kiemelőszín 2";
 
 /* No comment provided by engineer. */
-"Additional secondary" = "További másodlagos";
+"Additional secondary" = "További másodlagos szín";
 
 /* No comment provided by engineer. */
 "Address" = "Cím";
 
 /* No comment provided by engineer. */
-"Address change will be aborted. Old receiving address will be used." = "A cím módosítása megszakad. A régi fogadási cím kerül felhasználásra.";
+"Address change will be aborted. Old receiving address will be used." = "A cím módosítása meg fog szakadni. A régi fogadási cím lesz használva.";
 
 /* No comment provided by engineer. */
-"Address or 1-time link?" = "Cím vagy egyszer használható meghívó-hivatkozás?";
+"Address or 1-time link?" = "Cím vagy egyszer használható meghívó?";
 
 /* No comment provided by engineer. */
 "Address settings" = "Címbeállítások";
@@ -455,7 +464,7 @@
 "Admins can block a member for all." = "Az adminisztrátorok egy tagot a csoport összes tagja számára letilthatnak.";
 
 /* No comment provided by engineer. */
-"Admins can create the links to join groups." = "Az adminisztrátorok hivatkozásokat hozhatnak létre a csoportokhoz való kapcsolódáshoz.";
+"Admins can create the links to join groups." = "Az adminisztrátorok hivatkozásokat hozhatnak létre a csoportokhoz való csatlakozáshoz.";
 
 /* No comment provided by engineer. */
 "Advanced network settings" = "Speciális hálózati beállítások";
@@ -469,17 +478,26 @@
 /* chat item text */
 "agreeing encryption…" = "titkosítás elfogadása…";
 
+/* member criteria value */
+"all" = "összes";
+
+/* No comment provided by engineer. */
+"All" = "Összes";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Az összes alkalmazásadat törölve.";
 
 /* No comment provided by engineer. */
-"All chats and messages will be deleted - this cannot be undone!" = "Az összes csevegés és üzenet törlésre kerül - ez a művelet nem vonható vissza!";
+"All chats and messages will be deleted - this cannot be undone!" = "Az összes csevegés és üzenet törölve lesz – ez a művelet nem vonható vissza!";
+
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Az összes csevegés el lesz távolítva a(z) %@ nevű listáról, és a lista is törölve lesz.";
 
 /* No comment provided by engineer. */
-"All data is erased when it is entered." = "A jelkód megadása után az összes adat törlésre kerül.";
+"All data is erased when it is entered." = "A jelkód megadása után az összes adat törölve lesz.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Az összes adat biztonságban van az eszközén.";
+"All data is kept private on your device." = "Az összes adat privát módon van tárolva az eszközén.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Az összes csoporttag kapcsolatban marad.";
@@ -488,52 +506,58 @@
 "all members" = "összes tag";
 
 /* No comment provided by engineer. */
-"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Az összes üzenetet és fájlt **végpontok közötti titkosítással** küldi, a közvetlen üzenetekben pedig kvantumrezisztens biztonsággal.";
+"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Az összes üzenet és fájl **végpontok közötti titkosítással**, a közvetlen üzenetek továbbá kvantumbiztos titkosítással is rendelkeznek.";
 
 /* No comment provided by engineer. */
-"All messages will be deleted - this cannot be undone!" = "Az összes üzenet törlésre kerül – ez a művelet nem vonható vissza!";
+"All messages will be deleted - this cannot be undone!" = "Az összes üzenet törölve lesz – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
-"All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Az összes üzenet törlésre kerül - ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.";
+"All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "Az összes üzenet törölve lesz – ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.";
 
 /* No comment provided by engineer. */
-"All new messages from %@ will be hidden!" = "Az összes új üzenet elrejtésre kerül tőle: %@!";
+"All new messages from %@ will be hidden!" = "%@ összes új üzenete el lesz rejtve!";
 
 /* profile dropdown */
 "All profiles" = "Összes profil";
 
 /* No comment provided by engineer. */
-"All your contacts will remain connected." = "Az összes ismerősével kapcsolatban marad.";
+"All reports will be archived for you." = "Az összes jelentés archiválva lesz az Ön számára.";
 
 /* No comment provided by engineer. */
-"All your contacts will remain connected. Profile update will be sent to your contacts." = "Az ismerőseivel kapcsolatban marad. A profil-változtatások frissítésre kerülnek az ismerősöknél.";
+"All servers" = "Összes kiszolgáló";
 
 /* No comment provided by engineer. */
-"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Az összes ismerőse, -beszélgetése és -fájlja biztonságosan titkosításra kerülnek, melyek részletekben feltöltődnek a beállított XFTP-közvetítő-kiszolgálóra.";
+"All your contacts will remain connected." = "Az összes partnerével kapcsolatban marad.";
+
+/* No comment provided by engineer. */
+"All your contacts will remain connected. Profile update will be sent to your contacts." = "A partnereivel kapcsolatban marad. A profilfrissítés el lesz küldve a partnerei számára.";
+
+/* No comment provided by engineer. */
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Az összes partnere, -beszélgetése és -fájlja biztonságosan titkosítva lesz, majd töredékekre bontva feltöltődnek a beállított XFTP-továbbítókiszolgálókra.";
 
 /* No comment provided by engineer. */
 "Allow" = "Engedélyezés";
 
 /* No comment provided by engineer. */
-"Allow calls only if your contact allows them." = "A hívások kezdeményezése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
+"Allow calls only if your contact allows them." = "A hívások kezdeményezése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.";
 
 /* No comment provided by engineer. */
-"Allow calls?" = "Hívások engedélyezése?";
+"Allow calls?" = "Engedélyezi a hívásokat?";
 
 /* No comment provided by engineer. */
-"Allow disappearing messages only if your contact allows it to you." = "Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi az Ön számára.";
+"Allow disappearing messages only if your contact allows it to you." = "Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi az Ön számára.";
 
 /* No comment provided by engineer. */
 "Allow downgrade" = "Visszafejlesztés engedélyezése";
 
 /* No comment provided by engineer. */
-"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)";
+"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi. (24 óra)";
 
 /* No comment provided by engineer. */
-"Allow message reactions only if your contact allows them." = "Az üzenetreakciók küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
+"Allow message reactions only if your contact allows them." = "A reakciók hozzáadása az üzenetekhez csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.";
 
 /* No comment provided by engineer. */
-"Allow message reactions." = "Üzenetreakciók engedélyezése.";
+"Allow message reactions." = "A reakciók hozzáadása az üzenetekhez engedélyezve van.";
 
 /* No comment provided by engineer. */
 "Allow sending direct messages to members." = "A közvetlen üzenetek küldése a tagok között engedélyezve van.";
@@ -545,37 +569,40 @@
 "Allow sharing" = "Megosztás engedélyezése";
 
 /* No comment provided by engineer. */
-"Allow to irreversibly delete sent messages. (24 hours)" = "Elküldött üzenetek végleges törlésének engedélyezése. (24 óra)";
+"Allow to irreversibly delete sent messages. (24 hours)" = "Az elküldött üzenetek végleges törlése engedélyezve van. (24 óra)";
 
 /* No comment provided by engineer. */
-"Allow to send files and media." = "Fájlok és médiatartalmak küldésének engedélyezése.";
+"Allow to report messsages to moderators." = "Az üzenetek jelentése a moderátorok felé engedélyezve van.";
+
+/* No comment provided by engineer. */
+"Allow to send files and media." = "A fájlok- és a médiatartalmak küldése engedélyezve van.";
 
 /* No comment provided by engineer. */
 "Allow to send SimpleX links." = "A SimpleX-hivatkozások küldése engedélyezve van.";
 
 /* No comment provided by engineer. */
-"Allow to send voice messages." = "Hangüzenetek küldésének engedélyezése.";
+"Allow to send voice messages." = "A hangüzenetek küldése engedélyezve van.";
 
 /* No comment provided by engineer. */
-"Allow voice messages only if your contact allows them." = "A hangüzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.";
+"Allow voice messages only if your contact allows them." = "A hangüzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.";
 
 /* No comment provided by engineer. */
-"Allow voice messages?" = "Hangüzenetek engedélyezése?";
+"Allow voice messages?" = "Engedélyezi a hangüzeneteket?";
 
 /* No comment provided by engineer. */
-"Allow your contacts adding message reactions." = "Az üzenetreakciók küldése engedélyezve van az ismerősei számára.";
+"Allow your contacts adding message reactions." = "A reakciók hozzáadása az üzenetekhez engedélyezve van a partnerei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to call you." = "A hívások kezdeményezése engedélyezve van az ismerősei számára.";
+"Allow your contacts to call you." = "A hívások kezdeményezése engedélyezve van a partnerei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to irreversibly delete sent messages. (24 hours)" = "Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)";
+"Allow your contacts to irreversibly delete sent messages. (24 hours)" = "Az elküldött üzenetek végleges törlése engedélyezve van a partnerei számára. (24 óra)";
 
 /* No comment provided by engineer. */
-"Allow your contacts to send disappearing messages." = "Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.";
+"Allow your contacts to send disappearing messages." = "Az eltűnő üzenetek küldésének engedélyezése a partnerei számára.";
 
 /* No comment provided by engineer. */
-"Allow your contacts to send voice messages." = "A hangüzenetek küldése engedélyezve van az ismerősei számára.";
+"Allow your contacts to send voice messages." = "A hangüzenetek küldése engedélyezve van a partnerei számára.";
 
 /* No comment provided by engineer. */
 "Already connected?" = "Már kapcsolódott?";
@@ -593,14 +620,17 @@
 "Always use private routing." = "Mindig használjon privát útválasztást.";
 
 /* No comment provided by engineer. */
-"Always use relay" = "Mindig használjon közvetítő-kiszolgálót";
+"Always use relay" = "Mindig használjon továbbítókiszolgálót";
 
 /* No comment provided by engineer. */
-"An empty chat profile with the provided name is created, and the app opens as usual." = "Egy üres csevegési profil jön létre a megadott névvel, és az alkalmazás a szokásos módon megnyílik.";
+"An empty chat profile with the provided name is created, and the app opens as usual." = "Egy üres csevegési profil lesz létrehozva a megadott névvel, és az alkalmazás a szokásos módon megnyílik.";
 
 /* No comment provided by engineer. */
 "and %lld other events" = "és további %lld esemény";
 
+/* report reason */
+"Another reason" = "Egyéb indoklás";
+
 /* No comment provided by engineer. */
 "Answer call" = "Hívás fogadása";
 
@@ -608,7 +638,7 @@
 "Anybody can host servers." = "Bárki üzemeltethet kiszolgálókat.";
 
 /* No comment provided by engineer. */
-"App build: %@" = "Az alkalmazás build száma: %@";
+"App build: %@" = "Az alkalmazás összeállítási száma: %@";
 
 /* No comment provided by engineer. */
 "App data migration" = "Alkalmazásadatok átköltöztetése";
@@ -616,6 +646,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Az alkalmazás titkosítja a helyi fájlokat (a videók kivételével).";
 
+/* No comment provided by engineer. */
+"App group:" = "Alkalmazáscsoport:";
+
 /* No comment provided by engineer. */
 "App icon" = "Alkalmazásikon";
 
@@ -623,16 +656,16 @@
 "App passcode" = "Alkalmazás jelkód";
 
 /* No comment provided by engineer. */
-"App passcode is replaced with self-destruct passcode." = "Az alkalmazás jelkód helyettesítésre kerül egy önmegsemmisítő jelkóddal.";
+"App passcode is replaced with self-destruct passcode." = "Az alkalmazás-jelkód helyettesítve lesz egy önmegsemmisítő-jelkóddal.";
 
 /* No comment provided by engineer. */
 "App session" = "Alkalmazás munkamenete";
 
 /* No comment provided by engineer. */
-"App version" = "Alkalmazás verzió";
+"App version" = "Az alkalmazás verziója";
 
 /* No comment provided by engineer. */
-"App version: v%@" = "Alkalmazás verzió: v%@";
+"App version: v%@" = "Az alkalmazás verziója: v%@";
 
 /* No comment provided by engineer. */
 "Appearance" = "Megjelenés";
@@ -643,20 +676,41 @@
 /* No comment provided by engineer. */
 "Apply to" = "Alkalmazás erre";
 
+/* No comment provided by engineer. */
+"Archive" = "Archívum";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Archivál %lld jelentést?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Archiválja az összes jelentést?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiválás és feltöltés";
 
 /* No comment provided by engineer. */
-"Archive contacts to chat later." = "Az ismerősök archiválása a későbbi csevegéshez.";
+"Archive contacts to chat later." = "A partnerek archiválása a későbbi csevegéshez.";
 
 /* No comment provided by engineer. */
-"Archived contacts" = "Archivált ismerősök";
+"Archive report" = "Jelentés archiválása";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Archiválja a jelentést?";
+
+/* swipe action */
+"Archive reports" = "Jelentések archiválása";
+
+/* No comment provided by engineer. */
+"Archived contacts" = "Archivált partnerek";
+
+/* No comment provided by engineer. */
+"archived report" = "archivált jelentés";
 
 /* No comment provided by engineer. */
 "Archiving database" = "Adatbázis archiválása";
 
 /* No comment provided by engineer. */
-"Attach" = "Csatolás";
+"Attach" = "Mellékelés";
 
 /* No comment provided by engineer. */
 "attempts" = "próbálkozások";
@@ -671,7 +725,7 @@
 "audio call (not e2e encrypted)" = "hanghívás (nem e2e titkosított)";
 
 /* chat feature */
-"Audio/video calls" = "Hang-/videóhívások";
+"Audio/video calls" = "Hang- és videóhívások";
 
 /* No comment provided by engineer. */
 "Audio/video calls are prohibited." = "A hívások kezdeményezése le van tiltva ebben a csevegésben.";
@@ -695,7 +749,7 @@
 "Auto-accept" = "Automatikus elfogadás";
 
 /* No comment provided by engineer. */
-"Auto-accept contact requests" = "Kapcsolatkérések automatikus elfogadása";
+"Auto-accept contact requests" = "Meghívási kérések automatikus elfogadása";
 
 /* No comment provided by engineer. */
 "Auto-accept images" = "Képek automatikus elfogadása";
@@ -710,13 +764,13 @@
 "Background" = "Háttér";
 
 /* No comment provided by engineer. */
-"Bad desktop address" = "Hibás számítógép cím";
+"Bad desktop address" = "Érvénytelen számítógépcím";
 
 /* integrity error chat item */
-"bad message hash" = "hibás az üzenet hasító értéke";
+"bad message hash" = "érvénytelen az üzenet hasítóértéke";
 
 /* No comment provided by engineer. */
-"Bad message hash" = "Hibás az üzenet hasító értéke";
+"Bad message hash" = "Érvénytelen az üzenet hasítóértéke";
 
 /* integrity error chat item */
 "bad message ID" = "téves üzenet ID";
@@ -728,13 +782,16 @@
 "Better calls" = "Továbbfejlesztett hívásélmény";
 
 /* No comment provided by engineer. */
-"Better groups" = "Javított csoportok";
+"Better groups" = "Továbbfejlesztett csoportok";
+
+/* No comment provided by engineer. */
+"Better groups performance" = "Továbbfejlesztett, gyorsabb csoportok";
 
 /* No comment provided by engineer. */
 "Better message dates." = "Továbbfejlesztett üzenetdátumok.";
 
 /* No comment provided by engineer. */
-"Better messages" = "Jobb üzenetek";
+"Better messages" = "Továbbfejlesztett üzenetek";
 
 /* No comment provided by engineer. */
 "Better networking" = "Jobb hálózatkezelés";
@@ -742,6 +799,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Továbbfejlesztett értesítések";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Továbbfejlesztett adatvédelem és biztonság";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Továbbfejlesztett biztonság ✅";
 
@@ -755,31 +815,32 @@
 "Block" = "Letiltás";
 
 /* No comment provided by engineer. */
-"Block for all" = "Letiltás az összes tag számára";
+"Block for all" = "Letiltás";
 
 /* No comment provided by engineer. */
 "Block group members" = "Csoporttagok letiltása";
 
 /* No comment provided by engineer. */
-"Block member" = "Tag letiltása";
+"Block member" = "Letiltás";
 
 /* No comment provided by engineer. */
-"Block member for all?" = "Az összes tag számára letiltja ezt a tagot?";
+"Block member for all?" = "Az összes tag számára letiltja a tagot?";
 
 /* No comment provided by engineer. */
-"Block member?" = "Tag letiltása?";
+"Block member?" = "Letiltja a tagot?";
 
 /* marked deleted chat item preview text */
 "blocked" = "letiltva";
 
 /* rcv group event chat item */
-"blocked %@" = "letiltotta %@-t";
+"blocked %@" = "letiltotta őt: %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "letiltva az adminisztrátor által";
 
 /* No comment provided by engineer. */
-"Blocked by admin" = "Az adminisztrátor letiltotta";
+"Blocked by admin" = "Letiltva az adminisztrátor által";
 
 /* No comment provided by engineer. */
 "Blur for better privacy." = "Elhomályosítás a jobb adatvédelemért.";
@@ -791,10 +852,10 @@
 "bold" = "félkövér";
 
 /* No comment provided by engineer. */
-"Both you and your contact can add message reactions." = "Mindkét fél is hozzáadhat üzenetreakciókat.";
+"Both you and your contact can add message reactions." = "Mindkét fél hozzáadhat az üzenetekhez reakciókat.";
 
 /* No comment provided by engineer. */
-"Both you and your contact can irreversibly delete sent messages. (24 hours)" = "Mindkét fél törölheti véglegesen az elküldött üzeneteket. (24 óra)";
+"Both you and your contact can irreversibly delete sent messages. (24 hours)" = "Mindkét fél véglegesen törölheti az elküldött üzeneteket. (24 óra)";
 
 /* No comment provided by engineer. */
 "Both you and your contact can make calls." = "Mindkét fél tud hívásokat kezdeményezni.";
@@ -814,9 +875,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Üzleti csevegések";
 
+/* No comment provided by engineer. */
+"Businesses" = "Üzleti";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "A csevegési profillal (alapértelmezett), vagy a [kapcsolattal] (https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BÉTA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "A SimpleX Chat használatával Ön elfogadja, hogy:\n- csak elfogadott tartalmakat tesz közzé a nyilvános csoportokban.\n- tiszteletben tartja a többi felhasználót, és nem küld kéretlen tartalmat senkinek.";
+
 /* No comment provided by engineer. */
 "call" = "hívás";
 
@@ -842,22 +909,25 @@
 "Camera not available" = "A kamera nem elérhető";
 
 /* No comment provided by engineer. */
-"Can't call contact" = "Nem lehet felhívni az ismerőst";
+"Can't call contact" = "Nem lehet felhívni a partnert";
 
 /* No comment provided by engineer. */
 "Can't call member" = "Nem lehet felhívni a tagot";
 
 /* No comment provided by engineer. */
-"Can't invite contact!" = "Nem lehet meghívni az ismerőst!";
+"Can't invite contact!" = "Nem lehet meghívni a partnert!";
 
 /* No comment provided by engineer. */
-"Can't invite contacts!" = "Nem lehet meghívni az ismerősöket!";
+"Can't invite contacts!" = "Nem lehet meghívni a partnereket!";
 
 /* No comment provided by engineer. */
 "Can't message member" = "Nem lehet üzenetet küldeni a tagnak";
 
+/* No comment provided by engineer. */
+"can't send messages" = "nem lehet üzeneteket küldeni";
+
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Mégse";
 
 /* No comment provided by engineer. */
@@ -876,59 +946,62 @@
 "Cannot receive file" = "Nem lehet fogadni a fájlt";
 
 /* snd error text */
-"Capacity exceeded - recipient did not receive previously sent messages." = "Kapacitás túllépés - a címzett nem kapta meg a korábban elküldött üzeneteket.";
+"Capacity exceeded - recipient did not receive previously sent messages." = "Kapacitás túllépés – a címzett nem kapta meg a korábban elküldött üzeneteket.";
 
 /* No comment provided by engineer. */
 "Cellular" = "Mobilhálózat";
 
 /* No comment provided by engineer. */
-"Change" = "Változtatás";
+"Change" = "Módosítás";
+
+/* alert title */
+"Change automatic message deletion?" = "Módosítja az automatikus üzenettörlést?";
 
 /* authentication reason */
-"Change chat profiles" = "Csevegési profilok megváltoztatása";
+"Change chat profiles" = "Csevegési profilok módosítása";
 
 /* No comment provided by engineer. */
-"Change database passphrase?" = "Adatbázis-jelmondat megváltoztatása?";
+"Change database passphrase?" = "Módosítja az adatbázis jelmondatát?";
 
 /* authentication reason */
-"Change lock mode" = "Zárolási mód megváltoztatása";
+"Change lock mode" = "Zárolási mód módosítása";
 
 /* No comment provided by engineer. */
-"Change member role?" = "Tag szerepkörének megváltoztatása?";
+"Change member role?" = "Módosítja a tag szerepkörét?";
 
 /* authentication reason */
-"Change passcode" = "Jelkód megváltoztatása";
+"Change passcode" = "Jelkód módosítása";
 
 /* No comment provided by engineer. */
-"Change receiving address" = "A fogadó cím megváltoztatása";
+"Change receiving address" = "Fogadási cím módosítása";
 
 /* No comment provided by engineer. */
-"Change receiving address?" = "Megváltoztatja a fogadó címet?";
+"Change receiving address?" = "Módosítja a fogadási címet?";
 
 /* No comment provided by engineer. */
-"Change role" = "Szerepkör megváltoztatása";
+"Change role" = "Szerepkör módosítása";
 
 /* authentication reason */
-"Change self-destruct mode" = "Önmegsemmisítő mód megváltoztatása";
+"Change self-destruct mode" = "Önmegsemmisítő-mód módosítása";
 
 /* authentication reason
-   set passcode view */
-"Change self-destruct passcode" = "Önmegsemmisító jelkód megváltoztatása";
+set passcode view */
+"Change self-destruct passcode" = "Önmegsemmisítő-jelkód módosítása";
 
 /* chat item text */
-"changed address for you" = "cím megváltoztatva";
+"changed address for you" = "módosította a címet az Ön számára";
 
 /* rcv group event chat item */
-"changed role of %@ to %@" = "%1$@ szerepkörét megváltoztatta erre: %2$@";
+"changed role of %@ to %@" = "a következőre módosította %1$@ szerepkörét: „%2$@”";
 
 /* rcv group event chat item */
-"changed your role to %@" = "megváltoztatta az Ön szerepkörét erre: %@";
+"changed your role to %@" = "a következőre módosította az Ön szerepkörét: „%@”";
 
 /* chat item text */
-"changing address for %@…" = "cím megváltoztatása nála: %@…";
+"changing address for %@…" = "cím módosítása %@ számára…";
 
 /* chat item text */
-"changing address…" = "cím megváltoztatása…";
+"changing address…" = "cím módosítása…";
 
 /* No comment provided by engineer. */
 "Chat" = "Csevegés";
@@ -961,13 +1034,13 @@
 "Chat is running" = "A csevegés fut";
 
 /* No comment provided by engineer. */
-"Chat is stopped" = "A csevegés leállt";
+"Chat is stopped" = "A csevegés megállt";
 
 /* No comment provided by engineer. */
-"Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "A csevegés leállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés megkezdése előtt.";
+"Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "A csevegés megállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés elindítása előtt.";
 
 /* No comment provided by engineer. */
-"Chat list" = "Csevegőlista";
+"Chat list" = "Csevegési lista";
 
 /* No comment provided by engineer. */
 "Chat migrated!" = "A csevegés átköltöztetve!";
@@ -976,7 +1049,7 @@
 "Chat preferences" = "Csevegési beállítások";
 
 /* alert message */
-"Chat preferences were changed." = "A csevegési beállítások megváltoztak.";
+"Chat preferences were changed." = "A csevegési beállítások módosultak.";
 
 /* No comment provided by engineer. */
 "Chat profile" = "Csevegési profil";
@@ -985,14 +1058,23 @@
 "Chat theme" = "Csevegés témája";
 
 /* No comment provided by engineer. */
-"Chat will be deleted for all members - this cannot be undone!" = "A csevegés minden tag számára törlésre kerül - ezt a műveletet nem lehet visszavonni!";
+"Chat will be deleted for all members - this cannot be undone!" = "A csevegés minden tag számára törölve lesz – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
-"Chat will be deleted for you - this cannot be undone!" = "A csevegés törlésre kerül az Ön számára - ezt a műveletet nem lehet visszavonni!";
+"Chat will be deleted for you - this cannot be undone!" = "A csevegés törölve lesz az Ön számára – ez a művelet nem vonható vissza!";
+
+/* chat toolbar */
+"Chat with admins" = "Csevegés az adminisztrátorokkal";
+
+/* No comment provided by engineer. */
+"Chat with member" = "Csevegés a taggal";
 
 /* No comment provided by engineer. */
 "Chats" = "Csevegések";
 
+/* No comment provided by engineer. */
+"Chats with members" = "Csevegés a tagokkal";
+
 /* No comment provided by engineer. */
 "Check messages every 20 min." = "Üzenetek ellenőrzése 20 percenként.";
 
@@ -1015,13 +1097,13 @@
 "Choose from library" = "Választás a könyvtárból";
 
 /* No comment provided by engineer. */
-"Chunks deleted" = "Törölt fájltöredékek";
+"Chunks deleted" = "Törölt töredékek";
 
 /* No comment provided by engineer. */
-"Chunks downloaded" = "Letöltött fájltöredékek";
+"Chunks downloaded" = "Letöltött töredékek";
 
 /* No comment provided by engineer. */
-"Chunks uploaded" = "Feltöltött fájltöredékek";
+"Chunks uploaded" = "Feltöltött töredékek";
 
 /* swipe action */
 "Clear" = "Kiürítés";
@@ -1030,10 +1112,16 @@
 "Clear conversation" = "Üzenetek kiürítése";
 
 /* No comment provided by engineer. */
-"Clear conversation?" = "Üzenetek kiürítése?";
+"Clear conversation?" = "Kiüríti az üzeneteket?";
 
 /* No comment provided by engineer. */
-"Clear private notes?" = "Privát jegyzetek kiürítése?";
+"Clear group?" = "Kiüríti a csoportot?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Csoport kiürítése vagy törlése?";
+
+/* No comment provided by engineer. */
+"Clear private notes?" = "Kiüríti a privát jegyzeteket?";
 
 /* No comment provided by engineer. */
 "Clear verification" = "Hitelesítés törlése";
@@ -1045,13 +1133,16 @@
 "Color mode" = "Színmód";
 
 /* No comment provided by engineer. */
-"colored" = "színes";
+"colored" = "színezett";
+
+/* report reason */
+"Community guidelines violation" = "Közösségi irányelvek megsértése";
 
 /* server test step */
-"Compare file" = "Fájl összehasonlítás";
+"Compare file" = "Fájl-összehasonlítás";
 
 /* No comment provided by engineer. */
-"Compare security codes with your contacts." = "Biztonsági kódok összehasonlítása az ismerősökével.";
+"Compare security codes with your contacts." = "Biztonsági kódok összehasonlítása a partnerekével.";
 
 /* No comment provided by engineer. */
 "complete" = "befejezett";
@@ -1060,7 +1151,7 @@
 "Completed" = "Elkészült";
 
 /* No comment provided by engineer. */
-"Conditions accepted on: %@." = "Feltételek elfogadva ekkor: %@.";
+"Conditions accepted on: %@." = "Feltételek elfogadásának ideje: %@.";
 
 /* No comment provided by engineer. */
 "Conditions are accepted for the operator(s): **%@**." = "A következő üzemeltető(k) számára elfogadott feltételek: **%@**.";
@@ -1071,29 +1162,26 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Használati feltételek";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "A feltételek 30 nap elteltével lesznek elfogadva az engedélyezett üzemeltető számára.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "A feltételek el lesznek fogadva a következő üzemeltető(k) számára: **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "A feltételek el lesznek fogadva a következő üzemeltető(k) számára: **%@**.";
 
 /* No comment provided by engineer. */
-"Conditions will be accepted on: %@." = "A feltételek ekkor lesznek elfogadva: %@.";
+"Conditions will be accepted on: %@." = "A feltételek el lesznek fogadva a következő időpontban: %@.";
 
 /* No comment provided by engineer. */
-"Conditions will be automatically accepted for enabled operators on: %@." = "A feltételek automatikusan elfogadásra kerülnek az engedélyezett üzemeltető számára: %@.";
+"Conditions will be automatically accepted for enabled operators on: %@." = "A feltételek automatikusan el lesznek fogadva az engedélyezett üzemeltetők számára a következő időpontban: %@.";
 
 /* No comment provided by engineer. */
 "Configure ICE servers" = "ICE-kiszolgálók beállítása";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Kiszolgálóüzemeltetők beállítása";
+
 /* No comment provided by engineer. */
 "Confirm" = "Megerősítés";
 
 /* No comment provided by engineer. */
-"Confirm contact deletion?" = "Biztosan törli az ismerőst?";
+"Confirm contact deletion?" = "Biztosan törli a partnert?";
 
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Adatbázis fejlesztésének megerősítése";
@@ -1119,6 +1207,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Feltöltés megerősítése";
 
+/* token status text */
+"Confirmed" = "Megerősítve";
+
 /* server test step */
 "Connect" = "Kapcsolódás";
 
@@ -1135,16 +1226,16 @@
 "connect to SimpleX Chat developers." = "kapcsolódás a SimpleX Chat fejlesztőkhöz.";
 
 /* No comment provided by engineer. */
-"Connect to your friends faster." = "Kapcsolódjon gyorsabban az ismerőseihez.";
+"Connect to your friends faster." = "Kapcsolódjon gyorsabban a partnereihez.";
 
 /* No comment provided by engineer. */
-"Connect to yourself?" = "Kapcsolódás saját magához?";
+"Connect to yourself?" = "Kapcsolódik saját magához?";
 
 /* No comment provided by engineer. */
-"Connect to yourself?\nThis is your own one-time link!" = "Kapcsolódás saját magához?\nEz az Ön egyszer használható meghívó-hivatkozása!";
+"Connect to yourself?\nThis is your own one-time link!" = "Kapcsolódik saját magához?\nEz a saját egyszer használható meghívója!";
 
 /* No comment provided by engineer. */
-"Connect to yourself?\nThis is your own SimpleX address!" = "Kapcsolódás saját magához?\nEz az Ön SimpleX-címe!";
+"Connect to yourself?\nThis is your own SimpleX address!" = "Kapcsolódik saját magához?\nEz a saját SimpleX-címe!";
 
 /* No comment provided by engineer. */
 "Connect via contact address" = "Kapcsolódás a kapcsolattartási címen keresztül";
@@ -1153,7 +1244,7 @@
 "Connect via link" = "Kapcsolódás egy hivatkozáson keresztül";
 
 /* No comment provided by engineer. */
-"Connect via one-time link" = "Kapcsolódás egyszer használható meghívó-hivatkozáson keresztül";
+"Connect via one-time link" = "Kapcsolódás egyszer használható meghívón keresztül";
 
 /* No comment provided by engineer. */
 "Connect with %@" = "Kapcsolódás a következővel: %@";
@@ -1189,10 +1280,10 @@
 "connecting (announced)" = "kapcsolódás (bejelentve)";
 
 /* No comment provided by engineer. */
-"connecting (introduced)" = "kapcsolódás (bejelentve)";
+"connecting (introduced)" = "kapcsolódás (bemutatkozva)";
 
 /* No comment provided by engineer. */
-"connecting (introduction invitation)" = "kapcsolódás (bemutatkozó-meghívó)";
+"connecting (introduction invitation)" = "kapcsolódás (bemutatkozó meghívó)";
 
 /* call status */
 "connecting call" = "kapcsolódási hívás…";
@@ -1204,7 +1295,7 @@
 "Connecting server… (error: %@)" = "Kapcsolódás a kiszolgálóhoz… (hiba: %@)";
 
 /* No comment provided by engineer. */
-"Connecting to contact, please wait or check later!" = "Kapcsolódás az ismerőshöz, várjon vagy ellenőrizze később!";
+"Connecting to contact, please wait or check later!" = "Kapcsolódás a partnerhez, várjon vagy ellenőrizze később!";
 
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Kapcsolódás a számítógéphez";
@@ -1218,6 +1309,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Kapcsolatok- és kiszolgálók állapotának megjelenítése.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "A kapcsolat le van tiltva";
+
 /* No comment provided by engineer. */
 "Connection error" = "Kapcsolódási hiba";
 
@@ -1227,11 +1321,20 @@
 /* chat list item title (it should not be shown */
 "connection established" = "kapcsolat létrehozva";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "A kiszolgáló üzemeltetője letiltotta a kapcsolatot:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "A kapcsolat nem áll készen.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Kapcsolódási értesítések";
 
 /* No comment provided by engineer. */
-"Connection request sent!" = "Kapcsolatkérés elküldve!";
+"Connection request sent!" = "Meghívási kérés elküldve!";
+
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "A kapcsolat titkosítása újraegyeztetést igényel.";
 
 /* No comment provided by engineer. */
 "Connection security" = "Kapcsolatbiztonság";
@@ -1252,46 +1355,58 @@
 "Connections" = "Kapcsolatok";
 
 /* profile update event chat item */
-"contact %@ changed to %@" = "%1$@ megváltoztatta a nevét erre: %2$@";
+"contact %@ changed to %@" = "%1$@ a következőre módosította a nevét: %2$@";
 
 /* No comment provided by engineer. */
-"Contact allows" = "Ismerős engedélyezi";
+"Contact allows" = "Partner engedélyezi";
 
 /* No comment provided by engineer. */
-"Contact already exists" = "Az ismerős már létezik";
+"Contact already exists" = "A partner már létezik";
 
 /* No comment provided by engineer. */
-"Contact deleted!" = "Ismerős törölve!";
+"contact deleted" = "partner törölve";
 
 /* No comment provided by engineer. */
-"contact has e2e encryption" = "az ismerősnél az e2e titkosítás elérhető";
+"Contact deleted!" = "Partner törölve!";
 
 /* No comment provided by engineer. */
-"contact has no e2e encryption" = "az ismerősnél az e2e titkosítás nem elérhető";
+"contact disabled" = "partner letiltva";
+
+/* No comment provided by engineer. */
+"contact has e2e encryption" = "a partner e2e titkosítással rendelkezik";
+
+/* No comment provided by engineer. */
+"contact has no e2e encryption" = "a partner nem rendelkezik e2e titkosítással";
 
 /* notification */
-"Contact hidden:" = "Ismerős elrejtve:";
+"Contact hidden:" = "Rejtett név:";
 
 /* notification */
-"Contact is connected" = "Ismerőse kapcsolódott";
+"Contact is connected" = "Partnere kapcsolódott";
 
 /* No comment provided by engineer. */
-"Contact is deleted." = "Törölt ismerős.";
+"Contact is deleted." = "Törölt partner.";
 
 /* No comment provided by engineer. */
 "Contact name" = "Csak név";
 
 /* No comment provided by engineer. */
-"Contact preferences" = "Ismerős beállításai";
+"contact not ready" = "a kapcsolat nem áll készen";
 
 /* No comment provided by engineer. */
-"Contact will be deleted - this cannot be undone!" = "Az ismerős törlésre fog kerülni - ez a művelet nem vonható vissza!";
+"Contact preferences" = "Partnerbeállítások";
 
 /* No comment provided by engineer. */
-"Contacts" = "Ismerősök";
+"Contact will be deleted - this cannot be undone!" = "A partner törölve lesz – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
-"Contacts can mark messages for deletion; you will be able to view them." = "Az ismerősei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.";
+"Contacts" = "Partnerek";
+
+/* No comment provided by engineer. */
+"Contacts can mark messages for deletion; you will be able to view them." = "A partnerei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.";
+
+/* blocking reason */
+"Content violates conditions of use" = "A tartalom sérti a használati feltételeket";
 
 /* No comment provided by engineer. */
 "Continue" = "Folytatás";
@@ -1306,22 +1421,22 @@
 "Copy error" = "Másolási hiba";
 
 /* No comment provided by engineer. */
-"Core version: v%@" = "Alapverziószám: v%@";
+"Core version: v%@" = "Fő verzió: v%@";
 
 /* No comment provided by engineer. */
 "Corner" = "Sarok";
 
 /* No comment provided by engineer. */
-"Correct name to %@?" = "Név javítása erre: %@?";
+"Correct name to %@?" = "Helyesbíti a nevet a következőre: %@?";
 
 /* No comment provided by engineer. */
 "Create" = "Létrehozás";
 
 /* No comment provided by engineer. */
-"Create 1-time link" = "Egyszer használható meghívó-hivatkozás létrehozása";
+"Create 1-time link" = "Egyszer használható meghívó létrehozása";
 
 /* No comment provided by engineer. */
-"Create a group using a random profile." = "Csoport létrehozása véletlenszerűen létrehozott profillal.";
+"Create a group using a random profile." = "Csoport létrehozása véletlenszerű profillal.";
 
 /* server test step */
 "Create file" = "Fájl létrehozása";
@@ -1335,6 +1450,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Hivatkozás létrehozása";
 
+/* No comment provided by engineer. */
+"Create list" = "Lista létrehozása";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Új profil létrehozása a [számítógép-alkalmazásban](https://simplex.chat/downloads/). 💻";
 
@@ -1342,7 +1460,7 @@
 "Create profile" = "Profil létrehozása";
 
 /* server test step */
-"Create queue" = "Sorbaállítás létrehozása";
+"Create queue" = "Sorba állítás létrehozása";
 
 /* No comment provided by engineer. */
 "Create secret group" = "Titkos csoport létrehozása";
@@ -1357,10 +1475,10 @@
 "Created" = "Létrehozva";
 
 /* No comment provided by engineer. */
-"Created at" = "Létrehozva ekkor:";
+"Created at" = "Létrehozva";
 
 /* copied message info */
-"Created at: %@" = "Létrehozva ekkor: %@";
+"Created at: %@" = "Létrehozva: %@";
 
 /* No comment provided by engineer. */
 "Creating archive link" = "Archívum hivatkozás létrehozása";
@@ -1372,7 +1490,7 @@
 "creator" = "készítő";
 
 /* No comment provided by engineer. */
-"Current conditions text couldn't be loaded, you can review conditions via this link:" = "A jelenlegi feltételek szövegét nem lehetett betölteni, a feltételeket ezen a hivatkozáson keresztül vizsgálhatja felül:";
+"Current conditions text couldn't be loaded, you can review conditions via this link:" = "A jelenlegi feltételek szövegét nem lehetett betölteni, a feltételeket a következő hivatkozáson keresztül vizsgálhatja felül:";
 
 /* No comment provided by engineer. */
 "Current Passcode" = "Jelenlegi jelkód";
@@ -1384,16 +1502,16 @@
 "Current profile" = "Jelenlegi profil";
 
 /* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Jelenleg a maximális támogatott fájlméret %@.";
+"Currently maximum supported file size is %@." = "Jelenleg támogatott legnagyobb fájl méret: %@.";
 
 /* dropdown time picker choice */
-"custom" = "egyedi";
+"custom" = "egyéni";
 
 /* No comment provided by engineer. */
-"Custom time" = "Személyreszabott idő";
+"Custom time" = "Egyéni időköz";
 
 /* No comment provided by engineer. */
-"Customizable message shape." = "Testreszabható üzenetbuborékok.";
+"Customizable message shape." = "Személyre szabható üzenetbuborékok.";
 
 /* No comment provided by engineer. */
 "Customize theme" = "Téma személyre szabása";
@@ -1411,10 +1529,10 @@
 "Database encrypted!" = "Adatbázis titkosítva!";
 
 /* No comment provided by engineer. */
-"Database encryption passphrase will be updated and stored in the keychain.\n" = "Az adatbázis titkosítási jelmondata frissítve lesz és a kulcstartóban kerül tárolásra.\n";
+"Database encryption passphrase will be updated and stored in the keychain.\n" = "Az adatbázis titkosítási jelmondata frissülni fog és a kulcstartóban lesz tárolva.\n";
 
 /* No comment provided by engineer. */
-"Database encryption passphrase will be updated.\n" = "Az datbázis titkosítási jelmondata frissítve lesz.\n";
+"Database encryption passphrase will be updated.\n" = "Az adatbázis titkosítási jelmondata frissítve lesz.\n";
 
 /* No comment provided by engineer. */
 "Database error" = "Adatbázishiba";
@@ -1426,13 +1544,13 @@
 "Database ID: %d" = "Adatbázis-azonosító: %d";
 
 /* No comment provided by engineer. */
-"Database IDs and Transport isolation option." = "Adatbázis-azonosítók és átvitel-izolációs beállítások.";
+"Database IDs and Transport isolation option." = "Adatbázis-azonosítók és átvitelelkülönítési beállítások.";
 
 /* No comment provided by engineer. */
-"Database is encrypted using a random passphrase, you can change it." = "Az adatbázis egy véletlenszerű jelmondattal van titkosítva, ami megváltoztatható.";
+"Database is encrypted using a random passphrase, you can change it." = "Az adatbázis egy véletlenszerű jelmondattal van titkosítva, amelyet szabadon módosíthat.";
 
 /* No comment provided by engineer. */
-"Database is encrypted using a random passphrase. Please change it before exporting." = "Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt változtassa meg.";
+"Database is encrypted using a random passphrase. Please change it before exporting." = "Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt módosítsa.";
 
 /* No comment provided by engineer. */
 "Database passphrase" = "Adatbázis-jelmondat";
@@ -1441,7 +1559,7 @@
 "Database passphrase & export" = "Adatbázis-jelmondat és -exportálás";
 
 /* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata eltér a kulcstartóban mentettől.";
+"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata nem egyezik a kulcstartóba mentettől.";
 
 /* No comment provided by engineer. */
 "Database passphrase is required to open chat." = "A csevegés megnyitásához adja meg az adatbázis jelmondatát.";
@@ -1450,16 +1568,16 @@
 "Database upgrade" = "Adatbázis fejlesztése";
 
 /* No comment provided by engineer. */
-"database version is newer than the app, but no down migration for: %@" = "az adatbázis verziója újabb, mint az alkalmazásé, de nincs visszafelé átköltöztetés ehhez: %@";
+"database version is newer than the app, but no down migration for: %@" = "az adatbázis verziója újabb, mint az alkalmazásé, de a visszafelé történő átköltöztetés viszont nem lehetséges a következőhöz: %@";
 
 /* No comment provided by engineer. */
-"Database will be encrypted and the passphrase stored in the keychain.\n" = "Az adatbázis titkosítva lesz, a jelmondat pedig a kulcstartóban kerül tárolásra.\n";
+"Database will be encrypted and the passphrase stored in the keychain.\n" = "Az adatbázis titkosítva lesz, a jelmondat pedig a kulcstartóban lesz tárolva.\n";
 
 /* No comment provided by engineer. */
-"Database will be encrypted.\n" = "Az adatbázis titkosításra kerül.\n";
+"Database will be encrypted.\n" = "Az adatbázis titkosítva lesz.\n";
 
 /* No comment provided by engineer. */
-"Database will be migrated when the app restarts" = "Az adatbázis az alkalmazás újraindításakor átköltöztetésre kerül";
+"Database will be migrated when the app restarts" = "Az adatbázis az alkalmazás újraindításakor lesz átköltöztetve";
 
 /* time unit */
 "days" = "nap";
@@ -1471,12 +1589,13 @@
 "Decentralized" = "Decentralizált";
 
 /* message decrypt error item */
-"Decryption error" = "Titkosítás visszafejtési hiba";
+"Decryption error" = "Titkosításvisszafejtési hiba";
 
 /* No comment provided by engineer. */
 "decryption errors" = "visszafejtési hibák";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "alapértelmezett (%@)";
 
 /* No comment provided by engineer. */
@@ -1486,12 +1605,11 @@
 "default (yes)" = "alapértelmezett (igen)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Törlés";
 
 /* No comment provided by engineer. */
-"Delete %lld messages of members?" = "Tagok %lld üzenetének törlése?";
+"Delete %lld messages of members?" = "Törli a tagok %lld üzenetét?";
 
 /* No comment provided by engineer. */
 "Delete %lld messages?" = "Töröl %lld üzenetet?";
@@ -1500,7 +1618,7 @@
 "Delete address" = "Cím törlése";
 
 /* No comment provided by engineer. */
-"Delete address?" = "Cím törlése?";
+"Delete address?" = "Törli a címet?";
 
 /* No comment provided by engineer. */
 "Delete after" = "Törlés ennyi idő után";
@@ -1509,28 +1627,34 @@
 "Delete all files" = "Az összes fájl törlése";
 
 /* No comment provided by engineer. */
-"Delete and notify contact" = "Törlés, és az ismerős értesítése";
+"Delete and notify contact" = "Törlés, és a partner értesítése";
 
 /* No comment provided by engineer. */
 "Delete chat" = "Csevegés törlése";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Csevegési üzenetek törlése a saját eszközéről.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Csevegési profil törlése";
 
 /* No comment provided by engineer. */
-"Delete chat profile?" = "Csevegési profil törlése?";
+"Delete chat profile?" = "Törli a csevegési profilt?";
+
+/* alert title */
+"Delete chat with member?" = "Törli a taggal való csevegést?";
 
 /* No comment provided by engineer. */
-"Delete chat?" = "Csevegés törlése?";
+"Delete chat?" = "Törli a csevegést?";
 
 /* No comment provided by engineer. */
 "Delete connection" = "Kapcsolat törlése";
 
 /* No comment provided by engineer. */
-"Delete contact" = "Ismerős törlése";
+"Delete contact" = "Partner törlése";
 
 /* No comment provided by engineer. */
-"Delete contact?" = "Ismerős törlése?";
+"Delete contact?" = "Törli a partnert?";
 
 /* No comment provided by engineer. */
 "Delete database" = "Adatbázis törlése";
@@ -1542,7 +1666,7 @@
 "Delete file" = "Fájl törlése";
 
 /* No comment provided by engineer. */
-"Delete files and media?" = "Fájlok és a médiatartalmak törlése?";
+"Delete files and media?" = "Törli a fájl- és a médiatartalmakat?";
 
 /* No comment provided by engineer. */
 "Delete files for all chat profiles" = "Fájlok törlése az összes csevegési profilból";
@@ -1557,24 +1681,27 @@
 "Delete group" = "Csoport törlése";
 
 /* No comment provided by engineer. */
-"Delete group?" = "Csoport törlése?";
+"Delete group?" = "Törli a csoportot?";
 
 /* No comment provided by engineer. */
 "Delete invitation" = "Meghívó törlése";
 
 /* No comment provided by engineer. */
-"Delete link" = "Hivatkozás törlése";
+"Delete link" = "Törlés";
 
 /* No comment provided by engineer. */
-"Delete link?" = "Hivatkozás törlése?";
+"Delete link?" = "Törli a hivatkozást?";
+
+/* alert title */
+"Delete list?" = "Törli a listát?";
 
 /* No comment provided by engineer. */
-"Delete member message?" = "Csoporttag üzenetének törlése?";
+"Delete member message?" = "Törli a tag üzenetét?";
 
 /* No comment provided by engineer. */
-"Delete message?" = "Üzenet törlése?";
+"Delete message?" = "Törli az üzenetet?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Üzenetek törlése";
 
 /* No comment provided by engineer. */
@@ -1584,25 +1711,28 @@
 "Delete old database" = "Régi adatbázis törlése";
 
 /* No comment provided by engineer. */
-"Delete old database?" = "Régi adatbázis törlése?";
+"Delete old database?" = "Törli a régi adatbázist?";
 
 /* No comment provided by engineer. */
 "Delete or moderate up to 200 messages." = "Legfeljebb 200 üzenet egyszerre való törlése, vagy moderálása.";
 
 /* No comment provided by engineer. */
-"Delete pending connection?" = "Függőben lévő ismerőskérelem törlése?";
+"Delete pending connection?" = "Törli a függőben lévő meghívót?";
 
 /* No comment provided by engineer. */
 "Delete profile" = "Profil törlése";
 
 /* server test step */
-"Delete queue" = "Sorbaállítás törlése";
+"Delete queue" = "Sorba állítás törlése";
+
+/* No comment provided by engineer. */
+"Delete report" = "Jelentés törlése";
 
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Legfeljebb 20 üzenet egyszerre való törlése.";
 
 /* No comment provided by engineer. */
-"Delete user profile?" = "Felhasználói profil törlése?";
+"Delete user profile?" = "Törli a felhasználói profilt?";
 
 /* No comment provided by engineer. */
 "Delete without notification" = "Törlés értesítés nélkül";
@@ -1614,13 +1744,13 @@
 "Deleted" = "Törölve";
 
 /* No comment provided by engineer. */
-"Deleted at" = "Törölve ekkor:";
+"Deleted at" = "Törölve";
 
 /* copied message info */
-"Deleted at: %@" = "Törölve ekkor: %@";
+"Deleted at: %@" = "Törölve: %@";
 
 /* rcv direct event chat item */
-"deleted contact" = "törölt ismerős";
+"deleted contact" = "törölt partner";
 
 /* rcv group event chat item */
 "deleted group" = "törölt csoport";
@@ -1635,7 +1765,7 @@
 "Delivery" = "Kézbesítés";
 
 /* No comment provided by engineer. */
-"Delivery receipts are disabled!" = "A kézbesítési jelentések ki vannak kapcsolva!";
+"Delivery receipts are disabled!" = "A kézbesítési jelentések le vannak tiltva!";
 
 /* No comment provided by engineer. */
 "Delivery receipts!" = "Kézbesítési jelentések!";
@@ -1647,19 +1777,19 @@
 "Desktop address" = "Számítógép címe";
 
 /* No comment provided by engineer. */
-"Desktop app version %@ is not compatible with this app." = "A számítógép-alkalmazás verziója %@ nem kompatibilis ezzel az alkalmazással.";
+"Desktop app version %@ is not compatible with this app." = "A számítógép-alkalmazás verziója (%@) nem kompatibilis ezzel az alkalmazással.";
 
 /* No comment provided by engineer. */
 "Desktop devices" = "Számítógépek";
 
 /* No comment provided by engineer. */
-"Destination server address of %@ is incompatible with forwarding server %@ settings." = "A(z) %@ célkiszolgáló címe nem kompatibilis a(z) %@ továbbító kiszolgáló beállításaival.";
+"Destination server address of %@ is incompatible with forwarding server %@ settings." = "A(z) %@ célkiszolgáló címe nem kompatibilis a(z) %@ továbbítókiszolgáló beállításaival.";
 
 /* snd error text */
-"Destination server error: %@" = "Célkiszolgáló hiba: %@";
+"Destination server error: %@" = "Célkiszolgáló-hiba: %@";
 
 /* No comment provided by engineer. */
-"Destination server version of %@ is incompatible with forwarding server %@." = "A(z) %@ célkiszolgáló verziója nem kompatibilis a(z) %@ továbbító kiszolgálóval.";
+"Destination server version of %@ is incompatible with forwarding server %@." = "A(z) %@ célkiszolgáló verziója nem kompatibilis a(z) %@ továbbítókiszolgálóval.";
 
 /* No comment provided by engineer. */
 "Detailed statistics" = "Részletes statisztikák";
@@ -1686,10 +1816,10 @@
 "Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "Az eszközön nincs beállítva a képernyőzár. A SimpleX-zár az „Adatvédelem és biztonság” menüben kapcsolható be, miután beállította a képernyőzárat az eszközén.";
 
 /* No comment provided by engineer. */
-"different migration in the app/database: %@ / %@" = "különböző átköltöztetések az alkalmazásban/adatbázisban: %@ / %@";
+"different migration in the app/database: %@ / %@" = "különböző átköltöztetés az alkalmazásban/adatbázisban: %@ / %@";
 
 /* No comment provided by engineer. */
-"Different names, avatars and transport isolation." = "Különböző nevek, profilképek és átvitel-izoláció.";
+"Different names, avatars and transport isolation." = "Különböző nevek, profilképek és átvitelizoláció.";
 
 /* connection level description */
 "direct" = "közvetlen";
@@ -1701,13 +1831,19 @@
 "Direct messages between members are prohibited in this chat." = "A tagok közötti közvetlen üzenetek le vannak tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.";
+"Direct messages between members are prohibited." = "A tagok közötti közvetlen üzenetek le vannak tiltva.";
 
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Letiltás (felülírások megtartásával)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Letiltja az automatikus üzenettörlést?";
+
+/* alert button */
+"Disable delete messages" = "Üzenetek törlésének letiltása";
+
 /* No comment provided by engineer. */
-"Disable for all" = "Letiltás az összes tag számára";
+"Disable for all" = "Letiltás";
 
 /* authentication reason */
 "Disable SimpleX Lock" = "SimpleX-zár kikapcsolása";
@@ -1728,22 +1864,22 @@
 "Disappearing messages are prohibited in this chat." = "Az eltűnő üzenetek küldése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Disappearing messages are prohibited." = "Az eltűnő üzenetek küldése le van tiltva ebben a csoportban.";
+"Disappearing messages are prohibited." = "Az eltűnő üzenetek küldése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Disappears at" = "Eltűnik ekkor:";
+"Disappears at" = "Eltűnik";
 
 /* copied message info */
-"Disappears at: %@" = "Eltűnik ekkor: %@";
+"Disappears at: %@" = "Eltűnik: %@";
 
 /* server test step */
 "Disconnect" = "Kapcsolat bontása";
 
 /* No comment provided by engineer. */
-"Disconnect desktop?" = "Számítógép leválasztása?";
+"Disconnect desktop?" = "Leválasztja a számítógépet?";
 
 /* No comment provided by engineer. */
-"Discover and join groups" = "Helyi csoportok felfedezése és csatlakozás";
+"Discover and join groups" = "Csoportok felfedezése és csatlakozás";
 
 /* No comment provided by engineer. */
 "Discover via local network" = "Felfedezés helyi hálózaton keresztül";
@@ -1752,19 +1888,22 @@
 "Do it later" = "Befejezés később";
 
 /* No comment provided by engineer. */
-"Do not send history to new members." = "Az előzmények ne kerüljenek elküldésre az új tagok számára.";
+"Do not send history to new members." = "Az előzmények ne legyenek elküldve az új tagok számára.";
 
 /* No comment provided by engineer. */
-"Do NOT send messages directly, even if your or destination server does not support private routing." = "Ne küldjön üzeneteket közvetlenül, még akkor sem, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
+"Do NOT send messages directly, even if your or destination server does not support private routing." = "NE küldjön üzeneteket közvetlenül, még akkor sem, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
 
 /* No comment provided by engineer. */
 "Do not use credentials with proxy." = "Ne használja a hitelesítőadatokat proxyval.";
 
 /* No comment provided by engineer. */
-"Do NOT use private routing." = "Ne használjon privát útválasztást.";
+"Do NOT use private routing." = "NE használjon privát útválasztást.";
 
 /* No comment provided by engineer. */
-"Do NOT use SimpleX for emergency calls." = "NE használja a SimpleX-et segélyhívásokhoz.";
+"Do NOT use SimpleX for emergency calls." = "NE használja a SimpleXet segélyhívásokhoz.";
+
+/* No comment provided by engineer. */
+"Documents:" = "Dokumentumok:";
 
 /* No comment provided by engineer. */
 "Don't create address" = "Ne hozzon létre címet";
@@ -1773,13 +1912,19 @@
 "Don't enable" = "Ne engedélyezze";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Ne maradjon le a fontos üzenetekről.";
+
+/* alert action */
 "Don't show again" = "Ne mutasd újra";
 
+/* No comment provided by engineer. */
+"Done" = "Kész";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Visszafejlesztés és a csevegés megnyitása";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Letöltés";
 
 /* No comment provided by engineer. */
@@ -1807,7 +1952,7 @@
 "Downloading link details" = "Letöltési hivatkozás részletei";
 
 /* No comment provided by engineer. */
-"Duplicate display name!" = "Duplikált megjelenített név!";
+"Duplicate display name!" = "Duplikált megjelenítendő név!";
 
 /* integrity error chat item */
 "duplicate message" = "duplikált üzenet";
@@ -1828,7 +1973,7 @@
 "Edit" = "Szerkesztés";
 
 /* No comment provided by engineer. */
-"Edit group profile" = "A csoport profiljának szerkesztése";
+"Edit group profile" = "Csoportprofil szerkesztése";
 
 /* No comment provided by engineer. */
 "Enable" = "Engedélyezés";
@@ -1836,14 +1981,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Engedélyezés (felülírások megtartásával)";
 
-/* No comment provided by engineer. */
-"Enable automatic message deletion?" = "Automatikus üzenet törlés engedélyezése?";
+/* alert title */
+"Enable automatic message deletion?" = "Engedélyezi az automatikus üzenettörlést?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Kamera hozzáférés engedélyezése";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Flux engedélyezése";
+"Enable Flux in Network & servers settings for better metadata privacy." = "A Flux kiszolgálókat engedélyezheti a beállításokban, a „Hálózat és kiszolgálók” menüben, a metaadatok jobb védelme érdekében.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Engedélyezés az összes tag számára";
@@ -1852,7 +1997,7 @@
 "Enable in direct chats (BETA)!" = "Engedélyezés a közvetlen csevegésekben (BÉTA)!";
 
 /* No comment provided by engineer. */
-"Enable instant notifications?" = "Azonnali értesítések engedélyezése?";
+"Enable instant notifications?" = "Engedélyezi az azonnali értesítéseket?";
 
 /* No comment provided by engineer. */
 "Enable lock" = "Zárolás engedélyezése";
@@ -1861,13 +2006,13 @@
 "Enable notifications" = "Értesítések engedélyezése";
 
 /* No comment provided by engineer. */
-"Enable periodic notifications?" = "Időszakos értesítések engedélyezése?";
+"Enable periodic notifications?" = "Engedélyezi az időszakos értesítéseket?";
 
 /* No comment provided by engineer. */
 "Enable self-destruct" = "Önmegsemmisítés engedélyezése";
 
 /* set passcode view */
-"Enable self-destruct passcode" = "Önmegsemmisítő jelkód engedélyezése";
+"Enable self-destruct passcode" = "Önmegsemmisítő-jelkód engedélyezése";
 
 /* authentication reason */
 "Enable SimpleX Lock" = "SimpleX-zár bekapcsolása";
@@ -1882,10 +2027,10 @@
 "Enabled" = "Engedélyezve";
 
 /* No comment provided by engineer. */
-"Enabled for" = "Számukra engedélyezve:";
+"Enabled for" = "Számukra engedélyezve";
 
 /* enabled status */
-"enabled for contact" = "engedélyezve az ismerős számára";
+"enabled for contact" = "engedélyezve a partner számára";
 
 /* enabled status */
 "enabled for you" = "engedélyezve az Ön számára";
@@ -1894,7 +2039,7 @@
 "Encrypt" = "Titkosít";
 
 /* No comment provided by engineer. */
-"Encrypt database?" = "Adatbázis titkosítása?";
+"Encrypt database?" = "Titkosítja az adatbázist?";
 
 /* No comment provided by engineer. */
 "Encrypt local files" = "Helyi fájlok titkosítása";
@@ -1909,7 +2054,7 @@
 "Encrypted message or another event" = "Titkosított üzenet vagy más esemény";
 
 /* notification */
-"Encrypted message: app is stopped" = "Titkosított üzenet: az alkalmazás leállt";
+"Encrypted message: app is stopped" = "Titkosított üzenet: az alkalmazás megállt";
 
 /* notification */
 "Encrypted message: database error" = "Titkosított üzenet: adatbázishiba";
@@ -1936,25 +2081,28 @@
 "encryption ok" = "titkosítás rendben";
 
 /* chat item text */
-"encryption ok for %@" = "titkosítás rendben vele: %@";
+"encryption ok for %@" = "titkosítás rendben %@ számára";
 
 /* chat item text */
-"encryption re-negotiation allowed" = "titkosítás újraegyeztetés engedélyezve";
+"encryption re-negotiation allowed" = "a titkosítás újraegyeztetése engedélyezve van";
 
 /* chat item text */
-"encryption re-negotiation allowed for %@" = "titkosítás újraegyeztetés engedélyezve vele: %@";
+"encryption re-negotiation allowed for %@" = "a titkosítás újraegyeztetése engedélyezve van %@ számára";
 
 /* message decrypt error item */
-"Encryption re-negotiation error" = "Titkosítás újraegyeztetési hiba";
+"Encryption re-negotiation error" = "Hiba történt a titkosítás újraegyeztetésekor";
 
 /* No comment provided by engineer. */
-"Encryption re-negotiation failed." = "Sikertelen titkosítás-újraegyeztetés.";
+"Encryption re-negotiation failed." = "Nem sikerült a titkosítást újraegyeztetni.";
 
 /* chat item text */
-"encryption re-negotiation required" = "titkosítás újraegyeztetés szükséges";
+"encryption re-negotiation required" = "a titkosítás újraegyeztetése szükséges";
 
 /* chat item text */
-"encryption re-negotiation required for %@" = "titkosítás újraegyeztetés szükséges %@ számára";
+"encryption re-negotiation required for %@" = "a titkosítás újraegyeztetése szükséges %@ számára";
+
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "A titkosítás újraegyeztetése folyamatban van.";
 
 /* No comment provided by engineer. */
 "ended" = "befejeződött";
@@ -1966,31 +2114,31 @@
 "Enter correct passphrase." = "Adja meg a helyes jelmondatot.";
 
 /* No comment provided by engineer. */
-"Enter group name…" = "Csoportnév megadása…";
+"Enter group name…" = "Adja meg a csoport nevét…";
 
 /* No comment provided by engineer. */
-"Enter Passcode" = "Jelkód megadása";
+"Enter Passcode" = "Adja meg a jelkódot";
 
 /* No comment provided by engineer. */
-"Enter passphrase" = "Jelmondat megadása";
+"Enter passphrase" = "Adja meg a jelmondatot";
 
 /* No comment provided by engineer. */
-"Enter passphrase…" = "Jelmondat megadása…";
+"Enter passphrase…" = "Adja meg a jelmondatot…";
 
 /* No comment provided by engineer. */
-"Enter password above to show!" = "Jelszó megadása a megjelenítéshez!";
+"Enter password above to show!" = "Adja meg a jelszót fentebb a megjelenítéshez!";
 
 /* No comment provided by engineer. */
-"Enter server manually" = "Kiszolgáló megadása kézzel";
+"Enter server manually" = "Adja meg a kiszolgálót kézzel";
 
 /* No comment provided by engineer. */
 "Enter this device name…" = "Adja meg ennek az eszköznek a nevét…";
 
 /* placeholder */
-"Enter welcome message…" = "Üdvözlőüzenet megadása…";
+"Enter welcome message…" = "Adja meg az üdvözlőüzenetet…";
 
 /* placeholder */
-"Enter welcome message… (optional)" = "Üdvözlőüzenet megadása… (nem kötelező)";
+"Enter welcome message… (optional)" = "Adja meg az üdvözlőüzenetet… (nem kötelező)";
 
 /* No comment provided by engineer. */
 "Enter your name…" = "Adjon meg egy nevet…";
@@ -2002,204 +2150,233 @@
 "Error" = "Hiba";
 
 /* No comment provided by engineer. */
-"Error aborting address change" = "Hiba a cím megváltoztatásának megszakításakor";
+"Error aborting address change" = "Hiba történt a cím módosításának megszakításakor";
 
 /* alert title */
-"Error accepting conditions" = "Hiba a feltételek elfogadásakor";
+"Error accepting conditions" = "Hiba történt a feltételek elfogadásakor";
 
 /* No comment provided by engineer. */
-"Error accepting contact request" = "Hiba történt a kapcsolatkérés elfogadásakor";
-
-/* No comment provided by engineer. */
-"Error adding member(s)" = "Hiba a tag(ok) hozzáadásakor";
+"Error accepting contact request" = "Hiba történt a meghívási kérés elfogadásakor";
 
 /* alert title */
-"Error adding server" = "Hiba a kiszolgáló hozzáadásakor";
+"Error accepting member" = "Hiba a tag befogadásakor";
 
 /* No comment provided by engineer. */
-"Error changing address" = "Hiba a cím megváltoztatásakor";
-
-/* No comment provided by engineer. */
-"Error changing connection profile" = "Hiba a kapcsolati profilra való váltáskor";
-
-/* No comment provided by engineer. */
-"Error changing role" = "Hiba a szerepkör megváltoztatásakor";
-
-/* No comment provided by engineer. */
-"Error changing setting" = "Hiba a beállítás megváltoztatásakor";
-
-/* No comment provided by engineer. */
-"Error changing to incognito!" = "Hiba az inkognitóprofilra való váltáskor!";
-
-/* No comment provided by engineer. */
-"Error connecting to forwarding server %@. Please try later." = "Hiba a(z) %@ továbbító kiszolgálóhoz való kapcsolódáskor. Próbálja meg később.";
-
-/* No comment provided by engineer. */
-"Error creating address" = "Hiba a cím létrehozásakor";
-
-/* No comment provided by engineer. */
-"Error creating group" = "Hiba a csoport létrehozásakor";
-
-/* No comment provided by engineer. */
-"Error creating group link" = "Hiba a csoporthivatkozás létrehozásakor";
-
-/* No comment provided by engineer. */
-"Error creating member contact" = "Hiba az ismerőssel történő kapcsolat létrehozásában";
-
-/* No comment provided by engineer. */
-"Error creating message" = "Hiba az üzenet létrehozásakor";
-
-/* No comment provided by engineer. */
-"Error creating profile!" = "Hiba a profil létrehozásakor!";
-
-/* No comment provided by engineer. */
-"Error decrypting file" = "Hiba a fájl visszafejtésekor";
-
-/* No comment provided by engineer. */
-"Error deleting chat database" = "Hiba a csevegési adatbázis törlésekor";
-
-/* No comment provided by engineer. */
-"Error deleting chat!" = "Hiba a csevegés törlésekor!";
-
-/* No comment provided by engineer. */
-"Error deleting connection" = "Hiba a kapcsolat törlésekor";
-
-/* No comment provided by engineer. */
-"Error deleting database" = "Hiba az adatbázis törlésekor";
-
-/* No comment provided by engineer. */
-"Error deleting old database" = "Hiba a régi adatbázis törlésekor";
-
-/* No comment provided by engineer. */
-"Error deleting token" = "Hiba a token törlésekor";
-
-/* No comment provided by engineer. */
-"Error deleting user profile" = "Hiba a felhasználó-profil törlésekor";
-
-/* No comment provided by engineer. */
-"Error downloading the archive" = "Hiba az archívum letöltésekor";
-
-/* No comment provided by engineer. */
-"Error enabling delivery receipts!" = "Hiba a kézbesítési jelentések engedélyezésekor!";
-
-/* No comment provided by engineer. */
-"Error enabling notifications" = "Hiba az értesítések engedélyezésekor";
-
-/* No comment provided by engineer. */
-"Error encrypting database" = "Hiba az adatbázis titkosításakor";
-
-/* No comment provided by engineer. */
-"Error exporting chat database" = "Hiba a csevegési adatbázis exportálásakor";
-
-/* No comment provided by engineer. */
-"Error exporting theme: %@" = "Hiba a téma exportálásakor: %@";
-
-/* No comment provided by engineer. */
-"Error importing chat database" = "Hiba a csevegési adatbázis importálásakor";
-
-/* No comment provided by engineer. */
-"Error joining group" = "Hiba a csoporthoz való csatlakozáskor";
+"Error adding member(s)" = "Hiba történt a tag(ok) hozzáadásakor";
 
 /* alert title */
-"Error loading servers" = "Hiba a kiszolgálók betöltésekor";
+"Error adding server" = "Hiba történt a kiszolgáló hozzáadásakor";
 
 /* No comment provided by engineer. */
-"Error migrating settings" = "Hiba a beallítások átköltöztetésekor";
+"Error changing address" = "Hiba történt a cím módosításakor";
 
 /* No comment provided by engineer. */
-"Error opening chat" = "Hiba a csevegés megnyitásakor";
+"Error changing connection profile" = "Hiba történt a kapcsolati profilra való váltáskor";
+
+/* No comment provided by engineer. */
+"Error changing role" = "Hiba történt a szerepkör módosításakor";
+
+/* No comment provided by engineer. */
+"Error changing setting" = "Hiba történt a beállítás módosításakor";
+
+/* No comment provided by engineer. */
+"Error changing to incognito!" = "Hiba történt az inkognitóprofilra való váltáskor!";
+
+/* No comment provided by engineer. */
+"Error checking token status" = "Hiba történt a token állapotának ellenőrzésekor";
+
+/* No comment provided by engineer. */
+"Error connecting to forwarding server %@. Please try later." = "Hiba történt a(z) %@ továbbítókiszolgálóhoz való kapcsolódáskor. Próbálja meg később.";
+
+/* No comment provided by engineer. */
+"Error creating address" = "Hiba történt a cím létrehozásakor";
+
+/* No comment provided by engineer. */
+"Error creating group" = "Hiba történt a csoport létrehozásakor";
+
+/* No comment provided by engineer. */
+"Error creating group link" = "Hiba történt a csoporthivatkozás létrehozásakor";
 
 /* alert title */
-"Error receiving file" = "Hiba a fájl fogadásakor";
+"Error creating list" = "Hiba történt a lista létrehozásakor";
 
 /* No comment provided by engineer. */
-"Error reconnecting server" = "Hiba a kiszolgálóhoz való újrakapcsolódáskor";
+"Error creating member contact" = "Hiba történt a partnerrel történő kapcsolat létrehozásában";
 
 /* No comment provided by engineer. */
-"Error reconnecting servers" = "Hiba a kiszolgálókhoz való újrakapcsolódáskor";
+"Error creating message" = "Hiba történt az üzenet létrehozásakor";
 
 /* No comment provided by engineer. */
-"Error removing member" = "Hiba a tag eltávolításakor";
+"Error creating profile!" = "Hiba történt a profil létrehozásakor!";
 
 /* No comment provided by engineer. */
-"Error resetting statistics" = "Hiba a statisztikák visszaállításakor";
+"Error creating report" = "Hiba történt a jelentés létrehozásakor";
 
 /* No comment provided by engineer. */
-"Error saving group profile" = "Hiba a csoportprofil mentésekor";
+"Error decrypting file" = "Hiba történt a fájl visszafejtésekor";
 
 /* No comment provided by engineer. */
-"Error saving ICE servers" = "Hiba az ICE-kiszolgálók mentésekor";
-
-/* No comment provided by engineer. */
-"Error saving passcode" = "Hiba a jelkód mentésekor";
-
-/* No comment provided by engineer. */
-"Error saving passphrase to keychain" = "Hiba a jelmondat kulcstartóba történő mentésekor";
+"Error deleting chat database" = "Hiba történt a csevegési adatbázis törlésekor";
 
 /* alert title */
-"Error saving servers" = "Hiba a kiszolgálók mentésekor";
+"Error deleting chat with member" = "Hiba a taggal való csevegés törlésekor";
+
+/* No comment provided by engineer. */
+"Error deleting chat!" = "Hiba történt a csevegés törlésekor!";
+
+/* No comment provided by engineer. */
+"Error deleting connection" = "Hiba történt a kapcsolat törlésekor";
+
+/* No comment provided by engineer. */
+"Error deleting database" = "Hiba történt az adatbázis törlésekor";
+
+/* No comment provided by engineer. */
+"Error deleting old database" = "Hiba történt a régi adatbázis törlésekor";
+
+/* No comment provided by engineer. */
+"Error deleting token" = "Hiba történt a token törlésekor";
+
+/* No comment provided by engineer. */
+"Error deleting user profile" = "Hiba történt a felhasználói profil törlésekor";
+
+/* No comment provided by engineer. */
+"Error downloading the archive" = "Hiba történt az archívum letöltésekor";
+
+/* No comment provided by engineer. */
+"Error enabling delivery receipts!" = "Hiba történt a kézbesítési jelentések engedélyezésekor!";
+
+/* No comment provided by engineer. */
+"Error enabling notifications" = "Hiba történt az értesítések engedélyezésekor";
+
+/* No comment provided by engineer. */
+"Error encrypting database" = "Hiba történt az adatbázis titkosításakor";
+
+/* No comment provided by engineer. */
+"Error exporting chat database" = "Hiba történt a csevegési adatbázis exportálásakor";
+
+/* No comment provided by engineer. */
+"Error exporting theme: %@" = "Hiba történt a téma exportálásakor: %@";
+
+/* No comment provided by engineer. */
+"Error importing chat database" = "Hiba történt a csevegési adatbázis importálásakor";
+
+/* No comment provided by engineer. */
+"Error joining group" = "Hiba történt a csoporthoz való csatlakozáskor";
+
+/* alert title */
+"Error loading servers" = "Hiba történt a kiszolgálók betöltésekor";
+
+/* No comment provided by engineer. */
+"Error migrating settings" = "Hiba történt a beállítások átköltöztetésekor";
+
+/* No comment provided by engineer. */
+"Error opening chat" = "Hiba történt a csevegés megnyitásakor";
+
+/* alert title */
+"Error receiving file" = "Hiba történt a fájl fogadásakor";
+
+/* No comment provided by engineer. */
+"Error reconnecting server" = "Hiba történt a kiszolgálóhoz való újrakapcsolódáskor";
+
+/* No comment provided by engineer. */
+"Error reconnecting servers" = "Hiba történt a kiszolgálókhoz való újrakapcsolódáskor";
+
+/* alert title */
+"Error registering for notifications" = "Hiba történt az értesítések regisztrálásakor";
+
+/* alert title */
+"Error removing member" = "Hiba történt a tag eltávolításakor";
+
+/* alert title */
+"Error reordering lists" = "Hiba történt a listák újrarendezésekor";
+
+/* No comment provided by engineer. */
+"Error resetting statistics" = "Hiba történt a statisztikák visszaállításakor";
+
+/* alert title */
+"Error saving chat list" = "Hiba történt a csevegési lista mentésekor";
+
+/* No comment provided by engineer. */
+"Error saving group profile" = "Hiba történt a csoportprofil mentésekor";
+
+/* No comment provided by engineer. */
+"Error saving ICE servers" = "Hiba történt az ICE-kiszolgálók mentésekor";
+
+/* No comment provided by engineer. */
+"Error saving passcode" = "Hiba történt a jelkód mentésekor";
+
+/* No comment provided by engineer. */
+"Error saving passphrase to keychain" = "Hiba történt a jelmondat kulcstartóba történő mentésekor";
+
+/* alert title */
+"Error saving servers" = "Hiba történt a kiszolgálók mentésekor";
 
 /* when migrating */
-"Error saving settings" = "Hiba a beállítások mentésekor";
+"Error saving settings" = "Hiba történt a beállítások mentésekor";
 
 /* No comment provided by engineer. */
-"Error saving user password" = "Hiba a felhasználói jelszó mentésekor";
+"Error saving user password" = "Hiba történt a felhasználó jelszavának mentésekor";
 
 /* No comment provided by engineer. */
-"Error scanning code: %@" = "Hiba a kód beolvasásakor: %@";
+"Error scanning code: %@" = "Hiba történt a kód beolvasásakor: %@";
 
 /* No comment provided by engineer. */
-"Error sending email" = "Hiba az e-mail küldésekor";
+"Error sending email" = "Hiba történt az e-mail elküldésekor";
 
 /* No comment provided by engineer. */
 "Error sending member contact invitation" = "Hiba történt a tag kapcsolatfelvételi meghívójának elküldésekor";
 
 /* No comment provided by engineer. */
-"Error sending message" = "Hiba az üzenet küldésekor";
+"Error sending message" = "Hiba történt az üzenet elküldésekor";
 
 /* No comment provided by engineer. */
 "Error setting delivery receipts!" = "Hiba történt a kézbesítési jelentések beállításakor!";
 
 /* No comment provided by engineer. */
-"Error starting chat" = "Hiba a csevegés elindításakor";
+"Error starting chat" = "Hiba történt a csevegés elindításakor";
 
 /* No comment provided by engineer. */
-"Error stopping chat" = "Hiba a csevegés megállításakor";
+"Error stopping chat" = "Hiba történt a csevegés megállításakor";
 
 /* No comment provided by engineer. */
-"Error switching profile" = "Hiba a profilváltáskor";
+"Error switching profile" = "Hiba történt a profilváltáskor";
 
 /* alertTitle */
-"Error switching profile!" = "Hiba a profilváltásakor!";
+"Error switching profile!" = "Hiba történt a profilváltáskor!";
 
 /* No comment provided by engineer. */
-"Error synchronizing connection" = "Hiba a kapcsolat szinkronizálásakor";
+"Error synchronizing connection" = "Hiba történt a kapcsolat szinkronizálásakor";
 
 /* No comment provided by engineer. */
-"Error updating group link" = "Hiba a csoporthivatkozás frissítésekor";
+"Error testing server connection" = "Hiba történt a kiszolgáló kapcsolatának tesztelésekor";
 
 /* No comment provided by engineer. */
-"Error updating message" = "Hiba az üzenet frissítésekor";
+"Error updating group link" = "Hiba történt a csoporthivatkozás frissítésekor";
+
+/* No comment provided by engineer. */
+"Error updating message" = "Hiba történt az üzenet frissítésekor";
 
 /* alert title */
-"Error updating server" = "Hiba a kiszolgáló frissítésekor";
+"Error updating server" = "Hiba történt a kiszolgáló frissítésekor";
 
 /* No comment provided by engineer. */
 "Error updating settings" = "Hiba történt a beállítások frissítésekor";
 
 /* No comment provided by engineer. */
-"Error updating user privacy" = "Hiba a felhasználói adatvédelem frissítésekor";
+"Error updating user privacy" = "Hiba történt a felhasználói adatvédelem frissítésekor";
 
 /* No comment provided by engineer. */
-"Error uploading the archive" = "Hiba az archívum feltöltésekor";
+"Error uploading the archive" = "Hiba történt az archívum feltöltésekor";
 
 /* No comment provided by engineer. */
-"Error verifying passphrase:" = "Hiba a jelmondat hitelesítésekor:";
+"Error verifying passphrase:" = "Hiba történt a jelmondat hitelesítésekor:";
 
 /* No comment provided by engineer. */
 "Error: " = "Hiba: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Hiba: %@";
 
 /* No comment provided by engineer. */
@@ -2217,9 +2394,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Akkor is, ha le van tiltva a beszélgetésben.";
 
-/* No comment provided by engineer. */
-"event happened" = "esemény történt";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Kilépés mentés nélkül";
 
@@ -2229,6 +2403,9 @@
 /* No comment provided by engineer. */
 "expired" = "lejárt";
 
+/* token status text */
+"Expired" = "Lejárt";
+
 /* No comment provided by engineer. */
 "Export database" = "Adatbázis exportálása";
 
@@ -2253,29 +2430,41 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Gyors és nem kell várni, amíg a feladó online lesz!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Gyorsabb csoporttörlés.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Gyorsabb csatlakozás és megbízhatóbb üzenetkézbesítés.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Gyorsabb üzenetküldés.";
+
 /* swipe action */
 "Favorite" = "Kedvenc";
 
 /* No comment provided by engineer. */
+"Favorites" = "Kedvencek";
+
+/* file error alert title */
 "File error" = "Fájlhiba";
 
 /* alert message */
 "File errors:\n%@" = "Fájlhiba:\n%@";
 
 /* file error text */
-"File not found - most likely file was deleted or cancelled." = "A fájl nem található - valószínűleg a fájlt törölték vagy visszavonták.";
+"File is blocked by server operator:\n%@." = "A kiszolgáló üzemeltetője letiltotta a fájlt:\n%@.";
 
 /* file error text */
-"File server error: %@" = "Fájlkiszolgáló hiba: %@";
+"File not found - most likely file was deleted or cancelled." = "A fájl nem található – valószínűleg a fájlt törölték vagy visszavonták.";
+
+/* file error text */
+"File server error: %@" = "Fájlkiszolgáló-hiba: %@";
 
 /* No comment provided by engineer. */
-"File status" = "Fájlállapot";
+"File status" = "Fájl állapota";
 
 /* copied message info */
-"File status: %@" = "Fájlállapot: %@";
+"File status: %@" = "Fájl állapota: %@";
 
 /* No comment provided by engineer. */
 "File will be deleted from servers." = "A fájl törölve lesz a kiszolgálókról.";
@@ -2299,7 +2488,7 @@
 "Files and media" = "Fájlok és médiatartalmak";
 
 /* No comment provided by engineer. */
-"Files and media are prohibited." = "A fájlok- és a médiatartalmak le vannak tiltva ebben a csoportban.";
+"Files and media are prohibited." = "A fájlok- és a médiatartalmak küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Files and media not allowed" = "A fájlok- és médiatartalmak nincsenek engedélyezve";
@@ -2335,13 +2524,13 @@
 "Fix encryption after restoring backups." = "Titkosítás javítása az adatmentések helyreállítása után.";
 
 /* No comment provided by engineer. */
-"Fix not supported by contact" = "Ismerős általi javítás nem támogatott";
+"Fix not supported by contact" = "Partner általi javítás nem támogatott";
 
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "Csoporttag általi javítás nem támogatott";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "a metaadatok jobb védelme érdekében.";
+"For all moderators" = "Az összes moderátor számára";
 
 /* servers error */
 "For chat profile %@:" = "A(z) %@ nevű csevegési profilhoz:";
@@ -2350,7 +2539,10 @@
 "For console" = "Konzolhoz";
 
 /* No comment provided by engineer. */
-"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Például, ha az Ön ismerőse egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.";
+"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Például, ha a partnere egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, akkor az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.";
+
+/* No comment provided by engineer. */
+"For me" = "Csak magamnak";
 
 /* No comment provided by engineer. */
 "For private routing" = "A privát útválasztáshoz";
@@ -2362,7 +2554,7 @@
 "Forward" = "Továbbítás";
 
 /* alert title */
-"Forward %d message(s)?" = "%d üzenet továbbítása?";
+"Forward %d message(s)?" = "Továbbít %d üzenetet?";
 
 /* No comment provided by engineer. */
 "Forward and save messages" = "Üzenetek továbbítása és mentése";
@@ -2371,7 +2563,7 @@
 "Forward messages" = "Üzenetek továbbítása";
 
 /* alert message */
-"Forward messages without files?" = "Üzenetek továbbítása fájlok nélkül?";
+"Forward messages without files?" = "Továbbítja az üzeneteket fájlok nélkül?";
 
 /* No comment provided by engineer. */
 "Forward up to 20 messages at once." = "Legfeljebb 20 üzenet egyszerre való továbbítása.";
@@ -2383,25 +2575,25 @@
 "Forwarded" = "Továbbított";
 
 /* No comment provided by engineer. */
-"Forwarded from" = "Továbbítva innen:";
+"Forwarded from" = "Továbbítva innen";
 
 /* No comment provided by engineer. */
 "Forwarding %lld messages" = "%lld üzenet továbbítása";
 
 /* No comment provided by engineer. */
-"Forwarding server %@ failed to connect to destination server %@. Please try later." = "A(z) %@ továbbító-kiszolgáló nem tudott csatlakozni a(z) %@ célkiszolgálóhoz. Próbálja meg később.";
+"Forwarding server %@ failed to connect to destination server %@. Please try later." = "A(z) %@ továbbítókiszolgáló nem tudott kapcsolódni a(z) %@ célkiszolgálóhoz. Próbálja meg később.";
 
 /* No comment provided by engineer. */
-"Forwarding server address is incompatible with network settings: %@." = "A továbbító-kiszolgáló címe nem kompatibilis a hálózati beállításokkal: %@.";
+"Forwarding server address is incompatible with network settings: %@." = "A továbbítókiszolgáló címe nem kompatibilis a hálózati beállításokkal: %@.";
 
 /* No comment provided by engineer. */
-"Forwarding server version is incompatible with network settings: %@." = "A továbbító-kiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %@.";
+"Forwarding server version is incompatible with network settings: %@." = "A továbbítókiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %@.";
 
 /* snd error text */
-"Forwarding server: %@\nDestination server error: %@" = "Továbbító-kiszolgáló: %1$@\nCélkiszolgáló hiba:%2$@";
+"Forwarding server: %@\nDestination server error: %@" = "Továbbítókiszolgáló: %1$@\nCélkiszolgáló-hiba: %2$@";
 
 /* snd error text */
-"Forwarding server: %@\nError: %@" = "Továbbító-kiszolgáló: %1$@\nHiba: %2$@";
+"Forwarding server: %@\nError: %@" = "Továbbítókiszolgáló: %1$@\nHiba: %2$@";
 
 /* No comment provided by engineer. */
 "Found desktop" = "Megtalált számítógép";
@@ -2416,14 +2608,17 @@
 "Full name (optional)" = "Teljes név (nem kötelező)";
 
 /* No comment provided by engineer. */
-"Fully decentralized – visible only to members." = "Teljesen decentralizált - csak a tagok számára látható.";
+"Fully decentralized – visible only to members." = "Teljesen decentralizált – csak a tagok számára látható.";
 
 /* No comment provided by engineer. */
-"Fully re-implemented - work in background!" = "Teljesen újra implementálva - háttérben történő működés!";
+"Fully re-implemented - work in background!" = "Teljesen újra implementálva – háttérben történő működés!";
 
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Tovább csökkentett akkumulátor-használat";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Kapjon értesítést, ha megemlítik.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIF-ek és matricák";
 
@@ -2449,7 +2644,7 @@
 "Group display name" = "A csoport megjelenített neve";
 
 /* No comment provided by engineer. */
-"Group full name (optional)" = "Csoport teljes neve (nem kötelező)";
+"Group full name (optional)" = "A csoport teljes neve (nem kötelező)";
 
 /* No comment provided by engineer. */
 "Group image" = "Csoport profilképe";
@@ -2463,6 +2658,9 @@
 /* No comment provided by engineer. */
 "Group invitation is no longer valid, it was removed by sender." = "A csoportmeghívó már nem érvényes, a küldője eltávolította.";
 
+/* No comment provided by engineer. */
+"group is deleted" = "csoport törölve";
+
 /* No comment provided by engineer. */
 "Group link" = "Csoporthivatkozás";
 
@@ -2473,7 +2671,7 @@
 "Group message:" = "Csoport üzenet:";
 
 /* No comment provided by engineer. */
-"Group moderation" = "Csoport moderáció";
+"Group moderation" = "Csoport moderálása";
 
 /* No comment provided by engineer. */
 "Group preferences" = "Csoportbeállítások";
@@ -2491,14 +2689,20 @@
 "Group welcome message" = "A csoport üdvözlőüzenete";
 
 /* No comment provided by engineer. */
-"Group will be deleted for all members - this cannot be undone!" = "A csoport törlésre kerül az összes tag számára - ez a művelet nem vonható vissza!";
+"Group will be deleted for all members - this cannot be undone!" = "A csoport törölve lesz az összes tag számára – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
-"Group will be deleted for you - this cannot be undone!" = "A csoport törlésre kerül az Ön számára - ez a művelet nem vonható vissza!";
+"Group will be deleted for you - this cannot be undone!" = "A csoport törölve lesz az Ön számára – ez a művelet nem vonható vissza!";
+
+/* No comment provided by engineer. */
+"Groups" = "Csoportok";
 
 /* No comment provided by engineer. */
 "Help" = "Súgó";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Segítsen az adminisztrátoroknak a csoportjaik moderálásában.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Se név, se üzenet";
 
@@ -2518,13 +2722,13 @@
 "Hide profile" = "Profil elrejtése";
 
 /* No comment provided by engineer. */
-"Hide:" = "Elrejtés:";
+"Hide:" = "Elrejtve:";
 
 /* No comment provided by engineer. */
 "History" = "Előzmények";
 
 /* No comment provided by engineer. */
-"History is not sent to new members." = "Az előzmények nem kerülnek elküldésre az új tagok számára.";
+"History is not sent to new members." = "Az előzmények nem lesznek elküldve az új tagok számára.";
 
 /* time unit */
 "hours" = "óra";
@@ -2535,6 +2739,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Hogyan segíti az adatvédelmet";
 
+/* alert button */
+"How it works" = "Hogyan működik";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Hogyan működik a SimpleX";
 
@@ -2542,10 +2749,10 @@
 "How to" = "Hogyan";
 
 /* No comment provided by engineer. */
-"How to use it" = "Hogyan használja";
+"How to use it" = "Használati útmutató";
 
 /* No comment provided by engineer. */
-"How to use your servers" = "Saját kiszolgálók használata";
+"How to use your servers" = "Hogyan használja a saját kiszolgálóit";
 
 /* No comment provided by engineer. */
 "Hungarian interface" = "Magyar kezelőfelület";
@@ -2557,13 +2764,13 @@
 "If you can't meet in person, show QR code in a video call, or share the link." = "Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.";
 
 /* No comment provided by engineer. */
-"If you enter this passcode when opening the app, all app data will be irreversibly removed!" = "Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen eltávolításra kerül!";
+"If you enter this passcode when opening the app, all app data will be irreversibly removed!" = "Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen el lesz távolítva!";
 
 /* No comment provided by engineer. */
-"If you enter your self-destruct passcode while opening the app:" = "Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:";
+"If you enter your self-destruct passcode while opening the app:" = "Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő-jelkódot:";
 
 /* No comment provided by engineer. */
-"If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." = "Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).";
+"If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." = "Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor fel lesz ajánlva az adatbázis átköltöztetése).";
 
 /* No comment provided by engineer. */
 "Ignore" = "Mellőzés";
@@ -2578,13 +2785,13 @@
 "Immediately" = "Azonnal";
 
 /* No comment provided by engineer. */
-"Immune to spam" = "Spam és visszaélések elleni védelem";
+"Immune to spam" = "Védett a kéretlen tartalommal szemben";
 
 /* No comment provided by engineer. */
 "Import" = "Importálás";
 
 /* No comment provided by engineer. */
-"Import chat database?" = "Csevegési adatbázis importálása?";
+"Import chat database?" = "Importálja a csevegési adatbázist?";
 
 /* No comment provided by engineer. */
 "Import database" = "Adatbázis importálása";
@@ -2614,7 +2821,7 @@
 "In order to continue, chat should be stopped." = "A folytatáshoz a csevegést meg kell szakítani.";
 
 /* No comment provided by engineer. */
-"In reply to" = "Válasz neki";
+"In reply to" = "Válaszul erre";
 
 /* No comment provided by engineer. */
 "In-call sounds" = "Bejövő hívás csengőhangja";
@@ -2622,6 +2829,12 @@
 /* No comment provided by engineer. */
 "inactive" = "inaktív";
 
+/* report reason */
+"Inappropriate content" = "Kifogásolt tartalom";
+
+/* report reason */
+"Inappropriate profile" = "Kifogásolt profil";
+
 /* No comment provided by engineer. */
 "Incognito" = "Inkognitó";
 
@@ -2632,7 +2845,7 @@
 "Incognito mode" = "Inkognitómód";
 
 /* No comment provided by engineer. */
-"Incognito mode protects your privacy by using a new random profile for each contact." = "Az inkognitómód védi személyes adatait azáltal, hogy az összes ismerőséhez új, véletlenszerű profilt használ.";
+"Incognito mode protects your privacy by using a new random profile for each contact." = "Az inkognitómód úgy védi a személyes adatait, hogy az összes partneréhez új, véletlenszerű profilt használ.";
 
 /* chat list item description */
 "incognito via contact address link" = "inkognitó a kapcsolattartási címhivatkozáson keresztül";
@@ -2641,7 +2854,7 @@
 "incognito via group link" = "inkognitó a csoporthivatkozáson keresztül";
 
 /* chat list item description */
-"incognito via one-time link" = "inkognitó egy egyszer használható meghívó-hivatkozáson keresztül";
+"incognito via one-time link" = "inkognitó egy egyszer használható meghívón keresztül";
 
 /* notification */
 "Incoming audio call" = "Bejövő hanghívás";
@@ -2677,10 +2890,10 @@
 "Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)" = "A [SimpleX Chat terminálhoz] telepítése (https://github.com/simplex-chat/simplex-chat)";
 
 /* No comment provided by engineer. */
-"Instant" = "Azonnal";
+"Instant" = "Azonnali";
 
 /* No comment provided by engineer. */
-"Instant push notifications will be hidden!\n" = "Az azonnali push-értesítések elrejtésre kerülnek!\n";
+"Instant push notifications will be hidden!\n" = "Az azonnali push-értesítések el lesznek rejtve!\n";
 
 /* No comment provided by engineer. */
 "Interface" = "Kezelőfelület";
@@ -2688,6 +2901,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Kezelőfelület színei";
 
+/* token status text */
+"Invalid" = "Érvénytelen";
+
+/* token status text */
+"Invalid (bad token)" = "Érvénytelen (hibás token)";
+
+/* token status text */
+"Invalid (expired)" = "Érvénytelen (lejárt)";
+
+/* token status text */
+"Invalid (unregistered)" = "Érvénytelen (nincs regisztrálva)";
+
+/* token status text */
+"Invalid (wrong topic)" = "Érvénytelen (rossz topic)";
+
 /* invalid chat data */
 "invalid chat" = "érvénytelen csevegés";
 
@@ -2752,16 +2980,16 @@
 "invited %@" = "meghívta őt: %@";
 
 /* chat list item title */
-"invited to connect" = "meghívta, hogy csatlakozzon";
+"invited to connect" = "Függőben lévő meghívó";
 
 /* rcv group event chat item */
-"invited via your group link" = "meghíva az Ön csoporthivatkozásán keresztül";
+"invited via your group link" = "meghíva a saját csoporthivatkozásán keresztül";
 
 /* No comment provided by engineer. */
-"iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "Az iOS kulcstartó a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.";
+"iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "Az iOS kulcstartó a jelmondat biztonságos tárolására szolgál – lehetővé teszi a push-értesítések fogadását.";
 
 /* No comment provided by engineer. */
-"iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications." = "Az iOS kulcstartó az alkalmazás újraindítása, vagy a jelmondat módosítása után a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.";
+"iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications." = "Az iOS kulcstartó biztonságosan fogja tárolni a jelmondatot az alkalmazás újraindítása, vagy a jelmondat módosítása után – lehetővé teszi a push-értesítések fogadását.";
 
 /* No comment provided by engineer. */
 "IP address" = "IP-cím";
@@ -2773,16 +3001,16 @@
 "Irreversible message deletion is prohibited in this chat." = "Az üzenetek végleges törlése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Irreversible message deletion is prohibited." = "Az üzenetek végleges törlése le van tiltva ebben a csoportban.";
+"Irreversible message deletion is prohibited." = "Az üzenetek végleges törlése le van tiltva.";
 
 /* No comment provided by engineer. */
-"It allows having many anonymous connections without any shared data between them in a single chat profile." = "Lehetővé teszi, hogy egyetlen csevegőprofilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.";
+"It allows having many anonymous connections without any shared data between them in a single chat profile." = "Lehetővé teszi, hogy egyetlen csevegési profilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.";
 
 /* No comment provided by engineer. */
-"It can happen when you or your connection used the old database backup." = "Ez akkor fordulhat elő, ha Ön vagy az ismerőse régi adatbázis biztonsági mentést használt.";
+"It can happen when you or your connection used the old database backup." = "Ez akkor fordulhat elő, ha Ön vagy a partnere egy régi adatbázis biztonsági mentését használta.";
 
 /* No comment provided by engineer. */
-"It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Ez akkor fordulhat elő, ha:\n1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.\n2. Az üzenet visszafejtése sikertelen volt, mert vagy az ismerőse régebbi adatbázis biztonsági mentést használt.\n3. A kapcsolat sérült.";
+"It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Ez akkor fordulhat elő, ha:\n1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.\n2. Nem sikerült az üzenetet visszafejteni, mert Ön, vagy a partnere egy régi adatbázis biztonsági mentését használta.\n3. A kapcsolat sérült.";
 
 /* No comment provided by engineer. */
 "It protects your IP address and connections." = "Védi az IP-címét és a kapcsolatait.";
@@ -2803,7 +3031,7 @@
 "Join" = "Csatlakozás";
 
 /* No comment provided by engineer. */
-"join as %@" = "csatlakozás mint: %@";
+"join as %@" = "csatlakozás mint %@";
 
 /* No comment provided by engineer. */
 "Join group" = "Csatlakozás csoporthoz";
@@ -2821,13 +3049,13 @@
 "Join with current profile" = "Csatlakozás a jelenlegi profillal";
 
 /* No comment provided by engineer. */
-"Join your group?\nThis is your link for group %@!" = "Csatlakozik a csoportjához?\nEz az Ön hivatkozása a(z) %@ nevű csoporthoz!";
+"Join your group?\nThis is your link for group %@!" = "Csatlakozik a csoportjához?\nEz a saját hivatkozása a(z) %@ nevű csoporthoz!";
 
 /* No comment provided by engineer. */
 "Joining group" = "Csatlakozás a csoporthoz";
 
 /* alert action */
-"Keep" = "Megtart";
+"Keep" = "Megtartás";
 
 /* No comment provided by engineer. */
 "Keep conversation" = "Beszélgetés megtartása";
@@ -2836,7 +3064,7 @@
 "Keep the app open to use it from desktop" = "A számítógépről való használathoz tartsd nyitva az alkalmazást";
 
 /* alert title */
-"Keep unused invitation?" = "Fel nem használt meghívó megtartása?";
+"Keep unused invitation?" = "Megtartja a fel nem használt meghívót?";
 
 /* No comment provided by engineer. */
 "Keep your connections" = "Kapcsolatok megtartása";
@@ -2860,13 +3088,13 @@
 "Leave chat" = "Csevegés elhagyása";
 
 /* No comment provided by engineer. */
-"Leave chat?" = "Csevegés elhagyása?";
+"Leave chat?" = "Elhagyja a csevegést?";
 
 /* No comment provided by engineer. */
 "Leave group" = "Csoport elhagyása";
 
 /* No comment provided by engineer. */
-"Leave group?" = "Csoport elhagyása?";
+"Leave group?" = "Elhagyja a csoportot?";
 
 /* rcv group event chat item */
 "left" = "elhagyta a csoportot";
@@ -2889,6 +3117,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Társított számítógépek";
 
+/* swipe action */
+"List" = "Lista";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "Az összes lista nevének és emodzsijának különbözőnek kell lennie.";
+
+/* No comment provided by engineer. */
+"List name..." = "Lista neve…";
+
 /* No comment provided by engineer. */
 "LIVE" = "ÉLŐ";
 
@@ -2917,7 +3154,7 @@
 "Make profile private!" = "Tegye priváttá a profilját!";
 
 /* No comment provided by engineer. */
-"Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." = "Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.";
+"Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." = "Győződjön meg arról, hogy a megadott WebRTC ICE-kiszolgálók címei megfelelő formátumúak, soronként elkülönítettek, és nincsenek duplikálva.";
 
 /* No comment provided by engineer. */
 "Mark deleted for everyone" = "Jelölje meg az összes tag számára töröltként";
@@ -2938,7 +3175,7 @@
 "Max 30 seconds, received instantly." = "Max. 30 másodperc, azonnal érkezett.";
 
 /* No comment provided by engineer. */
-"Media & file servers" = "Média és fájlkiszolgálók";
+"Media & file servers" = "Média- és fájlkiszolgálók";
 
 /* blur media */
 "Medium" = "Közepes";
@@ -2950,49 +3187,67 @@
 "Member" = "Tag";
 
 /* profile update event chat item */
-"member %@ changed to %@" = "%1$@ megváltoztatta a nevét erre: %2$@";
+"member %@ changed to %@" = "%1$@ a következőre módosította a nevét: %2$@";
+
+/* No comment provided by engineer. */
+"Member admission" = "Tagbefogadás";
 
 /* rcv group event chat item */
 "member connected" = "kapcsolódott";
 
+/* No comment provided by engineer. */
+"member has old version" = "a tag régi verziót használ";
+
 /* item status text */
 "Member inactive" = "Inaktív tag";
 
-/* No comment provided by engineer. */
-"Member role will be changed to \"%@\". All chat members will be notified." = "A tag szerepeköre meg fog változni a következőre: \"%@\". A csevegés tagjai értesítést fognak kapni.";
+/* chat feature */
+"Member reports" = "Tagok jelentései";
 
 /* No comment provided by engineer. */
-"Member role will be changed to \"%@\". All group members will be notified." = "A tag szerepköre meg fog változni erre: „%@”. A csoportban az összes tag értesítve lesz.";
+"Member role will be changed to \"%@\". All chat members will be notified." = "A tag szerepköre a következőre fog módosulni: „%@”. A csevegés összes tagja értesítést fog kapni.";
 
 /* No comment provided by engineer. */
-"Member role will be changed to \"%@\". The member will receive a new invitation." = "A tag szerepköre meg fog változni erre: „%@”. A tag új meghívást fog kapni.";
+"Member role will be changed to \"%@\". All group members will be notified." = "A tag szerepköre a következőre fog módosulni: „%@”. A csoport az összes tagja értesítést fog kapni.";
 
 /* No comment provided by engineer. */
-"Member will be removed from chat - this cannot be undone!" = "A tag el lesz távolítva a csevegésből - ezt a műveletet nem lehet visszavonni!";
+"Member role will be changed to \"%@\". The member will receive a new invitation." = "A tag szerepköre a következőre fog módosulni: „%@”. A tag új meghívást fog kapni.";
 
 /* No comment provided by engineer. */
-"Member will be removed from group - this cannot be undone!" = "A tag eltávolítása a csoportból - ez a művelet nem vonható vissza!";
+"Member will be removed from chat - this cannot be undone!" = "A tag el lesz távolítva a csevegésből – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
-"Members can add message reactions." = "Csoporttagok üzenetreakciókat adhatnak hozzá.";
+"Member will be removed from group - this cannot be undone!" = "A tag el lesz távolítva a csoportból – ez a művelet nem vonható vissza!";
+
+/* alert message */
+"Member will join the group, accept member?" = "A tag csatlakozni akar a csoporthoz, befogadja a tagot?";
 
 /* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "A csoport tagjai véglegesen törölhetik az elküldött üzeneteiket. (24 óra)";
+"Members can add message reactions." = "A tagok reakciókat adhatnak hozzá az üzenetekhez.";
 
 /* No comment provided by engineer. */
-"Members can send direct messages." = "A csoport tagjai küldhetnek egymásnak közvetlen üzeneteket.";
+"Members can irreversibly delete sent messages. (24 hours)" = "A tagok véglegesen törölhetik az elküldött üzeneteiket. (24 óra)";
 
 /* No comment provided by engineer. */
-"Members can send disappearing messages." = "A csoport tagjai küldhetnek eltűnő üzeneteket.";
+"Members can report messsages to moderators." = "A tagok jelenthetik az üzeneteket a moderátorok felé.";
 
 /* No comment provided by engineer. */
-"Members can send files and media." = "A csoport tagjai küldhetnek fájlokat és médiatartalmakat.";
+"Members can send direct messages." = "A tagok küldhetnek egymásnak közvetlen üzeneteket.";
 
 /* No comment provided by engineer. */
-"Members can send SimpleX links." = "A csoport tagjai küldhetnek SimpleX-hivatkozásokat.";
+"Members can send disappearing messages." = "A tagok küldhetnek eltűnő üzeneteket.";
 
 /* No comment provided by engineer. */
-"Members can send voice messages." = "A csoport tagjai küldhetnek hangüzeneteket.";
+"Members can send files and media." = "A tagok küldhetnek fájlokat és médiatartalmakat.";
+
+/* No comment provided by engineer. */
+"Members can send SimpleX links." = "A tagok küldhetnek SimpleX-hivatkozásokat.";
+
+/* No comment provided by engineer. */
+"Members can send voice messages." = "A tagok küldhetnek hangüzeneteket.";
+
+/* No comment provided by engineer. */
+"Mention members 👋" = "Tagok említése 👋";
 
 /* No comment provided by engineer. */
 "Menus" = "Menük";
@@ -3019,16 +3274,16 @@
 "Message may be delivered later if member becomes active." = "Az üzenet később is kézbesíthető, ha a tag aktívvá válik.";
 
 /* No comment provided by engineer. */
-"Message queue info" = "Üzenet-sorbaállítási információ";
+"Message queue info" = "Üzenetsorbaállítási információ";
 
 /* chat feature */
 "Message reactions" = "Üzenetreakciók";
 
 /* No comment provided by engineer. */
-"Message reactions are prohibited in this chat." = "Az üzenetreakciók küldése le van tiltva ebben a csevegésben.";
+"Message reactions are prohibited in this chat." = "A reakciók hozzáadása az üzenetekhez le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Message reactions are prohibited." = "Az üzenetreakciók küldése le van tiltva ebben a csoportban.";
+"Message reactions are prohibited." = "A reakciók hozzáadása az üzenetekhez le van tiltva.";
 
 /* notification */
 "message received" = "üzenet érkezett";
@@ -3040,16 +3295,16 @@
 "Message servers" = "Üzenetkiszolgálók";
 
 /* No comment provided by engineer. */
-"Message shape" = "Üzenetbuborék formája";
+"Message shape" = "Üzenetbuborék alakja";
 
 /* No comment provided by engineer. */
 "Message source remains private." = "Az üzenet forrása titokban marad.";
 
 /* No comment provided by engineer. */
-"Message status" = "Üzenetállapot";
+"Message status" = "Üzenet állapota";
 
 /* copied message info */
-"Message status: %@" = "Üzenetállapot: %@";
+"Message status: %@" = "Üzenet állapota: %@";
 
 /* No comment provided by engineer. */
 "Message text" = "Név és üzenet";
@@ -3064,7 +3319,10 @@
 "Messages & files" = "Üzenetek és fájlok";
 
 /* No comment provided by engineer. */
-"Messages from %@ will be shown!" = "A(z) %@ által írt üzenetek megjelennek!";
+"Messages from %@ will be shown!" = "%@ összes üzenete meg fog jelenni!";
+
+/* alert message */
+"Messages in this chat will never be deleted." = "Az ebben a csevegésben lévő üzenetek soha nem lesznek törölve.";
 
 /* No comment provided by engineer. */
 "Messages received" = "Fogadott üzenetek";
@@ -3073,13 +3331,13 @@
 "Messages sent" = "Elküldött üzenetek";
 
 /* alert message */
-"Messages were deleted after you selected them." = "Az üzeneteket törölték miután kiválasztotta őket.";
+"Messages were deleted after you selected them." = "Az üzeneteket törölték miután kijelölte őket.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.";
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzenetek, a fájlok és a hívások **végpontok közötti titkosítással**, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzeneteket, fájlokat és hívásokat **végpontok közötti kvantumrezisztens titkosítással**, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.";
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Az üzenetek, a fájlok és a hívások **végpontok közötti kvantumbiztos titkosítással**, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.";
 
 /* No comment provided by engineer. */
 "Migrate device" = "Eszköz átköltöztetése";
@@ -3106,7 +3364,7 @@
 "Migration complete" = "Átköltöztetés befejezve";
 
 /* No comment provided by engineer. */
-"Migration error:" = "Átköltöztetés hiba:";
+"Migration error:" = "Átköltöztetési hiba:";
 
 /* No comment provided by engineer. */
 "Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." = "Sikertelen átköltöztetés. Koppintson a **Kihagyás** lehetőségre a jelenlegi adatbázis használatának folytatásához. Jelentse a problémát az alkalmazás fejlesztőinek csevegésben vagy e-mailben [chat@simplex.chat](mailto:chat@simplex.chat).";
@@ -3130,17 +3388,23 @@
 "moderated" = "moderált";
 
 /* No comment provided by engineer. */
-"Moderated at" = "Moderálva ekkor:";
+"Moderated at" = "Moderálva";
 
 /* copied message info */
-"Moderated at: %@" = "Moderálva ekkor: %@";
+"Moderated at: %@" = "Moderálva: %@";
 
 /* marked deleted chat item preview text */
 "moderated by %@" = "moderálva lett %@ által";
 
+/* member role */
+"moderator" = "moderátor";
+
 /* time unit */
 "months" = "hónap";
 
+/* swipe action */
+"More" = "Továbbiak";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Hamarosan további fejlesztések érkeznek!";
 
@@ -3151,17 +3415,17 @@
 "More reliable notifications" = "Megbízhatóbb értesítések";
 
 /* item status description */
-"Most likely this connection is deleted." = "Valószínűleg ez a kapcsolat törlésre került.";
+"Most likely this connection is deleted." = "Valószínűleg ez a kapcsolat törölve lett.";
 
 /* No comment provided by engineer. */
-"Multiple chat profiles" = "Több csevegőprofil";
+"Multiple chat profiles" = "Több csevegési profil";
 
-/* No comment provided by engineer. */
-"mute" = "némítás";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Némítás";
 
+/* notification label action */
+"Mute all" = "Összes némítása";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Némítás, ha inaktív!";
 
@@ -3172,19 +3436,19 @@
 "Network & servers" = "Hálózat és kiszolgálók";
 
 /* No comment provided by engineer. */
-"Network connection" = "Internetkapcsolat";
+"Network connection" = "Hálózati kapcsolat";
 
 /* No comment provided by engineer. */
 "Network decentralization" = "Hálózati decentralizáció";
 
 /* snd error text */
-"Network issues - message expired after many attempts to send it." = "Hálózati problémák - az üzenet többszöri elküldési kísérlet után lejárt.";
+"Network issues - message expired after many attempts to send it." = "Hálózati problémák – az üzenet többszöri elküldési kísérlet után lejárt.";
 
 /* No comment provided by engineer. */
 "Network management" = "Hálózatkezelés";
 
 /* No comment provided by engineer. */
-"Network operator" = "Hálózati üzemeltető";
+"Network operator" = "Hálózatüzemeltető";
 
 /* No comment provided by engineer. */
 "Network settings" = "Hálózati beállítások";
@@ -3192,17 +3456,20 @@
 /* No comment provided by engineer. */
 "Network status" = "Hálózat állapota";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "soha";
 
+/* token status text */
+"New" = "Új";
+
 /* No comment provided by engineer. */
-"New chat" = "Új beszélgetés";
+"New chat" = "Új csevegés";
 
 /* No comment provided by engineer. */
 "New chat experience 🎉" = "Új csevegési élmény 🎉";
 
 /* notification */
-"New contact request" = "Új kapcsolatkérés";
+"New contact request" = "Új meghívási kérés";
 
 /* notification */
 "New contact:" = "Új kapcsolat:";
@@ -3211,7 +3478,7 @@
 "New desktop app!" = "Új számítógép-alkalmazás!";
 
 /* No comment provided by engineer. */
-"New display name" = "Új megjelenítési név";
+"New display name" = "Új megjelenítendő név";
 
 /* notification */
 "New events" = "Új események";
@@ -3225,6 +3492,9 @@
 /* No comment provided by engineer. */
 "New member role" = "Új tag szerepköre";
 
+/* rcv group event chat item */
+"New member wants to join the group." = "Új tag szeretne csatlakozni a csoporthoz.";
+
 /* notification */
 "new message" = "új üzenet";
 
@@ -3256,16 +3526,28 @@
 "No app password" = "Nincs alkalmazás jelszó";
 
 /* No comment provided by engineer. */
-"No contacts selected" = "Nincs kiválasztva ismerős";
+"No chats" = "Nincsenek csevegések";
 
 /* No comment provided by engineer. */
-"No contacts to add" = "Nincs hozzáadandó ismerős";
+"No chats found" = "Nem találhatók csevegések";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Nincsenek csevegések a(z) %@ nevű listában";
+
+/* No comment provided by engineer. */
+"No chats with members" = "Nincsenek csevegések a tagokkal";
+
+/* No comment provided by engineer. */
+"No contacts selected" = "Nincs partner kijelölve";
+
+/* No comment provided by engineer. */
+"No contacts to add" = "Nincs hozzáadandó partner";
 
 /* No comment provided by engineer. */
 "No delivery information" = "Nincs kézbesítési információ";
 
 /* No comment provided by engineer. */
-"No device token!" = "Nincs kiszüléktoken!";
+"No device token!" = "Nincs készüléktoken!";
 
 /* item status description */
 "No direct connection yet, message is forwarded by admin." = "Még nincs közvetlen kapcsolat, az üzenetet az adminisztrátor továbbítja.";
@@ -3288,6 +3570,9 @@
 /* servers error */
 "No media & file servers." = "Nincsenek média- és fájlkiszolgálók.";
 
+/* No comment provided by engineer. */
+"No message" = "Nincs üzenet";
+
 /* servers error */
 "No message servers." = "Nincsenek üzenet-kiszolgálók.";
 
@@ -3313,10 +3598,10 @@
 "No servers for private message routing." = "Nincsenek kiszolgálók a privát üzenet-útválasztáshoz.";
 
 /* servers error */
-"No servers to receive files." = "Nincsenek fájlfogadó-kiszolgálók.";
+"No servers to receive files." = "Nincsenek fájlfogadási kiszolgálók.";
 
 /* servers error */
-"No servers to receive messages." = "Nincsenek üzenetfogadó-kiszolgálók.";
+"No servers to receive messages." = "Nincsenek üzenetfogadási kiszolgálók.";
 
 /* servers error */
 "No servers to send files." = "Nincsenek fájlküldő-kiszolgálók.";
@@ -3324,14 +3609,26 @@
 /* copied message info in history */
 "no text" = "nincs szöveg";
 
+/* alert title */
+"No token!" = "Nincs token!";
+
 /* No comment provided by engineer. */
-"No user identifiers." = "Nincsenek felhasználó-azonosítók.";
+"No unread chats" = "Nincsenek olvasatlan csevegések";
+
+/* No comment provided by engineer. */
+"No user identifiers." = "Nincsenek felhasználói azonosítók.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "Nem kompatibilis!";
 
 /* No comment provided by engineer. */
-"Nothing selected" = "Nincs kiválasztva semmi";
+"not synchronized" = "nincs szinkronizálva";
+
+/* No comment provided by engineer. */
+"Notes" = "Jegyzetek";
+
+/* No comment provided by engineer. */
+"Nothing selected" = "Nincs semmi kijelölve";
 
 /* alert title */
 "Nothing to forward!" = "Nincs mit továbbítani!";
@@ -3342,9 +3639,15 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Az értesítések le vannak tiltva!";
 
+/* alert title */
+"Notifications error" = "Értesítési hiba";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Értesítési adatvédelem";
 
+/* alert title */
+"Notifications status" = "Értesítések állapota";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Most már az adminisztrátorok is:\n- törölhetik a tagok üzeneteit.\n- letilthatnak tagokat („megfigyelő” szerepkör)";
 
@@ -3352,8 +3655,9 @@
 "observer" = "megfigyelő";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "kikapcsolva";
 
 /* blur media */
@@ -3363,9 +3667,10 @@
 "offered %@" = "%@ ajánlotta";
 
 /* feature offered item */
-"offered %@: %@" = "ajánlotta %1$@: %2$@-kor";
+"offered %@: %@" = "ajánlotta: %1$@, ekkor: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Rendben";
 
 /* No comment provided by engineer. */
@@ -3378,7 +3683,7 @@
 "on" = "bekapcsolva";
 
 /* No comment provided by engineer. */
-"One-time invitation link" = "Egyszer használható meghívó-hivatkozás";
+"One-time invitation link" = "Egyszer használható meghívó";
 
 /* No comment provided by engineer. */
 "Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Onion-kiszolgálók **szükségesek** a kapcsolódáshoz.\nKompatibilis VPN szükséges.";
@@ -3387,31 +3692,37 @@
 "Onion hosts will be used when available.\nRequires compatible VPN." = "Onion-kiszolgálók használata, ha azok rendelkezésre állnak.\nVPN engedélyezése szükséges.";
 
 /* No comment provided by engineer. */
-"Onion hosts will not be used." = "Onion-kiszolgálók nem lesznek használva.";
+"Onion hosts will not be used." = "Az onion-kiszolgálók nem lesznek használva.";
 
 /* No comment provided by engineer. */
-"Only chat owners can change preferences." = "Csak a csevegés tulajdonosai módosíthatják a beállításokat.";
+"Only chat owners can change preferences." = "Csak a csevegés tulajdonosai módosíthatják a csevegési beállításokat.";
 
 /* No comment provided by engineer. */
-"Only client devices store user profiles, contacts, groups, and messages." = "Csak az eszközök alkalmazásai tárolják a felhasználó-profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.";
+"Only client devices store user profiles, contacts, groups, and messages." = "A felhasználói profilok, partnerek, csoportok és üzenetek csak az eszközön vannak tárolva a kliensen belül.";
 
 /* No comment provided by engineer. */
 "Only delete conversation" = "Csak a beszélgetés törlése";
 
 /* No comment provided by engineer. */
-"Only group owners can change group preferences." = "Csak a csoporttulajdonosok módosíthatják a csoportbeállításokat.";
+"Only group owners can change group preferences." = "Csak a csoport tulajdonosai módosíthatják a csoportbeállításokat.";
 
 /* No comment provided by engineer. */
-"Only group owners can enable files and media." = "Csak a csoporttulajdonosok engedélyezhetik a fájlok- és a médiatartalmak küldését.";
+"Only group owners can enable files and media." = "Csak a csoport tulajdonosai engedélyezhetik a fájlok- és a médiatartalmak küldését.";
 
 /* No comment provided by engineer. */
-"Only group owners can enable voice messages." = "Csak a csoporttulajdonosok engedélyezhetik a hangüzenetek küldését.";
+"Only group owners can enable voice messages." = "Csak a csoport tulajdonosai engedélyezhetik a hangüzenetek küldését.";
 
 /* No comment provided by engineer. */
-"Only you can add message reactions." = "Csak Ön adhat hozzá üzenetreakciókat.";
+"Only sender and moderators see it" = "Csak a küldő és a moderátorok látják";
 
 /* No comment provided by engineer. */
-"Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" = "Véglegesen csak Ön törölhet üzeneteket (ismerőse csak törlésre jelölheti meg őket ). (24 óra)";
+"Only you and moderators see it" = "Csak Ön és a moderátorok látják";
+
+/* No comment provided by engineer. */
+"Only you can add message reactions." = "Csak Ön adhat hozzá reakciókat az üzenetekhez.";
+
+/* No comment provided by engineer. */
+"Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" = "Véglegesen csak Ön törölhet üzeneteket (partnere csak törlésre jelölheti meg őket ). (24 óra)";
 
 /* No comment provided by engineer. */
 "Only you can make calls." = "Csak Ön tud hívásokat indítani.";
@@ -3423,31 +3734,31 @@
 "Only you can send voice messages." = "Csak Ön tud hangüzeneteket küldeni.";
 
 /* No comment provided by engineer. */
-"Only your contact can add message reactions." = "Csak az ismerőse tud üzenetreakciókat küldeni.";
+"Only your contact can add message reactions." = "Csak a partnere adhat hozzá reakciókat az üzenetekhez.";
 
 /* No comment provided by engineer. */
-"Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" = "Csak az ismerőse tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)";
+"Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" = "Csak a partnere tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)";
 
 /* No comment provided by engineer. */
-"Only your contact can make calls." = "Csak az ismerőse tud hívást indítani.";
+"Only your contact can make calls." = "Csak a partnere tud hívást indítani.";
 
 /* No comment provided by engineer. */
-"Only your contact can send disappearing messages." = "Csak az ismerőse tud eltűnő üzeneteket küldeni.";
+"Only your contact can send disappearing messages." = "Csak a partnere tud eltűnő üzeneteket küldeni.";
 
 /* No comment provided by engineer. */
-"Only your contact can send voice messages." = "Csak az ismerőse tud hangüzeneteket küldeni.";
+"Only your contact can send voice messages." = "Csak a partnere tud hangüzeneteket küldeni.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Megnyitás";
 
 /* No comment provided by engineer. */
-"Open changes" = "Változások megnyitása";
+"Open changes" = "Módosítások megtekintése";
 
 /* No comment provided by engineer. */
 "Open chat" = "Csevegés megnyitása";
 
 /* authentication reason */
-"Open chat console" = "Csevegés konzol megnyitása";
+"Open chat console" = "Csevegési konzol megnyitása";
 
 /* No comment provided by engineer. */
 "Open conditions" = "Feltételek megnyitása";
@@ -3455,8 +3766,11 @@
 /* No comment provided by engineer. */
 "Open group" = "Csoport megnyitása";
 
+/* alert title */
+"Open link?" = "Megnyitja a hivatkozást?";
+
 /* authentication reason */
-"Open migration to another device" = "Átköltöztetés megkezdése egy másik eszközre";
+"Open migration to another device" = "Átköltöztetés indítása egy másik eszközre";
 
 /* No comment provided by engineer. */
 "Open Settings" = "Beállítások megnyitása";
@@ -3468,7 +3782,7 @@
 "Operator" = "Üzemeltető";
 
 /* alert title */
-"Operator server" = "Kiszolgáló üzemeltető";
+"Operator server" = "Kiszolgáló-üzemeltető";
 
 /* No comment provided by engineer. */
 "Or import archive file" = "Vagy archívumfájl importálása";
@@ -3488,6 +3802,9 @@
 /* No comment provided by engineer. */
 "Or to share privately" = "Vagy a privát megosztáshoz";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Csevegések listákba szervezése";
+
 /* No comment provided by engineer. */
 "other" = "egyéb";
 
@@ -3510,13 +3827,13 @@
 "Passcode" = "Jelkód";
 
 /* No comment provided by engineer. */
-"Passcode changed!" = "A jelkód megváltozott!";
+"Passcode changed!" = "A jelkód módosult!";
 
 /* No comment provided by engineer. */
 "Passcode entry" = "Jelkód bevitele";
 
 /* No comment provided by engineer. */
-"Passcode not changed!" = "A jelkód nem változott!";
+"Passcode not changed!" = "A jelkód nem módosult!";
 
 /* No comment provided by engineer. */
 "Passcode set!" = "A jelkód beállítva!";
@@ -3525,7 +3842,7 @@
 "Password" = "Jelszó";
 
 /* No comment provided by engineer. */
-"Password to show" = "Jelszó megjelenítése";
+"Password to show" = "Jelszó a megjelenítéshez";
 
 /* past/unknown group member */
 "Past member %@" = "(Már nem tag) %@";
@@ -3543,13 +3860,22 @@
 "Paste the link you received" = "Kapott hivatkozás beillesztése";
 
 /* No comment provided by engineer. */
-"peer-to-peer" = "ponttól-pontig";
+"peer-to-peer" = "egyenrangú";
+
+/* No comment provided by engineer. */
+"pending" = "függőben";
 
 /* No comment provided by engineer. */
 "Pending" = "Függőben";
 
 /* No comment provided by engineer. */
-"Periodic" = "Rendszeresen";
+"pending approval" = "jóváhagyásra vár";
+
+/* No comment provided by engineer. */
+"pending review" = "függőben lévő áttekintés";
+
+/* No comment provided by engineer. */
+"Periodic" = "Időszakos";
 
 /* message decrypt error item */
 "Permanent decryption error" = "Végleges visszafejtési hiba";
@@ -3567,22 +3893,22 @@
 "Play from the chat list." = "Lejátszás a csevegési listából.";
 
 /* No comment provided by engineer. */
-"Please ask your contact to enable calls." = "Kérje meg az ismerősét, hogy engedélyezze a hívásokat.";
+"Please ask your contact to enable calls." = "Kérje meg a partnerét, hogy engedélyezze a hívásokat.";
 
 /* No comment provided by engineer. */
-"Please ask your contact to enable sending voice messages." = "Kérje meg az ismerősét, hogy engedélyezze a hangüzenetek küldését.";
+"Please ask your contact to enable sending voice messages." = "Kérje meg a partnerét, hogy engedélyezze a hangüzenetek küldését.";
 
 /* No comment provided by engineer. */
 "Please check that mobile and desktop are connected to the same local network, and that desktop firewall allows the connection.\nPlease share any other issues with the developers." = "Ellenőrizze, hogy a hordozható eszköz és a számítógép ugyanahhoz a helyi hálózathoz csatlakozik-e, valamint a számítógép tűzfalában engedélyezve van-e a kapcsolat.\nMinden további problémát osszon meg a fejlesztőkkel.";
 
 /* No comment provided by engineer. */
-"Please check that you used the correct link or ask your contact to send you another one." = "Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg az ismerősét, hogy küldjön egy másikat.";
+"Please check that you used the correct link or ask your contact to send you another one." = "Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg a partnerét, hogy küldjön egy másikat.";
 
 /* No comment provided by engineer. */
-"Please check your network connection with %@ and try again." = "Ellenőrizze a hálózati kapcsolatát a következővel: %@, és próbálja újra.";
+"Please check your network connection with %@ and try again." = "Ellenőrizze a hálózati kapcsolatát a vele: %@, és próbálja újra.";
 
 /* No comment provided by engineer. */
-"Please check yours and your contact preferences." = "Ellenőrizze a saját- és az ismerőse beállításait.";
+"Please check yours and your contact preferences." = "Ellenőrizze a saját- és a partnere beállításait.";
 
 /* No comment provided by engineer. */
 "Please confirm that network settings are correct for this device." = "Ellenőrizze, hogy a hálózati beállítások megfelelők-e ehhez az eszközhöz.";
@@ -3594,13 +3920,13 @@
 "Please contact group admin." = "Lépjen kapcsolatba a csoport adminisztrátorával.";
 
 /* No comment provided by engineer. */
-"Please enter correct current passphrase." = "Adja meg a helyes, jelenlegi jelmondatát.";
+"Please enter correct current passphrase." = "Adja meg a helyes, jelenlegi jelmondatot.";
 
 /* No comment provided by engineer. */
-"Please enter the previous password after restoring database backup. This action can not be undone." = "Előző jelszó megadása az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.";
+"Please enter the previous password after restoring database backup. This action can not be undone." = "Adja meg a korábbi jelszót az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.";
 
 /* No comment provided by engineer. */
-"Please remember or store it securely - there is no way to recover a lost passcode!" = "Jegyezze fel vagy tárolja el biztonságosan - az elveszett jelkódot nem lehet visszaállítani!";
+"Please remember or store it securely - there is no way to recover a lost passcode!" = "Jegyezze fel vagy tárolja el biztonságosan – az elveszett jelkódot nem lehet visszaállítani!";
 
 /* No comment provided by engineer. */
 "Please report it to the developers." = "Jelentse a fejlesztőknek.";
@@ -3612,7 +3938,19 @@
 "Please store passphrase securely, you will NOT be able to access chat if you lose it." = "Tárolja el biztonságosan jelmondát, mert ha elveszti azt, akkor NEM férhet hozzá a csevegéshez.";
 
 /* No comment provided by engineer. */
-"Please store passphrase securely, you will NOT be able to change it if you lose it." = "Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja megváltoztatni.";
+"Please store passphrase securely, you will NOT be able to change it if you lose it." = "Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja módosítani.";
+
+/* token info */
+"Please try to disable and re-enable notfications." = "Próbálja meg letiltani és újra engedélyezni az értesítéseket.";
+
+/* snd group event chat item */
+"Please wait for group moderators to review your request to join the group." = "Várja meg, amíg a csoport moderátorai áttekintik a csoporthoz való csatlakozási kérelmét.";
+
+/* token info */
+"Please wait for token activation to complete." = "Várjon, amíg a token aktiválása befejeződik.";
+
+/* token info */
+"Please wait for token to be registered." = "Várjon a token regisztrálására.";
 
 /* No comment provided by engineer. */
 "Polish interface" = "Lengyel kezelőfelület";
@@ -3627,7 +3965,7 @@
 "Preserve the last message draft, with attachments." = "Az utolsó üzenet tervezetének megőrzése a mellékletekkel együtt.";
 
 /* No comment provided by engineer. */
-"Preset server address" = "Előre beállított kiszolgáló címe";
+"Preset server address" = "Az előre beállított kiszolgáló címe";
 
 /* No comment provided by engineer. */
 "Preset servers" = "Előre beállított kiszolgálók";
@@ -3642,14 +3980,23 @@
 "Privacy & security" = "Adatvédelem és biztonság";
 
 /* No comment provided by engineer. */
-"Privacy for your customers." = "Az Ön ügyfeleinek adatvédelme.";
+"Privacy for your customers." = "Saját ügyfeleinek adatvédelme.";
 
 /* No comment provided by engineer. */
-"Privacy redefined" = "Adatvédelem újraértelmezve";
+"Privacy policy and conditions of use." = "Adatvédelmi szabályzat és felhasználási feltételek.";
+
+/* No comment provided by engineer. */
+"Privacy redefined" = "Újraértelmezett adatvédelem";
+
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "A privát csevegések, a csoportok és a partnerek nem érhetők el a szerver üzemeltetői számára.";
 
 /* No comment provided by engineer. */
 "Private filenames" = "Privát fájlnevek";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Privát nevek a médiafájlokhoz.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Privát üzenet-útválasztás";
 
@@ -3663,7 +4010,7 @@
 "Private routing" = "Privát útválasztás";
 
 /* No comment provided by engineer. */
-"Private routing error" = "Privát útválasztáshiba";
+"Private routing error" = "Privát útválasztási hiba";
 
 /* No comment provided by engineer. */
 "Profile and server connections" = "Profil és kiszolgálókapcsolatok";
@@ -3681,19 +4028,22 @@
 "Profile theme" = "Profiltéma";
 
 /* alert message */
-"Profile update will be sent to your contacts." = "A profilfrissítés elküldésre került az ismerősök számára.";
+"Profile update will be sent to your contacts." = "A profilfrissítés el lesz küldve a partnerei számára.";
 
 /* No comment provided by engineer. */
 "Prohibit audio/video calls." = "A hívások kezdeményezése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit irreversible message deletion." = "Az üzenetek véglegesen való törlése le van tiltva.";
+"Prohibit irreversible message deletion." = "Az elküldött üzenetek végleges törlése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit message reactions." = "Az üzenetreakciók küldése le van tiltva.";
+"Prohibit message reactions." = "A reakciók hozzáadása az üzenethez le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit messages reactions." = "Az üzenetreakciók tiltása.";
+"Prohibit messages reactions." = "A reakciók hozzáadása az üzenetekhez le van tiltva.";
+
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "Az üzenetek a moderátorok felé történő jelentésének megtiltása.";
 
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "A közvetlen üzenetek küldése a tagok között le van tiltva.";
@@ -3702,7 +4052,7 @@
 "Prohibit sending disappearing messages." = "Az eltűnő üzenetek küldése le van tiltva.";
 
 /* No comment provided by engineer. */
-"Prohibit sending files and media." = "Fájlok- és a médiatartalmak küldésének letiltása.";
+"Prohibit sending files and media." = "A fájlok- és a médiatartalmak küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Prohibit sending SimpleX links." = "A SimpleX-hivatkozások küldése le van tiltva.";
@@ -3720,13 +4070,13 @@
 "Protect your chat profiles with a password!" = "Védje meg a csevegési profiljait egy jelszóval!";
 
 /* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.\nEngedélyezze a „Beállítások -> Hálózat és kiszolgálók” menüben.";
+"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje az IP-címét a partnerei által kiválasztott üzenetváltási továbbítókiszolgálókkal szemben.\nEngedélyezze a *Hálózat és kiszolgálók* menüben.";
 
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protokoll időtúllépése";
 
 /* No comment provided by engineer. */
-"Protocol timeout per KB" = "Protokoll időtúllépése KB-onként";
+"Protocol timeout per KB" = "Protokoll időtúllépése kB-onként";
 
 /* No comment provided by engineer. */
 "Proxied" = "Proxyzott";
@@ -3744,10 +4094,10 @@
 "Push server" = "Push-kiszolgáló";
 
 /* chat item text */
-"quantum resistant e2e encryption" = "végpontok közötti kvantumrezisztens titkosítás";
+"quantum resistant e2e encryption" = "végpontok közötti kvantumbiztos titkosítás";
 
 /* No comment provided by engineer. */
-"Quantum resistant encryption" = "Kvantumrezisztens titkosítás";
+"Quantum resistant encryption" = "Kvantumbiztos titkosítás";
 
 /* No comment provided by engineer. */
 "Rate the app" = "Értékelje az alkalmazást";
@@ -3786,10 +4136,10 @@
 "received answer…" = "válasz fogadása…";
 
 /* No comment provided by engineer. */
-"Received at" = "Fogadva ekkor:";
+"Received at" = "Fogadva";
 
 /* copied message info */
-"Received at: %@" = "Fogadva ekkor: %@";
+"Received at: %@" = "Fogadva: %@";
 
 /* No comment provided by engineer. */
 "received confirmation…" = "visszaigazolás fogadása…";
@@ -3810,13 +4160,13 @@
 "Received total" = "Összes fogadott üzenet";
 
 /* No comment provided by engineer. */
-"Receiving address will be changed to a different server. Address change will complete after sender comes online." = "A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.";
+"Receiving address will be changed to a different server. Address change will complete after sender comes online." = "A fogadási cím egy másik kiszolgálóra fog módosulni. A cím módosítása a feladó online állapotba kerülése után fejeződik be.";
 
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "A fájl fogadása le fog állni.";
 
 /* No comment provided by engineer. */
-"Receiving via" = "Fogadás a";
+"Receiving via" = "Fogadás a következőn keresztül:";
 
 /* No comment provided by engineer. */
 "Recent history and improved [directory bot](simplex:/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)." = "Legutóbbi előzmények és továbbfejlesztett [könyvtárbot](simplex:/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).";
@@ -3837,50 +4187,65 @@
 "Reconnect all servers" = "Újrakapcsolódás az összes kiszolgálóhoz";
 
 /* No comment provided by engineer. */
-"Reconnect all servers?" = "Újrakapcsolódás az összes kiszolgálóhoz?";
+"Reconnect all servers?" = "Újrakapcsolódik az összes kiszolgálóhoz?";
 
 /* No comment provided by engineer. */
 "Reconnect server to force message delivery. It uses additional traffic." = "A kiszolgálóhoz való újrakapcsolódás az üzenetkézbesítési jelentések kikényszerítéséhez. Ez további adatforgalmat használ.";
 
 /* No comment provided by engineer. */
-"Reconnect server?" = "Újrakapcsolódás a kiszolgálóhoz?";
+"Reconnect server?" = "Újrakapcsolódik a kiszolgálóhoz?";
 
 /* No comment provided by engineer. */
-"Reconnect servers?" = "Újrakapcsolódás a kiszolgálókhoz?";
+"Reconnect servers?" = "Újrakapcsolódik a kiszolgálókhoz?";
 
 /* No comment provided by engineer. */
-"Record updated at" = "A bejegyzés frissítve";
+"Record updated at" = "Bejegyzés frissítve";
 
 /* copied message info */
-"Record updated at: %@" = "A bejegyzés frissítve: %@";
+"Record updated at: %@" = "Bejegyzés frissítve: %@";
 
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Csökkentett akkumulátor-használat";
 
+/* No comment provided by engineer. */
+"Register" = "Regisztrálás";
+
+/* token info */
+"Register notification token?" = "Regisztrálja az értesítési tokent?";
+
+/* token status text */
+"Registered" = "Regisztrálva";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Elutasítás";
 
 /* No comment provided by engineer. */
 "Reject (sender NOT notified)" = "Elutasítás (a feladó NEM kap értesítést)";
 
 /* No comment provided by engineer. */
-"Reject contact request" = "Kapcsolatkérés elutasítása";
+"Reject contact request" = "Meghívási kérés elutasítása";
+
+/* alert title */
+"Reject member?" = "Elutasítja a tagot?";
+
+/* No comment provided by engineer. */
+"rejected" = "elutasítva";
 
 /* call status */
 "rejected call" = "elutasított hívás";
 
 /* No comment provided by engineer. */
-"Relay server is only used if necessary. Another party can observe your IP address." = "A közvetítő-kiszolgáló csak szükség esetén kerül használatra. Egy másik fél megfigyelheti az IP-címet.";
+"Relay server is only used if necessary. Another party can observe your IP address." = "A továbbítókiszolgáló csak szükség esetén lesz használva. Egy másik fél megfigyelheti az IP-címét.";
 
 /* No comment provided by engineer. */
-"Relay server protects your IP address, but it can observe the duration of the call." = "A közvetítő-kiszolgáló megvédi az IP-címet, de megfigyelheti a hívás időtartamát.";
+"Relay server protects your IP address, but it can observe the duration of the call." = "A továbbítókiszolgáló megvédi az IP-címét, de megfigyelheti a hívás időtartamát.";
 
 /* No comment provided by engineer. */
 "Remove" = "Eltávolítás";
 
 /* No comment provided by engineer. */
-"Remove archive?" = "Archívum eltávolítása?";
+"Remove archive?" = "Eltávolítja az archívumot?";
 
 /* No comment provided by engineer. */
 "Remove image" = "Kép eltávolítása";
@@ -3889,10 +4254,10 @@
 "Remove member" = "Eltávolítás";
 
 /* No comment provided by engineer. */
-"Remove member?" = "Biztosan eltávolítja?";
+"Remove member?" = "Eltávolítja a tagot?";
 
 /* No comment provided by engineer. */
-"Remove passphrase from keychain?" = "Jelmondat eltávolítása a kulcstartóból?";
+"Remove passphrase from keychain?" = "Eltávolítja a jelmondatot a kulcstartóból?";
 
 /* No comment provided by engineer. */
 "removed" = "eltávolítva";
@@ -3903,6 +4268,9 @@
 /* profile update event chat item */
 "removed contact address" = "eltávolította a kapcsolattartási címet";
 
+/* No comment provided by engineer. */
+"removed from group" = "eltávolítva a csoportból";
+
 /* profile update event chat item */
 "removed profile picture" = "eltávolította a profilképét";
 
@@ -3910,16 +4278,16 @@
 "removed you" = "eltávolította Önt";
 
 /* No comment provided by engineer. */
-"Renegotiate" = "Újraegyzetetés";
+"Renegotiate" = "Újraegyeztetés";
 
 /* No comment provided by engineer. */
 "Renegotiate encryption" = "Titkosítás újraegyeztetése";
 
 /* No comment provided by engineer. */
-"Renegotiate encryption?" = "Titkosítás újraegyeztetése?";
+"Renegotiate encryption?" = "Újraegyezteti a titkosítást?";
 
 /* No comment provided by engineer. */
-"Repeat connection request?" = "Kapcsolatkérés megismétlése?";
+"Repeat connection request?" = "Megismétli a meghívási kérést?";
 
 /* No comment provided by engineer. */
 "Repeat download" = "Letöltés ismét";
@@ -3928,7 +4296,7 @@
 "Repeat import" = "Importálás ismét";
 
 /* No comment provided by engineer. */
-"Repeat join request?" = "Csatlakozáskérés megismétlése?";
+"Repeat join request?" = "Megismétli a meghívási kérést?";
 
 /* No comment provided by engineer. */
 "Repeat upload" = "Feltöltés ismét";
@@ -3936,8 +4304,44 @@
 /* chat item action */
 "Reply" = "Válasz";
 
+/* chat item action */
+"Report" = "Jelentés";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Tartalom jelentése: csak a csoport moderátorai látják.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Tag profiljának jelentése: csak a csoport moderátorai látják.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Egyéb jelentés: csak a csoport moderátorai látják.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "Jelentés indoklása?";
+
+/* alert title */
+"Report sent to moderators" = "A jelentés el lett küldve a moderátoroknak";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Kéretlen tartalom jelentése: csak a csoport moderátorai látják.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Szabálysértés jelentése: csak a csoport moderátorai látják.";
+
+/* report in notification */
+"Report: %@" = "Jelentés: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "Az üzenetek jelentése a moderátorok felé le van tiltva.";
+
+/* No comment provided by engineer. */
+"Reports" = "Jelentések";
+
+/* No comment provided by engineer. */
+"request to join rejected" = "csatlakozási kérelem elutasítva";
+
 /* chat list item title */
-"requested to connect" = "kérelmezve a kapcsolódáshoz";
+"requested to connect" = "Függőben lévő meghívási kérelem";
 
 /* No comment provided by engineer. */
 "Required" = "Szükséges";
@@ -3952,7 +4356,7 @@
 "Reset all statistics" = "Az összes statisztika visszaállítása";
 
 /* No comment provided by engineer. */
-"Reset all statistics?" = "Az összes statisztika visszaállítása?";
+"Reset all statistics?" = "Visszaállítja az összes statisztikát?";
 
 /* No comment provided by engineer. */
 "Reset colors" = "Színek visszaállítása";
@@ -3979,10 +4383,10 @@
 "Restore database backup" = "Adatbázismentés visszaállítása";
 
 /* No comment provided by engineer. */
-"Restore database backup?" = "Adatbázismentés visszaállítása?";
+"Restore database backup?" = "Visszaállítja az adatbázismentést?";
 
 /* No comment provided by engineer. */
-"Restore database error" = "Hiba az adatbázis visszaállításakor";
+"Restore database error" = "Hiba történt az adatbázis visszaállításakor";
 
 /* No comment provided by engineer. */
 "Retry" = "Újrapróbálkozás";
@@ -3991,10 +4395,19 @@
 "Reveal" = "Felfedés";
 
 /* No comment provided by engineer. */
-"Review conditions" = "Feltételek felülvizsgálata";
+"review" = "áttekintés";
 
 /* No comment provided by engineer. */
-"Review later" = "Felülvizsgálat később";
+"Review conditions" = "Feltételek felülvizsgálata";
+
+/* admission stage */
+"Review members" = "Tagok áttekintése";
+
+/* admission stage description */
+"Review members before admitting (\"knocking\")." = "Tagok áttekintése a befogadás előtt (kopogtatás).";
+
+/* No comment provided by engineer. */
+"reviewed by admins" = "áttekintve a moderátorok által";
 
 /* No comment provided by engineer. */
 "Revoke" = "Visszavonás";
@@ -4003,7 +4416,7 @@
 "Revoke file" = "Fájl visszavonása";
 
 /* No comment provided by engineer. */
-"Revoke file?" = "Fájl visszavonása?";
+"Revoke file?" = "Visszavonja a fájlt?";
 
 /* No comment provided by engineer. */
 "Role" = "Szerepkör";
@@ -4018,14 +4431,17 @@
 "Safer groups" = "Biztonságosabb csoportok";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Mentés";
 
 /* alert button */
-"Save (and notify contacts)" = "Mentés és az ismerősök értesítése";
+"Save (and notify contacts)" = "Mentés (és a partnerek értesítése)";
+
+/* alert title */
+"Save admission settings?" = "Elmenti a befogadási beállításokat?";
 
 /* alert button */
-"Save and notify contact" = "Mentés és az ismerős értesítése";
+"Save and notify contact" = "Mentés és a partner értesítése";
 
 /* No comment provided by engineer. */
 "Save and notify group members" = "Mentés és a csoporttagok értesítése";
@@ -4039,6 +4455,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "Csoportprofil mentése";
 
+/* No comment provided by engineer. */
+"Save list" = "Lista mentése";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "Jelmondat mentése és a csevegés megnyitása";
 
@@ -4046,7 +4465,7 @@
 "Save passphrase in Keychain" = "Jelmondat mentése a kulcstartóba";
 
 /* alert title */
-"Save preferences?" = "Beállítások mentése?";
+"Save preferences?" = "Menti a beállításokat?";
 
 /* No comment provided by engineer. */
 "Save profile password" = "Profiljelszó mentése";
@@ -4055,13 +4474,13 @@
 "Save servers" = "Kiszolgálók mentése";
 
 /* alert title */
-"Save servers?" = "Kiszolgálók mentése?";
+"Save servers?" = "Menti a kiszolgálókat?";
 
 /* No comment provided by engineer. */
-"Save welcome message?" = "Üdvözlőüzenet mentése?";
+"Save welcome message?" = "Menti az üdvözlőüzenetet?";
 
 /* alert title */
-"Save your profile?" = "Profil mentése?";
+"Save your profile?" = "Menti a profilt?";
 
 /* No comment provided by engineer. */
 "saved" = "mentett";
@@ -4070,7 +4489,7 @@
 "Saved" = "Mentett";
 
 /* No comment provided by engineer. */
-"Saved from" = "Elmentve innen:";
+"Saved from" = "Elmentve innen";
 
 /* No comment provided by engineer. */
 "saved from %@" = "elmentve innen: %@";
@@ -4079,7 +4498,7 @@
 "Saved message" = "Mentett üzenet";
 
 /* No comment provided by engineer. */
-"Saved WebRTC ICE servers will be removed" = "A mentett WebRTC ICE-kiszolgálók eltávolításra kerülnek";
+"Saved WebRTC ICE servers will be removed" = "A mentett WebRTC ICE-kiszolgálók el lesznek távolítva";
 
 /* No comment provided by engineer. */
 "Saving %lld messages" = "%lld üzenet mentése";
@@ -4097,10 +4516,10 @@
 "Scan QR code" = "QR-kód beolvasása";
 
 /* No comment provided by engineer. */
-"Scan QR code from desktop" = "QR-kód beolvasása számítógépről";
+"Scan QR code from desktop" = "QR-kód beolvasása a számítógépről";
 
 /* No comment provided by engineer. */
-"Scan security code from your contact's app." = "Biztonsági kód beolvasása az ismerősének alkalmazásából.";
+"Scan security code from your contact's app." = "Biztonsági kód beolvasása a partnere alkalmazásából.";
 
 /* No comment provided by engineer. */
 "Scan server QR code" = "A kiszolgáló QR-kódjának beolvasása";
@@ -4112,7 +4531,7 @@
 "Search" = "Keresés";
 
 /* No comment provided by engineer. */
-"Search bar accepts invitation links." = "A keresősáv elfogadja a meghívó-hivatkozásokat.";
+"Search bar accepts invitation links." = "A keresősáv elfogadja a meghívási hivatkozásokat.";
 
 /* No comment provided by engineer. */
 "Search or paste SimpleX link" = "Keresés vagy SimpleX-hivatkozás beillesztése";
@@ -4121,7 +4540,7 @@
 "sec" = "mp";
 
 /* No comment provided by engineer. */
-"Secondary" = "Másodlagos";
+"Secondary" = "Másodlagos szín";
 
 /* time unit */
 "seconds" = "másodperc";
@@ -4130,7 +4549,7 @@
 "secret" = "titok";
 
 /* server test step */
-"Secure queue" = "Biztonságos sorbaállítás";
+"Secure queue" = "Biztonságos sorba állítás";
 
 /* No comment provided by engineer. */
 "Secured" = "Biztosítva";
@@ -4142,37 +4561,37 @@
 "Security code" = "Biztonsági kód";
 
 /* chat item text */
-"security code changed" = "a biztonsági kód megváltozott";
+"security code changed" = "a biztonsági kód módosult";
 
 /* chat item action */
-"Select" = "Kiválasztás";
+"Select" = "Kijelölés";
 
 /* No comment provided by engineer. */
-"Select chat profile" = "Csevegési profil kiválasztása";
+"Select chat profile" = "Csevegési profil kijelölése";
 
 /* No comment provided by engineer. */
-"Selected %lld" = "%lld kiválasztva";
+"Selected %lld" = "%lld kijelölve";
 
 /* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "A kiválasztott csevegési beállítások tiltják ezt az üzenetet.";
+"Selected chat preferences prohibit this message." = "A kijelölt csevegési beállítások tiltják ezt az üzenetet.";
 
 /* No comment provided by engineer. */
 "Self-destruct" = "Önmegsemmisítés";
 
 /* No comment provided by engineer. */
-"Self-destruct passcode" = "Önmegsemmisítési jelkód";
+"Self-destruct passcode" = "Önmegsemmisítő-jelkód";
 
 /* No comment provided by engineer. */
-"Self-destruct passcode changed!" = "Az önmegsemmisítési jelkód megváltozott!";
+"Self-destruct passcode changed!" = "Az önmegsemmisítő-jelkód módosult!";
 
 /* No comment provided by engineer. */
-"Self-destruct passcode enabled!" = "Az önmegsemmisítési jelkód engedélyezve!";
+"Self-destruct passcode enabled!" = "Az önmegsemmisítő-jelkód engedélyezve!";
 
 /* No comment provided by engineer. */
 "Send" = "Küldés";
 
 /* No comment provided by engineer. */
-"Send a live message - it will update for the recipient(s) as you type it" = "Élő üzenet küldése - a címzett(ek) számára frissül, ahogy beírja";
+"Send a live message - it will update for the recipient(s) as you type it" = "Élő üzenet küldése – az üzenet a címzett(ek) számára valós időben frissül, ahogy Ön beírja az üzenetet";
 
 /* No comment provided by engineer. */
 "Send delivery receipts to" = "A kézbesítési jelentéseket a következő címre kell küldeni";
@@ -4190,7 +4609,7 @@
 "Send errors" = "Üzenetküldési hibák";
 
 /* No comment provided by engineer. */
-"Send link previews" = "Hivatkozás előnézetek küldése";
+"Send link previews" = "Hivatkozás előnézete";
 
 /* No comment provided by engineer. */
 "Send live message" = "Élő üzenet küldése";
@@ -4199,61 +4618,64 @@
 "Send message to enable calls." = "Üzenet küldése a hívások engedélyezéséhez.";
 
 /* No comment provided by engineer. */
-"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha az IP-cím védett és az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
+"Send messages directly when IP address is protected and your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha az IP-cím védett és a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
 
 /* No comment provided by engineer. */
-"Send messages directly when your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
+"Send messages directly when your or destination server does not support private routing." = "Közvetlen üzenetküldés, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.";
 
 /* No comment provided by engineer. */
 "Send notifications" = "Értesítések küldése";
 
 /* No comment provided by engineer. */
-"Send questions and ideas" = "Ötletek és kérdések beküldése";
+"Send private reports" = "Privát jelentések küldése";
+
+/* No comment provided by engineer. */
+"Send questions and ideas" = "Ötletek és javaslatok";
 
 /* No comment provided by engineer. */
 "Send receipts" = "Kézbesítési jelentések küldése";
 
 /* No comment provided by engineer. */
-"Send them from gallery or custom keyboards." = "Küldje el őket galériából vagy egyedi billentyűzetekről.";
+"Send them from gallery or custom keyboards." = "Küldje el őket a galériából vagy az egyéni billentyűzetekről.";
 
 /* No comment provided by engineer. */
-"Send up to 100 last messages to new members." = "Az utolsó 100 üzenet elküldése az új tagoknak.";
+"Send up to 100 last messages to new members." = "Legfeljebb az utolsó 100 üzenet elküldése az új tagok számára.";
 
 /* alert message */
 "Sender cancelled file transfer." = "A fájl küldője visszavonta az átvitelt.";
 
 /* No comment provided by engineer. */
-"Sender may have deleted the connection request." = "A küldő törölhette a kapcsolatkérést.";
+"Sender may have deleted the connection request." = "A küldője törölhette a meghívási kérést.";
 
 /* No comment provided by engineer. */
-"Sending delivery receipts will be enabled for all contacts in all visible chat profiles." = "A kézbesítési jelentések küldése engedélyezésre kerül az összes látható csevegési profilban lévő összes ismerőse számára.";
+"Sending delivery receipts will be enabled for all contacts in all visible chat profiles." = "A kézbesítési jelentések küldése engedélyezve lesz az összes látható csevegési profilban lévő összes partnere számára.";
 
 /* No comment provided by engineer. */
-"Sending delivery receipts will be enabled for all contacts." = "A kézbesítési jelentés küldése az összes ismerőse számára engedélyezésre kerül.";
+"Sending delivery receipts will be enabled for all contacts." = "A kézbesítési jelentések küldése az összes partnere számára engedélyezve lesz.";
 
 /* No comment provided by engineer. */
 "Sending file will be stopped." = "A fájl küldése le fog állni.";
 
 /* No comment provided by engineer. */
-"Sending receipts is disabled for %lld contacts" = "A kézbesítési jelentések le vannak tiltva %lld ismerősnél";
+"Sending receipts is disabled for %lld contacts" = "A kézbesítési jelentések le vannak tiltva %lld partnernél";
 
 /* No comment provided by engineer. */
 "Sending receipts is disabled for %lld groups" = "A kézbesítési jelentések le vannak tiltva %lld csoportban";
 
 /* No comment provided by engineer. */
-"Sending receipts is enabled for %lld contacts" = "A kézbesítési jelentések engedélyezve vannak %lld ismerősnél";
+"Sending receipts is enabled for %lld contacts" = "A kézbesítési jelentések engedélyezve vannak %lld partnernél";
 
 /* No comment provided by engineer. */
 "Sending receipts is enabled for %lld groups" = "A kézbesítési jelentések engedélyezve vannak %lld csoportban";
 
 /* No comment provided by engineer. */
-"Sending via" = "Küldés ezen keresztül";
+"Sending via" = "Küldés a következőn keresztül:";
 
 /* No comment provided by engineer. */
-"Sent at" = "Elküldve ekkor:";
+"Sent at" = "Elküldve";
 
 /* copied message info */
-"Sent at: %@" = "Elküldve ekkor: %@";
+"Sent at: %@" = "Elküldve: %@";
 
 /* No comment provided by engineer. */
 "Sent directly" = "Közvetlenül küldött";
@@ -4268,7 +4690,7 @@
 "Sent messages" = "Elküldött üzenetek";
 
 /* No comment provided by engineer. */
-"Sent messages will be deleted after set time." = "Az elküldött üzenetek törlésre kerülnek a beállított idő után.";
+"Sent messages will be deleted after set time." = "Az elküldött üzenetek törölve lesznek a beállított idő után.";
 
 /* No comment provided by engineer. */
 "Sent reply" = "Válaszüzenet-buborék színe";
@@ -4277,7 +4699,7 @@
 "Sent total" = "Összes elküldött üzenet";
 
 /* No comment provided by engineer. */
-"Sent via proxy" = "Proxyn keresztül küldve";
+"Sent via proxy" = "Proxyn keresztül küldött";
 
 /* No comment provided by engineer. */
 "Server" = "Kiszolgáló";
@@ -4295,22 +4717,22 @@
 "Server address is incompatible with network settings." = "A kiszolgáló címe nem kompatibilis a hálózati beállításokkal.";
 
 /* alert title */
-"Server operator changed." = "A kiszolgáló üzemeltetője megváltozott.";
+"Server operator changed." = "A kiszolgáló üzemeltetője módosult.";
 
 /* No comment provided by engineer. */
-"Server operators" = "Kiszolgáló-üzemeltetők";
+"Server operators" = "Kiszolgálóüzemeltetők";
 
 /* alert title */
-"Server protocol changed." = "A kiszolgáló-protokoll megváltozott.";
+"Server protocol changed." = "A kiszolgáló-protokoll módosult.";
 
 /* queue info */
-"server queue info: %@\n\nlast received msg: %@" = "a kiszolgáló üzenet-sorbaállítási információi: %1$@\n\nutoljára fogadott üzenet: %2$@";
+"server queue info: %@\n\nlast received msg: %@" = "a kiszolgáló sorbaállítási információi: %1$@\n\nutoljára fogadott üzenet: %2$@";
 
 /* server test error */
-"Server requires authorization to create queues, check password" = "A kiszolgálónak engedélyre van szüksége a sorbaállítás létrehozásához, ellenőrizze jelszavát";
+"Server requires authorization to create queues, check password" = "A kiszolgálónak engedélyre van szüksége a sorba állítás létrehozásához, ellenőrizze a jelszavát";
 
 /* server test error */
-"Server requires authorization to upload, check password" = "A kiszolgálónak engedélyre van szüksége a várólisták feltöltéséhez, ellenőrizze jelszavát";
+"Server requires authorization to upload, check password" = "A kiszolgálónak hitelesítésre van szüksége a feltöltéshez, ellenőrizze jelszavát";
 
 /* No comment provided by engineer. */
 "Server test failed!" = "Sikertelen kiszolgáló teszt!";
@@ -4331,7 +4753,7 @@
 "Servers info" = "Információk a kiszolgálókról";
 
 /* No comment provided by engineer. */
-"Servers statistics will be reset - this cannot be undone!" = "A kiszolgálók statisztikái visszaállnak - ez a művelet nem vonható vissza!";
+"Servers statistics will be reset - this cannot be undone!" = "A kiszolgálók statisztikái visszaállnak – ez a művelet nem vonható vissza!";
 
 /* No comment provided by engineer. */
 "Session code" = "Munkamenet kód";
@@ -4340,7 +4762,10 @@
 "Set 1 day" = "Beállítva 1 nap";
 
 /* No comment provided by engineer. */
-"Set contact name…" = "Ismerős nevének beállítása…";
+"Set chat name…" = "Csevegés nevének beállítása…";
+
+/* No comment provided by engineer. */
+"Set contact name…" = "Partner nevének beállítása…";
 
 /* No comment provided by engineer. */
 "Set default theme" = "Alapértelmezett téma beállítása";
@@ -4349,10 +4774,16 @@
 "Set group preferences" = "Csoportbeállítások megadása";
 
 /* No comment provided by engineer. */
-"Set it instead of system authentication." = "Rendszerhitelesítés helyetti beállítás.";
+"Set it instead of system authentication." = "Beállítás a rendszer-hitelesítés helyett.";
+
+/* No comment provided by engineer. */
+"Set member admission" = "Tagbefogadás beállítása";
+
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Üzenetek eltűnési idejének módosítása a csevegésekben.";
 
 /* profile update event chat item */
-"set new contact address" = "új kapcsolattartási cím beállítása";
+"set new contact address" = "új kapcsolattartási címet állított be";
 
 /* profile update event chat item */
 "set new profile picture" = "új profilképet állított be";
@@ -4367,7 +4798,7 @@
 "Set passphrase to export" = "Jelmondat beállítása az exportáláshoz";
 
 /* No comment provided by engineer. */
-"Set the message shown to new members!" = "Megjelenő üzenet beállítása az új tagok számára!";
+"Set the message shown to new members!" = "Megjelenítendő üzenet beállítása az új tagok számára!";
 
 /* No comment provided by engineer. */
 "Set timeouts for proxy/VPN" = "Időtúllépések beállítása a proxy/VPN számára";
@@ -4376,20 +4807,20 @@
 "Settings" = "Beállítások";
 
 /* alert message */
-"Settings were changed." = "A beállítások megváltoztak.";
+"Settings were changed." = "A beállítások módosultak.";
 
 /* No comment provided by engineer. */
-"Shape profile images" = "Profilkép alakzat";
+"Shape profile images" = "Profilkép alakzata";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Megosztás";
 
 /* No comment provided by engineer. */
-"Share 1-time link" = "Egyszer használható hivatkozás megosztása";
+"Share 1-time link" = "Egyszer használható meghívó megosztása";
 
 /* No comment provided by engineer. */
-"Share 1-time link with a friend" = "Egyszer használható meghívó-hivatkozás megosztása egy baráttal";
+"Share 1-time link with a friend" = "Egyszer használható meghívó megosztása egy baráttal";
 
 /* No comment provided by engineer. */
 "Share address" = "Cím megosztása";
@@ -4398,13 +4829,13 @@
 "Share address publicly" = "Cím nyilvános megosztása";
 
 /* alert title */
-"Share address with contacts?" = "Megosztja a címet az ismerőseivel?";
+"Share address with contacts?" = "Megosztja a címet a partnereivel?";
 
 /* No comment provided by engineer. */
 "Share from other apps." = "Megosztás más alkalmazásokból.";
 
 /* No comment provided by engineer. */
-"Share link" = "Hivatkozás megosztása";
+"Share link" = "Megosztás";
 
 /* No comment provided by engineer. */
 "Share profile" = "Profil megosztása";
@@ -4413,13 +4844,16 @@
 "Share SimpleX address on social media." = "SimpleX-cím megosztása a közösségi médiában.";
 
 /* No comment provided by engineer. */
-"Share this 1-time invite link" = "Egyszer használható meghívó-hivatkozás megosztása";
+"Share this 1-time invite link" = "Ennek az egyszer használható meghívónak a megosztása";
 
 /* No comment provided by engineer. */
-"Share to SimpleX" = "Megosztás a SimpleX-ben";
+"Share to SimpleX" = "Megosztás a SimpleXben";
 
 /* No comment provided by engineer. */
-"Share with contacts" = "Megosztás az ismerősökkel";
+"Share with contacts" = "Megosztás a partnerekkel";
+
+/* No comment provided by engineer. */
+"Short link" = "Rövid hivatkozás";
 
 /* No comment provided by engineer. */
 "Show → on messages sent via private routing." = "Egy „→” jel megjelenítése a privát útválasztáson keresztül küldött üzeneteknél.";
@@ -4431,10 +4865,10 @@
 "Show developer options" = "Fejlesztői beállítások megjelenítése";
 
 /* No comment provided by engineer. */
-"Show last messages" = "Szobák utolsó üzeneteinek megjelenítése a listanézetben";
+"Show last messages" = "Legutóbbi üzenet előnézetének megjelenítése";
 
 /* No comment provided by engineer. */
-"Show message status" = "Üzenetállapot megjelenítése";
+"Show message status" = "Üzenet állapotának megjelenítése";
 
 /* No comment provided by engineer. */
 "Show percentage" = "Százalék megjelenítése";
@@ -4446,7 +4880,7 @@
 "Show QR code" = "QR-kód megjelenítése";
 
 /* No comment provided by engineer. */
-"Show:" = "Megjelenítés:";
+"Show:" = "Megjelenítve:";
 
 /* No comment provided by engineer. */
 "SimpleX" = "SimpleX";
@@ -4458,10 +4892,13 @@
 "SimpleX Address" = "SimpleX-cím";
 
 /* No comment provided by engineer. */
-"SimpleX address and 1-time links are safe to share via any messenger." = "A SimpleX-cím és az egyszer használható meghívó-hivatkozás biztonságosan megosztható bármilyen üzenetküldőn keresztül.";
+"SimpleX address and 1-time links are safe to share via any messenger." = "A SimpleX-cím és az egyszer használható meghívó biztonságosan megosztható bármilyen üzenetváltó-alkalmazáson keresztül.";
 
 /* No comment provided by engineer. */
-"SimpleX address or 1-time link?" = "SimpleX-cím vagy egyszer használható meghívó-hivatkozás?";
+"SimpleX address or 1-time link?" = "SimpleX-cím vagy egyszer használható meghívó?";
+
+/* simplex link type */
+"SimpleX channel link" = "SimpleX-csatornahivatkozás";
 
 /* No comment provided by engineer. */
 "SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "A SimpleX Chat és a Flux megállapodást kötött arról, hogy a Flux által üzemeltetett kiszolgálókat beépítik az alkalmazásba.";
@@ -4482,7 +4919,7 @@
 "SimpleX links" = "SimpleX-hivatkozások";
 
 /* No comment provided by engineer. */
-"SimpleX links are prohibited." = "A SimpleX-hivatkozások küldése le van tiltva ebben a csoportban.";
+"SimpleX links are prohibited." = "A SimpleX-hivatkozások küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "SimpleX links not allowed" = "A SimpleX-hivatkozások küldése le van tiltva";
@@ -4500,10 +4937,10 @@
 "SimpleX Lock turned on" = "SimpleX-zár bekapcsolva";
 
 /* simplex link type */
-"SimpleX one-time invitation" = "Egyszer használható SimpleX-meghívó-hivatkozás";
+"SimpleX one-time invitation" = "Egyszer használható SimpleX-meghívó";
 
 /* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "A SimpleX Chat biztonsága a Trail of Bits által lett felülvizsgálva.";
+"SimpleX protocols reviewed by Trail of Bits." = "A SimpleX-protokollokat a Trail of Bits auditálta.";
 
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Egyszerűsített inkognitómód";
@@ -4524,7 +4961,7 @@
 "SMP server" = "SMP-kiszolgáló";
 
 /* No comment provided by engineer. */
-"SOCKS proxy" = "SOCKS proxy";
+"SOCKS proxy" = "SOCKS-proxy";
 
 /* blur media */
 "Soft" = "Enyhe";
@@ -4533,7 +4970,7 @@
 "Some app settings were not migrated." = "Egyes alkalmazásbeállítások nem lettek átköltöztetve.";
 
 /* No comment provided by engineer. */
-"Some file(s) were not exported:" = "Néhány fájl nem került exportálásra:";
+"Some file(s) were not exported:" = "Néhány fájl nem lett exportálva:";
 
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importáláskor – további részleteket a csevegési konzolban olvashat.";
@@ -4547,6 +4984,10 @@
 /* notification title */
 "Somebody" = "Valaki";
 
+/* blocking reason
+report reason */
+"Spam" = "Kéretlen tartalom";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Négyzet, kör vagy bármi a kettő között.";
 
@@ -4557,13 +4998,13 @@
 "Start chat" = "Csevegés indítása";
 
 /* No comment provided by engineer. */
-"Start chat?" = "Csevegés indítása?";
+"Start chat?" = "Elindítja a csevegést?";
 
 /* No comment provided by engineer. */
 "Start migration" = "Átköltöztetés indítása";
 
 /* No comment provided by engineer. */
-"Starting from %@." = "Kezdve ettől %@.";
+"Starting from %@." = "Statisztikagyűjtés kezdete: %@.";
 
 /* No comment provided by engineer. */
 "starting…" = "indítás…";
@@ -4581,22 +5022,22 @@
 "Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "A csevegés megállítása a csevegési adatbázis exportálásához, importálásához vagy törléséhez. A csevegés megállításakor nem tud üzeneteket fogadni és küldeni.";
 
 /* No comment provided by engineer. */
-"Stop chat?" = "Csevegési szolgáltatás megállítása?";
+"Stop chat?" = "Megállítja a csevegést?";
 
 /* cancel file action */
 "Stop file" = "Fájl megállítása";
 
 /* No comment provided by engineer. */
-"Stop receiving file?" = "Fájlfogadás megállítása?";
+"Stop receiving file?" = "Megállítja a fájlfogadást?";
 
 /* No comment provided by engineer. */
-"Stop sending file?" = "Fájlküldés megállítása?";
+"Stop sending file?" = "Megállítja a fájlküldést?";
 
 /* alert action */
 "Stop sharing" = "Megosztás megállítása";
 
 /* alert title */
-"Stop sharing address?" = "Címmegosztás megállítása?";
+"Stop sharing address?" = "Megállítja a címmegosztást?";
 
 /* authentication reason */
 "Stop SimpleX" = "SimpleX megállítása";
@@ -4604,6 +5045,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Csevegés megállítása folyamatban";
 
+/* No comment provided by engineer. */
+"Storage" = "Tárhely";
+
 /* No comment provided by engineer. */
 "strike" = "áthúzott";
 
@@ -4629,13 +5073,13 @@
 "Switch audio and video during the call." = "Hang/Videó váltása hívás közben.";
 
 /* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Csevegési profilváltás az egyszer használható meghívó-hivatkozásokhoz.";
+"Switch chat profile for 1-time invitations." = "Csevegési profilváltás az egyszer használható meghívókhoz.";
 
 /* No comment provided by engineer. */
 "System" = "Rendszer";
 
 /* No comment provided by engineer. */
-"System authentication" = "Rendszerhitelesítés";
+"System authentication" = "Rendszer-hitelesítés";
 
 /* No comment provided by engineer. */
 "Tail" = "Farok";
@@ -4659,19 +5103,22 @@
 "Tap to join" = "Koppintson ide a csatlakozáshoz";
 
 /* No comment provided by engineer. */
-"Tap to join incognito" = "Koppintson ide az inkognitóban való csatlakozáshoz";
+"Tap to join incognito" = "Koppintson ide az inkognitóban való kapcsolódáshoz";
 
 /* No comment provided by engineer. */
 "Tap to paste link" = "Koppintson ide a hivatkozás beillesztéséhez";
 
 /* No comment provided by engineer. */
-"Tap to scan" = "Koppintson ide a QR-kód beolvasáshoz";
+"Tap to scan" = "Koppintson ide a QR-kód beolvasásához";
 
 /* No comment provided by engineer. */
-"TCP connection" = "TCP kapcsolat";
+"TCP connection" = "TCP-kapcsolat";
 
 /* No comment provided by engineer. */
-"TCP connection timeout" = "TCP kapcsolat időtúllépése";
+"TCP connection timeout" = "TCP-kapcsolat időtúllépése";
+
+/* No comment provided by engineer. */
+"TCP port for messaging" = "TCP-port az üzenetváltáshoz";
 
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
@@ -4682,11 +5129,14 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
-"Temporary file error" = "Ideiglenesfájl-hiba";
+/* file error alert title */
+"Temporary file error" = "Ideiglenes fájlhiba";
 
 /* server test failure */
-"Test failed at step %@." = "A teszt sikertelen volt a(z) %@ lépésnél.";
+"Test failed at step %@." = "A teszt a(z) %@ lépésnél sikertelen volt.";
+
+/* No comment provided by engineer. */
+"Test notifications" = "Értesítések tesztelése";
 
 /* No comment provided by engineer. */
 "Test server" = "Kiszolgáló tesztelése";
@@ -4701,34 +5151,34 @@
 "Thank you for installing SimpleX Chat!" = "Köszönjük, hogy telepítette a SimpleX Chatet!";
 
 /* No comment provided by engineer. */
-"Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Köszönet a felhasználóknak – [hozzájárulás a Weblate-en keresztül](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
+"Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Köszönet a felhasználóknak [a Weblate-en való közreműködésért](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
 /* No comment provided by engineer. */
-"Thanks to the users – contribute via Weblate!" = "Köszönet a felhasználóknak - hozzájárulás a Weblate-en!";
+"Thanks to the users – contribute via Weblate!" = "Köszönet a felhasználóknak a Weblate-en való közreműködésért!";
 
 /* No comment provided by engineer. */
-"The app can notify you when you receive messages or contact requests - please open settings to enable." = "Az alkalmazás értesíteni fogja, amikor üzeneteket vagy kapcsolatkéréseket kap – beállítások megnyitása az engedélyezéshez.";
+"The app can notify you when you receive messages or contact requests - please open settings to enable." = "Az alkalmazás értesíteni fogja, amikor üzeneteket vagy meghívási kéréseket kap – ezt a beállítások menüben engedélyezheti.";
 
 /* No comment provided by engineer. */
-"The app protects your privacy by using different operators in each conversation." = "Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetésben más-más üzemeltetőket használ.";
+"The app protects your privacy by using different operators in each conversation." = "Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetéshez más-más üzemeltetőt használ.";
 
 /* No comment provided by engineer. */
 "The app will ask to confirm downloads from unknown file servers (except .onion)." = "Az alkalmazás kérni fogja az ismeretlen fájlkiszolgálókról (kivéve .onion) történő letöltések megerősítését.";
 
 /* No comment provided by engineer. */
-"The attempt to change database passphrase was not completed." = "Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.";
+"The attempt to change database passphrase was not completed." = "Az adatbázis jelmondatának módosítására tett kísérlet nem fejeződött be.";
 
 /* No comment provided by engineer. */
 "The code you scanned is not a SimpleX link QR code." = "A beolvasott QR-kód nem egy SimpleX-QR-kód-hivatkozás.";
 
 /* No comment provided by engineer. */
-"The connection reached the limit of undelivered messages, your contact may be offline." = "A kapcsolat elérte a kézbesítetlen üzenetek számának határát, az Ön ismerőse lehet, hogy offline állapotban van.";
+"The connection reached the limit of undelivered messages, your contact may be offline." = "A kapcsolat elérte a kézbesítetlen üzenetek számának határát, a partnere lehet, hogy offline állapotban van.";
 
 /* No comment provided by engineer. */
 "The connection you accepted will be cancelled!" = "Az Ön által elfogadott kérelem vissza lesz vonva!";
 
 /* No comment provided by engineer. */
-"The contact you shared this link with will NOT be able to connect!" = "Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";
+"The contact you shared this link with will NOT be able to connect!" = "A partnere, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";
 
 /* No comment provided by engineer. */
 "The created archive is available via app Settings / Database / Old database archive." = "A létrehozott archívum a „Beállítások / Adatbázis / Régi adatbázis-archívum” menüben érhető el.";
@@ -4737,37 +5187,31 @@
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "A titkosítás működik, és új titkosítási egyezményre nincs szükség. Ez kapcsolati hibákat eredményezhet!";
 
 /* No comment provided by engineer. */
-"The future of messaging" = "A privát üzenetküldés következő generációja";
+"The future of messaging" = "Az üzenetváltás jövője";
 
 /* No comment provided by engineer. */
-"The hash of the previous message is different." = "Az előző üzenet hasító értéke különbözik.";
+"The hash of the previous message is different." = "Az előző üzenet hasítóértéke különbözik.";
 
 /* No comment provided by engineer. */
-"The ID of the next message is incorrect (less or equal to the previous).\nIt can happen because of some bug or when the connection is compromised." = "A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.";
+"The ID of the next message is incorrect (less or equal to the previous).\nIt can happen because of some bug or when the connection is compromised." = "A következő üzenet azonosítója érvénytelen (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba vagy sérült kapcsolat esetén fordulhat elő.";
 
 /* No comment provided by engineer. */
-"The message will be deleted for all members." = "Az üzenet az összes tag számára törlésre kerül.";
+"The message will be deleted for all members." = "Az üzenet az összes tag számára törölve lesz.";
 
 /* No comment provided by engineer. */
 "The message will be marked as moderated for all members." = "Az üzenet az összes tag számára moderáltként lesz megjelölve.";
 
 /* No comment provided by engineer. */
-"The messages will be deleted for all members." = "Az üzenetek az összes tag számára törlésre kerülnek.";
+"The messages will be deleted for all members." = "Az üzenetek az összes tag számára törölve lesznek.";
 
 /* No comment provided by engineer. */
 "The messages will be marked as moderated for all members." = "Az üzenetek az összes tag számára moderáltként lesznek megjelölve.";
 
 /* No comment provided by engineer. */
-"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem került eltávolításra az átköltöztetéskor, így törölhető.";
+"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem lett eltávolítva az átköltöztetéskor, ezért törölhető.";
 
 /* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "A profilja csak az ismerőseivel kerül megosztásra.";
-
-/* No comment provided by engineer. */
-"The same conditions will apply to operator **%@**." = "Ugyanezek a feltételek lesznek elfogadva a következő üzemeltetőre is: **%@**.";
-
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető(k)re is: **%@**.";
+"The same conditions will apply to operator **%@**." = "Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető számára is: **%@**.";
 
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "A második előre beállított üzemeltető az alkalmazásban!";
@@ -4779,16 +5223,16 @@
 "The sender will NOT be notified" = "A feladó NEM fog értesítést kapni";
 
 /* No comment provided by engineer. */
-"The servers for new connections of your current chat profile **%@**." = "A jelenlegi csevegési profilhoz tartozó új kapcsolatok kiszolgálói **%@**.";
+"The servers for new connections of your current chat profile **%@**." = "A jelenlegi **%@** nevű csevegési profiljához tartozó új kapcsolatok kiszolgálói.";
 
 /* No comment provided by engineer. */
-"The servers for new files of your current chat profile **%@**." = "Az Ön jelenlegi **%@** nevű csevegőprofiljához tartozó új fájlok kiszolgálói.";
+"The servers for new files of your current chat profile **%@**." = "A jelenlegi **%@** nevű csevegési profiljához tartozó új fájlok kiszolgálói.";
 
 /* No comment provided by engineer. */
 "The text you pasted is not a SimpleX link." = "A beillesztett szöveg nem egy SimpleX-hivatkozás.";
 
 /* No comment provided by engineer. */
-"The uploaded database archive will be permanently removed from the servers." = "A feltöltött adatbázis-archívum véglegesen eltávolításra kerül a kiszolgálókról.";
+"The uploaded database archive will be permanently removed from the servers." = "A feltöltött adatbázis-archívum véglegesen el lesz távolítva a kiszolgálókról.";
 
 /* No comment provided by engineer. */
 "Themes" = "Témák";
@@ -4797,52 +5241,61 @@
 "These conditions will also apply for: **%@**." = "Ezek a feltételek lesznek elfogadva a következő számára is: **%@**.";
 
 /* No comment provided by engineer. */
-"These settings are for your current profile **%@**." = "Ezek a beállítások csak a jelenlegi (**%@**) profiljára vonatkoznak.";
+"These settings are for your current profile **%@**." = "Ezek a beállítások csak a jelenlegi **%@** nevű csevegési profiljára vonatkoznak.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Ezek felülbírálhatók az ismerős- és csoportbeállításokban.";
+"They can be overridden in contact and group settings." = "Ezek felülbírálhatók a partner- és csoportbeállításokban.";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Ez a művelet nem vonható vissza - az összes fogadott és küldött fájl a médiatartalmakkal együtt törlésre kerül. Az alacsony felbontású képek viszont megmaradnak.";
+"This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Ez a művelet nem vonható vissza – az összes fogadott és küldött fájl a médiatartalmakkal együtt törölve lesznek. Az alacsony felbontású képek viszont megmaradnak.";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Ez a művelet nem vonható vissza - a kiválasztottnál korábban küldött és fogadott üzenetek törlésre kerülnek. Ez több percet is igénybe vehet.";
+"This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Ez a művelet nem vonható vissza – a kijelöltnél korábban küldött és fogadott üzenetek törölve lesznek. Ez több percet is igénybe vehet.";
+
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Ez a művelet nem vonható vissza – a kijelölt üzenettől korábban küldött és fogadott üzenetek törölve lesznek a csevegésből.";
 
 /* No comment provided by engineer. */
-"This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Ez a művelet nem vonható vissza - profiljai, ismerősei, üzenetei és fájljai visszafordíthatatlanul törlésre kerülnek.";
+"This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Ez a művelet nem vonható vissza – profiljai, partnerei, üzenetei és fájljai véglegesen törölve lesznek.";
 
 /* E2EE info chat item */
 "This chat is protected by end-to-end encryption." = "Ez a csevegés végpontok közötti titkosítással védett.";
 
 /* E2EE info chat item */
-"This chat is protected by quantum resistant end-to-end encryption." = "Ez a csevegés végpontok közötti kvantumrezisztens tikosítással védett.";
+"This chat is protected by quantum resistant end-to-end encryption." = "Ez a csevegés végpontok közötti kvantumbiztos titkosítással védett.";
 
 /* notification title */
-"this contact" = "ez az ismerős";
+"this contact" = "ez a partner";
 
 /* No comment provided by engineer. */
 "This device name" = "Ennek az eszköznek a neve";
 
 /* No comment provided by engineer. */
-"This display name is invalid. Please choose another name." = "Ez a megjelenített név érvénytelen. Válasszon egy másik nevet.";
+"This display name is invalid. Please choose another name." = "Ez a megjelenítendő név érvénytelen. Válasszon egy másik nevet.";
 
 /* No comment provided by engineer. */
-"This group has over %lld members, delivery receipts are not sent." = "Ennek a csoportnak több mint %lld tagja van, a kézbesítési jelentések nem kerülnek elküldésre.";
+"This group has over %lld members, delivery receipts are not sent." = "Ennek a csoportnak több mint %lld tagja van, a kézbesítési jelentések nem lesznek elküldve.";
 
 /* No comment provided by engineer. */
 "This group no longer exists." = "Ez a csoport már nem létezik.";
 
 /* No comment provided by engineer. */
-"This is your own one-time link!" = "Ez az Ön egyszer használható meghívó-hivatkozása!";
+"This is your own one-time link!" = "Ez a saját egyszer használható meghívója!";
 
 /* No comment provided by engineer. */
-"This is your own SimpleX address!" = "Ez az Ön SimpleX-címe!";
+"This is your own SimpleX address!" = "Ez a saját SimpleX-címe!";
+
+/* No comment provided by engineer. */
+"This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." = "Ez a hivatkozás újabb alkalmazásverziót igényel. Frissítse az alkalmazást vagy kérjen egy kompatibilis hivatkozást a partnerétől.";
 
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Ezt a hivatkozást egy másik hordozható eszközön már használták, hozzon létre egy új hivatkozást a számítógépén.";
 
 /* No comment provided by engineer. */
-"This setting applies to messages in your current chat profile **%@**." = "Ez a beállítás csak a jelenlegi (**%@**) profiljában lévő üzenetekre vonatkozik.";
+"This message was deleted or not received yet." = "Ez az üzenet törölve lett vagy még nem érkezett meg.";
+
+/* No comment provided by engineer. */
+"This setting applies to messages in your current chat profile **%@**." = "Ez a beállítás csak az Ön jelenlegi **%@** nevű csevegési profiljában lévő üzenetekre vonatkozik.";
 
 /* No comment provided by engineer. */
 "Title" = "Cím";
@@ -4851,7 +5304,7 @@
 "To ask any questions and to receive updates:" = "Bármilyen kérdés feltevéséhez és a frissítésekért:";
 
 /* No comment provided by engineer. */
-"To connect, your contact can scan QR code or use the link in the app." = "A kapcsolódáshoz az ismerőse beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.";
+"To connect, your contact can scan QR code or use the link in the app." = "A kapcsolódáshoz a partnere beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.";
 
 /* No comment provided by engineer. */
 "To hide unwanted messages." = "Kéretlen üzenetek elrejtése.";
@@ -4860,7 +5313,7 @@
 "To make a new connection" = "Új kapcsolat létrehozásához";
 
 /* No comment provided by engineer. */
-"To protect against your link being replaced, you can compare contact security codes." = "A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat az ismerősével.";
+"To protect against your link being replaced, you can compare contact security codes." = "A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat a partnerével.";
 
 /* No comment provided by engineer. */
 "To protect timezone, image/voice files use UTC." = "Az időzóna védelmének érdekében a kép-/hangfájlok UTC-t használnak.";
@@ -4872,7 +5325,7 @@
 "To protect your IP address, private routing uses your SMP servers to deliver messages." = "Az IP-cím védelmének érdekében a privát útválasztás az SMP-kiszolgálókat használja az üzenetek kézbesítéséhez.";
 
 /* No comment provided by engineer. */
-"To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Az adatvédelem érdekében (a más csevegési platformokon megszokott felhasználó-azonosítók helyett) a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, az összes ismerőséhez különbözőt.";
+"To protect your privacy, SimpleX uses separate IDs for each of your contacts." = "Adatainak védelme érdekében a SimpleX külön üzenet-azonosítókat használ minden egyes kapcsolatához.";
 
 /* No comment provided by engineer. */
 "To receive" = "A fogadáshoz";
@@ -4887,7 +5340,7 @@
 "To record voice message please grant permission to use Microphone." = "Hangüzenet rögzítéséhez adjon engedélyt a mikrofon használathoz.";
 
 /* No comment provided by engineer. */
-"To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Rejtett profilja megjelenítéséhez írja be a teljes jelszavát a keresőmezőbe a **Csevegési profilok** menüben.";
+"To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." = "Rejtett profilja felfedéséhez adja meg a teljes jelszót a keresőmezőben, a **Csevegési profilok** menüben.";
 
 /* No comment provided by engineer. */
 "To send" = "A küldéshez";
@@ -4899,13 +5352,16 @@
 "To use the servers of **%@**, accept conditions of use." = "A(z) **%@** kiszolgálóinak használatához fogadja el a használati feltételeket.";
 
 /* No comment provided by engineer. */
-"To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) az ismerőse eszközén lévő kóddal.";
+"To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) a partnere eszközén lévő kóddal.";
 
 /* No comment provided by engineer. */
-"Toggle chat list:" = "Csevegőlista átváltása:";
+"Toggle chat list:" = "Csevegési lista átváltása:";
 
 /* No comment provided by engineer. */
-"Toggle incognito when connecting." = "Inkognitómód használata kapcsolódáskor.";
+"Toggle incognito when connecting." = "Inkognitóra váltás kapcsolódáskor.";
+
+/* token status */
+"Token status: %@." = "Token állapota: %@.";
 
 /* No comment provided by engineer. */
 "Toolbar opacity" = "Eszköztár átlátszatlansága";
@@ -4914,16 +5370,16 @@
 "Total" = "Összes kapcsolat";
 
 /* No comment provided by engineer. */
-"Transport isolation" = "Átvitel-izoláció módja";
+"Transport isolation" = "Átvitelelkülönítés";
 
 /* No comment provided by engineer. */
 "Transport sessions" = "Munkamenetek átvitele";
 
 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál (hiba: %@).";
+"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál (hiba: %@).";
 
 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.";
+"Trying to connect to the server used to receive messages from this contact." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.";
 
 /* No comment provided by engineer. */
 "Turkish interface" = "Török kezelőfelület";
@@ -4941,7 +5397,7 @@
 "Unblock" = "Feloldás";
 
 /* No comment provided by engineer. */
-"Unblock for all" = "Letiltás feloldása az összes tag számára";
+"Unblock for all" = "Feloldás";
 
 /* No comment provided by engineer. */
 "Unblock member" = "Tag feloldása";
@@ -4950,7 +5406,7 @@
 "Unblock member for all?" = "Az összes tag számára feloldja a tag letiltását?";
 
 /* No comment provided by engineer. */
-"Unblock member?" = "Tag feloldása?";
+"Unblock member?" = "Feloldja a tag letiltását?";
 
 /* rcv group event chat item */
 "unblocked %@" = "feloldotta %@ letiltását";
@@ -5001,13 +5457,13 @@
 "Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." = "Hacsak nem az iOS hívási felületét használja, engedélyezze a Ne zavarjanak módot a megszakítások elkerülése érdekében.";
 
 /* No comment provided by engineer. */
-"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";
+"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Hacsak a partnere nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg a partnerét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";
 
 /* No comment provided by engineer. */
 "Unlink" = "Szétkapcsolás";
 
 /* No comment provided by engineer. */
-"Unlink desktop?" = "Számítógép szétkapcsolása?";
+"Unlink desktop?" = "Leválasztja a számítógépet?";
 
 /* No comment provided by engineer. */
 "Unlock" = "Feloldás";
@@ -5015,10 +5471,7 @@
 /* authentication reason */
 "Unlock app" = "Alkalmazás feloldása";
 
-/* No comment provided by engineer. */
-"unmute" = "némítás megszüntetése";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Némítás megszüntetése";
 
 /* No comment provided by engineer. */
@@ -5028,19 +5481,25 @@
 "Unread" = "Olvasatlan";
 
 /* No comment provided by engineer. */
-"Up to 100 last messages are sent to new members." = "Legfeljebb az utolsó 100 üzenet kerül elküldésre az új tagok számára.";
+"Unsupported connection link" = "Nem támogatott kapcsolattartási hivatkozás";
+
+/* No comment provided by engineer. */
+"Up to 100 last messages are sent to new members." = "Legfeljebb az utolsó 100 üzenet lesz elküldve az új tagok számára.";
 
 /* No comment provided by engineer. */
 "Update" = "Frissítés";
 
 /* No comment provided by engineer. */
-"Update database passphrase" = "Adatbázis-jelmondat megváltoztatása";
+"Update database passphrase" = "Az adatbázis jelmondatának módosítása";
 
 /* No comment provided by engineer. */
-"Update network settings?" = "Hálózati beállítások megváltoztatása?";
+"Update network settings?" = "Módosítja a hálózati beállításokat?";
 
 /* No comment provided by engineer. */
-"Update settings?" = "Beállítások frissítése?";
+"Update settings?" = "Frissíti a beállításokat?";
+
+/* No comment provided by engineer. */
+"Updated conditions" = "Frissített feltételek";
 
 /* rcv group event chat item */
 "updated group profile" = "frissítette a csoport profilját";
@@ -5079,7 +5538,7 @@
 "Use %@" = "%@ használata";
 
 /* No comment provided by engineer. */
-"Use chat" = "Csevegés használata";
+"Use chat" = "SimpleX Chat használata";
 
 /* No comment provided by engineer. */
 "Use current profile" = "Jelenlegi profil használata";
@@ -5106,7 +5565,7 @@
 "Use only local notifications?" = "Csak helyi értesítések használata?";
 
 /* No comment provided by engineer. */
-"Use private routing with unknown servers when IP address is not protected." = "Használjon privát útválasztást ismeretlen kiszolgálókkal, ha az IP-cím nem védett.";
+"Use private routing with unknown servers when IP address is not protected." = "Használjon privát útválasztást az ismeretlen kiszolgálókkal, ha az IP-cím nem védett.";
 
 /* No comment provided by engineer. */
 "Use private routing with unknown servers." = "Használjon privát útválasztást ismeretlen kiszolgálókkal.";
@@ -5117,11 +5576,20 @@
 /* No comment provided by engineer. */
 "Use servers" = "Kiszolgálók használata";
 
+/* No comment provided by engineer. */
+"Use short links (BETA)" = "Rövid hivatkozások használata (béta)";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "SimpleX Chat-kiszolgálók használata?";
 
 /* No comment provided by engineer. */
-"Use SOCKS proxy" = "SOCKS proxy használata";
+"Use SOCKS proxy" = "SOCKS-proxy használata";
+
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "A következő TCP-port használata, amikor nincs port megadva: %@.";
+
+/* No comment provided by engineer. */
+"Use TCP port 443 for preset servers only." = "A 443-as TCP-port használata kizárólag az előre beállított kiszolgálokhoz.";
 
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Használja az alkalmazást hívás közben.";
@@ -5130,7 +5598,10 @@
 "Use the app with one hand." = "Használja az alkalmazást egy kézzel.";
 
 /* No comment provided by engineer. */
-"User selection" = "Felhasználó kiválasztása";
+"Use web port" = "Webport használata";
+
+/* No comment provided by engineer. */
+"User selection" = "Felhasználó kijelölése";
 
 /* No comment provided by engineer. */
 "Username" = "Felhasználónév";
@@ -5169,19 +5640,19 @@
 "Via browser" = "Böngészőn keresztül";
 
 /* chat list item description */
-"via contact address link" = "kapcsolattartási cím-hivatkozáson keresztül";
+"via contact address link" = "a kapcsolattartási címhivatkozáson keresztül";
 
 /* chat list item description */
 "via group link" = "a csoporthivatkozáson keresztül";
 
 /* chat list item description */
-"via one-time link" = "egyszer használható meghívó-hivatkozáson keresztül";
+"via one-time link" = "egy egyszer használható meghívón keresztül";
 
 /* No comment provided by engineer. */
-"via relay" = "közvetítő-kiszolgálón keresztül";
+"via relay" = "egy továbbítókiszolgálón keresztül";
 
 /* No comment provided by engineer. */
-"Via secure quantum resistant protocol." = "Biztonságos kvantumrezisztens-protokollon keresztül.";
+"Via secure quantum resistant protocol." = "Biztonságos kvantumbiztos protokollon keresztül.";
 
 /* No comment provided by engineer. */
 "video" = "videó";
@@ -5199,7 +5670,7 @@
 "Video will be received when your contact is online, please wait or check later!" = "A videó akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!";
 
 /* No comment provided by engineer. */
-"Videos and files up to 1gb" = "Videók és fájlok 1Gb méretig";
+"Videos and files up to 1gb" = "Videók és fájlok legfeljebb 1GB méretig";
 
 /* No comment provided by engineer. */
 "View conditions" = "Feltételek megtekintése";
@@ -5223,13 +5694,13 @@
 "Voice messages are prohibited in this chat." = "A hangüzenetek küldése le van tiltva ebben a csevegésben.";
 
 /* No comment provided by engineer. */
-"Voice messages are prohibited." = "A hangüzenetek küldése le van tiltva ebben a csoportban.";
+"Voice messages are prohibited." = "A hangüzenetek küldése le van tiltva.";
 
 /* No comment provided by engineer. */
 "Voice messages not allowed" = "A hangüzenetek küldése le van tiltva";
 
 /* No comment provided by engineer. */
-"Voice messages prohibited!" = "A hangüzenetek le vannak tilva!";
+"Voice messages prohibited!" = "A hangüzenetek le vannak tiltva!";
 
 /* No comment provided by engineer. */
 "waiting for answer…" = "várakozás a válaszra…";
@@ -5250,7 +5721,7 @@
 "Waiting for video" = "Várakozás a videóra";
 
 /* No comment provided by engineer. */
-"Wallpaper accent" = "Háttérkép kiemelés";
+"Wallpaper accent" = "Háttérkép kiemelőszíne";
 
 /* No comment provided by engineer. */
 "Wallpaper background" = "Háttérkép háttérszíne";
@@ -5259,7 +5730,7 @@
 "wants to connect to you!" = "kapcsolatba akar lépni Önnel!";
 
 /* No comment provided by engineer. */
-"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, továbbá üzenetkézbesítési hibákat okozhat";
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, mert üzenetkézbesítési hibákat okoz";
 
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Figyelmeztetés: néhány adat elveszhet!";
@@ -5271,7 +5742,7 @@
 "weeks" = "hét";
 
 /* No comment provided by engineer. */
-"Welcome %@!" = "Üdvözöllek %@!";
+"Welcome %@!" = "Üdvözöljük %@!";
 
 /* No comment provided by engineer. */
 "Welcome message" = "Üdvözlőüzenet";
@@ -5292,7 +5763,7 @@
 "when IP hidden" = "ha az IP-cím rejtett";
 
 /* No comment provided by engineer. */
-"When more than one operator is enabled, none of them has metadata to learn who communicates with whom." = "Amikor egynél több hálózati üzemeltető van engedélyezve, egyikük sem rendelkezik olyan metaadatokkal ahhoz, hogy felderítse, ki kommunikál kivel.";
+"When more than one operator is enabled, none of them has metadata to learn who communicates with whom." = "Amikor egynél több üzemeltető van engedélyezve, akkor egyik sem rendelkezik olyan metaadatokkal, amelyekből megtudható, hogy ki kivel kommunikál.";
 
 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Inkognitóprofil megosztása esetén a rendszer azt a profilt fogja használni azokhoz a csoportokhoz, amelyekbe meghívást kapott.";
@@ -5316,22 +5787,22 @@
 "With reduced battery usage." = "Csökkentett akkumulátor-használattal.";
 
 /* No comment provided by engineer. */
-"Without Tor or VPN, your IP address will be visible to file servers." = "Tor vagy VPN nélkül az IP-címe látható lesz a fájlkiszolgálók számára.";
+"Without Tor or VPN, your IP address will be visible to file servers." = "Tor vagy VPN nélkül az IP-címe láthatóvá válik a fájlkiszolgálók számára.";
 
 /* alert message */
-"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Tor vagy VPN nélkül az IP-címe látható lesz a következő XFTP-közvetítő-kiszolgálók számára: %@.";
+"Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." = "Tor vagy VPN nélkül az IP-címe láthatóvá válik a következő XFTP-továbbítókiszolgálók számára: %@.";
 
 /* No comment provided by engineer. */
-"Wrong database passphrase" = "Hibás adatbázis-jelmondat";
+"Wrong database passphrase" = "Érvénytelen adatbázis-jelmondat";
 
 /* snd error text */
-"Wrong key or unknown connection - most likely this connection is deleted." = "Hibás kulcs vagy ismeretlen kapcsolat - valószínűleg ez a kapcsolat törlődött.";
+"Wrong key or unknown connection - most likely this connection is deleted." = "Érvénytelen kulcs vagy ismeretlen kapcsolat – valószínűleg ez a kapcsolat törlődött.";
 
 /* file error text */
-"Wrong key or unknown file chunk address - most likely file is deleted." = "Hibás kulcs vagy ismeretlen fájltöredék cím - valószínűleg a fájl törlődött.";
+"Wrong key or unknown file chunk address - most likely file is deleted." = "Érvénytelen kulcs vagy ismeretlen fájltöredékcím – valószínűleg a fájl törlődött.";
 
 /* No comment provided by engineer. */
-"Wrong passphrase!" = "Hibás jelmondat!";
+"Wrong passphrase!" = "Érvénytelen jelmondat!";
 
 /* No comment provided by engineer. */
 "XFTP server" = "XFTP-kiszolgáló";
@@ -5348,23 +5819,26 @@
 /* No comment provided by engineer. */
 "You accepted connection" = "Kapcsolat létrehozása";
 
+/* snd group event chat item */
+"you accepted this member" = "Ön befogadta ezt a tagot";
+
 /* No comment provided by engineer. */
 "You allow" = "Ön engedélyezi";
 
 /* No comment provided by engineer. */
-"You already have a chat profile with the same display name. Please choose another name." = "Már van egy csevegési profil ugyanezzel a megjelenített névvel. Válasszon egy másik nevet.";
+"You already have a chat profile with the same display name. Please choose another name." = "Már van egy csevegési profil ugyanezzel a megjelenítendő névvel. Válasszon egy másik nevet.";
 
 /* No comment provided by engineer. */
-"You are already connected to %@." = "Ön már kapcsolódva van ehhez: %@.";
+"You are already connected to %@." = "Ön már kapcsolódott a következőhöz: %@.";
 
 /* No comment provided by engineer. */
 "You are already connected with %@." = "Ön már kapcsolódva van vele: %@.";
 
 /* No comment provided by engineer. */
-"You are already connecting to %@." = "Már folyamatban van a kapcsolódás ehhez: %@.";
+"You are already connecting to %@." = "A kapcsolódás már folyamatban van a következőhöz: %@.";
 
 /* No comment provided by engineer. */
-"You are already connecting via this one-time link!" = "A kapcsolódás már folyamatban van ezen az egyszer használható meghívó-hivatkozáson keresztül!";
+"You are already connecting via this one-time link!" = "A kapcsolódás már folyamatban van ezen az egyszer használható meghívón keresztül!";
 
 /* No comment provided by engineer. */
 "You are already in group %@." = "Ön már a(z) %@ nevű csoport tagja.";
@@ -5379,16 +5853,16 @@
 "You are already joining the group via this link." = "A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül.";
 
 /* No comment provided by engineer. */
-"You are already joining the group!\nRepeat join request?" = "Csatlakozás folyamatban!\nCsatlakozáskérés megismétlése?";
+"You are already joining the group!\nRepeat join request?" = "A csatlakozás már folyamatban van a csoporthoz!\nMegismétli a meghívási kérést?";
 
 /* No comment provided by engineer. */
-"You are connected to the server used to receive messages from this contact." = "Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.";
+"You are connected to the server used to receive messages from this contact." = "Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.";
 
 /* No comment provided by engineer. */
-"you are invited to group" = "meghívást kapott a csoportba";
+"you are invited to group" = "Ön meghívást kapott a csoportba";
 
 /* No comment provided by engineer. */
-"You are invited to group" = "Meghívást kapott a csoportba";
+"You are invited to group" = "Ön meghívást kapott a csoportba";
 
 /* No comment provided by engineer. */
 "You are not connected to these servers. Private routing is used to deliver messages to them." = "Ön nem kapcsolódik ezekhez a kiszolgálókhoz. A privát útválasztás az üzenetek kézbesítésére szolgál.";
@@ -5405,9 +5879,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Ezt a „Megjelenés” menüben módosíthatja.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Az üzemeltetőket a „Hálózat és kiszolgálók” beállításaban konfigurálhatja.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "A kiszolgálókat a „Hálózat és kiszolgálók” menüben konfigurálhatja.";
 
@@ -5418,40 +5889,40 @@
 "You can enable later via Settings" = "Később engedélyezheti a „Beállításokban”";
 
 /* No comment provided by engineer. */
-"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüjében.";
+"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az „Adatvédelem és biztonság” menüben.";
 
 /* No comment provided by engineer. */
 "You can give another try." = "Megpróbálhatja még egyszer.";
 
 /* No comment provided by engineer. */
-"You can hide or mute a user profile - swipe it to the right." = "Elrejtheti vagy lenémíthatja a felhasználó -profiljait - csúsztassa jobbra a profilt.";
+"You can hide or mute a user profile - swipe it to the right." = "Elrejtheti vagy lenémíthatja a felhasználó -profiljait – csúsztassa jobbra a profilt.";
 
 /* No comment provided by engineer. */
-"You can make it visible to your SimpleX contacts via Settings." = "Láthatóvá teheti a SimpleXbeli ismerősei számára a „Beállításokban”.";
+"You can make it visible to your SimpleX contacts via Settings." = "Láthatóvá teheti a SimpleXbeli partnerei számára a „Beállításokban”.";
 
 /* notification body */
 "You can now chat with %@" = "Mostantól küldhet üzeneteket %@ számára";
 
 /* No comment provided by engineer. */
-"You can send messages to %@ from Archived contacts." = "Az „Archivált ismerősökből” továbbra is küldhet üzeneteket neki: %@.";
+"You can send messages to %@ from Archived contacts." = "Az „Archivált partnerekből” továbbra is küldhet üzeneteket neki: %@.";
 
 /* No comment provided by engineer. */
-"You can set connection name, to remember who the link was shared with." = "Beállíthatja az ismerős nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.";
+"You can set connection name, to remember who the link was shared with." = "Beállíthatja a partner nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.";
 
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "A lezárási képernyő értesítési előnézetét az „Értesítések” menüben állíthatja be.";
 
 /* No comment provided by engineer. */
-"You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it." = "Megoszthat egy hivatkozást vagy QR-kódot - így bárki csatlakozhat a csoporthoz. Ha a csoport később törlésre kerül, akkor nem fogja elveszíteni annak tagjait.";
+"You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it." = "Megoszthat egy hivatkozást vagy QR-kódot – így bárki csatlakozhat a csoporthoz. Ha a csoportot Ön később törli, akkor nem fogja elveszíteni annak tagjait.";
 
 /* No comment provided by engineer. */
-"You can share this address with your contacts to let them connect with **%@**." = "Megoszthatja ezt a címet az ismerőseivel, hogy kapcsolatba léphessenek Önnel a(z) **%@** nevű profilján keresztül.";
+"You can share this address with your contacts to let them connect with **%@**." = "Megoszthatja ezt a SimpleX-címet a partnereivel, hogy kapcsolatba léphessenek vele: **%@**.";
 
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "A csevegést az alkalmazás „Beállítások / Adatbázis” menüben vagy az alkalmazás újraindításával indíthatja el";
 
 /* No comment provided by engineer. */
-"You can still view conversation with %@ in the list of chats." = "A(z) %@ nevű ismerősével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.";
+"You can still view conversation with %@ in the list of chats." = "A(z) %@ nevű partnerével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.";
 
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "A SimpleX-zár az „Adatvédelem és biztonság” menüben kapcsolható be.";
@@ -5460,22 +5931,25 @@
 "You can use markdown to format messages:" = "Üzenetek formázása a szövegbe szúrt speciális karakterekkel:";
 
 /* alert message */
-"You can view invitation link again in connection details." = "A meghívó-hivatkozást újra megtekintheti a kapcsolat részleteinél.";
+"You can view invitation link again in connection details." = "A meghívási hivatkozást újra megtekintheti a kapcsolat részleteinél.";
+
+/* alert message */
+"You can view your reports in Chat with admins." = "A jelentéseket megtekintheti a „Csevegés az adminisztrátorokkal” menüben.";
 
 /* No comment provided by engineer. */
 "You can't send messages!" = "Nem lehet üzeneteket küldeni!";
 
 /* chat item text */
-"you changed address" = "cím megváltoztatva";
+"you changed address" = "Ön módosította a címet";
 
 /* chat item text */
-"you changed address for %@" = "cím megváltoztatva nála: %@";
+"you changed address for %@" = "Ön módosította a címet %@ számára";
 
 /* snd group event chat item */
-"you changed role for yourself to %@" = "saját szerepköre megváltozott erre: %@";
+"you changed role for yourself to %@" = "Ön a következőre módosította a saját szerepkörét: „%@”";
 
 /* snd group event chat item */
-"you changed role of %@ to %@" = "Ön megváltoztatta %1$@ szerepkörét erre: %@";
+"you changed role of %@ to %@" = "Ön a következőre módosította %1$@ szerepkörét: „%2$@”";
 
 /* No comment provided by engineer. */
 "You could not be verified; please try again." = "Nem sikerült hitelesíteni; próbálja meg újra.";
@@ -5484,22 +5958,22 @@
 "You decide who can connect." = "Ön dönti el, hogy kivel beszélget.";
 
 /* No comment provided by engineer. */
-"You have already requested connection via this address!" = "Már küldött egy kapcsolatkérést ezen a címen keresztül!";
+"You have already requested connection via this address!" = "Már küldött egy meghívási kérést ezen a címen keresztül!";
 
 /* No comment provided by engineer. */
-"You have already requested connection!\nRepeat connection request?" = "Már küldött egy kapcsolódási kérelmet!\nKapcsolatkérés megismétlése?";
+"You have already requested connection!\nRepeat connection request?" = "Ön már küldött egy meghívási kérést!\nMegismétli a meghívási kérést?";
 
 /* No comment provided by engineer. */
-"You have to enter passphrase every time the app starts - it is not stored on the device." = "A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul - nem az eszközön kerül tárolásra.";
+"You have to enter passphrase every time the app starts - it is not stored on the device." = "A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul – nem az eszközön van tárolva.";
 
 /* No comment provided by engineer. */
-"You invited a contact" = "Meghívta egy ismerősét";
+"You invited a contact" = "Ön meghívta egy partnerét";
 
 /* No comment provided by engineer. */
-"You joined this group" = "Csatlakozott ehhez a csoporthoz";
+"You joined this group" = "Ön csatlakozott ehhez a csoporthoz";
 
 /* No comment provided by engineer. */
-"You joined this group. Connecting to inviting group member." = "Csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.";
+"You joined this group. Connecting to inviting group member." = "Ön csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.";
 
 /* snd group event chat item */
 "you left" = "Ön elhagyta a csoportot";
@@ -5511,13 +5985,13 @@
 "You may save the exported archive." = "Az exportált archívumot elmentheti.";
 
 /* No comment provided by engineer. */
-"You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi ismerősétől.";
+"You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi partnerétől.";
 
 /* No comment provided by engineer. */
-"You need to allow your contact to call to be able to call them." = "Engedélyeznie kell a hívásokat az ismerőse számára, hogy fel tudják hívni egymást.";
+"You need to allow your contact to call to be able to call them." = "Engedélyeznie kell a hívásokat a partnere számára, hogy fel tudják hívni egymást.";
 
 /* No comment provided by engineer. */
-"You need to allow your contact to send voice messages to be able to send them." = "Engedélyeznie kell a hangüzenetek küldését az ismerőse számára, hogy hangüzeneteket küldhessenek egymásnak.";
+"You need to allow your contact to send voice messages to be able to send them." = "Engedélyeznie kell a hangüzenetek küldését a partnere számára, hogy hangüzeneteket küldhessenek egymásnak.";
 
 /* No comment provided by engineer. */
 "You rejected group invitation" = "Csoportmeghívó elutasítva";
@@ -5529,10 +6003,13 @@
 "You sent group invitation" = "Csoportmeghívó elküldve";
 
 /* chat list item description */
-"you shared one-time link" = "Ön egy egyszer használható meghívó-hivatkozást osztott meg";
+"you shared one-time link" = "Ön egy egyszer használható meghívót osztott meg";
 
 /* chat list item description */
-"you shared one-time link incognito" = "Ön egy egyszer használható meghívó-hivatkozást osztott meg inkognitóban";
+"you shared one-time link incognito" = "Ön egy egyszer használható meghívót osztott meg inkognitóban";
+
+/* token info */
+"You should receive notifications." = "Ön megkapja az értesítéseket.";
 
 /* snd group event chat item */
 "you unblocked %@" = "Ön feloldotta %@ letiltását";
@@ -5544,13 +6021,13 @@
 "You will be connected when group link host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva, amikor a csoporthivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";
 
 /* No comment provided by engineer. */
-"You will be connected when your connection request is accepted, please wait or check later!" = "Akkor lesz kapcsolódva, ha a kapcsolatkérése elfogadásra kerül, várjon, vagy ellenőrizze később!";
+"You will be connected when your connection request is accepted, please wait or check later!" = "Akkor lesz kapcsolódva, ha a meghívási kérése el lesz fogadva, várjon, vagy ellenőrizze később!";
 
 /* No comment provided by engineer. */
-"You will be connected when your contact's device is online, please wait or check later!" = "Akkor lesz kapcsolódva, amikor az ismerősének eszköze online lesz, várjon, vagy ellenőrizze később!";
+"You will be connected when your contact's device is online, please wait or check later!" = "Akkor lesz kapcsolódva, amikor a partnerének az eszköze online lesz, várjon, vagy ellenőrizze később!";
 
 /* No comment provided by engineer. */
-"You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Az alkalmazás indításakor, vagy 30 másodpercnyi háttérben töltött idő után az alkalmazáshoz visszatérve hitelesítés szükséges.";
+"You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Az alkalmazás elindításához vagy 30 másodpercnyi háttérben töltött idő után, az alkalmazáshoz való visszatéréshez hitelesítésre lesz szükség.";
 
 /* No comment provided by engineer. */
 "You will connect to all group members." = "Kapcsolódni fog a csoport összes tagjához.";
@@ -5565,16 +6042,16 @@
 "You will stop receiving messages from this group. Chat history will be preserved." = "Ettől a csoporttól nem fog értesítéseket kapni. A csevegési előzmények megmaradnak.";
 
 /* No comment provided by engineer. */
-"You won't lose your contacts if you later delete your address." = "Nem veszíti el az ismerőseit, ha később törli a címét.";
+"You won't lose your contacts if you later delete your address." = "Nem veszíti el a partnereit, ha később törli a címét.";
 
 /* No comment provided by engineer. */
 "you: " = "Ön: ";
 
 /* No comment provided by engineer. */
-"You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile" = "Egy olyan ismerősét próbálja meghívni, akivel inkognitóprofilt osztott meg abban a csoportban, amelyben a saját fő profilja van használatban";
+"You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile" = "Egy olyan partnerét próbálja meghívni, akivel inkognitóprofilt osztott meg abban a csoportban, amelyben a fő profilja van használatban";
 
 /* No comment provided by engineer. */
-"You're using an incognito profile for this group - to prevent sharing your main profile inviting contacts is not allowed" = "Inkognitóprofilt használ ehhez a csoporthoz - fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva";
+"You're using an incognito profile for this group - to prevent sharing your main profile inviting contacts is not allowed" = "Inkognitóprofilt használ ehhez a csoporthoz – fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva";
 
 /* No comment provided by engineer. */
 "Your calls" = "Hívások";
@@ -5586,7 +6063,7 @@
 "Your chat database is not encrypted - set passphrase to encrypt it." = "A csevegési adatbázis nincs titkosítva – adjon meg egy jelmondatot a titkosításhoz.";
 
 /* alert title */
-"Your chat preferences" = "Csevegési beállítások";
+"Your chat preferences" = "Az Ön csevegési beállításai";
 
 /* No comment provided by engineer. */
 "Your chat profiles" = "Csevegési profilok";
@@ -5595,19 +6072,19 @@
 "Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." = "A kapcsolata át lett helyezve ide: %@, de egy váratlan hiba történt a profilra való átirányításkor.";
 
 /* No comment provided by engineer. */
-"Your contact sent a file that is larger than currently supported maximum size (%@)." = "Az ismerőse olyan fájlt küldött, amely meghaladja a jelenleg támogatott maximális méretet (%@).";
+"Your contact sent a file that is larger than currently supported maximum size (%@)." = "A partnere a jelenleg megengedett maximális méretű (%@) fájlnál nagyobbat küldött.";
 
 /* No comment provided by engineer. */
-"Your contacts can allow full message deletion." = "Az ismerősei engedélyezhetik a teljes üzenet törlést.";
+"Your contacts can allow full message deletion." = "A partnerei engedélyezhetik a teljes üzenet törlését.";
 
 /* No comment provided by engineer. */
-"Your contacts will remain connected." = "Az ismerősei továbbra is kapcsolódva maradnak.";
+"Your contacts will remain connected." = "A partnerei továbbra is kapcsolódva maradnak.";
 
 /* No comment provided by engineer. */
 "Your credentials may be sent unencrypted." = "A hitelesítőadatai titkosítatlanul is elküldhetők.";
 
 /* No comment provided by engineer. */
-"Your current chat database will be DELETED and REPLACED with the imported one." = "A jelenlegi csevegési adatbázis TÖRLŐDNI FOG, és a HELYÉRE az importált adatbázis kerül.";
+"Your current chat database will be DELETED and REPLACED with the imported one." = "A jelenlegi csevegési adatbázis TÖRÖLVE és CSERÉLVE lesz az importáltra.";
 
 /* No comment provided by engineer. */
 "Your current profile" = "Jelenlegi profil";
@@ -5625,16 +6102,16 @@
 "Your profile" = "Profil";
 
 /* No comment provided by engineer. */
-"Your profile **%@** will be shared." = "A(z) **%@** nevű profilja megosztásra fog kerülni.";
+"Your profile **%@** will be shared." = "A(z) **%@** nevű profilja meg lesz osztva.";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "A profilja az eszközön van tárolva és csak az ismerőseivel kerül megosztásra. A SimpleX-kiszolgálók nem láthatják a profilját.";
+"Your profile is stored on your device and only shared with your contacts." = "A profilja az eszközén van tárolva és csak a partnereivel van megosztva.";
+
+/* No comment provided by engineer. */
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "A profilja az eszközén van tárolva és csak a partnereivel van megosztva. A SimpleX-kiszolgálók nem láthatják a profilját.";
 
 /* alert message */
-"Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "A profilja megváltozott. Ha elmenti, a frissített profil elküldésre kerül az összes ismerősének.";
-
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "A profilja, az ismerősei és az elküldött üzenetei az eszközön kerülnek tárolásra.";
+"Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "A profilja módosult. Ha elmenti, a profilfrissítés el lesz küldve a partnerei számára.";
 
 /* No comment provided by engineer. */
 "Your random profile" = "Véletlenszerű profil";
@@ -5643,7 +6120,7 @@
 "Your server address" = "Saját SMP-kiszolgálójának címe";
 
 /* No comment provided by engineer. */
-"Your servers" = "Az Ön kiszolgálói";
+"Your servers" = "Saját kiszolgálók";
 
 /* No comment provided by engineer. */
 "Your settings" = "Beállítások";
@@ -5651,6 +6128,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Profil SimpleX-címe";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Saját SMP-kiszolgálók";
-
diff --git a/apps/ios/hu.lproj/SimpleX--iOS--InfoPlist.strings b/apps/ios/hu.lproj/SimpleX--iOS--InfoPlist.strings
index 434f906b4e..f389e41458 100644
--- a/apps/ios/hu.lproj/SimpleX--iOS--InfoPlist.strings
+++ b/apps/ios/hu.lproj/SimpleX--iOS--InfoPlist.strings
@@ -8,7 +8,7 @@
 "NSFaceIDUsageDescription" = "A SimpleX Face ID-t használ a helyi hitelesítéshez";
 
 /* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "A SimpleX helyi hálózati hozzáférést használ, hogy lehetővé tegye a felhasználói csevegőprofil használatát számítógépen keresztül ugyanazon a hálózaton.";
+"NSLocalNetworkUsageDescription" = "A SimpleX helyi hálózati hozzáférést használ, hogy lehetővé tegye a felhasználói csevegési profil használatát számítógépen keresztül ugyanazon a hálózaton.";
 
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "A SimpleXnek mikrofon-hozzáférésre van szüksége hang- és videohívásokhoz, valamint hangüzenetek rögzítéséhez.";
diff --git a/apps/ios/it.lproj/Localizable.strings b/apps/ios/it.lproj/Localizable.strings
index 7c3a7e05de..f36b35efc2 100644
--- a/apps/ios/it.lproj/Localizable.strings
+++ b/apps/ios/it.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (può essere copiato)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- messaggi vocali fino a 5 minuti.\n- tempo di scomparsa personalizzato.\n- cronologia delle modifiche.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 colorato!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(nuovo)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(questo dispositivo v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Contribuisci](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d sec";
 
+/* delete after time */
+"%d seconds(s)" = "%d secondo/i";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d messaggio/i saltato/i";
 
@@ -241,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld nuove lingue dell'interfaccia";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld secondo/i";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld secondi";
 
@@ -289,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 giorno";
 
 /* time interval */
@@ -298,12 +278,17 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minuto";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 mese";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 settimana";
 
+/* delete after time */
+"1 year" = "1 anno";
+
 /* No comment provided by engineer. */
 "1-time link" = "Link una tantum";
 
@@ -343,6 +328,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Interrompere il cambio di indirizzo?";
 
+/* No comment provided by engineer. */
+"About operators" = "Info sugli operatori";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "Riguardo SimpleX Chat";
 
@@ -353,10 +341,16 @@
 "Accent" = "Principale";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Accetta";
 
+/* alert action */
+"Accept as member" = "Accetta come membro";
+
+/* alert action */
+"Accept as observer" = "Accetta come osservatore";
+
 /* No comment provided by engineer. */
 "Accept conditions" = "Accetta le condizioni";
 
@@ -367,21 +361,36 @@
 "Accept contact request from %@?" = "Accettare la richiesta di contatto da %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Accetta in incognito";
 
+/* alert title */
+"Accept member" = "Accetta membro";
+
+/* rcv group event chat item */
+"accepted %@" = "%@ accettato";
+
 /* call status */
 "accepted call" = "chiamata accettata";
 
 /* No comment provided by engineer. */
 "Accepted conditions" = "Condizioni accettate";
 
+/* chat list item title */
+"accepted invitation" = "invito accettato";
+
+/* rcv group event chat item */
+"accepted you" = "ti ha accettato/a";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Riconosciuto";
 
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Errori di riconoscimento";
 
+/* token status text */
+"Active" = "Attivo";
+
 /* No comment provided by engineer. */
 "Active connections" = "Connessioni attive";
 
@@ -391,6 +400,9 @@
 /* No comment provided by engineer. */
 "Add friends" = "Aggiungi amici";
 
+/* No comment provided by engineer. */
+"Add list" = "Aggiungi elenco";
+
 /* No comment provided by engineer. */
 "Add profile" = "Aggiungi profilo";
 
@@ -406,6 +418,9 @@
 /* No comment provided by engineer. */
 "Add to another device" = "Aggiungi ad un altro dispositivo";
 
+/* No comment provided by engineer. */
+"Add to list" = "Aggiungi ad un elenco";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Aggiungi messaggio di benvenuto";
 
@@ -463,12 +478,21 @@
 /* chat item text */
 "agreeing encryption…" = "concordando la crittografia…";
 
+/* member criteria value */
+"all" = "tutti";
+
+/* No comment provided by engineer. */
+"All" = "Tutte";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Tutti i dati dell'app vengono eliminati.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Tutte le chat e i messaggi verranno eliminati. Non è reversibile!";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Tutte le chat verranno rimosse dall'elenco %@ e l'elenco eliminato.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Tutti i dati vengono cancellati quando inserito.";
 
@@ -496,6 +520,12 @@
 /* profile dropdown */
 "All profiles" = "Tutti gli profili";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Tutte le segnalazioni verranno archiviate per te.";
+
+/* No comment provided by engineer. */
+"All servers" = "Tutti i server";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Tutti i tuoi contatti resteranno connessi.";
 
@@ -541,6 +571,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Permetti di eliminare irreversibilmente i messaggi inviati. (24 ore)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Consenti di segnalare messaggi ai moderatori.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Consenti l'invio di file e contenuti multimediali.";
 
@@ -595,6 +628,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "e altri %lld eventi";
 
+/* report reason */
+"Another reason" = "Altro motivo";
+
 /* No comment provided by engineer. */
 "Answer call" = "Rispondi alla chiamata";
 
@@ -610,6 +646,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "L'app cripta i nuovi file locali (eccetto i video).";
 
+/* No comment provided by engineer. */
+"App group:" = "Gruppo app:";
+
 /* No comment provided by engineer. */
 "App icon" = "Icona app";
 
@@ -637,15 +676,36 @@
 /* No comment provided by engineer. */
 "Apply to" = "Applica a";
 
+/* No comment provided by engineer. */
+"Archive" = "Archivia";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Archiviare %lld segnalazioni?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Archiviare tutte le segnalazioni?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archivia e carica";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Archivia contatti per chattare più tardi.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Archivia la segnalazione";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Archiviare la segnalazione?";
+
+/* swipe action */
+"Archive reports" = "Archivia segnalazioni";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Contatti archiviati";
 
+/* No comment provided by engineer. */
+"archived report" = "segnalazione archiviata";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Archiviazione del database";
 
@@ -724,6 +784,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Gruppi migliorati";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Prestazioni dei gruppi migliorate";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Date dei messaggi migliorate.";
 
@@ -736,6 +799,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Notifiche migliorate";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Privacy e sicurezza migliori";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Sicurezza migliorata ✅";
 
@@ -769,7 +835,8 @@
 /* rcv group event chat item */
 "blocked %@" = "ha bloccato %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "bloccato dall'amministratore";
 
 /* No comment provided by engineer. */
@@ -808,9 +875,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Chat di lavoro";
 
+/* No comment provided by engineer. */
+"Businesses" = "Lavorative";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Per profilo di chat (predefinito) o [per connessione](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "Usando SimpleX Chat accetti di:\n- inviare solo contenuto legale nei gruppi pubblici.\n- rispettare gli altri utenti - niente spam.";
+
 /* No comment provided by engineer. */
 "call" = "chiama";
 
@@ -850,8 +923,11 @@
 /* No comment provided by engineer. */
 "Can't message member" = "Impossibile inviare un messaggio al membro";
 
+/* No comment provided by engineer. */
+"can't send messages" = "impossibile inviare messaggi";
+
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Annulla";
 
 /* No comment provided by engineer. */
@@ -878,6 +954,9 @@
 /* No comment provided by engineer. */
 "Change" = "Cambia";
 
+/* alert title */
+"Change automatic message deletion?" = "Cambiare l'eliminazione automatica dei messaggi?";
+
 /* authentication reason */
 "Change chat profiles" = "Modifica profili utente";
 
@@ -906,7 +985,7 @@
 "Change self-destruct mode" = "Cambia modalità di autodistruzione";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Cambia codice di autodistruzione";
 
 /* chat item text */
@@ -984,9 +1063,18 @@
 /* No comment provided by engineer. */
 "Chat will be deleted for you - this cannot be undone!" = "La chat verrà eliminata solo per te, non è reversibile!";
 
+/* chat toolbar */
+"Chat with admins" = "Chat con amministratori";
+
+/* No comment provided by engineer. */
+"Chat with member" = "Chatta con il membro";
+
 /* No comment provided by engineer. */
 "Chats" = "Chat";
 
+/* No comment provided by engineer. */
+"Chats with members" = "Chat con membri";
+
 /* No comment provided by engineer. */
 "Check messages every 20 min." = "Controlla i messaggi ogni 20 min.";
 
@@ -1026,6 +1114,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Svuotare la conversazione?";
 
+/* No comment provided by engineer. */
+"Clear group?" = "Svuotare il gruppo?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Svuotare o eliminare il gruppo?";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "Svuotare le note private?";
 
@@ -1041,6 +1135,9 @@
 /* No comment provided by engineer. */
 "colored" = "colorato";
 
+/* report reason */
+"Community guidelines violation" = "Violazione delle linee guida della comunità";
+
 /* server test step */
 "Compare file" = "Confronta file";
 
@@ -1065,12 +1162,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Condizioni d'uso";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Le condizioni verranno accettate per gli operatori attivati dopo 30 giorni.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Le condizioni verranno accettate per gli operatori: **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Le condizioni verranno accettate per gli operatori: **%@**.";
 
@@ -1083,6 +1174,9 @@
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configura server ICE";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Configura gli operatori dei server";
+
 /* No comment provided by engineer. */
 "Confirm" = "Conferma";
 
@@ -1113,6 +1207,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Conferma caricamento";
 
+/* token status text */
+"Confirmed" = "Confermato";
+
 /* server test step */
 "Connect" = "Connetti";
 
@@ -1212,6 +1309,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Stato della connessione e dei server.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Connessione bloccata";
+
 /* No comment provided by engineer. */
 "Connection error" = "Errore di connessione";
 
@@ -1221,12 +1321,21 @@
 /* chat list item title (it should not be shown */
 "connection established" = "connessione stabilita";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "La connessione è bloccata dall'operatore del server:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "Connessione non pronta.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Notifiche di connessione";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "Richiesta di connessione inviata!";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "La connessione richiede la rinegoziazione della crittografia.";
+
 /* No comment provided by engineer. */
 "Connection security" = "Sicurezza della connessione";
 
@@ -1254,9 +1363,15 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Il contatto esiste già";
 
+/* No comment provided by engineer. */
+"contact deleted" = "contatto eliminato";
+
 /* No comment provided by engineer. */
 "Contact deleted!" = "Contatto eliminato!";
 
+/* No comment provided by engineer. */
+"contact disabled" = "contatto disattivato";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "il contatto ha la crittografia e2e";
 
@@ -1275,6 +1390,9 @@
 /* No comment provided by engineer. */
 "Contact name" = "Nome del contatto";
 
+/* No comment provided by engineer. */
+"contact not ready" = "contatto non pronto";
+
 /* No comment provided by engineer. */
 "Contact preferences" = "Preferenze del contatto";
 
@@ -1287,6 +1405,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "I contatti possono contrassegnare i messaggi per l'eliminazione; potrai vederli.";
 
+/* blocking reason */
+"Content violates conditions of use" = "Il contenuto viola le condizioni di utilizzo";
+
 /* No comment provided by engineer. */
 "Continue" = "Continua";
 
@@ -1329,6 +1450,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Crea link";
 
+/* No comment provided by engineer. */
+"Create list" = "Crea elenco";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Crea un nuovo profilo nell'[app desktop](https://simplex.chat/downloads/). 💻";
 
@@ -1470,7 +1594,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "errori di decifrazione";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "predefinito (%@)";
 
 /* No comment provided by engineer. */
@@ -1480,8 +1605,7 @@
 "default (yes)" = "predefinito (sì)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Elimina";
 
 /* No comment provided by engineer. */
@@ -1508,12 +1632,18 @@
 /* No comment provided by engineer. */
 "Delete chat" = "Elimina chat";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Elimina i messaggi di chat dal tuo dispositivo.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Elimina il profilo di chat";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Eliminare il profilo di chat?";
 
+/* alert title */
+"Delete chat with member?" = "Eliminare la chat con il membro?";
+
 /* No comment provided by engineer. */
 "Delete chat?" = "Eliminare la chat?";
 
@@ -1562,13 +1692,16 @@
 /* No comment provided by engineer. */
 "Delete link?" = "Eliminare il link?";
 
+/* alert title */
+"Delete list?" = "Eliminare l'elenco?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "Eliminare il messaggio del membro?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Eliminare il messaggio?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Elimina messaggi";
 
 /* No comment provided by engineer. */
@@ -1592,6 +1725,9 @@
 /* server test step */
 "Delete queue" = "Elimina coda";
 
+/* No comment provided by engineer. */
+"Delete report" = "Elimina la segnalazione";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Elimina fino a 20 messaggi contemporaneamente.";
 
@@ -1700,6 +1836,12 @@
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Disattiva (mantieni sostituzioni)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Disattivare l'eliminazione automatica dei messaggi?";
+
+/* alert button */
+"Disable delete messages" = "Disattiva eliminazione messaggi";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Disattiva per tutti";
 
@@ -1760,6 +1902,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "NON usare SimpleX per chiamate di emergenza.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Documenti:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "Non creare un indirizzo";
 
@@ -1767,13 +1912,19 @@
 "Don't enable" = "Non attivare";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Non perdere messaggi importanti.";
+
+/* alert action */
 "Don't show again" = "Non mostrare più";
 
+/* No comment provided by engineer. */
+"Done" = "Fatto";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Esegui downgrade e apri chat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Scarica";
 
 /* No comment provided by engineer. */
@@ -1830,14 +1981,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Attiva (mantieni sostituzioni)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Attivare l'eliminazione automatica dei messaggi?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Attiva l'accesso alla fotocamera";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Attiva Flux";
+"Enable Flux in Network & servers settings for better metadata privacy." = "Attiva Flux nelle impostazioni \"Rete e server\" per una migliore privacy dei metadati.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Attiva per tutti";
@@ -1950,6 +2101,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "richiesta rinegoziazione della crittografia per %@";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Rinegoziazione della crittografia in corso.";
+
 /* No comment provided by engineer. */
 "ended" = "terminata";
 
@@ -2004,6 +2158,9 @@
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Errore nell'accettazione della richiesta di contatto";
 
+/* alert title */
+"Error accepting member" = "Errore di accettazione del membro";
+
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Errore di aggiunta membro/i";
 
@@ -2025,6 +2182,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "Errore nel passaggio a incognito!";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Errore di controllo dello stato del token";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Errore di connessione al server di inoltro %@. Riprova più tardi.";
 
@@ -2037,6 +2197,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Errore nella creazione del link del gruppo";
 
+/* alert title */
+"Error creating list" = "Errore nella creazione dell'elenco";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "Errore di creazione del contatto";
 
@@ -2046,12 +2209,18 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "Errore nella creazione del profilo!";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Errore nella creazione del resoconto";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Errore decifrando il file";
 
 /* No comment provided by engineer. */
 "Error deleting chat database" = "Errore nell'eliminazione del database della chat";
 
+/* alert title */
+"Error deleting chat with member" = "Errore di eliminazione della chat con il membro";
+
 /* No comment provided by engineer. */
 "Error deleting chat!" = "Errore nell'eliminazione della chat!";
 
@@ -2112,12 +2281,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Errore di riconnessione ai server";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "Errore di registrazione per le notifiche";
+
+/* alert title */
 "Error removing member" = "Errore nella rimozione del membro";
 
+/* alert title */
+"Error reordering lists" = "Errore riordinando gli elenchi";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Errore di azzeramento statistiche";
 
+/* alert title */
+"Error saving chat list" = "Errore nel salvataggio dell'elenco di chat";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Errore nel salvataggio del profilo del gruppo";
 
@@ -2169,6 +2347,9 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Errore nella sincronizzazione della connessione";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Errore provando la connessione al server";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Errore nell'aggiornamento del link del gruppo";
 
@@ -2193,7 +2374,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Errore: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Errore: %@";
 
 /* No comment provided by engineer. */
@@ -2211,9 +2394,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Anche quando disattivato nella conversazione.";
 
-/* No comment provided by engineer. */
-"event happened" = "evento accaduto";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Esci senza salvare";
 
@@ -2223,6 +2403,9 @@
 /* No comment provided by engineer. */
 "expired" = "scaduto";
 
+/* token status text */
+"Expired" = "Scaduto";
+
 /* No comment provided by engineer. */
 "Export database" = "Esporta database";
 
@@ -2247,18 +2430,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Veloce e senza aspettare che il mittente sia in linea!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Eliminazione dei gruppi più veloce.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Ingresso più veloce e messaggi più affidabili.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Invio dei messaggi più veloce.";
+
 /* swipe action */
 "Favorite" = "Preferito";
 
 /* No comment provided by engineer. */
+"Favorites" = "Preferite";
+
+/* file error alert title */
 "File error" = "Errore del file";
 
 /* alert message */
 "File errors:\n%@" = "Errori di file:\n%@";
 
+/* file error text */
+"File is blocked by server operator:\n%@." = "Il file è bloccato dall'operatore del server:\n%@.";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "File non trovato - probabilmente è stato eliminato o annullato.";
 
@@ -2335,7 +2530,7 @@
 "Fix not supported by group member" = "Correzione non supportata dal membro del gruppo";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "per una migliore privacy dei metadati.";
+"For all moderators" = "Per tutti i moderatori";
 
 /* servers error */
 "For chat profile %@:" = "Per il profilo di chat %@:";
@@ -2346,6 +2541,9 @@
 /* No comment provided by engineer. */
 "For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Ad esempio, se il tuo contatto riceve messaggi tramite un server di SimpleX Chat, la tua app li consegnerà tramite un server Flux.";
 
+/* No comment provided by engineer. */
+"For me" = "Per me";
+
 /* No comment provided by engineer. */
 "For private routing" = "Per l'instradamento privato";
 
@@ -2418,6 +2616,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Ulteriore riduzione del consumo della batteria";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Ricevi una notifica quando menzionato.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIF e adesivi";
 
@@ -2457,6 +2658,9 @@
 /* No comment provided by engineer. */
 "Group invitation is no longer valid, it was removed by sender." = "L'invito al gruppo non è più valido, è stato rimosso dal mittente.";
 
+/* No comment provided by engineer. */
+"group is deleted" = "il gruppo è eliminato";
+
 /* No comment provided by engineer. */
 "Group link" = "Link del gruppo";
 
@@ -2490,9 +2694,15 @@
 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "Il gruppo verrà eliminato per te. Non è reversibile!";
 
+/* No comment provided by engineer. */
+"Groups" = "Gruppi";
+
 /* No comment provided by engineer. */
 "Help" = "Aiuto";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Aiuta gli amministratori a moderare i loro gruppi.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Nascosta";
 
@@ -2529,6 +2739,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Come aiuta la privacy";
 
+/* alert button */
+"How it works" = "Come funziona";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Come funziona SimpleX";
 
@@ -2616,6 +2829,12 @@
 /* No comment provided by engineer. */
 "inactive" = "inattivo";
 
+/* report reason */
+"Inappropriate content" = "Contenuto inappropriato";
+
+/* report reason */
+"Inappropriate profile" = "Profilo inappropriato";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incognito";
 
@@ -2682,6 +2901,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Colori dell'interfaccia";
 
+/* token status text */
+"Invalid" = "Non valido";
+
+/* token status text */
+"Invalid (bad token)" = "Non valido (token corrotto)";
+
+/* token status text */
+"Invalid (expired)" = "Non valido (scaduto)";
+
+/* token status text */
+"Invalid (unregistered)" = "Non valido (non registrato)";
+
+/* token status text */
+"Invalid (wrong topic)" = "Non valido (argomento sbagliato)";
+
 /* invalid chat data */
 "invalid chat" = "chat non valida";
 
@@ -2883,6 +3117,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Desktop collegati";
 
+/* swipe action */
+"List" = "Elenco";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "Il nome dell'elenco e l'emoji dovrebbero essere diversi per tutte le liste.";
+
+/* No comment provided by engineer. */
+"List name..." = "Nome elenco...";
+
 /* No comment provided by engineer. */
 "LIVE" = "IN DIRETTA";
 
@@ -2944,14 +3187,23 @@
 "Member" = "Membro";
 
 /* profile update event chat item */
-"member %@ changed to %@" = "membro %1$@ cambiato in %2$@";
+"member %@ changed to %@" = "il membro %1$@ è diventato %2$@";
+
+/* No comment provided by engineer. */
+"Member admission" = "Ammissione del membro";
 
 /* rcv group event chat item */
 "member connected" = "si è connesso/a";
 
+/* No comment provided by engineer. */
+"member has old version" = "il membro ha una versione vecchia";
+
 /* item status text */
 "Member inactive" = "Membro inattivo";
 
+/* chat feature */
+"Member reports" = "Segnalazioni dei membri";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All chat members will be notified." = "Il ruolo del membro verrà cambiato in \"%@\". Verranno notificati tutti i membri della chat.";
 
@@ -2967,12 +3219,18 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Il membro verrà rimosso dal gruppo, non è reversibile!";
 
+/* alert message */
+"Member will join the group, accept member?" = "Il membro entrerà nel gruppo, accettarlo?";
+
 /* No comment provided by engineer. */
 "Members can add message reactions." = "I membri del gruppo possono aggiungere reazioni ai messaggi.";
 
 /* No comment provided by engineer. */
 "Members can irreversibly delete sent messages. (24 hours)" = "I membri del gruppo possono eliminare irreversibilmente i messaggi inviati. (24 ore)";
 
+/* No comment provided by engineer. */
+"Members can report messsages to moderators." = "I membri possono segnalare messaggi ai moderatori.";
+
 /* No comment provided by engineer. */
 "Members can send direct messages." = "I membri del gruppo possono inviare messaggi diretti.";
 
@@ -2988,6 +3246,9 @@
 /* No comment provided by engineer. */
 "Members can send voice messages." = "I membri del gruppo possono inviare messaggi vocali.";
 
+/* No comment provided by engineer. */
+"Mention members 👋" = "Menziona i membri 👋";
+
 /* No comment provided by engineer. */
 "Menus" = "Menu";
 
@@ -3060,6 +3321,9 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "I messaggi da %@ verranno mostrati!";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "I messaggi in questa chat non verranno mai eliminati.";
+
 /* No comment provided by engineer. */
 "Messages received" = "Messaggi ricevuti";
 
@@ -3132,9 +3396,15 @@
 /* marked deleted chat item preview text */
 "moderated by %@" = "moderato da %@";
 
+/* member role */
+"moderator" = "moderatore";
+
 /* time unit */
 "months" = "mesi";
 
+/* swipe action */
+"More" = "Altro";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Altri miglioramenti sono in arrivo!";
 
@@ -3150,12 +3420,12 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Profili di chat multipli";
 
-/* No comment provided by engineer. */
-"mute" = "silenzia";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Silenzia";
 
+/* notification label action */
+"Mute all" = "Silenzia tutto";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Silenzioso quando inattivo!";
 
@@ -3186,9 +3456,12 @@
 /* No comment provided by engineer. */
 "Network status" = "Stato della rete";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "mai";
 
+/* token status text */
+"New" = "Nuovo";
+
 /* No comment provided by engineer. */
 "New chat" = "Nuova chat";
 
@@ -3219,6 +3492,9 @@
 /* No comment provided by engineer. */
 "New member role" = "Nuovo ruolo del membro";
 
+/* rcv group event chat item */
+"New member wants to join the group." = "Un nuovo membro vuole entrare nel gruppo.";
+
 /* notification */
 "new message" = "messaggio nuovo";
 
@@ -3249,6 +3525,18 @@
 /* Authentication unavailable */
 "No app password" = "Nessuna password dell'app";
 
+/* No comment provided by engineer. */
+"No chats" = "Nessuna chat";
+
+/* No comment provided by engineer. */
+"No chats found" = "Nessuna chat trovata";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Nessuna chat nell'elenco %@";
+
+/* No comment provided by engineer. */
+"No chats with members" = "Nessuna chat con membri";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "Nessun contatto selezionato";
 
@@ -3282,6 +3570,9 @@
 /* servers error */
 "No media & file servers." = "Nessun server di multimediali e file.";
 
+/* No comment provided by engineer. */
+"No message" = "Nessun messaggio";
+
 /* servers error */
 "No message servers." = "Nessun server dei messaggi.";
 
@@ -3318,12 +3609,24 @@
 /* copied message info in history */
 "no text" = "nessun testo";
 
+/* alert title */
+"No token!" = "Nessun token!";
+
+/* No comment provided by engineer. */
+"No unread chats" = "Nessuna chat non letta";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "Nessun identificatore utente.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "Non compatibile!";
 
+/* No comment provided by engineer. */
+"not synchronized" = "non sincronizzato";
+
+/* No comment provided by engineer. */
+"Notes" = "Note";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "Nessuna selezione";
 
@@ -3336,9 +3639,15 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Le notifiche sono disattivate!";
 
+/* alert title */
+"Notifications error" = "Errore delle notifiche";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Privacy delle notifiche";
 
+/* alert title */
+"Notifications status" = "Stato delle notifiche";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Ora gli amministratori possono:\n- eliminare i messaggi dei membri.\n- disattivare i membri (ruolo \"osservatore\")";
 
@@ -3346,8 +3655,9 @@
 "observer" = "osservatore";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "off";
 
 /* blur media */
@@ -3359,7 +3669,8 @@
 /* feature offered item */
 "offered %@: %@" = "offerto %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -3401,6 +3712,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "Solo i proprietari del gruppo possono attivare i messaggi vocali.";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "Solo il mittente e i moderatori lo vedono";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "Solo tu e i moderatori lo vedete";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Solo tu puoi aggiungere reazioni ai messaggi.";
 
@@ -3431,7 +3748,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Solo il tuo contatto può inviare messaggi vocali.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Apri";
 
 /* No comment provided by engineer. */
@@ -3449,6 +3766,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Apri gruppo";
 
+/* alert title */
+"Open link?" = "Aprire il link?";
+
 /* authentication reason */
 "Open migration to another device" = "Apri migrazione ad un altro dispositivo";
 
@@ -3482,6 +3802,9 @@
 /* No comment provided by engineer. */
 "Or to share privately" = "O per condividere in modo privato";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Organizza le chat in elenchi";
+
 /* No comment provided by engineer. */
 "other" = "altro";
 
@@ -3539,9 +3862,18 @@
 /* No comment provided by engineer. */
 "peer-to-peer" = "peer-to-peer";
 
+/* No comment provided by engineer. */
+"pending" = "in attesa";
+
 /* No comment provided by engineer. */
 "Pending" = "In attesa";
 
+/* No comment provided by engineer. */
+"pending approval" = "in attesa di approvazione";
+
+/* No comment provided by engineer. */
+"pending review" = "in attesa di revisione";
+
 /* No comment provided by engineer. */
 "Periodic" = "Periodicamente";
 
@@ -3608,6 +3940,18 @@
 /* No comment provided by engineer. */
 "Please store passphrase securely, you will NOT be able to change it if you lose it." = "Conserva la password in modo sicuro, NON potrai cambiarla se la perdi.";
 
+/* token info */
+"Please try to disable and re-enable notfications." = "Prova a disattivare e riattivare le notifiche.";
+
+/* snd group event chat item */
+"Please wait for group moderators to review your request to join the group." = "Attendi che i moderatori del gruppo revisionino la tua richiesta di entrare nel gruppo.";
+
+/* token info */
+"Please wait for token activation to complete." = "Attendi il completamento dell'attivazione del token.";
+
+/* token info */
+"Please wait for token to be registered." = "Attendi la registrazione del token.";
+
 /* No comment provided by engineer. */
 "Polish interface" = "Interfaccia polacca";
 
@@ -3638,12 +3982,21 @@
 /* No comment provided by engineer. */
 "Privacy for your customers." = "Privacy per i tuoi clienti.";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "Informativa sulla privacy e condizioni d'uso.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Privacy ridefinita";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "Le chat private, i gruppi e i tuoi contatti non sono accessibili agli operatori dei server.";
+
 /* No comment provided by engineer. */
 "Private filenames" = "Nomi di file privati";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Nomi privati dei file multimediali.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Instradamento privato dei messaggi";
 
@@ -3689,6 +4042,9 @@
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Proibisci le reazioni ai messaggi.";
 
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "Vieta di segnalare messaggi ai moderatori.";
+
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "Proibisci l'invio di messaggi diretti ai membri.";
 
@@ -3851,8 +4207,17 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Consumo di batteria ridotto";
 
+/* No comment provided by engineer. */
+"Register" = "Registra";
+
+/* token info */
+"Register notification token?" = "Registrare il token di notifica?";
+
+/* token status text */
+"Registered" = "Registrato";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Rifiuta";
 
 /* No comment provided by engineer. */
@@ -3861,6 +4226,12 @@
 /* No comment provided by engineer. */
 "Reject contact request" = "Rifiuta la richiesta di contatto";
 
+/* alert title */
+"Reject member?" = "Rifiutare il membro?";
+
+/* No comment provided by engineer. */
+"rejected" = "rifiutato";
+
 /* call status */
 "rejected call" = "chiamata rifiutata";
 
@@ -3897,6 +4268,9 @@
 /* profile update event chat item */
 "removed contact address" = "indirizzo di contatto rimosso";
 
+/* No comment provided by engineer. */
+"removed from group" = "rimosso dal gruppo";
+
 /* profile update event chat item */
 "removed profile picture" = "immagine del profilo rimossa";
 
@@ -3930,6 +4304,45 @@
 /* chat item action */
 "Reply" = "Rispondi";
 
+/* chat item action */
+"Report" = "Segnala";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Segnala contenuto: solo i moderatori del gruppo lo vedranno.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Segnala profilo: solo i moderatori del gruppo lo vedranno.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Segnala altro: solo i moderatori del gruppo lo vedranno.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "Motivo della segnalazione?";
+
+/* alert title */
+"Report sent to moderators" = "Segnalazione inviata ai moderatori";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Segnala spam: solo i moderatori del gruppo lo vedranno.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Segnala violazione: solo i moderatori del gruppo lo vedranno.";
+
+/* report in notification */
+"Report: %@" = "Segnalazione: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "È vietato segnalare messaggi ai moderatori.";
+
+/* No comment provided by engineer. */
+"Reports" = "Segnalazioni";
+
+/* No comment provided by engineer. */
+"request to join rejected" = "richiesta di entrare rifiutata";
+
+/* chat list item title */
+"requested to connect" = "richiesto di connettersi";
+
 /* No comment provided by engineer. */
 "Required" = "Obbligatorio";
 
@@ -3982,10 +4395,19 @@
 "Reveal" = "Rivela";
 
 /* No comment provided by engineer. */
-"Review conditions" = "Leggi le condizioni";
+"review" = "revisiona";
 
 /* No comment provided by engineer. */
-"Review later" = "Leggi più tardi";
+"Review conditions" = "Leggi le condizioni";
+
+/* admission stage */
+"Review members" = "Revisiona i membri";
+
+/* admission stage description */
+"Review members before admitting (\"knocking\")." = "Revisiona i membri prima di ammetterli (\"bussare\").";
+
+/* No comment provided by engineer. */
+"reviewed by admins" = "revisionato dagli amministratori";
 
 /* No comment provided by engineer. */
 "Revoke" = "Revoca";
@@ -4009,12 +4431,15 @@
 "Safer groups" = "Gruppi più sicuri";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Salva";
 
 /* alert button */
 "Save (and notify contacts)" = "Salva (e avvisa i contatti)";
 
+/* alert title */
+"Save admission settings?" = "Salvare le impostazioni di ammissione?";
+
 /* alert button */
 "Save and notify contact" = "Salva e avvisa il contatto";
 
@@ -4030,6 +4455,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "Salva il profilo del gruppo";
 
+/* No comment provided by engineer. */
+"Save list" = "Salva elenco";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "Salva la password e apri la chat";
 
@@ -4198,6 +4626,9 @@
 /* No comment provided by engineer. */
 "Send notifications" = "Invia notifiche";
 
+/* No comment provided by engineer. */
+"Send private reports" = "Invia segnalazioni private";
+
 /* No comment provided by engineer. */
 "Send questions and ideas" = "Invia domande e idee";
 
@@ -4330,6 +4761,9 @@
 /* No comment provided by engineer. */
 "Set 1 day" = "Imposta 1 giorno";
 
+/* No comment provided by engineer. */
+"Set chat name…" = "Imposta il nome della chat…";
+
 /* No comment provided by engineer. */
 "Set contact name…" = "Imposta nome del contatto…";
 
@@ -4342,6 +4776,12 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Impostalo al posto dell'autenticazione di sistema.";
 
+/* No comment provided by engineer. */
+"Set member admission" = "Imposta l'ammissione del membro";
+
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Imposta la scadenza dei messaggi nelle chat.";
+
 /* profile update event chat item */
 "set new contact address" = "impostato nuovo indirizzo di contatto";
 
@@ -4373,7 +4813,7 @@
 "Shape profile images" = "Forma delle immagini del profilo";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Condividi";
 
 /* No comment provided by engineer. */
@@ -4412,6 +4852,9 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Condividi con i contatti";
 
+/* No comment provided by engineer. */
+"Short link" = "Link breve";
+
 /* No comment provided by engineer. */
 "Show → on messages sent via private routing." = "Mostra → nei messaggi inviati via instradamento privato.";
 
@@ -4454,8 +4897,11 @@
 /* No comment provided by engineer. */
 "SimpleX address or 1-time link?" = "Indirizzo SimpleX o link una tantum?";
 
+/* simplex link type */
+"SimpleX channel link" = "Link del canale SimpleX";
+
 /* No comment provided by engineer. */
-"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell'app";
+"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell'app.";
 
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "La sicurezza di SimpleX Chat è stata verificata da Trail of Bits.";
@@ -4538,6 +4984,10 @@
 /* notification title */
 "Somebody" = "Qualcuno";
 
+/* blocking reason
+report reason */
+"Spam" = "Spam";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Quadrata, circolare o qualsiasi forma tra le due.";
 
@@ -4595,6 +5045,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Arresto della chat";
 
+/* No comment provided by engineer. */
+"Storage" = "Archiviazione";
+
 /* No comment provided by engineer. */
 "strike" = "barrato";
 
@@ -4664,6 +5117,9 @@
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Scadenza connessione TCP";
 
+/* No comment provided by engineer. */
+"TCP port for messaging" = "Porta TCP per i messaggi";
+
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
 
@@ -4673,12 +5129,15 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Errore del file temporaneo";
 
 /* server test failure */
 "Test failed at step %@." = "Test fallito al passo %@.";
 
+/* No comment provided by engineer. */
+"Test notifications" = "Prova le notifiche";
+
 /* No comment provided by engineer. */
 "Test server" = "Prova server";
 
@@ -4751,15 +5210,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Il database vecchio non è stato rimosso durante la migrazione, può essere eliminato.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Il profilo è condiviso solo con i tuoi contatti.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Le stesse condizioni si applicheranno all'operatore **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Le stesse condizioni si applicheranno agli operatori **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "Il secondo operatore preimpostato nell'app!";
 
@@ -4799,6 +5252,9 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Questa azione non può essere annullata: i messaggi inviati e ricevuti prima di quanto selezionato verranno eliminati. Potrebbe richiedere diversi minuti.";
 
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Questa azione non è reversibile: i messaggi inviati e ricevuti in questa chat prima della selezione verranno eliminati.";
+
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Questa azione non può essere annullata: il tuo profilo, i contatti, i messaggi e i file andranno persi in modo irreversibile.";
 
@@ -4829,9 +5285,15 @@
 /* No comment provided by engineer. */
 "This is your own SimpleX address!" = "Questo è il tuo indirizzo SimpleX!";
 
+/* No comment provided by engineer. */
+"This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." = "Questo link richiede una versione più recente dell'app. Aggiornala o chiedi al tuo contatto di inviare un link compatibile.";
+
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Questo link è stato usato con un altro dispositivo mobile, creane uno nuovo sul desktop.";
 
+/* No comment provided by engineer. */
+"This message was deleted or not received yet." = "Questo messaggio è stato eliminato o non ancora ricevuto.";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Questa impostazione si applica ai messaggi del profilo di chat attuale **%@**.";
 
@@ -4898,6 +5360,9 @@
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Attiva/disattiva l'incognito quando ti colleghi.";
 
+/* token status */
+"Token status: %@." = "Stato del token: %@.";
+
 /* No comment provided by engineer. */
 "Toolbar opacity" = "Opacità barra degli strumenti";
 
@@ -5006,10 +5471,7 @@
 /* authentication reason */
 "Unlock app" = "Sblocca l'app";
 
-/* No comment provided by engineer. */
-"unmute" = "riattiva notifiche";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Riattiva notifiche";
 
 /* No comment provided by engineer. */
@@ -5018,6 +5480,9 @@
 /* swipe action */
 "Unread" = "Non letto";
 
+/* No comment provided by engineer. */
+"Unsupported connection link" = "Link di connessione non supportato";
+
 /* No comment provided by engineer. */
 "Up to 100 last messages are sent to new members." = "Vengono inviati ai nuovi membri fino a 100 ultimi messaggi.";
 
@@ -5033,6 +5498,9 @@
 /* No comment provided by engineer. */
 "Update settings?" = "Aggiornare le impostazioni?";
 
+/* No comment provided by engineer. */
+"Updated conditions" = "Condizioni aggiornate";
+
 /* rcv group event chat item */
 "updated group profile" = "ha aggiornato il profilo del gruppo";
 
@@ -5108,18 +5576,30 @@
 /* No comment provided by engineer. */
 "Use servers" = "Usa i server";
 
+/* No comment provided by engineer. */
+"Use short links (BETA)" = "Usa link brevi (BETA)";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Usare i server di SimpleX Chat?";
 
 /* No comment provided by engineer. */
 "Use SOCKS proxy" = "Usa proxy SOCKS";
 
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "Usa la porta TCP %@ quando non è specificata alcuna porta.";
+
+/* No comment provided by engineer. */
+"Use TCP port 443 for preset servers only." = "Usa la porta TCP 443 solo per i server preimpostati.";
+
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Usa l'app mentre sei in chiamata.";
 
 /* No comment provided by engineer. */
 "Use the app with one hand." = "Usa l'app con una mano sola.";
 
+/* No comment provided by engineer. */
+"Use web port" = "Usa porta web";
+
 /* No comment provided by engineer. */
 "User selection" = "Selezione utente";
 
@@ -5339,6 +5819,9 @@
 /* No comment provided by engineer. */
 "You accepted connection" = "Hai accettato la connessione";
 
+/* snd group event chat item */
+"you accepted this member" = "hai accettato questo membro";
+
 /* No comment provided by engineer. */
 "You allow" = "Lo consenti";
 
@@ -5396,9 +5879,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Puoi cambiarlo nelle impostazioni dell'aspetto.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Puoi configurare gli operatori nelle impostazioni di rete e server.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "Puoi configurare i server nelle impostazioni.";
 
@@ -5453,6 +5933,9 @@
 /* alert message */
 "You can view invitation link again in connection details." = "Puoi vedere di nuovo il link di invito nei dettagli di connessione.";
 
+/* alert message */
+"You can view your reports in Chat with admins." = "Puoi vedere le tue segnalazioni nella chat con gli amministratori.";
+
 /* No comment provided by engineer. */
 "You can't send messages!" = "Non puoi inviare messaggi!";
 
@@ -5525,6 +6008,9 @@
 /* chat list item description */
 "you shared one-time link incognito" = "hai condiviso un link incognito una tantum";
 
+/* token info */
+"You should receive notifications." = "Dovresti ricevere le notifiche.";
+
 /* snd group event chat item */
 "you unblocked %@" = "hai sbloccato %@";
 
@@ -5618,15 +6104,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Verrà condiviso il tuo profilo **%@**.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Il profilo è condiviso solo con i tuoi contatti.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Il tuo profilo è memorizzato sul tuo dispositivo e condiviso solo con i tuoi contatti. I server di SimpleX non possono vedere il tuo profilo.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Il tuo profilo è stato cambiato. Se lo salvi, il profilo aggiornato verrà inviato a tutti i tuoi contatti.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Il tuo profilo, i contatti e i messaggi recapitati sono memorizzati sul tuo dispositivo.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Il tuo profilo casuale";
 
@@ -5642,6 +6128,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Il tuo indirizzo SimpleX";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "I tuoi server SMP";
-
diff --git a/apps/ios/ja.lproj/Localizable.strings b/apps/ios/ja.lproj/Localizable.strings
index da0ba42a86..481c21eb8b 100644
--- a/apps/ios/ja.lproj/Localizable.strings
+++ b/apps/ios/ja.lproj/Localizable.strings
@@ -1,45 +1,30 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (コピー可能)";
 
 /* No comment provided by engineer. */
 "_italic_" = "\\_斜体_";
 
+/* No comment provided by engineer. */
+"- connect to [directory service](simplex:/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) (BETA)!\n- delivery receipts (up to 20 members).\n- faster and more stable." = "- [ディレクトリサービス](simplex:/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) に接続 (ベータ)!\n- 配信証明を送信する (最大 20 人まで)。\n- より速く、より安定。";
+
 /* No comment provided by engineer. */
 "- more stable message delivery.\n- a bit better groups.\n- and more!" = "- より安定したメッセージ配信。\n- 改良されたグループ。\n- などなど！";
 
+/* No comment provided by engineer. */
+"- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!" = "- 任意で削除された連絡先へ通知します。\n- プロフィール名に空白を含めることができます。\n- and more!";
+
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 最長 5 分間の音声メッセージ。\n- 消えるまでのカスタム時間。\n- 編集履歴。";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 色付き!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(新規)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(このデバイス v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[貢献する](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -76,6 +61,9 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**推奨**: デバイス トークンと通知は SimpleX Chat 通知サーバーに送信されますが、メッセージの内容、サイズ、送信者は送信されません。";
 
+/* No comment provided by engineer. */
+"**Scan / Paste link**: to connect via a link you received." = "**QRスキャン / リンクの貼り付け**: 受け取ったリンクで接続する。";
+
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**警告**: 即時の プッシュ通知には、キーチェーンに保存されたパスフレーズが必要です。";
 
@@ -101,7 +89,7 @@
 "%@" = "%@";
 
 /* No comment provided by engineer. */
-"%@ (current)" = "%@ （現在）";
+"%@ (current)" = "%@ (現在)";
 
 /* copied message info */
 "%@ (current):" = "%@ (現在):";
@@ -136,12 +124,21 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ は検証されています";
 
+/* No comment provided by engineer. */
+"%@ server" = "%@ サーバー";
+
+/* No comment provided by engineer. */
+"%@ servers" = "%@ サーバー";
+
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ アップロード済";
 
 /* notification title */
 "%@ wants to connect!" = "%@ が接続を希望しています!";
 
+/* format for date separator in chat */
+"%@, %@" = "%1$@, %2$@";
+
 /* No comment provided by engineer. */
 "%@, %@ and %lld members" = "%@や%@など%lld人のメンバー";
 
@@ -154,9 +151,24 @@
 /* time interval */
 "%d days" = "%d 日";
 
+/* forward confirmation reason */
+"%d file(s) are still being downloaded." = "%d 個のファイルをダウンロードしています。";
+
+/* forward confirmation reason */
+"%d file(s) failed to download." = "%d 個のファイルがダウンロードに失敗しました。";
+
+/* forward confirmation reason */
+"%d file(s) were deleted." = "%d 個のファイルが削除されました。";
+
+/* forward confirmation reason */
+"%d file(s) were not downloaded." = "%d 個のファイルがダウンロードされていません。";
+
 /* time interval */
 "%d hours" = "%d 時";
 
+/* alert title */
+"%d messages not forwarded" = "%d 個のメッセージが未転送";
+
 /* time interval */
 "%d min" = "%d 分";
 
@@ -173,7 +185,7 @@
 "%d weeks" = "%d 週";
 
 /* No comment provided by engineer. */
-"%lld" = "%lld";
+"%lld" = "";
 
 /* No comment provided by engineer. */
 "%lld %@" = "%lld %@";
@@ -208,9 +220,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lldつの新しいインターフェース言語";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld 秒";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld 秒";
 
@@ -256,7 +265,8 @@
 /* No comment provided by engineer. */
 "0s" = "0秒";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1日";
 
 /* time interval */
@@ -265,12 +275,20 @@
 /* No comment provided by engineer. */
 "1 minute" = "1分";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1ヶ月";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1週間";
 
+/* No comment provided by engineer. */
+"1-time link" = "使い捨てリンク";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "使い捨てリンクは、*ひとつの連絡先にのみ* 使用できます - 対面または任意のチャットで共有してください。";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5分";
 
@@ -311,8 +329,8 @@
 "above, then choose:" = "上で選んでください：";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "承諾";
 
 /* No comment provided by engineer. */
@@ -322,7 +340,7 @@
 "Accept contact request from %@?" = "%@ からの連絡要求を受け入れますか?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "シークレットモードで承諾";
 
 /* call status */
@@ -346,6 +364,12 @@
 /* No comment provided by engineer. */
 "Add welcome message" = "ウェルカムメッセージを追加";
 
+/* No comment provided by engineer. */
+"Added media & file servers" = "追加されたメディア & ファイルサーバー";
+
+/* No comment provided by engineer. */
+"Added message servers" = "追加されたメッセージサーバー";
+
 /* No comment provided by engineer. */
 "Address" = "アドレス";
 
@@ -361,6 +385,9 @@
 /* No comment provided by engineer. */
 "Advanced network settings" = "ネットワーク詳細設定";
 
+/* No comment provided by engineer. */
+"Advanced settings" = "詳細設定";
+
 /* chat item text */
 "agreeing encryption for %@…" = "%@の暗号化に同意しています…";
 
@@ -382,6 +409,9 @@
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." = "全てのメッセージが削除されます(※注意：元に戻せません！※)。削除されるのは片方あなたのメッセージのみ。";
 
+/* profile dropdown */
+"All profiles" = "すべてのプロフィール";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "あなたの連絡先が繋がったまま継続します。";
 
@@ -401,7 +431,7 @@
 "Allow disappearing messages only if your contact allows it to you." = "連絡先が許可している場合のみ消えるメッセージを許可する。";
 
 /* No comment provided by engineer. */
-"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "送信相手も永久メッセージ削除を許可する時のみに許可する。";
+"Allow irreversible message deletion only if your contact allows it to you. (24 hours)" = "送信相手も永久メッセージ削除を許可する時のみに許可する。(24時間)";
 
 /* No comment provided by engineer. */
 "Allow message reactions only if your contact allows them." = "連絡先が許可している場合にのみ、メッセージへのリアクションを許可します。";
@@ -415,6 +445,9 @@
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "消えるメッセージの送信を許可する。";
 
+/* No comment provided by engineer. */
+"Allow sharing" = "共有を許可";
+
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "送信済みメッセージの永久削除を許可する。(24時間)";
 
@@ -460,6 +493,9 @@
 /* pref value */
 "always" = "常に";
 
+/* No comment provided by engineer. */
+"Always use private routing." = "プライベートルーティングを常に使用する。";
+
 /* No comment provided by engineer. */
 "Always use relay" = "常にリレーを経由する";
 
@@ -497,7 +533,16 @@
 "App version: v%@" = "アプリのバージョン: v%@";
 
 /* No comment provided by engineer. */
-"Appearance" = "見た目";
+"Appearance" = "アピアランス";
+
+/* No comment provided by engineer. */
+"Apply" = "適用";
+
+/* No comment provided by engineer. */
+"Apply to" = "に適用する";
+
+/* No comment provided by engineer. */
+"Archive and upload" = "アーカイブとアップロード";
 
 /* No comment provided by engineer. */
 "Attach" = "添付する";
@@ -602,7 +647,7 @@
 "Can't invite contacts!" = "連絡先を招待できません！";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "中止";
 
 /* feature offered item */
@@ -642,7 +687,7 @@
 "Change self-destruct mode" = "自己破壊モードの変更";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "自己破壊パスコードを変更する";
 
 /* chat item text */
@@ -835,7 +880,7 @@
 "Connection" = "接続";
 
 /* No comment provided by engineer. */
-"Connection and servers status." = "接続とサーバーのステータス";
+"Connection and servers status." = "接続とサーバーのステータス。";
 
 /* No comment provided by engineer. */
 "Connection error" = "接続エラー";
@@ -912,6 +957,9 @@
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "[デスクトップアプリ](https://simplex.chat/downloads/)で新しいプロファイルを作成します。 💻";
 
+/* No comment provided by engineer. */
+"Create profile" = "プロフィールを作成する";
+
 /* server test step */
 "Create queue" = "キューの作成";
 
@@ -1020,7 +1068,8 @@
 /* message decrypt error item */
 "Decryption error" = "復号化エラー";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "デフォルト (%@)";
 
 /* No comment provided by engineer. */
@@ -1030,8 +1079,7 @@
 "default (yes)" = "デフォルト（はい）";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "削除";
 
 /* No comment provided by engineer. */
@@ -1097,7 +1145,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "メッセージを削除しますか？";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "メッセージを削除";
 
 /* No comment provided by engineer. */
@@ -1224,12 +1272,12 @@
 "Do NOT use SimpleX for emergency calls." = "緊急通報にSimpleXを使用しないでください。";
 
 /* No comment provided by engineer. */
-"Don't create address" = "アドレスを作成しないでください";
+"Don't create address" = "アドレスを作成しない";
 
 /* No comment provided by engineer. */
 "Don't enable" = "有効にしない";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "次から表示しない";
 
 /* No comment provided by engineer. */
@@ -1262,7 +1310,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "有効にする（設定の優先を維持）";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "自動メッセージ削除を有効にしますか？";
 
 /* No comment provided by engineer. */
@@ -1466,7 +1514,7 @@
 /* alert title */
 "Error receiving file" = "ファイル受信にエラー発生";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "メンバー除名にエラー発生";
 
 /* No comment provided by engineer. */
@@ -1520,7 +1568,9 @@
 /* No comment provided by engineer. */
 "Error: " = "エラー : ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "エラー : %@";
 
 /* No comment provided by engineer. */
@@ -1532,9 +1582,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "会話中に無効になっている場合でも。";
 
-/* No comment provided by engineer. */
-"event happened" = "イベント発生";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "保存せずに閉じる";
 
@@ -1827,7 +1874,7 @@
 "Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)" = "インストール [ターミナル用SimpleX Chat](https://github.com/simplex-chat/simplex-chat)";
 
 /* No comment provided by engineer. */
-"Instant" = "すぐに";
+"Instant" = "即時";
 
 /* No comment provided by engineer. */
 "Instant push notifications will be hidden!\n" = "インスタントプッシュ通知は非表示になります！\n";
@@ -2084,6 +2131,9 @@
 /* No comment provided by engineer. */
 "Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**耐量子E2E暗号化**によって保護されます。";
 
+/* No comment provided by engineer. */
+"Migrate from another device" = "別の端末から移行";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "データベースのアーカイブを移行しています…";
 
@@ -2097,7 +2147,7 @@
 "Migration is completed" = "移行が完了しました";
 
 /* No comment provided by engineer. */
-"Migrations:" = "移行";
+"Migrations:" = "移行:";
 
 /* time unit */
 "minutes" = "分";
@@ -2132,7 +2182,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "複数チャットのプロフィール";
 
-/* swipe action */
+/* notification label action */
 "Mute" = "ミュート";
 
 /* No comment provided by engineer. */
@@ -2150,7 +2200,7 @@
 /* No comment provided by engineer. */
 "Network status" = "ネットワーク状況";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "一度も";
 
 /* notification */
@@ -2244,8 +2294,9 @@
 "observer" = "オブザーバー";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "オフ";
 
 /* blur media */
@@ -2257,7 +2308,8 @@
 /* feature offered item */
 "offered %@: %@" = "提供された %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "OK";
 
 /* No comment provided by engineer. */
@@ -2320,7 +2372,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "音声メッセージを送れるのはあなたの連絡相手だけです。";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "開く";
 
 /* No comment provided by engineer. */
@@ -2431,6 +2483,9 @@
 /* No comment provided by engineer. */
 "Private filenames" = "プライベートなファイル名";
 
+/* name of notes to self */
+"Private notes" = "プライベートノート";
+
 /* No comment provided by engineer. */
 "Profile and server connections" = "プロフィールとサーバ接続";
 
@@ -2549,7 +2604,7 @@
 "Reduced battery usage" = "電池使用量低減";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "拒否";
 
 /* No comment provided by engineer. */
@@ -2649,7 +2704,7 @@
 "Run chat" = "チャット起動";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "保存";
 
 /* alert button */
@@ -2836,7 +2891,7 @@
 "Settings" = "設定";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "共有する";
 
 /* No comment provided by engineer. */
@@ -3058,9 +3113,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "古いデータベースは移行時に削除されなかったので、削除することができます。";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "プロフィールは連絡先にしか共有されません。";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "長らくお待たせしました！ ✅";
 
@@ -3184,7 +3236,7 @@
 /* authentication reason */
 "Unlock app" = "アプリのロック解除";
 
-/* swipe action */
+/* notification label action */
 "Unmute" = "ミュート解除";
 
 /* swipe action */
@@ -3388,6 +3440,9 @@
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "ユーザープロファイルを右にスワイプすると、非表示またはミュートにすることができます。";
 
+/* No comment provided by engineer. */
+"You can make it visible to your SimpleX contacts via Settings." = "設定でSimpleXの連絡先に表示させることができます。";
+
 /* notification body */
 "You can now chat with %@" = "%@ にメッセージを送信できるようになりました";
 
@@ -3536,10 +3591,10 @@
 "Your profile **%@** will be shared." = "あなたのプロファイル **%@** が共有されます。";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "プロフィールはデバイスに保存され、連絡先とのみ共有されます。 SimpleX サーバーはあなたのプロファイルを参照できません。";
+"Your profile is stored on your device and only shared with your contacts." = "プロフィールは連絡先にしか共有されません。";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "あなたのプロフィール、連絡先、送信したメッセージがご自分の端末に保存されます。";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "プロフィールはデバイスに保存され、連絡先とのみ共有されます。 SimpleX サーバーはあなたのプロファイルを参照できません。";
 
 /* No comment provided by engineer. */
 "Your random profile" = "あなたのランダム・プロフィール";
@@ -3553,6 +3608,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "あなたのSimpleXアドレス";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "あなたのSMPサーバ";
-
diff --git a/apps/ios/nl.lproj/Localizable.strings b/apps/ios/nl.lproj/Localizable.strings
index 7004d0d124..5caea12ee2 100644
--- a/apps/ios/nl.lproj/Localizable.strings
+++ b/apps/ios/nl.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (kan gekopieerd worden)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- spraakberichten tot 5 minuten.\n- aangepaste tijd om te verdwijnen.\n- bewerkingsgeschiedenis.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 gekleurd!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(nieuw)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(dit apparaat v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Bijdragen](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d sec";
 
+/* delete after time */
+"%d seconds(s)" = "%d seconden";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d overgeslagen bericht(en)";
 
@@ -241,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld nieuwe interface-talen";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld seconde(n)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld seconden";
 
@@ -289,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 dag";
 
 /* time interval */
@@ -298,12 +278,17 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minuut";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 maand";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 week";
 
+/* delete after time */
+"1 year" = "1 jaar";
+
 /* No comment provided by engineer. */
 "1-time link" = "Eenmalige link";
 
@@ -356,8 +341,8 @@
 "Accent" = "Accent";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Accepteer";
 
 /* No comment provided by engineer. */
@@ -370,7 +355,7 @@
 "Accept contact request from %@?" = "Accepteer contactverzoek van %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Accepteer incognito";
 
 /* call status */
@@ -388,6 +373,9 @@
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Bevestigingsfouten";
 
+/* token status text */
+"Active" = "actief";
+
 /* No comment provided by engineer. */
 "Active connections" = "Actieve verbindingen";
 
@@ -397,6 +385,9 @@
 /* No comment provided by engineer. */
 "Add friends" = "Vrienden toevoegen";
 
+/* No comment provided by engineer. */
+"Add list" = "Lijst toevoegen";
+
 /* No comment provided by engineer. */
 "Add profile" = "Profiel toevoegen";
 
@@ -412,6 +403,9 @@
 /* No comment provided by engineer. */
 "Add to another device" = "Toevoegen aan een ander apparaat";
 
+/* No comment provided by engineer. */
+"Add to list" = "Toevoegen aan lijst";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Welkom bericht toevoegen";
 
@@ -469,12 +463,18 @@
 /* chat item text */
 "agreeing encryption…" = "versleuteling overeenkomen…";
 
+/* No comment provided by engineer. */
+"All" = "alle";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Alle app-gegevens worden verwijderd.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Alle chats en berichten worden verwijderd, dit kan niet ongedaan worden gemaakt!";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Alle chats worden uit de lijst %@ verwijderd en de lijst wordt verwijderd.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Alle gegevens worden bij het invoeren gewist.";
 
@@ -502,6 +502,9 @@
 /* profile dropdown */
 "All profiles" = "Alle profielen";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Alle rapporten worden voor u gearchiveerd.";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Al uw contacten blijven verbonden.";
 
@@ -547,6 +550,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Sta toe om verzonden berichten definitief te verwijderen. (24 uur)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Hiermee kunt u berichten rapporteren aan moderators.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Sta toe om bestanden en media te verzenden.";
 
@@ -601,6 +607,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "en %lld andere gebeurtenissen";
 
+/* report reason */
+"Another reason" = "Een andere reden";
+
 /* No comment provided by engineer. */
 "Answer call" = "Beantwoord oproep";
 
@@ -616,6 +625,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "App versleutelt nieuwe lokale bestanden (behalve video's).";
 
+/* No comment provided by engineer. */
+"App group:" = "App-groep:";
+
 /* No comment provided by engineer. */
 "App icon" = "App icon";
 
@@ -643,15 +655,36 @@
 /* No comment provided by engineer. */
 "Apply to" = "Toepassen op";
 
+/* No comment provided by engineer. */
+"Archive" = "Archief";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "%lld rapporten archiveren?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Alle rapporten archiveren?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiveren en uploaden";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Archiveer contacten om later te chatten.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Rapport archiveren";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Rapport archiveren?";
+
+/* swipe action */
+"Archive reports" = "Rapporten archiveren";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Gearchiveerde contacten";
 
+/* No comment provided by engineer. */
+"archived report" = "gearchiveerd rapport";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Database archiveren";
 
@@ -730,6 +763,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Betere groepen";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Betere prestaties van groepen";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Betere datums voor berichten.";
 
@@ -742,6 +778,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Betere meldingen";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Betere privacy en veiligheid";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Betere beveiliging ✅";
 
@@ -773,9 +812,10 @@
 "blocked" = "geblokkeerd";
 
 /* rcv group event chat item */
-"blocked %@" = "geblokkeerd %@";
+"blocked %@" = "blokkeerde %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "geblokkeerd door beheerder";
 
 /* No comment provided by engineer. */
@@ -814,9 +854,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Zakelijke chats";
 
+/* No comment provided by engineer. */
+"Businesses" = "bedrijven";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Via chatprofiel (standaard) of [via verbinding](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "Door SimpleX Chat te gebruiken, gaat u ermee akkoord:\n- alleen legale content te versturen in openbare groepen.\n- andere gebruikers te respecteren – geen spam.";
+
 /* No comment provided by engineer. */
 "call" = "bellen";
 
@@ -857,7 +903,7 @@
 "Can't message member" = "Kan geen bericht sturen naar lid";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Annuleren";
 
 /* No comment provided by engineer. */
@@ -884,6 +930,9 @@
 /* No comment provided by engineer. */
 "Change" = "Veranderen";
 
+/* alert title */
+"Change automatic message deletion?" = "Automatisch verwijderen van berichten wijzigen?";
+
 /* authentication reason */
 "Change chat profiles" = "Gebruikersprofielen wijzigen";
 
@@ -912,7 +961,7 @@
 "Change self-destruct mode" = "Zelfvernietigings modus wijzigen";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Zelfvernietigings code wijzigen";
 
 /* chat item text */
@@ -1032,6 +1081,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Gesprek wissen?";
 
+/* No comment provided by engineer. */
+"Clear group?" = "Groep wissen?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Groep wissen of verwijderen?";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "Privénotities verwijderen?";
 
@@ -1047,6 +1102,9 @@
 /* No comment provided by engineer. */
 "colored" = "gekleurd";
 
+/* report reason */
+"Community guidelines violation" = "Schending van de communityrichtlijnen";
+
 /* server test step */
 "Compare file" = "Bestand vergelijken";
 
@@ -1071,12 +1129,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Gebruiksvoorwaarden";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Voor ingeschakelde operators worden de voorwaarden na 30 dagen geaccepteerd.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Voorwaarden worden geaccepteerd voor operator(s): **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Voorwaarden worden geaccepteerd voor de operator(s): **%@**.";
 
@@ -1089,6 +1141,9 @@
 /* No comment provided by engineer. */
 "Configure ICE servers" = "ICE servers configureren";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Serveroperators configureren";
+
 /* No comment provided by engineer. */
 "Confirm" = "Bevestigen";
 
@@ -1119,6 +1174,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Bevestig het uploaden";
 
+/* token status text */
+"Confirmed" = "Bevestigd";
+
 /* server test step */
 "Connect" = "Verbind";
 
@@ -1218,6 +1276,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Verbindings- en serverstatus.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Verbinding geblokkeerd";
+
 /* No comment provided by engineer. */
 "Connection error" = "Verbindingsfout";
 
@@ -1227,12 +1288,21 @@
 /* chat list item title (it should not be shown */
 "connection established" = "verbinding gemaakt";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "Verbinding is geblokkeerd door serveroperator:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "Verbinding nog niet klaar.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Verbindingsmeldingen";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "Verbindingsverzoek verzonden!";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "Verbinding vereist heronderhandeling over encryptie.";
+
 /* No comment provided by engineer. */
 "Connection security" = "Beveiliging van de verbinding";
 
@@ -1293,6 +1363,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "Contact personen kunnen berichten markeren voor verwijdering; u kunt ze wel bekijken.";
 
+/* blocking reason */
+"Content violates conditions of use" = "Inhoud schendt de gebruiksvoorwaarden";
+
 /* No comment provided by engineer. */
 "Continue" = "Doorgaan";
 
@@ -1335,6 +1408,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Maak link";
 
+/* No comment provided by engineer. */
+"Create list" = "Maak een lijst";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Maak een nieuw profiel aan in [desktop-app](https://simplex.chat/downloads/). 💻";
 
@@ -1476,7 +1552,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "decoderingsfouten";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "standaard (%@)";
 
 /* No comment provided by engineer. */
@@ -1486,8 +1563,7 @@
 "default (yes)" = "standaard (ja)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Verwijderen";
 
 /* No comment provided by engineer. */
@@ -1514,6 +1590,9 @@
 /* No comment provided by engineer. */
 "Delete chat" = "Chat verwijderen";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Verwijder chatberichten van uw apparaat.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Chatprofiel verwijderen";
 
@@ -1568,13 +1647,16 @@
 /* No comment provided by engineer. */
 "Delete link?" = "Link verwijderen?";
 
+/* alert title */
+"Delete list?" = "Lijst verwijderen?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "Bericht van lid verwijderen?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Verwijder bericht?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Verwijder berichten";
 
 /* No comment provided by engineer. */
@@ -1598,6 +1680,9 @@
 /* server test step */
 "Delete queue" = "Wachtrij verwijderen";
 
+/* No comment provided by engineer. */
+"Delete report" = "Rapport verwijderen";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Verwijder maximaal 20 berichten tegelijk.";
 
@@ -1706,6 +1791,12 @@
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Uitschakelen (overschrijvingen behouden)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Automatisch verwijderen van berichten uitschakelen?";
+
+/* alert button */
+"Disable delete messages" = "Berichten verwijderen uitschakelen";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Uitschakelen voor iedereen";
 
@@ -1766,6 +1857,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "Gebruik SimpleX NIET voor noodoproepen.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Documenten:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "Maak geen adres aan";
 
@@ -1773,13 +1867,19 @@
 "Don't enable" = "Niet inschakelen";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Mis geen belangrijke berichten.";
+
+/* alert action */
 "Don't show again" = "Niet meer weergeven";
 
+/* No comment provided by engineer. */
+"Done" = "Klaar";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Downgraden en chat openen";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Downloaden";
 
 /* No comment provided by engineer. */
@@ -1836,14 +1936,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Inschakelen (overschrijvingen behouden)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Automatisch verwijderen van berichten aanzetten?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Schakel cameratoegang in";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Flux inschakelen";
+"Enable Flux in Network & servers settings for better metadata privacy." = "Schakel Flux in bij Netwerk- en serverinstellingen voor betere privacy van metagegevens.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Inschakelen voor iedereen";
@@ -1956,6 +2056,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "heronderhandeling van versleuteling vereist voor % @";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Er wordt opnieuw onderhandeld over de encryptie.";
+
 /* No comment provided by engineer. */
 "ended" = "geëindigd";
 
@@ -2031,6 +2134,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "Fout bij het overschakelen naar incognito!";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Fout bij het controleren van de tokenstatus";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Fout bij het verbinden met doorstuurserver %@. Probeer het later opnieuw.";
 
@@ -2043,6 +2149,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Fout bij maken van groep link";
 
+/* alert title */
+"Error creating list" = "Fout bij het aanmaken van de lijst";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "Fout bij aanmaken contact";
 
@@ -2052,6 +2161,9 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "Fout bij aanmaken van profiel!";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Fout bij het rapporteren";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Fout bij het ontsleutelen van bestand";
 
@@ -2118,12 +2230,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Fout bij opnieuw verbinden van servers";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "Fout bij registreren voor meldingen";
+
+/* alert title */
 "Error removing member" = "Fout bij verwijderen van lid";
 
+/* alert title */
+"Error reordering lists" = "Fout bij het opnieuw ordenen van lijsten";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Fout bij het resetten van statistieken";
 
+/* alert title */
+"Error saving chat list" = "Fout bij het opslaan van chatlijst";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Fout bij opslaan van groep profiel";
 
@@ -2175,6 +2296,9 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Fout bij het synchroniseren van de verbinding";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Fout bij het testen van de serververbinding";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Fout bij bijwerken van groep link";
 
@@ -2199,7 +2323,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Fout: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Fout: %@";
 
 /* No comment provided by engineer. */
@@ -2217,9 +2343,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Zelfs wanneer uitgeschakeld in het gesprek.";
 
-/* No comment provided by engineer. */
-"event happened" = "gebeurtenis gebeurd";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Afsluiten zonder opslaan";
 
@@ -2229,6 +2352,9 @@
 /* No comment provided by engineer. */
 "expired" = "verlopen";
 
+/* token status text */
+"Expired" = "Verlopen";
+
 /* No comment provided by engineer. */
 "Export database" = "Database exporteren";
 
@@ -2253,18 +2379,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Snel en niet wachten tot de afzender online is!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Sneller verwijderen van groepen.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Snellere deelname en betrouwbaardere berichten.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Sneller verzenden van berichten.";
+
 /* swipe action */
 "Favorite" = "Favoriet";
 
 /* No comment provided by engineer. */
+"Favorites" = "Favorieten";
+
+/* file error alert title */
 "File error" = "Bestandsfout";
 
 /* alert message */
 "File errors:\n%@" = "Bestandsfouten:\n%@";
 
+/* file error text */
+"File is blocked by server operator:\n%@." = "Bestand is geblokkeerd door serveroperator:\n%@.";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "Bestand niet gevonden - hoogstwaarschijnlijk is het bestand verwijderd of geannuleerd.";
 
@@ -2341,7 +2479,7 @@
 "Fix not supported by group member" = "Herstel wordt niet ondersteund door groepslid";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "voor betere privacy van metagegevens.";
+"For all moderators" = "Voor alle moderators";
 
 /* servers error */
 "For chat profile %@:" = "Voor chatprofiel %@:";
@@ -2352,6 +2490,9 @@
 /* No comment provided by engineer. */
 "For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Als uw contactpersoon bijvoorbeeld berichten ontvangt via een SimpleX Chat-server, worden deze door uw app via een Flux-server verzonden.";
 
+/* No comment provided by engineer. */
+"For me" = "Voor mij";
+
 /* No comment provided by engineer. */
 "For private routing" = "Voor privé-routering";
 
@@ -2424,6 +2565,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Verder verminderd batterij verbruik";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Ontvang een melding als u vermeld wordt.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIF's en stickers";
 
@@ -2496,9 +2640,15 @@
 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "De groep wordt voor u verwijderd, dit kan niet ongedaan worden gemaakt!";
 
+/* No comment provided by engineer. */
+"Groups" = "Groepen";
+
 /* No comment provided by engineer. */
 "Help" = "Help";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Help beheerders bij het modereren van hun groepen.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Verborgen";
 
@@ -2535,6 +2685,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Hoe het de privacy helpt";
 
+/* alert button */
+"How it works" = "Hoe het werkt";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Hoe SimpleX werkt";
 
@@ -2622,6 +2775,12 @@
 /* No comment provided by engineer. */
 "inactive" = "inactief";
 
+/* report reason */
+"Inappropriate content" = "Ongepaste inhoud";
+
+/* report reason */
+"Inappropriate profile" = "Ongepast profiel";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incognito";
 
@@ -2688,6 +2847,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Interface kleuren";
 
+/* token status text */
+"Invalid" = "Ongeldig";
+
+/* token status text */
+"Invalid (bad token)" = "Ongeldig (ongeldig token)";
+
+/* token status text */
+"Invalid (expired)" = "Ongeldig (verlopen)";
+
+/* token status text */
+"Invalid (unregistered)" = "Ongeldig (niet geregistreerd)";
+
+/* token status text */
+"Invalid (wrong topic)" = "Ongeldig (verkeerd onderwerp)";
+
 /* invalid chat data */
 "invalid chat" = "ongeldige gesprek";
 
@@ -2800,7 +2974,7 @@
 "Japanese interface" = "Japanse interface";
 
 /* swipe action */
-"Join" = "Word lid van";
+"Join" = "Word lid";
 
 /* No comment provided by engineer. */
 "join as %@" = "deelnemen als %@";
@@ -2889,6 +3063,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Gelinkte desktops";
 
+/* swipe action */
+"List" = "Lijst";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "De naam en emoji van de lijst moeten voor alle lijsten verschillend zijn.";
+
+/* No comment provided by engineer. */
+"List name..." = "Naam van lijst...";
+
 /* No comment provided by engineer. */
 "LIVE" = "LIVE";
 
@@ -2958,6 +3141,9 @@
 /* item status text */
 "Member inactive" = "Lid inactief";
 
+/* chat feature */
+"Member reports" = "Ledenrapporten";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All chat members will be notified." = "De rol van het lid wordt gewijzigd naar \"%@\". Alle chatleden worden op de hoogte gebracht.";
 
@@ -2979,6 +3165,9 @@
 /* No comment provided by engineer. */
 "Members can irreversibly delete sent messages. (24 hours)" = "Groepsleden kunnen verzonden berichten onherroepelijk verwijderen. (24 uur)";
 
+/* No comment provided by engineer. */
+"Members can report messsages to moderators." = "Leden kunnen berichten melden bij moderators.";
+
 /* No comment provided by engineer. */
 "Members can send direct messages." = "Groepsleden kunnen directe berichten sturen.";
 
@@ -2994,6 +3183,9 @@
 /* No comment provided by engineer. */
 "Members can send voice messages." = "Groepsleden kunnen spraak berichten verzenden.";
 
+/* No comment provided by engineer. */
+"Mention members 👋" = "Vermeld leden 👋";
+
 /* No comment provided by engineer. */
 "Menus" = "Menu's";
 
@@ -3066,6 +3258,9 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "Berichten van %@ worden getoond!";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "Berichten in deze chat zullen nooit worden verwijderd.";
+
 /* No comment provided by engineer. */
 "Messages received" = "Berichten ontvangen";
 
@@ -3138,9 +3333,15 @@
 /* marked deleted chat item preview text */
 "moderated by %@" = "gemodereerd door %@";
 
+/* member role */
+"moderator" = "moderator";
+
 /* time unit */
 "months" = "maanden";
 
+/* swipe action */
+"More" = "Meer";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Meer verbeteringen volgen snel!";
 
@@ -3156,12 +3357,12 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Meerdere chatprofielen";
 
-/* No comment provided by engineer. */
-"mute" = "dempen";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Dempen";
 
+/* notification label action */
+"Mute all" = "Alles dempen";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Gedempt wanneer inactief!";
 
@@ -3192,9 +3393,12 @@
 /* No comment provided by engineer. */
 "Network status" = "Netwerk status";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "nooit";
 
+/* token status text */
+"New" = "Nieuw";
+
 /* No comment provided by engineer. */
 "New chat" = "Nieuw gesprek";
 
@@ -3255,6 +3459,15 @@
 /* Authentication unavailable */
 "No app password" = "Geen app wachtwoord";
 
+/* No comment provided by engineer. */
+"No chats" = "Geen chats";
+
+/* No comment provided by engineer. */
+"No chats found" = "Geen chats gevonden";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Geen chats in lijst %@";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "Geen contacten geselecteerd";
 
@@ -3288,6 +3501,9 @@
 /* servers error */
 "No media & file servers." = "Geen media- en bestandsservers.";
 
+/* No comment provided by engineer. */
+"No message" = "Geen bericht";
+
 /* servers error */
 "No message servers." = "Geen berichtenservers.";
 
@@ -3324,12 +3540,21 @@
 /* copied message info in history */
 "no text" = "geen tekst";
 
+/* alert title */
+"No token!" = "Geen token!";
+
+/* No comment provided by engineer. */
+"No unread chats" = "Geen ongelezen chats";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "Geen gebruikers-ID's.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "Niet compatibel!";
 
+/* No comment provided by engineer. */
+"Notes" = "Notities";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "Niets geselecteerd";
 
@@ -3342,9 +3567,15 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Meldingen zijn uitgeschakeld!";
 
+/* alert title */
+"Notifications error" = "Meldingsfout";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Privacy van meldingen";
 
+/* alert title */
+"Notifications status" = "Meldingsstatus";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Nu kunnen beheerders: \n- berichten van leden verwijderen.\n- schakel leden uit (\"waarnemer\" rol)";
 
@@ -3352,8 +3583,9 @@
 "observer" = "Waarnemer";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "uit";
 
 /* blur media */
@@ -3365,7 +3597,8 @@
 /* feature offered item */
 "offered %@: %@" = "voorgesteld %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "OK";
 
 /* No comment provided by engineer. */
@@ -3407,6 +3640,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "Alleen groep eigenaren kunnen spraak berichten inschakelen.";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "Alleen de verzender en moderators zien het";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "Alleen jij en moderators zien het";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Alleen jij kunt bericht reacties toevoegen.";
 
@@ -3437,7 +3676,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Alleen uw contact kan spraak berichten verzenden.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Open";
 
 /* No comment provided by engineer. */
@@ -3488,6 +3727,9 @@
 /* No comment provided by engineer. */
 "Or to share privately" = "Of om privé te delen";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Organiseer chats in lijsten";
+
 /* No comment provided by engineer. */
 "other" = "overig";
 
@@ -3545,9 +3787,15 @@
 /* No comment provided by engineer. */
 "peer-to-peer" = "peer-to-peer";
 
+/* No comment provided by engineer. */
+"pending" = "In behandeling";
+
 /* No comment provided by engineer. */
 "Pending" = "in behandeling";
 
+/* No comment provided by engineer. */
+"pending approval" = "in afwachting van goedkeuring";
+
 /* No comment provided by engineer. */
 "Periodic" = "Periodiek";
 
@@ -3614,6 +3862,15 @@
 /* No comment provided by engineer. */
 "Please store passphrase securely, you will NOT be able to change it if you lose it." = "Bewaar het wachtwoord veilig, u kunt deze NIET wijzigen als u het kwijtraakt.";
 
+/* token info */
+"Please try to disable and re-enable notfications." = "Probeer meldingen uit en weer in te schakelen.";
+
+/* token info */
+"Please wait for token activation to complete." = "Wacht tot de tokenactivering voltooid is.";
+
+/* token info */
+"Please wait for token to be registered." = "Wacht tot het token is geregistreerd.";
+
 /* No comment provided by engineer. */
 "Polish interface" = "Poolse interface";
 
@@ -3644,12 +3901,21 @@
 /* No comment provided by engineer. */
 "Privacy for your customers." = "Privacy voor uw klanten.";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "Privacybeleid en gebruiksvoorwaarden.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Privacy opnieuw gedefinieerd";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "Privéchats, groepen en uw contacten zijn niet toegankelijk voor serverbeheerders.";
+
 /* No comment provided by engineer. */
 "Private filenames" = "Privé bestandsnamen";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Namen van persoonlijke mediabestanden.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Routering van privéberichten";
 
@@ -3695,6 +3961,9 @@
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Berichten reacties verbieden.";
 
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "Het melden van berichten aan moderators is niet toegestaan.";
+
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "Verbied het sturen van directe berichten naar leden.";
 
@@ -3857,8 +4126,17 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Verminderd batterijgebruik";
 
+/* No comment provided by engineer. */
+"Register" = "Register";
+
+/* token info */
+"Register notification token?" = "Meldingstoken registreren?";
+
+/* token status text */
+"Registered" = "Geregistreerd";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Afwijzen";
 
 /* No comment provided by engineer. */
@@ -3867,6 +4145,9 @@
 /* No comment provided by engineer. */
 "Reject contact request" = "Contactverzoek afwijzen";
 
+/* No comment provided by engineer. */
+"rejected" = "afgewezen";
+
 /* call status */
 "rejected call" = "geweigerde oproep";
 
@@ -3936,8 +4217,38 @@
 /* chat item action */
 "Reply" = "Antwoord";
 
+/* chat item action */
+"Report" = "rapporteren";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Inhoud melden: alleen groepsmoderators kunnen dit zien.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Rapporteer ledenprofiel: alleen groepsmoderators kunnen dit zien.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Anders melden: alleen groepsmoderators kunnen het zien.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "Reden melding?";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Spam melden: alleen groepsmoderators kunnen het zien.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Rapporteer overtreding: alleen groepsmoderators kunnen dit zien.";
+
+/* report in notification */
+"Report: %@" = "rapporteer: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "Het is niet toegestaan om berichten aan moderators te melden.";
+
+/* No comment provided by engineer. */
+"Reports" = "Rapporten";
+
 /* chat list item title */
-"requested to connect" = "gevraagd om verbinding te maken";
+"requested to connect" = "verzocht om verbinding te maken";
 
 /* No comment provided by engineer. */
 "Required" = "Vereist";
@@ -3993,9 +4304,6 @@
 /* No comment provided by engineer. */
 "Review conditions" = "Voorwaarden bekijken";
 
-/* No comment provided by engineer. */
-"Review later" = "Later beoordelen";
-
 /* No comment provided by engineer. */
 "Revoke" = "Intrekken";
 
@@ -4018,7 +4326,7 @@
 "Safer groups" = "Veiligere groepen";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Opslaan";
 
 /* alert button */
@@ -4040,7 +4348,10 @@
 "Save group profile" = "Groep profiel opslaan";
 
 /* No comment provided by engineer. */
-"Save passphrase and open chat" = "Bewaar het wachtwoord en open je chats";
+"Save list" = "Lijst opslaan";
+
+/* No comment provided by engineer. */
+"Save passphrase and open chat" = "Wachtwoord opslaan en open je chats";
 
 /* No comment provided by engineer. */
 "Save passphrase in Keychain" = "Sla het wachtwoord op in de Keychain";
@@ -4207,6 +4518,9 @@
 /* No comment provided by engineer. */
 "Send notifications" = "Meldingen verzenden";
 
+/* No comment provided by engineer. */
+"Send private reports" = "Rapporteer privé";
+
 /* No comment provided by engineer. */
 "Send questions and ideas" = "Stuur vragen en ideeën";
 
@@ -4339,6 +4653,9 @@
 /* No comment provided by engineer. */
 "Set 1 day" = "Stel 1 dag in";
 
+/* No comment provided by engineer. */
+"Set chat name…" = "Stel chatnaam in…";
+
 /* No comment provided by engineer. */
 "Set contact name…" = "Contactnaam instellen…";
 
@@ -4351,11 +4668,14 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Stel het in in plaats van systeemverificatie.";
 
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Stel de berichtvervaldatum in chats in.";
+
 /* profile update event chat item */
 "set new contact address" = "nieuw contactadres instellen";
 
 /* profile update event chat item */
-"set new profile picture" = "nieuwe profielfoto instellen";
+"set new profile picture" = "nieuwe profielfoto";
 
 /* No comment provided by engineer. */
 "Set passcode" = "Toegangscode instellen";
@@ -4382,7 +4702,7 @@
 "Shape profile images" = "Vorm profiel afbeeldingen";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Deel";
 
 /* No comment provided by engineer. */
@@ -4547,6 +4867,10 @@
 /* notification title */
 "Somebody" = "Iemand";
 
+/* blocking reason
+report reason */
+"Spam" = "Spam";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Vierkant, cirkel of iets daartussenin.";
 
@@ -4604,6 +4928,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Chat stoppen";
 
+/* No comment provided by engineer. */
+"Storage" = "Opslag";
+
 /* No comment provided by engineer. */
 "strike" = "staking";
 
@@ -4611,7 +4938,7 @@
 "Strong" = "Krachtig";
 
 /* No comment provided by engineer. */
-"Submit" = "Indienen";
+"Submit" = "Bevestigen";
 
 /* No comment provided by engineer. */
 "Subscribed" = "Subscribed";
@@ -4673,6 +5000,9 @@
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Timeout van TCP-verbinding";
 
+/* No comment provided by engineer. */
+"TCP port for messaging" = "TCP-poort voor berichtenuitwisseling";
+
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
 
@@ -4682,12 +5012,15 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Tijdelijke bestandsfout";
 
 /* server test failure */
 "Test failed at step %@." = "Test mislukt bij stap %@.";
 
+/* No comment provided by engineer. */
+"Test notifications" = "Testmeldingen";
+
 /* No comment provided by engineer. */
 "Test server" = "Server test";
 
@@ -4760,15 +5093,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "De oude database is niet verwijderd tijdens de migratie, deze kan worden verwijderd.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Het profiel wordt alleen gedeeld met uw contacten.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Dezelfde voorwaarden gelden voor operator **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Dezelfde voorwaarden gelden voor operator(s): **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "De tweede vooraf ingestelde operator in de app!";
 
@@ -4808,6 +5135,9 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Deze actie kan niet ongedaan worden gemaakt, de berichten die eerder zijn verzonden en ontvangen dan geselecteerd, worden verwijderd. Het kan enkele minuten duren.";
 
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Deze actie kan niet ongedaan worden gemaakt. De berichten die eerder in deze chat zijn verzonden en ontvangen dan geselecteerd, worden verwijderd.";
+
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan definitief verloren.";
 
@@ -4821,7 +5151,7 @@
 "this contact" = "dit contact";
 
 /* No comment provided by engineer. */
-"This device name" = "Deze apparaatnaam";
+"This device name" = "Naam van dit apparaat";
 
 /* No comment provided by engineer. */
 "This display name is invalid. Please choose another name." = "Deze weergavenaam is ongeldig. Kies een andere naam.";
@@ -4841,6 +5171,9 @@
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Deze link is gebruikt met een ander mobiel apparaat. Maak een nieuwe link op de desktop.";
 
+/* No comment provided by engineer. */
+"This message was deleted or not received yet." = "Dit bericht is verwijderd of nog niet ontvangen.";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Deze instelling is van toepassing op berichten in je huidige chatprofiel **%@**.";
 
@@ -4907,6 +5240,9 @@
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Schakel incognito in tijdens het verbinden.";
 
+/* token status */
+"Token status: %@." = "Tokenstatus: %@.";
+
 /* No comment provided by engineer. */
 "Toolbar opacity" = "De transparantie van de werkbalk";
 
@@ -5015,10 +5351,7 @@
 /* authentication reason */
 "Unlock app" = "Ontgrendel app";
 
-/* No comment provided by engineer. */
-"unmute" = "dempen opheffen";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Dempen opheffen";
 
 /* No comment provided by engineer. */
@@ -5042,6 +5375,9 @@
 /* No comment provided by engineer. */
 "Update settings?" = "Instellingen actualiseren?";
 
+/* No comment provided by engineer. */
+"Updated conditions" = "Bijgewerkte voorwaarden";
+
 /* rcv group event chat item */
 "updated group profile" = "bijgewerkt groep profiel";
 
@@ -5123,12 +5459,18 @@
 /* No comment provided by engineer. */
 "Use SOCKS proxy" = "Gebruik SOCKS proxy";
 
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "Gebruik TCP-poort %@ als er geen poort is opgegeven.";
+
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Gebruik de app tijdens het gesprek.";
 
 /* No comment provided by engineer. */
 "Use the app with one hand." = "Gebruik de app met één hand.";
 
+/* No comment provided by engineer. */
+"Use web port" = "Gebruik een webpoort";
+
 /* No comment provided by engineer. */
 "User selection" = "Gebruikersselectie";
 
@@ -5136,7 +5478,7 @@
 "Username" = "Gebruikersnaam";
 
 /* No comment provided by engineer. */
-"Using SimpleX Chat servers." = "SimpleX Chat servers gebruiken.";
+"Using SimpleX Chat servers." = "Gebruik SimpleX Chat servers.";
 
 /* No comment provided by engineer. */
 "v%@" = "v%@";
@@ -5405,9 +5747,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "U kunt dit wijzigen in de instellingen onder uiterlijk.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "U kunt operators configureren in Netwerk- en serverinstellingen.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "U kunt servers configureren via instellingen.";
 
@@ -5534,6 +5873,9 @@
 /* chat list item description */
 "you shared one-time link incognito" = "je hebt een eenmalige link incognito gedeeld";
 
+/* token info */
+"You should receive notifications." = "U zou meldingen moeten ontvangen.";
+
 /* snd group event chat item */
 "you unblocked %@" = "je hebt %@ gedeblokkeerd";
 
@@ -5627,15 +5969,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Uw profiel **%@** wordt gedeeld.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Het profiel wordt alleen gedeeld met uw contacten.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten. SimpleX servers kunnen uw profiel niet zien.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Je profiel is gewijzigd. Als je het opslaat, wordt het bijgewerkte profiel naar al je contacten verzonden.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Je willekeurige profiel";
 
@@ -5651,6 +5993,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Uw SimpleX adres";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Uw SMP servers";
-
diff --git a/apps/ios/pl.lproj/Localizable.strings b/apps/ios/pl.lproj/Localizable.strings
index cc3bd228f9..e3e860e329 100644
--- a/apps/ios/pl.lproj/Localizable.strings
+++ b/apps/ios/pl.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (można skopiować)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- wiadomości głosowe do 5 minut.\n- niestandardowy czas zniknięcia.\n- historia edycji.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 pokolorowany!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(nowy)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(to urządzenie v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Przyczyń się](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -82,6 +61,9 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Zalecane**: do serwera powiadomień SimpleX Chat wysyłany jest token urządzenia i powiadomienia, lecz nie treść wiadomości, jej rozmiar lub od kogo ona jest.";
 
+/* No comment provided by engineer. */
+"**Scan / Paste link**: to connect via a link you received." = "**Zeskanuj / Wklej link**: aby połączyć się za pomocą otrzymanego linku.";
+
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Uwaga**: Natychmiastowe powiadomienia push wymagają zapisania kodu dostępu w Keychain.";
 
@@ -142,6 +124,12 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ jest zweryfikowany";
 
+/* No comment provided by engineer. */
+"%@ server" = "%@ serwer";
+
+/* No comment provided by engineer. */
+"%@ servers" = "%@ serwery/ów";
+
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ wgrane";
 
@@ -190,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d sek";
 
+/* delete after time */
+"%d seconds(s)" = "%d sekundach";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d pominięte wiadomość(i)";
 
@@ -232,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld nowe języki interfejsu";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld sekund(y)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld sekund";
 
@@ -280,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 dzień";
 
 /* time interval */
@@ -289,12 +278,23 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 minuta";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 miesiąc";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 tydzień";
 
+/* delete after time */
+"1 year" = "1 roku";
+
+/* No comment provided by engineer. */
+"1-time link" = "link jednorazowy";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "Link jednorazowy może być użyty *tylko z jednym kontaktem* - udostępnij go osobiście lub przez dowolny komunikator.";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5 minut";
 
@@ -328,6 +328,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Przerwać zmianę adresu?";
 
+/* No comment provided by engineer. */
+"About operators" = "O operatorach";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "O SimpleX Chat";
 
@@ -338,10 +341,13 @@
 "Accent" = "Akcent";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Akceptuj";
 
+/* No comment provided by engineer. */
+"Accept conditions" = "Zaakceptuj warunki";
+
 /* No comment provided by engineer. */
 "Accept connection request?" = "Zaakceptować prośbę o połączenie?";
 
@@ -349,24 +355,36 @@
 "Accept contact request from %@?" = "Zaakceptuj prośbę o kontakt od %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Akceptuj incognito";
 
 /* call status */
 "accepted call" = "zaakceptowane połączenie";
 
+/* No comment provided by engineer. */
+"Accepted conditions" = "Zaakceptowano warunki";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Potwierdzono";
 
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Błędy potwierdzenia";
 
+/* token status text */
+"Active" = "Aktywne";
+
 /* No comment provided by engineer. */
 "Active connections" = "Aktywne połączenia";
 
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Dodaj adres do swojego profilu, aby Twoje kontakty mogły go udostępnić innym osobom. Aktualizacja profilu zostanie wysłana do Twoich kontaktów.";
 
+/* No comment provided by engineer. */
+"Add friends" = "Dodaj znajomych";
+
+/* No comment provided by engineer. */
+"Add list" = "Dodaj listę";
+
 /* No comment provided by engineer. */
 "Add profile" = "Dodaj profil";
 
@@ -376,12 +394,27 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Dodaj serwery, skanując kody QR.";
 
+/* No comment provided by engineer. */
+"Add team members" = "Dodaj członków zespołu";
+
 /* No comment provided by engineer. */
 "Add to another device" = "Dodaj do innego urządzenia";
 
+/* No comment provided by engineer. */
+"Add to list" = "Dodaj do listy";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Dodaj wiadomość powitalną";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "Dodaj członków zespołu do konwersacji.";
+
+/* No comment provided by engineer. */
+"Added media & file servers" = "Dodano serwery multimediów i plików";
+
+/* No comment provided by engineer. */
+"Added message servers" = "Dodano serwery wiadomości";
+
 /* No comment provided by engineer. */
 "Additional accent" = "Dodatkowy akcent";
 
@@ -397,6 +430,12 @@
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "Zmiana adresu zostanie przerwana. Użyty zostanie stary adres odbiorczy.";
 
+/* No comment provided by engineer. */
+"Address or 1-time link?" = "Adres czy jednorazowy link?";
+
+/* No comment provided by engineer. */
+"Address settings" = "Ustawienia adresu";
+
 /* member role */
 "admin" = "administrator";
 
@@ -421,12 +460,18 @@
 /* chat item text */
 "agreeing encryption…" = "uzgadnianie szyfrowania…";
 
+/* No comment provided by engineer. */
+"All" = "Wszystko";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Wszystkie dane aplikacji są usunięte.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Wszystkie czaty i wiadomości zostaną usunięte - nie można tego cofnąć!";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Wszystkie rozmowy zostaną usunięte z listy %@, a lista usunięta.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Wszystkie dane są usuwane po jego wprowadzeniu.";
 
@@ -439,6 +484,9 @@
 /* feature role */
 "all members" = "wszyscy członkowie";
 
+/* No comment provided by engineer. */
+"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Wszystkie wiadomości i pliki są wysyłane **z szyfrowaniem end-to-end**, z bezpieczeństwem postkwantowym w wiadomościach bezpośrednich.";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "Wszystkie wiadomości zostaną usunięte – nie można tego cofnąć!";
 
@@ -451,6 +499,9 @@
 /* profile dropdown */
 "All profiles" = "Wszystkie profile";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Wszystkie raporty zostaną dla Ciebie zarchiwizowane.";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Wszystkie Twoje kontakty pozostaną połączone.";
 
@@ -496,6 +547,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Zezwól na nieodwracalne usunięcie wysłanych wiadomości. (24 godziny)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Zezwól na zgłaszanie wiadomości moderatorom.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Pozwól na wysyłanie plików i mediów.";
 
@@ -550,6 +604,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "i %lld innych wydarzeń";
 
+/* report reason */
+"Another reason" = "Inny powód";
+
 /* No comment provided by engineer. */
 "Answer call" = "Odbierz połączenie";
 
@@ -565,6 +622,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Aplikacja szyfruje nowe lokalne pliki (bez filmów).";
 
+/* No comment provided by engineer. */
+"App group:" = "Grupa aplikacji:";
+
 /* No comment provided by engineer. */
 "App icon" = "Ikona aplikacji";
 
@@ -592,12 +652,30 @@
 /* No comment provided by engineer. */
 "Apply to" = "Zastosuj dla";
 
+/* No comment provided by engineer. */
+"Archive" = "Archiwizuj";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Archiwizować %lld reports?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Archiwizować wszystkie zgłoszenia?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiwizuj i prześlij";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Archiwizuj kontakty aby porozmawiać później.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Archiwizuj zgłoszenie";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Archiwizować zgłoszenie?";
+
+/* swipe action */
+"Archive reports" = "Archiwizuj zgłoszenia";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Zarchiwizowane kontakty";
 
@@ -673,15 +751,30 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Zły identyfikator wiadomości";
 
+/* No comment provided by engineer. */
+"Better calls" = "Lepsze połączenia";
+
 /* No comment provided by engineer. */
 "Better groups" = "Lepsze grupy";
 
+/* No comment provided by engineer. */
+"Better message dates." = "Lepsze daty wiadomości.";
+
 /* No comment provided by engineer. */
 "Better messages" = "Lepsze wiadomości";
 
 /* No comment provided by engineer. */
 "Better networking" = "Lepsze sieciowanie";
 
+/* No comment provided by engineer. */
+"Better notifications" = "Lepsze powiadomienia";
+
+/* No comment provided by engineer. */
+"Better security ✅" = "Lepsze zabezpieczenia ✅";
+
+/* No comment provided by engineer. */
+"Better user experience" = "Lepszy interfejs użytkownika";
+
 /* No comment provided by engineer. */
 "Black" = "Czarny";
 
@@ -709,7 +802,8 @@
 /* rcv group event chat item */
 "blocked %@" = "zablokowany %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "zablokowany przez admina";
 
 /* No comment provided by engineer. */
@@ -742,6 +836,15 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Bułgarski, fiński, tajski i ukraiński – dzięki użytkownikom i [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
+/* No comment provided by engineer. */
+"Business address" = "Adres firmowy";
+
+/* No comment provided by engineer. */
+"Business chats" = "Czaty biznesowe";
+
+/* No comment provided by engineer. */
+"Businesses" = "Firmy";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Według profilu czatu (domyślnie) lub [według połączenia](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
@@ -785,7 +888,7 @@
 "Can't message member" = "Nie można wysłać wiadomości do członka";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Anuluj";
 
 /* No comment provided by engineer. */
@@ -812,6 +915,9 @@
 /* No comment provided by engineer. */
 "Change" = "Zmień";
 
+/* authentication reason */
+"Change chat profiles" = "Zmień profil czatu";
+
 /* No comment provided by engineer. */
 "Change database passphrase?" = "Zmienić hasło bazy danych?";
 
@@ -837,7 +943,7 @@
 "Change self-destruct mode" = "Zmień tryb samozniszczenia";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Zmień pin samozniszczenia";
 
 /* chat item text */
@@ -855,6 +961,15 @@
 /* chat item text */
 "changing address…" = "zmiana adresu…";
 
+/* No comment provided by engineer. */
+"Chat" = "Czat";
+
+/* No comment provided by engineer. */
+"Chat already exists" = "Czat już istnieje";
+
+/* No comment provided by engineer. */
+"Chat already exists!" = "Czat już istnieje!";
+
 /* No comment provided by engineer. */
 "Chat colors" = "Kolory czatu";
 
@@ -868,10 +983,10 @@
 "Chat database deleted" = "Baza danych czatu usunięta";
 
 /* No comment provided by engineer. */
-"Chat database exported" = "Wyeksportowano bazę danych czatu";
+"Chat database exported" = "Wyeksportowano bazę danych czatów";
 
 /* No comment provided by engineer. */
-"Chat database imported" = "Zaimportowano bazę danych czatu";
+"Chat database imported" = "Zaimportowano bazę danych czatów";
 
 /* No comment provided by engineer. */
 "Chat is running" = "Czat jest uruchomiony";
@@ -900,9 +1015,21 @@
 /* No comment provided by engineer. */
 "Chat theme" = "Motyw czatu";
 
+/* No comment provided by engineer. */
+"Chat will be deleted for all members - this cannot be undone!" = "Czat zostanie usunięty dla wszystkich członków – tej operacji nie można cofnąć!";
+
+/* No comment provided by engineer. */
+"Chat will be deleted for you - this cannot be undone!" = "Czat zostanie usunięty dla Ciebie – tej operacji nie można cofnąć!";
+
 /* No comment provided by engineer. */
 "Chats" = "Czaty";
 
+/* No comment provided by engineer. */
+"Check messages every 20 min." = "Sprawdzaj wiadomości co 20 min.";
+
+/* No comment provided by engineer. */
+"Check messages when allowed." = "Sprawdź wiadomości, gdy będzie to dopuszczone.";
+
 /* alert title */
 "Check server address and try again." = "Sprawdź adres serwera i spróbuj ponownie.";
 
@@ -963,6 +1090,18 @@
 /* No comment provided by engineer. */
 "Completed" = "Zakończono";
 
+/* No comment provided by engineer. */
+"Conditions accepted on: %@." = "Warunki zaakceptowane dnia: %@.";
+
+/* No comment provided by engineer. */
+"Conditions are accepted for the operator(s): **%@**." = "Warunki zostały zaakceptowane przez operatora(-ów): **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions are already accepted for these operator(s): **%@**." = "Warunki zostały już zaakceptowane przez tego(-ych) operatora(-ów): **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions of use" = "Warunki użytkowania";
+
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Skonfiguruj serwery ICE";
 
@@ -1341,7 +1480,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "błąd odszyfrowywania";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "domyślne (%@)";
 
 /* No comment provided by engineer. */
@@ -1351,8 +1491,7 @@
 "default (yes)" = "domyślnie (tak)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Usuń";
 
 /* No comment provided by engineer. */
@@ -1433,7 +1572,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Usunąć wiadomość?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Usuń wiadomości";
 
 /* No comment provided by engineer. */
@@ -1622,14 +1761,14 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Nie włączaj";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Nie pokazuj ponownie";
 
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Obniż wersję i otwórz czat";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Pobierz";
 
 /* No comment provided by engineer. */
@@ -1683,7 +1822,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Włącz (zachowaj nadpisania)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Czy włączyć automatyczne usuwanie wiadomości?";
 
 /* No comment provided by engineer. */
@@ -1953,7 +2092,7 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Błąd ponownego łączenia serwerów";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Błąd usuwania członka";
 
 /* No comment provided by engineer. */
@@ -2028,7 +2167,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Błąd: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Błąd: %@";
 
 /* No comment provided by engineer. */
@@ -2043,9 +2184,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Nawet po wyłączeniu w rozmowie.";
 
-/* No comment provided by engineer. */
-"event happened" = "nowe wydarzenie";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Wyjdź bez zapisywania";
 
@@ -2085,7 +2223,7 @@
 /* swipe action */
 "Favorite" = "Ulubione";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "File error" = "Błąd pliku";
 
 /* alert message */
@@ -2937,10 +3075,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Wiele profili czatu";
 
-/* No comment provided by engineer. */
-"mute" = "wycisz";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Wycisz";
 
 /* No comment provided by engineer. */
@@ -2967,7 +3102,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Status sieci";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "nigdy";
 
 /* No comment provided by engineer. */
@@ -3100,8 +3235,9 @@
 "observer" = "obserwator";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "wyłączony";
 
 /* blur media */
@@ -3113,7 +3249,8 @@
 /* feature offered item */
 "offered %@: %@" = "zaoferował %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ok";
 
 /* No comment provided by engineer. */
@@ -3182,7 +3319,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Tylko Twój kontakt może wysyłać wiadomości głosowe.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Otwórz";
 
 /* No comment provided by engineer. */
@@ -3579,7 +3716,7 @@
 "Reduced battery usage" = "Zmniejszone zużycie baterii";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Odrzuć";
 
 /* No comment provided by engineer. */
@@ -3730,7 +3867,7 @@
 "Safer groups" = "Bezpieczniejsze grupy";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Zapisz";
 
 /* alert button */
@@ -4082,7 +4219,7 @@
 "Shape profile images" = "Kształtuj obrazy profilowe";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Udostępnij";
 
 /* No comment provided by engineer. */
@@ -4349,7 +4486,7 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Tymczasowy błąd pliku";
 
 /* server test failure */
@@ -4421,9 +4558,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Stara baza danych nie została usunięta podczas migracji, można ją usunąć.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Profil jest udostępniany tylko Twoim kontaktom.";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Drugi tik, który przegapiliśmy! ✅";
 
@@ -4646,10 +4780,7 @@
 /* authentication reason */
 "Unlock app" = "Odblokuj aplikację";
 
-/* No comment provided by engineer. */
-"unmute" = "wyłącz wyciszenie";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Wyłącz wyciszenie";
 
 /* No comment provided by engineer. */
@@ -5222,27 +5353,27 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Twój profil **%@** zostanie udostępniony.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Profil jest udostępniany tylko Twoim kontaktom.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Twój profil jest przechowywany na urządzeniu i udostępniany tylko Twoim kontaktom. Serwery SimpleX nie mogą zobaczyć Twojego profilu.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Twój profil został zmieniony. Jeśli go zapiszesz, zaktualizowany profil zostanie wysłany do wszystkich kontaktów.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Twój profil, kontakty i dostarczone wiadomości są przechowywane na Twoim urządzeniu.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Twój losowy profil";
 
 /* No comment provided by engineer. */
 "Your server address" = "Twój adres serwera";
 
+/* No comment provided by engineer. */
+"Your servers" = "Twoje serwery";
+
 /* No comment provided by engineer. */
 "Your settings" = "Twoje ustawienia";
 
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Twój adres SimpleX";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Twoje serwery SMP";
-
diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings
index dcd3de19d1..70cd739531 100644
--- a/apps/ios/ru.lproj/Localizable.strings
+++ b/apps/ios/ru.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (можно скопировать)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- голосовые сообщения до 5 минут.\n- настройка времени исчезающих сообщений.\n- история редактирования.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 цвет!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(новое)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(это устройство v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Внести свой вклад](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -164,7 +143,7 @@
 "%@, %@ and %lld members" = "%@, %@ и %lld членов группы";
 
 /* No comment provided by engineer. */
-"%@, %@ and %lld other members connected" = "%@, %@ и %lld других членов соединены";
+"%@, %@ and %lld other members connected" = "установлено соединение с %@, %@ и %lld другими членами группы";
 
 /* copied message info */
 "%@:" = "%@:";
@@ -185,7 +164,7 @@
 "%d file(s) were not downloaded." = "%d файлов не было загружено.";
 
 /* time interval */
-"%d hours" = "%d ч.";
+"%d hours" = "%d час.";
 
 /* alert title */
 "%d messages not forwarded" = "%d сообщений не переслано";
@@ -199,6 +178,9 @@
 /* time interval */
 "%d sec" = "%d сек";
 
+/* delete after time */
+"%d seconds(s)" = "%d секунд";
+
 /* integrity error chat item */
 "%d skipped message(s)" = "%d пропущенных сообщение(й)";
 
@@ -221,7 +203,7 @@
 "%lld group events" = "%lld событий";
 
 /* No comment provided by engineer. */
-"%lld members" = "Членов группы: %lld";
+"%lld members" = "%lld членов";
 
 /* No comment provided by engineer. */
 "%lld messages blocked" = "%lld сообщений заблокировано";
@@ -241,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld новых языков интерфейса";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld секунд";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld секунд";
 
@@ -289,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0с";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 день";
 
 /* time interval */
@@ -298,12 +278,17 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 минута";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 месяц";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 неделю";
 
+/* delete after time */
+"1 year" = "1 год";
+
 /* No comment provided by engineer. */
 "1-time link" = "Одноразовая ссылка";
 
@@ -332,7 +317,7 @@
 "A separate TCP connection will be used **for each chat profile you have in the app**." = "Отдельное TCP-соединение будет использоваться **для каждого профиля чата, который Вы имеете в приложении**.";
 
 /* No comment provided by engineer. */
-"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." = "Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться **для каждого контакта и члена группы**.\n**Обратите внимание**: если у Вас много контактов, потребление батареи и трафика может быть значительно выше, и некоторые соединения могут не работать.";
+"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." = "Будет использовано отдельное TCP соединение **для каждого контакта и члена группы**.\n**Примечание**: Чем больше подключений, тем быстрее разряжается батарея и расходуется трафик, а некоторые соединения могут отваливаться.";
 
 /* No comment provided by engineer. */
 "Abort" = "Прекратить";
@@ -356,10 +341,16 @@
 "Accent" = "Акцент";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Принять";
 
+/* alert action */
+"Accept as member" = "Принять в группу";
+
+/* alert action */
+"Accept as observer" = "Принять как читателя";
+
 /* No comment provided by engineer. */
 "Accept conditions" = "Принять условия";
 
@@ -370,9 +361,15 @@
 "Accept contact request from %@?" = "Принять запрос на соединение от %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Принять инкогнито";
 
+/* alert title */
+"Accept member" = "Принять члена";
+
+/* rcv group event chat item */
+"accepted %@" = "принят %@";
+
 /* call status */
 "accepted call" = "принятый звонок";
 
@@ -382,12 +379,18 @@
 /* chat list item title */
 "accepted invitation" = "принятое приглашение";
 
+/* rcv group event chat item */
+"accepted you" = "Вы приняты";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Подтверждено";
 
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "Ошибки подтверждения";
 
+/* token status text */
+"Active" = "Активный";
+
 /* No comment provided by engineer. */
 "Active connections" = "Активные соединения";
 
@@ -397,6 +400,9 @@
 /* No comment provided by engineer. */
 "Add friends" = "Добавить друзей";
 
+/* No comment provided by engineer. */
+"Add list" = "Добавить список";
+
 /* No comment provided by engineer. */
 "Add profile" = "Добавить профиль";
 
@@ -412,6 +418,9 @@
 /* No comment provided by engineer. */
 "Add to another device" = "Добавить на другое устройство";
 
+/* No comment provided by engineer. */
+"Add to list" = "Добавить в список";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "Добавить приветственное сообщение";
 
@@ -469,12 +478,21 @@
 /* chat item text */
 "agreeing encryption…" = "шифрование согласовывается…";
 
+/* member criteria value */
+"all" = "все";
+
+/* No comment provided by engineer. */
+"All" = "Все";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "Все данные приложения будут удалены.";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "Все чаты и сообщения будут удалены - это нельзя отменить!";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "Все чаты будут удалены из списка %@, и список удален.";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "Все данные удаляются при его вводе.";
 
@@ -482,7 +500,7 @@
 "All data is kept private on your device." = "Все данные хранятся только на вашем устройстве.";
 
 /* No comment provided by engineer. */
-"All group members will remain connected." = "Все члены группы, которые соединились через эту ссылку, останутся в группе.";
+"All group members will remain connected." = "Все члены группы останутся соединены.";
 
 /* feature role */
 "all members" = "все члены";
@@ -502,6 +520,12 @@
 /* profile dropdown */
 "All profiles" = "Все профили";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "Все сообщения о нарушениях будут заархивированы для вас.";
+
+/* No comment provided by engineer. */
+"All servers" = "Все серверы";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "Все контакты, которые соединились через этот адрес, сохранятся.";
 
@@ -536,7 +560,7 @@
 "Allow message reactions." = "Разрешить реакции на сообщения.";
 
 /* No comment provided by engineer. */
-"Allow sending direct messages to members." = "Разрешить посылать прямые сообщения членам группы.";
+"Allow sending direct messages to members." = "Разрешить личные сообщения членам группы.";
 
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Разрешить посылать исчезающие сообщения.";
@@ -547,6 +571,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Разрешить необратимо удалять отправленные сообщения. (24 часа)";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "Разрешить отправлять сообщения о нарушениях модераторам.";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Разрешить посылать файлы и медиа.";
 
@@ -601,6 +628,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "и %lld других событий";
 
+/* report reason */
+"Another reason" = "Другая причина";
+
 /* No comment provided by engineer. */
 "Answer call" = "Принять звонок";
 
@@ -616,6 +646,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Приложение шифрует новые локальные файлы (кроме видео).";
 
+/* No comment provided by engineer. */
+"App group:" = "Группа приложения:";
+
 /* No comment provided by engineer. */
 "App icon" = "Иконка";
 
@@ -643,15 +676,36 @@
 /* No comment provided by engineer. */
 "Apply to" = "Применить к";
 
+/* No comment provided by engineer. */
+"Archive" = "Архивировать";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "Архивировать %lld сообщений о нарушениях?";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "Архивировать все сообщения о нарушениях?";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "Архивировать и загрузить";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "Архивируйте контакты чтобы продолжить переписку.";
 
+/* No comment provided by engineer. */
+"Archive report" = "Архивировать сообщение о нарушении";
+
+/* No comment provided by engineer. */
+"Archive report?" = "Архивировать сообщение о нарушении?";
+
+/* swipe action */
+"Archive reports" = "Архивировать сообщения о нарушениях";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "Архивированные контакты";
 
+/* No comment provided by engineer. */
+"archived report" = "заархивированное сообщение о нарушении";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Подготовка архива";
 
@@ -730,6 +784,9 @@
 /* No comment provided by engineer. */
 "Better groups" = "Улучшенные группы";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "Улучшенная производительность групп";
+
 /* No comment provided by engineer. */
 "Better message dates." = "Улучшенные даты сообщений.";
 
@@ -742,6 +799,9 @@
 /* No comment provided by engineer. */
 "Better notifications" = "Улучшенные уведомления";
 
+/* No comment provided by engineer. */
+"Better privacy and security" = "Улучшенная конфиденциальность и безопасность";
+
 /* No comment provided by engineer. */
 "Better security ✅" = "Улучшенная безопасность ✅";
 
@@ -758,13 +818,13 @@
 "Block for all" = "Заблокировать для всех";
 
 /* No comment provided by engineer. */
-"Block group members" = "Блокируйте членов группы";
+"Block group members" = "Заблокировать членов группы";
 
 /* No comment provided by engineer. */
 "Block member" = "Заблокировать члена группы";
 
 /* No comment provided by engineer. */
-"Block member for all?" = "Заблокировать члена для всех?";
+"Block member for all?" = "Заблокировать для всех?";
 
 /* No comment provided by engineer. */
 "Block member?" = "Заблокировать члена группы?";
@@ -775,7 +835,8 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ заблокирован";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "заблокировано администратором";
 
 /* No comment provided by engineer. */
@@ -814,9 +875,15 @@
 /* No comment provided by engineer. */
 "Business chats" = "Бизнес разговоры";
 
+/* No comment provided by engineer. */
+"Businesses" = "Бизнесы";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "По профилю чата или [по соединению](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (БЕТА).";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "Используя SimpleX Chat, Вы согласны:\n- отправлять только законные сообщения в публичных группах.\n- уважать других пользователей – не отправлять спам.";
+
 /* No comment provided by engineer. */
 "call" = "звонок";
 
@@ -845,7 +912,7 @@
 "Can't call contact" = "Не удается позвонить контакту";
 
 /* No comment provided by engineer. */
-"Can't call member" = "Не удается позвонить члену группы";
+"Can't call member" = "Не удаётся позвонить члену группы";
 
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Нельзя пригласить контакт!";
@@ -854,10 +921,13 @@
 "Can't invite contacts!" = "Нельзя пригласить контакты!";
 
 /* No comment provided by engineer. */
-"Can't message member" = "Не удается написать члену группы";
+"Can't message member" = "Не удаётся отправить сообщение члену группы";
+
+/* No comment provided by engineer. */
+"can't send messages" = "нельзя отправлять";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Отменить";
 
 /* No comment provided by engineer. */
@@ -884,6 +954,9 @@
 /* No comment provided by engineer. */
 "Change" = "Поменять";
 
+/* alert title */
+"Change automatic message deletion?" = "Измененить автоматическое удаление сообщений?";
+
 /* authentication reason */
 "Change chat profiles" = "Поменять профили";
 
@@ -912,7 +985,7 @@
 "Change self-destruct mode" = "Изменить режим самоуничтожения";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Изменить код самоуничтожения";
 
 /* chat item text */
@@ -990,9 +1063,18 @@
 /* No comment provided by engineer. */
 "Chat will be deleted for you - this cannot be undone!" = "Разговор будет удален для Вас - это действие нельзя отменить!";
 
+/* chat toolbar */
+"Chat with admins" = "Чат с админами";
+
+/* No comment provided by engineer. */
+"Chat with member" = "Чат с членом группы";
+
 /* No comment provided by engineer. */
 "Chats" = "Чаты";
 
+/* No comment provided by engineer. */
+"Chats with members" = "Чаты с членами группы";
+
 /* No comment provided by engineer. */
 "Check messages every 20 min." = "Проверять сообщения каждые 20 минут.";
 
@@ -1032,6 +1114,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Очистить разговор?";
 
+/* No comment provided by engineer. */
+"Clear group?" = "Очистить группу?";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "Очистить или удалить группу?";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "Очистить личные заметки?";
 
@@ -1047,6 +1135,9 @@
 /* No comment provided by engineer. */
 "colored" = "цвет";
 
+/* report reason */
+"Community guidelines violation" = "Нарушение правил группы";
+
 /* server test step */
 "Compare file" = "Сравнение файла";
 
@@ -1071,12 +1162,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Условия использования";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Условия будут приняты для включенных операторов через 30 дней.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Условия будут приняты для оператора(ов): **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Условия будут приняты для оператора(ов): **%@**.";
 
@@ -1089,6 +1174,9 @@
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Настройка ICE серверов";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "Настроить операторов серверов";
+
 /* No comment provided by engineer. */
 "Confirm" = "Подтвердить";
 
@@ -1119,6 +1207,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "Подтвердить загрузку";
 
+/* token status text */
+"Confirmed" = "Подтвержденный";
+
 /* server test step */
 "Connect" = "Соединиться";
 
@@ -1218,6 +1309,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "Состояние соединения и серверов.";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "Соединение заблокировано";
+
 /* No comment provided by engineer. */
 "Connection error" = "Ошибка соединения";
 
@@ -1227,12 +1321,21 @@
 /* chat list item title (it should not be shown */
 "connection established" = "соединение установлено";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "Соединение заблокировано сервером оператора:\n%@";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "Соединение не готово.";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "Уведомления по соединениям";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "Запрос на соединение отправлен!";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "Соединение требует повторного согласования шифрования.";
+
 /* No comment provided by engineer. */
 "Connection security" = "Безопасность соединения";
 
@@ -1260,9 +1363,15 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Существующий контакт";
 
+/* No comment provided by engineer. */
+"contact deleted" = "контакт удален";
+
 /* No comment provided by engineer. */
 "Contact deleted!" = "Контакт удален!";
 
+/* No comment provided by engineer. */
+"contact disabled" = "контакт выключен";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "у контакта есть e2e шифрование";
 
@@ -1281,6 +1390,9 @@
 /* No comment provided by engineer. */
 "Contact name" = "Имена контактов";
 
+/* No comment provided by engineer. */
+"contact not ready" = "контакт не готов";
+
 /* No comment provided by engineer. */
 "Contact preferences" = "Предпочтения контакта";
 
@@ -1293,6 +1405,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "Контакты могут помечать сообщения для удаления; Вы сможете просмотреть их.";
 
+/* blocking reason */
+"Content violates conditions of use" = "Содержание нарушает условия использования";
+
 /* No comment provided by engineer. */
 "Continue" = "Продолжить";
 
@@ -1335,6 +1450,9 @@
 /* No comment provided by engineer. */
 "Create link" = "Создать ссылку";
 
+/* No comment provided by engineer. */
+"Create list" = "Создать список";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Создайте новый профиль в [приложении для компьютера](https://simplex.chat/downloads/). 💻";
 
@@ -1476,18 +1594,18 @@
 /* No comment provided by engineer. */
 "decryption errors" = "ошибки расшифровки";
 
-/* pref value */
-"default (%@)" = "по умолчанию (%@)";
+/* delete after time
+pref value */
+"default (%@)" = "базовый (%@)";
 
 /* No comment provided by engineer. */
-"default (no)" = "по умолчанию (нет)";
+"default (no)" = "базовый (нет)";
 
 /* No comment provided by engineer. */
-"default (yes)" = "по умолчанию (да)";
+"default (yes)" = "базовый (да)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Удалить";
 
 /* No comment provided by engineer. */
@@ -1514,12 +1632,18 @@
 /* No comment provided by engineer. */
 "Delete chat" = "Удалить разговор";
 
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "Удалить сообщения с вашего устройства.";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Удалить профиль чата";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Удалить профиль?";
 
+/* alert title */
+"Delete chat with member?" = "Удалить чат с членом группы?";
+
 /* No comment provided by engineer. */
 "Delete chat?" = "Удалить разговор?";
 
@@ -1568,17 +1692,20 @@
 /* No comment provided by engineer. */
 "Delete link?" = "Удалить ссылку?";
 
+/* alert title */
+"Delete list?" = "Удалить список?";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "Удалить сообщение участника?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Удалить сообщение?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Удалить сообщения";
 
 /* No comment provided by engineer. */
-"Delete messages after" = "Удалять сообщения через";
+"Delete messages after" = "Удалять сообщения";
 
 /* No comment provided by engineer. */
 "Delete old database" = "Удалить предыдущую версию данных";
@@ -1598,6 +1725,9 @@
 /* server test step */
 "Delete queue" = "Удаление очереди";
 
+/* No comment provided by engineer. */
+"Delete report" = "Удалить сообщение о нарушении";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "Удаляйте до 20 сообщений за раз.";
 
@@ -1698,14 +1828,20 @@
 "Direct messages" = "Прямые сообщения";
 
 /* No comment provided by engineer. */
-"Direct messages between members are prohibited in this chat." = "Прямые сообщения между членами запрещены в этом разговоре.";
+"Direct messages between members are prohibited in this chat." = "Личные сообщения запрещены в этой группе.";
 
 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "Прямые сообщения между членами группы запрещены.";
+"Direct messages between members are prohibited." = "Прямые сообщения между членами запрещены.";
 
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "Выключить (кроме исключений)";
 
+/* alert title */
+"Disable automatic message deletion?" = "Отключить автоматическое удаление сообщений?";
+
+/* alert button */
+"Disable delete messages" = "Отключить удаление сообщений";
+
 /* No comment provided by engineer. */
 "Disable for all" = "Выключить для всех";
 
@@ -1766,6 +1902,9 @@
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "Не используйте SimpleX для экстренных звонков.";
 
+/* No comment provided by engineer. */
+"Documents:" = "Документы:";
+
 /* No comment provided by engineer. */
 "Don't create address" = "Не создавать адрес";
 
@@ -1773,13 +1912,19 @@
 "Don't enable" = "Не включать";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "Не пропустите важные сообщения.";
+
+/* alert action */
 "Don't show again" = "Не показывать";
 
+/* No comment provided by engineer. */
+"Done" = "Готово";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Откатить версию и открыть чат";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Загрузить";
 
 /* No comment provided by engineer. */
@@ -1836,14 +1981,14 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Включить (кроме исключений)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Включить автоматическое удаление сообщений?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Включить доступ к камере";
 
 /* No comment provided by engineer. */
-"Enable Flux" = "Включить Flux";
+"Enable Flux in Network & servers settings for better metadata privacy." = "Включите Flux в настройках Сеть и серверы для лучшей конфиденциальности метаданных.";
 
 /* No comment provided by engineer. */
 "Enable for all" = "Включить для всех";
@@ -1956,6 +2101,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "требуется новое соглашение о шифровании для %@";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "Выполняется повторное согласование шифрования.";
+
 /* No comment provided by engineer. */
 "ended" = "завершён";
 
@@ -2010,6 +2158,9 @@
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Ошибка при принятии запроса на соединение";
 
+/* alert title */
+"Error accepting member" = "Ошибка вступления члена группы";
+
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Ошибка при добавлении членов группы";
 
@@ -2031,6 +2182,9 @@
 /* No comment provided by engineer. */
 "Error changing to incognito!" = "Ошибка при смене на Инкогнито!";
 
+/* No comment provided by engineer. */
+"Error checking token status" = "Ошибка проверки статуса токена";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "Ошибка подключения к пересылающему серверу %@. Попробуйте позже.";
 
@@ -2043,8 +2197,11 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Ошибка при создании ссылки группы";
 
+/* alert title */
+"Error creating list" = "Ошибка создания списка";
+
 /* No comment provided by engineer. */
-"Error creating member contact" = "Ошибка создания контакта с членом группы";
+"Error creating member contact" = "Ошибка при создании контакта";
 
 /* No comment provided by engineer. */
 "Error creating message" = "Ошибка создания сообщения";
@@ -2052,12 +2209,18 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "Ошибка создания профиля!";
 
+/* No comment provided by engineer. */
+"Error creating report" = "Ошибка создания сообщения о нарушении";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "Ошибка расшифровки файла";
 
 /* No comment provided by engineer. */
 "Error deleting chat database" = "Ошибка при удалении данных чата";
 
+/* alert title */
+"Error deleting chat with member" = "Ошибка при удалении чата с членом группы";
+
 /* No comment provided by engineer. */
 "Error deleting chat!" = "Ошибка при удалении чата!";
 
@@ -2118,12 +2281,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Ошибка переподключения к серверам";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "Ошибка регистрации для уведомлений";
+
+/* alert title */
 "Error removing member" = "Ошибка при удалении члена группы";
 
+/* alert title */
+"Error reordering lists" = "Ошибка сортировки списков";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "Ошибка сброса статистики";
 
+/* alert title */
+"Error saving chat list" = "Ошибка сохранения списка чатов";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "Ошибка при сохранении профиля группы";
 
@@ -2152,7 +2324,7 @@
 "Error sending email" = "Ошибка отправки email";
 
 /* No comment provided by engineer. */
-"Error sending member contact invitation" = "Ошибка отправки приглашения члену группы";
+"Error sending member contact invitation" = "Ошибка при отправке приглашения члену";
 
 /* No comment provided by engineer. */
 "Error sending message" = "Ошибка при отправке сообщения";
@@ -2175,6 +2347,9 @@
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "Ошибка синхронизации соединения";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "Ошибка проверки соединения с сервером";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "Ошибка обновления ссылки группы";
 
@@ -2199,7 +2374,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Ошибка: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Ошибка: %@";
 
 /* No comment provided by engineer. */
@@ -2217,9 +2394,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Даже когда они выключены в разговоре.";
 
-/* No comment provided by engineer. */
-"event happened" = "событие произошло";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Выйти без сохранения";
 
@@ -2229,6 +2403,9 @@
 /* No comment provided by engineer. */
 "expired" = "истекло";
 
+/* token status text */
+"Expired" = "Истекший";
+
 /* No comment provided by engineer. */
 "Export database" = "Экспорт архива чата";
 
@@ -2253,18 +2430,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Быстрые и не нужно ждать, когда отправитель онлайн!";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "Ускорено удаление групп.";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Быстрое вступление и надежная доставка сообщений.";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "Ускорена отправка сообщений.";
+
 /* swipe action */
 "Favorite" = "Избранный";
 
 /* No comment provided by engineer. */
+"Favorites" = "Избранное";
+
+/* file error alert title */
 "File error" = "Ошибка файла";
 
 /* alert message */
 "File errors:\n%@" = "Ошибки файлов:\n%@";
 
+/* file error text */
+"File is blocked by server operator:\n%@." = "Файл заблокирован оператором сервера:\n%@.";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "Файл не найден - скорее всего, файл был удален или отменен.";
 
@@ -2338,10 +2527,10 @@
 "Fix not supported by contact" = "Починка не поддерживается контактом";
 
 /* No comment provided by engineer. */
-"Fix not supported by group member" = "Починка не поддерживается членом группы";
+"Fix not supported by group member" = "Починка не поддерживается членом группы.";
 
 /* No comment provided by engineer. */
-"for better metadata privacy." = "для лучшей конфиденциальности метаданных.";
+"For all moderators" = "Для всех модераторов";
 
 /* servers error */
 "For chat profile %@:" = "Для профиля чата %@:";
@@ -2352,6 +2541,9 @@
 /* No comment provided by engineer. */
 "For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Например, если Ваш контакт получает сообщения через сервер SimpleX Chat, Ваше приложение доставит их через сервер Flux.";
 
+/* No comment provided by engineer. */
+"For me" = "Для меня";
+
 /* No comment provided by engineer. */
 "For private routing" = "Для доставки сообщений";
 
@@ -2424,6 +2616,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "Уменьшенное потребление батареи";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "Уведомления, когда Вас упомянули.";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "ГИФ файлы и стикеры";
 
@@ -2463,6 +2658,9 @@
 /* No comment provided by engineer. */
 "Group invitation is no longer valid, it was removed by sender." = "Приглашение в группу больше не действительно, оно было удалено отправителем.";
 
+/* No comment provided by engineer. */
+"group is deleted" = "группа удалена";
+
 /* No comment provided by engineer. */
 "Group link" = "Ссылка группы";
 
@@ -2496,9 +2694,15 @@
 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "Группа будет удалена для Вас - это действие нельзя отменить!";
 
+/* No comment provided by engineer. */
+"Groups" = "Группы";
+
 /* No comment provided by engineer. */
 "Help" = "Помощь";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "Помогайте администраторам модерировать их группы.";
+
 /* No comment provided by engineer. */
 "Hidden" = "Скрытое";
 
@@ -2535,6 +2739,9 @@
 /* No comment provided by engineer. */
 "How it helps privacy" = "Как это улучшает конфиденциальность";
 
+/* alert button */
+"How it works" = "Как это работает";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "Как SimpleX работает";
 
@@ -2622,6 +2829,12 @@
 /* No comment provided by engineer. */
 "inactive" = "неактивен";
 
+/* report reason */
+"Inappropriate content" = "Неприемлемый контент";
+
+/* report reason */
+"Inappropriate profile" = "Неприемлемый профиль";
+
 /* No comment provided by engineer. */
 "Incognito" = "Инкогнито";
 
@@ -2688,6 +2901,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "Цвета интерфейса";
 
+/* token status text */
+"Invalid" = "Недействительный";
+
+/* token status text */
+"Invalid (bad token)" = "Недействительный (плохой токен)";
+
+/* token status text */
+"Invalid (expired)" = "Недействительный (истекший)";
+
+/* token status text */
+"Invalid (unregistered)" = "Недействительный (незарегистрированный)";
+
+/* token status text */
+"Invalid (wrong topic)" = "Недействительный (плохой заголовок)";
+
 /* invalid chat data */
 "invalid chat" = "ошибка чата";
 
@@ -2889,6 +3117,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "Связанные компьютеры";
 
+/* swipe action */
+"List" = "Список";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "Название списка и эмодзи должны быть разными для всех списков.";
+
+/* No comment provided by engineer. */
+"List name..." = "Имя списка...";
+
 /* No comment provided by engineer. */
 "LIVE" = "LIVE";
 
@@ -2952,20 +3189,29 @@
 /* profile update event chat item */
 "member %@ changed to %@" = "член %1$@ изменился на %2$@";
 
+/* No comment provided by engineer. */
+"Member admission" = "Приём членов в группу";
+
 /* rcv group event chat item */
 "member connected" = "соединен(а)";
 
+/* No comment provided by engineer. */
+"member has old version" = "член имеет старую версию";
+
 /* item status text */
 "Member inactive" = "Член неактивен";
 
+/* chat feature */
+"Member reports" = "Сообщения о нарушениях";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All chat members will be notified." = "Роль участника будет изменена на \"%@\". Все участники разговора получат уведомление.";
 
 /* No comment provided by engineer. */
-"Member role will be changed to \"%@\". All group members will be notified." = "Роль члена группы будет изменена на \"%@\". Все члены группы получат сообщение.";
+"Member role will be changed to \"%@\". All group members will be notified." = "Роль члена будет изменена на \"%@\". Все члены группы получат уведомление.";
 
 /* No comment provided by engineer. */
-"Member role will be changed to \"%@\". The member will receive a new invitation." = "Роль члена группы будет изменена на \"%@\". Будет отправлено новое приглашение.";
+"Member role will be changed to \"%@\". The member will receive a new invitation." = "Роль члена будет изменена на \"%@\". Будет отправлено новое приглашение.";
 
 /* No comment provided by engineer. */
 "Member will be removed from chat - this cannot be undone!" = "Член будет удален из разговора - это действие нельзя отменить!";
@@ -2973,26 +3219,35 @@
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Член группы будет удален - это действие нельзя отменить!";
 
-/* No comment provided by engineer. */
-"Members can add message reactions." = "Члены группы могут добавлять реакции на сообщения.";
+/* alert message */
+"Member will join the group, accept member?" = "Участник хочет присоединиться к группе. Принять?";
 
 /* No comment provided by engineer. */
-"Members can irreversibly delete sent messages. (24 hours)" = "Члены группы могут необратимо удалять отправленные сообщения. (24 часа)";
+"Members can add message reactions." = "Члены могут добавлять реакции на сообщения.";
 
 /* No comment provided by engineer. */
-"Members can send direct messages." = "Члены группы могут посылать прямые сообщения.";
+"Members can irreversibly delete sent messages. (24 hours)" = "Члены могут необратимо удалять отправленные сообщения. (24 часа)";
 
 /* No comment provided by engineer. */
-"Members can send disappearing messages." = "Члены группы могут посылать исчезающие сообщения.";
+"Members can report messsages to moderators." = "Члены группы могут пожаловаться модераторам.";
 
 /* No comment provided by engineer. */
-"Members can send files and media." = "Члены группы могут слать файлы и медиа.";
+"Members can send direct messages." = "Члены могут посылать прямые сообщения.";
 
 /* No comment provided by engineer. */
-"Members can send SimpleX links." = "Члены группы могут отправлять ссылки SimpleX.";
+"Members can send disappearing messages." = "Члены могут посылать исчезающие сообщения.";
 
 /* No comment provided by engineer. */
-"Members can send voice messages." = "Члены группы могут отправлять голосовые сообщения.";
+"Members can send files and media." = "Члены могут слать файлы и медиа.";
+
+/* No comment provided by engineer. */
+"Members can send SimpleX links." = "Члены могут отправлять ссылки SimpleX.";
+
+/* No comment provided by engineer. */
+"Members can send voice messages." = "Члены могут отправлять голосовые сообщения.";
+
+/* No comment provided by engineer. */
+"Mention members 👋" = "Упоминайте участников 👋";
 
 /* No comment provided by engineer. */
 "Menus" = "Меню";
@@ -3066,6 +3321,9 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "Сообщения от %@ будут показаны!";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "Сообщения в этом чате никогда не будут удалены.";
+
 /* No comment provided by engineer. */
 "Messages received" = "Получено сообщений";
 
@@ -3138,9 +3396,15 @@
 /* marked deleted chat item preview text */
 "moderated by %@" = "удалено %@";
 
+/* member role */
+"moderator" = "модератор";
+
 /* time unit */
 "months" = "месяцев";
 
+/* swipe action */
+"More" = "Больше";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Дополнительные улучшения скоро!";
 
@@ -3156,12 +3420,12 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Много профилей чата";
 
-/* No comment provided by engineer. */
-"mute" = "без звука";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Без звука";
 
+/* notification label action */
+"Mute all" = "Все без звука";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Без звука, когда не активный!";
 
@@ -3192,9 +3456,12 @@
 /* No comment provided by engineer. */
 "Network status" = "Состояние сети";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "никогда";
 
+/* token status text */
+"New" = "Новый";
+
 /* No comment provided by engineer. */
 "New chat" = "Новый чат";
 
@@ -3225,6 +3492,9 @@
 /* No comment provided by engineer. */
 "New member role" = "Роль члена группы";
 
+/* rcv group event chat item */
+"New member wants to join the group." = "Новый участник хочет присоединиться к группе.";
+
 /* notification */
 "new message" = "новое сообщение";
 
@@ -3255,6 +3525,18 @@
 /* Authentication unavailable */
 "No app password" = "Нет кода доступа";
 
+/* No comment provided by engineer. */
+"No chats" = "Нет чатов";
+
+/* No comment provided by engineer. */
+"No chats found" = "Чаты не найдены";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "Нет чатов в списке %@";
+
+/* No comment provided by engineer. */
+"No chats with members" = "Нет чатов с членами группы";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "Контакты не выбраны";
 
@@ -3288,6 +3570,9 @@
 /* servers error */
 "No media & file servers." = "Нет серверов файлов и медиа.";
 
+/* No comment provided by engineer. */
+"No message" = "Нет сообщения";
+
 /* servers error */
 "No message servers." = "Нет серверов сообщений.";
 
@@ -3324,12 +3609,24 @@
 /* copied message info in history */
 "no text" = "нет текста";
 
+/* alert title */
+"No token!" = "Нет токена!";
+
+/* No comment provided by engineer. */
+"No unread chats" = "Нет непрочитанных чатов";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "Без идентификаторов пользователей.";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "Несовместимая версия!";
 
+/* No comment provided by engineer. */
+"not synchronized" = "не синхронизирован";
+
+/* No comment provided by engineer. */
+"Notes" = "Заметки";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "Ничего не выбрано";
 
@@ -3342,18 +3639,25 @@
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "Уведомления выключены";
 
+/* alert title */
+"Notifications error" = "Ошибка уведомлений";
+
 /* No comment provided by engineer. */
 "Notifications privacy" = "Конфиденциальность уведомлений";
 
+/* alert title */
+"Notifications status" = "Статус уведомлений";
+
 /* No comment provided by engineer. */
-"Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Теперь админы могут:\n- удалять сообщения членов.\n- приостанавливать членов (роль \"наблюдатель\")";
+"Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "Теперь админы могут:\n- удалять сообщения членов.\n- приостанавливать членов (роль наблюдатель)";
 
 /* member role */
 "observer" = "читатель";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "нет";
 
 /* blur media */
@@ -3365,7 +3669,8 @@
 /* feature offered item */
 "offered %@: %@" = "предложил(a) %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Ок";
 
 /* No comment provided by engineer. */
@@ -3407,6 +3712,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "Только владельцы группы могут разрешить голосовые сообщения.";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "Только отправитель и модераторы видят это";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "Только вы и модераторы видят это";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "Только Вы можете добавлять реакции на сообщения.";
 
@@ -3437,7 +3748,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Только Ваш контакт может отправлять голосовые сообщения.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Открыть";
 
 /* No comment provided by engineer. */
@@ -3455,6 +3766,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Открыть группу";
 
+/* alert title */
+"Open link?" = "Открыть ссылку?";
+
 /* authentication reason */
 "Open migration to another device" = "Открытие миграции на другое устройство";
 
@@ -3483,11 +3797,14 @@
 "Or securely share this file link" = "Или передайте эту ссылку";
 
 /* No comment provided by engineer. */
-"Or show this code" = "Или покажите этот код";
+"Or show this code" = "Или покажите код";
 
 /* No comment provided by engineer. */
 "Or to share privately" = "Или поделиться конфиденциально";
 
+/* No comment provided by engineer. */
+"Organize chats into lists" = "Организуйте чаты в списки";
+
 /* No comment provided by engineer. */
 "other" = "другое";
 
@@ -3546,7 +3863,16 @@
 "peer-to-peer" = "peer-to-peer";
 
 /* No comment provided by engineer. */
-"Pending" = "В ожидании";
+"pending" = "ожидает";
+
+/* No comment provided by engineer. */
+"Pending" = "Ожидает";
+
+/* No comment provided by engineer. */
+"pending approval" = "ожидает утверждения";
+
+/* No comment provided by engineer. */
+"pending review" = "ожидает одобрения";
 
 /* No comment provided by engineer. */
 "Periodic" = "Периодически";
@@ -3614,6 +3940,18 @@
 /* No comment provided by engineer. */
 "Please store passphrase securely, you will NOT be able to change it if you lose it." = "Пожалуйста, надежно сохраните пароль, Вы НЕ сможете его поменять, если потеряете.";
 
+/* token info */
+"Please try to disable and re-enable notfications." = "Попробуйте выключить и снова включить уведомления.";
+
+/* snd group event chat item */
+"Please wait for group moderators to review your request to join the group." = "Пожалуйста, подождите, пока модераторы группы рассмотрят ваш запрос на вступление.";
+
+/* token info */
+"Please wait for token activation to complete." = "Пожалуйста, дождитесь завершения активации токена.";
+
+/* token info */
+"Please wait for token to be registered." = "Пожалуйста, дождитесь регистрации токена.";
+
 /* No comment provided by engineer. */
 "Polish interface" = "Польский интерфейс";
 
@@ -3644,12 +3982,21 @@
 /* No comment provided by engineer. */
 "Privacy for your customers." = "Конфиденциальность для ваших покупателей.";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "Политика конфиденциальности и условия использования.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Более конфиденциальный";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "Частные разговоры, группы и Ваши контакты недоступны для операторов серверов.";
+
 /* No comment provided by engineer. */
 "Private filenames" = "Защищенные имена файлов";
 
+/* No comment provided by engineer. */
+"Private media file names." = "Конфиденциальные названия медиафайлов.";
+
 /* No comment provided by engineer. */
 "Private message routing" = "Конфиденциальная доставка сообщений";
 
@@ -3695,6 +4042,9 @@
 /* No comment provided by engineer. */
 "Prohibit messages reactions." = "Запретить реакции на сообщения.";
 
+/* No comment provided by engineer. */
+"Prohibit reporting messages to moderators." = "Запретить жаловаться модераторам группы.";
+
 /* No comment provided by engineer. */
 "Prohibit sending direct messages to members." = "Запретить посылать прямые сообщения членам группы.";
 
@@ -3857,8 +4207,17 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Уменьшенное потребление батареи";
 
+/* No comment provided by engineer. */
+"Register" = "Зарегистрировать";
+
+/* token info */
+"Register notification token?" = "Зарегистрировать токен уведомлений?";
+
+/* token status text */
+"Registered" = "Зарегистрирован";
+
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Отклонить";
 
 /* No comment provided by engineer. */
@@ -3867,6 +4226,12 @@
 /* No comment provided by engineer. */
 "Reject contact request" = "Отклонить запрос";
 
+/* alert title */
+"Reject member?" = "Отклонить участника?";
+
+/* No comment provided by engineer. */
+"rejected" = "отклонён";
+
 /* call status */
 "rejected call" = "отклонённый звонок";
 
@@ -3903,6 +4268,9 @@
 /* profile update event chat item */
 "removed contact address" = "удалён адрес контакта";
 
+/* No comment provided by engineer. */
+"removed from group" = "удален из группы";
+
 /* profile update event chat item */
 "removed profile picture" = "удалена картинка профиля";
 
@@ -3936,6 +4304,42 @@
 /* chat item action */
 "Reply" = "Ответить";
 
+/* chat item action */
+"Report" = "Пожаловаться";
+
+/* report reason */
+"Report content: only group moderators will see it." = "Пожаловаться на сообщение: увидят только модераторы группы.";
+
+/* report reason */
+"Report member profile: only group moderators will see it." = "Пожаловаться на профиль: увидят только модераторы группы.";
+
+/* report reason */
+"Report other: only group moderators will see it." = "Пожаловаться: увидят только модераторы группы.";
+
+/* No comment provided by engineer. */
+"Report reason?" = "Причина сообщения?";
+
+/* alert title */
+"Report sent to moderators" = "Жалоба отправлена модераторам";
+
+/* report reason */
+"Report spam: only group moderators will see it." = "Пожаловаться на спам: увидят только модераторы группы.";
+
+/* report reason */
+"Report violation: only group moderators will see it." = "Пожаловаться на нарушение: увидят только модераторы группы.";
+
+/* report in notification */
+"Report: %@" = "Сообщение о нарушении: %@";
+
+/* No comment provided by engineer. */
+"Reporting messages to moderators is prohibited." = "Сообщения о нарушениях запрещены в этой группе.";
+
+/* No comment provided by engineer. */
+"Reports" = "Сообщения о нарушениях";
+
+/* No comment provided by engineer. */
+"request to join rejected" = "запрос на вступление отклонён";
+
 /* chat list item title */
 "requested to connect" = "запрошено соединение";
 
@@ -3991,10 +4395,19 @@
 "Reveal" = "Показать";
 
 /* No comment provided by engineer. */
-"Review conditions" = "Посмотреть условия";
+"review" = "рассмотрение";
 
 /* No comment provided by engineer. */
-"Review later" = "Посмотреть позже";
+"Review conditions" = "Посмотреть условия";
+
+/* admission stage */
+"Review members" = "Одобрять членов";
+
+/* admission stage description */
+"Review members before admitting (\"knocking\")." = "Одобрять членов для вступления в группу.";
+
+/* No comment provided by engineer. */
+"reviewed by admins" = "одобрен админами";
 
 /* No comment provided by engineer. */
 "Revoke" = "Отозвать";
@@ -4018,12 +4431,15 @@
 "Safer groups" = "Более безопасные группы";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Сохранить";
 
 /* alert button */
 "Save (and notify contacts)" = "Сохранить (и уведомить контакты)";
 
+/* alert title */
+"Save admission settings?" = "Сохранить настройки вступления?";
+
 /* alert button */
 "Save and notify contact" = "Сохранить и уведомить контакт";
 
@@ -4039,6 +4455,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "Сохранить профиль группы";
 
+/* No comment provided by engineer. */
+"Save list" = "Сохранить список";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "Сохранить пароль и открыть чат";
 
@@ -4207,11 +4626,14 @@
 /* No comment provided by engineer. */
 "Send notifications" = "Отправлять уведомления";
 
+/* No comment provided by engineer. */
+"Send private reports" = "Вы можете сообщить о нарушениях";
+
 /* No comment provided by engineer. */
 "Send questions and ideas" = "Отправьте вопросы и идеи";
 
 /* No comment provided by engineer. */
-"Send receipts" = "Отправлять отчёты о доставке";
+"Send receipts" = "Отчёты о доставке";
 
 /* No comment provided by engineer. */
 "Send them from gallery or custom keyboards." = "Отправьте из галереи или из дополнительных клавиатур.";
@@ -4339,6 +4761,9 @@
 /* No comment provided by engineer. */
 "Set 1 day" = "Установить 1 день";
 
+/* No comment provided by engineer. */
+"Set chat name…" = "Имя чата…";
+
 /* No comment provided by engineer. */
 "Set contact name…" = "Имя контакта…";
 
@@ -4351,6 +4776,12 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Установите код вместо системной аутентификации.";
 
+/* No comment provided by engineer. */
+"Set member admission" = "Приём членов в группу";
+
+/* No comment provided by engineer. */
+"Set message expiration in chats." = "Установите срок хранения сообщений в чатах.";
+
 /* profile update event chat item */
 "set new contact address" = "установлен новый адрес контакта";
 
@@ -4382,7 +4813,7 @@
 "Shape profile images" = "Форма картинок профилей";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Поделиться";
 
 /* No comment provided by engineer. */
@@ -4413,7 +4844,7 @@
 "Share SimpleX address on social media." = "Поделитесь SimpleX адресом в социальных сетях.";
 
 /* No comment provided by engineer. */
-"Share this 1-time invite link" = "Поделиться одноразовой ссылкой-приглашением";
+"Share this 1-time invite link" = "Поделитесь одноразовой ссылкой";
 
 /* No comment provided by engineer. */
 "Share to SimpleX" = "Поделиться в SimpleX";
@@ -4421,6 +4852,9 @@
 /* No comment provided by engineer. */
 "Share with contacts" = "Поделиться с контактами";
 
+/* No comment provided by engineer. */
+"Short link" = "Короткая ссылка";
+
 /* No comment provided by engineer. */
 "Show → on messages sent via private routing." = "Показать → на сообщениях доставленных конфиденциально.";
 
@@ -4463,6 +4897,9 @@
 /* No comment provided by engineer. */
 "SimpleX address or 1-time link?" = "Адрес SimpleX или одноразовая ссылка?";
 
+/* simplex link type */
+"SimpleX channel link" = "SimpleX ссылка канала";
+
 /* No comment provided by engineer. */
 "SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat и Flux заключили соглашение добавить серверы под управлением Flux в приложение.";
 
@@ -4547,6 +4984,10 @@
 /* notification title */
 "Somebody" = "Контакт";
 
+/* blocking reason
+report reason */
+"Spam" = "Спам";
+
 /* No comment provided by engineer. */
 "Square, circle, or anything in between." = "Квадрат, круг и все, что между ними.";
 
@@ -4604,6 +5045,9 @@
 /* No comment provided by engineer. */
 "Stopping chat" = "Остановка чата";
 
+/* No comment provided by engineer. */
+"Storage" = "Хранилище";
+
 /* No comment provided by engineer. */
 "strike" = "зачеркнуть";
 
@@ -4673,6 +5117,9 @@
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Таймаут TCP соединения";
 
+/* No comment provided by engineer. */
+"TCP port for messaging" = "TCP-порт для отправки сообщений";
+
 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
 
@@ -4682,12 +5129,15 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Временная ошибка файла";
 
 /* server test failure */
 "Test failed at step %@." = "Ошибка теста на шаге %@.";
 
+/* No comment provided by engineer. */
+"Test notifications" = "Протестировать уведомления";
+
 /* No comment provided by engineer. */
 "Test server" = "Тестировать сервер";
 
@@ -4760,15 +5210,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Предыдущая версия данных чата не удалена при перемещении, её можно удалить.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Профиль отправляется только Вашим контактам.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Те же самые условия будут приняты для оператора **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Те же самые условия будут приняты для оператора(ов): **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "Второй оператор серверов в приложении!";
 
@@ -4808,6 +5252,9 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - the messages sent and received earlier than selected will be deleted. It may take several minutes." = "Это действие нельзя отменить — все сообщения, отправленные или полученные раньше чем выбрано, будут удалены. Это может занять несколько минут.";
 
+/* alert message */
+"This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted." = "Это действие нельзя отменить - сообщения в этом чате, отправленные или полученные раньше чем выбрано, будут удалены.";
+
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Это действие нельзя отменить — Ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.";
 
@@ -4827,7 +5274,7 @@
 "This display name is invalid. Please choose another name." = "Ошибка имени профиля. Пожалуйста, выберите другое имя.";
 
 /* No comment provided by engineer. */
-"This group has over %lld members, delivery receipts are not sent." = "В группе более %lld членов, отчёты о доставке выключены.";
+"This group has over %lld members, delivery receipts are not sent." = "В этой группе более %lld членов, отчёты о доставке не отправляются.";
 
 /* No comment provided by engineer. */
 "This group no longer exists." = "Эта группа больше не существует.";
@@ -4838,9 +5285,15 @@
 /* No comment provided by engineer. */
 "This is your own SimpleX address!" = "Это ваш собственный адрес SimpleX!";
 
+/* No comment provided by engineer. */
+"This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link." = "Эта ссылка требует новую версию. Обновите приложение или попросите Ваш контакт прислать совместимую ссылку.";
+
 /* No comment provided by engineer. */
 "This link was used with another mobile device, please create a new link on the desktop." = "Эта ссылка была использована на другом мобильном, пожалуйста, создайте новую ссылку на компьютере.";
 
+/* No comment provided by engineer. */
+"This message was deleted or not received yet." = "Это сообщение было удалено или еще не получено.";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Эта настройка применяется к сообщениям в Вашем текущем профиле чата **%@**.";
 
@@ -4907,6 +5360,9 @@
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Установите режим Инкогнито при соединении.";
 
+/* token status */
+"Token status: %@." = "Статус токена: %@.";
+
 /* No comment provided by engineer. */
 "Toolbar opacity" = "Прозрачность тулбара";
 
@@ -5015,10 +5471,7 @@
 /* authentication reason */
 "Unlock app" = "Разблокировать";
 
-/* No comment provided by engineer. */
-"unmute" = "уведомлять";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Уведомлять";
 
 /* No comment provided by engineer. */
@@ -5027,6 +5480,9 @@
 /* swipe action */
 "Unread" = "Не прочитано";
 
+/* No comment provided by engineer. */
+"Unsupported connection link" = "Ссылка не поддерживается";
+
 /* No comment provided by engineer. */
 "Up to 100 last messages are sent to new members." = "До 100 последних сообщений отправляются новым членам.";
 
@@ -5042,6 +5498,9 @@
 /* No comment provided by engineer. */
 "Update settings?" = "Обновить настройки?";
 
+/* No comment provided by engineer. */
+"Updated conditions" = "Обновленные условия";
+
 /* rcv group event chat item */
 "updated group profile" = "обновил(а) профиль группы";
 
@@ -5117,18 +5576,30 @@
 /* No comment provided by engineer. */
 "Use servers" = "Использовать серверы";
 
+/* No comment provided by engineer. */
+"Use short links (BETA)" = "Короткие ссылки (БЕТА)";
+
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Использовать серверы предосталенные SimpleX Chat?";
 
 /* No comment provided by engineer. */
 "Use SOCKS proxy" = "Использовать SOCKS прокси";
 
+/* No comment provided by engineer. */
+"Use TCP port %@ when no port is specified." = "Использовать TCP-порт %@, когда порт не указан.";
+
+/* No comment provided by engineer. */
+"Use TCP port 443 for preset servers only." = "Использовать TCP-порт 443 только для серверов по умолчанию.";
+
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Используйте приложение во время звонка.";
 
 /* No comment provided by engineer. */
 "Use the app with one hand." = "Используйте приложение одной рукой.";
 
+/* No comment provided by engineer. */
+"Use web port" = "Использовать веб-порт";
+
 /* No comment provided by engineer. */
 "User selection" = "Выбор пользователя";
 
@@ -5348,6 +5819,9 @@
 /* No comment provided by engineer. */
 "You accepted connection" = "Вы приняли приглашение соединиться";
 
+/* snd group event chat item */
+"you accepted this member" = "Вы приняли этого члена";
+
 /* No comment provided by engineer. */
 "You allow" = "Вы разрешаете";
 
@@ -5405,9 +5879,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Вы можете изменить это в настройках Интерфейса.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Вы можете настроить операторов в настройках Сети и серверов.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "Вы можете настроить серверы позже.";
 
@@ -5462,6 +5933,9 @@
 /* alert message */
 "You can view invitation link again in connection details." = "Вы можете увидеть ссылку-приглашение снова открыв соединение.";
 
+/* alert message */
+"You can view your reports in Chat with admins." = "Вы можете найти Ваши жалобы в Чате с админами.";
+
 /* No comment provided by engineer. */
 "You can't send messages!" = "Вы не можете отправлять сообщения!";
 
@@ -5534,6 +6008,9 @@
 /* chat list item description */
 "you shared one-time link incognito" = "Вы создали ссылку инкогнито";
 
+/* token info */
+"You should receive notifications." = "Вы должны получать уведомления.";
+
 /* snd group event chat item */
 "you unblocked %@" = "Вы разблокировали %@";
 
@@ -5627,15 +6104,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Будет отправлен Ваш профиль **%@**.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Ваш профиль храниться на Вашем устройстве и отправляется только контактам.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам. SimpleX серверы не могут получить доступ к Вашему профилю.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Ваш профиль был изменен. Если вы сохраните его, обновленный профиль будет отправлен всем вашим контактам.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Ваш профиль, контакты и доставленные сообщения хранятся на Вашем устройстве.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Случайный профиль";
 
@@ -5650,7 +6127,3 @@
 
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Ваш адрес SimpleX";
-
-/* No comment provided by engineer. */
-"Your SMP servers" = "Ваши SMP серверы";
-
diff --git a/apps/ios/th.lproj/Localizable.strings b/apps/ios/th.lproj/Localizable.strings
index 4fdc49139a..a6ef88d0d4 100644
--- a/apps/ios/th.lproj/Localizable.strings
+++ b/apps/ios/th.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (สามารถคัดลอกได้)";
 
@@ -16,24 +10,9 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- ข้อความเสียงนานสุด 5 นาที\n- เวลาที่กำหนดเองที่จะหายไป\n- ประวัติการแก้ไข";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 มีสี!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[มีส่วนร่วม](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -142,9 +121,6 @@
 /* No comment provided by engineer. */
 "%lld minutes" = "%lld นาที";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld วินาที";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld วินาที";
 
@@ -187,7 +163,8 @@
 /* No comment provided by engineer. */
 "0s" = "0s";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 วัน";
 
 /* time interval */
@@ -196,10 +173,12 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 นาที";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 เดือน";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 สัปดาห์";
 
 /* No comment provided by engineer. */
@@ -239,15 +218,15 @@
 "above, then choose:" = "ด้านบน จากนั้นเลือก:";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "รับ";
 
 /* notification body */
 "Accept contact request from %@?" = "รับการขอติดต่อจาก %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "ยอมรับโหมดไม่ระบุตัวตน";
 
 /* call status */
@@ -506,7 +485,7 @@
 "Can't invite contacts!" = "ไม่สามารถเชิญผู้ติดต่อได้!";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "ยกเลิก";
 
 /* feature offered item */
@@ -546,7 +525,7 @@
 "Change self-destruct mode" = "เปลี่ยนโหมดทําลายตัวเอง";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "เปลี่ยนรหัสผ่านแบบทำลายตัวเอง";
 
 /* chat item text */
@@ -855,7 +834,8 @@
 /* message decrypt error item */
 "Decryption error" = "ข้อผิดพลาดในการ decrypt";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "ค่าเริ่มต้น (%@)";
 
 /* No comment provided by engineer. */
@@ -865,8 +845,7 @@
 "default (yes)" = "ค่าเริ่มต้น (ใช่)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "ลบ";
 
 /* No comment provided by engineer. */
@@ -932,7 +911,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "ลบข้อความ?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "ลบข้อความ";
 
 /* No comment provided by engineer. */
@@ -1049,7 +1028,7 @@
 /* No comment provided by engineer. */
 "Don't enable" = "อย่าเปิดใช้งาน";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "ไม่ต้องแสดงอีก";
 
 /* No comment provided by engineer. */
@@ -1082,7 +1061,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "เปิดใช้งาน (เก็บการแทนที่)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "เปิดใช้งานการลบข้อความอัตโนมัติ?";
 
 /* No comment provided by engineer. */
@@ -1277,7 +1256,7 @@
 /* alert title */
 "Error receiving file" = "เกิดข้อผิดพลาดในการรับไฟล์";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "เกิดข้อผิดพลาดในการลบสมาชิก";
 
 /* No comment provided by engineer. */
@@ -1331,7 +1310,9 @@
 /* No comment provided by engineer. */
 "Error: " = "ผิดพลาด: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "ข้อผิดพลาด: % @";
 
 /* No comment provided by engineer. */
@@ -1928,7 +1909,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "โปรไฟล์การแชทหลายรายการ";
 
-/* swipe action */
+/* notification label action */
 "Mute" = "ปิดเสียง";
 
 /* No comment provided by engineer. */
@@ -1946,7 +1927,7 @@
 /* No comment provided by engineer. */
 "Network status" = "สถานะเครือข่าย";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "ไม่เคย";
 
 /* notification */
@@ -2034,8 +2015,9 @@
 "observer" = "ผู้สังเกตการณ์";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "ปิด";
 
 /* blur media */
@@ -2047,7 +2029,8 @@
 /* feature offered item */
 "offered %@: %@" = "เสนอแล้ว %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "ตกลง";
 
 /* No comment provided by engineer. */
@@ -2336,7 +2319,7 @@
 "Reduced battery usage" = "ลดการใช้แบตเตอรี่";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "ปฏิเสธ";
 
 /* No comment provided by engineer. */
@@ -2433,7 +2416,7 @@
 "Run chat" = "เรียกใช้แชท";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "บันทึก";
 
 /* alert button */
@@ -2635,7 +2618,7 @@
 "Settings" = "การตั้งค่า";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "แชร์";
 
 /* No comment provided by engineer. */
@@ -2848,9 +2831,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "ฐานข้อมูลเก่าไม่ได้ถูกลบในระหว่างการย้ายข้อมูล แต่สามารถลบได้";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "โปรไฟล์นี้แชร์กับผู้ติดต่อของคุณเท่านั้น";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "ขีดที่สองที่เราพลาด! ✅";
 
@@ -2971,7 +2951,7 @@
 /* authentication reason */
 "Unlock app" = "ปลดล็อคแอป";
 
-/* swipe action */
+/* notification label action */
 "Unmute" = "เปิดเสียง";
 
 /* swipe action */
@@ -3311,10 +3291,10 @@
 "Your privacy" = "ความเป็นส่วนตัวของคุณ";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "โปรไฟล์ของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณและแชร์กับผู้ติดต่อของคุณเท่านั้น เซิร์ฟเวอร์ SimpleX ไม่สามารถดูโปรไฟล์ของคุณได้";
+"Your profile is stored on your device and only shared with your contacts." = "โปรไฟล์นี้แชร์กับผู้ติดต่อของคุณเท่านั้น";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "โปรไฟล์ รายชื่อผู้ติดต่อ และข้อความที่ส่งของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณ";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "โปรไฟล์ของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณและแชร์กับผู้ติดต่อของคุณเท่านั้น เซิร์ฟเวอร์ SimpleX ไม่สามารถดูโปรไฟล์ของคุณได้";
 
 /* No comment provided by engineer. */
 "Your random profile" = "โปรไฟล์แบบสุ่มของคุณ";
@@ -3328,6 +3308,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "ที่อยู่ SimpleX ของคุณ";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "เซิร์ฟเวอร์ SMP ของคุณ";
-
diff --git a/apps/ios/tr.lproj/Localizable.strings b/apps/ios/tr.lproj/Localizable.strings
index b3eb5d426a..3d44c895ec 100644
--- a/apps/ios/tr.lproj/Localizable.strings
+++ b/apps/ios/tr.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (kopyalanabilir)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 5 dakikaya kadar süren sesli mesajlar.\n- mesaj kaybolması için özel zaman.\n- düzenleme geçmişi.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 renklendirilmiş!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(yeni)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(bu cihaz v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Katkıda bulun](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -82,6 +61,9 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**Önerilen**: cihaz tokeni ve bildirimler SimpleX Chat bildirim sunucularına gönderilir, ama mesajın içeriği, boyutu veya kimden geldiği gönderilmez.";
 
+/* No comment provided by engineer. */
+"**Scan / Paste link**: to connect via a link you received." = "edindiğiniz bağlantı aracılığıyla bağlanmak için **Linki tarayın/yapıştırın**.";
+
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Dikkat**: Anında iletilen bildirimlere Anahtar Zinciri'nde kaydedilmiş parola gereklidir.";
 
@@ -142,6 +124,12 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ onaylandı";
 
+/* No comment provided by engineer. */
+"%@ server" = "%@ sunucu";
+
+/* No comment provided by engineer. */
+"%@ servers" = "%@ sunucular";
+
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ yüklendi";
 
@@ -232,9 +220,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld yeni arayüz dilleri";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld saniye";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld saniye";
 
@@ -280,7 +265,8 @@
 /* No comment provided by engineer. */
 "0s" = "0sn";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 gün";
 
 /* time interval */
@@ -289,12 +275,20 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 dakika";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 ay";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 hafta";
 
+/* No comment provided by engineer. */
+"1-time link" = "tek kullanımlık bağlantı";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "Tek kullanımlık bağlantı *sadece bir kişi ile* kullanılabilir - kişiyle veya uygulama içinden paylaş.";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5 dakika";
 
@@ -328,6 +322,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Adres değişimi iptal edilsin mi?";
 
+/* No comment provided by engineer. */
+"About operators" = "Operatörler hakkında";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "SimpleX Chat hakkında";
 
@@ -338,10 +335,13 @@
 "Accent" = "Ana renk";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Kabul et";
 
+/* No comment provided by engineer. */
+"Accept conditions" = "Koşulları kabul et";
+
 /* No comment provided by engineer. */
 "Accept connection request?" = "Bağlantı isteği kabul edilsin mi?";
 
@@ -349,12 +349,15 @@
 "Accept contact request from %@?" = "%@ 'den gelen iletişim isteği kabul edilsin mi?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Takma adla kabul et";
 
 /* call status */
 "accepted call" = "kabul edilen arama";
 
+/* No comment provided by engineer. */
+"Accepted conditions" = "Kabul edilmiş koşullar";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Onaylandı";
 
@@ -367,6 +370,9 @@
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Kişilerinizin başkalarıyla paylaşabilmesi için profilinize adres ekleyin. Profil güncellemesi kişilerinize gönderilecek.";
 
+/* No comment provided by engineer. */
+"Add friends" = "Arkadaş ekle";
+
 /* No comment provided by engineer. */
 "Add profile" = "Profil ekle";
 
@@ -376,12 +382,24 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Karekod taratarak sunucuları ekleyin.";
 
+/* No comment provided by engineer. */
+"Add team members" = "Takım üyesi ekle";
+
 /* No comment provided by engineer. */
 "Add to another device" = "Başka bir cihaza ekle";
 
 /* No comment provided by engineer. */
 "Add welcome message" = "Karşılama mesajı ekleyin";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "Takım üyelerini konuşmalara ekle.";
+
+/* No comment provided by engineer. */
+"Added media & file servers" = "medya ve dosya sunucuları eklendi";
+
+/* No comment provided by engineer. */
+"Added message servers" = "Mesaj sunucuları eklendi";
+
 /* No comment provided by engineer. */
 "Additional accent" = "Ek ana renk";
 
@@ -397,6 +415,12 @@
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "Adres değişikliği iptal edilecek. Eski alıcı adresi kullanılacaktır.";
 
+/* No comment provided by engineer. */
+"Address or 1-time link?" = "adres mi yoksa tek kullanımlık bağlantı mı?";
+
+/* No comment provided by engineer. */
+"Address settings" = "Adres seçenekleri";
+
 /* member role */
 "admin" = "yönetici";
 
@@ -439,6 +463,9 @@
 /* feature role */
 "all members" = "bütün üyeler";
 
+/* No comment provided by engineer. */
+"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "Bütün mesajlar ve dosyalar **uçtan-uca şifrelemeli** gönderilir, doğrudan mesajlarda kuantum güvenlik ile birlikte.";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "Tüm mesajlar silinecektir - bu geri alınamaz!";
 
@@ -724,7 +751,8 @@
 /* rcv group event chat item */
 "blocked %@" = "engellendi %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "yönetici tarafından engellendi";
 
 /* No comment provided by engineer. */
@@ -757,6 +785,12 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Bulgarca, Fince, Tayca ve Ukraynaca - kullanıcılara ve [Weblate] e teşekkürler! (https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
+/* No comment provided by engineer. */
+"Business address" = "İş adresi";
+
+/* No comment provided by engineer. */
+"Business chats" = "İş konuşmaları";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Sohbet profiline göre (varsayılan) veya [bağlantıya göre](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
@@ -800,7 +834,7 @@
 "Can't message member" = "Üyeye mesaj gönderilemiyor";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "İptal et";
 
 /* No comment provided by engineer. */
@@ -827,6 +861,9 @@
 /* No comment provided by engineer. */
 "Change" = "Değiştir";
 
+/* authentication reason */
+"Change chat profiles" = "Sohbet profillerini değiştir";
+
 /* No comment provided by engineer. */
 "Change database passphrase?" = "Veritabanı parolasını değiştir?";
 
@@ -852,7 +889,7 @@
 "Change self-destruct mode" = "Kendini yok etme modunu değiştir";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Kendini yok eden parolayı değiştir";
 
 /* chat item text */
@@ -870,6 +907,15 @@
 /* chat item text */
 "changing address…" = "adres değiştiriliyor…";
 
+/* No comment provided by engineer. */
+"Chat" = "Sohbet";
+
+/* No comment provided by engineer. */
+"Chat already exists" = "Sohbet zaten mevcut";
+
+/* No comment provided by engineer. */
+"Chat already exists!" = "Sohbet zaten mevcut!";
+
 /* No comment provided by engineer. */
 "Chat colors" = "Sohbet renkleri";
 
@@ -915,9 +961,21 @@
 /* No comment provided by engineer. */
 "Chat theme" = "Sohbet teması";
 
+/* No comment provided by engineer. */
+"Chat will be deleted for all members - this cannot be undone!" = "Sohbet bütün üyeler için silinecek - bu geri alınamaz!";
+
+/* No comment provided by engineer. */
+"Chat will be deleted for you - this cannot be undone!" = "Sohbet senden silinecek - bu geri alınamaz!";
+
 /* No comment provided by engineer. */
 "Chats" = "Sohbetler";
 
+/* No comment provided by engineer. */
+"Check messages every 20 min." = "Her 20 dakikada mesajları kontrol et.";
+
+/* No comment provided by engineer. */
+"Check messages when allowed." = "İzin verildiğinde mesajları kontrol et.";
+
 /* alert title */
 "Check server address and try again." = "Sunucu adresini kontrol edip tekrar deneyin.";
 
@@ -978,6 +1036,27 @@
 /* No comment provided by engineer. */
 "Completed" = "Tamamlandı";
 
+/* No comment provided by engineer. */
+"Conditions accepted on: %@." = "Şuradaki koşullar kabul edildi: %@.";
+
+/* No comment provided by engineer. */
+"Conditions are accepted for the operator(s): **%@**." = "Koşullar operatör(ler) için kabul edildi: **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions are already accepted for these operator(s): **%@**." = "Koşullar çoktan operatör(ler) tarafından kabul edildi: **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions of use" = "Kullanım koşulları";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted for the operator(s): **%@**." = "Koşullar bu operatör(ler) için kabul edilecektir: **%@**.";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted on: %@." = "Koşullar şu tarihte kabul edilecektir: %@.";
+
+/* No comment provided by engineer. */
+"Conditions will be automatically accepted for enabled operators on: %@." = "Koşullar etkin operatörler için şu tarihte otomatik olarak kabul edilecektir: %@.";
+
 /* No comment provided by engineer. */
 "Configure ICE servers" = "ICE sunucularını ayarla";
 
@@ -1125,6 +1204,9 @@
 /* No comment provided by engineer. */
 "Connection request sent!" = "Bağlantı daveti gönderildi!";
 
+/* No comment provided by engineer. */
+"Connection security" = "Bağlantı güvenliği";
+
 /* No comment provided by engineer. */
 "Connection terminated" = "Bağlantı sonlandırılmış";
 
@@ -1206,6 +1288,9 @@
 /* No comment provided by engineer. */
 "Create" = "Oluştur";
 
+/* No comment provided by engineer. */
+"Create 1-time link" = "Tek kullanımlık bağlantı oluştur";
+
 /* No comment provided by engineer. */
 "Create a group using a random profile." = "Rasgele profil kullanarak grup oluştur.";
 
@@ -1257,6 +1342,9 @@
 /* No comment provided by engineer. */
 "creator" = "oluşturan";
 
+/* No comment provided by engineer. */
+"Current conditions text couldn't be loaded, you can review conditions via this link:" = "Şu anki koşulların yazısı yüklenemiyor, bu bağlantıdan koşullara inceleyebilirsin:";
+
 /* No comment provided by engineer. */
 "Current Passcode" = "Şu anki şifre";
 
@@ -1359,7 +1447,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "Şifre çözme hataları";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "varsayılan (%@)";
 
 /* No comment provided by engineer. */
@@ -1369,8 +1458,7 @@
 "default (yes)" = "varsayılan (evet)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Sil";
 
 /* No comment provided by engineer. */
@@ -1394,12 +1482,18 @@
 /* No comment provided by engineer. */
 "Delete and notify contact" = "Sil ve kişiye bildir";
 
+/* No comment provided by engineer. */
+"Delete chat" = "Sohbeti sil";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Sohbet profilini sil";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Sohbet profili silinsin mi?";
 
+/* No comment provided by engineer. */
+"Delete chat?" = "Sohbet silinsin mi?";
+
 /* No comment provided by engineer. */
 "Delete connection" = "Bağlantıyı sil";
 
@@ -1451,7 +1545,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Mesaj silinsin mi?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Mesajları sil";
 
 /* No comment provided by engineer. */
@@ -1571,6 +1665,9 @@
 /* chat feature */
 "Direct messages" = "Doğrudan mesajlar";
 
+/* No comment provided by engineer. */
+"Direct messages between members are prohibited in this chat." = "Üyeler arası doğrudan mesajlar bu sohbette yasaktır.";
+
 /* No comment provided by engineer. */
 "Direct messages between members are prohibited." = "Bu grupta üyeler arasında direkt mesajlaşma yasaktır.";
 
@@ -1643,14 +1740,14 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Etkinleştirme";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Yeniden gösterme";
 
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Sürüm düşür ve sohbeti aç";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "İndir";
 
 /* No comment provided by engineer. */
@@ -1692,6 +1789,9 @@
 /* No comment provided by engineer. */
 "e2e encrypted" = "uçtan uca şifrelenmiş";
 
+/* No comment provided by engineer. */
+"E2E encrypted notifications." = "Uçtan uca şifrelenmiş bildirimler.";
+
 /* chat item action */
 "Edit" = "Düzenle";
 
@@ -1704,7 +1804,7 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Etkinleştir (geçersiz kılmaları koru)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Otomatik mesaj silme etkinleştirilsin mi?";
 
 /* No comment provided by engineer. */
@@ -1869,12 +1969,18 @@
 /* No comment provided by engineer. */
 "Error aborting address change" = "Adres değişikliği iptal edilirken hata oluştu";
 
+/* alert title */
+"Error accepting conditions" = "Koşulları kabul ederken hata oluştu";
+
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Bağlantı isteği kabul edilirken hata oluştu";
 
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Üye(ler) eklenirken hata oluştu";
 
+/* alert title */
+"Error adding server" = "Sunucu eklenirken hata oluştu";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Adres değiştirilirken hata oluştu";
 
@@ -1959,6 +2065,9 @@
 /* No comment provided by engineer. */
 "Error joining group" = "Gruba katılırken hata oluştu";
 
+/* alert title */
+"Error loading servers" = "Sunucular yüklenirken hata oluştu";
+
 /* No comment provided by engineer. */
 "Error migrating settings" = "Ayarlar taşınırken hata oluştu";
 
@@ -1974,7 +2083,7 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Hata sunuculara yeniden bağlanılıyor";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Kişiyi silerken sorun oluştu";
 
 /* No comment provided by engineer. */
@@ -1992,6 +2101,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Parolayı Anahtar Zincirine kaydederken hata oluştu";
 
+/* alert title */
+"Error saving servers" = "Sunucular kaydedilirken hata oluştu";
+
 /* when migrating */
 "Error saving settings" = "Ayarlar kaydedilirken hata oluştu";
 
@@ -2034,6 +2146,9 @@
 /* No comment provided by engineer. */
 "Error updating message" = "Mesaj güncellenirken hata oluştu";
 
+/* alert title */
+"Error updating server" = "Sunucu güncellenirken hata oluştu";
+
 /* No comment provided by engineer. */
 "Error updating settings" = "Ayarları güncellerken hata oluştu";
 
@@ -2049,7 +2164,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Hata: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Hata: %@";
 
 /* No comment provided by engineer. */
@@ -2061,11 +2178,11 @@
 /* No comment provided by engineer. */
 "Errors" = "Hatalar";
 
-/* No comment provided by engineer. */
-"Even when disabled in the conversation." = "Konuşma sırasında devre dışı bırakılsa bile.";
+/* servers error */
+"Errors in servers configuration." = "Sunucular yapılandırılırken hatalar oluştu.";
 
 /* No comment provided by engineer. */
-"event happened" = "etkinlik yaşandı";
+"Even when disabled in the conversation." = "Konuşma sırasında devre dışı bırakılsa bile.";
 
 /* No comment provided by engineer. */
 "Exit without saving" = "Kaydetmeden çık";
@@ -2106,7 +2223,7 @@
 /* swipe action */
 "Favorite" = "Favori";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "File error" = "Dosya hatası";
 
 /* alert message */
@@ -2187,9 +2304,21 @@
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "Düzeltme grup üyesi tarafından desteklenmiyor";
 
+/* servers error */
+"For chat profile %@:" = "Sohbet profili için %@:";
+
 /* No comment provided by engineer. */
 "For console" = "Konsol için";
 
+/* No comment provided by engineer. */
+"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "Örneğin, eğer kişiniz SimpleX Sohbet sunucusundan mesajları alıyorsa, uygulamanız bu mesajları Flux sunucusundan iletecektir.";
+
+/* No comment provided by engineer. */
+"For private routing" = "Gizli yönlendirme için";
+
+/* No comment provided by engineer. */
+"For social media" = "Sosyal medya için";
+
 /* chat item action */
 "Forward" = "İlet";
 
@@ -2361,6 +2490,12 @@
 /* time unit */
 "hours" = "saat";
 
+/* No comment provided by engineer. */
+"How it affects privacy" = "Gizliliğinizi nasıl etkiler";
+
+/* No comment provided by engineer. */
+"How it helps privacy" = "Gizliliğinizi nasıl arttırır";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "SimpleX nasıl çalışır";
 
@@ -2565,6 +2700,9 @@
 /* No comment provided by engineer. */
 "Invite members" = "Üyeleri davet et";
 
+/* No comment provided by engineer. */
+"Invite to chat" = "Sohbete davet et";
+
 /* No comment provided by engineer. */
 "Invite to group" = "Gruba davet et";
 
@@ -2679,6 +2817,12 @@
 /* swipe action */
 "Leave" = "Ayrıl";
 
+/* No comment provided by engineer. */
+"Leave chat" = "Sohbetten ayrıl";
+
+/* No comment provided by engineer. */
+"Leave chat?" = "Sohbetten ayrılsın mı?";
+
 /* No comment provided by engineer. */
 "Leave group" = "Gruptan ayrıl";
 
@@ -2775,6 +2919,9 @@
 /* item status text */
 "Member inactive" = "Üye inaktif";
 
+/* No comment provided by engineer. */
+"Member role will be changed to \"%@\". All chat members will be notified." = "Üye rolü \"%@\" olarak değiştirilecektir. Tüm sohbet üyeleri bilgilendirilecektir.";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "Üye rolü \"%@\" olarak değiştirilecektir. Ve tüm grup üyeleri bilgilendirilecektir.";
 
@@ -2964,10 +3111,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Çoklu sohbet profili";
 
-/* No comment provided by engineer. */
-"mute" = "Sessiz";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Sustur";
 
 /* No comment provided by engineer. */
@@ -2994,7 +3138,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Ağ durumu";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "asla";
 
 /* No comment provided by engineer. */
@@ -3127,8 +3271,9 @@
 "observer" = "gözlemci";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "kapalı";
 
 /* blur media */
@@ -3140,7 +3285,8 @@
 /* feature offered item */
 "offered %@: %@" = "%1$@: %2$@ teklif etti";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Tamam";
 
 /* No comment provided by engineer. */
@@ -3209,7 +3355,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Sadece karşıdaki kişi sesli mesajlar gönderebilir.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Aç";
 
 /* No comment provided by engineer. */
@@ -3606,7 +3752,7 @@
 "Reduced battery usage" = "Azaltılmış pil kullanımı";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Reddet";
 
 /* No comment provided by engineer. */
@@ -3757,7 +3903,7 @@
 "Safer groups" = "Daha güvenli gruplar";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Kaydet";
 
 /* alert button */
@@ -4109,7 +4255,7 @@
 "Shape profile images" = "Profil resimlerini şekillendir";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Paylaş";
 
 /* No comment provided by engineer. */
@@ -4385,7 +4531,7 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_TVLDEKAL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Geçici dosya hatası";
 
 /* server test failure */
@@ -4457,9 +4603,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Eski veritabanı geçiş sırasında kaldırılmadı, silinebilir.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Profil sadece kişilerinle paylaşılacak.";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "Özlediğimiz ikinci tik! ✅";
 
@@ -4682,10 +4825,7 @@
 /* authentication reason */
 "Unlock app" = "Uygulama kilidini aç";
 
-/* No comment provided by engineer. */
-"unmute" = "susturmayı kaldır";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Susturmayı kaldır";
 
 /* No comment provided by engineer. */
@@ -5258,15 +5398,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Profiliniz **%@** paylaşılacaktır.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Profil sadece kişilerinle paylaşılacak.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Profiliniz cihazınızda saklanır ve sadece kişilerinizle paylaşılır. SimpleX sunucuları profilinizi göremez.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Profiliniz değiştirildi. Kaydederseniz, güncellenmiş profil tüm kişilerinize gönderilecektir.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Profiliniz, kişileriniz ve gönderilmiş mesajlar cihazınızda saklanır.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Rasgele profiliniz";
 
@@ -5279,6 +5419,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "SimpleX adresin";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "SMP sunucularınız";
-
diff --git a/apps/ios/uk.lproj/Localizable.strings b/apps/ios/uk.lproj/Localizable.strings
index ce8184272d..932c29d368 100644
--- a/apps/ios/uk.lproj/Localizable.strings
+++ b/apps/ios/uk.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " (можна скопіювати)";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- голосові повідомлення до 5 хвилин.\n- користувальницький час зникнення.\n- історія редагування.";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 кольоровий!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(новий)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(цей пристрій v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[Внесок](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -241,9 +220,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld нові мови інтерфейсу";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld секунд(и)";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld секунд";
 
@@ -289,7 +265,8 @@
 /* No comment provided by engineer. */
 "0s" = "0с";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1 день";
 
 /* time interval */
@@ -298,10 +275,12 @@
 /* No comment provided by engineer. */
 "1 minute" = "1 хвилина";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1 місяць";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1 тиждень";
 
 /* No comment provided by engineer. */
@@ -343,6 +322,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "Скасувати зміну адреси?";
 
+/* No comment provided by engineer. */
+"About operators" = "Про операторів";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "Про чат SimpleX";
 
@@ -353,8 +335,8 @@
 "Accent" = "Акцент";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "Прийняти";
 
 /* No comment provided by engineer. */
@@ -367,7 +349,7 @@
 "Accept contact request from %@?" = "Прийняти запит на контакт від %@?";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "Прийняти інкогніто";
 
 /* call status */
@@ -376,6 +358,9 @@
 /* No comment provided by engineer. */
 "Accepted conditions" = "Прийняті умови";
 
+/* chat list item title */
+"accepted invitation" = "прийняте запрошення";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "Визнано";
 
@@ -388,6 +373,9 @@
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Додайте адресу до свого профілю, щоб ваші контакти могли поділитися нею з іншими людьми. Повідомлення про оновлення профілю буде надіслано вашим контактам.";
 
+/* No comment provided by engineer. */
+"Add friends" = "Додайте друзів";
+
 /* No comment provided by engineer. */
 "Add profile" = "Додати профіль";
 
@@ -397,12 +385,18 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "Додайте сервери, відсканувавши QR-код.";
 
+/* No comment provided by engineer. */
+"Add team members" = "Додайте учасників команди";
+
 /* No comment provided by engineer. */
 "Add to another device" = "Додати до іншого пристрою";
 
 /* No comment provided by engineer. */
 "Add welcome message" = "Додати вітальне повідомлення";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "Додайте членів своєї команди до розмов.";
+
 /* No comment provided by engineer. */
 "Added media & file servers" = "Додано медіа та файлові сервери";
 
@@ -760,7 +754,8 @@
 /* rcv group event chat item */
 "blocked %@" = "заблоковано %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "заблоковано адміністратором";
 
 /* No comment provided by engineer. */
@@ -793,6 +788,12 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Болгарською, фінською, тайською та українською мовами - завдяки користувачам та [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
+/* No comment provided by engineer. */
+"Business address" = "Адреса підприємства";
+
+/* No comment provided by engineer. */
+"Business chats" = "Ділові чати";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Через профіль чату (за замовчуванням) або [за з'єднанням](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
@@ -836,7 +837,7 @@
 "Can't message member" = "Не можу надіслати повідомлення користувачеві";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "Скасувати";
 
 /* No comment provided by engineer. */
@@ -891,7 +892,7 @@
 "Change self-destruct mode" = "Змінити режим самознищення";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "Змінити пароль самознищення";
 
 /* chat item text */
@@ -909,6 +910,15 @@
 /* chat item text */
 "changing address…" = "змінює адресу…";
 
+/* No comment provided by engineer. */
+"Chat" = "Чат";
+
+/* No comment provided by engineer. */
+"Chat already exists" = "Чат вже існує";
+
+/* No comment provided by engineer. */
+"Chat already exists!" = "Чат вже існує!";
+
 /* No comment provided by engineer. */
 "Chat colors" = "Кольори чату";
 
@@ -954,6 +964,12 @@
 /* No comment provided by engineer. */
 "Chat theme" = "Тема чату";
 
+/* No comment provided by engineer. */
+"Chat will be deleted for all members - this cannot be undone!" = "Чат буде видалено для всіх учасників - цю дію неможливо скасувати!";
+
+/* No comment provided by engineer. */
+"Chat will be deleted for you - this cannot be undone!" = "Чат буде видалено для вас - цю дію неможливо скасувати!";
+
 /* No comment provided by engineer. */
 "Chats" = "Чати";
 
@@ -1035,12 +1051,6 @@
 /* No comment provided by engineer. */
 "Conditions of use" = "Умови використання";
 
-/* No comment provided by engineer. */
-"Conditions will be accepted for enabled operators after 30 days." = "Умови будуть прийняті для ввімкнених операторів через 30 днів.";
-
-/* No comment provided by engineer. */
-"Conditions will be accepted for operator(s): **%@**." = "Умови приймаються для оператора(ів): **%@**.";
-
 /* No comment provided by engineer. */
 "Conditions will be accepted for the operator(s): **%@**." = "Для оператора(ів) приймаються умови: **%@**.";
 
@@ -1440,7 +1450,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "помилки розшифровки";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "за замовчуванням (%@)";
 
 /* No comment provided by engineer. */
@@ -1450,8 +1461,7 @@
 "default (yes)" = "за замовчуванням (так)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "Видалити";
 
 /* No comment provided by engineer. */
@@ -1475,12 +1485,18 @@
 /* No comment provided by engineer. */
 "Delete and notify contact" = "Видалити та повідомити контакт";
 
+/* No comment provided by engineer. */
+"Delete chat" = "Видалити чат";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "Видалити профіль чату";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "Видалити профіль чату?";
 
+/* No comment provided by engineer. */
+"Delete chat?" = "Видалити чат?";
+
 /* No comment provided by engineer. */
 "Delete connection" = "Видалити підключення";
 
@@ -1532,7 +1548,7 @@
 /* No comment provided by engineer. */
 "Delete message?" = "Видалити повідомлення?";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "Видалити повідомлення";
 
 /* No comment provided by engineer. */
@@ -1655,6 +1671,9 @@
 /* chat feature */
 "Direct messages" = "Прямі повідомлення";
 
+/* No comment provided by engineer. */
+"Direct messages between members are prohibited in this chat." = "У цьому чаті заборонені прямі повідомлення між учасниками.";
+
 /* No comment provided by engineer. */
 "Direct messages between members are prohibited." = "У цій групі заборонені прямі повідомлення між учасниками.";
 
@@ -1727,14 +1746,14 @@
 /* No comment provided by engineer. */
 "Don't enable" = "Не вмикати";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Don't show again" = "Більше не показувати";
 
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Пониження та відкритий чат";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "Завантажити";
 
 /* No comment provided by engineer. */
@@ -1791,15 +1810,12 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "Увімкнути (зберегти перевизначення)";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "Увімкнути автоматичне видалення повідомлень?";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "Увімкніть доступ до камери";
 
-/* No comment provided by engineer. */
-"Enable Flux" = "Увімкнути Flux";
-
 /* No comment provided by engineer. */
 "Enable for all" = "Увімкнути для всіх";
 
@@ -2073,7 +2089,7 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "Помилка перепідключення серверів";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Error removing member" = "Помилка видалення учасника";
 
 /* No comment provided by engineer. */
@@ -2154,7 +2170,9 @@
 /* No comment provided by engineer. */
 "Error: " = "Помилка: ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "Помилка: %@";
 
 /* No comment provided by engineer. */
@@ -2172,9 +2190,6 @@
 /* No comment provided by engineer. */
 "Even when disabled in the conversation." = "Навіть коли вимкнений у розмові.";
 
-/* No comment provided by engineer. */
-"event happened" = "відбулася подія";
-
 /* No comment provided by engineer. */
 "Exit without saving" = "Вихід без збереження";
 
@@ -2214,7 +2229,7 @@
 /* swipe action */
 "Favorite" = "Улюблений";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "File error" = "Помилка файлу";
 
 /* alert message */
@@ -2295,9 +2310,6 @@
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "Виправлення не підтримується учасником групи";
 
-/* No comment provided by engineer. */
-"for better metadata privacy." = "для кращої конфіденційності метаданих.";
-
 /* servers error */
 "For chat profile %@:" = "Для профілю чату %@:";
 
@@ -2694,6 +2706,9 @@
 /* No comment provided by engineer. */
 "Invite members" = "Запросити учасників";
 
+/* No comment provided by engineer. */
+"Invite to chat" = "Запросити в чат";
+
 /* No comment provided by engineer. */
 "Invite to group" = "Запросити до групи";
 
@@ -2808,6 +2823,12 @@
 /* swipe action */
 "Leave" = "Залишити";
 
+/* No comment provided by engineer. */
+"Leave chat" = "Вийти з чату";
+
+/* No comment provided by engineer. */
+"Leave chat?" = "Залишити чат?";
+
 /* No comment provided by engineer. */
 "Leave group" = "Покинути групу";
 
@@ -2904,12 +2925,18 @@
 /* item status text */
 "Member inactive" = "Користувач неактивний";
 
+/* No comment provided by engineer. */
+"Member role will be changed to \"%@\". All chat members will be notified." = "Роль учасника буде змінено на \"%@\". Усі учасники чату отримають сповіщення.";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "Роль учасника буде змінено на \"%@\". Всі учасники групи будуть повідомлені про це.";
 
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". The member will receive a new invitation." = "Роль учасника буде змінено на \"%@\". Учасник отримає нове запрошення.";
 
+/* No comment provided by engineer. */
+"Member will be removed from chat - this cannot be undone!" = "Учасника буде видалено з чату – це неможливо скасувати!";
+
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "Учасник буде видалений з групи - це неможливо скасувати!";
 
@@ -3096,10 +3123,7 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Кілька профілів чату";
 
-/* No comment provided by engineer. */
-"mute" = "приглушити";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "Вимкнути звук";
 
 /* No comment provided by engineer. */
@@ -3132,7 +3156,7 @@
 /* No comment provided by engineer. */
 "Network status" = "Стан мережі";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "ніколи";
 
 /* No comment provided by engineer. */
@@ -3292,8 +3316,9 @@
 "observer" = "спостерігач";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "вимкнено";
 
 /* blur media */
@@ -3305,7 +3330,8 @@
 /* feature offered item */
 "offered %@: %@" = "запропонував %1$@: %2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "Гаразд";
 
 /* No comment provided by engineer. */
@@ -3329,6 +3355,9 @@
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion хости не будуть використовуватися.";
 
+/* No comment provided by engineer. */
+"Only chat owners can change preferences." = "Лише власники чату можуть змінювати налаштування.";
+
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages." = "Тільки клієнтські пристрої зберігають профілі користувачів, контакти, групи та повідомлення, надіслані за допомогою **2-шарового наскрізного шифрування**.";
 
@@ -3374,7 +3403,7 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Тільки ваш контакт може надсилати голосові повідомлення.";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "Відкрито";
 
 /* No comment provided by engineer. */
@@ -3407,6 +3436,9 @@
 /* alert title */
 "Operator server" = "Сервер оператора";
 
+/* No comment provided by engineer. */
+"Or import archive file" = "Або імпортуйте архівний файл";
+
 /* No comment provided by engineer. */
 "Or paste archive link" = "Або вставте посилання на архів";
 
@@ -3575,6 +3607,9 @@
 /* No comment provided by engineer. */
 "Privacy & security" = "Конфіденційність і безпека";
 
+/* No comment provided by engineer. */
+"Privacy for your customers." = "Конфіденційність для ваших клієнтів.";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "Конфіденційність переглянута";
 
@@ -3789,7 +3824,7 @@
 "Reduced battery usage" = "Зменшення використання акумулятора";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "Відхилити";
 
 /* No comment provided by engineer. */
@@ -3867,6 +3902,9 @@
 /* chat item action */
 "Reply" = "Відповісти";
 
+/* chat list item title */
+"requested to connect" = "запит на підключення";
+
 /* No comment provided by engineer. */
 "Required" = "Потрібно";
 
@@ -3921,9 +3959,6 @@
 /* No comment provided by engineer. */
 "Review conditions" = "Умови перегляду";
 
-/* No comment provided by engineer. */
-"Review later" = "Перегляньте пізніше";
-
 /* No comment provided by engineer. */
 "Revoke" = "Відкликати";
 
@@ -3946,7 +3981,7 @@
 "Safer groups" = "Безпечніші групи";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "Зберегти";
 
 /* alert button */
@@ -4310,7 +4345,7 @@
 "Shape profile images" = "Сформуйте зображення профілю";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "Поділіться";
 
 /* No comment provided by engineer. */
@@ -4391,6 +4426,9 @@
 /* No comment provided by engineer. */
 "SimpleX address or 1-time link?" = "SimpleX адреса або одноразове посилання?";
 
+/* No comment provided by engineer. */
+"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat і Flux уклали угоду про включення серверів, керованих Flux, у додаток.";
+
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "Безпека SimpleX Chat була перевірена компанією Trail of Bits.";
 
@@ -4571,6 +4609,9 @@
 /* No comment provided by engineer. */
 "Tap button " = "Натисніть кнопку ";
 
+/* No comment provided by engineer. */
+"Tap Create SimpleX address in the menu to create it later." = "Натисніть «Створити адресу SimpleX» у меню, щоб створити її пізніше.";
+
 /* No comment provided by engineer. */
 "Tap to activate profile." = "Натисніть, щоб активувати профіль.";
 
@@ -4604,7 +4645,7 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "Тимчасова помилка файлу";
 
 /* server test failure */
@@ -4682,15 +4723,9 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "Стара база даних не була видалена під час міграції, її можна видалити.";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Профіль доступний лише вашим контактам.";
-
 /* No comment provided by engineer. */
 "The same conditions will apply to operator **%@**." = "Такі ж умови діятимуть і для оператора **%@**.";
 
-/* No comment provided by engineer. */
-"The same conditions will apply to operator(s): **%@**." = "Такі ж умови будуть застосовуватися до оператора(ів): **%@**.";
-
 /* No comment provided by engineer. */
 "The second preset operator in the app!" = "Другий попередньо встановлений оператор у застосунку!";
 
@@ -4937,10 +4972,7 @@
 /* authentication reason */
 "Unlock app" = "Розблокувати додаток";
 
-/* No comment provided by engineer. */
-"unmute" = "увімкнути звук";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "Увімкнути звук";
 
 /* No comment provided by engineer. */
@@ -5279,6 +5311,9 @@
 /* No comment provided by engineer. */
 "You are already connected to %@." = "Ви вже підключені до %@.";
 
+/* No comment provided by engineer. */
+"You are already connected with %@." = "Ви вже підключені до %@.";
+
 /* No comment provided by engineer. */
 "You are already connecting to %@." = "Ви вже з'єднані з %@.";
 
@@ -5324,9 +5359,6 @@
 /* No comment provided by engineer. */
 "You can change it in Appearance settings." = "Ви можете змінити його в налаштуваннях зовнішнього вигляду.";
 
-/* No comment provided by engineer. */
-"You can configure operators in Network & servers settings." = "Ви можете налаштувати операторів у налаштуваннях Мережі та серверів.";
-
 /* No comment provided by engineer. */
 "You can configure servers via settings." = "Ви можете налаштувати сервери за допомогою налаштувань.";
 
@@ -5477,6 +5509,9 @@
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Ви все одно отримуватимете дзвінки та сповіщення від вимкнених профілів, якщо вони активні.";
 
+/* No comment provided by engineer. */
+"You will stop receiving messages from this chat. Chat history will be preserved." = "Ви більше не будете отримувати повідомлення з цього чату. Історія чату буде збережена.";
+
 /* No comment provided by engineer. */
 "You will stop receiving messages from this group. Chat history will be preserved." = "Ви перестанете отримувати повідомлення від цієї групи. Історія чату буде збережена.";
 
@@ -5543,15 +5578,15 @@
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Ваш профіль **%@** буде опублікований.";
 
+/* No comment provided by engineer. */
+"Your profile is stored on your device and only shared with your contacts." = "Профіль доступний лише вашим контактам.";
+
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Ваш профіль зберігається на вашому пристрої і доступний лише вашим контактам. Сервери SimpleX не бачать ваш профіль.";
 
 /* alert message */
 "Your profile was changed. If you save it, the updated profile will be sent to all your contacts." = "Ваш профіль було змінено. Якщо ви збережете його, оновлений профіль буде надіслано всім вашим контактам.";
 
-/* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "Ваш профіль, контакти та доставлені повідомлення зберігаються на вашому пристрої.";
-
 /* No comment provided by engineer. */
 "Your random profile" = "Ваш випадковий профіль";
 
@@ -5567,6 +5602,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "Ваша адреса SimpleX";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "Ваші SMP-сервери";
-
diff --git a/apps/ios/zh-Hans.lproj/Localizable.strings b/apps/ios/zh-Hans.lproj/Localizable.strings
index 62ff2088c2..19d7c268d4 100644
--- a/apps/ios/zh-Hans.lproj/Localizable.strings
+++ b/apps/ios/zh-Hans.lproj/Localizable.strings
@@ -1,9 +1,3 @@
-/* No comment provided by engineer. */
-"\n" = "\n";
-
-/* No comment provided by engineer. */
-" (" = " (";
-
 /* No comment provided by engineer. */
 " (can be copied)" = " （可复制）";
 
@@ -22,30 +16,15 @@
 /* No comment provided by engineer. */
 "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 语音消息最长5分钟。\n- 自定义限时消息。\n- 编辑消息历史。";
 
-/* No comment provided by engineer. */
-", " = ", ";
-
-/* No comment provided by engineer. */
-": " = ": ";
-
 /* No comment provided by engineer. */
 "!1 colored!" = "!1 种彩色!";
 
-/* No comment provided by engineer. */
-"." = ".";
-
-/* No comment provided by engineer. */
-"(" = "(";
-
 /* No comment provided by engineer. */
 "(new)" = "(新)";
 
 /* No comment provided by engineer. */
 "(this device v%@)" = "(此设备 v%@)";
 
-/* No comment provided by engineer. */
-")" = ")";
-
 /* No comment provided by engineer. */
 "[Contribute](https://github.com/simplex-chat/simplex-chat#contribute)" = "[贡献](https://github.com/simplex-chat/simplex-chat#contribute)";
 
@@ -82,6 +61,9 @@
 /* No comment provided by engineer. */
 "**Recommended**: device token and end-to-end encrypted notifications are sent to SimpleX Chat push server, but it does not see the message content, size or who it is from." = "**推荐**：设备令牌和通知会发送至 SimpleX Chat 通知服务器，但是消息内容、大小或者发送人不会。";
 
+/* No comment provided by engineer. */
+"**Scan / Paste link**: to connect via a link you received." = "**扫描/粘贴链接**：用您收到的链接连接。";
+
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**警告**：及时推送通知需要保存在钥匙串的密码。";
 
@@ -142,12 +124,21 @@
 /* No comment provided by engineer. */
 "%@ is verified" = "%@ 已认证";
 
+/* No comment provided by engineer. */
+"%@ server" = "服务器";
+
+/* No comment provided by engineer. */
+"%@ servers" = "服务器";
+
 /* No comment provided by engineer. */
 "%@ uploaded" = "%@ 已上传";
 
 /* notification title */
 "%@ wants to connect!" = "%@ 要连接！";
 
+/* format for date separator in chat */
+"%@, %@" = "%1$@, %2$@";
+
 /* No comment provided by engineer. */
 "%@, %@ and %lld members" = "%@, %@ 和 %lld 成员";
 
@@ -160,9 +151,24 @@
 /* time interval */
 "%d days" = "%d 天";
 
+/* forward confirmation reason */
+"%d file(s) are still being downloaded." = "仍在下载 %d 个文件。";
+
+/* forward confirmation reason */
+"%d file(s) failed to download." = "%d 个文件下载失败。";
+
+/* forward confirmation reason */
+"%d file(s) were deleted." = "已刪除 %d 个文件。";
+
+/* forward confirmation reason */
+"%d file(s) were not downloaded." = "未能下载 %d 个文件。";
+
 /* time interval */
 "%d hours" = "%d 小时";
 
+/* alert title */
+"%d messages not forwarded" = "未转发 %d 条消息";
+
 /* time interval */
 "%d min" = "%d 分钟";
 
@@ -172,8 +178,11 @@
 /* time interval */
 "%d sec" = "%d 秒";
 
+/* delete after time */
+"%d seconds(s)" = "%d 秒";
+
 /* integrity error chat item */
-"%d skipped message(s)" = "%d 跳过消息";
+"%d skipped message(s)" = "跳过的 %d 条消息";
 
 /* time interval */
 "%d weeks" = "%d 星期";
@@ -214,9 +223,6 @@
 /* No comment provided by engineer. */
 "%lld new interface languages" = "%lld 种新的界面语言";
 
-/* No comment provided by engineer. */
-"%lld second(s)" = "%lld 秒";
-
 /* No comment provided by engineer. */
 "%lld seconds" = "%lld 秒";
 
@@ -262,7 +268,8 @@
 /* No comment provided by engineer. */
 "0s" = "0秒";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 day" = "1天";
 
 /* time interval */
@@ -271,12 +278,23 @@
 /* No comment provided by engineer. */
 "1 minute" = "1分钟";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 month" = "1月";
 
-/* time interval */
+/* delete after time
+time interval */
 "1 week" = "1周";
 
+/* delete after time */
+"1 year" = "1 年";
+
+/* No comment provided by engineer. */
+"1-time link" = "一次性链接";
+
+/* No comment provided by engineer. */
+"1-time link can be used *with one contact only* - share in person or via any messenger." = "一次性链接*只能给一名联系人*使用。当面或使用聊天应用分享链接。";
+
 /* No comment provided by engineer. */
 "5 minutes" = "5分钟";
 
@@ -310,6 +328,9 @@
 /* No comment provided by engineer. */
 "Abort changing address?" = "中止地址更改？";
 
+/* No comment provided by engineer. */
+"About operators" = "关于运营方";
+
 /* No comment provided by engineer. */
 "About SimpleX Chat" = "关于SimpleX Chat";
 
@@ -320,10 +341,13 @@
 "Accent" = "强调";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+accept incoming call via notification
+swipe action */
 "Accept" = "接受";
 
+/* No comment provided by engineer. */
+"Accept conditions" = "接受条款";
+
 /* No comment provided by engineer. */
 "Accept connection request?" = "接受联系人？";
 
@@ -331,24 +355,36 @@
 "Accept contact request from %@?" = "接受来自 %@ 的联系人请求？";
 
 /* accept contact request via notification
-   swipe action */
+swipe action */
 "Accept incognito" = "接受隐身聊天";
 
 /* call status */
 "accepted call" = "已接受通话";
 
+/* No comment provided by engineer. */
+"Accepted conditions" = "已接受的条款";
+
 /* No comment provided by engineer. */
 "Acknowledged" = "确认";
 
 /* No comment provided by engineer. */
 "Acknowledgement errors" = "确认错误";
 
+/* token status text */
+"Active" = "活跃";
+
 /* No comment provided by engineer. */
 "Active connections" = "活动连接";
 
 /* No comment provided by engineer. */
 "Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "将地址添加到您的个人资料，以便您的联系人可以与其他人共享。个人资料更新将发送给您的联系人。";
 
+/* No comment provided by engineer. */
+"Add friends" = "添加好友";
+
+/* No comment provided by engineer. */
+"Add list" = "添加列表";
+
 /* No comment provided by engineer. */
 "Add profile" = "添加个人资料";
 
@@ -358,12 +394,27 @@
 /* No comment provided by engineer. */
 "Add servers by scanning QR codes." = "扫描二维码来添加服务器。";
 
+/* No comment provided by engineer. */
+"Add team members" = "添加团队成员";
+
 /* No comment provided by engineer. */
 "Add to another device" = "添加另一设备";
 
+/* No comment provided by engineer. */
+"Add to list" = "添加到列表";
+
 /* No comment provided by engineer. */
 "Add welcome message" = "添加欢迎信息";
 
+/* No comment provided by engineer. */
+"Add your team members to the conversations." = "将你的团队成员加入对话。";
+
+/* No comment provided by engineer. */
+"Added media & file servers" = "已添加媒体和文件服务器";
+
+/* No comment provided by engineer. */
+"Added message servers" = "已添加消息服务器";
+
 /* No comment provided by engineer. */
 "Additional accent" = "附加重音";
 
@@ -379,6 +430,12 @@
 /* No comment provided by engineer. */
 "Address change will be aborted. Old receiving address will be used." = "将中止地址更改。将使用旧接收地址。";
 
+/* No comment provided by engineer. */
+"Address or 1-time link?" = "地址还是一次性链接？";
+
+/* No comment provided by engineer. */
+"Address settings" = "地址设置";
+
 /* member role */
 "admin" = "管理员";
 
@@ -403,12 +460,18 @@
 /* chat item text */
 "agreeing encryption…" = "同意加密…";
 
+/* No comment provided by engineer. */
+"All" = "全部";
+
 /* No comment provided by engineer. */
 "All app data is deleted." = "已删除所有应用程序数据。";
 
 /* No comment provided by engineer. */
 "All chats and messages will be deleted - this cannot be undone!" = "所有聊天记录和消息将被删除——这一行为无法撤销！";
 
+/* alert message */
+"All chats will be removed from the list %@, and the list deleted." = "列表 %@ 和其中全部聊天将被删除。";
+
 /* No comment provided by engineer. */
 "All data is erased when it is entered." = "所有数据在输入后将被删除。";
 
@@ -421,6 +484,9 @@
 /* feature role */
 "all members" = "所有成员";
 
+/* No comment provided by engineer. */
+"All messages and files are sent **end-to-end encrypted**, with post-quantum security in direct messages." = "所有消息和文件均通过**端到端加密**发送；私信以量子安全方式发送。";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "所有消息都将被删除 - 这无法被撤销！";
 
@@ -433,6 +499,12 @@
 /* profile dropdown */
 "All profiles" = "所有配置文件";
 
+/* No comment provided by engineer. */
+"All reports will be archived for you." = "将为你存档所有举报。";
+
+/* No comment provided by engineer. */
+"All servers" = "全部服务器";
+
 /* No comment provided by engineer. */
 "All your contacts will remain connected." = "所有联系人会保持连接。";
 
@@ -478,6 +550,9 @@
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "允许不可撤回地删除已发送消息";
 
+/* No comment provided by engineer. */
+"Allow to report messsages to moderators." = "允许向 moderators 举报消息。";
+
 /* No comment provided by engineer. */
 "Allow to send files and media." = "允许发送文件和媒体。";
 
@@ -532,6 +607,9 @@
 /* No comment provided by engineer. */
 "and %lld other events" = "和 %lld 其他事件";
 
+/* report reason */
+"Another reason" = "另一个理由";
+
 /* No comment provided by engineer. */
 "Answer call" = "接听来电";
 
@@ -547,6 +625,9 @@
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "应用程序为新的本地文件（视频除外）加密。";
 
+/* No comment provided by engineer. */
+"App group:" = "应用组：";
+
 /* No comment provided by engineer. */
 "App icon" = "应用程序图标";
 
@@ -556,6 +637,9 @@
 /* No comment provided by engineer. */
 "App passcode is replaced with self-destruct passcode." = "应用程序密码被替换为自毁密码。";
 
+/* No comment provided by engineer. */
+"App session" = "应用会话";
+
 /* No comment provided by engineer. */
 "App version" = "应用程序版本";
 
@@ -571,12 +655,30 @@
 /* No comment provided by engineer. */
 "Apply to" = "应用于";
 
+/* No comment provided by engineer. */
+"Archive" = "存档";
+
+/* No comment provided by engineer. */
+"Archive %lld reports?" = "存档 %lld 个举报？";
+
+/* No comment provided by engineer. */
+"Archive all reports?" = "存档所有举报？";
+
 /* No comment provided by engineer. */
 "Archive and upload" = "存档和上传";
 
 /* No comment provided by engineer. */
 "Archive contacts to chat later." = "存档联系人以便稍后聊天.";
 
+/* No comment provided by engineer. */
+"Archive report" = "存档举报";
+
+/* No comment provided by engineer. */
+"Archive report?" = "存档举报？";
+
+/* swipe action */
+"Archive reports" = "存档举报";
+
 /* No comment provided by engineer. */
 "Archived contacts" = "已存档的联系人";
 
@@ -628,6 +730,9 @@
 /* No comment provided by engineer. */
 "Auto-accept images" = "自动接受图片";
 
+/* alert title */
+"Auto-accept settings" = "自动接受设置";
+
 /* No comment provided by engineer. */
 "Back" = "返回";
 
@@ -649,15 +754,36 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "错误消息 ID";
 
+/* No comment provided by engineer. */
+"Better calls" = "更佳的通话";
+
 /* No comment provided by engineer. */
 "Better groups" = "更佳的群组";
 
+/* No comment provided by engineer. */
+"Better groups performance" = "更好的群性能";
+
+/* No comment provided by engineer. */
+"Better message dates." = "更好的消息日期。";
+
 /* No comment provided by engineer. */
 "Better messages" = "更好的消息";
 
 /* No comment provided by engineer. */
 "Better networking" = "更好的网络";
 
+/* No comment provided by engineer. */
+"Better notifications" = "更佳的通知";
+
+/* No comment provided by engineer. */
+"Better privacy and security" = "更好的隐私和安全";
+
+/* No comment provided by engineer. */
+"Better security ✅" = "更佳的安全性✅";
+
+/* No comment provided by engineer. */
+"Better user experience" = "更佳的使用体验";
+
 /* No comment provided by engineer. */
 "Black" = "黑色";
 
@@ -685,7 +811,8 @@
 /* rcv group event chat item */
 "blocked %@" = "已封禁 %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item
+marked deleted chat item preview text */
 "blocked by admin" = "由管理员封禁";
 
 /* No comment provided by engineer. */
@@ -718,9 +845,21 @@
 /* No comment provided by engineer. */
 "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "保加利亚语、芬兰语、泰语和乌克兰语——感谢用户和[Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
 
+/* No comment provided by engineer. */
+"Business address" = "企业地址";
+
+/* No comment provided by engineer. */
+"Business chats" = "企业聊天";
+
+/* No comment provided by engineer. */
+"Businesses" = "企业";
+
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "通过聊天资料（默认）或者[通过连接](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)。";
 
+/* No comment provided by engineer. */
+"By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam." = "使用 SimpleX Chat 代表您同意：\n- 在公开群中只发送合法内容\n- 尊重其他用户 – 没有垃圾信息。";
+
 /* No comment provided by engineer. */
 "call" = "呼叫";
 
@@ -761,7 +900,7 @@
 "Can't message member" = "无法向成员发送消息";
 
 /* alert action
-   alert button */
+alert button */
 "Cancel" = "取消";
 
 /* No comment provided by engineer. */
@@ -788,6 +927,12 @@
 /* No comment provided by engineer. */
 "Change" = "更改";
 
+/* alert title */
+"Change automatic message deletion?" = "更改消息自动删除设置？";
+
+/* authentication reason */
+"Change chat profiles" = "更改聊天资料";
+
 /* No comment provided by engineer. */
 "Change database passphrase?" = "更改数据库密码？";
 
@@ -813,7 +958,7 @@
 "Change self-destruct mode" = "更改自毁模式";
 
 /* authentication reason
-   set passcode view */
+set passcode view */
 "Change self-destruct passcode" = "更改自毁密码";
 
 /* chat item text */
@@ -831,6 +976,15 @@
 /* chat item text */
 "changing address…" = "更改地址…";
 
+/* No comment provided by engineer. */
+"Chat" = "聊天";
+
+/* No comment provided by engineer. */
+"Chat already exists" = "聊天已存在";
+
+/* No comment provided by engineer. */
+"Chat already exists!" = "聊天已存在！";
+
 /* No comment provided by engineer. */
 "Chat colors" = "聊天颜色";
 
@@ -867,15 +1021,30 @@
 /* No comment provided by engineer. */
 "Chat preferences" = "聊天偏好设置";
 
+/* alert message */
+"Chat preferences were changed." = "聊天偏好设置已修改。";
+
 /* No comment provided by engineer. */
 "Chat profile" = "用户资料";
 
 /* No comment provided by engineer. */
 "Chat theme" = "聊天主题";
 
+/* No comment provided by engineer. */
+"Chat will be deleted for all members - this cannot be undone!" = "将为所有成员删除聊天 - 此操作无法撤销！";
+
+/* No comment provided by engineer. */
+"Chat will be deleted for you - this cannot be undone!" = "将为你删除聊天 - 此操作无法撤销！";
+
 /* No comment provided by engineer. */
 "Chats" = "聊天";
 
+/* No comment provided by engineer. */
+"Check messages every 20 min." = "每 20 分钟检查消息。";
+
+/* No comment provided by engineer. */
+"Check messages when allowed." = "在被允许时检查消息。";
+
 /* alert title */
 "Check server address and try again." = "检查服务器地址并再试一次。";
 
@@ -909,6 +1078,12 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "清除对话吗？";
 
+/* No comment provided by engineer. */
+"Clear group?" = "清除群？";
+
+/* No comment provided by engineer. */
+"Clear or delete group?" = "清除还是删除群？";
+
 /* No comment provided by engineer. */
 "Clear private notes?" = "清除私密笔记？";
 
@@ -924,6 +1099,9 @@
 /* No comment provided by engineer. */
 "colored" = "彩色";
 
+/* report reason */
+"Community guidelines violation" = "违反社区指导方针";
+
 /* server test step */
 "Compare file" = "对比文件";
 
@@ -936,9 +1114,33 @@
 /* No comment provided by engineer. */
 "Completed" = "已完成";
 
+/* No comment provided by engineer. */
+"Conditions accepted on: %@." = "已于 %@ 接受条款。";
+
+/* No comment provided by engineer. */
+"Conditions are accepted for the operator(s): **%@**." = "已接受运营方 **%@** 的条款。";
+
+/* No comment provided by engineer. */
+"Conditions are already accepted for these operator(s): **%@**." = "已经接受下列运营方的条款：**%@**。";
+
+/* No comment provided by engineer. */
+"Conditions of use" = "使用条款";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted for the operator(s): **%@**." = "将接受下列运营方的条款：**%@**。";
+
+/* No comment provided by engineer. */
+"Conditions will be accepted on: %@." = "将于 %@ 接受条款。";
+
+/* No comment provided by engineer. */
+"Conditions will be automatically accepted for enabled operators on: %@." = "将在 %@ 自动接受启用的运营方的条款。";
+
 /* No comment provided by engineer. */
 "Configure ICE servers" = "配置 ICE 服务器";
 
+/* No comment provided by engineer. */
+"Configure server operators" = "配置服务器运营方";
+
 /* No comment provided by engineer. */
 "Confirm" = "确认";
 
@@ -969,6 +1171,9 @@
 /* No comment provided by engineer. */
 "Confirm upload" = "确认上传";
 
+/* token status text */
+"Confirmed" = "已确定";
+
 /* server test step */
 "Connect" = "连接";
 
@@ -1068,6 +1273,9 @@
 /* No comment provided by engineer. */
 "Connection and servers status." = "连接和服务器状态。";
 
+/* No comment provided by engineer. */
+"Connection blocked" = "连接被阻止";
+
 /* No comment provided by engineer. */
 "Connection error" = "连接错误";
 
@@ -1077,12 +1285,24 @@
 /* chat list item title (it should not be shown */
 "connection established" = "连接已建立";
 
+/* No comment provided by engineer. */
+"Connection is blocked by server operator:\n%@" = "连接被运营方 %@ 阻止";
+
+/* No comment provided by engineer. */
+"Connection not ready." = "连接未就绪。";
+
 /* No comment provided by engineer. */
 "Connection notifications" = "连接通知";
 
 /* No comment provided by engineer. */
 "Connection request sent!" = "已发送连接请求！";
 
+/* No comment provided by engineer. */
+"Connection requires encryption renegotiation." = "连接需要加密重协商。";
+
+/* No comment provided by engineer. */
+"Connection security" = "连接安全性";
+
 /* No comment provided by engineer. */
 "Connection terminated" = "连接被终止";
 
@@ -1140,6 +1360,9 @@
 /* No comment provided by engineer. */
 "Contacts can mark messages for deletion; you will be able to view them." = "联系人可以将信息标记为删除；您将可以查看这些信息。";
 
+/* blocking reason */
+"Content violates conditions of use" = "内容违反使用条款";
+
 /* No comment provided by engineer. */
 "Continue" = "继续";
 
@@ -1155,12 +1378,18 @@
 /* No comment provided by engineer. */
 "Core version: v%@" = "核心版本: v%@";
 
+/* No comment provided by engineer. */
+"Corner" = "拐角";
+
 /* No comment provided by engineer. */
 "Correct name to %@?" = "将名称更正为 %@？";
 
 /* No comment provided by engineer. */
 "Create" = "创建";
 
+/* No comment provided by engineer. */
+"Create 1-time link" = "创建一次性链接";
+
 /* No comment provided by engineer. */
 "Create a group using a random profile." = "使用随机身份创建群组.";
 
@@ -1176,6 +1405,9 @@
 /* No comment provided by engineer. */
 "Create link" = "创建链接";
 
+/* No comment provided by engineer. */
+"Create list" = "创建列表";
+
 /* No comment provided by engineer. */
 "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "在[桌面应用程序](https://simplex.chat/downloads/)中创建新的个人资料。 💻";
 
@@ -1212,6 +1444,9 @@
 /* No comment provided by engineer. */
 "creator" = "创建者";
 
+/* No comment provided by engineer. */
+"Current conditions text couldn't be loaded, you can review conditions via this link:" = "无法加载当前条款文本，你可以通过此链接审阅条款：";
+
 /* No comment provided by engineer. */
 "Current Passcode" = "当前密码";
 
@@ -1230,6 +1465,9 @@
 /* No comment provided by engineer. */
 "Custom time" = "自定义时间";
 
+/* No comment provided by engineer. */
+"Customizable message shape." = "可自定义消息形状。";
+
 /* No comment provided by engineer. */
 "Customize theme" = "自定义主题";
 
@@ -1311,7 +1549,8 @@
 /* No comment provided by engineer. */
 "decryption errors" = "解密错误";
 
-/* pref value */
+/* delete after time
+pref value */
 "default (%@)" = "默认 (%@)";
 
 /* No comment provided by engineer. */
@@ -1321,8 +1560,7 @@
 "default (yes)" = "默认 (是)";
 
 /* alert action
-   chat item action
-   swipe action */
+swipe action */
 "Delete" = "删除";
 
 /* No comment provided by engineer. */
@@ -1346,12 +1584,21 @@
 /* No comment provided by engineer. */
 "Delete and notify contact" = "删除并通知联系人";
 
+/* No comment provided by engineer. */
+"Delete chat" = "删除聊天";
+
+/* No comment provided by engineer. */
+"Delete chat messages from your device." = "从你的设备删除聊天消息。";
+
 /* No comment provided by engineer. */
 "Delete chat profile" = "删除聊天资料";
 
 /* No comment provided by engineer. */
 "Delete chat profile?" = "删除聊天资料？";
 
+/* No comment provided by engineer. */
+"Delete chat?" = "删除聊天？";
+
 /* No comment provided by engineer. */
 "Delete connection" = "删除连接";
 
@@ -1397,13 +1644,16 @@
 /* No comment provided by engineer. */
 "Delete link?" = "删除链接？";
 
+/* alert title */
+"Delete list?" = "删除列表？";
+
 /* No comment provided by engineer. */
 "Delete member message?" = "删除成员消息？";
 
 /* No comment provided by engineer. */
 "Delete message?" = "删除消息吗？";
 
-/* No comment provided by engineer. */
+/* alert button */
 "Delete messages" = "删除消息";
 
 /* No comment provided by engineer. */
@@ -1415,6 +1665,9 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "删除旧数据库吗？";
 
+/* No comment provided by engineer. */
+"Delete or moderate up to 200 messages." = "允许自行删除或管理员移除最多200条消息。";
+
 /* No comment provided by engineer. */
 "Delete pending connection?" = "删除待定连接？";
 
@@ -1424,6 +1677,9 @@
 /* server test step */
 "Delete queue" = "删除队列";
 
+/* No comment provided by engineer. */
+"Delete report" = "删除举报";
+
 /* No comment provided by engineer. */
 "Delete up to 20 messages at once." = "一次最多删除 20 条信息。";
 
@@ -1454,6 +1710,9 @@
 /* No comment provided by engineer. */
 "Deletion errors" = "删除错误";
 
+/* No comment provided by engineer. */
+"Delivered even when Apple drops them." = "已送达，即使苹果已将其删除。";
+
 /* No comment provided by engineer. */
 "Delivery" = "传送";
 
@@ -1503,7 +1762,7 @@
 "Device" = "设备";
 
 /* No comment provided by engineer. */
-"Device authentication is disabled. Turning off SimpleX Lock." = "设备验证被禁用。关闭 SimpleX 锁定。";
+"Device authentication is disabled. Turning off SimpleX Lock." = "设备验证已禁用。 SimpleX 已解锁。";
 
 /* No comment provided by engineer. */
 "Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." = "没有启用设备验证。一旦启用设备验证，您可以通过设置打开 SimpleX 锁定。";
@@ -1521,11 +1780,20 @@
 "Direct messages" = "私信";
 
 /* No comment provided by engineer. */
-"Direct messages between members are prohibited." = "此群中禁止成员之间私信。";
+"Direct messages between members are prohibited in this chat." = "此群禁止成员间私信。";
+
+/* No comment provided by engineer. */
+"Direct messages between members are prohibited." = "此群禁止成员间私信。";
 
 /* No comment provided by engineer. */
 "Disable (keep overrides)" = "禁用（保留覆盖）";
 
+/* alert title */
+"Disable automatic message deletion?" = "禁用消息自动销毁？";
+
+/* alert button */
+"Disable delete messages" = "停用消息删除";
+
 /* No comment provided by engineer. */
 "Disable for all" = "全部禁用";
 
@@ -1577,12 +1845,18 @@
 /* No comment provided by engineer. */
 "Do NOT send messages directly, even if your or destination server does not support private routing." = "请勿直接发送消息，即使您的服务器或目标服务器不支持私有路由。";
 
+/* No comment provided by engineer. */
+"Do not use credentials with proxy." = "代理不使用身份验证凭据。";
+
 /* No comment provided by engineer. */
 "Do NOT use private routing." = "不要使用私有路由。";
 
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "请勿使用 SimpleX 进行紧急通话。";
 
+/* No comment provided by engineer. */
+"Documents:" = "文档：";
+
 /* No comment provided by engineer. */
 "Don't create address" = "不创建地址";
 
@@ -1590,13 +1864,19 @@
 "Don't enable" = "不要启用";
 
 /* No comment provided by engineer. */
+"Don't miss important messages." = "不错过重要消息。";
+
+/* alert action */
 "Don't show again" = "不再显示";
 
+/* No comment provided by engineer. */
+"Done" = "完成";
+
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "降级并打开聊天";
 
 /* alert button
-   chat item action */
+chat item action */
 "Download" = "下载";
 
 /* No comment provided by engineer. */
@@ -1608,6 +1888,9 @@
 /* server test step */
 "Download file" = "下载文件";
 
+/* alert action */
+"Download files" = "下载文件";
+
 /* No comment provided by engineer. */
 "Downloaded" = "已下载";
 
@@ -1627,7 +1910,7 @@
 "duplicate message" = "重复的消息";
 
 /* No comment provided by engineer. */
-"duplicates" = "复本";
+"duplicates" = "副本";
 
 /* No comment provided by engineer. */
 "Duration" = "时长";
@@ -1635,6 +1918,9 @@
 /* No comment provided by engineer. */
 "e2e encrypted" = "端到端加密";
 
+/* No comment provided by engineer. */
+"E2E encrypted notifications." = "端到端加密的通知。";
+
 /* chat item action */
 "Edit" = "编辑";
 
@@ -1647,12 +1933,15 @@
 /* No comment provided by engineer. */
 "Enable (keep overrides)" = "启用（保持覆盖）";
 
-/* No comment provided by engineer. */
+/* alert title */
 "Enable automatic message deletion?" = "启用自动删除消息？";
 
 /* No comment provided by engineer. */
 "Enable camera access" = "启用相机访问";
 
+/* No comment provided by engineer. */
+"Enable Flux in Network & servers settings for better metadata privacy." = "在“网络&服务器”设置中启用 Flux，更好地保护元数据隐私。";
+
 /* No comment provided by engineer. */
 "Enable for all" = "全部启用";
 
@@ -1764,6 +2053,9 @@
 /* chat item text */
 "encryption re-negotiation required for %@" = "需要为 %@ 重新进行加密协商";
 
+/* No comment provided by engineer. */
+"Encryption renegotiation in progress." = "正进行加密重协商。";
+
 /* No comment provided by engineer. */
 "ended" = "已结束";
 
@@ -1812,21 +2104,33 @@
 /* No comment provided by engineer. */
 "Error aborting address change" = "中止地址更改错误";
 
+/* alert title */
+"Error accepting conditions" = "接受条款出错";
+
 /* No comment provided by engineer. */
 "Error accepting contact request" = "接受联系人请求错误";
 
 /* No comment provided by engineer. */
 "Error adding member(s)" = "添加成员错误";
 
+/* alert title */
+"Error adding server" = "添加服务器出错";
+
 /* No comment provided by engineer. */
 "Error changing address" = "更改地址错误";
 
+/* No comment provided by engineer. */
+"Error changing connection profile" = "更改连接资料出错";
+
 /* No comment provided by engineer. */
 "Error changing role" = "更改角色错误";
 
 /* No comment provided by engineer. */
 "Error changing setting" = "更改设置错误";
 
+/* No comment provided by engineer. */
+"Error changing to incognito!" = "切换至隐身聊天出错！";
+
 /* No comment provided by engineer. */
 "Error connecting to forwarding server %@. Please try later." = "连接到转发服务器 %@ 时出错。请稍后尝试。";
 
@@ -1839,6 +2143,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "创建群组链接错误";
 
+/* alert title */
+"Error creating list" = "创建列表出错";
+
 /* No comment provided by engineer. */
 "Error creating member contact" = "创建成员联系人时出错";
 
@@ -1848,6 +2155,9 @@
 /* No comment provided by engineer. */
 "Error creating profile!" = "创建资料错误！";
 
+/* No comment provided by engineer. */
+"Error creating report" = "创建举报出错";
+
 /* No comment provided by engineer. */
 "Error decrypting file" = "解密文件时出错";
 
@@ -1896,6 +2206,12 @@
 /* No comment provided by engineer. */
 "Error joining group" = "加入群组错误";
 
+/* alert title */
+"Error loading servers" = "加载服务器出错";
+
+/* No comment provided by engineer. */
+"Error migrating settings" = "迁移设置出错";
+
 /* No comment provided by engineer. */
 "Error opening chat" = "打开聊天时出错";
 
@@ -1908,12 +2224,21 @@
 /* No comment provided by engineer. */
 "Error reconnecting servers" = "重新连接服务器时出错";
 
-/* No comment provided by engineer. */
+/* alert title */
+"Error registering for notifications" = "注册消息推送出错";
+
+/* alert title */
 "Error removing member" = "删除成员错误";
 
+/* alert title */
+"Error reordering lists" = "重排列表出错";
+
 /* No comment provided by engineer. */
 "Error resetting statistics" = "重置统计信息时出错";
 
+/* alert title */
+"Error saving chat list" = "保存聊天列表出错";
+
 /* No comment provided by engineer. */
 "Error saving group profile" = "保存群组资料错误";
 
@@ -1926,6 +2251,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "保存密码到钥匙串错误";
 
+/* alert title */
+"Error saving servers" = "保存服务器出错";
+
 /* when migrating */
 "Error saving settings" = "保存设置出错";
 
@@ -1953,18 +2281,27 @@
 /* No comment provided by engineer. */
 "Error stopping chat" = "停止聊天错误";
 
+/* No comment provided by engineer. */
+"Error switching profile" = "切换配置文件出错";
+
 /* alertTitle */
 "Error switching profile!" = "切换资料错误！";
 
 /* No comment provided by engineer. */
 "Error synchronizing connection" = "同步连接错误";
 
+/* No comment provided by engineer. */
+"Error testing server connection" = "检验服务器连接出错";
+
 /* No comment provided by engineer. */
 "Error updating group link" = "更新群组链接错误";
 
 /* No comment provided by engineer. */
 "Error updating message" = "更新消息错误";
 
+/* alert title */
+"Error updating server" = "更新服务器出错";
+
 /* No comment provided by engineer. */
 "Error updating settings" = "更新设置错误";
 
@@ -1980,7 +2317,9 @@
 /* No comment provided by engineer. */
 "Error: " = "错误： ";
 
-/* alert message */
+/* alert message
+file error text
+snd error text */
 "Error: %@" = "错误： ％@";
 
 /* No comment provided by engineer. */
@@ -1992,11 +2331,11 @@
 /* No comment provided by engineer. */
 "Errors" = "错误";
 
-/* No comment provided by engineer. */
-"Even when disabled in the conversation." = "即使在对话中被禁用。";
+/* servers error */
+"Errors in servers configuration." = "服务器配置有错误。";
 
 /* No comment provided by engineer. */
-"event happened" = "发生的事";
+"Even when disabled in the conversation." = "即使在对话中被禁用。";
 
 /* No comment provided by engineer. */
 "Exit without saving" = "退出而不保存";
@@ -2007,6 +2346,9 @@
 /* No comment provided by engineer. */
 "expired" = "过期";
 
+/* token status text */
+"Expired" = "已过期";
+
 /* No comment provided by engineer. */
 "Export database" = "导出数据库";
 
@@ -2031,15 +2373,30 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "快速且无需等待发件人在线！";
 
+/* No comment provided by engineer. */
+"Faster deletion of groups." = "更快地删除群。";
+
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "加入速度更快、信息更可靠。";
 
+/* No comment provided by engineer. */
+"Faster sending messages." = "更快发送消息。";
+
 /* swipe action */
 "Favorite" = "最喜欢";
 
 /* No comment provided by engineer. */
+"Favorites" = "收藏";
+
+/* file error alert title */
 "File error" = "文件错误";
 
+/* alert message */
+"File errors:\n%@" = "文件错误：\n%@";
+
+/* file error text */
+"File is blocked by server operator:\n%@." = "文件被服务器运营方阻止：\n%@。";
+
 /* file error text */
 "File not found - most likely file was deleted or cancelled." = "找不到文件 - 很可能文件已被删除或取消。";
 
@@ -2115,15 +2472,45 @@
 /* No comment provided by engineer. */
 "Fix not supported by group member" = "修复群组成员不支持的问题";
 
+/* No comment provided by engineer. */
+"For all moderators" = "所有 moderators";
+
+/* servers error */
+"For chat profile %@:" = "为聊天资料 %@：";
+
 /* No comment provided by engineer. */
 "For console" = "用于控制台";
 
+/* No comment provided by engineer. */
+"For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server." = "比如，如果你通过 SimpleX 服务器收到消息，应用会通过 Flux 服务器传送它们。";
+
+/* No comment provided by engineer. */
+"For me" = "仅自己";
+
+/* No comment provided by engineer. */
+"For private routing" = "用于私密路由";
+
+/* No comment provided by engineer. */
+"For social media" = "用于社交媒体";
+
 /* chat item action */
 "Forward" = "转发";
 
+/* alert title */
+"Forward %d message(s)?" = "转发 %d 条消息？";
+
 /* No comment provided by engineer. */
 "Forward and save messages" = "转发并保存消息";
 
+/* alert action */
+"Forward messages" = "已转发的消息";
+
+/* alert message */
+"Forward messages without files?" = "仅转发消息不转发文件？";
+
+/* No comment provided by engineer. */
+"Forward up to 20 messages at once." = "一次转发最多20条消息。";
+
 /* No comment provided by engineer. */
 "forwarded" = "已转发";
 
@@ -2133,6 +2520,9 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "转发自";
 
+/* No comment provided by engineer. */
+"Forwarding %lld messages" = "正在转发 %lld 条消息";
+
 /* No comment provided by engineer. */
 "Forwarding server %@ failed to connect to destination server %@. Please try later." = "转发服务器 %@ 无法连接到目标服务器 %@。请稍后尝试。";
 
@@ -2169,6 +2559,9 @@
 /* No comment provided by engineer. */
 "Further reduced battery usage" = "进一步减少电池使用";
 
+/* No comment provided by engineer. */
+"Get notified when mentioned." = "被提及时收到通知。";
+
 /* No comment provided by engineer. */
 "GIFs and stickers" = "GIF 和贴纸";
 
@@ -2241,9 +2634,15 @@
 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "将为您删除群组——此操作无法撤消！";
 
+/* No comment provided by engineer. */
+"Groups" = "群";
+
 /* No comment provided by engineer. */
 "Help" = "帮助";
 
+/* No comment provided by engineer. */
+"Help admins moderating their groups." = "帮助管理员管理群组。";
+
 /* No comment provided by engineer. */
 "Hidden" = "隐藏";
 
@@ -2274,6 +2673,15 @@
 /* time unit */
 "hours" = "小时";
 
+/* No comment provided by engineer. */
+"How it affects privacy" = "它如何影响隐私";
+
+/* No comment provided by engineer. */
+"How it helps privacy" = "它如何帮助隐私";
+
+/* alert button */
+"How it works" = "工作原理";
+
 /* No comment provided by engineer. */
 "How SimpleX works" = "SimpleX的工作原理";
 
@@ -2337,6 +2745,9 @@
 /* No comment provided by engineer. */
 "Importing archive" = "正在导入存档";
 
+/* No comment provided by engineer. */
+"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "改善传送，降低流量使用。\n更多改进即将推出！";
+
 /* No comment provided by engineer. */
 "Improved message delivery" = "改进了消息传递";
 
@@ -2358,6 +2769,12 @@
 /* No comment provided by engineer. */
 "inactive" = "无效";
 
+/* report reason */
+"Inappropriate content" = "不当内容";
+
+/* report reason */
+"Inappropriate profile" = "不当个人资料";
+
 /* No comment provided by engineer. */
 "Incognito" = "隐身聊天";
 
@@ -2424,6 +2841,21 @@
 /* No comment provided by engineer. */
 "Interface colors" = "界面颜色";
 
+/* token status text */
+"Invalid" = "无效";
+
+/* token status text */
+"Invalid (bad token)" = "Token 无效";
+
+/* token status text */
+"Invalid (expired)" = "无效（已过期）";
+
+/* token status text */
+"Invalid (unregistered)" = "无效（未注册）";
+
+/* token status text */
+"Invalid (wrong topic)" = "无效（话题有误）";
+
 /* invalid chat data */
 "invalid chat" = "无效聊天";
 
@@ -2475,6 +2907,9 @@
 /* No comment provided by engineer. */
 "Invite members" = "邀请成员";
 
+/* No comment provided by engineer. */
+"Invite to chat" = "邀请加入聊天";
+
 /* No comment provided by engineer. */
 "Invite to group" = "邀请加入群组";
 
@@ -2496,6 +2931,9 @@
 /* No comment provided by engineer. */
 "iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications." = "在您重启应用或改变密码后，iOS钥匙串将被用来安全地存储密码——它将允许接收推送通知。";
 
+/* No comment provided by engineer. */
+"IP address" = "IP 地址";
+
 /* No comment provided by engineer. */
 "Irreversible message deletion" = "不可撤回消息移除";
 
@@ -2586,6 +3024,12 @@
 /* swipe action */
 "Leave" = "离开";
 
+/* No comment provided by engineer. */
+"Leave chat" = "离开聊天";
+
+/* No comment provided by engineer. */
+"Leave chat?" = "离开聊天？";
+
 /* No comment provided by engineer. */
 "Leave group" = "离开群组";
 
@@ -2613,6 +3057,15 @@
 /* No comment provided by engineer. */
 "Linked desktops" = "已链接桌面";
 
+/* swipe action */
+"List" = "列表";
+
+/* No comment provided by engineer. */
+"List name and emoji should be different for all lists." = "所有列表的名称和表情符号都应不同。";
+
+/* No comment provided by engineer. */
+"List name..." = "列表名…";
+
 /* No comment provided by engineer. */
 "LIVE" = "实时";
 
@@ -2682,12 +3135,21 @@
 /* item status text */
 "Member inactive" = "成员不活跃";
 
+/* chat feature */
+"Member reports" = "成员举报";
+
+/* No comment provided by engineer. */
+"Member role will be changed to \"%@\". All chat members will be notified." = "将变更成员角色为“%@”。所有成员都会收到通知。";
+
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "成员角色将更改为 \"%@\"。所有群成员将收到通知。";
 
 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". The member will receive a new invitation." = "成员角色将更改为 \"%@\"。该成员将收到一份新的邀请。";
 
+/* No comment provided by engineer. */
+"Member will be removed from chat - this cannot be undone!" = "将从聊天中删除成员 - 此操作无法撤销！";
+
 /* No comment provided by engineer. */
 "Member will be removed from group - this cannot be undone!" = "成员将被移出群组——此操作无法撤消！";
 
@@ -2697,6 +3159,9 @@
 /* No comment provided by engineer. */
 "Members can irreversibly delete sent messages. (24 hours)" = "群组成员可以不可撤回地删除已发送的消息";
 
+/* No comment provided by engineer. */
+"Members can report messsages to moderators." = "成员可以向 moderators 举报消息。";
+
 /* No comment provided by engineer. */
 "Members can send direct messages." = "群组成员可以私信。";
 
@@ -2712,6 +3177,9 @@
 /* No comment provided by engineer. */
 "Members can send voice messages." = "群组成员可以发送语音消息。";
 
+/* No comment provided by engineer. */
+"Mention members 👋" = "提及成员👋";
+
 /* No comment provided by engineer. */
 "Menus" = "菜单";
 
@@ -2757,6 +3225,9 @@
 /* No comment provided by engineer. */
 "Message servers" = "消息服务器";
 
+/* No comment provided by engineer. */
+"Message shape" = "消息形状";
+
 /* No comment provided by engineer. */
 "Message source remains private." = "消息来源保持私密。";
 
@@ -2781,12 +3252,18 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "将显示来自 %@ 的消息！";
 
+/* alert message */
+"Messages in this chat will never be deleted." = "此聊天中的消息永远不会被删除。";
+
 /* No comment provided by engineer. */
 "Messages received" = "收到的消息";
 
 /* No comment provided by engineer. */
 "Messages sent" = "已发送的消息";
 
+/* alert message */
+"Messages were deleted after you selected them." = "在你选中消息后这些消息已被删除。";
+
 /* No comment provided by engineer. */
 "Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "消息、文件和通话受到 **端到端加密** 的保护，具有完全正向保密、否认和闯入恢复。";
 
@@ -2853,24 +3330,30 @@
 /* time unit */
 "months" = "月";
 
+/* swipe action */
+"More" = "更多";
+
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "更多改进即将推出！";
 
 /* No comment provided by engineer. */
 "More reliable network connection." = "更可靠的网络连接。";
 
+/* No comment provided by engineer. */
+"More reliable notifications" = "更可靠的通知";
+
 /* item status description */
 "Most likely this connection is deleted." = "此连接很可能已被删除。";
 
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "多个聊天资料";
 
-/* No comment provided by engineer. */
-"mute" = "静音";
-
-/* swipe action */
+/* notification label action */
 "Mute" = "静音";
 
+/* notification label action */
+"Mute all" = "全部静音";
+
 /* No comment provided by engineer. */
 "Muted when inactive!" = "不活动时静音！";
 
@@ -2883,21 +3366,30 @@
 /* No comment provided by engineer. */
 "Network connection" = "网络连接";
 
+/* No comment provided by engineer. */
+"Network decentralization" = "网络去中心化";
+
 /* snd error text */
 "Network issues - message expired after many attempts to send it." = "网络问题 - 消息在多次尝试发送后过期。";
 
 /* No comment provided by engineer. */
 "Network management" = "网络管理";
 
+/* No comment provided by engineer. */
+"Network operator" = "网络运营方";
+
 /* No comment provided by engineer. */
 "Network settings" = "网络设置";
 
 /* No comment provided by engineer. */
 "Network status" = "网络状态";
 
-/* No comment provided by engineer. */
+/* delete after time */
 "never" = "从不";
 
+/* token status text */
+"New" = "新";
+
 /* No comment provided by engineer. */
 "New chat" = "新聊天";
 
@@ -2916,6 +3408,9 @@
 /* No comment provided by engineer. */
 "New display name" = "新显示名";
 
+/* notification */
+"New events" = "新事件";
+
 /* No comment provided by engineer. */
 "New in %@" = "%@ 的新内容";
 
@@ -2937,6 +3432,15 @@
 /* No comment provided by engineer. */
 "New passphrase…" = "新密码……";
 
+/* No comment provided by engineer. */
+"New server" = "新服务器";
+
+/* No comment provided by engineer. */
+"New SOCKS credentials will be used every time you start the app." = "每次启动应用都会使用新的 SOCKS 凭据。";
+
+/* No comment provided by engineer. */
+"New SOCKS credentials will be used for each server." = "每个服务器都会使用新的 SOCKS 凭据。";
+
 /* pref value */
 "no" = "否";
 
@@ -2946,6 +3450,15 @@
 /* Authentication unavailable */
 "No app password" = "没有应用程序密码";
 
+/* No comment provided by engineer. */
+"No chats" = "无聊天";
+
+/* No comment provided by engineer. */
+"No chats found" = "找不到聊天";
+
+/* No comment provided by engineer. */
+"No chats in list %@" = "列表 %@ 中无聊天";
+
 /* No comment provided by engineer. */
 "No contacts selected" = "未选择联系人";
 
@@ -2976,9 +3489,24 @@
 /* No comment provided by engineer. */
 "No info, try to reload" = "无信息，尝试重新加载";
 
+/* servers error */
+"No media & file servers." = "无媒体和文件服务器。";
+
+/* No comment provided by engineer. */
+"No message" = "无消息";
+
+/* servers error */
+"No message servers." = "无消息服务器。";
+
 /* No comment provided by engineer. */
 "No network connection" = "无网络连接";
 
+/* No comment provided by engineer. */
+"No permission to record speech" = "无录音权限";
+
+/* No comment provided by engineer. */
+"No permission to record video" = "无录像权限";
+
 /* No comment provided by engineer. */
 "No permission to record voice message" = "没有录制语音消息的权限";
 
@@ -2988,24 +3516,57 @@
 /* No comment provided by engineer. */
 "No received or sent files" = "未收到或发送文件";
 
+/* servers error */
+"No servers for private message routing." = "无私密消息路由服务器。";
+
+/* servers error */
+"No servers to receive files." = "无文件接收服务器。";
+
+/* servers error */
+"No servers to receive messages." = "无消息接收服务器。";
+
+/* servers error */
+"No servers to send files." = "无文件发送服务器。";
+
 /* copied message info in history */
 "no text" = "无文本";
 
+/* alert title */
+"No token!" = "无 token！";
+
+/* No comment provided by engineer. */
+"No unread chats" = "没有未读聊天";
+
 /* No comment provided by engineer. */
 "No user identifiers." = "没有用户标识符。";
 
 /* No comment provided by engineer. */
 "Not compatible!" = "不兼容！";
 
+/* No comment provided by engineer. */
+"Notes" = "附注";
+
 /* No comment provided by engineer. */
 "Nothing selected" = "未选中任何内容";
 
+/* alert title */
+"Nothing to forward!" = "无可转发！";
+
 /* No comment provided by engineer. */
 "Notifications" = "通知";
 
 /* No comment provided by engineer. */
 "Notifications are disabled!" = "通知被禁用！";
 
+/* alert title */
+"Notifications error" = "通知错误";
+
+/* No comment provided by engineer. */
+"Notifications privacy" = "通知隐私";
+
+/* alert title */
+"Notifications status" = "通知状态";
+
 /* No comment provided by engineer. */
 "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)" = "现在管理员可以：\n- 删除成员的消息。\n- 禁用成员（“观察员”角色）";
 
@@ -3013,8 +3574,9 @@
 "observer" = "观察者";
 
 /* enabled status
-   group pref value
-   time to disappear */
+group pref value
+member criteria value
+time to disappear */
 "off" = "关闭";
 
 /* blur media */
@@ -3026,7 +3588,8 @@
 /* feature offered item */
 "offered %@: %@" = "已提供 %1$@：%2$@";
 
-/* alert button */
+/* alert action
+alert button */
 "Ok" = "好的";
 
 /* No comment provided by engineer. */
@@ -3050,6 +3613,9 @@
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "将不会使用 Onion 主机。";
 
+/* No comment provided by engineer. */
+"Only chat owners can change preferences." = "仅聊天所有人可更改首选项。";
+
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages." = "只有客户端设备存储用户资料、联系人、群组和**双层端到端加密**发送的消息。";
 
@@ -3065,6 +3631,12 @@
 /* No comment provided by engineer. */
 "Only group owners can enable voice messages." = "只有群主可以启用语音信息。";
 
+/* No comment provided by engineer. */
+"Only sender and moderators see it" = "仅发送人和moderators能看到";
+
+/* No comment provided by engineer. */
+"Only you and moderators see it" = "只有你和moderators能看到";
+
 /* No comment provided by engineer. */
 "Only you can add message reactions." = "只有您可以添加消息回应。";
 
@@ -3095,15 +3667,21 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "只有您的联系人可以发送语音消息。";
 
-/* No comment provided by engineer. */
+/* alert action */
 "Open" = "打开";
 
+/* No comment provided by engineer. */
+"Open changes" = "打开更改";
+
 /* No comment provided by engineer. */
 "Open chat" = "打开聊天";
 
 /* authentication reason */
 "Open chat console" = "打开聊天控制台";
 
+/* No comment provided by engineer. */
+"Open conditions" = "打开条款";
+
 /* No comment provided by engineer. */
 "Open group" = "打开群";
 
@@ -3116,6 +3694,15 @@
 /* No comment provided by engineer. */
 "Opening app…" = "正在打开应用程序…";
 
+/* No comment provided by engineer. */
+"Operator" = "运营方";
+
+/* alert title */
+"Operator server" = "运营方服务器";
+
+/* No comment provided by engineer. */
+"Or import archive file" = "或者导入或者导入压缩文件";
+
 /* No comment provided by engineer. */
 "Or paste archive link" = "或粘贴存档链接";
 
@@ -3128,6 +3715,12 @@
 /* No comment provided by engineer. */
 "Or show this code" = "或者显示此码";
 
+/* No comment provided by engineer. */
+"Or to share privately" = "或者私下分享";
+
+/* No comment provided by engineer. */
+"Organize chats into lists" = "将聊天组织到列表";
+
 /* No comment provided by engineer. */
 "other" = "其他";
 
@@ -3158,6 +3751,9 @@
 /* No comment provided by engineer. */
 "Passcode set!" = "密码已设置！";
 
+/* No comment provided by engineer. */
+"Password" = "密码";
+
 /* No comment provided by engineer. */
 "Password to show" = "显示密码";
 
@@ -3269,9 +3865,15 @@
 /* No comment provided by engineer. */
 "Privacy & security" = "隐私和安全";
 
+/* No comment provided by engineer. */
+"Privacy policy and conditions of use." = "隐私政策和使用条款。";
+
 /* No comment provided by engineer. */
 "Privacy redefined" = "重新定义隐私";
 
+/* No comment provided by engineer. */
+"Private chats, groups and your contacts are not accessible to server operators." = "服务器运营方无法访问私密聊天、群组和你的联系人。";
+
 /* No comment provided by engineer. */
 "Private filenames" = "私密文件名";
 
@@ -3480,7 +4082,7 @@
 "Reduced battery usage" = "减少电池使用量";
 
 /* reject incoming call via notification
-   swipe action */
+swipe action */
 "Reject" = "拒绝";
 
 /* No comment provided by engineer. */
@@ -3607,19 +4209,22 @@
 "Reveal" = "揭示";
 
 /* No comment provided by engineer. */
-"Revoke" = "撤销";
-
-/* cancel file action */
-"Revoke file" = "撤销文件";
+"Review conditions" = "审阅条款";
 
 /* No comment provided by engineer. */
-"Revoke file?" = "撤销文件？";
+"Revoke" = "吊销";
+
+/* cancel file action */
+"Revoke file" = "吊销文件";
+
+/* No comment provided by engineer. */
+"Revoke file?" = "吊销文件？";
 
 /* No comment provided by engineer. */
 "Role" = "角色";
 
 /* No comment provided by engineer. */
-"Run chat" = "运行聊天程序";
+"Run chat" = "运行聊天";
 
 /* No comment provided by engineer. */
 "Safely receive files" = "安全接收文件";
@@ -3628,7 +4233,7 @@
 "Safer groups" = "更安全的群组";
 
 /* alert button
-   chat item action */
+chat item action */
 "Save" = "保存";
 
 /* alert button */
@@ -3649,6 +4254,9 @@
 /* No comment provided by engineer. */
 "Save group profile" = "保存群组资料";
 
+/* No comment provided by engineer. */
+"Save list" = "保存列表";
+
 /* No comment provided by engineer. */
 "Save passphrase and open chat" = "保存密码并打开聊天";
 
@@ -3670,6 +4278,9 @@
 /* No comment provided by engineer. */
 "Save welcome message?" = "保存欢迎信息？";
 
+/* alert title */
+"Save your profile?" = "保存您的个人资料？";
+
 /* No comment provided by engineer. */
 "saved" = "已保存";
 
@@ -3688,6 +4299,9 @@
 /* No comment provided by engineer. */
 "Saved WebRTC ICE servers will be removed" = "已保存的WebRTC ICE服务器将被删除";
 
+/* No comment provided by engineer. */
+"Saving %lld messages" = "正在保存 %lld 条消息";
+
 /* No comment provided by engineer. */
 "Scale" = "规模";
 
@@ -3965,7 +4579,7 @@
 "Shape profile images" = "改变个人资料图形状";
 
 /* alert action
-   chat item action */
+chat item action */
 "Share" = "分享";
 
 /* No comment provided by engineer. */
@@ -4028,6 +4642,18 @@
 /* No comment provided by engineer. */
 "SimpleX Address" = "SimpleX 地址";
 
+/* No comment provided by engineer. */
+"SimpleX address and 1-time links are safe to share via any messenger." = "可以通过任何消息应用安全分享 SimpleX 地址和一次性链接。";
+
+/* No comment provided by engineer. */
+"SimpleX address or 1-time link?" = "SimpleX 地址或一次性链接？";
+
+/* simplex link type */
+"SimpleX channel link" = "SimpleX 频道链接";
+
+/* No comment provided by engineer. */
+"SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app." = "SimpleX Chat 与 Flux 达成了协议，将由 Flux 控制的服务器纳入 SimpleX 应用。";
+
 /* No comment provided by engineer. */
 "SimpleX Chat security was audited by Trail of Bits." = "SimpleX Chat 的安全性 由 Trail of Bits 审核。";
 
@@ -4035,10 +4661,10 @@
 "SimpleX contact address" = "SimpleX 联系地址";
 
 /* notification */
-"SimpleX encrypted message or connection event" = "SimpleX 加密消息或连接项目";
+"SimpleX encrypted message or connection event" = "SimpleX 加密的消息或连接事件";
 
 /* simplex link type */
-"SimpleX group link" = "SimpleX 群组链接";
+"SimpleX group link" = "SimpleX 群链接";
 
 /* chat feature */
 "SimpleX links" = "SimpleX 链接";
@@ -4064,6 +4690,9 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "SimpleX 一次性邀请";
 
+/* No comment provided by engineer. */
+"SimpleX protocols reviewed by Trail of Bits." = "SimpleX 协议由 Trail of Bits 审阅。";
+
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "简化的隐身模式";
 
@@ -4085,6 +4714,9 @@
 /* blur media */
 "Soft" = "软";
 
+/* No comment provided by engineer. */
+"Some app settings were not migrated." = "部分应用设置未被迁移。";
+
 /* No comment provided by engineer. */
 "Some file(s) were not exported:" = "某些文件未导出：";
 
@@ -4220,7 +4852,7 @@
 /* No comment provided by engineer. */
 "TCP_KEEPINTVL" = "TCP_KEEPINTVL";
 
-/* No comment provided by engineer. */
+/* file error alert title */
 "Temporary file error" = "临时文件错误";
 
 /* server test failure */
@@ -4292,9 +4924,6 @@
 /* No comment provided by engineer. */
 "The old database was not removed during the migration, it can be deleted." = "旧数据库在迁移过程中没有被移除，可以删除。";
 
-/* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "该资料仅与您的联系人共享。";
-
 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "我们错过的第二个\"√\"！✅";
 
@@ -4508,10 +5137,7 @@
 /* authentication reason */
 "Unlock app" = "解锁应用程序";
 
-/* No comment provided by engineer. */
-"unmute" = "取消静音";
-
-/* swipe action */
+/* notification label action */
 "Unmute" = "取消静音";
 
 /* No comment provided by engineer. */
@@ -5070,10 +5696,10 @@
 "Your profile **%@** will be shared." = "您的个人资料 **%@** 将被共享。";
 
 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "您的资料存储在您的设备上并仅与您的联系人共享。 SimpleX 服务器无法看到您的资料。";
+"Your profile is stored on your device and only shared with your contacts." = "该资料仅与您的联系人共享。";
 
 /* No comment provided by engineer. */
-"Your profile, contacts and delivered messages are stored on your device." = "您的资料、联系人和发送的消息存储在您的设备上。";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "您的资料存储在您的设备上并仅与您的联系人共享。 SimpleX 服务器无法看到您的资料。";
 
 /* No comment provided by engineer. */
 "Your random profile" = "您的随机资料";
@@ -5087,6 +5713,3 @@
 /* No comment provided by engineer. */
 "Your SimpleX address" = "您的 SimpleX 地址";
 
-/* No comment provided by engineer. */
-"Your SMP servers" = "您的 SMP 服务器";
-
diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts
index 250616ea5c..8fc9d104d2 100644
--- a/apps/multiplatform/android/build.gradle.kts
+++ b/apps/multiplatform/android/build.gradle.kts
@@ -85,6 +85,7 @@ android {
         "en",
         "ar",
         "bg",
+        "ca",
         "cs",
         "de",
         "es",
diff --git a/apps/multiplatform/android/src/main/AndroidManifest.xml b/apps/multiplatform/android/src/main/AndroidManifest.xml
index bb6a6f8f8a..0470977bcd 100644
--- a/apps/multiplatform/android/src/main/AndroidManifest.xml
+++ b/apps/multiplatform/android/src/main/AndroidManifest.xml
@@ -77,8 +77,33 @@
         <data android:scheme="http" />
         <data android:scheme="https" />
         <data android:host="simplex.chat" />
+        <data android:host="smp4.simplex.im" />
+        <data android:host="smp5.simplex.im" />
+        <data android:host="smp6.simplex.im" />
+        <data android:host="smp7.simplex.im" /> <!-- TODO remove -->
+        <data android:host="smp8.simplex.im" />
+        <data android:host="smp9.simplex.im" />
+        <data android:host="smp10.simplex.im" />
+        <data android:host="smp11.simplex.im" />
+        <data android:host="smp12.simplex.im" />
+        <data android:host="smp14.simplex.im" />
+        <data android:host="smp15.simplex.im" />
+        <data android:host="smp16.simplex.im" />
+        <data android:host="smp17.simplex.im" />
+        <data android:host="smp18.simplex.im" />
+        <data android:host="smp19.simplex.im" />
+        <data android:host="smp1.simplexonflux.com" />
+        <data android:host="smp2.simplexonflux.com" />
+        <data android:host="smp3.simplexonflux.com" />
+        <data android:host="smp4.simplexonflux.com" />
+        <data android:host="smp5.simplexonflux.com" />
+        <data android:host="smp6.simplexonflux.com" />
         <data android:pathPrefix="/invitation" />
         <data android:pathPrefix="/contact" />
+        <data android:pathPrefix="/a" />
+        <data android:pathPrefix="/c" />
+        <data android:pathPrefix="/g" />
+        <data android:pathPrefix="/i" />
       </intent-filter>
       <!-- Receive files from other apps -->
       <intent-filter>
@@ -179,5 +204,16 @@
         android:name=".SimplexService$AutoRestartReceiver"
         android:enabled="true"
         android:exported="false" />
+
+    <!-- SimplexService restart on app update -->
+    <receiver
+        android:name=".SimplexService$AppUpdateReceiver"
+        android:enabled="true"
+        android:exported="false">
+      <intent-filter>
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+      </intent-filter>
+    </receiver>
+
   </application>
 </manifest>
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
index 2d2829f1f2..bacdfe70af 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
@@ -229,5 +229,5 @@ fun isMediaIntent(intent: Intent): Boolean =
 //  val str: String = """
 //  """.trimIndent()
 //
-//  println(json.decodeFromString<APIResponse>(str))
+//  println(json.decodeFromString<APIResult>(str))
 //}
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
index ee259a98d0..5545595dc6 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
@@ -24,7 +24,6 @@ import chat.simplex.app.views.call.CallActivity
 import chat.simplex.common.helpers.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
@@ -33,7 +32,6 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
 import com.jakewharton.processphoenix.ProcessPhoenix
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.map
 import java.io.*
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -71,6 +69,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
     context = this
     initHaskell(packageName)
     initMultiplatform()
+    reconfigureBroadcastReceivers()
     runMigrations()
     tmpDir.deleteRecursively()
     tmpDir.mkdir()
@@ -93,7 +92,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
         Lifecycle.Event.ON_START -> {
           isAppOnForeground = true
           if (chatModel.chatRunning.value == true) {
-            withChats {
+            withContext(Dispatchers.Main) {
               kotlin.runCatching {
                 val currentUserId = chatModel.currentUser.value?.userId
                 val chats = ArrayList(chatController.apiGetChats(chatModel.remoteHostId()))
@@ -106,7 +105,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
                     /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
                     if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
                   }
-                  updateChats(chats)
+                  chatModel.chatsContext.updateChats(chats)
                 }
               }.onFailure { Log.e(TAG, it.stackTraceToString()) }
             }
@@ -216,6 +215,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
           appPrefs.backgroundServiceNoticeShown.set(false)
         }
         SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
+        SimplexService.AppUpdateReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
         CoroutineScope(Dispatchers.Default).launch {
           if (mode == NotificationsMode.SERVICE) {
             SimplexService.start()
@@ -371,4 +371,10 @@ class SimplexApp: Application(), LifecycleEventObserver {
       override val androidApiLevel: Int get() = Build.VERSION.SDK_INT
     }
   }
+
+  // Make sure that receivers enabled state is in actual state (same as in prefs)
+  private fun reconfigureBroadcastReceivers() {
+    val mode = appPrefs.notificationsMode.get()
+    SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
+    SimplexService.AppUpdateReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)}
 }
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
index 6ca8dd43a0..ad86759ba9 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
@@ -249,6 +249,29 @@ class SimplexService: Service() {
     }
   }
 
+  // restart on app update
+  class AppUpdateReceiver: BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+      // If notification service is enabled and battery optimization is disabled, restart the service on app update
+      if (SimplexApp.context.allowToStartServiceAfterAppExit()) {
+        Log.d(TAG, "AppUpdateReceiver: onReceive called")
+        scheduleStart(context)
+      }
+    }
+
+    companion object {
+      fun toggleReceiver(enable: Boolean) {
+        Log.d(TAG, "AppUpdateReceiver: toggleReceiver enabled: $enable")
+        val component = ComponentName(BuildConfig.APPLICATION_ID, AppUpdateReceiver::class.java.name)
+        SimplexApp.context.packageManager.setComponentEnabledSetting(
+          component,
+          if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+          PackageManager.DONT_KILL_APP
+        )
+      }
+    }
+  }
+
   class ServiceStartWorker(private val context: Context, params: WorkerParameters): CoroutineWorker(context, params) {
     override suspend fun doWork(): Result {
       val id = this.id
@@ -694,6 +717,7 @@ class SimplexService: Service() {
       }
       ChatController.appPrefs.notificationsMode.set(NotificationsMode.OFF)
       StartReceiver.toggleReceiver(false)
+      AppUpdateReceiver.toggleReceiver(false)
       androidAppContext.getWorkManagerInstance().cancelUniqueWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
       MessagesFetcherWorker.cancelAll()
       safeStopService()
diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index 5b7f89f2df..345a75b1e7 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -154,6 +154,7 @@ buildConfig {
     buildConfigField("int", "ANDROID_VERSION_CODE", "${extra["android.version_code"]}")
     buildConfigField("String", "DESKTOP_VERSION_NAME", "\"${extra["desktop.version_name"]}\"")
     buildConfigField("int", "DESKTOP_VERSION_CODE", "${extra["desktop.version_code"]}")
+    buildConfigField("String", "DATABASE_BACKEND", "\"${extra["database.backend"]}\"")
   }
 }
 
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Cryptor.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Cryptor.android.kt
index dc6c53ecbc..d9a5fb59e3 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Cryptor.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Cryptor.android.kt
@@ -30,10 +30,31 @@ internal class Cryptor: CryptorInterface {
       }
       return null
     }
-    val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
-    val spec = GCMParameterSpec(128, iv)
-    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
-    return runCatching { String(cipher.doFinal(data))}.onFailure { Log.e(TAG, "doFinal: ${it.stackTraceToString()}") }.getOrNull()
+
+    try {
+      val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
+      val spec = GCMParameterSpec(128, iv)
+      cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
+      return String(cipher.doFinal(data))
+    } catch (e: Throwable) {
+      Log.e(TAG, "cipher.init: ${e.stackTraceToString()}")
+      val randomPassphrase = appPreferences.initialRandomDBPassphrase.get()
+      AlertManager.shared.showAlertMsg(
+        title = generalGetString(MR.strings.error_reading_passphrase),
+        text = generalGetString(if (randomPassphrase) {
+          MR.strings.restore_passphrase_can_not_be_read_desc
+        } else {
+          MR.strings.restore_passphrase_can_not_be_read_enter_manually_desc
+        }
+        )
+          .plus("\n\n").plus(e.stackTraceToString())
+      )
+      if (randomPassphrase) {
+        // do not allow to override initial random passphrase in case of such error
+        throw e
+      }
+      return null
+    }
   }
 
   override fun encryptText(text: String, alias: String): Pair<ByteArray, ByteArray> {
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Images.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Images.android.kt
index fc323f6ffd..4f47fda130 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Images.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Images.android.kt
@@ -101,13 +101,13 @@ actual fun GrayU8.toImageBitmap(): ImageBitmap = ConvertBitmap.grayToBitmap(this
 
 actual fun ImageBitmap.hasAlpha(): Boolean = hasAlpha
 
-actual fun ImageBitmap.addLogo(): ImageBitmap = asAndroidBitmap().applyCanvas {
-  val radius = (width * 0.16f) / 2
+actual fun ImageBitmap.addLogo(size: Float): ImageBitmap = asAndroidBitmap().applyCanvas {
+  val radius = (width * size) / 2
   val paint = android.graphics.Paint()
   paint.color = android.graphics.Color.WHITE
   drawCircle(width / 2f, height / 2f, radius, paint)
   val logo = androidAppContext.resources.getDrawable(R.drawable.icon_foreground_android_common, null).toBitmap()
-  val logoSize = (width * 0.24).toInt()
+  val logoSize = (width * size * 1.5).toInt()
   translate((width - logoSize) / 2f, (height - logoSize) / 2f)
   drawBitmap(logo, null, android.graphics.Rect(0, 0, logoSize, logoSize), null)
 }.asImageBitmap()
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/PlatformTextField.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/PlatformTextField.android.kt
index 7b820aa67e..4f48ccca52 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/PlatformTextField.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/PlatformTextField.android.kt
@@ -15,10 +15,12 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.LayoutDirection
@@ -40,7 +42,6 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import java.lang.reflect.Field
 import java.net.URI
@@ -49,15 +50,16 @@ import java.net.URI
 actual fun PlatformTextField(
   composeState: MutableState<ComposeState>,
   sendMsgEnabled: Boolean,
+  disabledText: String?,
   sendMsgButtonDisabled: Boolean,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
-  userIsObserver: Boolean,
   placeholder: String,
   showVoiceButton: Boolean,
-  onMessageChange: (String) -> Unit,
+  onMessageChange: (ComposeMessage) -> Unit,
   onUpArrow: () -> Unit,
   onFilesPasted: (List<URI>) -> Unit,
+  focusRequester: FocusRequester?,
   onDone: () -> Unit,
 ) {
   val cs = composeState.value
@@ -117,6 +119,13 @@ actual fun PlatformTextField(
         }
         return InputConnectionCompat.createWrapper(connection, editorInfo, onCommit)
       }
+
+      override fun onSelectionChanged(selStart: Int, selEnd: Int) {
+        val start = minOf(text.length, minOf(selStart, selEnd))
+        val end = minOf(text.length, maxOf(selStart, selEnd))
+        onMessageChange(ComposeMessage(text.toString(), TextRange(start, end)))
+        super.onSelectionChanged(start, end)
+      }
     }
     editText.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
     editText.maxLines = 16
@@ -126,7 +135,8 @@ actual fun PlatformTextField(
     editText.background = ColorDrawable(Color.Transparent.toArgb())
     editText.textDirection = if (isRtl) EditText.TEXT_DIRECTION_LOCALE else EditText.TEXT_DIRECTION_ANY_RTL
     editText.setPaddingRelative(paddingStart, paddingTop, paddingEnd, paddingBottom)
-    editText.setText(cs.message)
+    editText.setText(cs.message.text)
+    editText.setSelection(cs.message.selection.start, cs.message.selection.end)
     editText.hint = placeholder
     editText.setHintTextColor(hintColor.toArgb())
     if (Build.VERSION.SDK_INT >= 29) {
@@ -149,9 +159,10 @@ actual fun PlatformTextField(
     }
     editText.doOnTextChanged { text, _, _, _ ->
       if (!composeState.value.inProgress) {
-        onMessageChange(text.toString())
-      } else if (text.toString() != composeState.value.message) {
-        editText.setText(composeState.value.message)
+        onMessageChange(ComposeMessage(text.toString(), TextRange(minOf(editText.selectionStart, editText.selectionEnd), maxOf(editText.selectionStart, editText.selectionEnd))))
+      } else if (text.toString() != composeState.value.message.text) {
+        editText.setText(composeState.value.message.text)
+        editText.setSelection(composeState.value.message.selection.start, composeState.value.message.selection.end)
       }
     }
     editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
@@ -167,10 +178,9 @@ actual fun PlatformTextField(
     it.textSize = textStyle.value.fontSize.value * appPrefs.fontScale.get()
     it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview
     it.isFocusableInTouchMode = it.isFocusable
-    if (cs.message != it.text.toString()) {
-      it.setText(cs.message)
-      // Set cursor to the end of the text
-      it.setSelection(it.text.length)
+    if (cs.message.text != it.text.toString() || cs.message.selection.start != it.selectionStart || cs.message.selection.end != it.selectionEnd) {
+      it.setText(cs.message.text)
+      it.setSelection(cs.message.selection.start, cs.message.selection.end)
     }
     if (showKeyboard) {
       it.requestFocus()
@@ -186,16 +196,16 @@ actual fun PlatformTextField(
     showDeleteTextButton.value = it.lineCount >= 4 && !cs.inProgress
   }
   if (composeState.value.preview is ComposePreview.VoicePreview) {
-    ComposeOverlay(MR.strings.voice_message_send_text, textStyle, padding)
-  } else if (userIsObserver) {
-    ComposeOverlay(MR.strings.you_are_observer, textStyle, padding)
+    ComposeOverlay(generalGetString(MR.strings.voice_message_send_text), textStyle, padding)
+  } else if (disabledText != null) {
+    ComposeOverlay(disabledText, textStyle, padding)
   }
 }
 
 @Composable
-private fun ComposeOverlay(textId: StringResource, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
+private fun ComposeOverlay(text: String, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
   Text(
-    generalGetString(textId),
+    text,
     Modifier.padding(padding),
     color = MaterialTheme.colors.secondary,
     style = textStyle.value.copy(fontStyle = FontStyle.Italic)
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/ScrollableColumn.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/ScrollableColumn.android.kt
index b3d8e9b52f..0d07de28f8 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/ScrollableColumn.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/ScrollableColumn.android.kt
@@ -95,8 +95,10 @@ actual fun LazyColumnWithScrollBarNoAppBar(
   additionalBarOffset: State<Dp>?,
   additionalTopBar: State<Boolean>,
   chatBottomBar: State<Boolean>,
+  maxHeight: State<Dp>?,
+  containerAlignment: Alignment,
   content: LazyListScope.() -> Unit
-) {
+  ) {
   val state = state ?: rememberLazyListState()
   LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled) {
     content()
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
index a1698ae28a..f6066d1624 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
@@ -14,12 +14,11 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
 import chat.simplex.common.AppScreen
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.clear
 import chat.simplex.common.model.clearAndNotify
 import chat.simplex.common.views.helpers.*
 import androidx.compose.ui.platform.LocalContext as LocalContext1
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 
 actual fun showToast(text: String, timeout: Long) = Toast.makeText(androidAppContext, text, Toast.LENGTH_SHORT).show()
 
@@ -76,13 +75,10 @@ actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
       ModalManager.start.closeModal()
     } else if (chatModel.chatId.value != null) {
       withApi {
-        withChats {
+        withContext(Dispatchers.Main) {
           // Since no modals are open, the problem is probably in ChatView
           chatModel.chatId.value = null
-          chatItems.clearAndNotify()
-        }
-        withChats {
-          chatItems.clearAndNotify()
+          chatModel.chatsContext.chatItems.clearAndNotify()
         }
       }
     } else {
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
index 54e3061d25..a09ca2792b 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
@@ -91,7 +91,7 @@ fun UserPickerUserBox(
       ProfileImageForActiveCall(size = USER_PICKER_IMAGE_SIZE, image = userInfo.user.profile.image, color = MaterialTheme.colors.secondaryVariant)
 
       if (userInfo.unreadCount > 0 && !userInfo.user.activeUser) {
-        unreadBadge(userInfo.unreadCount, userInfo.user.showNtfs, false)
+        userUnreadBadge(userInfo.unreadCount, userInfo.user.showNtfs, false)
       }
     }
     val user = userInfo.user
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
index ba1eda8a7c..d88a450fd1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
@@ -194,7 +194,7 @@ fun MainScreen() {
           OnboardingStage.Step2_5_SetupDatabasePassphrase -> SetupDatabasePassphrase(chatModel)
           OnboardingStage.Step3_ChooseServerOperators -> {
             val modalData = remember { ModalData() }
-            modalData.ChooseServerOperators(true)
+            modalData.OnboardingConditionsView()
             if (appPlatform.isDesktop) {
               ModalManager.fullscreen.showInView()
             }
@@ -339,7 +339,7 @@ fun AndroidScreen(userPickerState: MutableStateFlow<AnimatedViewState>) {
       .graphicsLayer { translationX = maxWidth.toPx() - minOf(offset.value.dp, maxWidth).toPx() }
     ) Box2@{
       currentChatId.value?.let {
-        ChatView(currentChatId, reportsView = false, onComposed = onComposed)
+        ChatView(chatsCtx = chatModel.chatsContext, currentChatId, onComposed = onComposed)
       }
     }
   }
@@ -393,7 +393,7 @@ fun CenterPartOfScreen() {
         ModalManager.center.showInView()
       }
     }
-    else -> ChatView(currentChatId, reportsView = false) {}
+    else -> ChatView(chatsCtx = chatModel.chatsContext, currentChatId) {}
   }
 }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
index 4eb0b350cb..270b3a73b2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.*
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
+import chat.simplex.common.model.MsgFilter.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
@@ -37,6 +38,7 @@ import java.net.URI
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.util.*
+import java.util.concurrent.atomic.AtomicLong
 import kotlin.collections.ArrayList
 import kotlin.random.Random
 import kotlin.time.*
@@ -64,14 +66,16 @@ object ChatModel {
 
   // current chat
   val chatId = mutableStateOf<String?>(null)
+  val openAroundItemId: MutableState<Long?> = mutableStateOf(null)
   val chatsContext = ChatsContext(null)
-  val reportsChatsContext = ChatsContext(MsgContentTag.Report)
+  val secondaryChatsContext = mutableStateOf<ChatsContext?>(null)
   // declaration of chatsContext should be before any other variable that is taken from ChatsContext class and used in the model, otherwise, strange crash with NullPointerException for "this" parameter in random functions
   val chats: State<List<Chat>> = chatsContext.chats
   // rhId, chatId
   val deletedChats = mutableStateOf<List<Pair<Long?, String>>>(emptyList())
   val groupMembers = mutableStateOf<List<GroupMember>>(emptyList())
   val groupMembersIndexes = mutableStateOf<Map<Long, Int>>(emptyMap())
+  val membersLoaded = mutableStateOf(false)
 
   // Chat Tags
   val userTags = mutableStateOf(emptyList<ChatTag>())
@@ -167,36 +171,6 @@ object ChatModel {
   // return true if you handled the click
   var centerPanelBackgroundClickHandler: (() -> Boolean)? = null
 
-  fun chatsForContent(contentTag: MsgContentTag?): State<SnapshotStateList<Chat>> = when(contentTag) {
-    null -> chatsContext.chats
-    MsgContentTag.Report -> reportsChatsContext.chats
-    else -> TODO()
-  }
-
-  fun chatItemsForContent(contentTag: MsgContentTag?): State<SnapshotStateList<ChatItem>> = when(contentTag) {
-    null -> chatsContext.chatItems
-    MsgContentTag.Report -> reportsChatsContext.chatItems
-    else -> TODO()
-  }
-
-  fun chatStateForContent(contentTag: MsgContentTag?): ActiveChatState = when(contentTag) {
-    null -> chatsContext.chatState
-    MsgContentTag.Report -> reportsChatsContext.chatState
-    else -> TODO()
-  }
-
-  fun chatItemsChangesListenerForContent(contentTag: MsgContentTag?): ChatItemsChangesListener? = when(contentTag) {
-    null -> chatsContext.chatItemsChangesListener
-    MsgContentTag.Report -> reportsChatsContext.chatItemsChangesListener
-    else -> TODO()
-  }
-
-  fun setChatItemsChangeListenerForContent(listener: ChatItemsChangesListener?, contentTag: MsgContentTag?) = when(contentTag) {
-    null -> chatsContext.chatItemsChangesListener = listener
-    MsgContentTag.Report -> reportsChatsContext.chatItemsChangesListener = listener
-    else -> TODO()
-  }
-
   fun getUser(userId: Long): User? = if (currentUser.value?.userId == userId) {
     currentUser.value
   } else {
@@ -245,15 +219,12 @@ object ChatModel {
       }
     }
 
-    if (activeChatTagFilter.value is ActiveFilter.PresetTag &&
-      (newPresetTags[(activeChatTagFilter.value as ActiveFilter.PresetTag).tag] ?: 0) == 0) {
-      activeChatTagFilter.value = null
-    }
-
     presetTags.clear()
     presetTags.putAll(newPresetTags)
     unreadTags.clear()
     unreadTags.putAll(newUnreadTags)
+
+    clearActiveChatFilterIfNeeded()
   }
 
   fun updateChatFavorite(favorite: Boolean, wasFavorite: Boolean) {
@@ -263,9 +234,7 @@ object ChatModel {
       presetTags[PresetTagKind.FAVORITES] = (count ?: 0) + 1
     } else if (!favorite && wasFavorite && count != null) {
       presetTags[PresetTagKind.FAVORITES] = maxOf(0, count - 1)
-      if (activeChatTagFilter.value == ActiveFilter.PresetTag(PresetTagKind.FAVORITES) && (presetTags[PresetTagKind.FAVORITES] ?: 0) == 0) {
-        activeChatTagFilter.value = null
-      }
+      clearActiveChatFilterIfNeeded()
     }
   }
 
@@ -286,6 +255,7 @@ object ChatModel {
         }
       }
     }
+    clearActiveChatFilterIfNeeded()
   }
 
   fun moveChatTagUnread(chat: Chat, oldTags: List<Long>?, newTags: List<Long>) {
@@ -325,37 +295,40 @@ object ChatModel {
     }
   }
 
-  // running everything inside the block on main thread. Make sure any heavy computation is moved to a background thread
-  suspend fun <T> withChats(contentTag: MsgContentTag? = null, action: suspend ChatsContext.() -> T): T = withContext(Dispatchers.Main) {
-    when {
-      contentTag == null -> chatsContext.action()
-      contentTag == MsgContentTag.Report -> reportsChatsContext.action()
-      else -> TODO()
-    }
-  }
-
-  suspend fun <T> withReportsChatsIfOpen(action: suspend ChatsContext.() -> T) = withContext(Dispatchers.Main) {
-    if (ModalManager.end.hasModalOpen(ModalViewId.GROUP_REPORTS)) {
-      reportsChatsContext.action()
-    }
-  }
-
-  class ChatsContext(private val contentTag: MsgContentTag?) {
+  class ChatsContext(val secondaryContextFilter: SecondaryContextFilter?) {
     val chats = mutableStateOf(SnapshotStateList<Chat>())
-    /** if you modify the items by adding/removing them, use helpers methods like [addAndNotify], [removeLastAndNotify], [removeAllAndNotify], [clearAndNotify] and so on.
+    /** if you modify the items by adding/removing them, use helpers methods like [addToChatItems], [removeLastChatItems], [removeAllAndNotify], [clearAndNotify] and so on.
      * If some helper is missing, create it. Notify is needed to track state of items that we added manually (not via api call). See [apiLoadMessages].
-     * If you use api call to get the items, use just [add] instead of [addAndNotify].
+     * If you use api call to get the items, use just [add] instead of [addToChatItems].
      * Never modify underlying list directly because it produces unexpected results in ChatView's LazyColumn (setting by index is ok) */
     val chatItems = mutableStateOf(SnapshotStateList<ChatItem>())
-    val chatItemStatuses = mutableMapOf<Long, CIStatus>()
     // set listener here that will be notified on every add/delete of a chat item
-    var chatItemsChangesListener: ChatItemsChangesListener? = null
     val chatState = ActiveChatState()
 
     fun hasChat(rhId: Long?, id: String): Boolean = chats.value.firstOrNull { it.id == id && it.remoteHostId == rhId } != null
     fun getChat(id: String): Chat? = chats.value.firstOrNull { it.id == id }
     private fun getChatIndex(rhId: Long?, id: String): Int = chats.value.indexOfFirst { it.id == id && it.remoteHostId == rhId }
 
+    val contentTag: MsgContentTag? =
+      when (secondaryContextFilter) {
+        null -> null
+        is SecondaryContextFilter.GroupChatScopeContext -> null
+        is SecondaryContextFilter.MsgContentTagContext -> secondaryContextFilter.contentTag
+      }
+
+    val groupScopeInfo: GroupChatScopeInfo? =
+      when (secondaryContextFilter) {
+        null -> null
+        is SecondaryContextFilter.GroupChatScopeContext -> secondaryContextFilter.groupScopeInfo
+        is SecondaryContextFilter.MsgContentTagContext -> null
+      }
+
+    val isUserSupportChat: Boolean =
+      when (groupScopeInfo) {
+        null -> false
+        is GroupChatScopeInfo.MemberSupport -> groupScopeInfo.groupMember_ == null
+      }
+
     suspend fun addChat(chat: Chat) {
       chats.add(index = 0, chat)
       popChatCollector.throttlePopChat(chat.remoteHostId, chat.id, currentPosition = 0)
@@ -388,6 +361,8 @@ object ChatModel {
               )
             )
           }
+        } else if (currentCInfo is ChatInfo.Group && newCInfo is ChatInfo.Group && newCInfo.groupChatScope != null) {
+          newCInfo = newCInfo.copy(groupInfo = newCInfo.groupInfo, groupChatScope = null)
         }
         chats[i] = chats[i].copy(chatInfo = newCInfo)
       }
@@ -410,7 +385,7 @@ object ChatModel {
       updateContact(rhId, updatedContact)
     }
 
-    suspend fun updateGroup(rhId: Long?, groupInfo: GroupInfo) = updateChat(rhId, ChatInfo.Group(groupInfo))
+    suspend fun updateGroup(rhId: Long?, groupInfo: GroupInfo) = updateChat(rhId, ChatInfo.Group(groupInfo, groupChatScope = null))
 
     private suspend fun updateChat(rhId: Long?, cInfo: ChatInfo, addMissing: Boolean = true) {
       if (hasChat(rhId, cInfo.id)) {
@@ -441,145 +416,191 @@ object ChatModel {
         addChat(chat)
       }
     }
+
+    fun addToChatItems(index: Int, elem: ChatItem) {
+      chatItems.value = SnapshotStateList<ChatItem>().apply { addAll(chatItems.value); add(index, elem); chatState.itemAdded(elem.id to elem.isRcvNew) }
+    }
+
+    fun addToChatItems(elem: ChatItem) {
+      chatItems.value = SnapshotStateList<ChatItem>().apply { addAll(chatItems.value); add(elem); chatState.itemAdded(elem.id to elem.isRcvNew) }
+    }
+
+    fun removeLastChatItems() {
+      val removed: Triple<Long, Int, Boolean>
+      chatItems.value = SnapshotStateList<ChatItem>().apply {
+        addAll(chatItems.value)
+        val remIndex = lastIndex
+        val rem = removeLast()
+        removed = Triple(rem.id, remIndex, rem.isRcvNew)
+      }
+      chatState.itemsRemoved(listOf(removed), chatItems.value)
+    }
+
     suspend fun addChatItem(rhId: Long?, cInfo: ChatInfo, cItem: ChatItem) {
+      // updates membersRequireAttention
+      updateChatInfo(rhId, cInfo)
       // mark chat non deleted
       if (cInfo is ChatInfo.Direct && cInfo.chatDeleted) {
         val updatedContact = cInfo.contact.copy(chatDeleted = false)
         updateContact(rhId, updatedContact)
       }
-      // update previews
+      // update chat list
       val i = getChatIndex(rhId, cInfo.id)
       val chat: Chat
       if (i >= 0) {
-        chat = chats[i]
-        val newPreviewItem = when (cInfo) {
-          is ChatInfo.Group -> {
-            val currentPreviewItem = chat.chatItems.firstOrNull()
-            if (currentPreviewItem != null) {
-              if (cItem.meta.itemTs >= currentPreviewItem.meta.itemTs) {
-                cItem
+        chat = chatsContext.chats[i]
+        // update preview (for chat from main scope to show new items for invitee in pending status)
+        if (cInfo.groupChatScope() == null || cInfo.groupInfo_?.membership?.memberPending == true) {
+          val newPreviewItem = when (cInfo) {
+            is ChatInfo.Group -> {
+              val currentPreviewItem = chat.chatItems.firstOrNull()
+              if (currentPreviewItem != null) {
+                if (cItem.meta.itemTs >= currentPreviewItem.meta.itemTs) {
+                  cItem
+                } else {
+                  currentPreviewItem
+                }
               } else {
-                currentPreviewItem
+                cItem
               }
-            } else {
-              cItem
             }
-          }
-          else -> cItem
-        }
-        val wasUnread = chat.unreadTag
-        chats[i] = chat.copy(
-          chatItems = arrayListOf(newPreviewItem),
-          chatStats =
-          if (cItem.meta.itemStatus is CIStatus.RcvNew) {
-            increaseUnreadCounter(rhId, currentUser.value!!)
-            chat.chatStats.copy(unreadCount = chat.chatStats.unreadCount + 1)
-          }
-          else
-            chat.chatStats
-        )
-        updateChatTagReadNoContentTag(chats[i], wasUnread)
 
+            else -> cItem
+          }
+          val wasUnread = chat.unreadTag
+          chatsContext.chats[i] = chat.copy(
+            chatItems = arrayListOf(newPreviewItem),
+            chatStats =
+            if (cItem.meta.itemStatus is CIStatus.RcvNew) {
+              increaseUnreadCounter(rhId, currentUser.value!!)
+              chat.chatStats.copy(unreadCount = chat.chatStats.unreadCount + 1, unreadMentions = if (cItem.meta.userMention) chat.chatStats.unreadMentions + 1 else chat.chatStats.unreadMentions)
+            } else
+              chat.chatStats
+          )
+          updateChatTagReadInPrimaryContext(chatsContext.chats[i], wasUnread)
+        }
+        // pop chat
         if (appPlatform.isDesktop && cItem.chatDir.sent) {
-          reorderChat(chats[i], 0)
+          reorderChat(chatsContext.chats[i], 0)
         } else {
           popChatCollector.throttlePopChat(chat.remoteHostId, chat.id, currentPosition = i)
         }
       } else {
-        addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
+        if (cInfo.groupChatScope() == null) {
+          addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
+        } else {
+          addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = emptyList()))
+        }
       }
+      // add to current scope
       withContext(Dispatchers.Main) {
-        // add to current chat
-        if (chatId.value == cInfo.id) {
+        if (chatItemBelongsToScope(cInfo, cItem)) {
           // Prevent situation when chat item already in the list received from backend
           if (chatItems.value.none { it.id == cItem.id }) {
             if (chatItems.value.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
-              chatItems.addAndNotify(kotlin.math.max(0, chatItems.value.lastIndex), cItem, contentTag)
+              addToChatItems(kotlin.math.max(0, chatItems.value.lastIndex), cItem)
             } else {
-              chatItems.addAndNotify(cItem, contentTag)
+              addToChatItems(cItem)
             }
           }
         }
       }
     }
-
-    suspend fun upsertChatItem(rhId: Long?, cInfo: ChatInfo, cItem: ChatItem): Boolean {
-      // update previews
-      val i = getChatIndex(rhId, cInfo.id)
-      val chat: Chat
-      val res: Boolean
-      if (i >= 0) {
-        chat = chats[i]
-        val pItem = chat.chatItems.lastOrNull()
-        if (pItem?.id == cItem.id) {
-          chats[i] = chat.copy(chatItems = arrayListOf(cItem))
-          if (pItem.isRcvNew && !cItem.isRcvNew) {
-            // status changed from New to Read, update counter
-            decreaseCounterInChatNoContentTag(rhId, cInfo.id)
+    
+    private fun chatItemBelongsToScope(cInfo: ChatInfo, cItem: ChatItem): Boolean =
+      when (secondaryContextFilter) {
+        null ->
+          chatId.value == cInfo.id && cInfo.groupChatScope() == null
+        is SecondaryContextFilter.GroupChatScopeContext -> {
+          val cInfoScope = cInfo.groupChatScope()
+          if (cInfoScope != null) {
+            chatId.value == cInfo.id && sameChatScope(cInfoScope, secondaryContextFilter.groupScopeInfo.toChatScope())
+          } else {
+            false
           }
         }
-        res = false
-      } else {
-        addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
-        res = true
+        is SecondaryContextFilter.MsgContentTagContext ->
+          chatId.value == cInfo.id && cItem.isReport
       }
-      return withContext(Dispatchers.Main) {
-        // update current chat
-        if (chatId.value == cInfo.id) {
+
+    suspend fun upsertChatItem(rhId: Long?, cInfo: ChatInfo, cItem: ChatItem): Boolean {
+      var itemAdded = false
+      // update chat list
+      if (cInfo.groupChatScope() == null) {
+        val i = getChatIndex(rhId, cInfo.id)
+        val chat: Chat
+        if (i >= 0) {
+          chat = chats[i]
+          val pItem = chat.chatItems.lastOrNull()
+          if (pItem?.id == cItem.id) {
+            chats[i] = chat.copy(chatItems = arrayListOf(cItem))
+            if (pItem.isRcvNew && !cItem.isRcvNew) {
+              // status changed from New to Read, update counter
+              decreaseCounterInPrimaryContext(rhId, cInfo.id)
+            }
+          }
+        } else {
+          addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
+          itemAdded = true
+        }
+      }
+      // update current scope
+      withContext(Dispatchers.Main) {
+        if (chatItemBelongsToScope(cInfo, cItem)) {
           if (cItem.isDeletedContent || cItem.meta.itemDeleted != null) {
             AudioPlayer.stop(cItem)
           }
           val items = chatItems.value
           val itemIndex = items.indexOfFirst { it.id == cItem.id }
           if (itemIndex >= 0) {
-            items[itemIndex] = cItem
-            false
-          } else {
-            val status = chatItemStatuses.remove(cItem.id)
-            val ci = if (status != null && cItem.meta.itemStatus is CIStatus.SndNew) {
-              cItem.copy(meta = cItem.meta.copy(itemStatus = status))
+            val oldStatus = items[itemIndex].meta.itemStatus
+            val newStatus = cItem.meta.itemStatus
+            val ci = if (shouldKeepOldSndCIStatus(oldStatus, newStatus)) {
+              cItem.copy(meta = cItem.meta.copy(itemStatus = oldStatus))
             } else {
               cItem
             }
-            chatItems.addAndNotify(ci, contentTag)
-            true
+            items[itemIndex] = ci
+          } else {
+            addToChatItems(cItem)
+            itemAdded = true
           }
-        } else {
-          res
         }
       }
+      return  itemAdded
     }
 
-    suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem, status: CIStatus? = null) {
+    suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem, status: CIStatus? = null, atIndex: Int? = null) {
       withContext(Dispatchers.Main) {
-        if (chatId.value == cInfo.id) {
+        if (chatItemBelongsToScope(cInfo, cItem)) {
           val items = chatItems.value
-          val itemIndex = items.indexOfFirst { it.id == cItem.id }
+          val itemIndex = atIndex ?: items.indexOfFirst { it.id == cItem.id }
           if (itemIndex >= 0) {
             items[itemIndex] = cItem
           }
-        } else if (status != null) {
-          chatItemStatuses[cItem.id] = status
         }
       }
     }
 
     fun removeChatItem(rhId: Long?, cInfo: ChatInfo, cItem: ChatItem) {
-      if (cItem.isRcvNew) {
-        decreaseCounterInChatNoContentTag(rhId, cInfo.id)
-      }
-      // update previews
-      val i = getChatIndex(rhId, cInfo.id)
-      val chat: Chat
-      if (i >= 0) {
-        chat = chats[i]
-        val pItem = chat.chatItems.lastOrNull()
-        if (pItem?.id == cItem.id) {
-          chats[i] = chat.copy(chatItems = arrayListOf(ChatItem.deletedItemDummy))
+      // update chat list
+      if (cInfo.groupChatScope() == null) {
+        if (cItem.isRcvNew) {
+          decreaseCounterInPrimaryContext(rhId, cInfo.id)
+        }
+        // update preview
+        val i = getChatIndex(rhId, cInfo.id)
+        val chat: Chat
+        if (i >= 0) {
+          chat = chats[i]
+          val pItem = chat.chatItems.lastOrNull()
+          if (pItem?.id == cItem.id) {
+            chats[i] = chat.copy(chatItems = arrayListOf(ChatItem.deletedItemDummy))
+          }
         }
       }
-      // remove from current chat
-      if (chatId.value == cInfo.id) {
+      // remove from current scope
+      if (chatItemBelongsToScope(cInfo, cItem)) {
         chatItems.removeAllAndNotify {
           // We delete taking into account meta.createdAt to make sure we will not be in situation when two items with the same id will be deleted
           // (it can happen if already deleted chat item in backend still in the list and new one came with the same (re-used) chat item id)
@@ -590,24 +611,67 @@ object ChatModel {
       }
     }
 
+    suspend fun removeMemberItems(rhId: Long?, removedMember: GroupMember, byMember: GroupMember, groupInfo: GroupInfo) {
+      fun removedUpdatedItem(item: ChatItem): ChatItem? {
+        val newContent = when {
+          item.chatDir is CIDirection.GroupSnd && removedMember.groupMemberId == groupInfo.membership.groupMemberId -> CIContent.SndModerated
+          item.chatDir is CIDirection.GroupRcv && item.chatDir.groupMember.groupMemberId == removedMember.groupMemberId -> CIContent.RcvModerated
+          else -> return null
+        }
+        val updatedItem = item.copy(
+          meta = item.meta.copy(itemDeleted = CIDeleted.Moderated(Clock.System.now(), byGroupMember = byMember)),
+          content = if (groupInfo.fullGroupPreferences.fullDelete.on) newContent else item.content
+        )
+        if (item.isActiveReport) {
+          decreaseGroupReportsCounter(rhId, groupInfo.id)
+        }
+        return updatedItem
+      }
+
+      // this should not happen, only another member can "remove" user, user can only "leave" (another event).
+      if (byMember.groupMemberId == groupInfo.membership.groupMemberId) {
+        Log.d(TAG, "exiting removeMemberItems")
+        return
+      }
+      val cInfo = ChatInfo.Group(groupInfo, groupChatScope = null) // TODO [knocking] review
+      if (chatId.value == groupInfo.id) {
+        for (i in 0 until chatItems.value.size) {
+          val updatedItem = removedUpdatedItem(chatItems.value[i])
+          if (updatedItem != null) {
+            updateChatItem(cInfo, updatedItem, atIndex = i)
+          }
+        }
+      } else {
+        val i = getChatIndex(rhId, groupInfo.id)
+        val chat = chats[i]
+        if (chat.chatItems.isNotEmpty()) {
+          val updatedItem = removedUpdatedItem(chat.chatItems[0])
+          if (updatedItem != null) {
+            chats.value[i] = chat.copy(chatItems = listOf(updatedItem))
+          }
+        }
+      }
+    }
+
     fun clearChat(rhId: Long?, cInfo: ChatInfo) {
       // clear preview
       val i = getChatIndex(rhId, cInfo.id)
       if (i >= 0) {
         decreaseUnreadCounter(rhId, currentUser.value!!, chats[i].chatStats.unreadCount)
+        val chatBefore = chats[i]
         chats[i] = chats[i].copy(chatItems = arrayListOf(), chatStats = Chat.ChatStats(), chatInfo = cInfo)
-        markChatTagRead(chats[i])
+        markChatTagRead(chatBefore)
       }
       // clear current chat
       if (chatId.value == cInfo.id) {
-        chatItemStatuses.clear()
         chatItems.clearAndNotify()
       }
     }
 
-    val popChatCollector = PopChatCollector(contentTag)
+    val popChatCollector = PopChatCollector(this)
 
-    class PopChatCollector(contentTag: MsgContentTag?) {
+    // TODO [contexts] no reason for this to be nested?
+    class PopChatCollector(chatsCtx: ChatsContext) {
       private val subject = MutableSharedFlow<Unit>()
       private var remoteHostId: Long? = null
       private val chatsToPop = mutableMapOf<ChatId, Instant>()
@@ -617,8 +681,8 @@ object ChatModel {
           subject
             .throttleLatest(2000)
             .collect {
-              withChats(contentTag) {
-                chats.replaceAll(popCollectedChats())
+              withContext(Dispatchers.Main) {
+                chatsCtx.chats.replaceAll(popCollectedChats())
               }
             }
         }
@@ -656,7 +720,7 @@ object ChatModel {
     }
 
     fun markChatItemsRead(remoteHostId: Long?, id: ChatId, itemIds: List<Long>? = null) {
-      val markedRead = markItemsReadInCurrentChat(id, itemIds)
+      val (markedRead, mentionsMarkedRead) = markItemsReadInCurrentChat(id, itemIds)
       // update preview
       val chatIdx = getChatIndex(remoteHostId, id)
       if (chatIdx >= 0) {
@@ -665,17 +729,19 @@ object ChatModel {
         if (lastId != null) {
           val wasUnread = chat.unreadTag
           val unreadCount = if (itemIds != null) chat.chatStats.unreadCount - markedRead else 0
+          val unreadMentions = if (itemIds != null) chat.chatStats.unreadMentions - mentionsMarkedRead else 0
           decreaseUnreadCounter(remoteHostId, currentUser.value!!, chat.chatStats.unreadCount - unreadCount)
           chats[chatIdx] = chat.copy(
-            chatStats = chat.chatStats.copy(unreadCount = unreadCount)
+            chatStats = chat.chatStats.copy(unreadCount = unreadCount, unreadMentions = unreadMentions)
           )
-          updateChatTagReadNoContentTag(chats[chatIdx], wasUnread)
+          updateChatTagReadInPrimaryContext(chats[chatIdx], wasUnread)
         }
       }
     }
 
-    private fun markItemsReadInCurrentChat(id: ChatId, itemIds: List<Long>? = null): Int {
+    private fun markItemsReadInCurrentChat(id: ChatId, itemIds: List<Long>? = null): Pair<Int, Int> {
       var markedRead = 0
+      var mentionsMarkedRead = 0
       if (chatId.value == id) {
         val items = chatItems.value
         var i = items.lastIndex
@@ -693,6 +759,9 @@ object ChatModel {
             }
             markedReadIds.add(item.id)
             markedRead++
+            if (item.meta.userMention) {
+              mentionsMarkedRead++
+            }
             if (itemIds != null) {
               itemIdsFromRange.remove(item.id)
               // already set all needed items as read, can finish the loop
@@ -701,14 +770,14 @@ object ChatModel {
           }
           i--
         }
-        chatItemsChangesListener?.read(if (itemIds != null) markedReadIds else null, items)
+        chatState.itemsRead(if (itemIds != null) markedReadIds else null, items)
       }
-      return markedRead
+      return markedRead to mentionsMarkedRead
     }
 
-    private fun decreaseCounterInChatNoContentTag(rhId: Long?, chatId: ChatId) {
+    private fun decreaseCounterInPrimaryContext(rhId: Long?, chatId: ChatId) {
       // updates anything only in main ChatView, not GroupReportsView or anything else from the future
-      if (contentTag != null) return
+      if (secondaryContextFilter != null) return
 
       val chatIndex = getChatIndex(rhId, chatId)
       if (chatIndex == -1) return
@@ -722,7 +791,7 @@ object ChatModel {
           unreadCount = unreadCount,
         )
       )
-      updateChatTagReadNoContentTag(chats[chatIndex], wasUnread)
+      updateChatTagReadInPrimaryContext(chats[chatIndex], wasUnread)
     }
 
     fun removeChat(rhId: Long?, id: String) {
@@ -742,6 +811,11 @@ object ChatModel {
       }
       // update current chat
       return if (chatId.value == groupInfo.id) {
+        if (groupMembers.value.isNotEmpty() && groupMembers.value.firstOrNull()?.groupId != groupInfo.groupId) {
+          // stale data, should be cleared at that point, otherwise, duplicated items will be here which will produce crashes in LazyColumn
+          groupMembers.value = emptyList()
+          groupMembersIndexes.value = emptyMap()
+        }
         val memberIndex = groupMembersIndexes.value[member.groupMemberId]
         val updated = chatItems.value.map {
           // Take into account only specific changes, not all. Other member updates are not important and can be skipped
@@ -786,16 +860,16 @@ object ChatModel {
     }
 
     fun increaseUnreadCounter(rhId: Long?, user: UserLike) {
-      changeUnreadCounterNoContentTag(rhId, user, 1)
+      changeUnreadCounterInPrimaryContext(rhId, user, 1)
     }
 
     fun decreaseUnreadCounter(rhId: Long?, user: UserLike, by: Int = 1) {
-      changeUnreadCounterNoContentTag(rhId, user, -by)
+      changeUnreadCounterInPrimaryContext(rhId, user, -by)
     }
 
-    private fun changeUnreadCounterNoContentTag(rhId: Long?, user: UserLike, by: Int) {
+    private fun changeUnreadCounterInPrimaryContext(rhId: Long?, user: UserLike, by: Int) {
       // updates anything only in main ChatView, not GroupReportsView or anything else from the future
-      if (contentTag != null) return
+      if (secondaryContextFilter != null) return
 
       val i = users.indexOfFirst { it.user.userId == user.userId && it.user.remoteHostId == rhId }
       if (i != -1) {
@@ -803,9 +877,9 @@ object ChatModel {
       }
     }
 
-    fun updateChatTagReadNoContentTag(chat: Chat, wasUnread: Boolean) {
+    fun updateChatTagReadInPrimaryContext(chat: Chat, wasUnread: Boolean) {
       // updates anything only in main ChatView, not GroupReportsView or anything else from the future
-      if (contentTag != null) return
+      if (secondaryContextFilter != null) return
 
       val tags = chat.chatInfo.chatTags ?: return
       val nowUnread = chat.unreadTag
@@ -815,21 +889,21 @@ object ChatModel {
           unreadTags[tag] = (unreadTags[tag] ?: 0) + 1
         }
       } else if (!nowUnread && wasUnread) {
-        markChatTagReadNoContentTag_(chat, tags)
+        markChatTagReadInPrimaryContext_(chat, tags)
       }
     }
 
     fun markChatTagRead(chat: Chat) {
       if (chat.unreadTag) {
         chat.chatInfo.chatTags?.let { tags ->
-          markChatTagReadNoContentTag_(chat, tags)
+          markChatTagReadInPrimaryContext_(chat, tags)
         }
       }
     }
 
-    private fun markChatTagReadNoContentTag_(chat: Chat, tags: List<Long>) {
+    private fun markChatTagReadInPrimaryContext_(chat: Chat, tags: List<Long>) {
       // updates anything only in main ChatView, not GroupReportsView or anything else from the future
-      if (contentTag != null) return
+      if (secondaryContextFilter != null) return
 
       for (tag in tags) {
         val count = unreadTags[tag]
@@ -843,8 +917,8 @@ object ChatModel {
       changeGroupReportsCounter(rhId, chatId, 1)
     }
 
-    fun decreaseGroupReportsCounter(rhId: Long?, chatId: ChatId) {
-      changeGroupReportsCounter(rhId, chatId, -1)
+    fun decreaseGroupReportsCounter(rhId: Long?, chatId: ChatId, by: Int = 1) {
+      changeGroupReportsCounter(rhId, chatId, -by)
     }
 
     private fun changeGroupReportsCounter(rhId: Long?, chatId: ChatId, by: Int = 0) {
@@ -861,16 +935,26 @@ object ChatModel {
         val wasReportsCount = chat.chatStats.reportsCount
         val nowReportsCount = chats[i].chatStats.reportsCount
         val by = if (wasReportsCount == 0 && nowReportsCount > 0) 1 else if (wasReportsCount > 0 && nowReportsCount == 0) -1 else 0
-        changeGroupReportsTagNoContentTag(by)
+        changeGroupReportsTagInPrimaryContext(by)
       }
     }
 
-    private fun changeGroupReportsTagNoContentTag(by: Int = 0) {
-      if (by == 0 || contentTag != null) return
-      presetTags[PresetTagKind.GROUP_REPORTS] = (presetTags[PresetTagKind.GROUP_REPORTS] ?: 0) + by
+    private fun changeGroupReportsTagInPrimaryContext(by: Int = 0) {
+      if (by == 0 || secondaryContextFilter != null) return
+      presetTags[PresetTagKind.GROUP_REPORTS] = kotlin.math.max(0, (presetTags[PresetTagKind.GROUP_REPORTS] ?: 0) + by)
+      clearActiveChatFilterIfNeeded()
     }
   }
 
+  fun clearActiveChatFilterIfNeeded() {
+    val clear = when(val f = activeChatTagFilter.value) {
+      is ActiveFilter.PresetTag -> (presetTags[f.tag] ?: 0) == 0
+      is ActiveFilter.UserTag -> userTags.value.none { it.chatTagId == f.tag.chatTagId }
+      is ActiveFilter.Unread, null -> false
+    }
+    if (clear) activeChatTagFilter.value = null
+  }
+
   fun updateCurrentUser(rhId: Long?, newProfile: Profile, preferences: FullChatPreferences? = null) {
     val current = currentUser.value ?: return
     val updated = current.copy(
@@ -898,17 +982,17 @@ object ChatModel {
 
   suspend fun addLiveDummy(chatInfo: ChatInfo): ChatItem {
     val cItem = ChatItem.liveDummy(chatInfo is ChatInfo.Direct)
-    withChats {
-      chatItems.addAndNotify(cItem, contentTag = null)
+    withContext(Dispatchers.Main) {
+      chatsContext.addToChatItems(cItem)
     }
     return cItem
   }
 
   fun removeLiveDummy() {
-    if (chatItemsForContent(null).value.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+    if (chatsContext.chatItems.value.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
       withApi {
-        withChats {
-          chatItems.removeLastAndNotify(contentTag = null)
+        withContext(Dispatchers.Main) {
+          chatsContext.removeLastChatItems()
         }
       }
     }
@@ -980,9 +1064,9 @@ object ChatModel {
   fun replaceConnReqView(id: String, withId: String) {
     if (id == showingInvitation.value?.connId) {
       withApi {
-        withChats {
+        withContext(Dispatchers.Main) {
           showingInvitation.value = null
-          chatItems.clearAndNotify()
+          chatsContext.chatItems.clearAndNotify()
           chatModel.chatId.value = withId
         }
       }
@@ -993,9 +1077,9 @@ object ChatModel {
 
   fun dismissConnReqView(id: String) = withApi {
     if (id == showingInvitation.value?.connId) {
-      withChats {
+      withContext(Dispatchers.Main) {
         showingInvitation.value = null
-        chatItems.clearAndNotify()
+        chatsContext.chatItems.clearAndNotify()
         chatModel.chatId.value = null
       }
       // Close NewChatView
@@ -1046,18 +1130,9 @@ object ChatModel {
   fun connectedToRemote(): Boolean = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
 }
 
-interface ChatItemsChangesListener {
-  // pass null itemIds if the whole chat now read
-  fun read(itemIds: Set<Long>?, newItems: List<ChatItem>)
-  fun added(item: Pair<Long, Boolean>, index: Int)
-  // itemId, index in old chatModel.chatItems (before the update), isRcvNew (is item unread or not)
-  fun removed(itemIds: List<Triple<Long, Int, Boolean>>, newItems: List<ChatItem>)
-  fun cleared()
-}
-
 data class ShowingInvitation(
   val connId: String,
-  val connReq: String,
+  val connLink: CreatedConnLink,
   val connChatUsed: Boolean,
   val conn: PendingContactConnection
 )
@@ -1070,6 +1145,28 @@ enum class ChatType(val type: String) {
   ContactConnection(":");
 }
 
+sealed class GroupChatScope {
+  class MemberSupport(val groupMemberId_: Long?): GroupChatScope()
+}
+
+fun sameChatScope(scope1: GroupChatScope, scope2: GroupChatScope) =
+  scope1 is GroupChatScope.MemberSupport
+      && scope2 is GroupChatScope.MemberSupport
+      && scope1.groupMemberId_ == scope2.groupMemberId_
+
+@Serializable
+sealed class GroupChatScopeInfo {
+  @Serializable @SerialName("memberSupport") data class MemberSupport(val groupMember_: GroupMember?) : GroupChatScopeInfo()
+
+  fun toChatScope(): GroupChatScope =
+    when (this) {
+      is MemberSupport -> when (groupMember_) {
+        null -> GroupChatScope.MemberSupport(groupMemberId_ = null)
+        else -> GroupChatScope.MemberSupport(groupMemberId_ = groupMember_.groupMemberId)
+      }
+    }
+}
+
 @Serializable
 data class User(
   val remoteHostId: Long?,
@@ -1175,8 +1272,6 @@ interface SomeChat {
   val apiId: Long
   val ready: Boolean
   val chatDeleted: Boolean
-  val sendMsgEnabled: Boolean
-  val ntfsEnabled: Boolean
   val incognito: Boolean
   fun featureEnabled(feature: ChatFeature): Boolean
   val timedMessagesTTL: Int?
@@ -1200,32 +1295,27 @@ data class Chat(
       else -> false
     }
 
-  val userIsObserver: Boolean get() = when(chatInfo) {
-    is ChatInfo.Group -> {
-      val m = chatInfo.groupInfo.membership
-      m.memberActive && m.memberRole == GroupMemberRole.Observer
-    }
-    else -> false
+  val unreadTag: Boolean get() = when (chatInfo.chatSettings?.enableNtfs) {
+    All -> chatStats.unreadChat || chatStats.unreadCount > 0
+    Mentions -> chatStats.unreadChat || chatStats.unreadMentions > 0
+    else -> chatStats.unreadChat
   }
 
-  val unreadTag: Boolean get() = chatInfo.ntfsEnabled && (chatStats.unreadCount > 0 || chatStats.unreadChat)
-
   val id: String get() = chatInfo.id
 
+  val supportUnreadCount: Int get() = when (chatInfo) {
+    is ChatInfo.Group ->
+      if (chatInfo.groupInfo.canModerate) {
+        chatInfo.groupInfo.membersRequireAttention
+      } else {
+        chatInfo.groupInfo.membership.supportChat?.unread ?: 0
+      }
+    else -> 0
+  }
+
   fun groupFeatureEnabled(feature: GroupFeature): Boolean =
     if (chatInfo is ChatInfo.Group) {
-      val groupInfo = chatInfo.groupInfo
-      val p = groupInfo.fullGroupPreferences
-      when (feature) {
-        GroupFeature.TimedMessages -> p.timedMessages.on
-        GroupFeature.DirectMessages -> p.directMessages.on(groupInfo.membership)
-        GroupFeature.FullDelete -> p.fullDelete.on
-        GroupFeature.Reactions -> p.reactions.on
-        GroupFeature.Voice -> p.voice.on(groupInfo.membership)
-        GroupFeature.Files -> p.files.on(groupInfo.membership)
-        GroupFeature.SimplexLinks -> p.simplexLinks.on(groupInfo.membership)
-        GroupFeature.History -> p.history.on
-      }
+      chatInfo.groupInfo.groupFeatureEnabled(feature)
     } else {
       true
     }
@@ -1233,9 +1323,11 @@ data class Chat(
   @Serializable
   data class ChatStats(
     val unreadCount: Int = 0,
+    val unreadMentions: Int = 0,
     // actual only via getChats() and getChat(.initial), otherwise, zero
     val reportsCount: Int = 0,
     val minUnreadItemId: Long = 0,
+    // actual only via getChats(), otherwise, false
     val unreadChat: Boolean = false
   )
 
@@ -1259,8 +1351,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contact.apiId
     override val ready get() = contact.ready
     override val chatDeleted get() = contact.chatDeleted
-    override val sendMsgEnabled get() = contact.sendMsgEnabled
-    override val ntfsEnabled get() = contact.ntfsEnabled
     override val incognito get() = contact.incognito
     override fun featureEnabled(feature: ChatFeature) = contact.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = contact.timedMessagesTTL
@@ -1278,15 +1368,13 @@ sealed class ChatInfo: SomeChat, NamedChat {
   }
 
   @Serializable @SerialName("group")
-  data class Group(val groupInfo: GroupInfo): ChatInfo() {
+  data class Group(val groupInfo: GroupInfo, val groupChatScope: GroupChatScopeInfo?): ChatInfo() {
     override val chatType get() = ChatType.Group
     override val localDisplayName get() = groupInfo.localDisplayName
     override val id get() = groupInfo.id
     override val apiId get() = groupInfo.apiId
     override val ready get() = groupInfo.ready
     override val chatDeleted get() = groupInfo.chatDeleted
-    override val sendMsgEnabled get() = groupInfo.sendMsgEnabled
-    override val ntfsEnabled get() = groupInfo.ntfsEnabled
     override val incognito get() = groupInfo.incognito
     override fun featureEnabled(feature: ChatFeature) = groupInfo.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = groupInfo.timedMessagesTTL
@@ -1298,7 +1386,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val localAlias get() = groupInfo.localAlias
 
     companion object {
-      val sampleData = Group(GroupInfo.sampleData)
+      val sampleData = Group(GroupInfo.sampleData, groupChatScope = null)
     }
   }
 
@@ -1310,8 +1398,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = noteFolder.apiId
     override val ready get() = noteFolder.ready
     override val chatDeleted get() = noteFolder.chatDeleted
-    override val sendMsgEnabled get() = noteFolder.sendMsgEnabled
-    override val ntfsEnabled get() = noteFolder.ntfsEnabled
     override val incognito get() = noteFolder.incognito
     override fun featureEnabled(feature: ChatFeature) = noteFolder.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = noteFolder.timedMessagesTTL
@@ -1335,8 +1421,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contactRequest.apiId
     override val ready get() = contactRequest.ready
     override val chatDeleted get() = contactRequest.chatDeleted
-    override val sendMsgEnabled get() = contactRequest.sendMsgEnabled
-    override val ntfsEnabled get() = contactRequest.ntfsEnabled
     override val incognito get() = contactRequest.incognito
     override fun featureEnabled(feature: ChatFeature) = contactRequest.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = contactRequest.timedMessagesTTL
@@ -1360,8 +1444,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contactConnection.apiId
     override val ready get() = contactConnection.ready
     override val chatDeleted get() = contactConnection.chatDeleted
-    override val sendMsgEnabled get() = contactConnection.sendMsgEnabled
-    override val ntfsEnabled get() = false
     override val incognito get() = contactConnection.incognito
     override fun featureEnabled(feature: ChatFeature) = contactConnection.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = contactConnection.timedMessagesTTL
@@ -1379,20 +1461,20 @@ sealed class ChatInfo: SomeChat, NamedChat {
   }
 
   @Serializable @SerialName("invalidJSON")
-  class InvalidJSON(val json: String): ChatInfo() {
+  class InvalidJSON(
+    val json: String,
+    override val apiId: Long = -idGenerator.getAndIncrement(),
+    override val createdAt: Instant = Clock.System.now(),
+    override val updatedAt: Instant = Clock.System.now()
+  ): ChatInfo() {
     override val chatType get() = ChatType.Direct
     override val localDisplayName get() = invalidChatName
-    override val id get() = ""
-    override val apiId get() = 0L
+    override val id get() = "?$apiId"
     override val ready get() = false
     override val chatDeleted get() = false
-    override val sendMsgEnabled get() = false
-    override val ntfsEnabled get() = false
     override val incognito get() = false
     override fun featureEnabled(feature: ChatFeature) = false
     override val timedMessagesTTL: Int? get() = null
-    override val createdAt get() = Clock.System.now()
-    override val updatedAt get() = Clock.System.now()
     override val displayName get() = invalidChatName
     override val fullName get() = invalidChatName
     override val image get() = null
@@ -1400,9 +1482,85 @@ sealed class ChatInfo: SomeChat, NamedChat {
 
     companion object {
       private val invalidChatName = generalGetString(MR.strings.invalid_chat)
+      private val idGenerator = AtomicLong(0)
     }
   }
 
+  val userCantSendReason: Pair<String, String?>?
+    get() {
+      when (this) {
+        is Direct -> {
+          // TODO [short links] this will have additional statuses for pending contact requests before they are accepted
+          if (contact.nextSendGrpInv) return null
+          if (!contact.active) return generalGetString(MR.strings.cant_send_message_contact_deleted) to null
+          if (!contact.sndReady) return generalGetString(MR.strings.cant_send_message_contact_not_ready) to null
+          if (contact.activeConn?.connectionStats?.ratchetSyncSendProhibited == true) return generalGetString(MR.strings.cant_send_message_contact_not_synchronized) to null
+          if (contact.activeConn?.connDisabled == true) return generalGetString(MR.strings.cant_send_message_contact_disabled) to null
+          return null
+        }
+        is Group -> {
+          if (groupInfo.membership.memberActive) {
+            when (groupChatScope) {
+              null -> {
+                if (groupInfo.membership.memberPending) {
+                  return generalGetString(MR.strings.reviewed_by_admins) to generalGetString(MR.strings.observer_cant_send_message_desc)
+                }
+                if (groupInfo.membership.memberRole == GroupMemberRole.Observer) {
+                  return generalGetString(MR.strings.observer_cant_send_message_title) to generalGetString(MR.strings.observer_cant_send_message_desc)
+                }
+                return null
+              }
+              is GroupChatScopeInfo.MemberSupport ->
+                if (groupChatScope.groupMember_ != null) {
+                  if (
+                    groupChatScope.groupMember_.versionRange.maxVersion < GROUP_KNOCKING_VERSION
+                    && !groupChatScope.groupMember_.memberPending
+                  ) {
+                    return generalGetString(MR.strings.cant_send_message_member_has_old_version) to null
+                  }
+                  return null
+                } else {
+                  return null
+                }
+            }
+          } else {
+            return when (groupInfo.membership.memberStatus) {
+              GroupMemberStatus.MemRejected -> generalGetString(MR.strings.cant_send_message_rejected) to null
+              GroupMemberStatus.MemGroupDeleted -> generalGetString(MR.strings.cant_send_message_group_deleted) to null
+              GroupMemberStatus.MemRemoved -> generalGetString(MR.strings.cant_send_message_mem_removed) to null
+              GroupMemberStatus.MemLeft -> generalGetString(MR.strings.cant_send_message_you_left) to null
+              else -> generalGetString(MR.strings.cant_send_message_generic) to null
+            }
+          }
+        }
+        is Local ->
+          return null
+        is ContactRequest ->
+          return generalGetString(MR.strings.cant_send_message_generic) to null
+        is ContactConnection ->
+          return generalGetString(MR.strings.cant_send_message_generic) to null
+        is InvalidJSON ->
+          return generalGetString(MR.strings.cant_send_message_generic) to null
+      }
+    }
+
+  val sendMsgEnabled get() = userCantSendReason == null
+
+  fun groupChatScope(): GroupChatScope? = when (this) {
+    is Group -> groupChatScope?.toChatScope()
+    else -> null
+  }
+
+  fun ntfsEnabled(ci: ChatItem): Boolean =
+    ntfsEnabled(ci.meta.userMention)
+
+  fun ntfsEnabled(userMention: Boolean): Boolean =
+    when (chatSettings?.enableNtfs) {
+      All -> true
+      Mentions -> userMention
+      else -> false
+    }
+
   val chatSettings
     get() = when(this) {
       is Direct -> contact.chatSettings
@@ -1420,14 +1578,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
       is InvalidJSON -> updatedAt
     }
 
-  val userCanSend: Boolean
-    get() = when (this) {
-      is ChatInfo.Direct -> true
-      is ChatInfo.Group -> groupInfo.membership.memberRole >= GroupMemberRole.Member
-      is ChatInfo.Local -> true
-      else -> false
-    }
-
   val chatTags: List<Long>?
     get() = when (this) {
       is Direct -> contact.chatTags
@@ -1435,12 +1585,22 @@ sealed class ChatInfo: SomeChat, NamedChat {
       else -> null
     }
 
+  val nextNtfMode: MsgFilter? get() = this.chatSettings?.enableNtfs?.nextMode(mentions = this.hasMentions)
+
+  val hasMentions: Boolean get() = this is Group
+
   val contactCard: Boolean
     get() = when (this) {
       is Direct -> contact.activeConn == null && contact.profile.contactLink != null && contact.active
       else -> false
     }
-  }
+
+  val groupInfo_: GroupInfo?
+    get() = when (this) {
+      is Group -> groupInfo
+      else -> null
+    }
+}
 
 @Serializable
 sealed class NetworkStatus {
@@ -1484,6 +1644,7 @@ data class Contact(
   val contactGroupMemberId: Long? = null,
   val contactGrpInvSent: Boolean,
   val chatTags: List<Long>,
+  val chatItemTTL: Long?,
   override val chatDeleted: Boolean,
   val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
@@ -1493,15 +1654,7 @@ data class Contact(
   override val ready get() = activeConn?.connStatus == ConnStatus.Ready
   val sndReady get() = ready || activeConn?.connStatus == ConnStatus.SndReady
   val active get() = contactStatus == ContactStatus.Active
-  override val sendMsgEnabled get() = (
-      sndReady
-          && active
-          && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?: false)
-          && !(activeConn?.connDisabled ?: true)
-      )
-      || nextSendGrpInv
   val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
-  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
   override val incognito get() = contactConnIncognito
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.enabled.forUser
@@ -1567,7 +1720,8 @@ data class Contact(
       contactGrpInvSent = false,
       chatDeleted = false,
       uiThemes = null,
-      chatTags = emptyList()
+      chatTags = emptyList(),
+      chatItemTTL = null,
     )
   }
 }
@@ -1719,13 +1873,14 @@ data class GroupInfo (
   val businessChat: BusinessChatInfo? = null,
   val fullGroupPreferences: FullGroupPreferences,
   val membership: GroupMember,
-  val hostConnCustomUserProfileId: Long? = null,
   val chatSettings: ChatSettings,
   override val createdAt: Instant,
   override val updatedAt: Instant,
   val chatTs: Instant?,
   val uiThemes: ThemeModeOverrides? = null,
+  val membersRequireAttention: Int,
   val chatTags: List<Long>,
+  val chatItemTTL: Long?,
   override val localAlias: String,
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Group
@@ -1733,8 +1888,6 @@ data class GroupInfo (
   override val apiId get() = groupId
   override val ready get() = membership.memberActive
   override val chatDeleted get() = false
-  override val sendMsgEnabled get() = membership.memberActive
-  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
   override val incognito get() = membership.memberIncognito
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> fullGroupPreferences.timedMessages.on
@@ -1752,7 +1905,7 @@ data class GroupInfo (
     get() = membership.memberRole == GroupMemberRole.Owner && membership.memberCurrent
 
   val canDelete: Boolean
-    get() = membership.memberRole == GroupMemberRole.Owner || !membership.memberCurrent
+    get() = membership.memberRole == GroupMemberRole.Owner || !membership.memberCurrentOrPending
 
   val canAddMembers: Boolean
     get() = membership.memberRole >= GroupMemberRole.Admin && membership.memberActive
@@ -1760,6 +1913,21 @@ data class GroupInfo (
   val canModerate: Boolean
     get() = membership.memberRole >= GroupMemberRole.Moderator && membership.memberActive
 
+  fun groupFeatureEnabled(feature: GroupFeature): Boolean {
+    val p = fullGroupPreferences
+    return when (feature) {
+      GroupFeature.TimedMessages -> p.timedMessages.on
+      GroupFeature.DirectMessages -> p.directMessages.on(membership)
+      GroupFeature.FullDelete -> p.fullDelete.on
+      GroupFeature.Reactions -> p.reactions.on
+      GroupFeature.Voice -> p.voice.on(membership)
+      GroupFeature.Files -> p.files.on(membership)
+      GroupFeature.SimplexLinks -> p.simplexLinks.on(membership)
+      GroupFeature.Reports -> p.reports.on
+      GroupFeature.History -> p.history.on
+    }
+  }
+
   companion object {
     val sampleData = GroupInfo(
       groupId = 1,
@@ -1767,14 +1935,15 @@ data class GroupInfo (
       groupProfile = GroupProfile.sampleData,
       fullGroupPreferences = FullGroupPreferences.sampleData,
       membership = GroupMember.sampleData,
-      hostConnCustomUserProfileId = null,
       chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
       createdAt = Clock.System.now(),
       updatedAt = Clock.System.now(),
       chatTs = Clock.System.now(),
       uiThemes = null,
+      membersRequireAttention = 0,
       chatTags = emptyList(),
-      localAlias = ""
+      localAlias = "",
+      chatItemTTL = null
     )
   }
 }
@@ -1789,7 +1958,8 @@ data class GroupProfile (
   val description: String? = null,
   override val image: String? = null,
   override val localAlias: String = "",
-  val groupPreferences: GroupPreferences? = null
+  val groupPreferences: GroupPreferences? = null,
+  val memberAdmission: GroupMemberAdmission? = null
 ): NamedChat {
   companion object {
     val sampleData = GroupProfile(
@@ -1799,6 +1969,27 @@ data class GroupProfile (
   }
 }
 
+@Serializable
+data class GroupMemberAdmission(
+  val review: MemberCriteria? = null,
+) {
+  companion object {
+    val sampleData = GroupMemberAdmission(
+      review = null,
+    )
+  }
+}
+
+@Serializable
+enum class MemberCriteria {
+  @SerialName("all") All;
+
+  val text: String
+    get() = when(this) {
+      MemberCriteria.All -> generalGetString(MR.strings.member_criteria_all)
+    }
+}
+
 @Serializable
 data class BusinessChatInfo (
   val chatType: BusinessChatType,
@@ -1827,7 +2018,9 @@ data class GroupMember (
   val memberProfile: LocalProfile,
   val memberContactId: Long? = null,
   val memberContactProfileId: Long,
-  var activeConn: Connection? = null
+  var activeConn: Connection? = null,
+  val supportChat: GroupSupportChat? = null,
+  val memberChatVRange: VersionRange
 ): NamedChat {
   val id: String get() = "#$groupId @$groupMemberId"
   val ready get() = activeConn?.connStatus == ConnStatus.Ready
@@ -1865,12 +2058,28 @@ data class GroupMember (
       name
   }
 
+  val localAliasAndFullName: String
+    get() {
+      val p = memberProfile
+      val fullName = p.displayName + (if (p.fullName == "" || p.fullName == p.displayName) "" else " / ${p.fullName}")
+
+      val name = if (p.localAlias.isNotEmpty()) {
+        "${p.localAlias} ($fullName)"
+      } else {
+        fullName
+      }
+      return pastMember(name)
+    }
+
   val memberActive: Boolean get() = when (this.memberStatus) {
+    GroupMemberStatus.MemRejected -> false
     GroupMemberStatus.MemRemoved -> false
     GroupMemberStatus.MemLeft -> false
     GroupMemberStatus.MemGroupDeleted -> false
     GroupMemberStatus.MemUnknown -> false
     GroupMemberStatus.MemInvited -> false
+    GroupMemberStatus.MemPendingApproval -> true
+    GroupMemberStatus.MemPendingReview -> true
     GroupMemberStatus.MemIntroduced -> false
     GroupMemberStatus.MemIntroInvited -> false
     GroupMemberStatus.MemAccepted -> false
@@ -1881,11 +2090,14 @@ data class GroupMember (
   }
 
   val memberCurrent: Boolean get() = when (this.memberStatus) {
+    GroupMemberStatus.MemRejected -> false
     GroupMemberStatus.MemRemoved -> false
     GroupMemberStatus.MemLeft -> false
     GroupMemberStatus.MemGroupDeleted -> false
     GroupMemberStatus.MemUnknown -> false
     GroupMemberStatus.MemInvited -> false
+    GroupMemberStatus.MemPendingApproval -> false
+    GroupMemberStatus.MemPendingReview -> false
     GroupMemberStatus.MemIntroduced -> true
     GroupMemberStatus.MemIntroInvited -> true
     GroupMemberStatus.MemAccepted -> true
@@ -1895,6 +2107,15 @@ data class GroupMember (
     GroupMemberStatus.MemCreator -> true
   }
 
+  val memberPending: Boolean get() = when (this.memberStatus) {
+    GroupMemberStatus.MemPendingApproval -> true
+    GroupMemberStatus.MemPendingReview -> true
+    else -> false
+  }
+
+  val memberCurrentOrPending: Boolean get() =
+    memberCurrent || memberPending
+
   fun canBeRemoved(groupInfo: GroupInfo): Boolean {
     val userRole = groupInfo.membership.memberRole
     return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft
@@ -1909,10 +2130,12 @@ data class GroupMember (
 
   fun canBlockForAll(groupInfo: GroupInfo): Boolean {
     val userRole = groupInfo.membership.memberRole
-    return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft && memberRole < GroupMemberRole.Admin
-        && userRole >= GroupMemberRole.Admin && userRole >= memberRole && groupInfo.membership.memberActive
+    return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft && memberRole < GroupMemberRole.Moderator
+        && userRole >= GroupMemberRole.Moderator && userRole >= memberRole && groupInfo.membership.memberActive
   }
 
+  val versionRange: VersionRange = activeConn?.peerChatVRange ?: memberChatVRange
+
   val memberIncognito = memberProfile.profileId != memberContactProfileId
 
   companion object {
@@ -1930,11 +2153,20 @@ data class GroupMember (
       memberProfile = LocalProfile.sampleData,
       memberContactId = 1,
       memberContactProfileId = 1L,
-      activeConn = Connection.sampleData
+      activeConn = Connection.sampleData,
+      memberChatVRange = VersionRange(minVersion = 1, maxVersion = 15)
     )
   }
 }
 
+@Serializable
+class GroupSupportChat (
+  val chatTs: Instant,
+  val unread: Int,
+  val memberAttention: Int,
+  val mentions: Int
+)
+
 @Serializable
 data class GroupMemberSettings(val showMessages: Boolean) {}
 
@@ -1984,11 +2216,14 @@ enum class GroupMemberCategory {
 
 @Serializable
 enum class GroupMemberStatus {
+  @SerialName("rejected") MemRejected,
   @SerialName("removed") MemRemoved,
   @SerialName("left") MemLeft,
   @SerialName("deleted") MemGroupDeleted,
   @SerialName("unknown") MemUnknown,
   @SerialName("invited") MemInvited,
+  @SerialName("pending_approval") MemPendingApproval,
+  @SerialName("pending_review") MemPendingReview,
   @SerialName("introduced") MemIntroduced,
   @SerialName("intro-inv") MemIntroInvited,
   @SerialName("accepted") MemAccepted,
@@ -1998,11 +2233,14 @@ enum class GroupMemberStatus {
   @SerialName("creator") MemCreator;
 
   val text: String get() = when (this) {
+    MemRejected -> generalGetString(MR.strings.group_member_status_rejected)
     MemRemoved -> generalGetString(MR.strings.group_member_status_removed)
     MemLeft -> generalGetString(MR.strings.group_member_status_left)
     MemGroupDeleted -> generalGetString(MR.strings.group_member_status_group_deleted)
     MemUnknown -> generalGetString(MR.strings.group_member_status_unknown)
     MemInvited -> generalGetString(MR.strings.group_member_status_invited)
+    MemPendingApproval -> generalGetString(MR.strings.group_member_status_pending_approval)
+    MemPendingReview -> generalGetString(MR.strings.group_member_status_pending_review)
     MemIntroduced -> generalGetString(MR.strings.group_member_status_introduced)
     MemIntroInvited -> generalGetString(MR.strings.group_member_status_intro_invitation)
     MemAccepted -> generalGetString(MR.strings.group_member_status_accepted)
@@ -2013,11 +2251,14 @@ enum class GroupMemberStatus {
   }
 
   val shortText: String get() = when (this) {
+    MemRejected -> generalGetString(MR.strings.group_member_status_rejected)
     MemRemoved -> generalGetString(MR.strings.group_member_status_removed)
     MemLeft -> generalGetString(MR.strings.group_member_status_left)
     MemGroupDeleted -> generalGetString(MR.strings.group_member_status_group_deleted)
     MemUnknown -> generalGetString(MR.strings.group_member_status_unknown_short)
     MemInvited -> generalGetString(MR.strings.group_member_status_invited)
+    MemPendingApproval -> generalGetString(MR.strings.group_member_status_pending_approval_short)
+    MemPendingReview -> generalGetString(MR.strings.group_member_status_pending_review_short)
     MemIntroduced -> generalGetString(MR.strings.group_member_status_connecting)
     MemIntroInvited -> generalGetString(MR.strings.group_member_status_connecting)
     MemAccepted -> generalGetString(MR.strings.group_member_status_connecting)
@@ -2072,8 +2313,6 @@ class NoteFolder(
   override val apiId get() = noteFolderId
   override val chatDeleted get() = false
   override val ready get() = true
-  override val sendMsgEnabled get() = true
-  override val ntfsEnabled get() = false
   override val incognito get() = false
   override fun featureEnabled(feature: ChatFeature) = feature == ChatFeature.Voice
   override val timedMessagesTTL: Int? get() = null
@@ -2109,8 +2348,6 @@ class UserContactRequest (
   override val apiId get() = contactRequestId
   override val chatDeleted get() = false
   override val ready get() = true
-  override val sendMsgEnabled get() = false
-  override val ntfsEnabled get() = false
   override val incognito get() = false
   override fun featureEnabled(feature: ChatFeature) = false
   override val timedMessagesTTL: Int? get() = null
@@ -2139,7 +2376,7 @@ class PendingContactConnection(
   val viaContactUri: Boolean,
   val groupLinkId: String? = null,
   val customUserProfileId: Long? = null,
-  val connReqInv: String? = null,
+  val connLinkInv: CreatedConnLink? = null,
   override val localAlias: String,
   override val createdAt: Instant,
   override val updatedAt: Instant
@@ -2149,8 +2386,6 @@ class PendingContactConnection(
   override val apiId get() = pccConnId
   override val chatDeleted get() = false
   override val ready get() = false
-  override val sendMsgEnabled get() = false
-  override val ntfsEnabled get() = false
   override val incognito get() = customUserProfileId != null
   override fun featureEnabled(feature: ChatFeature) = false
   override val timedMessagesTTL: Int? get() = null
@@ -2251,6 +2486,30 @@ data class MemberReaction(
   val reactionTs: Instant
 )
 
+@Serializable
+data class CIMentionMember(
+  val groupMemberId: Long,
+  val displayName: String,
+  val localAlias: String?,
+  val memberRole: GroupMemberRole
+)
+
+@Serializable
+data class CIMention(
+  val memberId: String,
+  val memberRef: CIMentionMember?
+) {
+  constructor(groupMember: GroupMember): this(
+    groupMember.memberId,
+    CIMentionMember(
+      groupMember.groupMemberId,
+      groupMember.memberProfile.displayName,
+      groupMember.memberProfile.localAlias,
+      groupMember.memberRole
+    )
+  )
+}
+
 @Serializable
 class CIReaction(
   val chatDir: CIDirection,
@@ -2265,6 +2524,7 @@ data class ChatItem (
   val meta: CIMeta,
   val content: CIContent,
   val formattedText: List<FormattedText>? = null,
+  val mentions: Map<String, CIMention>? = null,
   val quotedItem: CIQuote? = null,
   val reactions: List<CIReactionCount>,
   val file: CIFile? = null
@@ -2343,11 +2603,16 @@ data class ChatItem (
       is CIContent.RcvGroupFeature,
       is CIContent.SndGroupFeature -> CIMergeCategory.ChatFeature
       is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
-        is RcvGroupEvent.UserRole, is RcvGroupEvent.UserDeleted, is RcvGroupEvent.GroupDeleted, is RcvGroupEvent.MemberCreatedContact -> null
+        is RcvGroupEvent.UserRole,
+        is RcvGroupEvent.UserDeleted,
+        is RcvGroupEvent.GroupDeleted,
+        is RcvGroupEvent.MemberCreatedContact,
+        is RcvGroupEvent.NewMemberPendingReview ->
+          null
         else -> CIMergeCategory.RcvGroupEvent
       }
       is CIContent.SndGroupEventContent -> when (content.sndGroupEvent) {
-        is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft -> null
+        is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft, is SndGroupEvent.MemberAccepted, is SndGroupEvent.UserPendingReview -> null
         else -> CIMergeCategory.SndGroupEvent
       }
       else -> {
@@ -2362,14 +2627,14 @@ data class ChatItem (
   fun memberToModerate(chatInfo: ChatInfo): Pair<GroupInfo, GroupMember?>? {
     return if (chatInfo is ChatInfo.Group && chatDir is CIDirection.GroupRcv) {
       val m = chatInfo.groupInfo.membership
-      if (m.memberRole >= GroupMemberRole.Admin && m.memberRole >= chatDir.groupMember.memberRole && meta.itemDeleted == null) {
+      if (m.memberRole >= GroupMemberRole.Moderator && m.memberRole >= chatDir.groupMember.memberRole && meta.itemDeleted == null) {
         chatInfo.groupInfo to chatDir.groupMember
       } else {
       null
       }
     } else if (chatInfo is ChatInfo.Group && chatDir is CIDirection.GroupSnd) {
       val m = chatInfo.groupInfo.membership
-      if (m.memberRole >= GroupMemberRole.Admin) {
+      if (m.memberRole >= GroupMemberRole.Moderator) {
         chatInfo.groupInfo to null
       } else {
         null
@@ -2418,6 +2683,8 @@ data class ChatItem (
       is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
         is RcvGroupEvent.MemberAdded -> false
         is RcvGroupEvent.MemberConnected -> false
+        is RcvGroupEvent.MemberAccepted -> false
+        is RcvGroupEvent.UserAccepted -> false
         is RcvGroupEvent.MemberLeft -> false
         is RcvGroupEvent.MemberRole -> false
         is RcvGroupEvent.MemberBlocked -> false
@@ -2429,6 +2696,7 @@ data class ChatItem (
         is RcvGroupEvent.InvitedViaGroupLink -> false
         is RcvGroupEvent.MemberCreatedContact -> false
         is RcvGroupEvent.MemberProfileUpdated -> false
+        is RcvGroupEvent.NewMemberPendingReview -> true
       }
       is CIContent.SndGroupEventContent -> false
       is CIContent.RcvConnEventContent -> false
@@ -2564,7 +2832,8 @@ data class ChatItem (
           itemTimed = null,
           itemLive = false,
           deletable = false,
-          editable = false
+          editable = false,
+          userMention = false,
         ),
         content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
         quotedItem = null,
@@ -2588,7 +2857,8 @@ data class ChatItem (
           itemTimed = null,
           itemLive = true,
           deletable = false,
-          editable = false
+          editable = false,
+          userMention = false,
         ),
         content = CIContent.SndMsgContent(MsgContent.MCText("")),
         quotedItem = null,
@@ -2608,12 +2878,13 @@ data class ChatItem (
   }
 }
 
-fun MutableState<SnapshotStateList<Chat>>.add(index: Int, elem: Chat) {
-  value = SnapshotStateList<Chat>().apply { addAll(value); add(index, elem) }
+sealed class SecondaryContextFilter {
+  class GroupChatScopeContext(val groupScopeInfo: GroupChatScopeInfo): SecondaryContextFilter()
+  class MsgContentTagContext(val contentTag: MsgContentTag): SecondaryContextFilter()
 }
 
-fun MutableState<SnapshotStateList<ChatItem>>.addAndNotify(index: Int, elem: ChatItem, contentTag: MsgContentTag?) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); add(index, elem); chatModel.chatItemsChangesListenerForContent(contentTag)?.added(elem.id to elem.isRcvNew, index) }
+fun MutableState<SnapshotStateList<Chat>>.add(index: Int, elem: Chat) {
+  value = SnapshotStateList<Chat>().apply { addAll(value); add(index, elem) }
 }
 
 fun MutableState<SnapshotStateList<Chat>>.add(elem: Chat) {
@@ -2623,11 +2894,6 @@ fun MutableState<SnapshotStateList<Chat>>.add(elem: Chat) {
 // For some reason, Kotlin version crashes if the list is empty
 fun <T> MutableList<T>.removeAll(predicate: (T) -> Boolean): Boolean = if (isEmpty()) false else remAll(predicate)
 
-// Adds item to chatItems and notifies a listener about newly added item
-fun MutableState<SnapshotStateList<ChatItem>>.addAndNotify(elem: ChatItem, contentTag: MsgContentTag?) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); add(elem); chatModel.chatItemsChangesListenerForContent(contentTag)?.added(elem.id to elem.isRcvNew, lastIndex) }
-}
-
 fun <T> MutableState<SnapshotStateList<T>>.addAll(index: Int, elems: List<T>) {
   value = SnapshotStateList<T>().apply { addAll(value); addAll(index, elems) }
 }
@@ -2640,6 +2906,7 @@ fun MutableState<SnapshotStateList<Chat>>.removeAll(block: (Chat) -> Boolean) {
   value = SnapshotStateList<Chat>().apply { addAll(value); removeAll(block) }
 }
 
+// TODO [contexts] operates with both contexts?
 // Removes item(s) from chatItems and notifies a listener about removed item(s)
 fun MutableState<SnapshotStateList<ChatItem>>.removeAllAndNotify(block: (ChatItem) -> Boolean) {
   val toRemove = ArrayList<Triple<Long, Int, Boolean>>()
@@ -2654,8 +2921,8 @@ fun MutableState<SnapshotStateList<ChatItem>>.removeAllAndNotify(block: (ChatIte
     }
   }
   if (toRemove.isNotEmpty()) {
-    chatModel.chatsContext.chatItemsChangesListener?.removed(toRemove, value)
-    chatModel.reportsChatsContext.chatItemsChangesListener?.removed(toRemove, value)
+    chatModel.chatsContext.chatState.itemsRemoved(toRemove, value)
+    chatModel.secondaryChatsContext.value?.chatState?.itemsRemoved(toRemove, value)
   }
 }
 
@@ -2667,17 +2934,6 @@ fun MutableState<SnapshotStateList<Chat>>.removeAt(index: Int): Chat {
   return res
 }
 
-fun MutableState<SnapshotStateList<ChatItem>>.removeLastAndNotify(contentTag: MsgContentTag?) {
-  val removed: Triple<Long, Int, Boolean>
-  value = SnapshotStateList<ChatItem>().apply {
-    addAll(value)
-    val remIndex = lastIndex
-    val rem = removeLast()
-    removed = Triple(rem.id, remIndex, rem.isRcvNew)
-  }
-  chatModel.chatItemsChangesListenerForContent(contentTag)?.removed(listOf(removed), value)
-}
-
 fun <T> MutableState<SnapshotStateList<T>>.replaceAll(elems: List<T>) {
   value = SnapshotStateList<T>().apply { addAll(elems) }
 }
@@ -2686,11 +2942,12 @@ fun MutableState<SnapshotStateList<Chat>>.clear() {
   value = SnapshotStateList()
 }
 
+// TODO [contexts] operates with both contexts?
 // Removes all chatItems and notifies a listener about it
 fun MutableState<SnapshotStateList<ChatItem>>.clearAndNotify() {
   value = SnapshotStateList()
-  chatModel.chatsContext.chatItemsChangesListener?.cleared()
-  chatModel.reportsChatsContext.chatItemsChangesListener?.cleared()
+  chatModel.chatsContext.chatState.clear()
+  chatModel.secondaryChatsContext.value?.chatState?.clear()
 }
 
 fun <T> State<SnapshotStateList<T>>.asReversed(): MutableList<T> = value.asReversed()
@@ -2745,6 +3002,7 @@ data class CIMeta (
   val itemEdited: Boolean,
   val itemTimed: CITimed?,
   val itemLive: Boolean?,
+  val userMention: Boolean,
   val deletable: Boolean,
   val editable: Boolean
 ) {
@@ -2783,7 +3041,8 @@ data class CIMeta (
         itemTimed = itemTimed,
         itemLive = itemLive,
         deletable = deletable,
-        editable = editable
+        editable = editable,
+        userMention = false,
       )
 
     fun invalidJSON(): CIMeta =
@@ -2802,7 +3061,8 @@ data class CIMeta (
         itemTimed = null,
         itemLive = false,
         deletable = false,
-        editable = false
+        editable = false,
+        userMention = false
       )
   }
 }
@@ -2881,6 +3141,19 @@ sealed class CIStatus {
   @Serializable @SerialName("rcvRead") class RcvRead: CIStatus()
   @Serializable @SerialName("invalid") class Invalid(val text: String): CIStatus()
 
+  // as in corresponds to SENT response from agent
+  fun isSent(): Boolean = when(this) {
+    is SndNew -> false
+    is SndSent -> true
+    is SndRcvd -> false
+    is SndErrorAuth -> true
+    is CISSndError -> true
+    is SndWarning -> true
+    is RcvNew -> false
+    is RcvRead -> false
+    is Invalid -> false
+  }
+
   fun statusIcon(
     primaryColor: Color,
     metaColor: Color = CurrentColors.value.colors.secondary,
@@ -2920,6 +3193,13 @@ sealed class CIStatus {
   }
 }
 
+fun shouldKeepOldSndCIStatus(oldStatus: CIStatus, newStatus: CIStatus): Boolean =
+  when {
+    oldStatus is CIStatus.SndRcvd && newStatus !is CIStatus.SndRcvd -> true
+    oldStatus.isSent() && newStatus is CIStatus.SndNew -> true
+    else -> false
+  }
+
 @Serializable
 sealed class SndError {
   @Serializable @SerialName("auth") class Auth: SndError()
@@ -3035,6 +3315,13 @@ sealed class CIForwardedFrom {
         is Group -> chatName
       }
 
+  val chatTypeApiIdMsgId: Triple<ChatType, Long, Long?>?
+    get() = when (this) {
+      Unknown -> null
+      is Contact -> if (contactId != null) Triple(ChatType.Direct, contactId, chatItemId) else null
+      is Group -> if (groupId != null) Triple(ChatType.Group, groupId, chatItemId) else null
+    }
+
   fun text(chatType: ChatType): String =
     if (chatType == ChatType.Local) {
       if (chatName.isEmpty()) {
@@ -3170,6 +3457,7 @@ sealed class CIContent: ItemContent {
       when (role) {
         GroupMemberRole.Owner -> generalGetString(MR.strings.feature_roles_owners)
         GroupMemberRole.Admin -> generalGetString(MR.strings.feature_roles_admins)
+        GroupMemberRole.Moderator -> generalGetString(MR.strings.feature_roles_moderators)
         else -> generalGetString(MR.strings.feature_roles_all_members)
       }
 
@@ -3247,18 +3535,20 @@ sealed class MsgReaction {
       MREmojiChar.Heart -> "❤️"
       else -> emoji.value
     }
-    is Unknown -> ""
+    is Unknown -> "?"
   }
 
   companion object {
-    val values: List<MsgReaction> get() = MREmojiChar.values().map(::Emoji)
-    val old: List<MsgReaction> get() = listOf(
+    val values: List<MsgReaction> get() = MREmojiChar.entries.map(::Emoji)
+    val supported: List<MsgReaction> get() = listOf(
       MREmojiChar.ThumbsUp,
       MREmojiChar.ThumbsDown,
       MREmojiChar.Smile,
+      MREmojiChar.Laugh,
       MREmojiChar.Sad,
       MREmojiChar.Heart,
-      MREmojiChar.Launch
+      MREmojiChar.Launch,
+      MREmojiChar.Check
     ).map(::Emoji)
   }
 }
@@ -3277,8 +3567,13 @@ object MsgReactionSerializer : KSerializer<MsgReaction> {
     return if (json is JsonObject && "type" in json) {
       when(val t = json["type"]?.jsonPrimitive?.content ?: "") {
         "emoji" -> {
-          val emoji = Json.decodeFromString<MREmojiChar>(json["emoji"].toString())
-          if (emoji == null) MsgReaction.Unknown(t, json) else MsgReaction.Emoji(emoji)
+          val msgReaction = try {
+            val emoji = Json.decodeFromString<MREmojiChar>(json["emoji"].toString())
+            MsgReaction.Emoji(emoji)
+          } catch (e: Throwable) {
+            MsgReaction.Unknown(t, json)
+          }
+          msgReaction
         }
         else -> MsgReaction.Unknown(t, json)
       }
@@ -3806,7 +4101,7 @@ enum class MsgContentTag {
 class FormattedText(val text: String, val format: Format? = null) {
   // TODO make it dependent on simplexLinkMode preference
   fun link(mode: SimplexLinkMode): String? = when (format) {
-    is Format.Uri -> text
+    is Format.Uri -> if (text.startsWith("http://", ignoreCase = true) || text.startsWith("https://", ignoreCase = true)) text else "https://$text"
     is Format.SimplexLink -> if (mode == SimplexLinkMode.BROWSER) text else format.simplexUri
     is Format.Email -> "mailto:$text"
     is Format.Phone -> "tel:$text"
@@ -3819,6 +4114,10 @@ class FormattedText(val text: String, val format: Format? = null) {
 
   fun simplexLinkText(linkType: SimplexLinkType, smpHosts: List<String>): String =
     "${linkType.description} (${String.format(generalGetString(MR.strings.simplex_link_connection), smpHosts.firstOrNull() ?: "?")})"
+
+  companion object {
+    fun plain(text: String): List<FormattedText> = if (text.isEmpty()) emptyList() else listOf(FormattedText(text))
+  }
 }
 
 @Serializable
@@ -3831,6 +4130,7 @@ sealed class Format {
   @Serializable @SerialName("colored") class Colored(val color: FormatColor): Format()
   @Serializable @SerialName("uri") class Uri: Format()
   @Serializable @SerialName("simplexLink") class SimplexLink(val linkType: SimplexLinkType, val simplexUri: String, val smpHosts: List<String>): Format()
+  @Serializable @SerialName("mention") class Mention(val memberName: String): Format()
   @Serializable @SerialName("email") class Email: Format()
   @Serializable @SerialName("phone") class Phone: Format()
 
@@ -3843,6 +4143,7 @@ sealed class Format {
     is Colored -> SpanStyle(color = this.color.uiColor)
     is Uri -> linkStyle
     is SimplexLink -> linkStyle
+    is Mention -> SpanStyle(fontWeight = FontWeight.Medium)
     is Email -> linkStyle
     is Phone -> linkStyle
   }
@@ -3858,12 +4159,14 @@ sealed class Format {
 enum class SimplexLinkType(val linkType: String) {
   contact("contact"),
   invitation("invitation"),
-  group("group");
+  group("group"),
+  channel("channel");
 
   val description: String get() = generalGetString(when (this) {
       contact -> MR.strings.simplex_link_contact
       invitation -> MR.strings.simplex_link_invitation
       group -> MR.strings.simplex_link_group
+      channel -> MR.strings.simplex_link_channel
   })
 }
 
@@ -4035,6 +4338,8 @@ sealed class RcvDirectEvent() {
 sealed class RcvGroupEvent() {
   @Serializable @SerialName("memberAdded") class MemberAdded(val groupMemberId: Long, val profile: Profile): RcvGroupEvent()
   @Serializable @SerialName("memberConnected") class MemberConnected(): RcvGroupEvent()
+  @Serializable @SerialName("memberAccepted") class MemberAccepted(val groupMemberId: Long, val profile: Profile): RcvGroupEvent()
+  @Serializable @SerialName("userAccepted") class UserAccepted(): RcvGroupEvent()
   @Serializable @SerialName("memberLeft") class MemberLeft(): RcvGroupEvent()
   @Serializable @SerialName("memberRole") class MemberRole(val groupMemberId: Long, val profile: Profile, val role: GroupMemberRole): RcvGroupEvent()
   @Serializable @SerialName("memberBlocked") class MemberBlocked(val groupMemberId: Long, val profile: Profile, val blocked: Boolean): RcvGroupEvent()
@@ -4046,10 +4351,13 @@ sealed class RcvGroupEvent() {
   @Serializable @SerialName("invitedViaGroupLink") class InvitedViaGroupLink(): RcvGroupEvent()
   @Serializable @SerialName("memberCreatedContact") class MemberCreatedContact(): RcvGroupEvent()
   @Serializable @SerialName("memberProfileUpdated") class MemberProfileUpdated(val fromProfile: Profile, val toProfile: Profile): RcvGroupEvent()
+  @Serializable @SerialName("newMemberPendingReview") class NewMemberPendingReview(): RcvGroupEvent()
 
   val text: String get() = when (this) {
     is MemberAdded -> String.format(generalGetString(MR.strings.rcv_group_event_member_added), profile.profileViewName)
     is MemberConnected -> generalGetString(MR.strings.rcv_group_event_member_connected)
+    is MemberAccepted -> String.format(generalGetString(MR.strings.rcv_group_event_member_accepted), profile.profileViewName)
+    is UserAccepted -> generalGetString(MR.strings.rcv_group_event_user_accepted)
     is MemberLeft -> generalGetString(MR.strings.rcv_group_event_member_left)
     is MemberRole -> String.format(generalGetString(MR.strings.rcv_group_event_changed_member_role), profile.profileViewName, role.text)
     is MemberBlocked -> if (blocked) {
@@ -4065,6 +4373,7 @@ sealed class RcvGroupEvent() {
     is InvitedViaGroupLink -> generalGetString(MR.strings.rcv_group_event_invited_via_your_group_link)
     is MemberCreatedContact -> generalGetString(MR.strings.rcv_group_event_member_created_contact)
     is MemberProfileUpdated -> profileUpdatedText(fromProfile, toProfile)
+    is NewMemberPendingReview -> generalGetString(MR.strings.rcv_group_event_new_member_pending_review)
   }
 
   private fun profileUpdatedText(from: Profile, to: Profile): String =
@@ -4089,6 +4398,8 @@ sealed class SndGroupEvent() {
   @Serializable @SerialName("memberDeleted") class MemberDeleted(val groupMemberId: Long, val profile: Profile): SndGroupEvent()
   @Serializable @SerialName("userLeft") class UserLeft(): SndGroupEvent()
   @Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): SndGroupEvent()
+  @Serializable @SerialName("memberAccepted") class MemberAccepted(val groupMemberId: Long, val profile: Profile): SndGroupEvent()
+  @Serializable @SerialName("userPendingReview") class UserPendingReview(): SndGroupEvent()
 
   val text: String get() = when (this) {
     is MemberRole -> String.format(generalGetString(MR.strings.snd_group_event_changed_member_role), profile.profileViewName, role.text)
@@ -4101,6 +4412,8 @@ sealed class SndGroupEvent() {
     is MemberDeleted -> String.format(generalGetString(MR.strings.snd_group_event_member_deleted), profile.profileViewName)
     is UserLeft -> generalGetString(MR.strings.snd_group_event_user_left)
     is GroupUpdated -> generalGetString(MR.strings.snd_group_event_group_profile_updated)
+    is MemberAccepted -> generalGetString(MR.strings.snd_group_event_member_accepted)
+    is UserPendingReview -> generalGetString(MR.strings.snd_group_event_user_pending_review)
   }
 }
 
@@ -4186,32 +4499,49 @@ enum class SwitchPhase {
   @SerialName("completed") Completed
 }
 
-sealed class ChatItemTTL: Comparable<ChatItemTTL?> {
+sealed class ChatItemTTL: Comparable<ChatItemTTL> {
   object Day: ChatItemTTL()
   object Week: ChatItemTTL()
   object Month: ChatItemTTL()
+  object Year: ChatItemTTL()
   data class Seconds(val secs: Long): ChatItemTTL()
   object None: ChatItemTTL()
 
-  override fun compareTo(other: ChatItemTTL?): Int = (seconds ?: Long.MAX_VALUE).compareTo(other?.seconds ?: Long.MAX_VALUE)
+  override fun compareTo(other: ChatItemTTL): Int =
+    (seconds.takeIf { it != 0L } ?: Long.MAX_VALUE)
+      .compareTo(other.seconds.takeIf { it != 0L } ?: Long.MAX_VALUE)
 
-  val seconds: Long?
+  val seconds: Long
     get() =
       when (this) {
-        is None -> null
+        is None -> 0
         is Day -> 86400L
         is Week -> 7 * 86400L
         is Month -> 30 * 86400L
+        is Year -> 365 * 86400L
         is Seconds -> secs
       }
 
+  val text: String
+    get() = when(this) {
+      is None -> generalGetString(MR.strings.chat_item_ttl_none)
+      is Day -> generalGetString(MR.strings.chat_item_ttl_day)
+      is Week -> generalGetString(MR.strings.chat_item_ttl_week)
+      is Month -> generalGetString(MR.strings.chat_item_ttl_month)
+      is Year -> generalGetString(MR.strings.chat_item_ttl_year)
+      is Seconds -> String.format(generalGetString(MR.strings.chat_item_ttl_seconds), secs)
+    }
+
+  val neverExpires: Boolean get() = this is None
+
   companion object {
-    fun fromSeconds(seconds: Long?): ChatItemTTL =
+    fun fromSeconds(seconds: Long): ChatItemTTL =
       when (seconds) {
-        null -> None
+        0L -> None
         86400L -> Day
         7 * 86400L -> Week
         30 * 86400L -> Month
+        365 * 86400L -> Year
         else -> Seconds(seconds)
       }
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
index f891d206a3..0f65783152 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import chat.simplex.common.views.helpers.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -17,9 +19,9 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatController.getNetCfg
 import chat.simplex.common.model.ChatController.setNetCfg
 import chat.simplex.common.model.ChatModel.changingActiveUserMutex
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
-import chat.simplex.common.model.SMPErrorType.BLOCKED
+import chat.simplex.common.model.MsgContent.MCUnknown
+import chat.simplex.common.model.SMPProxyFallback.AllowProtected
+import chat.simplex.common.model.SMPProxyMode.Always
 import dev.icerock.moko.resources.compose.painterResource
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
@@ -36,6 +38,7 @@ import com.charleskorn.kaml.YamlConfiguration
 import chat.simplex.res.MR
 import com.russhwolf.settings.Settings
 import dev.icerock.moko.resources.ImageResource
+import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
@@ -44,6 +47,9 @@ import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.*
 import java.util.Date
 
@@ -52,6 +58,9 @@ typealias ChatCtrl = Long
 // version range that supports establishing direct connection with a group member (xGrpDirectInvVRange in core)
 val CREATE_MEMBER_CONTACT_VERSION = 2
 
+// support group knocking (MsgScope)
+val GROUP_KNOCKING_VERSION = 15
+
 enum class CallOnLockScreen {
   DISABLE,
   SHOW,
@@ -85,18 +94,7 @@ class AppPreferences {
   val backgroundServiceBatteryNoticeShown = mkBoolPreference(SHARED_PREFS_SERVICE_BATTERY_NOTICE_SHOWN, false)
   val autoRestartWorkerVersion = mkIntPreference(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, 0)
   val webrtcPolicyRelay = mkBoolPreference(SHARED_PREFS_WEBRTC_POLICY_RELAY, true)
-  private val _callOnLockScreen = mkStrPreference(SHARED_PREFS_WEBRTC_CALLS_ON_LOCK_SCREEN, CallOnLockScreen.default.name)
-  val callOnLockScreen: SharedPreference<CallOnLockScreen> = SharedPreference(
-    get = fun(): CallOnLockScreen {
-      val value = _callOnLockScreen.get() ?: return CallOnLockScreen.default
-      return try {
-        CallOnLockScreen.valueOf(value)
-      } catch (e: Throwable) {
-        CallOnLockScreen.default
-      }
-    },
-    set = fun(action: CallOnLockScreen) { _callOnLockScreen.set(action.name) }
-  )
+  val callOnLockScreen: SharedPreference<CallOnLockScreen> = mkSafeEnumPreference(SHARED_PREFS_WEBRTC_CALLS_ON_LOCK_SCREEN, CallOnLockScreen.default)
   val performLA = mkBoolPreference(SHARED_PREFS_PERFORM_LA, false)
   val laMode = mkEnumPreference(SHARED_PREFS_LA_MODE, LAMode.default) { LAMode.values().firstOrNull { it.name == this } }
   val laLockDelay = mkIntPreference(SHARED_PREFS_LA_LOCK_DELAY, 30)
@@ -106,20 +104,10 @@ class AppPreferences {
   val privacyAcceptImages = mkBoolPreference(SHARED_PREFS_PRIVACY_ACCEPT_IMAGES, true)
   val privacyLinkPreviews = mkBoolPreference(SHARED_PREFS_PRIVACY_LINK_PREVIEWS, true)
   val privacyChatListOpenLinks = mkEnumPreference(SHARED_PREFS_PRIVACY_CHAT_LIST_OPEN_LINKS, PrivacyChatListOpenLinksMode.ASK) { PrivacyChatListOpenLinksMode.values().firstOrNull { it.name == this } }
-  private val _simplexLinkMode = mkStrPreference(SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE, SimplexLinkMode.default.name)
-  val simplexLinkMode: SharedPreference<SimplexLinkMode> = SharedPreference(
-    get = fun(): SimplexLinkMode {
-      val value = _simplexLinkMode.get() ?: return SimplexLinkMode.default
-      return try {
-        SimplexLinkMode.valueOf(value)
-      } catch (e: Throwable) {
-        SimplexLinkMode.default
-      }
-    },
-    set = fun(mode: SimplexLinkMode) { _simplexLinkMode.set(mode.name) }
-  )
+  val simplexLinkMode: SharedPreference<SimplexLinkMode> = mkSafeEnumPreference(SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE, SimplexLinkMode.default)
   val privacyShowChatPreviews = mkBoolPreference(SHARED_PREFS_PRIVACY_SHOW_CHAT_PREVIEWS, true)
   val privacySaveLastDraft = mkBoolPreference(SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT, true)
+  val privacyShortLinks = mkBoolPreference(SHARED_PREFS_PRIVACY_SHORT_LINKS, false)
   val privacyDeliveryReceiptsSet = mkBoolPreference(SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET, false)
   val privacyEncryptLocalFiles = mkBoolPreference(SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES, true)
   val privacyAskToApproveRelays = mkBoolPreference(SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS, true)
@@ -156,22 +144,12 @@ class AppPreferences {
     },
     set = fun(proxy: NetworkProxy) { _networkProxy.set(json.encodeToString(proxy)) }
   )
-  private val _networkSessionMode = mkStrPreference(SHARED_PREFS_NETWORK_SESSION_MODE, TransportSessionMode.default.name)
-  val networkSessionMode: SharedPreference<TransportSessionMode> = SharedPreference(
-    get = fun(): TransportSessionMode {
-      val value = _networkSessionMode.get() ?: return TransportSessionMode.default
-      return try {
-        TransportSessionMode.valueOf(value)
-      } catch (e: Throwable) {
-        TransportSessionMode.default
-      }
-    },
-    set = fun(mode: TransportSessionMode) { _networkSessionMode.set(mode.name) }
-  )
-  val networkSMPProxyMode = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_MODE, NetCfg.defaults.smpProxyMode.name)
-  val networkSMPProxyFallback = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK, NetCfg.defaults.smpProxyFallback.name)
-  val networkHostMode = mkStrPreference(SHARED_PREFS_NETWORK_HOST_MODE, HostMode.OnionViaSocks.name)
+  val networkSessionMode: SharedPreference<TransportSessionMode> = mkSafeEnumPreference(SHARED_PREFS_NETWORK_SESSION_MODE, TransportSessionMode.default)
+  val networkSMPProxyMode: SharedPreference<SMPProxyMode> = mkSafeEnumPreference(SHARED_PREFS_NETWORK_SMP_PROXY_MODE, SMPProxyMode.default)
+  val networkSMPProxyFallback: SharedPreference<SMPProxyFallback> = mkSafeEnumPreference(SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK, SMPProxyFallback.default)
+  val networkHostMode: SharedPreference<HostMode> = mkSafeEnumPreference(SHARED_PREFS_NETWORK_HOST_MODE, HostMode.default)
   val networkRequiredHostMode = mkBoolPreference(SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE, false)
+  val networkSMPWebPortServers: SharedPreference<SMPWebPortServers> = mkSafeEnumPreference(SHARED_PREFS_NETWORK_SMP_WEB_PORT_SERVERS, SMPWebPortServers.default)
   val networkTCPConnectTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT, NetCfg.defaults.tcpConnectTimeout, NetCfg.proxyDefaults.tcpConnectTimeout)
   val networkTCPTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_TIMEOUT, NetCfg.defaults.tcpTimeout, NetCfg.proxyDefaults.tcpTimeout)
   val networkTCPTimeoutPerKb = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_TIMEOUT_PER_KB, NetCfg.defaults.tcpTimeoutPerKb, NetCfg.proxyDefaults.tcpTimeoutPerKb)
@@ -188,6 +166,7 @@ class AppPreferences {
   val oneHandUICardShown = mkBoolPreference(SHARED_PREFS_ONE_HAND_UI_CARD_SHOWN, false)
   val addressCreationCardShown = mkBoolPreference(SHARED_PREFS_ADDRESS_CREATION_CARD_SHOWN, false)
   val showMuteProfileAlert = mkBoolPreference(SHARED_PREFS_SHOW_MUTE_PROFILE_ALERT, true)
+  val showReportsInSupportChatAlert = mkBoolPreference(SHARED_PREFS_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT, true)
   val appLanguage = mkStrPreference(SHARED_PREFS_APP_LANGUAGE, null)
   val appUpdateChannel = mkEnumPreference(SHARED_PREFS_APP_UPDATE_CHANNEL, AppUpdatesChannel.DISABLED) { AppUpdatesChannel.entries.firstOrNull { it.name == this } }
   val appSkippedUpdate = mkStrPreference(SHARED_PREFS_APP_SKIPPED_UPDATE, "")
@@ -270,6 +249,7 @@ class AppPreferences {
     liveMessageAlertShown to false,
     showHiddenProfilesNotice to true,
     showMuteProfileAlert to true,
+    showReportsInSupportChatAlert to true,
     showDeleteConversationNotice to true,
     showDeleteContactNotice to true,
   )
@@ -326,7 +306,19 @@ class AppPreferences {
       set = fun(value) = settings.putString(prefName, value.toString())
     )
 
-  // LALAL
+  private inline fun <reified T : Enum<T>> mkSafeEnumPreference(key: String, default: T): SharedPreference<T> = SharedPreference(
+    get = {
+      val value = settings.getString(key, "")
+      if (value == "") return@SharedPreference default
+      try {
+        enumValueOf<T>(value)
+      } catch (e: IllegalArgumentException) {
+        default
+      }
+    },
+    set = { value -> settings.putString(key, value.name) }
+  )
+
   private fun mkDatePreference(prefName: String, default: Instant?): SharedPreference<Instant?> =
     SharedPreference(
       get = {
@@ -378,6 +370,7 @@ class AppPreferences {
     private const val SHARED_PREFS_PRIVACY_SIMPLEX_LINK_MODE = "PrivacySimplexLinkMode"
     private const val SHARED_PREFS_PRIVACY_SHOW_CHAT_PREVIEWS = "PrivacyShowChatPreviews"
     private const val SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT = "PrivacySaveLastDraft"
+    private const val SHARED_PREFS_PRIVACY_SHORT_LINKS = "PrivacyShortLinks"
     private const val SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET = "PrivacyDeliveryReceiptsSet"
     private const val SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES = "PrivacyEncryptLocalFiles"
     private const val SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS = "PrivacyAskToApproveRelays"
@@ -410,6 +403,7 @@ class AppPreferences {
     private const val SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK = "NetworkSMPProxyFallback"
     private const val SHARED_PREFS_NETWORK_HOST_MODE = "NetworkHostMode"
     private const val SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE = "NetworkRequiredHostMode"
+    private const val SHARED_PREFS_NETWORK_SMP_WEB_PORT_SERVERS = "NetworkSMPWebPortServers"
     private const val SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT = "NetworkTCPConnectTimeout"
     private const val SHARED_PREFS_NETWORK_TCP_TIMEOUT = "NetworkTCPTimeout"
     private const val SHARED_PREFS_NETWORK_TCP_TIMEOUT_PER_KB = "networkTCPTimeoutPerKb"
@@ -426,6 +420,7 @@ class AppPreferences {
     private const val SHARED_PREFS_ONE_HAND_UI_CARD_SHOWN = "OneHandUICardShown"
     private const val SHARED_PREFS_ADDRESS_CREATION_CARD_SHOWN = "AddressCreationCardShown"
     private const val SHARED_PREFS_SHOW_MUTE_PROFILE_ALERT = "ShowMuteProfileAlert"
+    private const val SHARED_PREFS_SHOW_REPORTS_IN_SUPPORT_CHAT_ALERT = "ShowReportsInSupportChatAlert"
     private const val SHARED_PREFS_STORE_DB_PASSPHRASE = "StoreDBPassphrase"
     private const val SHARED_PREFS_INITIAL_RANDOM_DB_PASSPHRASE = "InitialRandomDBPassphrase"
     private const val SHARED_PREFS_ENCRYPTED_DB_PASSPHRASE = "EncryptedDBPassphrase"
@@ -479,7 +474,7 @@ object ChatController {
   var ctrl: ChatCtrl? = -1
   val appPrefs: AppPreferences by lazy { AppPreferences() }
 
-  val messagesChannel: Channel<APIResponse> = Channel()
+  val messagesChannel: Channel<API> = Channel()
 
   val chatModel = ChatModel
   private var receiverStarted = false
@@ -492,8 +487,7 @@ object ChatController {
     val userId = currentUserId("getAgentSubsTotal")
 
     val r = sendCmd(rh, CC.GetAgentSubsTotal(userId), log = false)
-
-    if (r is CR.AgentSubsTotal) return r.subsTotal to r.hasSession
+    if (r is API.Result && r.res is CR.AgentSubsTotal) return r.res.subsTotal to r.res.hasSession
     Log.e(TAG, "getAgentSubsTotal bad response: ${r.responseType} ${r.details}")
     return null
   }
@@ -502,8 +496,7 @@ object ChatController {
     val userId = currentUserId("getAgentServersSummary")
 
     val r = sendCmd(rh, CC.GetAgentServersSummary(userId), log = false)
-
-    if (r is CR.AgentServersSummary) return r.serversSummary
+    if (r is API.Result && r.res is CR.AgentServersSummary) return r.res.serversSummary
     Log.e(TAG, "getAgentServersSummary bad response: ${r.responseType} ${r.details}")
     return null
   }
@@ -541,9 +534,9 @@ object ChatController {
         }
         Log.d(TAG, "startChat: started")
       } else {
-        withChats {
+        withContext(Dispatchers.Main) {
           val chats = apiGetChats(null)
-          updateChats(chats)
+          chatModel.chatsContext.updateChats(chats)
         }
         Log.d(TAG, "startChat: running")
       }
@@ -624,9 +617,9 @@ object ChatController {
     val hasUser = chatModel.currentUser.value != null
     chatModel.userAddress.value = if (hasUser) apiGetUserAddress(rhId) else null
     chatModel.chatItemTTL.value = if (hasUser) getChatItemTTL(rhId) else ChatItemTTL.None
-    withChats {
+    withContext(Dispatchers.Main) {
       val chats = apiGetChats(rhId)
-      updateChats(chats)
+      chatModel.chatsContext.updateChats(chats)
     }
     chatModel.userTags.value = apiGetChatTags(rhId).takeIf { hasUser } ?: emptyList()
     chatModel.activeChatTagFilter.value = null
@@ -655,11 +648,11 @@ object ChatController {
               messagesChannel.trySend(msg)
             }
             if (finishedWithoutTimeout == null) {
-              Log.e(TAG, "Timeout reached while processing received message: " + msg.resp.responseType)
+              Log.e(TAG, "Timeout reached while processing received message: " + msg.responseType)
               if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
                 AlertManager.shared.showAlertMsg(
                   title = generalGetString(MR.strings.possible_slow_function_title),
-                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.resp.responseType + "\n" + Exception().stackTraceToString()),
+                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.responseType + "\n" + Exception().stackTraceToString()),
                   shareText = true
                 )
               }
@@ -675,7 +668,7 @@ object ChatController {
     }
   }
 
-  suspend fun sendCmd(rhId: Long?, cmd: CC, otherCtrl: ChatCtrl? = null, log: Boolean = true): CR {
+  suspend fun sendCmd(rhId: Long?, cmd: CC, otherCtrl: ChatCtrl? = null, log: Boolean = true): API {
     val ctrl = otherCtrl ?: ctrl ?: throw Exception("Controller is not initialized")
 
     return withContext(Dispatchers.IO) {
@@ -684,37 +677,36 @@ object ChatController {
         chatModel.addTerminalItem(TerminalItem.cmd(rhId, cmd.obfuscated))
         Log.d(TAG, "sendCmd: ${cmd.cmdType}")
       }
-      val json = if (rhId == null) chatSendCmd(ctrl, c) else chatSendRemoteCmd(ctrl, rhId.toInt(), c)
+      val rStr = if (rhId == null) chatSendCmd(ctrl, c) else chatSendRemoteCmd(ctrl, rhId.toInt(), c)
       // coroutine was cancelled already, no need to process response (helps with apiListMembers - very heavy query in large groups)
       interruptIfCancelled()
-      val r = APIResponse.decodeStr(json)
+      val r = json.decodeFromString<API>(rStr)
       if (log) {
-        Log.d(TAG, "sendCmd response type ${r.resp.responseType}")
-        if (r.resp is CR.Response || r.resp is CR.Invalid) {
-          Log.d(TAG, "sendCmd response json $json")
+        Log.d(TAG, "sendCmd response type ${r.responseType}")
+        if (r is API.Result && (r.res is CR.Response || r.res is CR.Invalid)) {
+          Log.d(TAG, "sendCmd response json $rStr")
         }
-        chatModel.addTerminalItem(TerminalItem.resp(rhId, r.resp))
+        chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
       }
-      r.resp
+      r
     }
   }
 
-  fun recvMsg(ctrl: ChatCtrl): APIResponse? {
-    val json = chatRecvMsgWait(ctrl, MESSAGE_TIMEOUT)
-    return if (json == "") {
+  fun recvMsg(ctrl: ChatCtrl): API? {
+    val rStr = chatRecvMsgWait(ctrl, MESSAGE_TIMEOUT)
+    return if (rStr == "") {
       null
     } else {
-      val apiResp = APIResponse.decodeStr(json)
-      val r = apiResp.resp
+      val r = json.decodeFromString<API>(rStr)
       Log.d(TAG, "chatRecvMsg: ${r.responseType}")
-      if (r is CR.Response || r is CR.Invalid) Log.d(TAG, "chatRecvMsg json: $json")
-      apiResp
+      if (r is API.Result && (r.res is CR.Response || r.res is CR.Invalid)) Log.d(TAG, "chatRecvMsg json: $rStr")
+      r
     }
   }
 
   suspend fun apiGetActiveUser(rh: Long?, ctrl: ChatCtrl? = null): User? {
     val r = sendCmd(rh, CC.ShowActiveUser(), ctrl)
-    if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
+    if (r is API.Result && r.res is CR.ActiveUser) return r.res.user.updateRemoteHostId(rh)
     Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
     if (rh == null) {
       chatModel.localUserCreated.value = false
@@ -724,14 +716,15 @@ object ChatController {
 
   suspend fun apiCreateActiveUser(rh: Long?, p: Profile?, pastTimestamp: Boolean = false, ctrl: ChatCtrl? = null): User? {
     val r = sendCmd(rh, CC.CreateActiveUser(p, pastTimestamp = pastTimestamp), ctrl)
-    if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
-    else if (
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName ||
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat && r.chatError.errorType is ChatErrorType.UserExists
+    if (r is API.Result && r.res is CR.ActiveUser) return r.res.user.updateRemoteHostId(rh)
+    val e = (r as? API.Error)?.err
+    if (
+      e is ChatError.ChatErrorStore && e.storeError is StoreError.DuplicateName ||
+      e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.UserExists
     ) {
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_create_user_duplicate_title), generalGetString(MR.strings.failed_to_create_user_duplicate_desc))
     } else if (
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat && r.chatError.errorType is ChatErrorType.InvalidDisplayName
+      e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.InvalidDisplayName
     ) {
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_create_user_invalid_title), generalGetString(MR.strings.failed_to_create_user_invalid_desc))
     } else {
@@ -743,8 +736,8 @@ object ChatController {
 
   suspend fun listUsers(rh: Long?): List<UserInfo> {
     val r = sendCmd(rh, CC.ListUsers())
-    if (r is CR.UsersList) {
-      val users = if (rh == null) r.users else r.users.map { it.copy(user = it.user.copy(remoteHostId = rh)) }
+    if (r is API.Result && r.res is CR.UsersList) {
+      val users = if (rh == null) r.res.users else r.res.users.map { it.copy(user = it.user.copy(remoteHostId = rh)) }
       return users.sortedBy { it.user.chatViewName }
     }
     Log.d(TAG, "listUsers: ${r.responseType} ${r.details}")
@@ -753,26 +746,26 @@ object ChatController {
 
   suspend fun apiSetActiveUser(rh: Long?, userId: Long, viewPwd: String?): User {
     val r = sendCmd(rh, CC.ApiSetActiveUser(userId, viewPwd))
-    if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
+    if (r is API.Result && r.res is CR.ActiveUser) return r.res.user.updateRemoteHostId(rh)
     Log.d(TAG, "apiSetActiveUser: ${r.responseType} ${r.details}")
     throw Exception("failed to set the user as active ${r.responseType} ${r.details}")
   }
 
   suspend fun apiSetAllContactReceipts(rh: Long?, enable: Boolean) {
     val r = sendCmd(rh, CC.SetAllContactReceipts(enable))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set receipts for all users ${r.responseType} ${r.details}")
   }
 
   suspend fun apiSetUserContactReceipts(u: User, userMsgReceiptSettings: UserMsgReceiptSettings) {
     val r = sendCmd(u.remoteHostId, CC.ApiSetUserContactReceipts(u.userId, userMsgReceiptSettings))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set receipts for user contacts ${r.responseType} ${r.details}")
   }
 
   suspend fun apiSetUserGroupReceipts(u: User, userMsgReceiptSettings: UserMsgReceiptSettings) {
     val r = sendCmd(u.remoteHostId, CC.ApiSetUserGroupReceipts(u.userId, userMsgReceiptSettings))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set receipts for user groups ${r.responseType} ${r.details}")
   }
 
@@ -790,20 +783,20 @@ object ChatController {
 
   private suspend fun setUserPrivacy(rh: Long?, cmd: CC): User {
     val r = sendCmd(rh, cmd)
-    if (r is CR.UserPrivacy) return r.updatedUser.updateRemoteHostId(rh)
+    if (r is API.Result && r.res is CR.UserPrivacy) return r.res.updatedUser.updateRemoteHostId(rh)
     else throw Exception("Failed to change user privacy: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiDeleteUser(u: User, delSMPQueues: Boolean, viewPwd: String?) {
     val r = sendCmd(u.remoteHostId, CC.ApiDeleteUser(u.userId, delSMPQueues, viewPwd))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     Log.d(TAG, "apiDeleteUser: ${r.responseType} ${r.details}")
     throw Exception("failed to delete the user ${r.responseType} ${r.details}")
   }
 
   suspend fun apiStartChat(ctrl: ChatCtrl? = null): Boolean {
     val r = sendCmd(null, CC.StartChat(mainApp = true), ctrl)
-    when (r) {
+    when (r.result) {
       is CR.ChatStarted -> return true
       is CR.ChatRunning -> return false
       else -> throw Exception("failed starting chat: ${r.responseType} ${r.details}")
@@ -812,7 +805,7 @@ object ChatController {
 
   private suspend fun apiCheckChatRunning(): Boolean {
     val r = sendCmd(null, CC.CheckChatRunning())
-    when (r) {
+    when (r.result) {
       is CR.ChatRunning -> return true
       is CR.ChatStopped -> return false
       else -> throw Exception("failed check chat running: ${r.responseType} ${r.details}")
@@ -821,15 +814,13 @@ object ChatController {
 
   suspend fun apiStopChat(): Boolean {
     val r = sendCmd(null, CC.ApiStopChat())
-    when (r) {
-      is CR.ChatStopped -> return true
-      else -> throw Exception("failed stopping chat: ${r.responseType} ${r.details}")
-    }
+    if (r.result is CR.ChatStopped) return true
+    throw Exception("failed stopping chat: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, remoteHostsFolder: String, ctrl: ChatCtrl? = null) {
     val r = sendCmd(null, CC.ApiSetAppFilePaths(filesFolder, tempFolder, assetsFolder, remoteHostsFolder), ctrl)
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set app file paths: ${r.responseType} ${r.details}")
   }
 
@@ -837,52 +828,52 @@ object ChatController {
 
   suspend fun apiSaveAppSettings(settings: AppSettings) {
     val r = sendCmd(null, CC.ApiSaveSettings(settings))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set app settings: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiGetAppSettings(settings: AppSettings): AppSettings {
     val r = sendCmd(null, CC.ApiGetSettings(settings))
-    if (r is CR.AppSettingsR) return r.appSettings
+    if (r is API.Result && r.res is CR.AppSettingsR) return r.res.appSettings
     throw Exception("failed to get app settings: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiExportArchive(config: ArchiveConfig): List<ArchiveError> {
     val r = sendCmd(null, CC.ApiExportArchive(config))
-    if (r is CR.ArchiveExported) return r.archiveErrors
+    if (r is API.Result && r.res is CR.ArchiveExported) return r.res.archiveErrors
     throw Exception("failed to export archive: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiImportArchive(config: ArchiveConfig): List<ArchiveError> {
     val r = sendCmd(null, CC.ApiImportArchive(config))
-    if (r is CR.ArchiveImported) return r.archiveErrors
+    if (r is API.Result && r.res is CR.ArchiveImported) return r.res.archiveErrors
     throw Exception("failed to import archive: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiDeleteStorage() {
     val r = sendCmd(null, CC.ApiDeleteStorage())
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to delete storage: ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiStorageEncryption(currentKey: String = "", newKey: String = ""): CR.ChatCmdError? {
+  suspend fun apiStorageEncryption(currentKey: String = "", newKey: String = ""): ChatError? {
     val r = sendCmd(null, CC.ApiStorageEncryption(DBEncryptionConfig(currentKey, newKey)))
-    if (r is CR.CmdOk) return null
-    else if (r is CR.ChatCmdError) return r
+    if (r.result is CR.CmdOk) return null
+    else if (r is API.Error) return r.err
     throw Exception("failed to set storage encryption: ${r.responseType} ${r.details}")
   }
 
-  suspend fun testStorageEncryption(key: String, ctrl: ChatCtrl? = null): CR.ChatCmdError? {
+  suspend fun testStorageEncryption(key: String, ctrl: ChatCtrl? = null): ChatError? {
     val r = sendCmd(null, CC.TestStorageEncryption(key), ctrl)
-    if (r is CR.CmdOk) return null
-    else if (r is CR.ChatCmdError) return r
+    if (r.result is CR.CmdOk) return null
+    else if (r is API.Error) return r.err
     throw Exception("failed to test storage encryption: ${r.responseType} ${r.details}")
   }
 
   suspend fun apiGetChats(rh: Long?): List<Chat> {
     val userId = kotlin.runCatching { currentUserId("apiGetChats") }.getOrElse { return emptyList() }
     val r = sendCmd(rh, CC.ApiGetChats(userId))
-    if (r is CR.ApiChats) return if (rh == null) r.chats else r.chats.map { it.copy(remoteHostId = rh) }
+    if (r is API.Result && r.res is CR.ApiChats) return if (rh == null) r.res.chats else r.res.chats.map { it.copy(remoteHostId = rh) }
     Log.e(TAG, "failed getting the list of chats: ${r.responseType} ${r.details}")
     AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_parse_chats_title), generalGetString(MR.strings.contact_developers))
     return emptyList()
@@ -891,18 +882,18 @@ object ChatController {
   private suspend fun apiGetChatTags(rh: Long?): List<ChatTag>?{
     val userId = currentUserId("apiGetChatTags")
     val r = sendCmd(rh, CC.ApiGetChatTags(userId))
-
-    if (r is CR.ChatTags) return r.userTags
+    if (r is API.Result && r.res is CR.ChatTags) return r.res.userTags
     Log.e(TAG, "apiGetChatTags bad response: ${r.responseType} ${r.details}")
     AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_loading_chat_tags), "${r.responseType}: ${r.details}")
     return null
   }
 
-  suspend fun apiGetChat(rh: Long?, type: ChatType, id: Long, contentTag: MsgContentTag? = null, pagination: ChatPagination, search: String = ""): Pair<Chat, NavigationInfo>? {
-    val r = sendCmd(rh, CC.ApiGetChat(type, id, contentTag, pagination, search))
-    if (r is CR.ApiChat) return if (rh == null) r.chat to r.navInfo else r.chat.copy(remoteHostId = rh) to r.navInfo
+  suspend fun apiGetChat(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, contentTag: MsgContentTag? = null, pagination: ChatPagination, search: String = ""): Pair<Chat, NavigationInfo>? {
+    val r = sendCmd(rh, CC.ApiGetChat(type, id, scope, contentTag, pagination, search))
+    if (r is API.Result && r.res is CR.ApiChat) return if (rh == null) r.res.chat to r.res.navInfo else r.res.chat.copy(remoteHostId = rh) to r.res.navInfo
     Log.e(TAG, "apiGetChat bad response: ${r.responseType} ${r.details}")
-    if (pagination is ChatPagination.Around && r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.ChatItemNotFound) {
+    val e = (r as? API.Error)?.err
+    if (pagination is ChatPagination.Around && e is ChatError.ChatErrorStore && e.storeError is StoreError.ChatItemNotFound) {
       showQuotedItemDoesNotExistAlert()
     } else {
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_parse_chat_title), generalGetString(MR.strings.contact_developers))
@@ -912,7 +903,7 @@ object ChatController {
 
   suspend fun apiCreateChatTag(rh: Long?, tag: ChatTagData): List<ChatTag>? {
     val r = sendCmd(rh, CC.ApiCreateChatTag(tag))
-    if (r is CR.ChatTags) return r.userTags
+    if (r is API.Result && r.res is CR.ChatTags) return r.res.userTags
     Log.e(TAG, "apiCreateChatTag bad response: ${r.responseType} ${r.details}")
     AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_creating_chat_tags), "${r.responseType}: ${r.details}")
     return null
@@ -920,7 +911,7 @@ object ChatController {
 
   suspend fun apiSetChatTags(rh: Long?, type: ChatType, id: Long, tagIds: List<Long>): Pair<List<ChatTag>, List<Long>>? {
     val r = sendCmd(rh, CC.ApiSetChatTags(type, id, tagIds))
-    if (r is CR.TagsUpdated) return r.userTags to r.chatTags
+    if (r is API.Result && r.res is CR.TagsUpdated) return r.res.userTags to r.res.chatTags
     Log.e(TAG, "apiSetChatTags bad response: ${r.responseType} ${r.details}")
     AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_updating_chat_tags), "${r.responseType}: ${r.details}")
     return null
@@ -932,16 +923,16 @@ object ChatController {
 
   suspend fun apiReorderChatTags(rh: Long?, tagIds: List<Long>) = sendCommandOkResp(rh, CC.ApiReorderChatTags(tagIds))
 
-  suspend fun apiSendMessages(rh: Long?, type: ChatType, id: Long, live: Boolean = false, ttl: Int? = null, composedMessages: List<ComposedMessage>): List<AChatItem>? {
-    val cmd = CC.ApiSendMessages(type, id, live, ttl, composedMessages)
+  suspend fun apiSendMessages(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, live: Boolean = false, ttl: Int? = null, composedMessages: List<ComposedMessage>): List<AChatItem>? {
+    val cmd = CC.ApiSendMessages(type, id, scope, live, ttl, composedMessages)
     return processSendMessageCmd(rh, cmd)
   }
 
   private suspend fun processSendMessageCmd(rh: Long?, cmd: CC): List<AChatItem>? {
     val r = sendCmd(rh, cmd)
     return when {
-      r is CR.NewChatItems -> r.chatItems
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg && cmd is CC.ApiSendMessages -> {
+      r is API.Result && r.res is CR.NewChatItems -> r.res.chatItems
+      r is API.Error && r.err is ChatError.ChatErrorStore && r.err.storeError is StoreError.LargeMsg && cmd is CC.ApiSendMessages -> {
         val mc = cmd.composedMessages.last().msgContent
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.maximum_message_size_title),
@@ -953,7 +944,7 @@ object ChatController {
         )
         null
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg && cmd is CC.ApiForwardChatItems -> {
+      r is API.Error && r.err is ChatError.ChatErrorStore && r.err.storeError is StoreError.LargeMsg && cmd is CC.ApiForwardChatItems -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.maximum_message_size_title),
           generalGetString(MR.strings.maximum_message_size_reached_forwarding)
@@ -968,60 +959,48 @@ object ChatController {
       }
     }
   }
-   suspend fun apiCreateChatItems(rh: Long?, noteFolderId: Long, composedMessages: List<ComposedMessage>): List<AChatItem>? {
+
+  suspend fun apiCreateChatItems(rh: Long?, noteFolderId: Long, composedMessages: List<ComposedMessage>): List<AChatItem>? {
     val cmd = CC.ApiCreateChatItems(noteFolderId, composedMessages)
     val r = sendCmd(rh, cmd)
-    return when (r) {
-      is CR.NewChatItems -> r.chatItems
-      else -> {
-        apiErrorAlert("apiCreateChatItems", generalGetString(MR.strings.error_creating_message), r)
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.NewChatItems) return r.res.chatItems
+    apiErrorAlert("apiCreateChatItems", generalGetString(MR.strings.error_creating_message), r)
+    return null
   }
 
   suspend fun apiReportMessage(rh: Long?, groupId: Long, chatItemId: Long, reportReason: ReportReason, reportText: String): List<AChatItem>? {
     val r = sendCmd(rh, CC.ApiReportMessage(groupId, chatItemId, reportReason, reportText))
-    return when (r) {
-      is CR.NewChatItems -> r.chatItems
-      else -> {
-        apiErrorAlert("apiReportMessage", generalGetString(MR.strings.error_creating_report), r)
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.NewChatItems) return r.res.chatItems
+    apiErrorAlert("apiReportMessage", generalGetString(MR.strings.error_creating_report), r)
+    return null
   }
 
-  suspend fun apiGetChatItemInfo(rh: Long?, type: ChatType, id: Long, itemId: Long): ChatItemInfo? {
-    return when (val r = sendCmd(rh, CC.ApiGetChatItemInfo(type, id, itemId))) {
-      is CR.ApiChatItemInfo -> r.chatItemInfo
-      else -> {
-        apiErrorAlert("apiGetChatItemInfo", generalGetString(MR.strings.error_loading_details), r)
-        null
-      }
-    }
+  suspend fun apiGetChatItemInfo(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, itemId: Long): ChatItemInfo? {
+    val r = sendCmd(rh, CC.ApiGetChatItemInfo(type, id, scope, itemId))
+    if (r is API.Result && r.res is CR.ApiChatItemInfo) return r.res.chatItemInfo
+    apiErrorAlert("apiGetChatItemInfo", generalGetString(MR.strings.error_loading_details), r)
+    return null
   }
 
-  suspend fun apiForwardChatItems(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemIds: List<Long>, ttl: Int?): List<ChatItem>? {
-    val cmd = CC.ApiForwardChatItems(toChatType, toChatId, fromChatType, fromChatId, itemIds, ttl)
+  suspend fun apiForwardChatItems(rh: Long?, toChatType: ChatType, toChatId: Long, toScope: GroupChatScope?, fromChatType: ChatType, fromChatId: Long, fromScope: GroupChatScope?, itemIds: List<Long>, ttl: Int?): List<ChatItem>? {
+    val cmd = CC.ApiForwardChatItems(toChatType, toChatId, toScope, fromChatType, fromChatId, fromScope, itemIds, ttl)
     return processSendMessageCmd(rh, cmd)?.map { it.chatItem }
   }
 
-  suspend fun apiPlanForwardChatItems(rh: Long?, fromChatType: ChatType, fromChatId: Long, chatItemIds: List<Long>): CR.ForwardPlan? {
-    return when (val r = sendCmd(rh, CC.ApiPlanForwardChatItems(fromChatType, fromChatId, chatItemIds))) {
-      is CR.ForwardPlan -> r
-      else -> {
-        apiErrorAlert("apiPlanForwardChatItems", generalGetString(MR.strings.error_forwarding_messages), r)
-        null
-      }
-    }
+  suspend fun apiPlanForwardChatItems(rh: Long?, fromChatType: ChatType, fromChatId: Long, fromScope: GroupChatScope?, chatItemIds: List<Long>): CR.ForwardPlan? {
+    val r = sendCmd(rh, CC.ApiPlanForwardChatItems(fromChatType, fromChatId, fromScope, chatItemIds))
+    if (r is API.Result && r.res is CR.ForwardPlan) return r.res
+    apiErrorAlert("apiPlanForwardChatItems", generalGetString(MR.strings.error_forwarding_messages), r)
+    return null
   }
 
-  suspend fun apiUpdateChatItem(rh: Long?, type: ChatType, id: Long, itemId: Long, mc: MsgContent, live: Boolean = false): AChatItem? {
-    val r = sendCmd(rh, CC.ApiUpdateChatItem(type, id, itemId, mc, live))
+  suspend fun apiUpdateChatItem(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, itemId: Long, updatedMessage: UpdatedMessage, live: Boolean = false): AChatItem? {
+    val r = sendCmd(rh, CC.ApiUpdateChatItem(type, id, scope, itemId, updatedMessage, live))
     when {
-      r is CR.ChatItemUpdated -> return r.chatItem
-      r is CR.ChatItemNotChanged -> return r.chatItem
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.LargeMsg -> {
+      r is API.Result && r.res is CR.ChatItemUpdated -> return r.res.chatItem
+      r is API.Result && r.res is CR.ChatItemNotChanged -> return r.res.chatItem
+      r is API.Error && r.err is ChatError.ChatErrorStore && r.err.storeError is StoreError.LargeMsg -> {
+        val mc = updatedMessage.msgContent
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.maximum_message_size_title),
           if (mc is MsgContent.MCImage || mc is MsgContent.MCVideo || mc is MsgContent.MCLink) {
@@ -1038,9 +1017,9 @@ object ChatController {
     return null
   }
 
-  suspend fun apiChatItemReaction(rh: Long?, type: ChatType, id: Long, itemId: Long, add: Boolean, reaction: MsgReaction): ChatItem? {
-    val r = sendCmd(rh, CC.ApiChatItemReaction(type, id, itemId, add, reaction))
-    if (r is CR.ChatItemReaction) return r.reaction.chatReaction.chatItem
+  suspend fun apiChatItemReaction(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, itemId: Long, add: Boolean, reaction: MsgReaction): ChatItem? {
+    val r = sendCmd(rh, CC.ApiChatItemReaction(type, id, scope, itemId, add, reaction))
+    if (r is API.Result && r.res is CR.ChatItemReaction) return r.res.reaction.chatReaction.chatItem
     Log.e(TAG, "apiUpdateChatItem bad response: ${r.responseType} ${r.details}")
     return null
   }
@@ -1048,171 +1027,156 @@ object ChatController {
   suspend fun apiGetReactionMembers(rh: Long?, groupId: Long, itemId: Long, reaction: MsgReaction): List<MemberReaction>? {
     val userId = currentUserId("apiGetReactionMembers")
     val r = sendCmd(rh, CC.ApiGetReactionMembers(userId, groupId, itemId, reaction))
-    if (r is CR.ReactionMembers) return r.memberReactions
+    if (r is API.Result && r.res is CR.ReactionMembers) return r.res.memberReactions
     Log.e(TAG, "apiGetReactionMembers bad response: ${r.responseType} ${r.details}")
     return null
   }
 
-  suspend fun apiDeleteChatItems(rh: Long?, type: ChatType, id: Long, itemIds: List<Long>, mode: CIDeleteMode): List<ChatItemDeletion>? {
-    val r = sendCmd(rh, CC.ApiDeleteChatItem(type, id, itemIds, mode))
-    if (r is CR.ChatItemsDeleted) return r.chatItemDeletions
+  suspend fun apiDeleteChatItems(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, itemIds: List<Long>, mode: CIDeleteMode): List<ChatItemDeletion>? {
+    val r = sendCmd(rh, CC.ApiDeleteChatItem(type, id, scope, itemIds, mode))
+    if (r is API.Result && r.res is CR.ChatItemsDeleted) return r.res.chatItemDeletions
     Log.e(TAG, "apiDeleteChatItem bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiDeleteMemberChatItems(rh: Long?, groupId: Long, itemIds: List<Long>): List<ChatItemDeletion>? {
     val r = sendCmd(rh, CC.ApiDeleteMemberChatItem(groupId, itemIds))
-    if (r is CR.ChatItemsDeleted) return r.chatItemDeletions
+    if (r is API.Result && r.res is CR.ChatItemsDeleted) return r.res.chatItemDeletions
     Log.e(TAG, "apiDeleteMemberChatItem bad response: ${r.responseType} ${r.details}")
     return null
   }
 
+  suspend fun apiArchiveReceivedReports(rh: Long?, groupId: Long): CR.GroupChatItemsDeleted? {
+    val r = sendCmd(rh, CC.ApiArchiveReceivedReports(groupId))
+    if (r is API.Result && r.res is CR.GroupChatItemsDeleted) return r.res
+    Log.e(TAG, "apiArchiveReceivedReports bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiDeleteReceivedReports(rh: Long?, groupId: Long, itemIds: List<Long>, mode: CIDeleteMode): List<ChatItemDeletion>? {
+    val r = sendCmd(rh, CC.ApiDeleteReceivedReports(groupId, itemIds, mode))
+    if (r is API.Result && r.res is CR.ChatItemsDeleted) return r.res.chatItemDeletions
+    Log.e(TAG, "apiDeleteReceivedReports bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
   suspend fun testProtoServer(rh: Long?, server: String): ProtocolTestFailure? {
     val userId = currentUserId("testProtoServer")
     val r = sendCmd(rh, CC.APITestProtoServer(userId, server))
-    return when (r) {
-      is CR.ServerTestResult -> r.testFailure
-      else -> {
-        Log.e(TAG, "testProtoServer bad response: ${r.responseType} ${r.details}")
-        throw Exception("testProtoServer bad response: ${r.responseType} ${r.details}")
-      }
-    }
+    if (r is API.Result && r.res is CR.ServerTestResult) return r.res.testFailure
+    Log.e(TAG, "testProtoServer bad response: ${r.responseType} ${r.details}")
+    throw Exception("testProtoServer bad response: ${r.responseType} ${r.details}")
   }
 
   suspend fun getServerOperators(rh: Long?): ServerOperatorConditionsDetail? {
     val r = sendCmd(rh, CC.ApiGetServerOperators())
-
-    return when (r) {
-      is CR.ServerOperatorConditions -> r.conditions
-      else -> {
-        Log.e(TAG, "getServerOperators bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.ServerOperatorConditions) return r.res.conditions
+    Log.e(TAG, "getServerOperators bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun setServerOperators(rh: Long?, operators: List<ServerOperator>): ServerOperatorConditionsDetail? {
     val r = sendCmd(rh, CC.ApiSetServerOperators(operators))
-    return when (r) {
-      is CR.ServerOperatorConditions -> r.conditions
-      else -> {
-        Log.e(TAG, "setServerOperators bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.ServerOperatorConditions) return r.res.conditions
+    Log.e(TAG, "setServerOperators bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun getUserServers(rh: Long?): List<UserOperatorServers>? {
     val userId = currentUserId("getUserServers")
     val r = sendCmd(rh, CC.ApiGetUserServers(userId))
-    return when (r) {
-      is CR.UserServers -> r.userServers
-      else -> {
-        Log.e(TAG, "getUserServers bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.UserServers) return r.res.userServers
+    Log.e(TAG, "getUserServers bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun setUserServers(rh: Long?, userServers: List<UserOperatorServers>): Boolean {
     val userId = currentUserId("setUserServers")
     val r = sendCmd(rh, CC.ApiSetUserServers(userId, userServers))
-    return when (r) {
-      is CR.CmdOk -> true
-      else -> {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.failed_to_save_servers),
-          "${r.responseType}: ${r.details}"
-        )
-        Log.e(TAG, "setUserServers bad response: ${r.responseType} ${r.details}")
-        false
-      }
-    }
+    if (r.result is CR.CmdOk) return true
+    AlertManager.shared.showAlertMsg(
+      generalGetString(MR.strings.failed_to_save_servers),
+      "${r.responseType}: ${r.details}"
+    )
+    Log.e(TAG, "setUserServers bad response: ${r.responseType} ${r.details}")
+    return false
   }
 
   suspend fun validateServers(rh: Long?, userServers: List<UserOperatorServers>): List<UserServersError>? {
     val userId = currentUserId("validateServers")
     val r = sendCmd(rh, CC.ApiValidateServers(userId, userServers))
-    return when (r) {
-      is CR.UserServersValidation -> r.serverErrors
-      else -> {
-        Log.e(TAG, "validateServers bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.UserServersValidation) return r.res.serverErrors
+    Log.e(TAG, "validateServers bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun getUsageConditions(rh: Long?): Triple<UsageConditionsDetail, String?, UsageConditionsDetail?>? {
     val r = sendCmd(rh, CC.ApiGetUsageConditions())
-    return when (r) {
-      is CR.UsageConditions -> Triple(r.usageConditions, r.conditionsText, r.acceptedConditions)
-      else -> {
-        Log.e(TAG, "getUsageConditions bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.UsageConditions) return Triple(r.res.usageConditions, r.res.conditionsText, r.res.acceptedConditions)
+    Log.e(TAG, "getUsageConditions bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun setConditionsNotified(rh: Long?, conditionsId: Long): Boolean {
     val r = sendCmd(rh, CC.ApiSetConditionsNotified(conditionsId))
-    return when (r) {
-      is CR.CmdOk -> true
-      else -> {
-        Log.e(TAG, "setConditionsNotified bad response: ${r.responseType} ${r.details}")
-        false
-      }
-    }
+    if (r.result is CR.CmdOk) return true
+    Log.e(TAG, "setConditionsNotified bad response: ${r.responseType} ${r.details}")
+    return false
   }
 
   suspend fun acceptConditions(rh: Long?, conditionsId: Long, operatorIds: List<Long>): ServerOperatorConditionsDetail? {
     val r = sendCmd(rh, CC.ApiAcceptConditions(conditionsId, operatorIds))
-    return when (r) {
-      is CR.ServerOperatorConditions -> r.conditions
-      else -> {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.error_accepting_operator_conditions),
-          "${r.responseType}: ${r.details}"
-        )
-        Log.e(TAG, "acceptConditions bad response: ${r.responseType} ${r.details}")
-        null
-      }
-    }
+    if (r is API.Result && r.res is CR.ServerOperatorConditions) return r.res.conditions
+    AlertManager.shared.showAlertMsg(
+      generalGetString(MR.strings.error_accepting_operator_conditions),
+      "${r.responseType}: ${r.details}"
+    )
+    Log.e(TAG, "acceptConditions bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun getChatItemTTL(rh: Long?): ChatItemTTL {
     val userId = currentUserId("getChatItemTTL")
     val r = sendCmd(rh, CC.APIGetChatItemTTL(userId))
-    if (r is CR.ChatItemTTL) return ChatItemTTL.fromSeconds(r.chatItemTTL)
+    if (r is API.Result && r.res is CR.ChatItemTTL) {
+      return if (r.res.chatItemTTL != null) {
+        ChatItemTTL.fromSeconds(r.res.chatItemTTL)
+      } else {
+        ChatItemTTL.None
+      }
+    }
     throw Exception("failed to get chat item TTL: ${r.responseType} ${r.details}")
   }
 
   suspend fun setChatItemTTL(rh: Long?, chatItemTTL: ChatItemTTL) {
     val userId = currentUserId("setChatItemTTL")
     val r = sendCmd(rh, CC.APISetChatItemTTL(userId, chatItemTTL.seconds))
-    if (r is CR.CmdOk) return
+    if (r.result is CR.CmdOk) return
     throw Exception("failed to set chat item TTL: ${r.responseType} ${r.details}")
   }
 
+  suspend fun setChatTTL(rh: Long?, chatType: ChatType, id: Long, chatItemTTL: ChatItemTTL?) {
+    val userId = currentUserId("setChatTTL")
+    val r = sendCmd(rh, CC.APISetChatTTL(userId, chatType, id, chatItemTTL?.seconds))
+    if (r.result is CR.CmdOk) return
+    throw Exception("failed to set chat TTL: ${r.responseType} ${r.details}")
+  }
+
   suspend fun apiSetNetworkConfig(cfg: NetCfg, showAlertOnError: Boolean = true, ctrl: ChatCtrl? = null): Boolean {
     val r = sendCmd(null, CC.APISetNetworkConfig(cfg), ctrl)
-    return when (r) {
-      is CR.CmdOk -> true
-      else -> {
-        Log.e(TAG, "apiSetNetworkConfig bad response: ${r.responseType} ${r.details}")
-        if (showAlertOnError) {
-          AlertManager.shared.showAlertMsg(
-            generalGetString(MR.strings.error_setting_network_config),
-            "${r.responseType}: ${r.details}"
-          )
-        }
-        false
-      }
+    if (r.result is CR.CmdOk) return true
+    Log.e(TAG, "apiSetNetworkConfig bad response: ${r.responseType} ${r.details}")
+    if (showAlertOnError) {
+      AlertManager.shared.showAlertMsg(
+        generalGetString(MR.strings.error_setting_network_config),
+        "${r.responseType}: ${r.details}"
+      )
     }
+    return false
   }
 
   suspend fun reconnectServer(rh: Long?, server: String): Boolean {
     val userId = currentUserId("reconnectServer")
-
     return sendCommandOkResp(rh, CC.ReconnectServer(userId, server))
   }
 
@@ -1220,13 +1184,9 @@ object ChatController {
 
   suspend fun apiSetSettings(rh: Long?, type: ChatType, id: Long, settings: ChatSettings): Boolean {
     val r = sendCmd(rh, CC.APISetChatSettings(type, id, settings))
-    return when (r) {
-      is CR.CmdOk -> true
-      else -> {
-        Log.e(TAG, "apiSetSettings bad response: ${r.responseType} ${r.details}")
-        false
-      }
-    }
+    if (r.result is CR.CmdOk) return true
+    Log.e(TAG, "apiSetSettings bad response: ${r.responseType} ${r.details}")
+    return false
   }
 
   suspend fun apiSetNetworkInfo(networkInfo: UserNetworkInfo): Boolean =
@@ -1237,207 +1197,199 @@ object ChatController {
 
   suspend fun apiContactInfo(rh: Long?, contactId: Long): Pair<ConnectionStats?, Profile?>? {
     val r = sendCmd(rh, CC.APIContactInfo(contactId))
-    if (r is CR.ContactInfo) return r.connectionStats_ to r.customUserProfile
+    if (r is API.Result && r.res is CR.ContactInfo) return r.res.connectionStats_ to r.res.customUserProfile
     Log.e(TAG, "apiContactInfo bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiGroupMemberInfo(rh: Long?, groupId: Long, groupMemberId: Long): Pair<GroupMember, ConnectionStats?>? {
     val r = sendCmd(rh, CC.APIGroupMemberInfo(groupId, groupMemberId))
-    if (r is CR.GroupMemberInfo) return Pair(r.member, r.connectionStats_)
+    if (r is API.Result && r.res is CR.GroupMemberInfo) return r.res.member to r.res.connectionStats_
     Log.e(TAG, "apiGroupMemberInfo bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiContactQueueInfo(rh: Long?, contactId: Long): Pair<RcvMsgInfo?, ServerQueueInfo>? {
     val r = sendCmd(rh, CC.APIContactQueueInfo(contactId))
-    if (r is CR.QueueInfoR) return Pair(r.rcvMsgInfo, r.queueInfo)
+    if (r is API.Result && r.res is CR.QueueInfoR) return r.res.rcvMsgInfo to r.res.queueInfo
     apiErrorAlert("apiContactQueueInfo", generalGetString(MR.strings.error), r)
     return null
   }
 
   suspend fun apiGroupMemberQueueInfo(rh: Long?, groupId: Long, groupMemberId: Long): Pair<RcvMsgInfo?, ServerQueueInfo>? {
     val r = sendCmd(rh, CC.APIGroupMemberQueueInfo(groupId, groupMemberId))
-    if (r is CR.QueueInfoR) return Pair(r.rcvMsgInfo, r.queueInfo)
+    if (r is API.Result && r.res is CR.QueueInfoR) return r.res.rcvMsgInfo to r.res.queueInfo
     apiErrorAlert("apiGroupMemberQueueInfo", generalGetString(MR.strings.error), r)
     return null
   }
 
   suspend fun apiSwitchContact(rh: Long?, contactId: Long): ConnectionStats? {
     val r = sendCmd(rh, CC.APISwitchContact(contactId))
-    if (r is CR.ContactSwitchStarted) return r.connectionStats
+    if (r is API.Result && r.res is CR.ContactSwitchStarted) return r.res.connectionStats
     apiErrorAlert("apiSwitchContact", generalGetString(MR.strings.error_changing_address), r)
     return null
   }
 
   suspend fun apiSwitchGroupMember(rh: Long?, groupId: Long, groupMemberId: Long): Pair<GroupMember, ConnectionStats>? {
     val r = sendCmd(rh, CC.APISwitchGroupMember(groupId, groupMemberId))
-    if (r is CR.GroupMemberSwitchStarted) return Pair(r.member, r.connectionStats)
+    if (r is API.Result && r.res is CR.GroupMemberSwitchStarted) return r.res.member to r.res.connectionStats
     apiErrorAlert("apiSwitchGroupMember", generalGetString(MR.strings.error_changing_address), r)
     return null
   }
 
   suspend fun apiAbortSwitchContact(rh: Long?, contactId: Long): ConnectionStats? {
     val r = sendCmd(rh, CC.APIAbortSwitchContact(contactId))
-    if (r is CR.ContactSwitchAborted) return r.connectionStats
+    if (r is API.Result && r.res is CR.ContactSwitchAborted) return r.res.connectionStats
     apiErrorAlert("apiAbortSwitchContact", generalGetString(MR.strings.error_aborting_address_change), r)
     return null
   }
 
   suspend fun apiAbortSwitchGroupMember(rh: Long?, groupId: Long, groupMemberId: Long): Pair<GroupMember, ConnectionStats>? {
     val r = sendCmd(rh, CC.APIAbortSwitchGroupMember(groupId, groupMemberId))
-    if (r is CR.GroupMemberSwitchAborted) return Pair(r.member, r.connectionStats)
+    if (r is API.Result && r.res is CR.GroupMemberSwitchAborted) return r.res.member to r.res.connectionStats
     apiErrorAlert("apiAbortSwitchGroupMember", generalGetString(MR.strings.error_aborting_address_change), r)
     return null
   }
 
   suspend fun apiSyncContactRatchet(rh: Long?, contactId: Long, force: Boolean): ConnectionStats? {
     val r = sendCmd(rh, CC.APISyncContactRatchet(contactId, force))
-    if (r is CR.ContactRatchetSyncStarted) return r.connectionStats
+    if (r is API.Result && r.res is CR.ContactRatchetSyncStarted) return r.res.connectionStats
     apiErrorAlert("apiSyncContactRatchet", generalGetString(MR.strings.error_synchronizing_connection), r)
     return null
   }
 
   suspend fun apiSyncGroupMemberRatchet(rh: Long?, groupId: Long, groupMemberId: Long, force: Boolean): Pair<GroupMember, ConnectionStats>? {
     val r = sendCmd(rh, CC.APISyncGroupMemberRatchet(groupId, groupMemberId, force))
-    if (r is CR.GroupMemberRatchetSyncStarted) return Pair(r.member, r.connectionStats)
+    if (r is API.Result && r.res is CR.GroupMemberRatchetSyncStarted) return r.res.member to r.res.connectionStats
     apiErrorAlert("apiSyncGroupMemberRatchet", generalGetString(MR.strings.error_synchronizing_connection), r)
     return null
   }
 
   suspend fun apiGetContactCode(rh: Long?, contactId: Long): Pair<Contact, String>? {
     val r = sendCmd(rh, CC.APIGetContactCode(contactId))
-    if (r is CR.ContactCode) return r.contact to r.connectionCode
+    if (r is API.Result && r.res is CR.ContactCode) return r.res.contact to r.res.connectionCode
     Log.e(TAG,"failed to get contact code: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiGetGroupMemberCode(rh: Long?, groupId: Long, groupMemberId: Long): Pair<GroupMember, String>? {
     val r = sendCmd(rh, CC.APIGetGroupMemberCode(groupId, groupMemberId))
-    if (r is CR.GroupMemberCode) return r.member to r.connectionCode
+    if (r is API.Result && r.res is CR.GroupMemberCode) return r.res.member to r.res.connectionCode
     Log.e(TAG,"failed to get group member code: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiVerifyContact(rh: Long?, contactId: Long, connectionCode: String?): Pair<Boolean, String>? {
-    return when (val r = sendCmd(rh, CC.APIVerifyContact(contactId, connectionCode))) {
-      is CR.ConnectionVerified -> r.verified to r.expectedCode
-      else -> null
-    }
+    val r = sendCmd(rh, CC.APIVerifyContact(contactId, connectionCode))
+    if (r is API.Result && r.res is CR.ConnectionVerified) return r.res.verified to r.res.expectedCode
+    Log.e(TAG, "apiVerifyContact bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun apiVerifyGroupMember(rh: Long?, groupId: Long, groupMemberId: Long, connectionCode: String?): Pair<Boolean, String>? {
-    return when (val r = sendCmd(rh, CC.APIVerifyGroupMember(groupId, groupMemberId, connectionCode))) {
-      is CR.ConnectionVerified -> r.verified to r.expectedCode
-      else -> null
-    }
+    val r = sendCmd(rh, CC.APIVerifyGroupMember(groupId, groupMemberId, connectionCode))
+    if (r is API.Result && r.res is CR.ConnectionVerified) return r.res.verified to r.res.expectedCode
+    Log.e(TAG, "apiVerifyGroupMember bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
-
-
-  suspend fun apiAddContact(rh: Long?, incognito: Boolean): Pair<Pair<String, PendingContactConnection>?, (() -> Unit)?> {
+  suspend fun apiAddContact(rh: Long?, incognito: Boolean): Pair<Pair<CreatedConnLink, PendingContactConnection>?, (() -> Unit)?> {
     val userId = try { currentUserId("apiAddContact") } catch (e: Exception) { return null to null }
-    val r = sendCmd(rh, CC.APIAddContact(userId, incognito))
-    return when (r) {
-      is CR.Invitation -> (r.connReqInvitation to r.connection) to null
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          return null to { apiErrorAlert("apiAddContact", generalGetString(MR.strings.connection_error), r) }
-        }
-        null to null
-      }
+    val short = appPrefs.privacyShortLinks.get()
+    val r = sendCmd(rh, CC.APIAddContact(userId, short = short, incognito = incognito))
+    return when {
+      r is API.Result && r.res is CR.Invitation -> (r.res.connLinkInvitation to r.res.connection) to null
+      !(networkErrorAlert(r)) -> null to { apiErrorAlert("apiAddContact", generalGetString(MR.strings.connection_error), r) }
+      else -> null to null
     }
   }
 
   suspend fun apiSetConnectionIncognito(rh: Long?, connId: Long, incognito: Boolean): PendingContactConnection? {
     val r = sendCmd(rh, CC.ApiSetConnectionIncognito(connId, incognito))
-
-    return when (r) {
-      is CR.ConnectionIncognitoUpdated -> r.toConnection
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiSetConnectionIncognito", generalGetString(MR.strings.error_sending_message), r)
-        }
-        null
-      }
+    if (r is API.Result && r.res is CR.ConnectionIncognitoUpdated) return r.res.toConnection
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiSetConnectionIncognito", generalGetString(MR.strings.error_sending_message), r)
     }
+    return null
   }
 
   suspend fun apiChangeConnectionUser(rh: Long?, connId: Long, userId: Long): PendingContactConnection? {
     val r = sendCmd(rh, CC.ApiChangeConnectionUser(connId, userId))
-
-    return when (r) {
-      is CR.ConnectionUserChanged -> r.toConnection
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiChangeConnectionUser", generalGetString(MR.strings.error_sending_message), r)
-        }
-        null
-      }
+    if (r is API.Result && r.res is CR.ConnectionUserChanged) return r.res.toConnection
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiChangeConnectionUser", generalGetString(MR.strings.error_sending_message), r)
     }
-  }
-
-  suspend fun apiConnectPlan(rh: Long?, connReq: String): ConnectionPlan? {
-    val userId = kotlin.runCatching { currentUserId("apiConnectPlan") }.getOrElse { return null }
-    val r = sendCmd(rh, CC.APIConnectPlan(userId, connReq))
-    if (r is CR.CRConnectionPlan) return r.connectionPlan
-    Log.e(TAG, "apiConnectPlan bad response: ${r.responseType} ${r.details}")
     return null
   }
 
-  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection?  {
+  suspend fun apiConnectPlan(rh: Long?, connLink: String): Pair<CreatedConnLink, ConnectionPlan>? {
+    val userId = kotlin.runCatching { currentUserId("apiConnectPlan") }.getOrElse { return null }
+    val r = sendCmd(rh, CC.APIConnectPlan(userId, connLink))
+    if (r is API.Result && r.res is CR.CRConnectionPlan) return r.res.connLink to r.res.connectionPlan
+    apiConnectResponseAlert(r)
+    return null
+  }
+
+  suspend fun apiConnect(rh: Long?, incognito: Boolean, connLink: CreatedConnLink): PendingContactConnection?  {
     val userId = try { currentUserId("apiConnect") } catch (e: Exception) { return null }
-    val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq))
+    val r = sendCmd(rh, CC.APIConnect(userId, incognito, connLink))
     when {
-      r is CR.SentConfirmation -> return r.connection
-      r is CR.SentInvitation -> return r.connection
-      r is CR.ContactAlreadyExists -> {
+      r is API.Result && r.res is CR.SentConfirmation -> return r.res.connection
+      r is API.Result && r.res is CR.SentInvitation -> return r.res.connection
+      r is API.Result && r.res is CR.ContactAlreadyExists ->
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.contact_already_exists),
-          String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), r.contact.displayName)
+          String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), r.res.contact.displayName)
         )
-        return null
-      }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat
-          && r.chatError.errorType is ChatErrorType.InvalidConnReq -> {
+      else -> apiConnectResponseAlert(r)
+    }
+    return null
+  }
+
+  private fun apiConnectResponseAlert(r: API) {
+    when {
+      r is API.Error && r.err is ChatError.ChatErrorChat
+          && r.err.errorType is ChatErrorType.InvalidConnReq -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.invalid_connection_link),
           generalGetString(MR.strings.please_check_correct_link_and_maybe_ask_for_a_new_one)
         )
-        return null
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.AUTH -> {
+      r is API.Error && r.err is ChatError.ChatErrorChat
+          && r.err.errorType is ChatErrorType.UnsupportedConnReq -> {
+        AlertManager.shared.showAlertMsg(
+          generalGetString(MR.strings.unsupported_connection_link),
+          generalGetString(MR.strings.link_requires_newer_app_version_please_upgrade)
+        )
+      }
+      r is API.Error && r.err is ChatError.ChatErrorAgent
+          && r.err.agentError is AgentErrorType.SMP
+          && r.err.agentError.smpErr is SMPErrorType.AUTH -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error_auth),
           generalGetString(MR.strings.connection_error_auth_desc)
         )
-        return null
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.BLOCKED -> {
+      r is API.Error && r.err is ChatError.ChatErrorAgent
+          && r.err.agentError is AgentErrorType.SMP
+          && r.err.agentError.smpErr is SMPErrorType.BLOCKED -> {
         showContentBlockedAlert(
           generalGetString(MR.strings.connection_error_blocked),
-          generalGetString(MR.strings.connection_error_blocked_desc).format(r.chatError.agentError.smpErr.blockInfo.reason.text),
+          generalGetString(MR.strings.connection_error_blocked_desc).format(r.err.agentError.smpErr.blockInfo.reason.text),
         )
-        return null
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.QUOTA -> {
+      r is API.Error && r.err is ChatError.ChatErrorAgent
+          && r.err.agentError is AgentErrorType.SMP
+          && r.err.agentError.smpErr is SMPErrorType.QUOTA -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error_quota),
           generalGetString(MR.strings.connection_error_quota_desc)
         )
-        return null
       }
       else -> {
         if (!(networkErrorAlert(r))) {
           apiErrorAlert("apiConnect", generalGetString(MR.strings.connection_error), r)
         }
-        return null
       }
     }
   }
@@ -1445,22 +1397,18 @@ object ChatController {
   suspend fun apiConnectContactViaAddress(rh: Long?, incognito: Boolean, contactId: Long): Contact? {
     val userId = try { currentUserId("apiConnectContactViaAddress") } catch (e: Exception) { return null }
     val r = sendCmd(rh, CC.ApiConnectContactViaAddress(userId, incognito, contactId))
-    when {
-      r is CR.SentInvitationToContact -> return r.contact
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiConnectContactViaAddress", generalGetString(MR.strings.connection_error), r)
-        }
-        return null
-      }
+    if (r is API.Result && r.res is CR.SentInvitationToContact) return r.res.contact
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiConnectContactViaAddress", generalGetString(MR.strings.connection_error), r)
     }
+    return null
   }
 
   suspend fun deleteChat(chat: Chat, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)) {
     val cInfo = chat.chatInfo
     if (apiDeleteChat(rh = chat.remoteHostId, type = cInfo.chatType, id = cInfo.apiId, chatDeleteMode = chatDeleteMode)) {
-      withChats {
-        removeChat(chat.remoteHostId, cInfo.id)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.removeChat(chat.remoteHostId, cInfo.id)
       }
     }
   }
@@ -1468,10 +1416,11 @@ object ChatController {
   suspend fun apiDeleteChat(rh: Long?, type: ChatType, id: Long, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)): Boolean {
     chatModel.deletedChats.value += rh to type.type + id
     val r = sendCmd(rh, CC.ApiDeleteChat(type, id, chatDeleteMode))
+    val res = r.result
     val success = when {
-      r is CR.ContactDeleted && type == ChatType.Direct -> true
-      r is CR.ContactConnectionDeleted && type == ChatType.ContactConnection -> true
-      r is CR.GroupDeletedUser && type == ChatType.Group -> true
+      res is CR.ContactDeleted && type == ChatType.Direct -> true
+      res is CR.ContactConnectionDeleted && type == ChatType.ContactConnection -> true
+      res is CR.GroupDeletedUser && type == ChatType.Group -> true
       else -> {
         val titleId = when (type) {
           ChatType.Direct -> MR.strings.error_deleting_contact
@@ -1492,13 +1441,12 @@ object ChatController {
     val type = ChatType.Direct
     chatModel.deletedChats.value += rh to type.type + id
     val r = sendCmd(rh, CC.ApiDeleteChat(type, id, chatDeleteMode))
-    val contact = when {
-      r is CR.ContactDeleted -> r.contact
-      else -> {
-        val titleId = MR.strings.error_deleting_contact
-        apiErrorAlert("apiDeleteChat", generalGetString(titleId), r)
-        null
-      }
+    val contact = if (r is API.Result && r.res is CR.ContactDeleted) {
+      r.res.contact
+    } else {
+      val titleId = MR.strings.error_deleting_contact
+      apiErrorAlert("apiDeleteChat", generalGetString(titleId), r)
+      null
     }
     chatModel.deletedChats.value -= rh to type.type + id
     return contact
@@ -1508,11 +1456,11 @@ object ChatController {
     withBGApi {
       val updatedChatInfo = apiClearChat(chat.remoteHostId, chat.chatInfo.chatType, chat.chatInfo.apiId)
       if (updatedChatInfo != null) {
-        withChats {
-          clearChat(chat.remoteHostId, updatedChatInfo)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.clearChat(chat.remoteHostId, updatedChatInfo)
         }
-        withChats(MsgContentTag.Report) {
-          clearChat(chat.remoteHostId, updatedChatInfo)
+        withContext(Dispatchers.Main) {
+          chatModel.secondaryChatsContext.value?.clearChat(chat.remoteHostId, updatedChatInfo)
         }
         ntfManager.cancelNotificationsForChat(chat.chatInfo.id)
         close?.invoke()
@@ -1522,7 +1470,7 @@ object ChatController {
 
   suspend fun apiClearChat(rh: Long?, type: ChatType, id: Long): ChatInfo? {
     val r = sendCmd(rh, CC.ApiClearChat(type, id))
-    if (r is CR.ChatCleared) return r.chatInfo
+    if (r is API.Result && r.res is CR.ChatCleared) return r.res.chatInfo
     Log.e(TAG, "apiClearChat bad response: ${r.responseType} ${r.details}")
     return null
   }
@@ -1530,9 +1478,9 @@ object ChatController {
   suspend fun apiUpdateProfile(rh: Long?, profile: Profile): Pair<Profile, List<Contact>>? {
     val userId = kotlin.runCatching { currentUserId("apiUpdateProfile") }.getOrElse { return null }
     val r = sendCmd(rh, CC.ApiUpdateProfile(userId, profile))
-    if (r is CR.UserProfileNoChange) return profile to emptyList()
-    if (r is CR.UserProfileUpdated) return r.toProfile to r.updateSummary.changedContacts
-    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName) {
+    if (r is API.Result && r.res is CR.UserProfileNoChange) return profile to emptyList()
+    if (r is API.Result && r.res is CR.UserProfileUpdated) return r.res.toProfile to r.res.updateSummary.changedContacts
+    if (r is API.Error && r.err is ChatError.ChatErrorStore && r.err.storeError is StoreError.DuplicateName) {
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_create_user_duplicate_title), generalGetString(MR.strings.failed_to_create_user_duplicate_desc))
     }
     Log.e(TAG, "apiUpdateProfile bad response: ${r.responseType} ${r.details}")
@@ -1541,73 +1489,70 @@ object ChatController {
 
   suspend fun apiSetProfileAddress(rh: Long?, on: Boolean): User? {
     val userId = try { currentUserId("apiSetProfileAddress") } catch (e: Exception) { return null }
-    return when (val r = sendCmd(rh, CC.ApiSetProfileAddress(userId, on))) {
-      is CR.UserProfileNoChange -> null
-      is CR.UserProfileUpdated -> r.user.updateRemoteHostId(rh)
+    val r = sendCmd(rh, CC.ApiSetProfileAddress(userId, on))
+    return when {
+      r is API.Result && r.res is CR.UserProfileNoChange -> null
+      r is API.Result && r.res is CR.UserProfileUpdated -> r.res.user.updateRemoteHostId(rh)
       else -> throw Exception("failed to set profile address: ${r.responseType} ${r.details}")
     }
   }
 
   suspend fun apiSetContactPrefs(rh: Long?, contactId: Long, prefs: ChatPreferences): Contact? {
     val r = sendCmd(rh, CC.ApiSetContactPrefs(contactId, prefs))
-    if (r is CR.ContactPrefsUpdated) return r.toContact
+    if (r is API.Result && r.res is CR.ContactPrefsUpdated) return r.res.toContact
     Log.e(TAG, "apiSetContactPrefs bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiSetContactAlias(rh: Long?, contactId: Long, localAlias: String): Contact? {
     val r = sendCmd(rh, CC.ApiSetContactAlias(contactId, localAlias))
-    if (r is CR.ContactAliasUpdated) return r.toContact
+    if (r is API.Result && r.res is CR.ContactAliasUpdated) return r.res.toContact
     Log.e(TAG, "apiSetContactAlias bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiSetGroupAlias(rh: Long?, groupId: Long, localAlias: String): GroupInfo? {
     val r = sendCmd(rh, CC.ApiSetGroupAlias(groupId, localAlias))
-    if (r is CR.GroupAliasUpdated) return r.toGroup
+    if (r is API.Result && r.res is CR.GroupAliasUpdated) return r.res.toGroup
     Log.e(TAG, "apiSetGroupAlias bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiSetConnectionAlias(rh: Long?, connId: Long, localAlias: String): PendingContactConnection? {
     val r = sendCmd(rh, CC.ApiSetConnectionAlias(connId, localAlias))
-    if (r is CR.ConnectionAliasUpdated) return r.toConnection
+    if (r is API.Result && r.res is CR.ConnectionAliasUpdated) return r.res.toConnection
     Log.e(TAG, "apiSetConnectionAlias bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiSetUserUIThemes(rh: Long?, userId: Long, themes: ThemeModeOverrides?): Boolean {
     val r = sendCmd(rh, CC.ApiSetUserUIThemes(userId, themes))
-    if (r is CR.CmdOk) return true
+    if (r.result is CR.CmdOk) return true
     Log.e(TAG, "apiSetUserUIThemes bad response: ${r.responseType} ${r.details}")
     return false
   }
 
   suspend fun apiSetChatUIThemes(rh: Long?, chatId: ChatId, themes: ThemeModeOverrides?): Boolean {
     val r = sendCmd(rh, CC.ApiSetChatUIThemes(chatId, themes))
-    if (r is CR.CmdOk) return true
+    if (r.result is CR.CmdOk) return true
     Log.e(TAG, "apiSetChatUIThemes bad response: ${r.responseType} ${r.details}")
     return false
   }
 
-  suspend fun apiCreateUserAddress(rh: Long?): String? {
+  suspend fun apiCreateUserAddress(rh: Long?, short: Boolean): CreatedConnLink? {
     val userId = kotlin.runCatching { currentUserId("apiCreateUserAddress") }.getOrElse { return null }
-    val r = sendCmd(rh, CC.ApiCreateMyAddress(userId))
-    return when (r) {
-      is CR.UserContactLinkCreated -> r.connReqContact
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiCreateUserAddress", generalGetString(MR.strings.error_creating_address), r)
-        }
-        null
-      }
+    val r = sendCmd(rh, CC.ApiCreateMyAddress(userId, short))
+    if (r is API.Result && r.res is CR.UserContactLinkCreated) return r.res.connLinkContact
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiCreateUserAddress", generalGetString(MR.strings.error_creating_address), r)
     }
+    return null
   }
 
   suspend fun apiDeleteUserAddress(rh: Long?): User? {
     val userId = try { currentUserId("apiDeleteUserAddress") } catch (e: Exception) { return null }
     val r = sendCmd(rh, CC.ApiDeleteMyAddress(userId))
-    if (r is CR.UserContactLinkDeleted) return r.user.updateRemoteHostId(rh)
+    if (r is API.Result && r.res is CR.UserContactLinkDeleted) return r.res.user.updateRemoteHostId(rh)
     Log.e(TAG, "apiDeleteUserAddress bad response: ${r.responseType} ${r.details}")
     return null
   }
@@ -1615,9 +1560,9 @@ object ChatController {
   private suspend fun apiGetUserAddress(rh: Long?): UserContactLinkRec? {
     val userId = kotlin.runCatching { currentUserId("apiGetUserAddress") }.getOrElse { return null }
     val r = sendCmd(rh, CC.ApiShowMyAddress(userId))
-    if (r is CR.UserContactLink) return r.contactLink
-    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
-      && r.chatError.storeError is StoreError.UserContactLinkNotFound
+    if (r is API.Result && r.res is CR.UserContactLink) return r.res.contactLink
+    if (r is API.Error && r.err is ChatError.ChatErrorStore
+      && r.err.storeError is StoreError.UserContactLinkNotFound
     ) {
       return null
     }
@@ -1625,12 +1570,22 @@ object ChatController {
     return null
   }
 
+  suspend fun apiAddMyAddressShortLink(rh: Long?): UserContactLinkRec? {
+    val userId = kotlin.runCatching { currentUserId("apiAddMyAddressShortLink") }.getOrElse { return null }
+    val r = sendCmd(rh, CC.ApiAddMyAddressShortLink(userId))
+    if (r is API.Result && r.res is CR.UserContactLink) return r.res.contactLink
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiAddMyAddressShortLink", generalGetString(MR.strings.error_creating_address), r)
+    }
+    return null
+  }
+
   suspend fun userAddressAutoAccept(rh: Long?, autoAccept: AutoAccept?): UserContactLinkRec? {
     val userId = kotlin.runCatching { currentUserId("userAddressAutoAccept") }.getOrElse { return null }
     val r = sendCmd(rh, CC.ApiAddressAutoAccept(userId, autoAccept))
-    if (r is CR.UserContactLinkUpdated) return r.contactLink
-    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
-      && r.chatError.storeError is StoreError.UserContactLinkNotFound
+    if (r is API.Result && r.res is CR.UserContactLinkUpdated) return r.res.contactLink
+    if (r is API.Error && r.err is ChatError.ChatErrorStore
+      && r.err.storeError is StoreError.UserContactLinkNotFound
     ) {
       return null
     }
@@ -1641,10 +1596,10 @@ object ChatController {
   suspend fun apiAcceptContactRequest(rh: Long?, incognito: Boolean, contactReqId: Long): Contact? {
     val r = sendCmd(rh, CC.ApiAcceptContact(incognito, contactReqId))
     return when {
-      r is CR.AcceptingContactRequest -> r.contact
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.AUTH -> {
+      r is API.Result && r.res is CR.AcceptingContactRequest -> r.res.contact
+      r is API.Error && r.err is ChatError.ChatErrorAgent
+          && r.err.agentError is AgentErrorType.SMP
+          && r.err.agentError.smpErr is SMPErrorType.AUTH -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error_auth),
           generalGetString(MR.strings.sender_may_have_deleted_the_connection_request)
@@ -1662,89 +1617,89 @@ object ChatController {
 
   suspend fun apiRejectContactRequest(rh: Long?, contactReqId: Long): Boolean {
     val r = sendCmd(rh, CC.ApiRejectContact(contactReqId))
-    if (r is CR.ContactRequestRejected) return true
+    if (r is API.Result && r.res is CR.ContactRequestRejected) return true
     Log.e(TAG, "apiRejectContactRequest bad response: ${r.responseType} ${r.details}")
     return false
   }
 
   suspend fun apiGetCallInvitations(rh: Long?): List<RcvCallInvitation> {
     val r = sendCmd(rh, CC.ApiGetCallInvitations())
-    if (r is CR.CallInvitations) return r.callInvitations
+    if (r is API.Result && r.res is CR.CallInvitations) return r.res.callInvitations
     Log.e(TAG, "apiGetCallInvitations bad response: ${r.responseType} ${r.details}")
     return emptyList()
   }
 
   suspend fun apiSendCallInvitation(rh: Long?, contact: Contact, callType: CallType): Boolean {
     val r = sendCmd(rh, CC.ApiSendCallInvitation(contact, callType))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiRejectCall(rh: Long?, contact: Contact): Boolean {
     val r = sendCmd(rh, CC.ApiRejectCall(contact))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiSendCallOffer(rh: Long?, contact: Contact, rtcSession: String, rtcIceCandidates: String, media: CallMediaType, capabilities: CallCapabilities): Boolean {
     val webRtcSession = WebRTCSession(rtcSession, rtcIceCandidates)
     val callOffer = WebRTCCallOffer(CallType(media, capabilities), webRtcSession)
     val r = sendCmd(rh, CC.ApiSendCallOffer(contact, callOffer))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiSendCallAnswer(rh: Long?, contact: Contact, rtcSession: String, rtcIceCandidates: String): Boolean {
     val answer = WebRTCSession(rtcSession, rtcIceCandidates)
     val r = sendCmd(rh, CC.ApiSendCallAnswer(contact, answer))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiSendCallExtraInfo(rh: Long?, contact: Contact, rtcIceCandidates: String): Boolean {
     val extraInfo = WebRTCExtraInfo(rtcIceCandidates)
     val r = sendCmd(rh, CC.ApiSendCallExtraInfo(contact, extraInfo))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiEndCall(rh: Long?, contact: Contact): Boolean {
     val r = sendCmd(rh, CC.ApiEndCall(contact))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiCallStatus(rh: Long?, contact: Contact, status: WebRTCCallStatus): Boolean {
     val r = sendCmd(rh, CC.ApiCallStatus(contact, status))
-    return r is CR.CmdOk
+    return r.result is CR.CmdOk
   }
 
   suspend fun apiGetNetworkStatuses(rh: Long?): List<ConnNetworkStatus>? {
     val r = sendCmd(rh, CC.ApiGetNetworkStatuses())
-    if (r is CR.NetworkStatuses) return r.networkStatuses
+    if (r is API.Result && r.res is CR.NetworkStatuses) return r.res.networkStatuses
     Log.e(TAG, "apiGetNetworkStatuses bad response: ${r.responseType} ${r.details}")
     return null
   }
 
-  suspend fun apiChatRead(rh: Long?, type: ChatType, id: Long): Boolean {
-    val r = sendCmd(rh, CC.ApiChatRead(type, id))
-    if (r is CR.CmdOk) return true
+  suspend fun apiChatRead(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?): Boolean {
+    val r = sendCmd(rh, CC.ApiChatRead(type, id, scope))
+    if (r.result is CR.CmdOk) return true
     Log.e(TAG, "apiChatRead bad response: ${r.responseType} ${r.details}")
     return false
   }
 
-  suspend fun apiChatItemsRead(rh: Long?, type: ChatType, id: Long, itemIds: List<Long>): Boolean {
-    val r = sendCmd(rh, CC.ApiChatItemsRead(type, id, itemIds))
-    if (r is CR.CmdOk) return true
+  suspend fun apiChatItemsRead(rh: Long?, type: ChatType, id: Long, scope: GroupChatScope?, itemIds: List<Long>): ChatInfo? {
+    val r = sendCmd(rh, CC.ApiChatItemsRead(type, id, scope, itemIds))
+    if (r is API.Result && r.res is CR.ItemsReadForChat) return r.res.chatInfo
     Log.e(TAG, "apiChatItemsRead bad response: ${r.responseType} ${r.details}")
-    return false
+    return null
   }
 
   suspend fun apiChatUnread(rh: Long?, type: ChatType, id: Long, unreadChat: Boolean): Boolean {
     val r = sendCmd(rh, CC.ApiChatUnread(type, id, unreadChat))
-    if (r is CR.CmdOk) return true
+    if (r.result is CR.CmdOk) return true
     Log.e(TAG, "apiChatUnread bad response: ${r.responseType} ${r.details}")
     return false
   }
 
   suspend fun uploadStandaloneFile(user: UserLike, file: CryptoFile, ctrl: ChatCtrl? = null): Pair<FileTransferMeta?, String?> {
     val r = sendCmd(null, CC.ApiUploadStandaloneFile(user.userId, file), ctrl)
-    return if (r is CR.SndStandaloneFileCreated) {
-      r.fileTransferMeta to null
+    return if (r is API.Result && r.res is CR.SndStandaloneFileCreated) {
+      r.res.fileTransferMeta to null
     } else {
       Log.e(TAG, "uploadStandaloneFile error: $r")
       null to r.toString()
@@ -1753,8 +1708,8 @@ object ChatController {
 
   suspend fun downloadStandaloneFile(user: UserLike, url: String, file: CryptoFile, ctrl: ChatCtrl? = null): Pair<RcvFileTransfer?, String?> {
     val r = sendCmd(null, CC.ApiDownloadStandaloneFile(user.userId, url, file), ctrl)
-    return if (r is CR.RcvStandaloneFileCreated) {
-      r.rcvFileTransfer to null
+    return if (r is API.Result && r.res is CR.RcvStandaloneFileCreated) {
+      r.res.rcvFileTransfer to null
     } else {
       Log.e(TAG, "downloadStandaloneFile error: $r")
       null to r.toString()
@@ -1763,8 +1718,8 @@ object ChatController {
 
   suspend fun standaloneFileInfo(url: String, ctrl: ChatCtrl? = null): MigrationFileLinkData? {
     val r = sendCmd(null, CC.ApiStandaloneFileInfo(url), ctrl)
-    return if (r is CR.StandaloneFileInfo) {
-      r.fileMeta
+    return if (r is API.Result && r.res is CR.StandaloneFileInfo) {
+      r.res.fileMeta
     } else {
       Log.e(TAG, "standaloneFileInfo error: $r")
       null
@@ -1774,7 +1729,7 @@ object ChatController {
   suspend fun receiveFiles(rhId: Long?, user: UserLike, fileIds: List<Long>, userApprovedRelays: Boolean = false, auto: Boolean = false) {
     val fileIdsToApprove = mutableListOf<Long>()
     val srvsToApprove = mutableSetOf<String>()
-    val otherFileErrs = mutableListOf<CR>()
+    val otherFileErrs = mutableListOf<API>()
 
     for (fileId in fileIds) {
       val r = sendCmd(
@@ -1785,10 +1740,10 @@ object ChatController {
           inline = null
         )
       )
-      if (r is CR.RcvFileAccepted) {
-        chatItemSimpleUpdate(rhId, user, r.chatItem)
+      if (r is API.Result && r.res is CR.RcvFileAccepted) {
+        chatItemSimpleUpdate(rhId, user, r.res.chatItem)
       } else {
-        val maybeChatError = chatError(r)
+        val maybeChatError = apiChatErrorType(r)
         if (maybeChatError is ChatErrorType.FileNotApproved) {
           fileIdsToApprove.add(maybeChatError.fileId)
           srvsToApprove.addAll(maybeChatError.unknownServers.map { serverHostname(it) })
@@ -1816,21 +1771,19 @@ object ChatController {
           }
         )
       } else if (otherFileErrs.size == 1) { // If there is a single other error, we differentiate on it
-        when (val errCR = otherFileErrs.first()) {
-          is CR.RcvFileAcceptedSndCancelled -> {
-            Log.d(TAG, "receiveFiles error: sender cancelled file transfer")
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.cannot_receive_file),
-              generalGetString(MR.strings.sender_cancelled_file_transfer)
-            )
-          }
-          else -> {
-            val maybeChatError = chatError(errCR)
-            if (maybeChatError is ChatErrorType.FileCancelled || maybeChatError is ChatErrorType.FileAlreadyReceiving) {
-              Log.d(TAG, "receiveFiles ignoring FileCancelled or FileAlreadyReceiving error")
-            } else {
-              apiErrorAlert("receiveFiles", generalGetString(MR.strings.error_receiving_file), errCR)
-            }
+        val errCR = otherFileErrs.first()
+        if (errCR is API.Result && errCR.res is CR.RcvFileAcceptedSndCancelled) {
+          Log.d(TAG, "receiveFiles error: sender cancelled file transfer")
+          AlertManager.shared.showAlertMsg(
+            generalGetString(MR.strings.cannot_receive_file),
+            generalGetString(MR.strings.sender_cancelled_file_transfer)
+          )
+        } else {
+          val maybeChatError = apiChatErrorType(errCR)
+          if (maybeChatError is ChatErrorType.FileCancelled || maybeChatError is ChatErrorType.FileAlreadyReceiving) {
+            Log.d(TAG, "receiveFiles ignoring FileCancelled or FileAlreadyReceiving error")
+          } else {
+            apiErrorAlert("receiveFiles", generalGetString(MR.strings.error_receiving_file), errCR)
           }
         }
       } else if (otherFileErrs.size > 1) { // If there are multiple other errors, we show general alert
@@ -1846,7 +1799,7 @@ object ChatController {
 
   private fun showFilesToApproveAlert(
     srvsToApprove: Set<String>,
-    otherFileErrs: List<CR>,
+    otherFileErrs: List<API>,
     approveFiles: (() -> Unit)
   ) {
     val srvsToApproveStr = srvsToApprove.sorted().joinToString(separator = ", ")
@@ -1909,9 +1862,9 @@ object ChatController {
 
   suspend fun apiCancelFile(rh: Long?, fileId: Long, ctrl: ChatCtrl? = null): AChatItem? {
     val r = sendCmd(rh, CC.CancelFile(fileId), ctrl)
-    return when (r) {
-      is CR.SndFileCancelled -> r.chatItem_
-      is CR.RcvFileCancelled -> r.chatItem_
+    return when {
+      r is API.Result && r.res is CR.SndFileCancelled -> r.res.chatItem_
+      r is API.Result && r.res is CR.RcvFileCancelled -> r.res.chatItem_
       else -> {
         Log.d(TAG, "apiCancelFile bad response: ${r.responseType} ${r.details}")
         null
@@ -1922,34 +1875,32 @@ object ChatController {
   suspend fun apiNewGroup(rh: Long?, incognito: Boolean, groupProfile: GroupProfile): GroupInfo? {
     val userId = kotlin.runCatching { currentUserId("apiNewGroup") }.getOrElse { return null }
     val r = sendCmd(rh, CC.ApiNewGroup(userId, incognito, groupProfile))
-    if (r is CR.GroupCreated) return r.groupInfo
+    if (r is API.Result && r.res is CR.GroupCreated) return r.res.groupInfo
     Log.e(TAG, "apiNewGroup bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiAddMember(rh: Long?, groupId: Long, contactId: Long, memberRole: GroupMemberRole): GroupMember? {
     val r = sendCmd(rh, CC.ApiAddMember(groupId, contactId, memberRole))
-    return when (r) {
-      is CR.SentGroupInvitation -> r.member
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiAddMember", generalGetString(MR.strings.error_adding_members), r)
-        }
-        null
-      }
+    if (r is API.Result && r.res is CR.SentGroupInvitation) return r.res.member
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiAddMember", generalGetString(MR.strings.error_adding_members), r)
     }
+    return null
   }
 
   suspend fun apiJoinGroup(rh: Long?, groupId: Long) {
     val r = sendCmd(rh, CC.ApiJoinGroup(groupId))
-    when (r) {
-      is CR.UserAcceptedGroupSent ->
-        withChats {
-          updateGroup(rh, r.groupInfo)
+    when {
+      r is API.Result && r.res is CR.UserAcceptedGroupSent ->
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rh, r.res.groupInfo)
+        }
+      r is API.Error -> {
+        val e = r.err
+        suspend fun deleteGroup() { if (apiDeleteChat(rh, ChatType.Group, groupId)) {
+          withContext(Dispatchers.Main) { chatModel.chatsContext.removeChat(rh, "#$groupId") } }
         }
-      is CR.ChatCmdError -> {
-        val e = r.chatError
-        suspend fun deleteGroup() { if (apiDeleteChat(rh, ChatType.Group, groupId)) { withChats { removeChat(rh, "#$groupId") } } }
         if (e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.SMP && e.agentError.smpErr is SMPErrorType.AUTH) {
           deleteGroup()
           AlertManager.shared.showAlertMsg(generalGetString(MR.strings.alert_title_group_invitation_expired), generalGetString(MR.strings.alert_message_group_invitation_expired))
@@ -1964,58 +1915,69 @@ object ChatController {
     }
   }
 
-  suspend fun apiRemoveMember(rh: Long?, groupId: Long, memberId: Long): GroupMember? =
-    when (val r = sendCmd(rh, CC.ApiRemoveMember(groupId, memberId))) {
-      is CR.UserDeletedMember -> r.member
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiRemoveMember", generalGetString(MR.strings.error_removing_member), r)
-        }
-        null
-      }
+  suspend fun apiAcceptMember(rh: Long?, groupId: Long, groupMemberId: Long, memberRole: GroupMemberRole): Pair<GroupInfo, GroupMember>? {
+    val r = sendCmd(rh, CC.ApiAcceptMember(groupId, groupMemberId, memberRole))
+    if (r is API.Result && r.res is CR.MemberAccepted) return r.res.groupInfo to r.res.member
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiAcceptMember", generalGetString(MR.strings.error_accepting_member), r)
     }
+    return null
+  }
 
-  suspend fun apiMemberRole(rh: Long?, groupId: Long, memberId: Long, memberRole: GroupMemberRole): GroupMember =
-    when (val r = sendCmd(rh, CC.ApiMemberRole(groupId, memberId, memberRole))) {
-      is CR.MemberRoleUser -> r.member
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiMemberRole", generalGetString(MR.strings.error_changing_role), r)
-        }
-        throw Exception("failed to change member role: ${r.responseType} ${r.details}")
-      }
-    }
+  suspend fun apiDeleteMemberSupportChat(rh: Long?, groupId: Long, groupMemberId: Long): Pair<GroupInfo, GroupMember>? {
+    val r = sendCmd(rh, CC.ApiDeleteMemberSupportChat(groupId, groupMemberId))
+    if (r is API.Result && r.res is CR.MemberSupportChatDeleted) return r.res.groupInfo to r.res.member
+    apiErrorAlert("apiDeleteMemberSupportChat", generalGetString(MR.strings.error_deleting_member_support_chat), r)
+    return null
+  }
 
-  suspend fun apiBlockMemberForAll(rh: Long?, groupId: Long, memberId: Long, blocked: Boolean): GroupMember =
-    when (val r = sendCmd(rh, CC.ApiBlockMemberForAll(groupId, memberId, blocked))) {
-      is CR.MemberBlockedForAllUser -> r.member
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiBlockMemberForAll", generalGetString(MR.strings.error_blocking_member_for_all), r)
-        }
-        throw Exception("failed to block member for all: ${r.responseType} ${r.details}")
-      }
+  suspend fun apiRemoveMembers(rh: Long?, groupId: Long, memberIds: List<Long>, withMessages: Boolean = false): Pair<GroupInfo, List<GroupMember>>? {
+    val r = sendCmd(rh, CC.ApiRemoveMembers(groupId, memberIds, withMessages))
+    if (r is API.Result && r.res is CR.UserDeletedMembers) return r.res.groupInfo to r.res.members
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiRemoveMembers", generalGetString(MR.strings.error_removing_member), r)
     }
+    return null
+  }
+
+  suspend fun apiMembersRole(rh: Long?, groupId: Long, memberIds: List<Long>, memberRole: GroupMemberRole): List<GroupMember> {
+    val r = sendCmd(rh, CC.ApiMembersRole(groupId, memberIds, memberRole))
+    if (r is API.Result && r.res is CR.MembersRoleUser) return r.res.members
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiMembersRole", generalGetString(MR.strings.error_changing_role), r)
+    }
+    throw Exception("failed to change member role: ${r.responseType} ${r.details}")
+  }
+
+  suspend fun apiBlockMembersForAll(rh: Long?, groupId: Long, memberIds: List<Long>, blocked: Boolean): List<GroupMember> {
+    val r = sendCmd(rh, CC.ApiBlockMembersForAll(groupId, memberIds, blocked))
+    if (r is API.Result && r.res is CR.MembersBlockedForAllUser) return r.res.members
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiBlockMembersForAll", generalGetString(MR.strings.error_blocking_member_for_all), r)
+    }
+    throw Exception("failed to block member for all: ${r.responseType} ${r.details}")
+  }
 
   suspend fun apiLeaveGroup(rh: Long?, groupId: Long): GroupInfo? {
     val r = sendCmd(rh, CC.ApiLeaveGroup(groupId))
-    if (r is CR.LeftMemberUser) return r.groupInfo
+    if (r is API.Result && r.res is CR.LeftMemberUser) return r.res.groupInfo
     Log.e(TAG, "apiLeaveGroup bad response: ${r.responseType} ${r.details}")
     return null
   }
 
   suspend fun apiListMembers(rh: Long?, groupId: Long): List<GroupMember> {
     val r = sendCmd(rh, CC.ApiListMembers(groupId))
-    if (r is CR.GroupMembers) return r.group.members
+    if (r is API.Result && r.res is CR.GroupMembers) return r.res.group.members
     Log.e(TAG, "apiListMembers bad response: ${r.responseType} ${r.details}")
     return emptyList()
   }
 
   suspend fun apiUpdateGroup(rh: Long?, groupId: Long, groupProfile: GroupProfile): GroupInfo? {
-    return when (val r = sendCmd(rh, CC.ApiUpdateGroupProfile(groupId, groupProfile))) {
-      is CR.GroupUpdated -> r.toGroup
-      is CR.ChatCmdError -> {
-        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_saving_group_profile), "$r.chatError")
+    val r = sendCmd(rh, CC.ApiUpdateGroupProfile(groupId, groupProfile))
+    return when {
+      r is API.Result && r.res is CR.GroupUpdated -> r.res.toGroup
+      r is API.Error -> {
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_saving_group_profile), "$r.err")
         null
       }
       else -> {
@@ -2029,82 +1991,74 @@ object ChatController {
     }
   }
 
-  suspend fun apiCreateGroupLink(rh: Long?, groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<String, GroupMemberRole>? {
-    return when (val r = sendCmd(rh, CC.APICreateGroupLink(groupId, memberRole))) {
-      is CR.GroupLinkCreated -> r.connReqContact to r.memberRole
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiCreateGroupLink", generalGetString(MR.strings.error_creating_link_for_group), r)
-        }
-        null
-      }
+  suspend fun apiCreateGroupLink(rh: Long?, groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<CreatedConnLink, GroupMemberRole>? {
+    val short = appPrefs.privacyShortLinks.get()
+    val r = sendCmd(rh, CC.APICreateGroupLink(groupId, memberRole, short))
+    if (r is API.Result && r.res is CR.GroupLinkCreated) return r.res.connLinkContact to r.res.memberRole
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiCreateGroupLink", generalGetString(MR.strings.error_creating_link_for_group), r)
     }
+    return null
   }
 
-  suspend fun apiGroupLinkMemberRole(rh: Long?, groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<String, GroupMemberRole>? {
-    return when (val r = sendCmd(rh, CC.APIGroupLinkMemberRole(groupId, memberRole))) {
-      is CR.GroupLink -> r.connReqContact to r.memberRole
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiGroupLinkMemberRole", generalGetString(MR.strings.error_updating_link_for_group), r)
-        }
-        null
-      }
+  suspend fun apiGroupLinkMemberRole(rh: Long?, groupId: Long, memberRole: GroupMemberRole = GroupMemberRole.Member): Pair<CreatedConnLink, GroupMemberRole>? {
+    val r = sendCmd(rh, CC.APIGroupLinkMemberRole(groupId, memberRole))
+    if (r is API.Result && r.res is CR.GroupLink) return r.res.connLinkContact to r.res.memberRole
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiGroupLinkMemberRole", generalGetString(MR.strings.error_updating_link_for_group), r)
     }
+    return null
   }
 
   suspend fun apiDeleteGroupLink(rh: Long?, groupId: Long): Boolean {
-    return when (val r = sendCmd(rh, CC.APIDeleteGroupLink(groupId))) {
-      is CR.GroupLinkDeleted -> true
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiDeleteGroupLink", generalGetString(MR.strings.error_deleting_link_for_group), r)
-        }
-        false
-      }
+    val r = sendCmd(rh, CC.APIDeleteGroupLink(groupId))
+    if (r is API.Result && r.res is CR.GroupLinkDeleted) return true
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiDeleteGroupLink", generalGetString(MR.strings.error_deleting_link_for_group), r)
     }
+    return false
   }
 
-  suspend fun apiGetGroupLink(rh: Long?, groupId: Long): Pair<String, GroupMemberRole>? {
-    return when (val r = sendCmd(rh, CC.APIGetGroupLink(groupId))) {
-      is CR.GroupLink -> r.connReqContact to r.memberRole
-      else -> {
-        Log.e(TAG, "apiGetGroupLink bad response: ${r.responseType} ${r.details}")
-        null
-      }
+  suspend fun apiGetGroupLink(rh: Long?, groupId: Long): Pair<CreatedConnLink, GroupMemberRole>? {
+    val r = sendCmd(rh, CC.APIGetGroupLink(groupId))
+    if (r is API.Result && r.res is CR.GroupLink) return r.res.connLinkContact to r.res.memberRole
+    Log.e(TAG, "apiGetGroupLink bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiAddGroupShortLink(rh: Long?, groupId: Long): Pair<CreatedConnLink, GroupMemberRole>? {
+    val r = sendCmd(rh, CC.ApiAddGroupShortLink(groupId))
+    if (r is API.Result && r.res is CR.GroupLink) return r.res.connLinkContact to r.res.memberRole
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiAddGroupShortLink", generalGetString(MR.strings.error_creating_link_for_group), r)
     }
+    return null
   }
 
   suspend fun apiCreateMemberContact(rh: Long?, groupId: Long, groupMemberId: Long): Contact? {
-    return when (val r = sendCmd(rh, CC.APICreateMemberContact(groupId, groupMemberId))) {
-      is CR.NewMemberContact -> r.contact
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiCreateMemberContact", generalGetString(MR.strings.error_creating_member_contact), r)
-        }
-        null
-      }
+    val r = sendCmd(rh, CC.APICreateMemberContact(groupId, groupMemberId))
+    if (r is API.Result && r.res is CR.NewMemberContact) return r.res.contact
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiCreateMemberContact", generalGetString(MR.strings.error_creating_member_contact), r)
     }
+    return null
   }
 
   suspend fun apiSendMemberContactInvitation(rh: Long?, contactId: Long, mc: MsgContent): Contact? {
-    return when (val r = sendCmd(rh, CC.APISendMemberContactInvitation(contactId, mc))) {
-      is CR.NewMemberContactSentInv -> r.contact
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiSendMemberContactInvitation", generalGetString(MR.strings.error_sending_message_contact_invitation), r)
-        }
-        null
-      }
+    val r = sendCmd(rh, CC.APISendMemberContactInvitation(contactId, mc))
+    if (r is API.Result && r.res is CR.NewMemberContactSentInv) return r.res.contact
+    if (!(networkErrorAlert(r))) {
+      apiErrorAlert("apiSendMemberContactInvitation", generalGetString(MR.strings.error_sending_message_contact_invitation), r)
     }
+    return null
   }
 
   suspend fun allowFeatureToContact(rh: Long?, contact: Contact, feature: ChatFeature, param: Int? = null) {
     val prefs = contact.mergedPreferences.toPreferences().setAllowed(feature, param = param)
     val toContact = apiSetContactPrefs(rh, contact.contactId, prefs)
     if (toContact != null) {
-      withChats {
-        updateContact(rh, toContact)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateContact(rh, toContact)
       }
     }
   }
@@ -2113,7 +2067,7 @@ object ChatController {
 
   suspend fun listRemoteHosts(): List<RemoteHostInfo>? {
     val r = sendCmd(null, CC.ListRemoteHosts())
-    if (r is CR.RemoteHostList) return r.remoteHosts
+    if (r is API.Result && r.res is CR.RemoteHostList) return r.res.remoteHosts
     apiErrorAlert("listRemoteHosts", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
@@ -2126,14 +2080,14 @@ object ChatController {
 
   suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true, address: RemoteCtrlAddress?, port: Int?): CR.RemoteHostStarted? {
     val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast, address, port))
-    if (r is CR.RemoteHostStarted) return r
+    if (r is API.Result && r.res is CR.RemoteHostStarted) return r.res
     apiErrorAlert("startRemoteHost", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
 
   suspend fun switchRemoteHost (rhId: Long?): RemoteHostInfo? {
     val r = sendCmd(null, CC.SwitchRemoteHost(rhId))
-    if (r is CR.CurrentRemoteHost) return r.remoteHost_
+    if (r is API.Result && r.res is CR.CurrentRemoteHost) return r.res.remoteHost_
     apiErrorAlert("switchRemoteHost", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
@@ -2155,45 +2109,49 @@ object ChatController {
 
   suspend fun storeRemoteFile(rhId: Long, storeEncrypted: Boolean?, localPath: String): CryptoFile? {
     val r = sendCmd(null, CC.StoreRemoteFile(rhId, storeEncrypted, localPath))
-    if (r is CR.RemoteFileStored) return r.remoteFileSource
+    if (r is API.Result && r.res is CR.RemoteFileStored) return r.res.remoteFileSource
     apiErrorAlert("storeRemoteFile", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
 
-  suspend fun getRemoteFile(rhId: Long, file: RemoteFile): Boolean = sendCmd(null, CC.GetRemoteFile(rhId, file)) is CR.CmdOk
+  suspend fun getRemoteFile(rhId: Long, file: RemoteFile): Boolean = sendCmd(null, CC.GetRemoteFile(rhId, file)).result is CR.CmdOk
 
-  suspend fun connectRemoteCtrl(desktopAddress: String): Pair<SomeRemoteCtrl?, CR.ChatCmdError?> {
+  suspend fun connectRemoteCtrl(desktopAddress: String): Pair<SomeRemoteCtrl?, ChatError?> {
     val r = sendCmd(null, CC.ConnectRemoteCtrl(desktopAddress))
-    return if (r is CR.RemoteCtrlConnecting) SomeRemoteCtrl(r.remoteCtrl_, r.ctrlAppInfo, r.appVersion) to null
-    else if (r is CR.ChatCmdError) null to r
-    else {
-      apiErrorAlert("connectRemoteCtrl", generalGetString(MR.strings.error_alert_title), r)
-      null to null
+    return when {
+      r is API.Result && r.res is CR.RemoteCtrlConnecting -> SomeRemoteCtrl(r.res.remoteCtrl_, r.res.ctrlAppInfo, r.res.appVersion) to null
+      r is API.Error -> null to r.err
+      else -> {
+        apiErrorAlert("connectRemoteCtrl", generalGetString(MR.strings.error_alert_title), r)
+        null to null
+      }
     }
   }
 
   suspend fun findKnownRemoteCtrl(): Boolean = sendCommandOkResp(null, CC.FindKnownRemoteCtrl())
 
-  suspend fun confirmRemoteCtrl(rcId: Long): Pair<SomeRemoteCtrl?, CR.ChatCmdError?> {
+  suspend fun confirmRemoteCtrl(rcId: Long): Pair<SomeRemoteCtrl?, ChatError?> {
     val r = sendCmd(null, CC.ConfirmRemoteCtrl(remoteCtrlId = rcId))
-    return if (r is CR.RemoteCtrlConnecting) SomeRemoteCtrl(r.remoteCtrl_, r.ctrlAppInfo, r.appVersion) to null
-    else if (r is CR.ChatCmdError) null to r
-    else {
-      apiErrorAlert("confirmRemoteCtrl", generalGetString(MR.strings.error_alert_title), r)
-      null to null
+    return when {
+      r is API.Result && r.res is CR.RemoteCtrlConnecting -> SomeRemoteCtrl(r.res.remoteCtrl_, r.res.ctrlAppInfo, r.res.appVersion) to null
+      r is API.Error -> null to r.err
+      else -> {
+        apiErrorAlert("confirmRemoteCtrl", generalGetString(MR.strings.error_alert_title), r)
+        null to null
+      }
     }
   }
 
   suspend fun verifyRemoteCtrlSession(sessionCode: String): RemoteCtrlInfo? {
     val r = sendCmd(null, CC.VerifyRemoteCtrlSession(sessionCode))
-    if (r is CR.RemoteCtrlConnected) return r.remoteCtrl
+    if (r is API.Result && r.res is CR.RemoteCtrlConnected) return r.res.remoteCtrl
     apiErrorAlert("verifyRemoteCtrlSession", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
 
   suspend fun listRemoteCtrls(): List<RemoteCtrlInfo>? {
     val r = sendCmd(null, CC.ListRemoteCtrls())
-    if (r is CR.RemoteCtrlList) return r.remoteCtrls
+    if (r is API.Result && r.res is CR.RemoteCtrlList) return r.res.remoteCtrls
     apiErrorAlert("listRemoteCtrls", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
@@ -2204,72 +2162,71 @@ object ChatController {
 
   private suspend fun sendCommandOkResp(rh: Long?, cmd: CC, ctrl: ChatCtrl? = null): Boolean {
     val r = sendCmd(rh, cmd, ctrl)
-    val ok = r is CR.CmdOk
+    val ok = r is API.Result && r.res is CR.CmdOk
     if (!ok) apiErrorAlert(cmd.cmdType, generalGetString(MR.strings.error_alert_title), r)
     return ok
   }
 
   suspend fun apiGetVersion(): CoreVersionInfo? {
     val r = sendCmd(null, CC.ShowVersion())
-    return if (r is CR.VersionInfo) {
-      r.versionInfo
-    } else {
-      Log.e(TAG, "apiGetVersion bad response: ${r.responseType} ${r.details}")
-      null
-    }
+    if (r is API.Result && r.res is CR.VersionInfo) return r.res.versionInfo
+    Log.e(TAG, "apiGetVersion bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
-  private fun networkErrorAlert(r: CR): Boolean {
+  private fun networkErrorAlert(r: API): Boolean {
+    if (r !is API.Error) return false
+    val e = r.err
     return when {
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.BROKER
-          && r.chatError.agentError.brokerErr is BrokerErrorType.TIMEOUT -> {
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.BROKER
+          && e.agentError.brokerErr is BrokerErrorType.TIMEOUT -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_timeout),
-          String.format(generalGetString(MR.strings.network_error_desc), serverHostname(r.chatError.agentError.brokerAddress))
+          String.format(generalGetString(MR.strings.network_error_desc), serverHostname(e.agentError.brokerAddress))
         )
         true
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.BROKER
-          && r.chatError.agentError.brokerErr is BrokerErrorType.NETWORK -> {
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.BROKER
+          && e.agentError.brokerErr is BrokerErrorType.NETWORK -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error),
-          String.format(generalGetString(MR.strings.network_error_desc), serverHostname(r.chatError.agentError.brokerAddress))
+          String.format(generalGetString(MR.strings.network_error_desc), serverHostname(e.agentError.brokerAddress))
         )
         true
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.BROKER
-          && r.chatError.agentError.brokerErr is BrokerErrorType.HOST -> {
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.BROKER
+          && e.agentError.brokerErr is BrokerErrorType.HOST -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error),
-          String.format(generalGetString(MR.strings.network_error_broker_host_desc), serverHostname(r.chatError.agentError.brokerAddress))
+          String.format(generalGetString(MR.strings.network_error_broker_host_desc), serverHostname(e.agentError.brokerAddress))
         )
         true
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.BROKER
-          && r.chatError.agentError.brokerErr is BrokerErrorType.TRANSPORT
-          && r.chatError.agentError.brokerErr.transportErr is SMPTransportError.Version -> {
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.BROKER
+          && e.agentError.brokerErr is BrokerErrorType.TRANSPORT
+          && e.agentError.brokerErr.transportErr is SMPTransportError.Version -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error),
-          String.format(generalGetString(MR.strings.network_error_broker_version_desc), serverHostname(r.chatError.agentError.brokerAddress))
+          String.format(generalGetString(MR.strings.network_error_broker_version_desc), serverHostname(e.agentError.brokerAddress))
         )
         true
       }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.PROXY ->
-        smpProxyErrorAlert(r.chatError.agentError.smpErr.proxyErr, r.chatError.agentError.serverAddress)
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.PROXY
-          && r.chatError.agentError.proxyErr is ProxyClientError.ProxyProtocolError
-          && r.chatError.agentError.proxyErr.protocolErr is SMPErrorType.PROXY ->
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.SMP
+          && e.agentError.smpErr is SMPErrorType.PROXY ->
+        smpProxyErrorAlert(e.agentError.smpErr.proxyErr, e.agentError.serverAddress)
+      e is ChatError.ChatErrorAgent
+          && e.agentError is AgentErrorType.PROXY
+          && e.agentError.proxyErr is ProxyClientError.ProxyProtocolError
+          && e.agentError.proxyErr.protocolErr is SMPErrorType.PROXY ->
         proxyDestinationErrorAlert(
-          r.chatError.agentError.proxyErr.protocolErr.proxyErr,
-          r.chatError.agentError.proxyServer,
-          r.chatError.agentError.relayServer
+          e.agentError.proxyErr.protocolErr.proxyErr,
+          e.agentError.proxyServer,
+          e.agentError.relayServer
         )
       else -> false
     }
@@ -2360,34 +2317,34 @@ object ChatController {
     }
   }
 
-  private fun apiErrorAlert(method: String, title: String, r: CR) {
+  private fun apiErrorAlert(method: String, title: String, r: API) {
     val errMsg = "${r.responseType}: ${r.details}"
     Log.e(TAG, "$method bad response: $errMsg")
     AlertManager.shared.showAlertMsg(title, errMsg)
   }
 
-  private suspend fun processReceivedMsg(apiResp: APIResponse) {
+  private suspend fun processReceivedMsg(msg: API) {
     lastMsgReceivedTimestamp = System.currentTimeMillis()
-    val r = apiResp.resp
-    val rhId = apiResp.remoteHostId
+    val rhId = msg.rhId
     fun active(user: UserLike): Boolean = activeUser(rhId, user)
-    chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
+    chatModel.addTerminalItem(TerminalItem.resp(rhId, msg))
+    val r = msg.result
     when (r) {
       is CR.ContactDeletedByContact -> {
         if (active(r.user) && r.contact.directOrUsed) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
           }
         }
       }
       is CR.ContactConnected -> {
         if (active(r.user) && r.contact.directOrUsed) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
             val conn = r.contact.activeConn
             if (conn != null) {
               chatModel.replaceConnReqView(conn.id, "@${r.contact.contactId}")
-              removeChat(rhId, conn.id)
+              chatModel.chatsContext.removeChat(rhId, conn.id)
             }
           }
         }
@@ -2398,24 +2355,24 @@ object ChatController {
       }
       is CR.ContactConnecting -> {
         if (active(r.user) && r.contact.directOrUsed) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
             val conn = r.contact.activeConn
             if (conn != null) {
               chatModel.replaceConnReqView(conn.id, "@${r.contact.contactId}")
-              removeChat(rhId, conn.id)
+              chatModel.chatsContext.removeChat(rhId, conn.id)
             }
           }
         }
       }
       is CR.ContactSndReady -> {
         if (active(r.user) && r.contact.directOrUsed) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
             val conn = r.contact.activeConn
             if (conn != null) {
               chatModel.replaceConnReqView(conn.id, "@${r.contact.contactId}")
-              removeChat(rhId, conn.id)
+              chatModel.chatsContext.removeChat(rhId, conn.id)
             }
           }
         }
@@ -2425,11 +2382,11 @@ object ChatController {
         val contactRequest = r.contactRequest
         val cInfo = ChatInfo.ContactRequest(contactRequest)
         if (active(r.user)) {
-          withChats {
-            if (hasChat(rhId, contactRequest.id)) {
-              updateChatInfo(rhId, cInfo)
+          withContext(Dispatchers.Main) {
+            if (chatModel.chatsContext.hasChat(rhId, contactRequest.id)) {
+              chatModel.chatsContext.updateChatInfo(rhId, cInfo)
             } else {
-              addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = listOf()))
+              chatModel.chatsContext.addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = listOf()))
             }
           }
         }
@@ -2438,18 +2395,18 @@ object ChatController {
       is CR.ContactUpdated -> {
         if (active(r.user) && chatModel.chatsContext.hasChat(rhId, r.toContact.id)) {
           val cInfo = ChatInfo.Direct(r.toContact)
-          withChats {
-            updateChatInfo(rhId, cInfo)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateChatInfo(rhId, cInfo)
           }
         }
       }
       is CR.GroupMemberUpdated -> {
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.toMember)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.toMember)
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.toMember)
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, r.toMember)
           }
         }
       }
@@ -2458,8 +2415,8 @@ object ChatController {
           if (chatModel.chatId.value == r.mergedContact.id) {
             chatModel.chatId.value = r.intoContact.id
           }
-          withChats {
-            removeChat(rhId, r.mergedContact.id)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.removeChat(rhId, r.mergedContact.id)
           }
         }
       }
@@ -2470,8 +2427,8 @@ object ChatController {
       is CR.ContactSubSummary -> {
         for (sub in r.contactSubscriptions) {
           if (active(r.user)) {
-            withChats {
-              updateContact(rhId, sub.contact)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.updateContact(rhId, sub.contact)
             }
           }
           val err = sub.contactError
@@ -2497,20 +2454,18 @@ object ChatController {
           val cInfo = chatItem.chatInfo
           val cItem = chatItem.chatItem
           if (active(r.user)) {
-            withChats {
-              addChatItem(rhId, cInfo, cItem)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.addChatItem(rhId, cInfo, cItem)
               if (cItem.isActiveReport) {
-                increaseGroupReportsCounter(rhId, cInfo.id)
+                chatModel.chatsContext.increaseGroupReportsCounter(rhId, cInfo.id)
               }
             }
-            withReportsChatsIfOpen {
-              if (cItem.isReport) {
-                addChatItem(rhId, cInfo, cItem)
-              }
+            withContext(Dispatchers.Main) {
+              chatModel.secondaryChatsContext.value?.addChatItem(rhId, cInfo, cItem)
             }
-          } else if (cItem.isRcvNew && cInfo.ntfsEnabled) {
-            withChats {
-              increaseUnreadCounter(rhId, r.user)
+          } else if (cItem.isRcvNew && cInfo.ntfsEnabled(cItem)) {
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.increaseUnreadCounter(rhId, r.user)
             }
           }
           val file = cItem.file
@@ -2531,13 +2486,11 @@ object ChatController {
           val cInfo = chatItem.chatInfo
           val cItem = chatItem.chatItem
           if (!cItem.isDeletedContent && active(r.user)) {
-            withChats {
-              updateChatItem(cInfo, cItem, status = cItem.meta.itemStatus)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.upsertChatItem(rhId, cInfo, cItem)
             }
-            withReportsChatsIfOpen {
-              if (cItem.isReport) {
-                updateChatItem(cInfo, cItem, status = cItem.meta.itemStatus)
-              }
+            withContext(Dispatchers.Main) {
+              chatModel.secondaryChatsContext.value?.upsertChatItem(rhId, cInfo, cItem)
             }
           }
         }
@@ -2545,22 +2498,20 @@ object ChatController {
         chatItemUpdateNotify(rhId, r.user, r.chatItem)
       is CR.ChatItemReaction -> {
         if (active(r.user)) {
-          withChats {
-            updateChatItem(r.reaction.chatInfo, r.reaction.chatReaction.chatItem)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateChatItem(r.reaction.chatInfo, r.reaction.chatReaction.chatItem)
           }
-          withReportsChatsIfOpen {
-            if (r.reaction.chatReaction.chatItem.isReport) {
-              updateChatItem(r.reaction.chatInfo, r.reaction.chatReaction.chatItem)
-            }
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.updateChatItem(r.reaction.chatInfo, r.reaction.chatReaction.chatItem)
           }
         }
       }
       is CR.ChatItemsDeleted -> {
         if (!active(r.user)) {
           r.chatItemDeletions.forEach { (deletedChatItem, toChatItem) ->
-            if (toChatItem == null && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled) {
-              withChats {
-                decreaseUnreadCounter(rhId, r.user)
+            if (toChatItem == null && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled(deletedChatItem.chatItem)) {
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.decreaseUnreadCounter(rhId, r.user)
               }
             }
           }
@@ -2583,79 +2534,38 @@ object ChatController {
               generalGetString(if (toChatItem != null) MR.strings.marked_deleted_description else MR.strings.deleted_description)
             )
           }
-          withChats {
+          withContext(Dispatchers.Main) {
             if (toChatItem == null) {
-              removeChatItem(rhId, cInfo, cItem)
+              chatModel.chatsContext.removeChatItem(rhId, cInfo, cItem)
             } else {
-              upsertChatItem(rhId, cInfo, toChatItem.chatItem)
+              chatModel.chatsContext.upsertChatItem(rhId, cInfo, toChatItem.chatItem)
+            }
+            if (cItem.isActiveReport) {
+              chatModel.chatsContext.decreaseGroupReportsCounter(rhId, cInfo.id)
             }
           }
-          withReportsChatsIfOpen {
-            if (cItem.isReport) {
-              if (toChatItem == null) {
-                removeChatItem(rhId, cInfo, cItem)
-              } else {
-                upsertChatItem(rhId, cInfo, toChatItem.chatItem)
-              }
+          withContext(Dispatchers.Main) {
+            if (toChatItem == null) {
+              chatModel.secondaryChatsContext.value?.removeChatItem(rhId, cInfo, cItem)
+            } else {
+              chatModel.secondaryChatsContext.value?.upsertChatItem(rhId, cInfo, toChatItem.chatItem)
             }
           }
         }
+        r.chatItemDeletions.lastOrNull()?.deletedChatItem?.chatInfo?.let { updatedChatInfo ->
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateChatInfo(rhId, updatedChatInfo)
+          }
+        }
       }
       is CR.GroupChatItemsDeleted -> {
-        if (!active(r.user)) {
-          val users = chatController.listUsers(rhId)
-          chatModel.users.clear()
-          chatModel.users.addAll(users)
-          return
-        }
-        val cInfo = ChatInfo.Group(r.groupInfo)
-        withChats {
-          r.chatItemIDs.forEach { itemId ->
-            decreaseGroupReportsCounter(rhId, cInfo.id)
-            val cItem = chatItems.value.lastOrNull { it.id == itemId } ?: return@forEach
-            if (chatModel.chatId.value != null) {
-              // Stop voice playback only inside a chat, allow to play in a chat list
-              AudioPlayer.stop(cItem)
-            }
-            val isLastChatItem = getChat(cInfo.id)?.chatItems?.lastOrNull()?.id == cItem.id
-            if (isLastChatItem && ntfManager.hasNotificationsForChat(cInfo.id)) {
-              ntfManager.cancelNotificationsForChat(cInfo.id)
-              ntfManager.displayNotification(
-                r.user,
-                cInfo.id,
-                cInfo.displayName,
-                generalGetString(MR.strings.marked_deleted_description)
-              )
-            }
-            val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember?.groupMemberId != r.member_.groupMemberId) {
-              CIDeleted.Moderated(Clock.System.now(), r.member_)
-            } else {
-              CIDeleted.Deleted(Clock.System.now())
-            }
-            upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted)))
-          }
-        }
-        withReportsChatsIfOpen {
-          r.chatItemIDs.forEach { itemId ->
-            val cItem = chatItems.value.lastOrNull { it.id == itemId } ?: return@forEach
-            if (chatModel.chatId.value != null) {
-              // Stop voice playback only inside a chat, allow to play in a chat list
-              AudioPlayer.stop(cItem)
-            }
-            val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember?.groupMemberId != r.member_.groupMemberId) {
-              CIDeleted.Moderated(Clock.System.now(), r.member_)
-            } else {
-              CIDeleted.Deleted(Clock.System.now())
-            }
-            upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted)))
-          }
-        }
+        groupChatItemsDeleted(rhId, r)
       }
       is CR.ReceivedGroupInvitation -> {
         if (active(r.user)) {
-          withChats {
+          withContext(Dispatchers.Main) {
             // update so that repeat group invitations are not duplicated
-            updateGroup(rhId, r.groupInfo)
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
           }
           // TODO NtfManager.shared.notifyGroupInvitation
         }
@@ -2663,119 +2573,156 @@ object ChatController {
       is CR.UserAcceptedGroupSent -> {
         if (!active(r.user)) return
 
-        withChats {
-          updateGroup(rhId, r.groupInfo)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
           val conn = r.hostContact?.activeConn
           if (conn != null) {
             chatModel.replaceConnReqView(conn.id, "#${r.groupInfo.groupId}")
-            removeChat(rhId, conn.id)
+            chatModel.chatsContext.removeChat(rhId, conn.id)
           }
         }
       }
       is CR.GroupLinkConnecting -> {
         if (!active(r.user)) return
 
-        withChats {
-          updateGroup(rhId, r.groupInfo)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
           val hostConn = r.hostMember.activeConn
           if (hostConn != null) {
             chatModel.replaceConnReqView(hostConn.id, "#${r.groupInfo.groupId}")
-            removeChat(rhId, hostConn.id)
+            chatModel.chatsContext.removeChat(rhId, hostConn.id)
           }
         }
       }
       is CR.BusinessLinkConnecting -> {
         if (!active(r.user)) return
 
-        withChats {
-          updateGroup(rhId, r.groupInfo)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
         }
         if (chatModel.chatId.value == r.fromContact.id) {
           openGroupChat(rhId, r.groupInfo.groupId)
         }
-        withChats {
-          removeChat(rhId, r.fromContact.id)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.removeChat(rhId, r.fromContact.id)
         }
       }
       is CR.JoinedGroupMemberConnecting ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
+          }
+        }
+      is CR.MemberAcceptedByOther ->
+        if (active(r.user)) {
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
           }
         }
       is CR.DeletedMemberUser -> // TODO update user member
         if (active(r.user)) {
-          withChats {
-            updateGroup(rhId, r.groupInfo)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
+            if (r.withMessages) {
+              chatModel.chatsContext.removeMemberItems(rhId, r.groupInfo.membership, byMember = r.member, r.groupInfo)
+            }
+          }
+          withContext(Dispatchers.Main) {
+            if (r.withMessages) {
+              chatModel.secondaryChatsContext.value?.removeMemberItems(rhId, r.groupInfo.membership, byMember = r.member, r.groupInfo)
+            }
           }
         }
       is CR.DeletedMember ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.deletedMember)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.deletedMember)
+            if (r.withMessages) {
+              chatModel.chatsContext.removeMemberItems(rhId, r.deletedMember, byMember = r.byMember, r.groupInfo)
+            }
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.deletedMember)
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, r.deletedMember)
+            if (r.withMessages) {
+              chatModel.secondaryChatsContext.value?.removeMemberItems(rhId, r.deletedMember, byMember = r.byMember, r.groupInfo)
+            }
           }
         }
       is CR.LeftMember ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
         }
       is CR.MemberRole ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
         }
-      is CR.MemberRoleUser ->
+      is CR.MembersRoleUser ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            r.members.forEach { member ->
+              chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, member)
+            }
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            r.members.forEach { member ->
+              chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, member)
+            }
           }
         }
       is CR.MemberBlockedForAll ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
         }
       is CR.GroupDeleted -> // TODO update user member
         if (active(r.user)) {
-          withChats {
-            updateGroup(rhId, r.groupInfo)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
           }
         }
       is CR.UserJoinedGroup ->
         if (active(r.user)) {
-          withChats {
-            updateGroup(rhId, r.groupInfo)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.groupInfo)
+          }
+          if (
+            chatModel.chatId.value == r.groupInfo.id
+            && ModalManager.end.hasModalOpen(ModalViewId.SECONDARY_CHAT)
+            && chatModel.secondaryChatsContext.value?.secondaryContextFilter is SecondaryContextFilter.GroupChatScopeContext
+          ) {
+            withContext(Dispatchers.Main) {
+              chatModel.secondaryChatsContext.value = null
+            }
+            ModalManager.end.closeModals()
           }
         }
       is CR.JoinedGroupMember ->
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
         }
       is CR.ConnectedToGroupMember -> {
         if (active(r.user)) {
-          withChats {
-            upsertGroupMember(rhId, r.groupInfo, r.member)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
           }
         }
         if (r.memberContact != null) {
@@ -2784,14 +2731,14 @@ object ChatController {
       }
       is CR.GroupUpdated ->
         if (active(r.user)) {
-          withChats {
-            updateGroup(rhId, r.toGroup)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, r.toGroup)
           }
         }
       is CR.NewMemberContactReceivedInv ->
         if (active(r.user)) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
           }
         }
       is CR.RcvFileStart ->
@@ -2892,26 +2839,26 @@ object ChatController {
       }
       is CR.ContactSwitch ->
         if (active(r.user)) {
-          withChats {
-            updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
           }
         }
       is CR.GroupMemberSwitch ->
         if (active(r.user)) {
-          withChats {
-            updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
           }
         }
       is CR.ContactRatchetSync ->
         if (active(r.user)) {
-          withChats {
-            updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
           }
         }
       is CR.GroupMemberRatchetSync ->
         if (active(r.user)) {
-          withChats {
-            updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
           }
         }
       is CR.RemoteHostSessionCode -> {
@@ -2920,12 +2867,13 @@ object ChatController {
       is CR.RemoteHostConnected -> {
         // TODO needs to update it instead in sessions
         chatModel.currentRemoteHost.value = r.remoteHost
+        ModalManager.start.closeModals()
         switchUIRemoteHost(r.remoteHost.remoteHostId)
       }
       is CR.ContactDisabled -> {
         if (active(r.user)) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
           }
         }
       }
@@ -3049,20 +2997,21 @@ object ChatController {
       }
       is CR.ContactPQEnabled ->
         if (active(r.user)) {
-          withChats {
-            updateContact(rhId, r.contact)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateContact(rhId, r.contact)
           }
         }
-      is CR.ChatRespError -> when {
-        r.chatError is ChatError.ChatErrorAgent && r.chatError.agentError is AgentErrorType.CRITICAL -> {
-          chatModel.processedCriticalError.newError(r.chatError.agentError, r.chatError.agentError.offerRestart)
-        }
-        r.chatError is ChatError.ChatErrorAgent && r.chatError.agentError is AgentErrorType.INTERNAL && appPrefs.developerTools.get() && appPrefs.showInternalErrors.get() -> {
-          chatModel.processedInternalError.newError(r.chatError.agentError, false)
-        }
-      }
       else ->
-        Log.d(TAG , "unsupported event: ${r.responseType}")
+        Log.d(TAG , "unsupported event: ${msg.responseType}")
+    }
+    val e = (msg as? API.Error)?.err
+    when {
+      e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.CRITICAL ->
+        chatModel.processedCriticalError.newError(e.agentError, e.agentError.offerRestart)
+      e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.INTERNAL && appPrefs.developerTools.get() && appPrefs.showInternalErrors.get() ->
+        chatModel.processedInternalError.newError(e.agentError, false)
+      else ->
+        Log.d(TAG , "unsupported event: ${msg.responseType}")
     }
   }
 
@@ -3114,8 +3063,8 @@ object ChatController {
   suspend fun leaveGroup(rh: Long?, groupId: Long) {
     val groupInfo = apiLeaveGroup(rh, groupId)
     if (groupInfo != null) {
-      withChats {
-        updateGroup(rh, groupInfo)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateGroup(rh, groupInfo)
       }
     }
   }
@@ -3124,10 +3073,65 @@ object ChatController {
     if (activeUser(rh, user)) {
       val cInfo = aChatItem.chatInfo
       val cItem = aChatItem.chatItem
-      withChats { upsertChatItem(rh, cInfo, cItem) }
-      withReportsChatsIfOpen {
-        if (cItem.isReport) {
-          upsertChatItem(rh, cInfo, cItem)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.upsertChatItem(rh, cInfo, cItem)
+      }
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.upsertChatItem(rh, cInfo, cItem)
+      }
+    }
+  }
+
+  suspend fun groupChatItemsDeleted(rhId: Long?, r: CR.GroupChatItemsDeleted) {
+    if (!activeUser(rhId, r.user)) {
+      val users = chatController.listUsers(rhId)
+      chatModel.users.clear()
+      chatModel.users.addAll(users)
+      return
+    }
+    val cInfo = ChatInfo.Group(r.groupInfo, groupChatScope = null) // TODO [knocking] get scope from items?
+    withContext(Dispatchers.Main) {
+      val chatsCtx = chatModel.chatsContext
+      r.chatItemIDs.forEach { itemId ->
+        chatsCtx.decreaseGroupReportsCounter(rhId, cInfo.id)
+        val cItem = chatsCtx.chatItems.value.lastOrNull { it.id == itemId } ?: return@forEach
+        if (chatModel.chatId.value != null) {
+          // Stop voice playback only inside a chat, allow to play in a chat list
+          AudioPlayer.stop(cItem)
+        }
+        val isLastChatItem = chatsCtx.getChat(cInfo.id)?.chatItems?.lastOrNull()?.id == cItem.id
+        if (isLastChatItem && ntfManager.hasNotificationsForChat(cInfo.id)) {
+          ntfManager.cancelNotificationsForChat(cInfo.id)
+          ntfManager.displayNotification(
+            r.user,
+            cInfo.id,
+            cInfo.displayName,
+            generalGetString(MR.strings.marked_deleted_description)
+          )
+        }
+        val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember?.groupMemberId != r.member_.groupMemberId) {
+          CIDeleted.Moderated(Clock.System.now(), r.member_)
+        } else {
+          CIDeleted.Deleted(Clock.System.now())
+        }
+        chatsCtx.upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted)))
+      }
+    }
+    withContext(Dispatchers.Main) {
+      val chatsCtx = chatModel.secondaryChatsContext.value
+      if (chatsCtx != null) {
+        r.chatItemIDs.forEach { itemId ->
+          val cItem = chatsCtx.chatItems.value.lastOrNull { it.id == itemId } ?: return@forEach
+          if (chatModel.chatId.value != null) {
+            // Stop voice playback only inside a chat, allow to play in a chat list
+            AudioPlayer.stop(cItem)
+          }
+          val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember?.groupMemberId != r.member_.groupMemberId) {
+            CIDeleted.Moderated(Clock.System.now(), r.member_)
+          } else {
+            CIDeleted.Deleted(Clock.System.now())
+          }
+          chatsCtx.upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted)))
         }
       }
     }
@@ -3140,8 +3144,12 @@ object ChatController {
     if (!activeUser(rh, user)) {
       notify()
     } else {
-      val createdChat = withChats { upsertChatItem(rh, cInfo, cItem) }
-      withReportsChatsIfOpen { if (cItem.content.msgContent is MsgContent.MCReport) { upsertChatItem(rh, cInfo, cItem) } }
+      val createdChat = withContext(Dispatchers.Main) {
+        chatModel.chatsContext.upsertChatItem(rh, cInfo, cItem)
+      }
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.upsertChatItem(rh, cInfo, cItem)
+      }
       if (createdChat) {
         notify()
       } else if (cItem.content is CIContent.RcvCall && cItem.content.status == CICallStatus.Missed) {
@@ -3186,15 +3194,15 @@ object ChatController {
     chatModel.users.addAll(users)
     chatModel.currentUser.value = user
     if (user == null) {
-      withChats {
-        chatItems.clearAndNotify()
-        chats.clear()
-        popChatCollector.clear()
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.chatItems.clearAndNotify()
+        chatModel.chatsContext.chats.clear()
+        chatModel.chatsContext.popChatCollector.clear()
       }
-      withReportsChatsIfOpen {
-        chatItems.clearAndNotify()
-        chats.clear()
-        popChatCollector.clear()
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.chatItems?.clearAndNotify()
+        chatModel.secondaryChatsContext.value?.chats?.clear()
+        chatModel.secondaryChatsContext.value?.popChatCollector?.clear()
       }
     }
     val statuses = apiGetNetworkStatuses(rhId)
@@ -3231,11 +3239,12 @@ object ChatController {
     } else {
       null
     }
-    val hostMode = HostMode.valueOf(appPrefs.networkHostMode.get()!!)
+    val hostMode = appPrefs.networkHostMode.get()
     val requiredHostMode = appPrefs.networkRequiredHostMode.get()
     val sessionMode = appPrefs.networkSessionMode.get()
-    val smpProxyMode = SMPProxyMode.valueOf(appPrefs.networkSMPProxyMode.get()!!)
-    val smpProxyFallback = SMPProxyFallback.valueOf(appPrefs.networkSMPProxyFallback.get()!!)
+    val smpProxyMode = appPrefs.networkSMPProxyMode.get()
+    val smpProxyFallback = appPrefs.networkSMPProxyFallback.get()
+    val smpWebPortServers = appPrefs.networkSMPWebPortServers.get()
     val tcpConnectTimeout = appPrefs.networkTCPConnectTimeout.get()
     val tcpTimeout = appPrefs.networkTCPTimeout.get()
     val tcpTimeoutPerKb = appPrefs.networkTCPTimeoutPerKb.get()
@@ -3258,6 +3267,7 @@ object ChatController {
       sessionMode = sessionMode,
       smpProxyMode = smpProxyMode,
       smpProxyFallback = smpProxyFallback,
+      smpWebPortServers = smpWebPortServers,
       tcpConnectTimeout = tcpConnectTimeout,
       tcpTimeout = tcpTimeout,
       tcpTimeoutPerKb = tcpTimeoutPerKb,
@@ -3273,11 +3283,12 @@ object ChatController {
    * */
   fun setNetCfg(cfg: NetCfg) {
     appPrefs.networkUseSocksProxy.set(cfg.useSocksProxy)
-    appPrefs.networkHostMode.set(cfg.hostMode.name)
+    appPrefs.networkHostMode.set(cfg.hostMode)
     appPrefs.networkRequiredHostMode.set(cfg.requiredHostMode)
     appPrefs.networkSessionMode.set(cfg.sessionMode)
-    appPrefs.networkSMPProxyMode.set(cfg.smpProxyMode.name)
-    appPrefs.networkSMPProxyFallback.set(cfg.smpProxyFallback.name)
+    appPrefs.networkSMPProxyMode.set(cfg.smpProxyMode)
+    appPrefs.networkSMPProxyFallback.set(cfg.smpProxyFallback)
+    appPrefs.networkSMPWebPortServers.set(cfg.smpWebPortServers)
     appPrefs.networkTCPConnectTimeout.set(cfg.tcpConnectTimeout)
     appPrefs.networkTCPTimeout.set(cfg.tcpTimeout)
     appPrefs.networkTCPTimeoutPerKb.set(cfg.tcpTimeoutPerKb)
@@ -3342,9 +3353,9 @@ sealed class CC {
   class ApiGetSettings(val settings: AppSettings): CC()
   class ApiGetChatTags(val userId: Long): CC()
   class ApiGetChats(val userId: Long): CC()
-  class ApiGetChat(val type: ChatType, val id: Long, val contentTag: MsgContentTag?, val pagination: ChatPagination, val search: String = ""): CC()
-  class ApiGetChatItemInfo(val type: ChatType, val id: Long, val itemId: Long): CC()
-  class ApiSendMessages(val type: ChatType, val id: Long, val live: Boolean, val ttl: Int?, val composedMessages: List<ComposedMessage>): CC()
+  class ApiGetChat(val type: ChatType, val id: Long, val scope: GroupChatScope?, val contentTag: MsgContentTag?, val pagination: ChatPagination, val search: String = ""): CC()
+  class ApiGetChatItemInfo(val type: ChatType, val id: Long, val scope: GroupChatScope?, val itemId: Long): CC()
+  class ApiSendMessages(val type: ChatType, val id: Long, val scope: GroupChatScope?, val live: Boolean, val ttl: Int?, val composedMessages: List<ComposedMessage>): CC()
   class ApiCreateChatTag(val tag: ChatTagData): CC()
   class ApiSetChatTags(val type: ChatType, val id: Long, val tagIds: List<Long>): CC()
   class ApiDeleteChatTag(val tagId: Long): CC()
@@ -3352,26 +3363,31 @@ sealed class CC {
   class ApiReorderChatTags(val tagIds: List<Long>): CC()
   class ApiCreateChatItems(val noteFolderId: Long, val composedMessages: List<ComposedMessage>): CC()
   class ApiReportMessage(val groupId: Long, val chatItemId: Long, val reportReason: ReportReason, val reportText: String): CC()
-  class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent, val live: Boolean): CC()
-  class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemIds: List<Long>, val mode: CIDeleteMode): CC()
+  class ApiUpdateChatItem(val type: ChatType, val id: Long, val scope: GroupChatScope?, val itemId: Long, val updatedMessage: UpdatedMessage, val live: Boolean): CC()
+  class ApiDeleteChatItem(val type: ChatType, val id: Long, val scope: GroupChatScope?, val itemIds: List<Long>, val mode: CIDeleteMode): CC()
   class ApiDeleteMemberChatItem(val groupId: Long, val itemIds: List<Long>): CC()
-  class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
+  class ApiArchiveReceivedReports(val groupId: Long): CC()
+  class ApiDeleteReceivedReports(val groupId: Long, val itemIds: List<Long>, val mode: CIDeleteMode): CC()
+  class ApiChatItemReaction(val type: ChatType, val id: Long, val scope: GroupChatScope?, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
   class ApiGetReactionMembers(val userId: Long, val groupId: Long, val itemId: Long, val reaction: MsgReaction): CC()
-  class ApiPlanForwardChatItems(val fromChatType: ChatType, val fromChatId: Long, val chatItemIds: List<Long>): CC()
-  class ApiForwardChatItems(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemIds: List<Long>, val ttl: Int?): CC()
+  class ApiPlanForwardChatItems(val fromChatType: ChatType, val fromChatId: Long, val fromScope: GroupChatScope?, val chatItemIds: List<Long>): CC()
+  class ApiForwardChatItems(val toChatType: ChatType, val toChatId: Long, val toScope: GroupChatScope?, val fromChatType: ChatType, val fromChatId: Long, val fromScope: GroupChatScope?, val itemIds: List<Long>, val ttl: Int?): CC()
   class ApiNewGroup(val userId: Long, val incognito: Boolean, val groupProfile: GroupProfile): CC()
   class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
   class ApiJoinGroup(val groupId: Long): CC()
-  class ApiMemberRole(val groupId: Long, val memberId: Long, val memberRole: GroupMemberRole): CC()
-  class ApiBlockMemberForAll(val groupId: Long, val memberId: Long, val blocked: Boolean): CC()
-  class ApiRemoveMember(val groupId: Long, val memberId: Long): CC()
+  class ApiAcceptMember(val groupId: Long, val groupMemberId: Long, val memberRole: GroupMemberRole): CC()
+  class ApiDeleteMemberSupportChat(val groupId: Long, val groupMemberId: Long): CC()
+  class ApiMembersRole(val groupId: Long, val memberIds: List<Long>, val memberRole: GroupMemberRole): CC()
+  class ApiBlockMembersForAll(val groupId: Long, val memberIds: List<Long>, val blocked: Boolean): CC()
+  class ApiRemoveMembers(val groupId: Long, val memberIds: List<Long>, val withMessages: Boolean): CC()
   class ApiLeaveGroup(val groupId: Long): CC()
   class ApiListMembers(val groupId: Long): CC()
   class ApiUpdateGroupProfile(val groupId: Long, val groupProfile: GroupProfile): CC()
-  class APICreateGroupLink(val groupId: Long, val memberRole: GroupMemberRole): CC()
+  class APICreateGroupLink(val groupId: Long, val memberRole: GroupMemberRole, val short: Boolean): CC()
   class APIGroupLinkMemberRole(val groupId: Long, val memberRole: GroupMemberRole): CC()
   class APIDeleteGroupLink(val groupId: Long): CC()
   class APIGetGroupLink(val groupId: Long): CC()
+  class ApiAddGroupShortLink(val groupId: Long): CC()
   class APICreateMemberContact(val groupId: Long, val groupMemberId: Long): CC()
   class APISendMemberContactInvitation(val contactId: Long, val mc: MsgContent): CC()
   class APITestProtoServer(val userId: Long, val server: String): CC()
@@ -3383,8 +3399,9 @@ sealed class CC {
   class ApiGetUsageConditions(): CC()
   class ApiSetConditionsNotified(val conditionsId: Long): CC()
   class ApiAcceptConditions(val conditionsId: Long, val operatorIds: List<Long>): CC()
-  class APISetChatItemTTL(val userId: Long, val seconds: Long?): CC()
+  class APISetChatItemTTL(val userId: Long, val seconds: Long): CC()
   class APIGetChatItemTTL(val userId: Long): CC()
+  class APISetChatTTL(val userId: Long, val chatType: ChatType, val id: Long, val seconds: Long?): CC()
   class APISetNetworkConfig(val networkConfig: NetCfg): CC()
   class APIGetNetworkConfig: CC()
   class APISetNetworkInfo(val networkInfo: UserNetworkInfo): CC()
@@ -3406,11 +3423,11 @@ sealed class CC {
   class APIGetGroupMemberCode(val groupId: Long, val groupMemberId: Long): CC()
   class APIVerifyContact(val contactId: Long, val connectionCode: String?): CC()
   class APIVerifyGroupMember(val groupId: Long, val groupMemberId: Long, val connectionCode: String?): CC()
-  class APIAddContact(val userId: Long, val incognito: Boolean): CC()
+  class APIAddContact(val userId: Long, val short: Boolean, val incognito: Boolean): CC()
   class ApiSetConnectionIncognito(val connId: Long, val incognito: Boolean): CC()
   class ApiChangeConnectionUser(val connId: Long, val userId: Long): CC()
-  class APIConnectPlan(val userId: Long, val connReq: String): CC()
-  class APIConnect(val userId: Long, val incognito: Boolean, val connReq: String): CC()
+  class APIConnectPlan(val userId: Long, val connLink: String): CC()
+  class APIConnect(val userId: Long, val incognito: Boolean, val connLink: CreatedConnLink): CC()
   class ApiConnectContactViaAddress(val userId: Long, val incognito: Boolean, val contactId: Long): CC()
   class ApiDeleteChat(val type: ChatType, val id: Long, val chatDeleteMode: ChatDeleteMode): CC()
   class ApiClearChat(val type: ChatType, val id: Long): CC()
@@ -3422,9 +3439,10 @@ sealed class CC {
   class ApiSetConnectionAlias(val connId: Long, val localAlias: String): CC()
   class ApiSetUserUIThemes(val userId: Long, val themes: ThemeModeOverrides?): CC()
   class ApiSetChatUIThemes(val chatId: String, val themes: ThemeModeOverrides?): CC()
-  class ApiCreateMyAddress(val userId: Long): CC()
+  class ApiCreateMyAddress(val userId: Long, val short: Boolean): CC()
   class ApiDeleteMyAddress(val userId: Long): CC()
   class ApiShowMyAddress(val userId: Long): CC()
+  class ApiAddMyAddressShortLink(val userId: Long): CC()
   class ApiSetProfileAddress(val userId: Long, val on: Boolean): CC()
   class ApiAddressAutoAccept(val userId: Long, val autoAccept: AutoAccept?): CC()
   class ApiGetCallInvitations: CC()
@@ -3438,8 +3456,8 @@ sealed class CC {
   class ApiGetNetworkStatuses(): CC()
   class ApiAcceptContact(val incognito: Boolean, val contactReqId: Long): CC()
   class ApiRejectContact(val contactReqId: Long): CC()
-  class ApiChatRead(val type: ChatType, val id: Long): CC()
-  class ApiChatItemsRead(val type: ChatType, val id: Long, val itemIds: List<Long>): CC()
+  class ApiChatRead(val type: ChatType, val id: Long, val scope: GroupChatScope?): CC()
+  class ApiChatItemsRead(val type: ChatType, val id: Long, val scope: GroupChatScope?, val itemIds: List<Long>): CC()
   class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
   class ReceiveFile(val fileId: Long, val userApprovedRelays: Boolean, val encrypt: Boolean, val inline: Boolean?): CC()
   class CancelFile(val fileId: Long): CC()
@@ -3511,16 +3529,16 @@ sealed class CC {
       } else {
         " content=${contentTag.name.lowercase()}"
       }
-      "/_get chat ${chatRef(type, id)}$tag ${pagination.cmdString}" + (if (search == "") "" else " search=$search")
+      "/_get chat ${chatRef(type, id, scope)}$tag ${pagination.cmdString}" + (if (search == "") "" else " search=$search")
     }
-    is ApiGetChatItemInfo -> "/_get item info ${chatRef(type, id)} $itemId"
+    is ApiGetChatItemInfo -> "/_get item info ${chatRef(type, id, scope)} $itemId"
     is ApiSendMessages -> {
       val msgs = json.encodeToString(composedMessages)
       val ttlStr = if (ttl != null) "$ttl" else "default"
-      "/_send ${chatRef(type, id)} live=${onOff(live)} ttl=${ttlStr} json $msgs"
+      "/_send ${chatRef(type, id, scope)} live=${onOff(live)} ttl=${ttlStr} json $msgs"
     }
     is ApiCreateChatTag -> "/_create tag ${json.encodeToString(tag)}"
-    is ApiSetChatTags -> "/_tags ${chatRef(type, id)} ${tagIds.joinToString(",")}"
+    is ApiSetChatTags -> "/_tags ${chatRef(type, id, scope = null)} ${tagIds.joinToString(",")}"
     is ApiDeleteChatTag -> "/_delete tag $tagId"
     is ApiUpdateChatTag -> "/_update tag $tagId ${json.encodeToString(tagData)}"
     is ApiReorderChatTags -> "/_reorder tags ${tagIds.joinToString(",")}"
@@ -3529,31 +3547,36 @@ sealed class CC {
       "/_create *$noteFolderId json $msgs"
     }
     is ApiReportMessage -> "/_report #$groupId $chatItemId reason=${json.encodeToString(reportReason).trim('"')} $reportText"
-    is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId live=${onOff(live)} ${mc.cmdString}"
-    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} ${itemIds.joinToString(",")} ${mode.deleteMode}"
+    is ApiUpdateChatItem -> "/_update item ${chatRef(type, id, scope)} $itemId live=${onOff(live)} ${updatedMessage.cmdString}"
+    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id, scope)} ${itemIds.joinToString(",")} ${mode.deleteMode}"
     is ApiDeleteMemberChatItem -> "/_delete member item #$groupId ${itemIds.joinToString(",")}"
-    is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
+    is ApiArchiveReceivedReports -> "/_archive reports #$groupId"
+    is ApiDeleteReceivedReports -> "/_delete reports #$groupId ${itemIds.joinToString(",")} ${mode.deleteMode}"
+    is ApiChatItemReaction -> "/_reaction ${chatRef(type, id, scope)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
     is ApiGetReactionMembers -> "/_reaction members $userId #$groupId $itemId ${json.encodeToString(reaction)}"
     is ApiForwardChatItems -> {
       val ttlStr = if (ttl != null) "$ttl" else "default"
-      "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} ${itemIds.joinToString(",")} ttl=${ttlStr}"
+      "/_forward ${chatRef(toChatType, toChatId, toScope)} ${chatRef(fromChatType, fromChatId, fromScope)} ${itemIds.joinToString(",")} ttl=${ttlStr}"
     }
     is ApiPlanForwardChatItems -> {
-      "/_forward plan ${chatRef(fromChatType, fromChatId)} ${chatItemIds.joinToString(",")}"
+      "/_forward plan ${chatRef(fromChatType, fromChatId, fromScope)} ${chatItemIds.joinToString(",")}"
     }
     is ApiNewGroup -> "/_group $userId incognito=${onOff(incognito)} ${json.encodeToString(groupProfile)}"
     is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
     is ApiJoinGroup -> "/_join #$groupId"
-    is ApiMemberRole -> "/_member role #$groupId $memberId ${memberRole.memberRole}"
-    is ApiBlockMemberForAll -> "/_block #$groupId $memberId blocked=${onOff(blocked)}"
-    is ApiRemoveMember -> "/_remove #$groupId $memberId"
+    is ApiAcceptMember -> "/_accept member #$groupId $groupMemberId ${memberRole.memberRole}"
+    is ApiDeleteMemberSupportChat -> "/_delete member chat #$groupId $groupMemberId"
+    is ApiMembersRole -> "/_member role #$groupId ${memberIds.joinToString(",")} ${memberRole.memberRole}"
+    is ApiBlockMembersForAll -> "/_block #$groupId ${memberIds.joinToString(",")} blocked=${onOff(blocked)}"
+    is ApiRemoveMembers -> "/_remove #$groupId ${memberIds.joinToString(",")} messages=${onOff(withMessages)}"
     is ApiLeaveGroup -> "/_leave #$groupId"
     is ApiListMembers -> "/_members #$groupId"
     is ApiUpdateGroupProfile -> "/_group_profile #$groupId ${json.encodeToString(groupProfile)}"
-    is APICreateGroupLink -> "/_create link #$groupId ${memberRole.name.lowercase()}"
+    is APICreateGroupLink -> "/_create link #$groupId ${memberRole.name.lowercase()} short=${onOff(short)}"
     is APIGroupLinkMemberRole -> "/_set link role #$groupId ${memberRole.name.lowercase()}"
     is APIDeleteGroupLink -> "/_delete link #$groupId"
     is APIGetGroupLink -> "/_get link #$groupId"
+    is ApiAddGroupShortLink -> "/_short link #$groupId"
     is APICreateMemberContact -> "/_create member contact #$groupId $groupMemberId"
     is APISendMemberContactInvitation -> "/_invite member contact @$contactId ${mc.cmdString}"
     is APITestProtoServer -> "/_server test $userId $server"
@@ -3567,12 +3590,13 @@ sealed class CC {
     is ApiAcceptConditions -> "/_accept_conditions ${conditionsId} ${operatorIds.joinToString(",")}"
     is APISetChatItemTTL -> "/_ttl $userId ${chatItemTTLStr(seconds)}"
     is APIGetChatItemTTL -> "/_ttl $userId"
+    is APISetChatTTL -> "/_ttl $userId ${chatRef(chatType, id, scope = null)} ${chatItemTTLStr(seconds)}"
     is APISetNetworkConfig -> "/_network ${json.encodeToString(networkConfig)}"
     is APIGetNetworkConfig -> "/network"
     is APISetNetworkInfo -> "/_network info ${json.encodeToString(networkInfo)}"
     is ReconnectServer -> "/reconnect $userId $server"
     is ReconnectAllServers -> "/reconnect"
-    is APISetChatSettings -> "/_settings ${chatRef(type, id)} ${json.encodeToString(chatSettings)}"
+    is APISetChatSettings -> "/_settings ${chatRef(type, id, scope = null)} ${json.encodeToString(chatSettings)}"
     is ApiSetMemberSettings -> "/_member settings #$groupId $groupMemberId ${json.encodeToString(memberSettings)}"
     is APIContactInfo -> "/_info @$contactId"
     is APIGroupMemberInfo -> "/_info #$groupId $groupMemberId"
@@ -3588,14 +3612,14 @@ sealed class CC {
     is APIGetGroupMemberCode -> "/_get code #$groupId $groupMemberId"
     is APIVerifyContact -> "/_verify code @$contactId" + if (connectionCode != null) " $connectionCode" else ""
     is APIVerifyGroupMember -> "/_verify code #$groupId $groupMemberId" + if (connectionCode != null) " $connectionCode" else ""
-    is APIAddContact -> "/_connect $userId incognito=${onOff(incognito)}"
+    is APIAddContact -> "/_connect $userId short=${onOff(short)} incognito=${onOff(incognito)}"
     is ApiSetConnectionIncognito -> "/_set incognito :$connId ${onOff(incognito)}"
     is ApiChangeConnectionUser -> "/_set conn user :$connId $userId"
-    is APIConnectPlan -> "/_connect plan $userId $connReq"
-    is APIConnect -> "/_connect $userId incognito=${onOff(incognito)} $connReq"
+    is APIConnectPlan -> "/_connect plan $userId $connLink"
+    is APIConnect -> "/_connect $userId incognito=${onOff(incognito)} ${connLink.connFullLink} ${connLink.connShortLink ?: ""}"
     is ApiConnectContactViaAddress -> "/_connect contact $userId incognito=${onOff(incognito)} $contactId"
-    is ApiDeleteChat -> "/_delete ${chatRef(type, id)} ${chatDeleteMode.cmdString}"
-    is ApiClearChat -> "/_clear chat ${chatRef(type, id)}"
+    is ApiDeleteChat -> "/_delete ${chatRef(type, id, scope = null)} ${chatDeleteMode.cmdString}"
+    is ApiClearChat -> "/_clear chat ${chatRef(type, id, scope = null)}"
     is ApiListContacts -> "/_contacts $userId"
     is ApiUpdateProfile -> "/_profile $userId ${json.encodeToString(profile)}"
     is ApiSetContactPrefs -> "/_set prefs @$contactId ${json.encodeToString(prefs)}"
@@ -3604,9 +3628,10 @@ sealed class CC {
     is ApiSetConnectionAlias -> "/_set alias :$connId ${localAlias.trim()}"
     is ApiSetUserUIThemes -> "/_set theme user $userId ${if (themes != null) json.encodeToString(themes) else ""}"
     is ApiSetChatUIThemes -> "/_set theme $chatId ${if (themes != null) json.encodeToString(themes) else ""}"
-    is ApiCreateMyAddress -> "/_address $userId"
+    is ApiCreateMyAddress -> "/_address $userId short=${onOff(short)}"
     is ApiDeleteMyAddress -> "/_delete_address $userId"
     is ApiShowMyAddress -> "/_show_address $userId"
+    is ApiAddMyAddressShortLink -> "/_short_link_address $userId"
     is ApiSetProfileAddress -> "/_profile_address $userId ${onOff(on)}"
     is ApiAddressAutoAccept -> "/_auto_accept $userId ${AutoAccept.cmdString(autoAccept)}"
     is ApiAcceptContact -> "/_accept incognito=${onOff(incognito)} $contactReqId"
@@ -3620,13 +3645,13 @@ sealed class CC {
     is ApiEndCall -> "/_call end @${contact.apiId}"
     is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus.value}"
     is ApiGetNetworkStatuses -> "/_network_statuses"
-    is ApiChatRead -> "/_read chat ${chatRef(type, id)}"
-    is ApiChatItemsRead -> "/_read chat items ${chatRef(type, id)} ${itemIds.joinToString(",")}"
-    is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
+    is ApiChatRead -> "/_read chat ${chatRef(type, id, scope)}"
+    is ApiChatItemsRead -> "/_read chat items ${chatRef(type, id, scope)} ${itemIds.joinToString(",")}"
+    is ApiChatUnread -> "/_unread chat ${chatRef(type, id, scope = null)} ${onOff(unreadChat)}"
     is ReceiveFile ->
       "/freceive $fileId" +
-          (" approved_relays=${onOff(userApprovedRelays)}") +
-          (if (encrypt == null) "" else " encrypt=${onOff(encrypt)}") +
+          " approved_relays=${onOff(userApprovedRelays)}" +
+          " encrypt=${onOff(encrypt)}" +
           (if (inline == null) "" else " inline=${onOff(inline)}")
     is CancelFile -> "/fcancel $fileId"
     is SetLocalDeviceName -> "/set device name $displayName"
@@ -3697,6 +3722,8 @@ sealed class CC {
     is ApiUpdateChatItem -> "apiUpdateChatItem"
     is ApiDeleteChatItem -> "apiDeleteChatItem"
     is ApiDeleteMemberChatItem -> "apiDeleteMemberChatItem"
+    is ApiArchiveReceivedReports -> "apiArchiveReceivedReports"
+    is ApiDeleteReceivedReports -> "apiDeleteReceivedReports"
     is ApiChatItemReaction -> "apiChatItemReaction"
     is ApiGetReactionMembers -> "apiGetReactionMembers"
     is ApiForwardChatItems -> "apiForwardChatItems"
@@ -3704,9 +3731,11 @@ sealed class CC {
     is ApiNewGroup -> "apiNewGroup"
     is ApiAddMember -> "apiAddMember"
     is ApiJoinGroup -> "apiJoinGroup"
-    is ApiMemberRole -> "apiMemberRole"
-    is ApiBlockMemberForAll -> "apiBlockMemberForAll"
-    is ApiRemoveMember -> "apiRemoveMember"
+    is ApiAcceptMember -> "apiAcceptMember"
+    is ApiDeleteMemberSupportChat -> "apiDeleteMemberSupportChat"
+    is ApiMembersRole -> "apiMembersRole"
+    is ApiBlockMembersForAll -> "apiBlockMembersForAll"
+    is ApiRemoveMembers -> "apiRemoveMembers"
     is ApiLeaveGroup -> "apiLeaveGroup"
     is ApiListMembers -> "apiListMembers"
     is ApiUpdateGroupProfile -> "apiUpdateGroupProfile"
@@ -3714,6 +3743,7 @@ sealed class CC {
     is APIGroupLinkMemberRole -> "apiGroupLinkMemberRole"
     is APIDeleteGroupLink -> "apiDeleteGroupLink"
     is APIGetGroupLink -> "apiGetGroupLink"
+    is ApiAddGroupShortLink -> "apiAddGroupShortLink"
     is APICreateMemberContact -> "apiCreateMemberContact"
     is APISendMemberContactInvitation -> "apiSendMemberContactInvitation"
     is APITestProtoServer -> "testProtoServer"
@@ -3727,6 +3757,7 @@ sealed class CC {
     is ApiAcceptConditions -> "apiAcceptConditions"
     is APISetChatItemTTL -> "apiSetChatItemTTL"
     is APIGetChatItemTTL -> "apiGetChatItemTTL"
+    is APISetChatTTL -> "apiSetChatTTL"
     is APISetNetworkConfig -> "apiSetNetworkConfig"
     is APIGetNetworkConfig -> "apiGetNetworkConfig"
     is APISetNetworkInfo -> "apiSetNetworkInfo"
@@ -3767,6 +3798,7 @@ sealed class CC {
     is ApiCreateMyAddress -> "apiCreateMyAddress"
     is ApiDeleteMyAddress -> "apiDeleteMyAddress"
     is ApiShowMyAddress -> "apiShowMyAddress"
+    is ApiAddMyAddressShortLink -> "apiAddMyAddressShortLink"
     is ApiSetProfileAddress -> "apiSetProfileAddress"
     is ApiAddressAutoAccept -> "apiAddressAutoAccept"
     is ApiAcceptContact -> "apiAcceptContact"
@@ -3812,7 +3844,7 @@ sealed class CC {
   data class ItemRange(val from: Long, val to: Long)
 
   fun chatItemTTLStr(seconds: Long?): String {
-    if (seconds == null) return "none"
+    if (seconds == null) return "default"
     return seconds.toString()
   }
 
@@ -3839,7 +3871,13 @@ sealed class CC {
   private fun maybePwd(pwd: String?): String = if (pwd == "" || pwd == null) "" else " " + json.encodeToString(pwd)
 
   companion object {
-    fun chatRef(chatType: ChatType, id: Long) = "${chatType.type}${id}"
+    fun chatRef(chatType: ChatType, id: Long, scope: GroupChatScope?) = when (scope) {
+      null -> "${chatType.type}${id}"
+      is GroupChatScope.MemberSupport -> when (scope.groupMemberId_) {
+        null -> "${chatType.type}${id}(_support)"
+        else -> "${chatType.type}${id}(_support:${scope.groupMemberId_})"
+      }
+    }
   }
 }
 
@@ -3874,7 +3912,13 @@ sealed class ChatPagination {
 }
 
 @Serializable
-class ComposedMessage(val fileSource: CryptoFile?, val quotedItemId: Long?, val msgContent: MsgContent)
+class ComposedMessage(val fileSource: CryptoFile?, val quotedItemId: Long?, val msgContent: MsgContent, val mentions: Map<String, Long>)
+
+@Serializable
+class UpdatedMessage(val msgContent: MsgContent, val mentions: Map<String, Long>) {
+  val cmdString: String get() =
+    if (msgContent is MCUnknown) "json $json" else "json ${json.encodeToString(this)}"
+}
 
 @Serializable
 class ChatTagData(val emoji: String?, val text: String)
@@ -4364,13 +4408,13 @@ data class ParsedServerAddress (
 @Serializable
 data class NetCfg(
   val socksProxy: String?,
-  val socksMode: SocksMode = SocksMode.Always,
-  val hostMode: HostMode = HostMode.OnionViaSocks,
+  val socksMode: SocksMode = SocksMode.default,
+  val hostMode: HostMode = HostMode.default,
   val requiredHostMode: Boolean = false,
   val sessionMode: TransportSessionMode = TransportSessionMode.default,
-  val smpProxyMode: SMPProxyMode = SMPProxyMode.Always,
-  val smpProxyFallback: SMPProxyFallback = SMPProxyFallback.AllowProtected,
-  val smpWebPort: Boolean = false,
+  val smpProxyMode: SMPProxyMode = SMPProxyMode.default,
+  val smpProxyFallback: SMPProxyFallback = SMPProxyFallback.default,
+  val smpWebPortServers: SMPWebPortServers = SMPWebPortServers.default,
   val tcpConnectTimeout: Long, // microseconds
   val tcpTimeout: Long, // microseconds
   val tcpTimeoutPerKb: Long, // microseconds
@@ -4468,12 +4512,20 @@ enum class HostMode {
   @SerialName("onionViaSocks") OnionViaSocks,
   @SerialName("onion") Onion,
   @SerialName("public") Public;
+
+  companion object {
+    val default = OnionViaSocks
+  }
 }
 
 @Serializable
 enum class SocksMode {
   @SerialName("always") Always,
   @SerialName("onion") Onion;
+
+  companion object {
+    val default = Always
+  }
 }
 
 @Serializable
@@ -4482,6 +4534,10 @@ enum class SMPProxyMode {
   @SerialName("unknown") Unknown,
   @SerialName("unprotected") Unprotected,
   @SerialName("never") Never;
+
+  companion object {
+    val default = Always
+  }
 }
 
 @Serializable
@@ -4489,6 +4545,27 @@ enum class SMPProxyFallback {
   @SerialName("allow") Allow,
   @SerialName("allowProtected") AllowProtected,
   @SerialName("prohibit") Prohibit;
+
+  companion object {
+    val default = AllowProtected
+  }
+}
+
+@Serializable
+enum class SMPWebPortServers {
+  @SerialName("all") All,
+  @SerialName("preset") Preset,
+  @SerialName("off") Off;
+
+  val text get(): StringResource = when (this) {
+    All -> MR.strings.network_smp_web_port_all
+    Preset -> MR.strings.network_smp_web_port_preset
+    Off -> MR.strings.network_smp_web_port_off
+  }
+
+  companion object {
+    val default = Preset
+  }
 }
 
 @Serializable
@@ -4531,7 +4608,37 @@ data class ChatSettings(
 enum class MsgFilter {
   @SerialName("all") All,
   @SerialName("none") None,
-  @SerialName("mentions") Mentions,
+  @SerialName("mentions") Mentions;
+
+  fun nextMode(mentions: Boolean): MsgFilter {
+    return when (this) {
+      All -> if (mentions) Mentions else None
+      Mentions -> None
+      None -> All
+    }
+  }
+
+  fun text(mentions: Boolean): StringResource {
+    return when (this) {
+      All -> MR.strings.unmute_chat
+      Mentions -> MR.strings.mute_chat
+      None -> if (mentions) MR.strings.mute_all_chat else MR.strings.mute_chat
+    }
+  }
+
+  val icon: ImageResource
+    get() = when (this) {
+      All -> MR.images.ic_notifications
+      Mentions -> MR.images.ic_notification_important
+      None -> MR.images.ic_notifications_off
+    }
+
+  val iconFilled: ImageResource
+    get() = when (this) {
+      All -> MR.images.ic_notifications
+      Mentions -> MR.images.ic_notification_important_filled
+      None -> MR.images.ic_notifications_off_filled
+    }
 }
 
 @Serializable
@@ -5101,6 +5208,7 @@ enum class GroupFeature: Feature {
   @SerialName("voice") Voice,
   @SerialName("files") Files,
   @SerialName("simplexLinks") SimplexLinks,
+  @SerialName("reports") Reports,
   @SerialName("history") History;
 
   override val hasParam: Boolean get() = when(this) {
@@ -5117,6 +5225,7 @@ enum class GroupFeature: Feature {
       Voice -> true
       Files -> true
       SimplexLinks -> true
+      Reports -> false
       History -> false
     }
 
@@ -5129,6 +5238,7 @@ enum class GroupFeature: Feature {
       Voice -> generalGetString(MR.strings.voice_messages)
       Files -> generalGetString(MR.strings.files_and_media)
       SimplexLinks -> generalGetString(MR.strings.simplex_links)
+      Reports -> generalGetString(MR.strings.group_reports_member_reports)
       History -> generalGetString(MR.strings.recent_history)
     }
 
@@ -5141,6 +5251,7 @@ enum class GroupFeature: Feature {
       Voice -> painterResource(MR.images.ic_keyboard_voice)
       Files -> painterResource(MR.images.ic_draft)
       SimplexLinks -> painterResource(MR.images.ic_link)
+      Reports -> painterResource(MR.images.ic_flag)
       History -> painterResource(MR.images.ic_schedule)
     }
 
@@ -5153,6 +5264,7 @@ enum class GroupFeature: Feature {
     Voice -> painterResource(MR.images.ic_keyboard_voice_filled)
     Files -> painterResource(MR.images.ic_draft_filled)
     SimplexLinks -> painterResource(MR.images.ic_link)
+    Reports -> painterResource(MR.images.ic_flag_filled)
     History -> painterResource(MR.images.ic_schedule_filled)
   }
 
@@ -5187,6 +5299,10 @@ enum class GroupFeature: Feature {
           GroupFeatureEnabled.ON -> generalGetString(MR.strings.allow_to_send_simplex_links)
           GroupFeatureEnabled.OFF -> generalGetString(MR.strings.prohibit_sending_simplex_links)
         }
+        Reports -> when(enabled) {
+          GroupFeatureEnabled.ON -> generalGetString(MR.strings.enable_sending_member_reports)
+          GroupFeatureEnabled.OFF -> generalGetString(MR.strings.disable_sending_member_reports)
+        }
         History -> when(enabled) {
           GroupFeatureEnabled.ON -> generalGetString(MR.strings.enable_sending_recent_history)
           GroupFeatureEnabled.OFF -> generalGetString(MR.strings.disable_sending_recent_history)
@@ -5222,6 +5338,10 @@ enum class GroupFeature: Feature {
           GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_simplex_links)
           GroupFeatureEnabled.OFF -> generalGetString(MR.strings.simplex_links_are_prohibited_in_group)
         }
+        Reports -> when(enabled) {
+          GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_reports)
+          GroupFeatureEnabled.OFF -> generalGetString(MR.strings.member_reports_are_prohibited)
+        }
         History -> when(enabled) {
           GroupFeatureEnabled.ON -> generalGetString(MR.strings.recent_history_is_sent_to_new_members)
           GroupFeatureEnabled.OFF -> generalGetString(MR.strings.recent_history_is_not_sent_to_new_members)
@@ -5341,6 +5461,7 @@ data class FullGroupPreferences(
   val voice: RoleGroupPreference,
   val files: RoleGroupPreference,
   val simplexLinks: RoleGroupPreference,
+  val reports: GroupPreference,
   val history: GroupPreference,
 ) {
   fun toGroupPreferences(): GroupPreferences =
@@ -5352,7 +5473,8 @@ data class FullGroupPreferences(
       voice = voice,
       files = files,
       simplexLinks = simplexLinks,
-      history = history
+      reports = reports,
+      history = history,
     )
 
   companion object {
@@ -5364,6 +5486,7 @@ data class FullGroupPreferences(
       voice = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       files = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       simplexLinks = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
+      reports = GroupPreference(GroupFeatureEnabled.ON),
       history = GroupPreference(GroupFeatureEnabled.ON),
     )
   }
@@ -5378,6 +5501,7 @@ data class GroupPreferences(
   val voice: RoleGroupPreference? = null,
   val files: RoleGroupPreference? = null,
   val simplexLinks: RoleGroupPreference? = null,
+  val reports: GroupPreference? = null,
   val history: GroupPreference? = null,
 ) {
   companion object {
@@ -5389,6 +5513,7 @@ data class GroupPreferences(
       voice = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       files = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       simplexLinks = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
+      reports = GroupPreference(GroupFeatureEnabled.ON),
       history = GroupPreference(GroupFeatureEnabled.ON),
     )
   }
@@ -5530,56 +5655,122 @@ val yaml = Yaml(configuration = YamlConfiguration(
   codePointLimit = 5500000,
 ))
 
-@Serializable
-class APIResponse(val resp: CR, val remoteHostId: Long?, val corr: String? = null) {
-  companion object {
-    fun decodeStr(str: String): APIResponse {
-      return try {
-        json.decodeFromString(str)
-      } catch(e: Throwable) {
-        try {
-          Log.d(TAG, e.localizedMessage ?: "")
-          val data = json.parseToJsonElement(str).jsonObject
-          val resp = data["resp"]!!.jsonObject
-          val type = resp["type"]?.jsonPrimitive?.contentOrNull ?: "invalid"
-          val corr = data["corr"]?.toString()
-          val remoteHostId = data["remoteHostId"]?.jsonPrimitive?.longOrNull
-          try {
-            if (type == "apiChats") {
-              val user: UserRef = json.decodeFromJsonElement(resp["user"]!!.jsonObject)
-              val chats: List<Chat> = resp["chats"]!!.jsonArray.map {
-                parseChatData(it)
-              }
-              return APIResponse(CR.ApiChats(user, chats), remoteHostId, corr)
-            } else if (type == "apiChat") {
-              val user: UserRef = json.decodeFromJsonElement(resp["user"]!!.jsonObject)
-              val chat = parseChatData(resp["chat"]!!)
-              return APIResponse(CR.ApiChat(user, chat), remoteHostId, corr)
-            } else if (type == "chatCmdError") {
-              val userObject = resp["user_"]?.jsonObject
-              val user = runCatching<UserRef?> { json.decodeFromJsonElement(userObject!!) }.getOrNull()
-              return APIResponse(CR.ChatCmdError(user, ChatError.ChatErrorInvalidJSON(json.encodeToString(resp["chatError"]))), remoteHostId, corr)
-            } else if (type == "chatError") {
-              val userObject = resp["user_"]?.jsonObject
-              val user = runCatching<UserRef?> { json.decodeFromJsonElement(userObject!!) }.getOrNull()
-              return APIResponse(CR.ChatRespError(user, ChatError.ChatErrorInvalidJSON(json.encodeToString(resp["chatError"]))), remoteHostId, corr)
-            }
-          } catch (e: Exception) {
-            Log.e(TAG, "Exception while parsing chat(s): " + e.stackTraceToString())
-          } catch (e: Throwable) {
-            Log.e(TAG, "Throwable while parsing chat(s): " + e.stackTraceToString())
-            AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.stackTraceToString())
+@Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
+@Serializable(with = APISerializer::class)
+sealed class API {
+  @Serializable(with = APISerializer::class)  class Result(val remoteHostId: Long?, val res: CR) : API()
+  @Serializable(with = APISerializer::class)  class Error(val remoteHostId: Long?, val err: ChatError) : API()
+
+  val ok: Boolean get() = this is API.Result && this.res is CR.CmdOk
+  val result: CR? get() = (this as? API.Result)?.res
+  val rhId: Long? get() = when (this) {
+    is Result -> remoteHostId
+    is Error -> remoteHostId
+  }
+
+  val pair: Pair<CR?, ChatError?> get() = when (this) {
+    is Result -> res to null
+    is Error -> null to err
+  }
+
+  val responseType: String get() = when (this) {
+    is Result -> res.responseType
+    is Error -> "error ${err.resultType}"
+  }
+
+  val details: String get() = when (this) {
+    is Result -> res.details
+    is Error -> "error ${err.string}"
+  }
+}
+
+object APISerializer : KSerializer<API> {
+  override val descriptor: SerialDescriptor = buildSerialDescriptor("API", PolymorphicKind.SEALED) {
+    element("Result", buildClassSerialDescriptor("Result") {
+      element<Long?>("remoteHostId")
+      element<CR>("result")
+    })
+    element("Error", buildClassSerialDescriptor("Error") {
+      element<Long?>("remoteHostId")
+      element<ChatError>("error")
+    })
+  }
+
+  override fun deserialize(decoder: Decoder): API {
+    require(decoder is JsonDecoder)
+    val j = try { decoder.decodeJsonElement() } catch(e: Exception) { null } catch(e: Throwable) { null }
+    if (j == null) return API.Error(remoteHostId = null, ChatError.ChatErrorInvalidJSON(""))
+    if (j !is JsonObject) return API.Error(remoteHostId = null, ChatError.ChatErrorInvalidJSON(json.encodeToString(j)))
+    val remoteHostId = j["remoteHostId"]?.jsonPrimitive?.longOrNull
+    val jRes = j["result"]
+    if (jRes != null) {
+      val result = try {
+        decoder.json.decodeFromJsonElement<CR>(jRes)
+      } catch (e: Exception) {
+        fallbackResult(jRes)
+      } catch (e: Throwable) {
+        fallbackResult(jRes)
+      }
+      return API.Result(remoteHostId, result)
+    }
+    val jErr = j["error"]
+    if (jErr != null) {
+      val error = try {
+        decoder.json.decodeFromJsonElement<ChatError>(jErr)
+      } catch (e: Exception) {
+        fallbackChatError(jErr)
+      } catch (e: Throwable) {
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.stackTraceToString())
+        fallbackChatError(jErr)
+      }
+      return API.Error(remoteHostId, error)
+    }
+    return API.Error(remoteHostId, fallbackChatError(j))
+  }
+
+  private fun fallbackResult(jRes: JsonElement): CR {
+    if (jRes is JsonObject) {
+      val type = jRes["type"]?.jsonPrimitive?.contentOrNull ?: "invalid"
+      try {
+        if (type == "apiChats") {
+          val user: UserRef = json.decodeFromJsonElement(jRes["user"]!!.jsonObject)
+          val chats: List<Chat> = jRes["chats"]!!.jsonArray.map {
+            parseChatData(it)
           }
-          APIResponse(CR.Response(type, json.encodeToString(data)), remoteHostId, corr)
-        } catch(e: Exception) {
-          APIResponse(CR.Invalid(str), remoteHostId = null)
-        } catch(e: Throwable) {
-          Log.e(TAG, "Throwable2 while parsing chat(s): " + e.stackTraceToString())
-          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.stackTraceToString())
-          APIResponse(CR.Invalid(str), remoteHostId = null)
+          return CR.ApiChats(user, chats)
+        } else if (type == "apiChat") {
+          val user: UserRef = json.decodeFromJsonElement(jRes["user"]!!.jsonObject)
+          val chat = parseChatData(jRes["chat"]!!)
+          return CR.ApiChat(user, chat)
         }
+      } catch (e: Exception) {
+        Log.e(TAG, "Exception while parsing chat(s): " + e.stackTraceToString())
+      } catch (e: Throwable) {
+        Log.e(TAG, "Throwable while parsing chat(s): " + e.stackTraceToString())
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.stackTraceToString())
+      }
+      return CR.Response(type, json.encodeToString(jRes))
+    }
+    return CR.Response(type = "invalid", json.encodeToString(jRes))
+  }
+
+  private fun fallbackChatError(jErr: JsonElement): ChatError {
+    return ChatError.ChatErrorInvalidJSON(json.encodeToString(jErr))
+  }
+
+  override fun serialize(encoder: Encoder, value: API) {
+    require(encoder is JsonEncoder)
+    val json = when (value) {
+      is API.Result -> buildJsonObject {
+        value.remoteHostId?.let { put("remoteHostId", it) }
+        put("result", encoder.json.encodeToJsonElement(value.res))
+      }
+      is API.Error -> buildJsonObject {
+        value.remoteHostId?.let { put("remoteHostId", it) }
+        put("error", encoder.json.encodeToJsonElement(value.err))
       }
     }
+    encoder.encodeJsonElement(json)
   }
 }
 
@@ -5634,22 +5825,21 @@ sealed class CR {
   @Serializable @SerialName("groupMemberRatchetSyncStarted") class GroupMemberRatchetSyncStarted(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val connectionStats: ConnectionStats): CR()
   @Serializable @SerialName("contactRatchetSync") class ContactRatchetSync(val user: UserRef, val contact: Contact, val ratchetSyncProgress: RatchetSyncProgress): CR()
   @Serializable @SerialName("groupMemberRatchetSync") class GroupMemberRatchetSync(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val ratchetSyncProgress: RatchetSyncProgress): CR()
-  @Serializable @SerialName("contactVerificationReset") class ContactVerificationReset(val user: UserRef, val contact: Contact): CR()
-  @Serializable @SerialName("groupMemberVerificationReset") class GroupMemberVerificationReset(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("contactCode") class ContactCode(val user: UserRef, val contact: Contact, val connectionCode: String): CR()
   @Serializable @SerialName("groupMemberCode") class GroupMemberCode(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val connectionCode: String): CR()
   @Serializable @SerialName("connectionVerified") class ConnectionVerified(val user: UserRef, val verified: Boolean, val expectedCode: String): CR()
   @Serializable @SerialName("tagsUpdated") class TagsUpdated(val user: UserRef, val userTags: List<ChatTag>, val chatTags: List<Long>): CR()
-  @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connReqInvitation: String, val connection: PendingContactConnection): CR()
+  @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connLinkInvitation: CreatedConnLink, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionIncognitoUpdated") class ConnectionIncognitoUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionUserChanged") class ConnectionUserChanged(val user: UserRef, val fromConnection: PendingContactConnection, val toConnection: PendingContactConnection, val newUser: UserRef): CR()
-  @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connectionPlan: ConnectionPlan): CR()
+  @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connLink: CreatedConnLink, val connectionPlan: ConnectionPlan): CR()
   @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("sentInvitationToContact") class SentInvitationToContact(val user: UserRef, val contact: Contact, val customUserProfile: Profile?): CR()
   @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactDeleted") class ContactDeleted(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactDeletedByContact") class ContactDeletedByContact(val user: UserRef, val contact: Contact): CR()
+  @Serializable @SerialName("itemsReadForChat") class ItemsReadForChat(val user: UserRef, val chatInfo: ChatInfo): CR()
   @Serializable @SerialName("chatCleared") class ChatCleared(val user: UserRef, val chatInfo: ChatInfo): CR()
   @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange(val user: User): CR()
   @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val user: User, val fromProfile: Profile, val toProfile: Profile, val updateSummary: UserProfileUpdateSummary): CR()
@@ -5660,7 +5850,7 @@ sealed class CR {
   @Serializable @SerialName("contactPrefsUpdated") class ContactPrefsUpdated(val user: UserRef, val fromContact: Contact, val toContact: Contact): CR()
   @Serializable @SerialName("userContactLink") class UserContactLink(val user: User, val contactLink: UserContactLinkRec): CR()
   @Serializable @SerialName("userContactLinkUpdated") class UserContactLinkUpdated(val user: User, val contactLink: UserContactLinkRec): CR()
-  @Serializable @SerialName("userContactLinkCreated") class UserContactLinkCreated(val user: User, val connReqContact: String): CR()
+  @Serializable @SerialName("userContactLinkCreated") class UserContactLinkCreated(val user: User, val connLinkContact: CreatedConnLink): CR()
   @Serializable @SerialName("userContactLinkDeleted") class UserContactLinkDeleted(val user: User): CR()
   @Serializable @SerialName("contactConnected") class ContactConnected(val user: UserRef, val contact: Contact, val userCustomProfile: Profile? = null): CR()
   @Serializable @SerialName("contactConnecting") class ContactConnecting(val user: UserRef, val contact: Contact): CR()
@@ -5677,10 +5867,6 @@ sealed class CR {
   // TODO remove above
   @Serializable @SerialName("networkStatus") class NetworkStatusResp(val networkStatus: NetworkStatus, val connections: List<String>): CR()
   @Serializable @SerialName("networkStatuses") class NetworkStatuses(val user_: UserRef?, val networkStatuses: List<ConnNetworkStatus>): CR()
-  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val user: UserRef, val group: GroupRef): CR()
-  @Serializable @SerialName("memberSubErrors") class MemberSubErrors(val user: UserRef, val memberSubErrors: List<MemberSubError>): CR()
-  @Serializable @SerialName("groupEmpty") class GroupEmpty(val user: UserRef, val group: GroupInfo): CR()
-  @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
   @Serializable @SerialName("newChatItems") class NewChatItems(val user: UserRef, val chatItems: List<AChatItem>): CR()
   @Serializable @SerialName("chatItemsStatusesUpdated") class ChatItemsStatusesUpdated(val user: UserRef, val chatItems: List<AChatItem>): CR()
   @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val user: UserRef, val chatItem: AChatItem): CR()
@@ -5696,29 +5882,30 @@ sealed class CR {
   @Serializable @SerialName("userAcceptedGroupSent") class UserAcceptedGroupSent (val user: UserRef, val groupInfo: GroupInfo, val hostContact: Contact? = null): CR()
   @Serializable @SerialName("groupLinkConnecting") class GroupLinkConnecting (val user: UserRef, val groupInfo: GroupInfo, val hostMember: GroupMember): CR()
   @Serializable @SerialName("businessLinkConnecting") class BusinessLinkConnecting (val user: UserRef, val groupInfo: GroupInfo, val hostMember: GroupMember, val fromContact: Contact): CR()
-  @Serializable @SerialName("userDeletedMember") class UserDeletedMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("userDeletedMembers") class UserDeletedMembers(val user: UserRef, val groupInfo: GroupInfo, val members: List<GroupMember>, val withMessages: Boolean): CR()
   @Serializable @SerialName("leftMemberUser") class LeftMemberUser(val user: UserRef, val groupInfo: GroupInfo): CR()
   @Serializable @SerialName("groupMembers") class GroupMembers(val user: UserRef, val group: Group): CR()
   @Serializable @SerialName("receivedGroupInvitation") class ReceivedGroupInvitation(val user: UserRef, val groupInfo: GroupInfo, val contact: Contact, val memberRole: GroupMemberRole): CR()
   @Serializable @SerialName("groupDeletedUser") class GroupDeletedUser(val user: UserRef, val groupInfo: GroupInfo): CR()
   @Serializable @SerialName("joinedGroupMemberConnecting") class JoinedGroupMemberConnecting(val user: UserRef, val groupInfo: GroupInfo, val hostMember: GroupMember, val member: GroupMember): CR()
+  @Serializable @SerialName("memberAccepted") class MemberAccepted(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("memberSupportChatDeleted") class MemberSupportChatDeleted(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("memberAcceptedByOther") class MemberAcceptedByOther(val user: UserRef, val groupInfo: GroupInfo, val acceptingMember: GroupMember, val member: GroupMember): CR()
   @Serializable @SerialName("memberRole") class MemberRole(val user: UserRef, val groupInfo: GroupInfo, val byMember: GroupMember, val member: GroupMember, val fromRole: GroupMemberRole, val toRole: GroupMemberRole): CR()
-  @Serializable @SerialName("memberRoleUser") class MemberRoleUser(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val fromRole: GroupMemberRole, val toRole: GroupMemberRole): CR()
+  @Serializable @SerialName("membersRoleUser") class MembersRoleUser(val user: UserRef, val groupInfo: GroupInfo, val members: List<GroupMember>, val toRole: GroupMemberRole): CR()
   @Serializable @SerialName("memberBlockedForAll") class MemberBlockedForAll(val user: UserRef, val groupInfo: GroupInfo, val byMember: GroupMember, val member: GroupMember, val blocked: Boolean): CR()
-  @Serializable @SerialName("memberBlockedForAllUser") class MemberBlockedForAllUser(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val blocked: Boolean): CR()
-  @Serializable @SerialName("deletedMemberUser") class DeletedMemberUser(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
-  @Serializable @SerialName("deletedMember") class DeletedMember(val user: UserRef, val groupInfo: GroupInfo, val byMember: GroupMember, val deletedMember: GroupMember): CR()
+  @Serializable @SerialName("membersBlockedForAllUser") class MembersBlockedForAllUser(val user: UserRef, val groupInfo: GroupInfo, val members: List<GroupMember>, val blocked: Boolean): CR()
+  @Serializable @SerialName("deletedMemberUser") class DeletedMemberUser(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val withMessages: Boolean): CR()
+  @Serializable @SerialName("deletedMember") class DeletedMember(val user: UserRef, val groupInfo: GroupInfo, val byMember: GroupMember, val deletedMember: GroupMember, val withMessages: Boolean): CR()
   @Serializable @SerialName("leftMember") class LeftMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("groupDeleted") class GroupDeleted(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("contactsMerged") class ContactsMerged(val user: UserRef, val intoContact: Contact, val mergedContact: Contact): CR()
-  @Serializable @SerialName("groupInvitation") class GroupInvitation(val user: UserRef, val groupInfo: GroupInfo): CR() // unused
   @Serializable @SerialName("userJoinedGroup") class UserJoinedGroup(val user: UserRef, val groupInfo: GroupInfo): CR()
   @Serializable @SerialName("joinedGroupMember") class JoinedGroupMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("connectedToGroupMember") class ConnectedToGroupMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val memberContact: Contact? = null): CR()
-  @Serializable @SerialName("groupRemoved") class GroupRemoved(val user: UserRef, val groupInfo: GroupInfo): CR() // unused
   @Serializable @SerialName("groupUpdated") class GroupUpdated(val user: UserRef, val toGroup: GroupInfo): CR()
-  @Serializable @SerialName("groupLinkCreated") class GroupLinkCreated(val user: UserRef, val groupInfo: GroupInfo, val connReqContact: String, val memberRole: GroupMemberRole): CR()
-  @Serializable @SerialName("groupLink") class GroupLink(val user: UserRef, val groupInfo: GroupInfo, val connReqContact: String, val memberRole: GroupMemberRole): CR()
+  @Serializable @SerialName("groupLinkCreated") class GroupLinkCreated(val user: UserRef, val groupInfo: GroupInfo, val connLinkContact: CreatedConnLink, val memberRole: GroupMemberRole): CR()
+  @Serializable @SerialName("groupLink") class GroupLink(val user: UserRef, val groupInfo: GroupInfo, val connLinkContact: CreatedConnLink, val memberRole: GroupMemberRole): CR()
   @Serializable @SerialName("groupLinkDeleted") class GroupLinkDeleted(val user: UserRef, val groupInfo: GroupInfo): CR()
   @Serializable @SerialName("newMemberContact") class NewMemberContact(val user: UserRef, val contact: Contact,  val groupInfo: GroupInfo, val member: GroupMember): CR()
   @Serializable @SerialName("newMemberContactSentInv") class NewMemberContactSentInv(val user: UserRef, val contact: Contact,  val groupInfo: GroupInfo, val member: GroupMember): CR()
@@ -5781,8 +5968,6 @@ sealed class CR {
   // misc
   @Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
   @Serializable @SerialName("cmdOk") class CmdOk(val user: UserRef?): CR()
-  @Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: UserRef?, val chatError: ChatError): CR()
-  @Serializable @SerialName("chatError") class ChatRespError(val user_: UserRef?, val chatError: ChatError): CR()
   @Serializable @SerialName("archiveExported") class ArchiveExported(val archiveErrors: List<ArchiveError>): CR()
   @Serializable @SerialName("archiveImported") class ArchiveImported(val archiveErrors: List<ArchiveError>): CR()
   @Serializable @SerialName("appSettings") class AppSettingsR(val appSettings: AppSettings): CR()
@@ -5822,8 +6007,6 @@ sealed class CR {
     is GroupMemberRatchetSyncStarted -> "groupMemberRatchetSyncStarted"
     is ContactRatchetSync -> "contactRatchetSync"
     is GroupMemberRatchetSync -> "groupMemberRatchetSync"
-    is ContactVerificationReset -> "contactVerificationReset"
-    is GroupMemberVerificationReset -> "groupMemberVerificationReset"
     is ContactCode -> "contactCode"
     is GroupMemberCode -> "groupMemberCode"
     is ConnectionVerified -> "connectionVerified"
@@ -5838,6 +6021,7 @@ sealed class CR {
     is ContactAlreadyExists -> "contactAlreadyExists"
     is ContactDeleted -> "contactDeleted"
     is ContactDeletedByContact -> "contactDeletedByContact"
+    is ItemsReadForChat -> "itemsReadForChat"
     is ChatCleared -> "chatCleared"
     is UserProfileNoChange -> "userProfileNoChange"
     is UserProfileUpdated -> "userProfileUpdated"
@@ -5863,10 +6047,6 @@ sealed class CR {
     is ContactSubSummary -> "contactSubSummary"
     is NetworkStatusResp -> "networkStatus"
     is NetworkStatuses -> "networkStatuses"
-    is GroupSubscribed -> "groupSubscribed"
-    is MemberSubErrors -> "memberSubErrors"
-    is GroupEmpty -> "groupEmpty"
-    is UserContactLinkSubscribed -> "userContactLinkSubscribed"
     is NewChatItems -> "newChatItems"
     is ChatItemsStatusesUpdated -> "chatItemsStatusesUpdated"
     is ChatItemUpdated -> "chatItemUpdated"
@@ -5881,26 +6061,27 @@ sealed class CR {
     is UserAcceptedGroupSent -> "userAcceptedGroupSent"
     is GroupLinkConnecting -> "groupLinkConnecting"
     is BusinessLinkConnecting -> "businessLinkConnecting"
-    is UserDeletedMember -> "userDeletedMember"
+    is UserDeletedMembers -> "userDeletedMembers"
     is LeftMemberUser -> "leftMemberUser"
     is GroupMembers -> "groupMembers"
     is ReceivedGroupInvitation -> "receivedGroupInvitation"
     is GroupDeletedUser -> "groupDeletedUser"
     is JoinedGroupMemberConnecting -> "joinedGroupMemberConnecting"
+    is MemberAccepted -> "memberAccepted"
+    is MemberSupportChatDeleted -> "memberSupportChatDeleted"
+    is MemberAcceptedByOther -> "memberAcceptedByOther"
     is MemberRole -> "memberRole"
-    is MemberRoleUser -> "memberRoleUser"
+    is MembersRoleUser -> "membersRoleUser"
     is MemberBlockedForAll -> "memberBlockedForAll"
-    is MemberBlockedForAllUser -> "memberBlockedForAllUser"
+    is MembersBlockedForAllUser -> "membersBlockedForAllUser"
     is DeletedMemberUser -> "deletedMemberUser"
     is DeletedMember -> "deletedMember"
     is LeftMember -> "leftMember"
     is GroupDeleted -> "groupDeleted"
     is ContactsMerged -> "contactsMerged"
-    is GroupInvitation -> "groupInvitation"
     is UserJoinedGroup -> "userJoinedGroup"
     is JoinedGroupMember -> "joinedGroupMember"
     is ConnectedToGroupMember -> "connectedToGroupMember"
-    is GroupRemoved -> "groupRemoved"
     is GroupUpdated -> "groupUpdated"
     is GroupLinkCreated -> "groupLinkCreated"
     is GroupLink -> "groupLink"
@@ -5961,8 +6142,6 @@ sealed class CR {
     is AgentSubsTotal -> "agentSubsTotal"
     is AgentServersSummary -> "agentServersSummary"
     is CmdOk -> "cmdOk"
-    is ChatCmdError -> "chatCmdError"
-    is ChatRespError -> "chatError"
     is ArchiveExported -> "archiveExported"
     is ArchiveImported -> "archiveImported"
     is AppSettingsR -> "appSettings"
@@ -6000,22 +6179,21 @@ sealed class CR {
     is GroupMemberRatchetSyncStarted -> withUser(user, "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionStats: ${json.encodeToString(connectionStats)}")
     is ContactRatchetSync -> withUser(user, "contact: ${json.encodeToString(contact)}\nratchetSyncProgress: ${json.encodeToString(ratchetSyncProgress)}")
     is GroupMemberRatchetSync -> withUser(user, "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nratchetSyncProgress: ${json.encodeToString(ratchetSyncProgress)}")
-    is ContactVerificationReset -> withUser(user, "contact: ${json.encodeToString(contact)}")
-    is GroupMemberVerificationReset -> withUser(user, "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}")
     is ContactCode -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionCode: $connectionCode")
     is GroupMemberCode -> withUser(user, "groupInfo: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionCode: $connectionCode")
     is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
     is TagsUpdated -> withUser(user, "userTags: ${json.encodeToString(userTags)}\nchatTags: ${json.encodeToString(chatTags)}")
-    is Invitation -> withUser(user, "connReqInvitation: $connReqInvitation\nconnection: $connection")
+    is Invitation -> withUser(user, "connLinkInvitation: ${json.encodeToString(connLinkInvitation)}\nconnection: $connection")
     is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
     is ConnectionUserChanged -> withUser(user, "fromConnection: ${json.encodeToString(fromConnection)}\ntoConnection: ${json.encodeToString(toConnection)}\nnewUser: ${json.encodeToString(newUser)}" )
-    is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
+    is CRConnectionPlan -> withUser(user, "connLink: ${json.encodeToString(connLink)}\nconnectionPlan: ${json.encodeToString(connectionPlan)}")
     is SentConfirmation -> withUser(user, json.encodeToString(connection))
     is SentInvitation -> withUser(user, json.encodeToString(connection))
     is SentInvitationToContact -> withUser(user, json.encodeToString(contact))
     is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
     is ContactDeleted -> withUser(user, json.encodeToString(contact))
     is ContactDeletedByContact -> withUser(user, json.encodeToString(contact))
+    is ItemsReadForChat -> withUser(user, json.encodeToString(chatInfo))
     is ChatCleared -> withUser(user, json.encodeToString(chatInfo))
     is UserProfileNoChange -> withUser(user, noDetails())
     is UserProfileUpdated -> withUser(user, json.encodeToString(toProfile))
@@ -6026,7 +6204,7 @@ sealed class CR {
     is ContactPrefsUpdated -> withUser(user, "fromContact: $fromContact\ntoContact: \n${json.encodeToString(toContact)}")
     is UserContactLink -> withUser(user, contactLink.responseDetails)
     is UserContactLinkUpdated -> withUser(user, contactLink.responseDetails)
-    is UserContactLinkCreated -> withUser(user, connReqContact)
+    is UserContactLinkCreated -> withUser(user, json.encodeToString(connLinkContact))
     is UserContactLinkDeleted -> withUser(user, noDetails())
     is ContactConnected -> withUser(user, json.encodeToString(contact))
     is ContactConnecting -> withUser(user, json.encodeToString(contact))
@@ -6041,10 +6219,6 @@ sealed class CR {
     is ContactSubSummary -> withUser(user, json.encodeToString(contactSubscriptions))
     is NetworkStatusResp -> "networkStatus $networkStatus\nconnections: $connections"
     is NetworkStatuses -> withUser(user_, json.encodeToString(networkStatuses))
-    is GroupSubscribed -> withUser(user, json.encodeToString(group))
-    is MemberSubErrors -> withUser(user, json.encodeToString(memberSubErrors))
-    is GroupEmpty -> withUser(user, json.encodeToString(group))
-    is UserContactLinkSubscribed -> noDetails()
     is NewChatItems -> withUser(user, chatItems.joinToString("\n") { json.encodeToString(it) })
     is ChatItemsStatusesUpdated -> withUser(user, chatItems.joinToString("\n") { json.encodeToString(it) })
     is ChatItemUpdated -> withUser(user, json.encodeToString(chatItem))
@@ -6059,29 +6233,30 @@ sealed class CR {
     is UserAcceptedGroupSent -> json.encodeToString(groupInfo)
     is GroupLinkConnecting -> withUser(user, "groupInfo: $groupInfo\nhostMember: $hostMember")
     is BusinessLinkConnecting -> withUser(user, "groupInfo: $groupInfo\nhostMember: $hostMember\nfromContact: $fromContact")
-    is UserDeletedMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
+    is UserDeletedMembers -> withUser(user, "groupInfo: $groupInfo\nmembers: $members\nwithMessages: $withMessages")
     is LeftMemberUser -> withUser(user, json.encodeToString(groupInfo))
     is GroupMembers -> withUser(user, json.encodeToString(group))
     is ReceivedGroupInvitation -> withUser(user, "groupInfo: $groupInfo\ncontact: $contact\nmemberRole: $memberRole")
     is GroupDeletedUser -> withUser(user, json.encodeToString(groupInfo))
     is JoinedGroupMemberConnecting -> withUser(user, "groupInfo: $groupInfo\nhostMember: $hostMember\nmember: $member")
+    is MemberAccepted -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
+    is MemberSupportChatDeleted -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
+    is MemberAcceptedByOther -> withUser(user, "groupInfo: $groupInfo\nacceptingMember: $acceptingMember\nmember: $member")
     is MemberRole -> withUser(user, "groupInfo: $groupInfo\nbyMember: $byMember\nmember: $member\nfromRole: $fromRole\ntoRole: $toRole")
-    is MemberRoleUser -> withUser(user, "groupInfo: $groupInfo\nmember: $member\nfromRole: $fromRole\ntoRole: $toRole")
+    is MembersRoleUser -> withUser(user, "groupInfo: $groupInfo\nmembers: $members\ntoRole: $toRole")
     is MemberBlockedForAll -> withUser(user, "groupInfo: $groupInfo\nbyMember: $byMember\nmember: $member\nblocked: $blocked")
-    is MemberBlockedForAllUser -> withUser(user, "groupInfo: $groupInfo\nmember: $member\nblocked: $blocked")
-    is DeletedMemberUser -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
-    is DeletedMember -> withUser(user, "groupInfo: $groupInfo\nbyMember: $byMember\ndeletedMember: $deletedMember")
+    is MembersBlockedForAllUser -> withUser(user, "groupInfo: $groupInfo\nmembers: $members\nblocked: $blocked")
+    is DeletedMemberUser -> withUser(user, "groupInfo: $groupInfo\nmember: $member\nwithMessages: ${withMessages}")
+    is DeletedMember -> withUser(user, "groupInfo: $groupInfo\nbyMember: $byMember\ndeletedMember: $deletedMember\nwithMessages: ${withMessages}")
     is LeftMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
     is GroupDeleted -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
     is ContactsMerged -> withUser(user, "intoContact: $intoContact\nmergedContact: $mergedContact")
-    is GroupInvitation -> withUser(user, json.encodeToString(groupInfo))
     is UserJoinedGroup -> withUser(user, json.encodeToString(groupInfo))
     is JoinedGroupMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member")
     is ConnectedToGroupMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member\nmemberContact: $memberContact")
-    is GroupRemoved -> withUser(user, json.encodeToString(groupInfo))
     is GroupUpdated -> withUser(user, json.encodeToString(toGroup))
-    is GroupLinkCreated -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact\nmemberRole: $memberRole")
-    is GroupLink -> withUser(user, "groupInfo: $groupInfo\nconnReqContact: $connReqContact\nmemberRole: $memberRole")
+    is GroupLinkCreated -> withUser(user, "groupInfo: $groupInfo\nconnLinkContact: $connLinkContact\nmemberRole: $memberRole")
+    is GroupLink -> withUser(user, "groupInfo: $groupInfo\nconnLinkContact: $connLinkContact\nmemberRole: $memberRole")
     is GroupLinkDeleted -> withUser(user, json.encodeToString(groupInfo))
     is NewMemberContact -> withUser(user, "contact: $contact\ngroupInfo: $groupInfo\nmember: $member")
     is NewMemberContactSentInv -> withUser(user, "contact: $contact\ngroupInfo: $groupInfo\nmember: $member")
@@ -6156,8 +6331,6 @@ sealed class CR {
         "chat migrations: ${json.encodeToString(chatMigrations.map { it.upName })}\n\n" +
         "agent migrations: ${json.encodeToString(agentMigrations.map { it.upName })}"
     is CmdOk -> withUser(user, noDetails())
-    is ChatCmdError -> withUser(user_, chatError.string)
-    is ChatRespError -> withUser(user_, chatError.string)
     is ArchiveExported -> "${archiveErrors.map { it.string } }"
     is ArchiveImported -> "${archiveErrors.map { it.string } }"
     is AppSettingsR -> json.encodeToString(appSettings)
@@ -6170,13 +6343,9 @@ sealed class CR {
   private fun withUser(u: UserLike?, s: String): String = if (u != null) "userId: ${u.userId}\n$s" else s
 }
 
-fun chatError(r: CR): ChatErrorType? {
-  return (
-      if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat) r.chatError.errorType
-      else if (r is CR.ChatRespError && r.chatError is ChatError.ChatErrorChat) r.chatError.errorType
-      else null
-      )
-}
+fun apiChatErrorType(r: API): ChatErrorType? =
+  if (r is API.Error && r.err is ChatError.ChatErrorChat) r.err.errorType
+  else null
 
 @Serializable
 sealed class ChatDeleteMode {
@@ -6191,11 +6360,34 @@ sealed class ChatDeleteMode {
   }
 }
 
+@Serializable
+data class CreatedConnLink(val connFullLink: String, val connShortLink: String?) {
+  fun simplexChatUri(short: Boolean): String =
+    if (short) connShortLink ?: simplexChatLink(connFullLink)
+    else simplexChatLink(connFullLink)
+
+  companion object {
+    val nullableStateSaver: Saver<CreatedConnLink?, Pair<String?, String?>> = Saver(
+      save = { link -> link?.connFullLink to link?.connShortLink },
+      restore = { saved ->
+        val connFullLink = saved.first
+        if (connFullLink == null) null
+        else CreatedConnLink(connFullLink = connFullLink,  connShortLink = saved.second)
+      }
+    )
+  }
+}
+
+fun simplexChatLink(uri: String): String =
+  if (uri.startsWith("simplex:/")) uri.replace("simplex:/", "https://simplex.chat/")
+  else uri
+
 @Serializable
 sealed class ConnectionPlan {
   @Serializable @SerialName("invitationLink") class InvitationLink(val invitationLinkPlan: InvitationLinkPlan): ConnectionPlan()
   @Serializable @SerialName("contactAddress") class ContactAddress(val contactAddressPlan: ContactAddressPlan): ConnectionPlan()
   @Serializable @SerialName("groupLink") class GroupLink(val groupLinkPlan: GroupLinkPlan): ConnectionPlan()
+  @Serializable @SerialName("error") class Error(val chatError: ChatError): ConnectionPlan()
 }
 
 @Serializable
@@ -6238,7 +6430,7 @@ abstract class TerminalItem {
     override val details get() = cmd.cmdString
   }
 
-  class Resp(override val id: Long, override val remoteHostId: Long?, val resp: CR): TerminalItem() {
+  class Resp(override val id: Long, override val remoteHostId: Long?, val resp: API): TerminalItem() {
     override val label get() = "< ${resp.responseType}"
     override val details get() = resp.details
   }
@@ -6246,11 +6438,11 @@ abstract class TerminalItem {
   companion object {
     val sampleData = listOf(
         Cmd(0, null, CC.ShowActiveUser()),
-        Resp(1, null, CR.ActiveUser(User.sampleData))
+        Resp(1, null, API.Result(null, CR.ActiveUser(User.sampleData)))
     )
 
     fun cmd(rhId: Long?, c: CC) = Cmd(System.currentTimeMillis(), rhId, c)
-    fun resp(rhId: Long?, r: CR) = Resp(System.currentTimeMillis(), rhId, r)
+    fun resp(rhId: Long?, r: API) = Resp(System.currentTimeMillis(), rhId, r)
   }
 }
 
@@ -6328,8 +6520,8 @@ enum class RatchetSyncState {
 }
 
 @Serializable
-class UserContactLinkRec(val connReqContact: String, val autoAccept: AutoAccept? = null) {
-  val responseDetails: String get() = "connReqContact: ${connReqContact}\nautoAccept: ${AutoAccept.cmdString(autoAccept)}"
+class UserContactLinkRec(val connLinkContact: CreatedConnLink, val autoAccept: AutoAccept? = null) {
+  val responseDetails: String get() = "connLinkContact: ${connLinkContact}\nautoAccept: ${AutoAccept.cmdString(autoAccept)}"
 }
 
 @Serializable
@@ -6394,6 +6586,16 @@ sealed class ChatError {
   @Serializable @SerialName("errorRemoteHost") class ChatErrorRemoteHost(val remoteHostError: RemoteHostError): ChatError()
   @Serializable @SerialName("errorRemoteCtrl") class ChatErrorRemoteCtrl(val remoteCtrlError: RemoteCtrlError): ChatError()
   @Serializable @SerialName("invalidJSON") class ChatErrorInvalidJSON(val json: String): ChatError()
+
+  val resultType: String get() = when (this) {
+    is ChatErrorChat -> "chat"
+    is ChatErrorAgent -> "agent"
+    is ChatErrorStore -> "store"
+    is ChatErrorDatabase -> "database"
+    is ChatErrorRemoteHost -> "remoteHost"
+    is ChatErrorRemoteCtrl -> "remoteCtrl"
+    is ChatErrorInvalidJSON -> "invalid json"
+  }
 }
 
 @Serializable
@@ -6421,6 +6623,7 @@ sealed class ChatErrorType {
       is ChatStoreChanged -> "chatStoreChanged"
       is ConnectionPlanChatError -> "connectionPlan"
       is InvalidConnReq -> "invalidConnReq"
+      is UnsupportedConnReq -> "unsupportedConnReq"
       is InvalidChatMessage -> "invalidChatMessage"
       is ContactNotReady -> "contactNotReady"
       is ContactNotActive -> "contactNotActive"
@@ -6499,6 +6702,7 @@ sealed class ChatErrorType {
   @Serializable @SerialName("chatStoreChanged") object ChatStoreChanged: ChatErrorType()
   @Serializable @SerialName("connectionPlan") class ConnectionPlanChatError(val connectionPlan: ConnectionPlan): ChatErrorType()
   @Serializable @SerialName("invalidConnReq") object InvalidConnReq: ChatErrorType()
+  @Serializable @SerialName("unsupportedConnReq") object UnsupportedConnReq: ChatErrorType()
   @Serializable @SerialName("invalidChatMessage") class InvalidChatMessage(val connection: Connection, val message: String): ChatErrorType()
   @Serializable @SerialName("contactNotReady") class ContactNotReady(val contact: Contact): ChatErrorType()
   @Serializable @SerialName("contactNotActive") class ContactNotActive(val contact: Contact): ChatErrorType()
@@ -6561,63 +6765,79 @@ sealed class StoreError {
   val string: String
     get() = when (this) {
       is DuplicateName -> "duplicateName"
-      is UserNotFound -> "userNotFound"
-      is UserNotFoundByName -> "userNotFoundByName"
-      is UserNotFoundByContactId -> "userNotFoundByContactId"
-      is UserNotFoundByGroupId -> "userNotFoundByGroupId"
-      is UserNotFoundByFileId -> "userNotFoundByFileId"
-      is UserNotFoundByContactRequestId -> "userNotFoundByContactRequestId"
-      is ContactNotFound -> "contactNotFound"
-      is ContactNotFoundByName -> "contactNotFoundByName"
-      is ContactNotFoundByMemberId -> "contactNotFoundByMemberId"
-      is ContactNotReady -> "contactNotReady"
+      is UserNotFound -> "userNotFound $userId"
+      is UserNotFoundByName -> "userNotFoundByName $contactName"
+      is UserNotFoundByContactId -> "userNotFoundByContactId $contactId"
+      is UserNotFoundByGroupId -> "userNotFoundByGroupId $groupId"
+      is UserNotFoundByFileId -> "userNotFoundByFileId $fileId"
+      is UserNotFoundByContactRequestId -> "userNotFoundByContactRequestId $contactRequestId"
+      is ContactNotFound -> "contactNotFound $contactId"
+      is ContactNotFoundByName -> "contactNotFoundByName $contactName"
+      is ContactNotFoundByMemberId -> "contactNotFoundByMemberId $groupMemberId"
+      is ContactNotReady -> "contactNotReady $contactName"
       is DuplicateContactLink -> "duplicateContactLink"
       is UserContactLinkNotFound -> "userContactLinkNotFound"
-      is ContactRequestNotFound -> "contactRequestNotFound"
-      is ContactRequestNotFoundByName -> "contactRequestNotFoundByName"
-      is GroupNotFound -> "groupNotFound"
-      is GroupNotFoundByName -> "groupNotFoundByName"
-      is GroupMemberNameNotFound -> "groupMemberNameNotFound"
-      is GroupMemberNotFound -> "groupMemberNotFound"
-      is GroupMemberNotFoundByMemberId -> "groupMemberNotFoundByMemberId"
-      is MemberContactGroupMemberNotFound -> "memberContactGroupMemberNotFound"
+      is ContactRequestNotFound -> "contactRequestNotFound $contactRequestId"
+      is ContactRequestNotFoundByName -> "contactRequestNotFoundByName $contactName"
+      is GroupNotFound -> "groupNotFound $groupId"
+      is GroupNotFoundByName -> "groupNotFoundByName $groupName"
+      is GroupMemberNameNotFound -> "groupMemberNameNotFound $groupId $groupMemberName"
+      is GroupMemberNotFound -> "groupMemberNotFound $groupMemberId"
+      is GroupMemberNotFoundByMemberId -> "groupMemberNotFoundByMemberId $memberId"
+      is MemberContactGroupMemberNotFound -> "memberContactGroupMemberNotFound $contactId"
       is GroupWithoutUser -> "groupWithoutUser"
       is DuplicateGroupMember -> "duplicateGroupMember"
       is GroupAlreadyJoined -> "groupAlreadyJoined"
       is GroupInvitationNotFound -> "groupInvitationNotFound"
-      is SndFileNotFound -> "sndFileNotFound"
-      is SndFileInvalid -> "sndFileInvalid"
-      is RcvFileNotFound -> "rcvFileNotFound"
-      is RcvFileDescrNotFound -> "rcvFileDescrNotFound"
-      is FileNotFound -> "fileNotFound"
-      is RcvFileInvalid -> "rcvFileInvalid"
+      is NoteFolderAlreadyExists -> "noteFolderAlreadyExists $noteFolderId"
+      is NoteFolderNotFound -> "noteFolderNotFound $noteFolderId"
+      is UserNoteFolderNotFound -> "userNoteFolderNotFound"
+      is SndFileNotFound -> "sndFileNotFound $fileId"
+      is SndFileInvalid -> "sndFileInvalid $fileId"
+      is RcvFileNotFound -> "rcvFileNotFound $fileId"
+      is RcvFileDescrNotFound -> "rcvFileDescrNotFound $fileId"
+      is FileNotFound -> "fileNotFound $fileId"
+      is RcvFileInvalid -> "rcvFileInvalid $fileId"
       is RcvFileInvalidDescrPart -> "rcvFileInvalidDescrPart"
-      is SharedMsgIdNotFoundByFileId -> "sharedMsgIdNotFoundByFileId"
-      is FileIdNotFoundBySharedMsgId -> "fileIdNotFoundBySharedMsgId"
-      is SndFileNotFoundXFTP -> "sndFileNotFoundXFTP"
-      is RcvFileNotFoundXFTP -> "rcvFileNotFoundXFTP"
-      is ExtraFileDescrNotFoundXFTP -> "extraFileDescrNotFoundXFTP"
-      is ConnectionNotFound -> "connectionNotFound"
-      is ConnectionNotFoundById -> "connectionNotFoundById"
-      is ConnectionNotFoundByMemberId -> "connectionNotFoundByMemberId"
-      is PendingConnectionNotFound -> "pendingConnectionNotFound"
+      is LocalFileNoTransfer -> "localFileNoTransfer $fileId"
+      is SharedMsgIdNotFoundByFileId -> "sharedMsgIdNotFoundByFileId $fileId"
+      is FileIdNotFoundBySharedMsgId -> "fileIdNotFoundBySharedMsgId $sharedMsgId"
+      is SndFileNotFoundXFTP -> "sndFileNotFoundXFTP $agentSndFileId"
+      is RcvFileNotFoundXFTP -> "rcvFileNotFoundXFTP $agentRcvFileId"
+      is ConnectionNotFound -> "connectionNotFound $agentConnId"
+      is ConnectionNotFoundById -> "connectionNotFoundById $connId"
+      is ConnectionNotFoundByMemberId -> "connectionNotFoundByMemberId $groupMemberId"
+      is PendingConnectionNotFound -> "pendingConnectionNotFound $connId"
       is IntroNotFound -> "introNotFound"
       is UniqueID -> "uniqueID"
-      is InternalError -> "internalError"
-      is NoMsgDelivery -> "noMsgDelivery"
-      is BadChatItem -> "badChatItem"
-      is ChatItemNotFound -> "chatItemNotFound"
-      is ChatItemNotFoundByText -> "chatItemNotFoundByText"
-      is ChatItemSharedMsgIdNotFound -> "chatItemSharedMsgIdNotFound"
-      is ChatItemNotFoundByFileId -> "chatItemNotFoundByFileId"
-      is ChatItemNotFoundByGroupId -> "chatItemNotFoundByGroupId"
-      is ProfileNotFound -> "profileNotFound"
-      is DuplicateGroupLink -> "duplicateGroupLink"
-      is GroupLinkNotFound -> "groupLinkNotFound"
-      is HostMemberIdNotFound -> "hostMemberIdNotFound"
-      is ContactNotFoundByFileId -> "contactNotFoundByFileId"
-      is NoGroupSndStatus -> "noGroupSndStatus"
       is LargeMsg -> "largeMsg"
+      is InternalError -> "internalError $message"
+      is DBException -> "dBException $message"
+      is DBBusyError -> "dBBusyError $message"
+      is BadChatItem -> "badChatItem $itemId"
+      is ChatItemNotFound -> "chatItemNotFound $itemId"
+      is ChatItemNotFoundByText -> "chatItemNotFoundByText $text"
+      is ChatItemSharedMsgIdNotFound -> "chatItemSharedMsgIdNotFound $sharedMsgId"
+      is ChatItemNotFoundByFileId -> "chatItemNotFoundByFileId $fileId"
+      is ChatItemNotFoundByContactId -> "chatItemNotFoundByContactId $contactId"
+      is ChatItemNotFoundByGroupId -> "chatItemNotFoundByGroupId $groupId"
+      is ProfileNotFound -> "profileNotFound $profileId"
+      is DuplicateGroupLink -> "duplicateGroupLink ${groupInfo.groupId}"
+      is GroupLinkNotFound -> "groupLinkNotFound ${groupInfo.groupId}"
+      is HostMemberIdNotFound -> "hostMemberIdNotFound $groupId"
+      is ContactNotFoundByFileId -> "contactNotFoundByFileId $fileId"
+      is NoGroupSndStatus -> "noGroupSndStatus $itemId $groupMemberId"
+      is DuplicateGroupMessage -> "duplicateGroupMessage $groupId $sharedMsgId $authorGroupMemberId $authorGroupMemberId"
+      is RemoteHostNotFound -> "remoteHostNotFound $remoteHostId"
+      is RemoteHostUnknown -> "remoteHostUnknown"
+      is RemoteHostDuplicateCA -> "remoteHostDuplicateCA"
+      is RemoteCtrlNotFound -> "remoteCtrlNotFound $remoteCtrlId"
+      is RemoteCtrlDuplicateCA -> "remoteCtrlDuplicateCA"
+      is ProhibitedDeleteUser -> "prohibitedDeleteUser $userId $contactId"
+      is OperatorNotFound -> "operatorNotFound $serverOperatorId"
+      is UsageConditionsNotFound -> "usageConditionsNotFound"
+      is InvalidQuote -> "invalidQuote"
+      is InvalidMention -> "invalidMention"
     }
 
   @Serializable @SerialName("duplicateName") object DuplicateName: StoreError()
@@ -6645,6 +6865,9 @@ sealed class StoreError {
   @Serializable @SerialName("duplicateGroupMember") object DuplicateGroupMember: StoreError()
   @Serializable @SerialName("groupAlreadyJoined") object GroupAlreadyJoined: StoreError()
   @Serializable @SerialName("groupInvitationNotFound") object GroupInvitationNotFound: StoreError()
+  @Serializable @SerialName("noteFolderAlreadyExists") class NoteFolderAlreadyExists(val noteFolderId: Long): StoreError()
+  @Serializable @SerialName("noteFolderNotFound") class NoteFolderNotFound(val noteFolderId: Long): StoreError()
+  @Serializable @SerialName("userNoteFolderNotFound") object UserNoteFolderNotFound: StoreError()
   @Serializable @SerialName("sndFileNotFound") class SndFileNotFound(val fileId: Long): StoreError()
   @Serializable @SerialName("sndFileInvalid") class SndFileInvalid(val fileId: Long): StoreError()
   @Serializable @SerialName("rcvFileNotFound") class RcvFileNotFound(val fileId: Long): StoreError()
@@ -6652,24 +6875,27 @@ sealed class StoreError {
   @Serializable @SerialName("fileNotFound") class FileNotFound(val fileId: Long): StoreError()
   @Serializable @SerialName("rcvFileInvalid") class RcvFileInvalid(val fileId: Long): StoreError()
   @Serializable @SerialName("rcvFileInvalidDescrPart") object RcvFileInvalidDescrPart: StoreError()
+  @Serializable @SerialName("localFileNoTransfer") class LocalFileNoTransfer(val fileId: Long): StoreError()
   @Serializable @SerialName("sharedMsgIdNotFoundByFileId") class SharedMsgIdNotFoundByFileId(val fileId: Long): StoreError()
   @Serializable @SerialName("fileIdNotFoundBySharedMsgId") class FileIdNotFoundBySharedMsgId(val sharedMsgId: String): StoreError()
   @Serializable @SerialName("sndFileNotFoundXFTP") class SndFileNotFoundXFTP(val agentSndFileId: String): StoreError()
   @Serializable @SerialName("rcvFileNotFoundXFTP") class RcvFileNotFoundXFTP(val agentRcvFileId: String): StoreError()
-  @Serializable @SerialName("extraFileDescrNotFoundXFTP") class ExtraFileDescrNotFoundXFTP(val fileId: Long): StoreError()
   @Serializable @SerialName("connectionNotFound") class ConnectionNotFound(val agentConnId: String): StoreError()
   @Serializable @SerialName("connectionNotFoundById") class ConnectionNotFoundById(val connId: Long): StoreError()
   @Serializable @SerialName("connectionNotFoundByMemberId") class ConnectionNotFoundByMemberId(val groupMemberId: Long): StoreError()
   @Serializable @SerialName("pendingConnectionNotFound") class PendingConnectionNotFound(val connId: Long): StoreError()
   @Serializable @SerialName("introNotFound") object IntroNotFound: StoreError()
   @Serializable @SerialName("uniqueID") object UniqueID: StoreError()
+  @Serializable @SerialName("largeMsg") object LargeMsg: StoreError()
   @Serializable @SerialName("internalError") class InternalError(val message: String): StoreError()
-  @Serializable @SerialName("noMsgDelivery") class NoMsgDelivery(val connId: Long, val agentMsgId: String): StoreError()
+  @Serializable @SerialName("dBException") class DBException(val message: String): StoreError()
+  @Serializable @SerialName("dBBusyError") class DBBusyError(val message: String): StoreError()
   @Serializable @SerialName("badChatItem") class BadChatItem(val itemId: Long): StoreError()
   @Serializable @SerialName("chatItemNotFound") class ChatItemNotFound(val itemId: Long): StoreError()
   @Serializable @SerialName("chatItemNotFoundByText") class ChatItemNotFoundByText(val text: String): StoreError()
   @Serializable @SerialName("chatItemSharedMsgIdNotFound") class ChatItemSharedMsgIdNotFound(val sharedMsgId: String): StoreError()
   @Serializable @SerialName("chatItemNotFoundByFileId") class ChatItemNotFoundByFileId(val fileId: Long): StoreError()
+  @Serializable @SerialName("chatItemNotFoundByContactId") class ChatItemNotFoundByContactId(val contactId: Long): StoreError()
   @Serializable @SerialName("chatItemNotFoundByGroupId") class ChatItemNotFoundByGroupId(val groupId: Long): StoreError()
   @Serializable @SerialName("profileNotFound") class ProfileNotFound(val profileId: Long): StoreError()
   @Serializable @SerialName("duplicateGroupLink") class DuplicateGroupLink(val groupInfo: GroupInfo): StoreError()
@@ -6677,7 +6903,17 @@ sealed class StoreError {
   @Serializable @SerialName("hostMemberIdNotFound") class HostMemberIdNotFound(val groupId: Long): StoreError()
   @Serializable @SerialName("contactNotFoundByFileId") class ContactNotFoundByFileId(val fileId: Long): StoreError()
   @Serializable @SerialName("noGroupSndStatus") class NoGroupSndStatus(val itemId: Long, val groupMemberId: Long): StoreError()
-  @Serializable @SerialName("largeMsg") object LargeMsg: StoreError()
+  @Serializable @SerialName("duplicateGroupMessage") class DuplicateGroupMessage(val groupId: Long, val sharedMsgId: String, val authorGroupMemberId: Long?, val forwardedByGroupMemberId: Long?): StoreError()
+  @Serializable @SerialName("remoteHostNotFound") class RemoteHostNotFound(val remoteHostId: Long): StoreError()
+  @Serializable @SerialName("remoteHostUnknown") object RemoteHostUnknown: StoreError()
+  @Serializable @SerialName("remoteHostDuplicateCA") object RemoteHostDuplicateCA: StoreError()
+  @Serializable @SerialName("remoteCtrlNotFound") class RemoteCtrlNotFound(val remoteCtrlId: Long): StoreError()
+  @Serializable @SerialName("remoteCtrlDuplicateCA") class RemoteCtrlDuplicateCA: StoreError()
+  @Serializable @SerialName("prohibitedDeleteUser") class ProhibitedDeleteUser(val userId: Long, val contactId: Long): StoreError()
+  @Serializable @SerialName("operatorNotFound") class OperatorNotFound(val serverOperatorId: Long): StoreError()
+  @Serializable @SerialName("usageConditionsNotFound") object UsageConditionsNotFound: StoreError()
+  @Serializable @SerialName("invalidQuote") object InvalidQuote: StoreError()
+  @Serializable @SerialName("invalidMention") object InvalidMention: StoreError()
 }
 
 @Serializable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/AppCommon.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/AppCommon.kt
index 60a65eaac6..780f8c25b4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/AppCommon.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/AppCommon.kt
@@ -28,6 +28,8 @@ val appVersionInfo: Pair<String, Int?> = if (appPlatform == AppPlatform.ANDROID)
 else
   BuildConfigCommon.DESKTOP_VERSION_NAME to BuildConfigCommon.DESKTOP_VERSION_CODE
 
+val databaseBackend: String = if (appPlatform == AppPlatform.ANDROID) "sqlite" else BuildConfigCommon.DATABASE_BACKEND
+
 class FifoQueue<E>(private var capacity: Int) : LinkedList<E>() {
   override fun add(element: E): Boolean {
     if(size > capacity) removeFirst()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
index 5262714099..a9f2dcaffc 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
@@ -63,7 +63,11 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
     }
     val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
     val confirm = confirmMigrations ?: if (appPreferences.developerTools.get() && appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
-    var migrated: Array<Any> = chatMigrateInit(dbAbsolutePrefixPath, dbKey, MigrationConfirmation.Error.value)
+    var migrated: Array<Any> = if (databaseBackend == "postgres") {
+      chatMigrateInit("simplex_v1", "postgresql://simplex@/simplex_v1", MigrationConfirmation.Error.value)
+    } else {
+      chatMigrateInit(dbAbsolutePrefixPath, dbKey, MigrationConfirmation.Error.value)
+    }
     var res: DBMigrationResult = runCatching {
       json.decodeFromString<DBMigrationResult>(migrated[0] as String)
     }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
@@ -75,7 +79,11 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
     }
     if (rerunMigration) {
       chatModel.dbMigrationInProgress.value = true
-      migrated = chatMigrateInit(dbAbsolutePrefixPath, dbKey, confirm.value)
+      migrated = if (databaseBackend == "postgres") {
+        chatMigrateInit("simplex_v1", "postgresql://simplex@/simplex_v1", confirm.value)
+      } else {
+        chatMigrateInit(dbAbsolutePrefixPath, dbKey, confirm.value)
+      }
       res = runCatching {
         json.decodeFromString<DBMigrationResult>(migrated[0] as String)
       }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Images.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Images.kt
index fca69d5398..19e40ab0a2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Images.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Images.kt
@@ -16,7 +16,7 @@ expect fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOut
 expect fun GrayU8.toImageBitmap(): ImageBitmap
 
 expect fun ImageBitmap.hasAlpha(): Boolean
-expect fun ImageBitmap.addLogo(): ImageBitmap
+expect fun ImageBitmap.addLogo(size: Float): ImageBitmap
 expect fun ImageBitmap.scale(width: Int, height: Int): ImageBitmap
 
 expect fun isImage(uri: URI): Boolean
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
index 51d26f8ff2..5b9e63963c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
@@ -39,7 +39,7 @@ abstract class NtfManager {
   fun notifyMessageReceived(rhId: Long?, user: UserLike, cInfo: ChatInfo, cItem: ChatItem) {
     if (
       cItem.showNotification &&
-      cInfo.ntfsEnabled &&
+      cInfo.ntfsEnabled(cItem) &&
       (
           allowedToShowNotification() ||
               chatModel.chatId.value != cInfo.id ||
@@ -73,7 +73,7 @@ abstract class NtfManager {
       }
       val cInfo = chatModel.getChat(chatId)?.chatInfo
       chatModel.clearOverlays.value = true
-      if (cInfo != null && (cInfo is ChatInfo.Direct || cInfo is ChatInfo.Group)) openChat(null, cInfo)
+      if (cInfo != null && (cInfo is ChatInfo.Direct || cInfo is ChatInfo.Group)) openChat(secondaryChatsCtx = null, rhId = null, cInfo)
     }
   }
 
@@ -134,7 +134,12 @@ abstract class NtfManager {
       }
       res
     } else {
-      cItem.text
+      val mc = cItem.content.msgContent
+      if (mc is MsgContent.MCReport) {
+        generalGetString(MR.strings.notification_group_report).format(cItem.text.ifEmpty { mc.reason.text })
+      } else {
+        cItem.text
+      }
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/PlatformTextField.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/PlatformTextField.kt
index 1dff386684..6b301b9df4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/PlatformTextField.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/PlatformTextField.kt
@@ -1,8 +1,10 @@
 package chat.simplex.common.platform
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.*
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
+import chat.simplex.common.views.chat.ComposeMessage
 import chat.simplex.common.views.chat.ComposeState
 import java.net.URI
 
@@ -10,14 +12,15 @@ import java.net.URI
 expect fun PlatformTextField(
   composeState: MutableState<ComposeState>,
   sendMsgEnabled: Boolean,
+  disabledText: String?,
   sendMsgButtonDisabled: Boolean,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
-  userIsObserver: Boolean,
   placeholder: String,
   showVoiceButton: Boolean,
-  onMessageChange: (String) -> Unit,
+  onMessageChange: (ComposeMessage) -> Unit,
   onUpArrow: () -> Unit,
   onFilesPasted: (List<URI>) -> Unit,
+  focusRequester: FocusRequester? = null,
   onDone: () -> Unit,
 )
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/ScrollableColumn.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/ScrollableColumn.kt
index e6d4514875..b1965ec845 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/ScrollableColumn.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/ScrollableColumn.kt
@@ -45,6 +45,8 @@ expect fun LazyColumnWithScrollBarNoAppBar(
   additionalBarOffset: State<Dp>? = null,
   additionalTopBar: State<Boolean> = remember { mutableStateOf(false) },
   chatBottomBar: State<Boolean> = remember { mutableStateOf(true) },
+  maxHeight: State<Dp>? = null,
+  containerAlignment: Alignment = Alignment.TopStart,
   content: LazyListScope.() -> Unit
 )
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt
index 67fae65897..37aa7fc1d1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt
@@ -10,8 +10,10 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.TextOverflow
@@ -45,16 +47,16 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
   val developerTools = chatModel.controller.appPrefs.developerTools.get()
   val prefPerformLA = chatModel.controller.appPrefs.performLA.get()
   val s = composeState.value.message
-  if (s.startsWith("/sql") && (!prefPerformLA || !developerTools)) {
-    val resp = CR.ChatCmdError(null, ChatError.ChatErrorChat(ChatErrorType.CommandError("Failed reading: empty")))
-    chatModel.addTerminalItem(TerminalItem.cmd(null, CC.Console(s)))
+  if (s.text.startsWith("/sql") && (!prefPerformLA || !developerTools)) {
+    val resp = API.Error(null, ChatError.ChatErrorChat(ChatErrorType.CommandError("Failed reading: empty")))
+    chatModel.addTerminalItem(TerminalItem.cmd(null, CC.Console(s.text)))
     chatModel.addTerminalItem(TerminalItem.resp(null, resp))
     composeState.value = ComposeState(useLinkPreviews = false)
   } else {
     withBGApi {
       // show "in progress"
       // TODO show active remote host in chat console?
-      chatModel.controller.sendCmd(chatModel.remoteHostId(), CC.Console(s))
+      chatModel.controller.sendCmd(chatModel.remoteHostId(), CC.Console(s.text))
       composeState.value = ComposeState(useLinkPreviews = false)
       // hide "in progress"
     }
@@ -70,7 +72,7 @@ fun TerminalLayout(
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember { mutableStateOf(smallFont) }
 
-  fun onMessageChange(s: String) {
+  fun onMessageChange(s: ComposeMessage) {
     composeState.value = composeState.value.copy(message = s)
   }
   val oneHandUI = remember { appPrefs.oneHandUI.state }
@@ -97,12 +99,11 @@ fun TerminalLayout(
             isDirectChat = false,
             liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
             sendMsgEnabled = true,
+            userCantSendReason = null,
             sendButtonEnabled = true,
             nextSendGrpInv = false,
             needToAllowVoiceToContact = false,
             allowedVoiceByPrefs = false,
-            userIsObserver = false,
-            userCanSend = true,
             allowVoiceToContact = {},
             placeholder = "",
             sendMessage = { sendCommand() },
@@ -111,7 +112,8 @@ fun TerminalLayout(
             editPrevMessage = {},
             onMessageChange = ::onMessageChange,
             onFilesPasted = {},
-            textStyle = textStyle
+            textStyle = textStyle,
+            focusRequester = remember { FocusRequester() }
           )
         }
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallView.kt
index ae020ea3a1..8f5aba138d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallView.kt
@@ -10,13 +10,13 @@ import kotlinx.coroutines.*
 expect fun ActiveCallView()
 
 fun activeCallWaitDeliveryReceipt(scope: CoroutineScope) = scope.launch(Dispatchers.Default) {
-  for (apiResp in controller.messagesChannel) {
+  for (msg in controller.messagesChannel) {
     val call = chatModel.activeCall.value
     if (call == null || call.callState > CallState.InvitationSent) break
-    val msg = apiResp.resp
-    if (apiResp.remoteHostId == call.remoteHostId &&
-      msg is CR.ChatItemsStatusesUpdated &&
-      msg.chatItems.any {
+    if (msg.rhId == call.remoteHostId &&
+      msg is API.Result &&
+      msg.res is CR.ChatItemsStatusesUpdated &&
+      msg.res.chatItems.any {
         it.chatInfo.id == call.contact.id && it.chatItem.content is CIContent.SndCall && it.chatItem.meta.itemStatus is CIStatus.SndRcvd
       }
     ) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt
index 2b3cf773cc..a8b77e8fdd 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -35,15 +36,15 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.platform.*
+import chat.simplex.common.views.chat.group.ChatTTLOption
 import chat.simplex.common.views.chatlist.updateChatSettings
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -53,6 +54,7 @@ import java.io.File
 
 @Composable
 fun ChatInfoView(
+  chatsCtx: ChatModel.ChatsContext,
   chatModel: ChatModel,
   contact: Contact,
   connectionStats: ConnectionStats?,
@@ -74,6 +76,9 @@ fun ChatInfoView(
     }
     val chatRh = chat.remoteHostId
     val sendReceipts = remember(contact.id) { mutableStateOf(SendReceipts.fromBool(contact.chatSettings.sendRcpts, currentUser.sendRcptsContacts)) }
+    val chatItemTTL = remember(contact.id) { mutableStateOf(if (contact.chatItemTTL != null) ChatItemTTL.fromSeconds(contact.chatItemTTL) else null) }
+    val deletingItems = rememberSaveable(contact.id) { mutableStateOf(false) } 
+
     ChatInfoLayout(
       chat,
       contact,
@@ -84,6 +89,16 @@ fun ChatInfoView(
         updateChatSettings(chat.remoteHostId, chat.chatInfo, chatSettings, chatModel)
         sendReceipts.value = sendRcpts
       },
+      chatItemTTL = chatItemTTL,
+      setChatItemTTL = {
+        if (it == chatItemTTL.value) {
+          return@ChatInfoLayout
+        }
+        val previousChatTTL = chatItemTTL.value
+        chatItemTTL.value = it
+
+        setChatTTLAlert(chatsCtx, chat.remoteHostId, chat.chatInfo, chatItemTTL, previousChatTTL, deletingItems)
+      },
       connStats = connStats,
       contactNetworkStatus.value,
       customUserProfile,
@@ -109,8 +124,8 @@ fun ChatInfoView(
             val cStats = chatModel.controller.apiSwitchContact(chatRh, contact.contactId)
             connStats.value = cStats
             if (cStats != null) {
-              withChats {
-                updateContactConnectionStats(chatRh, contact, cStats)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateContactConnectionStats(chatRh, contact, cStats)
               }
             }
             close.invoke()
@@ -123,8 +138,8 @@ fun ChatInfoView(
             val cStats = chatModel.controller.apiAbortSwitchContact(chatRh, contact.contactId)
             connStats.value = cStats
             if (cStats != null) {
-              withChats {
-                updateContactConnectionStats(chatRh, contact, cStats)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateContactConnectionStats(chatRh, contact, cStats)
               }
             }
           }
@@ -154,8 +169,8 @@ fun ChatInfoView(
               verify = { code ->
                 chatModel.controller.apiVerifyContact(chatRh, ct.contactId, code)?.let { r ->
                   val (verified, existingCode) = r
-                  withChats {
-                    updateContact(
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.updateContact(
                       chatRh,
                       ct.copy(
                         activeConn = ct.activeConn?.copy(
@@ -173,7 +188,8 @@ fun ChatInfoView(
         }
       },
       close = close,
-      onSearchClicked = onSearchClicked
+      onSearchClicked = onSearchClicked,
+      deletingItems = deletingItems
     )
   }
 }
@@ -182,8 +198,8 @@ suspend fun syncContactConnection(rhId: Long?, contact: Contact, connectionStats
   val cStats = chatModel.controller.apiSyncContactRatchet(rhId, contact.contactId, force = force)
   connectionStats.value = cStats
   if (cStats != null) {
-    withChats {
-      updateContactConnectionStats(rhId, contact, cStats)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateContactConnectionStats(rhId, contact, cStats)
     }
   }
 }
@@ -457,14 +473,14 @@ fun deleteContact(chat: Chat, chatModel: ChatModel, close: (() -> Unit)?, chatDe
     val chatRh = chat.remoteHostId
     val ct = chatModel.controller.apiDeleteContact(chatRh, chatInfo.apiId, chatDeleteMode)
     if (ct != null) {
-      withChats {
+      withContext(Dispatchers.Main) {
         when (chatDeleteMode) {
           is ChatDeleteMode.Full ->
-            removeChat(chatRh, chatInfo.id)
+            chatModel.chatsContext.removeChat(chatRh, chatInfo.id)
           is ChatDeleteMode.Entity ->
-            updateContact(chatRh, ct)
+            chatModel.chatsContext.updateContact(chatRh, ct)
           is ChatDeleteMode.Messages ->
-            clearChat(chatRh, ChatInfo.Direct(ct))
+            chatModel.chatsContext.clearChat(chatRh, ChatInfo.Direct(ct))
         }
       }
       if (chatModel.chatId.value == chatInfo.id) {
@@ -504,6 +520,8 @@ fun ChatInfoLayout(
   currentUser: User,
   sendReceipts: State<SendReceipts>,
   setSendReceipts: (SendReceipts) -> Unit,
+  chatItemTTL: MutableState<ChatItemTTL?>,
+  setChatItemTTL: (ChatItemTTL?) -> Unit,
   connStats: MutableState<ConnectionStats?>,
   contactNetworkStatus: NetworkStatus,
   customUserProfile: Profile?,
@@ -520,7 +538,8 @@ fun ChatInfoLayout(
   syncContactConnectionForce: () -> Unit,
   verifyClicked: () -> Unit,
   close: () -> Unit,
-  onSearchClicked: () -> Unit
+  onSearchClicked: () -> Unit,
+  deletingItems: State<Boolean>
 ) {
   val cStats = connStats.value
   val scrollState = rememberScrollState()
@@ -597,6 +616,12 @@ fun ChatInfoLayout(
     }
     SectionDividerSpaced(maxBottomPadding = false)
 
+    SectionView {
+      ChatTTLOption(chatItemTTL, setChatItemTTL, deletingItems)
+      SectionTextFooter(stringResource(MR.strings.chat_ttl_options_footer))
+    }
+    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+
     val conn = contact.activeConn
     if (conn != null) {
       SectionView {
@@ -813,17 +838,18 @@ fun MuteButton(
   chat: Chat,
   contact: Contact
 ) {
-  val ntfsEnabled = remember { mutableStateOf(chat.chatInfo.ntfsEnabled) }
+  val enableNtfs = remember { mutableStateOf(contact.chatSettings.enableNtfs ) }
+  val nextNtfMode by remember { derivedStateOf { enableNtfs.value.nextMode(false) } }
   val disabled = !contact.ready || !contact.active
 
   InfoViewActionButton(
     modifier = modifier,
-    icon =  if (ntfsEnabled.value) painterResource(MR.images.ic_notifications_off) else painterResource(MR.images.ic_notifications),
-    title = if (ntfsEnabled.value) stringResource(MR.strings.mute_chat) else stringResource(MR.strings.unmute_chat),
+    icon =  painterResource(nextNtfMode.icon),
+    title = stringResource(nextNtfMode.text(false)),
     disabled = disabled,
     disabledLook = disabled,
     onClick = {
-      toggleNotifications(chat.remoteHostId, chat.chatInfo, !ntfsEnabled.value, chatModel, ntfsEnabled)
+      toggleNotifications(chat.remoteHostId, chat.chatInfo, nextNtfMode, chatModel, enableNtfs)
     }
   )
 }
@@ -1245,11 +1271,11 @@ suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, c
   wallpaperFilesToDelete.forEach(::removeWallpaperFile)
 
   if (controller.apiSetChatUIThemes(chat.remoteHostId, chat.id, changedThemes)) {
-    withChats {
+    withContext(Dispatchers.Main) {
       if (chat.chatInfo is ChatInfo.Direct) {
-        updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(contact = chat.chatInfo.contact.copy(uiThemes = changedThemes)))
+        chatModel.chatsContext.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(contact = chat.chatInfo.contact.copy(uiThemes = changedThemes)))
       } else if (chat.chatInfo is ChatInfo.Group) {
-        updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(groupInfo = chat.chatInfo.groupInfo.copy(uiThemes = changedThemes)))
+        chatModel.chatsContext.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(groupInfo = chat.chatInfo.groupInfo.copy(uiThemes = changedThemes)))
       }
     }
   }
@@ -1258,8 +1284,8 @@ suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, c
 private fun setContactAlias(chat: Chat, localAlias: String, chatModel: ChatModel) = withBGApi {
   val chatRh = chat.remoteHostId
   chatModel.controller.apiSetContactAlias(chatRh, chat.chatInfo.apiId, localAlias)?.let {
-    withChats {
-      updateContact(chatRh, it)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateContact(chatRh, it)
     }
   }
 }
@@ -1308,6 +1334,83 @@ fun queueInfoText(info: Pair<RcvMsgInfo?, ServerQueueInfo>): String {
   return generalGetString(MR.strings.message_queue_info_server_info).format(json.encodeToString(qInfo), msgInfo)
 }
 
+fun setChatTTLAlert(
+  chatsCtx: ChatModel.ChatsContext,
+  rhId: Long?,
+  chatInfo: ChatInfo,
+  selectedChatTTL: MutableState<ChatItemTTL?>,
+  previousChatTTL: ChatItemTTL?,
+  progressIndicator: MutableState<Boolean>
+) {
+  val defaultTTL = chatModel.chatItemTTL.value
+  val previouslyUsedTTL = previousChatTTL ?: defaultTTL
+  val newTTLToUse = selectedChatTTL.value ?: defaultTTL
+
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(
+      if (newTTLToUse.neverExpires) {
+        MR.strings.disable_automatic_deletion_question
+      } else if (!previouslyUsedTTL.neverExpires || selectedChatTTL.value == null) {
+        MR.strings.change_automatic_deletion_question
+      } else MR.strings.enable_automatic_deletion_question),
+    text = generalGetString(if (newTTLToUse.neverExpires) MR.strings.disable_automatic_deletion_message else MR.strings.change_automatic_chat_deletion_message),
+    confirmText = generalGetString(if (newTTLToUse.neverExpires) MR.strings.disable_automatic_deletion else MR.strings.delete_messages),
+    onConfirm = { setChatTTL(chatsCtx, rhId, chatInfo, selectedChatTTL, progressIndicator, previousChatTTL) },
+    onDismiss = { selectedChatTTL.value = previousChatTTL },
+    onDismissRequest = { selectedChatTTL.value = previousChatTTL },
+    destructive = true,
+  )
+}
+
+private fun setChatTTL(
+  chatsCtx: ChatModel.ChatsContext,
+  rhId: Long?,
+  chatInfo: ChatInfo,
+  chatTTL: MutableState<ChatItemTTL?>,
+  progressIndicator: MutableState<Boolean>,
+  previousChatTTL: ChatItemTTL?
+  ) {
+  progressIndicator.value = true
+  withBGApi {
+    try {
+      chatModel.controller.setChatTTL(rhId, chatInfo.chatType, chatInfo.apiId, chatTTL.value)
+      afterSetChatTTL(chatsCtx, rhId, chatInfo, progressIndicator)
+    } catch (e: Exception) {
+      chatTTL.value = previousChatTTL
+      afterSetChatTTL(chatsCtx, rhId, chatInfo, progressIndicator)
+      AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_changing_message_deletion), e.stackTraceToString())
+    }
+  }
+}
+
+private suspend fun afterSetChatTTL(chatsCtx: ChatModel.ChatsContext, rhId: Long?, chatInfo: ChatInfo, progressIndicator: MutableState<Boolean>) {
+  try {
+    val pagination = ChatPagination.Initial(ChatPagination.INITIAL_COUNT)
+    val (chat, navInfo) = controller.apiGetChat(rhId, chatInfo.chatType, chatInfo.apiId, scope = null, contentTag = null, pagination) ?: return
+    if (chat.chatItems.isEmpty()) {
+      // replacing old chat with the same old chat but without items. Less intrusive way of clearing a preview
+      withContext(Dispatchers.Main) {
+        val oldChat = chatModel.chatsContext.getChat(chat.id)
+        if (oldChat != null) {
+          chatModel.chatsContext.replaceChat(oldChat.remoteHostId, oldChat.id, oldChat.copy(chatItems = emptyList()))
+        }
+      }
+    }
+    if (chat.remoteHostId != chatModel.remoteHostId() || chat.id != chatModel.chatId.value) return
+    processLoadedChat(
+      chatsCtx,
+      chat,
+      navInfo,
+      pagination = pagination,
+      openAroundItemId = null
+    )
+  } catch (e: Exception) {
+    Log.e(TAG, "apiGetChat error: ${e.stackTraceToString()}")
+  } finally {
+    progressIndicator.value = false
+  }
+}
+
 @Preview
 @Composable
 fun PreviewChatInfoLayout() {
@@ -1322,6 +1425,8 @@ fun PreviewChatInfoLayout() {
       User.sampleData,
       sendReceipts = remember { mutableStateOf(SendReceipts.Yes) },
       setSendReceipts = {},
+      chatItemTTL = remember { mutableStateOf(ChatItemTTL.fromSeconds(0)) },
+      setChatItemTTL = {},
       localAlias = "",
       connectionCode = "123",
       developerTools = false,
@@ -1338,7 +1443,8 @@ fun PreviewChatInfoLayout() {
       syncContactConnectionForce = {},
       verifyClicked = {},
       close = {},
-      onSearchClicked = {}
+      onSearchClicked = {},
+      deletingItems = remember { mutableStateOf(false) }
     )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
index e62235bd7c..9c36f4896b 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
@@ -42,18 +42,20 @@ sealed class CIInfoTab {
 }
 
 @Composable
-fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
+fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean, chatInfo: ChatInfo?) {
   val sent = ci.chatDir.sent
   val appColors = MaterialTheme.appColors
   val uriHandler = LocalUriHandler.current
   val selection = remember { mutableStateOf<CIInfoTab>(CIInfoTab.History) }
 
   @Composable
-  fun TextBubble(text: String, formattedText: List<FormattedText>?, sender: String?, showMenu: MutableState<Boolean>) {
+  fun TextBubble(text: String, formattedText: List<FormattedText>?, sender: String?, showMenu: MutableState<Boolean>, mentions: Map<String, CIMention>? = null, userMemberId: String? = null, ) {
     if (text != "") {
       MarkdownText(
         text, if (text.isEmpty()) emptyList() else formattedText,
         sender = sender,
+        mentions = mentions,
+        userMemberId = userMemberId,
         senderBold = true,
         toggleSecrets = true,
         linkMode = SimplexLinkMode.DESCRIPTION, uriHandler = uriHandler,
@@ -80,7 +82,12 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
           .onRightClick { showMenu.value = true }
       ) {
         Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-          TextBubble(text, ciVersion.formattedText, sender = null, showMenu)
+          TextBubble(text, ciVersion.formattedText, sender = null, showMenu = showMenu, mentions = ci.mentions,
+            userMemberId = when {
+              chatInfo is ChatInfo.Group -> chatInfo.groupInfo.membership.memberId
+              else -> null
+            }
+          )
         }
       }
       Row(Modifier.padding(start = 12.dp, top = 3.dp, bottom = 16.dp)) {
@@ -202,7 +209,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
       SectionItemView(
         click = {
           withBGApi {
-            openChat(chatRh, forwardedFromItem.chatInfo)
+            openChat(secondaryChatsCtx = null, chatRh, forwardedFromItem.chatInfo)
             ModalManager.end.closeModals()
           }
         },
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsLoader.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsLoader.kt
index 6419aa884d..07cdc065a7 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsLoader.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsLoader.kt
@@ -2,61 +2,74 @@ package chat.simplex.common.views.chat
 
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.chatModel
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.datetime.Instant
 import kotlin.math.min
 
 const val TRIM_KEEP_COUNT = 200
 
 suspend fun apiLoadSingleMessage(
+  chatsCtx: ChatModel.ChatsContext,
   rhId: Long?,
   chatType: ChatType,
   apiId: Long,
-  itemId: Long,
-  contentTag: MsgContentTag?,
+  itemId: Long
 ): ChatItem? = coroutineScope {
-  val (chat, _) = chatModel.controller.apiGetChat(rhId, chatType, apiId, contentTag, ChatPagination.Around(itemId, 0), "") ?: return@coroutineScope null
+  val (chat, _) = chatModel.controller.apiGetChat(rhId, chatType, apiId, chatsCtx.groupScopeInfo?.toChatScope(), chatsCtx.contentTag, ChatPagination.Around(itemId, 0), "") ?: return@coroutineScope null
   chat.chatItems.firstOrNull()
 }
 
 suspend fun apiLoadMessages(
+  chatsCtx: ChatModel.ChatsContext,
   rhId: Long?,
   chatType: ChatType,
   apiId: Long,
-  contentTag: MsgContentTag?,
   pagination: ChatPagination,
   search: String = "",
+  openAroundItemId: Long? = null,
   visibleItemIndexesNonReversed: () -> IntRange = { 0 .. 0 }
 ) = coroutineScope {
-  val (chat, navInfo) = chatModel.controller.apiGetChat(rhId, chatType, apiId, contentTag, pagination, search) ?: return@coroutineScope
+  val (chat, navInfo) = chatModel.controller.apiGetChat(rhId, chatType, apiId, chatsCtx.groupScopeInfo?.toChatScope(), chatsCtx.contentTag, pagination, search) ?: return@coroutineScope
   // For .initial allow the chatItems to be empty as well as chatModel.chatId to not match this chat because these values become set after .initial finishes
-  if (((chatModel.chatId.value != chat.id || chat.chatItems.isEmpty()) && pagination !is ChatPagination.Initial && pagination !is ChatPagination.Last)
+  /** When [openAroundItemId] is provided, chatId can be different too */
+  if (((chatModel.chatId.value != chat.id || chat.chatItems.isEmpty()) && pagination !is ChatPagination.Initial && pagination !is ChatPagination.Last && openAroundItemId == null)
     || !isActive) return@coroutineScope
+  processLoadedChat(chatsCtx, chat, navInfo, pagination, openAroundItemId, visibleItemIndexesNonReversed)
+}
 
-  val chatState = chatModel.chatStateForContent(contentTag)
+suspend fun processLoadedChat(
+  chatsCtx: ChatModel.ChatsContext,
+  chat: Chat,
+  navInfo: NavigationInfo,
+  pagination: ChatPagination,
+  openAroundItemId: Long?,
+  visibleItemIndexesNonReversed: () -> IntRange = { 0 .. 0 }
+) {
+  val chatState = chatsCtx.chatState
   val (splits, unreadAfterItemId, totalAfter, unreadTotal, unreadAfter, unreadAfterNewestLoaded) = chatState
-  val oldItems = chatModel.chatItemsForContent(contentTag).value
+  val oldItems = chatsCtx.chatItems.value
   val newItems = SnapshotStateList<ChatItem>()
   when (pagination) {
     is ChatPagination.Initial -> {
       val newSplits = if (chat.chatItems.isNotEmpty() && navInfo.afterTotal > 0) listOf(chat.chatItems.last().id) else emptyList()
-      if (contentTag == null) {
+      if (chatsCtx.secondaryContextFilter == null) {
         // update main chats, not content tagged
-        withChats {
-          if (getChat(chat.id) == null) {
-            addChat(chat)
+        withContext(Dispatchers.Main) {
+          val oldChat = chatModel.chatsContext.getChat(chat.id)
+          if (oldChat == null) {
+            chatModel.chatsContext.addChat(chat)
           } else {
-            updateChatInfo(chat.remoteHostId, chat.chatInfo)
-            updateChatStats(chat.remoteHostId, chat.id, chat.chatStats)
+            chatModel.chatsContext.updateChatInfo(chat.remoteHostId, chat.chatInfo)
+            // unreadChat is currently not actual in getChat query (always false)
+            chatModel.chatsContext.updateChatStats(chat.remoteHostId, chat.id, chat.chatStats.copy(unreadChat = oldChat.chatStats.unreadChat))
           }
         }
       }
-      withChats(contentTag) {
-        chatItemStatuses.clear()
-        chatItems.replaceAll(chat.chatItems)
-        chatModel.chatId.value = chat.chatInfo.id
+      withContext(Dispatchers.Main) {
+        chatsCtx.chatItems.replaceAll(chat.chatItems)
+        chatModel.chatId.value = chat.id
         splits.value = newSplits
         if (chat.chatItems.isNotEmpty()) {
           unreadAfterItemId.value = chat.chatItems.last().id
@@ -70,7 +83,7 @@ suspend fun apiLoadMessages(
     is ChatPagination.Before -> {
       newItems.addAll(oldItems)
       val indexInCurrentItems: Int = oldItems.indexOfFirst { it.id == pagination.chatItemId }
-      if (indexInCurrentItems == -1) return@coroutineScope
+      if (indexInCurrentItems == -1) return
       val (newIds, _) = mapItemsToIds(chat.chatItems)
       val wasSize = newItems.size
       val (oldUnreadSplitIndex, newUnreadSplitIndex, trimmedIds, newSplits) = removeDuplicatesAndModifySplitsOnBeforePagination(
@@ -78,8 +91,8 @@ suspend fun apiLoadMessages(
       )
       val insertAt = (indexInCurrentItems - (wasSize - newItems.size) + trimmedIds.size).coerceAtLeast(0)
       newItems.addAll(insertAt, chat.chatItems)
-      withChats(contentTag) {
-        chatItems.replaceAll(newItems)
+      withContext(Dispatchers.Main) {
+        chatsCtx.chatItems.replaceAll(newItems)
         splits.value = newSplits
         chatState.moveUnreadAfterItem(oldUnreadSplitIndex, newUnreadSplitIndex, oldItems)
       }
@@ -87,7 +100,7 @@ suspend fun apiLoadMessages(
     is ChatPagination.After -> {
       newItems.addAll(oldItems)
       val indexInCurrentItems: Int = oldItems.indexOfFirst { it.id == pagination.chatItemId }
-      if (indexInCurrentItems == -1) return@coroutineScope
+      if (indexInCurrentItems == -1) return
 
       val mappedItems = mapItemsToIds(chat.chatItems)
       val newIds = mappedItems.first
@@ -97,8 +110,8 @@ suspend fun apiLoadMessages(
       val indexToAdd = min(indexInCurrentItems + 1, newItems.size)
       val indexToAddIsLast = indexToAdd == newItems.size
       newItems.addAll(indexToAdd, chat.chatItems)
-      withChats(contentTag) {
-        chatItems.replaceAll(newItems)
+      withContext(Dispatchers.Main) {
+        chatsCtx.chatItems.replaceAll(newItems)
         splits.value = newSplits
         chatState.moveUnreadAfterItem(splits.value.firstOrNull() ?: newItems.last().id, newItems)
         // loading clear bottom area, updating number of unread items after the newest loaded item
@@ -108,27 +121,43 @@ suspend fun apiLoadMessages(
       }
     }
     is ChatPagination.Around -> {
-      newItems.addAll(oldItems)
-      val newSplits = removeDuplicatesAndUpperSplits(newItems, chat, splits, visibleItemIndexesNonReversed)
-      // currently, items will always be added on top, which is index 0
-      newItems.addAll(0, chat.chatItems)
-      withChats(contentTag) {
-        chatItems.replaceAll(newItems)
-        splits.value = listOf(chat.chatItems.last().id) + newSplits
+      val newSplits: ArrayList<Long> = if (openAroundItemId == null) {
+        newItems.addAll(oldItems)
+        ArrayList(removeDuplicatesAndUpperSplits(newItems, chat, splits, visibleItemIndexesNonReversed))
+      } else {
+        arrayListOf()
+      }
+      val (itemIndex, splitIndex) = indexToInsertAround(chat.chatInfo.chatType, chat.chatItems.lastOrNull(), to = newItems, newSplits.toSet())
+      //indexToInsertAroundTest()
+      newItems.addAll(itemIndex, chat.chatItems)
+      newSplits.add(splitIndex, chat.chatItems.last().id)
+
+      withContext(Dispatchers.Main) {
+        chatsCtx.chatItems.replaceAll(newItems)
+        splits.value = newSplits
         unreadAfterItemId.value = chat.chatItems.last().id
         totalAfter.value = navInfo.afterTotal
         unreadTotal.value = chat.chatStats.unreadCount
         unreadAfter.value = navInfo.afterUnread
-        // no need to set it, count will be wrong
-        // unreadAfterNewestLoaded.value = navInfo.afterUnread
+
+        if (openAroundItemId != null) {
+          unreadAfterNewestLoaded.value = navInfo.afterUnread
+          chatModel.openAroundItemId.value = openAroundItemId
+          chatModel.chatId.value = chat.id
+        } else {
+          // no need to set it, count will be wrong
+          // unreadAfterNewestLoaded.value = navInfo.afterUnread
+        }
       }
     }
     is ChatPagination.Last -> {
       newItems.addAll(oldItems)
+      val newSplits = removeDuplicatesAndUnusedSplits(newItems, chat, chatState.splits.value)
       removeDuplicates(newItems, chat)
       newItems.addAll(chat.chatItems)
-      withChats(contentTag) {
-        chatItems.replaceAll(newItems)
+      withContext(Dispatchers.Main) {
+        chatsCtx.chatItems.replaceAll(newItems)
+        chatState.splits.value = newSplits
         unreadAfterNewestLoaded.value = 0
       }
     }
@@ -214,7 +243,15 @@ private fun removeDuplicatesAndModifySplitsOnAfterPagination(
   val indexInSplitRanges = splits.value.indexOf(paginationChatItemId)
   // Currently, it should always load from split range
   val loadingFromSplitRange = indexInSplitRanges != -1
-  val splitsToMerge = if (loadingFromSplitRange && indexInSplitRanges + 1 <= splits.value.size) ArrayList(splits.value.subList(indexInSplitRanges + 1, splits.value.size)) else ArrayList()
+  val topSplits: List<Long>
+  val splitsToMerge: ArrayList<Long>
+  if (loadingFromSplitRange && indexInSplitRanges + 1 <= splits.value.size) {
+    splitsToMerge = ArrayList(splits.value.subList(indexInSplitRanges + 1, splits.value.size))
+    topSplits = splits.value.take(indexInSplitRanges + 1)
+  } else {
+    splitsToMerge = ArrayList()
+    topSplits = emptyList()
+  }
   newItems.removeAll {
     val duplicate = newIds.contains(it.id)
     if (loadingFromSplitRange && duplicate) {
@@ -233,8 +270,8 @@ private fun removeDuplicatesAndModifySplitsOnAfterPagination(
   }
   var newSplits: List<Long> = emptyList()
   if (firstItemIdBelowAllSplits != null) {
-    // no splits anymore, all were merged with bottom items
-    newSplits = emptyList()
+    // no splits below anymore, all were merged with bottom items
+    newSplits = topSplits
   } else {
     if (splitsToRemove.isNotEmpty()) {
       val new = ArrayList(splits.value)
@@ -297,6 +334,31 @@ private fun removeDuplicatesAndUpperSplits(
   return newSplits
 }
 
+private fun removeDuplicatesAndUnusedSplits(
+  newItems: SnapshotStateList<ChatItem>,
+  chat: Chat,
+  splits: List<Long>
+): List<Long> {
+  if (splits.isEmpty()) {
+    removeDuplicates(newItems, chat)
+    return splits
+  }
+
+  val newSplits = splits.toMutableList()
+  val (newIds, _) = mapItemsToIds(chat.chatItems)
+  newItems.removeAll {
+    val duplicate = newIds.contains(it.id)
+    if (duplicate) {
+      val firstIndex = newSplits.indexOf(it.id)
+      if (firstIndex != -1) {
+        newSplits.removeAt(firstIndex)
+      }
+    }
+    duplicate
+  }
+  return newSplits
+}
+
 // ids, number of unread items
 private fun mapItemsToIds(items: List<ChatItem>): Pair<Set<Long>, Int> {
   var unreadInLoaded = 0
@@ -317,3 +379,141 @@ private fun removeDuplicates(newItems: SnapshotStateList<ChatItem>, chat: Chat)
   val (newIds, _) = mapItemsToIds(chat.chatItems)
   newItems.removeAll { newIds.contains(it.id) }
 }
+
+private data class SameTimeItem(val index: Int, val item: ChatItem)
+
+// return (item index, split index)
+private fun indexToInsertAround(chatType: ChatType, lastNew: ChatItem?, to: List<ChatItem>, splits: Set<Long>): Pair<Int, Int> {
+  if (to.size <= 0 || lastNew == null) {
+    return 0 to 0
+  }
+  // group sorting: item_ts, item_id
+  // everything else: created_at, item_id
+  val compareByTimeTs = chatType == ChatType.Group
+  // in case several items have the same time as another item in the `to` array
+  var sameTime: ArrayList<SameTimeItem> = arrayListOf()
+
+  // trying to find new split index for item looks difficult but allows to not use one more loop.
+  // The idea is to memorize how many splits were till any index (map number of splits until index)
+  // and use resulting itemIndex to decide new split index position.
+  // Because of the possibility to have many items with the same timestamp, it's possible to see `itemIndex < || == || > i`.
+  val splitsTillIndex: ArrayList<Int> = arrayListOf()
+  var splitsPerPrevIndex = 0
+
+  for (i in to.indices) {
+    val item = to[i]
+
+    splitsPerPrevIndex = if (splits.contains(item.id)) splitsPerPrevIndex + 1 else splitsPerPrevIndex
+    splitsTillIndex.add(splitsPerPrevIndex)
+    val itemIsNewer = (if (compareByTimeTs) item.meta.itemTs > lastNew.meta.itemTs else item.meta.createdAt > lastNew.meta.createdAt)
+    if (itemIsNewer || i + 1 == to.size) {
+      val same = if (compareByTimeTs) lastNew.meta.itemTs == item.meta.itemTs else lastNew.meta.createdAt == item.meta.createdAt
+      if (same) {
+        sameTime.add(SameTimeItem(i, item))
+      }
+      // time to stop the loop. Item is newer, or it's the last item in `to` array, taking previous items and checking position inside them
+      val itemIndex: Int
+      val first = if (sameTime.size > 1) sameTime.sortedWith { prev, next -> prev.item.meta.itemId.compareTo(next.item.id) }.firstOrNull { same -> same.item.id > lastNew.id } else null
+      if (sameTime.size > 1 && first != null) {
+        itemIndex = first.index
+      } else if (sameTime.size == 1) {
+        itemIndex = if (sameTime[0].item.id > lastNew.id) sameTime[0].index else sameTime[0].index + 1
+      } else {
+        itemIndex = if (itemIsNewer) i else i + 1
+      }
+      val splitIndex = splitsTillIndex[min(itemIndex, splitsTillIndex.size - 1)]
+      val prevItemSplitIndex = if (itemIndex == 0) 0 else splitsTillIndex[min(itemIndex - 1, splitsTillIndex.size - 1)]
+      return Pair(itemIndex, if (splitIndex == prevItemSplitIndex) splitIndex else prevItemSplitIndex)
+    }
+    val same = if (compareByTimeTs) lastNew.meta.itemTs == item.meta.itemTs else lastNew.meta.createdAt == item.meta.createdAt
+    if (same) {
+      sameTime.add(SameTimeItem(index = i, item = item))
+    } else {
+      sameTime = arrayListOf()
+    }
+  }
+  // shouldn't be here
+  return Pair(to.size, splits.size)
+}
+
+private fun indexToInsertAroundTest() {
+  fun assert(one: Pair<Int, Int>, two: Pair<Int, Int>) {
+    if (one != two) {
+      throw Exception("$one != $two")
+    }
+  }
+
+  val itemsToInsert = listOf(ChatItem.getSampleData(3, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds( 3), ""))
+  val items1 = listOf(
+    ChatItem.getSampleData(0, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds( 0), ""),
+  ChatItem.getSampleData(1, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds( 1), ""),
+  ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds( 2), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items1, setOf(1)), Pair(3, 1))
+
+  val items2 = listOf(
+    ChatItem.getSampleData(0, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(0), ""),
+  ChatItem.getSampleData(1, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(1), ""),
+  ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items2, setOf(2)), Pair(3, 1))
+
+  val items3 = listOf(
+    ChatItem.getSampleData(0, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(0), ""),
+  ChatItem.getSampleData(1, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items3, setOf(1)), Pair(3, 1))
+
+  val items4 = listOf(
+    ChatItem.getSampleData(0, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(0), ""),
+  ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items4, setOf(4)), Pair(1, 0))
+
+  val items5 = listOf(
+    ChatItem.getSampleData(0, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(0), ""),
+  ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items5, setOf(2)), Pair(2, 1))
+
+  val items6 = listOf(
+    ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), ""),
+  ChatItem.getSampleData(6, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items6, setOf(5)), Pair(0, 0))
+
+  val items7 = listOf(
+    ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), ""),
+  ChatItem.getSampleData(6, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, null, to = items7, setOf(6)), Pair(0, 0))
+
+  val items8 = listOf(
+    ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), ""),
+  ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items8, setOf(2)), Pair(0, 0))
+
+  val items9 = listOf(
+    ChatItem.getSampleData(2, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items9, setOf(5)), Pair(1, 0))
+
+  val items10 = listOf(
+    ChatItem.getSampleData(4, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(5, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(3), ""),
+  ChatItem.getSampleData(6, CIDirection.GroupSnd(), Instant.fromEpochMilliseconds(4), "")
+  )
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items10, setOf(4)), Pair(0, 0))
+
+  val items11: List<ChatItem> = listOf()
+  assert(indexToInsertAround(ChatType.Group, itemsToInsert.lastOrNull(), to = items11, emptySet()), Pair(0, 0))
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsMerger.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsMerger.kt
index d318cf05fd..d98c041478 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsMerger.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemsMerger.kt
@@ -237,24 +237,8 @@ data class ActiveChatState (
     unreadAfter.value = 0
     unreadAfterNewestLoaded.value = 0
   }
-}
 
-fun visibleItemIndexesNonReversed(mergedItems: State<MergedItems>, reversedItemsSize: Int, listState: LazyListState): IntRange {
-  val zero = 0 .. 0
-  if (listState.layoutInfo.totalItemsCount == 0) return zero
-  val newest = mergedItems.value.items.getOrNull(listState.firstVisibleItemIndex)?.startIndexInReversedItems
-  val oldest = mergedItems.value.items.getOrNull(listState.layoutInfo.visibleItemsInfo.last().index)?.lastIndexInReversed()
-  if (newest == null || oldest == null) return zero
-  val range = reversedItemsSize - oldest .. reversedItemsSize - newest
-  if (range.first < 0 || range.last < 0) return zero
-
-  // visible items mapped to their underlying data structure which is chatModel.chatItems
-  return range
-}
-
-fun recalculateChatStatePositions(chatState: ActiveChatState) = object: ChatItemsChangesListener {
-  override fun read(itemIds: Set<Long>?, newItems: List<ChatItem>) {
-    val (_, unreadAfterItemId, _, unreadTotal, unreadAfter) = chatState
+  fun itemsRead(itemIds: Set<Long>?, newItems: List<ChatItem>) {
     if (itemIds == null) {
       // special case when the whole chat became read
       unreadTotal.value = 0
@@ -287,14 +271,15 @@ fun recalculateChatStatePositions(chatState: ActiveChatState) = object: ChatItem
     unreadTotal.value = newUnreadTotal
     unreadAfter.value = newUnreadAfter
   }
-  override fun added(item: Pair<Long, Boolean>, index: Int) {
+
+  fun itemAdded(item: Pair<Long, Boolean>) {
     if (item.second) {
-      chatState.unreadAfter.value++
-      chatState.unreadTotal.value++
+      unreadAfter.value++
+      unreadTotal.value++
     }
   }
-  override fun removed(itemIds: List<Triple<Long, Int, Boolean>>, newItems: List<ChatItem>) {
-    val (splits, unreadAfterItemId, totalAfter, unreadTotal, unreadAfter) = chatState
+
+  fun itemsRemoved(itemIds: List<Triple<Long, Int, Boolean>>, newItems: List<ChatItem>) {
     val newSplits = ArrayList<Long>()
     for (split in splits.value) {
       val index = itemIds.indexOfFirst { it.first == split }
@@ -343,7 +328,19 @@ fun recalculateChatStatePositions(chatState: ActiveChatState) = object: ChatItem
       totalAfter.value -= itemIds.size
     }
   }
-  override fun cleared() { chatState.clear() }
+}
+
+fun visibleItemIndexesNonReversed(mergedItems: State<MergedItems>, reversedItemsSize: Int, listState: LazyListState): IntRange {
+  val zero = 0 .. 0
+  if (listState.layoutInfo.totalItemsCount == 0) return zero
+  val newest = mergedItems.value.items.getOrNull(listState.firstVisibleItemIndex)?.startIndexInReversedItems
+  val oldest = mergedItems.value.items.getOrNull(listState.layoutInfo.visibleItemsInfo.last().index)?.lastIndexInReversed()
+  if (newest == null || oldest == null) return zero
+  val range = reversedItemsSize - oldest .. reversedItemsSize - newest
+  if (range.first < 0 || range.last < 0) return zero
+
+  // visible items mapped to their underlying data structure which is chatModel.chatItems
+  return range
 }
 
 /** Helps in debugging */
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index 7713a2399f..2ca0dcc35d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
 import androidx.compose.ui.draw.*
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.layer.GraphicsLayer
 import androidx.compose.ui.layout.layoutId
@@ -31,8 +32,6 @@ import chat.simplex.common.model.CIDirection.GroupRcv
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.activeCall
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.chat.group.*
@@ -58,29 +57,34 @@ data class ItemSeparation(val timestamp: Boolean, val largeGap: Boolean, val dat
 // staleChatId means the id that was before chatModel.chatId becomes null. It's needed for Android only to make transition from chat
 // to chat list smooth. Otherwise, chat view will become blank right before the transition starts
 fun ChatView(
+  chatsCtx: ChatModel.ChatsContext,
   staleChatId: State<String?>,
-  reportsView: Boolean,
   scrollToItemId: MutableState<Long?> = remember { mutableStateOf(null) },
   onComposed: suspend (chatId: String) -> Unit
 ) {
   val showSearch = rememberSaveable { mutableStateOf(false) }
+  val chat = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }
   // They have their own iterator inside for a reason to prevent crash "Reading a state that was created after the snapshot..."
   val remoteHostId = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.remoteHostId } }
-  val activeChatInfo = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatInfo } }
-  val activeChatStats = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatStats } }
+  val activeChatInfo = remember { derivedStateOf {
+    var chatInfo = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatInfo
+    if (
+      chatsCtx.secondaryContextFilter is SecondaryContextFilter.GroupChatScopeContext
+      && chatInfo is ChatInfo.Group
+    ) {
+      val scopeInfo = chatsCtx.secondaryContextFilter.groupScopeInfo
+      chatInfo = chatInfo.copy(groupChatScope = scopeInfo)
+    }
+    chatInfo
+  } }
   val user = chatModel.currentUser.value
   val chatInfo = activeChatInfo.value
-  if (chatInfo == null || user == null) {
+  if (chat == null || chatInfo == null || user == null) {
     LaunchedEffect(Unit) {
       chatModel.chatId.value = null
       ModalManager.end.closeModals()
     }
   } else {
-    val groupReports = remember { derivedStateOf {
-      val reportsCount = if (activeChatInfo.value is ChatInfo.Group) activeChatStats.value?.reportsCount ?: 0 else 0
-      GroupReports(reportsCount, reportsView) }
-    }
-    val reversedChatItems = remember { derivedStateOf { chatModel.chatItemsForContent(groupReports.value.contentTag).value.asReversed() } }
     val searchText = rememberSaveable { mutableStateOf("") }
     val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
     val composeState = rememberSaveable(saver = ComposeState.saver()) {
@@ -106,7 +110,7 @@ fun ChatView(
           .distinctUntilChanged()
           .filterNotNull()
           .collect { chatId ->
-            if (!groupReports.value.reportsView) {
+            if (chatsCtx.secondaryContextFilter == null) {
               markUnreadChatAsRead(chatId)
             }
             showSearch.value = false
@@ -115,19 +119,31 @@ fun ChatView(
           }
       }
     }
+    if (chatsCtx.secondaryContextFilter == null && chatInfo is ChatInfo.Group && chatInfo.groupInfo.membership.memberPending) {
+      LaunchedEffect(Unit) {
+        val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = null)
+        val supportChatInfo = ChatInfo.Group(chatInfo.groupInfo, groupChatScope = scopeInfo)
+        showMemberSupportChatView(
+          chatModel.chatId,
+          scrollToItemId,
+          supportChatInfo,
+          scopeInfo
+        )
+      }
+    }
     val view = LocalMultiplatformView()
     val chatRh = remoteHostId.value
     // We need to have real unreadCount value for displaying it inside top right button
     // Having activeChat reloaded on every change in it is inefficient (UI lags)
     val unreadCount = remember {
       derivedStateOf {
-        chatModel.chatsForContent(if (reportsView) MsgContentTag.Report else null).value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatStats?.unreadCount ?: 0
+        chatsCtx.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatStats?.unreadCount ?: 0
       }
     }
+    val reportsCount = reportsCount(chatInfo.id)
     val clipboard = LocalClipboardManager.current
     CompositionLocalProvider(
       LocalAppBarHandler provides rememberAppBarHandler(chatInfo.id, keyboardCoversBar = false),
-      LocalContentTag provides groupReports.value.contentTag
     ) {
     when (chatInfo) {
       is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
@@ -135,23 +151,27 @@ fun ChatView(
         val perChatTheme = remember(chatInfo, CurrentColors.value.base) { if (chatInfo is ChatInfo.Direct) chatInfo.contact.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else null }
         val overrides = if (perChatTheme != null) ThemeManager.currentColors(null, perChatTheme, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get()) else null
         val fullDeleteAllowed = remember(chatInfo) { chatInfo.featureEnabled(ChatFeature.FullDelete) }
+
         SimpleXThemeOverride(overrides ?: CurrentColors.collectAsState().value) {
           val onSearchValueChanged: (String) -> Unit = onSearchValueChanged@{ value ->
-            if (searchText.value == value) return@onSearchValueChanged
-            val c = chatModel.getChat(chatInfo.id) ?: return@onSearchValueChanged
-            if (chatModel.chatId.value != chatInfo.id) return@onSearchValueChanged
+            val sameText = searchText.value == value
+            // showSearch can be false with empty text when it was closed manually after clicking on message from search to load .around it
+            // (required on Android to have this check to prevent call to search with old text)
+            val emptyAndClosedSearch = searchText.value.isEmpty() && !showSearch.value && chatsCtx.secondaryContextFilter == null
+            val c = chatModel.getChat(chatInfo.id)
+            if (sameText || emptyAndClosedSearch || c == null || chatModel.chatId.value != chatInfo.id) return@onSearchValueChanged
             withBGApi {
-              apiFindMessages(c, value, groupReports.value.toContentTag())
+              apiFindMessages(chatsCtx, c, value)
               searchText.value = value
             }
           }
           ChatLayout(
+            chatsCtx = chatsCtx,
             remoteHostId = remoteHostId,
             chatInfo = activeChatInfo,
-            reversedChatItems = reversedChatItems,
             unreadCount,
             composeState,
-            composeView = {
+            composeView = { focusRequester ->
               if (selectedChatItems.value == null) {
                 Column(
                   Modifier.fillMaxWidth(),
@@ -171,13 +191,14 @@ fun ChatView(
                     )
                   }
                   ComposeView(
-                    chatModel, Chat(remoteHostId = chatRh, chatInfo = chatInfo, chatItems = emptyList()), composeState, attachmentOption,
-                    showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
+                    rhId = remoteHostId.value, chatModel, chatsCtx, Chat(remoteHostId = chatRh, chatInfo = chatInfo, chatItems = emptyList()), composeState, attachmentOption,
+                    showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } },
+                    focusRequester = focusRequester
                   )
                 }
               } else {
-                SelectedItemsBottomToolbar(
-                  reversedChatItems = reversedChatItems,
+                SelectedItemsButtonsToolbar(
+                  chatsCtx = chatsCtx,
                   selectedChatItems = selectedChatItems,
                   chatInfo = chatInfo,
                   deleteItems = { canDeleteForAll ->
@@ -200,6 +221,7 @@ fun ChatView(
                       )
                     }
                   },
+                  archiveItems = { archiveItems(chatRh, chatInfo, selectedChatItems) },
                   moderateItems = {
                     if (chatInfo is ChatInfo.Group) {
                       val itemIds = selectedChatItems.value
@@ -222,6 +244,7 @@ fun ChatView(
                           rh = chatRh,
                           fromChatType = chatInfo.chatType,
                           fromChatId = chatInfo.apiId,
+                          fromScope = chatInfo.groupChatScope(),
                           chatItemIds = chatItemIds
                         )
 
@@ -238,7 +261,6 @@ fun ChatView(
                 )
               }
             },
-            groupReports,
             scrollToItemId,
             attachmentOption,
             attachmentBottomSheetState,
@@ -252,6 +274,7 @@ fun ChatView(
               chatModel.chatId.value = null
               chatModel.groupMembers.value = emptyList()
               chatModel.groupMembersIndexes.value = emptyMap()
+              chatModel.membersLoaded.value = false
             },
             info = {
               if (ModalManager.end.hasModalsOpen()) {
@@ -264,7 +287,7 @@ fun ChatView(
                 // The idea is to preload information before showing a modal because large groups can take time to load all members
                 var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = null
                 var preloadedCode: String? = null
-                var preloadedLink: Pair<String, GroupMemberRole>? = null
+                var preloadedLink: Pair<CreatedConnLink, GroupMemberRole>? = null
                 if (chatInfo is ChatInfo.Direct) {
                   preloadedContactInfo = chatModel.controller.apiContactInfo(chatRh, chatInfo.apiId)
                   preloadedCode = chatModel.controller.apiGetContactCode(chatRh, chatInfo.apiId)?.second
@@ -274,40 +297,52 @@ fun ChatView(
                 }
                 if (!isActive) return@launch
 
-                ModalManager.end.showModalCloseable(true) { close ->
-                  val chatInfo = remember { activeChatInfo }.value
-                  if (chatInfo is ChatInfo.Direct) {
-                    var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
-                    var code: String? by remember { mutableStateOf(preloadedCode) }
-                    KeyChangeEffect(chatInfo.id, ChatModel.networkStatuses.toMap()) {
-                      contactInfo = chatModel.controller.apiContactInfo(chatRh, chatInfo.apiId)
-                      preloadedContactInfo = contactInfo
-                      code = chatModel.controller.apiGetContactCode(chatRh, chatInfo.apiId)?.second
-                      preloadedCode = code
+                val selectedItems: MutableState<Set<Long>?> = mutableStateOf(null)
+                ModalManager.end.showCustomModal { close ->
+                  val appBar = remember { mutableStateOf(null as @Composable (BoxScope.() -> Unit)?) }
+                  ModalView(close, appBar = appBar.value) {
+                    val chatInfo = remember { activeChatInfo }.value
+                    if (chatInfo is ChatInfo.Direct) {
+                      var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
+                      var code: String? by remember { mutableStateOf(preloadedCode) }
+                      KeyChangeEffect(chatInfo.id, ChatModel.networkStatuses.toMap()) {
+                        contactInfo = chatModel.controller.apiContactInfo(chatRh, chatInfo.apiId)
+                        preloadedContactInfo = contactInfo
+                        code = chatModel.controller.apiGetContactCode(chatRh, chatInfo.apiId)?.second
+                        preloadedCode = code
+                      }
+                      ChatInfoView(chatsCtx, chatModel, chatInfo.contact, contactInfo?.first, contactInfo?.second, chatInfo.localAlias, code, close) {
+                        showSearch.value = true
+                      }
+                    } else if (chatInfo is ChatInfo.Group) {
+                      var link: Pair<CreatedConnLink, GroupMemberRole>? by remember(chatInfo.id) { mutableStateOf(preloadedLink) }
+                      KeyChangeEffect(chatInfo.id) {
+                        setGroupMembers(chatRh, chatInfo.groupInfo, chatModel)
+                        link = chatModel.controller.apiGetGroupLink(chatRh, chatInfo.groupInfo.groupId)
+                        preloadedLink = link
+                      }
+                      GroupChatInfoView(chatsCtx, chatRh, chatInfo.id, link?.first, link?.second, selectedItems, appBar, scrollToItemId, {
+                        link = it
+                        preloadedLink = it
+                      }, close, { showSearch.value = true })
+                    } else {
+                      LaunchedEffect(Unit) {
+                        close()
+                      }
                     }
-                    ChatInfoView(chatModel, chatInfo.contact, contactInfo?.first, contactInfo?.second, chatInfo.localAlias, code, close) {
-                      showSearch.value = true
-                    }
-                  } else if (chatInfo is ChatInfo.Group) {
-                    var link: Pair<String, GroupMemberRole>? by remember(chatInfo.id) { mutableStateOf(preloadedLink) }
-                    KeyChangeEffect(chatInfo.id) {
-                      setGroupMembers(chatRh, chatInfo.groupInfo, chatModel)
-                      link = chatModel.controller.apiGetGroupLink(chatRh, chatInfo.groupInfo.groupId)
-                      preloadedLink = link
-                    }
-                    GroupChatInfoView(chatModel, chatRh, chatInfo.id, link?.first, link?.second, scrollToItemId, {
-                      link = it
-                      preloadedLink = it
-                    }, close, { showSearch.value = true })
-                  } else {
                     LaunchedEffect(Unit) {
-                      close()
+                      snapshotFlow { activeChatInfo.value?.id }
+                        .drop(1)
+                        .collect {
+                          appBar.value = null
+                          selectedItems.value = null
+                        }
                     }
                   }
                 }
               }
             },
-            showGroupReports = {
+            showReports = {
               val info = activeChatInfo.value ?: return@ChatLayout
               if (ModalManager.end.hasModalsOpen()) {
                 ModalManager.end.closeModals()
@@ -318,6 +353,38 @@ fun ChatView(
                 showGroupReportsView(staleChatId, scrollToItemId, info)
               }
             },
+            showSupportChats = {
+              val info = activeChatInfo.value ?: return@ChatLayout
+              if (ModalManager.end.hasModalsOpen()) {
+                ModalManager.end.closeModals()
+                return@ChatLayout
+              }
+              hideKeyboard(view)
+              scope.launch {
+                if (info is ChatInfo.Group && info.groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+                  ModalManager.end.showCustomModal { close ->
+                    MemberSupportView(
+                      chatRh,
+                      chat,
+                      info.groupInfo,
+                      scrollToItemId,
+                      close
+                    )
+                  }
+                } else if (info is ChatInfo.Group) {
+                  val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = null)
+                  val supportChatInfo = ChatInfo.Group(info.groupInfo, groupChatScope = scopeInfo)
+                  scope.launch {
+                    showMemberSupportChatView(
+                      chatModel.chatId,
+                      scrollToItemId = scrollToItemId,
+                      supportChatInfo,
+                      scopeInfo
+                    )
+                  }
+                }
+              }
+            },
             showMemberInfo = { groupInfo: GroupInfo, member: GroupMember ->
               hideKeyboard(view)
               groupMembersJob.cancel()
@@ -333,12 +400,12 @@ fun ChatView(
                 setGroupMembers(chatRh, groupInfo, chatModel)
                 if (!isActive) return@launch
 
-                if (!groupReports.value.reportsView) {
+                if (chatsCtx.secondaryContextFilter == null) {
                   ModalManager.end.closeModals()
                 }
                 ModalManager.end.showModalCloseable(true) { close ->
                   remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
-                    GroupMemberInfoView(chatRh, groupInfo, mem, stats, code, chatModel, close, close)
+                    GroupMemberInfoView(chatRh, groupInfo, mem, scrollToItemId, stats, code, chatModel, close, close)
                   }
                 }
               }
@@ -347,12 +414,12 @@ fun ChatView(
               val c = chatModel.getChat(chatId)
               if (chatModel.chatId.value != chatId) return@ChatLayout
               if (c != null) {
-                apiLoadMessages(c.remoteHostId, c.chatInfo.chatType, c.chatInfo.apiId, groupReports.value.toContentTag(), pagination, searchText.value, visibleItemIndexes)
+                apiLoadMessages(chatsCtx, c.remoteHostId, c.chatInfo.chatType, c.chatInfo.apiId, pagination, searchText.value, null, visibleItemIndexes)
               }
             },
             deleteMessage = { itemId, mode ->
               withBGApi {
-                val toDeleteItem = reversedChatItems.value.lastOrNull { it.id == itemId }
+                val toDeleteItem = reversedChatItemsStatic(chatsCtx).lastOrNull { it.id == itemId }
                 val toModerate = toDeleteItem?.memberToModerate(chatInfo)
                 val groupInfo = toModerate?.first
                 val groupMember = toModerate?.second
@@ -369,6 +436,7 @@ fun ChatView(
                     chatRh,
                     type = chatInfo.chatType,
                     id = chatInfo.apiId,
+                    scope = chatInfo.groupChatScope(),
                     itemIds = listOf(itemId),
                     mode = mode
                   )
@@ -377,30 +445,30 @@ fun ChatView(
                 if (deleted != null) {
                   deletedChatItem = deleted.deletedChatItem.chatItem
                   toChatItem = deleted.toChatItem?.chatItem
-                  withChats {
+                  withContext(Dispatchers.Main) {
                     if (toChatItem != null) {
-                      upsertChatItem(chatRh, chatInfo, toChatItem)
+                      chatModel.chatsContext.upsertChatItem(chatRh, chatInfo, toChatItem)
                     } else {
-                      removeChatItem(chatRh, chatInfo, deletedChatItem)
+                      chatModel.chatsContext.removeChatItem(chatRh, chatInfo, deletedChatItem)
                     }
                     val deletedItem = deleted.deletedChatItem.chatItem
                     if (deletedItem.isActiveReport) {
-                      decreaseGroupReportsCounter(chatRh, chatInfo.id)
+                      chatModel.chatsContext.decreaseGroupReportsCounter(chatRh, chatInfo.id)
                     }
+                    chatModel.chatsContext.updateChatInfo(chatRh, deleted.deletedChatItem.chatInfo)
                   }
-                  withReportsChatsIfOpen {
-                    if (deletedChatItem.isReport) {
-                      if (toChatItem != null) {
-                        upsertChatItem(chatRh, chatInfo, toChatItem)
-                      } else {
-                        removeChatItem(chatRh, chatInfo, deletedChatItem)
-                      }
+                  withContext(Dispatchers.Main) {
+                    if (toChatItem != null) {
+                      chatModel.secondaryChatsContext.value?.upsertChatItem(chatRh, chatInfo, toChatItem)
+                    } else {
+                      chatModel.secondaryChatsContext.value?.removeChatItem(chatRh, chatInfo, deletedChatItem)
                     }
                   }
                 }
               }
             },
             deleteMessages = { itemIds -> deleteMessages(chatRh, chatInfo, itemIds, false, moderate = false) },
+            archiveReports = { itemIds, forAll -> archiveReports(chatRh, chatInfo, itemIds, forAll) },
             receiveFile = { fileId ->
               withBGApi { chatModel.controller.receiveFile(chatRh, user, fileId) }
             },
@@ -450,8 +518,8 @@ fun ChatView(
                 if (r != null) {
                   val contactStats = r.first
                   if (contactStats != null)
-                    withChats {
-                      updateContactConnectionStats(chatRh, contact, contactStats)
+                    withContext(Dispatchers.Main) {
+                      chatModel.chatsContext.updateContactConnectionStats(chatRh, contact, contactStats)
                     }
                 }
               }
@@ -462,8 +530,8 @@ fun ChatView(
                 if (r != null) {
                   val memStats = r.second
                   if (memStats != null) {
-                    withChats {
-                      updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
+                    withContext(Dispatchers.Main) {
+                      chatModel.chatsContext.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
                     }
                   }
                 }
@@ -473,8 +541,8 @@ fun ChatView(
               withBGApi {
                 val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
                 if (cStats != null) {
-                  withChats {
-                    updateContactConnectionStats(chatRh, contact, cStats)
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.updateContactConnectionStats(chatRh, contact, cStats)
                   }
                 }
               }
@@ -483,8 +551,8 @@ fun ChatView(
               withBGApi {
                 val r = chatModel.controller.apiSyncGroupMemberRatchet(chatRh, groupInfo.apiId, member.groupMemberId, force = false)
                 if (r != null) {
-                  withChats {
-                    updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
                   }
                 }
               }
@@ -501,25 +569,24 @@ fun ChatView(
                   rh = chatRh,
                   type = cInfo.chatType,
                   id = cInfo.apiId,
+                  scope = cInfo.groupChatScope(),
                   itemId = cItem.id,
                   add = add,
                   reaction = reaction
                 )
                 if (updatedCI != null) {
-                  withChats {
-                    updateChatItem(cInfo, updatedCI)
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.updateChatItem(cInfo, updatedCI)
                   }
-                  withReportsChatsIfOpen {
-                    if (cItem.isReport) {
-                      updateChatItem(cInfo, updatedCI)
-                    }
+                  withContext(Dispatchers.Main) {
+                    chatModel.secondaryChatsContext.value?.updateChatItem(cInfo, updatedCI)
                   }
                 }
               }
             },
             showItemDetails = { cInfo, cItem ->
               suspend fun loadChatItemInfo(): ChatItemInfo? = coroutineScope {
-                val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
+                val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cInfo.groupChatScope(), cItem.id)
                 if (ciInfo != null) {
                   if (chatInfo is ChatInfo.Group) {
                     setGroupMembers(chatRh, chatInfo.groupInfo, chatModel)
@@ -531,7 +598,7 @@ fun ChatView(
               groupMembersJob.cancel()
               groupMembersJob = scope.launch(Dispatchers.Default) {
                 var initialCiInfo = loadChatItemInfo() ?: return@launch
-                if (!ModalManager.end.hasModalOpen(ModalViewId.GROUP_REPORTS)) {
+                if (!ModalManager.end.hasModalOpen(ModalViewId.SECONDARY_CHAT)) {
                   ModalManager.end.closeModals()
                 }
                 ModalManager.end.showModalCloseable(endButtons = {
@@ -540,14 +607,14 @@ fun ChatView(
                   }
                 }) { close ->
                   var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
-                  ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
+                  ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get(), chatInfo)
                   LaunchedEffect(cItem.id) {
                     withContext(Dispatchers.Default) {
-                      for (apiResp in controller.messagesChannel) {
-                        val msg = apiResp.resp
-                        if (apiResp.remoteHostId == chatRh &&
-                          msg is CR.ChatItemsStatusesUpdated &&
-                          msg.chatItems.any { it.chatItem.id == cItem.id }
+                      for (msg in controller.messagesChannel) {
+                        if (msg.rhId == chatRh &&
+                          msg is API.Result &&
+                          msg.res is CR.ChatItemsStatusesUpdated &&
+                          msg.res.chatItems.any { it.chatItem.id == cItem.id }
                         ) {
                           ciInfo = loadChatItemInfo() ?: return@withContext
                           initialCiInfo = ciInfo
@@ -565,45 +632,48 @@ fun ChatView(
             openGroupLink = { groupInfo -> openGroupLink(view = view, groupInfo = groupInfo, rhId = chatRh, close = { ModalManager.end.closeModals() }) },
             markItemsRead = { itemsIds ->
               withBGApi {
-                withChats {
-                  // It's important to call it on Main thread. Otherwise, composable crash occurs from time-to-time without useful stacktrace
-                  withContext(Dispatchers.Main) {
-                    markChatItemsRead(chatRh, chatInfo.id, itemsIds)
-                  }
+                withContext(Dispatchers.Main) {
+                  chatModel.chatsContext.markChatItemsRead(chatRh, chatInfo.id, itemsIds)
                   ntfManager.cancelNotificationsForChat(chatInfo.id)
-                  chatModel.controller.apiChatItemsRead(
+                  val updatedChatInfo = chatModel.controller.apiChatItemsRead(
                     chatRh,
                     chatInfo.chatType,
                     chatInfo.apiId,
+                    chatInfo.groupChatScope(),
                     itemsIds
                   )
+                  if (updatedChatInfo != null) {
+                    chatModel.chatsContext.updateChatInfo(chatRh, updatedChatInfo)
+                  }
                 }
-                withReportsChatsIfOpen {
-                  markChatItemsRead(chatRh, chatInfo.id, itemsIds)
+                withContext(Dispatchers.Main) {
+                  chatModel.secondaryChatsContext.value?.markChatItemsRead(chatRh, chatInfo.id, itemsIds)
                 }
               }
             },
             markChatRead = {
               withBGApi {
-                withChats {
-                  // It's important to call it on Main thread. Otherwise, composable crash occurs from time-to-time without useful stacktrace
-                  withContext(Dispatchers.Main) {
-                    markChatItemsRead(chatRh, chatInfo.id)
-                  }
+                withContext(Dispatchers.Main) {
+                  chatModel.chatsContext.markChatItemsRead(chatRh, chatInfo.id)
                   ntfManager.cancelNotificationsForChat(chatInfo.id)
                   chatModel.controller.apiChatRead(
                     chatRh,
                     chatInfo.chatType,
-                    chatInfo.apiId
+                    chatInfo.apiId,
+                    chatInfo.groupChatScope()
                   )
                 }
-                withReportsChatsIfOpen {
-                  markChatItemsRead(chatRh, chatInfo.id)
+                withContext(Dispatchers.Main) {
+                  chatModel.secondaryChatsContext.value?.markChatItemsRead(chatRh, chatInfo.id)
                 }
               }
             },
             changeNtfsState = { enabled, currentValue -> toggleNotifications(chatRh, chatInfo, enabled, chatModel, currentValue) },
             onSearchValueChanged = onSearchValueChanged,
+            closeSearch = {
+              showSearch.value = false
+              searchText.value = ""
+            },
             onComposed,
             developerTools = chatModel.controller.appPrefs.developerTools.get(),
             showViaProxy = chatModel.controller.appPrefs.showSentViaProxy.get(),
@@ -614,13 +684,13 @@ fun ChatView(
       is ChatInfo.ContactConnection -> {
         val close = { chatModel.chatId.value = null }
           ModalView(close, showClose = appPlatform.isAndroid, content = {
-            ContactConnectionInfoView(chatModel, chatRh, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, false, close)
+            ContactConnectionInfoView(chatModel, chatRh, chatInfo.contactConnection.connLinkInv, chatInfo.contactConnection, false, close)
           })
           LaunchedEffect(chatInfo.id) {
             onComposed(chatInfo.id)
             ModalManager.end.closeModals()
-            withChats {
-              chatItems.clearAndNotify()
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.chatItems.clearAndNotify()
             }
           }
       }
@@ -632,8 +702,8 @@ fun ChatView(
           LaunchedEffect(chatInfo.id) {
             onComposed(chatInfo.id)
             ModalManager.end.closeModals()
-            withChats {
-              chatItems.clearAndNotify()
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.chatItems.clearAndNotify()
             }
           }
       }
@@ -658,13 +728,12 @@ fun startChatCall(remoteHostId: Long?, chatInfo: ChatInfo, media: CallMediaType)
 
 @Composable
 fun ChatLayout(
+  chatsCtx: ChatModel.ChatsContext,
   remoteHostId: State<Long?>,
   chatInfo: State<ChatInfo?>,
-  reversedChatItems: State<List<ChatItem>>,
   unreadCount: State<Int>,
   composeState: MutableState<ComposeState>,
-  composeView: (@Composable () -> Unit),
-  groupReports: State<GroupReports>,
+  composeView: (@Composable (FocusRequester?) -> Unit),
   scrollToItemId: MutableState<Long?>,
   attachmentOption: MutableState<AttachmentOption?>,
   attachmentBottomSheetState: ModalBottomSheetState,
@@ -674,11 +743,13 @@ fun ChatLayout(
   selectedChatItems: MutableState<Set<Long>?>,
   back: () -> Unit,
   info: () -> Unit,
-  showGroupReports: () -> Unit,
+  showReports: () -> Unit,
+  showSupportChats: () -> Unit,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
   loadMessages: suspend (ChatId, ChatPagination, visibleItemIndexesNonReversed: () -> IntRange) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
+  archiveReports: (List<Long>, Boolean) -> Unit,
   receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long, () -> Unit) -> Unit,
@@ -700,8 +771,9 @@ fun ChatLayout(
   openGroupLink: (GroupInfo) -> Unit,
   markItemsRead: (List<Long>) -> Unit,
   markChatRead: () -> Unit,
-  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
+  changeNtfsState: (MsgFilter, currentValue: MutableState<MsgFilter>) -> Unit,
   onSearchValueChanged: (String) -> Unit,
+  closeSearch: () -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
   developerTools: Boolean,
   showViaProxy: Boolean,
@@ -713,7 +785,7 @@ fun ChatLayout(
     Modifier
       .fillMaxWidth()
       .desktopOnExternalDrag(
-        enabled = remember(attachmentDisabled.value, chatInfo.value?.userCanSend) { mutableStateOf(!attachmentDisabled.value && chatInfo.value?.userCanSend == true) }.value,
+        enabled = remember(attachmentDisabled.value, chatInfo.value?.sendMsgEnabled) { mutableStateOf(!attachmentDisabled.value && chatInfo.value?.sendMsgEnabled == true) }.value,
         onFiles = { paths -> composeState.onFilesAttached(paths.map { it.toURI() }) },
         onImage = { file -> CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(listOf(file.toURI()), null) } },
         onText = {
@@ -735,29 +807,45 @@ fun ChatLayout(
       sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
     ) {
       val composeViewHeight = remember { mutableStateOf(0.dp) }
-      Box(Modifier.fillMaxSize().chatViewBackgroundModifier(MaterialTheme.colors, MaterialTheme.wallpaper, LocalAppBarHandler.current?.backgroundGraphicsLayerSize, LocalAppBarHandler.current?.backgroundGraphicsLayer, !groupReports.value.reportsView)) {
+      Box(Modifier.fillMaxSize().chatViewBackgroundModifier(MaterialTheme.colors, MaterialTheme.wallpaper, LocalAppBarHandler.current?.backgroundGraphicsLayerSize, LocalAppBarHandler.current?.backgroundGraphicsLayer, drawWallpaper = chatsCtx.secondaryContextFilter == null)) {
         val remoteHostId = remember { remoteHostId }.value
         val chatInfo = remember { chatInfo }.value
         val oneHandUI = remember { appPrefs.oneHandUI.state }
         val chatBottomBar = remember { appPrefs.chatBottomBar.state }
+        val composeViewFocusRequester = remember { if (appPlatform.isDesktop) FocusRequester() else null }
         AdaptingBottomPaddingLayout(Modifier, CHAT_COMPOSE_LAYOUT_ID, composeViewHeight) {
           if (chatInfo != null) {
-            Box(Modifier.fillMaxSize()) {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
               // disables scrolling to top of chat item on click inside the bubble
               CompositionLocalProvider(LocalBringIntoViewSpec provides object : BringIntoViewSpec {
                 override fun calculateScrollDistance(offset: Float, size: Float, containerSize: Float): Float = 0f
               }) {
                 ChatItemsList(
-                  remoteHostId, chatInfo, reversedChatItems, unreadCount, composeState, composeViewHeight, searchValue,
-                  useLinkPreviews, linkMode, groupReports, scrollToItemId, selectedChatItems, showMemberInfo, showChatInfo = info, loadMessages, deleteMessage, deleteMessages,
+                  chatsCtx, remoteHostId, chatInfo, unreadCount, composeState, composeViewHeight, searchValue,
+                  useLinkPreviews, linkMode, scrollToItemId, selectedChatItems, showMemberInfo, showChatInfo = info, loadMessages, deleteMessage, deleteMessages, archiveReports,
                   receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
                   updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-                  setReaction, showItemDetails, markItemsRead, markChatRead, remember { { onComposed(it) } }, developerTools, showViaProxy,
+                  setReaction, showItemDetails, markItemsRead, markChatRead, closeSearch, remember { { onComposed(it) } }, developerTools, showViaProxy,
                 )
               }
+              if (chatInfo is ChatInfo.Group && composeState.value.message.text.isNotEmpty()) {
+                Column(
+                  Modifier
+                    .align(Alignment.BottomStart)
+                    .padding(bottom = composeViewHeight.value)
+                ) {
+                  GroupMentions(
+                    chatsCtx = chatsCtx,
+                    rhId = remoteHostId,
+                    composeState = composeState,
+                    composeViewFocusRequester = composeViewFocusRequester,
+                    chatInfo = chatInfo,
+                  )
+                }
+              }
             }
           }
-          if (groupReports.value.reportsView) {
+          if (chatsCtx.contentTag == MsgContentTag.Report) {
             Column(
               Modifier
                 .layoutId(CHAT_COMPOSE_LAYOUT_ID)
@@ -767,8 +855,8 @@ fun ChatLayout(
             ) {
               AnimatedVisibility(selectedChatItems.value != null) {
                 if (chatInfo != null) {
-                  SelectedItemsBottomToolbar(
-                    reversedChatItems = reversedChatItems,
+                  SelectedItemsButtonsToolbar(
+                    chatsCtx = chatsCtx,
                     selectedChatItems = selectedChatItems,
                     chatInfo = chatInfo,
                     deleteItems = { _ ->
@@ -782,6 +870,7 @@ fun ChatLayout(
                         })
                       }
                     },
+                    archiveItems = { archiveItems(remoteHostId, chatInfo, selectedChatItems) },
                     moderateItems = {},
                     forwardItems = {}
                   )
@@ -801,45 +890,81 @@ fun ChatLayout(
                 .navigationBarsPadding()
                 .then(if (oneHandUI.value && chatBottomBar.value) Modifier.padding(bottom = AppBarHeight * fontSizeSqrtMultiplier) else Modifier)
             ) {
-              composeView()
+              composeView(composeViewFocusRequester)
             }
           }
         }
+        val reportsCount = reportsCount(chatInfo?.id)
+        val supportUnreadCount = supportUnreadCount(chatInfo?.id)
         if (oneHandUI.value && chatBottomBar.value) {
-          if (groupReports.value.showBar) {
-            ReportedCountToolbar(groupReports, withStatusBar = true, showGroupReports)
+          if (
+            chatInfo is ChatInfo.Group
+            && chatsCtx.secondaryContextFilter == null
+            && (reportsCount > 0 || supportUnreadCount > 0)
+          ) {
+            SupportChatsCountToolbar(chatInfo, reportsCount, supportUnreadCount, withStatusBar = true, showReports, showSupportChats)
           } else {
             StatusBarBackground()
           }
         } else {
           NavigationBarBackground(true, oneHandUI.value, noAlpha = true)
         }
-        if (groupReports.value.reportsView) {
-          if (oneHandUI.value) {
-            StatusBarBackground()
-          }
-          Column(if (oneHandUI.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
-            Box {
-              if (selectedChatItems.value == null) {
-                GroupReportsAppBar(groupReports, { ModalManager.end.closeModal() }, onSearchValueChanged)
-              } else {
-                SelectedItemsTopToolbar(selectedChatItems, !oneHandUI.value)
-              }
-            }
-          }
-        } else {
-          Column(if (oneHandUI.value && chatBottomBar.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
-            Box {
-              if (selectedChatItems.value == null) {
-                if (chatInfo != null) {
-                  ChatInfoToolbar(chatInfo, groupReports, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
+        when (chatsCtx.secondaryContextFilter) {
+          is SecondaryContextFilter.GroupChatScopeContext -> {
+            when (chatsCtx.secondaryContextFilter.groupScopeInfo) {
+              is GroupChatScopeInfo.MemberSupport -> {
+                if (oneHandUI.value) {
+                  StatusBarBackground()
+                }
+                Column(if (oneHandUI.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
+                  Box {
+                    if (selectedChatItems.value == null) {
+                      MemberSupportChatAppBar(chatsCtx, chatsCtx.secondaryContextFilter.groupScopeInfo.groupMember_, { ModalManager.end.closeModal() }, onSearchValueChanged)
+                    } else {
+                      SelectedItemsCounterToolbar(selectedChatItems, !oneHandUI.value)
+                    }
+                  }
                 }
-              } else {
-                SelectedItemsTopToolbar(selectedChatItems, !oneHandUI.value || !chatBottomBar.value)
               }
             }
-            if (groupReports.value.showBar && (!oneHandUI.value || !chatBottomBar.value)) {
-              ReportedCountToolbar(groupReports, withStatusBar = false, showGroupReports)
+          }
+          is SecondaryContextFilter.MsgContentTagContext -> {
+            when (chatsCtx.secondaryContextFilter.contentTag) {
+              MsgContentTag.Report -> {
+                if (oneHandUI.value) {
+                  StatusBarBackground()
+                }
+                Column(if (oneHandUI.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
+                  Box {
+                    if (selectedChatItems.value == null) {
+                      GroupReportsAppBar(chatsCtx, { ModalManager.end.closeModal() }, onSearchValueChanged)
+                    } else {
+                      SelectedItemsCounterToolbar(selectedChatItems, !oneHandUI.value)
+                    }
+                  }
+                }
+              }
+              else -> TODO()
+            }
+          }
+          null -> {
+            Column(if (oneHandUI.value && chatBottomBar.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
+              Box {
+                if (selectedChatItems.value == null) {
+                  if (chatInfo != null) {
+                    ChatInfoToolbar(chatsCtx, chatInfo, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
+                  }
+                } else {
+                  SelectedItemsCounterToolbar(selectedChatItems, !oneHandUI.value || !chatBottomBar.value)
+                }
+              }
+              if (
+                chatInfo is ChatInfo.Group
+                && (reportsCount > 0 || supportUnreadCount > 0)
+                && (!oneHandUI.value || !chatBottomBar.value)
+              ) {
+                SupportChatsCountToolbar(chatInfo, reportsCount, supportUnreadCount, withStatusBar = false, showReports, showSupportChats)
+              }
             }
           }
         }
@@ -850,15 +975,15 @@ fun ChatLayout(
 
 @Composable
 fun BoxScope.ChatInfoToolbar(
+  chatsCtx: ChatModel.ChatsContext,
   chatInfo: ChatInfo,
-  groupReports: State<GroupReports>,
   back: () -> Unit,
   info: () -> Unit,
   startCall: (CallMediaType) -> Unit,
   endCall: () -> Unit,
   addMembers: (GroupInfo) -> Unit,
   openGroupLink: (GroupInfo) -> Unit,
-  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
+  changeNtfsState: (MsgFilter, currentValue: MutableState<MsgFilter>) -> Unit,
   onSearchValueChanged: (String) -> Unit,
   showSearch: MutableState<Boolean>
 ) {
@@ -873,7 +998,7 @@ fun BoxScope.ChatInfoToolbar(
       showSearch.value = false
     }
   }
-  if (appPlatform.isAndroid && !groupReports.value.reportsView) {
+  if (appPlatform.isAndroid && chatsCtx.secondaryContextFilter == null) {
     BackHandler(onBack = onBackClicked)
   }
   val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
@@ -977,18 +1102,20 @@ fun BoxScope.ChatInfoToolbar(
     }
   }
 
-  if ((chatInfo is ChatInfo.Direct && chatInfo.contact.ready && chatInfo.contact.active) || chatInfo is ChatInfo.Group) {
-    val ntfsEnabled = remember { mutableStateOf(chatInfo.ntfsEnabled) }
+  val enableNtfs = chatInfo.chatSettings?.enableNtfs
+  if (((chatInfo is ChatInfo.Direct && chatInfo.contact.ready && chatInfo.contact.active) || chatInfo is ChatInfo.Group) && enableNtfs != null) {
+    val ntfMode = remember { mutableStateOf(enableNtfs) }
+    val nextNtfMode by remember { derivedStateOf { ntfMode.value.nextMode(chatInfo.hasMentions) } }
     menuItems.add {
       ItemAction(
-        if (ntfsEnabled.value) stringResource(MR.strings.mute_chat) else stringResource(MR.strings.unmute_chat),
-        if (ntfsEnabled.value) painterResource(MR.images.ic_notifications_off) else painterResource(MR.images.ic_notifications),
+        stringResource(nextNtfMode.text(chatInfo.hasMentions)),
+        painterResource(nextNtfMode.icon),
         onClick = {
           showMenu.value = false
           // Just to make a delay before changing state of ntfsEnabled, otherwise it will redraw menu item with new value before closing the menu
           scope.launch {
             delay(200)
-            changeNtfsState(!ntfsEnabled.value, ntfsEnabled)
+            changeNtfsState(nextNtfMode, ntfMode)
           }
         }
       )
@@ -1068,34 +1195,79 @@ fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Colo
 }
 
 @Composable
-private fun ReportedCountToolbar(
-  groupReports: State<GroupReports>,
+private fun SupportChatsCountToolbar(
+  chatInfo: ChatInfo,
+  reportsCount: Int,
+  supportUnreadCount: Int,
   withStatusBar: Boolean,
-  showGroupReports: () -> Unit
+  showReports: () -> Unit,
+  showSupportChats: () -> Unit
 ) {
   Box {
     val statusBarPadding = if (withStatusBar) WindowInsets.statusBars.asPaddingValues().calculateTopPadding() else 0.dp
     Row(
       Modifier
-        .fillMaxWidth()
-        .height(AppBarHeight * fontSizeSqrtMultiplier + statusBarPadding)
-        .background(MaterialTheme.colors.background)
-        .clickable(onClick = showGroupReports)
-        .padding(top = statusBarPadding),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.Center
+        .fillMaxWidth(),
+      horizontalArrangement = Arrangement.SpaceEvenly,
     ) {
-      Icon(painterResource(MR.images.ic_flag), null, Modifier.size(22.dp), tint = MaterialTheme.colors.error)
-      Spacer(Modifier.width(4.dp))
-      val reports = groupReports.value.reportsCount
-      Text(
-        if (reports == 1) {
-          stringResource(MR.strings.group_reports_active_one)
-        } else {
-          stringResource(MR.strings.group_reports_active).format(reports)
-        },
-        style = MaterialTheme.typography.button
-      )
+      if (
+        chatInfo is ChatInfo.Group
+        && chatInfo.groupInfo.canModerate
+        && reportsCount > 0
+      ) {
+        Row(
+          Modifier
+            .fillMaxWidth()
+            .weight(1F)
+            .height(AppBarHeight * fontSizeSqrtMultiplier + statusBarPadding)
+            .background(MaterialTheme.colors.background)
+            .clickable(onClick = showReports)
+            .padding(top = statusBarPadding),
+          verticalAlignment = Alignment.CenterVertically,
+          horizontalArrangement = Arrangement.Center
+        ) {
+          Icon(painterResource(MR.images.ic_flag), null, Modifier.size(22.dp), tint = MaterialTheme.colors.error)
+          Spacer(Modifier.width(4.dp))
+          Text(
+            if (reportsCount == 1) {
+              stringResource(MR.strings.group_reports_active_one)
+            } else {
+              stringResource(MR.strings.group_reports_active).format(reportsCount)
+            },
+            style = MaterialTheme.typography.button
+          )
+        }
+      }
+
+      if (supportUnreadCount > 0) {
+        Row(
+          Modifier
+            .fillMaxWidth()
+            .weight(1F)
+            .height(AppBarHeight * fontSizeSqrtMultiplier + statusBarPadding)
+            .background(MaterialTheme.colors.background)
+            .clickable(onClick = showSupportChats)
+            .padding(top = statusBarPadding),
+          verticalAlignment = Alignment.CenterVertically,
+          horizontalArrangement = Arrangement.Center
+        ) {
+          Icon(painterResource(MR.images.ic_flag), null, Modifier.size(22.dp), tint = MaterialTheme.colors.primary)
+          Spacer(Modifier.width(4.dp))
+          Text(
+            if (chatInfo is ChatInfo.Group && chatInfo.groupInfo.canModerate) {
+              if (appPlatform.isAndroid)
+                stringResource(MR.strings.group_new_support_chats_short).format(supportUnreadCount)
+              else if (supportUnreadCount == 1)
+                stringResource(MR.strings.group_new_support_chat_one)
+              else
+                stringResource(MR.strings.group_new_support_chats).format(supportUnreadCount)
+            } else {
+              stringResource(MR.strings.group_new_support_messages).format(supportUnreadCount)
+            },
+            style = MaterialTheme.typography.button
+          )
+        }
+      }
     }
     Divider(Modifier.align(Alignment.BottomStart))
   }
@@ -1106,21 +1278,20 @@ private fun ContactVerifiedShield() {
   Icon(painterResource(MR.images.ic_verified_user), null, Modifier.size(18.dp * fontSizeSqrtMultiplier).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
 }
 
-/** Saves current scroll position when [GroupReports] are open and user opens [ChatItemInfoView], for example, and goes back */
+/** Saves current scroll position when group reports are open and user opens [ChatItemInfoView], for example, and goes back */
 private var reportsListState: LazyListState? = null
 
 @Composable
 fun BoxScope.ChatItemsList(
+  chatsCtx: ChatModel.ChatsContext,
   remoteHostId: Long?,
   chatInfo: ChatInfo,
-  reversedChatItems: State<List<ChatItem>>,
   unreadCount: State<Int>,
   composeState: MutableState<ComposeState>,
   composeViewHeight: State<Dp>,
   searchValue: State<String>,
   useLinkPreviews: Boolean,
   linkMode: SimplexLinkMode,
-  groupReports: State<GroupReports>,
   scrollToItemId: MutableState<Long?>,
   selectedChatItems: MutableState<Set<Long>?>,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
@@ -1128,6 +1299,7 @@ fun BoxScope.ChatItemsList(
   loadMessages: suspend (ChatId, ChatPagination, visibleItemIndexesNonReversed: () -> IntRange) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
+  archiveReports: (List<Long>, Boolean) -> Unit,
   receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long, () -> Unit) -> Unit,
@@ -1145,33 +1317,80 @@ fun BoxScope.ChatItemsList(
   showItemDetails: (ChatInfo, ChatItem) -> Unit,
   markItemsRead: (List<Long>) -> Unit,
   markChatRead: () -> Unit,
+  closeSearch: () -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
   developerTools: Boolean,
   showViaProxy: Boolean
 ) {
+  val loadingTopItems = remember { mutableStateOf(false) }
+  val loadingBottomItems = remember { mutableStateOf(false) }
+  // just for changing local var here based on request
+  val loadMessages: suspend (ChatId, ChatPagination, visibleItemIndexesNonReversed: () -> IntRange) -> Unit = { chatId, pagination, visibleItemIndexesNonReversed ->
+    val loadingSide = when (pagination) {
+      is ChatPagination.Before -> loadingTopItems
+      is ChatPagination.Last -> loadingBottomItems
+      is ChatPagination.After, is ChatPagination.Around, is ChatPagination.Initial -> null
+    }
+    loadingSide?.value = true
+    try {
+      loadMessages(chatId, pagination, visibleItemIndexesNonReversed)
+    } finally {
+      loadingSide?.value = false
+    }
+  }
   val searchValueIsEmpty = remember { derivedStateOf { searchValue.value.isEmpty() } }
+  val searchValueIsNotBlank = remember { derivedStateOf { searchValue.value.isNotBlank() } }
   val revealedItems = rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(setOf<Long>()) }
-  val mergedItems = remember { derivedStateOf { MergedItems.create(reversedChatItems.value, unreadCount, revealedItems.value, chatModel.chatStateForContent(groupReports.value.contentTag)) } }
-  val topPaddingToContentPx = rememberUpdatedState(with(LocalDensity.current) { topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar).roundToPx() })
+  // not using reversedChatItems inside to prevent possible derivedState bug in Compose when one derived state access can cause crash asking another derived state
+  val mergedItems = remember {
+    derivedStateOf {
+      MergedItems.create(chatsCtx.chatItems.value.asReversed(), unreadCount, revealedItems.value, chatsCtx.chatState)
+    }
+  }
+  val reversedChatItems = remember { derivedStateOf { chatsCtx.chatItems.value.asReversed() } }
+  val reportsCount = reportsCount(chatInfo.id)
+  val supportUnreadCount = supportUnreadCount(chatInfo.id)
+  val topPaddingToContent = topPaddingToContent(
+    chatView = chatsCtx.secondaryContextFilter == null,
+    additionalTopBar = chatsCtx.secondaryContextFilter == null && (reportsCount > 0 || supportUnreadCount > 0)
+  )
+  val topPaddingToContentPx = rememberUpdatedState(with(LocalDensity.current) { topPaddingToContent.roundToPx() })
+  val numberOfBottomAppBars = numberOfBottomAppBars()
+
   /** determines height based on window info and static height of two AppBars. It's needed because in the first graphic frame height of
    * [composeViewHeight] is unknown, but we need to set scroll position for unread messages already so it will be correct before the first frame appears
    * */
   val maxHeightForList = rememberUpdatedState(
-    with(LocalDensity.current) { LocalWindowHeight().roundToPx() - topPaddingToContentPx.value - (AppBarHeight * fontSizeSqrtMultiplier * 2).roundToPx() }
+    with(LocalDensity.current) { LocalWindowHeight().roundToPx() - topPaddingToContentPx.value - (AppBarHeight * fontSizeSqrtMultiplier * numberOfBottomAppBars).roundToPx() }
   )
-  val listState = rememberUpdatedState(rememberSaveable(chatInfo.id, searchValueIsEmpty.value, saver = LazyListState.Saver) {
-    val index = mergedItems.value.items.indexOfLast { it.hasUnread() }
+  val resetListState = remember { mutableStateOf(false) }
+  remember(chatModel.openAroundItemId.value) {
+    if (chatModel.openAroundItemId.value != null) {
+      closeSearch()
+      resetListState.value = !resetListState.value
+    }
+  }
+  val highlightedItems = remember { mutableStateOf(setOf<Long>()) }
+  val hoveredItemId = remember { mutableStateOf(null as Long?) }
+  val listState = rememberUpdatedState(rememberSaveable(chatInfo.id, searchValueIsEmpty.value, resetListState.value, saver = LazyListState.Saver) {
+    val openAroundItemId = chatModel.openAroundItemId.value
+    val index = mergedItems.value.indexInParentItems[openAroundItemId] ?: mergedItems.value.items.indexOfLast { it.hasUnread() }
     val reportsState = reportsListState
+    if (openAroundItemId != null) {
+      highlightedItems.value += openAroundItemId
+      chatModel.openAroundItemId.value = null
+    }
+    hoveredItemId.value = null
     if (reportsState != null) {
       reportsListState = null
       reportsState
-    } else if (index <= 0) {
+    } else if (index <= 0 || !searchValueIsEmpty.value) {
       LazyListState(0, 0)
     } else {
       LazyListState(index + 1, -maxHeightForList.value)
     }
   })
-  SaveReportsStateOnDispose(groupReports, listState)
+  SaveReportsStateOnDispose(chatsCtx, listState)
   val maxHeight = remember { derivedStateOf { listState.value.layoutInfo.viewportEndOffset - topPaddingToContentPx.value } }
   val loadingMoreItems = remember { mutableStateOf(false) }
   val animatedScrollingInProgress = remember { mutableStateOf(false) }
@@ -1180,305 +1399,298 @@ fun BoxScope.ChatItemsList(
     if (searchValueIsEmpty.value && reversedChatItems.value.size < ChatPagination.INITIAL_COUNT)
       ignoreLoadingRequests.add(reversedChatItems.value.lastOrNull()?.id ?: return@LaunchedEffect)
   }
-  if (!loadingMoreItems.value) {
-    PreloadItems(chatInfo.id, if (searchValueIsEmpty.value) ignoreLoadingRequests else mutableSetOf(), reversedChatItems, mergedItems, listState, ChatPagination.UNTIL_PRELOAD_COUNT) { chatId, pagination ->
-      if (loadingMoreItems.value) return@PreloadItems false
+  PreloadItems(chatsCtx, chatInfo.id, if (searchValueIsEmpty.value) ignoreLoadingRequests else mutableSetOf(), loadingMoreItems, resetListState, mergedItems, listState, ChatPagination.UNTIL_PRELOAD_COUNT) { chatId, pagination ->
+    if (loadingMoreItems.value || chatId != chatModel.chatId.value) return@PreloadItems false
+    loadingMoreItems.value = true
+    withContext(NonCancellable) {
       try {
-        loadingMoreItems.value = true
         loadMessages(chatId, pagination) {
           visibleItemIndexesNonReversed(mergedItems, reversedChatItems.value.size, listState.value)
         }
       } finally {
         loadingMoreItems.value = false
       }
-      true
     }
+    true
   }
-
   val remoteHostIdUpdated = rememberUpdatedState(remoteHostId)
   val chatInfoUpdated = rememberUpdatedState(chatInfo)
-  val highlightedItems = remember { mutableStateOf(setOf<Long>()) }
   val scope = rememberCoroutineScope()
   val scrollToItem: (Long) -> Unit = remember {
-    // In group reports just set the itemId to scroll to so the main ChatView will handle scrolling
-    if (groupReports.value.reportsView) return@remember { scrollToItemId.value = it }
     scrollToItem(searchValue, loadingMoreItems, animatedScrollingInProgress, highlightedItems, chatInfoUpdated, maxHeight, scope, reversedChatItems, mergedItems, listState, loadMessages)
   }
-  val scrollToQuotedItemFromItem: (Long) -> Unit = remember { findQuotedItemFromItem(remoteHostIdUpdated, chatInfoUpdated, scope, scrollToItem, groupReports.value.contentTag) }
-  if (!groupReports.value.reportsView) {
-    LaunchedEffect(Unit) { snapshotFlow { scrollToItemId.value }.filterNotNull().collect {
-      if (appPlatform.isAndroid) {
-        ModalManager.end.closeModals()
+  val scrollToQuotedItemFromItem: (Long) -> Unit = remember { findQuotedItemFromItem(chatsCtx, remoteHostIdUpdated, chatInfoUpdated, scope, scrollToItem, scrollToItemId) }
+  if (chatsCtx.secondaryContextFilter == null) {
+    LaunchedEffect(Unit) {
+      snapshotFlow { scrollToItemId.value }.filterNotNull().collect {
+        if (appPlatform.isAndroid) {
+          ModalManager.end.closeModals()
+        }
+        scrollToItem(it)
+        scrollToItemId.value = null
       }
-      scrollToItem(it)
-      scrollToItemId.value = null }
     }
   }
-  LoadLastItems(loadingMoreItems, remoteHostId, chatInfo, groupReports)
   SmallScrollOnNewMessage(listState, reversedChatItems)
   val finishedInitialComposition = remember { mutableStateOf(false) }
   NotifyChatListOnFinishingComposition(finishedInitialComposition, chatInfo, revealedItems, listState, onComposed)
 
   DisposableEffectOnGone(
-    always = {
-      chatModel.setChatItemsChangeListenerForContent(recalculateChatStatePositions(chatModel.chatStateForContent(groupReports.value.contentTag)), groupReports.value.contentTag)
-    },
     whenGone = {
       VideoPlayerHolder.releaseAll()
-      chatModel.setChatItemsChangeListenerForContent(recalculateChatStatePositions(chatModel.chatStateForContent(groupReports.value.contentTag)), groupReports.value.contentTag)
     }
   )
 
-    @Composable
-    fun ChatViewListItem(
-      itemAtZeroIndexInWholeList: Boolean,
-      range: State<IntRange?>,
-      showAvatar: Boolean,
-      cItem: ChatItem,
-      itemSeparation: ItemSeparation,
-      previousItemSeparationLargeGap: Boolean,
-      revealed: State<Boolean>,
-      reveal: (Boolean) -> Unit
+  @Composable
+  fun ChatViewListItem(
+    itemAtZeroIndexInWholeList: Boolean,
+    range: State<IntRange?>,
+    showAvatar: Boolean,
+    cItem: ChatItem,
+    itemSeparation: ItemSeparation,
+    previousItemSeparationLargeGap: Boolean,
+    revealed: State<Boolean>,
+    reveal: (Boolean) -> Unit
+  ) {
+    val itemScope = rememberCoroutineScope()
+    CompositionLocalProvider(
+      // Makes horizontal and vertical scrolling to coexist nicely.
+      // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
+      LocalViewConfiguration provides LocalViewConfiguration.current.bigTouchSlop()
     ) {
-      val itemScope = rememberCoroutineScope()
-      CompositionLocalProvider(
-        // Makes horizontal and vertical scrolling to coexist nicely.
-        // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
-        LocalViewConfiguration provides LocalViewConfiguration.current.bigTouchSlop()
-      ) {
-        val provider = {
-          providerForGallery(reversedChatItems.value.asReversed(), cItem.id) { indexInReversed ->
+      val provider = {
+        providerForGallery(reversedChatItems.value.asReversed(), cItem.id) { indexInReversed ->
+          itemScope.launch {
+            listState.value.scrollToItem(
+              min(reversedChatItems.value.lastIndex, indexInReversed + 1),
+              -maxHeight.value
+            )
+          }
+        }
+      }
+
+      @Composable
+      fun ChatItemViewShortHand(cItem: ChatItem, itemSeparation: ItemSeparation, range: State<IntRange?>, fillMaxWidth: Boolean = true) {
+        tryOrShowError("${cItem.id}ChatItem", error = {
+          CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
+        }) {
+          val highlighted = remember { derivedStateOf { highlightedItems.value.contains(cItem.id) } }
+          LaunchedEffect(Unit) {
+            snapshotFlow { highlighted.value }
+              .distinctUntilChanged()
+              .filter { it }
+              .collect {
+                delay(500)
+                highlightedItems.value = setOf()
+              }
+          }
+          ChatItemView(chatsCtx, remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, hoveredItemId = hoveredItemId, range = range, searchIsNotBlank = searchValueIsNotBlank, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems, reversedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, archiveReports = archiveReports, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToItemId = scrollToItemId, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, showChatInfo = showChatInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
+        }
+      }
+
+      @Composable
+      fun ChatItemView(cItem: ChatItem, range: State<IntRange?>, itemSeparation: ItemSeparation, previousItemSeparationLargeGap: Boolean) {
+        val dismissState = rememberDismissState(initialValue = DismissValue.Default) {
+          if (it == DismissValue.DismissedToStart) {
             itemScope.launch {
-              listState.value.scrollToItem(
-                min(reversedChatItems.value.lastIndex, indexInReversed + 1),
-                -maxHeight.value
-              )
-            }
-          }
-        }
-
-        @Composable
-        fun ChatItemViewShortHand(cItem: ChatItem, itemSeparation: ItemSeparation, range: State<IntRange?>, fillMaxWidth: Boolean = true) {
-          tryOrShowError("${cItem.id}ChatItem", error = {
-            CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
-          }) {
-            val highlighted = remember { derivedStateOf { highlightedItems.value.contains(cItem.id) } }
-            LaunchedEffect(Unit) {
-              snapshotFlow { highlighted.value }
-                .distinctUntilChanged()
-                .filter { it }
-                .collect {
-                  delay(500)
-                  highlightedItems.value = setOf()
-                }
-            }
-            ChatItemView(remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, range = range, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems, reversedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, showChatInfo = showChatInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
-          }
-        }
-
-        @Composable
-        fun ChatItemView(cItem: ChatItem, range: State<IntRange?>, itemSeparation: ItemSeparation, previousItemSeparationLargeGap: Boolean) {
-          val dismissState = rememberDismissState(initialValue = DismissValue.Default) {
-            if (it == DismissValue.DismissedToStart) {
-              itemScope.launch {
-                if ((cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) && chatInfo !is ChatInfo.Local && !cItem.isReport) {
-                  if (composeState.value.editing) {
-                    composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-                  } else if (cItem.id != ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
-                    composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-                  }
+              if ((cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) && chatInfo !is ChatInfo.Local && !cItem.isReport) {
+                if (composeState.value.editing) {
+                  composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+                } else if (cItem.id != ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+                  composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
                 }
               }
             }
-            false
           }
-          val swipeableModifier = SwipeToDismissModifier(
-            state = dismissState,
-            directions = setOf(DismissDirection.EndToStart),
-            swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
-          )
-          val sent = cItem.chatDir.sent
+          false
+        }
+        val swipeableModifier = SwipeToDismissModifier(
+          state = dismissState,
+          directions = setOf(DismissDirection.EndToStart),
+          swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
+        )
+        val sent = cItem.chatDir.sent
 
-          @Composable
-          fun ChatItemBox(modifier: Modifier = Modifier, content: @Composable () -> Unit = { }) {
-            Box(
-              modifier = modifier.padding(
-                bottom = if (itemSeparation.largeGap) {
-                  if (itemAtZeroIndexInWholeList) {
-                    8.dp
-                  } else {
-                    4.dp
-                  }
-                } else 1.dp, top = if (previousItemSeparationLargeGap) 4.dp else 1.dp
-              ),
-              contentAlignment = Alignment.CenterStart
-            ) {
-              content()
-            }
+        @Composable
+        fun ChatItemBox(modifier: Modifier = Modifier, content: @Composable () -> Unit = { }) {
+          Box(
+            modifier = modifier.padding(
+              bottom = if (itemSeparation.largeGap) {
+                if (itemAtZeroIndexInWholeList) {
+                  8.dp
+                } else {
+                  4.dp
+                }
+              } else 1.dp, top = if (previousItemSeparationLargeGap) 4.dp else 1.dp
+            ),
+            contentAlignment = Alignment.CenterStart
+          ) {
+            content()
           }
+        }
 
-          @Composable
-          fun adjustTailPaddingOffset(originalPadding: Dp, start: Boolean): Dp {
-            val chatItemTail = remember { appPreferences.chatItemTail.state }
-            val style = shapeStyle(cItem, chatItemTail.value, itemSeparation.largeGap, true)
-            val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
+        @Composable
+        fun adjustTailPaddingOffset(originalPadding: Dp, start: Boolean): Dp {
+          val chatItemTail = remember { appPreferences.chatItemTail.state }
+          val style = shapeStyle(cItem, chatItemTail.value, itemSeparation.largeGap, true)
+          val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
 
-            return originalPadding + (if (tailRendered) 0.dp else if (start) msgTailWidthDp * 2 else msgTailWidthDp)
-          }
+          return originalPadding + (if (tailRendered) 0.dp else if (start) msgTailWidthDp * 2 else msgTailWidthDp)
+        }
+
+        Box {
+          val voiceWithTransparentBack = cItem.content.msgContent is MsgContent.MCVoice && cItem.content.text.isEmpty() && cItem.quotedItem == null && cItem.meta.itemForwarded == null
+          val selectionVisible = selectedChatItems.value != null && cItem.canBeDeletedForSelf
+          val selectionOffset by animateDpAsState(if (selectionVisible && !sent) 4.dp + 22.dp * fontSizeMultiplier else 0.dp)
+          val swipeableOrSelectionModifier = (if (selectionVisible) Modifier else swipeableModifier).graphicsLayer { translationX = selectionOffset.toPx() }
+          if (chatInfo is ChatInfo.Group) {
+            if (cItem.chatDir is CIDirection.GroupRcv) {
+              if (showAvatar) {
+                Column(
+                  Modifier
+                    .padding(top = 8.dp)
+                    .padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(66.dp, start = false))
+                    .fillMaxWidth()
+                    .then(swipeableModifier),
+                  verticalArrangement = Arrangement.spacedBy(4.dp),
+                  horizontalAlignment = Alignment.Start
+                ) {
+                  @Composable
+                  fun MemberNameAndRole(range: State<IntRange?>) {
+                    Row(Modifier.padding(bottom = 2.dp).graphicsLayer { translationX = selectionOffset.toPx() }, horizontalArrangement = Arrangement.SpaceBetween) {
+                      val member = cItem.chatDir.groupMember
+                      val rangeValue = range.value
+                      val (prevMember, memCount) =
+                        if (rangeValue != null) {
+                          chatModel.getPrevHiddenMember(member, rangeValue, reversedChatItems.value)
+                        } else {
+                          null to 1
+                        }
+                      Text(
+                        memberNames(member, prevMember, memCount),
+                        Modifier
+                          .padding(start = (MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier) + DEFAULT_PADDING_HALF)
+                          .weight(1f, false),
+                        fontSize = 13.5.sp,
+                        color = MaterialTheme.colors.secondary,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                      )
+                      if (memCount == 1 && member.memberRole > GroupMemberRole.Member) {
+                        val chatItemTail = remember { appPreferences.chatItemTail.state }
+                        val style = shapeStyle(cItem, chatItemTail.value, itemSeparation.largeGap, true)
+                        val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
 
-          Box {
-            val voiceWithTransparentBack = cItem.content.msgContent is MsgContent.MCVoice && cItem.content.text.isEmpty() && cItem.quotedItem == null && cItem.meta.itemForwarded == null
-            val selectionVisible = selectedChatItems.value != null && cItem.canBeDeletedForSelf
-            val selectionOffset by animateDpAsState(if (selectionVisible && !sent) 4.dp + 22.dp * fontSizeMultiplier else 0.dp)
-            val swipeableOrSelectionModifier = (if (selectionVisible) Modifier else swipeableModifier).graphicsLayer { translationX = selectionOffset.toPx() }
-            if (chatInfo is ChatInfo.Group) {
-              if (cItem.chatDir is CIDirection.GroupRcv) {
-                if (showAvatar) {
-                  Column(
-                    Modifier
-                      .padding(top = 8.dp)
-                      .padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(66.dp, start = false))
-                      .fillMaxWidth()
-                      .then(swipeableModifier),
-                    verticalArrangement = Arrangement.spacedBy(4.dp),
-                    horizontalAlignment = Alignment.Start
-                  ) {
-                    @Composable
-                    fun MemberNameAndRole(range: State<IntRange?>) {
-                      Row(Modifier.padding(bottom = 2.dp).graphicsLayer { translationX = selectionOffset.toPx() }, horizontalArrangement = Arrangement.SpaceBetween) {
-                        val member = cItem.chatDir.groupMember
-                        val rangeValue = range.value
-                        val (prevMember, memCount) =
-                          if (rangeValue != null) {
-                            chatModel.getPrevHiddenMember(member, rangeValue, reversedChatItems.value)
-                          } else {
-                            null to 1
-                          }
                         Text(
-                          memberNames(member, prevMember, memCount),
-                          Modifier
-                            .padding(start = (MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier) + DEFAULT_PADDING_HALF)
-                            .weight(1f, false),
+                          member.memberRole.text,
+                          Modifier.padding(start = DEFAULT_PADDING_HALF * 1.5f, end = DEFAULT_PADDING_HALF + if (tailRendered) msgTailWidthDp else 0.dp),
                           fontSize = 13.5.sp,
+                          fontWeight = FontWeight.Medium,
                           color = MaterialTheme.colors.secondary,
-                          overflow = TextOverflow.Ellipsis,
                           maxLines = 1
                         )
-                        if (memCount == 1 && member.memberRole > GroupMemberRole.Member) {
-                          val chatItemTail = remember { appPreferences.chatItemTail.state }
-                          val style = shapeStyle(cItem, chatItemTail.value, itemSeparation.largeGap, true)
-                          val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
-
-                          Text(
-                            member.memberRole.text,
-                            Modifier.padding(start = DEFAULT_PADDING_HALF * 1.5f, end = DEFAULT_PADDING_HALF + if (tailRendered) msgTailWidthDp else 0.dp),
-                            fontSize = 13.5.sp,
-                            fontWeight = FontWeight.Medium,
-                            color = MaterialTheme.colors.secondary,
-                            maxLines = 1
-                          )
-                        }
                       }
                     }
-
-                    @Composable
-                    fun Item() {
-                      ChatItemBox(Modifier.layoutId(CHAT_BUBBLE_LAYOUT_ID)) {
-                        androidx.compose.animation.AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
-                          SelectedChatItem(Modifier, cItem.id, selectedChatItems)
-                        }
-                        Row(Modifier.graphicsLayer { translationX = selectionOffset.toPx() }) {
-                          val member = cItem.chatDir.groupMember
-                          Box(Modifier.clickable { showMemberInfo(chatInfo.groupInfo, member) }) {
-                            MemberImage(member)
-                          }
-                          Box(modifier = Modifier.padding(top = 2.dp, start = 4.dp).chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)) {
-                            ChatItemViewShortHand(cItem, itemSeparation, range, false)
-                          }
-                        }
-                      }
-                    }
-                    if (cItem.content.showMemberName) {
-                      DependentLayout(Modifier, CHAT_BUBBLE_LAYOUT_ID) {
-                        MemberNameAndRole(range)
-                        Item()
-                      }
-                    } else {
-                      Item()
-                    }
                   }
-                } else {
-                  ChatItemBox {
-                    AnimatedVisibility (selectionVisible, enter = fadeIn(), exit = fadeOut()) {
-                      SelectedChatItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
+
+                  @Composable
+                  fun Item() {
+                    ChatItemBox(Modifier.layoutId(CHAT_BUBBLE_LAYOUT_ID)) {
+                      androidx.compose.animation.AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
+                        SelectedListItem(Modifier, cItem.id, selectedChatItems)
+                      }
+                      Row(Modifier.graphicsLayer { translationX = selectionOffset.toPx() }) {
+                        val member = cItem.chatDir.groupMember
+                        Box(Modifier.clickable { showMemberInfo(chatInfo.groupInfo, member) }) {
+                          MemberImage(member)
+                        }
+                        Box(modifier = Modifier.padding(top = 2.dp, start = 4.dp).chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)) {
+                          ChatItemViewShortHand(cItem, itemSeparation, range, false)
+                        }
+                      }
                     }
-                    Row(
-                      Modifier
-                        .padding(start = 8.dp + (MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier) + 4.dp, end = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(66.dp, start = false))
-                        .chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)
-                        .then(swipeableOrSelectionModifier)
-                    ) {
-                      ChatItemViewShortHand(cItem, itemSeparation, range)
+                  }
+                  if (cItem.content.showMemberName) {
+                    DependentLayout(Modifier, CHAT_BUBBLE_LAYOUT_ID) {
+                      MemberNameAndRole(range)
+                      Item()
                     }
+                  } else {
+                    Item()
                   }
                 }
               } else {
                 ChatItemBox {
-                  AnimatedVisibility (selectionVisible, enter = fadeIn(), exit = fadeOut()) {
-                    SelectedChatItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
+                  AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
+                    SelectedListItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
                   }
-                  Box(
+                  Row(
                     Modifier
-                      .padding(start = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(104.dp, start = true), end = 12.dp)
+                      .padding(start = 8.dp + (MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier) + 4.dp, end = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(66.dp, start = false))
                       .chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)
-                      .then(if (selectionVisible) Modifier else swipeableModifier)
+                      .then(swipeableOrSelectionModifier)
                   ) {
                     ChatItemViewShortHand(cItem, itemSeparation, range)
                   }
                 }
               }
-            } else { // direct message
+            } else {
               ChatItemBox {
-                AnimatedVisibility (selectionVisible, enter = fadeIn(), exit = fadeOut()) {
-                  SelectedChatItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
+                AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
+                  SelectedListItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
                 }
-
                 Box(
-                  Modifier.padding(
-                    start = if (sent && !voiceWithTransparentBack) adjustTailPaddingOffset(76.dp, start = true) else 12.dp,
-                    end = if (sent || voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(76.dp, start = false),
-                  )
+                  Modifier
+                    .padding(start = if (voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(104.dp, start = true), end = 12.dp)
                     .chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)
-                    .then(if (!selectionVisible || !sent) swipeableOrSelectionModifier else Modifier)
+                    .then(if (selectionVisible) Modifier else swipeableModifier)
                 ) {
                   ChatItemViewShortHand(cItem, itemSeparation, range)
                 }
               }
             }
-            if (selectionVisible) {
-              Box(Modifier.matchParentSize().clickable {
-                val checked = selectedChatItems.value?.contains(cItem.id) == true
-                selectUnselectChatItem(select = !checked, cItem, revealed, selectedChatItems, reversedChatItems)
-              })
+          } else { // direct message
+            ChatItemBox {
+              AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
+                SelectedListItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
+              }
+
+              Box(
+                Modifier.padding(
+                  start = if (sent && !voiceWithTransparentBack) adjustTailPaddingOffset(76.dp, start = true) else 12.dp,
+                  end = if (sent || voiceWithTransparentBack) 12.dp else adjustTailPaddingOffset(76.dp, start = false),
+                )
+                  .chatItemOffset(cItem, itemSeparation.largeGap, revealed = revealed.value)
+                  .then(if (!selectionVisible || !sent) swipeableOrSelectionModifier else Modifier)
+              ) {
+                ChatItemViewShortHand(cItem, itemSeparation, range)
+              }
             }
           }
+          if (selectionVisible) {
+            Box(Modifier.matchParentSize().clickable {
+              val checked = selectedChatItems.value?.contains(cItem.id) == true
+              selectUnselectChatItem(select = !checked, cItem, revealed, selectedChatItems, reversedChatItems)
+            })
+          }
         }
-        if (itemSeparation.date != null) {
-          DateSeparator(itemSeparation.date)
-        }
-        ChatItemView(cItem, range, itemSeparation, previousItemSeparationLargeGap)
       }
+      if (itemSeparation.date != null) {
+        DateSeparator(itemSeparation.date)
+      }
+      ChatItemView(cItem, range, itemSeparation, previousItemSeparationLargeGap)
     }
+  }
   LazyColumnWithScrollBar(
     Modifier.align(Alignment.BottomCenter),
     state = listState.value,
     contentPadding = PaddingValues(
-      top = topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar),
+      top = topPaddingToContent,
       bottom = composeViewHeight.value
     ),
     reverseLayout = true,
     additionalBarOffset = composeViewHeight,
-    additionalTopBar = remember { derivedStateOf { groupReports.value.showBar } },
+    additionalTopBar = rememberUpdatedState(chatsCtx.secondaryContextFilter == null && (reportsCount > 0 || supportUnreadCount > 0)),
     chatBottomBar = remember { appPrefs.chatBottomBar.state }
   ) {
     val mergedItemsValue = mergedItems.value
@@ -1522,8 +1734,26 @@ fun BoxScope.ChatItemsList(
       }
     }
   }
-  FloatingButtons(loadingMoreItems, animatedScrollingInProgress, mergedItems, unreadCount, maxHeight, composeViewHeight, searchValue, groupReports, markChatRead, listState)
-  FloatingDate(Modifier.padding(top = 10.dp + topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar)).align(Alignment.TopCenter), mergedItems, listState, groupReports)
+  FloatingButtons(
+    chatsCtx,
+    reversedChatItems,
+    chatInfoUpdated,
+    topPaddingToContent,
+    topPaddingToContentPx,
+    loadingMoreItems,
+    loadingTopItems,
+    loadingBottomItems,
+    animatedScrollingInProgress,
+    mergedItems,
+    unreadCount,
+    maxHeight,
+    composeViewHeight,
+    searchValue,
+    markChatRead,
+    listState,
+    loadMessages
+  )
+  FloatingDate(Modifier.padding(top = 10.dp + topPaddingToContent).align(Alignment.TopCenter), topPaddingToContentPx, mergedItems, listState)
 
   LaunchedEffect(Unit) {
     snapshotFlow { listState.value.isScrollInProgress }
@@ -1542,22 +1772,24 @@ fun BoxScope.ChatItemsList(
   }
 }
 
-@Composable
-private fun LoadLastItems(loadingMoreItems: MutableState<Boolean>, remoteHostId: Long?, chatInfo: ChatInfo, groupReports: State<GroupReports>) {
-  LaunchedEffect(remoteHostId, chatInfo.id) {
-    try {
-      loadingMoreItems.value = true
-      if (chatModel.chatStateForContent(groupReports.value.contentTag).totalAfter.value <= 0) return@LaunchedEffect
-      delay(500)
-      withContext(Dispatchers.Default) {
-        apiLoadMessages(remoteHostId, chatInfo.chatType, chatInfo.apiId, groupReports.value.toContentTag(), ChatPagination.Last(ChatPagination.INITIAL_COUNT))
-      }
-    } finally {
-      loadingMoreItems.value = false
-    }
-  }
+private suspend fun loadLastItems(chatsCtx: ChatModel.ChatsContext, chatId: State<ChatId>, listState: State<LazyListState>, loadItems: State<suspend (ChatId, ChatPagination) -> Boolean>) {
+  val lastVisible = listState.value.layoutInfo.visibleItemsInfo.lastOrNull()
+  val itemsCanCoverScreen = lastVisible != null && listState.value.layoutInfo.viewportEndOffset - listState.value.layoutInfo.afterContentPadding <= lastVisible.offset + lastVisible.size
+  if (!itemsCanCoverScreen) return
+
+  if (lastItemsLoaded(chatsCtx)) return
+
+  delay(500)
+  loadItems.value(chatId.value, ChatPagination.Last(ChatPagination.INITIAL_COUNT))
 }
 
+private fun lastItemsLoaded(chatsCtx: ChatModel.ChatsContext): Boolean {
+  val chatState = chatsCtx.chatState
+  return chatState.splits.value.isEmpty() || chatState.splits.value.firstOrNull() != chatsCtx.chatItems.value.lastOrNull()?.id
+}
+
+// TODO: in extra rare case when after loading last items only 1 item is loaded, the view will jump like when receiving new message
+// can be reproduced by forwarding a message to notes that is (ChatPagination.INITIAL_COUNT - 1) away from bottom and going to that message
 @Composable
 private fun SmallScrollOnNewMessage(listState: State<LazyListState>, reversedChatItems: State<List<ChatItem>>) {
   val scrollDistance = with(LocalDensity.current) { -39.dp.toPx() }
@@ -1616,19 +1848,59 @@ private fun NotifyChatListOnFinishingComposition(
 
 @Composable
 fun BoxScope.FloatingButtons(
+  chatsCtx: ChatModel.ChatsContext,
+  reversedChatItems: State<List<ChatItem>>,
+  chatInfo: State<ChatInfo>,
+  topPaddingToContent: Dp,
+  topPaddingToContentPx: State<Int>,
   loadingMoreItems: MutableState<Boolean>,
+  loadingTopItems: MutableState<Boolean>,
+  loadingBottomItems: MutableState<Boolean>,
   animatedScrollingInProgress: MutableState<Boolean>,
   mergedItems: State<MergedItems>,
   unreadCount: State<Int>,
   maxHeight: State<Int>,
   composeViewHeight: State<Dp>,
   searchValue: State<String>,
-  groupReports: State<GroupReports>,
   markChatRead: () -> Unit,
-  listState: State<LazyListState>
+  listState: State<LazyListState>,
+  loadMessages: suspend (ChatId, ChatPagination, visibleItemIndexesNonReversed: () -> IntRange) -> Unit
 ) {
   val scope = rememberCoroutineScope()
-  val topPaddingToContentPx = rememberUpdatedState(with(LocalDensity.current) { topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar).roundToPx() })
+  fun scrollToBottom() {
+    scope.launch {
+      animatedScrollingInProgress.value = true
+      tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(0) }
+    }
+  }
+  fun scrollToTopUnread() {
+    scope.launch {
+      tryBlockAndSetLoadingMore(loadingMoreItems) {
+        if (chatsCtx.chatState.splits.value.isNotEmpty()) {
+          val pagination = ChatPagination.Initial(ChatPagination.INITIAL_COUNT)
+          val oldSize = reversedChatItems.value.size
+          loadMessages(chatInfo.value.id, pagination) {
+            visibleItemIndexesNonReversed(mergedItems, reversedChatItems.value.size, listState.value)
+          }
+          var repeatsLeft = 100
+          while (oldSize == reversedChatItems.value.size && repeatsLeft > 0) {
+            delay(10)
+            repeatsLeft--
+          }
+          if (oldSize == reversedChatItems.value.size) {
+            return@tryBlockAndSetLoadingMore
+          }
+        }
+        val index = mergedItems.value.items.indexOfLast { it.hasUnread() }
+        if (index != -1) {
+          // scroll to the top unread item
+          animatedScrollingInProgress.value = true
+          listState.value.animateScrollToItem(index + 1, -maxHeight.value)
+        }
+      }
+    }
+  }
+
   val bottomUnreadCount = remember {
     derivedStateOf {
       if (unreadCount.value == 0) return@derivedStateOf 0
@@ -1654,49 +1926,79 @@ fun BoxScope.FloatingButtons(
     allowToShowBottomWithArrow.value = shouldShow
     shouldShow && allow
   } }
+
+  val requestedTopScroll = remember { mutableStateOf(false) }
+  val requestedBottomScroll = remember { mutableStateOf(false) }
+
   BottomEndFloatingButton(
     bottomUnreadCount,
     showBottomButtonWithCounter,
     showBottomButtonWithArrow,
+    requestedBottomScroll,
     animatedScrollingInProgress,
     composeViewHeight,
     onClick = {
-      scope.launch {
-        animatedScrollingInProgress.value = true
-        tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(0) }
+      if (loadingBottomItems.value || !lastItemsLoaded(chatsCtx)) {
+        requestedTopScroll.value = false
+        requestedBottomScroll.value = true
+      } else {
+        scrollToBottom()
       }
     }
   )
+  LaunchedEffect(Unit) {
+    launch {
+      snapshotFlow { loadingTopItems.value }
+        .drop(1)
+        .collect { top ->
+          if (!top && requestedTopScroll.value) {
+            requestedTopScroll.value = false
+            scrollToTopUnread()
+          }
+        }
+    }
+    launch {
+      snapshotFlow { loadingBottomItems.value }
+        .drop(1)
+        .collect { bottom ->
+          if (!bottom && requestedBottomScroll.value) {
+            requestedBottomScroll.value = false
+            scrollToBottom()
+          }
+        }
+    }
+  }
   // Don't show top FAB if is in search
   if (searchValue.value.isNotEmpty()) return
   val fabSize = 56.dp
-  val topUnreadCount = remember { derivedStateOf { if (bottomUnreadCount.value >= 0) (unreadCount.value - bottomUnreadCount.value).coerceAtLeast(0) else 0 } }
+  val topUnreadCount = remember { derivedStateOf {
+    if (bottomUnreadCount.value >= 0) (unreadCount.value - bottomUnreadCount.value).coerceAtLeast(0) else 0 }
+  }
   val showDropDown = remember { mutableStateOf(false) }
 
   TopEndFloatingButton(
-    Modifier.padding(end = DEFAULT_PADDING, top = 24.dp + topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar)).align(Alignment.TopEnd),
+    Modifier.padding(end = DEFAULT_PADDING, top = 24.dp + topPaddingToContent).align(Alignment.TopEnd),
     topUnreadCount,
+    requestedTopScroll,
     animatedScrollingInProgress,
     onClick = {
-      val index = mergedItems.value.items.indexOfLast { it.hasUnread() }
-      if (index != -1) {
-        // scroll to the top unread item
-        scope.launch {
-          animatedScrollingInProgress.value = true
-          tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(index + 1, -maxHeight.value) }
-        }
+      if (loadingTopItems.value) {
+        requestedBottomScroll.value = false
+        requestedTopScroll.value = true
+      } else {
+        scrollToTopUnread()
       }
     },
     onLongClick = { showDropDown.value = true }
   )
 
-  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd)) {
+  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd).align(Alignment.TopEnd)) {
     val density = LocalDensity.current
     val width = remember { mutableStateOf(250.dp) }
     DefaultDropdownMenu(
       showDropDown,
       modifier = Modifier.onSizeChanged { with(density) { width.value = it.width.toDp().coerceAtLeast(250.dp) } },
-      offset = DpOffset(-DEFAULT_PADDING - width.value, 24.dp + fabSize + topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar))
+      offset = DpOffset(-DEFAULT_PADDING - width.value, 24.dp + fabSize + topPaddingToContent)
     ) {
       ItemAction(
         generalGetString(MR.strings.mark_read),
@@ -1711,9 +2013,11 @@ fun BoxScope.FloatingButtons(
 
 @Composable
 fun PreloadItems(
+  chatsCtx: ChatModel.ChatsContext,
   chatId: String,
   ignoreLoadingRequests: MutableSet<Long>,
-  reversedChatItems: State<List<ChatItem>>,
+  loadingMoreItems: State<Boolean>,
+  resetListState: State<Boolean>,
   mergedItems: State<MergedItems>,
   listState: State<LazyListState>,
   remaining: Int,
@@ -1724,98 +2028,83 @@ fun PreloadItems(
   val chatId = rememberUpdatedState(chatId)
   val loadItems = rememberUpdatedState(loadItems)
   val ignoreLoadingRequests = rememberUpdatedState(ignoreLoadingRequests)
-  PreloadItemsBefore(allowLoad, chatId, ignoreLoadingRequests, reversedChatItems, mergedItems, listState, remaining, loadItems)
-  PreloadItemsAfter(allowLoad, chatId, reversedChatItems, mergedItems, listState, remaining, loadItems)
-}
-
-@Composable
-private fun PreloadItemsBefore(
-  allowLoad: State<Boolean>,
-  chatId: State<String>,
-  ignoreLoadingRequests: State<MutableSet<Long>>,
-  reversedChatItems: State<List<ChatItem>>,
-  mergedItems: State<MergedItems>,
-  listState: State<LazyListState>,
-  remaining: Int,
-  loadItems: State<suspend (ChatId, ChatPagination) -> Boolean>,
-) {
-  KeyChangeEffect(allowLoad.value, chatId.value) {
-    snapshotFlow { listState.value.firstVisibleItemIndex }
-      .distinctUntilChanged()
-      .map { firstVisibleIndex ->
-        val splits = mergedItems.value.splits
-        val lastVisibleIndex = (listState.value.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0)
-        var lastIndexToLoadFrom: Int? = findLastIndexToLoadFromInSplits(firstVisibleIndex, lastVisibleIndex, remaining, splits)
-        val items = reversedChatItems.value
-        if (splits.isEmpty() && items.isNotEmpty() && lastVisibleIndex > mergedItems.value.items.size - remaining) {
-          lastIndexToLoadFrom = 0
-        }
-        if (allowLoad.value && lastIndexToLoadFrom != null) {
-          items.getOrNull(items.lastIndex - lastIndexToLoadFrom)?.id
-        } else {
-          null
-        }
-      }
-      .filterNotNull()
-      .filter { !ignoreLoadingRequests.value.contains(it) }
-      .collect { loadFromItemId ->
-        withBGApi {
-          val sizeWas = reversedChatItems.value.size
-          val oldestItemIdWas = reversedChatItems.value.lastOrNull()?.id
-          val triedToLoad = loadItems.value(chatId.value, ChatPagination.Before(loadFromItemId, ChatPagination.PRELOAD_COUNT))
-          if (triedToLoad && sizeWas == reversedChatItems.value.size && oldestItemIdWas == reversedChatItems.value.lastOrNull()?.id) {
-            ignoreLoadingRequests.value.add(loadFromItemId)
-          }
-        }
-      }
-  }
-}
-
-@Composable
-private fun PreloadItemsAfter(
-  allowLoad: MutableState<Boolean>,
-  chatId: State<String>,
-  reversedChatItems: State<List<ChatItem>>,
-  mergedItems: State<MergedItems>,
-  listState: State<LazyListState>,
-  remaining: Int,
-  loadItems: State<suspend (ChatId, ChatPagination) -> Boolean>,
-) {
   LaunchedEffect(Unit) {
     snapshotFlow { chatId.value }
       .distinctUntilChanged()
       .filterNotNull()
       .collect {
-        allowLoad.value = listState.value.layoutInfo.totalItemsCount == listState.value.layoutInfo.visibleItemsInfo.size
+        allowLoad.value = false
         delay(500)
         allowLoad.value = true
       }
   }
-  LaunchedEffect(chatId.value) {
-    launch {
+  if (allowLoad.value && !loadingMoreItems.value) {
+    LaunchedEffect(chatId.value, resetListState.value) {
       snapshotFlow { listState.value.firstVisibleItemIndex }
         .distinctUntilChanged()
-        .map { firstVisibleIndex ->
-          val items = reversedChatItems.value
-          val splits = mergedItems.value.splits
-          val split = splits.lastOrNull { it.indexRangeInParentItems.contains(firstVisibleIndex) }
-          // we're inside a splitRange (top --- [end of the splitRange --- we're here --- start of the splitRange] --- bottom)
-          if (split != null && split.indexRangeInParentItems.first + remaining > firstVisibleIndex) {
-            items.getOrNull(split.indexRangeInReversed.first)?.id
-          } else {
-            null
-          }
-        }
-        .filterNotNull()
-        .collect { loadFromItemId ->
-          withBGApi {
-            loadItems.value(chatId.value, ChatPagination.After(loadFromItemId, ChatPagination.PRELOAD_COUNT))
+        .collect { firstVisibleIndex ->
+          if (!preloadItemsBefore(chatsCtx, firstVisibleIndex, chatId, ignoreLoadingRequests, mergedItems, listState, remaining, loadItems)) {
+            preloadItemsAfter(chatsCtx, firstVisibleIndex, chatId, mergedItems, remaining, loadItems)
           }
+          loadLastItems(chatsCtx, chatId, listState, loadItems)
         }
     }
   }
 }
 
+private suspend fun preloadItemsBefore(
+  chatsCtx: ChatModel.ChatsContext,
+  firstVisibleIndex: Int,
+  chatId: State<String>,
+  ignoreLoadingRequests: State<MutableSet<Long>>,
+  mergedItems: State<MergedItems>,
+  listState: State<LazyListState>,
+  remaining: Int,
+  loadItems: State<suspend (ChatId, ChatPagination) -> Boolean>,
+): Boolean {
+  val splits = mergedItems.value.splits
+  val lastVisibleIndex = (listState.value.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0)
+  var lastIndexToLoadFrom: Int? = findLastIndexToLoadFromInSplits(firstVisibleIndex, lastVisibleIndex, remaining, splits)
+  val items = reversedChatItemsStatic(chatsCtx)
+  if (splits.isEmpty() && items.isNotEmpty() && lastVisibleIndex > mergedItems.value.items.size - remaining) {
+    lastIndexToLoadFrom = items.lastIndex
+  }
+  if (lastIndexToLoadFrom != null) {
+    val loadFromItemId = items.getOrNull(lastIndexToLoadFrom)?.id ?: return false
+    if (!ignoreLoadingRequests.value.contains(loadFromItemId)) {
+      val items = reversedChatItemsStatic(chatsCtx)
+      val sizeWas = items.size
+      val oldestItemIdWas = items.lastOrNull()?.id
+      val triedToLoad = loadItems.value(chatId.value, ChatPagination.Before(loadFromItemId, ChatPagination.PRELOAD_COUNT))
+      val itemsUpdated = reversedChatItemsStatic(chatsCtx)
+      if (triedToLoad && sizeWas == itemsUpdated.size && oldestItemIdWas == itemsUpdated.lastOrNull()?.id) {
+        ignoreLoadingRequests.value.add(loadFromItemId)
+        return false
+      }
+      return triedToLoad
+    }
+  }
+  return false
+}
+
+private suspend fun preloadItemsAfter(
+  chatsCtx: ChatModel.ChatsContext,
+  firstVisibleIndex: Int,
+  chatId: State<String>,
+  mergedItems: State<MergedItems>,
+  remaining: Int,
+  loadItems: State<suspend (ChatId, ChatPagination) -> Boolean>,
+) {
+  val items = reversedChatItemsStatic(chatsCtx)
+  val splits = mergedItems.value.splits
+  val split = splits.lastOrNull { it.indexRangeInParentItems.contains(firstVisibleIndex) }
+  // we're inside a splitRange (top --- [end of the splitRange --- we're here --- start of the splitRange] --- bottom)
+  if (split != null && split.indexRangeInParentItems.first + remaining > firstVisibleIndex) {
+    val loadFromItemId = items.getOrNull(split.indexRangeInReversed.first)?.id ?: return
+    loadItems.value(chatId.value, ChatPagination.After(loadFromItemId, ChatPagination.PRELOAD_COUNT))
+  }
+}
+
 val MEMBER_IMAGE_SIZE: Dp = 37.dp
 
 @Composable
@@ -1827,6 +2116,7 @@ fun MemberImage(member: GroupMember) {
 private fun TopEndFloatingButton(
   modifier: Modifier = Modifier,
   unreadCount: State<Int>,
+  requestedTopScroll: State<Boolean>,
   animatedScrollingInProgress: State<Boolean>,
   onClick: () -> Unit,
   onLongClick: () -> Unit
@@ -1840,11 +2130,15 @@ private fun TopEndFloatingButton(
       elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp),
       interactionSource = interactionSource,
     ) {
-      Text(
-        unreadCountStr(unreadCount.value),
-        color = MaterialTheme.colors.primary,
-        fontSize = 14.sp,
-      )
+      if (requestedTopScroll.value) {
+        LoadingProgressIndicator()
+      } else {
+        Text(
+          unreadCountStr(unreadCount.value),
+          color = MaterialTheme.colors.primary,
+          fontSize = 14.sp,
+        )
+      }
     }
   }
 }
@@ -1861,18 +2155,28 @@ fun topPaddingToContent(chatView: Boolean, additionalTopBar: Boolean = false): D
   }
 }
 
+@Composable
+private fun numberOfBottomAppBars(): Int {
+  val oneHandUI = remember { appPrefs.oneHandUI.state }
+  val chatBottomBar = remember { appPrefs.chatBottomBar.state }
+  return if (oneHandUI.value && chatBottomBar.value) {
+    2
+  } else {
+    1
+  }
+}
+
 @Composable
 private fun FloatingDate(
   modifier: Modifier,
+  topPaddingToContentPx: State<Int>,
   mergedItems: State<MergedItems>,
   listState: State<LazyListState>,
-  groupReports: State<GroupReports>
 ) {
   val isNearBottom = remember(chatModel.chatId) { mutableStateOf(listState.value.firstVisibleItemIndex == 0) }
   val nearBottomIndex = remember(chatModel.chatId) { mutableStateOf(if (isNearBottom.value) -1 else 0) }
   val showDate = remember(chatModel.chatId) { mutableStateOf(false) }
   val density = LocalDensity.current.density
-  val topPaddingToContentPx = rememberUpdatedState(with(LocalDensity.current) { topPaddingToContent(chatView = !groupReports.value.reportsView, groupReports.value.showBar).roundToPx() })
   val fontSizeSqrtMultiplier = fontSizeSqrtMultiplier
   val lastVisibleItemDate = remember {
     derivedStateOf {
@@ -1957,10 +2261,10 @@ private fun FloatingDate(
 }
 
 @Composable
-private fun SaveReportsStateOnDispose(groupReports: State<GroupReports>, listState: State<LazyListState>) {
+private fun SaveReportsStateOnDispose(chatsCtx: ChatModel.ChatsContext, listState: State<LazyListState>) {
   DisposableEffect(Unit) {
     onDispose {
-      reportsListState = if (groupReports.value.reportsView && ModalManager.end.hasModalOpen(ModalViewId.GROUP_REPORTS)) listState.value else null
+      reportsListState = if (chatsCtx.contentTag == MsgContentTag.Report && ModalManager.end.hasModalOpen(ModalViewId.SECONDARY_CHAT)) listState.value else null
     }
   }
 }
@@ -2038,7 +2342,7 @@ private fun DateSeparator(date: Instant) {
 
 @Composable
 private fun MarkItemsReadAfterDelay(
-  itemKey: String,
+  itemKey: ChatViewItemKey,
   itemIds: List<Long>,
   finishedInitialComposition: State<Boolean>,
   chatId: ChatId,
@@ -2062,20 +2366,43 @@ private fun MarkItemsReadAfterDelay(
   }
 }
 
+@Composable
+fun reportsCount(staleChatId: String?): Int {
+  return if (staleChatId?.startsWith("#") != true) {
+    0
+  } else {
+    remember(staleChatId) { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId }?.chatStats } }.value?.reportsCount ?: 0
+  }
+}
+
+@Composable
+fun supportUnreadCount(staleChatId: String?): Int {
+  return if (staleChatId?.startsWith("#") != true) {
+    0
+  } else {
+    remember(staleChatId) { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId } } }.value?.supportUnreadCount ?: 0
+  }
+}
+
+private fun reversedChatItemsStatic(chatsCtx: ChatModel.ChatsContext): List<ChatItem> =
+  chatsCtx.chatItems.value.asReversed()
+
 private fun oldestPartiallyVisibleListItemInListStateOrNull(topPaddingToContentPx: State<Int>, mergedItems: State<MergedItems>, listState: State<LazyListState>): ListItem? {
   val lastFullyVisibleOffset = listState.value.layoutInfo.viewportEndOffset - topPaddingToContentPx.value
-  return mergedItems.value.items.getOrNull((listState.value.layoutInfo.visibleItemsInfo.lastOrNull { item ->
+  val visibleKey: ChatViewItemKey? = listState.value.layoutInfo.visibleItemsInfo.lastOrNull { item ->
     item.offset <= lastFullyVisibleOffset
-  }?.index ?: listState.value.layoutInfo.visibleItemsInfo.lastOrNull()?.index) ?: -1)?.oldest()
+  }?.key as? ChatViewItemKey
+  return mergedItems.value.items.getOrNull((mergedItems.value.indexInParentItems[visibleKey?.first] ?: listState.value.layoutInfo.visibleItemsInfo.lastOrNull()?.index) ?: -1)?.oldest()
 }
 
 private fun lastFullyVisibleIemInListState(topPaddingToContentPx: State<Int>, density: Float, fontSizeSqrtMultiplier: Float, mergedItems: State<MergedItems>, listState: State<LazyListState>): ChatItem? {
   val lastFullyVisibleOffsetMinusFloatingHeight = listState.value.layoutInfo.viewportEndOffset - topPaddingToContentPx.value - 50 * density * fontSizeSqrtMultiplier
+  val visibleKey: ChatViewItemKey? = listState.value.layoutInfo.visibleItemsInfo.lastOrNull { item ->
+    item.offset <= lastFullyVisibleOffsetMinusFloatingHeight && item.size > 0
+  }?.key as? ChatViewItemKey
+
   return mergedItems.value.items.getOrNull(
-    (listState.value.layoutInfo.visibleItemsInfo.lastOrNull { item ->
-      item.offset <= lastFullyVisibleOffsetMinusFloatingHeight && item.size > 0
-    }
-      ?.index
+    (mergedItems.value.indexInParentItems[visibleKey?.first]
       ?: listState.value.layoutInfo.visibleItemsInfo.lastOrNull()?.index)
       ?: -1)?.newest()?.item
 }
@@ -2134,23 +2461,28 @@ private fun scrollToItem(
 }
 
 private fun findQuotedItemFromItem(
+  chatsCtx: ChatModel.ChatsContext,
   rhId: State<Long?>,
   chatInfo: State<ChatInfo>,
   scope: CoroutineScope,
   scrollToItem: (Long) -> Unit,
-  contentTag: MsgContentTag?
+  scrollToItemId: MutableState<Long?>
 ): (Long) -> Unit = { itemId: Long ->
   scope.launch(Dispatchers.Default) {
-    val item = apiLoadSingleMessage(rhId.value, chatInfo.value.chatType, chatInfo.value.apiId, itemId, contentTag)
+    val item = apiLoadSingleMessage(chatsCtx, rhId.value, chatInfo.value.chatType, chatInfo.value.apiId, itemId)
     if (item != null) {
-      withChats {
-        updateChatItem(chatInfo.value, item)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateChatItem(chatInfo.value, item)
       }
-      withReportsChatsIfOpen {
-        updateChatItem(chatInfo.value, item)
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.updateChatItem(chatInfo.value, item)
       }
       if (item.quotedItem?.itemId != null) {
-        scrollToItem(item.quotedItem.itemId)
+        if (item.isReport && chatsCtx.secondaryContextFilter != null) {
+          scrollToItemId.value = item.quotedItem.itemId
+        } else {
+          scrollToItem(item.quotedItem.itemId)
+        }
       } else {
         showQuotedItemDoesNotExistAlert()
       }
@@ -2187,48 +2519,59 @@ private fun BoxScope.BottomEndFloatingButton(
   unreadCount: State<Int>,
   showButtonWithCounter: State<Boolean>,
   showButtonWithArrow: State<Boolean>,
+  requestedBottomScroll: State<Boolean>,
   animatedScrollingInProgress: State<Boolean>,
   composeViewHeight: State<Dp>,
   onClick: () -> Unit
-) = when {
-  showButtonWithCounter.value && !animatedScrollingInProgress.value -> {
-    FloatingActionButton(
-      onClick = onClick,
-      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-      modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
-    ) {
-      Text(
-        unreadCountStr(unreadCount.value),
-        color = MaterialTheme.colors.primary,
-        fontSize = 14.sp,
-      )
+) {
+  when {
+    showButtonWithCounter.value && !animatedScrollingInProgress.value -> {
+      FloatingActionButton(
+        onClick = onClick,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
+        backgroundColor = MaterialTheme.colors.secondaryVariant,
+      ) {
+        if (requestedBottomScroll.value) {
+          LoadingProgressIndicator()
+        } else {
+          Text(
+            unreadCountStr(unreadCount.value),
+            color = MaterialTheme.colors.primary,
+            fontSize = 14.sp,
+          )
+        }
+      }
     }
-  }
-  showButtonWithArrow.value && !animatedScrollingInProgress.value -> {
-    FloatingActionButton(
-      onClick = onClick,
-      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-      modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
-    ) {
-      Icon(
-        painter = painterResource(MR.images.ic_keyboard_arrow_down),
-        contentDescription = null,
-        tint = MaterialTheme.colors.primary
-      )
+    showButtonWithArrow.value && !animatedScrollingInProgress.value -> {
+      FloatingActionButton(
+        onClick = onClick,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
+        backgroundColor = MaterialTheme.colors.secondaryVariant,
+      ) {
+        if (requestedBottomScroll.value) {
+          LoadingProgressIndicator()
+        } else {
+          Icon(
+            painter = painterResource(MR.images.ic_keyboard_arrow_down),
+            contentDescription = null,
+            tint = MaterialTheme.colors.primary
+          )
+        }
+      }
     }
+    else -> {}
   }
-  else -> {}
 }
 
 @Composable
-private fun SelectedChatItem(
+fun SelectedListItem(
   modifier: Modifier,
-  ciId: Long,
-  selectedChatItems: State<Set<Long>?>,
+  id: Long,
+  selectedItems: State<Set<Long>?>,
 ) {
-  val checked = remember { derivedStateOf { selectedChatItems.value?.contains(ciId) == true } }
+  val checked = remember { derivedStateOf { selectedItems.value?.contains(id) == true } }
   Icon(
     painterResource(if (checked.value) MR.images.ic_check_circle_filled else MR.images.ic_radio_button_unchecked),
     null,
@@ -2245,6 +2588,20 @@ private fun SelectedChatItem(
   )
 }
 
+@Composable
+private fun LoadingProgressIndicator() {
+  Box(
+    Modifier.fillMaxSize(),
+    contentAlignment = Alignment.Center
+  ) {
+    CircularProgressIndicator(
+      Modifier.size(30.dp),
+      color = MaterialTheme.colors.secondary,
+      strokeWidth = 2.dp
+    )
+  }
+}
+
 private fun selectUnselectChatItem(
   select: Boolean,
   ci: ChatItem,
@@ -2297,34 +2654,36 @@ private fun deleteMessages(chatRh: Long?, chatInfo: ChatInfo, itemIds: List<Long
           chatRh,
           type = chatInfo.chatType,
           id = chatInfo.apiId,
+          scope = chatInfo.groupChatScope(),
           itemIds = itemIds,
           mode = if (forAll) CIDeleteMode.cidmBroadcast else CIDeleteMode.cidmInternal
         )
       }
       if (deleted != null) {
-        withChats {
+        withContext(Dispatchers.Main) {
           for (di in deleted) {
             val toChatItem = di.toChatItem?.chatItem
             if (toChatItem != null) {
-              upsertChatItem(chatRh, chatInfo, toChatItem)
+              chatModel.chatsContext.upsertChatItem(chatRh, chatInfo, toChatItem)
             } else {
-              removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
+              chatModel.chatsContext.removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
             }
             val deletedItem = di.deletedChatItem.chatItem
             if (deletedItem.isActiveReport) {
-              decreaseGroupReportsCounter(chatRh, chatInfo.id)
+              chatModel.chatsContext.decreaseGroupReportsCounter(chatRh, chatInfo.id)
             }
           }
+          deleted.lastOrNull()?.deletedChatItem?.chatInfo?.let { updatedChatInfo ->
+            chatModel.chatsContext.updateChatInfo(chatRh, updatedChatInfo)
+          }
         }
-        withReportsChatsIfOpen {
+        withContext(Dispatchers.Main) {
           for (di in deleted) {
-            if (di.deletedChatItem.chatItem.isReport) {
-              val toChatItem = di.toChatItem?.chatItem
-              if (toChatItem != null) {
-                upsertChatItem(chatRh, chatInfo, toChatItem)
-              } else {
-                removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
-              }
+            val toChatItem = di.toChatItem?.chatItem
+            if (toChatItem != null) {
+              chatModel.secondaryChatsContext.value?.upsertChatItem(chatRh, chatInfo, toChatItem)
+            } else {
+              chatModel.secondaryChatsContext.value?.removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
             }
           }
         }
@@ -2334,6 +2693,60 @@ private fun deleteMessages(chatRh: Long?, chatInfo: ChatInfo, itemIds: List<Long
   }
 }
 
+private fun archiveReports(chatRh: Long?, chatInfo: ChatInfo, itemIds: List<Long>, forAll: Boolean, onSuccess: () -> Unit = {}) {
+  if (itemIds.isNotEmpty()) {
+    withBGApi {
+      val deleted = chatModel.controller.apiDeleteReceivedReports(
+        chatRh,
+        groupId = chatInfo.apiId,
+        itemIds = itemIds,
+        mode = if (forAll) CIDeleteMode.cidmBroadcast else CIDeleteMode.cidmInternalMark
+      )
+      if (deleted != null) {
+        withContext(Dispatchers.Main) {
+          for (di in deleted) {
+            val toChatItem = di.toChatItem?.chatItem
+            if (toChatItem != null) {
+              chatModel.chatsContext.upsertChatItem(chatRh, chatInfo, toChatItem)
+            } else {
+              chatModel.chatsContext.removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
+            }
+            val deletedItem = di.deletedChatItem.chatItem
+            if (deletedItem.isActiveReport) {
+              chatModel.chatsContext.decreaseGroupReportsCounter(chatRh, chatInfo.id)
+            }
+          }
+          deleted.lastOrNull()?.deletedChatItem?.chatInfo?.let { updatedChatInfo ->
+            chatModel.chatsContext.updateChatInfo(chatRh, updatedChatInfo)
+          }
+        }
+        withContext(Dispatchers.Main) {
+          for (di in deleted) {
+            val toChatItem = di.toChatItem?.chatItem
+            if (toChatItem != null) {
+              chatModel.secondaryChatsContext.value?.upsertChatItem(chatRh, chatInfo, toChatItem)
+            } else {
+              chatModel.secondaryChatsContext.value?.removeChatItem(chatRh, chatInfo, di.deletedChatItem.chatItem)
+            }
+          }
+        }
+        onSuccess()
+      }
+    }
+  }
+}
+
+private fun archiveItems(rhId: Long?, chatInfo: ChatInfo, selectedChatItems: MutableState<Set<Long>?>) {
+  val itemIds = selectedChatItems.value
+  if (itemIds != null) {
+    showArchiveReportsAlert(itemIds.sorted(), chatInfo is ChatInfo.Group && chatInfo.groupInfo.membership.memberActive, archiveReports = { ids, forAll ->
+      archiveReports(rhId, chatInfo, ids, forAll) {
+        selectedChatItems.value = null
+      }
+    })
+  }
+}
+
 private fun markUnreadChatAsRead(chatId: String) {
   val chat = chatModel.chats.value.firstOrNull { it.id == chatId }
   if (chat?.chatStats?.unreadChat != true) return
@@ -2346,9 +2759,9 @@ private fun markUnreadChatAsRead(chatId: String) {
       false
     )
     if (success) {
-      withChats {
-        replaceChat(chatRh, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = false)))
-        markChatTagRead(chat)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.replaceChat(chatRh, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = false)))
+        chatModel.chatsContext.markChatTagRead(chat)
       }
     }
   }
@@ -2510,7 +2923,9 @@ fun providerForGallery(
   }
 }
 
-private fun keyForItem(item: ChatItem): String = (item.id to item.meta.createdAt.toEpochMilliseconds()).toString()
+typealias ChatViewItemKey = Pair<Long, Long>
+
+private fun keyForItem(item: ChatItem): ChatViewItemKey = ChatViewItemKey(item.id, item.meta.createdAt.toEpochMilliseconds())
 
 private fun ViewConfiguration.bigTouchSlop(slop: Float = 50f) = object: ViewConfiguration {
   override val longPressTimeoutMillis
@@ -2528,7 +2943,7 @@ private fun ViewConfiguration.bigTouchSlop(slop: Float = 50f) = object: ViewConf
 private fun forwardContent(chatItemsIds: List<Long>, chatInfo: ChatInfo) {
   chatModel.chatId.value = null
   chatModel.sharedContent.value = SharedContent.Forward(
-    chatModel.chatItemsForContent(null).value.filter { chatItemsIds.contains(it.id) },
+    chatModel.chatsContext.chatItems.value.filter { chatItemsIds.contains(it.id) },
     chatInfo
   )
 }
@@ -2663,13 +3078,12 @@ fun PreviewChatLayout() {
     val unreadCount = remember { mutableStateOf(chatItems.count { it.isRcvNew }) }
     val searchValue = remember { mutableStateOf("") }
     ChatLayout(
+      chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       remoteHostId = remember { mutableStateOf(null) },
       chatInfo = remember { mutableStateOf(ChatInfo.Direct.sampleData) },
-      reversedChatItems = remember { mutableStateOf(emptyList()) },
       unreadCount = unreadCount,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      composeView = {},
-      groupReports = remember { mutableStateOf(GroupReports(0, false)) },
+      composeView = { _ -> },
       scrollToItemId = remember { mutableStateOf(null) },
       attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
       attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
@@ -2679,11 +3093,13 @@ fun PreviewChatLayout() {
       selectedChatItems = remember { mutableStateOf(setOf()) },
       back = {},
       info = {},
-      showGroupReports = {},
+      showReports = {},
+      showSupportChats = {},
       showMemberInfo = { _, _ -> },
       loadMessages = { _, _, _ -> },
       deleteMessage = { _, _ -> },
       deleteMessages = { _ -> },
+      archiveReports = { _, _ -> },
       receiveFile = { _ -> },
       cancelFile = {},
       joinGroup = { _, _ -> },
@@ -2707,6 +3123,7 @@ fun PreviewChatLayout() {
       markChatRead = {},
       changeNtfsState = { _, _ -> },
       onSearchValueChanged = {},
+      closeSearch = {},
       onComposed = {},
       developerTools = false,
       showViaProxy = false,
@@ -2740,13 +3157,12 @@ fun PreviewGroupChatLayout() {
     val unreadCount = remember { mutableStateOf(chatItems.count { it.isRcvNew }) }
     val searchValue = remember { mutableStateOf("") }
     ChatLayout(
+      chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       remoteHostId = remember { mutableStateOf(null) },
       chatInfo = remember { mutableStateOf(ChatInfo.Direct.sampleData) },
-      reversedChatItems = remember { mutableStateOf(emptyList()) },
       unreadCount = unreadCount,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      composeView = {},
-      groupReports = remember { mutableStateOf(GroupReports(0, false)) },
+      composeView = { _ -> },
       scrollToItemId = remember { mutableStateOf(null) },
       attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
       attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
@@ -2756,11 +3172,13 @@ fun PreviewGroupChatLayout() {
       selectedChatItems = remember { mutableStateOf(setOf()) },
       back = {},
       info = {},
-      showGroupReports = {},
+      showReports = {},
+      showSupportChats = {},
       showMemberInfo = { _, _ -> },
       loadMessages = { _, _, _ -> },
       deleteMessage = { _, _ -> },
       deleteMessages = {},
+      archiveReports = { _, _ -> },
       receiveFile = { _ -> },
       cancelFile = {},
       joinGroup = { _, _ -> },
@@ -2784,6 +3202,7 @@ fun PreviewGroupChatLayout() {
       markChatRead = {},
       changeNtfsState = { _, _ -> },
       onSearchValueChanged = {},
+      closeSearch = {},
       onComposed = {},
       developerTools = false,
       showViaProxy = false,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt
new file mode 100644
index 0000000000..3c3f99ad94
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt
@@ -0,0 +1,126 @@
+package chat.simplex.common.views.chat
+
+import SectionItemView
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.chatModel
+import chat.simplex.common.views.chat.group.removeMember
+import chat.simplex.common.views.chat.group.removeMemberDialog
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Composable
+fun ComposeContextPendingMemberActionsView(
+  rhId: Long?,
+  groupInfo: GroupInfo,
+  member: GroupMember
+) {
+  Column(
+    Modifier
+      .height(60.dp)
+      .background(MaterialTheme.colors.surface)
+  ) {
+    Divider()
+
+    Row(
+      Modifier
+        .fillMaxWidth(),
+      horizontalArrangement = Arrangement.SpaceEvenly,
+    ) {
+      Column(
+        Modifier
+          .fillMaxWidth()
+          .fillMaxHeight()
+          .weight(1F)
+          .clickable {
+            rejectMemberDialog(rhId, member, chatModel, close = { ModalManager.end.closeModal() })
+          },
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+      ) {
+        Text(stringResource(MR.strings.reject_pending_member_button), color = Color.Red)
+      }
+
+      Column(
+        Modifier
+          .fillMaxWidth()
+          .fillMaxHeight()
+          .weight(1F)
+          .clickable {
+            acceptMemberDialog(rhId, groupInfo, member, close = { ModalManager.end.closeModal() })
+          },
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+      ) {
+        Text(stringResource(MR.strings.accept_pending_member_button), color = MaterialTheme.colors.primary)
+      }
+    }
+  }
+}
+
+fun rejectMemberDialog(rhId: Long?, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.reject_pending_member_alert_title),
+    confirmText = generalGetString(MR.strings.reject_pending_member_button),
+    onConfirm = {
+      removeMember(rhId, member, chatModel, close)
+    },
+    destructive = true,
+  )
+}
+
+fun acceptMemberDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertDialogButtonsColumn(
+    title = generalGetString(MR.strings.accept_pending_member_alert_title),
+    text = generalGetString(MR.strings.accept_pending_member_alert_question),
+    buttons = {
+      Column {
+        // Accept as member
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+          acceptMember(rhId, groupInfo, member, GroupMemberRole.Member, close)
+        }) {
+          Text(generalGetString(MR.strings.accept_pending_member_alert_confirmation_as_member), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+        // Accept as observer
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+          acceptMember(rhId, groupInfo, member, GroupMemberRole.Observer, close)
+        }) {
+          Text(generalGetString(MR.strings.accept_pending_member_alert_confirmation_as_observer), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+        // Cancel
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+        }) {
+          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+      }
+    }
+  )
+}
+
+private fun acceptMember(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, role: GroupMemberRole, close: (() -> Unit)?) {
+  withBGApi {
+    val r = chatModel.controller.apiAcceptMember(rhId, groupInfo.groupId, member.groupMemberId, role)
+    if (r != null) {
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.upsertGroupMember(rhId, r.first, r.second)
+        chatModel.chatsContext.updateGroup(rhId, r.first)
+      }
+    }
+    close?.invoke()
+  }
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
index c413e06599..ca6279fd88 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -1,4 +1,4 @@
-@file:UseSerializers(UriSerializer::class)
+@file:UseSerializers(UriSerializer::class, ComposeMessageSerializer::class)
 package chat.simplex.common.views.chat
 
 import androidx.compose.foundation.background
@@ -11,20 +11,20 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.font.FontStyle
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.util.*
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.model.ChatModel.filesToDelete
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.*
@@ -33,10 +33,15 @@ import chat.simplex.res.MR
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import java.io.File
 import java.net.URI
 import java.nio.file.Files
 
+const val MAX_NUMBER_OF_MENTIONS = 3
+
 @Serializable
 sealed class ComposePreview {
   @Serializable object NoPreview: ComposePreview()
@@ -63,23 +68,57 @@ data class LiveMessage(
   val sent: Boolean
 )
 
+typealias MentionedMembers = Map<String, CIMention>
+
+@Serializable
+data class ComposeMessage(
+  val text: String = "",
+  val selection: TextRange = TextRange.Zero
+) {
+  constructor(text: String): this(text, TextRange(text.length))
+}
+
+@Serializer(forClass = TextRange::class)
+object ComposeMessageSerializer : KSerializer<TextRange> {
+  override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("TextRange", PrimitiveKind.LONG)
+  override fun serialize(encoder: Encoder, value: TextRange) =
+    encoder.encodeLong(packInts(value.start, value.end))
+  override fun deserialize(decoder: Decoder): TextRange =
+    decoder.decodeLong().let { value ->  TextRange(unpackInt1(value), unpackInt2(value)) }
+}
+
 @Serializable
 data class ComposeState(
-  val message: String = "",
+  val message: ComposeMessage = ComposeMessage(),
+  val parsedMessage: List<FormattedText> = emptyList(),
   val liveMessage: LiveMessage? = null,
   val preview: ComposePreview = ComposePreview.NoPreview,
   val contextItem: ComposeContextItem = ComposeContextItem.NoContextItem,
   val inProgress: Boolean = false,
-  val useLinkPreviews: Boolean
+  val useLinkPreviews: Boolean,
+  val mentions: MentionedMembers = emptyMap()
 ) {
   constructor(editingItem: ChatItem, liveMessage: LiveMessage? = null, useLinkPreviews: Boolean): this(
-    editingItem.content.text,
+    ComposeMessage(editingItem.content.text),
+    editingItem.formattedText ?: FormattedText.plain(editingItem.content.text),
     liveMessage,
     chatItemPreview(editingItem),
     ComposeContextItem.EditingItem(editingItem),
-    useLinkPreviews = useLinkPreviews
+    useLinkPreviews = useLinkPreviews,
+    mentions = editingItem.mentions ?: emptyMap()
   )
 
+  val memberMentions: Map<String, Long>
+    get() = this.mentions.mapNotNull {
+      val memberRef = it.value.memberRef
+
+      if (memberRef != null) {
+        it.key to memberRef.groupMemberId
+      } else {
+        null
+      }
+    }.toMap()
+
   val editing: Boolean
     get() =
       when (contextItem) {
@@ -100,7 +139,7 @@ data class ComposeState(
     get() = when (contextItem) {
       is ComposeContextItem.ReportedItem -> {
         when (contextItem.reason) {
-          is ReportReason.Other -> message.isNotEmpty()
+          is ReportReason.Other -> message.text.isNotEmpty()
           else -> true
         }
       }
@@ -112,12 +151,12 @@ data class ComposeState(
         is ComposePreview.MediaPreview -> true
         is ComposePreview.VoicePreview -> true
         is ComposePreview.FilePreview -> true
-        else -> message.isNotEmpty() || forwarding || liveMessage != null || submittingValidReport
+        else -> message.text.isNotEmpty() || forwarding || liveMessage != null || submittingValidReport
       }
       hasContent && !inProgress
     }
   val endLiveDisabled: Boolean
-    get() = liveMessage != null && message.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
+    get() = liveMessage != null && message.text.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
 
   val linkPreviewAllowed: Boolean
     get() =
@@ -160,7 +199,7 @@ data class ComposeState(
     }
 
   val empty: Boolean
-    get() = message.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
+    get() = message.text.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
 
   companion object {
     fun saver(): Saver<MutableState<ComposeState>, *> = Saver(
@@ -170,6 +209,18 @@ data class ComposeState(
       }
     )
   }
+
+  fun mentionMemberName(name: String): String {
+    var n = 0
+    var tryName = name
+
+    while (mentions.containsKey(tryName)) {
+      n++
+      tryName = "${name}_$n"
+    }
+
+    return tryName
+  }
 }
 
 private val maxFileSize = getMaxFileSize(FileProtocol.XFTP)
@@ -223,7 +274,7 @@ fun MutableState<ComposeState>.processPickedFile(uri: URI?, text: String?) {
     if (fileSize != null && fileSize <= maxFileSize) {
       val fileName = getFileName(uri)
       if (fileName != null) {
-        value = value.copy(message = text ?: value.message, preview = ComposePreview.FilePreview(fileName, uri))
+        value = value.copy(message = if (text != null) ComposeMessage(text) else value.message, preview = ComposePreview.FilePreview(fileName, uri))
       }
     } else if (fileSize != null) {
       AlertManager.shared.showAlertMsg(
@@ -276,25 +327,27 @@ suspend fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text:
     }
   }
   if (imagesPreview.isNotEmpty()) {
-    value = value.copy(message = text ?: value.message, preview = ComposePreview.MediaPreview(imagesPreview, content))
+    value = value.copy(message = if (text != null) ComposeMessage(text) else value.message, preview = ComposePreview.MediaPreview(imagesPreview, content))
   }
 }
 
 @Composable
 fun ComposeView(
+  rhId: Long?,
   chatModel: ChatModel,
+  chatsCtx: ChatModel.ChatsContext,
   chat: Chat,
   composeState: MutableState<ComposeState>,
   attachmentOption: MutableState<AttachmentOption?>,
-  showChooseAttachment: () -> Unit
+  showChooseAttachment: () -> Unit,
+  focusRequester: FocusRequester?,
 ) {
   val cancelledLinks = rememberSaveable { mutableSetOf<String>() }
   fun isSimplexLink(link: String): Boolean =
     link.startsWith("https://simplex.chat", true) || link.startsWith("http://simplex.chat", true)
 
-  fun parseMessage(msg: String): Pair<String?, Boolean> {
-    if (msg.isBlank()) return null to false
-    val parsedMsg = parseToMarkdown(msg) ?: return null to false
+  fun getSimplexLink(parsedMsg: List<FormattedText>?): Pair<String?, Boolean> {
+    if (parsedMsg == null) return null to false
     val link = parsedMsg.firstOrNull { ft -> ft.format is Format.Uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text) }
     val simplexLink = parsedMsg.any { ft -> ft.format is Format.SimplexLink }
     return link?.text to simplexLink
@@ -302,7 +355,7 @@ fun ComposeView(
 
   val linkUrl = rememberSaveable { mutableStateOf<String?>(null) }
   // default value parsed because of draft
-  val hasSimplexLink = rememberSaveable { mutableStateOf(parseMessage(composeState.value.message).second) }
+  val hasSimplexLink = rememberSaveable { mutableStateOf(getSimplexLink(parseToMarkdown(composeState.value.message.text)).second) }
   val prevLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
   val pendingLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
   val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
@@ -310,7 +363,6 @@ fun ComposeView(
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember(MaterialTheme.colors.isLight) { mutableStateOf(smallFont) }
   val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }
-
   AttachmentSelection(composeState, attachmentOption, composeState::processPickedFile) { uris, text -> CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(uris, text) } }
 
   fun loadLinkPreview(url: String, wait: Long? = null) {
@@ -330,11 +382,11 @@ fun ComposeView(
     }
   }
 
-  fun showLinkPreview(s: String) {
+  fun showLinkPreview(parsedMessage: List<FormattedText>?) {
     prevLinkUrl.value = linkUrl.value
-    val parsed = parseMessage(s)
-    linkUrl.value = parsed.first
-    hasSimplexLink.value = parsed.second
+    val linkParsed = getSimplexLink(parsedMessage)
+    linkUrl.value = linkParsed.first
+    hasSimplexLink.value = linkParsed.second
     val url = linkUrl.value
     if (url != null) {
       if (url != composeState.value.linkPreview?.uri && url != pendingLinkUrl.value) {
@@ -403,27 +455,28 @@ fun ComposeView(
     }
   }
 
-  suspend fun send(chat: Chat, mc: MsgContent, quoted: Long?, file: CryptoFile? = null, live: Boolean = false, ttl: Int?): ChatItem? {
+  suspend fun send(chat: Chat, mc: MsgContent, quoted: Long?, file: CryptoFile? = null, live: Boolean = false, ttl: Int?, mentions: Map<String, Long>): ChatItem? {
     val cInfo = chat.chatInfo
     val chatItems = if (chat.chatInfo.chatType == ChatType.Local)
       chatModel.controller.apiCreateChatItems(
         rh = chat.remoteHostId,
         noteFolderId = chat.chatInfo.apiId,
-        composedMessages = listOf(ComposedMessage(file, null, mc))
+        composedMessages = listOf(ComposedMessage(file, null, mc, mentions))
       )
     else
       chatModel.controller.apiSendMessages(
         rh = chat.remoteHostId,
         type = cInfo.chatType,
         id = cInfo.apiId,
+        scope = cInfo.groupChatScope(),
         live = live,
         ttl = ttl,
-        composedMessages = listOf(ComposedMessage(file, quoted, mc))
+        composedMessages = listOf(ComposedMessage(file, quoted, mc, mentions))
       )
     if (!chatItems.isNullOrEmpty()) {
       chatItems.forEach { aChatItem ->
-        withChats {
-          addChatItem(chat.remoteHostId, cInfo, aChatItem.chatItem)
+        withContext(Dispatchers.Main) {
+          chatsCtx.addChatItem(chat.remoteHostId, cInfo, aChatItem.chatItem)
         }
       }
       return chatItems.first().chatItem
@@ -437,7 +490,7 @@ fun ComposeView(
     val cs = composeState.value
     var sent: List<ChatItem>?
     var lastMessageFailedToSend: ComposeState? = null
-    val msgText = text ?: cs.message
+    val msgText = text ?: cs.message.text
 
     fun sending() {
       composeState.value = composeState.value.copy(inProgress = true)
@@ -448,15 +501,17 @@ fun ComposeView(
         rh = rhId,
         toChatType = chat.chatInfo.chatType,
         toChatId = chat.chatInfo.apiId,
+        toScope = chat.chatInfo.groupChatScope(),
         fromChatType = fromChatInfo.chatType,
         fromChatId = fromChatInfo.apiId,
+        fromScope = fromChatInfo.groupChatScope(),
         itemIds = forwardedItem.map { it.id },
         ttl = ttl
       )
 
-      withChats {
+      withContext(Dispatchers.Main) {
         chatItems?.forEach { chatItem ->
-          addChatItem(rhId, chat.chatInfo, chatItem)
+          chatsCtx.addChatItem(rhId, chat.chatInfo, chatItem)
         }
       }
 
@@ -473,7 +528,8 @@ fun ComposeView(
     fun checkLinkPreview(): MsgContent {
       return when (val composePreview = cs.preview) {
         is ComposePreview.CLinkPreview -> {
-          val url = parseMessage(msgText).first
+          val parsedMsg = parseToMarkdown(msgText)
+          val url = getSimplexLink(parsedMsg).first
           val lp = composePreview.linkPreview
           if (lp != null && url == lp.uri) {
             MsgContent.MCLink(msgText, preview = lp)
@@ -512,16 +568,21 @@ fun ComposeView(
       }
     }
 
+    fun showReportsInSupportChatAlert() {
+      AlertManager.shared.showAlertDialog(
+        title = generalGetString(MR.strings.report_sent_alert_title),
+        text = generalGetString(MR.strings.report_sent_alert_msg_view_in_support_chat),
+        confirmText = generalGetString(MR.strings.ok),
+        dismissText = generalGetString(MR.strings.dont_show_again),
+        onDismiss = {
+          chatModel.controller.appPrefs.showReportsInSupportChatAlert.set(false)
+        },
+      )
+    }
+
     suspend fun sendReport(reportReason: ReportReason, chatItemId: Long): List<ChatItem>? {
       val cItems = chatModel.controller.apiReportMessage(chat.remoteHostId, chat.chatInfo.apiId, chatItemId, reportReason, msgText)
-      if (cItems != null) {
-        withChats {
-          cItems.forEach { chatItem ->
-            addChatItem(chat.remoteHostId, chat.chatInfo, chatItem.chatItem)
-          }
-        }
-      }
-
+      if (chatModel.controller.appPrefs.showReportsInSupportChatAlert.get()) showReportsInSupportChatAlert()
       return cItems?.map { it.chatItem }
     }
 
@@ -529,8 +590,8 @@ fun ComposeView(
       val mc = checkLinkPreview()
       val contact = chatModel.controller.apiSendMemberContactInvitation(chat.remoteHostId, chat.chatInfo.apiId, mc)
       if (contact != null) {
-        withChats {
-          updateContact(chat.remoteHostId, contact)
+        withContext(Dispatchers.Main) {
+          chatsCtx.updateContact(chat.remoteHostId, contact)
         }
       }
     }
@@ -543,12 +604,15 @@ fun ComposeView(
           rh = chat.remoteHostId,
           type = cInfo.chatType,
           id = cInfo.apiId,
+          scope = cInfo.groupChatScope(),
           itemId = ei.meta.itemId,
-          mc = updateMsgContent(oldMsgContent),
+          updatedMessage = UpdatedMessage(updateMsgContent(oldMsgContent), cs.memberMentions),
           live = live
         )
-        if (updatedItem != null) withChats {
-          upsertChatItem(chat.remoteHostId, cInfo, updatedItem.chatItem)
+        if (updatedItem != null) {
+          withContext(Dispatchers.Main) {
+            chatsCtx.upsertChatItem(chat.remoteHostId, cInfo, updatedItem.chatItem)
+          }
         }
         return updatedItem?.chatItem
       }
@@ -572,10 +636,10 @@ fun ComposeView(
       if (sent == null) {
         lastMessageFailedToSend = constructFailedMessage(cs)
       }
-      if (cs.message.isNotEmpty()) {
+      if (cs.message.text.isNotEmpty()) {
         sent?.mapIndexed { index, message ->
           if (index == sent!!.lastIndex) {
-            send(chat, checkLinkPreview(), quoted = message.id, live = false, ttl = ttl)
+            send(chat, checkLinkPreview(), quoted = message.id, live = false, ttl = ttl, mentions = cs.memberMentions)
           } else {
             message
           }
@@ -686,7 +750,8 @@ fun ComposeView(
         }
         val sendResult = send(chat, content, if (index == 0) quotedItemId else null, file,
           live = if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false,
-          ttl = ttl
+          ttl = ttl,
+          mentions = cs.memberMentions
         )
         sent = if (sendResult != null) listOf(sendResult) else null
         if (sent == null && index == msgs.lastIndex && cs.liveMessage == null) {
@@ -719,21 +784,22 @@ fun ComposeView(
     }
   }
 
-  fun onMessageChange(s: String) {
-    composeState.value = composeState.value.copy(message = s)
-    if (isShortEmoji(s)) {
-      textStyle.value = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
+  fun onMessageChange(s: ComposeMessage) {
+    val parsedMessage = parseToMarkdown(s.text)
+    composeState.value = composeState.value.copy(message = s, parsedMessage = parsedMessage ?: FormattedText.plain(s.text))
+    if (isShortEmoji(s.text)) {
+      textStyle.value = if (s.text.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
     } else {
       textStyle.value = smallFont
       if (composeState.value.linkPreviewAllowed) {
-        if (s.isNotEmpty()) {
-          showLinkPreview(s)
+        if (s.text.isNotEmpty()) {
+          showLinkPreview(parsedMessage)
         } else {
           resetLinkPreview()
           hasSimplexLink.value = false
         }
-      } else if (s.isNotEmpty() && !chat.groupFeatureEnabled(GroupFeature.SimplexLinks)) {
-        hasSimplexLink.value = parseMessage(s).second
+      } else if (s.text.isNotEmpty() && !chat.groupFeatureEnabled(GroupFeature.SimplexLinks)) {
+        hasSimplexLink.value = getSimplexLink(parsedMessage).second
       } else {
         hasSimplexLink.value = false
       }
@@ -801,7 +867,7 @@ fun ComposeView(
 
   suspend fun sendLiveMessage() {
     val cs = composeState.value
-    val typedMsg = cs.message
+    val typedMsg = cs.message.text
     if ((cs.sendEnabled() || cs.contextItem is ComposeContextItem.QuotedItem) && (cs.liveMessage == null || !cs.liveMessage.sent)) {
       val ci = sendMessageAsync(typedMsg, live = true, ttl = null)
       if (!ci.isNullOrEmpty()) {
@@ -822,21 +888,21 @@ fun ComposeView(
     val typedMsg = composeState.value.message
     val liveMessage = composeState.value.liveMessage
     if (liveMessage != null) {
-      val sentMsg = liveMessageToSend(liveMessage, typedMsg)
+      val sentMsg = liveMessageToSend(liveMessage, typedMsg.text)
       if (sentMsg != null) {
         val ci = sendMessageAsync(sentMsg, live = true, ttl = null)
         if (!ci.isNullOrEmpty()) {
-          composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci.last(), typedMsg = typedMsg, sentMsg = sentMsg, sent = true))
+          composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci.last(), typedMsg = typedMsg.text, sentMsg = sentMsg, sent = true))
         }
-      } else if (liveMessage.typedMsg != typedMsg) {
-        composeState.value = composeState.value.copy(liveMessage = liveMessage.copy(typedMsg = typedMsg))
+      } else if (liveMessage.typedMsg != typedMsg.text) {
+        composeState.value = composeState.value.copy(liveMessage = liveMessage.copy(typedMsg = typedMsg.text))
       }
     }
   }
 
   fun editPrevMessage() {
     if (composeState.value.contextItem != ComposeContextItem.NoContextItem || composeState.value.preview != ComposePreview.NoPreview) return
-    val lastEditable = chatModel.chatItemsForContent(null).value.findLast { it.meta.editable }
+    val lastEditable = chatsCtx.chatItems.value.findLast { it.meta.editable }
     if (lastEditable != null) {
       composeState.value = ComposeState(editingItem = lastEditable, useLinkPreviews = useLinkPreviews)
     }
@@ -904,16 +970,16 @@ fun ComposeView(
   fun contextItemView() {
     when (val contextItem = composeState.value.contextItem) {
       ComposeContextItem.NoContextItem -> {}
-      is ComposeContextItem.QuotedItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_reply), chatType = chat.chatInfo.chatType) {
+      is ComposeContextItem.QuotedItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_reply), chatInfo = chat.chatInfo) {
         composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
       }
-      is ComposeContextItem.EditingItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_edit_filled),  chatType = chat.chatInfo.chatType) {
+      is ComposeContextItem.EditingItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_edit_filled),  chatInfo = chat.chatInfo) {
         clearState()
       }
-      is ComposeContextItem.ForwardingItems -> ContextItemView(contextItem.chatItems, painterResource(MR.images.ic_forward), showSender = false,  chatType = chat.chatInfo.chatType) {
+      is ComposeContextItem.ForwardingItems -> ContextItemView(contextItem.chatItems, painterResource(MR.images.ic_forward), showSender = false,  chatInfo = chat.chatInfo) {
         composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
       }
-      is ComposeContextItem.ReportedItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_flag), chatType = chat.chatInfo.chatType, contextIconColor = Color.Red) {
+      is ComposeContextItem.ReportedItem -> ContextItemView(listOf(contextItem.chatItem), painterResource(MR.images.ic_flag), chatInfo = chat.chatInfo, contextIconColor = Color.Red) {
         composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
       }
     }
@@ -932,7 +998,7 @@ fun ComposeView(
     if (chatModel.chatId.value == null) return@LaunchedEffect
 
     when (val shared = chatModel.sharedContent.value) {
-      is SharedContent.Text -> onMessageChange(shared.text)
+      is SharedContent.Text -> onMessageChange(ComposeMessage(shared.text))
       is SharedContent.Media -> composeState.processPickedMedia(shared.uris, shared.text)
       is SharedContent.File -> composeState.processPickedFile(shared.uri, shared.text)
       is SharedContent.Forward -> composeState.value = composeState.value.copy(
@@ -944,12 +1010,26 @@ fun ComposeView(
     chatModel.sharedContent.value = null
   }
 
-  val userCanSend = rememberUpdatedState(chat.chatInfo.userCanSend)
   val sendMsgEnabled = rememberUpdatedState(chat.chatInfo.sendMsgEnabled)
-  val userIsObserver = rememberUpdatedState(chat.userIsObserver)
+  val userCantSendReason = rememberUpdatedState(chat.chatInfo.userCantSendReason)
   val nextSendGrpInv = rememberUpdatedState(chat.nextSendGrpInv)
 
   Column {
+    if (
+      chat.chatInfo is ChatInfo.Group
+      && chatsCtx.secondaryContextFilter is SecondaryContextFilter.GroupChatScopeContext
+      && chatsCtx.secondaryContextFilter.groupScopeInfo is GroupChatScopeInfo.MemberSupport
+      && chatsCtx.secondaryContextFilter.groupScopeInfo.groupMember_ != null
+      && chatsCtx.secondaryContextFilter.groupScopeInfo.groupMember_.memberPending
+      && composeState.value.contextItem == ComposeContextItem.NoContextItem
+      && composeState.value.preview == ComposePreview.NoPreview
+    ) {
+      ComposeContextPendingMemberActionsView(
+        rhId = rhId,
+        groupInfo = chat.chatInfo.groupInfo,
+        member = chatsCtx.secondaryContextFilter.groupScopeInfo.groupMember_
+      )
+    }
     if (nextSendGrpInv.value) {
       ComposeContextInvitingContactMemberView()
     }
@@ -957,8 +1037,8 @@ fun ComposeView(
     if (ctx is ComposeContextItem.ReportedItem) {
       ReportReasonView(ctx.reason)
     }
-    val simplexLinkProhibited = hasSimplexLink.value && !chat.groupFeatureEnabled(GroupFeature.SimplexLinks)
-    val fileProhibited = composeState.value.attachmentPreview && !chat.groupFeatureEnabled(GroupFeature.Files)
+    val simplexLinkProhibited = chatsCtx.secondaryContextFilter == null && hasSimplexLink.value && !chat.groupFeatureEnabled(GroupFeature.SimplexLinks)
+    val fileProhibited = chatsCtx.secondaryContextFilter == null && composeState.value.attachmentPreview && !chat.groupFeatureEnabled(GroupFeature.Files)
     val voiceProhibited = composeState.value.preview is ComposePreview.VoicePreview && !chat.chatInfo.featureEnabled(ChatFeature.Voice)
     if (composeState.value.preview !is ComposePreview.VoicePreview || composeState.value.editing) {
       if (simplexLinkProhibited) {
@@ -987,7 +1067,10 @@ fun ComposeView(
     Surface(color = MaterialTheme.colors.background, contentColor = MaterialTheme.colors.onBackground) {
       Divider()
       Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
-        val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
+        val isGroupAndProhibitedFiles =
+          chatsCtx.secondaryContextFilter == null
+              && chat.chatInfo is ChatInfo.Group
+              && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
         val attachmentClicked = if (isGroupAndProhibitedFiles) {
           {
             AlertManager.shared.showAlertMsg(
@@ -1001,7 +1084,6 @@ fun ComposeView(
         val attachmentEnabled =
           !composeState.value.attachmentDisabled
               && sendMsgEnabled.value
-              && userCanSend.value
               && !isGroupAndProhibitedFiles
               && !nextSendGrpInv.value
         IconButton(
@@ -1047,8 +1129,8 @@ fun ComposeView(
             }
         }
 
-        LaunchedEffect(rememberUpdatedState(chat.chatInfo.userCanSend).value) {
-          if (!chat.chatInfo.userCanSend) {
+        LaunchedEffect(rememberUpdatedState(chat.chatInfo.sendMsgEnabled).value) {
+          if (!chat.chatInfo.sendMsgEnabled) {
             clearCurrentDraft()
             clearState()
           }
@@ -1056,7 +1138,7 @@ fun ComposeView(
 
         KeyChangeEffect(chatModel.chatId.value) { prevChatId ->
           val cs = composeState.value
-          if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
+          if (cs.liveMessage != null && (cs.message.text.isNotEmpty() || cs.liveMessage.sent)) {
             sendMessage(null)
             resetLinkPreview()
             clearPrevDraft(prevChatId)
@@ -1104,13 +1186,12 @@ fun ComposeView(
           chat.chatInfo is ChatInfo.Direct,
           liveMessageAlertShown = chatModel.controller.appPrefs.liveMessageAlertShown,
           sendMsgEnabled = sendMsgEnabled.value,
+          userCantSendReason = userCantSendReason.value,
           sendButtonEnabled = sendMsgEnabled.value && !(simplexLinkProhibited || fileProhibited || voiceProhibited),
           nextSendGrpInv = nextSendGrpInv.value,
           needToAllowVoiceToContact,
           allowedVoiceByPrefs,
           allowVoiceToContact = ::allowVoiceToContact,
-          userIsObserver = userIsObserver.value,
-          userCanSend = userCanSend.value,
           sendButtonColor = sendButtonColor,
           timedMessageAllowed = timedMessageAllowed,
           customDisappearingMessageTimePref = chatModel.controller.appPrefs.customDisappearingMessageTime,
@@ -1128,7 +1209,8 @@ fun ComposeView(
           editPrevMessage = ::editPrevMessage,
           onFilesPasted = { composeState.onFilesAttached(it) },
           onMessageChange = ::onMessageChange,
-          textStyle = textStyle
+          textStyle = textStyle,
+          focusRequester = focusRequester,
         )
       }
     }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContactPreferences.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContactPreferences.kt
index b1e9bf750e..7c04c30f67 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContactPreferences.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContactPreferences.kt
@@ -12,16 +12,16 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import dev.icerock.moko.resources.compose.stringResource
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.PreferenceToggle
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.common.platform.chatModel
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 
 @Composable
 fun ContactPreferencesView(
@@ -41,8 +41,8 @@ fun ContactPreferencesView(
       val prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
       val toContact = m.controller.apiSetContactPrefs(rhId, ct.contactId, prefs)
       if (toContact != null) {
-        withChats {
-          updateContact(rhId, toContact)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateContact(rhId, toContact)
           currentFeaturesAllowed = featuresAllowed
         }
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContextItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContextItemView.kt
index 1657a1f0b7..1501fb7938 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContextItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ContextItemView.kt
@@ -31,7 +31,7 @@ fun ContextItemView(
   contextItems: List<ChatItem>,
   contextIcon: Painter,
   showSender: Boolean = true,
-  chatType: ChatType,
+  chatInfo: ChatInfo,
   contextIconColor: Color = MaterialTheme.colors.secondary,
   cancelContextItem: () -> Unit,
 ) {
@@ -64,6 +64,11 @@ fun ContextItemView(
       inlineContent = inlineContent,
       linkMode = SimplexLinkMode.DESCRIPTION,
       modifier = Modifier.fillMaxWidth(),
+      mentions = contextItem.mentions,
+      userMemberId = when {
+        chatInfo is ChatInfo.Group -> chatInfo.groupInfo.membership.memberId
+        else -> null
+      }
     )
   }
 
@@ -126,7 +131,7 @@ fun ContextItemView(
           ContextMsgPreview(contextItem, lines = 3)
         }
       } else if (contextItems.isNotEmpty()) {
-        Text(String.format(generalGetString(if (chatType == ChatType.Local) MR.strings.compose_save_messages_n else MR.strings.compose_forward_messages_n), contextItems.count()), fontStyle = FontStyle.Italic)
+        Text(String.format(generalGetString(if (chatInfo.chatType == ChatType.Local) MR.strings.compose_save_messages_n else MR.strings.compose_forward_messages_n), contextItems.count()), fontStyle = FontStyle.Italic)
       }
     }
     IconButton(onClick = cancelContextItem) {
@@ -147,7 +152,7 @@ fun PreviewContextItemView() {
     ContextItemView(
       contextItems = listOf(ChatItem.getSampleData(1, CIDirection.DirectRcv(), Clock.System.now(), "hello")),
       contextIcon = painterResource(MR.images.ic_edit_filled),
-      chatType = ChatType.Direct
+      chatInfo = Chat.sampleData.chatInfo
     ) {}
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
index e449831ee0..ac722783a3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
@@ -7,12 +7,12 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.BackHandler
 import chat.simplex.common.platform.chatModel
 import chat.simplex.common.views.helpers.*
@@ -21,41 +21,55 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 
 @Composable
-fun BoxScope.SelectedItemsTopToolbar(selectedChatItems: MutableState<Set<Long>?>, onTop: Boolean) {
-  val onBackClicked = { selectedChatItems.value = null }
+fun BoxScope.SelectedItemsCounterToolbar(selectedItems: MutableState<Set<Long>?>, onTop: Boolean, selectAll: (() -> Unit)? = null) {
+  val onBackClicked = { selectedItems.value = null }
   BackHandler(onBack = onBackClicked)
-  val count = selectedChatItems.value?.size ?: 0
-  DefaultAppBar(
-    navigationButton = { NavigationButtonClose(onButtonClicked = onBackClicked) },
-    title = {
-      Text(
-        if (count == 0) {
-          stringResource(MR.strings.selected_chat_items_nothing_selected)
-        } else {
-          stringResource(MR.strings.selected_chat_items_selected_n).format(count)
-        },
-        fontWeight = FontWeight.SemiBold,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis
-      )
-    },
-    onTitleClick = null,
-    onTop = onTop,
-    onSearchValueChanged = {},
-  )
+  val count = selectedItems.value?.size ?: 0
+  Box(if (onTop) Modifier else Modifier.imePadding()) {
+    DefaultAppBar(
+      navigationButton = { NavigationButtonClose(onButtonClicked = onBackClicked) },
+      title = {
+        Text(
+          if (count == 0) {
+            stringResource(MR.strings.selected_chat_items_nothing_selected)
+          } else {
+            stringResource(MR.strings.selected_chat_items_selected_n).format(count)
+          },
+          fontWeight = FontWeight.SemiBold,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis
+        )
+      },
+      onTitleClick = null,
+      onTop = onTop,
+      onSearchValueChanged = {},
+      buttons = if (selectAll != null) { { SelectAllButton(selectAll) } } else {{}}
+    )
+  }
 }
 
 @Composable
-fun SelectedItemsBottomToolbar(
+private fun SelectAllButton(onClick: () -> Unit) {
+  IconButton(onClick) {
+    Icon(
+      painterResource(MR.images.ic_checklist), stringResource(MR.strings.back), Modifier.height(24.dp), tint = MaterialTheme.colors.primary
+    )
+  }
+}
+
+@Composable
+fun SelectedItemsButtonsToolbar(
+  chatsCtx: ChatModel.ChatsContext,
   chatInfo: ChatInfo,
-  reversedChatItems: State<List<ChatItem>>,
   selectedChatItems: MutableState<Set<Long>?>,
   deleteItems: (Boolean) -> Unit, // Boolean - delete for everyone is possible
+  archiveItems: () -> Unit,
   moderateItems: () -> Unit,
   forwardItems: () -> Unit,
 ) {
   val deleteEnabled = remember { mutableStateOf(false) }
   val deleteForEveryoneEnabled = remember { mutableStateOf(false) }
+  val canArchiveReports = remember { mutableStateOf(false) }
   val canModerate = remember { mutableStateOf(false) }
   val moderateEnabled = remember { mutableStateOf(false) }
   val forwardEnabled = remember { mutableStateOf(false) }
@@ -63,7 +77,7 @@ fun SelectedItemsBottomToolbar(
   val forwardCountProhibited = remember { mutableStateOf(false) }
   Box {
     // It's hard to measure exact height of ComposeView with different fontSizes. Better to depend on actual ComposeView, even empty
-    ComposeView(chatModel = chatModel, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(null) }, {})
+    ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
     Row(
       Modifier
         .matchParentSize()
@@ -78,7 +92,7 @@ fun SelectedItemsBottomToolbar(
       horizontalArrangement = Arrangement.SpaceBetween,
       verticalAlignment = Alignment.CenterVertically
     ) {
-      IconButton({ deleteItems(deleteForEveryoneEnabled.value) }, enabled = deleteEnabled.value && !deleteCountProhibited.value) {
+      IconButton({ if (canArchiveReports.value) archiveItems() else deleteItems(deleteForEveryoneEnabled.value) }, enabled = deleteEnabled.value && !deleteCountProhibited.value) {
         Icon(
           painterResource(MR.images.ic_delete),
           null,
@@ -87,28 +101,29 @@ fun SelectedItemsBottomToolbar(
         )
       }
 
-      IconButton({ moderateItems() }, Modifier.alpha(if (canModerate.value) 1f else 0f), enabled = moderateEnabled.value && !deleteCountProhibited.value) {
+      IconButton({ moderateItems() }, Modifier.alpha(if (canModerate.value) 1f else 0f), enabled = moderateEnabled.value && !deleteCountProhibited.value && chatsCtx.secondaryContextFilter == null) {
         Icon(
           painterResource(MR.images.ic_flag),
           null,
           Modifier.size(22.dp),
-          tint = if (!moderateEnabled.value || deleteCountProhibited.value) MaterialTheme.colors.secondary else MaterialTheme.colors.error
+          tint = if (!moderateEnabled.value || deleteCountProhibited.value || chatsCtx.secondaryContextFilter != null) MaterialTheme.colors.secondary else MaterialTheme.colors.error
         )
       }
 
-      IconButton({ forwardItems() }, enabled = forwardEnabled.value && !forwardCountProhibited.value) {
+      IconButton({ forwardItems() }, enabled = forwardEnabled.value && !forwardCountProhibited.value && chatsCtx.secondaryContextFilter == null) {
         Icon(
           painterResource(MR.images.ic_forward),
           null,
           Modifier.size(22.dp),
-          tint = if (!forwardEnabled.value || forwardCountProhibited.value) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
+          tint = if (!forwardEnabled.value || forwardCountProhibited.value || chatsCtx.secondaryContextFilter != null) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
         )
       }
     }
     Divider(Modifier.align(Alignment.TopStart))
   }
-  LaunchedEffect(chatInfo, reversedChatItems.value, selectedChatItems.value) {
-    recheckItems(chatInfo, reversedChatItems.value.asReversed(), selectedChatItems, deleteEnabled, deleteForEveryoneEnabled, canModerate, moderateEnabled, forwardEnabled, deleteCountProhibited, forwardCountProhibited)
+  val chatItems = remember { derivedStateOf { chatsCtx.chatItems.value } }
+  LaunchedEffect(chatInfo, chatItems.value, selectedChatItems.value) {
+    recheckItems(chatInfo, chatItems.value, selectedChatItems, deleteEnabled, deleteForEveryoneEnabled, canArchiveReports, canModerate, moderateEnabled, forwardEnabled, deleteCountProhibited, forwardCountProhibited)
   }
 }
 
@@ -117,6 +132,7 @@ private fun recheckItems(chatInfo: ChatInfo,
   selectedChatItems: MutableState<Set<Long>?>,
   deleteEnabled: MutableState<Boolean>,
   deleteForEveryoneEnabled: MutableState<Boolean>,
+  canArchiveReports:  MutableState<Boolean>,
   canModerate: MutableState<Boolean>,
   moderateEnabled: MutableState<Boolean>,
   forwardEnabled: MutableState<Boolean>,
@@ -130,6 +146,7 @@ private fun recheckItems(chatInfo: ChatInfo,
   val selected = selectedChatItems.value ?: return
   var rDeleteEnabled = true
   var rDeleteForEveryoneEnabled = true
+  var rCanArchiveReports = true
   var rModerateEnabled = true
   var rOnlyOwnGroupItems = true
   var rForwardEnabled = true
@@ -138,6 +155,7 @@ private fun recheckItems(chatInfo: ChatInfo,
     if (selected.contains(ci.id)) {
       rDeleteEnabled = rDeleteEnabled && ci.canBeDeletedForSelf
       rDeleteForEveryoneEnabled = rDeleteForEveryoneEnabled && ci.meta.deletable && !ci.localNote && !ci.isReport
+      rCanArchiveReports = rCanArchiveReports && ci.isActiveReport && ci.chatDir !is CIDirection.GroupSnd && chatInfo is ChatInfo.Group && chatInfo.groupInfo.membership.memberRole >= GroupMemberRole.Moderator
       rOnlyOwnGroupItems = rOnlyOwnGroupItems && ci.chatDir is CIDirection.GroupSnd && !ci.isReport
       rModerateEnabled = rModerateEnabled && ci.content.msgContent != null && ci.memberToModerate(chatInfo) != null && !ci.isReport
       rForwardEnabled = rForwardEnabled && ci.content.msgContent != null && ci.meta.itemDeleted == null && !ci.isLiveDummy && !ci.isReport
@@ -147,10 +165,11 @@ private fun recheckItems(chatInfo: ChatInfo,
   rModerateEnabled = rModerateEnabled && !rOnlyOwnGroupItems
   deleteEnabled.value = rDeleteEnabled
   deleteForEveryoneEnabled.value = rDeleteForEveryoneEnabled
+  canArchiveReports.value = rCanArchiveReports
   moderateEnabled.value = rModerateEnabled
   forwardEnabled.value = rForwardEnabled
   selectedChatItems.value = rSelectedChatItems
 }
 
 private fun possibleToModerate(chatInfo: ChatInfo): Boolean =
-  chatInfo is ChatInfo.Group && chatInfo.groupInfo.membership.memberRole >= GroupMemberRole.Admin
+  chatInfo is ChatInfo.Group && chatInfo.groupInfo.membership.memberRole >= GroupMemberRole.Moderator
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt
index e2b44478af..5710f09ed5 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt
@@ -12,9 +12,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.*
@@ -39,12 +39,11 @@ fun SendMsgView(
   isDirectChat: Boolean,
   liveMessageAlertShown: SharedPreference<Boolean>,
   sendMsgEnabled: Boolean,
+  userCantSendReason: Pair<String, String?>?,
   sendButtonEnabled: Boolean,
   nextSendGrpInv: Boolean,
   needToAllowVoiceToContact: Boolean,
   allowedVoiceByPrefs: Boolean,
-  userIsObserver: Boolean,
-  userCanSend: Boolean,
   sendButtonColor: Color = MaterialTheme.colors.primary,
   allowVoiceToContact: () -> Unit,
   timedMessageAllowed: Boolean = false,
@@ -56,11 +55,11 @@ fun SendMsgView(
   cancelLiveMessage: (() -> Unit)? = null,
   editPrevMessage: () -> Unit,
   onFilesPasted: (List<URI>) -> Unit,
-  onMessageChange: (String) -> Unit,
-  textStyle: MutableState<TextStyle>
-) {
+  onMessageChange: (ComposeMessage) -> Unit,
+  textStyle: MutableState<TextStyle>,
+  focusRequester: FocusRequester? = null,
+  ) {
   val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }
-
   val padding = if (appPlatform.isAndroid) PaddingValues(vertical = 8.dp) else PaddingValues(top = 3.dp, bottom = 4.dp)
   Box(Modifier.padding(padding)) {
     val cs = composeState.value
@@ -73,42 +72,50 @@ fun SendMsgView(
         false
       }
     }
-    val showVoiceButton = !nextSendGrpInv && cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
+    val showVoiceButton = !nextSendGrpInv && cs.message.text.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
         !composeState.value.forwarding && cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started) && (cs.contextItem !is ComposeContextItem.ReportedItem)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
     val sendMsgButtonDisabled = !sendMsgEnabled || !cs.sendEnabled() ||
       (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
         cs.endLiveDisabled ||
         !sendButtonEnabled
-    val clicksOnTextFieldDisabled = !sendMsgEnabled || cs.preview is ComposePreview.VoicePreview || !userCanSend || cs.inProgress
+    val clicksOnTextFieldDisabled = !sendMsgEnabled || cs.preview is ComposePreview.VoicePreview || cs.inProgress
     PlatformTextField(
       composeState,
       sendMsgEnabled,
+      disabledText = userCantSendReason?.first,
       sendMsgButtonDisabled,
       textStyle,
       showDeleteTextButton,
-      userIsObserver,
       if (clicksOnTextFieldDisabled) "" else placeholder,
       showVoiceButton,
       onMessageChange,
       editPrevMessage,
-      onFilesPasted
+      onFilesPasted,
+      focusRequester
     ) {
       if (!cs.inProgress) {
         sendMessage(null)
       }
     }
     if (clicksOnTextFieldDisabled) {
-      Box(
-        Modifier
-          .matchParentSize()
-          .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(MR.strings.observer_cant_send_message_title),
-              text = generalGetString(MR.strings.observer_cant_send_message_desc)
-            )
-          })
-      )
+      if (userCantSendReason != null) {
+        Box(
+          Modifier
+            .matchParentSize()
+            .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
+              AlertManager.shared.showAlertMsg(
+                title = generalGetString(MR.strings.cant_send_message_alert_title),
+                text = userCantSendReason.second
+              )
+            })
+        )
+      } else {
+        Box(
+          Modifier
+            .matchParentSize()
+        )
+      }
     }
     if (showDeleteTextButton.value) {
       DeleteTextButton(composeState)
@@ -132,11 +139,11 @@ fun SendMsgView(
           Row(verticalAlignment = Alignment.CenterVertically) {
             val stopRecOnNextClick = remember { mutableStateOf(false) }
             when {
-              needToAllowVoiceToContact || !allowedVoiceByPrefs || !userCanSend -> {
-                DisallowedVoiceButton(userCanSend) {
+              needToAllowVoiceToContact || !allowedVoiceByPrefs -> {
+                DisallowedVoiceButton {
                   if (needToAllowVoiceToContact) {
                     showNeedToAllowVoiceAlert(allowVoiceToContact)
-                  } else if (!allowedVoiceByPrefs) {
+                  } else {
                     showDisabledVoiceAlert(isDirectChat)
                   }
                 }
@@ -152,7 +159,7 @@ fun SendMsgView(
               && cs.contextItem is ComposeContextItem.NoContextItem
             ) {
               Spacer(Modifier.width(12.dp))
-              StartLiveMessageButton(userCanSend) {
+              StartLiveMessageButton {
                 if (composeState.value.preview is ComposePreview.NoPreview) {
                   startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
                 }
@@ -160,7 +167,7 @@ fun SendMsgView(
             }
           }
         }
-        cs.liveMessage?.sent == false && cs.message.isEmpty() -> {
+        cs.liveMessage?.sent == false && cs.message.text.isEmpty() -> {
           CancelLiveMessageButton {
             cancelLiveMessage?.invoke()
           }
@@ -280,7 +287,7 @@ private fun CustomDisappearingMessageDialog(
 @Composable
 private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>) {
   IconButton(
-    { composeState.value = composeState.value.copy(message = "") },
+    { composeState.value = composeState.value.copy(message = ComposeMessage()) },
     Modifier.align(Alignment.TopEnd).size(36.dp)
   ) {
     Icon(painterResource(MR.images.ic_close), null, Modifier.padding(7.dp).size(36.dp), tint = MaterialTheme.colors.secondary)
@@ -340,8 +347,8 @@ private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNex
 }
 
 @Composable
-private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
+private fun DisallowedVoiceButton(onClick: () -> Unit) {
+  IconButton(onClick, Modifier.size(36.dp)) {
     Icon(
       painterResource(MR.images.ic_keyboard_voice),
       stringResource(MR.strings.icon_descr_record_voice_message),
@@ -457,14 +464,13 @@ private fun SendMsgButton(
 }
 
 @Composable
-private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
+private fun StartLiveMessageButton(onClick: () -> Unit) {
   val interactionSource = remember { MutableInteractionSource() }
   val ripple = remember { ripple(bounded = false, radius = 24.dp) }
   Box(
     modifier = Modifier.requiredSize(36.dp)
       .clickable(
         onClick = onClick,
-        enabled = enabled,
         role = Role.Button,
         interactionSource = interactionSource,
         indication = ripple
@@ -474,7 +480,7 @@ private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
     Icon(
       BoltFilled,
       stringResource(MR.strings.icon_descr_send_message),
-      tint = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+      tint = MaterialTheme.colors.primary,
       modifier = Modifier
         .size(36.dp)
         .padding(4.dp)
@@ -573,12 +579,11 @@ fun PreviewSendMsgView() {
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       sendMsgEnabled = true,
+      userCantSendReason = null,
       sendButtonEnabled = true,
       nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
       allowVoiceToContact = {},
       timedMessageAllowed = false,
       placeholder = "",
@@ -586,7 +591,7 @@ fun PreviewSendMsgView() {
       editPrevMessage = {},
       onMessageChange = { _ -> },
       onFilesPasted = {},
-      textStyle = textStyle
+      textStyle = textStyle,
     )
   }
 }
@@ -609,12 +614,11 @@ fun PreviewSendMsgViewEditing() {
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       sendMsgEnabled = true,
+      userCantSendReason = null,
       sendButtonEnabled = true,
       nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
       allowVoiceToContact = {},
       timedMessageAllowed = false,
       placeholder = "",
@@ -622,7 +626,7 @@ fun PreviewSendMsgViewEditing() {
       editPrevMessage = {},
       onMessageChange = { _ -> },
       onFilesPasted = {},
-      textStyle = textStyle
+      textStyle = textStyle,
     )
   }
 }
@@ -645,12 +649,11 @@ fun PreviewSendMsgViewInProgress() {
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       sendMsgEnabled = true,
+      userCantSendReason = null,
       sendButtonEnabled = true,
       nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
       allowVoiceToContact = {},
       timedMessageAllowed = false,
       placeholder = "",
@@ -658,7 +661,7 @@ fun PreviewSendMsgViewInProgress() {
       editPrevMessage = {},
       onMessageChange = { _ -> },
       onFilesPasted = {},
-      textStyle = textStyle
+      textStyle = textStyle,
     )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt
index e670fae5ef..91f7af2b95 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt
@@ -68,7 +68,7 @@ private fun VerifyCodeLayout(
       }
     }
 
-    QRCode(connectionCode, padding = PaddingValues(vertical = DEFAULT_PADDING_HALF))
+    QRCode(connectionCode, small = true, padding = PaddingValues(vertical = DEFAULT_PADDING_HALF))
 
     Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
       Spacer(Modifier.weight(2f))
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt
index abfb3895d9..827af085ea 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt
@@ -25,8 +25,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.ChatInfoToolbarTitle
 import chat.simplex.common.views.helpers.*
@@ -35,6 +33,7 @@ import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
+import kotlinx.coroutines.*
 
 @Composable
 fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolean = false, chatModel: ChatModel, close: () -> Unit) {
@@ -56,17 +55,27 @@ fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolea
         GroupPreferencesView(chatModel, rhId, groupInfo.id, close)
       }
     },
+    openMemberAdmission = {
+      ModalManager.end.showCustomModal { close ->
+        MemberAdmissionView(
+          chat.simplex.common.platform.chatModel,
+          rhId,
+          groupInfo.id,
+          close
+        )
+      }
+    },
     inviteMembers = {
       allowModifyMembers = false
       withLongRunningApi(slow = 120_000) {
         for (contactId in selectedContacts) {
           val member = chatModel.controller.apiAddMember(rhId, groupInfo.groupId, contactId, selectedRole.value)
           if (member != null) {
-            withChats {
-              upsertGroupMember(rhId, groupInfo, member)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.upsertGroupMember(rhId, groupInfo, member)
             }
-            withReportsChatsIfOpen {
-              upsertGroupMember(rhId, groupInfo, member)
+            withContext(Dispatchers.Main) {
+              chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, groupInfo, member)
             }
           } else {
             break
@@ -94,8 +103,9 @@ fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
     .asSequence()
     .map { it.chatInfo }
     .filterIsInstance<ChatInfo.Direct>()
+    .filter { it.sendMsgEnabled }
     .map { it.contact }
-    .filter { c -> c.sendMsgEnabled && !c.nextSendGrpInv && c.contactId !in memberContactIds && c.anyNameContains(s)
+    .filter { c -> !c.nextSendGrpInv && c.contactId !in memberContactIds && c.anyNameContains(s)
     }
     .sortedBy { it.displayName.lowercase() }
     .toList()
@@ -111,6 +121,7 @@ fun AddGroupMembersLayout(
   allowModifyMembers: Boolean,
   searchText: MutableState<TextFieldValue>,
   openPreferences: () -> Unit,
+  openMemberAdmission: () -> Unit,
   inviteMembers: () -> Unit,
   clearSelection: () -> Unit,
   addContact: (Long) -> Unit,
@@ -145,7 +156,7 @@ fun AddGroupMembersLayout(
       horizontalArrangement = Arrangement.Center
     ) {
       ChatInfoToolbarTitle(
-        ChatInfo.Group(groupInfo),
+        ChatInfo.Group(groupInfo, groupChatScope = null),
         imageSize = 60.dp,
         iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight
       )
@@ -166,6 +177,9 @@ fun AddGroupMembersLayout(
     } else {
       SectionView {
         if (creatingGroup) {
+          SectionItemView(openMemberAdmission) {
+            Text(stringResource(MR.strings.set_member_admission))
+          }
           SectionItemView(openPreferences) {
             Text(stringResource(MR.strings.set_group_preferences))
           }
@@ -377,6 +391,7 @@ fun PreviewAddGroupMembersLayout() {
       allowModifyMembers = true,
       searchText = remember { mutableStateOf(TextFieldValue("")) },
       openPreferences = {},
+      openMemberAdmission = {},
       inviteMembers = {},
       clearSelection = {},
       addContact = {},
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt
index 9b2986ef83..db6eff562e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt
@@ -8,6 +8,8 @@ import SectionItemViewLongClickable
 import SectionSpacer
 import SectionTextFooter
 import SectionView
+import androidx.compose.animation.*
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
@@ -17,6 +19,7 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.AnnotatedString
@@ -29,24 +32,37 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.chat.*
-import chat.simplex.common.views.chat.item.ItemAction
+import chat.simplex.common.views.chat.item.*
 import chat.simplex.common.views.chatlist.*
+import chat.simplex.common.views.database.TtlOptions
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
 
 const val SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
+val MEMBER_ROW_AVATAR_SIZE = 42.dp
+val MEMBER_ROW_VERTICAL_PADDING = 8.dp
 
 @Composable
-fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: String, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, scrollToItemId: MutableState<Long?>, onGroupLinkUpdated: (Pair<String, GroupMemberRole>?) -> Unit, close: () -> Unit, onSearchClicked: () -> Unit) {
+fun ModalData.GroupChatInfoView(
+  chatsCtx: ChatModel.ChatsContext,
+  rhId: Long?,
+  chatId: String,
+  groupLink: CreatedConnLink?,
+  groupLinkMemberRole: GroupMemberRole?,
+  selectedItems: MutableState<Set<Long>?>,
+  appBar: MutableState<@Composable (BoxScope.() -> Unit)?>,
+  scrollToItemId: MutableState<Long?>,
+  onGroupLinkUpdated: (Pair<CreatedConnLink, GroupMemberRole>?) -> Unit,
+  close: () -> Unit,
+  onSearchClicked: () -> Unit
+) {
   BackHandler(onBack = close)
   // TODO derivedStateOf?
   val chat = chatModel.chats.value.firstOrNull { ch -> ch.id == chatId && ch.remoteHostId == rhId }
@@ -55,7 +71,13 @@ fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: Strin
   if (chat != null && chat.chatInfo is ChatInfo.Group && currentUser != null) {
     val groupInfo = chat.chatInfo.groupInfo
     val sendReceipts = remember { mutableStateOf(SendReceipts.fromBool(groupInfo.chatSettings.sendRcpts, currentUser.sendRcptsSmallGroups)) }
+    val chatItemTTL = remember(groupInfo.id) { mutableStateOf(if (groupInfo.chatItemTTL != null) ChatItemTTL.fromSeconds(groupInfo.chatItemTTL) else null) }
+    val deletingItems = rememberSaveable(groupInfo.id) { mutableStateOf(false) }
     val scope = rememberCoroutineScope()
+    val activeSortedMembers = remember { chatModel.groupMembers }.value
+      .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
+      .sortedByDescending { it.memberRole }
+
     GroupChatInfoLayout(
       chat,
       groupInfo,
@@ -66,12 +88,22 @@ fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: Strin
         updateChatSettings(chat.remoteHostId, chat.chatInfo, chatSettings, chatModel)
         sendReceipts.value = sendRcpts
       },
-      members = remember { chatModel.groupMembers }.value
-        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
-        .sortedByDescending { it.memberRole },
+      chatItemTTL = chatItemTTL,
+      setChatItemTTL = {
+        if (it == chatItemTTL.value) {
+          return@GroupChatInfoLayout
+        }
+        val previousChatTTL = chatItemTTL.value
+        chatItemTTL.value = it
+
+        setChatTTLAlert(chatsCtx, chat.remoteHostId, chat.chatInfo, chatItemTTL, previousChatTTL, deletingItems)
+      },
+      activeSortedMembers = activeSortedMembers,
       developerTools,
       onLocalAliasChanged = { setGroupAlias(chat, it, chatModel) },
       groupLink,
+      selectedItems,
+      appBar,
       scrollToItemId,
       addMembers = {
         scope.launch(Dispatchers.Default) {
@@ -95,7 +127,7 @@ fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: Strin
           }
           ModalManager.end.showModalCloseable(true) { closeCurrent ->
             remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
-              GroupMemberInfoView(rhId, groupInfo, mem, stats, code, chatModel, closeCurrent) {
+              GroupMemberInfoView(rhId, groupInfo, mem, scrollToItemId, stats, code, chatModel, closeCurrent) {
                 closeCurrent()
                 close()
               }
@@ -109,6 +141,17 @@ fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: Strin
       addOrEditWelcomeMessage = {
         ModalManager.end.showCustomModal { close -> GroupWelcomeView(chatModel, rhId, groupInfo, close) }
       },
+      openMemberSupport = {
+        ModalManager.end.showCustomModal { close ->
+          MemberSupportView(
+            rhId,
+            chat,
+            groupInfo,
+            scrollToItemId,
+            close
+          )
+        }
+      },
       openPreferences = {
         ModalManager.end.showCustomModal { close ->
           GroupPreferencesView(
@@ -125,7 +168,8 @@ fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: Strin
       manageGroupLink = {
           ModalManager.end.showModal { GroupLinkView(chatModel, rhId, groupInfo, groupLink, groupLinkMemberRole, onGroupLinkUpdated) }
       },
-      onSearchClicked = onSearchClicked
+      onSearchClicked = onSearchClicked,
+      deletingItems = deletingItems
     )
   }
 }
@@ -149,8 +193,8 @@ fun deleteGroupDialog(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, cl
       withBGApi {
         val r = chatModel.controller.apiDeleteChat(chat.remoteHostId, chatInfo.chatType, chatInfo.apiId)
         if (r) {
-          withChats {
-            removeChat(chat.remoteHostId, chatInfo.id)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.removeChat(chat.remoteHostId, chatInfo.id)
             if (chatModel.chatId.value == chatInfo.id) {
               chatModel.chatId.value = null
               ModalManager.end.closeModals()
@@ -195,17 +239,23 @@ private fun removeMemberAlert(rhId: Long?, groupInfo: GroupInfo, mem: GroupMembe
     text = generalGetString(messageId),
     confirmText = generalGetString(MR.strings.remove_member_confirmation),
     onConfirm = {
-      withBGApi {
-        val updatedMember = chatModel.controller.apiRemoveMember(rhId, groupInfo.groupId, mem.groupMemberId)
-        if (updatedMember != null) {
-          withChats {
-            upsertGroupMember(rhId, groupInfo, updatedMember)
-          }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, groupInfo, updatedMember)
-          }
-        }
-      }
+      removeMembers(rhId, groupInfo, listOf(mem.groupMemberId))
+    },
+    destructive = true,
+  )
+}
+
+private fun removeMembersAlert(rhId: Long?, groupInfo: GroupInfo, memberIds: List<Long>, onSuccess: () -> Unit = {}) {
+  val messageId = if (groupInfo.businessChat == null)
+    MR.strings.members_will_be_removed_from_group_cannot_be_undone
+  else
+    MR.strings.members_will_be_removed_from_chat_cannot_be_undone
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.button_remove_members_question),
+    text = generalGetString(messageId),
+    confirmText = generalGetString(MR.strings.remove_member_confirmation),
+    onConfirm = {
+      removeMembers(rhId, groupInfo, memberIds, onSuccess)
     },
     destructive = true,
   )
@@ -242,16 +292,17 @@ fun MuteButton(
   chat: Chat,
   groupInfo: GroupInfo
 ) {
-  val ntfsEnabled = remember { mutableStateOf(chat.chatInfo.ntfsEnabled) }
+  val notificationMode = remember { mutableStateOf(groupInfo.chatSettings.enableNtfs) }
+  val nextNotificationMode by remember { derivedStateOf { notificationMode.value.nextMode(true) } }
 
   InfoViewActionButton(
     modifier = modifier,
-    icon =  if (ntfsEnabled.value) painterResource(MR.images.ic_notifications_off) else painterResource(MR.images.ic_notifications),
-    title = if (ntfsEnabled.value) stringResource(MR.strings.mute_chat) else stringResource(MR.strings.unmute_chat),
+    icon =  painterResource(nextNotificationMode.icon),
+    title = generalGetString(nextNotificationMode.text(true)),
     disabled = !groupInfo.ready,
     disabledLook = !groupInfo.ready,
     onClick = {
-      toggleNotifications(chat.remoteHostId, chat.chatInfo, !ntfsEnabled.value, chatModel, ntfsEnabled)
+      toggleNotifications(chat.remoteHostId, chat.chatInfo, nextNotificationMode, chatModel, notificationMode)
     }
   )
 }
@@ -278,6 +329,40 @@ fun AddGroupMembersButton(
   )
 }
 
+@Composable
+fun UserSupportChatButton(
+  chat: Chat,
+  groupInfo: GroupInfo,
+  scrollToItemId: MutableState<Long?>
+) {
+  val scope = rememberCoroutineScope()
+
+  SettingsActionItemWithContent(
+    painterResource(if (chat.supportUnreadCount > 0) MR.images.ic_flag_filled else MR.images.ic_flag),
+    stringResource(MR.strings.button_support_chat),
+    click = {
+      val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = null)
+      val supportChatInfo = ChatInfo.Group(groupInfo, groupChatScope = scopeInfo)
+      scope.launch {
+        showMemberSupportChatView(
+          chatModel.chatId,
+          scrollToItemId = scrollToItemId,
+          supportChatInfo,
+          scopeInfo
+        )
+      }
+    },
+    iconColor = (if (chat.supportUnreadCount > 0) MaterialTheme.colors.primary else MaterialTheme.colors.secondary),
+  ) {
+    if (chat.supportUnreadCount > 0) {
+      UnreadBadge(
+        text = unreadCountStr(chat.supportUnreadCount),
+        backgroundColor = MaterialTheme.colors.primary
+      )
+    }
+  }
+}
+
 @Composable
 fun ModalData.GroupChatInfoLayout(
   chat: Chat,
@@ -285,22 +370,28 @@ fun ModalData.GroupChatInfoLayout(
   currentUser: User,
   sendReceipts: State<SendReceipts>,
   setSendReceipts: (SendReceipts) -> Unit,
-  members: List<GroupMember>,
+  chatItemTTL: MutableState<ChatItemTTL?>,
+  setChatItemTTL: (ChatItemTTL?) -> Unit,
+  activeSortedMembers: List<GroupMember>,
   developerTools: Boolean,
   onLocalAliasChanged: (String) -> Unit,
-  groupLink: String?,
+  groupLink: CreatedConnLink?,
+  selectedItems: MutableState<Set<Long>?>,
+  appBar: MutableState<@Composable (BoxScope.() -> Unit)?>,
   scrollToItemId: MutableState<Long?>,
   addMembers: () -> Unit,
   showMemberInfo: (GroupMember) -> Unit,
   editGroupProfile: () -> Unit,
   addOrEditWelcomeMessage: () -> Unit,
+  openMemberSupport: () -> Unit,
   openPreferences: () -> Unit,
   deleteGroup: () -> Unit,
   clearChat: () -> Unit,
   leaveGroup: () -> Unit,
   manageGroupLink: () -> Unit,
   close: () -> Unit = { ModalManager.closeAllModalsEverywhere()},
-  onSearchClicked: () -> Unit
+  onSearchClicked: () -> Unit,
+  deletingItems: State<Boolean>
 ) {
   val listState = remember { appBarHandler.listState }
   val scope = rememberCoroutineScope()
@@ -308,20 +399,38 @@ fun ModalData.GroupChatInfoLayout(
     scope.launch { listState.scrollToItem(0) }
   }
   val searchText = remember { stateGetOrPut("searchText") { TextFieldValue() } }
-  val filteredMembers = remember(members) {
+  val filteredMembers = remember(activeSortedMembers) {
     derivedStateOf {
       val s = searchText.value.text.trim().lowercase()
-      if (s.isEmpty()) members else members.filter { m -> m.anyNameContains(s) }
+      if (s.isEmpty()) activeSortedMembers else activeSortedMembers.filter { m -> m.anyNameContains(s) }
     }
   }
   Box {
     val oneHandUI = remember { appPrefs.oneHandUI.state }
+    val selectedItemsBarHeight = if (selectedItems.value != null) AppBarHeight * fontSizeSqrtMultiplier else 0.dp
+    val navBarPadding = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+    val imePadding = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
   LazyColumnWithScrollBar(
     state = listState,
     contentPadding = if (oneHandUI.value) {
-      PaddingValues(top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + DEFAULT_PADDING + 5.dp, bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding())
+      PaddingValues(
+        top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + DEFAULT_PADDING + 5.dp,
+        bottom = navBarPadding +
+            imePadding +
+            selectedItemsBarHeight +
+            // TODO: that's workaround but works. Actually, something in the codebase doesn't consume padding for AppBar and it produce
+            // different padding when the user has NavigationBar and doesn't have it with ime shown (developer options helps to test it nav bars)
+            (if (navBarPadding > 0.dp && imePadding > 0.dp) 0.dp else AppBarHeight * fontSizeSqrtMultiplier)
+      )
     } else {
-      PaddingValues(top = topPaddingToContent(false))
+      PaddingValues(
+        top = topPaddingToContent(false),
+        bottom = if (imePadding > 0.dp) {
+          imePadding + selectedItemsBarHeight
+        } else {
+          navBarPadding + selectedItemsBarHeight
+        }
+      )
     }
   ) {
     item {
@@ -360,6 +469,40 @@ fun ModalData.GroupChatInfoLayout(
 
       SectionSpacer()
 
+      var anyTopSectionRowShow = false
+      SectionView {
+        if (groupInfo.canAddMembers && groupInfo.businessChat == null) {
+          anyTopSectionRowShow = true
+          if (groupLink == null) {
+            CreateGroupLinkButton(manageGroupLink)
+          } else {
+            GroupLinkButton(manageGroupLink)
+          }
+        }
+        if (groupInfo.businessChat == null && groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+          anyTopSectionRowShow = true
+          MemberSupportButton(chat, openMemberSupport)
+        }
+        if (groupInfo.canModerate) {
+          anyTopSectionRowShow = true
+          GroupReportsButton(chat) {
+            scope.launch {
+              showGroupReportsView(chatModel.chatId, scrollToItemId, chat.chatInfo)
+            }
+          }
+        }
+        if (
+          groupInfo.membership.memberActive &&
+          (groupInfo.membership.memberRole < GroupMemberRole.Moderator || groupInfo.membership.supportChat != null)
+        ) {
+          anyTopSectionRowShow = true
+          UserSupportChatButton(chat, groupInfo, scrollToItemId)
+        }
+      }
+      if (anyTopSectionRowShow) {
+        SectionDividerSpaced(maxBottomPadding = false)
+      }
+
       SectionView {
         if (groupInfo.isOwner && groupInfo.businessChat?.chatType == null) {
           EditGroupProfileButton(editGroupProfile)
@@ -369,19 +512,17 @@ fun ModalData.GroupChatInfoLayout(
         }
         val prefsTitleId = if (groupInfo.businessChat == null) MR.strings.group_preferences else MR.strings.chat_preferences
         GroupPreferencesButton(prefsTitleId, openPreferences)
-        if (groupInfo.canModerate) {
-          GroupReportsButton {
-            scope.launch {
-              showGroupReportsView(chatModel.chatId, scrollToItemId, chat.chatInfo)
-            }
-          }
-        }
-        if (members.filter { it.memberCurrent }.size <= SMALL_GROUPS_RCPS_MEM_LIMIT) {
+      }
+      val footerId = if (groupInfo.businessChat == null) MR.strings.only_group_owners_can_change_prefs else MR.strings.only_chat_owners_can_change_prefs
+      SectionTextFooter(stringResource(footerId))
+      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+
+      SectionView {
+        if (activeSortedMembers.filter { it.memberCurrent }.size <= SMALL_GROUPS_RCPS_MEM_LIMIT) {
           SendReceiptsOption(currentUser, sendReceipts, setSendReceipts)
         } else {
           SendReceiptsOptionDisabled()
         }
-
         WallpaperButton {
           ModalManager.end.showModal {
             val chat = remember { derivedStateOf { chatModel.chats.value.firstOrNull { it.id == chat.id } } }
@@ -391,20 +532,13 @@ fun ModalData.GroupChatInfoLayout(
             }
           }
         }
+        ChatTTLOption(chatItemTTL, setChatItemTTL, deletingItems)
+        SectionTextFooter(stringResource(MR.strings.chat_ttl_options_footer))
       }
-      val footerId = if (groupInfo.businessChat == null) MR.strings.only_group_owners_can_change_prefs else MR.strings.only_chat_owners_can_change_prefs
-      SectionTextFooter(stringResource(footerId))
-      SectionDividerSpaced(maxTopPadding = true)
+      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = true)
 
-      SectionView(title = String.format(generalGetString(MR.strings.group_info_section_title_num_members), members.count() + 1)) {
+      SectionView(title = String.format(generalGetString(MR.strings.group_info_section_title_num_members), activeSortedMembers.count() + 1)) {
         if (groupInfo.canAddMembers) {
-          if (groupInfo.businessChat == null) {
-            if (groupLink == null) {
-              CreateGroupLinkButton(manageGroupLink)
-            } else {
-              GroupLinkButton(manageGroupLink)
-            }
-          }
           val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
           val tint = if (chat.chatInfo.incognito) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
           val addMembersTitleId = when (groupInfo.businessChat?.chatType) {
@@ -414,9 +548,9 @@ fun ModalData.GroupChatInfoLayout(
           }
           AddMembersButton(addMembersTitleId, tint, onAddMembersClick)
         }
-        if (members.size > 8) {
+        if (activeSortedMembers.size > 8) {
           SectionItemView(padding = PaddingValues(start = 14.dp, end = DEFAULT_PADDING_HALF)) {
-            SearchRowView(searchText)
+            MemberListSearchRowView(searchText)
           }
         }
         SectionItemView(minHeight = 54.dp, padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
@@ -424,12 +558,34 @@ fun ModalData.GroupChatInfoLayout(
         }
       }
     }
-    items(filteredMembers.value) { member ->
+    items(filteredMembers.value, key = { it.groupMemberId }) { member ->
       Divider()
       val showMenu = remember { mutableStateOf(false) }
-      SectionItemViewLongClickable({ showMemberInfo(member) }, { showMenu.value = true }, minHeight = 54.dp, padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-        DropDownMenuForMember(chat.remoteHostId, member, groupInfo, showMenu)
-        MemberRow(member, onClick = { showMemberInfo(member) })
+      val canBeSelected = groupInfo.membership.memberRole >= member.memberRole && member.memberRole < GroupMemberRole.Moderator
+      SectionItemViewLongClickable(
+        click = {
+          if (selectedItems.value != null) {
+            if (canBeSelected) {
+              toggleItemSelection(member.groupMemberId, selectedItems)
+            }
+          } else {
+            showMemberInfo(member)
+          }
+        },
+        longClick = { showMenu.value = true },
+        minHeight = 54.dp,
+        padding = PaddingValues(horizontal = DEFAULT_PADDING)
+      ) {
+        Box(contentAlignment = Alignment.CenterStart) {
+          androidx.compose.animation.AnimatedVisibility(selectedItems.value != null, enter = fadeIn(), exit = fadeOut()) {
+            SelectedListItem(Modifier.alpha(if (canBeSelected) 1f else 0f).padding(start = 2.dp), member.groupMemberId, selectedItems)
+          }
+          val selectionOffset by animateDpAsState(if (selectedItems.value != null) 20.dp + 22.dp * fontSizeMultiplier else 0.dp)
+          DropDownMenuForMember(chat.remoteHostId, member, groupInfo, selectedItems, showMenu)
+          Box(Modifier.padding(start = selectionOffset)) {
+            MemberRow(member)
+          }
+        }
       }
     }
     item {
@@ -440,7 +596,7 @@ fun ModalData.GroupChatInfoLayout(
           val titleId = if (groupInfo.businessChat == null) MR.strings.button_delete_group else MR.strings.button_delete_chat
           DeleteGroupButton(titleId, deleteGroup)
         }
-        if (groupInfo.membership.memberCurrent) {
+        if (groupInfo.membership.memberCurrentOrPending) {
           val titleId = if (groupInfo.businessChat == null) MR.strings.button_leave_group else MR.strings.button_leave_chat
           LeaveGroupButton(titleId, leaveGroup)
         }
@@ -454,12 +610,109 @@ fun ModalData.GroupChatInfoLayout(
         }
       }
       SectionBottomSpacer()
-      Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
     }
   }
     if (!oneHandUI.value) {
       NavigationBarBackground(oneHandUI.value, oneHandUI.value)
     }
+    SelectedItemsButtonsToolbar(chat, groupInfo, selectedItems, rememberUpdatedState(activeSortedMembers))
+    SelectedItemsCounterToolbarSetter(groupInfo, selectedItems, filteredMembers, appBar)
+  }
+}
+
+@Composable
+private fun BoxScope.SelectedItemsButtonsToolbar(chat: Chat, groupInfo: GroupInfo, selectedItems: MutableState<Set<Long>?>, activeMembers: State<List<GroupMember>>) {
+  val oneHandUI = remember { appPrefs.oneHandUI.state }
+  Column(Modifier.align(Alignment.BottomCenter)) {
+    AnimatedVisibility(selectedItems.value != null) {
+      SelectedItemsMembersToolbar(
+        selectedItems = selectedItems,
+        activeMembers = activeMembers,
+        groupInfo = groupInfo,
+        delete = {
+          removeMembersAlert(chat.remoteHostId, groupInfo, selectedItems.value!!.sorted()) {
+            selectedItems.value = null
+          }
+        },
+        blockForAll = { block ->
+          if (block) {
+            blockForAllAlert(chat.remoteHostId, groupInfo, selectedItems.value!!.sorted()) {
+              selectedItems.value = null
+            }
+          } else {
+            unblockForAllAlert(chat.remoteHostId, groupInfo, selectedItems.value!!.sorted()) {
+              selectedItems.value = null
+            }
+          }
+        },
+        changeRole = { toRole ->
+          updateMembersRoleDialog(toRole, groupInfo) {
+            updateMembersRole(toRole, chat.remoteHostId, groupInfo, selectedItems.value!!.sorted()) {
+              selectedItems.value = null
+            }
+          }
+        }
+      )
+    }
+    if (oneHandUI.value) {
+      // That's placeholder to take some space for bottom app bar in oneHandUI
+      Box(Modifier.height(AppBarHeight * fontSizeSqrtMultiplier))
+    }
+  }
+}
+
+@Composable
+private fun SelectedItemsCounterToolbarSetter(
+  groupInfo: GroupInfo,
+  selectedItems: MutableState<Set<Long>?>,
+  filteredMembers: State<List<GroupMember>>,
+  appBar: MutableState<@Composable (BoxScope.() -> Unit)?>
+) {
+  LaunchedEffect(
+    groupInfo,
+    /* variable, not value - intentionally - to reduce work but handle variable change because it changes in remember(members) { derivedState {} } */
+    filteredMembers
+  ) {
+    snapshotFlow { selectedItems.value == null }
+      .collect { nullItems ->
+        if (!nullItems) {
+          appBar.value = {
+            SelectedItemsCounterToolbar(selectedItems, !remember { appPrefs.oneHandUI.state }.value) {
+              if (!groupInfo.membership.memberActive) return@SelectedItemsCounterToolbar
+              val ids: MutableSet<Long> = mutableSetOf()
+              for (mem in filteredMembers.value) {
+                if (groupInfo.membership.memberActive && groupInfo.membership.memberRole >= mem.memberRole && mem.memberRole < GroupMemberRole.Moderator) {
+                  ids.add(mem.groupMemberId)
+                }
+              }
+              if (ids.isNotEmpty() && (selectedItems.value ?: setOf()).containsAll(ids)) {
+                selectedItems.value = (selectedItems.value ?: setOf()).minus(ids)
+              } else {
+                selectedItems.value = (selectedItems.value ?: setOf()).union(ids)
+              }
+            }
+          }
+        } else {
+          appBar.value = null
+        }
+      }
+  }
+}
+
+@Composable
+fun ChatTTLOption(chatItemTTL: State<ChatItemTTL?>, setChatItemTTL: (ChatItemTTL?) -> Unit, deletingItems: State<Boolean>) {
+  Box {
+    TtlOptions(
+      chatItemTTL,
+      enabled = remember { derivedStateOf { !deletingItems.value } },
+      onSelected = setChatItemTTL,
+      default = chatModel.chatItemTTL
+    )
+    if (deletingItems.value) {
+      Box(Modifier.matchParentSize()) {
+        ProgressIndicator()
+      }
+    }
   }
 }
 
@@ -496,6 +749,23 @@ private fun GroupChatInfoHeader(cInfo: ChatInfo, groupInfo: GroupInfo) {
   }
 }
 
+@Composable
+private fun MemberSupportButton(chat: Chat, onClick: () -> Unit) {
+  SettingsActionItemWithContent(
+    painterResource(if (chat.supportUnreadCount > 0) MR.images.ic_flag_filled else MR.images.ic_flag),
+    stringResource(MR.strings.member_support),
+    click = onClick,
+    iconColor = (if (chat.supportUnreadCount > 0) MaterialTheme.colors.primary else MaterialTheme.colors.secondary)
+  ) {
+    if (chat.supportUnreadCount > 0) {
+      UnreadBadge(
+        text = unreadCountStr(chat.supportUnreadCount),
+        backgroundColor = MaterialTheme.colors.primary
+      )
+    }
+  }
+}
+
 @Composable
 private fun GroupPreferencesButton(titleId: StringResource, onClick: () -> Unit) {
   SettingsActionItem(
@@ -506,12 +776,20 @@ private fun GroupPreferencesButton(titleId: StringResource, onClick: () -> Unit)
 }
 
 @Composable
-private fun GroupReportsButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(MR.images.ic_flag),
+private fun GroupReportsButton(chat: Chat, onClick: () -> Unit) {
+  SettingsActionItemWithContent(
+    painterResource(if (chat.chatStats.reportsCount > 0) MR.images.ic_flag_filled else MR.images.ic_flag),
     stringResource(MR.strings.group_reports_member_reports),
-    click = onClick
-  )
+    click = onClick,
+    iconColor = (if (chat.chatStats.reportsCount > 0) Color.Red else MaterialTheme.colors.secondary)
+  ) {
+    if (chat.chatStats.reportsCount > 0) {
+      UnreadBadge(
+        text = unreadCountStr(chat.chatStats.reportsCount),
+        backgroundColor = Color.Red
+      )
+    }
+  }
 }
 
 @Composable
@@ -557,14 +835,14 @@ private fun AddMembersButton(titleId: StringResource, tint: Color = MaterialThem
 }
 
 @Composable
-private fun MemberRow(member: GroupMember, user: Boolean = false, onClick: (() -> Unit)? = null) {
+fun MemberRow(member: GroupMember, user: Boolean = false, infoPage: Boolean = true, showlocalAliasAndFullName: Boolean = false, selected: Boolean = false) {
   @Composable
   fun MemberInfo() {
     if (member.blocked) {
       Text(stringResource(MR.strings.member_info_member_blocked), color = MaterialTheme.colors.secondary)
     } else {
       val role = member.memberRole
-      if (role in listOf(GroupMemberRole.Owner, GroupMemberRole.Admin, GroupMemberRole.Observer)) {
+      if (role in listOf(GroupMemberRole.Owner, GroupMemberRole.Admin, GroupMemberRole.Moderator, GroupMemberRole.Observer)) {
         Text(role.text, color = MaterialTheme.colors.secondary)
       }
     }
@@ -586,11 +864,11 @@ private fun MemberRow(member: GroupMember, user: Boolean = false, onClick: (() -
     verticalAlignment = Alignment.CenterVertically
   ) {
     Row(
-      Modifier.weight(1f).padding(top = 8.dp, end = DEFAULT_PADDING, bottom = 8.dp),
+      Modifier.weight(1f).padding(top = MEMBER_ROW_VERTICAL_PADDING, end = DEFAULT_PADDING, bottom = MEMBER_ROW_VERTICAL_PADDING),
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.spacedBy(4.dp)
     ) {
-      MemberProfileImage(size = 42.dp, member)
+      MemberProfileImage(size = MEMBER_ROW_AVATAR_SIZE, member)
       Spacer(Modifier.width(DEFAULT_PADDING_HALF))
       Column {
         Row(verticalAlignment = Alignment.CenterVertically) {
@@ -598,33 +876,48 @@ private fun MemberRow(member: GroupMember, user: Boolean = false, onClick: (() -
             MemberVerifiedShield()
           }
           Text(
-            member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
+            if (showlocalAliasAndFullName) member.localAliasAndFullName else member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
             color = if (member.memberIncognito) Indigo else Color.Unspecified
           )
         }
-        val statusDescr =
-          if (user) String.format(generalGetString(MR.strings.group_info_member_you), member.memberStatus.shortText) else memberConnStatus()
-        Text(
-          statusDescr,
-          color = MaterialTheme.colors.secondary,
-          fontSize = 12.sp,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis
-        )
+
+        if (infoPage) {
+          val statusDescr =
+            if (user) String.format(generalGetString(MR.strings.group_info_member_you), member.memberStatus.shortText) else memberConnStatus()
+          Text(
+            statusDescr,
+            color = MaterialTheme.colors.secondary,
+            fontSize = 12.sp,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
+          )
+        }
       }
     }
-    MemberInfo()
+    if (infoPage) {
+      MemberInfo()
+    }
+    if (selected) {
+      Icon(
+        painterResource(
+          MR.images.ic_check
+        ),
+        null,
+        Modifier.size(20.dp),
+        tint = MaterialTheme.colors.primary,
+      )
+    }
   }
 }
 
 @Composable
-private fun MemberVerifiedShield() {
+fun MemberVerifiedShield() {
   Icon(painterResource(MR.images.ic_verified_user), null, Modifier.padding(end = 3.dp).size(16.dp), tint = MaterialTheme.colors.secondary)
 }
 
 @Composable
-private fun DropDownMenuForMember(rhId: Long?, member: GroupMember, groupInfo: GroupInfo, showMenu: MutableState<Boolean>) {
-  if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
+private fun DropDownMenuForMember(rhId: Long?, member: GroupMember, groupInfo: GroupInfo, selectedItems: MutableState<Set<Long>?>, showMenu: MutableState<Boolean>) {
+  if (groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
     val canBlockForAll = member.canBlockForAll(groupInfo)
     val canRemove = member.canBeRemoved(groupInfo)
     if (canBlockForAll || canRemove) {
@@ -648,6 +941,10 @@ private fun DropDownMenuForMember(rhId: Long?, member: GroupMember, groupInfo: G
             showMenu.value = false
           })
         }
+        if (selectedItems.value == null && member.memberRole < GroupMemberRole.Moderator) {
+          Divider()
+          SelectItemAction(showMenu) { toggleItemSelection(member.groupMemberId, selectedItems) }
+        }
       }
     }
   } else if (!member.blockedByAdmin) {
@@ -735,7 +1032,7 @@ private fun DeleteGroupButton(titleId: StringResource, onClick: () -> Unit) {
 }
 
 @Composable
-private fun SearchRowView(
+fun MemberListSearchRowView(
   searchText: MutableState<TextFieldValue> = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue()) }
 ) {
   Box(Modifier.width(36.dp), contentAlignment = Alignment.Center) {
@@ -750,12 +1047,45 @@ private fun SearchRowView(
 private fun setGroupAlias(chat: Chat, localAlias: String, chatModel: ChatModel) = withBGApi {
   val chatRh = chat.remoteHostId
   chatModel.controller.apiSetGroupAlias(chatRh, chat.chatInfo.apiId, localAlias)?.let {
-    withChats {
-      updateGroup(chatRh, it)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateGroup(chatRh, it)
     }
   }
 }
 
+fun removeMembers(rhId: Long?, groupInfo: GroupInfo, memberIds: List<Long>, onSuccess: () -> Unit = {}) {
+  withBGApi {
+    val r = chatModel.controller.apiRemoveMembers(rhId, groupInfo.groupId, memberIds)
+    if (r != null) {
+      val (updatedGroupInfo, updatedMembers) = r
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateGroup(rhId, updatedGroupInfo)
+        updatedMembers.forEach { updatedMember ->
+          chatModel.chatsContext.upsertGroupMember(rhId, updatedGroupInfo, updatedMember)
+        }
+      }
+      withContext(Dispatchers.Main) {
+        updatedMembers.forEach { updatedMember ->
+          chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, updatedGroupInfo, updatedMember)
+        }
+      }
+      onSuccess()
+    }
+  }
+}
+
+fun <T> toggleItemSelection(itemId: T, selectedItems: MutableState<Set<T>?>) {
+  val select = selectedItems.value?.contains(itemId) != true
+  if (select) {
+    val sel = selectedItems.value ?: setOf()
+    selectedItems.value = sel + itemId
+  } else {
+    val sel = (selectedItems.value ?: setOf()).toMutableSet()
+    sel.remove(itemId)
+    selectedItems.value = sel
+  }
+}
+
 @Preview
 @Composable
 fun PreviewGroupChatInfoLayout() {
@@ -770,12 +1100,27 @@ fun PreviewGroupChatInfoLayout() {
       User.sampleData,
       sendReceipts = remember { mutableStateOf(SendReceipts.Yes) },
       setSendReceipts = {},
-      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
+      chatItemTTL = remember { mutableStateOf(ChatItemTTL.fromSeconds(0)) },
+      setChatItemTTL = {},
+      activeSortedMembers = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
       developerTools = false,
       onLocalAliasChanged = {},
       groupLink = null,
+      selectedItems = remember { mutableStateOf(null) },
+      appBar = remember { mutableStateOf(null) },
       scrollToItemId = remember { mutableStateOf(null) },
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, addOrEditWelcomeMessage = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {}, onSearchClicked = {},
+      addMembers = {},
+      showMemberInfo = {},
+      editGroupProfile = {},
+      addOrEditWelcomeMessage = {},
+      openMemberSupport = {},
+      openPreferences = {},
+      deleteGroup = {},
+      clearChat = {},
+      leaveGroup = {},
+      manageGroupLink = {},
+      onSearchClicked = {},
+      deletingItems = remember { mutableStateOf(true) }
     )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
index 956ee575de..30c16db6a4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
@@ -1,9 +1,9 @@
 package chat.simplex.common.views.chat.group
 
 import SectionBottomSpacer
+import SectionViewWithButton
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -16,11 +16,11 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.ColumnWithScrollBar
-import chat.simplex.common.platform.shareText
+import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.*
+import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.res.MR
 
 @Composable
@@ -28,13 +28,13 @@ fun GroupLinkView(
   chatModel: ChatModel,
   rhId: Long?,
   groupInfo: GroupInfo,
-  connReqContact: String?,
+  connLinkContact: CreatedConnLink?,
   memberRole: GroupMemberRole?,
-  onGroupLinkUpdated: ((Pair<String, GroupMemberRole>?) -> Unit)?,
+  onGroupLinkUpdated: ((Pair<CreatedConnLink, GroupMemberRole>?) -> Unit)?,
   creatingGroup: Boolean = false,
   close: (() -> Unit)? = null
 ) {
-  var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
+  var groupLink by rememberSaveable(stateSaver = CreatedConnLink.nullableStateSaver) { mutableStateOf(connLinkContact) }
   val groupLinkMemberRole = rememberSaveable { mutableStateOf(memberRole) }
   var creatingLink by rememberSaveable { mutableStateOf(false) }
   fun createLink() {
@@ -49,6 +49,18 @@ fun GroupLinkView(
       creatingLink = false
     }
   }
+  fun addShortLink() {
+    creatingLink = true
+    withBGApi {
+      val link = chatModel.controller.apiAddGroupShortLink(rhId, groupInfo.groupId)
+      if (link != null) {
+        groupLink = link.first
+        groupLinkMemberRole.value = link.second
+        onGroupLinkUpdated?.invoke(link)
+      }
+      creatingLink = false
+    }
+  }
   LaunchedEffect(Unit) {
     if (groupLink == null && !creatingLink) {
       createLink()
@@ -60,6 +72,7 @@ fun GroupLinkView(
     groupLinkMemberRole,
     creatingLink,
     createLink = ::createLink,
+    addShortLink = ::addShortLink,
     updateLink = {
       val role = groupLinkMemberRole.value
       if (role != null) {
@@ -100,11 +113,12 @@ fun GroupLinkView(
 
 @Composable
 fun GroupLinkLayout(
-  groupLink: String?,
+  groupLink: CreatedConnLink?,
   groupInfo: GroupInfo,
   groupLinkMemberRole: MutableState<GroupMemberRole?>,
   creatingLink: Boolean,
   createLink: () -> Unit,
+  addShortLink: () -> Unit,
   updateLink: () -> Unit,
   deleteLink: () -> Unit,
   creatingGroup: Boolean = false,
@@ -151,7 +165,15 @@ fun GroupLinkLayout(
           }
           initialLaunch = false
         }
-        SimpleXLinkQRCode(groupLink)
+        val showShortLink = remember { mutableStateOf(true) }
+        Spacer(Modifier.height(DEFAULT_PADDING_HALF))
+        if (groupLink.connShortLink == null) {
+          SimpleXCreatedLinkQRCode(groupLink, short = false)
+        } else {
+          SectionViewWithButton(titleButton = { ToggleShortLinkButton(showShortLink) }) {
+            SimpleXCreatedLinkQRCode(groupLink, short = showShortLink.value)
+          }
+        }
         Row(
           horizontalArrangement = Arrangement.spacedBy(10.dp),
           verticalAlignment = Alignment.CenterVertically,
@@ -161,7 +183,7 @@ fun GroupLinkLayout(
           SimpleButton(
             stringResource(MR.strings.share_link),
             icon = painterResource(MR.images.ic_share),
-            click = { clipboard.shareText(simplexChatLink(groupLink)) }
+            click = { clipboard.shareText(groupLink.simplexChatUri(short = showShortLink.value)) }
           )
           if (creatingGroup && close != null) {
             ContinueButton(close)
@@ -174,12 +196,26 @@ fun GroupLinkLayout(
             )
           }
         }
+        if (groupLink.connShortLink == null && appPreferences.privacyShortLinks.get()) {
+          AddShortLinkButton(addShortLink)
+        }
       }
     }
     SectionBottomSpacer()
   }
 }
 
+@Composable
+private fun AddShortLinkButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_add),
+    stringResource(MR.strings.add_short_link),
+    onClick,
+    iconColor = MaterialTheme.colors.primary,
+    textColor = MaterialTheme.colors.primary,
+  )
+}
+
 @Composable
 private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole?>, enabled: Boolean = true) {
   Row(
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt
index ef1c69a5bb..e56bc36562 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt
@@ -27,8 +27,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
 import chat.simplex.common.views.helpers.*
@@ -40,12 +38,14 @@ import chat.simplex.common.views.chatlist.openLoadedChat
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.datetime.Clock
+import kotlinx.coroutines.*
 
 @Composable
 fun GroupMemberInfoView(
   rhId: Long?,
   groupInfo: GroupInfo,
   member: GroupMember,
+  scrollToItemId: MutableState<Long?>,
   connectionStats: ConnectionStats?,
   connectionCode: String?,
   chatModel: ChatModel,
@@ -63,11 +63,11 @@ fun GroupMemberInfoView(
       val r = chatModel.controller.apiSyncGroupMemberRatchet(rhId, groupInfo.apiId, member.groupMemberId, force = false)
       if (r != null) {
         connStats.value = r.second
-        withChats {
-          updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
         }
-        withReportsChatsIfOpen {
-          updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+        withContext(Dispatchers.Main) {
+          chatModel.secondaryChatsContext.value?.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
         }
         close.invoke()
       }
@@ -80,6 +80,7 @@ fun GroupMemberInfoView(
       rhId = rhId,
       groupInfo,
       member,
+      scrollToItemId,
       connStats,
       newRole,
       developerTools,
@@ -87,7 +88,7 @@ fun GroupMemberInfoView(
       getContactChat = { chatModel.getContactChat(it) },
       openDirectChat = {
         withBGApi {
-          apiLoadMessages(rhId, ChatType.Direct, it, null, ChatPagination.Initial(ChatPagination.INITIAL_COUNT))
+          apiLoadMessages(chatModel.chatsContext, rhId, ChatType.Direct, it, ChatPagination.Initial(ChatPagination.INITIAL_COUNT))
           if (chatModel.getContactChat(it) != null) {
             closeAll()
           }
@@ -100,8 +101,8 @@ fun GroupMemberInfoView(
             val memberContact = chatModel.controller.apiCreateMemberContact(rhId, groupInfo.apiId, member.groupMemberId)
             if (memberContact != null) {
               val memberChat = Chat(remoteHostId = rhId, ChatInfo.Direct(memberContact), chatItems = arrayListOf())
-              withChats {
-                addChat(memberChat)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.addChat(memberChat)
               }
               openLoadedChat(memberChat)
               closeAll()
@@ -137,22 +138,10 @@ fun GroupMemberInfoView(
         if (it == newRole.value) return@GroupMemberInfoLayout
         val prevValue = newRole.value
         newRole.value = it
-        updateMemberRoleDialog(it, groupInfo, member, onDismiss = {
+        updateMemberRoleDialog(it, groupInfo, member.memberCurrent, onDismiss = {
           newRole.value = prevValue
         }) {
-          withBGApi {
-            kotlin.runCatching {
-              val mem = chatModel.controller.apiMemberRole(rhId, groupInfo.groupId, member.groupMemberId, it)
-              withChats {
-                upsertGroupMember(rhId, groupInfo, mem)
-              }
-              withReportsChatsIfOpen {
-                upsertGroupMember(rhId, groupInfo, mem)
-              }
-            }.onFailure {
-              newRole.value = prevValue
-            }
-          }
+          updateMembersRole(newRole.value, rhId, groupInfo, listOf(member.groupMemberId), onFailure = { newRole.value = prevValue })
         }
       },
       switchMemberAddress = {
@@ -161,11 +150,11 @@ fun GroupMemberInfoView(
             val r = chatModel.controller.apiSwitchGroupMember(rhId, groupInfo.apiId, member.groupMemberId)
             if (r != null) {
               connStats.value = r.second
-              withChats {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
-              withReportsChatsIfOpen {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.secondaryChatsContext.value?.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
               close.invoke()
             }
@@ -178,11 +167,11 @@ fun GroupMemberInfoView(
             val r = chatModel.controller.apiAbortSwitchGroupMember(rhId, groupInfo.apiId, member.groupMemberId)
             if (r != null) {
               connStats.value = r.second
-              withChats {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
-              withReportsChatsIfOpen {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.secondaryChatsContext.value?.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
               close.invoke()
             }
@@ -198,11 +187,11 @@ fun GroupMemberInfoView(
             val r = chatModel.controller.apiSyncGroupMemberRatchet(rhId, groupInfo.apiId, member.groupMemberId, force = true)
             if (r != null) {
               connStats.value = r.second
-              withChats {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
-              withReportsChatsIfOpen {
-                updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+              withContext(Dispatchers.Main) {
+                chatModel.secondaryChatsContext.value?.updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
               }
               close.invoke()
             }
@@ -224,11 +213,11 @@ fun GroupMemberInfoView(
                       connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
                     )
                   )
-                  withChats {
-                    upsertGroupMember(rhId, groupInfo, copy)
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.upsertGroupMember(rhId, groupInfo, copy)
                   }
-                  withReportsChatsIfOpen {
-                    upsertGroupMember(rhId, groupInfo, copy)
+                  withContext(Dispatchers.Main) {
+                    chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, groupInfo, copy)
                   }
                   r
                 }
@@ -256,28 +245,34 @@ fun removeMemberDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, c
     text = generalGetString(messageId),
     confirmText = generalGetString(MR.strings.remove_member_confirmation),
     onConfirm = {
-      withBGApi {
-        val removedMember = chatModel.controller.apiRemoveMember(rhId, member.groupId, member.groupMemberId)
-        if (removedMember != null) {
-          withChats {
-            upsertGroupMember(rhId, groupInfo, removedMember)
-          }
-          withReportsChatsIfOpen {
-            upsertGroupMember(rhId, groupInfo, removedMember)
-          }
-        }
-        close?.invoke()
-      }
+      removeMember(rhId, member, chatModel, close)
     },
     destructive = true,
   )
 }
 
+fun removeMember(rhId: Long?, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  withBGApi {
+    val r = chatModel.controller.apiRemoveMembers(rhId, member.groupId, listOf(member.groupMemberId))
+    if (r != null) {
+      val (updatedGroupInfo, removedMembers) = r
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateGroup(rhId, updatedGroupInfo)
+        removedMembers.forEach { removedMember ->
+          chatModel.chatsContext.upsertGroupMember(rhId, updatedGroupInfo, removedMember)
+        }
+      }
+    }
+    close?.invoke()
+  }
+}
+
 @Composable
 fun GroupMemberInfoLayout(
   rhId: Long?,
   groupInfo: GroupInfo,
   member: GroupMember,
+  scrollToItemId: MutableState<Long?>,
   connStats: MutableState<ConnectionStats?>,
   newRole: MutableState<GroupMemberRole>,
   developerTools: Boolean,
@@ -309,7 +304,30 @@ fun GroupMemberInfoLayout(
   }
 
   @Composable
-  fun AdminDestructiveSection() {
+  fun SupportChatButton() {
+    val scope = rememberCoroutineScope()
+
+    SettingsActionItem(
+      painterResource(MR.images.ic_flag),
+      stringResource(MR.strings.button_support_chat_member),
+      click = {
+        val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = member)
+        val supportChatInfo = ChatInfo.Group(groupInfo, groupChatScope = scopeInfo)
+        scope.launch {
+          showMemberSupportChatView(
+            chatModel.chatId,
+            scrollToItemId = scrollToItemId,
+            supportChatInfo,
+            scopeInfo
+          )
+        }
+      },
+      iconColor = MaterialTheme.colors.secondary,
+    )
+  }
+
+  @Composable
+  fun ModeratorDestructiveSection() {
     val canBlockForAll = member.canBlockForAll(groupInfo)
     val canRemove = member.canBeRemoved(groupInfo)
     if (canBlockForAll || canRemove) {
@@ -422,6 +440,12 @@ fun GroupMemberInfoLayout(
 
     if (member.memberActive) {
       SectionView {
+        if (
+          groupInfo.membership.memberRole >= GroupMemberRole.Moderator &&
+          (member.memberRole < GroupMemberRole.Moderator || member.supportChat != null)
+        ) {
+          SupportChatButton()
+        }
         if (connectionCode != null) {
           VerifyCodeButton(member.verified, verifyClicked)
         }
@@ -486,8 +510,8 @@ fun GroupMemberInfoLayout(
       }
     }
 
-    if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
-      AdminDestructiveSection()
+    if (groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+      ModeratorDestructiveSection()
     } else {
       NonAdminBlockSection()
     }
@@ -701,16 +725,37 @@ fun MemberProfileImage(
   )
 }
 
-private fun updateMemberRoleDialog(
+fun updateMembersRole(newRole: GroupMemberRole, rhId: Long?, groupInfo: GroupInfo, memberIds: List<Long>, onFailure: () -> Unit = {}, onSuccess: () -> Unit = {}) {
+  withBGApi {
+    kotlin.runCatching {
+      val members = chatModel.controller.apiMembersRole(rhId, groupInfo.groupId, memberIds, newRole)
+      withContext(Dispatchers.Main) {
+        members.forEach { member ->
+          chatModel.chatsContext.upsertGroupMember(rhId, groupInfo, member)
+        }
+      }
+      withContext(Dispatchers.Main) {
+        members.forEach { member ->
+          chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, groupInfo, member)
+        }
+      }
+      onSuccess()
+    }.onFailure {
+      onFailure()
+    }
+  }
+}
+
+fun updateMemberRoleDialog(
   newRole: GroupMemberRole,
   groupInfo: GroupInfo,
-  member: GroupMember,
+  memberCurrent: Boolean,
   onDismiss: () -> Unit,
   onConfirm: () -> Unit
 ) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(MR.strings.change_member_role_question),
-    text = if (member.memberCurrent) {
+    text = if (memberCurrent) {
       if (groupInfo.businessChat == null)
         String.format(generalGetString(MR.strings.member_role_will_be_changed_with_notification), newRole.text)
       else
@@ -724,6 +769,22 @@ private fun updateMemberRoleDialog(
   )
 }
 
+fun updateMembersRoleDialog(
+  newRole: GroupMemberRole,
+  groupInfo: GroupInfo,
+  onConfirm: () -> Unit
+) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.change_member_role_question),
+    text = if (groupInfo.businessChat == null)
+      String.format(generalGetString(MR.strings.member_role_will_be_changed_with_notification), newRole.text)
+    else
+      String.format(generalGetString(MR.strings.member_role_will_be_changed_with_notification_chat), newRole.text),
+    confirmText = generalGetString(MR.strings.change_verb),
+    onConfirm = onConfirm,
+  )
+}
+
 fun connectViaMemberAddressAlert(rhId: Long?, connReqUri: String) {
   try {
     withBGApi {
@@ -769,11 +830,11 @@ fun updateMemberSettings(rhId: Long?, gInfo: GroupInfo, member: GroupMember, mem
   withBGApi {
     val success = ChatController.apiSetMemberSettings(rhId, gInfo.groupId, member.groupMemberId, memberSettings)
     if (success) {
-      withChats {
-        upsertGroupMember(rhId, gInfo, member.copy(memberSettings = memberSettings))
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.upsertGroupMember(rhId, gInfo, member.copy(memberSettings = memberSettings))
       }
-      withReportsChatsIfOpen {
-        upsertGroupMember(rhId, gInfo, member.copy(memberSettings = memberSettings))
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, gInfo, member.copy(memberSettings = memberSettings))
       }
     }
   }
@@ -785,7 +846,19 @@ fun blockForAllAlert(rhId: Long?, gInfo: GroupInfo, mem: GroupMember) {
     text = generalGetString(MR.strings.block_member_desc).format(mem.chatViewName),
     confirmText = generalGetString(MR.strings.block_for_all),
     onConfirm = {
-      blockMemberForAll(rhId, gInfo, mem, true)
+      blockMemberForAll(rhId, gInfo, listOf(mem.groupMemberId), true)
+    },
+    destructive = true,
+  )
+}
+
+fun blockForAllAlert(rhId: Long?, gInfo: GroupInfo, memberIds: List<Long>, onSuccess: () -> Unit = {}) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.block_members_for_all_question),
+    text = generalGetString(MR.strings.block_members_desc),
+    confirmText = generalGetString(MR.strings.block_for_all),
+    onConfirm = {
+      blockMemberForAll(rhId, gInfo, memberIds, true, onSuccess)
     },
     destructive = true,
   )
@@ -797,20 +870,36 @@ fun unblockForAllAlert(rhId: Long?, gInfo: GroupInfo, mem: GroupMember) {
     text = generalGetString(MR.strings.unblock_member_desc).format(mem.chatViewName),
     confirmText = generalGetString(MR.strings.unblock_for_all),
     onConfirm = {
-      blockMemberForAll(rhId, gInfo, mem, false)
+      blockMemberForAll(rhId, gInfo, listOf(mem.groupMemberId), false)
     },
   )
 }
 
-fun blockMemberForAll(rhId: Long?, gInfo: GroupInfo, member: GroupMember, blocked: Boolean) {
+fun unblockForAllAlert(rhId: Long?, gInfo: GroupInfo, memberIds: List<Long>, onSuccess: () -> Unit = {}) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.unblock_members_for_all_question),
+    text = generalGetString(MR.strings.unblock_members_desc),
+    confirmText = generalGetString(MR.strings.unblock_for_all),
+    onConfirm = {
+      blockMemberForAll(rhId, gInfo, memberIds, false, onSuccess)
+    },
+  )
+}
+
+fun blockMemberForAll(rhId: Long?, gInfo: GroupInfo, memberIds: List<Long>, blocked: Boolean, onSuccess: () -> Unit = {}) {
   withBGApi {
-    val updatedMember = ChatController.apiBlockMemberForAll(rhId, gInfo.groupId, member.groupMemberId, blocked)
-    withChats {
-      upsertGroupMember(rhId, gInfo, updatedMember)
+    val updatedMembers = ChatController.apiBlockMembersForAll(rhId, gInfo.groupId, memberIds, blocked)
+    withContext(Dispatchers.Main) {
+      updatedMembers.forEach { updatedMember ->
+        chatModel.chatsContext.upsertGroupMember(rhId, gInfo, updatedMember)
+      }
     }
-    withReportsChatsIfOpen {
-      upsertGroupMember(rhId, gInfo, updatedMember)
+    withContext(Dispatchers.Main) {
+      updatedMembers.forEach { updatedMember ->
+        chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, gInfo, updatedMember)
+      }
     }
+    onSuccess()
   }
 }
 
@@ -822,6 +911,7 @@ fun PreviewGroupMemberInfoLayout() {
       rhId = null,
       groupInfo = GroupInfo.sampleData,
       member = GroupMember.sampleData,
+      scrollToItemId = remember { mutableStateOf(null) },
       connStats = remember { mutableStateOf(null) },
       newRole = remember { mutableStateOf(GroupMemberRole.Member) },
       developerTools = false,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt
new file mode 100644
index 0000000000..62f1a4337c
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt
@@ -0,0 +1,129 @@
+package chat.simplex.common.views.chat.group
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.max
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.chatModel
+import chat.simplex.common.ui.theme.WarningOrange
+import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+
+@Composable
+fun SelectedItemsMembersToolbar(
+  selectedItems: MutableState<Set<Long>?>,
+  activeMembers: State<List<GroupMember>>,
+  groupInfo: GroupInfo,
+  delete: () -> Unit,
+  blockForAll: (Boolean) -> Unit, // Boolean - block or unlock
+  changeRole: (GroupMemberRole) -> Unit,
+) {
+  val deleteEnabled = remember { mutableStateOf(false) }
+  val blockForAllEnabled = remember { mutableStateOf(false) }
+  val unblockForAllEnabled = remember { mutableStateOf(false) }
+  val blockForAllButtonEnabled = remember { derivedStateOf { (blockForAllEnabled.value && !unblockForAllEnabled.value) || (!blockForAllEnabled.value && unblockForAllEnabled.value) } }
+
+  val roleToMemberEnabled = remember { mutableStateOf(false) }
+  val roleToObserverEnabled = remember { mutableStateOf(false) }
+  val roleButtonEnabled = remember { derivedStateOf { (roleToMemberEnabled.value && !roleToObserverEnabled.value) || (!roleToMemberEnabled.value && roleToObserverEnabled.value) } }
+  Box(
+    Modifier
+      .background(MaterialTheme.colors.background)
+      .navigationBarsPadding()
+      .imePadding()
+  ) {
+    // It's hard to measure exact height of ComposeView with different fontSizes. Better to depend on actual ComposeView, even empty
+    Box(Modifier.alpha(0f)) {
+      ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
+    }
+    Row(
+      Modifier
+        .matchParentSize()
+        .padding(horizontal = 2.dp)
+        .height(AppBarHeight * fontSizeSqrtMultiplier)
+        .pointerInput(Unit) {
+          detectGesture {
+            true
+          }
+        },
+      horizontalArrangement = Arrangement.SpaceBetween,
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      IconButton(delete, enabled = deleteEnabled.value) {
+        Icon(
+          painterResource(MR.images.ic_delete),
+          null,
+          Modifier.size(22.dp),
+          tint = if (!deleteEnabled.value) MaterialTheme.colors.secondary else MaterialTheme.colors.error
+        )
+      }
+
+      IconButton({ blockForAll(blockForAllEnabled.value) }, enabled = blockForAllButtonEnabled.value) {
+        Icon(
+          painterResource(if (unblockForAllEnabled.value && blockForAllButtonEnabled.value) MR.images.ic_do_not_touch else MR.images.ic_back_hand),
+          null,
+          Modifier.size(22.dp),
+          tint = if (!blockForAllButtonEnabled.value) MaterialTheme.colors.secondary else if (blockForAllEnabled.value) MaterialTheme.colors.error else WarningOrange
+        )
+      }
+
+      IconButton({ changeRole(if (roleToMemberEnabled.value) GroupMemberRole.Member else GroupMemberRole.Observer) }, enabled = roleButtonEnabled.value) {
+        Icon(
+          painterResource(if (roleToObserverEnabled.value || !roleButtonEnabled.value) MR.images.ic_person else MR.images.ic_person_edit),
+          null,
+          Modifier.size(22.dp),
+          tint = if (!roleButtonEnabled.value) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
+        )
+      }
+    }
+    Divider(Modifier.align(Alignment.TopStart))
+  }
+  LaunchedEffect(groupInfo, activeMembers.value.toList(), selectedItems.value) {
+    recheckItems(groupInfo, selectedItems, activeMembers.value, deleteEnabled, blockForAllEnabled, unblockForAllEnabled, roleToMemberEnabled, roleToObserverEnabled)
+  }
+}
+
+private fun recheckItems(
+  groupInfo: GroupInfo,
+  selectedItems: MutableState<Set<Long>?>,
+  activeMembers: List<GroupMember>,
+  deleteEnabled: MutableState<Boolean>,
+  blockForAllEnabled: MutableState<Boolean>,
+  unblockForAllEnabled: MutableState<Boolean>,
+  roleToMemberEnabled: MutableState<Boolean>,
+  roleToObserverEnabled: MutableState<Boolean>,
+) {
+  val selected = selectedItems.value ?: return
+  var rDeleteEnabled = true
+  var rBlockForAllEnabled = true
+  var rUnblockForAllEnabled = true
+  var rRoleToMemberEnabled = true
+  var rRoleToObserverEnabled = true
+  val rSelectedItems = mutableSetOf<Long>()
+  for (mem in activeMembers) {
+    if (selected.contains(mem.groupMemberId) && groupInfo.membership.memberRole >= mem.memberRole && mem.memberRole < GroupMemberRole.Moderator && groupInfo.membership.memberActive) {
+      rDeleteEnabled = rDeleteEnabled && mem.memberStatus != GroupMemberStatus.MemRemoved && mem.memberStatus != GroupMemberStatus.MemLeft
+      rBlockForAllEnabled = rBlockForAllEnabled && !mem.blockedByAdmin
+      rUnblockForAllEnabled = rUnblockForAllEnabled && mem.blockedByAdmin
+      rRoleToMemberEnabled = rRoleToMemberEnabled && mem.memberRole != GroupMemberRole.Member
+      rRoleToObserverEnabled = rRoleToObserverEnabled && mem.memberRole != GroupMemberRole.Observer
+      rSelectedItems.add(mem.groupMemberId) // we are collecting new selected items here to account for any changes in members list
+    }
+  }
+  deleteEnabled.value = rDeleteEnabled
+  blockForAllEnabled.value = rBlockForAllEnabled
+  unblockForAllEnabled.value = rUnblockForAllEnabled
+  roleToMemberEnabled.value = rRoleToMemberEnabled
+  roleToObserverEnabled.value = rRoleToObserverEnabled
+  selectedItems.value = rSelectedItems
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMentions.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMentions.kt
new file mode 100644
index 0000000000..aa737a02d3
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMentions.kt
@@ -0,0 +1,326 @@
+package chat.simplex.common.views.chat.group
+
+import androidx.compose.animation.core.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.unit.*
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.chatlist.setGroupMembers
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import kotlinx.coroutines.launch
+import kotlin.text.CharCategory.*
+
+val punctuation = setOf(
+  DASH_PUNCTUATION, START_PUNCTUATION, END_PUNCTUATION,
+  CONNECTOR_PUNCTUATION, OTHER_PUNCTUATION
+)
+
+private val PICKER_ROW_SIZE = MEMBER_ROW_AVATAR_SIZE + (MEMBER_ROW_VERTICAL_PADDING * 2f)
+private val MAX_PICKER_HEIGHT = (PICKER_ROW_SIZE * 4) + (MEMBER_ROW_AVATAR_SIZE + MEMBER_ROW_VERTICAL_PADDING - 4.dp)
+
+@Composable
+fun GroupMentions(
+  chatsCtx: ChatModel.ChatsContext,
+  rhId: Long?,
+  composeState: MutableState<ComposeState>,
+  composeViewFocusRequester: FocusRequester?,
+  chatInfo: ChatInfo.Group
+) {
+  val maxHeightInPx = with(LocalDensity.current) { windowHeight().toPx() }
+  val isVisible = remember { mutableStateOf(false) }
+  val offsetY = remember { Animatable(maxHeightInPx) }
+
+  val currentMessage = remember { mutableStateOf(composeState.value.message) }
+  val mentionName = remember { mutableStateOf("") }
+  val mentionRange = remember { mutableStateOf<TextRange?>(null) }
+  val mentionMemberId = remember { mutableStateOf<String?>(null) }
+
+  fun contextMemberFilter(member: GroupMember): Boolean =
+    when (chatsCtx.secondaryContextFilter) {
+      null -> true
+      is SecondaryContextFilter.GroupChatScopeContext ->
+        when (chatsCtx.secondaryContextFilter.groupScopeInfo) {
+          is GroupChatScopeInfo.MemberSupport -> {
+            val scopeMember = chatsCtx.secondaryContextFilter.groupScopeInfo.groupMember_
+            if (scopeMember != null) {
+              member.memberRole >= GroupMemberRole.Moderator || member.groupMemberId == scopeMember.groupMemberId
+            } else {
+              member.memberRole >= GroupMemberRole.Moderator
+            }
+          }
+        }
+      is SecondaryContextFilter.MsgContentTagContext -> false
+    }
+
+  val filteredMembers = remember {
+    derivedStateOf {
+      val members = chatModel.groupMembers.value
+        .filter {
+          val status = it.memberStatus
+          status != GroupMemberStatus.MemLeft && status != GroupMemberStatus.MemRemoved && status != GroupMemberStatus.MemInvited
+              && contextMemberFilter(it)
+        }
+        .sortedByDescending { it.memberRole }
+
+      if (mentionName.value.isEmpty()) {
+        members
+      } else {
+        members.filter { it.memberProfile.anyNameContains(mentionName.value) }
+      }
+    }
+  }
+  val scope = rememberCoroutineScope()
+
+  suspend fun closeMembersPicker() {
+    isVisible.value = false
+    if (offsetY.value != 0f) {
+      return
+    }
+
+    offsetY.animateTo(
+      targetValue = maxHeightInPx,
+      animationSpec = mentionPickerAnimSpec()
+    )
+    mentionName.value = ""
+    mentionRange.value = null
+    mentionMemberId.value = null
+  }
+
+  fun messageChanged(msg: ComposeMessage, parsedMsg: List<FormattedText>) {
+    removeUnusedMentions(composeState, parsedMsg)
+    val selected = selectedMarkdown(parsedMsg, msg.selection)
+
+    if (selected != null) {
+      val (ft, r) = selected
+
+      when (ft.format) {
+        is Format.Mention -> {
+          isVisible.value = true
+          mentionName.value = ft.format.memberName
+          mentionRange.value = r
+          mentionMemberId.value = composeState.value.mentions[mentionName.value]?.memberId
+          if (!chatModel.membersLoaded.value) {
+            scope.launch {
+              setGroupMembers(rhId, chatInfo.groupInfo, chatModel)
+            }
+          }
+          return
+        }
+        null -> {
+          val pos = msg.selection.start
+          if (msg.selection.length == 0 && getCharacter(msg.text, pos - 1)?.first == "@") {
+            val prevChar = getCharacter(msg.text, pos - 2)?.first
+            if (prevChar == null || prevChar == " " || prevChar == "\n") {
+              isVisible.value = true
+              mentionName.value = ""
+              mentionRange.value = TextRange(pos - 1, pos)
+              mentionMemberId.value = null
+              scope.launch {
+                setGroupMembers(rhId, chatInfo.groupInfo, chatModel)
+              }
+              return
+            }
+          }
+        }
+        else -> {}
+      }
+    }
+    scope.launch {
+      closeMembersPicker()
+    }
+  }
+
+  fun addMemberMention(member: GroupMember, range: TextRange) {
+    val mentions = composeState.value.mentions.toMutableMap()
+    val existingMention = mentions.entries.firstOrNull {
+      it.value.memberId == member.memberId
+    }
+    val newName = existingMention?.key ?: composeState.value.mentionMemberName(member.memberProfile.displayName)
+    mentions[newName] = CIMention(member)
+    var msgMention = if (newName.contains(" ") || (newName.lastOrNull()?.category in punctuation))
+                      "@'$newName'"
+                      else "@$newName"
+    var newPos = range.start + msgMention.length
+    val newMsgLength = composeState.value.message.text.length + msgMention.length - range.length
+    if (newPos == newMsgLength) {
+      msgMention += " "
+      newPos += 1
+    }
+
+    val msg = composeState.value.message.text.replaceRange(
+      range.start,
+      range.end,
+      msgMention
+    )
+    composeState.value = composeState.value.copy(
+      message = ComposeMessage(msg, TextRange(newPos)),
+      parsedMessage = parseToMarkdown(msg) ?: FormattedText.plain(msg),
+      mentions = mentions
+    )
+
+    composeViewFocusRequester?.requestFocus()
+
+    scope.launch {
+      closeMembersPicker()
+    }
+  }
+
+  LaunchedEffect(composeState.value.parsedMessage) {
+    currentMessage.value = composeState.value.message
+    messageChanged(currentMessage.value, composeState.value.parsedMessage)
+  }
+
+//  KeyChangeEffect(composeState.value.message.selection) {
+//    // This condition is needed to prevent messageChanged called twice,
+//    // because composeState.formattedText triggers later when message changes.
+//    // The condition is only true if position changed without text change
+//    if (currentMessage.value.text == composeState.value.message.text) {
+//      messageChanged(currentMessage.value, composeState.value.parsedMessage)
+//    }
+//  }
+
+  LaunchedEffect(isVisible.value) {
+    if (isVisible.value) {
+      offsetY.animateTo(
+        targetValue = 0f,
+        animationSpec = mentionPickerAnimSpec()
+      )
+    }
+  }
+  Box(
+    modifier = Modifier
+      .fillMaxSize()
+      .offset { IntOffset(0, offsetY.value.toInt()) }
+      .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {
+        scope.launch { closeMembersPicker() }
+      },
+    contentAlignment = Alignment.BottomStart
+  ) {
+    val showMaxReachedBox = composeState.value.mentions.size >= MAX_NUMBER_OF_MENTIONS && isVisible.value && composeState.value.mentions[mentionName.value] == null
+    LazyColumnWithScrollBarNoAppBar(
+      Modifier
+        .heightIn(max = MAX_PICKER_HEIGHT)
+        .background(MaterialTheme.colors.surface),
+      maxHeight = remember { mutableStateOf(MAX_PICKER_HEIGHT) },
+      containerAlignment = Alignment.BottomEnd
+    ) {
+      if (showMaxReachedBox) {
+        stickyHeader {
+          MaxMentionsReached()
+        }
+      }
+      itemsIndexed(filteredMembers.value, key = { _, item -> item.groupMemberId }) { i, member ->
+        if (i != 0 || !showMaxReachedBox) {
+          Divider()
+        }
+        val mentioned = mentionMemberId.value == member.memberId
+        val disabled = composeState.value.mentions.size >= MAX_NUMBER_OF_MENTIONS && !mentioned
+        Row(
+          Modifier
+            .fillMaxWidth()
+            .alpha(if (disabled) 0.6f else 1f)
+            .clickable(enabled = !disabled) {
+              val range = mentionRange.value ?: return@clickable
+              val mentionMemberValue = mentionMemberId.value
+
+              if (mentionMemberValue != null) {
+                if (mentionMemberValue != member.memberId) {
+                  addMemberMention(member, range)
+                } else {
+                  return@clickable
+                }
+              } else {
+                addMemberMention(member, range)
+              }
+            }
+            .padding(horizontal = DEFAULT_PADDING_HALF),
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          MemberRow(
+            member,
+            infoPage = false,
+            showlocalAliasAndFullName = true,
+            selected = mentioned
+          )
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun MaxMentionsReached() {
+  Column(Modifier.background(MaterialTheme.colors.surface)) {
+    Divider()
+    Row(
+      Modifier.fillMaxWidth(),
+      verticalAlignment = Alignment.CenterVertically,
+    ) {
+      Text(
+        String.format(generalGetString(MR.strings.max_group_mentions_per_message_reached), MAX_NUMBER_OF_MENTIONS),
+        Modifier.padding(12.dp),
+      )
+    }
+    Divider()
+  }
+}
+
+private fun getCharacter(s: String, pos: Int): Pair<CharSequence, IntRange>? {
+  return if (pos in s.indices) {
+    val char = s.subSequence(pos, pos + 1)
+    char to (pos until pos + 1)
+  } else {
+    null
+  }
+}
+
+private fun selectedMarkdown(
+  parsedMsg: List<FormattedText>,
+  range: TextRange
+): Pair<FormattedText, TextRange>? {
+  if (parsedMsg.isEmpty()) return null
+
+  var i = 0
+  var pos = 0
+
+  while (i < parsedMsg.size && pos + parsedMsg[i].text.length < range.start) {
+    pos += parsedMsg[i].text.length
+    i++
+  }
+
+  return if (i >= parsedMsg.size || range.end > pos + parsedMsg[i].text.length) {
+    null
+  } else {
+    parsedMsg[i] to TextRange(pos, pos + parsedMsg[i].text.length)
+  }
+}
+
+private fun removeUnusedMentions(composeState: MutableState<ComposeState>, parsedMsg: List<FormattedText>) {
+  val usedMentions = parsedMsg.mapNotNull { ft ->
+    when (ft.format) {
+      is Format.Mention -> ft.format.memberName
+      else -> null
+    }
+  }.toSet()
+
+  if (usedMentions.size < composeState.value.mentions.size) {
+    composeState.value = composeState.value.copy(
+      mentions = composeState.value.mentions.filterKeys { it in usedMentions }
+    )
+  }
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupPreferences.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupPreferences.kt
index 3d9f42f929..b8db5969a1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupPreferences.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupPreferences.kt
@@ -15,12 +15,16 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.PreferenceToggleWithIcon
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.common.platform.chatModel
+import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import kotlinx.coroutines.*
 
 private val featureRoles: List<Pair<GroupMemberRole?, String>> = listOf(
   null to generalGetString(MR.strings.feature_roles_all_members),
+  GroupMemberRole.Moderator to generalGetString(MR.strings.feature_roles_moderators),
   GroupMemberRole.Admin to generalGetString(MR.strings.feature_roles_admins),
   GroupMemberRole.Owner to generalGetString(MR.strings.feature_roles_owners)
 )
@@ -41,12 +45,12 @@ fun GroupPreferencesView(m: ChatModel, rhId: Long?, chatId: String, close: () ->
       val gp = gInfo.groupProfile.copy(groupPreferences = preferences.toGroupPreferences())
       val g = m.controller.apiUpdateGroup(rhId, gInfo.groupId, gp)
       if (g != null) {
-        withChats {
-          updateGroup(rhId, g)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, g)
           currentPreferences = preferences
         }
-        withChats {
-          updateGroup(rhId, g)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, g)
         }
       }
       afterSave()
@@ -69,6 +73,16 @@ fun GroupPreferencesView(m: ChatModel, rhId: Long?, chatId: String, close: () ->
         preferences = currentPreferences
       },
       savePrefs = ::savePrefs,
+      openMemberAdmission = {
+        ModalManager.end.showCustomModal { close ->
+          MemberAdmissionView(
+            chatModel,
+            rhId,
+            chatId,
+            close
+          )
+        }
+      }
     )
   }
 }
@@ -81,10 +95,15 @@ private fun GroupPreferencesLayout(
   applyPrefs: (FullGroupPreferences) -> Unit,
   reset: () -> Unit,
   savePrefs: () -> Unit,
+  openMemberAdmission: () -> Unit,
 ) {
   ColumnWithScrollBar {
     val titleId = if (groupInfo.businessChat == null) MR.strings.group_preferences else MR.strings.chat_preferences
     AppBarTitle(stringResource(titleId))
+    if (groupInfo.businessChat == null) {
+      MemberAdmissionButton(openMemberAdmission)
+      SectionDividerSpaced(maxBottomPadding = false)
+    }
     val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.enable) }
     val onTTLUpdated = { ttl: Int? ->
       applyPrefs(preferences.copy(timedMessages = preferences.timedMessages.copy(ttl = ttl)))
@@ -132,6 +151,11 @@ private fun GroupPreferencesLayout(
       applyPrefs(preferences.copy(simplexLinks = RoleGroupPreference(enable = enable, role)))
     }
 
+    SectionDividerSpaced(true, maxBottomPadding = false)
+    val enableReports = remember(preferences) { mutableStateOf(preferences.reports.enable) }
+    FeatureSection(GroupFeature.Reports, enableReports, null, groupInfo, preferences, onTTLUpdated) { enable, _ ->
+      applyPrefs(preferences.copy(reports = GroupPreference(enable = enable)))
+    }
     SectionDividerSpaced(true, maxBottomPadding = false)
     val enableHistory = remember(preferences) { mutableStateOf(preferences.history.enable) }
     FeatureSection(GroupFeature.History, enableHistory, null, groupInfo, preferences, onTTLUpdated) { enable, _ ->
@@ -149,6 +173,15 @@ private fun GroupPreferencesLayout(
   }
 }
 
+@Composable
+private fun MemberAdmissionButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_toggle_on),
+    stringResource(MR.strings.member_admission),
+    click = onClick
+  )
+}
+
 @Composable
 private fun FeatureSection(
   feature: GroupFeature,
@@ -169,6 +202,7 @@ private fun FeatureSection(
         feature.text,
         icon,
         iconTint,
+        disabled = feature == GroupFeature.Reports, // remove in 6.4
         checked = enableFeature.value == GroupFeatureEnabled.ON,
       ) { checked ->
         onSelected(if (checked) GroupFeatureEnabled.ON else GroupFeatureEnabled.OFF, enableForRole?.value)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
index 3163c109e6..fb24c028b2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
@@ -17,8 +17,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.*
@@ -27,8 +25,7 @@ import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.net.URI
 
 @Composable
@@ -40,8 +37,8 @@ fun GroupProfileView(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, cl
       withBGApi {
         val gInfo = chatModel.controller.apiUpdateGroup(rhId, groupInfo.groupId, p)
         if (gInfo != null) {
-          withChats {
-            updateGroup(rhId, gInfo)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId, gInfo)
           }
           close.invoke()
         }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupReportsView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupReportsView.kt
index a1ec3ec0a9..2cc2402c0a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupReportsView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupReportsView.kt
@@ -14,30 +14,22 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.flow.*
 
-val LocalContentTag: ProvidableCompositionLocal<MsgContentTag?> = staticCompositionLocalOf { null }
-
-data class GroupReports(
-  val reportsCount: Int,
-  val reportsView: Boolean,
-) {
-  val showBar: Boolean = reportsCount > 0 && !reportsView
-
-  fun toContentTag(): MsgContentTag? {
-    if (!reportsView) return null
-    return MsgContentTag.Report
-  }
-
-  val contentTag: MsgContentTag? = if (!reportsView) null else MsgContentTag.Report
-}
-
 @Composable
-private fun GroupReportsView(staleChatId: State<String?>, scrollToItemId: MutableState<Long?>) {
-  ChatView(staleChatId, reportsView = true, scrollToItemId, onComposed = {})
+private fun GroupReportsView(
+  reportsChatsCtx: ChatModel.ChatsContext,
+  staleChatId: State<String?>,
+  scrollToItemId: MutableState<Long?>,
+  close: () -> Unit
+) {
+  KeyChangeEffect(chatModel.chatId.value) {
+    close()
+  }
+  ChatView(reportsChatsCtx, staleChatId, scrollToItemId, onComposed = {})
 }
 
 @Composable
 fun GroupReportsAppBar(
-  groupReports: State<GroupReports>,
+  chatsCtx: ChatModel.ChatsContext,
   close: () -> Unit,
   onSearchValueChanged: (String) -> Unit
 ) {
@@ -65,11 +57,11 @@ fun GroupReportsAppBar(
       }
     }
   )
-  ItemsReload(groupReports)
+  ItemsReload(chatsCtx)
 }
 
 @Composable
-private fun ItemsReload(groupReports: State<GroupReports>) {
+fun ItemsReload(chatsCtx: ChatModel.ChatsContext,) {
   LaunchedEffect(Unit) {
     snapshotFlow { chatModel.chatId.value }
       .distinctUntilChanged()
@@ -79,18 +71,19 @@ private fun ItemsReload(groupReports: State<GroupReports>) {
       .filterNotNull()
       .filter { it.chatInfo is ChatInfo.Group }
       .collect { chat ->
-        reloadItems(chat, groupReports)
+        reloadItems(chatsCtx, chat)
       }
   }
 }
 
 suspend fun showGroupReportsView(staleChatId: State<String?>, scrollToItemId: MutableState<Long?>, chatInfo: ChatInfo) {
-  openChat(chatModel.remoteHostId(), chatInfo, MsgContentTag.Report)
-  ModalManager.end.showCustomModal(true, id = ModalViewId.GROUP_REPORTS) { close ->
+  val reportsChatsCtx = ChatModel.ChatsContext(secondaryContextFilter = SecondaryContextFilter.MsgContentTagContext(MsgContentTag.Report))
+  openChat(secondaryChatsCtx = reportsChatsCtx, chatModel.remoteHostId(), chatInfo)
+  ModalManager.end.showCustomModal(true, id = ModalViewId.SECONDARY_CHAT) { close ->
     ModalView({}, showAppBar = false) {
       val chatInfo = remember { derivedStateOf { chatModel.chats.value.firstOrNull { it.id == chatModel.chatId.value }?.chatInfo } }.value
       if (chatInfo is ChatInfo.Group && chatInfo.groupInfo.canModerate) {
-        GroupReportsView(staleChatId, scrollToItemId)
+        GroupReportsView(reportsChatsCtx, staleChatId, scrollToItemId, close)
       } else {
         LaunchedEffect(Unit) {
           close()
@@ -100,7 +93,6 @@ suspend fun showGroupReportsView(staleChatId: State<String?>, scrollToItemId: Mu
   }
 }
 
-private suspend fun reloadItems(chat: Chat, groupReports: State<GroupReports>) {
-  val contentFilter = groupReports.value.toContentTag()
-  apiLoadMessages(chat.remoteHostId, chat.chatInfo.chatType, chat.chatInfo.apiId, contentFilter, ChatPagination.Initial(ChatPagination.INITIAL_COUNT))
+private suspend fun reloadItems(chatsCtx: ChatModel.ChatsContext, chat: Chat) {
+  apiLoadMessages(chatsCtx, chat.remoteHostId, chat.chatInfo.chatType, chat.chatInfo.apiId, ChatPagination.Initial(ChatPagination.INITIAL_COUNT))
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberAdmission.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberAdmission.kt
new file mode 100644
index 0000000000..48171bfeb7
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberAdmission.kt
@@ -0,0 +1,152 @@
+package chat.simplex.common.views.chat.group
+
+import InfoRow
+import SectionBottomSpacer
+import SectionDividerSpaced
+import SectionItemView
+import SectionTextFooter
+import SectionView
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import dev.icerock.moko.resources.compose.stringResource
+import chat.simplex.common.views.helpers.*
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.common.platform.chatModel
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.StringResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Composable
+fun MemberAdmissionView(m: ChatModel, rhId: Long?, chatId: String, close: () -> Unit) {
+  val groupInfo = remember { derivedStateOf {
+    val ch = m.getChat(chatId)
+    val g = (ch?.chatInfo as? ChatInfo.Group)?.groupInfo
+    if (g == null || ch.remoteHostId != rhId) null else g
+  }}
+  val gInfo = groupInfo.value ?: return
+  var admission by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(gInfo.groupProfile.memberAdmission) }
+  var currentAdmission by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(admission) }
+
+  fun saveAdmission(afterSave: () -> Unit = {}) {
+    withBGApi {
+      val gp = gInfo.groupProfile.copy(memberAdmission = admission)
+      val g = m.controller.apiUpdateGroup(rhId, gInfo.groupId, gp)
+      if (g != null) {
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, g)
+          currentAdmission = admission
+        }
+      }
+      afterSave()
+    }
+  }
+  ModalView(
+    close = {
+      if (admission == currentAdmission) close()
+      else showUnsavedChangesAlert({ saveAdmission(close) }, close)
+    },
+  ) {
+    MemberAdmissionLayout(
+      admission,
+      currentAdmission,
+      gInfo,
+      applyAdmission = { admsn ->
+        admission = admsn
+      },
+      reset = {
+        admission = currentAdmission
+      },
+      saveAdmission = ::saveAdmission,
+    )
+  }
+}
+
+@Composable
+private fun MemberAdmissionLayout(
+  admission: GroupMemberAdmission?,
+  currentAdmission: GroupMemberAdmission?,
+  groupInfo: GroupInfo,
+  applyAdmission: (GroupMemberAdmission) -> Unit,
+  reset: () -> Unit,
+  saveAdmission: () -> Unit,
+) {
+  ColumnWithScrollBar {
+    AppBarTitle(stringResource(MR.strings.member_admission))
+    val review = remember(admission) { mutableStateOf(admission?.review) }
+    AdmissionSection(MR.strings.admission_stage_review, MR.strings.admission_stage_review_descr, review, groupInfo) { criteria ->
+      if (admission != null) {
+        applyAdmission(admission.copy(review = criteria))
+      } else {
+        applyAdmission(GroupMemberAdmission(review = criteria))
+      }
+    }
+    if (groupInfo.isOwner) {
+      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+      ResetSaveButtons(
+        reset = reset,
+        save = saveAdmission,
+        disabled = admission == currentAdmission
+      )
+    }
+    SectionBottomSpacer()
+  }
+}
+
+private val memberCriterias: List<Pair<MemberCriteria?, String>> = listOf(
+  null to generalGetString(MR.strings.member_criteria_off),
+  MemberCriteria.All to generalGetString(MR.strings.member_criteria_all)
+)
+
+@Composable
+private fun AdmissionSection(
+  admissionStageStrId: StringResource,
+  admissionStageDescrStrId: StringResource,
+  memberCriteria: State<MemberCriteria?>,
+  groupInfo: GroupInfo,
+  onSelected: (MemberCriteria?) -> Unit
+) {
+  SectionView {
+    if (groupInfo.isOwner) {
+      ExposedDropDownSettingRow(
+        generalGetString(admissionStageStrId),
+        memberCriterias,
+        memberCriteria,
+        onSelected = { value ->
+          onSelected(value)
+        }
+      )
+    } else {
+      InfoRow(
+        stringResource(admissionStageStrId),
+        memberCriteria.value?.text ?: generalGetString(MR.strings.member_criteria_off)
+      )
+    }
+  }
+  SectionTextFooter(stringResource( admissionStageDescrStrId))
+}
+
+@Composable
+private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
+  SectionView {
+    SectionItemView(reset, disabled = disabled) {
+      Text(stringResource(MR.strings.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+    }
+    SectionItemView(save, disabled = disabled) {
+      Text(stringResource(MR.strings.save_and_notify_group_members), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+    }
+  }
+}
+
+private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
+  AlertManager.shared.showAlertDialogStacked(
+    title = generalGetString(MR.strings.save_admission_question),
+    confirmText = generalGetString(MR.strings.save_and_notify_group_members),
+    dismissText = generalGetString(MR.strings.exit_without_saving),
+    onConfirm = save,
+    onDismiss = revert,
+  )
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportChatView.kt
new file mode 100644
index 0000000000..99e2e3198e
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportChatView.kt
@@ -0,0 +1,145 @@
+package chat.simplex.common.views.chat.group
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.chatlist.*
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
+
+@Composable
+private fun MemberSupportChatView(
+  chatInfo: ChatInfo,
+  memberSupportChatsCtx: ChatModel.ChatsContext,
+  staleChatId: State<String?>,
+  scrollToItemId: MutableState<Long?>
+) {
+  KeyChangeEffect(chatModel.chatId.value) {
+    ModalManager.end.closeModals()
+  }
+  if (appPlatform.isAndroid) {
+    DisposableEffect(Unit) {
+      onDispose {
+        val chat = chatModel.chats.value.firstOrNull { ch -> ch.id == chatInfo.id }
+        if (
+          memberSupportChatsCtx.isUserSupportChat
+          && chat?.chatInfo?.groupInfo_?.membership?.memberPending == true
+        ) {
+          withBGApi {
+            chatModel.chatId.value = null
+          }
+        }
+      }
+    }
+  }
+  ChatView(memberSupportChatsCtx, staleChatId, scrollToItemId, onComposed = {})
+}
+
+@Composable
+fun MemberSupportChatAppBar(
+  chatsCtx: ChatModel.ChatsContext,
+  scopeMember_: GroupMember?,
+  close: () -> Unit,
+  onSearchValueChanged: (String) -> Unit
+) {
+  val oneHandUI = remember { ChatController.appPrefs.oneHandUI.state }
+  val showSearch = rememberSaveable { mutableStateOf(false) }
+  val onBackClicked = {
+    if (!showSearch.value) {
+      close()
+    } else {
+      onSearchValueChanged("")
+      showSearch.value = false
+    }
+  }
+  BackHandler(onBack = onBackClicked)
+  if (scopeMember_ != null) {
+    DefaultAppBar(
+      navigationButton = { NavigationButtonBack(onBackClicked) },
+      title = { MemberSupportChatToolbarTitle(scopeMember_) },
+      onTitleClick = null,
+      onTop = !oneHandUI.value,
+      showSearch = showSearch.value,
+      onSearchValueChanged = onSearchValueChanged,
+      buttons = {
+        IconButton({ showSearch.value = true }) {
+          Icon(painterResource(MR.images.ic_search), stringResource(MR.strings.search_verb), tint = MaterialTheme.colors.primary)
+        }
+      }
+    )
+  } else {
+    DefaultAppBar(
+      navigationButton = { NavigationButtonBack(onBackClicked) },
+      fixedTitleText = stringResource(MR.strings.support_chat),
+      onTitleClick = null,
+      onTop = !oneHandUI.value,
+      showSearch = showSearch.value,
+      onSearchValueChanged = onSearchValueChanged,
+      buttons = {
+        IconButton({ showSearch.value = true }) {
+          Icon(painterResource(MR.images.ic_search), stringResource(MR.strings.search_verb), tint = MaterialTheme.colors.primary)
+        }
+      }
+    )
+  }
+  ItemsReload(chatsCtx)
+}
+
+@Composable
+fun MemberSupportChatToolbarTitle(member: GroupMember, imageSize: Dp = 40.dp, iconColor: Color = MaterialTheme.colors.secondaryVariant.mixWith(MaterialTheme.colors.onBackground, 0.97f)) {
+  Row(
+    horizontalArrangement = Arrangement.Center,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    MemberProfileImage(size = imageSize * fontSizeSqrtMultiplier, member, iconColor)
+    Column(
+      Modifier.padding(start = 8.dp),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      Row(verticalAlignment = Alignment.CenterVertically) {
+        if (member.verified) {
+          MemberVerifiedShield()
+        }
+        Text(
+          member.displayName, fontWeight = FontWeight.SemiBold,
+          maxLines = 1, overflow = TextOverflow.Ellipsis
+        )
+      }
+      if (member.fullName != "" && member.fullName != member.displayName && member.localAlias.isEmpty()) {
+        Text(
+          member.fullName,
+          maxLines = 1, overflow = TextOverflow.Ellipsis
+        )
+      }
+    }
+  }
+}
+
+suspend fun showMemberSupportChatView(staleChatId: State<String?>, scrollToItemId: MutableState<Long?>, chatInfo: ChatInfo, scopeInfo: GroupChatScopeInfo) {
+  val memberSupportChatsCtx = ChatModel.ChatsContext(secondaryContextFilter = SecondaryContextFilter.GroupChatScopeContext(scopeInfo))
+  openChat(secondaryChatsCtx = memberSupportChatsCtx, chatModel.remoteHostId(), chatInfo)
+  ModalManager.end.showCustomModal(true, id = ModalViewId.SECONDARY_CHAT) { close ->
+    ModalView({}, showAppBar = false) {
+      if (chatInfo is ChatInfo.Group && chatInfo.groupChatScope != null) {
+        MemberSupportChatView(chatInfo, memberSupportChatsCtx, staleChatId, scrollToItemId)
+      } else {
+        LaunchedEffect(Unit) {
+          close()
+        }
+      }
+    }
+  }
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportView.kt
new file mode 100644
index 0000000000..298a545c8c
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/MemberSupportView.kt
@@ -0,0 +1,302 @@
+package chat.simplex.common.views.chat.group
+
+import SectionBottomSpacer
+import SectionItemView
+import SectionItemViewLongClickable
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import dev.icerock.moko.resources.compose.stringResource
+import chat.simplex.common.views.helpers.*
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.chat.item.ItemAction
+import chat.simplex.common.views.chatlist.*
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import kotlinx.coroutines.*
+
+@Composable
+fun ModalData.MemberSupportView(
+  rhId: Long?,
+  chat: Chat,
+  groupInfo: GroupInfo,
+  scrollToItemId: MutableState<Long?>,
+  close: () -> Unit
+) {
+  KeyChangeEffect(chatModel.chatId.value) {
+    ModalManager.end.closeModals()
+  }
+  LaunchedEffect(Unit) {
+    setGroupMembers(rhId, groupInfo, chatModel)
+  }
+  ModalView(
+    close = close,
+    endButtons = { RefreshMembersButton(rhId, groupInfo) }
+  ) {
+    MemberSupportViewLayout(
+      chat,
+      groupInfo,
+      scrollToItemId
+    )
+  }
+}
+
+@Composable
+fun RefreshMembersButton(
+  rhId: Long?,
+  groupInfo: GroupInfo
+) {
+  IconButton(
+    onClick = {
+      withBGApi {
+        setGroupMembers(rhId, groupInfo, chatModel)
+      }
+    }
+  ) {
+    Icon(
+      painterResource(MR.images.ic_refresh),
+      contentDescription = null,
+      tint = MaterialTheme.colors.primary
+    )
+  }
+}
+
+@Composable
+private fun ModalData.MemberSupportViewLayout(
+  chat: Chat,
+  groupInfo: GroupInfo,
+  scrollToItemId: MutableState<Long?>
+) {
+  val oneHandUI = remember { ChatController.appPrefs.oneHandUI.state }
+  val scope = rememberCoroutineScope()
+
+  val membersWithChats = remember { chatModel.groupMembers }.value
+    .filter { it.supportChat != null && it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
+    .sortedWith(
+      compareByDescending<GroupMember> { it.memberPending }
+        .thenByDescending { (it.supportChat?.mentions ?: 0) > 0 }
+        .thenByDescending { (it.supportChat?.memberAttention ?: 0) > 0 }
+        .thenByDescending { (it.supportChat?.unread ?: 0) > 0 }
+        .thenByDescending { it.supportChat?.chatTs }
+    )
+
+  val searchText = remember { stateGetOrPut("searchText") { TextFieldValue() } }
+  val filteredmembersWithChats = remember(membersWithChats) {
+    derivedStateOf {
+      val s = searchText.value.text.trim().lowercase()
+      if (s.isEmpty()) membersWithChats else membersWithChats.filter { m -> m.anyNameContains(s) }
+    }
+  }
+
+  LazyColumnWithScrollBar(
+    contentPadding =
+    PaddingValues(
+      top = if (oneHandUI.value) WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + DEFAULT_PADDING + 5.dp else topPaddingToContent(false)
+    )
+  ) {
+    item {
+      AppBarTitle(stringResource(MR.strings.member_support))
+    }
+
+    if (membersWithChats.isEmpty()) {
+      item {
+        Box(Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING), contentAlignment = Alignment.Center) {
+          Text(generalGetString(MR.strings.no_support_chats), color = MaterialTheme.colors.secondary, textAlign = TextAlign.Center)
+        }
+      }
+    } else {
+      item {
+        SectionItemView(padding = PaddingValues(start = 14.dp, end = DEFAULT_PADDING_HALF)) {
+          MemberListSearchRowView(searchText)
+        }
+      }
+      items(filteredmembersWithChats.value, key = { it.groupMemberId }) { member ->
+        Divider()
+        val showMenu = remember { mutableStateOf(false) }
+        SectionItemViewLongClickable(
+          click = {
+            val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = member)
+            val supportChatInfo = ChatInfo.Group(groupInfo, groupChatScope = scopeInfo)
+            scope.launch {
+              showMemberSupportChatView(
+                chatModel.chatId,
+                scrollToItemId = scrollToItemId,
+                supportChatInfo,
+                scopeInfo
+              )
+            }
+          },
+          longClick = { showMenu.value = true },
+          minHeight = 54.dp,
+          padding = PaddingValues(horizontal = DEFAULT_PADDING)
+        ) {
+          Box(contentAlignment = Alignment.CenterStart) {
+            DropDownMenuForSupportChat(chat.remoteHostId, member, groupInfo, showMenu)
+            SupportChatRow(member)
+          }
+        }
+      }
+      item {
+        Divider()
+        SectionBottomSpacer()
+      }
+    }
+  }
+}
+
+@Composable
+fun SupportChatRow(member: GroupMember) {
+  fun memberStatus(): String {
+    return if (member.activeConn?.connDisabled == true) {
+      generalGetString(MR.strings.member_info_member_disabled)
+    } else if (member.activeConn?.connInactive == true) {
+      generalGetString(MR.strings.member_info_member_inactive)
+    } else if (member.memberPending) {
+      member.memberStatus.text
+    } else {
+      member.memberRole.text
+    }
+  }
+
+  @Composable
+  fun SupportChatUnreadIndicator(supportChat: GroupSupportChat) {
+    Box(Modifier.widthIn(min = 34.sp.toDp()), contentAlignment = Alignment.TopEnd) {
+      Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.sp.toDp())) {
+        if (supportChat.unread > 0 || supportChat.mentions > 0 || supportChat.memberAttention > 0) {
+          val unreadBadgeColor = when {
+            supportChat.mentions > 0 || supportChat.memberAttention > 0 -> MaterialTheme.colors.primaryVariant
+            else -> MaterialTheme.colors.secondary
+          }
+          if (supportChat.mentions == 1 && supportChat.unread == 1) {
+            Box(modifier = Modifier.offset(y = 2.sp.toDp()).size(15.sp.toDp()).background(unreadBadgeColor, shape = CircleShape), contentAlignment = Alignment.Center) {
+              Icon(
+                painterResource(MR.images.ic_alternate_email),
+                contentDescription = generalGetString(MR.strings.notifications),
+                tint = Color.White,
+                modifier = Modifier.size(9.sp.toDp())
+              )
+            }
+          } else {
+            if (supportChat.mentions > 0 && supportChat.unread > 1) {
+              Icon(
+                painterResource(MR.images.ic_alternate_email),
+                contentDescription = generalGetString(MR.strings.notifications),
+                tint = unreadBadgeColor,
+                modifier = Modifier.size(12.sp.toDp()).offset(y = 2.sp.toDp())
+              )
+            }
+
+            UnreadBadge(
+              text = unreadCountStr(supportChat.unread),
+              backgroundColor = unreadBadgeColor,
+              yOffset = 2.dp
+            )
+          }
+        }
+      }
+    }
+  }
+
+  Row(
+    Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Row(
+      Modifier.weight(1f).padding(top = MEMBER_ROW_VERTICAL_PADDING, end = DEFAULT_PADDING, bottom = MEMBER_ROW_VERTICAL_PADDING),
+      horizontalArrangement = Arrangement.spacedBy(4.dp),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      MemberProfileImage(size = MEMBER_ROW_AVATAR_SIZE, member)
+      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
+      Column {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          if (member.verified) {
+            MemberVerifiedShield()
+          }
+          Text(
+            member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
+            color = if (member.memberIncognito) Indigo else Color.Unspecified
+          )
+        }
+
+        Text(
+          memberStatus(),
+          color = MaterialTheme.colors.secondary,
+          fontSize = 12.sp,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis
+        )
+      }
+    }
+
+    Row {
+      if (member.memberPending) {
+        Icon(
+          painterResource(MR.images.ic_flag_filled),
+          contentDescription = null,
+          Modifier.padding(end = 3.dp).size(16.dp),
+          tint = MaterialTheme.colors.primaryVariant
+        )
+      }
+      if (member.supportChat != null) {
+        SupportChatUnreadIndicator(member.supportChat)
+      }
+    }
+  }
+}
+
+@Composable
+private fun DropDownMenuForSupportChat(rhId: Long?, member: GroupMember, groupInfo: GroupInfo, showMenu: MutableState<Boolean>) {
+  DefaultDropdownMenu(showMenu) {
+    if (member.memberPending) {
+      ItemAction(stringResource(MR.strings.accept_pending_member_button), painterResource(MR.images.ic_check), color = MaterialTheme.colors.primary, onClick = {
+        acceptMemberDialog(rhId, groupInfo, member)
+        showMenu.value = false
+      })
+    } else {
+      ItemAction(stringResource(MR.strings.delete_member_support_chat_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
+        deleteMemberSupportChatDialog(rhId, groupInfo, member)
+        showMenu.value = false
+      })
+    }
+  }
+}
+
+fun deleteMemberSupportChatDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.delete_member_support_chat_alert_title),
+    confirmText = generalGetString(MR.strings.delete_member_support_chat_button),
+    onConfirm = {
+      deleteMemberSupportChat(rhId, groupInfo, member)
+    },
+    destructive = true,
+  )
+}
+
+private fun deleteMemberSupportChat(rhId: Long?, groupInfo: GroupInfo, member: GroupMember) {
+  withBGApi {
+    val r = chatModel.controller.apiDeleteMemberSupportChat(rhId, groupInfo.groupId, member.groupMemberId)
+    if (r != null) {
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.upsertGroupMember(rhId, r.first, r.second)
+        chatModel.chatsContext.updateGroup(rhId, r.first)
+      }
+    }
+  }
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
index 703d74f225..1e99c7f527 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
@@ -26,13 +26,10 @@ import chat.simplex.common.ui.theme.DEFAULT_PADDING
 import chat.simplex.common.views.chat.item.MarkdownText
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.model.GroupInfo
-import chat.simplex.common.platform.ColumnWithScrollBar
-import chat.simplex.common.platform.chatJsonLength
+import chat.simplex.common.platform.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.*
 
 private const val maxByteCount = 1200
 
@@ -51,8 +48,8 @@ fun GroupWelcomeView(m: ChatModel, rhId: Long?, groupInfo: GroupInfo, close: ()
       val res = m.controller.apiUpdateGroup(rhId, gInfo.groupId, groupProfileUpdated)
       if (res != null) {
         gInfo = res
-        withChats {
-          updateGroup(rhId, res)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateGroup(rhId, res)
         }
         welcomeText.value = welcome ?: ""
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
index 7711ee73af..c743d78d1c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
@@ -13,10 +13,10 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatModel.getChatItemIndexOrNull
 import chat.simplex.common.platform.onRightClick
-import chat.simplex.common.views.chat.group.LocalContentTag
 
 @Composable
 fun CIChatFeatureView(
+  chatsCtx: ChatModel.ChatsContext,
   chatInfo: ChatInfo,
   chatItem: ChatItem,
   feature: Feature,
@@ -25,7 +25,7 @@ fun CIChatFeatureView(
   revealed: State<Boolean>,
   showMenu: MutableState<Boolean>,
 ) {
-  val merged = if (!revealed.value) mergedFeatures(chatItem, chatInfo) else emptyList()
+  val merged = if (!revealed.value) mergedFeatures(chatsCtx, chatItem, chatInfo) else emptyList()
   Box(
     Modifier
       .combinedClickable(
@@ -72,11 +72,10 @@ private fun Feature.toFeatureInfo(color: Color, param: Int?, type: String): Feat
   )
 
 @Composable
-private fun mergedFeatures(chatItem: ChatItem, chatInfo: ChatInfo): List<FeatureInfo>? {
-  val m = ChatModel
+private fun mergedFeatures(chatsCtx: ChatModel.ChatsContext, chatItem: ChatItem, chatInfo: ChatInfo): List<FeatureInfo>? {
   val fs: ArrayList<FeatureInfo> = arrayListOf()
   val icons: MutableSet<PainterBox> = mutableSetOf()
-  val reversedChatItems = m.chatItemsForContent(LocalContentTag.current).value.asReversed()
+  val reversedChatItems = chatsCtx.chatItems.value.asReversed()
   var i = getChatItemIndexOrNull(chatItem, reversedChatItems)
   if (i != null) {
     while (i < reversedChatItems.size) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt
index 401d098bea..1be2110b1f 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt
@@ -8,6 +8,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
@@ -91,12 +92,6 @@ fun CIImageView(
     }
   }
 
-  @Composable
-  fun imageViewFullWidth(): Dp {
-    val approximatePadding = 100.dp
-    return with(LocalDensity.current) { minOf(DEFAULT_MAX_IMAGE_WIDTH, LocalWindowWidth() - approximatePadding) }
-  }
-
   @Composable
   fun imageView(imageBitmap: ImageBitmap, onClick: () -> Unit) {
     Image(
@@ -122,7 +117,7 @@ fun CIImageView(
     // IllegalStateException: Recording currently in progress - missing #endRecording() call?
     // but can display 5000px image. Using even lower value here just to feel safer.
     // It happens to WebP because it's not compressed while sending since it can be animated.
-    if (painter.intrinsicSize.width <= 4320 && painter.intrinsicSize.height <= 4320) {
+    if (painter.intrinsicSize != Size.Unspecified && painter.intrinsicSize.width <= 4320 && painter.intrinsicSize.height <= 4320) {
       Image(
         painter,
         contentDescription = stringResource(MR.strings.image_descr),
@@ -140,7 +135,7 @@ fun CIImageView(
       )
     } else {
       Box(Modifier
-        .width(if (painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH)
+        .width(if (painter.intrinsicSize != Size.Unspecified && painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH)
         .combinedClickable(
           onLongClick = { showMenu.value = true },
           onClick = {}
@@ -264,6 +259,12 @@ fun CIImageView(
   }
 }
 
+@Composable
+fun imageViewFullWidth(): Dp {
+  val approximatePadding = 100.dp
+  return with(LocalDensity.current) { minOf(DEFAULT_MAX_IMAGE_WIDTH, LocalWindowWidth() - approximatePadding) }
+}
+
 private fun showDownloadButton(status: CIFileStatus?): Boolean =
   status is CIFileStatus.RcvInvitation || status is CIFileStatus.RcvAborted
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
index 3b2bf63f28..6e938aa5c4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
@@ -3,8 +3,7 @@ package chat.simplex.common.views.chat.item
 import SectionItemView
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.HoverInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.*
 import androidx.compose.material.*
@@ -30,9 +29,10 @@ import chat.simplex.common.model.ChatModel.currentUser
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
-import chat.simplex.common.views.chat.group.LocalContentTag
+import chat.simplex.common.views.chatlist.openChat
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.ImageResource
 import kotlinx.datetime.Clock
 import kotlin.math.*
 
@@ -62,6 +62,7 @@ data class ChatItemReactionMenuItem (
 
 @Composable
 fun ChatItemView(
+  chatsCtx: ChatModel.ChatsContext,
   rhId: Long?,
   cInfo: ChatInfo,
   cItem: ChatItem,
@@ -71,17 +72,21 @@ fun ChatItemView(
   linkMode: SimplexLinkMode,
   revealed: State<Boolean>,
   highlighted: State<Boolean>,
+  hoveredItemId: MutableState<Long?>,
   range: State<IntRange?>,
   selectedChatItems: MutableState<Set<Long>?>,
+  searchIsNotBlank: State<Boolean>,
   fillMaxWidth: Boolean = true,
   selectChatItem: () -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
+  archiveReports: (List<Long>, Boolean) -> Unit,
   receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long, () -> Unit) -> Unit,
   acceptCall: (Contact) -> Unit,
   scrollToItem: (Long) -> Unit,
+  scrollToItemId: MutableState<Long?>,
   scrollToQuotedItemFromItem: (Long) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
   openDirectChat: (Long) -> Unit,
@@ -112,7 +117,7 @@ fun ChatItemView(
   val live = remember { derivedStateOf { composeState.value.liveMessage != null } }.value
 
   Box(
-    modifier = if (fillMaxWidth) Modifier.fillMaxWidth() else Modifier,
+    modifier = (if (fillMaxWidth) Modifier.fillMaxWidth() else Modifier),
     contentAlignment = alignment,
   ) {
     val info = cItem.meta.itemStatus.statusInto
@@ -227,190 +232,423 @@ fun ChatItemView(
       }
     }
 
-    Column(horizontalAlignment = if (cItem.chatDir.sent) Alignment.End else Alignment.Start) {
-      val interactionSource = remember { MutableInteractionSource() }
-      val enterInteraction = remember { HoverInteraction.Enter() }
-      KeyChangeEffect(highlighted.value) {
-        if (highlighted.value) {
-          interactionSource.emit(enterInteraction)
+    @Composable
+    fun GoToItemInnerButton(alignStart: Boolean, icon: ImageResource, iconSize: Dp = 22.dp, parentActivated: State<Boolean>, onClick: () -> Unit) {
+      val buttonInteractionSource = remember { MutableInteractionSource() }
+      val buttonHovered = buttonInteractionSource.collectIsHoveredAsState()
+      val buttonPressed = buttonInteractionSource.collectIsPressedAsState()
+      val buttonActivated = remember { derivedStateOf { buttonHovered.value || buttonPressed.value } }
+
+      val fullyVisible = parentActivated.value || buttonActivated.value || hoveredItemId.value == cItem.id
+      val mixAlpha = 0.6f
+      val mixedBackgroundColor = if (fullyVisible) {
+        if (MaterialTheme.colors.isLight) {
+          MaterialTheme.colors.secondary.mixWith(Color.White, mixAlpha)
         } else {
-          interactionSource.emit(HoverInteraction.Exit(enterInteraction))
+          MaterialTheme.colors.secondary.mixWith(Color.Black, mixAlpha)
+        }
+      } else {
+        Color.Unspecified
+      }
+      val iconTint = if (fullyVisible) {
+        Color.White
+      } else {
+        if (MaterialTheme.colors.isLight) {
+          MaterialTheme.colors.secondary.mixWith(Color.White, mixAlpha)
+        } else {
+          MaterialTheme.colors.secondary.mixWith(Color.Black, mixAlpha)
         }
       }
-      Column(
+
+      IconButton(
+        onClick,
         Modifier
-          .clipChatItem(cItem, itemSeparation.largeGap, revealed.value)
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick, interactionSource = interactionSource, indication = LocalIndication.current)
-          .onRightClick { showMenu.value = true },
+          .padding(start = if (alignStart) 0.dp else DEFAULT_PADDING_HALF + 3.dp, end = if (alignStart) DEFAULT_PADDING_HALF + 3.dp else 0.dp)
+          .then(if (fullyVisible) Modifier.background(mixedBackgroundColor, CircleShape) else Modifier)
+          .size(22.dp),
+        interactionSource = buttonInteractionSource
       ) {
-        @Composable
-        fun framedItemView() {
-          FramedItemView(cInfo, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToQuotedItemFromItem)
-        }
+        Icon(painterResource(icon), null, Modifier.size(iconSize), tint = iconTint)
+      }
+    }
 
-        fun deleteMessageQuestionText(): String {
-          return if (!sent || fullDeleteAllowed || cInfo is ChatInfo.Local) {
-            generalGetString(MR.strings.delete_message_cannot_be_undone_warning)
-          } else {
-            generalGetString(MR.strings.delete_message_mark_deleted_warning)
+    // improvement could be to track "forwarded from" scope and open it
+    @Composable
+    fun GoToItemButton(alignStart: Boolean, parentActivated: State<Boolean>) {
+      val chatTypeApiIdMsgId = cItem.meta.itemForwarded?.chatTypeApiIdMsgId
+      if (searchIsNotBlank.value) {
+        GoToItemInnerButton(alignStart, MR.images.ic_search, 17.dp, parentActivated) {
+          withBGApi {
+            openChat(secondaryChatsCtx = null, rhId, cInfo.chatType, cInfo.apiId, cItem.id)
+            closeReportsIfNeeded()
           }
         }
+      } else if (chatTypeApiIdMsgId != null) {
+        GoToItemInnerButton(alignStart, MR.images.ic_arrow_forward, 22.dp, parentActivated) {
+          val (chatType, apiId, msgId) = chatTypeApiIdMsgId
+          withBGApi {
+            openChat(secondaryChatsCtx = null, rhId, chatType, apiId, msgId)
+            closeReportsIfNeeded()
+          }
+        }
+      }
+    }
 
-        @Composable
-        fun MsgReactionsMenu() {
-          val rs = MsgReaction.old.mapNotNull { r ->
-            if (null == cItem.reactions.find { it.userReacted && it.reaction.text == r.text }) {
-              r
+    Column(horizontalAlignment = if (cItem.chatDir.sent) Alignment.End else Alignment.Start) {
+      Row(verticalAlignment = Alignment.CenterVertically) {
+        val bubbleInteractionSource = remember { MutableInteractionSource() }
+        val bubbleHovered = bubbleInteractionSource.collectIsHoveredAsState()
+        if (cItem.chatDir.sent) {
+          GoToItemButton(true, bubbleHovered)
+        }
+        Column(Modifier.weight(1f, fill = false)) {
+          val enterInteraction = remember { HoverInteraction.Enter() }
+          LaunchedEffect(highlighted.value, hoveredItemId.value) {
+            if (highlighted.value || hoveredItemId.value == cItem.id) {
+              bubbleInteractionSource.emit(enterInteraction)
             } else {
-              null
+              bubbleInteractionSource.emit(HoverInteraction.Exit(enterInteraction))
             }
           }
-          if (rs.isNotEmpty()) {
-            Row(modifier = Modifier.padding(horizontal = DEFAULT_PADDING).horizontalScroll(rememberScrollState()), verticalAlignment = Alignment.CenterVertically) {
-              rs.forEach() { r ->
-                Box(
-                  Modifier.size(36.dp).clickable {
-                    setReaction(cInfo, cItem, true, r)
-                    showMenu.value = false
-                  },
-                  contentAlignment = Alignment.Center
-                ) {
-                  ReactionIcon(r.text, 12.sp)
+          Column(
+            Modifier
+              .clipChatItem(cItem, itemSeparation.largeGap, revealed.value)
+              .hoverable(bubbleInteractionSource)
+              .combinedClickable(
+                onLongClick = { showMenu.value = true },
+                onClick = {
+                  if (appPlatform.isAndroid && (searchIsNotBlank.value || cItem.meta.itemForwarded?.chatTypeApiIdMsgId != null)) {
+                    hoveredItemId.value = if (hoveredItemId.value == cItem.id) null else cItem.id
+                  }
+                  onClick()
+                }, interactionSource = bubbleInteractionSource, indication = LocalIndication.current)
+              .onRightClick { showMenu.value = true },
+          ) {
+            @Composable
+            fun framedItemView() {
+              FramedItemView(chatsCtx, cInfo, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToItemId, scrollToQuotedItemFromItem)
+            }
+
+            fun deleteMessageQuestionText(): String {
+              return if (!sent || fullDeleteAllowed || cInfo is ChatInfo.Local) {
+                generalGetString(MR.strings.delete_message_cannot_be_undone_warning)
+              } else {
+                generalGetString(MR.strings.delete_message_mark_deleted_warning)
+              }
+            }
+
+            @Composable
+            fun MsgReactionsMenu() {
+              val rs = MsgReaction.supported.mapNotNull { r ->
+                if (null == cItem.reactions.find { it.userReacted && it.reaction.text == r.text }) {
+                  r
+                } else {
+                  null
+                }
+              }
+              if (rs.isNotEmpty()) {
+                Row(modifier = Modifier.padding(horizontal = DEFAULT_PADDING).horizontalScroll(rememberScrollState()), verticalAlignment = Alignment.CenterVertically) {
+                  rs.forEach() { r ->
+                    Box(
+                      Modifier.size(36.dp).clip(CircleShape).clickable {
+                        setReaction(cInfo, cItem, true, r)
+                        showMenu.value = false
+                      },
+                      contentAlignment = Alignment.Center
+                    ) {
+                      ReactionIcon(r.text, 12.sp)
+                    }
+                  }
                 }
               }
             }
-          }
-        }
 
-        @Composable
-        fun DeleteItemMenu() {
-          DefaultDropdownMenu(showMenu) {
-            DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-            if (cItem.canBeDeletedForSelf) {
-              Divider()
-              SelectItemAction(showMenu, selectChatItem)
-            }
-          }
-        }
-
-        @Composable
-        fun MsgContentItemDropdownMenu() {
-          val saveFileLauncher = rememberSaveFileLauncher(ciFile = cItem.file)
-          when {
-            // cItem.id check is a special case for live message chat item which has negative ID while not sent yet
-            cItem.isReport && cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group -> {
+            @Composable
+            fun DeleteItemMenu() {
               DefaultDropdownMenu(showMenu) {
-                if (cItem.chatDir !is CIDirection.GroupSnd && cInfo.groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
-                  ArchiveReportItemAction(cItem, showMenu, deleteMessage)
-                }
-                DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages, buttonText = stringResource(MR.strings.delete_report))
-                Divider()
-                SelectItemAction(showMenu, selectChatItem)
-              }
-            }
-            cItem.content.msgContent != null && cItem.id >= 0 && !cItem.isReport -> {
-              DefaultDropdownMenu(showMenu) {
-                if (cInfo.featureEnabled(ChatFeature.Reactions) && cItem.allowAddReaction) {
-                  MsgReactionsMenu()
-                }
-                if (cItem.meta.itemDeleted == null && !live && !cItem.localNote) {
-                  ItemAction(stringResource(MR.strings.reply_verb), painterResource(MR.images.ic_reply), onClick = {
-                    if (composeState.value.editing) {
-                      composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-                    } else {
-                      composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-                    }
-                    showMenu.value = false
-                  })
-                }
-                val clipboard = LocalClipboardManager.current
-                val cachedRemoteReqs = remember { CIFile.cachedRemoteFileRequests }
-
-                val copyAndShareAllowed = when {
-                  cItem.content.text.isNotEmpty() -> true
-                  cItem.file?.forwardingAllowed() == true -> true
-                  else -> false
-                }
-
-                if (copyAndShareAllowed) {
-                  ItemAction(stringResource(MR.strings.share_verb), painterResource(MR.images.ic_share), onClick = {
-                    var fileSource = getLoadedFileSource(cItem.file)
-                    val shareIfExists = {
-                      when (val f = fileSource) {
-                        null -> clipboard.shareText(cItem.content.text)
-                        else -> shareFile(cItem.text, f)
-                      }
-                      showMenu.value = false
-                    }
-                    if (chatModel.connectedToRemote() && fileSource == null) {
-                      withLongRunningApi(slow = 600_000) {
-                        cItem.file?.loadRemoteFile(true)
-                        fileSource = getLoadedFileSource(cItem.file)
-                        shareIfExists()
-                      }
-                    } else shareIfExists()
-                  })
-                }
-                if (copyAndShareAllowed) {
-                  ItemAction(stringResource(MR.strings.copy_verb), painterResource(MR.images.ic_content_copy), onClick = {
-                    copyItemToClipboard(cItem, clipboard)
-                    showMenu.value = false
-                  })
-                }
-                if (cItem.file != null && (getLoadedFilePath(cItem.file) != null || (chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file.fileSource] != false && cItem.file.loaded))) {
-                  SaveContentItemAction(cItem, saveFileLauncher, showMenu)
-                } else if (cItem.file != null && cItem.file.fileStatus is CIFileStatus.RcvInvitation && fileSizeValid(cItem.file)) {
-                  ItemAction(stringResource(MR.strings.download_file), painterResource(MR.images.ic_arrow_downward), onClick = {
-                    withBGApi {
-                      Log.d(TAG, "ChatItemView downloadFileAction")
-                      val user = chatModel.currentUser.value
-                      if (user != null) {
-                        controller.receiveFile(rhId, user, cItem.file.fileId)
-                      }
-                    }
-                    showMenu.value = false
-                  })
-                }
-                if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
-                  ItemAction(stringResource(MR.strings.edit_verb), painterResource(MR.images.ic_edit_filled), onClick = {
-                    composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-                    showMenu.value = false
-                  })
-                }
-                if (cItem.meta.itemDeleted == null &&
-                  (cItem.file == null || cItem.file.forwardingAllowed()) &&
-                  !cItem.isLiveDummy && !live
-                  ) {
-                  ItemAction(stringResource(MR.strings.forward_chat_item), painterResource(MR.images.ic_forward), onClick = {
-                    forwardItem(cInfo, cItem)
-                    showMenu.value = false
-                  })
-                }
-                ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-                if (revealed.value) {
-                  HideItemAction(revealed, showMenu, reveal)
-                }
-                if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null && !cItem.localNote) {
-                  CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
-                }
-                if (!(live && cItem.meta.isLive) && !preview) {
-                  DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-                }
-                if (cItem.chatDir !is CIDirection.GroupSnd) {
-                  val groupInfo = cItem.memberToModerate(cInfo)?.first
-                  if (groupInfo != null) {
-                    ModerateItemAction(cItem, questionText = moderateMessageQuestionText(cInfo.featureEnabled(ChatFeature.FullDelete), 1), showMenu, deleteMessage)
-                  } // else if (cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group && cInfo.groupInfo.membership.memberRole == GroupMemberRole.Member && !live) {
-                    // ReportItemAction(cItem, composeState, showMenu)
-                  // }
-                }
+                DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
                 if (cItem.canBeDeletedForSelf) {
                   Divider()
                   SelectItemAction(showMenu, selectChatItem)
                 }
               }
             }
-            cItem.meta.itemDeleted != null -> {
+
+            @Composable
+            fun MsgContentItemDropdownMenu() {
+              val saveFileLauncher = rememberSaveFileLauncher(ciFile = cItem.file)
+              when {
+                // cItem.id check is a special case for live message chat item which has negative ID while not sent yet
+                cItem.isReport && cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group -> {
+                  DefaultDropdownMenu(showMenu) {
+                    if (cItem.chatDir !is CIDirection.GroupSnd && cInfo.groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+                      ArchiveReportItemAction(cItem.id, cInfo.groupInfo.membership.memberActive, showMenu, archiveReports)
+                    }
+                    DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages, buttonText = stringResource(MR.strings.delete_report))
+                    Divider()
+                    SelectItemAction(showMenu, selectChatItem)
+                  }
+                }
+                cItem.content.msgContent != null && cItem.id >= 0 && !cItem.isReport -> {
+                  DefaultDropdownMenu(showMenu) {
+                    if (cInfo.featureEnabled(ChatFeature.Reactions) && cItem.allowAddReaction) {
+                      MsgReactionsMenu()
+                    }
+                    if (cItem.meta.itemDeleted == null && !live && !cItem.localNote) {
+                      ItemAction(stringResource(MR.strings.reply_verb), painterResource(MR.images.ic_reply), onClick = {
+                        if (composeState.value.editing) {
+                          composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+                        } else {
+                          composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+                        }
+                        showMenu.value = false
+                      })
+                    }
+                    val clipboard = LocalClipboardManager.current
+                    val cachedRemoteReqs = remember { CIFile.cachedRemoteFileRequests }
+                    val copyAndShareAllowed = when {
+                      cItem.content.text.isNotEmpty() -> true
+                      cItem.file?.forwardingAllowed() == true -> true
+                      else -> false
+                    }
+
+                    if (copyAndShareAllowed) {
+                      ItemAction(stringResource(MR.strings.share_verb), painterResource(MR.images.ic_share), onClick = {
+                        var fileSource = getLoadedFileSource(cItem.file)
+                        val shareIfExists = {
+                          when (val f = fileSource) {
+                            null -> clipboard.shareText(cItem.content.text)
+                            else -> shareFile(cItem.text, f)
+                          }
+                          showMenu.value = false
+                        }
+                        if (chatModel.connectedToRemote() && fileSource == null) {
+                          withLongRunningApi(slow = 600_000) {
+                            cItem.file?.loadRemoteFile(true)
+                            fileSource = getLoadedFileSource(cItem.file)
+                            shareIfExists()
+                          }
+                        } else shareIfExists()
+                      })
+                    }
+                    if (copyAndShareAllowed) {
+                      ItemAction(stringResource(MR.strings.copy_verb), painterResource(MR.images.ic_content_copy), onClick = {
+                        copyItemToClipboard(cItem, clipboard)
+                        showMenu.value = false
+                      })
+                    }
+                    if (cItem.file != null && (getLoadedFilePath(cItem.file) != null || (chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file.fileSource] != false && cItem.file.loaded))) {
+                      SaveContentItemAction(cItem, saveFileLauncher, showMenu)
+                    } else if (cItem.file != null && cItem.file.fileStatus is CIFileStatus.RcvInvitation && fileSizeValid(cItem.file)) {
+                      ItemAction(stringResource(MR.strings.download_file), painterResource(MR.images.ic_arrow_downward), onClick = {
+                        withBGApi {
+                          Log.d(TAG, "ChatItemView downloadFileAction")
+                          val user = chatModel.currentUser.value
+                          if (user != null) {
+                            controller.receiveFile(rhId, user, cItem.file.fileId)
+                          }
+                        }
+                        showMenu.value = false
+                      })
+                    }
+                    if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
+                      ItemAction(stringResource(MR.strings.edit_verb), painterResource(MR.images.ic_edit_filled), onClick = {
+                        composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
+                        showMenu.value = false
+                      })
+                    }
+                    if (cItem.meta.itemDeleted == null &&
+                      (cItem.file == null || cItem.file.forwardingAllowed()) &&
+                      !cItem.isLiveDummy && !live
+                    ) {
+                      ItemAction(stringResource(MR.strings.forward_chat_item), painterResource(MR.images.ic_forward), onClick = {
+                        forwardItem(cInfo, cItem)
+                        showMenu.value = false
+                      })
+                    }
+                    ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
+                    if (revealed.value) {
+                      HideItemAction(revealed, showMenu, reveal)
+                    }
+                    if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null && !cItem.localNote) {
+                      CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
+                    }
+                    if (!(live && cItem.meta.isLive) && !preview) {
+                      DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                    }
+                    if (cItem.chatDir !is CIDirection.GroupSnd) {
+                      val groupInfo = cItem.memberToModerate(cInfo)?.first
+                      if (groupInfo != null) {
+                        ModerateItemAction(cItem, questionText = moderateMessageQuestionText(cInfo.featureEnabled(ChatFeature.FullDelete), 1), showMenu, deleteMessage)
+                      } else if (cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group && cInfo.groupInfo.groupFeatureEnabled(GroupFeature.Reports) && cInfo.groupInfo.membership.memberRole == GroupMemberRole.Member && !live) {
+                        ReportItemAction(cItem, composeState, showMenu)
+                      }
+                    }
+                    if (cItem.canBeDeletedForSelf) {
+                      Divider()
+                      SelectItemAction(showMenu, selectChatItem)
+                    }
+                  }
+                }
+                cItem.meta.itemDeleted != null -> {
+                  DefaultDropdownMenu(showMenu) {
+                    if (revealed.value) {
+                      HideItemAction(revealed, showMenu, reveal)
+                    } else if (!cItem.isDeletedContent) {
+                      RevealItemAction(revealed, showMenu, reveal)
+                    } else if (range.value != null) {
+                      ExpandItemAction(revealed, showMenu, reveal)
+                    }
+                    ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
+                    DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                    if (cItem.canBeDeletedForSelf) {
+                      Divider()
+                      SelectItemAction(showMenu, selectChatItem)
+                    }
+                  }
+                }
+                cItem.isDeletedContent -> {
+                  DefaultDropdownMenu(showMenu) {
+                    ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
+                    DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                    if (cItem.canBeDeletedForSelf) {
+                      Divider()
+                      SelectItemAction(showMenu, selectChatItem)
+                    }
+                  }
+                }
+                cItem.mergeCategory != null && ((range.value?.count() ?: 0) > 1 || revealed.value) -> {
+                  DefaultDropdownMenu(showMenu) {
+                    if (revealed.value) {
+                      ShrinkItemAction(revealed, showMenu, reveal)
+                    } else {
+                      ExpandItemAction(revealed, showMenu, reveal)
+                    }
+                    DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                    if (cItem.canBeDeletedForSelf) {
+                      Divider()
+                      SelectItemAction(showMenu, selectChatItem)
+                    }
+                  }
+                }
+                else -> {
+                  DefaultDropdownMenu(showMenu) {
+                    DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                    if (selectedChatItems.value == null) {
+                      Divider()
+                      SelectItemAction(showMenu, selectChatItem)
+                    }
+                  }
+                }
+              }
+            }
+
+            @Composable
+            fun MarkedDeletedItemDropdownMenu() {
+              DefaultDropdownMenu(showMenu) {
+                if (!cItem.isDeletedContent) {
+                  RevealItemAction(revealed, showMenu, reveal)
+                }
+                ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
+                DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                if (cItem.canBeDeletedForSelf) {
+                  Divider()
+                  SelectItemAction(showMenu, selectChatItem)
+                }
+              }
+            }
+
+            @Composable
+            fun ContentItem() {
+              val mc = cItem.content.msgContent
+              if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) {
+                MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                MarkedDeletedItemDropdownMenu()
+              } else {
+                if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
+                  if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
+                    EmojiItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
+                    CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile)
+                  } else {
+                    framedItemView()
+                  }
+                } else {
+                  framedItemView()
+                }
+                MsgContentItemDropdownMenu()
+              }
+            }
+
+            @Composable fun LegacyDeletedItem() {
+              DeletedItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+              DefaultDropdownMenu(showMenu) {
+                ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
+                DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                if (cItem.canBeDeletedForSelf) {
+                  Divider()
+                  SelectItemAction(showMenu, selectChatItem)
+                }
+              }
+            }
+
+            @Composable fun CallItem(status: CICallStatus, duration: Int) {
+              CICallItemView(cInfo, cItem, status, duration, showTimestamp = showTimestamp, acceptCall, cInfo.timedMessagesTTL)
+              DeleteItemMenu()
+            }
+
+            fun mergedGroupEventText(chatItem: ChatItem, reversedChatItems: List<ChatItem>): String? {
+              val (count, ns) = chatModel.getConnectedMemberNames(chatItem, reversedChatItems)
+              val members = when {
+                ns.size == 1 -> String.format(generalGetString(MR.strings.rcv_group_event_1_member_connected), ns[0])
+                ns.size == 2 -> String.format(generalGetString(MR.strings.rcv_group_event_2_members_connected), ns[0], ns[1])
+                ns.size == 3 -> String.format(generalGetString(MR.strings.rcv_group_event_3_members_connected), ns[0], ns[1], ns[2])
+                ns.size > 3 -> String.format(generalGetString(MR.strings.rcv_group_event_n_members_connected), ns[0], ns[1], ns.size - 2)
+                else -> ""
+              }
+              return if (count <= 1) {
+                null
+              } else if (ns.isEmpty()) {
+                generalGetString(MR.strings.rcv_group_events_count).format(count)
+              } else if (count > ns.size) {
+                members + " " + generalGetString(MR.strings.rcv_group_and_other_events).format(count - ns.size)
+              } else {
+                members
+              }
+            }
+
+            fun eventItemViewText(reversedChatItems: List<ChatItem>): AnnotatedString {
+              val memberDisplayName = cItem.memberDisplayName
+              val t = mergedGroupEventText(cItem, reversedChatItems)
+              return if (!revealed.value && t != null) {
+                chatEventText(t, cItem.timestampText)
+              } else if (memberDisplayName != null) {
+                buildAnnotatedString {
+                  withStyle(chatEventStyle) { append(memberDisplayName) }
+                  append(" ")
+                }.plus(chatEventText(cItem))
+              } else {
+                chatEventText(cItem)
+              }
+            }
+
+            @Composable fun EventItemView() {
+              val reversedChatItems = chatsCtx.chatItems.value.asReversed()
+              CIEventView(eventItemViewText(reversedChatItems))
+            }
+
+            @Composable fun PendingReviewEventItemView() {
+              Text(
+                buildAnnotatedString {
+                  withStyle(chatEventStyle.copy(fontWeight = FontWeight.Bold)) { append(cItem.content.text) }
+                },
+                Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
+              )
+            }
+
+            @Composable
+            fun DeletedItem() {
+              MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
               DefaultDropdownMenu(showMenu) {
                 if (revealed.value) {
                   HideItemAction(revealed, showMenu, reveal)
@@ -420,275 +658,141 @@ fun ChatItemView(
                   ExpandItemAction(revealed, showMenu, reveal)
                 }
                 ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-                DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
+                DeleteItemAction(chatsCtx, cItem, revealed, showMenu, questionText = generalGetString(MR.strings.delete_message_cannot_be_undone_warning), deleteMessage, deleteMessages)
                 if (cItem.canBeDeletedForSelf) {
                   Divider()
                   SelectItemAction(showMenu, selectChatItem)
                 }
               }
             }
-            cItem.isDeletedContent -> {
-              DefaultDropdownMenu(showMenu) {
-                ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-                DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-                if (cItem.canBeDeletedForSelf) {
-                  Divider()
-                  SelectItemAction(showMenu, selectChatItem)
-                }
-              }
-            }
-            cItem.mergeCategory != null && ((range.value?.count() ?: 0) > 1 || revealed.value) -> {
-              DefaultDropdownMenu(showMenu) {
-                if (revealed.value) {
-                  ShrinkItemAction(revealed, showMenu, reveal)
-                } else {
-                  ExpandItemAction(revealed, showMenu, reveal)
-                }
-                DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-                if (cItem.canBeDeletedForSelf) {
-                  Divider()
-                  SelectItemAction(showMenu, selectChatItem)
-                }
-              }
-            }
-            else -> {
-              DefaultDropdownMenu(showMenu) {
-                DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-                if (selectedChatItems.value == null) {
-                  Divider()
-                  SelectItemAction(showMenu, selectChatItem)
-                }
-              }
-            }
-          }
-        }
 
-        @Composable
-        fun MarkedDeletedItemDropdownMenu() {
-          DefaultDropdownMenu(showMenu) {
-            if (!cItem.isDeletedContent) {
-              RevealItemAction(revealed, showMenu, reveal)
+            @Composable
+            fun E2EEInfoNoPQText() {
+              Text(
+                buildAnnotatedString {
+                  withStyle(chatEventStyle) { append(annotatedStringResource(MR.strings.e2ee_info_no_pq)) }
+                },
+                Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
+              )
             }
-            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-            if (cItem.canBeDeletedForSelf) {
-              Divider()
-              SelectItemAction(showMenu, selectChatItem)
-            }
-          }
-        }
 
-        @Composable
-        fun ContentItem() {
-          val mc = cItem.content.msgContent
-          if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) {
-            MarkedDeletedItemView(cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-            MarkedDeletedItemDropdownMenu()
-          } else {
-            if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
-              if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-                EmojiItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-              } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-                CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile)
+            @Composable
+            fun DirectE2EEInfoText(e2EEInfo: E2EEInfo) {
+              if (e2EEInfo.pqEnabled) {
+                Text(
+                  buildAnnotatedString {
+                    withStyle(chatEventStyle) { append(annotatedStringResource(MR.strings.e2ee_info_pq)) }
+                  },
+                  Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
+                )
               } else {
-                framedItemView()
+                E2EEInfoNoPQText()
               }
-            } else {
-              framedItemView()
             }
-            MsgContentItemDropdownMenu()
-          }
-        }
 
-        @Composable fun LegacyDeletedItem() {
-          DeletedItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-          DefaultDropdownMenu(showMenu) {
-            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
-            if (cItem.canBeDeletedForSelf) {
-              Divider()
-              SelectItemAction(showMenu, selectChatItem)
+            when (val c = cItem.content) {
+              is CIContent.SndMsgContent -> ContentItem()
+              is CIContent.RcvMsgContent -> ContentItem()
+              is CIContent.SndDeleted -> LegacyDeletedItem()
+              is CIContent.RcvDeleted -> LegacyDeletedItem()
+              is CIContent.SndCall -> CallItem(c.status, c.duration)
+              is CIContent.RcvCall -> CallItem(c.status, c.duration)
+              is CIContent.RcvIntegrityError -> if (developerTools) {
+                IntegrityErrorItemView(c.msgError, cItem, showTimestamp, cInfo.timedMessagesTTL)
+                DeleteItemMenu()
+              } else {
+                Box(Modifier.size(0.dp)) {}
+              }
+              is CIContent.RcvDecryptionError -> {
+                CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember)
+                DeleteItemMenu()
+              }
+              is CIContent.RcvGroupInvitation -> {
+                CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL)
+                DeleteItemMenu()
+              }
+              is CIContent.SndGroupInvitation -> {
+                CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL)
+                DeleteItemMenu()
+              }
+              is CIContent.RcvDirectEventContent -> {
+                EventItemView()
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvGroupEventContent -> {
+                when (c.rcvGroupEvent) {
+                  is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat)
+                  is RcvGroupEvent.NewMemberPendingReview -> PendingReviewEventItemView()
+                  else -> EventItemView()
+                }
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.SndGroupEventContent -> {
+                when (c.sndGroupEvent) {
+                  is SndGroupEvent.UserPendingReview -> PendingReviewEventItemView()
+                  else -> EventItemView()
+                }
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvConnEventContent -> {
+                EventItemView()
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.SndConnEventContent -> {
+                EventItemView()
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvChatFeature -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.SndChatFeature -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvChatPreference -> {
+                val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
+                CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
+                DeleteItemMenu()
+              }
+              is CIContent.SndChatPreference -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon, revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvGroupFeature -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.SndGroupFeature -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvChatFeatureRejected -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, Color.Red, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.RcvGroupFeatureRejected -> {
+                CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, Color.Red, revealed = revealed, showMenu = showMenu)
+                MsgContentItemDropdownMenu()
+              }
+              is CIContent.SndModerated -> DeletedItem()
+              is CIContent.RcvModerated -> DeletedItem()
+              is CIContent.RcvBlocked -> DeletedItem()
+              is CIContent.SndDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo)
+              is CIContent.RcvDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo)
+              is CIContent.SndGroupE2EEInfo -> E2EEInfoNoPQText()
+              is CIContent.RcvGroupE2EEInfo -> E2EEInfoNoPQText()
+              is CIContent.InvalidJSON -> {
+                CIInvalidJSONView(c.json)
+                DeleteItemMenu()
+              }
             }
           }
         }
-
-        @Composable fun CallItem(status: CICallStatus, duration: Int) {
-          CICallItemView(cInfo, cItem, status, duration, showTimestamp = showTimestamp, acceptCall, cInfo.timedMessagesTTL)
-          DeleteItemMenu()
-        }
-
-        fun mergedGroupEventText(chatItem: ChatItem, reversedChatItems: List<ChatItem>): String? {
-          val (count, ns) = chatModel.getConnectedMemberNames(chatItem, reversedChatItems)
-          val members = when {
-            ns.size == 1 -> String.format(generalGetString(MR.strings.rcv_group_event_1_member_connected), ns[0])
-            ns.size == 2 -> String.format(generalGetString(MR.strings.rcv_group_event_2_members_connected), ns[0], ns[1])
-            ns.size == 3 -> String.format(generalGetString(MR.strings.rcv_group_event_3_members_connected), ns[0], ns[1], ns[2])
-            ns.size > 3 -> String.format(generalGetString(MR.strings.rcv_group_event_n_members_connected), ns[0], ns[1], ns.size - 2)
-            else -> ""
-          }
-          return if (count <= 1) {
-            null
-          } else if (ns.isEmpty()) {
-            generalGetString(MR.strings.rcv_group_events_count).format(count)
-          } else if (count > ns.size) {
-            members + " " + generalGetString(MR.strings.rcv_group_and_other_events).format(count - ns.size)
-          } else {
-            members
-          }
-        }
-
-        fun eventItemViewText(reversedChatItems: List<ChatItem>): AnnotatedString {
-          val memberDisplayName = cItem.memberDisplayName
-          val t = mergedGroupEventText(cItem, reversedChatItems)
-          return if (!revealed.value && t != null) {
-            chatEventText(t, cItem.timestampText)
-          } else if (memberDisplayName != null) {
-            buildAnnotatedString {
-              withStyle(chatEventStyle) { append(memberDisplayName) }
-              append(" ")
-            }.plus(chatEventText(cItem))
-          } else {
-            chatEventText(cItem)
-          }
-        }
-
-        @Composable fun EventItemView() {
-          val reversedChatItems = chatModel.chatItemsForContent(LocalContentTag.current).value.asReversed()
-          CIEventView(eventItemViewText(reversedChatItems))
-        }
-
-        @Composable
-        fun DeletedItem() {
-          MarkedDeletedItemView(cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-          DefaultDropdownMenu(showMenu) {
-            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            DeleteItemAction(cItem, revealed, showMenu, questionText = generalGetString(MR.strings.delete_message_cannot_be_undone_warning), deleteMessage, deleteMessages)
-            if (cItem.canBeDeletedForSelf) {
-              Divider()
-              SelectItemAction(showMenu, selectChatItem)
-            }
-          }
-        }
-
-        @Composable
-        fun E2EEInfoNoPQText() {
-          Text(
-            buildAnnotatedString {
-              withStyle(chatEventStyle) { append(annotatedStringResource(MR.strings.e2ee_info_no_pq)) }
-            },
-            Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
-          )
-        }
-
-        @Composable
-        fun DirectE2EEInfoText(e2EEInfo: E2EEInfo) {
-          if (e2EEInfo.pqEnabled) {
-            Text(
-              buildAnnotatedString {
-                withStyle(chatEventStyle) { append(annotatedStringResource(MR.strings.e2ee_info_pq)) }
-              },
-              Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
-            )
-          } else {
-            E2EEInfoNoPQText()
-          }
-        }
-
-        when (val c = cItem.content) {
-          is CIContent.SndMsgContent -> ContentItem()
-          is CIContent.RcvMsgContent -> ContentItem()
-          is CIContent.SndDeleted -> LegacyDeletedItem()
-          is CIContent.RcvDeleted -> LegacyDeletedItem()
-          is CIContent.SndCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvIntegrityError -> if (developerTools) {
-            IntegrityErrorItemView(c.msgError, cItem, showTimestamp, cInfo.timedMessagesTTL)
-            DeleteItemMenu()
-          } else {
-            Box(Modifier.size(0.dp)) {}
-          }
-          is CIContent.RcvDecryptionError -> {
-            CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember)
-            DeleteItemMenu()
-          }
-          is CIContent.RcvGroupInvitation -> {
-            CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL)
-            DeleteItemMenu()
-          }
-          is CIContent.SndGroupInvitation -> {
-            CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL)
-            DeleteItemMenu()
-          }
-          is CIContent.RcvDirectEventContent -> {
-            EventItemView()
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvGroupEventContent -> {
-            when (c.rcvGroupEvent) {
-              is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat)
-              else -> EventItemView()
-            }
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.SndGroupEventContent -> {
-            EventItemView()
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvConnEventContent -> {
-            EventItemView()
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.SndConnEventContent -> {
-            EventItemView()
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvChatFeature -> {
-            CIChatFeatureView(cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.SndChatFeature -> {
-            CIChatFeatureView(cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvChatPreference -> {
-            val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
-            CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
-            DeleteItemMenu()
-          }
-          is CIContent.SndChatPreference -> {
-            CIChatFeatureView(cInfo, cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon, revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvGroupFeature -> {
-            CIChatFeatureView(cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.SndGroupFeature -> {
-            CIChatFeatureView(cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvChatFeatureRejected -> {
-            CIChatFeatureView(cInfo, cItem, c.feature, Color.Red, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.RcvGroupFeatureRejected -> {
-            CIChatFeatureView(cInfo, cItem, c.groupFeature, Color.Red, revealed = revealed, showMenu = showMenu)
-            MsgContentItemDropdownMenu()
-          }
-          is CIContent.SndModerated -> DeletedItem()
-          is CIContent.RcvModerated -> DeletedItem()
-          is CIContent.RcvBlocked -> DeletedItem()
-          is CIContent.SndDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo)
-          is CIContent.RcvDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo)
-          is CIContent.SndGroupE2EEInfo -> E2EEInfoNoPQText()
-          is CIContent.RcvGroupE2EEInfo -> E2EEInfoNoPQText()
-          is CIContent.InvalidJSON -> {
-            CIInvalidJSONView(c.json)
-            DeleteItemMenu()
-          }
+        if (!cItem.chatDir.sent) {
+          GoToItemButton(false, bubbleHovered)
         }
       }
-
       if (cItem.content.msgContent != null && (cItem.meta.itemDeleted == null || revealed.value) && cItem.reactions.isNotEmpty()) {
         ChatItemReactions()
       }
@@ -740,6 +844,7 @@ fun ItemInfoAction(
 
 @Composable
 fun DeleteItemAction(
+  chatsCtx: ChatModel.ChatsContext,
   cItem: ChatItem,
   revealed: State<Boolean>,
   showMenu: MutableState<Boolean>,
@@ -748,14 +853,13 @@ fun DeleteItemAction(
   deleteMessages: (List<Long>) -> Unit,
   buttonText: String = stringResource(MR.strings.delete_verb),
 ) {
-  val contentTag = LocalContentTag.current
   ItemAction(
     buttonText,
     painterResource(MR.images.ic_delete),
     onClick = {
       showMenu.value = false
       if (!revealed.value) {
-        val reversedChatItems = chatModel.chatItemsForContent(contentTag).value.asReversed()
+        val reversedChatItems = chatsCtx.chatItems.value.asReversed()
         val currIndex = chatModel.getChatItemIndexOrNull(cItem, reversedChatItems)
         val ciCategory = cItem.mergeCategory
         if (currIndex != null && ciCategory != null) {
@@ -807,14 +911,14 @@ fun ModerateItemAction(
 @Composable
 fun SelectItemAction(
   showMenu: MutableState<Boolean>,
-  selectChatItem: () -> Unit,
+  selectItem: () -> Unit,
 ) {
   ItemAction(
     stringResource(MR.strings.select_verb),
     painterResource(MR.images.ic_check_circle),
     onClick = {
       showMenu.value = false
-      selectChatItem()
+      selectItem()
     }
   )
 }
@@ -914,23 +1018,53 @@ private fun ReportItemAction(
 }
 
 @Composable
-private fun ArchiveReportItemAction(cItem: ChatItem, showMenu: MutableState<Boolean>, deleteMessage: (Long, CIDeleteMode) -> Unit) {
+private fun ArchiveReportItemAction(id: Long, allowForAll: Boolean, showMenu: MutableState<Boolean>, archiveReports: (List<Long>, Boolean) -> Unit) {
   ItemAction(
     stringResource(MR.strings.archive_report),
     painterResource(MR.images.ic_inventory_2),
     onClick = {
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(MR.strings.report_archive_alert_title),
-        text = generalGetString(MR.strings.report_archive_alert_desc),
-        onConfirm = {
-          deleteMessage(cItem.id, CIDeleteMode.cidmInternalMark)
-        },
-        destructive = true,
-        confirmText = generalGetString(MR.strings.archive_verb),
-      )
+      showArchiveReportsAlert(listOf(id), allowForAll, archiveReports)
       showMenu.value = false
+    }
+  )
+}
+
+fun showArchiveReportsAlert(ids: List<Long>, allowForAll: Boolean, archiveReports: (List<Long>, Boolean) -> Unit) {
+  AlertManager.shared.showAlertDialogButtonsColumn(
+    title = if (ids.size == 1) {
+      generalGetString(MR.strings.report_archive_alert_title)
+    } else {
+      generalGetString(MR.strings.report_archive_alert_title_nth).format(ids.size)
     },
-    color = Color.Red
+    text = null,
+    buttons = {
+      // Archive for me
+      SectionItemView({
+        AlertManager.shared.hideAlert()
+        archiveReports(ids, false)
+      }) {
+        Text(
+          generalGetString(MR.strings.report_archive_for_me),
+          Modifier.fillMaxWidth(),
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.error
+        )
+      }
+      if (allowForAll) {
+        // Archive for all moderators
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+          archiveReports(ids, true)
+        }) {
+          Text(
+            stringResource(MR.strings.report_archive_for_all_moderators),
+            Modifier.fillMaxWidth(),
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.error
+          )
+        }
+      }
+    }
   )
 }
 
@@ -1078,7 +1212,7 @@ fun Modifier.clipChatItem(chatItem: ChatItem? = null, tailVisible: Boolean = fal
 
 private fun chatItemShape(roundness: Float, density: Density, tailVisible: Boolean, sent: Boolean = false): GenericShape = GenericShape { size, _ ->
   val (msgTailWidth, msgBubbleMaxRadius) = with(density) { Pair(msgTailWidthDp.toPx(), msgBubbleMaxRadius.toPx()) }
-  val width = if (sent && tailVisible) size.width - msgTailWidth else size.width
+  val width = size.width
   val height = size.height
   val rxMax = min(msgBubbleMaxRadius, width / 2)
   val ryMax = min(msgBubbleMaxRadius, height / 2)
@@ -1193,6 +1327,12 @@ fun shapeStyle(chatItem: ChatItem? = null, tailEnabled: Boolean, tailVisible: Bo
   }
 }
 
+private fun closeReportsIfNeeded() {
+  if (appPlatform.isAndroid && ModalManager.end.isLastModalOpen(ModalViewId.SECONDARY_CHAT)) {
+    ModalManager.end.closeModals()
+  }
+}
+
 fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit, cancelAction: CancelAction) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(cancelAction.alert.titleId),
@@ -1297,6 +1437,7 @@ fun PreviewChatItemView(
   chatItem: ChatItem = ChatItem.getSampleData(1, CIDirection.DirectSnd(), Clock.System.now(), "hello")
 ) {
   ChatItemView(
+    chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
     rhId = null,
     ChatInfo.Direct.sampleData,
     chatItem,
@@ -1305,16 +1446,20 @@ fun PreviewChatItemView(
     composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
     revealed = remember { mutableStateOf(false) },
     highlighted = remember { mutableStateOf(false) },
+    hoveredItemId = remember { mutableStateOf(null) },
     range = remember { mutableStateOf(0..1) },
     selectedChatItems = remember { mutableStateOf(setOf()) },
+    searchIsNotBlank = remember { mutableStateOf(false) },
     selectChatItem = {},
     deleteMessage = { _, _ -> },
     deleteMessages = { _ -> },
+    archiveReports = { _, _ -> },
     receiveFile = { _ -> },
     cancelFile = {},
     joinGroup = { _, _ -> },
     acceptCall = { _ -> },
     scrollToItem = {},
+    scrollToItemId = remember { mutableStateOf(null) },
     scrollToQuotedItemFromItem = {},
     acceptFeature = { _, _, _ -> },
     openDirectChat = { _ -> },
@@ -1343,6 +1488,7 @@ fun PreviewChatItemView(
 fun PreviewChatItemViewDeletedContent() {
   SimpleXTheme {
     ChatItemView(
+      chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       rhId = null,
       ChatInfo.Direct.sampleData,
       ChatItem.getDeletedContentSampleData(),
@@ -1351,16 +1497,20 @@ fun PreviewChatItemViewDeletedContent() {
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       revealed = remember { mutableStateOf(false) },
       highlighted = remember { mutableStateOf(false) },
+      hoveredItemId = remember { mutableStateOf(null) },
       range = remember { mutableStateOf(0..1) },
       selectedChatItems = remember { mutableStateOf(setOf()) },
+      searchIsNotBlank = remember { mutableStateOf(false) },
       selectChatItem = {},
       deleteMessage = { _, _ -> },
       deleteMessages = { _ -> },
+      archiveReports = { _, _ -> },
       receiveFile = { _ -> },
       cancelFile = {},
       joinGroup = { _, _ -> },
       acceptCall = { _ -> },
       scrollToItem = {},
+      scrollToItemId = remember { mutableStateOf(null) },
       scrollToQuotedItemFromItem = {},
       acceptFeature = { _, _, _ -> },
       openDirectChat = { _ -> },
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
index 784563dbb2..b2beba29e4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
@@ -27,6 +27,7 @@ import kotlin.math.ceil
 
 @Composable
 fun FramedItemView(
+  chatsCtx: ChatModel.ChatsContext,
   chatInfo: ChatInfo,
   ci: ChatItem,
   uriHandler: UriHandler? = null,
@@ -39,6 +40,7 @@ fun FramedItemView(
   receiveFile: (Long) -> Unit,
   onLinkLongClick: (link: String) -> Unit = {},
   scrollToItem: (Long) -> Unit = {},
+  scrollToItemId: MutableState<Long?>,
   scrollToQuotedItemFromItem: (Long) -> Unit = {},
 ) {
   val sent = ci.chatDir.sent
@@ -59,14 +61,18 @@ fun FramedItemView(
       style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface),
       linkMode = linkMode,
       uriHandler = if (appPlatform.isDesktop) uriHandler else null,
-      showTimestamp = showTimestamp
+      showTimestamp = showTimestamp,
     )
   }
 
   @Composable
   fun ciQuotedMsgView(qi: CIQuote) {
     Box(
-      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+      Modifier
+        // this width limitation prevents crash on calculating constraints that may happen if you post veeeery long message and then quote it.
+        // Top level layout wants `IntrinsicWidth.Max` and very long layout makes the crash in this case
+        .widthIn(max = 50000.dp)
+        .padding(vertical = 6.dp, horizontal = 12.dp),
       contentAlignment = Alignment.TopStart
     ) {
       val sender = qi.sender(membership())
@@ -76,7 +82,7 @@ fun FramedItemView(
         ) {
           Text(
             sender,
-            style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
+            style = TextStyle(fontSize = 13.5.sp, color = if (qi.chatDir is CIDirection.GroupSnd) CurrentColors.value.colors.primary else CurrentColors.value.colors.secondary),
             maxLines = 1
           )
           ciQuotedMsgTextView(qi, lines = 2,  showTimestamp = showTimestamp)
@@ -176,7 +182,7 @@ fun FramedItemView(
   fun ciFileView(ci: ChatItem, text: String) {
     CIFileView(ci.file, ci.meta.itemEdited, showMenu, false, receiveFile)
     if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(ci, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp)
+      CIMarkdownText(ci, chatInfo, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp)
     }
   }
 
@@ -202,7 +208,7 @@ fun FramedItemView(
       Column(
         Modifier
           .width(IntrinsicSize.Max)
-          .padding(start = if (tailRendered) msgTailWidthDp else 0.dp, end = if (sent && tailRendered) msgTailWidthDp else 0.dp)
+          .padding(start = if (!sent && tailRendered) msgTailWidthDp else 0.dp, end = if (sent && tailRendered) msgTailWidthDp else 0.dp)
       ) {
         PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
           @Composable
@@ -249,7 +255,11 @@ fun FramedItemView(
                   onLongClick = { showMenu.value = true },
                   onClick = {
                     if (ci.quotedItem.itemId != null) {
-                      scrollToItem(ci.quotedItem.itemId)
+                      if (ci.isReport && chatsCtx.secondaryContextFilter != null) {
+                        scrollToItemId.value = ci.quotedItem.itemId
+                      } else {
+                        scrollToItem(ci.quotedItem.itemId)
+                      }
                     } else {
                       scrollToQuotedItemFromItem(ci.id)
                     }
@@ -285,7 +295,7 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCVideo -> {
@@ -293,26 +303,26 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCVoice -> {
                 CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile)
                 if (mc.text != "") {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCFile -> ciFileView(ci, mc.text)
               is MsgContent.MCUnknown ->
                 if (ci.file == null) {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 } else {
                   ciFileView(ci, mc.text)
                 }
               is MsgContent.MCLink -> {
                 ChatItemLinkView(mc.preview, showMenu, onLongClick = { showMenu.value = true })
                 Box(Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCReport -> {
@@ -321,9 +331,9 @@ fun FramedItemView(
                     append(if (mc.text.isEmpty()) mc.reason.text else "${mc.reason.text}: ")
                   }
                 }
-                CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix)
+                CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix)
               }
-              else -> CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+              else -> CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
             }
           }
         }
@@ -344,6 +354,7 @@ fun FramedItemView(
 @Composable
 fun CIMarkdownText(
   ci: ChatItem,
+  chatInfo: ChatInfo,
   chatTTL: Int?,
   linkMode: SimplexLinkMode,
   uriHandler: UriHandler?,
@@ -357,6 +368,10 @@ fun CIMarkdownText(
     MarkdownText(
       text, if (text.isEmpty()) emptyList() else ci.formattedText, toggleSecrets = true,
       meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
+      mentions = ci.mentions, userMemberId = when {
+        chatInfo is ChatInfo.Group -> chatInfo.groupInfo.membership.memberId
+        else -> null
+      },
       uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix
     )
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
index d63094cd1d..84bc14fee3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
@@ -12,17 +12,15 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.chatModel
 import chat.simplex.common.model.ChatModel.getChatItemIndexOrNull
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.chat.group.LocalContentTag
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.datetime.Clock
 
 @Composable
-fun MarkedDeletedItemView(ci: ChatItem, chatInfo: ChatInfo, timedMessagesTTL: Int?, revealed: State<Boolean>, showViaProxy: Boolean, showTimestamp: Boolean) {
+fun MarkedDeletedItemView(chatsCtx: ChatModel.ChatsContext, ci: ChatItem, chatInfo: ChatInfo, timedMessagesTTL: Int?, revealed: State<Boolean>, showViaProxy: Boolean, showTimestamp: Boolean) {
   val sentColor = MaterialTheme.appColors.sentMessage
   val receivedColor = MaterialTheme.appColors.receivedMessage
   Surface(
@@ -35,7 +33,7 @@ fun MarkedDeletedItemView(ci: ChatItem, chatInfo: ChatInfo, timedMessagesTTL: In
       verticalAlignment = Alignment.CenterVertically
     ) {
       Box(Modifier.weight(1f, false)) {
-        MergedMarkedDeletedText(ci, chatInfo, revealed)
+        MergedMarkedDeletedText(chatsCtx, ci, chatInfo, revealed)
       }
       CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
     }
@@ -43,8 +41,8 @@ fun MarkedDeletedItemView(ci: ChatItem, chatInfo: ChatInfo, timedMessagesTTL: In
 }
 
 @Composable
-private fun MergedMarkedDeletedText(chatItem: ChatItem, chatInfo: ChatInfo, revealed: State<Boolean>) {
-  val reversedChatItems = chatModel.chatItemsForContent(LocalContentTag.current).value.asReversed()
+private fun MergedMarkedDeletedText(chatsCtx: ChatModel.ChatsContext, chatItem: ChatItem, chatInfo: ChatInfo, revealed: State<Boolean>) {
+  val reversedChatItems = chatsCtx.chatItems.value.asReversed()
   var i = getChatItemIndexOrNull(chatItem, reversedChatItems)
   val ciCategory = chatItem.mergeCategory
   val text =  if (!revealed.value && ciCategory != null && i != null) {
@@ -95,7 +93,7 @@ private fun MergedMarkedDeletedText(chatItem: ChatItem, chatInfo: ChatInfo, reve
 
 fun markedDeletedText(cItem: ChatItem, chatInfo: ChatInfo): String =
   if (cItem.meta.itemDeleted != null && cItem.isReport) {
-    if (cItem.meta.itemDeleted is CIDeleted.Moderated && cItem.meta.itemDeleted.byGroupMember.groupMemberId != (chatInfo as ChatInfo.Group?)?.groupInfo?.membership?.groupMemberId) {
+    if (cItem.meta.itemDeleted is CIDeleted.Moderated && cItem.meta.itemDeleted.byGroupMember.groupMemberId != (chatInfo as? ChatInfo.Group)?.groupInfo?.membership?.groupMemberId) {
       generalGetString(MR.strings.report_item_archived_by).format(cItem.meta.itemDeleted.byGroupMember.displayName)
     } else {
       generalGetString(MR.strings.report_item_archived)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
index 257ede7d4a..ad11eb4897 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
@@ -13,7 +13,6 @@ import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.sp
@@ -22,7 +21,6 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.views.helpers.*
 import kotlinx.coroutines.*
-import java.awt.*
 
 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
@@ -60,6 +58,8 @@ fun MarkdownText (
   sender: String? = null,
   meta: CIMeta? = null,
   chatTTL: Int? = null,
+  mentions: Map<String, CIMention>? = null,
+  userMemberId: String? = null,
   toggleSecrets: Boolean,
   style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
   maxLines: Int = Int.MAX_VALUE,
@@ -148,6 +148,26 @@ fun MarkdownText (
             withAnnotation(tag = "SECRET", annotation = key) {
               if (showSecrets[key] == true) append(ft.text) else withStyle(ftStyle) { append(ft.text) }
             }
+          } else if (ft.format is Format.Mention) {
+            val mention = mentions?.get(ft.format.memberName)
+
+            if (mention != null) {
+              if (mention.memberRef != null) {
+                val displayName = mention.memberRef.displayName
+                val name = if (mention.memberRef.localAlias.isNullOrEmpty()) {
+                  displayName
+                } else {
+                  "${mention.memberRef.localAlias} ($displayName)"
+                }
+                val mentionStyle = if (mention.memberId == userMemberId) ft.format.style.copy(color = MaterialTheme.colors.primary) else ft.format.style
+
+                withStyle(mentionStyle) { append(mentionText(name)) }
+              } else {
+                withStyle( ft.format.style) { append(mentionText(ft.format.memberName)) }
+              }
+            } else {
+              append(ft.text)
+            }
           } else {
             val link = ft.link(linkMode)
             if (link != null) {
@@ -291,3 +311,5 @@ private fun isRtl(s: CharSequence): Boolean {
   }
   return false
 }
+
+private fun mentionText(name: String): String = if (name.contains(" @"))  "@'$name'" else "@$name"
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
index 3ba15bc79c..52b4059eef 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
@@ -19,8 +19,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
+import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
@@ -104,13 +103,14 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
       )
     }
     is ChatInfo.Local -> {
+      val defaultClickAction = { if (chatModel.chatId.value != chat.id) scope.launch { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) } }
       ChatListNavLinkLayout(
         chatLinkPreview = {
           tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
-            ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, disabled, linkMode, inProgress = false, progressByTimeout = false, {})
+            ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, disabled, linkMode, inProgress = false, progressByTimeout = false, defaultClickAction)
           }
         },
-        click = { if (chatModel.chatId.value != chat.id) scope.launch { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) } },
+        click = defaultClickAction,
         dropdownMenuItems = {
           tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
             NoteFolderMenuItems(chat, showMenu, showMarkRead)
@@ -189,7 +189,7 @@ fun ErrorChatListItem() {
 suspend fun directChatAction(rhId: Long?, contact: Contact, chatModel: ChatModel) {
   when {
     contact.activeConn == null && contact.profile.contactLink != null && contact.active -> askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close = null, openChat = true)
-    else -> openChat(rhId, ChatInfo.Direct(contact))
+    else -> openDirectChat(rhId, contact.contactId)
   }
 }
 
@@ -197,35 +197,56 @@ suspend fun groupChatAction(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatMo
   when (groupInfo.membership.memberStatus) {
     GroupMemberStatus.MemInvited -> acceptGroupInvitationAlertDialog(rhId, groupInfo, chatModel, inProgress)
     GroupMemberStatus.MemAccepted -> groupInvitationAcceptedAlert(rhId)
-    else -> openChat(rhId, ChatInfo.Group(groupInfo))
+    else -> openGroupChat(rhId, groupInfo.groupId)
   }
 }
 
-suspend fun noteFolderChatAction(rhId: Long?, noteFolder: NoteFolder) = openChat(rhId, ChatInfo.Local(noteFolder))
+suspend fun noteFolderChatAction(rhId: Long?, noteFolder: NoteFolder) = openChat(secondaryChatsCtx = null, rhId, ChatInfo.Local(noteFolder))
 
-suspend fun openDirectChat(rhId: Long?, contactId: Long) = openChat(rhId, ChatType.Direct, contactId)
+suspend fun openDirectChat(rhId: Long?, contactId: Long) = openChat(secondaryChatsCtx = null, rhId, ChatType.Direct, contactId)
 
-suspend fun openGroupChat(rhId: Long?, groupId: Long, contentTag: MsgContentTag? = null) = openChat(rhId, ChatType.Group, groupId, contentTag)
+suspend fun openGroupChat(rhId: Long?, groupId: Long) = openChat(secondaryChatsCtx = null, rhId, ChatType.Group, groupId)
 
-suspend fun openChat(rhId: Long?, chatInfo: ChatInfo, contentTag: MsgContentTag? = null) = openChat(rhId, chatInfo.chatType, chatInfo.apiId, contentTag)
+suspend fun openChat(secondaryChatsCtx: ChatModel.ChatsContext?, rhId: Long?, chatInfo: ChatInfo) = openChat(secondaryChatsCtx, rhId, chatInfo.chatType, chatInfo.apiId)
 
-private suspend fun openChat(rhId: Long?, chatType: ChatType, apiId: Long, contentTag: MsgContentTag? = null) =
-  apiLoadMessages(rhId, chatType, apiId, contentTag, ChatPagination.Initial(ChatPagination.INITIAL_COUNT))
+suspend fun openChat(
+  secondaryChatsCtx: ChatModel.ChatsContext?,
+  rhId: Long?,
+  chatType: ChatType,
+  apiId: Long,
+  openAroundItemId: Long? = null
+) {
+  if (secondaryChatsCtx != null) {
+    chatModel.secondaryChatsContext.value = secondaryChatsCtx
+  }
+  apiLoadMessages(
+    chatsCtx = secondaryChatsCtx ?: chatModel.chatsContext,
+    rhId,
+    chatType,
+    apiId,
+    if (openAroundItemId != null) {
+      ChatPagination.Around(openAroundItemId, ChatPagination.INITIAL_COUNT)
+    } else {
+      ChatPagination.Initial(ChatPagination.INITIAL_COUNT)
+    },
+    "",
+    openAroundItemId
+  )
+}
 
-suspend fun openLoadedChat(chat: Chat, contentTag: MsgContentTag? = null) {
-  withChats(contentTag) {
-    chatItemStatuses.clear()
-    chatItems.replaceAll(chat.chatItems)
+suspend fun openLoadedChat(chat: Chat) {
+  withContext(Dispatchers.Main) {
+    chatModel.chatsContext.chatItems.replaceAll(chat.chatItems)
     chatModel.chatId.value = chat.chatInfo.id
-    chatModel.chatStateForContent(contentTag).clear()
+    chatModel.chatsContext.chatState.clear()
   }
 }
 
-suspend fun apiFindMessages(ch: Chat, search: String, contentTag: MsgContentTag?) {
-  withChats(contentTag) {
-    chatItems.clearAndNotify()
+suspend fun apiFindMessages(chatsCtx: ChatModel.ChatsContext, ch: Chat, search: String) {
+  withContext(Dispatchers.Main) {
+    chatsCtx.chatItems.clearAndNotify()
   }
-  apiLoadMessages(ch.remoteHostId, ch.chatInfo.chatType, ch.chatInfo.apiId, contentTag, pagination = ChatPagination.Last(ChatPagination.INITIAL_COUNT), search = search)
+  apiLoadMessages(chatsCtx, ch.remoteHostId, ch.chatInfo.chatType, ch.chatInfo.apiId, pagination = if (search.isNotEmpty()) ChatPagination.Last(ChatPagination.INITIAL_COUNT) else ChatPagination.Initial(ChatPagination.INITIAL_COUNT), search = search)
 }
 
 suspend fun setGroupMembers(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel) = coroutineScope {
@@ -244,6 +265,7 @@ suspend fun setGroupMembers(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatMo
   }
   chatModel.groupMembersIndexes.value = emptyMap()
   chatModel.groupMembers.value = newMembers
+  chatModel.membersLoaded.value = true
   chatModel.populateGroupMembersIndexes()
 }
 
@@ -256,7 +278,7 @@ fun ContactMenuItems(chat: Chat, contact: Contact, chatModel: ChatModel, showMen
       MarkUnreadChatAction(chat, chatModel, showMenu)
     }
     ToggleFavoritesChatAction(chat, chatModel, chat.chatInfo.chatSettings?.favorite == true, showMenu)
-    ToggleNotificationsChatAction(chat, chatModel, chat.chatInfo.ntfsEnabled, showMenu)
+    ToggleNotificationsChatAction(chat, chatModel, contact.chatSettings.enableNtfs.nextMode(false), showMenu)
     TagListAction(chat, showMenu)
     ClearChatAction(chat, showMenu)
   }
@@ -282,7 +304,7 @@ fun GroupMenuItems(
       }
     }
     GroupMemberStatus.MemAccepted -> {
-      if (groupInfo.membership.memberCurrent) {
+      if (groupInfo.membership.memberCurrentOrPending) {
         LeaveGroupAction(chat.remoteHostId, groupInfo, chatModel, showMenu)
       }
       if (groupInfo.canDelete) {
@@ -296,10 +318,15 @@ fun GroupMenuItems(
         MarkUnreadChatAction(chat, chatModel, showMenu)
       }
       ToggleFavoritesChatAction(chat, chatModel, chat.chatInfo.chatSettings?.favorite == true, showMenu)
-      ToggleNotificationsChatAction(chat, chatModel, chat.chatInfo.ntfsEnabled, showMenu)
+      ToggleNotificationsChatAction(chat, chatModel, groupInfo.chatSettings.enableNtfs.nextMode(true), showMenu)
       TagListAction(chat, showMenu)
+      if (chat.chatStats.reportsCount > 0 && groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+        ArchiveAllReportsItemAction(showMenu) {
+          archiveAllReportsForMe(chat.remoteHostId, chat.chatInfo.apiId)
+        }
+      }
       ClearChatAction(chat, showMenu)
-      if (groupInfo.membership.memberCurrent) {
+      if (groupInfo.membership.memberCurrentOrPending) {
         LeaveGroupAction(chat.remoteHostId, groupInfo, chatModel, showMenu)
       }
       if (groupInfo.canDelete) {
@@ -379,12 +406,12 @@ fun ToggleFavoritesChatAction(chat: Chat, chatModel: ChatModel, favorite: Boolea
 }
 
 @Composable
-fun ToggleNotificationsChatAction(chat: Chat, chatModel: ChatModel, ntfsEnabled: Boolean, showMenu: MutableState<Boolean>) {
+fun ToggleNotificationsChatAction(chat: Chat, chatModel: ChatModel, nextMsgFilter: MsgFilter, showMenu: MutableState<Boolean>) {
   ItemAction(
-    if (ntfsEnabled) stringResource(MR.strings.mute_chat) else stringResource(MR.strings.unmute_chat),
-    if (ntfsEnabled) painterResource(MR.images.ic_notifications_off) else painterResource(MR.images.ic_notifications),
+    generalGetString(nextMsgFilter.text(chat.chatInfo.hasMentions)),
+    painterResource(nextMsgFilter.icon),
     onClick = {
-      toggleNotifications(chat.remoteHostId, chat.chatInfo, !ntfsEnabled, chatModel)
+      toggleNotifications(chat.remoteHostId, chat.chatInfo, nextMsgFilter, chatModel)
       showMenu.value = false
     }
   )
@@ -521,7 +548,7 @@ fun ContactConnectionMenuItems(rhId: Long?, chatInfo: ChatInfo.ContactConnection
       ModalManager.center.closeModals()
       ModalManager.end.closeModals()
       ModalManager.center.showModalCloseable(true, showClose = appPlatform.isAndroid) { close ->
-        ContactConnectionInfoView(chatModel, rhId, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, true, close)
+        ContactConnectionInfoView(chatModel, rhId, chatInfo.contactConnection.connLinkInv, chatInfo.contactConnection, true, close)
       }
       showMenu.value = false
     },
@@ -562,20 +589,33 @@ private fun InvalidDataView() {
   }
 }
 
+@Composable
+private fun ArchiveAllReportsItemAction(showMenu: MutableState<Boolean>, archiveReports: () -> Unit) {
+  ItemAction(
+    stringResource(MR.strings.archive_reports),
+    painterResource(MR.images.ic_inventory_2),
+    onClick = {
+      showArchiveAllReportsForMeAlert(archiveReports)
+      showMenu.value = false
+    }
+  )
+}
+
 fun markChatRead(c: Chat) {
   var chat = c
   withApi {
     if (chat.chatStats.unreadCount > 0) {
-      withChats {
-        markChatItemsRead(chat.remoteHostId, chat.chatInfo.id)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.markChatItemsRead(chat.remoteHostId, chat.chatInfo.id)
       }
-      withReportsChatsIfOpen {
-        markChatItemsRead(chat.remoteHostId, chat.chatInfo.id)
+      withContext(Dispatchers.Main) {
+        chatModel.secondaryChatsContext.value?.markChatItemsRead(chat.remoteHostId, chat.chatInfo.id)
       }
       chatModel.controller.apiChatRead(
         chat.remoteHostId,
         chat.chatInfo.chatType,
-        chat.chatInfo.apiId
+        chat.chatInfo.apiId,
+        chat.chatInfo.groupChatScope()
       )
       chat = chatModel.getChat(chat.id) ?: return@withApi
     }
@@ -587,9 +627,9 @@ fun markChatRead(c: Chat) {
         false
       )
       if (success) {
-        withChats {
-          replaceChat(chat.remoteHostId, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = false)))
-          markChatTagRead(chat)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.replaceChat(chat.remoteHostId, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = false)))
+          chatModel.chatsContext.markChatTagRead(chat)
         }
       }
     }
@@ -609,9 +649,9 @@ fun markChatUnread(chat: Chat, chatModel: ChatModel) {
       true
     )
     if (success) {
-      withChats {
-        replaceChat(chat.remoteHostId, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = true)))
-        updateChatTagReadNoContentTag(chat, wasUnread)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.replaceChat(chat.remoteHostId, chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = true)))
+        chatModel.chatsContext.updateChatTagReadInPrimaryContext(chat, wasUnread)
       }
     }
   }
@@ -652,8 +692,8 @@ fun acceptContactRequest(rhId: Long?, incognito: Boolean, apiId: Long, contactRe
     val contact = chatModel.controller.apiAcceptContactRequest(rhId, incognito, apiId)
     if (contact != null && isCurrentUser && contactRequest != null) {
       val chat = Chat(remoteHostId = rhId, ChatInfo.Direct(contact), listOf())
-      withChats {
-        replaceChat(rhId, contactRequest.id, chat)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.replaceChat(rhId, contactRequest.id, chat)
       }
       chatModel.setContactNetworkStatus(contact, NetworkStatus.Connected())
       close?.invoke(chat)
@@ -664,8 +704,8 @@ fun acceptContactRequest(rhId: Long?, incognito: Boolean, apiId: Long, contactRe
 fun rejectContactRequest(rhId: Long?, contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
   withBGApi {
     chatModel.controller.apiRejectContactRequest(rhId, contactRequest.apiId)
-    withChats {
-      removeChat(rhId, contactRequest.id)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.removeChat(rhId, contactRequest.id)
     }
   }
 }
@@ -682,8 +722,8 @@ fun deleteContactConnectionAlert(rhId: Long?, connection: PendingContactConnecti
       withBGApi {
         AlertManager.shared.hideAlert()
         if (chatModel.controller.apiDeleteChat(rhId, ChatType.ContactConnection, connection.apiId)) {
-          withChats {
-            removeChat(rhId, connection.id)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.removeChat(rhId, connection.id)
           }
           onSuccess()
         }
@@ -703,8 +743,8 @@ fun pendingContactAlertDialog(rhId: Long?, chatInfo: ChatInfo, chatModel: ChatMo
       withBGApi {
         val r = chatModel.controller.apiDeleteChat(rhId, chatInfo.chatType, chatInfo.apiId)
         if (r) {
-          withChats {
-            removeChat(rhId, chatInfo.id)
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.removeChat(rhId, chatInfo.id)
           }
           if (chatModel.chatId.value == chatInfo.id) {
             chatModel.chatId.value = null
@@ -767,8 +807,8 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
 suspend fun connectContactViaAddress(chatModel: ChatModel, rhId: Long?, contactId: Long, incognito: Boolean): Boolean {
   val contact = chatModel.controller.apiConnectContactViaAddress(rhId, incognito, contactId)
   if (contact != null) {
-    withChats {
-      updateContact(rhId, contact)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateContact(rhId, contact)
     }
     AlertManager.privacySensitive.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
@@ -810,8 +850,8 @@ fun deleteGroup(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel) {
   withBGApi {
     val r = chatModel.controller.apiDeleteChat(rhId, ChatType.Group, groupInfo.apiId)
     if (r) {
-      withChats {
-        removeChat(rhId, groupInfo.id)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.removeChat(rhId, groupInfo.id)
       }
       if (chatModel.chatId.value == groupInfo.id) {
         chatModel.chatId.value = null
@@ -830,8 +870,8 @@ fun groupInvitationAcceptedAlert(rhId: Long?) {
   )
 }
 
-fun toggleNotifications(remoteHostId: Long?, chatInfo: ChatInfo, enableAllNtfs: Boolean, chatModel: ChatModel, currentState: MutableState<Boolean>? = null) {
-  val chatSettings = (chatInfo.chatSettings ?: ChatSettings.defaults).copy(enableNtfs = if (enableAllNtfs) MsgFilter.All else MsgFilter.None)
+fun toggleNotifications(remoteHostId: Long?, chatInfo: ChatInfo, filter: MsgFilter, chatModel: ChatModel, currentState: MutableState<MsgFilter>? = null) {
+  val chatSettings = (chatInfo.chatSettings ?: ChatSettings.defaults).copy(enableNtfs = filter)
   updateChatSettings(remoteHostId, chatInfo, chatSettings, chatModel, currentState)
 }
 
@@ -840,13 +880,13 @@ fun toggleChatFavorite(remoteHostId: Long?, chatInfo: ChatInfo, favorite: Boolea
   updateChatSettings(remoteHostId, chatInfo, chatSettings, chatModel)
 }
 
-fun updateChatSettings(remoteHostId: Long?, chatInfo: ChatInfo, chatSettings: ChatSettings, chatModel: ChatModel, currentState: MutableState<Boolean>? = null) {
+fun updateChatSettings(remoteHostId: Long?, chatInfo: ChatInfo, chatSettings: ChatSettings, chatModel: ChatModel, currentState: MutableState<MsgFilter>? = null) {
   val newChatInfo = when(chatInfo) {
     is ChatInfo.Direct -> with (chatInfo) {
       ChatInfo.Direct(contact.copy(chatSettings = chatSettings))
     }
     is ChatInfo.Group -> with(chatInfo) {
-      ChatInfo.Group(groupInfo.copy(chatSettings = chatSettings))
+      ChatInfo.Group(groupInfo.copy(chatSettings = chatSettings), groupChatScope = null)
     }
     else -> null
   }
@@ -865,26 +905,45 @@ fun updateChatSettings(remoteHostId: Long?, chatInfo: ChatInfo, chatSettings: Ch
       val wasUnread = chat?.unreadTag ?: false
       val wasFavorite = chatInfo.chatSettings?.favorite ?: false
       chatModel.updateChatFavorite(favorite = chatSettings.favorite, wasFavorite)
-      withChats {
-        updateChatInfo(remoteHostId, newChatInfo)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateChatInfo(remoteHostId, newChatInfo)
       }
-      if (chatSettings.enableNtfs != MsgFilter.All) {
+      if (chatSettings.enableNtfs == MsgFilter.None) {
         ntfManager.cancelNotificationsForChat(chatInfo.id)
       }
       val updatedChat = chatModel.getChat(chatInfo.id)
       if (updatedChat != null) {
-        withChats {
-          updateChatTagReadNoContentTag(updatedChat, wasUnread)
+        withContext(Dispatchers.Main) {
+          chatModel.chatsContext.updateChatTagReadInPrimaryContext(updatedChat, wasUnread)
         }
       }
       val current = currentState?.value
       if (current != null) {
-        currentState.value = !current
+        currentState.value = chatSettings.enableNtfs
       }
     }
   }
 }
 
+private fun showArchiveAllReportsForMeAlert(archiveReports: () -> Unit) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(MR.strings.report_archive_alert_title_all),
+    text = generalGetString(MR.strings.report_archive_alert_desc_all),
+    onConfirm = archiveReports,
+    destructive = true,
+    confirmText = generalGetString(MR.strings.archive_verb),
+  )
+}
+
+private fun archiveAllReportsForMe(chatRh: Long?, apiId: Long) {
+  withBGApi {
+    val r = chatModel.controller.apiArchiveReceivedReports(chatRh, apiId)
+    if (r != null) {
+      controller.groupChatItemsDeleted(chatRh, r)
+    }
+  }
+}
+
 @Composable
 expect fun ChatListNavLinkLayout(
   chatLinkPreview: @Composable () -> Unit,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
index 3205a084f0..87c02f038c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.AppLock
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.ChatController.setConditionsNotified
 import chat.simplex.common.model.ChatController.stopRemoteHostAndReloadHosts
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -38,8 +37,6 @@ import chat.simplex.common.views.chat.topPaddingToContent
 import chat.simplex.common.views.newchat.*
 import chat.simplex.common.views.onboarding.*
 import chat.simplex.common.views.usersettings.*
-import chat.simplex.common.views.usersettings.networkAndServers.ConditionsLinkButton
-import chat.simplex.common.views.usersettings.networkAndServers.UsageConditionsView
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
@@ -127,32 +124,19 @@ fun ToggleChatListCard() {
 @Composable
 fun ChatListView(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedViewState>, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
   val oneHandUI = remember { appPrefs.oneHandUI.state }
-  val rhId = chatModel.remoteHostId()
 
   LaunchedEffect(Unit) {
     val showWhatsNew = shouldShowWhatsNew(chatModel)
     val showUpdatedConditions = chatModel.conditions.value.conditionsAction?.shouldShowNotice ?: false
-    if (showWhatsNew) {
+    if (showWhatsNew || showUpdatedConditions) {
       delay(1000L)
       ModalManager.center.showCustomModal { close -> WhatsNewView(close = close, updatedConditions = showUpdatedConditions) }
-    } else if (showUpdatedConditions) {
-      ModalManager.center.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close ->
-        LaunchedEffect(Unit) {
-          val conditionsId = chatModel.conditions.value.currentConditions.conditionsId
-          try {
-            setConditionsNotified(rh = rhId, conditionsId = conditionsId)
-          } catch (e: Exception) {
-            Log.d(TAG, "UsageConditionsView setConditionsNotified error: ${e.message}")
-          }
-        }
-        UsageConditionsView(userServers = mutableStateOf(emptyList()), currUserServers = mutableStateOf(emptyList()), close = close, rhId = rhId)
-      }
     }
   }
 
   if (appPlatform.isDesktop) {
     KeyChangeEffect(chatModel.chatId.value) {
-      if (chatModel.chatId.value != null && !ModalManager.end.isLastModalOpen(ModalViewId.GROUP_REPORTS)) {
+      if (chatModel.chatId.value != null && !ModalManager.end.isLastModalOpen(ModalViewId.SECONDARY_CHAT)) {
         ModalManager.end.closeModalsExceptFirst()
       }
       AudioPlayer.stop()
@@ -1219,7 +1203,7 @@ private fun filtered(chat: Chat, activeFilter: ActiveFilter?): Boolean =
   when (activeFilter) {
     is ActiveFilter.PresetTag -> presetTagMatchesChat(activeFilter.tag, chat.chatInfo, chat.chatStats)
     is ActiveFilter.UserTag -> chat.chatInfo.chatTags?.contains(activeFilter.tag.chatTagId) ?: false
-    is ActiveFilter.Unread -> chat.chatStats.unreadChat ||  chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0
+    is ActiveFilter.Unread -> chat.unreadTag
     else -> true
   }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
index ba7334522a..65a9d175dd 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
@@ -19,7 +19,6 @@ import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.font.FontStyle
@@ -71,6 +70,7 @@ fun ChatPreviewView(
         }
       is ChatInfo.Group ->
         when (cInfo.groupInfo.membership.memberStatus) {
+          GroupMemberStatus.MemRejected -> inactiveIcon()
           GroupMemberStatus.MemLeft -> inactiveIcon()
           GroupMemberStatus.MemRemoved -> inactiveIcon()
           GroupMemberStatus.MemGroupDeleted -> inactiveIcon()
@@ -157,7 +157,7 @@ fun ChatPreviewView(
             else
               if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary
           )
-          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(MaterialTheme.colors.secondary)
+          GroupMemberStatus.MemAccepted, GroupMemberStatus.MemRejected -> chatPreviewTitleText(MaterialTheme.colors.secondary)
           else -> chatPreviewTitleText(
             if (deleting)
               MaterialTheme.colors.secondary
@@ -176,7 +176,7 @@ fun ChatPreviewView(
       if (showChatPreviews || (chatModelDraftChatId == chat.id && chatModelDraft != null)) {
         val sp20 = with(LocalDensity.current) { 20.sp.toDp() }
         val (text: CharSequence, inlineTextContent) = when {
-          chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { chatModelDraft.message to messageDraft(chatModelDraft, sp20) }
+          chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { chatModelDraft.message.text to messageDraft(chatModelDraft, sp20) }
           ci.meta.itemDeleted == null -> ci.text to null
           else -> markedDeletedText(ci, chat.chatInfo) to null
         }
@@ -203,6 +203,11 @@ fun ChatPreviewView(
             cInfo is ChatInfo.Group && !ci.chatDir.sent -> ci.memberDisplayName
             else -> null
           },
+          mentions = ci.mentions,
+          userMemberId = when {
+            cInfo is ChatInfo.Group -> cInfo.groupInfo.membership.memberId
+            else -> null
+          },
           toggleSecrets = false,
           linkMode = linkMode,
           senderBold = true,
@@ -233,8 +238,11 @@ fun ChatPreviewView(
           }
         is ChatInfo.Group ->
           when (cInfo.groupInfo.membership.memberStatus) {
+            GroupMemberStatus.MemRejected -> Text(stringResource(MR.strings.group_preview_rejected))
             GroupMemberStatus.MemInvited -> Text(groupInvitationPreviewText(currentUserProfileDisplayName, cInfo.groupInfo))
             GroupMemberStatus.MemAccepted -> Text(stringResource(MR.strings.group_connection_pending), color = MaterialTheme.colors.secondary)
+            GroupMemberStatus.MemPendingReview, GroupMemberStatus.MemPendingApproval ->
+              Text(stringResource(MR.strings.reviewed_by_admins), color = MaterialTheme.colors.secondary)
             else -> {}
           }
         else -> {}
@@ -357,7 +365,11 @@ fun ChatPreviewView(
       if (progressByTimeout) {
         progressView()
       } else if (chat.chatStats.reportsCount > 0) {
-        GroupReportsIcon()
+        FlagIcon(color = MaterialTheme.colors.error)
+      } else if (chat.supportUnreadCount > 0) {
+        FlagIcon(color = MaterialTheme.colors.primary)
+      } else if (chat.chatInfo.groupInfo_?.membership?.memberPending == true) {
+        FlagIcon(color = MaterialTheme.colors.secondary)
       } else {
         IncognitoIcon(chat.chatInfo.incognito)
       }
@@ -366,103 +378,132 @@ fun ChatPreviewView(
     }
   }
 
-  Row {
-    Box(contentAlignment = Alignment.BottomEnd) {
-      ChatInfoImage(cInfo, size = 72.dp * fontSizeSqrtMultiplier)
-      Box(Modifier.padding(end = 6.sp.toDp(), bottom = 6.sp.toDp())) {
-        chatPreviewImageOverlayIcon()
-      }
-    }
-    Spacer(Modifier.width(8.dp))
-    Column(Modifier.weight(1f)) {
-      Row {
-        Box(Modifier.weight(1f)) {
-          chatPreviewTitle()
+  Box(contentAlignment = Alignment.Center) {
+    Row {
+      Box(contentAlignment = Alignment.BottomEnd) {
+        ChatInfoImage(cInfo, size = 72.dp * fontSizeSqrtMultiplier)
+        Box(Modifier.padding(end = 6.sp.toDp(), bottom = 6.sp.toDp())) {
+          chatPreviewImageOverlayIcon()
         }
-        Spacer(Modifier.width(8.sp.toDp()))
-        val ts = getTimestampText(chat.chatItems.lastOrNull()?.meta?.itemTs ?: chat.chatInfo.chatTs)
-        ChatListTimestampView(ts)
       }
-      Row(Modifier.heightIn(min = 46.sp.toDp()).fillMaxWidth()) {
-        Row(Modifier.padding(top = 3.sp.toDp()).weight(1f)) {
-          val activeVoicePreview: MutableState<(ActiveVoicePreview)?> = remember(chat.id) { mutableStateOf(null) }
-          val chat = activeVoicePreview.value?.chat ?: chat
-          val ci = activeVoicePreview.value?.ci ?: chat.chatItems.lastOrNull()
-          val mc = ci?.content?.msgContent
-          val deleted = ci?.isDeletedContent == true || ci?.meta?.itemDeleted != null
-          val showContentPreview = (showChatPreviews && chatModelDraftChatId != chat.id && !deleted) || activeVoicePreview.value != null
-          if (ci != null && showContentPreview) {
-            chatItemContentPreview(chat, ci)
+      Spacer(Modifier.width(8.dp))
+      Column(Modifier.weight(1f)) {
+        Row {
+          Box(Modifier.weight(1f)) {
+            chatPreviewTitle()
           }
-          if (mc !is MsgContent.MCVoice || !showContentPreview || mc.text.isNotEmpty() || chatModelDraftChatId == chat.id) {
-            Box(Modifier.offset(x = if (mc is MsgContent.MCFile && ci.meta.itemDeleted == null) -15.sp.toDp() else 0.dp)) {
-              chatPreviewText()
+          Spacer(Modifier.width(8.sp.toDp()))
+          val ts = getTimestampText(chat.chatItems.lastOrNull()?.meta?.itemTs ?: chat.chatInfo.chatTs)
+          ChatListTimestampView(ts)
+        }
+        Row(Modifier.heightIn(min = 46.sp.toDp()).fillMaxWidth()) {
+          Row(Modifier.padding(top = 3.sp.toDp()).weight(1f)) {
+            val activeVoicePreview: MutableState<(ActiveVoicePreview)?> = remember(chat.id) { mutableStateOf(null) }
+            val chat = activeVoicePreview.value?.chat ?: chat
+            val ci = activeVoicePreview.value?.ci ?: chat.chatItems.lastOrNull()
+            val mc = ci?.content?.msgContent
+            val deleted = ci?.isDeletedContent == true || ci?.meta?.itemDeleted != null
+            val showContentPreview = (showChatPreviews && chatModelDraftChatId != chat.id && !deleted) || activeVoicePreview.value != null
+            if (ci != null && showContentPreview) {
+              chatItemContentPreview(chat, ci)
             }
-          }
-          LaunchedEffect(AudioPlayer.currentlyPlaying.value, activeVoicePreview.value) {
-            val playing = AudioPlayer.currentlyPlaying.value
-            when {
-              playing == null -> activeVoicePreview.value = null
-              activeVoicePreview.value == null -> if (mc is MsgContent.MCVoice && playing.fileSource.filePath == ci.file?.fileSource?.filePath) {
-                activeVoicePreview.value = ActiveVoicePreview(chat, ci, mc)
+            if (mc !is MsgContent.MCVoice || !showContentPreview || mc.text.isNotEmpty() || chatModelDraftChatId == chat.id) {
+              Box(Modifier.offset(x = if (mc is MsgContent.MCFile && ci.meta.itemDeleted == null) -15.sp.toDp() else 0.dp)) {
+                chatPreviewText()
               }
-              else -> if (playing.fileSource.filePath != ci?.file?.fileSource?.filePath) {
-                activeVoicePreview.value = null
+            }
+            LaunchedEffect(AudioPlayer.currentlyPlaying.value, activeVoicePreview.value) {
+              val playing = AudioPlayer.currentlyPlaying.value
+              when {
+                playing == null -> activeVoicePreview.value = null
+                activeVoicePreview.value == null -> if (mc is MsgContent.MCVoice && playing.fileSource.filePath == ci.file?.fileSource?.filePath) {
+                  activeVoicePreview.value = ActiveVoicePreview(chat, ci, mc)
+                }
+
+                else -> if (playing.fileSource.filePath != ci?.file?.fileSource?.filePath) {
+                  activeVoicePreview.value = null
+                }
+              }
+            }
+            LaunchedEffect(chatModel.deletedChats.value) {
+              val voicePreview = activeVoicePreview.value
+              // Stop voice when deleting the chat
+              if (chatModel.deletedChats.value.contains(chatModel.remoteHostId() to chat.id) && voicePreview?.ci != null) {
+                AudioPlayer.stop(voicePreview.ci)
               }
             }
           }
-          LaunchedEffect(chatModel.deletedChats.value) {
-            val voicePreview = activeVoicePreview.value
-            // Stop voice when deleting the chat
-            if (chatModel.deletedChats.value.contains(chatModel.remoteHostId() to chat.id) && voicePreview?.ci != null) {
-              AudioPlayer.stop(voicePreview.ci)
+
+          Spacer(Modifier.width(8.sp.toDp()))
+
+          Box(Modifier.widthIn(min = 34.sp.toDp()), contentAlignment = Alignment.TopEnd) {
+            val n = chat.chatStats.unreadCount
+            val ntfsMode = chat.chatInfo.chatSettings?.enableNtfs
+            val showNtfsIcon = !chat.chatInfo.ntfsEnabled(false) && (chat.chatInfo is ChatInfo.Direct || chat.chatInfo is ChatInfo.Group)
+            if (n > 0 || chat.chatStats.unreadChat) {
+              val unreadMentions = chat.chatStats.unreadMentions
+              Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.sp.toDp())) {
+                val mentionColor = when {
+                  disabled -> MaterialTheme.colors.secondary
+                  cInfo is ChatInfo.Group -> {
+                    val enableNtfs = cInfo.groupInfo.chatSettings.enableNtfs
+                    if (enableNtfs == MsgFilter.All || enableNtfs == MsgFilter.Mentions) MaterialTheme.colors.primaryVariant else MaterialTheme.colors.secondary
+                  }
+
+                  else -> if (showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant
+                }
+                if (unreadMentions > 0 && n > 1) {
+                  Icon(
+                    painterResource(MR.images.ic_alternate_email),
+                    contentDescription = generalGetString(MR.strings.notifications),
+                    tint = mentionColor,
+                    modifier = Modifier.size(12.sp.toDp()).offset(y = 3.sp.toDp())
+                  )
+                }
+
+                if (unreadMentions > 0 && n == 1) {
+                  Box(modifier = Modifier.offset(y = 2.sp.toDp()).size(15.sp.toDp()).background(mentionColor, shape = CircleShape), contentAlignment = Alignment.Center) {
+                    Icon(
+                      painterResource(MR.images.ic_alternate_email),
+                      contentDescription = generalGetString(MR.strings.notifications),
+                      tint = Color.White,
+                      modifier = Modifier.size(9.sp.toDp())
+                    )
+                  }
+                } else {
+                  UnreadBadge(
+                    text = if (n > 0) unreadCountStr(n) else "",
+                    backgroundColor = if (disabled || showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant,
+                    yOffset = 3.dp
+                  )
+                }
+              }
+            } else if (showNtfsIcon && ntfsMode != null) {
+              Icon(
+                painterResource(ntfsMode.iconFilled),
+                contentDescription = generalGetString(MR.strings.notifications),
+                tint = MaterialTheme.colors.secondary,
+                modifier = Modifier
+                  .padding(start = 2.sp.toDp())
+                  .size(18.sp.toDp())
+                  .offset(x = 2.5.sp.toDp(), y = 2.sp.toDp())
+              )
+            } else if (chat.chatInfo.chatSettings?.favorite == true) {
+              Icon(
+                painterResource(MR.images.ic_star_filled),
+                contentDescription = generalGetString(MR.strings.favorite_chat),
+                tint = MaterialTheme.colors.secondary,
+                modifier = Modifier
+                  .size(20.sp.toDp())
+                  .offset(x = 2.5.sp.toDp())
+              )
+            }
+            Box(
+              Modifier.offset(y = 28.sp.toDp()),
+              contentAlignment = Alignment.Center
+            ) {
+              chatStatusImage()
             }
-          }
-        }
-
-        Spacer(Modifier.width(8.sp.toDp()))
-
-        Box(Modifier.widthIn(min = 34.sp.toDp()), contentAlignment = Alignment.TopEnd) {
-          val n = chat.chatStats.unreadCount
-          val showNtfsIcon = !chat.chatInfo.ntfsEnabled && (chat.chatInfo is ChatInfo.Direct || chat.chatInfo is ChatInfo.Group)
-          if (n > 0 || chat.chatStats.unreadChat) {
-            Text(
-              if (n > 0) unreadCountStr(n) else "",
-              color = Color.White,
-              fontSize = 10.sp,
-              style = TextStyle(textAlign = TextAlign.Center),
-              modifier = Modifier
-                .offset(y = 3.sp.toDp())
-                .background(if (disabled || showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant, shape = CircleShape)
-                .badgeLayout()
-                .padding(horizontal = 2.sp.toDp())
-                .padding(vertical = 1.sp.toDp())
-            )
-          } else if (showNtfsIcon) {
-            Icon(
-              painterResource(MR.images.ic_notifications_off_filled),
-              contentDescription = generalGetString(MR.strings.notifications),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .padding(start = 2.sp.toDp())
-                .size(18.sp.toDp())
-                .offset(x = 2.5.sp.toDp(), y = 2.sp.toDp())
-            )
-          } else if (chat.chatInfo.chatSettings?.favorite == true) {
-            Icon(
-              painterResource(MR.images.ic_star_filled),
-              contentDescription = generalGetString(MR.strings.favorite_chat),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .size(20.sp.toDp())
-                .offset(x = 2.5.sp.toDp())
-            )
-          }
-          Box(
-            Modifier.offset(y = 28.sp.toDp()),
-            contentAlignment = Alignment.Center
-          ) {
-            chatStatusImage()
           }
         }
       }
@@ -506,11 +547,11 @@ fun IncognitoIcon(incognito: Boolean) {
 }
 
 @Composable
-fun GroupReportsIcon() {
+fun FlagIcon(color: Color) {
   Icon(
     painterResource(MR.images.ic_flag),
     contentDescription = null,
-    tint = MaterialTheme.colors.error,
+    tint = color,
     modifier = Modifier
       .size(21.sp.toDp())
       .offset(x = 2.sp.toDp())
@@ -525,6 +566,26 @@ private fun groupInvitationPreviewText(currentUserProfileDisplayName: String?, g
     stringResource(MR.strings.group_preview_you_are_invited)
 }
 
+@Composable
+fun UnreadBadge(
+  text: String,
+  backgroundColor: Color,
+  yOffset: Dp? = null
+) {
+  Text(
+    text,
+    color = Color.White,
+    fontSize = 10.sp,
+    style = TextStyle(textAlign = TextAlign.Center),
+    modifier = Modifier
+      .offset(y = yOffset ?: 0.dp)
+      .background(backgroundColor, shape = CircleShape)
+      .badgeLayout()
+      .padding(horizontal = 2.sp.toDp())
+      .padding(vertical = 1.sp.toDp())
+  )
+}
+
 @Composable
 fun unreadCountStr(n: Int): String {
   return if (n < 1000) "$n" else "${n / 1000}" + stringResource(MR.strings.thousand_abbreviation)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
index 1b563e6d02..8dfe138da1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
@@ -31,8 +31,7 @@ import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.apiDeleteChatTag
 import chat.simplex.common.model.ChatController.apiSetChatTags
 import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
+import chat.simplex.common.model.ChatModel.clearActiveChatFilterIfNeeded
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ItemAction
@@ -42,6 +41,7 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.*
 
 @Composable
 fun TagListView(rhId: Long?, chat: Chat? = null, close: () -> Unit, reorderMode: Boolean) {
@@ -416,15 +416,15 @@ private fun setTag(rhId: Long?, tagId: Long?, chat: Chat, close: () -> Unit) {
         when (val cInfo = chat.chatInfo) {
           is ChatInfo.Direct -> {
             val contact = cInfo.contact.copy(chatTags = result.second)
-            withChats {
-              updateContact(rhId, contact)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.updateContact(rhId, contact)
             }
           }
 
           is ChatInfo.Group -> {
             val group = cInfo.groupInfo.copy(chatTags = result.second)
-            withChats {
-              updateGroup(rhId, group)
+            withContext(Dispatchers.Main) {
+              chatModel.chatsContext.updateGroup(rhId, group)
             }
           }
 
@@ -447,21 +447,19 @@ private fun deleteTag(rhId: Long?, tag: ChatTag, saving: MutableState<Boolean>)
       val tagId = tag.chatTagId
       if (apiDeleteChatTag(rhId, tagId)) {
         chatModel.userTags.value = chatModel.userTags.value.filter { it.chatTagId != tagId }
-        if (chatModel.activeChatTagFilter.value == ActiveFilter.UserTag(tag)) {
-          chatModel.activeChatTagFilter.value = null
-        }
+        clearActiveChatFilterIfNeeded()
         chatModel.chats.value.forEach { c ->
           when (val cInfo = c.chatInfo) {
             is ChatInfo.Direct -> {
               val contact = cInfo.contact.copy(chatTags = cInfo.contact.chatTags.filter { it != tagId })
-              withChats {
-                updateContact(rhId, contact)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateContact(rhId, contact)
               }
             }
             is ChatInfo.Group -> {
               val group = cInfo.groupInfo.copy(chatTags = cInfo.groupInfo.chatTags.filter { it != tagId })
-              withChats {
-                updateGroup(rhId, group)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateGroup(rhId, group)
               }
             }
             else -> {}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
index 185ec3925f..13351a2111 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -634,7 +634,7 @@ fun HostDisconnectButton(onClick: (() -> Unit)?) {
 }
 
 @Composable
-fun BoxScope.unreadBadge(unreadCount: Int, userMuted: Boolean, hasPadding: Boolean) {
+fun BoxScope.userUnreadBadge(unreadCount: Int, userMuted: Boolean, hasPadding: Boolean) {
   Text(
     if (unreadCount > 0) unreadCountStr(unreadCount) else "",
     color = Color.White,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
index da70aef621..4e65a3649e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
@@ -5,7 +5,6 @@ import androidx.compose.ui.graphics.Color
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.chat.*
 import chat.simplex.common.views.chat.item.ItemAction
@@ -56,13 +55,13 @@ fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>, showDel
                     when (contactType) {
                         ContactType.RECENT -> {
                             withApi {
-                                openChat(rhId, chat.chatInfo)
+                                openChat(secondaryChatsCtx = null, rhId, chat.chatInfo)
                                 ModalManager.start.closeModals()
                             }
                         }
                         ContactType.CHAT_DELETED -> {
                             withApi {
-                                openChat(rhId, chat.chatInfo)
+                                openChat(secondaryChatsCtx = null, rhId, chat.chatInfo)
                                 ModalManager.start.closeModals()
                             }
                         }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt
index c2e1d67d50..1c1c37b7ac 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt
@@ -435,7 +435,7 @@ suspend fun encryptDatabase(
     }
     val error = m.controller.apiStorageEncryption(currentKey.value, newKey.value)
     appPrefs.encryptionStartedAt.set(null)
-    val sqliteError = ((error?.chatError as? ChatError.ChatErrorDatabase)?.databaseError as? DatabaseError.ErrorExport)?.sqliteError
+    val sqliteError = ((error as? ChatError.ChatErrorDatabase)?.databaseError as? DatabaseError.ErrorExport)?.sqliteError
     when {
       sqliteError is SQLiteError.ErrorNotADatabase -> {
         operationEnded(m, progressIndicator) {
@@ -449,7 +449,7 @@ suspend fun encryptDatabase(
       error != null -> {
         operationEnded(m, progressIndicator) {
           AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_encrypting_database),
-            "failed to set storage encryption: ${error.responseType} ${error.details}"
+            "failed to set storage encryption: error ${error.string}"
           )
         }
         false
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
index d951f1f812..4a911fa6f0 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.*
@@ -20,8 +21,6 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
@@ -35,6 +34,7 @@ import java.nio.file.StandardCopyOption
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.collections.ArrayList
+import kotlinx.coroutines.*
 
 @Composable
 fun DatabaseView() {
@@ -108,6 +108,9 @@ fun DatabaseView() {
         }
       },
       onChatItemTTLSelected = {
+        if (it == null) {
+          return@DatabaseLayout
+        }
         val oldValue = chatItemTTL.value
         chatItemTTL.value = it
         if (it < oldValue) {
@@ -158,7 +161,7 @@ fun DatabaseLayout(
   exportArchive: () -> Unit,
   deleteChatAlert: () -> Unit,
   deleteAppFilesAndMedia: () -> Unit,
-  onChatItemTTLSelected: (ChatItemTTL) -> Unit,
+  onChatItemTTLSelected: (ChatItemTTL?) -> Unit,
   disconnectAllHosts: () -> Unit,
 ) {
   val operationsDisabled = progressIndicator && !chatModel.desktopNoUserNoRemote
@@ -300,21 +303,25 @@ private fun setChatItemTTLAlert(
 }
 
 @Composable
-private fun TtlOptions(current: State<ChatItemTTL>, enabled: State<Boolean>, onSelected: (ChatItemTTL) -> Unit) {
+fun TtlOptions(
+  current: State<ChatItemTTL?>,
+  enabled: State<Boolean>,
+  onSelected: (ChatItemTTL?) -> Unit,
+  default: State<ChatItemTTL>? = null
+) {
   val values = remember {
-    val all: ArrayList<ChatItemTTL> = arrayListOf(ChatItemTTL.None, ChatItemTTL.Month, ChatItemTTL.Week, ChatItemTTL.Day)
-    if (current.value is ChatItemTTL.Seconds) {
-      all.add(current.value)
+    val all: ArrayList<ChatItemTTL> = arrayListOf(ChatItemTTL.None, ChatItemTTL.Year, ChatItemTTL.Month, ChatItemTTL.Week, ChatItemTTL.Day)
+    val currentValue = current.value
+    if (currentValue is ChatItemTTL.Seconds) {
+      all.add(currentValue)
     }
-    all.map {
-      when (it) {
-        is ChatItemTTL.None -> it to generalGetString(MR.strings.chat_item_ttl_none)
-        is ChatItemTTL.Day -> it to generalGetString(MR.strings.chat_item_ttl_day)
-        is ChatItemTTL.Week -> it to generalGetString(MR.strings.chat_item_ttl_week)
-        is ChatItemTTL.Month -> it to generalGetString(MR.strings.chat_item_ttl_month)
-        is ChatItemTTL.Seconds -> it to String.format(generalGetString(MR.strings.chat_item_ttl_seconds), it.secs)
-      }
+    val options: MutableList<Pair<ChatItemTTL?, String>> = all.map { it to it.text }.toMutableList()
+
+    if (default != null) {
+      options.add(null to String.format(generalGetString(MR.strings.chat_item_ttl_default), default.value.text))
     }
+
+    options
   }
   ExposedDropDownSettingRow(
     generalGetString(MR.strings.delete_messages_after),
@@ -530,15 +537,15 @@ fun deleteChatDatabaseFilesAndState() {
   // Clear sensitive data on screen just in case ModalManager will fail to prevent hiding its modals while database encrypts itself
   chatModel.chatId.value = null
   withLongRunningApi {
-    withChats {
-      chatItems.clearAndNotify()
-      chats.clear()
-      popChatCollector.clear()
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.chatItems.clearAndNotify()
+      chatModel.chatsContext.chats.clear()
+      chatModel.chatsContext.popChatCollector.clear()
     }
-    withReportsChatsIfOpen {
-      chatItems.clearAndNotify()
-      chats.clear()
-      popChatCollector.clear()
+    withContext(Dispatchers.Main) {
+      chatModel.secondaryChatsContext.value?.chatItems?.clearAndNotify()
+      chatModel.secondaryChatsContext.value?.chats?.clear()
+      chatModel.secondaryChatsContext.value?.popChatCollector?.clear()
     }
   }
   chatModel.users.clear()
@@ -777,10 +784,10 @@ private fun afterSetCiTTL(
   appFilesCountAndSize.value = directoryFileCountAndSize(appFilesDir.absolutePath)
   withApi {
     try {
-      withChats {
+      withContext(Dispatchers.Main) {
         // this is using current remote host on purpose - if it changes during update, it will load correct chats
         val chats = m.controller.apiGetChats(m.remoteHostId())
-        updateChats(chats)
+        chatModel.chatsContext.updateChats(chats)
       }
     } catch (e: Exception) {
       Log.e(TAG, "apiGetChats error: ${e.message}")
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
index 4fdbd97d23..078cdde9da 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
@@ -9,3 +9,5 @@ fun <T> newChatSheetAnimSpec() = tween<T>(256, 0, LinearEasing)
 fun <T> audioProgressBarAnimationSpec() = tween<T>(durationMillis = 30, easing = LinearEasing)
 
 fun <T> userPickerAnimSpec() = tween<T>(256, 0, FastOutSlowInEasing)
+
+fun <T> mentionPickerAnimSpec() = tween<T>(256, 0, FastOutSlowInEasing)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt
index cce7cf17a5..9c529e547a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.layoutId
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -19,6 +20,8 @@ import chat.simplex.common.model.LinkPreview
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.chatViewScrollState
+import chat.simplex.common.views.chat.item.CHAT_IMAGE_LAYOUT_ID
+import chat.simplex.common.views.chat.item.imageViewFullWidth
 import chat.simplex.res.MR
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -40,11 +43,21 @@ suspend fun getLinkPreview(url: String): LinkPreview? {
           url
         }
         else -> {
-          val response = Jsoup.connect(url)
+          val connection = Jsoup.connect(url)
             .ignoreContentType(true)
             .timeout(10000)
             .followRedirects(true)
-            .execute()
+
+          val response = if (url.lowercase().startsWith("https://x.com/")) {
+            // Apple sends request with special user-agent which handled differently by X.com.
+            // Different response that includes video poster from post
+            connection
+              .userAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4 facebookexternalhit/1.1 Facebot Twitterbot/1.0")
+              .execute()
+          } else {
+            connection
+              .execute()
+          }
           val doc = response.parse()
           val ogTags = doc.select(OG_SELECT_QUERY)
           title = ogTags.firstOrNull { it.attr("property") == "og:title" }?.attr("content") ?: doc.title()
@@ -123,10 +136,15 @@ fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancel
 
 @Composable
 fun ChatItemLinkView(linkPreview: LinkPreview, showMenu: State<Boolean>, onLongClick: () -> Unit) {
-  Column(Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
+  val image = base64ToBitmap(linkPreview.image)
+  Column(
+    Modifier
+    .layoutId(CHAT_IMAGE_LAYOUT_ID)
+    .width(if (image.width * 0.97 <= image.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH)
+  ) {
     val blurred = remember { mutableStateOf(appPrefs.privacyMediaBlurRadius.get() > 0) }
     Image(
-      base64ToBitmap(linkPreview.image),
+      image,
       stringResource(MR.strings.image_descr_link_preview),
       modifier = Modifier
         .fillMaxWidth()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
index 3e24629ab1..af207d1381 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
@@ -32,6 +32,7 @@ fun ModalView(
   searchAlwaysVisible: Boolean = false,
   onSearchValueChanged: (String) -> Unit = {},
   endButtons: @Composable RowScope.() -> Unit = {},
+  appBar: @Composable (BoxScope.() -> Unit)? = null,
   content: @Composable BoxScope.() -> Unit,
 ) {
   if (showClose && showAppBar) {
@@ -48,14 +49,20 @@ fun ModalView(
           StatusBarBackground()
         }
         Box(Modifier.align(if (oneHandUI.value) Alignment.BottomStart else Alignment.TopStart)) {
-          DefaultAppBar(
-            navigationButton = if (showClose) {{ NavigationButtonBack(onButtonClicked = if (enableClose) close else null) }} else null,
-            onTop = !oneHandUI.value,
-            showSearch = showSearch,
-            searchAlwaysVisible = searchAlwaysVisible,
-            onSearchValueChanged = onSearchValueChanged,
-            buttons = endButtons
-          )
+          if (appBar != null) {
+            appBar()
+          } else {
+            DefaultAppBar(
+              navigationButton = if (showClose) {
+                { NavigationButtonBack(onButtonClicked = if (enableClose) close else null) }
+              } else null,
+              onTop = !oneHandUI.value,
+              showSearch = showSearch,
+              searchAlwaysVisible = searchAlwaysVisible,
+              onSearchValueChanged = onSearchValueChanged,
+              buttons = endButtons
+            )
+          }
         }
       }
     }
@@ -78,7 +85,7 @@ class ModalData(val keyboardCoversBar: Boolean = true) {
 }
 
 enum class ModalViewId {
-  GROUP_REPORTS
+  SECONDARY_CHAT
 }
 
 class ModalManager(private val placement: ModalPlacement? = null) {
@@ -154,13 +161,20 @@ class ModalManager(private val placement: ModalPlacement? = null) {
 
   fun closeModal() {
     if (modalViews.isNotEmpty()) {
-      if (modalViews.lastOrNull()?.animated == false) modalViews.removeAt(modalViews.lastIndex)
-      else runAtomically { toRemove.add(modalViews.lastIndex - min(toRemove.size, modalViews.lastIndex)) }
+      val lastModal = modalViews.lastOrNull()
+      if (lastModal != null) {
+        if (lastModal.id == ModalViewId.SECONDARY_CHAT) chatModel.secondaryChatsContext.value = null
+        if (!lastModal.animated)
+          modalViews.removeAt(modalViews.lastIndex)
+        else
+          runAtomically { toRemove.add(modalViews.lastIndex - min(toRemove.size, modalViews.lastIndex)) }
+      }
     }
     _modalCount.value = modalViews.size - toRemove.size
   }
 
   fun closeModals() {
+    chatModel.secondaryChatsContext.value = null
     modalViews.clear()
     toRemove.clear()
     _modalCount.value = 0
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
index 37bf5b10b1..0d188bb73c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
@@ -53,6 +53,24 @@ fun SectionView(
   }
 }
 
+@Composable
+fun SectionViewWithButton(title: String? = null, titleButton: (@Composable () -> Unit)?, contentPadding: PaddingValues = PaddingValues(), headerBottomPadding: Dp = DEFAULT_PADDING, content: (@Composable ColumnScope.() -> Unit)) {
+  Column {
+    if (title != null || titleButton != null) {
+      Row(modifier = Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = headerBottomPadding).fillMaxWidth()) {
+        if (title != null) {
+          Text(title, color = MaterialTheme.colors.secondary, style = MaterialTheme.typography.body2, fontSize = 12.sp)
+        }
+        if (titleButton != null) {
+          Spacer(modifier = Modifier.weight(1f))
+          titleButton()
+        }
+      }
+    }
+    Column(Modifier.padding(contentPadding).fillMaxWidth()) { content() }
+  }
+}
+
 @Composable
 fun <T> SectionViewSelectable(
   title: String?,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateFromDevice.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateFromDevice.kt
index 8588e0e981..03542ca8af 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateFromDevice.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateFromDevice.kt
@@ -468,12 +468,12 @@ private suspend fun MutableState<MigrationFromState>.verifyDatabasePassphrase(db
   val error = controller.testStorageEncryption(dbKey)
   if (error == null) {
     state = MigrationFromState.UploadConfirmation
-  } else if (((error.chatError as? ChatError.ChatErrorDatabase)?.databaseError as? DatabaseError.ErrorOpen)?.sqliteError is SQLiteError.ErrorNotADatabase) {
+  } else if (((error as? ChatError.ChatErrorDatabase)?.databaseError as? DatabaseError.ErrorOpen)?.sqliteError is SQLiteError.ErrorNotADatabase) {
     showErrorOnMigrationIfNeeded(DBMigrationResult.ErrorNotADatabase(""))
   } else {
     AlertManager.shared.showAlertMsg(
       title = generalGetString(MR.strings.error),
-      text = generalGetString(MR.strings.migrate_from_device_error_verifying_passphrase) + " " + error.details
+      text = generalGetString(MR.strings.migrate_from_device_error_verifying_passphrase) + " " + error.string
     )
   }
 }
@@ -556,11 +556,12 @@ private fun MutableState<MigrationFromState>.startUploading(
 ) {
   withBGApi {
     chatReceiver.value = MigrationFromChatReceiver(ctrl, tempDatabaseFile) { msg ->
-      when (msg) {
+      val r = msg.result
+      when (r) {
         is CR.SndFileProgressXFTP -> {
           val s = state
           if (s is MigrationFromState.UploadProgress && s.uploadedBytes != s.totalBytes) {
-            state = MigrationFromState.UploadProgress(msg.sentSize, msg.totalSize, msg.fileTransferMeta.fileId, archivePath, ctrl, user)
+            state = MigrationFromState.UploadProgress(r.sentSize, r.totalSize, r.fileTransferMeta.fileId, archivePath, ctrl, user)
           }
         }
         is CR.SndFileRedirectStartXFTP -> {
@@ -578,7 +579,7 @@ private fun MutableState<MigrationFromState>.startUploading(
               requiredHostMode = cfg.requiredHostMode
             )
           )
-          state = MigrationFromState.LinkShown(msg.fileTransferMeta.fileId, data.addToLink(msg.rcvURIs[0]), ctrl)
+          state = MigrationFromState.LinkShown(r.fileTransferMeta.fileId, data.addToLink(r.rcvURIs[0]), ctrl)
         }
         is CR.SndFileError -> {
           AlertManager.shared.showAlertMsg(
@@ -692,7 +693,7 @@ private class MigrationFromChatReceiver(
   val ctrl: ChatCtrl,
   val databaseUrl: File,
   var receiveMessages: Boolean = true,
-  val processReceivedMsg: suspend (CR) -> Unit
+  val processReceivedMsg: suspend (API) -> Unit
 ) {
   fun start() {
     Log.d(TAG, "MigrationChatReceiver startReceiver")
@@ -701,19 +702,18 @@ private class MigrationFromChatReceiver(
         try {
           val msg = ChatController.recvMsg(ctrl)
           if (msg != null && receiveMessages) {
-            val r = msg.resp
-            val rhId = msg.remoteHostId
-            Log.d(TAG, "processReceivedMsg: ${r.responseType}")
-            chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
+            val rhId = msg.rhId
+            Log.d(TAG, "processReceivedMsg: ${msg.responseType}")
+            chatModel.addTerminalItem(TerminalItem.resp(rhId, msg))
             val finishedWithoutTimeout = withTimeoutOrNull(60_000L) {
-              processReceivedMsg(r)
+              processReceivedMsg(msg)
             }
             if (finishedWithoutTimeout == null) {
-              Log.e(TAG, "Timeout reached while processing received message: " + msg.resp.responseType)
+              Log.e(TAG, "Timeout reached while processing received message: " + msg.responseType)
               if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
                 AlertManager.shared.showAlertMsg(
                   title = generalGetString(MR.strings.possible_slow_function_title),
-                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.resp.responseType + "\n" + Exception().stackTraceToString()),
+                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.responseType + "\n" + Exception().stackTraceToString()),
                   shareText = true
                 )
               }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
index 1a28bbf589..d74846f8a3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
@@ -580,12 +580,13 @@ private fun MutableState<MigrationToState?>.startDownloading(
 ) {
   withBGApi {
     chatReceiver.value = MigrationToChatReceiver(ctrl, tempDatabaseFile) { msg ->
-        when (msg) {
-          is CR.RcvFileProgressXFTP -> {
-            state = MigrationToState.DownloadProgress(msg.receivedSize, msg.totalSize, msg.rcvFileTransfer.fileId, link, archivePath, netCfg, networkProxy, ctrl)
+        val r = msg.result
+        when {
+          r is CR.RcvFileProgressXFTP -> {
+            state = MigrationToState.DownloadProgress(r.receivedSize, r.totalSize, r.rcvFileTransfer.fileId, link, archivePath, netCfg, networkProxy, ctrl)
             MigrationToDeviceState.save(MigrationToDeviceState.DownloadProgress(link, File(archivePath).name, netCfg, networkProxy))
           }
-          is CR.RcvStandaloneFileComplete -> {
+          r is CR.RcvStandaloneFileComplete -> {
             delay(500)
             // User closed the whole screen before new state was saved
             if (state == null) {
@@ -595,22 +596,22 @@ private fun MutableState<MigrationToState?>.startDownloading(
               MigrationToDeviceState.save(MigrationToDeviceState.ArchiveImport(File(archivePath).name, netCfg, networkProxy))
             }
           }
-          is CR.RcvFileError -> {
+          r is CR.RcvFileError -> {
             AlertManager.shared.showAlertMsg(
               generalGetString(MR.strings.migrate_to_device_download_failed),
               generalGetString(MR.strings.migrate_to_device_file_delete_or_link_invalid)
             )
             state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg, networkProxy)
           }
-          is CR.ChatRespError -> {
-            if (msg.chatError is ChatError.ChatErrorChat && msg.chatError.errorType is ChatErrorType.NoRcvFileUser) {
+          msg is API.Error -> {
+            if (msg.err is ChatError.ChatErrorChat && msg.err.errorType is ChatErrorType.NoRcvFileUser) {
               AlertManager.shared.showAlertMsg(
                 generalGetString(MR.strings.migrate_to_device_download_failed),
                 generalGetString(MR.strings.migrate_to_device_file_delete_or_link_invalid)
               )
               state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg, networkProxy)
             } else {
-              Log.d(TAG, "unsupported error: ${msg.responseType}, ${json.encodeToString(msg.chatError)}")
+              Log.d(TAG, "unsupported error: ${msg.responseType}, ${json.encodeToString(msg.err)}")
             }
           }
           else -> Log.d(TAG, "unsupported event: ${msg.responseType}")
@@ -739,7 +740,7 @@ private class MigrationToChatReceiver(
   val ctrl: ChatCtrl,
   val databaseUrl: File,
   var receiveMessages: Boolean = true,
-  val processReceivedMsg: suspend (CR) -> Unit
+  val processReceivedMsg: suspend (API) -> Unit
 ) {
   fun start() {
     Log.d(TAG, "MigrationChatReceiver startReceiver")
@@ -748,19 +749,18 @@ private class MigrationToChatReceiver(
         try {
           val msg = ChatController.recvMsg(ctrl)
           if (msg != null && receiveMessages) {
-            val r = msg.resp
-            val rhId = msg.remoteHostId
-            Log.d(TAG, "processReceivedMsg: ${r.responseType}")
-            chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
+            val rhId = msg.rhId
+            Log.d(TAG, "processReceivedMsg: ${msg.responseType}")
+            chatModel.addTerminalItem(TerminalItem.resp(rhId, msg))
             val finishedWithoutTimeout = withTimeoutOrNull(60_000L) {
-              processReceivedMsg(r)
+              processReceivedMsg(msg)
             }
             if (finishedWithoutTimeout == null) {
-              Log.e(TAG, "Timeout reached while processing received message: " + msg.resp.responseType)
+              Log.e(TAG, "Timeout reached while processing received message: " + msg.responseType)
               if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
                 AlertManager.shared.showAlertMsg(
                   title = generalGetString(MR.strings.possible_slow_function_title),
-                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.resp.responseType + "\n" + Exception().stackTraceToString()),
+                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.responseType + "\n" + Exception().stackTraceToString()),
                   shareText = true
                 )
               }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
index 2380c64a4c..2db40f770d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
@@ -18,7 +18,6 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.group.AddGroupMembersView
 import chat.simplex.common.views.chatlist.setGroupMembers
@@ -30,6 +29,7 @@ import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.net.URI
 
 @Composable
@@ -42,10 +42,9 @@ fun AddGroupView(chatModel: ChatModel, rh: RemoteHostInfo?, close: () -> Unit, c
       withBGApi {
         val groupInfo = chatModel.controller.apiNewGroup(rhId, incognito, groupProfile)
         if (groupInfo != null) {
-          withChats {
-            updateGroup(rhId = rhId, groupInfo)
-            chatItems.clearAndNotify()
-            chatItemStatuses.clear()
+          withContext(Dispatchers.Main) {
+            chatModel.chatsContext.updateGroup(rhId = rhId, groupInfo)
+            chatModel.chatsContext.chatItems.clearAndNotify()
             chatModel.chatId.value = groupInfo.id
           }
           setGroupMembers(rhId, groupInfo, chatModel)
@@ -57,7 +56,7 @@ fun AddGroupView(chatModel: ChatModel, rh: RemoteHostInfo?, close: () -> Unit, c
             }
           } else {
             ModalManager.end.showModalCloseable(true) { close ->
-              GroupLinkView(chatModel, rhId, groupInfo, connReqContact = null, memberRole = null, onGroupLinkUpdated = null, creatingGroup = true, close)
+              GroupLinkView(chatModel, rhId, groupInfo, connLinkContact = null, memberRole = null, onGroupLinkUpdated = null, creatingGroup = true, close)
             }
           }
         }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
index 1b5b475b35..330c80b7a2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
@@ -7,13 +7,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import dev.icerock.moko.resources.compose.stringResource
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
-import java.net.URI
 
 enum class ConnectionLinkType {
   INVITATION, CONTACT, GROUP
@@ -21,7 +19,7 @@ enum class ConnectionLinkType {
 
 suspend fun planAndConnect(
   rhId: Long?,
-  uri: String,
+  shortOrFullLink: String,
   incognito: Boolean?,
   close: (() -> Unit)?,
   cleanup: (() -> Unit)? = null,
@@ -29,18 +27,19 @@ suspend fun planAndConnect(
   filterKnownGroup: ((GroupInfo) -> Unit)? = null,
 ): CompletableDeferred<Boolean> {
   val completable = CompletableDeferred<Boolean>()
-  val close: (() -> Unit)? = {
+  val close: (() -> Unit) = {
     close?.invoke()
     // if close was called, it means the connection was created
     completable.complete(true)
   }
-  val cleanup: (() -> Unit)? = {
+  val cleanup: (() -> Unit) = {
     cleanup?.invoke()
     completable.complete(!completable.isActive)
   }
-  val connectionPlan = chatModel.controller.apiConnectPlan(rhId, uri)
-  if (connectionPlan != null) {
-    val link = strHasSingleSimplexLink(uri.trim())
+  val result = chatModel.controller.apiConnectPlan(rhId, shortOrFullLink)
+  if (result != null) {
+    val (connectionLink, connectionPlan) = result
+    val link = strHasSingleSimplexLink(shortOrFullLink.trim())
     val linkText = if (link?.format is Format.SimplexLink)
       "<br><br><u>${link.simplexLinkText(link.format.linkType, link.format.smpHosts)}</u>"
     else
@@ -50,10 +49,10 @@ suspend fun planAndConnect(
         InvitationLinkPlan.Ok -> {
           Log.d(TAG, "planAndConnect, .InvitationLink, .Ok, incognito=$incognito")
           if (incognito != null) {
-            connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup)
+            connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup)
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_via_invitation_link),
               text = generalGetString(MR.strings.profile_will_be_sent_to_contact_sending_link) + linkText,
               connectDestructive = false,
@@ -68,7 +67,7 @@ suspend fun planAndConnect(
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_one_time_link) + linkText,
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup) } },
+              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup) } },
               onDismiss = cleanup,
               onDismissRequest = cleanup,
               destructive = true,
@@ -76,7 +75,7 @@ suspend fun planAndConnect(
             )
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_one_time_link) + linkText,
               connectDestructive = true,
@@ -97,7 +96,7 @@ suspend fun planAndConnect(
                 String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName) + linkText,
                 hostDevice = hostDevice(rhId),
               )
-              cleanup?.invoke()
+              cleanup()
             }
           } else {
             AlertManager.privacySensitive.showAlertMsg(
@@ -105,7 +104,7 @@ suspend fun planAndConnect(
               generalGetString(MR.strings.connect_plan_you_are_already_connecting_via_this_one_time_link) + linkText,
               hostDevice = hostDevice(rhId),
             )
-            cleanup?.invoke()
+            cleanup()
           }
         }
         is InvitationLinkPlan.Known -> {
@@ -120,7 +119,7 @@ suspend fun planAndConnect(
               String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName) + linkText,
               hostDevice = hostDevice(rhId),
             )
-            cleanup?.invoke()
+            cleanup()
           }
         }
       }
@@ -128,10 +127,10 @@ suspend fun planAndConnect(
         ContactAddressPlan.Ok -> {
           Log.d(TAG, "planAndConnect, .ContactAddress, .Ok, incognito=$incognito")
           if (incognito != null) {
-            connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup)
+            connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup)
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_via_contact_link),
               text = generalGetString(MR.strings.profile_will_be_sent_to_contact_sending_link) + linkText,
               connectDestructive = false,
@@ -146,7 +145,7 @@ suspend fun planAndConnect(
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_simplex_address) + linkText,
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup) } },
+              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup) } },
               destructive = true,
               onDismiss = cleanup,
               onDismissRequest = cleanup,
@@ -154,7 +153,7 @@ suspend fun planAndConnect(
             )
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_simplex_address) + linkText,
               connectDestructive = true,
@@ -169,7 +168,7 @@ suspend fun planAndConnect(
               title = generalGetString(MR.strings.connect_plan_repeat_connection_request),
               text = generalGetString(MR.strings.connect_plan_you_have_already_requested_connection_via_this_address) + linkText,
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup) } },
+              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup) } },
               onDismiss = cleanup,
               onDismissRequest = cleanup,
               destructive = true,
@@ -177,7 +176,7 @@ suspend fun planAndConnect(
             )
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_plan_repeat_connection_request),
               text = generalGetString(MR.strings.connect_plan_you_have_already_requested_connection_via_this_address) + linkText,
               connectDestructive = true,
@@ -197,7 +196,7 @@ suspend fun planAndConnect(
               String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName) + linkText,
               hostDevice = hostDevice(rhId),
             )
-            cleanup?.invoke()
+            cleanup()
           }
         }
         is ContactAddressPlan.Known -> {
@@ -212,19 +211,19 @@ suspend fun planAndConnect(
               String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName) + linkText,
               hostDevice = hostDevice(rhId),
             )
-            cleanup?.invoke()
+            cleanup()
           }
         }
         is ContactAddressPlan.ContactViaAddress -> {
           Log.d(TAG, "planAndConnect, .ContactAddress, .ContactViaAddress, incognito=$incognito")
           val contact = connectionPlan.contactAddressPlan.contact
           if (incognito != null) {
-            close?.invoke()
+            close()
             connectContactViaAddress(chatModel, rhId, contact.contactId, incognito)
           } else {
             askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close, openChat = false)
           }
-          cleanup?.invoke()
+          cleanup()
         }
       }
       is ConnectionPlan.GroupLink -> when (connectionPlan.groupLinkPlan) {
@@ -235,14 +234,14 @@ suspend fun planAndConnect(
               title = generalGetString(MR.strings.connect_via_group_link),
               text = generalGetString(MR.strings.you_will_join_group) + linkText,
               confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
-              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup) } },
+              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup) } },
               onDismiss = cleanup,
               onDismissRequest = cleanup,
               hostDevice = hostDevice(rhId),
             )
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_via_group_link),
               text = generalGetString(MR.strings.you_will_join_group) + linkText,
               connectDestructive = false,
@@ -256,7 +255,7 @@ suspend fun planAndConnect(
           if (filterKnownGroup != null) {
             filterKnownGroup(groupInfo)
           } else {
-            ownGroupLinkConfirmConnect(chatModel, rhId, uri, linkText, incognito, connectionPlan, groupInfo, close, cleanup)
+            ownGroupLinkConfirmConnect(chatModel, rhId, connectionLink, linkText, incognito, connectionPlan, groupInfo, close, cleanup)
           }
         }
         GroupLinkPlan.ConnectingConfirmReconnect -> {
@@ -266,7 +265,7 @@ suspend fun planAndConnect(
               title = generalGetString(MR.strings.connect_plan_repeat_join_request),
               text = generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link) + linkText,
               confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
-              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup) } },
+              onConfirm = { withBGApi { connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup) } },
               onDismiss = cleanup,
               onDismissRequest = cleanup,
               destructive = true,
@@ -274,7 +273,7 @@ suspend fun planAndConnect(
             )
           } else {
             askCurrentOrIncognitoProfileAlert(
-              chatModel, rhId, uri, connectionPlan, close,
+              chatModel, rhId, connectionLink, connectionPlan, close,
               title = generalGetString(MR.strings.connect_plan_repeat_join_request),
               text = generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link) + linkText,
               connectDestructive = true,
@@ -304,7 +303,7 @@ suspend fun planAndConnect(
               hostDevice = hostDevice(rhId),
             )
           }
-          cleanup?.invoke()
+          cleanup()
         }
         is GroupLinkPlan.Known -> {
           Log.d(TAG, "planAndConnect, .GroupLink, .Known, incognito=$incognito")
@@ -326,22 +325,23 @@ suspend fun planAndConnect(
                 hostDevice = hostDevice(rhId),
               )
             }
-            cleanup?.invoke()
+            cleanup()
           }
         }
       }
-    }
-  } else {
-    Log.d(TAG, "planAndConnect, plan error")
-    if (incognito != null) {
-      connectViaUri(chatModel, rhId, uri, incognito, connectionPlan = null, close, cleanup)
-    } else {
-      askCurrentOrIncognitoProfileAlert(
-        chatModel, rhId, uri, connectionPlan = null, close,
-        title = generalGetString(MR.strings.connect_plan_connect_via_link),
-        connectDestructive = false,
-        cleanup = cleanup,
-      )
+      is ConnectionPlan.Error -> {
+        Log.d(TAG, "planAndConnect, error ${connectionPlan.chatError}")
+        if (incognito != null) {
+          connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan = null, close, cleanup)
+        } else {
+          askCurrentOrIncognitoProfileAlert(
+            chatModel, rhId, connectionLink, connectionPlan = null, close,
+            title = generalGetString(MR.strings.connect_plan_connect_via_link),
+            connectDestructive = false,
+            cleanup = cleanup,
+          )
+        }
+      }
     }
   }
   return completable
@@ -350,17 +350,17 @@ suspend fun planAndConnect(
 suspend fun connectViaUri(
   chatModel: ChatModel,
   rhId: Long?,
-  uri: String,
+  connLink: CreatedConnLink,
   incognito: Boolean,
   connectionPlan: ConnectionPlan?,
   close: (() -> Unit)?,
   cleanup: (() -> Unit)?,
 ): Boolean {
-  val pcc = chatModel.controller.apiConnect(rhId, incognito, uri)
-  val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
+  val pcc = chatModel.controller.apiConnect(rhId, incognito, connLink)
+  val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) ?: ConnectionLinkType.INVITATION else ConnectionLinkType.INVITATION
   if (pcc != null) {
-    withChats {
-      updateContactConnection(rhId, pcc)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateContactConnection(rhId, pcc)
     }
     close?.invoke()
     AlertManager.privacySensitive.showAlertMsg(
@@ -378,18 +378,19 @@ suspend fun connectViaUri(
   return pcc != null
 }
 
-fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {
+fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType? {
   return when(connectionPlan) {
     is ConnectionPlan.InvitationLink -> ConnectionLinkType.INVITATION
     is ConnectionPlan.ContactAddress -> ConnectionLinkType.CONTACT
     is ConnectionPlan.GroupLink -> ConnectionLinkType.GROUP
+    is ConnectionPlan.Error -> null
   }
 }
 
 fun askCurrentOrIncognitoProfileAlert(
   chatModel: ChatModel,
   rhId: Long?,
-  uri: String,
+  connectionLink: CreatedConnLink,
   connectionPlan: ConnectionPlan?,
   close: (() -> Unit)?,
   title: String,
@@ -406,7 +407,7 @@ fun askCurrentOrIncognitoProfileAlert(
         SectionItemView({
           AlertManager.privacySensitive.hideAlert()
           withBGApi {
-            connectViaUri(chatModel, rhId, uri, incognito = false, connectionPlan, close, cleanup)
+            connectViaUri(chatModel, rhId, connectionLink, incognito = false, connectionPlan, close, cleanup)
           }
         }) {
           Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
@@ -414,7 +415,7 @@ fun askCurrentOrIncognitoProfileAlert(
         SectionItemView({
           AlertManager.privacySensitive.hideAlert()
           withBGApi {
-            connectViaUri(chatModel, rhId, uri, incognito = true, connectionPlan, close, cleanup)
+            connectViaUri(chatModel, rhId, connectionLink, incognito = true, connectionPlan, close, cleanup)
           }
         }) {
           Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
@@ -445,7 +446,7 @@ fun openKnownContact(chatModel: ChatModel, rhId: Long?, close: (() -> Unit)?, co
 fun ownGroupLinkConfirmConnect(
   chatModel: ChatModel,
   rhId: Long?,
-  uri: String,
+  connectionLink: CreatedConnLink,
   linkText: String,
   incognito: Boolean?,
   connectionPlan: ConnectionPlan?,
@@ -471,7 +472,7 @@ fun ownGroupLinkConfirmConnect(
           SectionItemView({
             AlertManager.privacySensitive.hideAlert()
             withBGApi {
-              connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close, cleanup)
+              connectViaUri(chatModel, rhId, connectionLink, incognito, connectionPlan, close, cleanup)
             }
           }) {
             Text(
@@ -484,7 +485,7 @@ fun ownGroupLinkConfirmConnect(
           SectionItemView({
             AlertManager.privacySensitive.hideAlert()
             withBGApi {
-              connectViaUri(chatModel, rhId, uri, incognito = false, connectionPlan, close, cleanup)
+              connectViaUri(chatModel, rhId, connectionLink, incognito = false, connectionPlan, close, cleanup)
             }
           }) {
             Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
@@ -493,7 +494,7 @@ fun ownGroupLinkConfirmConnect(
           SectionItemView({
             AlertManager.privacySensitive.hideAlert()
             withBGApi {
-              connectViaUri(chatModel, rhId, uri, incognito = true, connectionPlan, close, cleanup)
+              connectViaUri(chatModel, rhId, connectionLink, incognito = true, connectionPlan, close, cleanup)
             }
           }) {
             Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ContactConnectionInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ContactConnectionInfoView.kt
index 1623f8510d..0f299b5187 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ContactConnectionInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ContactConnectionInfoView.kt
@@ -4,8 +4,8 @@ import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionTextFooter
 import SectionView
+import SectionViewWithButton
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -22,24 +22,24 @@ import chat.simplex.common.views.chat.LocalAliasEditor
 import chat.simplex.common.views.chatlist.deleteContactConnectionAlert
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.model.PendingContactConnection
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 
 @Composable
 fun ContactConnectionInfoView(
   chatModel: ChatModel,
   rhId: Long?,
-  connReqInvitation: String?,
+  connLinkInvitation: CreatedConnLink?,
   contactConnection: PendingContactConnection,
   focusAlias: Boolean,
   close: () -> Unit
 ) {
-  LaunchedEffect(connReqInvitation) {
-    if (connReqInvitation != null) {
-      chatModel.showingInvitation.value = ShowingInvitation(contactConnection.id, connReqInvitation, false, conn = contactConnection)
+  LaunchedEffect(connLinkInvitation) {
+    if (connLinkInvitation != null) {
+      chatModel.showingInvitation.value = ShowingInvitation(contactConnection.id, connLinkInvitation, false, conn = contactConnection)
     }
   }
   /** When [AddContactLearnMore] is open, we don't need to drop [ChatModel.showingInvitation].
@@ -54,16 +54,16 @@ fun ContactConnectionInfoView(
       }
     }
   }
-  val clipboard = LocalClipboardManager.current
+  val showShortLink = remember { mutableStateOf(true) }
   ContactConnectionInfoLayout(
     chatModel = chatModel,
-    connReq = connReqInvitation,
+    connLink = connLinkInvitation,
+    showShortLink = showShortLink,
     contactConnection = contactConnection,
     focusAlias = focusAlias,
     rhId = rhId,
     deleteConnection = { deleteContactConnectionAlert(rhId, contactConnection, chatModel, close) },
     onLocalAliasChanged = { setContactAlias(rhId, contactConnection, it, chatModel) },
-    share = { if (connReqInvitation != null) clipboard.shareText(connReqInvitation) },
     learnMore = {
       ModalManager.end.showModalCloseable { close ->
         AddContactLearnMore(close)
@@ -75,13 +75,13 @@ fun ContactConnectionInfoView(
 @Composable
 private fun ContactConnectionInfoLayout(
   chatModel: ChatModel,
-  connReq: String?,
+  connLink: CreatedConnLink?,
+  showShortLink: MutableState<Boolean>,
   contactConnection: PendingContactConnection,
   focusAlias: Boolean,
   rhId: Long?,
   deleteConnection: () -> Unit,
   onLocalAliasChanged: (String) -> Unit,
-  share: () -> Unit,
   learnMore: () -> Unit,
 ) {
   @Composable fun incognitoEnabled() {
@@ -127,13 +127,19 @@ private fun ContactConnectionInfoLayout(
       LocalAliasEditor(contactConnection.id, contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
     }
 
-    SectionView {
-      if (!connReq.isNullOrEmpty() && contactConnection.initiated) {
-        SimpleXLinkQRCode(connReq)
+    if (connLink != null && connLink.connFullLink.isNotEmpty() && contactConnection.initiated) {
+      Spacer(Modifier.height(DEFAULT_PADDING))
+      SectionViewWithButton(
+        stringResource(MR.strings.one_time_link).uppercase(),
+        titleButton = if (connLink.connShortLink == null) null else {{ ToggleShortLinkButton(showShortLink) }}
+      ) {
+        SimpleXCreatedLinkQRCode(connLink, short = showShortLink.value)
         incognitoEnabled()
-        ShareLinkButton(connReq)
+        ShareLinkButton(connLink.simplexChatUri(short = showShortLink.value))
         OneTimeLinkLearnMoreButton(learnMore)
-      } else {
+      }
+    } else {
+      SectionView {
         incognitoEnabled()
         OneTimeLinkLearnMoreButton(learnMore)
       }
@@ -149,14 +155,14 @@ private fun ContactConnectionInfoLayout(
 }
 
 @Composable
-fun ShareLinkButton(connReqInvitation: String) {
+fun ShareLinkButton(linkUri: String) {
   val clipboard = LocalClipboardManager.current
   SettingsActionItem(
     painterResource(MR.images.ic_share),
     stringResource(MR.strings.share_invitation_link),
     click = {
       chatModel.showingInvitation.value = chatModel.showingInvitation.value?.copy(connChatUsed = true)
-      clipboard.shareText(simplexChatLink(connReqInvitation))
+      clipboard.shareText(simplexChatLink(linkUri))
     },
     iconColor = MaterialTheme.colors.primary,
     textColor = MaterialTheme.colors.primary,
@@ -185,8 +191,8 @@ fun DeleteButton(onClick: () -> Unit) {
 
 private fun setContactAlias(rhId: Long?, contactConnection: PendingContactConnection, localAlias: String, chatModel: ChatModel) = withBGApi {
   chatModel.controller.apiSetConnectionAlias(rhId, contactConnection.pccConnId, localAlias)?.let {
-    withChats {
-      updateContactConnection(rhId, it)
+    withContext(Dispatchers.Main) {
+      chatModel.chatsContext.updateContactConnection(rhId, it)
     }
   }
 }
@@ -201,13 +207,13 @@ private fun PreviewContactConnectionInfoView() {
   SimpleXTheme {
     ContactConnectionInfoLayout(
       chatModel = ChatModel,
-      connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
+      connLink = CreatedConnLink("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", null),
+      showShortLink = remember { mutableStateOf(true) },
       contactConnection = PendingContactConnection.getSampleData(),
       focusAlias = false,
       rhId = null,
       deleteConnection = {},
       onLocalAliasChanged = {},
-      share = {},
       learnMore = {}
     )
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatView.kt
index 923c0256a8..1b3138d21c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatView.kt
@@ -4,6 +4,7 @@ import SectionBottomSpacer
 import SectionItemView
 import SectionTextFooter
 import SectionView
+import SectionViewWithButton
 import TextIconSpaced
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -31,7 +32,6 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.topPaddingToContent
@@ -39,7 +39,6 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
-import java.net.URI
 
 enum class NewChatOption {
   INVITE, CONNECT
@@ -50,17 +49,17 @@ fun ModalData.NewChatView(rh: RemoteHostInfo?, selection: NewChatOption, showQRC
   val selection = remember { stateGetOrPut("selection") { selection } }
   val showQRCodeScanner = remember { stateGetOrPut("showQRCodeScanner") { showQRCodeScanner } }
   val contactConnection: MutableState<PendingContactConnection?> = rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(chatModel.showingInvitation.value?.conn) }
-  val connReqInvitation by remember { derivedStateOf { chatModel.showingInvitation.value?.connReq ?: "" } }
+  val connLinkInvitation by remember { derivedStateOf { chatModel.showingInvitation.value?.connLink ?: CreatedConnLink("", null) } }
   val creatingConnReq = rememberSaveable { mutableStateOf(false) }
   val pastedLink = rememberSaveable { mutableStateOf("") }
   LaunchedEffect(selection.value) {
     if (
       selection.value == NewChatOption.INVITE
-      && connReqInvitation.isEmpty()
+      && connLinkInvitation.connFullLink.isEmpty()
       && contactConnection.value == null
       && !creatingConnReq.value
     ) {
-      createInvitation(rh?.remoteHostId, creatingConnReq, connReqInvitation, contactConnection)
+      createInvitation(rh?.remoteHostId, creatingConnReq, connLinkInvitation, contactConnection)
     }
   }
   DisposableEffect(Unit) {
@@ -145,12 +144,12 @@ fun ModalData.NewChatView(rh: RemoteHostInfo?, selection: NewChatOption, showQRC
           Modifier
             .fillMaxWidth()
             .heightIn(min = this@BoxWithConstraints.maxHeight - 150.dp),
-          verticalArrangement = if (index == NewChatOption.INVITE.ordinal && connReqInvitation.isEmpty()) Arrangement.Center else Arrangement.Top
+          verticalArrangement = if (index == NewChatOption.INVITE.ordinal && connLinkInvitation.connFullLink.isEmpty()) Arrangement.Center else Arrangement.Top
         ) {
           Spacer(Modifier.height(DEFAULT_PADDING))
           when (index) {
             NewChatOption.INVITE.ordinal -> {
-              PrepareAndInviteView(rh?.remoteHostId, contactConnection, connReqInvitation, creatingConnReq)
+              PrepareAndInviteView(rh?.remoteHostId, contactConnection, connLinkInvitation, creatingConnReq)
             }
             NewChatOption.CONNECT.ordinal -> {
               ConnectView(rh?.remoteHostId, showQRCodeScanner, pastedLink, close)
@@ -164,17 +163,17 @@ fun ModalData.NewChatView(rh: RemoteHostInfo?, selection: NewChatOption, showQRC
 }
 
 @Composable
-private fun PrepareAndInviteView(rhId: Long?, contactConnection: MutableState<PendingContactConnection?>, connReqInvitation: String, creatingConnReq: MutableState<Boolean>) {
-  if (connReqInvitation.isNotEmpty()) {
+private fun PrepareAndInviteView(rhId: Long?, contactConnection: MutableState<PendingContactConnection?>, connLinkInvitation: CreatedConnLink, creatingConnReq: MutableState<Boolean>) {
+  if (connLinkInvitation.connFullLink.isNotEmpty()) {
     InviteView(
       rhId,
-      connReqInvitation = connReqInvitation,
+      connLinkInvitation = connLinkInvitation,
       contactConnection = contactConnection,
     )
   } else if (creatingConnReq.value) {
     CreatingLinkProgressView()
   } else {
-    RetryButton { createInvitation(rhId, creatingConnReq, connReqInvitation, contactConnection) }
+    RetryButton { createInvitation(rhId, creatingConnReq, connLinkInvitation, contactConnection) }
   }
 }
 
@@ -187,7 +186,7 @@ private fun updateShownConnection(conn: PendingContactConnection) {
   chatModel.showingInvitation.value = chatModel.showingInvitation.value?.copy(
     conn = conn,
     connId = conn.id,
-    connReq = conn.connReqInv ?: "",
+    connLink = conn.connLinkInv ?: CreatedConnLink("", null),
     connChatUsed = true
   )
 }
@@ -315,8 +314,8 @@ fun ActiveProfilePicker(
             if (contactConnection != null) {
               updatedConn = controller.apiChangeConnectionUser(rhId, contactConnection.pccConnId, user.userId)
               if (updatedConn != null) {
-                withChats {
-                  updateContactConnection(rhId, updatedConn)
+                withContext(Dispatchers.Main) {
+                  chatModel.chatsContext.updateContactConnection(rhId, updatedConn)
                   updateShownConnection(updatedConn)
                 }
               }
@@ -338,8 +337,8 @@ fun ActiveProfilePicker(
             }
 
             if (updatedConn != null) {
-              withChats {
-                updateContactConnection(user.remoteHostId, updatedConn)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateContactConnection(user.remoteHostId, updatedConn)
               }
             }
 
@@ -368,8 +367,8 @@ fun ActiveProfilePicker(
             appPreferences.incognito.set(true)
             val conn = controller.apiSetConnectionIncognito(rhId, contactConnection.pccConnId, true)
             if (conn != null) {
-              withChats {
-                updateContactConnection(rhId, conn)
+              withContext(Dispatchers.Main) {
+                chatModel.chatsContext.updateContactConnection(rhId, conn)
                 updateShownConnection(conn)
               }
               close()
@@ -451,15 +450,21 @@ fun ActiveProfilePicker(
 }
 
 @Composable
-private fun InviteView(rhId: Long?, connReqInvitation: String, contactConnection: MutableState<PendingContactConnection?>) {
-  SectionView(stringResource(MR.strings.share_this_1_time_link).uppercase(), headerBottomPadding = 5.dp) {
-    LinkTextView(connReqInvitation, true)
-  }
-
+private fun InviteView(rhId: Long?, connLinkInvitation: CreatedConnLink, contactConnection: MutableState<PendingContactConnection?>) {
+  val showShortLink = remember { mutableStateOf(true) }
   Spacer(Modifier.height(10.dp))
 
-  SectionView(stringResource(MR.strings.or_show_this_qr_code).uppercase(), headerBottomPadding = 5.dp) {
-    SimpleXLinkQRCode(connReqInvitation, onShare = { chatModel.markShowingInvitationUsed() })
+  SectionView(stringResource(MR.strings.share_this_1_time_link).uppercase(), headerBottomPadding = 5.dp) {
+    LinkTextView(connLinkInvitation.simplexChatUri(short = showShortLink.value), true)
+  }
+
+  Spacer(Modifier.height(DEFAULT_PADDING))
+
+  SectionViewWithButton(
+    stringResource(MR.strings.or_show_this_qr_code).uppercase(),
+    titleButton = if (connLinkInvitation.connShortLink != null) {{ ToggleShortLinkButton(showShortLink) }} else null
+  ) {
+    SimpleXCreatedLinkQRCode(connLinkInvitation, short = showShortLink.value, onShare = { chatModel.markShowingInvitationUsed() })
   }
 
   Spacer(Modifier.height(DEFAULT_PADDING))
@@ -530,6 +535,18 @@ private fun InviteView(rhId: Long?, connReqInvitation: String, contactConnection
   }
 }
 
+@Composable
+fun ToggleShortLinkButton(short: MutableState<Boolean>) {
+  Text(
+    stringResource(if (short.value) MR.strings.full_link_button_text else MR.strings.short_link_button_text),
+    modifier = Modifier.clickable(
+      interactionSource = remember { MutableInteractionSource() },
+      indication = null
+    ) { short.value = !short.value },
+    style = MaterialTheme.typography.body2, fontSize = 14.sp, color = MaterialTheme.colors.primary
+  )
+}
+
 @Composable
 fun AddContactLearnMoreButton() {
   IconButton(
@@ -677,17 +694,17 @@ private suspend fun connect(rhId: Long?, link: String, close: () -> Unit, cleanu
 private fun createInvitation(
   rhId: Long?,
   creatingConnReq: MutableState<Boolean>,
-  connReqInvitation: String,
+  connLinkInvitation: CreatedConnLink,
   contactConnection: MutableState<PendingContactConnection?>
 ) {
-  if (connReqInvitation.isNotEmpty() || contactConnection.value != null || creatingConnReq.value) return
+  if (connLinkInvitation.connFullLink.isNotEmpty() || contactConnection.value != null || creatingConnReq.value) return
   creatingConnReq.value = true
   withBGApi {
     val (r, alert) = controller.apiAddContact(rhId, incognito = controller.appPrefs.incognito.get())
     if (r != null) {
-      withChats {
-        updateContactConnection(rhId, r.second)
-        chatModel.showingInvitation.value = ShowingInvitation(connId = r.second.id, connReq = simplexChatLink(r.first), connChatUsed = false, conn = r.second)
+      withContext(Dispatchers.Main) {
+        chatModel.chatsContext.updateContactConnection(rhId, r.second)
+        chatModel.showingInvitation.value = ShowingInvitation(connId = r.second.id, connLink = r.first, connChatUsed = false, conn = r.second)
         contactConnection.value = r.second
       }
     } else {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt
index e38c983487..74c9a55ecf 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt
@@ -12,13 +12,34 @@ import androidx.compose.ui.unit.dp
 import dev.icerock.moko.resources.compose.stringResource
 import boofcv.alg.drawing.FiducialImageEngine
 import boofcv.alg.fiducial.qrcode.*
-import chat.simplex.common.model.CryptoFile
+import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.launch
 
+@Composable
+fun SimpleXCreatedLinkQRCode(
+  connLink: CreatedConnLink,
+  short: Boolean,
+  modifier: Modifier = Modifier,
+  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING * 2f, vertical = DEFAULT_PADDING_HALF),
+  tintColor: Color = Color(0xff062d56),
+  withLogo: Boolean = true,
+  onShare: (() -> Unit)? = null,
+) {
+  QRCode(
+    connLink.simplexChatUri(short),
+    small = short && connLink.connShortLink != null,
+    modifier,
+    padding,
+    tintColor,
+    withLogo,
+    onShare,
+  )
+}
+
 @Composable
 fun SimpleXLinkQRCode(
   connReq: String,
@@ -30,6 +51,7 @@ fun SimpleXLinkQRCode(
 ) {
   QRCode(
     simplexChatLink(connReq),
+    small = connReq.count() < 200,
     modifier,
     padding,
     tintColor,
@@ -38,17 +60,10 @@ fun SimpleXLinkQRCode(
   )
 }
 
-fun simplexChatLink(uri: String): String {
-  return if (uri.startsWith("simplex:/")) {
-    uri.replace("simplex:/", "https://simplex.chat/")
-  } else {
-    uri
-  }
-}
-
 @Composable
 fun QRCode(
   connReq: String,
+  small: Boolean = false,
   modifier: Modifier = Modifier,
   padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING * 2f, vertical = DEFAULT_PADDING_HALF),
   tintColor: Color = Color(0xff062d56),
@@ -56,9 +71,11 @@ fun QRCode(
   onShare: (() -> Unit)? = null,
 ) {
   val scope = rememberCoroutineScope()
+  val logoSize = if (small) 0.21f else 0.16f
+  val errorLevel = if (small) QrCode.ErrorLevel.M else QrCode.ErrorLevel.L
   val qr = remember(connReq, tintColor, withLogo) {
-    qrCodeBitmap(connReq, 1024).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
-      .let { if (withLogo) it.addLogo() else it }
+    qrCodeBitmap(connReq, 1024, errorLevel).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
+      .let { if (withLogo) it.addLogo(logoSize) else it }
   }
   Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
     Image(
@@ -67,12 +84,13 @@ fun QRCode(
       Modifier
         .padding(padding)
         .widthIn(max = 400.dp)
+        .fillMaxWidth(if (small) 0.63f else 1f)
         .aspectRatio(1f)
         .then(modifier)
         .clickable {
           scope.launch {
-            val image = qrCodeBitmap(connReq, 1024).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
-              .let { if (withLogo) it.addLogo() else it }
+            val image = qrCodeBitmap(connReq, 1024, errorLevel).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
+              .let { if (withLogo) it.addLogo(logoSize) else it }
             val file = saveTempImageUncompressed(image, true)
             if (file != null) {
               shareFile("", CryptoFile.plain(file.absolutePath))
@@ -84,8 +102,8 @@ fun QRCode(
   }
 }
 
-fun qrCodeBitmap(content: String, size: Int = 1024): ImageBitmap {
-  val qrCode = QrCodeEncoder().addAutomatic(content).setError(QrCode.ErrorLevel.L).fixate()
+fun qrCodeBitmap(content: String, size: Int = 1024, errorLevel: QrCode.ErrorLevel): ImageBitmap {
+  val qrCode = QrCodeEncoder().addAutomatic(content).setError(errorLevel).fixate()
   /** See [QrCodeGeneratorImage.initialize] and [FiducialImageEngine.configure] for size calculation */
   val numModules = QrCode.totalModules(qrCode.version)
   // Hide border on light themes to make it fit to the same place as camera in QRCodeScanner.
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/ChooseServerOperators.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/ChooseServerOperators.kt
index 2f84166362..a14f163a91 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/ChooseServerOperators.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/ChooseServerOperators.kt
@@ -7,15 +7,18 @@ import SectionTextFooter
 import SectionView
 import TextIconSpaced
 import androidx.compose.foundation.*
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
@@ -27,11 +30,7 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
-fun ModalData.ChooseServerOperators(
-  onboarding: Boolean,
-  close: (() -> Unit) = { ModalManager.fullscreen.closeModals() },
-  modalManager: ModalManager = ModalManager.fullscreen
-) {
+fun ModalData.OnboardingConditionsView() {
   LaunchedEffect(Unit) {
     prepareChatBeforeFinishingOnboarding()
   }
@@ -41,6 +40,73 @@ fun ModalData.ChooseServerOperators(
       val selectedOperatorIds = remember { stateGetOrPut("selectedOperatorIds") { serverOperators.value.filter { it.enabled }.map { it.operatorId }.toSet() } }
       val selectedOperators = remember { derivedStateOf { serverOperators.value.filter { selectedOperatorIds.value.contains(it.operatorId) } } }
 
+      ColumnWithScrollBar(
+        Modifier
+          .themedBackground(bgLayerSize = LocalAppBarHandler.current?.backgroundGraphicsLayerSize, bgLayer = LocalAppBarHandler.current?.backgroundGraphicsLayer),
+        maxIntrinsicSize = true
+      ) {
+        Box(Modifier.align(Alignment.CenterHorizontally)) {
+          AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), bottomPadding = DEFAULT_PADDING)
+        }
+
+        Spacer(Modifier.weight(1f))
+        Column(
+          (if (appPlatform.isDesktop) Modifier.width(450.dp).align(Alignment.CenterHorizontally) else Modifier)
+          .fillMaxWidth()
+          .padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING),
+          horizontalAlignment = Alignment.Start
+        ) {
+          Text(
+            stringResource(MR.strings.onboarding_conditions_private_chats_not_accessible),
+            style = TextStyle(fontSize = 17.sp, lineHeight = 23.sp)
+          )
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Text(
+            stringResource(MR.strings.onboarding_conditions_by_using_you_agree),
+            style = TextStyle(fontSize = 17.sp, lineHeight = 23.sp)
+          )
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Text(
+            stringResource(MR.strings.onboarding_conditions_privacy_policy_and_conditions_of_use),
+            style = TextStyle(fontSize = 17.sp),
+            color = MaterialTheme.colors.primary,
+            modifier = Modifier
+              .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null
+              ) {
+                ModalManager.fullscreen.showModal(endButtons = { ConditionsLinkButton() }) {
+                  SimpleConditionsView(rhId = null)
+                }
+              }
+          )
+        }
+        Spacer(Modifier.weight(1f))
+
+        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+          AcceptConditionsButton(enabled = selectedOperatorIds.value.isNotEmpty(), selectedOperators, selectedOperatorIds)
+          TextButtonBelowOnboardingButton(stringResource(MR.strings.onboarding_conditions_configure_server_operators)) {
+            ModalManager.fullscreen.showModalCloseable { close ->
+              ChooseServerOperators(serverOperators, selectedOperatorIds, close)
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun ModalData.ChooseServerOperators(
+  serverOperators: State<List<ServerOperator>>,
+  selectedOperatorIds: MutableState<Set<Long>>,
+  close: (() -> Unit)
+) {
+  LaunchedEffect(Unit) {
+    prepareChatBeforeFinishingOnboarding()
+  }
+  CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) {
+    ModalView({}, showClose = false) {
       ColumnWithScrollBar(
         Modifier
           .themedBackground(bgLayerSize = LocalAppBarHandler.current?.backgroundGraphicsLayerSize, bgLayer = LocalAppBarHandler.current?.backgroundGraphicsLayer),
@@ -53,7 +119,7 @@ fun ModalData.ChooseServerOperators(
         Column(Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING), horizontalAlignment = Alignment.CenterHorizontally) {
           OnboardingInformationButton(
             stringResource(MR.strings.how_it_helps_privacy),
-            onClick = { modalManager.showModal { ChooseServerOperatorsInfoView(modalManager) } }
+            onClick = { ModalManager.fullscreen.showModal { ChooseServerOperatorsInfoView() } }
           )
         }
 
@@ -77,42 +143,11 @@ fun ModalData.ChooseServerOperators(
         }
         Spacer(Modifier.weight(1f))
 
-        val reviewForOperators = selectedOperators.value.filter { !it.conditionsAcceptance.conditionsAccepted }
-        val canReviewLater = reviewForOperators.all { it.conditionsAcceptance.usageAllowed }
-        val currEnabledOperatorIds = serverOperators.value.filter { it.enabled }.map { it.operatorId }.toSet()
-
         Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
           val enabled = selectedOperatorIds.value.isNotEmpty()
-          when {
-            reviewForOperators.isNotEmpty() -> ReviewConditionsButton(enabled, onboarding, selectedOperators, selectedOperatorIds, modalManager)
-            selectedOperatorIds.value != currEnabledOperatorIds && enabled -> SetOperatorsButton(true, onboarding, serverOperators, selectedOperatorIds, close)
-            else -> ContinueButton(enabled, onboarding, close)
-          }
-          if (onboarding && reviewForOperators.isEmpty()) {
-              TextButtonBelowOnboardingButton(stringResource(MR.strings.operator_conditions_of_use)) {
-                modalManager.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close ->
-                  UsageConditionsView(
-                    currUserServers = remember { mutableStateOf(emptyList()) },
-                    userServers = remember { mutableStateOf(emptyList()) },
-                    close = close,
-                    rhId = null,
-                  )
-                }
-              }
-          } else if (onboarding || reviewForOperators.isEmpty()) {
-            // Reserve space
-            TextButtonBelowOnboardingButton("", null)
-          }
-          if (!onboarding && reviewForOperators.isNotEmpty()) {
-            ReviewLaterButton(canReviewLater, close)
-            SectionTextFooter(
-              annotatedStringResource(MR.strings.onboarding_network_operators_conditions_will_be_accepted) +
-                  AnnotatedString(" ") +
-                  annotatedStringResource(MR.strings.onboarding_network_operators_conditions_you_can_configure),
-              textAlign = TextAlign.Center
-            )
-            SectionBottomSpacer()
-          }
+          SetOperatorsButton(enabled, close)
+          // Reserve space
+          TextButtonBelowOnboardingButton("", null)
         }
       }
     }
@@ -167,115 +202,36 @@ private fun CircleCheckbox(checked: Boolean) {
 }
 
 @Composable
-private fun ReviewConditionsButton(
-  enabled: Boolean,
-  onboarding: Boolean,
-  selectedOperators: State<List<ServerOperator>>,
-  selectedOperatorIds: State<Set<Long>>,
-  modalManager: ModalManager
-) {
+private fun SetOperatorsButton(enabled: Boolean, close: () -> Unit) {
   OnboardingActionButton(
     modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-    labelId = MR.strings.operator_review_conditions,
+    labelId = MR.strings.ok,
     onboarding = null,
     enabled = enabled,
     onclick = {
-      modalManager.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close ->
-        ReviewConditionsView(onboarding, selectedOperators, selectedOperatorIds, close)
-      }
+      close()
     }
   )
 }
 
-@Composable
-private fun SetOperatorsButton(enabled: Boolean, onboarding: Boolean, serverOperators: State<List<ServerOperator>>, selectedOperatorIds: State<Set<Long>>, close: () -> Unit) {
-  OnboardingActionButton(
-    modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-    labelId = MR.strings.onboarding_network_operators_update,
-    onboarding = null,
-    enabled = enabled,
-    onclick = {
-      withBGApi {
-        val enabledOperators = enabledOperators(serverOperators.value, selectedOperatorIds.value)
-        if (enabledOperators != null) {
-          val r = chatController.setServerOperators(rh = chatModel.remoteHostId(), operators = enabledOperators)
-          if (r != null) {
-            chatModel.conditions.value = r
-          }
-          continueToNextStep(onboarding, close)
-        }
-      }
-    }
-  )
-}
-
-@Composable
-private fun ContinueButton(enabled: Boolean, onboarding: Boolean, close: () -> Unit) {
-  OnboardingActionButton(
-    modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-    labelId = MR.strings.onboarding_network_operators_continue,
-    onboarding = null,
-    enabled = enabled,
-    onclick = {
-      continueToNextStep(onboarding, close)
-    }
-  )
-}
-
-@Composable
-private fun ReviewLaterButton(enabled: Boolean, close: () -> Unit) {
-  TextButtonBelowOnboardingButton(
-    stringResource(MR.strings.onboarding_network_operators_review_later),
-    onClick = if (!enabled) null else {{ continueToNextStep(false, close) }}
-  )
-}
-
-@Composable
-private fun ReviewConditionsView(
-  onboarding: Boolean,
-  selectedOperators: State<List<ServerOperator>>,
-  selectedOperatorIds: State<Set<Long>>,
-  close: () -> Unit
-) {
-  // remembering both since we don't want to reload the view after the user accepts conditions
-  val operatorsWithConditionsAccepted = remember { chatModel.conditions.value.serverOperators.filter { it.conditionsAcceptance.conditionsAccepted } }
-  val acceptForOperators = remember { selectedOperators.value.filter { !it.conditionsAcceptance.conditionsAccepted } }
-  ColumnWithScrollBar(modifier = Modifier.fillMaxSize().padding(horizontal = if (onboarding) DEFAULT_ONBOARDING_HORIZONTAL_PADDING else DEFAULT_PADDING)) {
-    AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), withPadding = false, enableAlphaChanges = false, bottomPadding = DEFAULT_PADDING)
-    if (operatorsWithConditionsAccepted.isNotEmpty()) {
-      ReadableText(MR.strings.operator_conditions_accepted_for_some, args = operatorsWithConditionsAccepted.joinToString(", ") { it.legalName_ })
-      ReadableText(MR.strings.operator_same_conditions_will_apply_to_operators, args = acceptForOperators.joinToString(", ") { it.legalName_ })
-    } else {
-      ReadableText(MR.strings.operator_conditions_will_be_accepted_for_some, args = acceptForOperators.joinToString(", ") { it.legalName_ })
-    }
-    Column(modifier = Modifier.weight(1f).padding(top = DEFAULT_PADDING_HALF)) {
-      ConditionsTextView(chatModel.remoteHostId())
-    }
-    Column(Modifier.padding(vertical = DEFAULT_PADDING).widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-      AcceptConditionsButton(onboarding, selectedOperators, selectedOperatorIds, close)
-    }
-  }
-}
-
 @Composable
 private fun AcceptConditionsButton(
-  onboarding: Boolean,
+  enabled: Boolean,
   selectedOperators: State<List<ServerOperator>>,
-  selectedOperatorIds: State<Set<Long>>,
-  close: () -> Unit
+  selectedOperatorIds: State<Set<Long>>
 ) {
   fun continueOnAccept() {
-    if (appPlatform.isDesktop || !onboarding) {
-      if (onboarding) { close() }
-      continueToNextStep(onboarding, close)
+    if (appPlatform.isDesktop) {
+      continueToNextStep()
     } else {
       continueToSetNotificationsAfterAccept()
     }
   }
   OnboardingActionButton(
-    modifier = if (appPlatform.isAndroid) Modifier.fillMaxWidth() else Modifier,
-    labelId = MR.strings.accept_conditions,
+    modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+    labelId = MR.strings.onboarding_conditions_accept,
     onboarding = null,
+    enabled = enabled,
     onclick = {
       withBGApi {
         val conditionsId = chatModel.conditions.value.currentConditions.conditionsId
@@ -300,12 +256,8 @@ private fun AcceptConditionsButton(
   )
 }
 
-private fun continueToNextStep(onboarding: Boolean, close: () -> Unit) {
-  if (onboarding) {
+private fun continueToNextStep() {
     appPrefs.onboardingStage.set(if (appPlatform.isAndroid) OnboardingStage.Step4_SetNotificationsMode else OnboardingStage.OnboardingComplete)
-  } else {
-    close()
-  }
 }
 
 private fun continueToSetNotificationsAfterAccept() {
@@ -344,9 +296,7 @@ private fun enabledOperators(operators: List<ServerOperator>, selectedOperatorId
 }
 
 @Composable
-private fun ChooseServerOperatorsInfoView(
-  modalManager: ModalManager
-) {
+private fun ChooseServerOperatorsInfoView() {
   ColumnWithScrollBar {
     AppBarTitle(stringResource(MR.strings.onboarding_network_operators))
 
@@ -362,21 +312,20 @@ private fun ChooseServerOperatorsInfoView(
 
     SectionView(title = stringResource(MR.strings.onboarding_network_about_operators).uppercase()) {
       chatModel.conditions.value.serverOperators.forEach { op ->
-        ServerOperatorRow(op, modalManager)
+        ServerOperatorRow(op)
       }
     }
     SectionBottomSpacer()
   }
 }
 
-@Composable()
+@Composable
 private fun ServerOperatorRow(
-  operator: ServerOperator,
-  modalManager: ModalManager
+  operator: ServerOperator
 ) {
   SectionItemView(
     {
-      modalManager.showModalCloseable { close ->
+      ModalManager.fullscreen.showModalCloseable { close ->
         OperatorInfoView(operator)
       }
     }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt
index a66ef9ff7a..52eea3dd9d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt
@@ -14,6 +14,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatController.appPrefs
@@ -163,11 +164,20 @@ fun ModalData.WhatsNewView(updatedConditions: Boolean = false, viaSettings: Bool
         Text(
           stringResource(MR.strings.view_updated_conditions),
           color = MaterialTheme.colors.primary,
-          modifier = Modifier.clickable {
-            modalManager.showModalCloseable {
-              close -> UsageConditionsView(userServers = mutableStateOf(emptyList()), currUserServers = mutableStateOf(emptyList()), close = close, rhId = rhId)
+          modifier = Modifier
+            .clickable(
+              interactionSource = remember { MutableInteractionSource() },
+              indication = null
+            ) {
+              modalManager.showModalCloseable { close ->
+                UsageConditionsView(
+                  userServers = mutableStateOf(emptyList()),
+                  currUserServers = mutableStateOf(emptyList()),
+                  close = close,
+                  rhId = rhId
+                )
+              }
             }
-          }
         )
       }
 
@@ -176,14 +186,21 @@ fun ModalData.WhatsNewView(updatedConditions: Boolean = false, viaSettings: Bool
         Box(
           Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
         ) {
-          Text(
-            generalGetString(MR.strings.ok),
-            modifier = Modifier.clickable(onClick = {
-                close()
-            }),
-            style = MaterialTheme.typography.h3,
-            color = MaterialTheme.colors.primary
-          )
+          Box(Modifier.clip(RoundedCornerShape(20.dp))) {
+            Row(
+              verticalAlignment = Alignment.CenterVertically,
+              horizontalArrangement = Arrangement.Center,
+              modifier = Modifier
+                .clickable { close() }
+                .padding(8.dp)
+            ) {
+              Text(
+                generalGetString(MR.strings.ok),
+                style = MaterialTheme.typography.h3,
+                color = MaterialTheme.colors.primary
+              )
+            }
+          }
         }
         Spacer(Modifier.fillMaxHeight().weight(1f))
       }
@@ -199,8 +216,17 @@ fun ModalData.WhatsNewView(updatedConditions: Boolean = false, viaSettings: Bool
 fun ReadMoreButton(url: String) {
   val uriHandler = LocalUriHandler.current
   Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = DEFAULT_PADDING.div(4))) {
-    Text(stringResource(MR.strings.whats_new_read_more), color = MaterialTheme.colors.primary,
-      modifier = Modifier.clickable { uriHandler.openUriCatching(url) })
+    Text(
+      stringResource(MR.strings.whats_new_read_more),
+      color = MaterialTheme.colors.primary,
+      modifier = Modifier
+        .clickable(
+          interactionSource = remember { MutableInteractionSource() },
+          indication = null
+        ) {
+          uriHandler.openUriCatching(url)
+        }
+    )
     Icon(painterResource(MR.images.ic_open_in_new), stringResource(MR.strings.whats_new_read_more), tint = MaterialTheme.colors.primary)
   }
 }
@@ -737,17 +763,7 @@ private val versionDescriptions: List<VersionDescription> = listOf(
             val src = (operatorsInfo[OperatorTag.Flux] ?: dummyOperatorInfo).largeLogo
             Image(painterResource(src), null, modifier = Modifier.height(48.dp))
             Text(stringResource(MR.strings.v6_2_network_decentralization_descr), modifier = Modifier.padding(top = 8.dp))
-            Row {
-              Text(
-                stringResource(MR.strings.v6_2_network_decentralization_enable_flux),
-                color = MaterialTheme.colors.primary,
-                modifier = Modifier.clickable {
-                  modalManager.showModalCloseable { close -> ChooseServerOperators(onboarding = false, close, modalManager) }
-                }
-              )
-              Text(" ")
-              Text(stringResource(MR.strings.v6_2_network_decentralization_enable_flux_reason))
-            }
+            Text(stringResource(MR.strings.v6_2_network_decentralization_enable_flux))
           }
         }
       ),
@@ -762,6 +778,45 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         descrId = MR.strings.v6_2_improved_chat_navigation_descr
       ),
     ),
+  ),
+  VersionDescription(
+    version = "v6.3",
+    post = "https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html",
+    features = listOf(
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_at,
+        titleId = MR.strings.v6_3_mentions,
+        descrId = MR.strings.v6_3_mentions_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_flag,
+        titleId = MR.strings.v6_3_reports,
+        descrId = MR.strings.v6_3_reports_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = MR.images.ic_menu,
+        titleId = MR.strings.v6_3_organize_chat_lists,
+        descrId = MR.strings.v6_3_organize_chat_lists_descr
+      ),
+      VersionFeature.FeatureDescription(
+        icon = null,
+        titleId = MR.strings.v6_3_better_privacy_and_security,
+        descrId = null,
+        subfeatures = listOf(
+          MR.images.ic_visibility_off to MR.strings.v6_3_private_media_file_names,
+          MR.images.ic_delete to MR.strings.v6_3_set_message_expiration_in_chats
+        )
+      ),
+      VersionFeature.FeatureDescription(
+        icon = null,
+        titleId = MR.strings.v6_3_better_groups_performance,
+        descrId = null,
+        subfeatures = listOf(
+          MR.images.ic_bolt to MR.strings.v6_3_faster_sending_messages,
+          MR.images.ic_group_off to MR.strings.v6_3_faster_deletion_of_groups
+        )
+      ),
+    )
   )
 )
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
index 3b6e176ca3..8bb84060c2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
@@ -492,7 +492,7 @@ private suspend fun connectDesktopAddress(sessionAddress: MutableState<String>,
   }
 }
 
-private suspend fun connectDesktop(sessionAddress: MutableState<String>, connect: suspend () -> Pair<SomeRemoteCtrl?, CR.ChatCmdError?>): Boolean {
+private suspend fun connectDesktop(sessionAddress: MutableState<String>, connect: suspend () -> Pair<SomeRemoteCtrl?, ChatError?>): Boolean {
   val res = connect()
   if (res.first != null) {
     val (rc_, ctrlAppInfo, v) = res.first!!
@@ -505,13 +505,13 @@ private suspend fun connectDesktop(sessionAddress: MutableState<String>, connect
   } else {
     val e = res.second ?: return false
     when {
-      e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadInvitation -> showBadInvitationErrorAlert()
-      e.chatError is ChatError.ChatErrorChat && e.chatError.errorType is ChatErrorType.CommandError -> showBadInvitationErrorAlert()
-      e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadVersion -> showBadVersionAlert(v = e.chatError.remoteCtrlError.appVersion)
-      e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.VERSION -> showBadVersionAlert(v = null)
-      e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.CTRL_AUTH -> showDesktopDisconnectedErrorAlert()
+      e is ChatError.ChatErrorRemoteCtrl && e.remoteCtrlError is RemoteCtrlError.BadInvitation -> showBadInvitationErrorAlert()
+      e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.CommandError -> showBadInvitationErrorAlert()
+      e is ChatError.ChatErrorRemoteCtrl && e.remoteCtrlError is RemoteCtrlError.BadVersion -> showBadVersionAlert(v = e.remoteCtrlError.appVersion)
+      e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.RCP && e.agentError.rcpErr is RCErrorType.VERSION -> showBadVersionAlert(v = null)
+      e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.RCP && e.agentError.rcpErr is RCErrorType.CTRL_AUTH -> showDesktopDisconnectedErrorAlert()
       else -> {
-        val errMsg = "${e.responseType}: ${e.details}"
+        val errMsg = "error: ${e.string}"
         Log.e(TAG, "bad response: $errMsg")
         AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), errMsg)
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt
index b4fead6692..7a1fc21b17 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt
@@ -1096,6 +1096,7 @@ object AppearanceScope {
       "en" to "English",
       "ar" to "العربية",
       "bg" to "Български",
+      "ca" to "Català",
       "cs" to "Čeština",
       "de" to "Deutsch",
       "es" to "Español",
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Preferences.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Preferences.kt
index 5132516669..72fa45b936 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Preferences.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Preferences.kt
@@ -11,13 +11,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
 import dev.icerock.moko.resources.compose.stringResource
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.common.platform.chatModel
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 
 @Composable
 fun PreferencesView(m: ChatModel, user: User, close: () -> Unit,) {
@@ -34,8 +34,8 @@ fun PreferencesView(m: ChatModel, user: User, close: () -> Unit,) {
       if (updated != null) {
         val (updatedProfile, updatedContacts) = updated
         m.updateCurrentUser(user.remoteHostId, updatedProfile, preferences)
-        withChats {
-          updatedContacts.forEach { updateContact(user.remoteHostId, it) }
+        withContext(Dispatchers.Main) {
+          updatedContacts.forEach { chatModel.chatsContext.updateContact(user.remoteHostId, it) }
         }
         currentPreferences = preferences
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
index c411eb0d78..569f4ff5f8 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
@@ -30,8 +30,8 @@ import chat.simplex.common.views.isValidDisplayName
 import chat.simplex.common.views.localauth.SetAppPasscodeView
 import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
+import kotlinx.coroutines.*
 
 enum class LAMode {
   SYSTEM,
@@ -88,6 +88,13 @@ fun PrivacySettingsView(
         simplexLinkMode.set(it)
         chatModel.simplexLinkMode.value = it
       })
+      if (appPrefs.developerTools.get()) {
+        SettingsPreferenceItem(
+          null,
+          stringResource(MR.strings.privacy_short_links),
+          chatModel.controller.appPrefs.privacyShortLinks
+        )
+      }
     }
     SectionDividerSpaced()
 
@@ -119,15 +126,15 @@ fun PrivacySettingsView(
           chatModel.currentUser.value = currentUser.copy(sendRcptsContacts = enable)
           if (clearOverrides) {
             // For loop here is to prevent ConcurrentModificationException that happens with forEach
-            withChats {
-              for (i in 0 until chats.size) {
-                val chat = chats[i]
+            withContext(Dispatchers.Main) {
+              for (i in 0 until chatModel.chatsContext.chats.size) {
+                val chat = chatModel.chatsContext.chats[i]
                 if (chat.chatInfo is ChatInfo.Direct) {
                   var contact = chat.chatInfo.contact
                   val sendRcpts = contact.chatSettings.sendRcpts
                   if (sendRcpts != null && sendRcpts != enable) {
                     contact = contact.copy(chatSettings = contact.chatSettings.copy(sendRcpts = null))
-                    updateContact(currentUser.remoteHostId, contact)
+                    chatModel.chatsContext.updateContact(currentUser.remoteHostId, contact)
                   }
                 }
               }
@@ -143,16 +150,16 @@ fun PrivacySettingsView(
           chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
           chatModel.currentUser.value = currentUser.copy(sendRcptsSmallGroups = enable)
           if (clearOverrides) {
-            withChats {
+            withContext(Dispatchers.Main) {
               // For loop here is to prevent ConcurrentModificationException that happens with forEach
-              for (i in 0 until chats.size) {
-                val chat = chats[i]
+              for (i in 0 until chatModel.chatsContext.chats.size) {
+                val chat = chatModel.chatsContext.chats[i]
                 if (chat.chatInfo is ChatInfo.Group) {
                   var groupInfo = chat.chatInfo.groupInfo
                   val sendRcpts = groupInfo.chatSettings.sendRcpts
                   if (sendRcpts != null && sendRcpts != enable) {
                     groupInfo = groupInfo.copy(chatSettings = groupInfo.chatSettings.copy(sendRcpts = null))
-                    updateGroup(currentUser.remoteHostId, groupInfo)
+                    chatModel.chatsContext.updateGroup(currentUser.remoteHostId, groupInfo)
                   }
                 }
               }
@@ -284,7 +291,7 @@ private fun DeliveryReceiptsSection(
   SectionView(stringResource(MR.strings.settings_section_title_delivery_receipts)) {
     SettingsActionItemWithContent(painterResource(MR.images.ic_person), stringResource(MR.strings.receipts_section_contacts)) {
       DefaultSwitch(
-        checked = currentUser.sendRcptsContacts ?: false,
+        checked = currentUser.sendRcptsContacts,
         onCheckedChange = { enable ->
           setOrAskSendReceiptsContacts(enable)
         }
@@ -292,7 +299,7 @@ private fun DeliveryReceiptsSection(
     }
     SettingsActionItemWithContent(painterResource(MR.images.ic_group), stringResource(MR.strings.receipts_section_groups)) {
       DefaultSwitch(
-        checked = currentUser.sendRcptsSmallGroups ?: false,
+        checked = currentUser.sendRcptsSmallGroups,
         onCheckedChange = { enable ->
           setOrAskSendReceiptsGroups(enable)
         }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserAddressView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserAddressView.kt
index 7bc35bc0de..d77c4bc7f6 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserAddressView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserAddressView.kt
@@ -5,6 +5,7 @@ import SectionDividerSpaced
 import SectionItemView
 import SectionTextFooter
 import SectionView
+import SectionViewWithButton
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -42,6 +43,7 @@ fun UserAddressView(
   KeyChangeEffect(user.value?.remoteHostId, user.value?.userId) {
     close()
   }
+
   fun setProfileAddress(on: Boolean) {
     progressIndicator = true
     withBGApi {
@@ -61,7 +63,8 @@ fun UserAddressView(
   fun createAddress() {
     withBGApi {
       progressIndicator = true
-      val connReqContact = chatModel.controller.apiCreateUserAddress(user?.value?.remoteHostId)
+      val short = appPreferences.privacyShortLinks.get()
+      val connReqContact = chatModel.controller.apiCreateUserAddress(user.value?.remoteHostId, short = short)
       if (connReqContact != null) {
         chatModel.userAddress.value = UserContactLinkRec(connReqContact)
 
@@ -79,6 +82,17 @@ fun UserAddressView(
     }
   }
 
+  fun addShortLink() {
+    withBGApi {
+      progressIndicator = true
+      val userAddress = chatModel.controller.apiAddMyAddressShortLink(user.value?.remoteHostId)
+      if (userAddress != null) {
+        chatModel.userAddress.value = userAddress
+      }
+      progressIndicator = false
+    }
+  }
+
   LaunchedEffect(autoCreateAddress) {
     if (chatModel.userAddress.value == null && autoCreateAddress) {
       createAddress()
@@ -93,6 +107,7 @@ fun UserAddressView(
       userAddress = userAddress.value,
       shareViaProfile,
       createAddress = { createAddress() },
+      addShortLink = { addShortLink() },
       learnMore = {
         ModalManager.start.showModal {
           UserAddressLearnMore()
@@ -102,7 +117,7 @@ fun UserAddressView(
       sendEmail = { userAddress ->
         uriHandler.sendEmail(
           generalGetString(MR.strings.email_invite_subject),
-          generalGetString(MR.strings.email_invite_body).format(simplexChatLink(userAddress.connReqContact))
+          generalGetString(MR.strings.email_invite_body).format(simplexChatLink(userAddress.connLinkContact.connFullLink)) // TODO [short links] replace with short link
         )
       },
       setProfileAddress = ::setProfileAddress,
@@ -167,6 +182,7 @@ private fun UserAddressLayout(
   userAddress: UserContactLinkRec?,
   shareViaProfile: MutableState<Boolean>,
   createAddress: () -> Unit,
+  addShortLink: () -> Unit,
   learnMore: () -> Unit,
   share: (String) -> Unit,
   sendEmail: (UserContactLinkRec) -> Unit,
@@ -198,13 +214,20 @@ private fun UserAddressLayout(
       } else {
         val autoAcceptState = remember { mutableStateOf(AutoAcceptState(userAddress)) }
         val autoAcceptStateSaved = remember { mutableStateOf(autoAcceptState.value) }
+        val showShortLink = remember { mutableStateOf(true) }
 
-        SectionView(stringResource(MR.strings.for_social_media).uppercase()) {
-          SimpleXLinkQRCode(userAddress.connReqContact)
-          ShareAddressButton { share(simplexChatLink(userAddress.connReqContact)) }
+        SectionViewWithButton(
+          stringResource(MR.strings.for_social_media).uppercase(),
+          titleButton = if (userAddress.connLinkContact.connShortLink != null) {{ ToggleShortLinkButton(showShortLink) }} else null
+        ) {
+          SimpleXCreatedLinkQRCode(userAddress.connLinkContact, short = showShortLink.value)
+          ShareAddressButton { share(userAddress.connLinkContact.simplexChatUri(short = showShortLink.value)) }
           // ShareViaEmailButton { sendEmail(userAddress) }
           BusinessAddressToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) }
           AddressSettingsButton(user, userAddress, shareViaProfile, setProfileAddress, saveAas)
+          if (userAddress.connLinkContact.connShortLink == null && appPreferences.privacyShortLinks.get()) {
+            AddShortLinkButton(addShortLink)
+          }
 
           if (autoAcceptState.value.business) {
             SectionTextFooter(stringResource(MR.strings.add_your_team_members_to_conversations))
@@ -242,6 +265,17 @@ private fun CreateAddressButton(onClick: () -> Unit) {
   )
 }
 
+@Composable
+private fun AddShortLinkButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_add),
+    stringResource(MR.strings.add_short_link),
+    onClick,
+    iconColor = MaterialTheme.colors.primary,
+    textColor = MaterialTheme.colors.primary,
+  )
+}
+
 @Composable
 private fun CreateOneTimeLinkButton() {
   val closeAll = { ModalManager.start.closeModals() }
@@ -553,6 +587,7 @@ fun PreviewUserAddressLayoutNoAddress() {
       user = User.sampleData,
       userAddress = null,
       createAddress = {},
+      addShortLink = {},
       share = { _ -> },
       deleteAddress = {},
       saveAas = { _, _ -> },
@@ -584,8 +619,9 @@ fun PreviewUserAddressLayoutAddressCreated() {
   SimpleXTheme {
     UserAddressLayout(
       user = User.sampleData,
-      userAddress = UserContactLinkRec("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"),
+      userAddress = UserContactLinkRec(CreatedConnLink("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", null)),
       createAddress = {},
+      addShortLink = {},
       share = { _ -> },
       deleteAddress = {},
       saveAas = { _, _ -> },
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/AdvancedNetworkSettings.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/AdvancedNetworkSettings.kt
index fc042cc46c..0c38b0c045 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/AdvancedNetworkSettings.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/AdvancedNetworkSettings.kt
@@ -19,6 +19,7 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.ui.theme.*
@@ -26,6 +27,7 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.ColumnWithScrollBar
 import chat.simplex.common.platform.chatModel
+import chat.simplex.common.views.usersettings.PreferenceToggle
 import chat.simplex.common.views.usersettings.SettingsPreferenceItem
 import chat.simplex.res.MR
 import java.text.DecimalFormat
@@ -44,6 +46,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
   val sessionMode = remember { mutableStateOf(currentCfgVal.sessionMode) }
   val smpProxyMode = remember { mutableStateOf(currentCfgVal.smpProxyMode) }
   val smpProxyFallback = remember { mutableStateOf(currentCfgVal.smpProxyFallback) }
+  val smpWebPortServers = remember { mutableStateOf(currentCfgVal.smpWebPortServers) }
 
   val networkTCPConnectTimeout = remember { mutableStateOf(currentCfgVal.tcpConnectTimeout) }
   val networkTCPTimeout = remember { mutableStateOf(currentCfgVal.tcpTimeout) }
@@ -82,6 +85,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
       sessionMode = sessionMode.value,
       smpProxyMode = smpProxyMode.value,
       smpProxyFallback = smpProxyFallback.value,
+      smpWebPortServers = smpWebPortServers.value,
       tcpConnectTimeout = networkTCPConnectTimeout.value,
       tcpTimeout = networkTCPTimeout.value,
       tcpTimeoutPerKb = networkTCPTimeoutPerKb.value,
@@ -96,6 +100,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
     sessionMode.value = cfg.sessionMode
     smpProxyMode.value = cfg.smpProxyMode
     smpProxyFallback.value = cfg.smpProxyFallback
+    smpWebPortServers.value = cfg.smpWebPortServers
     networkTCPConnectTimeout.value = cfg.tcpConnectTimeout
     networkTCPTimeout.value = cfg.tcpTimeout
     networkTCPTimeoutPerKb.value = cfg.tcpTimeoutPerKb
@@ -150,6 +155,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
       sessionMode = sessionMode,
       smpProxyMode = smpProxyMode,
       smpProxyFallback = smpProxyFallback,
+      smpWebPortServers,
       networkTCPConnectTimeout,
       networkTCPTimeout,
       networkTCPTimeoutPerKb,
@@ -182,6 +188,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
   sessionMode: MutableState<TransportSessionMode>,
   smpProxyMode: MutableState<SMPProxyMode>,
   smpProxyFallback: MutableState<SMPProxyFallback>,
+  smpWebPortServers: MutableState<SMPWebPortServers>,
   networkTCPConnectTimeout: MutableState<Long>,
   networkTCPTimeout: MutableState<Long>,
   networkTCPTimeoutPerKb: MutableState<Long>,
@@ -214,75 +221,85 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
       }
       SectionTextFooter(stringResource(MR.strings.private_routing_explanation))
       SectionDividerSpaced(maxTopPadding = true)
-    }
 
-    if (currentRemoteHost == null) {
       SectionView(stringResource(MR.strings.network_session_mode_transport_isolation).uppercase()) {
         SessionModePicker(sessionMode, showModal, updateSessionMode)
       }
       SectionDividerSpaced()
-    }
+      SectionView(stringResource(MR.strings.network_smp_web_port_section_title).uppercase()) {
+        ExposedDropDownSettingRow(
+          stringResource(MR.strings.network_smp_web_port_toggle),
+          SMPWebPortServers.entries.map { it to stringResource(it.text) },
+          smpWebPortServers
+        ) { smpWebPortServers.value = it }
+      }
+      SectionTextFooter(
+        if (smpWebPortServers.value == SMPWebPortServers.Preset) stringResource(MR.strings.network_smp_web_port_preset_footer)
+        else String.format(stringResource(MR.strings.network_smp_web_port_footer), if (smpWebPortServers.value == SMPWebPortServers.All) "443" else "5223")
+      )
+      SectionDividerSpaced(maxTopPadding = true)
 
-    SectionView(stringResource(MR.strings.network_option_tcp_connection).uppercase()) {
-      SectionItemView {
-        TimeoutSettingRow(
-          stringResource(MR.strings.network_option_tcp_connection_timeout), networkTCPConnectTimeout,
-          listOf(10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000), secondsLabel
-        )
-      }
-      SectionItemView {
-        TimeoutSettingRow(
-          stringResource(MR.strings.network_option_protocol_timeout), networkTCPTimeout,
-          listOf(5_000000, 7_000000, 10_000000, 15_000000, 20_000_000, 30_000_000), secondsLabel
-        )
-      }
-      SectionItemView {
-        // can't be higher than 130ms to avoid overflow on 32bit systems
-        TimeoutSettingRow(
-          stringResource(MR.strings.network_option_protocol_timeout_per_kb), networkTCPTimeoutPerKb,
-          listOf(2_500, 5_000, 10_000, 15_000, 20_000, 30_000), secondsLabel
-        )
-      }
-      // SectionItemView {
-      //   IntSettingRow(
-      //     stringResource(MR.strings.network_option_rcv_concurrency), networkRcvConcurrency,
-      //     listOf(1, 2, 4, 8, 12, 16, 24), ""
-      //   )
-      // }
-      SectionItemView {
-        TimeoutSettingRow(
-          stringResource(MR.strings.network_option_ping_interval), networkSMPPingInterval,
-          listOf(120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000), secondsLabel
-        )
-      }
-      SectionItemView {
-        IntSettingRow(
-          stringResource(MR.strings.network_option_ping_count), networkSMPPingCount,
-          listOf(1, 2, 3, 5, 8), ""
-        )
-      }
-      SectionItemView {
-        EnableKeepAliveSwitch(networkEnableKeepAlive)
-      }
-      if (networkEnableKeepAlive.value) {
+      SectionView(stringResource(MR.strings.network_option_tcp_connection).uppercase()) {
         SectionItemView {
-          IntSettingRow("TCP_KEEPIDLE", networkTCPKeepIdle, listOf(15, 30, 60, 120, 180), secondsLabel)
+          TimeoutSettingRow(
+            stringResource(MR.strings.network_option_tcp_connection_timeout), networkTCPConnectTimeout,
+            listOf(10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000), secondsLabel
+          )
         }
         SectionItemView {
-          IntSettingRow("TCP_KEEPINTVL", networkTCPKeepIntvl, listOf(5, 10, 15, 30, 60), secondsLabel)
+          TimeoutSettingRow(
+            stringResource(MR.strings.network_option_protocol_timeout), networkTCPTimeout,
+            listOf(5_000000, 7_000000, 10_000000, 15_000000, 20_000_000, 30_000_000), secondsLabel
+          )
         }
         SectionItemView {
-          IntSettingRow("TCP_KEEPCNT", networkTCPKeepCnt, listOf(1, 2, 4, 6, 8), "")
+          // can't be higher than 130ms to avoid overflow on 32bit systems
+          TimeoutSettingRow(
+            stringResource(MR.strings.network_option_protocol_timeout_per_kb), networkTCPTimeoutPerKb,
+            listOf(2_500, 5_000, 10_000, 15_000, 20_000, 30_000), secondsLabel
+          )
         }
-      } else {
+        // SectionItemView {
+        //   IntSettingRow(
+        //     stringResource(MR.strings.network_option_rcv_concurrency), networkRcvConcurrency,
+        //     listOf(1, 2, 4, 8, 12, 16, 24), ""
+        //   )
+        // }
         SectionItemView {
-          Text("TCP_KEEPIDLE", color = MaterialTheme.colors.secondary)
+          TimeoutSettingRow(
+            stringResource(MR.strings.network_option_ping_interval), networkSMPPingInterval,
+            listOf(120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000), secondsLabel
+          )
         }
         SectionItemView {
-          Text("TCP_KEEPINTVL", color = MaterialTheme.colors.secondary)
+          IntSettingRow(
+            stringResource(MR.strings.network_option_ping_count), networkSMPPingCount,
+            listOf(1, 2, 3, 5, 8), ""
+          )
         }
         SectionItemView {
-          Text("TCP_KEEPCNT", color = MaterialTheme.colors.secondary)
+          EnableKeepAliveSwitch(networkEnableKeepAlive)
+        }
+        if (networkEnableKeepAlive.value) {
+          SectionItemView {
+            IntSettingRow("TCP_KEEPIDLE", networkTCPKeepIdle, listOf(15, 30, 60, 120, 180), secondsLabel)
+          }
+          SectionItemView {
+            IntSettingRow("TCP_KEEPINTVL", networkTCPKeepIntvl, listOf(5, 10, 15, 30, 60), secondsLabel)
+          }
+          SectionItemView {
+            IntSettingRow("TCP_KEEPCNT", networkTCPKeepCnt, listOf(1, 2, 4, 6, 8), "")
+          }
+        } else {
+          SectionItemView {
+            Text("TCP_KEEPIDLE", color = MaterialTheme.colors.secondary)
+          }
+          SectionItemView {
+            Text("TCP_KEEPINTVL", color = MaterialTheme.colors.secondary)
+          }
+          SectionItemView {
+            Text("TCP_KEEPCNT", color = MaterialTheme.colors.secondary)
+          }
         }
       }
     }
@@ -309,7 +326,7 @@ private fun SMPProxyModePicker(
 ) {
   val density = LocalDensity.current
   val values = remember {
-    SMPProxyMode.values().map {
+    SMPProxyMode.entries.map {
       when (it) {
         SMPProxyMode.Always -> ValueTitleDesc(SMPProxyMode.Always, generalGetString(MR.strings.network_smp_proxy_mode_always), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_always_description), density))
         SMPProxyMode.Unknown -> ValueTitleDesc(SMPProxyMode.Unknown, generalGetString(MR.strings.network_smp_proxy_mode_unknown), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_mode_unknown_description), density))
@@ -344,7 +361,7 @@ private fun SMPProxyFallbackPicker(
 ) {
   val density = LocalDensity.current
   val values = remember {
-    SMPProxyFallback.values().map {
+    SMPProxyFallback.entries.map {
       when (it) {
         SMPProxyFallback.Allow -> ValueTitleDesc(SMPProxyFallback.Allow, generalGetString(MR.strings.network_smp_proxy_fallback_allow), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_fallback_allow_description), density))
         SMPProxyFallback.AllowProtected -> ValueTitleDesc(SMPProxyFallback.AllowProtected, generalGetString(MR.strings.network_smp_proxy_fallback_allow_protected), escapedHtmlToAnnotatedString(generalGetString(MR.strings.network_smp_proxy_fallback_allow_protected_description), density))
@@ -537,6 +554,7 @@ fun PreviewAdvancedNetworkSettingsLayout() {
       sessionMode = remember { mutableStateOf(TransportSessionMode.User) },
       smpProxyMode = remember { mutableStateOf(SMPProxyMode.Never) },
       smpProxyFallback = remember { mutableStateOf(SMPProxyFallback.Allow) },
+      smpWebPortServers = remember { mutableStateOf(SMPWebPortServers.Preset) },
       networkTCPConnectTimeout = remember { mutableStateOf(10_000000) },
       networkTCPTimeout = remember { mutableStateOf(10_000000) },
       networkTCPTimeoutPerKb = remember { mutableStateOf(10_000) },
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
index 835e01ec27..98f671ddc4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
@@ -22,8 +22,12 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.input.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
@@ -180,7 +184,14 @@ fun ModalData.NetworkAndServersView(closeNetworkAndServers: () -> Unit) {
   @Composable
   fun ConditionsButton(conditionsAction: UsageConditionsAction, rhId: Long?) {
     SectionItemView(
-      click = { ModalManager.start.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close -> UsageConditionsView(currUserServers, userServers, close, rhId) } },
+      click = { ModalManager.start.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close ->
+        UsageConditionsView(
+          currUserServers,
+          userServers,
+          close,
+          rhId
+        )
+      } },
     ) {
       Text(
         stringResource(if (conditionsAction is UsageConditionsAction.Review) MR.strings.operator_review_conditions else MR.strings.operator_conditions_accepted),
@@ -733,17 +744,43 @@ fun UsageConditionsView(
     }
   }
 
+  @Composable
+  fun ConditionsDiffButton() {
+    val uriHandler = LocalUriHandler.current
+    val commit = chatModel.conditions.value.currentConditions.conditionsCommit
+    Column (
+      modifier = Modifier.fillMaxWidth(),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      Row(
+        modifier = Modifier
+          .clip(shape = CircleShape)
+          .clickable {
+            val commitUrl = "https://github.com/simplex-chat/simplex-chat/commit/$commit"
+            uriHandler.openUriCatching(commitUrl)
+          }
+          .padding(horizontal = 6.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center
+      ) {
+        Text(stringResource(MR.strings.operator_open_changes), color = MaterialTheme.colors.primary)
+        Spacer(Modifier.width(8.dp))
+        Icon(painterResource(MR.images.ic_outbound), contentDescription = null, tint = MaterialTheme.colors.primary)
+      }
+    }
+  }
+
   ColumnWithScrollBar(modifier = Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING)) {
-    AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
     when (val conditionsAction = chatModel.conditions.value.conditionsAction) {
       is UsageConditionsAction.Review -> {
+        AppBarTitle(stringResource(MR.strings.operator_updated_conditions), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
         if (conditionsAction.operators.isNotEmpty()) {
           ReadableText(MR.strings.operators_conditions_will_be_accepted_for, args = conditionsAction.operators.joinToString(", ") { it.legalName_ })
         }
         Column(modifier = Modifier.weight(1f).padding(bottom = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF)) {
           ConditionsTextView(rhId)
         }
-        AcceptConditionsButton(conditionsAction.operators.map { it.operatorId }, close, if (conditionsAction.deadline != null) DEFAULT_PADDING_HALF else DEFAULT_PADDING * 2)
+        AcceptConditionsButton(conditionsAction.operators.map { it.operatorId }, close, DEFAULT_PADDING_HALF)
         if (conditionsAction.deadline != null) {
           SectionTextFooter(
             text = AnnotatedString(String.format(generalGetString(MR.strings.operator_conditions_accepted_for_enabled_operators_on), localDate(conditionsAction.deadline))),
@@ -751,9 +788,12 @@ fun UsageConditionsView(
           )
           Spacer(Modifier.fillMaxWidth().height(DEFAULT_PADDING))
         }
+        ConditionsDiffButton()
+        Spacer(Modifier.fillMaxWidth().height(DEFAULT_PADDING))
       }
 
       is UsageConditionsAction.Accepted -> {
+        AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
         if (conditionsAction.operators.isNotEmpty()) {
           ReadableText(MR.strings.operators_conditions_accepted_for, args = conditionsAction.operators.joinToString(", ") { it.legalName_ })
         }
@@ -763,6 +803,7 @@ fun UsageConditionsView(
       }
 
       else -> {
+        AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
         Column(modifier = Modifier.weight(1f).padding(bottom = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF)) {
           ConditionsTextView(rhId)
         }
@@ -771,6 +812,18 @@ fun UsageConditionsView(
   }
 }
 
+@Composable
+fun SimpleConditionsView(
+  rhId: Long?
+) {
+  ColumnWithScrollBar(modifier = Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING)) {
+    AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
+    Column(modifier = Modifier.weight(1f).padding(bottom = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF)) {
+      ConditionsTextView(rhId)
+    }
+  }
+}
+
 @Composable
 fun ServersErrorFooter(errStr: String) {
   Row(
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServerView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServerView.kt
index bebc96a28c..8626fd3143 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServerView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServerView.kt
@@ -189,7 +189,7 @@ fun CustomServer(
   if (valid.value) {
     SectionDividerSpaced()
     SectionView(stringResource(MR.strings.smp_servers_add_to_another_device).uppercase()) {
-      QRCode(serverAddress.value)
+      QRCode(serverAddress.value, small = true)
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
index 4c781f0aab..4bb2244785 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
@@ -36,13 +36,13 @@
     <string name="all_group_members_will_remain_connected">سيبقى جميع أعضاء المجموعة على اتصال.</string>
     <string name="allow_disappearing_messages_only_if">السماح باختفاء الرسائل فقط إذا سمحت جهة اتصالك بذلك.</string>
     <string name="allow_irreversible_message_deletion_only_if">السماح بحذف الرسائل بشكل لا رجوع فيه فقط إذا سمحت لك جهة الاتصال بذلك. (24 ساعة)</string>
-    <string name="group_member_role_admin">المشرف</string>
+    <string name="group_member_role_admin">المُدير</string>
     <string name="users_add">أضِف ملف التعريف</string>
     <string name="allow_direct_messages">السماح بإرسال رسائل مباشرة إلى الأعضاء.</string>
     <string name="accept_contact_incognito_button">قبول التخفي</string>
     <string name="button_add_welcome_message">أضِف رسالة ترحيب</string>
     <string name="v4_3_improved_server_configuration_desc">أضف الخوادم عن طريق مسح رموز QR.</string>
-    <string name="v4_2_group_links_desc">يمكن للمشرفين إنشاء روابط للانضمام إلى المجموعات.</string>
+    <string name="v4_2_group_links_desc">يمكن للمُدراء إنشاء روابط للانضمام إلى المجموعات.</string>
     <string name="accept_connection_request__question">قبول طلب الاتصال؟</string>
     <string name="clear_chat_warning">سيتم حذف جميع الرسائل - لا يمكن التراجع عن هذا! سيتم حذف الرسائل فقط من أجلك.</string>
     <string name="callstatus_accepted">مكالمة مقبولة</string>
@@ -51,12 +51,12 @@
     <string name="keychain_is_storing_securely">يتم استخدام Android Keystore لتخزين عبارة المرور بشكل آمن - فهو يسمح لخدمة الإشعارات بالعمل.</string>
     <string name="empty_chat_profile_is_created">يتم إنشاء ملف تعريف دردشة فارغ بالاسم المقدم، ويفتح التطبيق كالمعتاد.</string>
     <string name="answer_call">أجب الاتصال</string>
-    <string name="chat_preferences_always">دائِماً</string>
+    <string name="chat_preferences_always">دائمًا</string>
     <string name="allow_to_send_disappearing">السماح بإرسال رسائل تختفي.</string>
     <string name="allow_to_send_voice">السماح بإرسال رسائل صوتية.</string>
     <string name="settings_section_title_app">تطبيق</string>
     <string name="color_secondary_variant">ثانوي إضافي</string>
-    <string name="allow_your_contacts_adding_message_reactions">السماح لجهات اتصالك بإضافة ردود الفعل الرسالة.</string>
+    <string name="allow_your_contacts_adding_message_reactions">السماح لجهات اتصالك بإضافة ردود الفعل للرسالة.</string>
     <string name="allow_your_contacts_to_call">السماح لجهات اتصالك بالاتصال بك.</string>
     <string name="allow_message_reactions">السماح بردود الفعل على الرسائل.</string>
     <string name="v5_1_self_destruct_passcode_descr">يتم مسح جميع البيانات عند إدخالها.</string>
@@ -64,11 +64,11 @@
     <string name="allow_your_contacts_to_send_disappearing_messages">السماح لجهات اتصالك بإرسال رسائل تختفي.</string>
     <string name="allow_voice_messages_only_if">اسمح بالرسائل الصوتية فقط إذا سمحت جهة اتصالك بذلك.</string>
     <string name="v5_0_app_passcode">رمز مرور التطبيق</string>
-    <string name="notifications_mode_service">دائِماً مُتاح</string>
+    <string name="notifications_mode_service">يعمل دائمًا</string>
     <string name="notifications_mode_off_desc">يمكن للتطبيق استلام الإشعارات فقط عند تشغيله، ولن يتم بدء تشغيل أي خدمة في الخلفية</string>
     <string name="allow_voice_messages_question">السماح بالرسائل الصوتية؟</string>
     <string name="all_your_contacts_will_remain_connected">ستبقى جميع جهات اتصالك متصلة.</string>
-    <string name="always_use_relay">استخدم التتابع دائمًا</string>
+    <string name="always_use_relay">استخدم الموجه دائمًا</string>
     <string name="full_backup">النسخ الاحتياطي لبيانات التطبيق</string>
     <string name="all_app_data_will_be_cleared">حُذفت جميع بيانات التطبيق.</string>
     <string name="allow_to_delete_messages">السماح بحذف الرسائل المرسلة بشكل لا رجعة فيه. (24 ساعة)</string>
@@ -121,7 +121,7 @@
     <string name="la_authenticate">مصادقة</string>
     <string name="send_disappearing_message_1_minute">1 دقيقة</string>
     <string name="send_disappearing_message_30_seconds">30 ثانية</string>
-    <string name="icon_descr_cancel_live_message">إلغاء الرسالة المباشرة</string>
+    <string name="icon_descr_cancel_live_message">ألغِ الرسالة الحيّة</string>
     <string name="cancel_verb">إلغاء</string>
     <string name="network_session_mode_entity_description"><![CDATA[سيتم استخدام اتصال TCP منفصل (وبيانات اعتماد SOCKS) <b> لكل جهة اتصال وعضو في المجموعة</b>\n.<b> الرجاء ملاحظة</b>: إذا كان لديك العديد من الاتصالات، فقد يكون استهلاك البطارية وحركة المرور أعلى بكثير وقد تفشل بعض الاتصالات.]]></string>
     <string name="callstatus_calling">جارٍ الاتصال…</string>
@@ -174,7 +174,7 @@
     <string name="switch_receiving_address_question">تغيير عنوان الاستلام؟</string>
     <string name="copied">نٌسخت إلى الحافظة</string>
     <string name="clear_verb">مسح</string>
-    <string name="clear_chat_button">مسح الدردشة</string>
+    <string name="clear_chat_button">امسح الدردشة</string>
     <string name="create_address">إنشاء عنوان</string>
     <string name="settings_section_title_chats">الدردشات</string>
     <string name="confirm_new_passphrase">تأكيد عبارة المرور الجديدة…</string>
@@ -196,7 +196,7 @@
     <string name="create_group">إنشاء مجموعة سرية</string>
     <string name="error_aborting_address_change">خطأ في إحباط تغيير العنوان</string>
     <string name="auth_enable_simplex_lock">تفعيل قفل SimpleX</string>
-    <string name="auth_confirm_credential">تأكد من بيانات الاعتماد الخاصة بك</string>
+    <string name="auth_confirm_credential">تأكد من بيانات اعتمادك</string>
     <string name="create_simplex_address">أنشئ عنوان SimpleX</string>
     <string name="continue_to_next_step">متابعة</string>
     <string name="chat_with_developers">تحدث مع المطورين</string>
@@ -286,7 +286,7 @@
     <string name="connection_local_display_name">الاتصال %1$d</string>
     <string name="display_name_connection_established">انشأت الاتصال</string>
     <string name="callstatus_connecting">مكالمة جارية…</string>
-    <string name="encrypt_database">عَمِّ</string>
+    <string name="encrypt_database">تشفير</string>
     <string name="enter_passphrase">أدخل عبارة المرور…</string>
     <string name="group_member_status_creator">المنشئ</string>
     <string name="error_adding_members">خطأ في إضافة الأعضاء</string>
@@ -308,7 +308,7 @@
     <string name="connect_via_link_or_qr">تواصل عبر الرابط / رمز QR</string>
     <string name="share_one_time_link">إنشاء رابط دعوة لمرة واحدة</string>
     <string name="smp_servers_check_address">تحقق من عنوان الخادم وحاول مرة أخرى.</string>
-    <string name="clear_verification">مسح التَحَقُّق</string>
+    <string name="clear_verification">امسح التحقُّق</string>
     <string name="create_address_and_let_people_connect">أنشئ عنوانًا للسماح للأشخاص بالتواصل معك.</string>
     <string name="smp_servers_enter_manually">أدخل الخادم يدويًا</string>
     <string name="colored_text">ملون</string>
@@ -464,8 +464,8 @@
     <string name="file_will_be_received_when_contact_completes_uploading">سيتم استلام الملف عندما يكتمل جهة اتصالك من رفعِها.</string>
     <string name="icon_descr_help">المساعدة</string>
     <string name="file_with_path">الملف: %s</string>
-    <string name="fix_connection_confirm">إصلاح</string>
-    <string name="fix_connection">إصلاح الاتصال</string>
+    <string name="fix_connection_confirm">أصلح</string>
+    <string name="fix_connection">أصلح الاتصال</string>
     <string name="fix_connection_question">إصلاح الاتصال؟</string>
     <string name="fix_connection_not_supported_by_group_member">الإصلاح غير مدعوم من قبل أعضاء المجموعة</string>
     <string name="group_members_can_send_files">يمكن للأعضاء إرسال الملفات والوسائط.</string>
@@ -567,7 +567,7 @@
     <string name="rcv_group_event_member_added">مدعو %1$s</string>
     <string name="rcv_group_event_invited_via_your_group_link">مدعو عبر رابط المجموعة</string>
     <string name="invalid_chat">الدردشة غير صالحة</string>
-    <string name="live">حي</string>
+    <string name="live">حيّ</string>
     <string name="invalid_connection_link">رابط اتصال غير صالح</string>
     <string name="large_file">الملف كبير!</string>
     <string name="learn_more">معرفة المزيد</string>
@@ -577,7 +577,7 @@
     <string name="invalid_migration_confirmation">تأكيد الترحيل غير صالح</string>
     <string name="group_member_status_invited">مدعو</string>
     <string name="image_descr_link_preview">رابط معاينة الصورة</string>
-    <string name="live_message">رسالة مباشرة!</string>
+    <string name="live_message">رسالة حيّة!</string>
     <string name="italic_text">مائل</string>
     <string name="email_invite_subject">لنتحدث في SimpleX Chat</string>
     <string name="lock_after">قفل بعد</string>
@@ -585,14 +585,14 @@
     <string name="alert_title_group_invitation_expired">انتهت صلاحية الدعوة!</string>
     <string name="join_group_question">انضمام إلى المجموعة؟</string>
     <string name="join_group_incognito_button">الانضمام المتخفي</string>
-    <string name="joining_group">الانضمام إلى المجموعة</string>
+    <string name="joining_group">جارِ الانضمام إلى المجموعة</string>
     <string name="leave_group_button">غادِر</string>
     <string name="leave_group_question">مغادرة المجموعة؟</string>
     <string name="group_member_status_left">غادر</string>
-    <string name="delivery_receipts_are_disabled">إيصالات التسليم معطلة!</string>
+    <string name="delivery_receipts_are_disabled">إيصالات التسليم مُعطَّلة!</string>
     <string name="no_call_on_lock_screen">تعطيل</string>
     <string name="timed_messages">رسائل تختفي</string>
-    <string name="auth_device_authentication_is_disabled_turning_off">عٌطل مصادقة الجهاز. جاري إيقاف تشغيل قفل SimpleX.</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">استيثاق الجهاز مُعطَّل. جارِ إيقاف تشغيل قفل SimpleX.</string>
     <string name="ttl_m">%d شهر</string>
     <string name="ttl_weeks">%d أسابيع</string>
     <string name="ttl_w">%d أسبوع</string>
@@ -610,11 +610,11 @@
     <string name="share_text_disappears_at">يختفي في: %s</string>
     <string name="disappearing_prohibited_in_this_chat">الرسائل المختفية ممنوعة في هذه الدردشة.</string>
     <string name="status_e2e_encrypted">مُعمّى بين الطريفين</string>
-    <string name="icon_descr_edited">حُرر</string>
+    <string name="icon_descr_edited">حُرّر</string>
     <string name="downgrade_and_open_chat">الرجوع إلى إصدار سابق وفتح الدردشة</string>
     <string name="direct_messages">رسائل مباشرة</string>
     <string name="disappearing_messages_are_prohibited">الرسائل المختفية ممنوعة.</string>
-    <string name="button_edit_group_profile">تحرير ملف تعريف المجموعة</string>
+    <string name="button_edit_group_profile">حرّر ملف تعريف المجموعة</string>
     <string name="dont_show_again">لا تُظهر مرة أخرى</string>
     <string name="settings_section_title_device">الجهاز</string>
     <string name="ttl_week">%d أسبوع</string>
@@ -625,7 +625,7 @@
     <string name="ttl_h">%d ساعة</string>
     <string name="ttl_hours">%d ساعات</string>
     <string name="ttl_mth">%d شهر</string>
-    <string name="edit_image">تحرير الصورة</string>
+    <string name="edit_image">حرّر الصورة</string>
     <string name="total_files_count_and_size">%d ملف/ات بإجمالي الحجم %s</string>
     <string name="ttl_s">%d ثانية</string>
     <string name="receipts_section_contacts">جهات الاتصال</string>
@@ -695,7 +695,7 @@
     <string name="error_sending_message">خطأ في إرسال الرسالة</string>
     <string name="error_joining_group">خطأ في الانضمام إلى المجموعة</string>
     <string name="error_synchronizing_connection">خطأ في مزامنة الاتصال</string>
-    <string name="auth_log_in_using_credential">تسجيل الدخول باستخدام بيانات الاعتماد الخاصة بك</string>
+    <string name="auth_log_in_using_credential">سجّل الدخول باستخدام بيانات اعتمادك</string>
     <string name="error_saving_file">خطأ في حفظ الملف</string>
     <string name="mark_unread">علّم غير مقروءة</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">تأكد من أن عناوين خادم WebRTC ICE بالتنسيق الصحيح، وأن تكون مفصولة بأسطر وليست مكررة.</string>
@@ -704,7 +704,7 @@
     <string name="error_saving_group_profile">خطأ في حفظ ملف تعريف المجموعة</string>
     <string name="notification_preview_mode_message">رسالة نصية</string>
     <string name="message_reactions">ردود فعل الرسائل</string>
-    <string name="delete_message_mark_deleted_warning">سيتم وضع علامة على الرسالة للحذف. سيتمكن المستلم/مون من الكشف عن هذه الرسالة.</string>
+    <string name="delete_message_mark_deleted_warning">سيتم وضع علامة على الرسالة للحذف. سيتمكن المُستلم/ون من الكشف عن هذه الرسالة.</string>
     <string name="delete_message_cannot_be_undone_warning">سيتم حذف الرسالة - لا يمكن التراجع عن هذا!</string>
     <string name="message_delivery_error_title">خطأ في تسليم الرسالة</string>
     <string name="network_and_servers">الشبكة والخوادم</string>
@@ -712,7 +712,7 @@
     <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 للجوال: انقر فوق <b>فتح في تطبيق الجوال</b>، ثم انقر فوق <b>اتصال</b> في التطبيق.]]></string>
     <string name="share_text_moderated_at">تحت الإشراف في: %s</string>
     <string name="message_reactions_prohibited_in_this_chat">ردود الفعل الرسائل ممنوعة في هذه الدردشة.</string>
-    <string name="moderated_item_description">مُشرف بواسطة %s</string>
+    <string name="moderated_item_description">أُشرف بواسطة %s</string>
     <string name="message_delivery_error_desc">من المرجح أن جهة الاتصال هذه قد حذفت الاتصال بك.</string>
     <string name="v5_1_message_reactions">ردود فعل الرسائل</string>
     <string name="callstatus_missed">مكالمة فائتة</string>
@@ -729,9 +729,7 @@
     <string name="v5_2_message_delivery_receipts">إيصالات تسليم الرسائل!</string>
     <string name="custom_time_unit_minutes">دقائق</string>
     <string name="custom_time_unit_months">شهور</string>
-    <string name="v5_2_more_things_descr">- توصيل رسائل أكثر استقرارًا.
-\n- مجموعات أفضل قليلاً.
-\n- و اكثر!</string>
+    <string name="v5_2_more_things_descr">- توصيل رسائل أكثر استقرارًا.\n- مجموعات أفضل قليلاً.\n- و اكثر!</string>
     <string name="network_status">حالة الشبكة</string>
     <string name="user_mute">كتم</string>
     <string name="message_reactions_are_prohibited">ردود الفعل الرسائل ممنوعة.</string>
@@ -757,7 +755,7 @@
     <string name="network_use_onion_hosts_prefer_desc">سيتم استخدام مضيفات البصل عند توفرها.</string>
     <string name="network_use_onion_hosts_no_desc">لن يتم استخدام مضيفات البصل.</string>
     <string name="no_contacts_selected">لم تٌحدد جهات اتصال</string>
-    <string name="v4_6_group_moderation_descr">يمكن للمشرف الآن:\n- حذف رسائل الأعضاء.\n- تعطيل الأعضاء (دور المراقب)</string>
+    <string name="v4_6_group_moderation_descr">يمكن للمُدراء الآن:\n- حذف رسائل الأعضاء.\n- تعطيل الأعضاء (دور المراقب)</string>
     <string name="settings_notifications_mode_title">خدمة الإشعار</string>
     <string name="chat_preferences_off">غير مفعّل</string>`
   <string name="chat_preferences_on">مفعل</string>
@@ -777,18 +775,17 @@
     <string name="videos_limit_desc">يمكن إرسال 10 فيديوهات فقط في نفس الوقت</string>
     <string name="add_contact">رابط دعوة لمرة واحدة</string>
     <string name="network_use_onion_hosts_no">لا</string>
-    <string name="network_use_onion_hosts_required_desc">سوف تكون مضيفات البصل مطلوبة للاتصال.
-\nيُرجى ملاحظة: أنك لن تتمكن من الاتصال بالخوادم بدون عنوان onion.</string>
+    <string name="network_use_onion_hosts_required_desc">ستكون مضيفات البصل مطلوبة للاتصال. \nيُرجى ملاحظة: أنك لن تتمكن من الاتصال بالخوادم بدون عنوان onion.</string>
     <string name="self_destruct_new_display_name">اسم عرض جديد:</string>
     <string name="new_passphrase">عبارة مرور جديدة…</string>
     <string name="icon_descr_server_status_pending">قيد الانتظار</string>
-    <string name="enter_passphrase_notification_title">كلمة المرور مطلوبة</string>
+    <string name="enter_passphrase_notification_title">عبارة المرور مطلوبة</string>
     <string name="paste_the_link_you_received">ألصِق الرابط الذي استلمته</string>
     <string name="only_owners_can_enable_files_and_media">فقط مالكي المجموعة يمكنهم تفعيل الملفات والوسائط.</string>
     <string name="only_group_owners_can_enable_voice">فقط مالكي المجموعة يمكنهم تفعيل الرسائل الصوتية.</string>
     <string name="only_stored_on_members_devices">(يخزن فقط بواسطة أعضاء المجموعة)</string>
-    <string name="la_mode_passcode">كلمة المرور</string>
-    <string name="passcode_set">تم تعيين كلمة المرور!</string>
+    <string name="la_mode_passcode">رمز المرور</string>
+    <string name="passcode_set">عيّنت رمز المرور!</string>
     <string name="group_member_role_owner">المالك</string>
     <string name="only_your_contact_can_send_disappearing">فقط جهة اتصالك يمكنها إرسال رسائل تختفي.</string>
     <string name="only_your_contact_can_add_message_reactions">جهة اتصالك فقط يمكنها إضافة ردود الفعل على الرسالة</string>
@@ -796,26 +793,26 @@
     <string name="only_your_contact_can_delete">جهة اتصالك فقط يمكنها حذف الرسائل بشكل لا رجعة فيه (يمكنك تعليم الرسالة للحذف). (24 ساعة)</string>
     <string name="only_you_can_send_voice">أنت فقط يمكنك إرسال رسائل صوتية.</string>
     <string name="open_verb">افتح</string>
-    <string name="passcode_not_changed">لم يتم تغيير كلمة المرور!</string>
-    <string name="passcode_changed">تم تغيير كلمة المرور</string>
+    <string name="passcode_not_changed">لم يتم تغيير رمز المرور!</string>
+    <string name="passcode_changed">تم تغيير رمز المرور</string>
     <string name="opening_database">جارِ فتح قاعدة البيانات…</string>
     <string name="only_your_contact_can_send_voice">جهة اتصالك فقط يمكنها إرسال رسائل صوتية.</string>
     <string name="paste_button">ألصق</string>
-    <string name="restore_passphrase_not_found_desc">كلمة المرور غير موجودة في مخزن المفاتيح، يرجى إدخالها يدوياً. قد يحدث هذا إذا قمت باستعادة ملفات التطبيق باستخدام أداة استرجاع بيانات. إذا لم يكن الأمر كذلك، تواصل مع المبرمجين رجاء</string>
+    <string name="restore_passphrase_not_found_desc">لم يتم العثور على عبارة المرور في Keystore، يُرجى إدخالها يدويًا. ربما حدث هذا إذا استعدت بيانات التطبيق باستخدام أداة النسخ الاحتياطي. إذا لم يكن الأمر كذلك، يُرجى التواصل مع المطورين.</string>
     <string name="open_chat">افتح الدردشة</string>
-    <string name="simplex_link_mode_browser_warning">فتح الرابط في المتصفح قد يقلل خصوصية وحماية اتصالك. الروابط غير الموثوقة من SimpleX ستكون باللون الأحمر</string>
+    <string name="simplex_link_mode_browser_warning">قد يؤدي فتح الرابط في المتصفح إلى تقليل خصوصية الاتصال وأمانه. ستظهر روابط SimpleX غير الموثوقة باللون الأحمر.</string>
     <string name="only_you_can_add_message_reactions">أنت فقط يمكنك إضافة ردود الفعل على الرسالة.</string>
     <string name="only_you_can_delete_messages">أنت فقط يمكنك حذف الرسائل بشكل لا رجعة فيه (يمكن للمستلم تعليمها للحذف). (24 ساعة)</string>
     <string name="only_you_can_send_disappearing">أنت فقط يمكنك إرسال رسائل تختفي</string>
     <string name="only_you_can_make_calls">أنت فقط يمكنك إجراء المكالمات.</string>
     <string name="only_your_contact_can_make_calls">فقط جهة اتصالك يمكنها إجراء المكالمات.</string>
     <string name="auth_open_chat_console">افتح وحدة تحكم الدردشة</string>
-    <string name="la_lock_mode_passcode">إدخال كلمة المرور</string>
-    <string name="open_simplex_chat_to_accept_call">افتح SimpleX Chat للرد على المكالمة</string>
+    <string name="la_lock_mode_passcode">إدخال رمز المرور</string>
+    <string name="open_simplex_chat_to_accept_call">افتح SimpleX Chat لقبول المكالمة</string>
     <string name="opensource_protocol_and_code_anybody_can_run_servers">يمكن لأي شخص استضافة الخوادم.</string>
     <string name="password_to_show">كلمة المرور للإظهار</string>
     <string name="call_connection_peer_to_peer">ندّ لِندّ</string>
-    <string name="people_can_connect_only_via_links_you_share">أنت تقرر من يمكنه الاتصال.</string>
+    <string name="people_can_connect_only_via_links_you_share">أنت تقرر مَن يمكنه الاتصال.</string>
     <string name="icon_descr_call_pending_sent">مكالمة قيد الانتظار</string>
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">تقوم أجهزة العميل فقط بتخزين ملفات تعريف المستخدمين وجهات الاتصال والمجموعات والرسائل.</string>
     <string name="reset_color">صفّر الألوان</string>
@@ -879,7 +876,7 @@
     <string name="info_row_updated_at">حٌديثت السجل في</string>
     <string name="share_text_updated_at">حٌديثت السجل في: %s</string>
     <string name="restore_database_alert_confirm">استعادة</string>
-    <string name="v4_4_live_messages_desc">يرى المستلمون التحديثات أثناء كتابتها.</string>
+    <string name="v4_4_live_messages_desc">يرى المُستلمون التحديثات أثناء كتابتها.</string>
     <string name="feature_received_prohibited">استلمت، ممنوع</string>
     <string name="save_servers_button">حفظ</string>
     <string name="profile_update_will_be_sent_to_contacts">سيتم إرسال تحديث ملف التعريف إلى جهات اتصالك.</string>
@@ -907,7 +904,7 @@
     <string name="prohibit_sending_disappearing">منع إرسال الرسائل التي تختفي.</string>
     <string name="v4_5_message_draft_descr">الاحتفاظ بمسودة الرسالة الأخيرة، مع المرفقات.</string>
     <string name="v4_5_private_filenames">أسماء ملفات خاصة</string>
-    <string name="v4_6_hidden_chat_profiles_descr">حماية ملفات تعريف الدردشة الخاصة بك بكلمة مرور!</string>
+    <string name="v4_6_hidden_chat_profiles_descr">احمِ ملفات تعريف دردشتك بكلمة مرور!</string>
     <string name="callstatus_rejected">رُفضت المكالمة</string>
     <string name="protect_app_screen">حماية شاشة التطبيق</string>
     <string name="group_member_status_removed">أُزيلت</string>
@@ -915,7 +912,7 @@
     <string name="group_welcome_preview">معاينة</string>
     <string name="error_smp_test_certificate">من المحتمل أن الملف المرجعي للشهادة في عنوان الخادم غير صحيح</string>
     <string name="simplex_service_notification_text">يتم استلام الرسائل…</string>
-    <string name="observer_cant_send_message_desc">يُرجى الاتصال بمشرف المجموعة.</string>
+    <string name="observer_cant_send_message_desc">يُرجى الاتصال بمُدير المجموعة.</string>
     <string name="sync_connection_force_confirm">أعد التفاوض</string>
     <string name="sync_connection_force_question">إعادة تفاوض التعمية</string>
     <string name="revoke_file__action">سحب وصول الملف</string>
@@ -935,12 +932,12 @@
     <string name="sender_at_ts">%s في %s</string>
     <string name="save_group_profile">حفظ ملف المجموعة</string>
     <string name="color_secondary">ثانوي</string>
-    <string name="v5_1_self_destruct_passcode">كلمة مرور التدمير الذاتي</string>
+    <string name="v5_1_self_destruct_passcode">رمز المرور للتدمير الذاتي</string>
     <string name="sending_files_not_yet_supported">إرسال الملفات غير مدعوم بعد</string>
-    <string name="sender_cancelled_file_transfer">قام المرسل بإلغاء إرسال الملف</string>
+    <string name="sender_cancelled_file_transfer">أُلغيَ المرسل نقل الملف.</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(امسح أو ألصق من الحافظة)</string>
     <string name="network_option_seconds_label">ثانية</string>
-    <string name="sender_may_have_deleted_the_connection_request">قد يكون المرسل قد ألغى طلب الاتصال</string>
+    <string name="sender_may_have_deleted_the_connection_request">ربما حذف المرسل طلب الاتصال.</string>
     <string name="scan_QR_code">مسح رمز QR</string>
     <string name="send_us_an_email">أرسل لنا بريداً</string>
     <string name="scan_code_from_contacts_app">مسح رمز الأمان من تطبيق جهة الاتصال</string>
@@ -948,65 +945,65 @@
     <string name="stop_snd_file__message">سيتم إيقاف إرسال الملف.</string>
     <string name="icon_descr_send_message">إرسال رسالة</string>
     <string name="send_disappearing_message_send">إرسال</string>
-    <string name="send_live_message">إرسال رسالة حية</string>
+    <string name="send_live_message">أرسل رسالة حيّة</string>
     <string name="smp_servers_test_failed">فشلت تجربة الخادم!</string>
-    <string name="save_passphrase_in_keychain">حفظ كلمة المرور في مخزن المفاتيح</string>
+    <string name="save_passphrase_in_keychain">احفظ عبارة المرور في Keystore</string>
     <string name="button_send_direct_message">أرسل رسالة مباشرة</string>
     <string name="sending_via">إرسال عبر</string>
     <string name="conn_stats_section_title_servers">الخوادم</string>
     <string name="v4_2_security_assessment">تقييم الأمان</string>
     <string name="v4_4_disappearing_messages_desc">الرسائل المرسلة سيتم حذفها بعد المدة المحدّدة.</string>
     <string name="v4_6_group_welcome_message_descr">تعيين رسالة تظهر للأعضاء الجدد!</string>
-    <string name="set_passcode">تعيين كلمة المرور</string>
+    <string name="set_passcode">عيّن رمز المرور</string>
     <string name="share_text_sent_at">تم إرساله في: %s</string>
     <string name="current_version_timestamp">%s (الحالي)</string>
     <string name="color_sent_message">رسالة مرسلة</string>
     <string name="set_group_preferences">عيّن تفضيلات المجموعة</string>
-    <string name="v5_0_app_passcode_descr">عيينها بدلا من توثيق النظام</string>
+    <string name="v5_0_app_passcode_descr">عيّنها بدلاً من استيثاق النظام.</string>
     <string name="share_verb">مشاركة</string>
     <string name="send_verb">إرسال</string>
-    <string name="save_passphrase_and_open_chat">حفظ كلمة المرور وفتح الدردشة</string>
-    <string name="select_contacts">حدد جهات اتصال</string>
+    <string name="save_passphrase_and_open_chat">احفظ عبارة المرور وافتح الدردشة</string>
+    <string name="select_contacts">حدد جهات الاتصال</string>
     <string name="accept_feature_set_1_day">تعيين يوم واحد</string>
     <string name="custom_time_unit_seconds">ثواني</string>
     <string name="sent_message">رسالة مرسلة</string>
     <string name="send_disappearing_message">أرسل رسالة تختفي</string>
-    <string name="save_profile_password">حفظ كلمة مرور الحساب</string>
+    <string name="save_profile_password">حفظ كلمة مرور ملف التعريف</string>
     <string name="self_destruct">تدمير ذاتي</string>
-    <string name="scan_code">مسح الكود</string>
-    <string name="chat_with_the_founder">إرسال أسئلة وأفكار</string>
+    <string name="scan_code">مسح الرمز</string>
+    <string name="chat_with_the_founder">أرسل أسئلة وأفكار</string>
     <string name="share_address_with_contacts_question">مشاركة العنوان مع جهات الاتصال؟</string>
     <string name="share_address">مشاركة العنوان</string>
     <string name="save_welcome_message_question">حفظ رسالة الترحيب؟</string>
-    <string name="smp_servers_save">حفظ السيرفرات</string>
-    <string name="settings_section_title_delivery_receipts">أرسل تقارير الاستلام إلى</string>
-    <string name="receipts_contacts_override_disabled">إرسال تقارير الاستلام معطل لـ %d جهة اتصال.</string>
-    <string name="receipts_contacts_override_enabled">إرسال تقارير الاستلام مفعل لـ %d جهة اتصال</string>
-    <string name="set_password_to_export">تعيين كلمة المرور للتصدير</string>
+    <string name="smp_servers_save">احفظ الخوادم</string>
+    <string name="settings_section_title_delivery_receipts">أرسل إيصالات التسليم إلى</string>
+    <string name="receipts_contacts_override_disabled">إرسال الإيصالات مُعطَّل لـ %d جهة اتصال.</string>
+    <string name="receipts_contacts_override_enabled">إرسال الإيصالات مفعّل لـ %d جهة اتصال</string>
+    <string name="set_password_to_export">عيّن عبارة المرور للتصدير</string>
     <string name="rcv_conn_event_verification_code_reset">تم تغيير رمز الأمان</string>
-    <string name="send_receipts">تقارير الارسال</string>
+    <string name="send_receipts">إيصالات الإرسال</string>
     <string name="info_row_sent_at">تم إرساله في</string>
     <string name="custom_time_picker_select">حدد</string>
-    <string name="sending_delivery_receipts_will_be_enabled">إرسال تقارير الاستلام سيتم تفعيله لجميع جهات الاتصال.</string>
-    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">سيتم تفعيل إرسال تقارير الاستلام لجميع جهات الاتصال ذات حسابات دردشة ظاهرة</string>
+    <string name="sending_delivery_receipts_will_be_enabled">سيتم تفعيل إرسال إيصالات التسليم لجميع جهات الاتصال.</string>
+    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">سيتم تفعيل إرسال إيصالات التسليم لجميع جهات الاتصال في جميع ملفات تعريف الدردشة المرئية.</string>
     <string name="smp_server_test_secure_queue">قائمة انتظار آمنة</string>
     <string name="icon_descr_sent_msg_status_send_failed">فشل الإرسال</string>
-    <string name="icon_descr_sent_msg_status_sent">تم الإرسال</string>
+    <string name="icon_descr_sent_msg_status_sent">أُرسلت</string>
     <string name="text_field_set_contact_placeholder">تعيين اسم جهة الاتصال…</string>
-    <string name="send_live_message_desc">إرسال رسالة حية - سيتم تحديثها للمستلم مع كتابتك لها</string>
+    <string name="send_live_message_desc">أرسل رسالة حيّة - سيتم تحديثها للمُستلم مع كتابتك لها</string>
     <string name="set_contact_name">تعيين اسم جهة الاتصال</string>
     <string name="icon_descr_settings">الإعدادات</string>
     <string name="smp_save_servers_question">حفظ الخوادم؟</string>
     <string name="smp_servers_scan_qr">مسح رمز QR الخادم</string>
     <string name="security_code">رمز الأمان</string>
-    <string name="save_preferences_question">حفظ الإعدادات؟</string>
+    <string name="save_preferences_question">حفظ التفضيلات؟</string>
     <string name="save_settings_question">حفظ الإعدادات؟</string>
     <string name="secret_text">سري</string>
-    <string name="self_destruct_passcode">كلمة مرور التدمير الذاتي</string>
-    <string name="self_destruct_passcode_changed">تم تغيير كلمة مرور التدمير الذاتي!</string>
-    <string name="self_destruct_passcode_enabled">تم تفعيل كلمة مرور التدمير الذاتي</string>
+    <string name="self_destruct_passcode">رمز المرور للتدمير الذاتي</string>
+    <string name="self_destruct_passcode_changed">تغيّرت رمز المرور للتدمير الذاتي!</string>
+    <string name="self_destruct_passcode_enabled">فعّلت رمز المرور للتدمير الذاتي!</string>
     <string name="settings_section_title_settings">الإعدادات</string>
-    <string name="simplex_link_invitation">دعوة لمرة واحدة SimpleX</string>
+    <string name="simplex_link_invitation">دعوة SimpleX لمرة واحدة</string>
     <string name="notification_preview_mode_message_desc">عرض جهة الاتصال والرسالة</string>
     <string name="la_notice_title_simplex_lock">قفل SimpleX</string>
     <string name="is_not_verified">لم يتحقق من %s</string>
@@ -1033,7 +1030,7 @@
     <string name="stop_chat_confirmation">إيقاف</string>
     <string name="settings_notification_preview_mode_title">عرض المعاينة</string>
     <string name="icon_descr_speaker_off">السماعة متوقفة</string>
-    <string name="la_lock_mode">وضع قفل SimpleX</string>
+    <string name="la_lock_mode">SimpleX وضع القفل</string>
     <string name="share_link">مشاركة الرابط</string>
     <string name="alert_title_skipped_messages">الرسائل التي تم تخطيها</string>
     <string name="simplex_address">عنوان SimpleX</string>
@@ -1069,7 +1066,7 @@
     <string name="network_socks_proxy_settings">إعدادات وكيل SOCKS</string>
     <string name="settings_shutdown">إيقاف التشغيل</string>
     <string name="icon_descr_speaker_on">السماعة قيد التشغيل</string>
-    <string name="submit_passcode">إرسال</string>
+    <string name="submit_passcode">أرسل</string>
     <string name="language_system">النظام</string>
     <string name="theme">السمة</string>
     <string name="to_start_a_new_chat_help_header">لبدء محادثة جديدة</string>
@@ -1077,7 +1074,7 @@
     <string name="group_is_decentralized">لامركزية بالكامل – مرئية للأعضاء فقط.</string>
     <string name="theme_system">النظام</string>
     <string name="error_smp_test_failed_at_step">فشل الاختبار في الخطوة %s.</string>
-    <string name="v4_5_italian_interface_descr">بفضل المستخدمين - المساهمة عبر Weblate!</string>
+    <string name="v4_5_italian_interface_descr">بفضل المستخدمين - ساهِم عبر Weblate!</string>
     <string name="periodic_notifications_desc">يجلب التطبيق الرسائل الجديدة بشكل دوري - يستخدم نسبة قليلة من البطارية يوميًا. لا يستخدم التطبيق إشعارات الدفع - لا يتم إرسال البيانات من جهازك إلى الخوادم.</string>
     <string name="connection_you_accepted_will_be_cancelled">سيتم إلغاء الاتصال الذي قبلته!</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">لن تتمكن جهة الاتصال التي شاركت هذا الرابط معها من الاتصال!</string>
@@ -1085,26 +1082,26 @@
     <string name="to_protect_privacy_simplex_has_ids_for_queues">لحماية خصوصيتك، يستخدم SimpleX معرّفات منفصلة لكل جهة اتصال لديك.</string>
     <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">لحماية معلوماتك، فعّل قفل SimpleX \nسيُطلب منك إكمال المصادقة قبل تفعيل هذه الميزة.</string>
     <string name="network_session_mode_transport_isolation">عزل النقل</string>
-    <string name="v4_4_french_interface_descr">بفضل المستخدمين - المساهمة عبر Weblate!</string>
+    <string name="v4_4_french_interface_descr">بفضل المستخدمين - ساهِم عبر Weblate!</string>
     <string name="v4_6_audio_video_calls_descr">دعم البلوتوث وتحسينات أخرى.</string>
-    <string name="v5_0_polish_interface_descr">بفضل المستخدمين - المساهمة عبر Weblate!</string>
+    <string name="v5_0_polish_interface_descr">بفضل المستخدمين - ساهِم عبر Weblate!</string>
     <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[لتحسين الخصوصية، <b>يتم تشغيل SimpleX في الخلفية</b> بدلاً من استخدام إشعارات push.]]></string>
     <string name="tap_to_start_new_chat">انقر لبدء محادثة جديدة</string>
     <string name="to_share_with_your_contact">(للمشاركة مع جهة اتصالك)</string>
     <string name="to_connect_via_link_title">للتواصل عبر الرابط</string>
     <string name="scan_qr_to_connect_to_contact">للاتصال، يمكن لجهة الاتصال مسح رمز QR أو استخدام الرابط في التطبيق.</string>
-    <string name="smp_servers_test_servers">خوادم الاختبار</string>
+    <string name="smp_servers_test_servers">اختبر الخوادم</string>
     <string name="first_platform_without_user_ids">لا معرّفات مُستخدم</string>
     <string name="settings_section_title_support">دعم SIMPLEX CHAT</string>
     <string name="switch_verb">تبديل</string>
     <string name="color_title">العنوان الرئيسي</string>
     <string name="moderate_message_will_be_marked_warning">سيتم وضع علامة على الرسالة على أنها تحت الإشراف لجميع الأعضاء.</string>
     <string name="group_invitation_tap_to_join">انقر للانضمام</string>
-    <string name="to_reveal_profile_enter_password">للكشف عن ملف تعريفك المخفي، أدخل كلمة مرور كاملة في حقل البحث في صفحة ملفات تعريف الدردشة الخاصة بك.</string>
+    <string name="to_reveal_profile_enter_password">للكشف عن ملف تعريفك المخفي، أدخل كلمة مرور كاملة في حقل البحث في صفحة ملفات تعريف دردشتك.</string>
     <string name="group_invitation_tap_to_join_incognito">انقر للانضمام إلى وضع التخفي</string>
     <string name="la_mode_system">النظام</string>
     <string name="settings_section_title_themes">السمات</string>
-    <string name="v4_6_chinese_spanish_interface_descr">بفضل المستخدمين - المساهمة عبر Weblate!</string>
+    <string name="v4_6_chinese_spanish_interface_descr">بفضل المستخدمين - ساهِم عبر Weblate!</string>
     <string name="database_initialization_error_desc">قاعدة البيانات لا تعمل بشكل صحيح. انقر لمعرفة المزيد</string>
     <string name="theme_colors_section_title">ألوان الواجهة</string>
     <string name="tap_to_activate_profile">انقر لتنشيط ملف التعريف.</string>
@@ -1115,7 +1112,7 @@
     <string name="network_option_tcp_connection_timeout">انتهت مهلة اتصال TCP</string>
     <string name="v4_5_private_filenames_descr">لحماية المنطقة الزمنية، تستخدم ملفات الصور / الصوت التوقيت العالمي المنسق (UTC).</string>
     <string name="v5_2_message_delivery_receipts_descr">فقدنا القراد الثاني! ✅</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">بفضل المستخدمين - المساهمة عبر Weblate!</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">بفضل المستخدمين - ساهِم عبر Weblate!</string>
     <string name="database_backup_can_be_restored">لم تكتمل محاولة تغيير عبارة مرور قاعدة البيانات.</string>
     <string name="enter_passphrase_notification_desc">لاستلام الإشعارات، يُرجى إدخال عبارة مرور قاعدة البيانات</string>
     <string name="la_lock_mode_system">مصادقة النظام</string>
@@ -1126,7 +1123,7 @@
     <string name="videos_limit_title">مقاطع الفيديو كثيرة!</string>
     <string name="chat_help_tap_button">زر النقر</string>
     <string name="thank_you_for_installing_simplex">شكرًا لك على تثبيت SimpleX Chat!</string>
-    <string name="smp_servers_test_server">خادم الاختبار</string>
+    <string name="smp_servers_test_server">اختبر الخادم</string>
     <string name="alert_text_msg_bad_hash">تجزئة الرسالة السابقة مختلفة.</string>
     <string name="alert_text_msg_bad_id">معرف الرسالة التالية غير صحيح (أقل أو يساوي السابق).
 \nيمكن أن يحدث ذلك بسبب بعض العلل أو عندما يُخترق الاتصال.</string>
@@ -1144,8 +1141,8 @@
     <string name="sender_you_pronoun">أنت</string>
     <string name="description_you_shared_one_time_link">لقد شاركت رابط لمرة واحدة</string>
     <string name="profile_will_be_sent_to_contact_sending_link">سيتم إرسال ملف التعريفك إلى جهة الاتصال التي استلمت منها هذا الرابط.</string>
-    <string name="you_will_join_group">سوف تتصل بجميع أعضاء المجموعة.</string>
-    <string name="your_chat_profiles">ملفات تعريف الدردشة الخاصة بك</string>
+    <string name="you_will_join_group">ستتصل بجميع أعضاء المجموعة.</string>
+    <string name="your_chat_profiles">ملفات تعريف دردشتك</string>
     <string name="your_simplex_contact_address">عنوان SimpleX الخاص بك</string>
     <string name="your_SMP_servers">خوادم SMP الخاصة بك</string>
     <string name="onboarding_notifications_mode_off">عندما يكون التطبيق قيد التشغيل</string>
@@ -1160,8 +1157,8 @@
     <string name="verify_security_code">تحقق من رمز الأمان</string>
     <string name="v4_3_voice_messages">رسائل صوتية</string>
     <string name="you_can_accept_or_reject_connection">عندما يطلب الأشخاص الاتصال، يمكنك قبوله أو رفضه.</string>
-    <string name="you_will_be_connected_when_group_host_device_is_online">سوف تكون متصلاً بالمجموعة عندما يكون جهاز مضيف المجموعة متصلاً بالإنترنت، يُرجى الانتظار أو التحقق لاحقًا!</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">سوف تكون متصلاً عندما يتم قبول طلب اتصالك، يُرجى الانتظار أو التحقق لاحقًا!</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">ستكون متصلاً بالمجموعة عندما يكون جهاز مضيف المجموعة متصلاً بالإنترنت، يُرجى الانتظار أو التحقق لاحقًا!</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">ستكون متصلاً عندما يتم قبول طلب اتصالك، يُرجى الانتظار أو التحقق لاحقًا!</string>
     <string name="using_simplex_chat_servers">تستخدم خوادم SimpleX Chat.</string>
     <string name="network_socks_toggle_use_socks_proxy">استخدم وكيل SOCKS</string>
     <string name="network_use_onion_hosts">استخدم مضيفي onion.</string>
@@ -1203,21 +1200,21 @@
     <string name="description_via_one_time_link">عبر رابط لمرة واحدة</string>
     <string name="video_call_no_encryption">مكالمة الفيديو ليست مُعمّاة بين الطريفين</string>
     <string name="snd_conn_event_switch_queue_phase_completed">غيّرتَ العنوان</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">سوف تكون متصلاً عندما يكون جهاز جهة اتصالك متصلاً بالإنترنت، يُرجى الانتظار أو التحقق لاحقًا!</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">ستكون متصلاً عندما يكون جهاز جهة اتصالك متصلاً بالإنترنت، يُرجى الانتظار أو التحقق لاحقًا!</string>
     <string name="snd_group_event_user_left">غادرت</string>
-    <string name="you_must_use_the_most_recent_version_of_database">يجب عليك استخدام أحدث إصدار من قاعدة بيانات الدردشة الخاصة بك على جهاز واحد فقط، وإلا فقد تتوقف عن تلقي الرسائل من بعض جهات الاتصال.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">يجب عليك استخدام أحدث إصدار من قاعدة بيانات دردشتك على جهاز واحد فقط، وإلا فقد تتوقف عن تلقي الرسائل من بعض جهات الاتصال.</string>
     <string name="video_will_be_received_when_contact_is_online">سيتم استلام الفيديو عندما تكون جهة اتصالك متصلة بالإنترنت، يُرجى الانتظار أو التحقق لاحقًا!</string>
     <string name="you_can_share_this_address_with_your_contacts">يمكنك مشاركة هذا العنوان مع جهات اتصالك للسماح لهم بالاتصال بـ%s.</string>
     <string name="snd_group_event_member_deleted">أُزيلت %1$s</string>
-    <string name="update_database">تحديث</string>
-    <string name="database_is_not_encrypted">قاعدة بيانات الدردشة الخاصة بك غير مُعمّاة - عيّن عبارة مرور لحمايتها.</string>
+    <string name="update_database">حدّث</string>
+    <string name="database_is_not_encrypted">قاعدة بيانات دردشتك غير مُعمّاة - عيّن عبارة مرور لحمايتها.</string>
     <string name="wrong_passphrase">عبارة مرور قاعدة بيانات خاطئة</string>
     <string name="group_main_profile_sent">سيتم إرسال ملف تعريف الدردشة الخاص بك إلى أعضاء المجموعة</string>
     <string name="personal_welcome">مرحبًا! %1$s</string>
     <string name="contact_wants_to_connect_with_you">يريد الاتصال بك!</string>
     <string name="your_ice_servers">خوادم ICE الخاصة بك</string>
     <string name="your_privacy">خصوصيتك</string>
-    <string name="rcv_group_event_updated_group_profile">حدثت ملف تعريف المجموعة</string>
+    <string name="rcv_group_event_updated_group_profile">حُدثت ملف تعريف المجموعة</string>
     <string name="group_info_member_you">أنت: %1$s</string>
     <string name="update_network_settings_confirmation">تحديث</string>
     <string name="update_network_settings_question">تحديث إعدادات الشبكة؟</string>
@@ -1235,7 +1232,7 @@
     <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">سيتم حذف قاعدة بيانات الدردشة الحالية واستبدالها بالقاعدة المستوردة.
 \nلا يمكن التراجع عن هذا الإجراء - سيتم فقد ملف التعريف وجهات الاتصال والرسائل والملفات الخاصة بك بشكل نهائي.</string>
     <string name="update_database_passphrase">تحديث عبارة مرور قاعدة البيانات</string>
-    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">سوف تتوقف عن تلقي الرسائل من هذه المجموعة. سيتم الاحتفاظ بسجل الدردشة.</string>
+    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">ستتوقف عن تلقي الرسائل من هذه المجموعة. سيتم الاحتفاظ بسجل الدردشة.</string>
     <string name="custom_time_unit_weeks">أسابيع</string>
     <string name="you_can_hide_or_mute_user_profile">يمكنك إخفاء أو كتم ملف تعريف المستخدم - اضغط مطولاً للقائمة.</string>
     <string name="whats_new">ما هو الجديد</string>
@@ -1260,16 +1257,14 @@
     <string name="smp_servers_use_server_for_new_conn">استخدم للاتصالات الجديدة</string>
     <string name="smp_servers_use_server">استخدم الخادم</string>
     <string name="smp_servers_your_server_address">عنوان خادمك</string>
-    <string name="your_chat_database">قاعدة بيانات الدردشة الخاصة بك</string>
+    <string name="your_chat_database">قاعدة بيانات دردشتك</string>
     <string name="you_are_invited_to_group_join_to_connect_with_group_members">أنت مدعو إلى المجموعة. انضم للتواصل مع أعضاء المجموعة.</string>
-    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">لقد انضممت إلى هذه المجموعة. الاتصال بدعوة عضو المجموعة.</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">لقد انضممت إلى هذه المجموعة. جارِ الاتصال بدعوة عضو المجموعة.</string>
     <string name="snd_conn_event_switch_queue_phase_completed_for_member">غيّرتَ العنوان ل%s</string>
     <string name="unhide_chat_profile">إلغاء إخفاء ملف تعريف الدردشة</string>
     <string name="voice_prohibited_in_this_chat">الرسائل الصوتية ممنوعة في هذه الدردشة.</string>
     <string name="v5_0_large_files_support">مقاطع فيديو وملفات تصل إلى 1 جيجا بايت</string>
-    <string name="v5_1_better_messages_descr">- رسائل صوتية تصل إلى 5 دقائق.
-\n- الوقت المخصص لتختفي.
-\n- تحرير التاريخ.</string>
+    <string name="v5_1_better_messages_descr">- رسائل صوتية تصل إلى 5 دقائق.\n- الوقت المخصص لتختفي.\n- تحرير التاريخ.</string>
     <string name="you_can_enable_delivery_receipts_later">يمكنك تفعيلة لاحقًا عبر الإعدادات</string>
     <string name="you_can_enable_delivery_receipts_later_alert">يمكنك تفعيلها لاحقًا عبر إعدادات الخصوصية والأمان للتطبيق.</string>
     <string name="description_via_group_link">عبر رابط المجموعة</string>
@@ -1350,12 +1345,12 @@
     <string name="database_encryption_will_be_updated_in_settings">سيتم تحديث عبارة مرور تعمية قاعدة البيانات وتخزينها في الإعدادات.</string>
     <string name="remove_passphrase_from_settings">هل تريد إزالة عبارة المرور من الإعدادات؟</string>
     <string name="use_random_passphrase">استخدم عبارة مرور عشوائية</string>
-    <string name="save_passphrase_in_settings">حفظ عبارة المرور في الإعدادات</string>
-    <string name="setup_database_passphrase">إعداد كلمة المرور لقاعدة البيانات</string>
-    <string name="set_database_passphrase">تعيين عبارة مرور قاعدة البيانات</string>
+    <string name="save_passphrase_in_settings">احفظ عبارة المرور في الإعدادات</string>
+    <string name="setup_database_passphrase">إعداد عبارة المرور لقاعدة البيانات</string>
+    <string name="set_database_passphrase">عيّن عبارة مرور قاعدة البيانات</string>
     <string name="open_database_folder">افتح مجلد قاعدة البيانات</string>
     <string name="passphrase_will_be_saved_in_settings">سيتم تخزين عبارة المرور في الإعدادات كنص عادي بعد تغييرها أو إعادة تشغيل التطبيق.</string>
-    <string name="settings_is_storing_in_clear_text">يُخزين عبارة المرور في الإعدادات كنص عادي.</string>
+    <string name="settings_is_storing_in_clear_text">عبارة المرور مخزنة في الإعدادات كنص عادي.</string>
     <string name="socks_proxy_setting_limitations"><![CDATA[<b>يُرجى الملاحظة</b>: يتم توصيل مرحلات الرسائل والملفات عبر وكيل SOCKS. تستخدم المكالمات وإرسال معاينات الروابط الاتصال المباشر.]]></string>
     <string name="encrypt_local_files">عَمِّ الملفات المحلية</string>
     <string name="v5_3_encrypt_local_files">عَمِّ الملفات والوسائط المخزنة</string>
@@ -1365,9 +1360,7 @@
     <string name="v5_3_discover_join_groups">اكتشاف والانضمام إلى المجموعات</string>
     <string name="v5_3_new_interface_languages_descr">العربية والبلغارية والفنلندية والعبرية والتايلاندية والأوكرانية - شكرًا للمستخدمين و Weblate.</string>
     <string name="v5_3_new_desktop_app_descr">إنشاء ملف تعريف جديد في تطبيق سطح المكتب. 💻</string>
-    <string name="v5_3_discover_join_groups_descr">- الاتصال بخدمة الدليل (تجريبي)!
-\n- إيصالات التسليم (ما يصل إلى 20 عضوا).
-\n- أسرع وأكثر استقرارًا.</string>
+    <string name="v5_3_discover_join_groups_descr">- الاتصال بخدمة الدليل (تجريبي)!\n- إيصالات التسليم (ما يصل إلى 20 عضوا).\n- أسرع وأكثر استقرارًا.</string>
     <string name="rcv_group_event_open_chat">افتح</string>
     <string name="error_creating_member_contact">حدث خطأ أثناء إنشاء جهة اتصال للعضو</string>
     <string name="compose_send_direct_message_to_connect">أرسل رسالة مباشرة للاتصال</string>
@@ -1444,7 +1437,7 @@
     <string name="v5_4_incognito_groups">مجموعات التخفي</string>
     <string name="group_members_n">%s و%s و%d عضو</string>
     <string name="this_device">هذا الجهاز</string>
-    <string name="moderated_items_description">%1$d من الرسائل يُشرف عليها بواسطة %2$s</string>
+    <string name="moderated_items_description">%1$d من الرسائل أُشرف عليها بواسطة %2$s</string>
     <string name="unblock_member_button">إلغاء حظر العضو</string>
     <string name="remote_host_was_disconnected_toast"><![CDATA[جوّال <b>%s</b> قُطع اتصاله]]></string>
     <string name="waiting_for_desktop">في انتظار سطح المكتب…</string>
@@ -1482,7 +1475,7 @@
     <string name="verify_code_with_desktop">تحقق من الرمز مع سطح المكتب</string>
     <string name="scan_qr_code_from_desktop">مسح رمز QR من سطح المكتب</string>
     <string name="unblock_member_confirmation">إلغاء الحظر</string>
-    <string name="v5_4_more_things_descr">- إشعار اختياريًا جهات الاتصال المحذوفة. \n- أسماء الملفات التعريفية بمسافات. \n- و اكثر!</string>
+    <string name="v5_4_more_things_descr">- إشعار اختياريًا جهات الاتصال المحذوفة.\n- أسماء الملفات التعريفية بمسافات.\n- و اكثر!</string>
     <string name="non_content_uri_alert_title">مسار الملف غير صالح</string>
     <string name="connect_plan_you_have_already_requested_connection_via_this_address">لقد طلبت بالفعل الاتصال عبر هذا العنوان!</string>
     <string name="terminal_always_visible">إظهار وحدة التحكم في نافذة جديدة</string>
@@ -1596,7 +1589,7 @@
     <string name="unblock_for_all_question">إلغاء حظر العضو للجميع؟</string>
     <string name="unblock_for_all">إلغاء الحظر للجميع</string>
     <string name="error_blocking_member_for_all">حدث خطأ أثناء حظر العضو للجميع</string>
-    <string name="blocked_by_admin_items_description">حُظر %d رسالة من قبل المشرف</string>
+    <string name="blocked_by_admin_items_description">حُظرت %d رسالة من قبل المُدير</string>
     <string name="rcv_group_event_member_blocked">محظور %s</string>
     <string name="rcv_group_event_member_unblocked">أُلغيت حظر %s</string>
     <string name="snd_group_event_member_blocked">حظرت %s</string>
@@ -1604,8 +1597,8 @@
     <string name="member_info_member_blocked">محظور</string>
     <string name="block_for_all">حظر للجميع</string>
     <string name="block_for_all_question">حظر العضو للجميع؟</string>
-    <string name="blocked_by_admin_item_description">محظور من قبل المشرف</string>
-    <string name="member_blocked_by_admin">محظور من قبل المشرف</string>
+    <string name="blocked_by_admin_item_description">محظور من قبل المُدير</string>
+    <string name="member_blocked_by_admin">محظور من قبل المُدير</string>
     <string name="message_too_large">الرسالة كبيرة جدًا</string>
     <string name="welcome_message_is_too_long">رسالة الترحيب طويلة جدًا</string>
     <string name="database_migration_in_progress">ترحيل قاعدة البيانات قيد التقدم.
@@ -1616,10 +1609,10 @@
     <string name="unable_to_open_browser_desc">متصفح الويب الافتراضي مطلوب للمكالمات. يُرجى تضبيط المتصفح الافتراضي في النظام، ومشاركة المزيد من المعلومات مع المطورين.</string>
     <string name="unable_to_open_browser_title">حدث خطأ أثناء فتح المتصفح</string>
     <string name="migrate_from_device_archive_and_upload">أرشفة و رفع</string>
-    <string name="v5_6_safer_groups_descr">يمكن للمشرفين حظر عضو للجميع.</string>
+    <string name="v5_6_safer_groups_descr">يمكن للمُدراء حظر عضو للجميع.</string>
     <string name="v5_6_app_data_migration">ترحيل بيانات التطبيق</string>
     <string name="migrate_from_device_archiving_database">جارِ أرشفة قاعدة البيانات</string>
-    <string name="migrate_from_device_all_data_will_be_uploaded">سيتم تعمية جميع جهات الاتصال والمحادثات والملفات الخاصة بك بشكل آمن ورفعها في أجزاء إلى مُرحلات XFTP التي ضُبطت.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">جميع جهات الاتصال، المحادثات والملفات الخاصة بك سيتم تشفيرها بأمان ورفعها على شكل أجزاء إلى موجهات XFTP المُعدة.</string>
     <string name="migrate_to_device_apply_onion">طبّق</string>
     <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>يُرجى ملاحظة</b>: استخدام نفس قاعدة البيانات على جهازين سيؤدي إلى كسر فك تعمية الرسائل من اتصالاتك، كحماية أمنية.]]></string>
     <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>تحذير</b>: سيتم حذف الأرشيف.]]></string>
@@ -1715,7 +1708,7 @@
     <string name="feature_roles_all_members">كل الأعضاء</string>
     <string name="group_members_can_send_simplex_links">يمكن للأعضاء إرسال روابط SimpleX.</string>
     <string name="simplex_links_are_prohibited_in_group">روابط SimpleX محظورة.</string>
-    <string name="feature_roles_admins">المشرفين</string>
+    <string name="feature_roles_admins">المُدراء</string>
     <string name="feature_enabled_for">مفعّل لـ</string>
     <string name="feature_roles_owners">المالكون</string>
     <string name="files_and_media_not_allowed">الملفات والوسائط غير مسموح بها</string>
@@ -1742,7 +1735,7 @@
     <string name="v5_7_network">إدارة الشبكة</string>
     <string name="v5_7_network_descr">اتصال شبكة أكثر موثوقية.</string>
     <string name="settings_section_title_profile_images">صور ملف التعريف</string>
-    <string name="v5_7_shape_profile_images">شكل الصور التعريفية</string>
+    <string name="v5_7_shape_profile_images">شكّل الصور التعريفية</string>
     <string name="v5_7_new_interface_languages">واجهة المستخدم الليتوانية</string>
     <string name="v5_7_shape_profile_images_descr">مربع أو دائرة أو أي شيء بينهما.</string>
     <string name="srv_error_host">عنوان الخادم غير متوافق مع إعدادات الشبكة.</string>
@@ -1850,8 +1843,7 @@
     <string name="cannot_share_message_alert_title">لا يمكن إرسال الرسالة</string>
     <string name="cannot_share_message_alert_text">تفضيلات الدردشة المحدّدة تحظر هذه الرسالة.</string>
     <string name="servers_info_details">التفاصيل</string>
-    <string name="servers_info_private_data_disclaimer">بدءًا من %s.
-\nجميع البيانات خاصة بجهازك.</string>
+    <string name="servers_info_private_data_disclaimer">بدءًا من %s.\nجميع البيانات خاصة على جهازك.</string>
     <string name="servers_info_detailed_statistics_sent_messages_total">أرسلت الإجمالي</string>
     <string name="size">الحجم</string>
     <string name="uploaded_files">الملفات المرفوعة</string>
@@ -1861,14 +1853,14 @@
     <string name="network_error_broker_version_desc">إصدار الخادم غير متوافق مع تطبيقك: %1$s.</string>
     <string name="member_inactive_title">العضو غير نشط</string>
     <string name="message_forwarded_title">رسالة محوّلة</string>
-    <string name="message_forwarded_desc">لا يوجد اتصال مباشر حتى الآن، يتم تحويل من قِبل المشرف.</string>
+    <string name="message_forwarded_desc">لا يوجد اتصال مباشر حتى الآن، يتم تحويل من قِبل المُدير.</string>
     <string name="scan_paste_link">امسح / ألصِق الرابط</string>
     <string name="smp_servers_configured">خوادم SMP المهيأة</string>
     <string name="smp_servers_other">خوادم SMP أخرى</string>
     <string name="xftp_servers_configured">خوادم XFTP المهيأة</string>
     <string name="xftp_servers_other">خوادم XFTP أخرى</string>
     <string name="subscription_percentage">أظهِر النسبة المئوية</string>
-    <string name="app_check_for_updates_disabled">مُعطّل</string>
+    <string name="app_check_for_updates_disabled">مُعطَّل</string>
     <string name="app_check_for_updates_stable">مستقرّ</string>
     <string name="app_check_for_updates_update_available">يتوفر تحديث: %s</string>
     <string name="app_check_for_updates_notice_title">التمس التحديثات</string>
@@ -1879,7 +1871,7 @@
     <string name="app_check_for_updates_button_remind_later">تذكر لاحقا</string>
     <string name="app_check_for_updates_button_skip">تخطي هذه النسخة</string>
     <string name="app_check_for_updates_canceled">أُلغيت تنزيل التحديث</string>
-    <string name="member_info_member_disabled">مُعطّل</string>
+    <string name="member_info_member_disabled">مُعطَّل</string>
     <string name="member_info_member_inactive">غير نشط</string>
     <string name="servers_info">معلومات الخوادم</string>
     <string name="servers_info_target">عرض المعلومات ل</string>
@@ -1916,7 +1908,7 @@
     <string name="other_label">أخرى</string>
     <string name="proxied">موّكل</string>
     <string name="secured">مؤمن</string>
-    <string name="send_errors">أرسِل الأخطاء</string>
+    <string name="send_errors">أرسل الأخطاء</string>
     <string name="sent_directly">أُرسلت مباشرةً</string>
     <string name="sent_via_proxy">مُرسَل عبر الوكيل</string>
     <string name="subscribed">مشترك</string>
@@ -1976,9 +1968,9 @@
     <string name="privacy_media_blur_radius">تمويه الوسائط</string>
     <string name="privacy_media_blur_radius_medium">متوسط</string>
     <string name="privacy_media_blur_radius_soft">ناعم</string>
-    <string name="info_view_call_button">المكالمة</string>
+    <string name="info_view_call_button">مكالمة</string>
     <string name="info_view_connect_button">اتصل</string>
-    <string name="info_view_message_button">الرسالة</string>
+    <string name="info_view_message_button">مراسلة</string>
     <string name="info_view_open_button">افتح</string>
     <string name="info_view_search_button">بحث</string>
     <string name="toolbar_settings">الإعدادات</string>
@@ -2009,7 +2001,7 @@
     <string name="you_need_to_allow_calls">يجب عليك السماح لجهات اتصالك بالاتصال حتى تتمكن من الاتصال بها.</string>
     <string name="calls_prohibited_ask_to_enable_calls_alert_text">يُرجى الطلب من جهة اتصالك تفعيل المكالمات.</string>
     <string name="delete_members_messages__question">حذف %d رسائل الأعضاء؟</string>
-    <string name="delete_messages_mark_deleted_warning">سيتم وضع علامة على الرسائل للحذف. سيتمكن المستلم/(المستلمون) من الكشف عن هذه الرسائل.</string>
+    <string name="delete_messages_mark_deleted_warning">سيتم وضع علامة على الرسائل للحذف. سيتمكن المُستلم/(المُستلمون) من الكشف عن هذه الرسائل.</string>
     <string name="select_verb">حدد</string>
     <string name="moderate_messages_will_be_deleted_warning">سيتم حذف الرسائل لجميع الأعضاء.</string>
     <string name="moderate_messages_will_be_marked_warning">سيتم وضع علامة على الرسائل على أنها تحت الإشراف لجميع الأعضاء.</string>
@@ -2049,15 +2041,14 @@
     <string name="reset_all_hints">صفّر كافة التلميحات</string>
     <string name="error_parsing_uri_desc">يُرجى التأكد من أن رابط SimpleX صحيح.</string>
     <string name="error_parsing_uri_title">الرابط غير صالح</string>
-    <string name="n_file_errors">%1$d خطأ في الملف:
-\n%2$s</string>
+    <string name="n_file_errors">%1$d خطأ في الملف:\n%2$s</string>
     <string name="forward_files_failed_to_receive_desc">فشل تنزيل %1$d ملف/ات.</string>
     <string name="forward_files_not_accepted_desc">لم يتم تنزيل %1$d ملف/ات.</string>
     <string name="forward_files_not_accepted_receive_files">نزّل</string>
     <string name="new_chat_share_profile">شارك ملف التعريف</string>
     <string name="network_proxy_auth_mode_isolate_by_auth_entity">استخدم بيانات اعتماد الوكيل المختلفة لكل اتصال.</string>
     <string name="network_proxy_username">اسم المستخدم</string>
-    <string name="network_proxy_auth_mode_username_password">قد يتم إرسال بيانات الاعتماد الخاصة بك غير مُعمَّاة.</string>
+    <string name="network_proxy_auth_mode_username_password">قد يتم إرسال بيانات اعتمادك غير مُعمَّاة.</string>
     <string name="network_proxy_incorrect_config_title">خطأ في حفظ الوكيل</string>
     <string name="migrate_from_device_remove_archive_question">إزالة الأرشيف؟</string>
     <string name="system_mode_toast">وضع النظام</string>
@@ -2066,7 +2057,7 @@
     <string name="network_proxy_random_credentials">استخدم بيانات اعتماد عشوائية</string>
     <string name="settings_section_title_chat_database">قاعدة بيانات الدردشة</string>
     <string name="forward_files_missing_desc">حُذف %1$d ملف/ات.</string>
-    <string name="forward_files_in_progress_desc">لا يزال يتم تنزيل %1$d ملفًا.</string>
+    <string name="forward_files_in_progress_desc">لا يزال يتم تنزيل %1$d ملف/ات.</string>
     <string name="network_proxy_auth_mode_no_auth">لا تستخدم بيانات الاعتماد مع الوكيل.</string>
     <string name="error_forwarding_messages">خطأ في تحويل الرسائل</string>
     <string name="switching_profile_error_title">خطأ في تبديل ملف التعريف</string>
@@ -2128,7 +2119,7 @@
     <string name="onboarding_network_operators_conditions_you_can_configure">يمكنك تضبيط المُشغلين في إعدادات الشبكة والخوادم.</string>
     <string name="onboarding_network_operators_update">حدّث</string>
     <string name="onboarding_network_operators_continue">تابع</string>
-    <string name="operator_conditions_accepted">قُبل الشروط</string>
+    <string name="operator_conditions_accepted">الشروط المتفق عليها</string>
     <string name="operator_review_conditions">راجع الشروط</string>
     <string name="network_preset_servers_title">الخوادم المُعدة مسبقًا</string>
     <string name="operator_conditions_accepted_for_enabled_operators_on">سيتم قبول الشروط تلقائيًا للمُشغلين المفعّلين في: %s.</string>
@@ -2154,7 +2145,7 @@
     <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[ستطبق نفس الشروط على المُشغل/ين: <b>%s</b>.]]></string>
     <string name="operator_added_xftp_servers">أُضيفت خوادم الوسائط والملفات</string>
     <string name="operator_open_conditions">الشروط المفتوحة</string>
-    <string name="xftp_servers_per_user">الخوادم الخاصة بالملفات الجديدة لملف الدردشة الحالي الخاص بك</string>
+    <string name="xftp_servers_per_user">الخوادم الخاصة بالملفات الجديدة لملف دردشتك الحالي</string>
     <string name="operator_use_for_sending">لإرسال</string>
     <string name="error_adding_server">خطأ في إضافة الخادم</string>
     <string name="error_updating_server_title">خطأ في تحديث الخادم</string>
@@ -2165,7 +2156,7 @@
     <string name="appearance_app_toolbars">أشرطة أدوات التطبيق</string>
     <string name="appearance_bars_blur_radius">تمويه</string>
     <string name="appearance_in_app_bars_alpha">الشفافية</string>
-    <string name="v6_2_network_decentralization_enable_flux">فعّل flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">فعّل flux في إعدادات الشبكة والخوادم لتحسين خصوصية البيانات الوصفية.</string>
     <string name="v6_2_network_decentralization">اللامركزية الشبكية</string>
     <string name="v6_2_network_decentralization_descr">المُشغل المُعد مسبقًا الثاني في التطبيق!</string>
     <string name="v6_2_network_decentralization_enable_flux_reason">لتحسين خصوصية البيانات الوصفية.</string>
@@ -2180,7 +2171,7 @@
     <string name="operator_conditions_failed_to_load">لا يمكن تحميل نص الشروط الحالية، يمكنك مراجعة الشروط عبر هذا الرابط:</string>
     <string name="error_accepting_operator_conditions">خطأ في قبول الشروط</string>
     <string name="failed_to_save_servers">خطأ في حفظ الخوادم</string>
-    <string name="onboarding_network_operators_app_will_use_for_routing">على سبيل المثال، إذا تلقى أحد جهات اتصالك رسائل عبر خادم SimpleX Chat، فسوف يقوم تطبيقك بتسليمها عبر خادم Flux.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">على سبيل المثال، إذا تلقى أحد جهات اتصالك رسائل عبر خادم SimpleX Chat، فسيقوم تطبيقك بتسليمها عبر خادم Flux.</string>
     <string name="no_message_servers_configured_for_private_routing">لا يوجد خوادم لتوجيه الرسائل الخاصة.</string>
     <string name="no_message_servers_configured">لا يوجد خوادم رسائل.</string>
     <string name="no_media_servers_configured_for_private_routing">لا يوجد خوادم لاستقبال الملفات.</string>
@@ -2222,7 +2213,7 @@
     <string name="chat_archive">أو استورد ملف الأرشيف</string>
     <string name="onboarding_notifications_mode_off_desc_short">لا توجد خدمة خلفية</string>
     <string name="onboarding_notifications_mode_battery">الإشعارات والبطارية</string>
-    <string name="only_chat_owners_can_change_prefs">يمكن فقط لأصحاب الدردشة تغيير التفضيلات.</string>
+    <string name="only_chat_owners_can_change_prefs">فقط مالكي الدردشة يمكنهم تغيير التفضيلات.</string>
     <string name="v6_2_business_chats_descr">الخصوصية لعملائك.</string>
     <string name="remote_hosts_section">الجوالات عن بُعد</string>
     <string name="invite_to_chat_button">ادعُ للدردشة</string>
@@ -2236,9 +2227,153 @@
     <string name="display_name_requested_to_connect">طلبت الاتصال</string>
     <string name="maximum_message_size_reached_non_text">يُرجى تقليل حجم الرسالة أو إزالة الوسائط ثم إرسالها مرة أخرى.</string>
     <string name="maximum_message_size_reached_forwarding">يمكنك نسخ الرسالة وتقليل حجمها لإرسالها.</string>
-    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">عندما يتم تفعيل أكثر من مُشغل واحد، لن يكون لدى أي منهم بيانات تعريفية لمعرفة من يتواصل مع من.</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">عندما يتم تفعيل أكثر من مُشغل واحد، لن يكون لدى أي منهم بيانات تعريفية لمعرفة مَن يتواصل مع مَن.</string>
     <string name="member_role_will_be_changed_with_notification_chat">سيتم تغيير الدور إلى %s. وسيتم إشعار الجميع في الدردشة.</string>
     <string name="chat_main_profile_sent">سيتم إرسال ملف تعريفك للدردشة إلى أعضاء الدردشة</string>
-    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">سوف تتوقف عن تلقي الرسائل من هذه الدردشة. سيتم حفظ سجل الدردشة.</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">ستتوقف عن تلقي الرسائل من هذه الدردشة. سيتم حفظ سجل الدردشة.</string>
     <string name="onboarding_network_about_operators">عن المُشغلين</string>
-</resources>
\ No newline at end of file
+    <string name="onboarding_network_operators_simplex_flux_agreement">توصلت SimpleX Chat وFlux إلى اتفاق لتضمين الخوادم التي تديرها Flux في التطبيق.</string>
+    <string name="encryption_renegotiation_in_progress">جارِ إعادة التفاوض على التعمية.</string>
+    <string name="sync_connection_question">إصلاح الاتصال؟</string>
+    <string name="sync_connection_desc">يتطلب الاتصال إعادة التفاوض على التعمية.</string>
+    <string name="sync_connection_confirm">إصلاح</string>
+    <string name="debug_logs">فعّل السجلات</string>
+    <string name="error_saving_database">خطأ في حفظ قاعدة البيانات</string>
+    <string name="strikethrough_text">شطب</string>
+    <string name="connection_not_ready">الاتصال غير جاهز.</string>
+    <string name="list_menu">القائمة</string>
+    <string name="no_chats">لا دردشات</string>
+    <string name="no_chats_in_list">لا توجد محادثات في القائمة %s.</string>
+    <string name="no_unread_chats">لا توجد محادثات غير مقروءة</string>
+    <string name="no_chats_found">لم يتم العثور على أي محادثات</string>
+    <string name="chat_list_favorites">المفضلات</string>
+    <string name="chat_list_add_list">أضف القائمة</string>
+    <string name="chat_list_all">الكل</string>
+    <string name="chat_list_groups">المجموعات</string>
+    <string name="open_with_app">افتح باستخدام %s</string>
+    <string name="add_to_list">أضف إلى القائمة</string>
+    <string name="delete_chat_list_menu_action">احذف</string>
+    <string name="delete_chat_list_question">حذف القائمة؟</string>
+    <string name="edit_chat_list_menu_action">حرّر</string>
+    <string name="list_name_field_placeholder">اسم القائمة...</string>
+    <string name="duplicated_list_error">يجب أن يكون اسم القائمة والرموز التعبيرية مختلفين لجميع القوائم.</string>
+    <string name="save_list">احفظ القائمة</string>
+    <string name="chat_list_contacts">جهات الاتصال</string>
+    <string name="error_creating_chat_tags">خطأ في إنشاء قائمة الدردشة</string>
+    <string name="chat_list_businesses">الشركات</string>
+    <string name="error_loading_chat_tags">خطأ في تحميل قوائم الدردشة</string>
+    <string name="delete_chat_list_warning">سيتم إزالة جميع المحادثات من القائمة %s، وسيتم حذف القائمة</string>
+    <string name="create_list">أنشئ قائمة</string>
+    <string name="error_updating_chat_tags">خطأ في تحديث قائمة الدردشة</string>
+    <string name="chat_list_notes">الملحوظات</string>
+    <string name="change_list">تغيير القائمة</string>
+    <string name="change_order_chat_list_menu_action">تغيير الترتيب</string>
+    <string name="prefs_error_saving_settings">خطأ في حفظ الإعدادات</string>
+    <string name="error_creating_report">خطأ في إنشاء بلاغ</string>
+    <string name="report_item_visibility_submitter">أنت والمشرفون فقط هم من يرون ذلك</string>
+    <string name="report_item_archived">بلاغ مؤرشف</string>
+    <string name="report_item_visibility_moderators">لا يراه إلا المُرسِل والمُشرفين</string>
+    <string name="archive_verb">أرشف</string>
+    <string name="archive_report">أرشف البلاغ</string>
+    <string name="delete_report">احذف البلاغ</string>
+    <string name="report_verb">بلّغ</string>
+    <string name="report_reason_profile">ملف تعريفي غير لائق</string>
+    <string name="report_reason_spam">إزعاج (spam)</string>
+    <string name="report_reason_other">سبب آخر</string>
+    <string name="chat_list_group_reports">البلاغات</string>
+    <string name="group_reports_active_one">1 بلاغ</string>
+    <string name="group_reports_active">%d بلاغات</string>
+    <string name="group_reports_member_reports">بلاغات الأعضاء</string>
+    <string name="report_compose_reason_header_illegal">بلّغ عن المحتوى: سيراه مشرفو المجموعة فقط.</string>
+    <string name="report_compose_reason_header_other">بلّغ عن أُخرى: سيراه مشرفو المجموعة فقط.</string>
+    <string name="group_member_role_moderator">مشرف</string>
+    <string name="report_item_archived_by">بلاغ مؤرشف بواسطة %s</string>
+    <string name="report_compose_reason_header_profile">بلّغ عن ملف تعريف العضو: سيراه مشرفو المجموعة فقط.</string>
+    <string name="report_reason_community">انتهاك إرشادات المجتمع</string>
+    <string name="report_reason_illegal">محتوى غير لائق</string>
+    <string name="report_compose_reason_header_community">بلّغ عن مخالفة: سيراه مشرفو المجموعة فقط.</string>
+    <string name="report_compose_reason_header_spam">بلّغ عن إزعاج (spam): سيراه مشرفو المجموعة فقط.</string>
+    <string name="report_archive_alert_title">أرشفة البلاغ؟</string>
+    <string name="report_reason_alert_title">سبب الإبلاغ؟</string>
+    <string name="report_archive_alert_desc">سيتم أرشفة البلاغ لك.</string>
+    <string name="blocking_reason_spam">إزعاج (spam)</string>
+    <string name="privacy_chat_list_open_links_yes">نعم</string>
+    <string name="privacy_chat_list_open_links_ask">اسأل</string>
+    <string name="privacy_chat_list_open_links_no">لا</string>
+    <string name="privacy_chat_list_open_web_link">افتح الرابط</string>
+    <string name="privacy_chat_list_open_web_link_question">فتح رابط الويب؟</string>
+    <string name="connection_error_blocked">حُظر الاتصال</string>
+    <string name="privacy_chat_list_open_links">افتح الروابط من قائمة الدردشة</string>
+    <string name="blocking_reason_content">المحتوى ينتهك شروط الاستخدام</string>
+    <string name="connection_error_blocked_desc">حُظر الاتصال بواسطة مُشغل الخادم:\n%1$s.</string>
+    <string name="file_error_blocked">حُظر الملف بواسطة مُشغل الخادم:\n%1$s.</string>
+    <string name="chat_item_ttl_default">الافتراضي %s</string>
+    <string name="chat_item_ttl_year">سنة واحدة</string>
+    <string name="disable_automatic_deletion">عطّل حذف الرسائل التلقائي</string>
+    <string name="disable_automatic_deletion_question">تعطيل حذف الرسائل التلقائي؟</string>
+    <string name="disable_automatic_deletion_message">لن يتم حذف الرسائل الموجودة في هذه الدردشة أبدًا.</string>
+    <string name="chat_ttl_options_footer">احذف رسائل الدردشة من جهازك.</string>
+    <string name="text_field_set_chat_placeholder">عيّن اسم الدردشة…</string>
+    <string name="change_automatic_chat_deletion_message">لا يمكن التراجع عن هذا الإجراء - سيتم حذف الرسائل المُرسلة والمُستلمة في هذه الدردشة قبل التاريخ المحدّد.</string>
+    <string name="change_automatic_deletion_question">تغيير حذف الرسائل التلقائي؟</string>
+    <string name="network_smp_web_port_footer">استخدم منفذ TCP %1$s عندما لا يتم تحديد أي منفذ.</string>
+    <string name="network_smp_web_port_toggle">استخدم منفذ الويب</string>
+    <string name="network_smp_web_port_section_title">منفذ TCP للمُراسلة</string>
+    <string name="mute_all_chat">اكتم الكل</string>
+    <string name="unread_mentions">ذّكورات غير مقروءة</string>
+    <string name="max_group_mentions_per_message_reached">يمكنك ذكر ما يصل إلى %1$s من الأعضاء في الرسالة الواحدة!</string>
+    <string name="enable_sending_member_reports">السماح بالإبلاغ عن الرسائل إلى المشرفين.</string>
+    <string name="disable_sending_member_reports">منع الإبلاغ عن الرسائل للمشرفين.</string>
+    <string name="report_archive_alert_title_all">أرشفة كافة البلاغات؟</string>
+    <string name="archive_reports">أرشف البلاغات</string>
+    <string name="report_archive_for_all_moderators">لكل المشرفين</string>
+    <string name="report_archive_for_me">لي</string>
+    <string name="notification_group_report">بلاغ: %s</string>
+    <string name="group_members_can_send_reports">يمكن للأعضاء الإبلاغ عن الرسائل إلى المشرفين.</string>
+    <string name="report_archive_alert_desc_all">سيتم أرشفة كافة البلاغات لك.</string>
+    <string name="report_archive_alert_title_nth">أرشفة %d بلاغ؟</string>
+    <string name="member_reports_are_prohibited">يُمنع الإبلاغ عن الرسائل في هذه المجموعة.</string>
+    <string name="v6_3_organize_chat_lists_descr">لا تفوت رسائل مهمة.</string>
+    <string name="v6_3_reports_descr">مساعدة المُدراء على إشراف مجموعاتهم.</string>
+    <string name="v6_3_mentions">أذكر الأعضاء 👋</string>
+    <string name="v6_3_organize_chat_lists">نظّم الدردشات في القوائم</string>
+    <string name="v6_3_reports">أرسل بلاغات خاصة</string>
+    <string name="v6_3_set_message_expiration_in_chats">اضبط انتهاء صلاحية الرسالة في الدردشات.</string>
+    <string name="v6_3_faster_deletion_of_groups">حذف أسرع من المجموعات.</string>
+    <string name="v6_3_private_media_file_names">أسماء ملفات الوسائط خاصة.</string>
+    <string name="v6_3_mentions_descr">استلم إشعارًا عند ذكرك.</string>
+    <string name="v6_3_better_groups_performance">أداء مجموعات أفضل</string>
+    <string name="v6_3_better_privacy_and_security">خصوصية وأمان أفضل</string>
+    <string name="v6_3_faster_sending_messages">إرسال أسرع للرسائل.</string>
+    <string name="group_member_status_rejected">رُفض</string>
+    <string name="group_preview_rejected">رُفض</string>
+    <string name="error_reading_passphrase">خطأ في قراءة عبارة مرور قاعدة البيانات</string>
+    <string name="group_member_status_pending_approval_short">ينتظر</string>
+    <string name="operator_updated_conditions">حُدثت الشروط</string>
+    <string name="button_remove_members_question">إزالة الأعضاء؟</string>
+    <string name="block_members_desc">سيتم إخفاء جميع الرسائل الجديدة من هؤلاء الأعضاء!</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">سيتم إزالة الأعضاء من الدردشة - لا يمكن التراجع عن هذا!</string>
+    <string name="unblock_members_for_all_question">إلغاء حظر الأعضاء للجميع؟</string>
+    <string name="block_members_for_all_question">حظر الأعضاء للجميع؟</string>
+    <string name="unblock_members_desc">سيتم عرض رسائل من هؤلاء الأعضاء!</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">لا يمكن قراءة عبارة المرور في Keystore، يُرجى إدخالها يدويًا. قد يكون هذا قد حدث بعد تحديث النظام غير متوافق مع التطبيق. إذا لم يكن الأمر كذلك، فيُرجى التواصل مع المطورين.</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">سيتم إزالة الأعضاء من المجموعة - لا يمكن التراجع عن هذا!</string>
+    <string name="feature_roles_moderators">المشرفين</string>
+    <string name="restore_passphrase_can_not_be_read_desc">لا يمكن قراءة عبارة المرور في Keystore. قد يكون هذا قد حدث بعد تحديث النظام غير متوافق مع التطبيق. إذا لم يكن الأمر كذلك، فيُرجى التواصل مع المطورين.</string>
+    <string name="group_member_status_pending_approval">موافقة الانتظار</string>
+    <string name="onboarding_conditions_configure_server_operators">ضبّط مُشغلي الخادم</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">سياسة الخصوصية وشروط الاستخدام.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">لا يمكن الوصول إلى الدردشات الخاصة والمجموعات وجهات اتصالك لمشغلي الخادم.</string>
+    <string name="onboarding_conditions_by_using_you_agree">باستخدام SimpleX Chat، توافق على:\n- إرسال المحتوى القانوني فقط في المجموعات العامة.\n- احترام المستخدمين الآخرين – لا سبام.</string>
+    <string name="onboarding_conditions_accept">اقبل</string>
+    <string name="privacy_short_links">استخدم روابط قصيرة (تجريبي)</string>
+    <string name="link_requires_newer_app_version_please_upgrade">يتطلب هذا الرابط إصدار تطبيق أحدث. يُرجى ترقية التطبيق أو اطلب من جهة اتصالك إرسال رابط متوافق.</string>
+    <string name="full_link_button_text">رابط كامل</string>
+    <string name="short_link_button_text">رابط قصير</string>
+    <string name="simplex_link_channel">رابط قناة SimpleX</string>
+    <string name="unsupported_connection_link">رابط اتصال غير مدعوم</string>
+    <string name="network_smp_web_port_preset_footer">استخدم منفذ TCP 443 للخوادم المُعدة مسبقًا فقط.</string>
+    <string name="network_smp_web_port_off">إيقاف التشغيل</string>
+    <string name="network_smp_web_port_preset">الخوادم المُعدة مسبقًا</string>
+    <string name="network_smp_web_port_all">جميع الخوادم</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index 954c22abee..7af75e64e8 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -91,12 +91,14 @@
   <string name="simplex_link_contact">SimpleX contact address</string>
   <string name="simplex_link_invitation">SimpleX one-time invitation</string>
   <string name="simplex_link_group">SimpleX group link</string>
+  <string name="simplex_link_channel">SimpleX channel link</string>
   <string name="simplex_link_connection">via %1$s</string>
   <string name="simplex_link_mode">SimpleX links</string>
   <string name="simplex_link_mode_description">Description</string>
   <string name="simplex_link_mode_full">Full link</string>
   <string name="simplex_link_mode_browser">Via browser</string>
   <string name="simplex_link_mode_browser_warning">Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</string>
+  <string name="privacy_short_links">Use short links (BETA)</string>
 
   <!-- Reports - ChatModel.kt -->
   <string name="report_reason_spam">Spam</string>
@@ -156,6 +158,8 @@
   <string name="error_loading_details">Error loading details</string>
   <string name="error_adding_members">Error adding member(s)</string>
   <string name="error_joining_group">Error joining group</string>
+  <string name="error_accepting_member">Error accepting member</string>
+  <string name="error_deleting_member_support_chat">Error deleting chat with member</string>
   <string name="cannot_receive_file">Cannot receive file</string>
   <string name="sender_cancelled_file_transfer">Sender cancelled file transfer.</string>
   <string name="file_not_approved_title">Unknown servers!</string>
@@ -168,6 +172,8 @@
   <string name="you_are_already_connected_to_vName_via_this_link">You are already connected to %1$s.</string>
   <string name="invalid_connection_link">Invalid connection link</string>
   <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Please check that you used the correct link or ask your contact to send you another one.</string>
+  <string name="unsupported_connection_link">Unsupported connection link</string>
+  <string name="link_requires_newer_app_version_please_upgrade">This link requires a newer app version. Please upgrade the app or ask your contact to send a compatible link.</string>
   <string name="connection_error_auth">Connection error (AUTH)</string>
   <string name="connection_error_auth_desc">Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection.</string>
   <string name="connection_error_blocked">Connection blocked</string>
@@ -312,7 +318,12 @@
   <string name="message_deleted_or_not_received_error_desc">This message was deleted or not received yet.</string>
   <string name="report_reason_alert_title">Report reason?</string>
   <string name="report_archive_alert_title">Archive report?</string>
+  <string name="report_archive_alert_title_nth">Archive %d reports?</string>
+  <string name="report_archive_alert_title_all">Archive all reports?</string>
   <string name="report_archive_alert_desc">The report will be archived for you.</string>
+  <string name="report_archive_alert_desc_all">All reports will be archived for you.</string>
+  <string name="report_archive_for_me">For me</string>
+  <string name="report_archive_for_all_moderators">For all moderators</string>
 
   <!-- CIStatus errors -->
   <string name="ci_status_other_error">Error: %1$s</string>
@@ -341,6 +352,7 @@
   <string name="search_verb">Search</string>
   <string name="archive_verb">Archive</string>
   <string name="archive_report">Archive report</string>
+  <string name="archive_reports">Archive reports</string>
   <string name="delete_report">Delete report</string>
   <string name="sent_message">Sent message</string>
   <string name="received_message">Received message</string>
@@ -412,6 +424,7 @@
   <string name="member_contact_send_direct_message">send direct message</string>
   <string name="group_preview_you_are_invited">you are invited to group</string>
   <string name="group_preview_join_as">join as %s</string>
+  <string name="group_preview_rejected">rejected</string>
   <string name="group_connection_pending">connecting…</string>
   <string name="tap_to_start_new_chat">Tap to start a new chat</string>
   <string name="chat_with_developers">Chat with the developers</string>
@@ -447,12 +460,16 @@
   <string name="chat_list_businesses">Businesses</string>
   <string name="chat_list_notes">Notes</string>
   <string name="chat_list_group_reports">Reports</string>
+  <string name="notification_group_report">Report: %s</string>
   <string name="chat_list_all">All</string>
   <string name="chat_list_add_list">Add list</string>
   <string name="group_reports_active_one">1 report</string>
   <string name="group_reports_active">%d reports</string>
   <string name="group_reports_member_reports">Member reports</string>
-  <string name="group_reports_archived_member_reports">Archived member reports</string>
+  <string name="group_new_support_messages">%d messages</string>
+  <string name="group_new_support_chats">%d chats with members</string>
+  <string name="group_new_support_chat_one">1 chat with a member</string>
+  <string name="group_new_support_chats_short">%d chat(s)</string>
 
   <!-- ShareListView.kt -->
   <string name="share_message">Share message…</string>
@@ -475,9 +492,6 @@
   <string name="image_decoding_exception_title">Decoding error</string>
   <string name="image_decoding_exception_desc">The image cannot be decoded. Please, try a different image or contact developers.</string>
   <string name="video_decoding_exception_desc">The video cannot be decoded. Please, try a different video or contact developers.</string>
-  <string name="you_are_observer">you are observer</string>
-  <string name="observer_cant_send_message_title">You can\'t send messages!</string>
-  <string name="observer_cant_send_message_desc">Please contact group admin.</string>
   <string name="files_and_media_prohibited">Files and media prohibited!</string>
   <string name="only_owners_can_enable_files_and_media">Only group owners can enable files and media.</string>
   <string name="compose_send_direct_message_to_connect">Send direct message to connect</string>
@@ -496,6 +510,24 @@
   <string name="report_compose_reason_header_community">Report violation: only group moderators will see it.</string>
   <string name="report_compose_reason_header_illegal">Report content: only group moderators will see it.</string>
   <string name="report_compose_reason_header_other">Report other: only group moderators will see it.</string>
+  <string name="report_sent_alert_title">Report sent to moderators</string>
+  <string name="report_sent_alert_msg_view_in_support_chat">You can view your reports in Chat with admins.</string>
+
+  <string name="cant_send_message_alert_title">You can\'t send messages!</string>
+  <string name="cant_send_message_contact_not_ready">contact not ready</string>
+  <string name="cant_send_message_contact_deleted">contact deleted</string>
+  <string name="cant_send_message_contact_not_synchronized">not synchronized</string>
+  <string name="cant_send_message_contact_disabled">contact disabled</string>
+  <string name="observer_cant_send_message_title">you are observer</string>
+  <string name="observer_cant_send_message_desc">Please contact group admin.</string>
+  <string name="cant_send_message_rejected">request to join rejected</string>
+  <string name="cant_send_message_group_deleted">group is deleted</string>
+  <string name="cant_send_message_mem_removed">removed from group</string>
+  <string name="cant_send_message_you_left">you left</string>
+  <string name="cant_send_message_generic">can\'t send messages</string>
+  <string name="you_are_observer">you are observer</string>
+  <string name="reviewed_by_admins">reviewed by admins</string>
+  <string name="cant_send_message_member_has_old_version">member has old version</string>
 
   <!-- Images - chat.simplex.app.views.chat.item.CIImageView.kt -->
   <string name="image_descr">Image</string>
@@ -540,6 +572,12 @@
 
   <!-- Chat Info Settings - ChatInfoView.kt -->
   <string name="notifications">Notifications</string>
+  <string name="disable_automatic_deletion_question">Disable automatic message deletion?</string>
+  <string name="change_automatic_deletion_question">Change automatic message deletion?</string>
+  <string name="disable_automatic_deletion_message">Messages in this chat will never be deleted.</string>
+  <string name="change_automatic_chat_deletion_message">This action cannot be undone - the messages sent and received in this chat earlier than selected will be deleted.</string>
+  <string name="disable_automatic_deletion">Disable delete messages</string>
+  <string name="chat_ttl_options_footer">Delete chat messages from your device.</string>
 
   <!-- Chat Info Actions - ChatInfoView.kt -->
   <string name="info_view_connect_button">connect</string>
@@ -673,9 +711,11 @@
 
   <!-- Actions - ChatListNavLinkView.kt -->
   <string name="mute_chat">Mute</string>
+  <string name="mute_all_chat">Mute all</string>
   <string name="unmute_chat">Unmute</string>
   <string name="favorite_chat">Favorite</string>
   <string name="unfavorite_chat">Unfavorite</string>
+  <string name="unread_mentions">Unread mentions</string>
 
   <!-- Tags - ChatListNavLinkView.kt -->
   <string name="create_list">Create list</string>
@@ -780,6 +820,8 @@
   <string name="one_time_link_short">1-time link</string>
   <string name="simplex_address">SimpleX address</string>
   <string name="or_show_this_qr_code">Or show this code</string>
+  <string name="full_link_button_text">Full link</string>
+  <string name="short_link_button_text">Short link</string>
   <string name="new_chat_share_profile">Share profile</string>
   <string name="select_chat_profile">Select chat profile</string>
   <string name="switching_profile_error_title">Error switching profile</string>
@@ -940,6 +982,13 @@
   <string name="update_network_smp_proxy_fallback_question">Message routing fallback</string>
   <string name="private_routing_show_message_status">Show message status</string>
   <string name="private_routing_explanation">To protect your IP address, private routing uses your SMP servers to deliver messages.</string>
+  <string name="network_smp_web_port_section_title">TCP port for messaging</string>
+  <string name="network_smp_web_port_toggle">Use web port</string>
+  <string name="network_smp_web_port_footer">Use TCP port %1$s when no port is specified.</string>
+  <string name="network_smp_web_port_preset_footer">Use TCP port 443 for preset servers only.</string>
+  <string name="network_smp_web_port_all">All servers</string>
+  <string name="network_smp_web_port_preset">Preset servers</string>
+  <string name="network_smp_web_port_off">Off</string>
   <string name="appearance_settings">Appearance</string>
   <string name="customize_theme_title">Customize theme</string>
   <string name="theme_colors_section_title">INTERFACE COLORS</string>
@@ -1009,6 +1058,7 @@
   <string name="address_settings">Address settings</string>
   <string name="business_address">Business address</string>
   <string name="add_your_team_members_to_conversations">Add your team members to the conversations.</string>
+  <string name="add_short_link">Add short link</string>
 
   <!-- CreateSimpleXAddress.kt -->
   <string name="continue_to_next_step">Continue</string>
@@ -1024,6 +1074,7 @@
   <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</string>
   <string name="edit_image">Edit image</string>
   <string name="delete_image">Delete image</string>
+  <string name="save_admission_question">Save admission settings?</string>
   <string name="save_preferences_question">Save preferences?</string>
   <string name="save_and_notify_contact">Save and notify contact</string>
   <string name="save_and_notify_contacts">Save and notify contacts</string>
@@ -1144,6 +1195,11 @@
   <string name="use_random_passphrase">Use random passphrase</string>
 
   <!-- ChooseServerOperators.kt -->
+  <string name="onboarding_conditions_private_chats_not_accessible">Private chats, groups and your contacts are not accessible to server operators.</string>
+  <string name="onboarding_conditions_by_using_you_agree">By using SimpleX Chat you agree to:\n- send only legal content in public groups.\n- respect other users – no spam.</string>
+  <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Privacy policy and conditions of use.</string>
+  <string name="onboarding_conditions_accept">Accept</string>
+  <string name="onboarding_conditions_configure_server_operators">Configure server operators</string>
   <string name="onboarding_choose_server_operators">Server operators</string>
   <string name="onboarding_network_operators">Network operators</string>
   <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.</string>
@@ -1396,7 +1452,9 @@
   <string name="chat_item_ttl_day">1 day</string>
   <string name="chat_item_ttl_week">1 week</string>
   <string name="chat_item_ttl_month">1 month</string>
+  <string name="chat_item_ttl_year">1 year</string>
   <string name="chat_item_ttl_seconds">%s second(s)</string>
+  <string name="chat_item_ttl_default">default (%s)</string>
   <string name="messages_section_title">Messages</string>
   <string name="messages_section_description">This setting applies to messages in your current chat profile</string>
   <string name="delete_messages_after">Delete messages after</string>
@@ -1450,6 +1508,7 @@
 
   <!-- DatabaseErrorView.kt -->
   <string name="wrong_passphrase">Wrong database passphrase</string>
+  <string name="error_reading_passphrase">Error reading database passphrase</string>
   <string name="encrypted_database">Encrypted database</string>
   <string name="database_error">Database error</string>
   <string name="keychain_error">Keychain error</string>
@@ -1471,7 +1530,9 @@
   <string name="restore_database_alert_desc">Please enter the previous password after restoring database backup. This action can not be undone.</string>
   <string name="restore_database_alert_confirm">Restore</string>
   <string name="database_restore_error">Restore database error</string>
-  <string name="restore_passphrase_not_found_desc">Passphrase not found in Keystore, please enter it manually. This may have happened if you restored the app\'s data using a backup tool. If it\'s not the case, please, contact developers.</string>
+  <string name="restore_passphrase_not_found_desc">Passphrase not found in Keystore, please enter it manually. This may have happened if you restored the app\'s data using a backup tool. If it\'s not the case, please contact developers.</string>
+  <string name="restore_passphrase_can_not_be_read_desc">Passphrase in Keystore can\'t be read. This may have happened after system update incompatible with the app. If it\'s not the case, please contact developers.</string>
+  <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Passphrase in Keystore can\'t be read, please enter it manually. This may have happened after system update incompatible with the app. If it\'s not the case, please contact developers.</string>
   <string name="database_upgrade">Database upgrade</string>
   <string name="database_downgrade">Database downgrade</string>
   <string name="incompatible_database_version">Incompatible database version</string>
@@ -1533,6 +1594,8 @@
   <!-- Group event chat items -->
   <string name="rcv_group_event_member_added">invited %1$s</string>
   <string name="rcv_group_event_member_connected">connected</string>
+  <string name="rcv_group_event_member_accepted">accepted %1$s</string>
+  <string name="rcv_group_event_user_accepted">accepted you</string>
   <string name="rcv_group_event_member_left">left</string>
   <string name="rcv_group_event_changed_member_role">changed role of %s to %s</string>
   <string name="rcv_group_event_member_blocked">blocked %s</string>
@@ -1544,6 +1607,7 @@
   <string name="rcv_group_event_updated_group_profile">updated group profile</string>
   <string name="rcv_group_event_invited_via_your_group_link">invited via your group link</string>
   <string name="rcv_group_event_member_created_contact">connected directly</string>
+  <string name="rcv_group_event_new_member_pending_review">New member wants to join the group.</string>
   <string name="snd_group_event_changed_member_role">you changed role of %s to %s</string>
   <string name="snd_group_event_changed_role_for_yourself">you changed role for yourself to %s</string>
   <string name="snd_group_event_member_blocked">you blocked %s</string>
@@ -1551,6 +1615,8 @@
   <string name="snd_group_event_member_deleted">you removed %1$s</string>
   <string name="snd_group_event_user_left">you left</string>
   <string name="snd_group_event_group_profile_updated">group profile updated</string>
+  <string name="snd_group_event_member_accepted">you accepted this member</string>
+  <string name="snd_group_event_user_pending_review">Please wait for group moderators to review your request to join the group.</string>
 
   <string name="rcv_group_event_1_member_connected">%s connected</string>
   <string name="rcv_group_event_2_members_connected">%s and %s connected</string>
@@ -1602,11 +1668,16 @@
   <string name="group_member_role_owner">owner</string>
 
   <!-- GroupMemberStatus -->
+  <string name="group_member_status_rejected">rejected</string>
   <string name="group_member_status_removed">removed</string>
   <string name="group_member_status_left">left</string>
   <string name="group_member_status_group_deleted">group deleted</string>
   <string name="group_member_status_unknown">unknown status</string>
   <string name="group_member_status_invited">invited</string>
+  <string name="group_member_status_pending_approval">pending approval</string>
+  <string name="group_member_status_pending_approval_short">pending</string>
+  <string name="group_member_status_pending_review">pending review</string>
+  <string name="group_member_status_pending_review_short">review</string>
   <string name="group_member_status_introduced">connecting (introduced)</string>
   <string name="group_member_status_intro_invitation">connecting (introduction invitation)</string>
   <string name="group_member_status_accepted">connecting (accepted)</string>
@@ -1677,6 +1748,7 @@
   <string name="send_receipts_disabled_alert_title">Receipts are disabled</string>
   <string name="send_receipts_disabled_alert_msg">This group has over %1$d members, delivery receipts are not sent.</string>
   <string name="action_button_add_members">Invite</string>
+  <string name="button_support_chat">Chat with admins</string>
 
   <!-- Chat / Chat item info -->
   <string name="section_title_for_console">FOR CONSOLE</string>
@@ -1711,25 +1783,32 @@
 
   <!-- GroupMemberInfoView.kt -->
   <string name="button_remove_member_question">Remove member?</string>
+  <string name="button_remove_members_question">Remove members?</string>
   <string name="button_remove_member">Remove member</string>
-
+  <string name="button_support_chat_member">Chat with member</string>
   <string name="button_send_direct_message">Send direct message</string>
   <string name="member_will_be_removed_from_group_cannot_be_undone">Member will be removed from group - this cannot be undone!</string>
+  <string name="members_will_be_removed_from_group_cannot_be_undone">Members will be removed from group - this cannot be undone!</string>
   <string name="member_will_be_removed_from_chat_cannot_be_undone">Member will be removed from chat - this cannot be undone!</string>
+  <string name="members_will_be_removed_from_chat_cannot_be_undone">Members will be removed from chat - this cannot be undone!</string>
   <string name="remove_member_confirmation">Remove</string>
   <string name="remove_member_button">Remove member</string>
   <string name="block_member_question">Block member?</string>
   <string name="block_member_button">Block member</string>
   <string name="block_member_confirmation">Block</string>
   <string name="block_for_all_question">Block member for all?</string>
+  <string name="block_members_for_all_question">Block members for all?</string>
   <string name="block_for_all">Block for all</string>
   <string name="block_member_desc">All new messages from %s will be hidden!</string>
+  <string name="block_members_desc">All new messages from these members will be hidden!</string>
   <string name="unblock_member_question">Unblock member?</string>
   <string name="unblock_member_button">Unblock member</string>
   <string name="unblock_member_confirmation">Unblock</string>
   <string name="unblock_for_all_question">Unblock member for all?</string>
+  <string name="unblock_members_for_all_question">Unblock members for all?</string>
   <string name="unblock_for_all">Unblock for all</string>
   <string name="unblock_member_desc">Messages from %s will be shown!</string>
+  <string name="unblock_members_desc">Messages from these members will be shown!</string>
   <string name="member_blocked_by_admin">Blocked by admin</string>
   <string name="member_info_member_blocked">blocked</string>
   <string name="member_info_member_disabled">disabled</string>
@@ -1822,7 +1901,6 @@
   <string name="operator_website">Website</string>
   <string name="operator_conditions_accepted_on">Conditions accepted on: %s.</string>
   <string name="operator_conditions_will_be_accepted_on">Conditions will be accepted on: %s.</string>
-  <string name="operator">Operator</string>
   <string name="operator_use_operator_toggle_description">Use servers</string>
   <string name="use_servers_of_operator_x">Use %s</string>
   <string name="operator_conditions_failed_to_load">Current conditions text couldn\'t be loaded, you can review conditions via this link:</string>
@@ -1835,6 +1913,7 @@
   <string name="view_conditions">View conditions</string>
   <string name="accept_conditions">Accept conditions</string>
   <string name="operator_conditions_of_use">Conditions of use</string>
+  <string name="operator_updated_conditions">Updated conditions</string>
   <string name="operator_in_order_to_use_accept_conditions"><![CDATA[To use the servers of <b>%s</b>, accept conditions of use.]]></string>
   <string name="operator_use_for_messages">Use for messages</string>
   <string name="operator_use_for_messages_receiving">To receive</string>
@@ -1983,6 +2062,7 @@
   <string name="contact_preferences">Contact preferences</string>
   <string name="group_preferences">Group preferences</string>
   <string name="set_group_preferences">Set group preferences</string>
+  <string name="set_member_admission">Set member admission</string>
   <string name="your_preferences">Your preferences</string>
   <string name="timed_messages">Disappearing messages</string>
   <string name="direct_messages">Direct messages</string>
@@ -2052,6 +2132,8 @@
   <string name="prohibit_sending_simplex_links">Prohibit sending SimpleX links</string>
   <string name="enable_sending_recent_history">Send up to 100 last messages to new members.</string>
   <string name="disable_sending_recent_history">Do not send history to new members.</string>
+  <string name="enable_sending_member_reports">Allow to report messsages to moderators.</string>
+  <string name="disable_sending_member_reports">Prohibit reporting messages to moderators.</string>
   <string name="group_members_can_send_disappearing">Members can send disappearing messages.</string>
   <string name="disappearing_messages_are_prohibited">Disappearing messages are prohibited.</string>
   <string name="group_members_can_send_dms">Members can send direct messages.</string>
@@ -2070,6 +2152,8 @@
   <string name="simplex_links_are_prohibited_in_group">SimpleX links are prohibited.</string>
   <string name="recent_history_is_sent_to_new_members">Up to 100 last messages are sent to new members.</string>
   <string name="recent_history_is_not_sent_to_new_members">History is not sent to new members.</string>
+  <string name="group_members_can_send_reports">Members can report messsages to moderators.</string>
+  <string name="member_reports_are_prohibited">Reporting messages is prohibited in this group.</string>
   <string name="delete_after">Delete after</string>
   <string name="ttl_sec">%d sec</string>
   <string name="ttl_s">%ds</string>
@@ -2091,10 +2175,34 @@
   <string name="feature_offered_item_with_param">offered %s: %2s</string>
   <string name="feature_cancelled_item">cancelled %s</string>
   <string name="feature_roles_all_members">all members</string>
+  <string name="feature_roles_moderators">moderators</string>
   <string name="feature_roles_admins">admins</string>
   <string name="feature_roles_owners">owners</string>
   <string name="feature_enabled_for">Enabled for</string>
 
+  <!-- MemberAdmission.kt -->
+  <string name="member_admission">Member admission</string>
+  <string name="admission_stage_review">Review members</string>
+  <string name="admission_stage_review_descr">Review members before admitting ("knocking").</string>
+  <string name="member_criteria_off">off</string>
+  <string name="member_criteria_all">all</string>
+
+  <!-- MemberSupportView.kt -->
+  <string name="member_support">Chats with members</string>
+  <string name="no_support_chats">No chats with members</string>
+  <string name="delete_member_support_chat_button">Delete chat</string>
+  <string name="delete_member_support_chat_alert_title">Delete chat with member?</string>
+
+  <!-- MemberSupportChatView.kt -->
+  <string name="support_chat">Chat with admins</string>
+  <string name="reject_pending_member_button">Reject</string>
+  <string name="reject_pending_member_alert_title">Reject member?</string>
+  <string name="accept_pending_member_button">Accept</string>
+  <string name="accept_pending_member_alert_title">Accept member</string>
+  <string name="accept_pending_member_alert_question">Member will join the group, accept member?</string>
+  <string name="accept_pending_member_alert_confirmation_as_member">Accept as member</string>
+  <string name="accept_pending_member_alert_confirmation_as_observer">Accept as observer</string>
+
   <!-- WhatsNewView.kt -->
   <string name="whats_new">What\'s new</string>
   <string name="new_in_version">New in %s</string>
@@ -2253,12 +2361,24 @@
   <string name="v6_1_delete_many_messages_descr">Delete or moderate up to 200 messages.</string>
   <string name="v6_2_network_decentralization">Network decentralization</string>
   <string name="v6_2_network_decentralization_descr">The second preset operator in the app!</string>
-  <string name="v6_2_network_decentralization_enable_flux">Enable flux</string>
+  <string name="v6_2_network_decentralization_enable_flux">Enable Flux in Network &amp; servers settings for better metadata privacy.</string>
   <string name="v6_2_network_decentralization_enable_flux_reason">for better metadata privacy.</string>
   <string name="v6_2_improved_chat_navigation">Improved chat navigation</string>
   <string name="v6_2_improved_chat_navigation_descr">- Open chat on the first unread message.\n- Jump to quoted messages.</string>
   <string name="v6_2_business_chats">Business chats</string>
   <string name="v6_2_business_chats_descr">Privacy for your customers.</string>
+  <string name="v6_3_mentions">Mention members 👋</string>
+  <string name="v6_3_mentions_descr">Get notified when mentioned.</string>
+  <string name="v6_3_reports">Send private reports</string>
+  <string name="v6_3_reports_descr">Help admins moderating their groups.</string>
+  <string name="v6_3_organize_chat_lists">Organize chats into lists</string>
+  <string name="v6_3_organize_chat_lists_descr">Don\'t miss important messages.</string>
+  <string name="v6_3_better_privacy_and_security">Better privacy and security</string>
+  <string name="v6_3_private_media_file_names">Private media file names.</string>
+  <string name="v6_3_set_message_expiration_in_chats">Set message expiration in chats.</string>
+  <string name="v6_3_better_groups_performance">Better groups performance</string>
+  <string name="v6_3_faster_sending_messages">Faster sending messages.</string>
+  <string name="v6_3_faster_deletion_of_groups">Faster deletion of groups.</string>
   <string name="view_updated_conditions">View updated conditions</string>
 
   <!-- CustomTimePicker -->
@@ -2480,7 +2600,7 @@
   <string name="servers_info_messages_sent">Messages sent</string>
   <string name="servers_info_messages_received">Messages received</string>
   <string name="servers_info_details">Details</string>
-  <string name="servers_info_private_data_disclaimer">Starting from %s.\nAll data is kept private on your device..</string>
+  <string name="servers_info_private_data_disclaimer">Starting from %s.\nAll data is kept private on your device.</string>
   <string name="servers_info_subscriptions_section_header">Message reception</string>
   <string name="servers_info_subscriptions_connections_subscribed">Active connections</string>
   <string name="servers_info_subscriptions_connections_pending">Pending</string>
@@ -2545,4 +2665,7 @@
   <string name="download_errors">Download errors</string>
   <string name="server_address">Server address</string>
   <string name="open_server_settings_button">Open server settings</string>
+
+  <!-- GroupMentions.kt -->
+  <string name="max_group_mentions_per_message_reached">You can mention up to %1$s members per message!</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
index c51b33e456..c37d4e6924 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
@@ -220,11 +220,11 @@
     <string name="connection_error_auth">Грешка при свързване (AUTH)</string>
     <string name="display_name_connecting">свързване…</string>
     <string name="switch_receiving_address">Промени адреса за получаване</string>
-    <string name="chat_database_deleted">Базата данни на чата е изтрита</string>
+    <string name="chat_database_deleted">Базата данни е изтрита</string>
     <string name="chat_is_running">Чатът работи</string>
     <string name="chat_is_stopped">Чатът е спрян</string>
-    <string name="chat_database_section">БАЗА ДАННИ НА ЧАТА</string>
-    <string name="chat_database_imported">Базата данни на чат е импортирана</string>
+    <string name="chat_database_section">БАЗА ДАННИ</string>
+    <string name="chat_database_imported">Базата данни е импортирана</string>
     <string name="confirm_new_passphrase">Потвърди новата парола…</string>
     <string name="confirm_database_upgrades">Потвърди актуализаациите на базата данни</string>
     <string name="rcv_group_event_member_connected">свързан</string>
@@ -338,7 +338,7 @@
     <string name="database_downgrade">Понижаване на версията на базата данни</string>
     <string name="database_upgrade">Актуализация на базата данни</string>
     <string name="mtr_error_no_down_migration">версията на базата данни е по-нова от приложението, но няма миграция надолу за: %s</string>
-    <string name="rcv_group_event_group_deleted">групата изтрита</string>
+    <string name="rcv_group_event_group_deleted">групата е изтрита</string>
     <string name="icon_descr_contact_checked">Контактът е проверен</string>
     <string name="group_member_status_creator">създател</string>
     <string name="create_group_link">Създай групов линк</string>
@@ -406,7 +406,7 @@
     <string name="developer_options">Идентификатори в базата данни и опция за изолация на транспорта.</string>
     <string name="delete_address">Изтрий адрес</string>
     <string name="delete_address__question">Изтрий адрес\?</string>
-    <string name="theme_colors_section_title">ЦВЕТОВЕ НА ТЕМАТА</string>
+    <string name="theme_colors_section_title">ЦВЕТОВЕ НА ИНТЕРФЕЙСА</string>
     <string name="create_profile_button">Създай</string>
     <string name="create_profile">Създай профил</string>
     <string name="delete_image">Изтрий изображение</string>
@@ -440,7 +440,7 @@
     <string name="smp_servers_delete_server">Изтрий сървър</string>
     <string name="dont_create_address">Не създавай адрес</string>
     <string name="display_name__field">Име на профила:</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Само потребителските устройства съхраняват потребителски профили, контакти, групи и съобщения, изпратени с <b>двуслойно криптиране от край до край</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Само потребителските устройства съхраняват потребителски профили, контакти, групи и съобщения.</string>
     <string name="receipts_contacts_title_disable">Деактивирай потвърждениeто\?</string>
     <string name="receipts_contacts_enable_keep_overrides">Активиране (запазване на промените)</string>
     <string name="receipts_contacts_title_enable">Активирай потвърждениeто\?</string>
@@ -491,7 +491,7 @@
     <string name="delete_messages">Изтрий съобщенията</string>
     <string name="error_encrypting_database">Грешка при криптиране на базата данни</string>
     <string name="enable_automatic_deletion_question">Активиране на автоматично изтриване на съобщения\?</string>
-    <string name="database_is_not_encrypted">Вашата чат база данни не е криптирана - задайте парола, за да я защитите.</string>
+    <string name="database_is_not_encrypted">Вашата база данни не е криптирана - задайте парола, за да я защитите.</string>
     <string name="encrypt_database_question">Криптиране на база данни\?</string>
     <string name="group_invitation_item_description">покана за група %1$s</string>
     <string name="you_sent_group_invitation">Изпратихте покана за групата</string>
@@ -567,13 +567,13 @@
     <string name="encrypted_database">Криптирана база данни</string>
     <string name="network_option_enable_tcp_keep_alive">Активирай TCP keep-alive</string>
     <string name="disappearing_prohibited_in_this_chat">Изчезващите съобщения са забранени в този чат.</string>
-    <string name="disappearing_messages_are_prohibited">Изчезващите съобщения са забранени в тази група.</string>
+    <string name="disappearing_messages_are_prohibited">Изчезващите съобщения са забранени.</string>
     <string name="v4_4_disappearing_messages">Изчезващи съобщения</string>
     <string name="enter_welcome_message_optional">Въведи съобщение при посрещане…(незадължително)</string>
     <string name="button_welcome_message">Съобщение при посрещане</string>
     <string name="icon_descr_server_status_error">Грешка при свързване със сървъра</string>
     <string name="v4_2_auto_accept_contact_requests_desc">С незадължително съобщение при посрещане.</string>
-    <string name="error_deleting_database">Грешка при изтриване на чат базата данни</string>
+    <string name="error_deleting_database">Грешка при изтриване на базата данни</string>
     <string name="error_changing_message_deletion">Грешка при промяна на настройката</string>
     <string name="error_creating_link_for_group">Грешка при създаване на групов линк</string>
     <string name="error_deleting_link_for_group">Грешка при изтриване на групов линк</string>
@@ -597,10 +597,10 @@
     <string name="icon_descr_server_status_pending">Предстояща връзка със сървъра</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Вашият контакт трябва да бъде онлайн, за да осъществите връзката.
 \nМожете да откажете тази връзка и да премахнете контакта (и да опитате по -късно с нов линк).</string>
-    <string name="error_exporting_chat_database">Грешка при експортиране на чат базата данни</string>
+    <string name="error_exporting_chat_database">Грешка при експортиране на базата данни</string>
     <string name="error_with_info">Грешка: %s</string>
     <string name="error_saving_file">Грешка при запазване на файл</string>
-    <string name="error_importing_database">Грешка при импортиране на чат базата данни</string>
+    <string name="error_importing_database">Грешка при импортиране на базата данни</string>
     <string name="error_removing_member">Грешка при отстраняване на член</string>
     <string name="error_saving_group_profile">Грешка при запазване на профила на групата</string>
     <string name="error_loading_smp_servers">Грешка при зареждане на SMP сървъри</string>
@@ -641,14 +641,14 @@
     <string name="file_will_be_received_when_contact_completes_uploading">Файлът ще бъде получен, когато вашият контакт завърши качването му.</string>
     <string name="file_will_be_received_when_contact_is_online">Файлът ще бъде получен, когато вашият контакт е онлайн, моля, изчакайте или проверете по-късно!</string>
     <string name="v5_2_favourites_filter_descr">Филтрирайте непрочетените и любимите чатове.</string>
-    <string name="group_members_can_send_dms">Членовете на групата могат да изпращат лични съобщения.</string>
+    <string name="group_members_can_send_dms">Членовете могат да изпращат лични съобщения.</string>
     <string name="icon_descr_help">помощ</string>
     <string name="settings_section_title_help">ПОМОЩ</string>
     <string name="email_invite_body">Здравей,
 \nСвържи се с мен през SimpleX Chat: %s</string>
-    <string name="group_members_can_add_message_reactions">Членовете на групата могат да добавят реакции към съобщенията.</string>
-    <string name="group_members_can_delete">Членовете на групата могат необратимо да изтриват изпратените съобщения. (24 часа)</string>
-    <string name="group_members_can_send_voice">Членовете на групата могат да изпращат гласови съобщения.</string>
+    <string name="group_members_can_add_message_reactions">Членовете могат да добавят реакции към съобщенията.</string>
+    <string name="group_members_can_delete">Членовете могат необратимо да изтриват изпратените съобщения. (24 часа)</string>
+    <string name="group_members_can_send_voice">Членовете могат да изпращат гласови съобщения.</string>
     <string name="v5_2_disappear_one_message_descr">Дори когато е деактивиран в разговора.</string>
     <string name="v5_0_large_files_support_descr">Бързо и без чакане, докато подателят е онлайн!</string>
     <string name="v4_4_french_interface">Френски интерфейс</string>
@@ -668,8 +668,8 @@
     <string name="group_profile_is_stored_on_members_devices">Груповият профил се съхранява на устройствата на членовете, а не на сървърите.</string>
     <string name="user_hide">Скрий</string>
     <string name="prohibit_sending_disappearing_messages">Забрани изпращането на изчезващи съобщения.</string>
-    <string name="files_are_prohibited_in_group">Файловете и медията са забранени в тази група.</string>
-    <string name="group_members_can_send_files">Членовете на групата могат да изпращат файлове и медия.</string>
+    <string name="files_are_prohibited_in_group">Файловете и медията са забранени.</string>
+    <string name="group_members_can_send_files">Членовете могат да изпращат файлове и медия.</string>
     <string name="v4_6_hidden_chat_profiles">Скрити чат профили</string>
     <string name="v4_6_reduced_battery_usage">Допълнително намален разход на батерията</string>
     <string name="v4_6_group_moderation">Групово модериране</string>
@@ -693,7 +693,7 @@
     <string name="only_you_can_send_disappearing">Само вие можете да изпращате изчезващи съобщения.</string>
     <string name="only_your_contact_can_send_disappearing">Само вашият контакт може да изпраща изчезващи съобщения.</string>
     <string name="prohibit_sending_disappearing">Забрани изпращането на изчезващи съобщения.</string>
-    <string name="group_members_can_send_disappearing">Членовете на групата могат да изпращат изчезващи съобщения.</string>
+    <string name="group_members_can_send_disappearing">Членовете могат да изпращат изчезващи съобщения.</string>
     <string name="invalid_QR_code">Невалиден QR код</string>
     <string name="invalid_contact_link">Невалиден линк!</string>
     <string name="incorrect_code">Неправилен код за сигурност!</string>
@@ -705,7 +705,7 @@
     <string name="invite_friends">Покани приятели</string>
     <string name="hide_profile">Скрий профила</string>
     <string name="how_to_use_markdown">Как се използва форматирането</string>
-    <string name="onboarding_notifications_mode_subtitle">Може да се промени по-късно през настройките.</string>
+    <string name="onboarding_notifications_mode_subtitle">Как се отразява на батерията</string>
     <string name="onboarding_notifications_mode_service">Незабавно</string>
     <string name="settings_section_title_incognito">Режим инкогнито</string>
     <string name="icon_descr_add_members">Покани членове</string>
@@ -716,14 +716,14 @@
     <string name="unhide_profile">Покажи профила</string>
     <string name="how_to_use_simplex_chat">Как се използва</string>
     <string name="italic_text">курсив</string>
-    <string name="import_database_question">Импортиране на чат база данни\?</string>
+    <string name="import_database_question">Импортиране на база данни?</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Ако изберете да отхвърлите, подателят НЯМА да бъде уведомен.</string>
     <string name="image_descr">Изображение</string>
     <string name="image_will_be_received_when_contact_completes_uploading">Изображението ще бъде получено, когато вашият контакт завърши качването му.</string>
     <string name="image_saved">Изображението е запазено в Галерия</string>
     <string name="icon_descr_image_snd_complete">Изображението е изпратено</string>
     <string name="image_will_be_received_when_contact_is_online">Изображението ще бъде получено, когато вашият контакт е онлайн, моля, изчакайте или проверете по-късно!</string>
-    <string name="message_deletion_prohibited_in_chat">Необратимото изтриване на съобщения е забранено в тази група.</string>
+    <string name="message_deletion_prohibited_in_chat">Необратимото изтриване на съобщения е забранено.</string>
     <string name="v4_3_improved_server_configuration">Подобрена конфигурация на сървъра</string>
     <string name="alert_text_skipped_messages_it_can_happen_when">Това може да се случи, когато:
 \n1. Времето за пазене на съобщенията е изтекло - в изпращащия клиент е 2 дена а на сървъра е 30.
@@ -752,7 +752,7 @@
     <string name="invalid_message_format">невалиден формат на съобщението</string>
     <string name="invalid_connection_link">Невалиден линк за връзка</string>
     <string name="notification_display_mode_hidden_desc">Скриване на контакт и съобщение</string>
-    <string name="turn_off_battery_optimization"><![CDATA[За да го използвате, моля, <b>разрешете на SimpleX да работи във фонов режим</b> в следващия диалогов прозорец. В противен случай известията ще бъдат деактивирани.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Разрешете</b> в следващия диалогов прозорец, за да получавате незабавно известия.]]></string>
     <string name="icon_descr_instant_notifications">Незабавни известия</string>
     <string name="service_notifications">Незабавни известия!</string>
     <string name="service_notifications_disabled">Незабавните известия са деактивирани!</string>
@@ -765,7 +765,7 @@
     <string name="install_simplex_chat_for_terminal">Инсталирай SimpleX Chat за терминал</string>
     <string name="how_it_works">Как работи</string>
     <string name="how_simplex_works">Как работи SimpleX</string>
-    <string name="immune_to_spam_and_abuse">Защитен от спам и злоупотреби</string>
+    <string name="immune_to_spam_and_abuse">Защитен от спам</string>
     <string name="ignore">Игнорирай</string>
     <string name="button_add_members">Покани членове</string>
     <string name="message_deletion_prohibited">Необратимото изтриване на съобщения е забранено в този чат.</string>
@@ -791,7 +791,7 @@
     <string name="rate_the_app">Оценете приложението</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Уверете се, че адресите на WebRTC ICE сървъра са в правилен формат, разделени на редове и не са дублирани.</string>
     <string name="network_and_servers">Мрежа и сървъри</string>
-    <string name="network_settings_title">Мрежови настройки</string>
+    <string name="network_settings_title">Разширени настройки</string>
     <string name="port_verb">Порт</string>
     <string name="network_proxy_port">порт %d</string>
     <string name="network_use_onion_hosts_required">Задължително</string>
@@ -852,7 +852,7 @@
     <string name="prohibit_message_reactions_group">Забрани реакциите на съобщенията.</string>
     <string name="restore_database_alert_desc">Моля, въведете предишната парола след възстановяване на резервното копие на базата данни. Това действие не може да бъде отменено.</string>
     <string name="large_file">Голям файл!</string>
-    <string name="message_reactions_are_prohibited">Реакциите на съобщения са забранени в тази група.</string>
+    <string name="message_reactions_are_prohibited">Реакциите на съобщения са забранени.</string>
     <string name="new_in_version">Ново в %s</string>
     <string name="feature_offered_item">предлага %s</string>
     <string name="feature_offered_item_with_param">предлага %s: %2s</string>
@@ -884,7 +884,7 @@
     <string name="switch_receiving_address_desc">Получаващият адрес ще бъде променен към друг сървър. Промяната на адреса ще завърши, след като подателят е онлайн.</string>
     <string name="new_database_archive">Нов архив на база данни</string>
     <string name="old_database_archive">Стар архив на база данни</string>
-    <string name="non_fatal_errors_occured_during_import">Някои не-фатални грешки са възникнали по време на импортиране - може да видите конзолата за повече подробности.</string>
+    <string name="non_fatal_errors_occured_during_import">Някои не-фатални грешки са възникнали по време на импортиране:</string>
     <string name="messages_section_title">Съобщения</string>
     <string name="enter_correct_current_passphrase">Моля, въведете правилната текуща парола.</string>
     <string name="store_passphrase_securely">Моля, съхранявайте паролата на сигурно място, НЯМА да можете да я промените, ако я загубите.</string>
@@ -955,7 +955,7 @@
     <string name="simplex_service_notification_text">Получаване на съобщения…</string>
     <string name="notifications_mode_off">Работи, когато приложението е отворено</string>
     <string name="simplex_service_notification_title">Simplex Chat услуга</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[За да запази вашата поверителност, вместо да изпозлва push известия, приложението има <b> SimpleX фонова услуга </b> – използва няколко процента от батерията на ден.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[За подобряване на поверителността <b>SimpleX работи във фонов режим</b> вместо да използва push известия.]]></string>
     <string name="enter_passphrase_notification_desc">За да получавате известия, моля, въведете паролата на базата данни</string>
     <string name="auth_log_in_using_credential">Влезте с вашите идентификационни данни</string>
     <string name="message_delivery_error_title">Грешка при доставката на съобщението</string>
@@ -963,7 +963,7 @@
     <string name="message_delivery_error_desc">Най-вероятно този контакт е изтрил връзката с вас.</string>
     <string name="no_history">Няма история</string>
     <string name="auth_open_chat_console">Отвори конзолата</string>
-    <string name="auth_open_chat_profiles">Отвори чат профилите</string>
+    <string name="auth_open_chat_profiles">Промени чат профилите</string>
     <string name="la_please_remember_to_store_password">Моля, запомнете я или я съхранявайте на сигурно място - няма начин да възстановите загубена парола!</string>
     <string name="received_message">Получено съобщение</string>
     <string name="reply_verb">Отговори</string>
@@ -978,8 +978,8 @@
     <string name="toast_permission_denied">Разрешение е отказано!</string>
     <string name="image_descr_profile_image">профилно изображение</string>
     <string name="icon_descr_profile_image_placeholder">запазено място за профилно изображение</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">Протокол и код с отворен код – всеки може да оперира собствени сървъри.</string>
-    <string name="people_can_connect_only_via_links_you_share">Хората могат да се свържат с вас само чрез ликовете, които споделяте.</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">Всеки може да оперира сървъри.</string>
+    <string name="people_can_connect_only_via_links_you_share">Вие решавате кой може да се свърже с вас.</string>
     <string name="privacy_redefined">Поверителността преосмислена</string>
     <string name="make_private_connection">Добави поверителна връзка</string>
     <string name="open_verb">Отвори</string>
@@ -1066,7 +1066,7 @@
     <string name="receipts_groups_title_disable">Деактивиране на потвърждениe за доставка за групи\?</string>
     <string name="receipts_groups_enable_for_all">Активиране за всички групи</string>
     <string name="receipts_groups_override_enabled">Изпращането на потвърждениe за доставка е разрешено за %d групи</string>
-    <string name="restart_the_app_to_use_imported_chat_database">Рестартирайте приложението, за да използвате импортирана чат база данни.</string>
+    <string name="restart_the_app_to_use_imported_chat_database">Рестартирайте приложението, за да използвате импортирана база данни.</string>
     <string name="send_receipts_disabled_alert_msg">Тази група има над %1$d членове, потвърждениeто за доставка няма да се изпраща.</string>
     <string name="conn_stats_section_title_servers">СЪРВЪРИ</string>
     <string name="recipient_colon_delivery_status">%s: %s</string>
@@ -1173,14 +1173,14 @@
     <string name="group_is_decentralized">Напълно децентрализирана – видима е само за членовете.</string>
     <string name="v4_5_transport_isolation">Транспортна изолация</string>
     <string name="v5_0_polish_interface_descr">Благодарение на потребителите – допринесете през Weblate!</string>
-    <string name="alert_text_msg_bad_hash">Хешът на предишното съобщение е различен.</string>
+    <string name="alert_text_msg_bad_hash">Хешът на предишното съобщение е различен.\"</string>
     <string name="smp_servers_test_servers">Тествай сървърите</string>
     <string name="v4_5_italian_interface_descr">Благодарение на потребителите – допринесете през Weblate!</string>
     <string name="v4_5_private_filenames_descr">За да не се разкрива часовата зона, файловете с изображения/глас използват UTC.</string>
     <string name="this_string_is_not_a_connection_link">Този текст не е линк за връзка!</string>
     <string name="videos_limit_title">Твърде много видеоклипове!</string>
     <string name="messages_section_description">Тази настройка се прилага за съобщения в текущия ви профил</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">За да се защити поверителността, вместо потребителски идентификатори, използвани от всички други платформи, SimpleX има идентификатори за опашки от съобщения, отделни за всеки от вашите контакти.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">За да се защити поверителността, SimpleX използва идентификатори за опашки от съобщения, отделни за всеки от вашите контакти.</string>
     <string name="trying_to_connect_to_server_to_receive_messages">Опит за свързване със сървъра, използван за получаване на съобщения от този контакт.</string>
     <string name="trying_to_connect_to_server_to_receive_messages_with_error">Опит за свързване със сървъра, използван за получаване на съобщения от този контакт (грешка: %1$s).</string>
     <string name="error_smp_test_failed_at_step">Тестът е неуспешен на стъпка %s.</string>
@@ -1189,8 +1189,8 @@
     <string name="chat_help_tap_button">Докосни бутона</string>
     <string name="thank_you_for_installing_simplex">Благодарим Ви, че инсталирахте SimpleX Chat!</string>
     <string name="save_and_notify_contacts">Запази и уведоми контактите</string>
-    <string name="next_generation_of_private_messaging">Ново поколение поверителни съобщения</string>
-    <string name="first_platform_without_user_ids">Първата платформа без никакви потребителски идентификатори – поверителна по дизайн.</string>
+    <string name="next_generation_of_private_messaging">Бъдещето на комуникацията</string>
+    <string name="first_platform_without_user_ids">Няма потребителски идентификатори.</string>
     <string name="la_mode_system">Системна</string>
     <string name="alert_text_msg_bad_id">Неправилно ID на следващото съобщение (по-малко или еднакво с предишното).
 \nТова може да се случи поради някаква грешка или когато връзката е компрометирана.</string>
@@ -1202,7 +1202,7 @@
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Ще бъдете свързани, когато устройството на вашия контакт е онлайн, моля, изчакайте или проверете по-късно!</string>
     <string name="you_wont_lose_your_contacts_if_delete_address">Няма да загубите контактите си, ако по-късно изтриете адреса си.</string>
     <string name="your_settings">Вашите настройки</string>
-    <string name="your_simplex_contact_address">Вашият SimpleX адрес</string>
+    <string name="your_simplex_contact_address">Вашият адрес в SimpleX</string>
     <string name="smp_servers_use_server_for_new_conn">Използвай за нови връзки</string>
     <string name="your_XFTP_servers">Вашите XFTP сървъри</string>
     <string name="use_simplex_chat_servers__question">Използвай сървърите на SimpleX Chat\?</string>
@@ -1233,7 +1233,7 @@
     <string name="you_can_share_this_address_with_your_contacts">Можете да споделите този адрес с вашите контакти, за да им позволите да се свържат с %s.</string>
     <string name="unfavorite_chat">Премахни от любимите</string>
     <string name="settings_section_title_you">ВИЕ</string>
-    <string name="your_chat_database">Вашата чат база данни</string>
+    <string name="your_chat_database">Вашата база данни</string>
     <string name="icon_descr_waiting_for_image">Изчаква се получаването на изображението</string>
     <string name="waiting_for_image">Изчаква се получаването на изображението</string>
     <string name="icon_descr_waiting_for_video">Изчаква се получаването на видеото</string>
@@ -1245,7 +1245,7 @@
     <string name="voice_message">Гласово съобщение</string>
     <string name="voice_message_with_duration">Гласово съобщение (%1$s)</string>
     <string name="voice_message_send_text">Гласово съобщение…</string>
-    <string name="voice_messages_are_prohibited">Гласовите съобщения са забранени в тази група.</string>
+    <string name="voice_messages_are_prohibited">Гласовите съобщения са забранени.</string>
     <string name="icon_descr_received_msg_status_unread">непрочетено</string>
     <string name="welcome">Добре дошли!</string>
     <string name="personal_welcome">Добре дошли %1$s!</string>
@@ -1275,8 +1275,7 @@
     <string name="group_main_profile_sent">Вашият чат профил ще бъде изпратен на членовете на групата</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Вашият чат профил ще бъде изпратен
 \nдо вашия контакт</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Вашата текуща чат база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.
-\nТова действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Вашата текуща база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната. \nТова действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</string>
     <string name="updating_settings_will_reconnect_client_to_all_servers">Актуализирането на настройките ще свърже отново клиента към всички сървъри.</string>
     <string name="rcv_group_event_updated_group_profile">актуализиран профил на групата</string>
     <string name="video_descr">Видео</string>
@@ -1444,7 +1443,7 @@
     <string name="not_compatible">Несъвместим!</string>
     <string name="waiting_for_mobile_to_connect">Изчаква се мобилното устройство да се свърже:</string>
     <string name="delete_messages__question">Изтрий %d съобщения?</string>
-    <string name="link_a_mobile">Свържи мобилно устройство</string>
+    <string name="link_a_mobile">Свързване на мобилно устройство</string>
     <string name="connect_with_contact_name_question">Свързване с %1$s?</string>
     <string name="remove_member_button">Премахни член</string>
     <string name="block_member_confirmation">Блокирай</string>
@@ -1630,7 +1629,7 @@
     <string name="migrate_to_device_confirm_network_settings">Потвърди мрежовите настройки</string>
     <string name="migrate_to_device_error_downloading_archive">Грешка при изтеглянето на архива</string>
     <string name="migrate_from_device_database_init">Подготвя се качване</string>
-    <string name="migrate_from_device_error_exporting_archive">Грешка при експортиране на чат базата данни</string>
+    <string name="migrate_from_device_error_exporting_archive">Грешка при експортиране на базата данни</string>
     <string name="migrate_from_device_start_chat">Стартиране на чата</string>
     <string name="v5_6_quantum_resistant_encryption">Квантово устойчиво криптиране</string>
     <string name="v5_6_app_data_migration">Миграция на данните от приложението</string>
@@ -1711,8 +1710,8 @@
     <string name="settings_section_title_network_connection">Мрежова връзка</string>
     <string name="simplex_links">SimpleX линкове</string>
     <string name="prohibit_sending_simplex_links">Забранете изпращането на SimpleX линкове</string>
-    <string name="group_members_can_send_simplex_links">Членовете на групата могат да изпращат SimpleX линкове.</string>
-    <string name="simplex_links_are_prohibited_in_group">SimpleX линкове са забранени в тази група.</string>
+    <string name="group_members_can_send_simplex_links">Членовете могат да изпращат SimpleX линкове.</string>
+    <string name="simplex_links_are_prohibited_in_group">SimpleX линкове са забранени.</string>
     <string name="feature_enabled_for">Активирано за</string>
     <string name="feature_roles_owners">собственици</string>
     <string name="permissions_camera">Камера</string>
@@ -1749,4 +1748,526 @@
     <string name="settings_section_title_profile_images">Профилни изображения</string>
     <string name="v5_7_shape_profile_images">Променете формата на профилните изображения</string>
     <string name="v5_7_shape_profile_images_descr">Квадрат, кръг или нещо между тях.</string>
-</resources>
\ No newline at end of file
+    <string name="forward_files_not_accepted_desc">%1$d файл(а) не бяха изтеглени.</string>
+    <string name="forward_files_in_progress_desc">%1$d файл(а) все още се изтеглят.</string>
+    <string name="operator_conditions_accepted">Приети условия</string>
+    <string name="accept_conditions">Приеми условията</string>
+    <string name="n_file_errors">%1$d файлова грешка(и):\n%2$s</string>
+    <string name="forward_files_missing_desc">%1$d файл(а) бяха изтрити.</string>
+    <string name="forward_files_failed_to_receive_desc">Неуспешно изтегляне на %1$d файл(а).</string>
+    <string name="forward_files_messages_deleted_after_selection_title">%1$s съобщения не са препратени</string>
+    <string name="display_name_accepted_invitation">приета покана</string>
+    <string name="n_other_file_errors">%1$d друга(и) файлова(и) грешка(и).</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="onboarding_network_about_operators">За операторите</string>
+    <string name="color_primary_variant2">Допълнителен акцент 2</string>
+    <string name="no_media_servers_configured_for_private_routing">Няма сървъри за получаване на файлове.</string>
+    <string name="private_routing_error">Грешка при поверително рутиране</string>
+    <string name="file_not_approved_descr">Без Tor или VPN вашият IP адрес ще бъде видим за тези XFTP релета:\n%1$s.</string>
+    <string name="forward_alert_title_messages_to_forward">Препращане на %1$s съобщението(ята)?</string>
+    <string name="forward_multiple">Препращане на съобщенията…</string>
+    <string name="compose_forward_messages_n">Препращане на %1$s съобщения</string>
+    <string name="network_smp_proxy_fallback_allow_downgrade">Позволи понижаване</string>
+    <string name="network_smp_proxy_fallback_allow_protected">Когато IP-то е скрито</string>
+    <string name="network_smp_proxy_fallback_prohibit_description">НЕ изпращайте съобщения директно, дори ако вашият или получаващият сървър не поддържат поверително рутиране.</string>
+    <string name="operator_use_for_messages_private_routing">За поверителното рутиране</string>
+    <string name="smp_proxy_error_connecting">Грешка при свързване към препращащият сървър %1$s. Моля, опитайте по-късно.</string>
+    <string name="private_routing_show_message_status">Покажи състоянието на съобщението</string>
+    <string name="private_routing_explanation">За да защити вашия IP адрес, поверително рутиране използва вашите SMP сървъри за доставяне на съобщения.</string>
+    <string name="forward_alert_forward_messages_without_files">Препращане на съобщенията без файловете?</string>
+    <string name="network_smp_proxy_mode_unknown">Неизвестни сървъри</string>
+    <string name="settings_section_title_files">ФАЙЛОВЕ</string>
+    <string name="chat_list_always_visible">Показване на списъка на чатовете в нов прозорец</string>
+    <string name="color_mode_system">Системна</string>
+    <string name="color_mode_dark">Тъмна</string>
+    <string name="theme_black">Черна</string>
+    <string name="reset_single_color">Нулиране на цветовете</string>
+    <string name="v6_0_private_routing_descr">То защитава вашия IP адрес и връзки.</string>
+    <string name="smp_proxy_error_broker_host">Адресът на препращащия сървър е несъвместим с мрежовите настройки: %1$s.</string>
+    <string name="smp_proxy_error_broker_version">Версията на препращащия сървър е несъвместима с мрежовите настройки: %1$s.</string>
+    <string name="proxy_destination_error_failed_to_connect">Препращащият сървър %1$s не успя да се свърже с получаващия сървър %2$s. Моля, опитайте по-късно.</string>
+    <string name="proxy_destination_error_broker_version">Версията на получаващия сървър %1$s е несъвместима с препращащия сървър %2$s.</string>
+    <string name="snd_error_relay">Грешка от получаващия сървър: %1$s</string>
+    <string name="srv_error_host">Адресът на сървъра е несъвместим с мрежовите настройки.</string>
+    <string name="message_forwarded_title">Съобщението е препратено</string>
+    <string name="message_forwarded_desc">Все още няма директна връзка, съобщението е препратено от администратора.</string>
+    <string name="theme_destination_app_theme">Тема на приложението</string>
+    <string name="v5_8_private_routing_descr">Защитете вашия IP адрес от реле сървърите за съобщения, избрани от вашите контакти.\nАктивирайте в настройките *Мрежа и сървъри*.</string>
+    <string name="v5_8_private_routing">Поверително рутиране на съобщенията 🚀</string>
+    <string name="v6_1_forward_many_messages_descr">Препращайте до 20 съобщения наведнъж.</string>
+    <string name="servers_info_proxied_servers_section_footer">Не сте свързани с тези сървъри. Поверителното рутиране се използва за доставяне на съобщенията до тях.</string>
+    <string name="snd_error_auth">Грешен ключ или неизвестна връзка - най-вероятно тази връзка е изтрита.</string>
+    <string name="snd_error_quota">Капацитетът е надвишен - получателят не е получил предишно изпратените съобщения.</string>
+    <string name="snd_error_proxy">Препращащ сървър: %1$s\nГрешка: %2$s</string>
+    <string name="srv_error_version">Версията на сървъра е несъвместима с мрежовите настройки.</string>
+    <string name="protect_ip_address">Защити IP адреса</string>
+    <string name="settings_section_title_private_message_routing">ПОВЕРИТЕЛНО РУТИРАНЕ НА СЪОБЩЕНИЯ</string>
+    <string name="app_will_ask_to_confirm_unknown_file_servers">Приложението ще поиска потвърждение за изтегляния от неизвестни файлови сървъри (с изключение на .onion сървъри или когато SOCKS прокси е активирано).</string>
+    <string name="ci_status_other_error">Грешка: %1$s</string>
+    <string name="forward_files_not_accepted_receive_files">Изтегляне</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">Съобщенията бяха изтрити, след като ги избрахте.</string>
+    <string name="forward_alert_title_nothing_to_forward">Нищо за препращане!</string>
+    <string name="network_smp_proxy_mode_private_routing">Поверително рутиране</string>
+    <string name="network_smp_proxy_mode_unprotected">Незащитен</string>
+    <string name="network_smp_proxy_fallback_allow_protected_description">Изпращайте съобщения директно, когато IP адресът е защитен и вашият или получаващият сървър не поддържа поверително рутиране.</string>
+    <string name="network_smp_proxy_fallback_allow_description">Изпращайте съобщения директно, когато вашият или получаващият сървър не поддържат поверително рутиране.</string>
+    <string name="network_smp_proxy_mode_always_description">Винаги използвай поверително рутиране.</string>
+    <string name="network_smp_proxy_mode_unknown_description">Използвай поверително рутиране с неизвестни сървъри.</string>
+    <string name="settings_section_title_user_theme">Тема на профила</string>
+    <string name="color_mode">Цветен режим</string>
+    <string name="dark_mode_colors">Цветове за тъмен режим</string>
+    <string name="no_message_servers_configured_for_private_routing">Няма сървъри за поверително рутиране на съобщения.</string>
+    <string name="without_tor_or_vpn_ip_address_will_be_visible_to_file_servers">Без Tor или VPN вашият IP адрес ще бъде видим за файловите сървъри.</string>
+    <string name="message_delivery_warning_title">Предупреждение за доставката на съобщението</string>
+    <string name="network_smp_proxy_mode_never_description">НЕ използвайте поверително рутиране.</string>
+    <string name="settings_section_title_chat_colors">Цветове на чата</string>
+    <string name="error_forwarding_messages">Грешка при препращане на съобщенията</string>
+    <string name="proxy_destination_error_broker_host">Адресът на получаващия сървър %1$s е несъвместим с настройките на препращащия сървър %2$s.</string>
+    <string name="file_not_approved_title">Неизвестни сървъри!</string>
+    <string name="snd_error_expired">Проблеми с мрежата - съобщението е отказано след много опити за изпращане.</string>
+    <string name="snd_error_proxy_relay">Препращащ сървър: %1$s\nГрешка от получаващия сървър: %2$s</string>
+    <string name="maximum_message_size_reached_forwarding">Може да копирате и намалите размера на съобщението, за да бъде изпратено.</string>
+    <string name="network_smp_proxy_mode_always">Винаги</string>
+    <string name="network_smp_proxy_fallback_prohibit">Не</string>
+    <string name="network_smp_proxy_mode_never">Никога</string>
+    <string name="update_network_smp_proxy_mode_question">Режим за рутиране на съобщения</string>
+    <string name="network_smp_proxy_mode_unprotected_description">Използвай поверително рутиране с неизвестни сървъри, когато IP адресът не е защитен.</string>
+    <string name="color_mode_light">Светла</string>
+    <string name="network_smp_proxy_fallback_allow">Да</string>
+    <string name="settings_section_title_chat_theme">Тема на чата</string>
+    <string name="color_received_quote">Получен отговор</string>
+    <string name="color_sent_quote">Изпратен отговор</string>
+    <string name="theme_remove_image">Премахни изображението</string>
+    <string name="color_wallpaper_background">Тапетен фон</string>
+    <string name="color_wallpaper_tint">Тапетен акцент</string>
+    <string name="wallpaper_preview_hello_alice">Добър ден!</string>
+    <string name="wallpaper_preview_hello_bob">Добро утро!</string>
+    <string name="wallpaper_scale_fill">Запълване</string>
+    <string name="wallpaper_scale_repeat">Повтори</string>
+    <string name="wallpaper_scale">Мащаб</string>
+    <string name="please_try_later">Моля, опитайте по-късно.</string>
+    <string name="file_error_no_file">Файлът не е намерен - най-вероятно файлът е бил изтрит или отказан.</string>
+    <string name="file_error_relay">Грешка на файловия сървър: %1$s</string>
+    <string name="file_error_auth">Грешен ключ или неизвестен адрес на файлово парче - най-вероятно файлът е изтрит.</string>
+    <string name="share_text_file_status">Файлов статус: %s</string>
+    <string name="all_users">Всички профили</string>
+    <string name="servers_info_private_data_disclaimer">Започвайки от %s.\nВсички данни се съхраняват поверително на вашето устройство..</string>
+    <string name="servers_info_reconnect_server_message">Свържете отново сървъра, за да принудите доставката на съобщенията. Това използва допълнителен трафик.</string>
+    <string name="servers_info_reset_stats_alert_error_title">Грешка при нулиране на статистиката</string>
+    <string name="scan_paste_link">Сканирай / Постави линк</string>
+    <string name="xftp_servers_configured">Конфигурирани XFTP сървъри</string>
+    <string name="appearance_font_size">Размер на шрифта</string>
+    <string name="share_text_message_status">Статус на съобщението: %s</string>
+    <string name="chat_theme_set_default_theme">Задай тема по подразбиране</string>
+    <string name="v5_8_safe_files_descr">Потвърдете файловете от неизвестни сървъри.</string>
+    <string name="servers_info_detailed_statistics_sent_messages_header">Изпратени съобщения</string>
+    <string name="error_initializing_web_view">Грешка при стартиране на WebView. Актуализирайте системата си до новата версия. Моля, свържете се с разработчиците.\nГрешка: %s</string>
+    <string name="xftp_servers_other">Други XFTP сървъри</string>
+    <string name="appearance_zoom">Мащабиране</string>
+    <string name="chat_theme_apply_to_all_modes">Всички цветови режими</string>
+    <string name="chat_theme_apply_to_light_mode">Светъл режим</string>
+    <string name="v5_8_message_delivery_descr">С намален разход на батерията.</string>
+    <string name="file_error">Файлова грешка</string>
+    <string name="info_row_message_status">Статус на съобщението</string>
+    <string name="info_row_file_status">Файлов статус</string>
+    <string name="v5_8_chat_themes">Нови чат теми</string>
+    <string name="v5_8_safe_files">Безопасно получаване на файлове</string>
+    <string name="v5_8_persian_ui">Персийски потребителски интерфейс</string>
+    <string name="servers_info_missing">Няма информация, опитайте да презаредите</string>
+    <string name="servers_info_target">Показване на информация за</string>
+    <string name="servers_info">Информация за сървърите</string>
+    <string name="servers_info_files_tab">Файлове</string>
+    <string name="servers_info_transport_sessions_section_header">Транспортни сесии</string>
+    <string name="servers_info_modal_error_title">Грешка</string>
+    <string name="message_queue_info">Информация за опашката за съобщения</string>
+    <string name="message_queue_info_none">няма</string>
+    <string name="message_queue_info_server_info">информация за опашката на сървъра: %1$s\n\nпоследно получено съобщение: %2$s</string>
+    <string name="servers_info_details">Подробности</string>
+    <string name="servers_info_reconnect_servers_title">Повторно свързване на сървърите?</string>
+    <string name="servers_info_previously_connected_servers_section_header">Предишни свързани сървъри</string>
+    <string name="servers_info_reconnect_servers_error">Грешка при повторното свързване на сървърите</string>
+    <string name="servers_info_reconnect_server_error">Грешка при повторното свързване на сървъра</string>
+    <string name="servers_info_reconnect_all_servers_button">Повторно свързване на всички сървъри</string>
+    <string name="servers_info_reset_stats_alert_confirm">Нулиране</string>
+    <string name="servers_info_downloaded">Свалено</string>
+    <string name="cannot_share_message_alert_text">Избраните чат настройки забраняват това съобщение.</string>
+    <string name="member_info_member_inactive">неактивен</string>
+    <string name="chat_theme_apply_to_dark_mode">Тъмен режим</string>
+    <string name="servers_info_subscriptions_connections_subscribed">Активни връзки</string>
+    <string name="servers_info_subscriptions_connections_pending">Предстоящи</string>
+    <string name="servers_info_connected_servers_section_header">Свързани сървъри</string>
+    <string name="servers_info_subscriptions_total">Общо</string>
+    <string name="member_info_member_disabled">деактивирано</string>
+    <string name="servers_info_reconnect_servers_message">Свържете се отново с всички свързани сървъри, за да принудите доставката на съобщенията. Това използва допълнителен трафик.</string>
+    <string name="remote_ctrl_connection_stopped_identity_desc">Този линк е използван с друго мобилно устройство, моля, създайте нова линк на настолното устройство.</string>
+    <string name="servers_info_sessions_connected">Свързан</string>
+    <string name="servers_info_messages_received">Получени съобщения</string>
+    <string name="servers_info_subscriptions_section_header">Покритие на съобщенията</string>
+    <string name="servers_info_proxied_servers_section_header">Сървъри през прокси</string>
+    <string name="servers_info_reset_stats">Нулиране на всички статистически данни</string>
+    <string name="servers_info_reset_stats_alert_title">Нулиране на всички статистически данни?</string>
+    <string name="servers_info_reset_stats_alert_message">Статистиката на сървърите ще бъде нулирана - това не може да бъде отменено!</string>
+    <string name="servers_info_detailed_statistics">Подробна статистика</string>
+    <string name="member_inactive_title">Членът е неактивен</string>
+    <string name="member_inactive_desc">Съобщението може да бъде доставено по-късно, ако членът стане активен.</string>
+    <string name="cannot_share_message_alert_title">Не може да се изпрати съобщението</string>
+    <string name="subscription_percentage">Покажи процент</string>
+    <string name="servers_info_reconnect_server_title">Повторно свързване на сървъра?</string>
+    <string name="servers_info_uploaded">Качено</string>
+    <string name="servers_info_detailed_statistics_sent_messages_total">Изпратени общо</string>
+    <string name="copy_error">Грешка при копиране</string>
+    <string name="network_error_broker_host_desc">Адресът на сървъра е несъвместим с мрежовите настройки: %1$s.</string>
+    <string name="network_error_broker_version_desc">Версията на сървъра е несъвместима с вашето приложение: %1$s.</string>
+    <string name="servers_info_sessions_errors">Грешки</string>
+    <string name="servers_info_statistics_section_header">Статистика</string>
+    <string name="servers_info_sessions_connecting">Свързване</string>
+    <string name="servers_info_messages_sent">Изпратени съобщения</string>
+    <string name="info_row_debug_delivery">Отстраняване на грешки за доставка</string>
+    <string name="wallpaper_scale_fit">Изпълване</string>
+    <string name="wallpaper_advanced_settings">Разширени настройки</string>
+    <string name="chat_theme_apply_to_mode">Приложи към</string>
+    <string name="chat_theme_reset_to_app_theme">Нулиране с темата за приложението</string>
+    <string name="chat_theme_reset_to_user_theme">Нулиране с потребителска тема</string>
+    <string name="v5_8_chat_themes_descr">Направете вашите чатове да изглеждат различно!</string>
+    <string name="current_user">Текущ профил</string>
+    <string name="reconnect">Повторно свързване</string>
+    <string name="servers_info_detailed_statistics_received_messages_header">Получени съобщения</string>
+    <string name="servers_info_detailed_statistics_received_total">Получени общо</string>
+    <string name="servers_info_detailed_statistics_receive_errors">Получени грешки</string>
+    <string name="remote_ctrl_connection_stopped_desc">Моля, проверете дали мобилното и настолното устройство са свързани към една и съща локална мрежа и дали защитната стена на настолното устройство позволява връзката.\nМоля, споделете всички други проблеми с разработчиците.</string>
+    <string name="temporary_file_error">Временна файлова грешка</string>
+    <string name="smp_servers_configured">Конфигурирани SMP сървъри</string>
+    <string name="smp_servers_other">Други SMP сървъри</string>
+    <string name="v5_8_message_delivery">Подобрена доставка на съобщения</string>
+    <string name="attempts_label">опити</string>
+    <string name="expired_label">изтекли</string>
+    <string name="other_label">други</string>
+    <string name="duplicates_label">дубликати</string>
+    <string name="acknowledged">Потвърден</string>
+    <string name="acknowledgement_errors">Грешки при потвърждението</string>
+    <string name="connections">Връзки</string>
+    <string name="servers_info_starting_from">Започвайки от %s.</string>
+    <string name="xftp_server">XFTP сървър</string>
+    <string name="sent_directly">Изпратени директно</string>
+    <string name="sent_via_proxy">Изпратени чрез прокси</string>
+    <string name="proxied">Чрез прокси</string>
+    <string name="smp_server">SMP сървър</string>
+    <string name="send_errors">Изпрати грешки</string>
+    <string name="other_errors">други грешки</string>
+    <string name="decryption_errors">грешки при декриптиране</string>
+    <string name="deletion_errors">Грешки при изтриване</string>
+    <string name="created">Създаден</string>
+    <string name="completed">Завършен</string>
+    <string name="deleted">Изтрит</string>
+    <string name="secured">Защитен</string>
+    <string name="subscribed">Абониран</string>
+    <string name="subscription_results_ignored">Абонаменти игнорирани</string>
+    <string name="subscription_errors">Абонаментни грешки</string>
+    <string name="chunks_uploaded">Качени парчета</string>
+    <string name="uploaded_files">Качени файлове</string>
+    <string name="upload_errors">Грешки при качване</string>
+    <string name="size">Размер</string>
+    <string name="chunks_deleted">Парчета изтрити</string>
+    <string name="chunks_downloaded">Изтеглени парчета</string>
+    <string name="downloaded_files">Изтеглени файлове</string>
+    <string name="toolbar_settings">Настройки</string>
+    <string name="app_check_for_updates_disabled">Деактивирано</string>
+    <string name="app_check_for_updates_stable">Стабилен канал</string>
+    <string name="app_check_for_updates_beta">Бета канал</string>
+    <string name="app_check_for_updates_update_available">Налична актуализация: %s</string>
+    <string name="app_check_for_updates_download_started">Изтегляне на актуализация на приложението, не затваряйте приложението</string>
+    <string name="create_address_button">Създай</string>
+    <string name="privacy_media_blur_radius_strong">Много</string>
+    <string name="settings_section_title_message_shape">Форма на съобщение</string>
+    <string name="allow_calls_question">Позволи обаждания?</string>
+    <string name="calls_prohibited_alert_title">Обажданията са забранени!</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Моля, поискайте вашия контакт да позволи обажданията.</string>
+    <string name="v6_0_privacy_blur">Размазване за по-добра поверителност.</string>
+    <string name="v6_0_delete_many_messages_descr">Изтрийте до 20 съобщения наведнъж.</string>
+    <string name="v6_0_chat_list_media">Възпроизвеждане от чат списъка.</string>
+    <string name="v6_1_better_security_descr">SimpleX протоколите, прегледани от Trail of Bits.</string>
+    <string name="v6_1_better_security">По-добра сигурност ✅</string>
+    <string name="compose_save_messages_n">%1$s съобщения се запазват</string>
+    <string name="keep_conversation">Запази разговора</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_entity">Използвай различни прокси идентификационни данни за всяка връзка.</string>
+    <string name="network_proxy_incorrect_config_title">Грешка за запазване на прокси</string>
+    <string name="app_check_for_updates_download_completed_title">Актуализацията на приложението е изтеглена</string>
+    <string name="cant_call_contact_alert_title">Обаждането на контакта не е позволено</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">Тече свързване с контакт, моля изчакайте или проверете по-късно!</string>
+    <string name="cant_call_member_alert_title">Обаждането на груповия член е не е позволено</string>
+    <string name="system_mode_toast">Системен режим</string>
+    <string name="v6_0_your_contacts_descr">Архивирайте контактите, за да разговаряте по-късно.</string>
+    <string name="invite_friends_short">Покани</string>
+    <string name="chat_database_exported_not_all_files">Някои файлове не са били експортирани</string>
+    <string name="chat_database_exported_title">Базата данни е експортирана</string>
+    <string name="error_parsing_uri_title">Невалиден линк</string>
+    <string name="error_parsing_uri_desc">Моля, проверете, че SimpleX линкът е правилен.</string>
+    <string name="only_delete_conversation">Изтрий само разговора</string>
+    <string name="network_socks_proxy">SOCKS прокси</string>
+    <string name="v6_0_upgrade_app">Автоматични актуализации на приложението</string>
+    <string name="network_options_save_and_reconnect">Запази и се свържи отново</string>
+    <string name="v6_0_reachable_chat_toolbar">Достъпен панел</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Използвайте приложението с една ръка.</string>
+    <string name="v6_0_connect_faster_descr">Свържете се с приятелите си по-бързо.</string>
+    <string name="v6_0_connection_servers_status">Контролирайте вашата мрежа</string>
+    <string name="v6_0_upgrade_app_descr">Изтеглете новите версии от GitHub.</string>
+    <string name="v6_0_increase_font_size">Увеличете размера на шрифта.</string>
+    <string name="v6_1_better_calls">По-добри обаждания</string>
+    <string name="v6_1_better_calls_descr">Превключете аудио и видео по време на разговора.</string>
+    <string name="no_filtered_contacts">Няма филтрирани контакти</string>
+    <string name="contact_list_header_title">Вашите контакти</string>
+    <string name="chat_database_exported_save">Можете да запазите експортирания архив.</string>
+    <string name="chat_database_exported_migrate">Можете да мигрирате експортираната база данни.</string>
+    <string name="one_hand_ui_change_instruction">Можете да го промените в настройките за Изглед.</string>
+    <string name="network_option_tcp_connection">TCP връзка</string>
+    <string name="v6_0_connection_servers_status_descr">Състояние на връзката и сървърите.</string>
+    <string name="delete_members_messages__question">Изтриване на %d съобщения на членовете?</string>
+    <string name="confirm_delete_contact_question">Потвърди изтриването на контакта?</string>
+    <string name="network_proxy_username">Потребителско име</string>
+    <string name="app_check_for_updates">Провери за актуализации</string>
+    <string name="privacy_media_blur_radius_off">Изключено</string>
+    <string name="privacy_media_blur_radius_medium">Средно</string>
+    <string name="privacy_media_blur_radius_soft">Малко</string>
+    <string name="settings_message_shape_corner">Ъгъл</string>
+    <string name="settings_message_shape_tail">Опашка</string>
+    <string name="cant_call_contact_deleted_alert_text">Контактът е изтрит..</string>
+    <string name="you_need_to_allow_calls">Трябва да разрешите на вашия контакт да може да ви се обажда, за да можете и вие да се обаждате.</string>
+    <string name="paste_link">Постави линк</string>
+    <string name="switching_profile_error_message">Връзката ви беше преместена към %s, но възникна неочаквана грешка при пренасочването ви към профила.</string>
+    <string name="network_session_mode_session">Сесия на приложението</string>
+    <string name="network_session_mode_server">Сървър</string>
+    <string name="app_check_for_updates_button_download">Изтегли %s (%s)</string>
+    <string name="app_check_for_updates_button_skip">Пропусни тази версия</string>
+    <string name="app_check_for_updates_notice_title">Провери за актуализации</string>
+    <string name="settings_section_title_chat_database">БАЗА ДАННИ</string>
+    <string name="one_hand_ui_card_title">Превключване на чат списъка:</string>
+    <string name="you_can_still_send_messages_to_contact">Можете да изпращате съобщения до %1$s от архивираните контакти.</string>
+    <string name="chat_bottom_bar">Достъпен панел</string>
+    <string name="cant_send_message_to_member_alert_title">Изпращането на съобщения на груповия член не е налично</string>
+    <string name="error_initializing_web_view_wrong_arch">Грешка при стартиране на WebView. Уверете се, че сте инсталирали WebView и поддържаната архитектура е ARM64.\nГрешка: %s</string>
+    <string name="delete_messages_cannot_be_undone_warning">Съобщенията ще бъдат изтрити - това не може да бъде отменено!</string>
+    <string name="moderate_messages_will_be_deleted_warning">Съобщенията ще бъдат изтрити за всички членове.</string>
+    <string name="moderate_messages_will_be_marked_warning">Съобщенията ще бъдат маркирани като модерирани за всички членове.</string>
+    <string name="selected_chat_items_selected_n">Избрано %d</string>
+    <string name="selected_chat_items_nothing_selected">Нищо не е избрано</string>
+    <string name="compose_message_placeholder">Съобщение</string>
+    <string name="info_view_open_button">отвори</string>
+    <string name="info_view_message_button">съобщение</string>
+    <string name="info_view_call_button">обаждане</string>
+    <string name="delete_contact_cannot_undo_warning">Контактът ще бъде изтрит - това не може да бъде отменено!</string>
+    <string name="info_view_connect_button">свързване</string>
+    <string name="delete_without_notification">Изтрий без известие</string>
+    <string name="conversation_deleted">Разговорът е изтрит!</string>
+    <string name="you_can_still_view_conversation_with_contact">Все още ще можете да видите разговора с %1$s в списъка с чатовете.</string>
+    <string name="new_chat_share_profile">Сподели профил</string>
+    <string name="select_chat_profile">Избери чат профил</string>
+    <string name="switching_profile_error_title">Грешка при превключване на профил</string>
+    <string name="action_button_add_members">Покани</string>
+    <string name="icon_descr_sound_muted">Звукът е заглушен</string>
+    <string name="appearance_app_toolbars">Панели на приложението</string>
+    <string name="cant_call_member_send_message_alert_text">Изпратете съобщение за да се активират обажданията.</string>
+    <string name="info_view_search_button">търсене</string>
+    <string name="info_view_video_button">видео</string>
+    <string name="contact_deleted">Контактът е изтрит!</string>
+    <string name="deleted_chats">Архивирани контакти</string>
+    <string name="one_hand_ui">Достъпни панели</string>
+    <string name="open_server_settings_button">Отвори настройките на сървъра</string>
+    <string name="chat_database_exported_continue">Продължи</string>
+    <string name="app_check_for_updates_button_open">Отвори местоположението на файла</string>
+    <string name="app_check_for_updates_button_install">Инсталиране на актуализация</string>
+    <string name="app_check_for_updates_button_remind_later">Напомни по-късно</string>
+    <string name="app_check_for_updates_installed_successfully_title">Инсталирането е успешно</string>
+    <string name="app_check_for_updates_installed_successfully_desc">Моля, рестартирайте приложението.</string>
+    <string name="app_check_for_updates_canceled">Изтеглянето на актуализацията е отменено</string>
+    <string name="migrate_from_device_remove_archive_question">Премахни архив?</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">Каченият архив на базата данни ще бъде окончателно премахнат от сървърите.</string>
+    <string name="call_desktop_permission_denied_title">За да извършвате обаждания, разрешете да използва микрофона. Прекратете разговора и опитайте да се обадите отново.</string>
+    <string name="call_desktop_permission_denied_chrome">Натиснете бутона за информация близо до адресното поле, за да разрешите използването на микрофона.</string>
+    <string name="call_desktop_permission_denied_safari">Отворете Safari Настройки / Уеб страници / Микрофон, след което изберете Позволи за localhost.</string>
+    <string name="v6_0_new_chat_experience">Нов интерфейс 🎉</string>
+    <string name="v6_0_new_media_options">Нови медийни опции</string>
+    <string name="v6_1_better_user_experience">Подобрен интерфейс</string>
+    <string name="select_verb">Избери</string>
+    <string name="delete_messages_mark_deleted_warning">Съобщенията ще бъдат маркирани за изтриване. Получателят(ите) ще могат да разкрият тези съобщения.</string>
+    <string name="privacy_media_blur_radius">Размазване на медия</string>
+    <string name="message_servers">Сървъри за съобщения</string>
+    <string name="new_message">Ново съобщение</string>
+    <string name="media_and_file_servers">Сървъри за медия и файлове</string>
+    <string name="network_proxy_auth">Прокси идентификация</string>
+    <string name="network_proxy_random_credentials">Използвай случайни идентификационни данни</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_user">Използвай различни прокси идентификационни данни за всеки профил.</string>
+    <string name="network_proxy_auth_mode_no_auth">Не използвай идентификационни данни с прокси.</string>
+    <string name="network_proxy_auth_mode_username_password">Вашите идентификационни данни могат да бъдат изпратени некриптирани.</string>
+    <string name="network_proxy_password">Парола</string>
+    <string name="network_proxy_incorrect_config_desc">Уверете се, че прокси конфигурацията е правилна.</string>
+    <string name="network_session_mode_session_description">Нови идентификационни данни за SOCKS ще се използват всеки път, когато стартирате приложението.</string>
+    <string name="network_session_mode_server_description">Ще се използват нови SOCKS идентификационни данни за всеки сървър.</string>
+    <string name="app_check_for_updates_notice_desc">За да бъдете уведомени за новите версии, включете периодичната проверка за стабилни или бета версии.</string>
+    <string name="app_check_for_updates_notice_disable">Деактивиране</string>
+    <string name="reset_all_hints">Нулирай всички съвети</string>
+    <string name="download_errors">Грешки при изтегляне</string>
+    <string name="server_address">Сървърен адрес</string>
+    <string name="no_message_servers_configured">Няма сървъри за съобщения.</string>
+    <string name="no_message_servers_configured_for_receiving">Няма сървъри за получаване на съобщения.</string>
+    <string name="for_chat_profile">За чат профил %s:</string>
+    <string name="errors_in_servers_configuration">Грешки в конфигурацията на сървърите.</string>
+    <string name="connection_error_quota">Недоставени съобщения</string>
+    <string name="connection_error_quota_desc">Връзката достигна лимита за недоставени съобщения, вашият контакт може да е офлайн.</string>
+    <string name="share_simplex_address_on_social_media">Сподели SimpleX адресът в социалните мрежи.</string>
+    <string name="connection_security">Сигурност на връзката</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">За да се предпазите от подмяна на вашия линк, можете да сравните кодовете за сигурност на контакта.</string>
+    <string name="for_social_media">За социалните мрежи</string>
+    <string name="simplex_address_or_1_time_link">SimpleX адрес или еднократен линк?</string>
+    <string name="create_1_time_link">Създай еднократен линк</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Приложението защитава вашата поверителност, като използва различни оператори за всеки разговор.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Например, ако контактът ви получава съобщения чрез SimpleX Chat сървър, приложението ви ще ги достави чрез Flux сървър.</string>
+    <string name="onboarding_choose_server_operators">Сървърни оператори</string>
+    <string name="onboarding_network_operators">Мрежови оператори</string>
+    <string name="onboarding_network_operators_review_later">Преглед по-късно</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Можете да конфигурирате операторите в Мрежа и сървъри.</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Условията ще бъдат автоматично приети за активираните оператори на: %s.</string>
+    <string name="your_servers">Вашите сървъри</string>
+    <string name="operator_conditions_will_be_accepted_on">Условията ще бъдат приети на: %s.</string>
+    <string name="operator_use_operator_toggle_description">Използвай сървърите</string>
+    <string name="use_servers_of_operator_x">Използвай %s</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Условията вече са приети за следния оператор(и): <b>%s</b>.]]></string>
+    <string name="view_conditions">Преглед на условията</string>
+    <string name="operator_conditions_of_use">Условия за ползване</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[За да използвате сървърите на <b>%s</b>, приемете условията за използване.]]></string>
+    <string name="operator_use_for_sending">За изпращане</string>
+    <string name="operator_added_message_servers">Добавени сървъри за съобщения</string>
+    <string name="operator_use_for_files">Използвай за файлове</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Отворете чата при първото непрочетено съобщение.\n- Преминете към цитирани съобщения.</string>
+    <string name="update_network_smp_proxy_fallback_question">Резервно рутиране на съобщения</string>
+    <string name="debug_logs">Активирай логовете</string>
+    <string name="add_your_team_members_to_conversations">Добавете членовете на вашия екип към разговорите.</string>
+    <string name="strikethrough_text">задраскан</string>
+    <string name="onboarding_network_operators_continue">Продължи</string>
+    <string name="button_add_friends">Добави приятели</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[ Условия са приети за оператора(ите): <b>%s</b>.]]></string>
+    <string name="operator_website">Уеб страница</string>
+    <string name="operator_conditions_accepted_on">Условия, приети на: %s.</string>
+    <string name="remote_hosts_section">Дистанционни мобилни устройства</string>
+    <string name="network_preset_servers_title">Предварително зададени сървъри</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Ще бъдат приети условия за оператора(ите): <b>%s</b>.]]></string>
+    <string name="operator_open_changes">Отвори промените</string>
+    <string name="error_updating_server_title">Грешка при актуализиране на сървъра</string>
+    <string name="error_server_protocol_changed">Сървърният протокол е променен.</string>
+    <string name="error_adding_server">Грешка при добавяне на сървър</string>
+    <string name="direct_messages_are_prohibited_in_chat">Личните съобщения между членовете са забранени в този чат.</string>
+    <string name="v6_1_customizable_message_descr">Персонализирана форма на съобщенията.</string>
+    <string name="v6_1_message_dates_descr">По-добри дати на съобщението.</string>
+    <string name="v6_2_network_decentralization_enable_flux">Активиране на flux</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">за по-добра поверителност на метаданните.</string>
+    <string name="v6_2_improved_chat_navigation">Подобрена навигация в чата</string>
+    <string name="error_saving_database">Грешка при запазване на базата данни</string>
+    <string name="chat_main_profile_sent">Вашият профил ще бъде изпратен до членовете</string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Същите условия ще се прилагат за оператора(ите): <b>%s</b>.]]></string>
+    <string name="operator_use_for_messages_receiving">За получаване</string>
+    <string name="operator_added_xftp_servers">Добавени медийни и файлови сървъри</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Същите условия ще се прилагат за оператора <b>%s</b>.]]></string>
+    <string name="connection_not_ready">Връзката не е готова.</string>
+    <string name="operator">Оператор</string>
+    <string name="view_updated_conditions">Вижте актуализираните условия</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi устройства </b>: моля, активирайте Autostart в системните настройки, за да работят известията.]]></string>
+    <string name="message_deleted_or_not_received_error_title">Няма съобщение</string>
+    <string name="or_to_share_privately">Или да се сподели лично</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Всички съобщения и файлове се изпращат <b>криптирани от край до край</b>, с постквантова сигурност в директните съобщения.]]></string>
+    <string name="onboarding_notifications_mode_off_desc_short">Без фонова услуга</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Проверявай за съобщения на всеки 10 минути</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Приложението винаги работи във фонов режим</string>
+    <string name="onboarding_notifications_mode_battery">Известия и батерия</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Условията ще бъдат приети за активираните оператори след 30 дни.</string>
+    <string name="onboarding_network_operators_configure_via_settings">Можете да конфигурирате сървърите през настройките.</string>
+    <string name="onboarding_network_operators_update">Актуализация</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Ще се приемат условия за оператора(ите): <b>%s</b>.]]></string>
+    <string name="operator_use_for_messages">Използвай за съобщения</string>
+    <string name="direct_messages_are_prohibited">Личните съобщения между членовете са забранени.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Вече сте свързани с <b>%1$s</b>.]]></string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">SimpleX адресът и еднократните линкове за връзки са безопасни за споделяне чрез всеки месинджър.</string>
+    <string name="you_can_set_connection_name_to_remember">Можете да зададете име на връзка, за да запомните с кого е споделена.</string>
+    <string name="server_added_to_operator__name">Сървърът е добавен към оператор %s.</string>
+    <string name="error_updating_chat_tags">Грешка при актуализирането на чат списъка</string>
+    <string name="error_creating_chat_tags">Грешка при създаването на чат списъка</string>
+    <string name="message_deleted_or_not_received_error_desc">Това съобщение е изтрито или не е получено.</string>
+    <string name="error_loading_chat_tags">Грешка при зареждането на чат списъка</string>
+    <string name="no_chats_in_list">Няма чатове в списъка %s.</string>
+    <string name="no_unread_chats">Няма непрочетени чатове</string>
+    <string name="address_creation_instruction">Докосни Създаване на SimpleX адрес в менюто, за да го създадете по-късно.</string>
+    <string name="no_chats">Няма чатове</string>
+    <string name="no_chats_found">Няма намерени чатове</string>
+    <string name="chat_list_favorites">Любими</string>
+    <string name="chat_list_contacts">Контакти</string>
+    <string name="chat_list_groups">Групи</string>
+    <string name="chat_list_add_list">Добави списък</string>
+    <string name="open_with_app">Отвори с %s</string>
+    <string name="sync_connection_confirm">Поправи</string>
+    <string name="encryption_renegotiation_in_progress">В ход е предоговаряне на криптирането.</string>
+    <string name="create_list">Създай списък</string>
+    <string name="add_to_list">Добави към списъка</string>
+    <string name="save_list">Запази списъка</string>
+    <string name="duplicated_list_error">Името на списъка и емотиконите трябва да са различни за всички списъци.</string>
+    <string name="delete_chat_list_warning">Всички чатове ще бъдат премахнати от списъка %s и списъкът ще бъде изтрит</string>
+    <string name="edit_chat_list_menu_action">Редактирай</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[еднократният линк може да се използва <i>само с един контакт</i> - споделете лично или чрез произволен месинджър.]]></string>
+    <string name="address_or_1_time_link">Адрес или еднократен линк?</string>
+    <string name="smp_servers_new_server">Нов сървър</string>
+    <string name="operator_servers_title">%s сървъри</string>
+    <string name="operator_conditions_failed_to_load">Текстът на текущите условия не може да бъде зареден, можете да прегледате условията през този линк:</string>
+    <string name="error_server_operator_changed">Сървърният оператор е променен.</string>
+    <string name="invite_to_chat_button">Покана за чат</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Чатът ще бъде изтрит за вас - това не може да бъде отменено!</string>
+    <string name="button_leave_chat">Напусни чата</string>
+    <string name="button_delete_chat">Изтрий чата</string>
+    <string name="delete_chat_question">Изтрий чата?</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Чатът ще бъде изтрит за всички членове - това не може да бъде отменено!</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Членът ще бъде премахнат от чата - това не може да бъде отменено!</string>
+    <string name="info_row_chat">Чат</string>
+    <string name="operator_review_conditions">Преглед на условията</string>
+    <string name="xftp_servers_per_user">Сървърите за нови файлове от текущия ви профил</string>
+    <string name="v6_2_business_chats_descr">Поверителност за вашите клиенти.</string>
+    <string name="v6_2_network_decentralization">Децентрализация на мрежата</string>
+    <string name="v6_2_network_decentralization_descr">Вторият предварително зададен оператор в приложението!</string>
+    <string name="v6_2_business_chats">Бизнес чатове</string>
+    <string name="share_address_publicly">Сподели адресът публично</string>
+    <string name="chat_list_all">Всички</string>
+    <string name="only_chat_owners_can_change_prefs">Само собствениците на чат могат да променят настройките.</string>
+    <string name="delete_chat_list_question">Изтрий списъка?</string>
+    <string name="list_menu">Списък</string>
+    <string name="delete_chat_list_menu_action">Изтрий</string>
+    <string name="chat_list_businesses">Бизнеси</string>
+    <string name="list_name_field_placeholder">Име на списъка...</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Когато е активиран повече от един оператор, никои от тях няма метаданни, за да научи кой с кого комуникира.</string>
+    <string name="connect_plan_chat_already_exists">Чатът вече съществува!</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Ролята ще бъде променена на %s. Всички в чата ще бъдат уведомени.</string>
+    <string name="operator_info_title">Мрежов оператор</string>
+    <string name="operator_server_alert_title">Сървър на оператора</string>
+    <string name="appearance_in_app_bars_alpha">Прозрачност</string>
+    <string name="v6_1_delete_many_messages_descr">Изтриване или модериране до 200 съобщения.</string>
+    <string name="chat_archive">Или импортирайте архивен файл</string>
+    <string name="display_name_requested_to_connect">заявка за свързване</string>
+    <string name="failed_to_save_servers">Грешка при запазване на сървърите</string>
+    <string name="no_media_servers_configured">Няма сървъри за медия и файлове.</string>
+    <string name="no_media_servers_configured_for_sending">Няма сървъри за изпращане на файлове.</string>
+    <string name="error_accepting_operator_conditions">Грешка при приемане на условия</string>
+    <string name="maximum_message_size_title">Съобщението е твърде голямо!</string>
+    <string name="maximum_message_size_reached_text">Моля, намалете размера на съобщението и го изпратете отново.</string>
+    <string name="maximum_message_size_reached_non_text">Моля, намалете размера на съобщението или премахнете мултимедията и изпратете отново.</string>
+    <string name="business_address">Бизнес адрес</string>
+    <string name="leave_chat_question">Напусни чата?</string>
+    <string name="appearance_bars_blur_radius">Размазване</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat и Flux сключиха споразумение за включване на управлявани от Flux сървъри в приложението.</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Тези условия ще се прилагат и за: <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Тези условия ще се прилагат и за: <b>%s</b>.]]></string>
+    <string name="operator_open_conditions">Отвори условията</string>
+    <string name="v6_1_switch_chat_profile_descr">Превключете чат профила за еднократен линк за връзка.</string>
+    <string name="sync_connection_question">Поправи връзката?</string>
+    <string name="sync_connection_desc">Връзката изисква предоговаряне на криптирането.</string>
+    <string name="share_1_time_link_with_a_friend">Сподели еднократен линк за връзка с приятел</string>
+    <string name="address_settings">Настройки на адреса</string>
+    <string name="onboarding_select_network_operators_to_use">Изберете мрежови оператори за използване.</string>
+    <string name="how_it_helps_privacy">Как помага за поверителността</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Ще спрете да получавате съобщения от този чат. Историята на чата ще бъде запазена.</string>
+    <string name="button_add_team_members">Добави членове на екипа</string>
+    <string name="mute_all_chat">Заглушаване на всички</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ca/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ca/strings.xml
new file mode 100644
index 0000000000..0e179fadd4
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ca/strings.xml
@@ -0,0 +1,2356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="v4_3_improved_server_configuration_desc">Afegiu servidors escanejant codis QR.</string>
+    <string name="forward_files_messages_deleted_after_selection_title">%1$s missatges no reenviats</string>
+    <string name="block_member_desc">Tots els missatges nous de %s s\'amagaran!</string>
+    <string name="notifications_mode_off_desc">L\'aplicació només pot rebre notificacions quan s\'està executant, no s\'iniciarà cap servei en segon pla</string>
+    <string name="notifications_mode_service_desc">El servei en segon pla sempre s\'executa: les notificacions es mostraran tan aviat com els missatges estiguin disponibles.</string>
+    <string name="color_primary_variant">Color addicional</string>
+    <string name="icon_descr_asked_to_receive">S\'ha demanat rebre la imatge</string>
+    <string name="member_info_member_blocked">blocat</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Tots els vostres contactes, converses i fitxers es xifraran de manera segura i es penjaran en trossos als relés XFTP configurats.</string>
+    <string name="notifications_mode_service">Sempre actiu</string>
+    <string name="alert_title_msg_bad_id">Identificador incorrecte de missatge</string>
+    <string name="network_session_mode_entity_description"><![CDATA[S\'utilitzarà una connexió TCP independent (i una credencial SOCKS) <b>per a cada contacte i membre del grup</b>.\n<b>Tingueu en compte</b>: si teniu moltes connexions, el vostre el consum de bateria i trànsit pot ser substancialment més elevat i algunes connexions poden fallar.]]></string>
+    <string name="alert_title_msg_bad_hash">Hash incorrecte de missatge</string>
+    <string name="turning_off_service_and_periodic">L\'optimització de la bateria està activa, desactiva el servei en segon pla i les sol·licituds periòdiques de missatges nous. Podeu tornar-los a activar mitjançant la configuració.</string>
+    <string name="attempts_label">intents</string>
+    <string name="block_member_confirmation">Blocar</string>
+    <string name="remote_host_error_bad_version"><![CDATA[Mobile <b>%s</b> té una versió no compatible.  Si us plau, assegureu-vos que feu servir la mateixa versió als dos dispositius]]></string>
+    <string name="call_service_notification_audio_call">Trucada</string>
+    <string name="la_auth_failed">L\'autenticació ha fallat</string>
+    <string name="auth_unavailable">Autenticació no disponible</string>
+    <string name="both_you_and_your_contact_can_send_voice">Tant tu com el teu contacte podeu enviar missatges de veu.</string>
+    <string name="info_view_call_button">trucar</string>
+    <string name="call_already_ended">La trucada ja s\'ha acabat!</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Es pot desactivar mitjançant la configuració</b>: les notificacions encara es mostraran mentre l\'aplicació s\'executa.]]></string>
+    <string name="color_primary">Color</string>
+    <string name="abort_switch_receiving_address_desc">El canvi d\'adreça s\'avortarà. S\'utilitzarà l\'adreça de recepció antiga.</string>
+    <string name="wallpaper_advanced_settings">Configuració avançada</string>
+    <string name="v4_2_auto_accept_contact_requests">Accepta automàticament les sol·licituds de contacte</string>
+    <string name="allow_voice_messages_question">Vols permetre els missatges de veu?</string>
+    <string name="bad_desktop_address">Mala adreça d\'ordinador</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Els missatges, els fitxers i les trucades estan protegits per un <b>xifratge d\'extrem a extrem</b> amb PFS, repudi i recuperació per intrusió.]]></string>
+    <string name="all_your_contacts_will_remain_connected_update_sent">Tots els teus contactes romandran connectats. L\'actualització del perfil s\'enviarà als teus contactes.</string>
+    <string name="connect_plan_already_connecting">Ja estem connectant!</string>
+    <string name="connect_plan_already_joining_the_group">Ja us uniu al grup!</string>
+    <string name="attach">Adjuntar</string>
+    <string name="integrity_msg_bad_id">Identificador incorrecte de missatge</string>
+    <string name="icon_descr_cancel_file_preview">Cancel·la la vista prèvia del fitxer</string>
+    <string name="snd_error_quota">S\'ha superat la capacitat: el destinatari no ha rebut missatges enviats anteriorment.</string>
+    <string name="network_session_mode_user_description"><![CDATA[S\'utilitzarà una connexió TCP independent (i una credencial SOCKS) <b>per a cada perfil de xat que tingueu a l\'aplicació</b>.]]></string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Afegeix un contacte</b>: crea un enllaç d\'invitació nou o connecta\'t mitjançant un enllaç que has rebut.]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Tingueu en compte</b>: utilitzar la mateixa base de dades en dos dispositius trencarà el desxifrat dels missatges de les vostres connexions, com a protecció de seguretat.]]></string>
+    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Utilitza més bateria</b>! L\'aplicació sempre s\'executa en segon pla: les notificacions es mostren a l\'instant.]]></string>
+    <string name="remote_host_error_bad_state"><![CDATA[La connexió al mòbil <b>%s</b> està en mal estat]]></string>
+    <string name="remote_host_disconnected_from"><![CDATA[Desconnectat del mòbil <b>%s</b> amb el motiu: %s]]></string>
+    <string name="moderated_items_description">%1$d missatge(s) moderat(s) per %2$s</string>
+    <string name="blocked_by_admin_item_description">blocat per l\'administrador</string>
+    <string name="e2ee_info_pq"><![CDATA[Els missatges, els fitxers i les trucades estan protegits per un <b>xifratge extrem a extrem resistent quàntic</b> amb PFS, repudi i recuperació d\'intrusió.]]></string>
+    <string name="n_other_file_errors">%1$d altre(s) error(s) del fitxer.</string>
+    <string name="cannot_receive_file">No es pot rebre el fitxer</string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Permet-ho</b> al següent diàleg per rebre notificacions a l\'instant.]]></string>
+    <string name="database_initialization_error_title">No es pot inicialitzar la base de dades</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Dispositius Xiaomi</b>: activeu l\'inici automàtic a la configuració del sistema perquè les notificacions funcionin.]]></string>
+    <string name="icon_descr_cancel_image_preview">Cancelar vista prèvia de la imatge</string>
+    <string name="cannot_share_message_alert_title">No es pot enviar el missatge</string>
+    <string name="icon_descr_video_asked_to_receive">S\'ha demanat rebre el vídeo</string>
+    <string name="back">Tornar</string>
+    <string name="use_camera_button">Càmera</string>
+    <string name="camera_not_available">Càmera no disponible</string>
+    <string name="cancel_verb">Cancelar</string>
+    <string name="icon_descr_cancel_live_message">Cancel·la el missatge en directe</string>
+    <string name="above_then_preposition_continuation">a dalt, aleshores:</string>
+    <string name="create_group_button_to_create_new_group"><![CDATA[<b>Crea grup</b>: per crear un grup nou.]]></string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code"><![CDATA[💻 ordinador: escaneja el codi QR que es mostra des de l\'aplicació, mitjançant <b>Escaneja el codi QR</b>.]]></string>
+    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 mòbil: toca <b>Obre a l\'aplicació per a mòbils</b> i després toca <b>Connecta</b> a l\'aplicació.]]></string>
+    <string name="clear_note_folder_warning">Tots els missatges se suprimiran; això no es pot desfer!</string>
+    <string name="clear_chat_warning">Tots els missatges s\'eliminaran NOMÉS per a tu; això no es pot desfer!</string>
+    <string name="icon_descr_cancel_link_preview">cancel·la la vista prèvia de l\'enllaç</string>
+    <string name="connect__a_new_random_profile_will_be_shared">Es compartirà un nou perfil aleatori.</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[l\'enllaç d\'un cop es pot utilitzar <i>només amb un contacte</i>: compartiu-lo en persona o mitjançant qualsevol missatger.]]></string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Si no us podeu trobar en persona, podeu <b>escanejar el codi QR a la videotrucada</b> o el vostre contacte pot compartir un enllaç d\'invitació.]]></string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Si no pots trobar-te en persona, <b>mostra el codi QR a la videotrucada</b> o comparteix l\'enllaç.]]></string>
+    <string name="deleted_chats">Contactes arxivats</string>
+    <string name="read_more_in_user_guide_with_link"><![CDATA[Llegir més a la <font color="#0088ff">Guia de l\'usuari</font>.]]></string>
+    <string name="network_settings">Configuració de xarxa avançada</string>
+    <string name="network_settings_title">Configuració avançada</string>
+    <string name="network_enable_socks_info">Accedir als servidors mitjançant el servidor SOCKS al port %d? S\'ha d\'iniciar abans d\'activar aquesta opció.</string>
+    <string name="network_session_mode_session">per sessió</string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Tingueu en compte</b>: els retransmissions de missatges i fitxers es connecten mitjançant un servidor intermediari SOCKS. Les trucades i l\'enviament de visualitzacions prèvies d\'enllaç utilitzen connexió directa.]]></string>
+    <string name="network_smp_proxy_fallback_allow_downgrade">Permetre la versió anterior</string>
+    <string name="network_smp_proxy_mode_always">Sempre</string>
+    <string name="network_smp_proxy_mode_always_description">Utilitzeu sempre l\'encaminament privat.</string>
+    <string name="app_version_code">Creació de l\'aplicació: %s</string>
+    <string name="appearance_settings">Aparença</string>
+    <string name="app_check_for_updates_download_completed_title">S\'ha baixat l\'actualització de l\'aplicació</string>
+    <string name="app_version_title">Versió</string>
+    <string name="app_version_name">Versió de l\'aplicació: v%s</string>
+    <string name="app_check_for_updates_beta">Beta</string>
+    <string name="all_your_contacts_will_remain_connected">Tots els teus contactes romandran connectats.</string>
+    <string name="add_your_team_members_to_conversations">Afegeix els membres del teu equip a les converses.</string>
+    <string name="auto_accept_contact">Acceptació automàtica</string>
+    <string name="business_address">Adreça d\'empresa</string>
+    <string name="bold_text">negreta</string>
+    <string name="callstatus_ended">trucada acabada %1$s</string>
+    <string name="callstatus_error">error de trucada</string>
+    <string name="callstatus_calling">trucant…</string>
+    <string name="callstatus_in_progress">trucada en curs</string>
+    <string name="permissions_camera">Càmera</string>
+    <string name="permissions_camera_and_record_audio">Càmera i micròfon</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">Qualsevol pot allotjar servidors.</string>
+    <string name="audio_device_bluetooth">Bluetooth</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Tots els missatges i fitxers s\'envien <b>xifrats d\'extrem a extrem</b>, amb seguretat postquàntica als missatges directes.]]></string>
+    <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>El millor per a la bateria</b>. Només rebràs notificacions quan l\'aplicació s\'està executant (Sense servei en segon pla).]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Bo per a la bateria</b>. L\'aplicació revisa els missatges cada 10 minuts. Podeu perdre trucades o missatges urgents.]]></string>
+    <string name="read_more_in_github_with_link"><![CDATA[Llegir més al nostre <font color="#0088ff">repositori GitHub</font>.]]></string>
+    <string name="contact_wants_to_connect_via_call">%1$s vol connectar amb tu mitjançant</string>
+    <string name="always_use_relay">Feu servir sempre el retransmisor</string>
+    <string name="onboarding_notifications_mode_service_desc_short">App always runs in background</string>
+    <string name="icon_descr_audio_call">trucada</string>
+    <string name="audio_call_no_encryption">trucada (no xifrada)</string>
+    <string name="settings_audio_video_calls">Trucades d\'àudio i vídeo</string>
+    <string name="call_on_lock_screen">Trucades a la pantalla de bloqueig:</string>
+    <string name="alert_text_decryption_error_too_many_skipped">%1$d missatge(s) omés(os).</string>
+    <string name="integrity_msg_skipped">%1$d missatge(s) omés(os).</string>
+    <string name="answer_call">Respondre trucada</string>
+    <string name="icon_descr_audio_off">Àudio desactivat</string>
+    <string name="icon_descr_audio_on">Àudio activat</string>
+    <string name="integrity_msg_bad_hash">hash de missatge erroni</string>
+    <string name="icon_descr_call_ended">La trucada ha finalitzat</string>
+    <string name="icon_descr_call_progress">Trucada en curs</string>
+    <string name="full_backup">Còpia de seguretat de dades de l\'aplicació</string>
+    <string name="la_app_passcode">Contrasenya de l\'aplicació</string>
+    <string name="authentication_cancelled">S\'ha cancel·lat l\'autenticació</string>
+    <string name="auto_accept_images">Accepta imatges automàticament</string>
+    <string name="all_app_data_will_be_cleared">S\'eliminaran totes les dades de l\'aplicació.</string>
+    <string name="empty_chat_profile_is_created">Es crea un perfil de xat buit amb el nom proporcionat i l\'aplicació s\'obre com de costum.</string>
+    <string name="app_passcode_replaced_with_self_destruct">La contrasenya de l\'aplicació es substitueix per una contrasenya d\'autodestrucció.</string>
+    <string name="settings_section_title_app">APLICACIÓ</string>
+    <string name="settings_section_title_icon">ICONA APLICACIÓ</string>
+    <string name="privacy_media_blur_radius">Desenfocar els mitjans</string>
+    <string name="settings_section_title_calls">TRUCADES</string>
+    <string name="keychain_is_storing_securely">Android Keystore s\'utilitza per emmagatzemar de manera segura la frase de contrasenya: permet que el servei de notificacions funcioni.</string>
+    <string name="keychain_allows_to_receive_ntfs">Android Keystore s\'utilitzarà per emmagatzemar de manera segura la frase de contrasenya després de reiniciar l\'aplicació o canviar la frase de contrasenya; permetrà rebre notificacions.</string>
+    <string name="cannot_access_keychain">No es pot accedir a Keystore per desar la contrasenya de la base de dades</string>
+    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Tingueu en compte</b>: NO podreu recuperar ni canviar la contrasenya si la perdeu.]]></string>
+    <string name="alert_title_cant_invite_contacts">No es poden convidar contactes!</string>
+    <string name="rcv_group_event_member_blocked">ha blocat a %s</string>
+    <string name="rcv_group_and_other_events">i %d esdeveniments més</string>
+    <string name="conn_event_ratchet_sync_started">acordant el xifratge…</string>
+    <string name="snd_conn_event_ratchet_sync_started">acordant el xifratge per a %s…</string>
+    <string name="group_member_role_author">autor</string>
+    <string name="group_info_section_title_num_members">%1$s MEMBRES</string>
+    <string name="invite_prohibited">No es pot convidar el contacte!</string>
+    <string name="all_group_members_will_remain_connected">Tots els membres del grup romandran connectats.</string>
+    <string name="block_for_all">Blocar per a tots</string>
+    <string name="block_member_button">Blocar membre</string>
+    <string name="block_member_question">Blocar membre?</string>
+    <string name="block_for_all_question">Blocar membre per a tots?</string>
+    <string name="member_blocked_by_admin">Blocat per l\'administrador</string>
+    <string name="cant_call_contact_alert_title">No es pot trucar al contacte</string>
+    <string name="allow_calls_question">Permetre trucades?</string>
+    <string name="calls_prohibited_alert_title">Trucades prohibides!</string>
+    <string name="cant_call_member_alert_title">No es pot trucar al membre del grup</string>
+    <string name="cant_send_message_to_member_alert_title">No es pot enviar missatges als membres del grup</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[S\'han acceptat les condicions per a l\'operador(s): <b>%s</b>.]]></string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Ja s\'han acceptat les condicions per als operadors següents: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[S\'acceptaran condicions per als operadors: <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[S\'acceptaran condicions per als operadors: <b>%s</b>.]]></string>
+    <string name="operator_added_xftp_servers">S\'han afegit servidors multimèdia i de fitxers</string>
+    <string name="operator_added_message_servers">S\'han afegit servidors de missatges</string>
+    <string name="users_delete_all_chats_deleted">Tots els xats i missatges se suprimiran; això no es pot desfer!</string>
+    <string name="theme_black">Negre</string>
+    <string name="theme_destination_app_theme">Tema de l\'aplicació</string>
+    <string name="color_secondary_variant">Secundari addicional</string>
+    <string name="color_background">Fons</string>
+    <string name="color_primary_variant2">Color addicional 2</string>
+    <string name="chat_theme_apply_to_all_modes">Tots els modes</string>
+    <string name="chat_preferences_always">sempre</string>
+    <string name="chat_theme_apply_to_mode">Aplicar a</string>
+    <string name="appearance_app_toolbars">Barres d\'eines d\'aplicació</string>
+    <string name="appearance_bars_blur_radius">Desenfocar</string>
+    <string name="audio_video_calls">Trucades d\'àudio/vídeo</string>
+    <string name="available_in_v51">\nDisponible en v5.1</string>
+    <string name="allow_calls_only_if">Permet trucades només si el vostre contacte ho permet.</string>
+    <string name="allow_disappearing_messages_only_if">Permet la desaparició de missatges només si el vostre contacte ho permet.</string>
+    <string name="allow_irreversible_message_deletion_only_if">"Permet la supressió irreversible del missatge només si el teu contacte t\'ho permet.  (24 hores)"</string>
+    <string name="allow_message_reactions_only_if">Permet les reaccions als missatges només si el teu contacte les permet.</string>
+    <string name="allow_voice_messages_only_if">Permet missatges de veu només si el vostre contacte els permet.</string>
+    <string name="allow_your_contacts_adding_message_reactions">Permet que els teus contactes afegeixin reaccions als missatges.</string>
+    <string name="allow_your_contacts_to_call">Permet que els teus contactes et truquin.</string>
+    <string name="allow_your_contacts_irreversibly_delete">Permet als teus contactes eliminar de manera irreversible els missatges enviats. (24 hores)</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Permet que els teus contactes enviïn missatges que desapareixen.</string>
+    <string name="allow_your_contacts_to_send_voice_messages">Permet que els teus contactes enviïn missatges de veu.</string>
+    <string name="both_you_and_your_contacts_can_delete">Tant vos com els vostres contactes podeu suprimir de manera irreversible els missatges enviats. (24 hores)</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Tant tu com el teu contacte podeu enviar missatges que desapareguin.</string>
+    <string name="both_you_and_your_contact_can_add_message_reactions">Tant tu com el teu contacte podeu afegir reaccions als missatges.</string>
+    <string name="allow_message_reactions">Permet la supressió irreversible del missatge només si el teu contacte t\'ho permet. (24 hores)</string>
+    <string name="allow_direct_messages">Permet enviar missatges directes als membres.</string>
+    <string name="allow_to_delete_messages">Permeteu suprimir de manera irreversible els missatges enviats. (24 hores)</string>
+    <string name="allow_to_send_disappearing">Permet enviar missatges que desapareixen.</string>
+    <string name="allow_to_send_files">Permet enviar fitxers i mitjans.</string>
+    <string name="allow_to_send_voice">Permet enviar missatges de veu.</string>
+    <string name="calls_prohibited_with_this_contact">Les trucades d\'àudio/vídeo estan prohibides.</string>
+    <string name="both_you_and_your_contact_can_make_calls">Tant tu com el teu contacte podeu fer trucades.</string>
+    <string name="allow_to_send_simplex_links">Permet enviar enllaços SimpleX.</string>
+    <string name="feature_roles_all_members">tots els membres</string>
+    <string name="feature_cancelled_item">cancel·lat %s</string>
+    <string name="v4_2_group_links_desc">Els administradors poden crear els enllaços per unir-se als grups.</string>
+    <string name="v4_6_audio_video_calls">Trucades d\'àudio i vídeo</string>
+    <string name="v4_5_transport_isolation_descr">Per perfil de xat (per defecte) o per connexió (BETA).</string>
+    <string name="v5_1_self_destruct_passcode_descr">Totes les dades s\'esborren quan s\'introdueix.</string>
+    <string name="v5_0_app_passcode">Contrasenya de l\'aplicació</string>
+    <string name="v5_1_better_messages">Missatges millorats</string>
+    <string name="v5_2_more_things">Unes quantes coses més</string>
+    <string name="v5_3_encrypt_local_files_descr">Xifratge dels fitxers locals nous (excepte vídeos).</string>
+    <string name="v5_3_new_interface_languages_descr">Àrab, búlgar, finès, hebreu, tailandès i ucraïnès - gràcies als usuaris i Weblate.</string>
+    <string name="v5_4_better_groups">Grups millorats</string>
+    <string name="v5_4_block_group_members">Blocar membres del grup</string>
+    <string name="v5_6_app_data_migration">Migració de dades d\'aplicacions</string>
+    <string name="v6_0_your_contacts_descr">Arxiva els contactes per xatejar més tard.</string>
+    <string name="v6_0_privacy_blur">Desenfoca per a una millor privadesa.</string>
+    <string name="v6_1_better_calls">Trucades millorades</string>
+    <string name="v6_1_message_dates_descr">Dates de missatges millorades.</string>
+    <string name="v6_1_better_security">Seguretat millorada ✅</string>
+    <string name="v6_1_better_user_experience">Millor experiència d\'usuari</string>
+    <string name="v6_2_business_chats">Xats d\'empresa</string>
+    <string name="this_device_version"><![CDATA[<i>(aquest dispositiu v%s)</i>]]></string>
+    <string name="new_desktop"><![CDATA[<i>(nou)</i>]]></string>
+    <string name="remote_host_was_disconnected_toast"><![CDATA[El mòbil <b>%s</b> s\'ha desconnectat]]></string>
+    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Obre <i>Usar des de l\'ordinador</i> a l\'aplicació mòbil i escaneja el codi QR.]]></string>
+    <string name="remote_host_error_busy"><![CDATA[El mòbil <b>%s</b> està ocupat]]></string>
+    <string name="remote_host_error_inactive"><![CDATA[El mòbil <b>%s</b> està inactiu]]></string>
+    <string name="remote_host_error_missing"><![CDATA[El mòbil <b>%s</b> no es troba]]></string>
+    <string name="remote_host_error_disconnected"><![CDATA[El mòbil <b>%s</b> s\'ha desconnectat]]></string>
+    <string name="migrate_to_device_apply_onion">Aplicar</string>
+    <string name="migrate_from_device_archive_and_upload">Arxivar i carregar</string>
+    <string name="migrate_from_device_archiving_database">Arxivant bases de dades</string>
+    <string name="migrate_from_device_cancel_migration">Cancel·la la migració</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Trieu <i>Migra des d\'un altre dispositiu</i> al dispositiu nou i escaneja el codi QR.]]></string>
+    <string name="all_users">Tots els perfils</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Avís</b>: l\'arxiu s\'eliminarà.]]></string>
+    <string name="acknowledged">Reconegut</string>
+    <string name="acknowledgement_errors">Errors de reconeixement</string>
+    <string name="forward_files_not_accepted_desc">%1$d fitxer(s) no s\'ha(n) baixat.</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d missatge(s) no s\'ha(n) pogut desencriptar.</string>
+    <string name="server_connecting">s\'està connectant</string>
+    <string name="blocked_item_description">blocat</string>
+    <string name="thousand_abbreviation">k</string>
+    <string name="connect_via_link_verb">Connecta</string>
+    <string name="server_error">error</string>
+    <string name="sender_you_pronoun">vostè</string>
+    <string name="live">EN DIRECTE</string>
+    <string name="moderated_description">moderat</string>
+    <string name="forwarded_description">reenviat</string>
+    <string name="saved_description">desat</string>
+    <string name="display_name_connecting">s\'està connectant…</string>
+    <string name="simplex_link_mode_description">Descripció</string>
+    <string name="n_file_errors">%1$d error(s) de fitxer:\n%2$s</string>
+    <string name="smp_server_test_disconnect">Desconnecta</string>
+    <string name="turn_off_battery_optimization_button">Permet</string>
+    <string name="la_authenticate">Autentica</string>
+    <string name="auth_unlock">Desbloca</string>
+    <string name="share_verb">Comparteix</string>
+    <string name="save_verb">Desa</string>
+    <string name="edit_verb">Edita</string>
+    <string name="info_menu">Info</string>
+    <string name="search_verb">Cerca</string>
+    <string name="forwarded_chat_item_info_tab">Reenviat</string>
+    <string name="delete_verb">Esborra</string>
+    <string name="reveal_verb">Mostra</string>
+    <string name="hide_verb">Amaga</string>
+    <string name="moderate_verb">Modera</string>
+    <string name="select_verb">Selecciona</string>
+    <string name="expand_verb">Expandeix</string>
+    <string name="forward_files_failed_to_receive_desc">La baixada ha fallat per a %1$d fitxer(s).</string>
+    <string name="forward_files_missing_desc">%1$d fitxer(s) ha(n) estat eliminat(s).</string>
+    <string name="deleted_description">esborrat</string>
+    <string name="notification_preview_mode_hidden">Ocult</string>
+    <string name="copy_verb">Còpia</string>
+    <string name="delivery">Lliurament</string>
+    <string name="forward_files_in_progress_desc">%1$d encara s\'estan baixant els fitxers.</string>
+    <string name="smp_server_test_connect">Connecta</string>
+    <string name="error_alert_title">Error</string>
+    <string name="reply_verb">Respon</string>
+    <string name="hide_notification">Amaga</string>
+    <string name="server_connected">connectat</string>
+    <string name="stop_file__confirm">Atura</string>
+    <string name="notification_contact_connected">Connectat</string>
+    <string name="la_immediately">Immediatament</string>
+    <string name="edit_history">Historial</string>
+    <string name="saved_chat_item_info_tab">Desat</string>
+    <string name="allow_verb">Permet</string>
+    <string name="revoke_file__confirm">Revoca</string>
+    <string name="display_name_accepted_invitation">invitació acceptada</string>
+    <string name="send_disappearing_message_30_seconds">30 segons</string>
+    <string name="accept_contact_button">Accepta</string>
+    <string name="accept_connection_request__question">Voleu acceptar la sol·licitud de connexió?</string>
+    <string name="accept_contact_incognito_button">Acceptar incògnit</string>
+    <string name="learn_more_about_address">Quant a l\'adreça de SimpleX</string>
+    <string name="one_time_link_short">Enllaç d\'un sol ús</string>
+    <string name="add_contact_tab">Afegiu un contacte</string>
+    <string name="address_or_1_time_link">Adreça o enllaç d\'un sol ús?</string>
+    <string name="smp_servers_preset_add">Afegiu servidors predefinits</string>
+    <string name="smp_servers_add">Afegeix servidor</string>
+    <string name="about_simplex">Quant a SimpleX</string>
+    <string name="callstatus_accepted">trucada acceptada</string>
+    <string name="accept">Accepta</string>
+    <string name="chat_item_ttl_day">1 dia</string>
+    <string name="chat_item_ttl_month">1 mes</string>
+    <string name="chat_item_ttl_week">1 setmana</string>
+    <string name="group_member_role_admin">administrador</string>
+    <string name="button_add_friends">Afegiu-hi amics</string>
+    <string name="button_add_team_members">Afegeix membres de l\'equip</string>
+    <string name="button_add_welcome_message">Afegeix missatge de benvinguda</string>
+    <string name="address_section_title">Adreça</string>
+    <string name="abort_switch_receiving_address">Cancel·la el canvi d\'adreça</string>
+    <string name="accept_conditions">Accepta les condicions</string>
+    <string name="operator_conditions_accepted">Condicions acceptades</string>
+    <string name="users_add">Afegiu un perfil</string>
+    <string name="abort_switch_receiving_address_question">Voleu cancel·lar el canvi d\'adreça?</string>
+    <string name="send_disappearing_message_1_minute">1 minut</string>
+    <string name="accept_feature">Accepta</string>
+    <string name="v5_3_new_interface_languages">6 noves llengües d\'interfície</string>
+    <string name="abort_switch_receiving_address_confirm">Cancel·la</string>
+    <string name="about_simplex_chat">Quant a SimpleX Chat</string>
+    <string name="v5_6_safer_groups_descr">Els administradors poden blocar un membre per a tothom.</string>
+    <string name="servers_info_subscriptions_connections_subscribed">Connexions actives</string>
+    <string name="send_disappearing_message_5_minutes">5 minuts</string>
+    <string name="accept_call_on_lock_screen">Accepta</string>
+    <string name="onboarding_network_about_operators">Quant als operadors</string>
+    <string name="add_address_to_your_profile">Afegiu l\'adreça al vostre perfil per tal que els vostres contactes puguin compartir-la amb la resta del món. L\'actualització del perfil s\'enviarà als vostres contactes.</string>
+    <string name="address_settings">Configuració d\'adreça</string>
+    <string name="smp_servers_add_to_another_device">Afegeix a un altre dispositiu</string>
+    <string name="feature_roles_admins">administradors</string>
+    <string name="delete_contact_question">Voleu suprimir el contacte?</string>
+    <string name="share_text_disappears_at">Desapareixerà a: %s</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">L\'autenticació del dispositiu està desactivada. S\'està desactivant el bloqueig SimpleX.</string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">L\'autenticació del dispositiu no està activada. Podeu activar SimpleX Lock mitjançant Configuració, un cop hàgiu activat l\'autenticació del dispositiu.</string>
+    <string name="send_receipts_disabled">desactivat</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Ja esteu connectat amb <b>%1$s</b>.]]></string>
+    <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[Ja us esteu connectant a <b>%1$s</b>.]]></string>
+    <string name="proxy_destination_error_broker_host">L\'adreça del servidor de destinació de %1$s és incompatible amb la configuració del servidor de reenviament %2$s.</string>
+    <string name="delete_chat_profile">Suprimeix el perfil</string>
+    <string name="ttl_hours">%d hores</string>
+    <string name="for_me_only">Esborrar per mi</string>
+    <string name="direct_messages_are_prohibited_in_chat">Els missatges directes entre membres estan prohibits en aquest xat.</string>
+    <string name="proxy_destination_error_broker_version">La versió del servidor de destinació de %1$s és incompatible amb el servidor de reenviament %2$s.</string>
+    <string name="database_migration_in_progress">La migració de la base de dades està en curs. Pot trigar uns minuts.</string>
+    <string name="blocked_items_description">%d missatge(s) bloquejat(s)</string>
+    <string name="blocked_by_admin_items_description">%d missatge(s) bloquejat(s) per l\'administrador</string>
+    <string name="marked_deleted_items_description">%d missatge(s) marcat(s) eliminat(s)</string>
+    <string name="decryption_error">Error de desxifrat</string>
+    <string name="smp_server_test_delete_queue">Suprimeix la cua</string>
+    <string name="smp_server_test_delete_file">Esborrar fitxer</string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Per millorar la privadesa, <b>SimpleX s\'executa en segon pla</b> en lloc d\'utilitzar notificacions push.]]></string>
+    <string name="disable_notifications_button">Desactivar notificacions</string>
+    <string name="system_restricted_background_warn"><![CDATA[Per habilitar les notificacions, seleccioneu <b>Ús de la bateria de l\'aplicació</b> / <b>Sense restriccions</b> a la configuració de l\'aplicació.]]></string>
+    <string name="system_restricted_background_in_call_warn"><![CDATA[Per fer trucades en segon pla, seleccioneu <b>Ús de la bateria de l\'aplicació</b> / <b>Sense restriccions</b> a la configuració de l\'aplicació.]]></string>
+    <string name="la_minutes">%d minuts</string>
+    <string name="auth_disable_simplex_lock">Desactiva el bloqueig SimpleX</string>
+    <string name="snd_error_relay">Error del servidor de destinació: %1$s</string>
+    <string name="delete_message__question">Voleu suprimir el missatge?</string>
+    <string name="delete_messages__question">Voleu suprimir els %d missatges?</string>
+    <string name="delete_members_messages__question">Voleu suprimir %d missatges dels membres?</string>
+    <string name="delete_member_message__question">Vols suprimir el missatge del membre?</string>
+    <string name="image_decoding_exception_title">Error de descodificació</string>
+    <string name="delete_and_notify_contact">Eliminar i notificar el contacte</string>
+    <string name="button_delete_contact">Suprimeix el contacte</string>
+    <string name="delete_without_notification">Suprimeix sense notificació</string>
+    <string name="icon_descr_server_status_disconnected">Desconnectat</string>
+    <string name="disappearing_message">Missatge que desapareix</string>
+    <string name="delete_contact_menu_action">Suprimeix</string>
+    <string name="delete_group_menu_action">Suprimeix</string>
+    <string name="delete_pending_connection__question">Voleu suprimir la connexió pendent?</string>
+    <string name="database_passphrase_and_export">Contrasenya i exportació de la base de dades</string>
+    <string name="smp_servers_delete_server">Suprimeix el servidor</string>
+    <string name="disable_onion_hosts_when_not_supported"><![CDATA[Estableix <i>Utilitza els hosts .onion</i> a No si el servidor SOCKS no els admet.]]></string>
+    <string name="app_check_for_updates_disabled">Desactivat</string>
+    <string name="network_smp_proxy_fallback_prohibit_description">NO envieu missatges directament, encara que el vostre servidor de destinació no admeti l\'encaminament privat.</string>
+    <string name="delete_address__question">Voleu suprimir l\'adreça?</string>
+    <string name="developer_options_section">Opcions de desenvolupador</string>
+    <string name="app_check_for_updates_notice_disable">Desactivar</string>
+    <string name="delete_address">Esborrar adreça</string>
+    <string name="delete_image">Suprimeix la imatge</string>
+    <string name="display_name_cannot_contain_whitespace">El nom mostrat no pot contenir espais en blanc.</string>
+    <string name="decentralized">Descentralitzada</string>
+    <string name="no_call_on_lock_screen">Desactivar</string>
+    <string name="receipts_contacts_disable_for_all">Desactivar per a tothom</string>
+    <string name="receipts_groups_disable_for_all">Desactiva per a tots els grups</string>
+    <string name="receipts_contacts_disable_keep_overrides">Desactivar (conservant anul·lacions)</string>
+    <string name="receipts_groups_disable_keep_overrides">Desactivar (mantenint les anul·lacions del grup)</string>
+    <string name="receipts_contacts_title_disable">Desactivar rebuts?</string>
+    <string name="receipts_groups_title_disable">Desactivar rebuts per a grups?</string>
+    <string name="settings_developer_tools">Eines per a desenvolupadors</string>
+    <string name="settings_section_title_device">DISPOSITIU</string>
+    <string name="set_password_to_export_desc">La base de dades es xifra amb una contrasenya aleatòria. Si us plau, canvieu-la abans d\'exportar.</string>
+    <string name="database_passphrase">Contrasenya de la base de dades</string>
+    <string name="delete_chat_profile_question">Voleu suprimir el perfil?</string>
+    <string name="delete_database">Esborrar la base de dades</string>
+    <string name="delete_files_and_media_all">Suprimeix tots els fitxers</string>
+    <string name="delete_files_and_media_question">Voleu suprimir els fitxers i els mitjans?</string>
+    <string name="delete_files_and_media_for_all_users">Suprimeix els fitxers de tots els perfils</string>
+    <string name="total_files_count_and_size">%d fitxer(s) amb una mida total de %s</string>
+    <string name="database_encrypted">Base de dades xifrada!</string>
+    <string name="delete_messages">Suprimir missatges</string>
+    <string name="encrypted_with_random_passphrase">La base de dades es xifra amb una contrasenya aleatòria, podeu canviar-la.</string>
+    <string name="database_passphrase_will_be_updated">La contrasenya de xifratge de la base de dades s\'actualitzarà.</string>
+    <string name="database_encryption_will_be_updated_in_settings">La contrasenya de xifratge de la base de dades s\'actualitzarà i s\'emmagatzemarà a la configuració.</string>
+    <string name="passphrase_is_different">La contrasenya de la base de dades és diferent de la desada al Keystore.</string>
+    <string name="database_passphrase_is_required">La contrasenya de la base de dades és necessària per obrir el xat.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored_in_settings">La base de dades es xifrarà i la contrasenya s\'emmagatzemarà a la configuració.</string>
+    <string name="database_will_be_encrypted">La base de dades es xifrarà.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">La base de dades es xifrarà i la frase de contrasenya s\'emmagatzemarà a Keystore.</string>
+    <string name="database_encryption_will_be_updated">La contrasenya de xifratge de la base de dades s\'actualitzarà i s\'emmagatzemarà a Keystore.</string>
+    <string name="database_upgrade">Actualització de la base de dades</string>
+    <string name="mtr_error_no_down_migration">La versió de la base de dades és més recent que l\'aplicació, però no hi ha cap migració cap avall per a: %s</string>
+    <string name="mtr_error_different">migració diferent a l\'aplicació/base de dades: %s / %s</string>
+    <string name="rcv_direct_event_contact_deleted">contacte eliminat</string>
+    <string name="rcv_group_event_group_deleted">grup esborrat</string>
+    <string name="rcv_group_events_count">%d esdeveniments de grup</string>
+    <string name="num_contacts_selected">%d contacte(s) seleccionat(s)</string>
+    <string name="button_delete_chat">Suprimir xat</string>
+    <string name="delete_chat_question">Suprimir xat?</string>
+    <string name="button_delete_group">Suprimir grup</string>
+    <string name="delete_group_question">Suprimir grup?</string>
+    <string name="delete_link">Suprimir enllaç</string>
+    <string name="delete_link_question">Suprimir enllaç?</string>
+    <string name="info_row_debug_delivery">Entrega de depuració</string>
+    <string name="info_row_deleted_at">Suprimit</string>
+    <string name="share_text_deleted_at">Suprimit: %s</string>
+    <string name="info_row_disappears_at">Desapareixerà a</string>
+    <string name="conn_level_desc_direct">directe</string>
+    <string name="member_info_member_disabled">inactiu</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[S\'aplicaran les mateixes condicions a l\'operador <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[S\'aplicaran les mateixes condicions als operadors: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Aquestes condicions també s\'aplicaran a: <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Aquestes condicions també s\'aplicaran per a: <b>%s</b>.]]></string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Per utilitzar els servidors de <b>%s</b>, accepteu les condicions d\'ús.]]></string>
+    <string name="users_delete_question">Voleu suprimir el perfil?</string>
+    <string name="delete_profile">Suprimeix el perfil</string>
+    <string name="chat_preferences_default">predeterminat (%s)</string>
+    <string name="full_deletion">Suprimeix per a tothom</string>
+    <string name="direct_messages">Missatges directes</string>
+    <string name="timed_messages">Missatges que desapareixen</string>
+    <string name="disappearing_prohibited_in_this_chat">Els missatges que desapareixen estan prohibits en aquest xat.</string>
+    <string name="ttl_d">%dd</string>
+    <string name="ttl_day">%d dia</string>
+    <string name="ttl_days">%d dies</string>
+    <string name="delete_after">Suprimeix després</string>
+    <string name="ttl_h">%dh</string>
+    <string name="ttl_hour">%d hora</string>
+    <string name="direct_messages_are_prohibited">Els missatges directes entre membres estan prohibits.</string>
+    <string name="direct_messages_are_prohibited_in_group">Els missatges directes entre membres estan prohibits en aquest grup.</string>
+    <string name="disappearing_messages_are_prohibited">Els missatges que desapareixen estan prohibits.</string>
+    <string name="ttl_m">%dm</string>
+    <string name="ttl_min">%d min</string>
+    <string name="ttl_month">%d mes</string>
+    <string name="ttl_months">%d mesos</string>
+    <string name="ttl_mth">%dmes</string>
+    <string name="disable_sending_recent_history">No envieu l\'historial als nous membres.</string>
+    <string name="v4_4_disappearing_messages">Missatges que desapareixen</string>
+    <string name="v4_5_multiple_chat_profiles_descr">Diferents noms, avatars i aïllament del transport.</string>
+    <string name="v5_3_discover_join_groups">Descobreix i uneix-te a grups</string>
+    <string name="v6_0_delete_many_messages_descr">Suprimir fins a 20 missatges alhora.</string>
+    <string name="custom_time_unit_days">dies</string>
+    <string name="v6_1_delete_many_messages_descr">Suprimeix o modera fins a 200 missatges.</string>
+    <string name="delivery_receipts_title">Rebuts de lliurament!</string>
+    <string name="delivery_receipts_are_disabled">Els rebuts de lliurament estan desactivats!</string>
+    <string name="desktop_app_version_is_incompatible">La versió de l\'aplicació d\'ordinador %s no és compatible amb aquesta aplicació.</string>
+    <string name="desktop_devices">Ordinadors</string>
+    <string name="devices">Dispositius</string>
+    <string name="disconnect_remote_host">Desconnectar</string>
+    <string name="disconnect_desktop_question">Desconnectar l\'ordinador?</string>
+    <string name="remote_ctrl_disconnected_with_reason">S\'ha desconnectat amb el motiu: %s</string>
+    <string name="disconnect_remote_hosts">Desconnectar mòbils</string>
+    <string name="desktop_device">Ordinador</string>
+    <string name="desktop_address">Adreça ordinador</string>
+    <string name="remote_ctrl_error_bad_version">L\'ordinador té una versió no compatible. Si us plau, assegureu-vos que feu servir la mateixa versió als dos dispositius</string>
+    <string name="remote_ctrl_error_bad_invitation">L\'ordinador té un codi d\'invitació incorrecte</string>
+    <string name="remote_ctrl_error_busy">L\'ordinador està ocupat</string>
+    <string name="remote_ctrl_error_inactive">L\'ordinador està inactiu</string>
+    <string name="remote_ctrl_error_disconnected">L\'ordinador ha estat desconnectat</string>
+    <string name="multicast_discoverable_via_local_network">Descobrible a través de la xarxa local</string>
+    <string name="discover_on_network">Descobriu a través de la xarxa local</string>
+    <string name="remote_host_error_timeout"><![CDATA[S\'ha arribat al temps d\'espera durant la connexió al mòbil <b>%s</b>]]></string>
+    <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Aquest és el vostre enllaç per al grup <b>%1$s</b>!]]></string>
+    <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[Ja sou al grup <b>%1$s</b>.]]></string>
+    <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Ja us esteu unint al grup <b>%1$s</b>.]]></string>
+    <string name="migrate_from_device_delete_database_from_device">Suprimir la base de dades d\'aquest dispositiu</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device">No heu d\'utilitzar la mateixa base de dades en dos dispositius.</string>
+    <string name="servers_info_details">Detalls</string>
+    <string name="decryption_errors">errors de desxifrat</string>
+    <string name="servers_info_detailed_statistics">Estadístiques detallades</string>
+    <string name="deleted">Suprimides</string>
+    <string name="deletion_errors">Errors d\'eliminació</string>
+    <string name="connected_mobile">Mòbil connectat</string>
+    <string name="connect_via_link_incognito">Connectar en mode incògnit</string>
+    <string name="connection_local_display_name">connexió %1$d</string>
+    <string name="notifications_mode_periodic_desc">Comprova si hi ha missatges cada 10 minuts durant un minut com a màxim</string>
+    <string name="la_change_app_passcode">Canvia el codi d\'accés</string>
+    <string name="auth_open_chat_profiles">Canvia el perfil</string>
+    <string name="auth_confirm_credential">Confirmeu les credencials</string>
+    <string name="your_chats">Xats</string>
+    <string name="chat_with_developers">Parleu amb els desenvolupadors</string>
+    <string name="info_view_connect_button">connecta</string>
+    <string name="confirm_delete_contact_question">Confirmeu l\'eliminació del contacte?</string>
+    <string name="icon_descr_server_status_connected">Connectat</string>
+    <string name="confirm_verb">Confirma</string>
+    <string name="clear_note_folder_question">Voleu suprimir les notes privades?</string>
+    <string name="icon_descr_close_button">Botó de tancament</string>
+    <string name="connect_button">Connecta</string>
+    <string name="chat_console">Consola del xat</string>
+    <string name="smp_servers_check_address">Comproveu l\'adreça del servidor de i torneu a provar.</string>
+    <string name="smp_servers_configured">Servidors SMP configurats</string>
+    <string name="configure_ICE_servers">Configura els servidors ICE</string>
+    <string name="network_session_mode_user">Perfil del xat</string>
+    <string name="network_session_mode_entity">Connexió</string>
+    <string name="app_check_for_updates">Comprova si hi ha actualitzacions</string>
+    <string name="app_check_for_updates_notice_title">Comprova si hi ha actualitzacions</string>
+    <string name="callstate_connected">connectat</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Comprova missatges cada 10 minuts</string>
+    <string name="change_lock_mode">Canvia la modalitat de bloqueig</string>
+    <string name="change_self_destruct_mode">Canvia el mode l\'autodestrucció</string>
+    <string name="change_self_destruct_passcode">Canvia el codi d\'autodestrucció</string>
+    <string name="confirm_passcode">Confirmeu el codi d\'accés</string>
+    <string name="settings_section_title_chat_database">BASE DE DADES DELS XATS</string>
+    <string name="settings_section_title_chats">XATS</string>
+    <string name="settings_section_title_chat_theme">Tema del xat</string>
+    <string name="settings_section_title_chat_colors">Colors del xat</string>
+    <string name="chat_database_deleted">Base de dades suprimida</string>
+    <string name="chat_database_imported">Base de dades importada</string>
+    <string name="chat_database_exported_title">Base de dades exportada</string>
+    <string name="confirm_new_passphrase">Confirmeu el nou mot de pas…</string>
+    <string name="change_database_passphrase_question">Voleu canviar la frase de pas per a la base de dades?</string>
+    <string name="rcv_group_event_member_connected">connectat</string>
+    <string name="rcv_group_event_member_created_contact">connectat directament</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">canviant d\'adreça per %s…</string>
+    <string name="group_member_status_connected">connectat</string>
+    <string name="group_member_status_complete">complet</string>
+    <string name="change_verb">Canvia</string>
+    <string name="info_row_chat">Xat</string>
+    <string name="operator_conditions_accepted_on">Condicions acceptades el: %s.</string>
+    <string name="operator_conditions_of_use">Condicions d\'ús</string>
+    <string name="color_mode">Mode de color</string>
+    <string name="chat_preferences">Preferències del xat</string>
+    <string name="v4_4_verify_connection_security_desc">Compareu els codis de seguretat amb els vostres contactes.</string>
+    <string name="v6_0_connection_servers_status_descr">Estat de la connexió i dels servidors</string>
+    <string name="connected_to_mobile">Connectat a un mòbil</string>
+    <string name="in_developing_title">Pròximament!</string>
+    <string name="multicast_connect_automatically">Connecta automàticament</string>
+    <string name="connect_plan_chat_already_exists">El xat ja existeix!</string>
+    <string name="migrate_to_device_chat_migrated">Xat migrat!</string>
+    <string name="migrate_from_device_check_connection_and_try_again">Comproveu la connexió a Internet i torneu a provar</string>
+    <string name="servers_info_connected_servers_section_header">Servidors connectats</string>
+    <string name="chunks_deleted">Blocs eliminats</string>
+    <string name="chunks_downloaded">Blocs descarregats</string>
+    <string name="error_saving_file">Error en desar el fitxer</string>
+    <string name="switch_receiving_address_question">Canviar l\'adreça de recepció?</string>
+    <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Podeu <font color="#0088ff">connectar amb els desenvolupadors de SimpleX Chat per fer qualsevol pregunta i rebre actualitzacions</font>.]]></string>
+    <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[També us podeu connectar fent clic a l\'enllaç. Si s\'obre al navegador, feu clic al botó <b>Obre a l\'aplicació mòbil</b>.]]></string>
+    <string name="error_saving_ICE_servers">Error en desar els servidors ICE</string>
+    <string name="network_proxy_incorrect_config_title">Error en desar el servidor intermediari</string>
+    <string name="chat_database_section">BASE DE DADES DELS XATS</string>
+    <string name="chat_is_running">El xat s\'està executant</string>
+    <string name="chat_is_stopped">El xat està aturat</string>
+    <string name="error_with_info">Error: %s</string>
+    <string name="chat_is_stopped_indication">El xat està aturat</string>
+    <string name="chat_is_stopped_you_should_transfer_database">El xat està aturat. Si ja heu utilitzat aquesta base de dades en un altre dispositiu, hauríeu de tornar-la a transferir abans d\'iniciar el xat.</string>
+    <string name="rcv_group_event_changed_member_role">ha canviat el rol de %s a %s</string>
+    <string name="rcv_group_event_changed_your_role">ha canviat el teu rol a %s</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">ha canviat d\'adreça per a tu</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">canviant d\'adreça…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">canviant d\'adreça…</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">El xat se suprimirà; això no es pot desfer!</string>
+    <string name="change_member_role_question">Canviar el rol del grup?</string>
+    <string name="change_role">Canviar rol</string>
+    <string name="switch_receiving_address">Canvia l\'adreça de recepció</string>
+    <string name="error_saving_group_profile">Error en desar el perfil del grup</string>
+    <string name="network_type_cellular">Mòbil</string>
+    <string name="servers_info_sessions_errors">Errors</string>
+    <string name="icon_descr_contact_checked">Contacte verificat</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacte i tots els missatges s\'eliminaran, l\'acció és irreversible!</string>
+    <string name="display_name_connection_established">connexió establerta</string>
+    <string name="connection_error">Error de connexió</string>
+    <string name="connection_timeout">Temps de connexió enhaurit</string>
+    <string name="contact_already_exists">El contacte la existeix</string>
+    <string name="connection_error_auth">Error de connexió (AUTH)</string>
+    <string name="notification_preview_mode_contact">Nom del contacte</string>
+    <string name="contact_deleted">Contacte eliminat!</string>
+    <string name="alert_title_contact_connection_pending">El contacte encara no s\'hi ha connectat!</string>
+    <string name="connection_request_sent">Sol·licitud de connexió tramesa!</string>
+    <string name="connect_via_link">Connecta via enllaç</string>
+    <string name="status_contact_has_e2e_encryption">el contacte admet criptografia d\'extrem a extrem</string>
+    <string name="status_contact_has_no_e2e_encryption">el contacte no té criptografía d\'extrem a extrem</string>
+    <string name="cant_call_contact_deleted_alert_text">El contacte ha estat eliminat</string>
+    <string name="contact_preferences">Preferències del contacte</string>
+    <string name="v6_0_connect_faster_descr">Connecteu amb els vostres amic més ràpidament.</string>
+    <string name="remote_host_was_disconnected_title">Connexió interrompuda</string>
+    <string name="remote_ctrl_was_disconnected_title">Connexió aturada</string>
+    <string name="desktop_connection_terminated">Connexió finalitzada</string>
+    <string name="connect_plan_connect_via_link">Voleu connectar a través d\'un enllaç?</string>
+    <string name="connections">Connexions</string>
+    <string name="migrate_from_device_error_uploading_archive">Error en carregar l\'arxiu</string>
+    <string name="migrate_from_device_error_saving_settings">Error en desar la configuració</string>
+    <string name="error_stopping_chat">Error en aturar el xat</string>
+    <string name="error_updating_server_title">Error en actualitzar el servidor</string>
+    <string name="migrate_to_device_enter_passphrase">Introduïu la contrasenya</string>
+    <string name="error_starting_chat">Error en iniciar el xat</string>
+    <string name="error_saving_user_password">Error en desar la contrasenya de l\'usuari</string>
+    <string name="enter_correct_passphrase">Introduïu la contrasenya correcta.</string>
+    <string name="enter_passphrase">Introduïu la contrasenya…</string>
+    <string name="group_display_name_field">Introduïu el nom del grup:</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Error en verificar la contrasenya:</string>
+    <string name="callstate_ended">finalitzada</string>
+    <string name="enter_password_to_show">Introduïu la contrasenya</string>
+    <string name="error_showing_content">error en mostrar el contingut</string>
+    <string name="error_showing_message">error en mostrar el missatge</string>
+    <string name="error_saving_smp_servers">Error en desar els servidors SMP</string>
+    <string name="error_saving_xftp_servers">Error en desar els servidors XFTP</string>
+    <string name="error_sending_message">Error en enviar el missatge</string>
+    <string name="errors_in_servers_configuration">Errors en la configuració dels servidors.</string>
+    <string name="failed_to_active_user_title">Error en canviar el perfil!</string>
+    <string name="error_setting_network_config">Error en actualitzar la configuració de la xarxa</string>
+    <string name="error_setting_address">Error en establir l\'adreça</string>
+    <string name="error_synchronizing_connection">Error en sincronitzar la connexió</string>
+    <string name="error_updating_user_privacy">Error en actualitzar la privadesa de l\'usuari</string>
+    <string name="error_showing_desktop_notification">Error en mostrar la notificació, contacteu amb els desenvolupadors.</string>
+    <string name="la_enter_app_passcode">Introduïu el codi</string>
+    <string name="switching_profile_error_title">Error en canviar el perfil</string>
+    <string name="smp_servers_enter_manually">Introduïu el servidor manualment</string>
+    <string name="error_sending_message_contact_invitation">Error en enviar la invitació</string>
+    <string name="error_updating_link_for_group">Error en actualitzar l\'enllaç del grup</string>
+    <string name="v5_2_disappear_one_message_descr">Fins i tot quan està desactivat a la conversa.</string>
+    <string name="onboarding_network_operators_continue">Continua</string>
+    <string name="continue_to_next_step">Continua</string>
+    <string name="chat_database_exported_continue">Continua</string>
+    <string name="icon_descr_context">Icona contextual</string>
+    <string name="delete_contact_cannot_undo_warning">El contacte serà eliminat; l\'acció no es pot desfer!</string>
+    <string name="conversation_deleted">Conversa eliminada!</string>
+    <string name="copied">Copiat al porta-retalls</string>
+    <string name="contribute">Contribuïu</string>
+    <string name="receipts_section_contacts">Contactes</string>
+    <string name="servers_info_reset_stats_alert_error_title">Error en restablir les estadístiques</string>
+    <string name="servers_info_modal_error_title">Error</string>
+    <string name="servers_info_reconnect_servers_error">Error en reconnectar els servidors</string>
+    <string name="enter_welcome_message_optional">Introduïu el missatge de benvinguda… (opcional)</string>
+    <string name="display_name">Introduïu el vostre nom:</string>
+    <string name="unable_to_open_browser_title">Error en obrir el navegador</string>
+    <string name="error_exporting_chat_database">Error en exportar la base de dades de xat</string>
+    <string name="error_deleting_database">S\'ha produït un error en suprimir la base de dades de xat</string>
+    <string name="error_importing_database">Error en importar la base de dades de xat</string>
+    <string name="error_changing_message_deletion">Error en canviar la configuració</string>
+    <string name="error_removing_member">Error en eliminar el membre</string>
+    <string name="error_blocking_member_for_all">Error en bloquejar el membre per a tots</string>
+    <string name="error_changing_role">Error en canviar el rol</string>
+    <string name="error_adding_server">Error en afegir servidor</string>
+    <string name="migrate_from_device_error_deleting_database">Error en suprimir la base de dades</string>
+    <string name="servers_info_reconnect_server_error">Error en reconnectar el servidor</string>
+    <string name="error_encrypting_database">Error en xifrar la base de dades</string>
+    <string name="migrate_from_device_error_exporting_archive">Error en exportar la base de dades de xat</string>
+    <string name="chunks_uploaded">Blocs penjats</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">El xat se suprimirà per a tots els membres; això no es pot desfer!</string>
+    <string name="colored_text">acolorit</string>
+    <string name="call_desktop_permission_denied_chrome">Feu clic al botó d\'informació al costat del camp d\'adreça per permetre l\'ús del micròfon.</string>
+    <string name="completed">Completades</string>
+    <string name="error_accepting_operator_conditions">Error en acceptar les condicions</string>
+    <string name="smp_proxy_error_connecting">Error en connectar-se al servidor de reenviament %1$s. Si us plau, prova-ho més tard.</string>
+    <string name="error_creating_message">Error en crear el missatge</string>
+    <string name="failed_to_create_user_title">Error en crear el perfil!</string>
+    <string name="error_forwarding_messages">Error en reenviar els missatges</string>
+    <string name="error_loading_smp_servers">Error en carregar els servidors SMP</string>
+    <string name="error_loading_xftp_servers">Error en carregar els servidors XFTP</string>
+    <string name="error_adding_members">Error en afegir membre(s)</string>
+    <string name="error_creating_address">Error en crear l\'adreça</string>
+    <string name="error_joining_group">Error en unir-se al grup</string>
+    <string name="error_loading_details">Error en carregar els detalls</string>
+    <string name="error_receiving_file">Error en rebre el fitxer</string>
+    <string name="error_accepting_contact_request">Error en acceptar la sol·licitud de contacte</string>
+    <string name="error_deleting_contact">S\'ha produït un error en suprimir el contacte</string>
+    <string name="error_deleting_group">S\'ha produït un error en suprimir el grup</string>
+    <string name="error_aborting_address_change">Error en cancel·lar el canvi d\'adreça</string>
+    <string name="error_changing_address">Error en canviar l\'adreça</string>
+    <string name="error_deleting_contact_request">S\'ha produït un error en suprimir la sol·licitud de contacte</string>
+    <string name="error_deleting_pending_contact_connection">S\'ha produït un error en suprimir la connexió de contacte pendent</string>
+    <string name="error_deleting_note_folder">S\'ha produït un error en suprimir les notes privades</string>
+    <string name="error_deleting_user">S\'ha produït un error en suprimir el perfil d\'usuari</string>
+    <string name="smp_server_test_compare_file">Comparar el fitxer</string>
+    <string name="ci_status_other_error">Error: %1$s</string>
+    <string name="icon_descr_server_status_error">Error</string>
+    <string name="choose_file_title">Trieu un fitxer</string>
+    <string name="clear_verb">Netejar</string>
+    <string name="clear_chat_menu_action">Netejar</string>
+    <string name="clear_chat_button">Netejar xat</string>
+    <string name="clear_chat_question">Netejar xat?</string>
+    <string name="clear_verification">Netejar verificació</string>
+    <string name="error_initializing_web_view_wrong_arch">Error en inicialitzar WebView. Assegureu-vos que teniu WebView instal·lat i que sigui suportada l\'arquitectura arm64. Error: %s</string>
+    <string name="error_initializing_web_view">Error en inicialitzar WebView. Actualitzeu el vostre sistema a la nova versió. Poseu-vos en contacte amb els desenvolupadors. Error: %s</string>
+    <string name="clear_contacts_selection_button">Netejar</string>
+    <string name="error_creating_link_for_group">Error en crear l\'enllaç del grup</string>
+    <string name="error_creating_member_contact">Error en crear el contacte del membre</string>
+    <string name="error_deleting_link_for_group">Error en suprimir l\'enllaç del grup</string>
+    <string name="enter_welcome_message">Introduïu el missatge de benvinguda…</string>
+    <string name="v4_6_chinese_spanish_interface">Interfície en xinès i espanyol</string>
+    <string name="error_enabling_delivery_receipts">Error en habilitar els rebuts de lliurament.</string>
+    <string name="enter_this_device_name">Introduïu el nom d\'aquest dispositiu…</string>
+    <string name="error">Error</string>
+    <string name="migrate_to_device_error_downloading_archive">Error en baixar l\'arxiu</string>
+    <string name="create_address">Crea una adreça</string>
+    <string name="create_address_button">Crea</string>
+    <string name="v5_4_incognito_groups_descr">Crea un grup tot fent servir un perfil aleatori.</string>
+    <string name="current_user">Perfil actual</string>
+    <string name="create_1_time_link">Crea un enllaç d\'un sol ús</string>
+    <string name="dont_create_address">No crear cap adreça</string>
+    <string name="create_profile_button">Crea</string>
+    <string name="create_another_profile_button">Crea perfil</string>
+    <string name="settings_message_shape_corner">Cantonada</string>
+    <string name="current_passphrase">Frase de pas actual…</string>
+    <string name="button_create_group_link">Crea un enllaç</string>
+    <string name="create_secret_group_title">Crea un grup secret</string>
+    <string name="dont_show_again">No tornis a mostrar</string>
+    <string name="dark_theme">Tema fosc</string>
+    <string name="created">Creat</string>
+    <string name="create_group_button">Crea un grup</string>
+    <string name="create_group_link">Crea un enllaç de group</string>
+    <string name="agent_critical_error_title">Errada crítica</string>
+    <string name="custom_time_picker_custom">personalitzat</string>
+    <string name="chat_theme_apply_to_dark_mode">Mode fosc</string>
+    <string name="smp_server_test_create_queue">Crea una cua</string>
+    <string name="smp_server_test_create_file">Crea un fitxer</string>
+    <string name="la_current_app_passcode">Codi d\'accés actual</string>
+    <string name="maximum_supported_file_size">Ara per ara, la mida màxima per als fitxers és %1$s.</string>
+    <string name="share_one_time_link">Crea un enllaç d\'invitació d\'un sol ús</string>
+    <string name="create_group">Crea un grupo secreto</string>
+    <string name="send_disappearing_message_custom_time">Temps personalitzat</string>
+    <string name="create_chat_profile">Crea un perfil de xat</string>
+    <string name="create_address_and_let_people_connect">Creeu una adreça perquè la gent pugui connectar amb vós.</string>
+    <string name="create_simplex_address">Crea una adreça SimpleX</string>
+    <string name="create_profile">Crea perfil</string>
+    <string name="group_member_status_creator">creador</string>
+    <string name="info_row_database_id">ID de la base de dades</string>
+    <string name="share_text_database_id">ID de la base de dades: %d</string>
+    <string name="item_info_current">(actual)</string>
+    <string name="color_mode_dark">Fosc</string>
+    <string name="theme_dark">Fosc</string>
+    <string name="create_your_profile">Creeu el vostre perfil</string>
+    <string name="icon_descr_edited">editat</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat i Flux han acordat incloure els servidors operats per Flux a l\'aplicació.</string>
+    <string name="simplex_address_or_1_time_link">Voleu compartir l\'adreça de SimpleX o un enllaç d\'un sol ús?</string>
+    <string name="toolbar_settings">Configuració</string>
+    <string name="settings_shutdown">Tanca</string>
+    <string name="contact_connection_pending">s\'està connectant…</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Les condicions s\'acceptaran per als operadors habilitats després de 30 dies.</string>
+    <string name="system_restricted_background_desc">SimpleX no pot funcionar en segon pla. Només rebreu les notificacions quan obriu l\'aplicació.</string>
+    <string name="ntf_channel_calls">Trucades de SimpleX chat</string>
+    <string name="ntf_channel_messages">Missatges de xat de SimpleX</string>
+    <string name="icon_descr_sent_msg_status_sent">enviat</string>
+    <string name="icon_descr_received_msg_status_unread">per llegir</string>
+    <string name="welcome">Benvinguts!</string>
+    <string name="send_disappearing_message_send">Envia</string>
+    <string name="send_verb">Envia</string>
+    <string name="reset_verb">Restableix</string>
+    <string name="choose_file">Fitxer</string>
+    <string name="gallery_image_button">Imatge</string>
+    <string name="gallery_video_button">Vídeo</string>
+    <string name="mute_chat">Silencia</string>
+    <string name="unmute_chat">Activa el so</string>
+    <string name="favorite_chat">Favorit</string>
+    <string name="icon_descr_settings">Configuració</string>
+    <string name="icon_descr_help">ajuda</string>
+    <string name="icon_descr_email">Correu electrònic</string>
+    <string name="icon_descr_address">Adreça de SimpleX</string>
+    <string name="icon_descr_more_button">Més</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Compartir els enllaços d\'un sol ús i les adreces de SimpleX és segur a través de qualsevol mitjà.</string>
+    <string name="paste_button">Enganxa</string>
+    <string name="keep_invitation_link">Desa</string>
+    <string name="retry_verb">Torna-ho a provar</string>
+    <string name="simplex_address">Adreça de SimpleX</string>
+    <string name="save_servers_button">Desa</string>
+    <string name="network_proxy_username">Nom d\'usuari</string>
+    <string name="network_proxy_password">Contrasenya</string>
+    <string name="host_verb">Amfitrió</string>
+    <string name="port_verb">Port</string>
+    <string name="network_use_onion_hosts_no">No</string>
+    <string name="network_use_onion_hosts_required">Requerit</string>
+    <string name="network_smp_proxy_mode_unprotected">Amb IP desprotegida</string>
+    <string name="network_smp_proxy_mode_never">Mai</string>
+    <string name="network_smp_proxy_fallback_allow">Sí</string>
+    <string name="network_smp_proxy_fallback_prohibit">No</string>
+    <string name="app_check_for_updates_stable">Estable</string>
+    <string name="show_dev_options">Mostra:</string>
+    <string name="hide_dev_options">Amaga:</string>
+    <string name="theme_simplex">SimpleX</string>
+    <string name="v4_2_security_assessment_desc">La seguretat de SimpleX chat ha estat auditada per Trail of Bits.</string>
+    <string name="email_invite_subject">Parlem a SimpleX Chat</string>
+    <string name="invalid_name">El nom no és vàlid!</string>
+    <string name="italic_text">cursiva</string>
+    <string name="make_private_connection">Crea una connexió privada</string>
+    <string name="incoming_audio_call">Trucada d\'àudio entrant</string>
+    <string name="incorrect_passcode">Codi d\'accés incorrecte</string>
+    <string name="lock_after">Bloca després</string>
+    <string name="lock_mode">Mode de blocatge</string>
+    <string name="settings_section_title_incognito">Mode d\'incògnit</string>
+    <string name="member_info_member_inactive">inactiu</string>
+    <string name="chat_theme_apply_to_light_mode">Mode clar</string>
+    <string name="v5_4_incognito_groups">Grups d\'incògnit</string>
+    <string name="member_info_section_title_member">MEMBRE</string>
+    <string name="join_group_question">Voleu unir-vos al grup?</string>
+    <string name="leave_group_button">Surt</string>
+    <string name="leave_chat_question">Voleu sortir del xat?</string>
+    <string name="leave_group_question">Voleu sortir del grup?</string>
+    <string name="alert_title_group_invitation_expired">Invitació caducada!</string>
+    <string name="icon_descr_add_members">Convida membres</string>
+    <string name="group_member_status_invited">convidat</string>
+    <string name="group_member_status_left">ha sortit</string>
+    <string name="v6_0_private_routing_descr">Protegeix la vostra adreça IP i les vostres connexions.</string>
+    <string name="v5_7_call_sounds">So de trucada</string>
+    <string name="incoming_video_call">Videotrucada entrant</string>
+    <string name="conn_level_desc_indirect">indirecte (%1$s)</string>
+    <string name="group_invitation_item_description">invitació al grup %1$s</string>
+    <string name="invite_friends_short">Convida</string>
+    <string name="desktop_incompatible_version">Versió incompatible</string>
+    <string name="v5_7_new_interface_languages">Interfície en lituà</string>
+    <string name="agent_internal_error_title">Error intern</string>
+    <string name="v6_0_increase_font_size">Augmenta la mida de la lletra.</string>
+    <string name="info_row_local_name">Nom local</string>
+    <string name="invalid_file_link">Enllaç no vàlid</string>
+    <string name="action_button_add_members">Convida</string>
+    <string name="invite_friends">Convida amics</string>
+    <string name="v4_5_italian_interface">Interfície en italià</string>
+    <string name="non_content_uri_alert_title">Ruta de fitxer no vàlida</string>
+    <string name="invalid_data">dades no vàlides</string>
+    <string name="in_reply_to">En resposta a</string>
+    <string name="download_file">Descarrega</string>
+    <string name="member_inactive_title">Membre inactiu</string>
+    <string name="keep_conversation">Conserva la conversa</string>
+    <string name="mark_unread">Marcar com ha llegit</string>
+    <string name="invalid_contact_link">Enllaç no vàlid</string>
+    <string name="invalid_QR_code">El codi QR no és vàlid</string>
+    <string name="learn_more">Més informació</string>
+    <string name="invalid_qr_code">El codi QR no és vàlid</string>
+    <string name="incorrect_code">Codi de seguretat incorrecte!</string>
+    <string name="smp_servers_invalid_address">L\'adreça del servidor no és vàlida!</string>
+    <string name="markdown_help">Ajuda sobre Markdown</string>
+    <string name="markdown_in_messages">Markdown en els missatges</string>
+    <string name="network_proxy_incorrect_config_desc">Assegureu-vos que la configuració del servidor intermediari és correcta.</string>
+    <string name="app_check_for_updates_button_install">Instal·la l\'actualització</string>
+    <string name="app_check_for_updates_installed_successfully_title">"Instal·lació  completada"</string>
+    <string name="privacy_media_blur_radius_medium">Mitjà</string>
+    <string name="incompatible_database_version">La versió de la base de dades és incompatible</string>
+    <string name="rcv_group_event_member_added">ha convidat %1$s</string>
+    <string name="rcv_group_event_member_left">ha sortit</string>
+    <string name="group_member_role_member">membre</string>
+    <string name="invite_to_group_button">Convida al grup</string>
+    <string name="button_leave_chat">Surt del xat</string>
+    <string name="button_leave_group">Surt del grup</string>
+    <string name="incognito">Incògnit</string>
+    <string name="incognito_info_protects">El mode d\'incògnit protegeix la vostra privacitat usant un perfil aleatori nou per a cada contacte.</string>
+    <string name="color_mode_light">Clar</string>
+    <string name="theme_light">Clar</string>
+    <string name="group_members_can_send_dms">Els membres poden enviar missatges directes.</string>
+    <string name="group_members_can_send_files">Els membres poden enviar fitxers i multimèdia.</string>
+    <string name="correct_name_to">Corregir el nom a %s?</string>
+    <string name="callstate_connecting">connectant…</string>
+    <string name="encrypted_audio_call">Trucada amb xifratge d\'extrem a extrem</string>
+    <string name="encrypted_video_call">Videotrucada amb xifratge d\'extrem a extrem</string>
+    <string name="status_e2e_encrypted">xifrat d\'extrem a extrem</string>
+    <string name="allow_accepting_calls_from_lock_screen">Activa les trucades des de la pantalla de bloqueig mitjançant Configuració.</string>
+    <string name="integrity_msg_duplicate">missatge duplicat</string>
+    <string name="enable_lock">Activa bloqueig</string>
+    <string name="receipts_contacts_enable_keep_overrides">Activar (conservar anul·lacions)</string>
+    <string name="receipts_groups_enable_keep_overrides">Activa (mantenir les anul·lacions de grup)</string>
+    <string name="enable_automatic_deletion_question">Activar la supressió automàtica de missatges?</string>
+    <string name="info_row_created_at">Creat a</string>
+    <string name="connect_via_member_address_alert_title">Connectar-se directament?</string>
+    <string name="info_row_connection">Connexió</string>
+    <string name="operator_conditions_failed_to_load">El text de les condicions actuals no s\'ha pogut carregar, podeu revisar les condicions mitjançant aquest enllaç:</string>
+    <string name="icon_descr_call_connecting">Trucada en connexió</string>
+    <string name="migrate_to_device_downloading_archive">Baixant l\'arxiu</string>
+    <string name="ttl_week">%d setmana</string>
+    <string name="confirm_password">Confirmeu la contrasenya</string>
+    <string name="group_member_status_introduced">connectant (presentat)</string>
+    <string name="group_member_status_announced">connectant (anunciat)</string>
+    <string name="group_member_status_intro_invitation">connectant (invitació de presentació)</string>
+    <string name="ttl_w">%ds</string>
+    <string name="ttl_weeks">%d setmanes</string>
+    <string name="v6_0_upgrade_app_descr">Baixa noves versions de GitHub.</string>
+    <string name="v6_2_network_decentralization_enable_flux">Habiliteu Flux a la configuració de la xarxa i dels servidors per obtenir una millor privadesa de les metadades.</string>
+    <string name="connect_to_desktop">Connectar amb l\'ordinador</string>
+    <string name="servers_info_sessions_connecting">Connectant</string>
+    <string name="download_errors">Errors de descàrrega</string>
+    <string name="v5_8_safe_files_descr">Confirmeu fitxers de servidors desconeguts.</string>
+    <string name="operator_conditions_will_be_accepted_on">Les condicions s\'acceptaran el dia: %s.</string>
+    <string name="servers_info_sessions_connected">Connectades</string>
+    <string name="downloaded_files">Arxius descarregats</string>
+    <string name="servers_info_downloaded">Descarregat</string>
+    <string name="group_member_status_accepted">connectant (acceptat)</string>
+    <string name="connected_desktop">Ordinador connectat</string>
+    <string name="connected_to_desktop">Connectat amb l\'ordinador</string>
+    <string name="callstatus_connecting">trucada en connexió…</string>
+    <string name="migrate_from_device_creating_archive_link">Creant un enllaç a l\'arxiu</string>
+    <string name="connecting_to_desktop">Connectant amb l\'ordinador</string>
+    <string name="v5_3_discover_join_groups_descr">- Connexió al servei de directoris (BETA)!\n- Confirmacions de lliurament (fins a 20 membres).\n- Més ràpid i més estable.</string>
+    <string name="receipts_contacts_enable_for_all">Habilita per a tothom</string>
+    <string name="profile_update_event_contact_name_changed">el contacte %1$s ha canviat a %2$s</string>
+    <string name="chat_preferences_contact_allows">El contacte permet</string>
+    <string name="ttl_s">%ds</string>
+    <string name="duplicates_label">duplicats</string>
+    <string name="edit_image">Editar imatge</string>
+    <string name="enable_receipts_all">Activar</string>
+    <string name="receipts_groups_enable_for_all">Habilita per a tots els grups</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">Habilita als xats directes (BETA)!</string>
+    <string name="copy_error">Copiar error</string>
+    <string name="migrate_to_device_download_failed">La baixada ha fallat</string>
+    <string name="ttl_sec">%d seg</string>
+    <string name="connect_via_contact_link">Connectar mitjançant l\'adreça de contacte?</string>
+    <string name="connect_via_invitation_link">Conectar mitjançant enllaç d\'invitació?</string>
+    <string name="failed_to_create_user_duplicate_title">Nom de visualització duplicat!</string>
+    <string name="smp_server_test_download_file">Descarregar fitxer</string>
+    <string name="notification_preview_somebody">Contacte ocult:</string>
+    <string name="la_seconds">%d segons</string>
+    <string name="group_connection_pending">connectant…</string>
+    <string name="connect_with_contact_name_question">Connectar amb %1$s?</string>
+    <string name="forward_files_not_accepted_receive_files">Descarregar</string>
+    <string name="sync_connection_desc">La connexió requereix una renegociació del xifratge.</string>
+    <string name="connect_via_link_or_qr">Connectar mitjançant enllaç/codi QR</string>
+    <string name="enable_camera_access">Habilita l\'accés a la càmera</string>
+    <string name="connection_security">Seguretat de connexió</string>
+    <string name="creating_link">Creant enllaç…</string>
+    <string name="xftp_servers_configured">Servidors XFTP configurats</string>
+    <string name="network_proxy_auth_mode_no_auth">No utilitzeu credencials amb servidor intermediari.</string>
+    <string name="core_version">Versió del nucli: v%s</string>
+    <string name="customize_theme_title">Personalitzar tema</string>
+    <string name="network_smp_proxy_mode_never_description">NO utilitzeu l\'encaminament privat.</string>
+    <string name="app_check_for_updates_download_started">S\'està baixant l\'actualització de l\'aplicació, no la tanquis</string>
+    <string name="app_check_for_updates_button_download">Baixa %s (%s)</string>
+    <string name="developer_options">ID de bases de dades i opció d\'aïllament de transport.</string>
+    <string name="audio_device_earpiece">Auriculars</string>
+    <string name="database_error">Error de base de dades</string>
+    <string name="confirm_database_upgrades">Confirmeu les actualitzacions de la base de dades</string>
+    <string name="database_downgrade">Reducció de versió de la base de dades</string>
+    <string name="downgrade_and_open_chat">Baixa la versió anterior i obri el xat</string>
+    <string name="group_member_status_connecting">connectant</string>
+    <string name="button_edit_group_profile">Editar perfil del grup</string>
+    <string name="share_text_created_at">Creat a: %s</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">Connectant al contacte, si us plau, espereu o comproveu-ho més tard!</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Les condicions s\'acceptaran automàticament per als operadors habilitats el dia: %s.</string>
+    <string name="dark_mode_colors">Colors en mode fosc</string>
+    <string name="feature_enabled_for_contact">habilitat per al contacte</string>
+    <string name="feature_enabled">habilitat</string>
+    <string name="feature_enabled_for_you">habilitat per a tu</string>
+    <string name="contacts_can_mark_messages_for_deletion">Els contactes poden marcar missatges per suprimir-los. Encara els podreu veure.</string>
+    <string name="feature_enabled_for">Habilitat per</string>
+    <string name="v5_1_custom_themes_descr">Personalitza i comparteix temes de color.</string>
+    <string name="v5_1_custom_themes">Temes personalitzats</string>
+    <string name="v5_3_new_desktop_app_descr">Crea perfil nou a l\'aplicació per a ordinador. 💻</string>
+    <string name="v6_1_customizable_message_descr">Forma de missatge personalitzable.</string>
+    <string name="dont_enable_receipts">No activeu</string>
+    <string name="connect_plan_connect_to_yourself">Connectar amb tu mateix?</string>
+    <string name="migrate_to_device_confirm_network_settings">Confirmeu la configuració de la xarxa</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">Confirmeu que recordeu la contrasenya de la base de dades per migrar-la.</string>
+    <string name="remote_ctrl_error_bad_state">La connexió a l\'ordinador és deficient</string>
+    <string name="migrate_from_device_confirm_upload">Confirmar la càrrega</string>
+    <string name="v6_0_connection_servers_status">Controla la teva xarxa</string>
+    <string name="migrate_to_device_downloading_details">Baixant els detalls de l\'enllaç</string>
+    <string name="failed_to_save_servers">Error en desar els servidors</string>
+    <string name="debug_logs">Habilita els registres</string>
+    <string name="for_social_media">Per a xarxes socials</string>
+    <string name="full_name__field">Nom complet:</string>
+    <string name="exit_without_saving">Sortir sense desar</string>
+    <string name="hidden_profile_password">Contrasenya de perfil amagada</string>
+    <string name="permissions_required">Concedir permisos</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Per exemple, si el vostre contacte rep missatges mitjançant un servidor SimpleX Chat, la vostra aplicació els lliurarà mitjançant un servidor Flux.</string>
+    <string name="icon_descr_flip_camera">Gira la càmera</string>
+    <string name="enabled_self_destruct_passcode">Activar codi d\'autodestrucció</string>
+    <string name="receipts_contacts_title_enable">Activar els rebuts?</string>
+    <string name="enable_self_destruct">Activar autodestrucció</string>
+    <string name="receipts_groups_title_enable">Activar els rebuts per a grups?</string>
+    <string name="settings_section_title_files">FITXERS</string>
+    <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
+    <string name="export_database">Exportar base de dades</string>
+    <string name="encrypt_database">Xifrar</string>
+    <string name="file_with_path">Fitxer: %s</string>
+    <string name="info_row_group">Grup</string>
+    <string name="fix_connection">Arreglar connexió</string>
+    <string name="group_is_decentralized">Totalment descentralitzat: només visible per als membres.</string>
+    <string name="v4_6_group_moderation">Moderació de grups</string>
+    <string name="v4_6_group_welcome_message">Missatge de benvinguda als grups</string>
+    <string name="icon_descr_group_inactive">Grup inactiu</string>
+    <string name="alert_message_group_invitation_expired">La invitació de grup ja no és vàlida, el remitent l\'ha eliminada.</string>
+    <string name="alert_title_no_group">Grup no trobat!</string>
+    <string name="conn_event_ratchet_sync_required">es requereix renegociar el xifratge</string>
+    <string name="group_member_status_group_deleted">grup esborrat</string>
+    <string name="section_title_for_console">PER A CONSOLA</string>
+    <string name="fix_connection_question">Arreglar connexió?</string>
+    <string name="fix_connection_not_supported_by_group_member">Correcció no suportada per membre del grup</string>
+    <string name="group_full_name_field">Nom complet del grup:</string>
+    <string name="wallpaper_scale_fill">Farciment</string>
+    <string name="wallpaper_scale_fit">Encaix</string>
+    <string name="v4_2_group_links">Enllaços de grup</string>
+    <string name="v4_6_hidden_chat_profiles">Perfils de xat ocults</string>
+    <string name="v5_3_encrypt_local_files">Xifra els fitxers i els mitjans emmagatzemats</string>
+    <string name="found_desktop">Ordinador trobat</string>
+    <string name="connect_plan_group_already_exists">El grup ja existeix!</string>
+    <string name="migrate_from_device_finalize_migration">Finalitzar la migració</string>
+    <string name="expired_label">expirats</string>
+    <string name="conn_event_ratchet_sync_agreed">xifratge acordat</string>
+    <string name="v5_4_better_groups_descr">Unió més ràpida i missatges més fiables.</string>
+    <string name="network_option_enable_tcp_keep_alive">Activar TCP keep-alive</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">S\'ha suprimit el fitxer o l\'enllaç no és vàlid</string>
+    <string name="error_saving_database">Error en desar la base de dades</string>
+    <string name="conn_event_ratchet_sync_ok">xifratge ok</string>
+    <string name="icon_descr_hang_up">Penjar</string>
+    <string name="wallpaper_preview_hello_bob">Bon dia!</string>
+    <string name="group_preferences">Preferències del grup</string>
+    <string name="servers_info_files_tab">Fitxers</string>
+    <string name="fix_connection_not_supported_by_contact">Correcció no suportada pel contacte</string>
+    <string name="fix_connection_confirm">Arreglar</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">per a una millor privadesa de les metadades.</string>
+    <string name="wallpaper_preview_hello_alice">Bona tarda!</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">El fitxer exportat no existeix</string>
+    <string name="v5_7_forward">Reenvia i desa missatges</string>
+    <string name="email_invite_body">Hola!\nConnecteu-vos amb mi mitjançant SimpleX Chat: %s</string>
+    <string name="settings_experimental_features">Característiques experimentals</string>
+    <string name="alert_text_encryption_renegotiation_failed">La renegociació del xifratge ha fallat.</string>
+    <string name="conn_event_ratchet_sync_allowed">renegociació de xifratge permesa</string>
+    <string name="encryption_renegotiation_error">Error de renegociació de xifratge</string>
+    <string name="simplex_link_mode_full">Enllaç complet</string>
+    <string name="failed_to_parse_chat_title">No s\'ha pogut carregar el xat</string>
+    <string name="failed_to_parse_chats_title">No s\'han pogut carregar els xats</string>
+    <string name="for_chat_profile">Per al perfil de xat %s:</string>
+    <string name="proxy_destination_error_failed_to_connect">El servidor de reenviament %1$s no s\'ha pogut connectar al servidor de destinació %2$s. Si us plau, prova-ho més tard.</string>
+    <string name="smp_proxy_error_broker_host">L\'adreça del servidor de reenviament és incompatible amb la configuració de xarxa: %1$s.</string>
+    <string name="smp_proxy_error_broker_version">La versió del servidor de reenviament és incompatible amb la configuració de xarxa: %1$s.</string>
+    <string name="possible_slow_function_desc">L\'execució de la funció triga massa temps: %1$d segons: %2$s</string>
+    <string name="call_service_notification_end_call">Trucada finalitzada</string>
+    <string name="auth_enable_simplex_lock">Activar Bloqueig SimpleX</string>
+    <string name="snd_error_proxy">Servidor de reenviament: %1$s\nError: %2$s</string>
+    <string name="snd_error_proxy_relay">Servidor de reenviament: %1$s\nError del servidor de destinació: %2$s</string>
+    <string name="file_error_no_file">No s\'ha trobat el fitxer: el més probable és que s\'hagi suprimit o cancel·lat.</string>
+    <string name="file_error_relay">Error del servidor de fitxers: %1$s</string>
+    <string name="forwarded_from_chat_item_info_title">Reenviat des de</string>
+    <string name="for_everybody">Per a tothom</string>
+    <string name="revoke_file__message">El fitxer s\'eliminarà dels servidors.</string>
+    <string name="forward_chat_item">Reenviar</string>
+    <string name="forward_alert_title_messages_to_forward">Reenviar %1$s missatges?</string>
+    <string name="forward_alert_forward_messages_without_files">Reenviar missatges sense fitxers?</string>
+    <string name="forward_message">Reenviar missatge…</string>
+    <string name="forward_multiple">Reenviar missatges…</string>
+    <string name="files_and_media_prohibited">Arxius i mitjans prohibits!</string>
+    <string name="compose_forward_messages_n">Reenviant %1$s missatges</string>
+    <string name="files_and_media_not_allowed">No es permeten fitxers ni suports</string>
+    <string name="icon_descr_file">Fitxer</string>
+    <string name="file_error">Error de fitxer</string>
+    <string name="file_not_found">No s\'ha trobat el fitxer</string>
+    <string name="file_saved">Fitxer desat</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">El fitxer es rebrà quan el vostre contacte acabi de carregar-lo.</string>
+    <string name="file_will_be_received_when_contact_is_online">El fitxer es rebrà quan el vostre contacte estigui en línia, espereu o comproveu més tard!</string>
+    <string name="sync_connection_question">Arreglar connexió?</string>
+    <string name="sync_connection_confirm">Arreglar</string>
+    <string name="encryption_renegotiation_in_progress">Renegociació de xifratge en curs.</string>
+    <string name="from_gallery_button">De la Galeria</string>
+    <string name="permissions_find_in_settings_and_grant">Cerqueu aquest permís a la configuració d\'Android i concediu-lo manualment.</string>
+    <string name="permissions_grant_in_settings">Concedir a la configuració</string>
+    <string name="permissions_grant">Donar permís(os) per fer trucades</string>
+    <string name="audio_device_wired_headphones">Auriculars</string>
+    <string name="encrypt_local_files">Xifra fitxers locals</string>
+    <string name="settings_section_title_help">AJUT</string>
+    <string name="files_and_media_section">Arxius i mitjans</string>
+    <string name="encrypt_database_question">Xifrar base de dades?</string>
+    <string name="encrypted_database">Base de dades xifrada</string>
+    <string name="group_invitation_expired">Invitació del grup caducada</string>
+    <string name="snd_group_event_group_profile_updated">perfil de grup actualitzat</string>
+    <string name="snd_conn_event_ratchet_sync_agreed">xifratge acordat per a %s</string>
+    <string name="snd_conn_event_ratchet_sync_ok">xifratge correcte per a %s</string>
+    <string name="snd_conn_event_ratchet_sync_allowed">renegociació de xifratge permesa per a %s</string>
+    <string name="snd_conn_event_ratchet_sync_required">es requereix renegociar el xifratge per a %s</string>
+    <string name="icon_descr_expand_role">Amplieu la selecció de rols</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">El grup se suprimirà per a tots els membres; això no es pot desfer!</string>
+    <string name="group_link">Enllaç de grup</string>
+    <string name="delete_group_for_self_cannot_undo_warning">El grup se suprimirà per tu; això no es pot desfer!</string>
+    <string name="info_row_file_status">Estat del fitxer</string>
+    <string name="share_text_file_status">Estat del fitxer: %s</string>
+    <string name="group_profile_is_stored_on_members_devices">El perfil del grup s\'emmagatzema als dispositius dels membres, no als servidors.</string>
+    <string name="operator_use_for_messages_private_routing">Per a l\'encaminament privat</string>
+    <string name="export_theme">xifratge correcte</string>
+    <string name="appearance_font_size">Mida de la lletra</string>
+    <string name="files_and_media">Arxius i mitjans</string>
+    <string name="files_are_prohibited_in_group">Els fitxers i els mitjans estan prohibits.</string>
+    <string name="v4_4_french_interface">Interfície en francès</string>
+    <string name="v5_0_large_files_support_descr">Ràpid i sense esperar fins que el remitent estigui en línia!</string>
+    <string name="v5_1_message_reactions_descr">Per fi, els tenim! 🚀</string>
+    <string name="v4_6_reduced_battery_usage">Ús de la bateria encara més reduït</string>
+    <string name="v5_2_favourites_filter_descr">Filtra els xats preferits i no llegits.</string>
+    <string name="v5_2_favourites_filter">Trobar xats més ràpidament</string>
+    <string name="v5_2_fix_encryption_descr">Corregir el xifratge després de restaurar les còpies de seguretat.</string>
+    <string name="v6_1_forward_many_messages_descr">Reenvia fins a 20 missatges alhora.</string>
+    <string name="migrate_to_device_finalize_migration">Finalitzar la migració a un altre dispositiu.</string>
+    <string name="callstatus_missed">trucada perduda</string>
+    <string name="permissions_record_audio">Micròfon</string>
+    <string name="icon_descr_call_missed">Trucada perduda</string>
+    <string name="privacy_message_draft">Esborrany</string>
+    <string name="remote_hosts_section">Mòbils remots</string>
+    <string name="remove_passphrase">Elimina</string>
+    <string name="remove_member_confirmation">Expulsa</string>
+    <string name="rcv_group_event_user_deleted">t\'ha expulsat</string>
+    <string name="group_member_status_removed">eliminat</string>
+    <string name="renegotiate_encryption">Renegocia l\'encriptació</string>
+    <string name="custom_time_unit_months">mesos</string>
+    <string name="migrate_to_device_title">Migra aquí</string>
+    <string name="servers_info_messages_sent">Missatges enviats</string>
+    <string name="servers_info_messages_received">Missatges rebuts</string>
+    <string name="button_remove_member">Expulsar membre</string>
+    <string name="custom_time_unit_minutes">minuts</string>
+    <string name="rcv_group_event_member_deleted">ha expulsat %1$s</string>
+    <string name="moderated_item_description">moderat per %s</string>
+    <string name="message_delivery_error_title">Error en l\'enviament del missatge</string>
+    <string name="member_inactive_desc">El missatge podrà ser lliurat si el membre esdevé actiu.</string>
+    <string name="compose_message_placeholder">Missatge</string>
+    <string name="maximum_message_size_title">El missatge és massa llarg!</string>
+    <string name="info_view_message_button">missatge</string>
+    <string name="settings_section_title_messages">MISSATGES I FITXERS</string>
+    <string name="messages_section_title">Missatges</string>
+    <string name="info_row_message_status">Estat del missatge</string>
+    <string name="share_text_message_status">Estat del missatge: %s</string>
+    <string name="message_too_large">Missatge massa llarg</string>
+    <string name="color_surface">Menús i alertes</string>
+    <string name="theme_remove_image">Eliminar la imatge</string>
+    <string name="group_members_can_send_voice">Els membres poden enviar missatges de veu.</string>
+    <string name="save_preferences_question">Voleu desar les preferències?</string>
+    <string name="network_options_save">Desa</string>
+    <string name="save_passphrase_in_keychain">Desa la frase de pas al Keystore</string>
+    <string name="save_passphrase_and_open_chat">Desa la frase de pas i obre el xat</string>
+    <string name="network_options_save_and_reconnect">Desa i reconnecta</string>
+    <string name="wallpaper_scale_repeat">Repeteix</string>
+    <string name="v5_6_safer_groups">Grups més segurs</string>
+    <string name="migrate_to_device_repeat_download">Repeteix la descàrrega</string>
+    <string name="migrate_to_device_repeat_import">Repetir importació</string>
+    <string name="restore_database">Restaura la còpia de la base de dades</string>
+    <string name="group_members_2">%s i %s</string>
+    <string name="restore_database_alert_confirm">Restaura</string>
+    <string name="restore_database_alert_title">Voleu restaurar la còpia de la base de dades?</string>
+    <string name="notifications_mode_off">Solament quan l\'app és oberta</string>
+    <string name="revoke_file__title">Voleu revocar el fitxer?</string>
+    <string name="sync_connection_force_question">Voleu renegociar l\'encriptació?</string>
+    <string name="smp_servers_save">Desa els servidors</string>
+    <string name="saved_message_title">Missatge desat</string>
+    <string name="save_group_profile">Desa el perfil del grup</string>
+    <string name="waiting_for_mobile_to_connect">Esperant connexió mòbil:</string>
+    <string name="you_can_hide_or_mute_user_profile">Podeu amagar o silenciar un perfil d\'usuari; manteniu-lo premut per al menú.</string>
+    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">Ja esteu connectant mitjançant aquest enllaç d\'un sol ús!</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Pots compartir un enllaç o un codi QR; qualsevol es podrà unir al grup. No perdràs membres del grup si més tard el suprimeixes.</string>
+    <string name="onboarding_network_operators_configure_via_settings">Podeu configurar servidors mitjançant la configuració.</string>
+    <string name="migrate_to_device_try_again">Pots intentar-ho un altre cop.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">La vostra base de dades de xat actual s\'ELIMINARÀ i SUBSTITUÏRÀ per la importada.\nAquesta acció no es pot desfer: el vostre perfil, contactes, missatges i fitxers es perdran de manera irreversible.</string>
+    <string name="description_you_shared_one_time_link_incognito">has compartit enllaç d\'un sol ús en mode incògnit</string>
+    <string name="connect_plan_repeat_connection_request">Repetir la sol·licitud de connexió?</string>
+    <string name="servers_info_missing">Sense informació, prova de tornar a carregar</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">Pot passar quan:\n1. Els missatges van caducar al client d\'enviament al cap de 2 dies o al servidor després de 30 dies.\n2. No s\'ha pogut desxifrar el missatge, perquè tu o el teu contacte feien servir una còpia de seguretat de la base de dades antiga.\n3. La connexió s\'ha compromès.</string>
+    <string name="users_delete_data_only">Només dades de perfil local</string>
+    <string name="connect_plan_join_your_group">Unir-se al teu grup?</string>
+    <string name="delete_message_mark_deleted_warning">El missatge es marcarà per suprimir-lo. Els destinataris podran visualitzar aquest missatge.</string>
+    <string name="v6_0_new_chat_experience">Nova experiència de xat 🎉</string>
+    <string name="join_group_button">Unir-te</string>
+    <string name="v5_5_simpler_connect_ui">Enganxar enllaç per connectar!</string>
+    <string name="old_database_archive">Arxiu de bases de dades antigues</string>
+    <string name="migrate_from_another_device">Migrar des d\'un altre dispositiu</string>
+    <string name="notifications_will_be_hidden">Les notificacions només es lliuraran fins que l\'aplicació s\'aturi!</string>
+    <string name="operator_open_changes">Obrir canvis</string>
+    <string name="profile_update_event_member_name_changed">el membre %1$s ha canviat a %2$s</string>
+    <string name="v5_8_chat_themes_descr">Canvia l\'aspecte dels teus xats!</string>
+    <string name="v4_3_voice_messages_desc">Màxim 40 segons, rebut a l\'instant.</string>
+    <string name="only_you_can_delete_messages">Només vos podreu suprimir els missatges de manera irreversible (el vostre contacte pot marcar-los per suprimir-los). (24 hores)</string>
+    <string name="open_server_settings_button">Obrir configuració del servidor</string>
+    <string name="other_errors">altres errors</string>
+    <string name="v5_4_more_things_descr">- Notificació opcional als contactes suprimits.\n- Noms de perfil amb espais.\n- I més!</string>
+    <string name="servers_info_subscriptions_connections_pending">Pendents</string>
+    <string name="delete_messages_cannot_be_undone_warning">Els missatges se suprimiran; això no es pot desfer!</string>
+    <string name="v5_7_network_descr">Connexió de xarxa més fiable.</string>
+    <string name="new_mobile_device">Nou dispositiu mòbil</string>
+    <string name="v6_2_improved_chat_navigation_descr">- El xat s\'obre amb al primer missatge no llegit.\n- Desplaçaments fins als missatges citats.</string>
+    <string name="call_desktop_permission_denied_safari">Obriu Configuració de Safari / Llocs web / Micròfon i, a continuació, trieu Permetre localhost.</string>
+    <string name="operator_server_alert_title">Servidor de l\'operador</string>
+    <string name="or_paste_archive_link">O enganxeu l\'enllaç de l\'arxiu</string>
+    <string name="migrate_from_device_or_share_this_file_link">O compartiu aquest enllaç de fitxer de manera segura</string>
+    <string name="icon_descr_sent_msg_status_send_failed">enviament fallat</string>
+    <string name="sending_delivery_receipts_will_be_enabled">L\'enviament de rebuts de lliurament s\'habilitarà per a tots els contactes.</string>
+    <string name="server_address">Adreça del servidor</string>
+    <string name="migrate_from_device_bytes_uploaded">%s pujades</string>
+    <string name="network_option_tcp_connection">Connexió TCP</string>
+    <string name="v5_3_simpler_incognito_mode">Mode d\'incògnit simplificat</string>
+    <string name="member_role_will_be_changed_with_notification_chat">El rol es canviarà a %s. Tots els participants del xat rebran una notificació.</string>
+    <string name="shutdown_alert_question">Tancar?</string>
+    <string name="shutdown_alert_desc">Les notificacions deixaran de funcionar fins que torneu a iniciar l\'aplicació</string>
+    <string name="your_contacts_will_remain_connected">Els teus contactes romandran connectats.</string>
+    <string name="share_address_with_contacts_question">Compartir l\'adreça amb els contactes?</string>
+    <string name="share_link">Compartir enllaç</string>
+    <string name="save_auto_accept_settings">Desa la configuració d\'acceptació automàtica</string>
+    <string name="stop_sharing">Deixar de compartir</string>
+    <string name="or_to_share_privately">O per compartir en privat</string>
+    <string name="you_can_create_it_later">Podeu crear-la més tard</string>
+    <string name="you_can_make_address_visible_via_settings">Podeu fer-lo visible per als vostres contactes de SimpleX mitjançant Configuració.</string>
+    <string name="display_name__field">Nom del perfil:</string>
+    <string name="save_and_notify_contact">Desa i notifica el contacte</string>
+    <string name="your_current_profile">El teu perfil actual</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">El teu perfil s\'emmagatzema al teu dispositiu i només es comparteix amb els teus contactes, els servidors SimpleX no poden veure\'l.</string>
+    <string name="save_and_notify_contacts">Desa i notifica els contactes</string>
+    <string name="save_and_notify_group_members">Desa i notifica als membres del grup</string>
+    <string name="hide_profile">Amagar el perfil</string>
+    <string name="password_to_show">Contrasenya per mostrar</string>
+    <string name="save_profile_password">Desa la contrasenya del perfil</string>
+    <string name="to_reveal_profile_enter_password">Per revelar el vostre perfil ocult introduïu una contrasenya completa al camp de cerca de la pàgina Els vostres perfils de xat.</string>
+    <string name="you_control_your_chat">Tu controles el teu xat!</string>
+    <string name="you_can_use_markdown_to_format_messages__prompt">Pots utilitzar la sintaxi markdown per donar format als teus missatges:</string>
+    <string name="how_to_use_markdown">Com utilitzar la sintaxis markdown</string>
+    <string name="callstatus_rejected">trucada rebutjada</string>
+    <string name="callstate_starting">iniciant…</string>
+    <string name="callstate_received_answer">resposta rebuda…</string>
+    <string name="callstate_waiting_for_answer">esperant resposta…</string>
+    <string name="callstate_waiting_for_confirmation">esperant confirmació…</string>
+    <string name="callstate_received_confirmation">confirmació rebuda…</string>
+    <string name="unable_to_open_browser_desc">Un navegador web predeterminat és necessari per a les trucades. Configura\'n un al sistema i comparteix més informació amb els desenvolupadors.</string>
+    <string name="privacy_redefined">Privadesa redefinida</string>
+    <string name="people_can_connect_only_via_links_you_share">Tu decideixes qui es pot connectar.</string>
+    <string name="immune_to_spam_and_abuse">Immune al correu brossa</string>
+    <string name="first_platform_without_user_ids">Sense identificadors d\'usuari.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Per protegir la vostra privadesa SimpleX utilitza identificadors separats per a cadascun dels vostres contactes..</string>
+    <string name="use_chat">Obrir SimpleX</string>
+    <string name="how_simplex_works">Com funciona SimpleX</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Només els dispositius client emmagatzemen perfils d\'usuari, contactes, grups i missatges.</string>
+    <string name="onboarding_notifications_mode_title">Notificacions privades</string>
+    <string name="onboarding_notifications_mode_subtitle">Com afecta la bateria</string>
+    <string name="onboarding_notifications_mode_periodic">Periòdic</string>
+    <string name="onboarding_notifications_mode_service">Instantánea</string>
+    <string name="onboarding_notifications_mode_off">Quan l\'aplicació s\'està executant</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Sense servei de fons</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">L\'aplicació protegeix la teva privadesa utilitzant diferents operadors en cada conversa.</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Quan hi ha més d\'un operador habilitat, cap d\'ells té metadades per saber qui es comunica amb qui.</string>
+    <string name="how_it_helps_privacy">Com ajuda a la privadesa</string>
+    <string name="onboarding_network_operators_review_later">Revisar més tard</string>
+    <string name="onboarding_network_operators_update">Actualitzar</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Podeu configurar els operadors a la configuració: Xarxa i Servidors.</string>
+    <string name="video_call_no_encryption">videotrucada (sense xifrar)</string>
+    <string name="ignore">Ignorar</string>
+    <string name="reject">Rebutjar</string>
+    <string name="call_desktop_permission_denied_title">Per fer trucades, permet utilitzar el micròfon. Finalitza la trucada i prova de tornar a trucar.</string>
+    <string name="icon_descr_video_call">Videotrucada</string>
+    <string name="relay_server_if_necessary">El servidor de retransmissió només s\'utilitza si cal. Un tercer pot observar la vostra adreça IP.</string>
+    <string name="show_call_on_lock_screen">Mostrar</string>
+    <string name="your_calls">Trucades</string>
+    <string name="status_no_e2e_encryption">sense xifratge e2e</string>
+    <string name="open_verb">Obrir</string>
+    <string name="call_connection_via_relay">mitjançant retransmissor</string>
+    <string name="icon_descr_video_off">Desactivar vídeo</string>
+    <string name="call_connection_peer_to_peer">p2p</string>
+    <string name="icon_descr_video_on">Activar vídeo</string>
+    <string name="icon_descr_call_rejected">Trucada rebutjada</string>
+    <string name="icon_descr_call_pending_sent">Trucada pendent</string>
+    <string name="icon_descr_sound_muted">So silenciat</string>
+    <string name="alert_title_skipped_messages">Missatges omesos</string>
+    <string name="alert_text_msg_bad_hash">El hash del missatge anterior és diferent.\"</string>
+    <string name="alert_text_msg_bad_id">L\'identificador del missatge següent és incorrecte (menor o igual a l\'anterior).\nPot passar per algun error o quan la connexió està compromesa.</string>
+    <string name="alert_text_fragment_please_report_to_developers">Informeu-ho als desenvolupadors.</string>
+    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Pot passar quan tu o el teu contacte feu servir la còpia de seguretat de la base de dades antiga.</string>
+    <string name="app_will_ask_to_confirm_unknown_file_servers">L\'aplicació us demanarà que confirmeu les baixades de servidors de fitxers desconeguts (excepte .onion o quan el servidor intermediari SOCKS estigui habilitat).</string>
+    <string name="send_link_previews">Envia previsualitzacions d\'enllaços</string>
+    <string name="privacy_show_last_messages">Mostra els últims missatges</string>
+    <string name="submit_passcode">Enviar</string>
+    <string name="new_passcode">Codi nou</string>
+    <string name="la_mode_off">Desactivat</string>
+    <string name="la_mode_passcode">Codi d\'accés</string>
+    <string name="passcode_set">Codi d\'accés desat!</string>
+    <string name="passcode_changed">Codi d\'accés canviat!</string>
+    <string name="self_destruct_new_display_name">Nou nom mostrat:</string>
+    <string name="self_destruct_passcode_changed">Codi d\'autodestrucció canviat!</string>
+    <string name="self_destruct_passcode_enabled">Codi d\'autodestrucció activat!</string>
+    <string name="receipts_contacts_override_disabled">L\'enviament de rebuts està desactivat per a %d contactes</string>
+    <string name="receipts_contacts_override_enabled">L\'enviament de rebuts està habilitat per a %d contactes</string>
+    <string name="receipts_groups_override_enabled">L\'enviament de rebuts està habilitat per a %d grups</string>
+    <string name="settings_section_title_delivery_receipts">ENVIAR ELS REBUS DE LLIURAMENT A</string>
+    <string name="receipts_groups_override_disabled">L\'enviament de rebuts està desactivat per a %d grups</string>
+    <string name="settings_restart_app">Reiniciar</string>
+    <string name="settings_section_title_socks">SERVIDOR INTERMEDIARI SOCKS</string>
+    <string name="settings_section_title_profile_images">Imatges de perfil</string>
+    <string name="settings_section_title_themes">TEMES</string>
+    <string name="settings_message_shape_tail">Cua</string>
+    <string name="settings_section_title_message_shape">Forma del missatge</string>
+    <string name="run_chat_section">EXECUTAR SIMPLEX</string>
+    <string name="settings_section_title_use_from_desktop">Usar des d\'ordinador</string>
+    <string name="your_chat_database">Base de dades de xat</string>
+    <string name="import_database">Importar base de dades</string>
+    <string name="new_database_archive">Nou arxiu de bases de dades</string>
+    <string name="open_database_folder">Obrir la carpeta de la base de dades</string>
+    <string name="stop_chat_question">Aturar SimpleX?</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Atura SimpleX per poder exportar, importar o suprimir la base de dades de xat. No podreu rebre ni enviar missatges mentre el xat estigui aturat.</string>
+    <string name="set_password_to_export">Estableix contrasenya per a exportar</string>
+    <string name="stop_chat_confirmation">Aturar</string>
+    <string name="restart_the_app_to_use_imported_chat_database">Reinicieu l\'aplicació per utilitzar la base de dades de xat importada.</string>
+    <string name="import_database_confirmation">Importar</string>
+    <string name="import_database_question">Importar la base de dades de xat?</string>
+    <string name="non_fatal_errors_occured_during_import">S\'han produït alguns errors no fatals durant la importació:</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Aquesta acció no es pot desfer: el vostre perfil, contactes, missatges i fitxers es perdran de manera irreversible.</string>
+    <string name="enable_automatic_deletion_message">Aquesta acció no es pot desfer; els missatges enviats i rebuts anteriors al seleccionat se suprimiran. Pot trigar uns quants minuts.</string>
+    <string name="chat_database_exported_migrate">Podeu migrar la base de dades exportada.</string>
+    <string name="chat_database_exported_save">Podeu desar l\'arxiu exportat.</string>
+    <string name="save_passphrase_in_settings">Desa la contrasenya a la configuració</string>
+    <string name="update_database">Actualitzar</string>
+    <string name="unknown_error">Error desconegut</string>
+    <string name="wrong_passphrase_title">Contrasenya incorrecta!</string>
+    <string name="alert_message_no_group">Aquest grup ja no existeix.</string>
+    <string name="rcv_group_event_member_unblocked">ha desblocat a %s</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s i %d membres més connectats</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">has canviat d\'adreça de servidor per a %s</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">El membre s\'eliminarà del xat; això no es pot desfer!</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">El membre s\'eliminarà del grup; això no es pot desfer!</string>
+    <string name="member_role_will_be_changed_with_notification">El rol es canviarà a %s. Tots els membres del grup seran avisats.</string>
+    <string name="connect_via_member_address_alert_desc">La sol·licitud de connexió s\'enviarà a aquest membre del grup.</string>
+    <string name="member_role_will_be_changed_with_invitation">El rol es canviarà a %s. El membre rebrà una nova invitació.</string>
+    <string name="network_status">Estat de la xarxa</string>
+    <string name="operator">Operador</string>
+    <string name="operator_website">Lloc web</string>
+    <string name="operator_use_for_sending">Per a enviar</string>
+    <string name="network_options_reset_to_defaults">Restablir valors predeterminats</string>
+    <string name="network_option_ping_count">Compte PING</string>
+    <string name="tap_to_activate_profile">Toqueu per activar el perfil.</string>
+    <string name="muted_when_inactive">Silenciat quan està inactiu!</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Encara rebràs trucades i notificacions de perfils silenciats quan estiguin actius.</string>
+    <string name="only_your_contact_can_delete">Només el vostre contacte pot suprimir missatges de manera irreversible (podeu marcar-los per suprimir-los). (24 hores)</string>
+    <string name="message_deletion_prohibited">La supressió de missatges irreversible està prohibida en aquest xat.</string>
+    <string name="v4_3_irreversible_message_deletion_desc">Els vostres contactes poden permetre la supressió completa del missatge.</string>
+    <string name="v4_3_irreversible_message_deletion">Eliminació irreversible del missatge</string>
+    <string name="v4_3_improved_privacy_and_security_desc">Amaga la pantalla de l\'aplicació a les aplicacions recents.</string>
+    <string name="v4_3_improved_privacy_and_security">Millora de la privadesa i la seguretat</string>
+    <string name="v4_3_improved_server_configuration">Configuració del servidor millorada</string>
+    <string name="v4_4_live_messages_desc">El(s) destinatari(s) veu(en) l\'actualització mentre l\'escriviu.</string>
+    <string name="v4_4_live_messages">Missatges en directe</string>
+    <string name="v4_4_disappearing_messages_desc">Els missatges enviats se suprimiran després del temps establert.</string>
+    <string name="v4_5_message_draft">Esborrany de missatge</string>
+    <string name="v4_5_message_draft_descr">Conserva l\'últim esborrany del missatge, amb fitxers adjunts.</string>
+    <string name="v4_5_transport_isolation">Aïllament de transport</string>
+    <string name="v4_6_group_moderation_descr">Ara els administradors poden:\n- suprimir els missatges dels membres.\n- desactivar els membres (rol d\'observador)</string>
+    <string name="v4_6_hidden_chat_profiles_descr">Protegir els vostres perfils de xat amb contrasenya!</string>
+    <string name="v4_6_audio_video_calls_descr">Admet bluetooth i altres millores.</string>
+    <string name="v5_4_link_mobile_desktop_descr">Mitjançant protocol segur de resistència quàntica.</string>
+    <string name="v5_4_link_mobile_desktop">Enllaça aplicacions mòbils i d\'ordinador! 🔗</string>
+    <string name="migrate_from_device_to_another_device">Migrar a un altre dispositiu</string>
+    <string name="migrate_from_device_database_init">Preparant càrrega</string>
+    <string name="network_type_no_network_connection">Sense connexió de xarxa</string>
+    <string name="servers_info_transport_sessions_section_header">Sessions de transport</string>
+    <string name="secured">Assegurades</string>
+    <string name="v5_6_picture_in_picture_calls_descr">Usar l\'aplicació durant la trucada.</string>
+    <string name="unblock_for_all">Desblocar per tothom</string>
+    <string name="moderate_messages_will_be_marked_warning">Els missatges es marcaran com a moderats per a tots els membres.</string>
+    <string name="use_servers_of_operator_x">Utilitzar %s</string>
+    <string name="remove_passphrase_from_keychain">Suprimir la contrasenya de Keystore?</string>
+    <string name="remove_passphrase_from_settings">Suprimir la contrasenya de la configuració?</string>
+    <string name="new_passphrase">Nova contrasenya…</string>
+    <string name="enter_correct_current_passphrase">Introduïu la contrasenya actual correcta.</string>
+    <string name="set_database_passphrase">Estableix contrasenya per a la base de dades</string>
+    <string name="set_passphrase">Estableix contrasenya</string>
+    <string name="update_database_passphrase">Actualitzar la contrasenya de la base de dades</string>
+    <string name="settings_is_storing_in_clear_text">La frase de contrasenya s\'emmagatzema a la configuració com a text pla.</string>
+    <string name="database_backup_can_be_restored">L\'intent de canviar la contrasenya de la base de dades no s\'ha completat.</string>
+    <string name="unknown_database_error_with_info">Error de base de dades desconegut: %s</string>
+    <string name="database_restore_error">Error en restaurar base de dades</string>
+    <string name="database_migrations">Migracions: %s</string>
+    <string name="database_downgrade_warning">Avís: podeu perdre algunes dades!</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Podeu iniciar el xat mitjançant Configuració / Base de dades o reiniciant l\'aplicació.</string>
+    <string name="join_group_incognito_button">Uneix-te d\'incògnit</string>
+    <string name="joining_group">Entrant al grup</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Estàs convidat al grup. Uneix-te per connectar amb els seus membres.</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">T\'has unit a aquest grup. S\'està connectant amb l\'emissor de la invitació.</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Deixaràs de rebre missatges d\'aquest xat. L\'historial de xat es conservarà.</string>
+    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Deixaràs de rebre missatges d\'aquest grup. L\'historial de xat es conservarà.</string>
+    <string name="rcv_group_event_2_members_connected">%s i %s connectats</string>
+    <string name="group_members_n">%s, %s i %d membres</string>
+    <string name="rcv_group_event_open_chat">Obrir</string>
+    <string name="rcv_group_event_3_members_connected">%s, %s i %s connectats</string>
+    <string name="profile_update_event_removed_address">adreça de contacte eliminat</string>
+    <string name="profile_update_event_removed_picture">foto de perfil eliminada</string>
+    <string name="profile_update_event_set_new_picture">establir una nova foto de perfil</string>
+    <string name="profile_update_event_set_new_address">nova adreça de contacte</string>
+    <string name="profile_update_event_updated_profile">perfil actualitzat</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">has canviat d\'adreça de servidor</string>
+    <string name="group_member_role_owner">propietari</string>
+    <string name="group_member_status_unknown">estat desconegut</string>
+    <string name="you_can_share_this_address_with_your_contacts">Podeu compartir aquesta adreça amb els vostres contactes perquè es connectin amb %s.</string>
+    <string name="send_receipts_disabled_alert_msg">Aquest grup té més de %1$d membres, no s\'envien rebuts d\'entrega.</string>
+    <string name="info_row_received_at">Rebut</string>
+    <string name="sender_at_ts">%s a les %s</string>
+    <string name="button_send_direct_message">Enviar missatge directe</string>
+    <string name="share_text_moderated_at">Moderat el: %s</string>
+    <string name="share_text_received_at">Rebut: %s</string>
+    <string name="unblock_member_button">Desblocar membre</string>
+    <string name="unblock_member_question">Desblocar membre?</string>
+    <string name="unblock_for_all_question">Desblocar membre per tothom?</string>
+    <string name="role_in_group">Rol</string>
+    <string name="message_queue_info_server_info">informació de cua del servidor: %1$s\n\núltim missatge rebut: %2$s</string>
+    <string name="message_queue_info">Informació de la cua de missatges</string>
+    <string name="message_queue_info_none">cap</string>
+    <string name="sending_via">Enviant via</string>
+    <string name="chat_main_profile_sent">El teu perfil de xat s\'enviarà als membres del xat</string>
+    <string name="group_main_profile_sent">El teu perfil de xat s\'enviarà als membres del grup</string>
+    <string name="operator_info_title">Operador de xarxa</string>
+    <string name="operator_servers_title">%s servidors</string>
+    <string name="xftp_servers_per_user">Servidors per a fitxers nous al vostre perfil de xat actual</string>
+    <string name="view_conditions">Veure condicions</string>
+    <string name="operator_open_conditions">Obrir condicions</string>
+    <string name="server_added_to_operator__name">Servidor afegit a l\'operador %s.</string>
+    <string name="error_server_operator_changed">Ha canviat l\'operador del servidor.</string>
+    <string name="error_server_protocol_changed">El protocol del servidor ha canviat.</string>
+    <string name="network_option_tcp_connection_timeout">Temps d\'espera de connexió TCP</string>
+    <string name="network_option_protocol_timeout">Temps d\'espera del protocol</string>
+    <string name="network_option_protocol_timeout_per_kb">Temps d\'espera del protocol per KB</string>
+    <string name="network_option_rcv_concurrency">Concurrència a la recepció</string>
+    <string name="update_network_settings_question">Actualitzar la configuració de xarxa?</string>
+    <string name="update_network_settings_confirmation">Actualitzar</string>
+    <string name="users_delete_with_connections">Connexions de perfil i servidor</string>
+    <string name="user_unhide">Mostrar</string>
+    <string name="user_mute">Silenciar</string>
+    <string name="user_unmute">Activar so</string>
+    <string name="unhide_profile">Mostrar perfil</string>
+    <string name="reset_single_color">Restablir color</string>
+    <string name="reset_color">Restablir colors</string>
+    <string name="system_mode_toast">Mode de sistema</string>
+    <string name="chat_preferences_no">no</string>
+    <string name="chat_preferences_off">desactivat</string>`
+  <string name="chat_preferences_on">Activat</string>
+    <string name="chat_theme_reset_to_app_theme">Restablir al tema de l\'aplicació</string>
+    <string name="chat_theme_reset_to_user_theme">Restablir al tema d\'usuari</string>
+    <string name="chat_theme_set_default_theme">Estableix tema predeterminat</string>
+    <string name="chat_preferences_you_allow">Permeteu</string>
+    <string name="set_group_preferences">Estableix preferències de grup</string>
+    <string name="your_preferences">Preferències</string>
+    <string name="message_reactions">Reaccions a missatge</string>
+    <string name="voice_messages">Missatges de veu</string>
+    <string name="prohibit_sending_files">Prohibir l\'enviament de fitxers i mitjans.</string>
+    <string name="simplex_links_are_prohibited_in_group">Enllaços SimpleX no permesos.</string>
+    <string name="recent_history_is_sent_to_new_members">S\'envien fins a 100 darrers missatges als nous membres.</string>
+    <string name="recent_history_is_not_sent_to_new_members">L\'historial no s\'envia als nous membres.</string>
+    <string name="feature_offered_item">oferit %s</string>
+    <string name="feature_offered_item_with_param">oferit %s: %2s</string>
+    <string name="whats_new">Novetats</string>
+    <string name="new_in_version">Nou a %s</string>
+    <string name="whats_new_read_more">Llegeix més</string>
+    <string name="v4_3_voice_messages">Missatges de veu</string>
+    <string name="v4_2_auto_accept_contact_requests_desc">Amb missatge de benvinguda opcional.</string>
+    <string name="v4_5_private_filenames">Noms de fitxers privats</string>
+    <string name="v4_5_reduced_battery_usage">Ús de bateria reduït</string>
+    <string name="v4_5_italian_interface_descr">Gràcies als usuaris: contribuïu a través de Weblate!</string>
+    <string name="v4_5_reduced_battery_usage_descr">Aviat hi haurà més millores!</string>
+    <string name="v5_2_message_delivery_receipts">Rebuts de lliurament de missatges!</string>
+    <string name="v5_3_simpler_incognito_mode_descr">Activa o desactiva l\'incògnit en connectar-te.</string>
+    <string name="v5_4_block_group_members_descr">Per amagar missatges no desitjats.</string>
+    <string name="v5_5_private_notes">Notes privades</string>
+    <string name="v5_5_simpler_connect_ui_descr">La barra de cerca accepta enllaços d\'invitació.</string>
+    <string name="v5_5_private_notes_descr">Amb fitxers i mitjans xifrats.</string>
+    <string name="v5_5_message_delivery">Entrega de missatges millorada</string>
+    <string name="v5_5_message_delivery_descr">Amb ús reduït de la bateria.</string>
+    <string name="v5_6_app_data_migration_descr">Migra a un altre dispositiu mitjançant el codi QR.</string>
+    <string name="v5_6_picture_in_picture_calls">Trucades imatge-en-imatge</string>
+    <string name="v5_6_quantum_resistant_encryption">Xifratge resistent quàntic</string>
+    <string name="v5_7_shape_profile_images">Formar imatges de perfil</string>
+    <string name="v5_7_forward_descr">L\'autoria del missatge continua sent privada.</string>
+    <string name="v5_7_shape_profile_images_descr">Quadrat, cercle o qualsevol forma intermèdia.</string>
+    <string name="v5_7_call_sounds_descr">En connectar trucades d\'àudio i vídeo.</string>
+    <string name="v5_7_quantum_resistant_encryption_descr">S\'habilitarà als xats directes!</string>
+    <string name="v5_7_network">Gestió de la xarxa</string>
+    <string name="v5_8_chat_themes">Nous temes de xat</string>
+    <string name="v5_8_safe_files">Rebre fitxers amb seguretat</string>
+    <string name="v5_8_message_delivery">Entrega de missatges millorada</string>
+    <string name="v5_8_persian_ui">IU en persa</string>
+    <string name="v5_8_message_delivery_descr">Amb ús reduït de la bateria.</string>
+    <string name="v6_0_new_media_options">Noves opcions de mitjans</string>
+    <string name="v6_0_reachable_chat_toolbar">Barres d\'eines de xat accessible</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Fes servir l\'aplicació amb una sola mà.</string>
+    <string name="v6_0_chat_list_media">Reprodueix des de la llista de xat.</string>
+    <string name="v6_0_upgrade_app">Actualitza l\'aplicació automàticament</string>
+    <string name="v6_2_network_decentralization">Descentralització de la xarxa</string>
+    <string name="v6_2_network_decentralization_descr">El segon operador preestablert a l\'aplicació!</string>
+    <string name="v6_2_business_chats_descr">Privadesa per als teus clients.</string>
+    <string name="view_updated_conditions">Veure condicions actualitzades</string>
+    <string name="custom_time_unit_hours">hores</string>
+    <string name="custom_time_unit_weeks">setmanes</string>
+    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">L\'enviament de rebuts de lliurament s\'habilitarà per a tots els contactes de tots els perfils de xat visibles.</string>
+    <string name="unlink_desktop">Desenllaçar</string>
+    <string name="unlink_desktop_question">Desenllaçar l\'ordinador?</string>
+    <string name="you_can_enable_delivery_receipts_later_alert">Podeu activar-los més tard mitjançant la configuració de privadesa i seguretat de l\'aplicació.</string>
+    <string name="remote_ctrl_connection_stopped_identity_desc">Aquest enllaç s\'ha utilitzat amb un altre dispositiu mòbil; creeu-ne un de nou a l\'ordinador.</string>
+    <string name="only_one_device_can_work_at_the_same_time">Només un dispositiu pot funcionar al mateix temps</string>
+    <string name="session_code">Codi de sessió</string>
+    <string name="waiting_for_desktop">Esperant ordinador…</string>
+    <string name="linked_desktops">Ordinadors enllaçats</string>
+    <string name="verify_code_with_desktop">Verifica el codi a l\'ordinador</string>
+    <string name="remote_ctrl_error_timeout">S\'ha arribat al temps d\'espera durant la connexió a l\'ordinador</string>
+    <string name="connect_plan_you_have_already_requested_connection_via_this_address">Ja heu sol·licitat connexió a través d\'aquesta adreça!</string>
+    <string name="connect_plan_repeat_join_request">Repetir la sol·licitud d\'unió?</string>
+    <string name="connect_plan_open_group">Grup obert</string>
+    <string name="connect_plan_you_are_already_joining_the_group_via_this_link">Ja t\'estàs unint al grup mitjançant aquest enllaç.</string>
+    <string name="agent_critical_error_desc">Informeu-ho als desenvolupadors:\n%s\n\nEs recomana reiniciar l\'aplicació.</string>
+    <string name="chat_archive">O importar un fitxer d\'arxiu</string>
+    <string name="paste_archive_link">Enganxa l\'enllaç de l\'arxiu</string>
+    <string name="restart_chat_button">Reiniciar xat</string>
+    <string name="migrate_to_device_migrating">Migrant</string>
+    <string name="migrate_to_device_database_init">Preparant descàrrega</string>
+    <string name="migrate_to_device_import_failed">Importació fallida</string>
+    <string name="migrate_to_device_importing_archive">Important arxiu</string>
+    <string name="migrate_from_device_stopping_chat">Aturant el xat</string>
+    <string name="migrate_from_device_title">Migrar dispositiu</string>
+    <string name="migrate_from_device_chat_should_be_stopped">Per continuar, el xat s\'ha d\'aturar.</string>
+    <string name="migrate_from_device_uploading_archive">Carregant l\'arxiu</string>
+    <string name="migrate_from_device_remove_archive_question">Suprimir l\'arxiu?</string>
+    <string name="migrate_from_device_repeat_upload">Repetir la càrrega</string>
+    <string name="migrate_from_device_try_again">Pots intentar-ho un altre cop.</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">L\'arxiu de base de dades carregat s\'eliminarà permanentment dels servidors.</string>
+    <string name="migrate_from_device_migration_complete">Migració completada</string>
+    <string name="migrate_from_device_verify_passphrase">Verificar contrasenya</string>
+    <string name="network_type_other">Altre</string>
+    <string name="servers_info">Info servidors</string>
+    <string name="servers_info_target">Mostrant info per a</string>
+    <string name="servers_info_private_data_disclaimer">Iniciat el %s\nTotes les dades es mantenen privades al vostre dispositiu.</string>
+    <string name="servers_info_subscriptions_total">Total</string>
+    <string name="servers_info_proxied_servers_section_footer">No esteu connectats a aquests servidors. Per enviar missatges s\'usa l\'encaminament privat.</string>
+    <string name="servers_info_reconnect_servers_title">Reconnectar servidors?</string>
+    <string name="servers_info_reset_stats_alert_confirm">Restablir</string>
+    <string name="servers_info_reset_stats">Restablir totes les estadístiques</string>
+    <string name="servers_info_reset_stats_alert_title">Restablir totes les estadístiques?</string>
+    <string name="servers_info_reset_stats_alert_message">Les estadístiques dels servidors es restabliran; això no es pot desfer!</string>
+    <string name="servers_info_uploaded">Carregat</string>
+    <string name="servers_info_detailed_statistics_sent_messages_header">Missatges enviats</string>
+    <string name="servers_info_detailed_statistics_received_messages_header">Missatges rebuts</string>
+    <string name="servers_info_detailed_statistics_received_total">Total rebuts</string>
+    <string name="servers_info_detailed_statistics_sent_messages_total">Total enviats</string>
+    <string name="servers_info_starting_from">Iniciat el %s.</string>
+    <string name="servers_info_detailed_statistics_receive_errors">Errors de recepció</string>
+    <string name="reconnect">Reconnectar</string>
+    <string name="send_errors">Errors d\'enviament</string>
+    <string name="other_label">altres</string>
+    <string name="proxied">Intermediat</string>
+    <string name="sent_directly">Enviat directament</string>
+    <string name="sent_via_proxy">Enviat mitjançant servidor intermediari</string>
+    <string name="subscribed">Subscrit</string>
+    <string name="subscription_errors">Errors de subscripció</string>
+    <string name="subscription_results_ignored">Subscripcions ignorades</string>
+    <string name="uploaded_files">Fitxers carregats</string>
+    <string name="upload_errors">Errors de càrrega</string>
+    <string name="operator_use_operator_toggle_description">Utilitzar servidors</string>
+    <string name="send_receipts_disabled_alert_title">Rebuts desactivats</string>
+    <string name="servers_info_reconnect_servers_message">Reconnectar els servidors per forçar l\'entrega de missatges. Utilitza trànsit addicional.</string>
+    <string name="servers_info_reconnect_server_title">Reconnectar servidor?</string>
+    <string name="servers_info_reconnect_all_servers_button">Reconnectar tots els servidors</string>
+    <string name="remote_ctrl_connection_stopped_desc">Comproveu que el mòbil i l\'ordinador estiguin connectats a la mateixa xarxa local i que el tallafoc d\'escriptori permet la connexió.\nSi us plau, comparteix qualsevol altre problema amb els desenvolupadors.</string>
+    <string name="restore_database_alert_desc">Introduïu la contrasenya anterior després de restaurar la còpia de seguretat de la base de dades. Aquesta acció no es pot desfer.</string>
+    <string name="network_option_ping_interval">Interval PING</string>
+    <string name="agent_internal_error_desc">Informeu-ho als desenvolupadors:\n%s</string>
+    <string name="v5_8_private_routing">Encaminament de missatges privat 🚀</string>
+    <string name="user_hide">Amagar</string>
+    <string name="servers_info_reconnect_server_message">Reconnectar el servidor per forçar l\'entrega de missatges. Utilitza trànsit addicional.</string>
+    <string name="migrate_from_device_verify_database_passphrase">Verificar contrasenya de la base de dades</string>
+    <string name="v6_2_improved_chat_navigation">Navegació millorada al xat</string>
+    <string name="servers_info_subscriptions_section_header">Recepció de missatges</string>
+    <string name="error_parsing_uri_title">Enllaç no vàlid</string>
+    <string name="connect_via_group_link">Unir-te al grup?</string>
+    <string name="marked_deleted_description">marcat eliminat</string>
+    <string name="opening_database">Obrint la base de dades…</string>
+    <string name="error_parsing_uri_desc">Comproveu que l\'enllaç SimpleX sigui correcte.</string>
+    <string name="sending_files_not_yet_supported">l\'enviament de fitxers encara no està suportat</string>
+    <string name="trying_to_connect_to_server_to_receive_messages">Intentant connectar-se al servidor utilitzat per rebre missatges d\'aquest contacte.</string>
+    <string name="trying_to_connect_to_server_to_receive_messages_with_error">S\'està provant de connectar-se al servidor utilitzat per rebre missatges d\'aquest contacte (error: %1$s).</string>
+    <string name="connect_use_current_profile">Usar perfil actual</string>
+    <string name="connect_use_new_incognito_profile">Usar nou perfil incògnit</string>
+    <string name="app_was_crashed">Error aplicació</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">Esteu connectat al servidor utilitzat per rebre missatges d\'aquest contacte.</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">El teu perfil s\'enviarà al contacte del qual has rebut aquest enllaç.</string>
+    <string name="non_content_uri_alert_text">Heu compartit una ruta de fitxer no vàlida. Informeu-ne als desenvolupadors de l\'aplicació.</string>
+    <string name="you_will_join_group">Us connectareu amb tots els membres del grup.</string>
+    <string name="description_via_contact_address_link_incognito">d\'incògnit mitjançant l\'enllaç de l\'adreça de contacte</string>
+    <string name="description_via_group_link_incognito">d\'incògnit mitjançant l\'enllaç del grup</string>
+    <string name="description_via_one_time_link_incognito">d\'incògnit mitjançant un enllaç d\'un sol ús</string>
+    <string name="invalid_chat">xat no vàlid</string>
+    <string name="invalid_message_format">format de missatge no vàlid</string>
+    <string name="display_name_invited_to_connect">convidat a connectar</string>
+    <string name="simplex_link_mode_browser_warning">L\'obertura de l\'enllaç al navegador pot reduir la privadesa i la seguretat de la connexió. Els enllaços SimpleX no fiables seran vermells.</string>
+    <string name="note_folder_local_display_name">Notes privades</string>
+    <string name="receiving_files_not_yet_supported">la recepció de fitxers encara no està suportada</string>
+    <string name="display_name_requested_to_connect">sol·licitada connexió</string>
+    <string name="saved_from_description">desat des de %s</string>
+    <string name="simplex_link_contact">Adreça de contacte SimpleX</string>
+    <string name="simplex_link_group">Enllaç de grup SimpleX</string>
+    <string name="simplex_link_mode">Enllaços SimpleX</string>
+    <string name="e2ee_info_no_pq_short">Aquest xat està protegit per xifratge d\'extrem a extrem.</string>
+    <string name="e2ee_info_pq_short">Aquest xat està protegit per un xifratge d\'extrem a extrem resistent a la quàntica.</string>
+    <string name="unknown_message_format">format de missatge desconegut</string>
+    <string name="simplex_link_connection">mitjançant %1$s</string>
+    <string name="simplex_link_mode_browser">Mitjançant navegador</string>
+    <string name="description_via_contact_address_link">mitjançant enllaç d\'adreça de contacte</string>
+    <string name="description_via_group_link">mitjançant enllaç de grup</string>
+    <string name="description_via_one_time_link">mitjançant enllaç d\'un sol ús</string>
+    <string name="description_you_shared_one_time_link">has compartit un enllaç d\'un sol ús</string>
+    <string name="failed_to_create_user_invalid_title">Nom mostrat no vàlid!</string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">Assegureu-vos que les adreces del servidor SMP estiguin en el format correcte, que estiguin separades per línies i que no estiguin duplicades.</string>
+    <string name="ensure_xftp_server_address_are_correct_format_and_unique">Assegureu-vos que les adreces del servidor XFTP estiguin en el format correcte, que estiguin separades per línies i que no estiguin duplicades.</string>
+    <string name="no_media_servers_configured">No hi ha servidors multimèdia ni de fitxers.</string>
+    <string name="no_message_servers_configured">No hi ha servidors de missatges.</string>
+    <string name="no_message_servers_configured_for_private_routing">No hi ha servidors per a l\'encaminament de missatges privats.</string>
+    <string name="no_media_servers_configured_for_private_routing">No hi ha servidors per rebre fitxers.</string>
+    <string name="no_message_servers_configured_for_receiving">No hi ha servidors per rebre missatges.</string>
+    <string name="no_media_servers_configured_for_sending">No hi ha servidors per enviar fitxers.</string>
+    <string name="network_error_desc">Comproveu la vostra connexió de xarxa amb %1$s i torneu-ho a provar.</string>
+    <string name="please_try_later">Si us plau, prova-ho més tard.</string>
+    <string name="contact_developers">Actualitzeu l\'aplicació i contacteu amb els desenvolupadors.</string>
+    <string name="private_routing_error">Error d\'encaminament privat</string>
+    <string name="network_error_broker_host_desc">L\'adreça del servidor és incompatible amb la configuració de xarxa: %1$s.</string>
+    <string name="network_error_broker_version_desc">La versió del servidor és incompatible amb la vostra aplicació: %1$s.</string>
+    <string name="failed_to_create_user_invalid_desc">Aquest nom mostrat no és vàlid. Si us plau, trieu-ne un altre.</string>
+    <string name="failed_to_create_user_duplicate_desc">Ja teniu un perfil de xat amb el mateix nom mostrat Si us plau, trieu un altre nom.</string>
+    <string name="invalid_connection_link">Enllaç de connexió no vàlid</string>
+    <string name="sender_cancelled_file_transfer">El remitent ha cancel·lat la transferència de fitxers.</string>
+    <string name="file_not_approved_title">Servidors desconeguts!</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Ja esteu connectat a %1$s.</string>
+    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Comproveu que heu utilitzat l\'enllaç correcte o demaneu al vostre contacte que us n\'enviï un altre.</string>
+    <string name="sender_may_have_deleted_the_connection_request">És possible que el remitent hagi suprimit la sol·licitud de connexió.</string>
+    <string name="connection_error_quota_desc">La connexió ha arribat al límit de missatges no lliurats, és possible que el vostre contacte estigui fora de línia.</string>
+    <string name="connection_error_quota">Missatges no lliurats</string>
+    <string name="connection_error_auth_desc">A menys que el vostre contacte hagi suprimit la connexió o aquest enllaç ja s\'ha utilitzat, pot ser que sigui un error; si us plau, informeu-ho.\nPer connectar-vos, demaneu al vostre contacte que creï un altre enllaç de connexió i comproveu que teniu una connexió de xarxa estable.</string>
+    <string name="error_smp_test_certificate">Possiblement, l\'empremta digital del certificat a l\'adreça del servidor és incorrecta</string>
+    <string name="error_smp_test_server_auth">El servidor requereix autorització per crear cues, comproveu la contrasenya</string>
+    <string name="error_xftp_test_server_auth">El servidor requereix autorització per carregar, comproveu la contrasenya</string>
+    <string name="error_smp_test_failed_at_step">La prova ha fallat al pas %s.</string>
+    <string name="smp_server_test_secure_queue">Cua segura</string>
+    <string name="smp_server_test_upload_file">Carrega fitxer</string>
+    <string name="icon_descr_instant_notifications">Notificacions instantànies</string>
+    <string name="service_notifications">Notificacions instantànies!</string>
+    <string name="service_notifications_disabled">Les notificacions instantànies estan desactivades!</string>
+    <string name="periodic_notifications">Notificacions periòdiques</string>
+    <string name="periodic_notifications_disabled">Notificacions periòdiques desactivades</string>
+    <string name="periodic_notifications_desc">L\'aplicació obté missatges nous periòdicament: utilitza un percentatge de la bateria al dia. L\'aplicació no utilitza notificacions push: les dades del vostre dispositiu no s\'envien als servidors.</string>
+    <string name="turn_off_system_restriction_button">Obriu la configuració de l\'aplicació</string>
+    <string name="system_restricted_background_in_call_title">Sense trucades en segon pla</string>
+    <string name="system_restricted_background_in_call_desc">És possible que l\'aplicació es tanqui al cap d\'un minut en segon pla.</string>
+    <string name="enter_passphrase_notification_title">Cal contrasenya</string>
+    <string name="enter_passphrase_notification_desc">Per rebre notificacions introduïu la contrasenya de la base de dades</string>
+    <string name="simplex_service_notification_text">Rebent missatges…</string>
+    <string name="simplex_service_notification_title">Servei de SimpleX Xat</string>
+    <string name="database_initialization_error_desc">La base de dades no funciona correctament. Toca per obtenir més informació</string>
+    <string name="call_service_notification_video_call">Videotrucada</string>
+    <string name="settings_notifications_mode_title">Servei de notificacions</string>
+    <string name="settings_notification_preview_title">Vista prèvia de la notificació</string>
+    <string name="settings_notification_preview_mode_title">Vista prèvia</string>
+    <string name="notifications_mode_periodic">Cíclic</string>
+    <string name="notification_display_mode_hidden_desc">Amaga el contacte i el missatge</string>
+    <string name="notification_preview_mode_message">Text del missatge</string>
+    <string name="notification_new_contact_request">Nova sol·licitud de contacte</string>
+    <string name="notification_preview_new_message">missatge nou</string>
+    <string name="notification_preview_mode_message_desc">Mostrar el contacte i el missatge</string>
+    <string name="notification_preview_mode_contact_desc">Mostrar només el contacte</string>
+    <string name="la_no_app_password">Sense codi d\'accés de l\'aplicació</string>
+    <string name="la_lock_mode_passcode">Camp de codi d\'accés</string>
+    <string name="la_notice_title_simplex_lock">Bloqueig SimpleX</string>
+    <string name="la_lock_mode">Mode de Bloqueig SimpleX</string>
+    <string name="la_lock_mode_system">Autenticació del sistema</string>
+    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Per protegir la vostra informació activeu SimpleX Lock.\nSe us demanarà que completeu l\'autenticació abans que aquesta funció estigui habilitada.</string>
+    <string name="la_notice_turn_on">Activar</string>
+    <string name="la_could_not_be_verified">No has pogut ser verificat; si us plau, torna-ho a provar.</string>
+    <string name="la_please_remember_to_store_password">Recordeu-la o emmagatzemeu-la de manera segura: no hi ha manera de recuperar una contrasenya perduda!</string>
+    <string name="auth_simplex_lock_turned_on">Bloqueig SimpleX habilitat</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Se us demanarà que us autentiqueu quan inicieu o reinicieu l\'aplicació després de 30 segons en segon pla.</string>
+    <string name="auth_log_in_using_credential">Inicieu sessió amb la vostra credencial</string>
+    <string name="message_delivery_warning_title">Avís d\'entrega de missatge</string>
+    <string name="message_delivery_error_desc">El més probable és que aquest contacte hagi suprimit la connexió amb tu.</string>
+    <string name="message_deleted_or_not_received_error_title">Cap missatge</string>
+    <string name="auth_open_chat_console">Obrir consola de xat</string>
+    <string name="auth_open_migration_to_another_device">Obrir pantalla de migració</string>
+    <string name="lock_not_enabled">Bloqueig SimpleX no habilitat!</string>
+    <string name="auth_stop_chat">Aturar SimpleX</string>
+    <string name="you_can_turn_on_lock">Podeu activar el Bloqueig SimpleX mitjançant Configuració.</string>
+    <string name="message_deleted_or_not_received_error_desc">Aquest missatge s\'ha suprimit o encara no s\'ha rebut.</string>
+    <string name="snd_error_expired">Problemes de xarxa: el missatge ha caducat després de molts intents d\'enviar-lo.</string>
+    <string name="snd_error_auth">Clau incorrecta o connexió desconeguda: el més probable és que aquesta connexió s\'hagi suprimit.</string>
+    <string name="srv_error_host">L\'adreça del servidor és incompatible amb la configuració de la xarxa.</string>
+    <string name="srv_error_version">La versió del servidor és incompatible amb la configuració de la xarxa.</string>
+    <string name="file_error_auth">Clau incorrecta o adreça de bloc de fitxer desconeguda: el més probable és que el fitxer s\'hagi suprimit.</string>
+    <string name="received_message">Missatge rebut</string>
+    <string name="sent_message">Missatge enviat</string>
+    <string name="no_history">Sense historial</string>
+    <string name="saved_from_chat_item_info_title">Desat des de</string>
+    <string name="recipients_can_not_see_who_message_from">El(s) destinatari(s) no veu(en) de qui és aquest missatge.</string>
+    <string name="no_info_on_delivery">Sense informació de lliurament</string>
+    <string name="delete_message_cannot_be_undone_warning">El missatge se suprimirà; això no es pot desfer!</string>
+    <string name="delete_messages_mark_deleted_warning">Els missatges es marcaran per eliminar-los. Els destinataris podran revelar aquests missatges.</string>
+    <string name="moderate_messages_will_be_deleted_warning">Els missatges s\'eliminaran per a tots els membres.</string>
+    <string name="moderate_message_will_be_deleted_warning">El missatge s\'eliminarà per a tots els membres.</string>
+    <string name="moderate_message_will_be_marked_warning">El missatge es marcarà com a moderat per a tots els membres.</string>
+    <string name="stop_rcv_file__message">S\'aturarà la recepció del fitxer.</string>
+    <string name="stop_snd_file__message">L\'enviament del fitxer s\'aturarà.</string>
+    <string name="stop_file__action">Aturar fitxer</string>
+    <string name="stop_rcv_file__title">Deixar de rebre fitxer?</string>
+    <string name="stop_snd_file__title">Deixar d\'enviar el fitxer?</string>
+    <string name="message_forwarded_title">Missatge reenviat</string>
+    <string name="message_forwarded_desc">Encara no hi ha connexió directa, el missatge el reenvia l\'administrador.</string>
+    <string name="revoke_file__action">Revocar fitxer</string>
+    <string name="icon_descr_sent_msg_status_unauthorized_send">enviament no autoritzat</string>
+    <string name="this_text_is_available_in_settings">Aquest text està disponible a la configuració</string>
+    <string name="personal_welcome">Benvingut %1$s!</string>
+    <string name="group_preview_join_as">unir-te com a %s</string>
+    <string name="member_contact_send_direct_message">enviar missatge directe</string>
+    <string name="tap_to_start_new_chat">Toca per iniciar un xat nou</string>
+    <string name="loading_chats">Carregant xats…</string>
+    <string name="no_filtered_chats">No hi ha xats filtrats</string>
+    <string name="search_or_paste_simplex_link">Cerqueu o enganxeu l\'enllaç SimpleX</string>
+    <string name="contact_tap_to_connect">Toqueu per connectar</string>
+    <string name="you_have_no_chats">No tens cap xat</string>
+    <string name="no_selected_chat">No hi ha cap xat seleccionat</string>
+    <string name="selected_chat_items_nothing_selected">Res seleccionat</string>
+    <string name="selected_chat_items_selected_n">Seleccionats %d</string>
+    <string name="forward_alert_title_nothing_to_forward">Res a reenviar!</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">Els missatges s\'han suprimit després de seleccionar-los.</string>
+    <string name="share_file">Compartir fitxer…</string>
+    <string name="share_image">Compartir mitjans…</string>
+    <string name="share_message">Compartir missatge…</string>
+    <string name="cannot_share_message_alert_text">Les preferències de xat seleccionades prohibeixen aquest missatge.</string>
+    <string name="images_limit_title">Massa imatges!</string>
+    <string name="videos_limit_title">Massa vídeos!</string>
+    <string name="images_limit_desc">Només es poden enviar 10 imatges al mateix temps</string>
+    <string name="videos_limit_desc">Només es poden enviar 10 vídeos al mateix temps</string>
+    <string name="image_decoding_exception_desc">La imatge no es pot descodificar. Si us plau, proveu amb una imatge diferent o contacteu amb els desenvolupadors.</string>
+    <string name="video_decoding_exception_desc">El vídeo no es pot descodificar. Si us plau, prova amb un vídeo diferent o contacta amb els desenvolupadors.</string>
+    <string name="you_are_observer">ets observador</string>
+    <string name="observer_cant_send_message_title">No pots enviar missatges!</string>
+    <string name="observer_cant_send_message_desc">Poseu-vos en contacte amb l\'administrador del grup.</string>
+    <string name="only_owners_can_enable_files_and_media">Només els propietaris del grup poden activar fitxers i mitjans.</string>
+    <string name="compose_save_messages_n">Desant %1$s missatges</string>
+    <string name="compose_send_direct_message_to_connect">Envia missatge directe per connectar</string>
+    <string name="simplex_links_not_allowed">Enllaços SimpleX no permesos.</string>
+    <string name="maximum_message_size_reached_text">Si us plau, redueix la mida del missatge i torna a enviar-lo.</string>
+    <string name="maximum_message_size_reached_non_text">Si us plau, reduïu la mida del missatge o elimineu mitjans i torneu a enviar-lo.</string>
+    <string name="voice_messages_not_allowed">Missatges de veu no permesos</string>
+    <string name="maximum_message_size_reached_forwarding">Podeu copiar i reduir la mida del missatge per enviar-lo.</string>
+    <string name="image_descr">Imatge</string>
+    <string name="icon_descr_image_snd_complete">Imatge enviada</string>
+    <string name="icon_descr_waiting_for_image">Esperant la imatge</string>
+    <string name="waiting_for_image">Esperant la imatge</string>
+    <string name="image_saved">Imatge desada a la Galeria</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">La imatge es rebrà quan el vostre contacte acabi de carregar-la.</string>
+    <string name="image_will_be_received_when_contact_is_online">La imatge es rebrà quan el vostre contacte estigui en línia, espereu o comproveu més tard!</string>
+    <string name="icon_descr_waiting_for_video">Esperant el vídeo</string>
+    <string name="large_file">Arxiu gran!</string>
+    <string name="icon_descr_video_snd_complete">Vídeo enviat</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">El vídeo es rebrà quan el contacte acabi de pujar-lo.</string>
+    <string name="video_will_be_received_when_contact_is_online">El vídeo es rebrà quan el contacte estigui en línia, espereu o comproveu més tard!</string>
+    <string name="waiting_for_video">Esperant el vídeo</string>
+    <string name="contact_sent_large_file">El vostre contacte ha enviat un fitxer més gran que la mida màxima admesa actualment (%1$s).</string>
+    <string name="loading_remote_file_title">Carregant el fitxer</string>
+    <string name="notifications">Notificacions</string>
+    <string name="info_view_open_button">obrir</string>
+    <string name="loading_remote_file_desc">Si us plau, espereu mentre es carrega el fitxer des del mòbil enllaçat</string>
+    <string name="temporary_file_error">Error de fitxer temporal</string>
+    <string name="voice_message">Missatge de veu</string>
+    <string name="voice_message_send_text">Missatge de veu…</string>
+    <string name="voice_message_with_duration">Missatge de veu (%1$s )</string>
+    <string name="waiting_for_file">Esperant el fitxer</string>
+    <string name="only_delete_conversation">Només suprimeix la conversa</string>
+    <string name="icon_descr_server_status_pending">Pendente</string>
+    <string name="switch_receiving_address_desc">L\'adreça de recepció es canviarà per un servidor diferent. El canvi d\'adreça es completarà quan el remitent estigui en línia.</string>
+    <string name="text_field_set_contact_placeholder">Estableix el nom del contacte…</string>
+    <string name="you_can_still_send_messages_to_contact">Pots enviar missatges a %1$s des dels contactes arxivats.</string>
+    <string name="you_can_still_view_conversation_with_contact">Encara podeu veure la conversa amb %1$s a la llista de xats.</string>
+    <string name="sync_connection_force_desc">El xifratge funciona i el nou acord de xifratge no és necessari. Pot resultar en errors de connexió!</string>
+    <string name="sync_connection_force_confirm">Renegociar</string>
+    <string name="view_security_code">Veure codi de seguretat</string>
+    <string name="verify_security_code">Comprovar codi de seguretat</string>
+    <string name="icon_descr_send_message">Enviar Missatge</string>
+    <string name="icon_descr_record_voice_message">Grava el missatge de veu</string>
+    <string name="you_need_to_allow_to_send_voice">Heu de permetre que el vostre contacte enviï missatges de veu per poder-los enviar.</string>
+    <string name="live_message">Missatge en directe!</string>
+    <string name="no_details">cap detall</string>
+    <string name="ok">OK</string>
+    <string name="add_contact">Enllaç d\'invitació d\'un sol ús</string>
+    <string name="only_group_owners_can_enable_voice">Només els propietaris de grups poden activar els missatges de veu.</string>
+    <string name="only_stored_on_members_devices">(només emmagatzemat pels membres del grup)</string>
+    <string name="toast_permission_denied">Permís denegat!</string>
+    <string name="ask_your_contact_to_enable_voice">Demaneu al vostre contacte que habiliti l\'enviament de missatges de veu.</string>
+    <string name="send_live_message_desc">Envia un missatge en directe: s\'actualitzarà per al(s) destinatari(s) a mesura que l\'escrius</string>
+    <string name="send_disappearing_message">Envia un missatge que desapareix</string>
+    <string name="send_live_message">Envia missatge en directe</string>
+    <string name="tap_to_scan">Toqueu per escanejar</string>
+    <string name="to_share_with_your_contact">(per compartir amb el teu contacte)</string>
+    <string name="voice_messages_prohibited">Missatges de veu prohibits!</string>
+    <string name="thank_you_for_installing_simplex">Gràcies per instal·lar SimpleX Xat!</string>
+    <string name="to_start_a_new_chat_help_header">Per iniciar un xat nou</string>
+    <string name="chat_help_tap_button">Toqueu el botó</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Si decideixes rebutjar, el remitent NO rebrà notificació.</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Si heu rebut l\'enllaç d\'invitació de SimpleX Chat, podeu obrir-lo al vostre navegador:</string>
+    <string name="reject_contact_button">Rebutjar</string>
+    <string name="to_connect_via_link_title">Per connectar-se mitjançant enllaç</string>
+    <string name="image_descr_link_preview">vista prèvia de l\'enllaç</string>
+    <string name="mark_read">Marcar com a llegit</string>
+    <string name="image_descr_profile_image">imatge de perfil</string>
+    <string name="icon_descr_profile_image_placeholder">espai per a la imatge de perfil</string>
+    <string name="image_descr_qr_code">Codi QR</string>
+    <string name="set_contact_name">Estableix el nom del contacte</string>
+    <string name="connection_you_accepted_will_be_cancelled">La connexió que heu acceptat es cancel·larà!</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">El contacte amb qui has compartit aquest enllaç NO es podrà connectar!</string>
+    <string name="unfavorite_chat">Desfavorit</string>
+    <string name="contact_wants_to_connect_with_you">vol contactar amb tu!</string>
+    <string name="you_invited_a_contact">Has convidat un contacte</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">El vostre contacte ha d\'estar en línia perquè la connexió es completi.\nPots cancel·lar aquesta connexió i eliminar el contacte (i provar-ho més tard amb un enllaç nou).</string>
+    <string name="show_QR_code">Mostrar codi QR</string>
+    <string name="this_link_is_not_a_valid_connection_link">Aquest no és un enllaç de connexió vàlid!</string>
+    <string name="this_QR_code_is_not_a_link">Aquest codi QR no és un enllaç!</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">Et connectaràs al grup quan el dispositiu de l\'amfitrió estigui en línia. Espereu o comproveu més tard!</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Et connectaràs quan s\'accepti la teva sol·licitud de connexió, si us plau, espera o consulta més tard!</string>
+    <string name="if_you_cant_meet_in_person">Si no pots trobar-te en persona, mostra el codi QR en una videotrucada o comparteix l\'enllaç.</string>
+    <string name="paste_the_link_you_received_to_connect_with_your_contact">Enganxeu l\'enllaç que heu rebut per connectar amb el vostre contacte…</string>
+    <string name="share_invitation_link">Compartir enllaç d\'un sol ús</string>
+    <string name="share_1_time_link_with_a_friend">Compartir enllaç d\'un sol ús amb un amic</string>
+    <string name="share_address_publicly">Compartir adreça públicament</string>
+    <string name="share_simplex_address_on_social_media">Comparteix l\'adreça SimpleX a les xarxes socials.</string>
+    <string name="scan_qr_to_connect_to_contact">Per connectar-se, el vostre contacte pot escanejar el codi QR o utilitzar l\'enllaç de l\'aplicació.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Per protegir-vos de la substitució del vostre enllaç, podeu comparar els codis de seguretat de contacte.</string>
+    <string name="you_can_accept_or_reject_connection">Quan algú sol·liciti la connexió, pots acceptar-la o rebutjar-la.</string>
+    <string name="you_can_set_connection_name_to_remember">Podeu definir el nom de la connexió per recordar amb qui s\'ha compartit l\'enllaç.</string>
+    <string name="you_can_share_your_address">Pots compartir la teva adreça com a enllaç o codi QR; qualsevol es pot connectar amb tu.</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">S\'enviarà el teu perfil de xat\nal teu contacte</string>
+    <string name="connect__your_profile_will_be_shared">El teu perfil %1$s es compartirà.</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Et connectaràs quan el dispositiu del teu contacte estigui en línia, si us plau, espera o consulta més tard!</string>
+    <string name="you_wont_lose_your_contacts_if_delete_address">Si més tard decideixes eliminar la teva adreça els contactes no es perdran.</string>
+    <string name="keep_unused_invitation_question">Mantenir la invitació no utilitzada?</string>
+    <string name="new_chat">Nou xat</string>
+    <string name="new_message">Missatge nou</string>
+    <string name="no_filtered_contacts">No hi ha contactes filtrats</string>
+    <string name="one_time_link">Enllaç d\'invitació d\'un sol ús</string>
+    <string name="or_scan_qr_code">O escaneja el codi QR</string>
+    <string name="or_show_this_qr_code">O mostra aquest codi</string>
+    <string name="paste_link">Enganxar enllaç</string>
+    <string name="paste_the_link_you_received">Enganxar l\'enllaç rebut</string>
+    <string name="select_chat_profile">Seleccioneu el perfil de xat</string>
+    <string name="new_chat_share_profile">Compartir perfil</string>
+    <string name="share_this_1_time_link">Compartir aquest enllaç d\'un sol ús</string>
+    <string name="tap_to_paste_link">Toca per enganxar l\'enllaç</string>
+    <string name="code_you_scanned_is_not_simplex_link_qr_code">El codi QR que heu escanejat no és un enllaç de SimpleX.</string>
+    <string name="the_text_you_pasted_is_not_a_link">El text enganxat no és un enllaç SimpleX.</string>
+    <string name="this_string_is_not_a_connection_link">Aquesta cadena no és un enllaç de connexió!</string>
+    <string name="you_can_view_invitation_link_again">Podeu tornar a veure l\'enllaç d\'invitació als detalls de connexió.</string>
+    <string name="switching_profile_error_message">La teva connexió s\'ha mogut a %s, però s\'ha produït un error inesperat en redirigir-te al perfil.</string>
+    <string name="mark_code_verified">Marcar com a verificat</string>
+    <string name="scan_code_from_contacts_app">Escaneja el codi de seguretat des de l\'aplicació del teu contacte.</string>
+    <string name="contact_list_header_title">Contactes</string>
+    <string name="how_to_use_simplex_chat">Com utilitzar-lo</string>
+    <string name="media_and_file_servers">Servidors de fitxers i mitjans</string>
+    <string name="message_servers">Servidors de missatges</string>
+    <string name="smp_servers_new_server">Nou servidor</string>
+    <string name="smp_servers_other">Altres servidors SMP</string>
+    <string name="xftp_servers_other">Altres servidors XFTP</string>
+    <string name="smp_servers_preset_server">Servidor preestablert</string>
+    <string name="smp_servers_preset_address">Adreça predeterminada del servidor</string>
+    <string name="chat_with_the_founder">Preguntes i idees</string>
+    <string name="send_us_an_email">Contacta via email</string>
+    <string name="smp_servers_test_failed">La prova del servidor ha fallat!</string>
+    <string name="chat_lock">Bloqueig SimpleX</string>
+    <string name="is_not_verified">%s no està verificat</string>
+    <string name="is_verified">%s està verificat</string>
+    <string name="smp_servers_test_some_failed">Alguns servidors han fallat la prova:</string>
+    <string name="smp_servers_test_server">Provar servidor</string>
+    <string name="smp_servers_test_servers">Provar servidors</string>
+    <string name="smp_servers_per_user">Servidors per a noves connexions del vostre perfil de xat actual</string>
+    <string name="smp_servers_use_server_for_new_conn">Utilitzar per a noves connexions</string>
+    <string name="smp_servers_use_server">Utilitzar servidor</string>
+    <string name="your_chat_profiles">Perfils de xat</string>
+    <string name="smp_servers_your_server">El teu servidor</string>
+    <string name="smp_servers_your_server_address">L\'adreça del teu servidor</string>
+    <string name="your_settings">Configuració</string>
+    <string name="your_simplex_contact_address">La teva adreça SimpleX</string>
+    <string name="how_to">Com</string>
+    <string name="how_to_use_your_servers">Com utilitzar els vostres servidors</string>
+    <string name="enter_one_ICE_server_per_line">Servidors ICE (un per línia)</string>
+    <string name="install_simplex_chat_for_terminal">Instal·lar SimpleX Chat per al terminal</string>
+    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Assegureu-vos que les adreces del servidor WebRTC ICE estiguin en el format correcte, que estiguin separades per línies i que no estiguin duplicades.</string>
+    <string name="rate_the_app">Valoreu l\'aplicació</string>
+    <string name="reset_all_hints">Restablir totes les pistes</string>
+    <string name="saved_ICE_servers_will_be_removed">Els servidors WebRTC ICE desats s\'eliminaran.</string>
+    <string name="subscription_percentage">Mostrar percentatge</string>
+    <string name="star_on_github">Estrela a GitHub</string>
+    <string name="use_simplex_chat_servers__question">Utilitzar servidors SimpleX Xat?</string>
+    <string name="using_simplex_chat_servers">Usant servidors SimpleX Xat.</string>
+    <string name="your_ICE_servers">Servidors ICE</string>
+    <string name="your_SMP_servers">Servidors SMP</string>
+    <string name="your_XFTP_servers">Servidors XFTP</string>
+    <string name="network_and_servers">Xarxa i servidors</string>
+    <string name="network_proxy_auth">Autenticació d\'intermediari</string>
+    <string name="network_socks_proxy">Servidor intermediari SOCKS</string>
+    <string name="network_socks_proxy_settings">Configuració SOCKS</string>
+    <string name="network_proxy_random_credentials">Utilitzar credencials aleatòries</string>
+    <string name="network_socks_toggle_use_socks_proxy">Utilitzar servidor intermediari SOCKS</string>
+    <string name="network_disable_socks_info">Si confirmeu, els servidors de missatgeria podran veure la vostra adreça IP i el vostre proveïdor, a quins servidors us esteu connectant.</string>
+    <string name="network_session_mode_session_description">Les noves credencials de SOCKS s\'utilitzaran cada vegada que inicieu l\'aplicació.</string>
+    <string name="network_session_mode_server_description">S\'utilitzaran noves credencials SOCKS per a cada servidor.</string>
+    <string name="network_use_onion_hosts_required_desc">Es necessitaran hosts .onion per a la connexió.\nTingueu en compte: no us podreu connectar als servidors sense l\'adreça .onion.</string>
+    <string name="network_use_onion_hosts_prefer_desc">S\'utilitzaran amfitrions .onion quan estiguin disponibles.</string>
+    <string name="network_use_onion_hosts_no_desc">No es faran servir hosts .onion</string>
+    <string name="network_proxy_port">port %d</string>
+    <string name="network_smp_proxy_mode_private_routing">Encaminament privat</string>
+    <string name="network_session_mode_server">Servidor</string>
+    <string name="network_session_mode_transport_isolation">Aïllament de transport</string>
+    <string name="update_network_session_mode_question">Actualitzar el mode d\'aïllament de transport?</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_entity">Utilitza credencials de servidors intermediari diferents per a cada connexió.</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_user">Utilitza credencials de servidor intermediari diferents per a cada perfil.</string>
+    <string name="network_disable_socks">Utilitzar connexió a Internet directa?</string>
+    <string name="network_use_onion_hosts">Utilitzar servidors .onion</string>
+    <string name="network_enable_socks">Utilitzar servidor intermediari SOCKS?</string>
+    <string name="network_use_onion_hosts_prefer">Si disponibles</string>
+    <string name="network_proxy_auth_mode_username_password">Les vostres credencials es podrien enviar sense xifrar.</string>
+    <string name="theme_colors_section_title">COLORS DE LA INTERFÍCIE</string>
+    <string name="update_network_smp_proxy_fallback_question">Alternativa d\'encaminament de missatges</string>
+    <string name="update_network_smp_proxy_mode_question">Mode d\'encaminament de missatges</string>
+    <string name="app_check_for_updates_button_open">Obrir ubicació del fitxer</string>
+    <string name="network_smp_proxy_fallback_allow_protected_description">Envieu missatges directament quan l\'adreça IP està protegida i el vostre servidor de destinació no admet l\'encaminament privat.</string>
+    <string name="network_smp_proxy_fallback_allow_description">Enviar missatges directament quan el vostre servidor de destinació no admet l\'encaminament privat.</string>
+    <string name="private_routing_show_message_status">Mostrar l\'estat del missatge</string>
+    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="app_check_for_updates_button_skip">Ometre aquesta versió</string>
+    <string name="private_routing_explanation">Per protegir la vostra adreça IP l\'encaminament privat utilitza els vostres servidors SMP per enviar missatges.</string>
+    <string name="network_smp_proxy_mode_unknown">Servidors desconeguts</string>
+    <string name="app_check_for_updates_update_available">Actualització disponible: %s</string>
+    <string name="network_smp_proxy_mode_unknown_description">Utilitzar l\'encaminament privat amb servidors desconeguts.</string>
+    <string name="network_smp_proxy_mode_unprotected_description">Utilitzeu l\'encaminament privat amb servidors desconeguts quan l\'adreça IP no estigui protegida.</string>
+    <string name="network_smp_proxy_fallback_allow_protected">Amb IP oculta</string>
+    <string name="app_check_for_updates_canceled">Descàrrega d\'actualització cancel·lada</string>
+    <string name="app_check_for_updates_installed_successfully_desc">Si us plau, reinicieu l\'aplicació.</string>
+    <string name="app_check_for_updates_button_remind_later">Recorda més tard</string>
+    <string name="show_developer_options">Mostrar opcions de desenvolupador</string>
+    <string name="show_internal_errors">Mostrar errors interns</string>
+    <string name="show_slow_api_calls">Mostrar trucades lentes d\'API</string>
+    <string name="app_check_for_updates_notice_desc">Per rebre notificacions sobre les noves versions activeu la comprovació periòdica de les versions Estable o Beta.</string>
+    <string name="share_with_contacts">Compartir amb contactes</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">La plataforma de missatgeria i aplicacions que protegeix la vostra privadesa i seguretat.</string>
+    <string name="profile_is_only_shared_with_your_contacts">El perfil només es comparteix amb els teus contactes.</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">No emmagatzemem cap dels vostres contactes o missatges (un cop lliurats) als servidors.</string>
+    <string name="your_profile_is_stored_on_your_device">El vostre perfil, contactes i missatges lliurats s\'emmagatzemen al vostre dispositiu.</string>
+    <string name="permissions_open_settings">Obrir configuració</string>
+    <string name="next_generation_of_private_messaging">El futur de la missatgeria</string>
+    <string name="onboarding_network_operators">Operadors de xarxa</string>
+    <string name="onboarding_notifications_mode_battery">Notificacions i bateria</string>
+    <string name="you_can_change_it_later">La contrasenya aleatòria s\'emmagatzema a la configuració com a text pla.\nPodeu canviar-ho més tard.</string>
+    <string name="onboarding_select_network_operators_to_use">Seleccioneu els operadors de xarxa que voleu utilitzar.</string>
+    <string name="onboarding_choose_server_operators">Operadors de servidor</string>
+    <string name="setup_database_passphrase">Configura la contrasenya de la base de dades</string>
+    <string name="use_random_passphrase">Utilitzar contrasenya aleatòria</string>
+    <string name="open_simplex_chat_to_accept_call">Obrir SimpleX Chat per acceptar la trucada</string>
+    <string name="relay_server_protects_ip">El servidor de retransmissió protegeix la vostra adreça IP, però pot veure la durada de la trucada.</string>
+    <string name="webrtc_ice_servers">Servidors WebRTC ICE</string>
+    <string name="your_ice_servers">Servidors ICE</string>
+    <string name="privacy_and_security">Privacitat i seguretat</string>
+    <string name="protect_app_screen">Protegeix la pantalla de l\'aplicació</string>
+    <string name="protect_ip_address">Protegir l\'adreça IP</string>
+    <string name="your_privacy">Privacitat</string>
+    <string name="if_you_enter_passcode_data_removed">Si introduïu aquesta contrasenya en obrir l\'aplicació, totes les dades de l\'aplicació s\'eliminaran de manera irreversible.</string>
+    <string name="if_you_enter_self_destruct_code">Si introduïu el vostre codi d\'autodestrucció mentre obriu l\'aplicació:</string>
+    <string name="set_passcode">Estableix codi</string>
+    <string name="receipts_section_description">Aquesta configuració és per al vostre perfil actual</string>
+    <string name="receipts_section_description_1">Es pot canviar a la configuració de contacte i grup.</string>
+    <string name="privacy_media_blur_radius_off">No</string>
+    <string name="settings_section_title_settings">CONFIGURACIÓ</string>
+    <string name="privacy_media_blur_radius_soft">Tou</string>
+    <string name="privacy_media_blur_radius_strong">Fort</string>
+    <string name="settings_section_title_support">SUPORT SIMPLEX XAT</string>
+    <string name="settings_section_title_network_connection">Connexió a la xarxa</string>
+    <string name="settings_section_title_private_message_routing">ENCAMINAMENT DE MISSATGES PRIVAT</string>
+    <string name="chat_item_ttl_none">mai</string>
+    <string name="no_received_app_files">No s\'han rebut ni enviats fitxers</string>
+    <string name="restart_the_app_to_create_a_new_chat_profile">Reinicieu l\'aplicació per crear un perfil de xat nou.</string>
+    <string name="delete_files_and_media_desc">Aquesta acció no es pot desfer: se suprimiran tots els fitxers i els mitjans rebuts i enviats. Les imatges de baixa resolució es mantindran.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">Heu d\'utilitzar la versió més recent de la vostra base de dades de xat NOMÉS en un dispositiu, en cas contrari, podeu deixar de rebre els missatges d\'alguns contactes.</string>
+    <string name="messages_section_description">Aquesta configuració s\'aplica als missatges del vostre perfil de xat actual</string>
+    <string name="database_is_not_encrypted">La vostra base de dades de xat no està xifrada; definiu una contrasenya per protegir-la.</string>
+    <string name="passphrase_will_be_saved_in_settings">La frase de contrasenya s\'emmagatzemarà a la configuració com a text pla després de canviar-la o reiniciar l\'aplicació.</string>
+    <string name="wrong_passphrase">Contrasenya de la base de dades incorrecta</string>
+    <string name="you_have_to_enter_passphrase_every_time">Heu d\'introduir la contrasenya cada vegada que s\'inicia l\'aplicació: no s\'emmagatzema al dispositiu.</string>
+    <string name="keychain_error">Error en Keystore</string>
+    <string name="open_chat">Obrir xat</string>
+    <string name="store_passphrase_securely_without_recover">Si us plau, emmagatzemeu la contrasenya de manera segura, NO podreu accedir al xat si la perdeu.</string>
+    <string name="store_passphrase_securely">Si us plau, emmagatzemeu la contrasenya de manera segura, NO la podreu canviar si la perdeu.</string>
+    <string name="invalid_migration_confirmation">Confirmació de migració no vàlida</string>
+    <string name="restore_passphrase_not_found_desc">No s\'ha trobat la contrasenya a Keystore, introduïu-la manualment. Això pot haver passat si vau restaurar les dades de l\'aplicació mitjançant una eina de còpia de seguretat. Si no és el cas, poseu-vos en contacte amb els desenvolupadors.</string>
+    <string name="one_hand_ui">Barres d\'eines d\'aplicacions accessible</string>
+    <string name="chat_bottom_bar">Barres d\'eines de xat accessible</string>
+    <string name="chat_list_always_visible">Mostra la llista de xat en una finestra nova</string>
+    <string name="one_hand_ui_card_title">Commuta la llista de xat:</string>
+    <string name="terminal_always_visible">Mostrar consola en finestra nova</string>
+    <string name="one_hand_ui_change_instruction">Podeu canviar-la a la configuració de l\'aparença.</string>
+    <string name="upgrade_and_open_chat">Actualitzar i obrir el xat</string>
+    <string name="group_invitation_tap_to_join">Toca per unir-te</string>
+    <string name="group_invitation_tap_to_join_incognito">Toca per unir-te d\'incògnit</string>
+    <string name="you_joined_this_group">T\'has unit a aquest grup</string>
+    <string name="you_rejected_group_invitation">Has rebutjat la invitació del grup</string>
+    <string name="alert_title_cant_invite_contacts_descr">Esteu utilitzant un perfil d\'incògnit en aquest grup; per evitar mostrar el vostre perfil principal no es permet convidar contactes</string>
+    <string name="you_sent_group_invitation">Has enviat la invitació del grup</string>
+    <string name="rcv_group_event_invited_via_your_group_link">convidat mitjançant l\'enllaç del vostre grup</string>
+    <string name="rcv_group_event_updated_group_profile">ha actualitzat el perfil del grup</string>
+    <string name="snd_group_event_changed_member_role">has canviat el rol de %s a %s</string>
+    <string name="snd_group_event_member_blocked">has blocat a %s</string>
+    <string name="snd_group_event_changed_role_for_yourself">has canviat el teu rol a %s</string>
+    <string name="snd_group_event_user_left">has marxat</string>
+    <string name="snd_group_event_member_deleted">has foragitat a %1$s</string>
+    <string name="snd_group_event_member_unblocked">has desblocat a %s</string>
+    <string name="group_member_role_observer">observador</string>
+    <string name="conn_event_enabled_pq">xifratge extrem a extrem resistent quàntic</string>
+    <string name="initial_member_role">Rol inicial</string>
+    <string name="invite_to_chat_button">Convidar a xatejar</string>
+    <string name="new_member_role">Nou rol de membre</string>
+    <string name="no_contacts_to_add">No hi ha contactes per afegir</string>
+    <string name="past_member_vName">Membre anterior %1$s</string>
+    <string name="skip_inviting_button">Ometre convidar membres</string>
+    <string name="group_member_status_unknown_short">desconegut</string>
+    <string name="button_add_members">Convidar membres</string>
+    <string name="no_contacts_selected">Cap contacte seleccionat</string>
+    <string name="invite_prohibited_description">Esteu provant de convidar el contacte amb qui heu compartit un perfil d\'incògnit al grup en què feu servir el vostre perfil principal</string>
+    <string name="button_welcome_message">Missatge de benvinguda</string>
+    <string name="only_chat_owners_can_change_prefs">Només els propietaris del xat poden canviar les preferències.</string>
+    <string name="only_group_owners_can_change_prefs">Només els propietaris del grup poden canviar-ne les preferències.</string>
+    <string name="share_address">Compartir adreça</string>
+    <string name="send_receipts">Enviar rebuts</string>
+    <string name="info_row_sent_at">Enviat</string>
+    <string name="info_row_updated_at">Registre actualitzat</string>
+    <string name="info_row_moderated_at">Moderat el</string>
+    <string name="share_text_updated_at">Registre actualitzat: %s</string>
+    <string name="share_text_sent_at">Enviat: %s</string>
+    <string name="item_info_no_text">sense text</string>
+    <string name="button_remove_member_question">Eliminar membre?</string>
+    <string name="recipient_colon_delivery_status">%s: %s</string>
+    <string name="remove_member_button">Eliminar membre</string>
+    <string name="unblock_member_desc">Els missatges de %s es mostraran!</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Demaneu al vostre contacte que habiliti les trucades.</string>
+    <string name="cant_call_member_send_message_alert_text">Enviar un missatge per activar trucades.</string>
+    <string name="you_need_to_allow_calls">Heu de permetre que el vostre contacte truqui per poder trucar-los.</string>
+    <string name="group_welcome_preview">Vista prèvia</string>
+    <string name="receiving_via">Rebent via</string>
+    <string name="save_and_update_group_profile">Desa i actualitza el perfil del grup</string>
+    <string name="conn_stats_section_title_servers">SERVIDORS</string>
+    <string name="group_welcome_title">Missatge de benvinguda</string>
+    <string name="welcome_message_is_too_long">El missatge de benvinguda és massa llarg</string>
+    <string name="your_servers">Els teus servidors</string>
+    <string name="network_preset_servers_title">Servidors preestablerts</string>
+    <string name="operator_review_conditions">Revisar condicions</string>
+    <string name="operator_use_for_messages_receiving">Per a rebre</string>
+    <string name="operator_use_for_files">Utilitzar per a fitxers</string>
+    <string name="operator_use_for_messages">Utilitzar per a missatges</string>
+    <string name="make_profile_private">Fes el perfil privat!</string>
+    <string name="incognito_info_allows">Permet tenir moltes connexions anònimes sense cap dada compartida entre elles en un únic perfil de xat.</string>
+    <string name="incognito_random_profile">El teu perfil aleatori</string>
+    <string name="unhide_chat_profile">Mostrar perfil ocult</string>
+    <string name="incognito_info_share">Quan comparteixes un perfil d\'incògnit amb algú, aquest perfil s\'utilitzarà per als grups als quals et conviden.</string>
+    <string name="theme">Tema</string>
+    <string name="import_theme">Importar tema</string>
+    <string name="import_theme_error">Error en importar tema</string>
+    <string name="import_theme_error_desc">Assegureu-vos que el fitxer tingui la sintaxi YAML correcta. Exporta el tema per tenir un exemple de l\'estructura del fitxer del tema.</string>
+    <string name="color_sent_message">Missatge enviat</string>
+    <string name="color_sent_quote">Resposta enviada</string>
+    <string name="color_title">Títol</string>
+    <string name="color_received_message">Missatge rebut</string>
+    <string name="color_received_quote">Resposta rebuda</string>
+    <string name="color_wallpaper_tint">Color imatge de fons</string>
+    <string name="color_wallpaper_background">Color de fons</string>
+    <string name="appearance_in_app_bars_alpha">Transparència</string>
+    <string name="appearance_zoom">Zoom</string>
+    <string name="simplex_links">Enllaços SimpleX</string>
+    <string name="recent_history">Historial visible</string>
+    <string name="feature_off">desactivat</string>
+    <string name="feature_received_prohibited">recepció no permesa</string>
+    <string name="accept_feature_set_1_day">Establir 1 dia</string>
+    <string name="only_you_can_send_disappearing">Només tu pots enviar missatges que desapareixen.</string>
+    <string name="only_your_contact_can_send_disappearing">Només el vostre contacte pot enviar missatges que desapareixen.</string>
+    <string name="prohibit_sending_voice_messages">Prohibir l\'enviament de missatges de veu.</string>
+    <string name="only_you_can_send_voice">Només tu pots enviar missatges de veu.</string>
+    <string name="only_your_contact_can_send_voice">Només el vostre contacte pot enviar missatges de veu.</string>
+    <string name="voice_prohibited_in_this_chat">Els missatges de veu estan prohibits en aquest xat.</string>
+    <string name="only_you_can_add_message_reactions">Només tu pots afegir reaccions als missatges.</string>
+    <string name="only_your_contact_can_add_message_reactions">Només el vostre contacte pot afegir reaccions als missatges.</string>
+    <string name="message_reactions_prohibited_in_this_chat">Les reaccions als missatges estan prohibides en aquest xat.</string>
+    <string name="only_you_can_make_calls">Només tu pots fer trucades.</string>
+    <string name="only_your_contact_can_make_calls">Només el vostre contacte pot fer trucades.</string>
+    <string name="prohibit_sending_voice">Prohibir l\'enviament de missatges de veu.</string>
+    <string name="prohibit_sending_simplex_links">Prohibir l\'enviament d\'enllaços SimpleX</string>
+    <string name="message_deletion_prohibited_in_chat">Es prohibeix la supressió irreversible de missatges.</string>
+    <string name="group_members_can_add_message_reactions">Els membres poden afegir reaccions als missatges.</string>
+    <string name="group_members_can_delete">Els membres poden suprimir de manera irreversible els missatges enviats. (24 hores)</string>
+    <string name="group_members_can_send_disappearing">Els membres poden enviar missatges que desapareixen.</string>
+    <string name="group_members_can_send_simplex_links">Els membres poden enviar enllaços SimpleX.</string>
+    <string name="message_reactions_are_prohibited">Les reaccions als missatges estan prohibides.</string>
+    <string name="enable_sending_recent_history">Envia fins a 100 darrers missatges als nous membres.</string>
+    <string name="voice_messages_are_prohibited">Els missatges de veu estan prohibits.</string>
+    <string name="feature_roles_owners">propietaris</string>
+    <string name="v4_5_multiple_chat_profiles">Múltiples perfils de xat</string>
+    <string name="v4_4_french_interface_descr">Gràcies als usuaris: contribuïu a través de Weblate!</string>
+    <string name="v4_4_verify_connection_security">Comprovar la seguretat de la connexió</string>
+    <string name="v4_6_group_welcome_message_descr">Estableix el missatge que es mostra als nous membres!</string>
+    <string name="v5_1_japanese_portuguese_interface">Interfície d\'usuari en japonès i portuguès</string>
+    <string name="v5_1_message_reactions">Reaccions a missatges</string>
+    <string name="v4_6_reduced_battery_usage_descr">Aviat hi haurà més millores!</string>
+    <string name="v5_0_polish_interface">Interfície en polonès</string>
+    <string name="v5_1_self_destruct_passcode">Codi d\'autodestrucció</string>
+    <string name="v5_0_app_passcode_descr">Configureu-lo en lloc de l\'autenticació del sistema.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Gràcies als usuaris: contribuïu a través de Weblate!</string>
+    <string name="v5_0_polish_interface_descr">Gràcies als usuaris: contribuïu a través de Weblate!</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">Gràcies als usuaris: contribuïu a través de Weblate!</string>
+    <string name="v5_0_large_files_support">Vídeos i fitxers de fins a 1 GB</string>
+    <string name="v5_1_better_messages_descr">- Missatges de veu fins a 5 minuts.\n- Temps personalitzat per a missatges temporals.\n- Historial d\'edició.</string>
+    <string name="v5_2_more_things_descr">- Lliurament de missatges més estable.\n- Grups millorats.\n- I més!</string>
+    <string name="v5_3_new_desktop_app">Nova aplicació per a ordinador!</string>
+    <string name="v5_2_message_delivery_receipts_descr">La doble comprovació que ens mancava! ✅</string>
+    <string name="v5_2_fix_encryption">Manté les vostres connexions</string>
+    <string name="v5_2_disappear_one_message">Fer desaparèixer un missatge</string>
+    <string name="v5_5_join_group_conversation">Unir-se a converses de grup</string>
+    <string name="v5_5_join_group_conversation_descr">Historial recent i bot de directori millorat.</string>
+    <string name="v6_1_better_calls_descr">Canvia l\'àudio i el vídeo durant la trucada.</string>
+    <string name="v6_1_switch_chat_profile_descr">Canvia el perfil de xat per a invitacions d\'un sol ús.</string>
+    <string name="you_can_enable_delivery_receipts_later">Podeu activar-ho més tard mitjançant Configuració</string>
+    <string name="link_a_mobile">Enllaçar un mòbil</string>
+    <string name="linked_mobiles">Mòbils enllaçats</string>
+    <string name="this_device_name">Nom d\'aquest dispositiu</string>
+    <string name="verify_code_on_mobile">Verificar codi al mòbil</string>
+    <string name="verify_connection">Verificar connexió</string>
+    <string name="this_device_name_shared_with_mobile">El nom del dispositiu es compartirà amb el client mòbil connectat.</string>
+    <string name="this_device">Aquest dispositiu</string>
+    <string name="linked_desktop_options">Opcions ordinador enllaçat</string>
+    <string name="no_connected_mobile">Cap mòbil connectat</string>
+    <string name="not_compatible">No compatible!</string>
+    <string name="open_port_in_firewall_title">Obrir port al tallafoc</string>
+    <string name="paste_desktop_address">Enganxar adreça d\'ordinador</string>
+    <string name="random_port">Aleatori</string>
+    <string name="refresh_qr_code">Recarregar</string>
+    <string name="scan_qr_code_from_desktop">Escaneja el codi QR des de l\'ordinador</string>
+    <string name="open_port_in_firewall_desc">Per permetre que una aplicació mòbil es connecti a l\'ordinador obriu aquest port al vostre tallafoc, si el teniu habilitat</string>
+    <string name="verify_connections">Verificar connexions</string>
+    <string name="in_developing_desc">Aquesta funció encara no està disponible. Prova la propera versió.</string>
+    <string name="connect_plan_this_is_your_own_one_time_link">Aquest és el vostre enllaç d\'un sol ús!</string>
+    <string name="connect_plan_this_is_your_own_simplex_address">Aquesta és la teva pròpia adreça SimpleX!</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Confirmeu que la configuració de xarxa és correcta per a aquest dispositiu.</string>
+    <string name="servers_info_previously_connected_servers_section_header">Servidors connectats prèviament</string>
+    <string name="servers_info_proxied_servers_section_header">Servidors intermediats</string>
+    <string name="how_it_works">Com funciona</string>
+    <string name="v5_5_new_interface_languages">IU en hongarès i turc</string>
+    <string name="passcode_not_changed">Codi d\'accés no canviat!</string>
+    <string name="v5_8_private_routing_descr">Protegiu la vostra adreça IP dels servidors de retransmissió de missatgeria escollits pels vostres contactes.\nActiva a la configuració de *Xarxa i servidors*.</string>
+    <string name="address_creation_instruction">Toqueu Crea adreça SimpleX al menú per crear-la més tard.</string>
+    <string name="v4_5_private_filenames_descr">Per protegir la zona horària els fitxers d\'imatge/veu utilitzen UTC.</string>
+    <string name="unblock_member_confirmation">Desbloca</string>
+    <string name="migrate_from_device_upload_failed">La càrrega ha fallat</string>
+    <string name="to_verify_compare">Per verificar el xifratge d\'extrem a extrem amb el vostre contacte compareu (o escanegeu) el codi dels vostres dispositius.</string>
+    <string name="updating_settings_will_reconnect_client_to_all_servers">L\'actualització de la configuració reconnectarà el client a tots els servidors.</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Atenció: l\'inici del xat a diversos dispositius és incompatible i provocaria errors en el lliurament de missatges.</string>
+    <string name="switch_verb">Canvia</string>
+    <string name="save_settings_question">Voleu desar les preferències?</string>
+    <string name="stop_sharing_address">Voleu deixar de compartir l\'adreça?</string>
+    <string name="secret_text">secret</string>
+    <string name="icon_descr_speaker_off">Altaveu desactivat</string>
+    <string name="icon_descr_speaker_on">Altaveu activat</string>
+    <string name="without_tor_or_vpn_ip_address_will_be_visible_to_file_servers">Sense Tor o una VPN, el servidors de fitxers podran veure la vostra adreça.</string>
+    <string name="la_mode_system">Sistema</string>
+    <string name="self_destruct">Autodestrucció</string>
+    <string name="self_destruct_passcode">Codi d\'autodestrucció</string>
+    <string name="receipts_section_groups">Grups petits (màx. 20)</string>
+    <string name="chat_database_exported_not_all_files">Alguns fitxers no han estat exportats</string>
+    <string name="network_option_seconds_label">s</string>
+    <string name="size">Mida</string>
+    <string name="start_chat_question">Voleu iniciar un xat?</string>
+    <string name="wallpaper_scale">Escala</string>
+    <string name="chat_preferences_yes">sí</string>
+    <string name="custom_time_picker_select">Selecciona</string>
+    <string name="migrate_to_device_bytes_downloaded">%s baixades</string>
+    <string name="network_type_network_wifi">WiFi</string>
+    <string name="network_type_ethernet">Ethernet per cable</string>
+    <string name="servers_info_statistics_section_header">Estadistiques</string>
+    <string name="xftp_server">Servidor XFTP</string>
+    <string name="v4_2_security_assessment">Avaluació de seguretat</string>
+    <string name="smp_server">Servidor SMP</string>
+    <string name="custom_time_unit_seconds">segons</string>
+    <string name="migrate_from_device_start_chat">Inicia un xat</string>
+    <string name="simplex_link_invitation">"Invitació d\'un sol ús per  SimpleX"</string>
+    <string name="file_not_approved_descr">Sense Tor o una VPN, la vostra adreça serà visible per als següents relays XFTP: %1$s.</string>
+    <string name="possible_slow_function_title">Funció lenta</string>
+    <string name="group_preview_you_are_invited">heu estat convidat a un grup</string>
+    <string name="info_view_search_button">cerca</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(escaneja o enganxa del porta-retalls)</string>
+    <string name="scan_QR_code">Escaneja un codi QR</string>
+    <string name="add_contact_or_create_group">Comença una conversa nova</string>
+    <string name="image_descr_simplex_logo">Logo de SimpleX</string>
+    <string name="icon_descr_simplex_team">Equip SimpleX</string>
+    <string name="you_accepted_connection">Heu acceptat la connexió</string>
+    <string name="scan_paste_link">Escaneja / Enganxa un enllaç</string>
+    <string name="scan_code">Escaneja codi</string>
+    <string name="security_code">Codi de seguretat</string>
+    <string name="smp_save_servers_question">Voleu desar els servidors?</string>
+    <string name="smp_servers_scan_qr">Escaneja el codi QR del servidor</string>
+    <string name="smp_servers">Servidors SMP</string>
+    <string name="xftp_servers">Servidors XFTP</string>
+    <string name="audio_device_speaker">Altaveu</string>
+    <string name="settings_section_title_you">VÓS</string>
+    <string name="chat_item_ttl_seconds">%s segon(s)</string>
+    <string name="you_are_invited_to_group">"Heu estat  convidat a un grup"</string>
+    <string name="rcv_group_event_1_member_connected">%s connectat</string>
+    <string name="rcv_conn_event_verification_code_reset">codi de seguretat modificat</string>
+    <string name="conn_event_disabled_pq">encriptació extrem a extrem estàndard</string>
+    <string name="select_contacts">Selecciona contactes</string>
+    <string name="group_info_member_you">vós : %1$s</string>
+    <string name="current_version_timestamp">%s (actual)</string>
+    <string name="save_welcome_message_question">Voleu desar el missatge de benvinguda?</string>
+    <string name="color_mode_system">Sistema</string>
+    <string name="theme_system">Sistema</string>
+    <string name="language_system">Sistema</string>
+    <string name="color_secondary">Secundari</string>
+    <string name="v6_1_better_security_descr">Protocols de SimpleX revisats per Trail of Bits.</string>
+    <string name="scan_from_mobile">Escaneja amb el mòbil</string>
+    <string name="video_descr">Vídeo</string>
+    <string name="info_view_video_button">vídeo</string>
+    <string name="settings_section_title_user_theme">Tema del perfil</string>
+    <string name="profile_password">Contrasenya del perfil</string>
+    <string name="prohibit_calls">No es permeten trucades ni videotrucades.</string>
+    <string name="prohibit_message_reactions">No es permeten reaccions als missatges.</string>
+    <string name="prohibit_sending_disappearing_messages">No es permet l\'enviament de missatges temporals.</string>
+    <string name="prohibit_message_deletion">No es permet l\'eliminació irreversible de missatges.</string>
+    <string name="prohibit_message_reactions_group">No es permeten reaccions als missatges.</string>
+    <string name="prohibit_direct_messages">No es permet l\'enviament de missatges directes als membres.</string>
+    <string name="prohibit_sending_disappearing">No es permet l\'enviament de missatges temporals.</string>
+    <string name="profile_update_will_be_sent_to_contacts">L\'actualització del perfil s\'enviarà als vostres contactes.</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="strikethrough_text">ratllat</string>
+    <string name="delete_messages_after">Suprimeix els missatges després</string>
+    <string name="users_delete_profile_for">Eliminar el perfil de xat per</string>
+    <string name="connection_not_ready">La connexió no està preparada.</string>
+    <string name="error_creating_chat_tags">Error en crear la llista de xat</string>
+    <string name="error_loading_chat_tags">Error en carregar llistes de xat</string>
+    <string name="error_updating_chat_tags">Error en actualitzar les llistes de xat</string>
+    <string name="chat_list_contacts">Contactes</string>
+    <string name="chat_list_favorites">Preferits</string>
+    <string name="no_unread_chats">Cap xat no llegit</string>
+    <string name="chat_list_add_list">Afegir llista</string>
+    <string name="chat_list_all">Tot</string>
+    <string name="chat_list_businesses">Negocis</string>
+    <string name="open_with_app">Obrir amb %s</string>
+    <string name="no_chats">Sense xats</string>
+    <string name="no_chats_found">No s\'han trobat xats</string>
+    <string name="change_list">Canviar llista</string>
+    <string name="delete_chat_list_menu_action">Eliminar</string>
+    <string name="chat_list_groups">Grups</string>
+    <string name="no_chats_in_list">No hi ha cap xat a la llista %s.</string>
+    <string name="list_menu">Llista</string>
+    <string name="duplicated_list_error">El nom de la llista i l\'emoji haurien de ser diferents per a totes les llistes.</string>
+    <string name="chat_list_notes">Notes</string>
+    <string name="add_to_list">Afegir a la llista</string>
+    <string name="create_list">Crear llista</string>
+    <string name="save_list">Desar llista</string>
+    <string name="delete_chat_list_warning">Tots els xats s\'eliminaran de la llista %s i aquesta serà suprimida</string>
+    <string name="change_order_chat_list_menu_action">Canviar ordre</string>
+    <string name="edit_chat_list_menu_action">Editar</string>
+    <string name="delete_chat_list_question">Eliminar llista?</string>
+    <string name="list_name_field_placeholder">Nom de la llista...</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="archive_verb">Arxivar</string>
+    <string name="archive_report">Arxivar informe</string>
+    <string name="report_compose_reason_header_spam">Informar de spam: només ho veurà la moderació del grup.</string>
+    <string name="report_compose_reason_header_profile">Informar del perfil d\'un/a membre: només ho veurà la moderació del grup.</string>
+    <string name="report_compose_reason_header_community">Informar de violació: només ho veurà la moderació del grup.</string>
+    <string name="report_compose_reason_header_illegal">Informar de contingut: només ho veurà la moderació del grup.</string>
+    <string name="report_compose_reason_header_other">Informar d\'altres: només ho veurà la moderació del grup.</string>
+    <string name="report_item_archived_by">informe arxivat per %s</string>
+    <string name="report_reason_other">Un altre motiu</string>
+    <string name="report_reason_community">Violació de les normes de la comunitat</string>
+    <string name="report_reason_illegal">Contingut inadequat</string>
+    <string name="report_reason_profile">Perfil inadequat</string>
+    <string name="delete_report">Suprimeix l\'informe</string>
+    <string name="report_archive_alert_desc">L\'informe s\'arxivarà.</string>
+    <string name="report_verb">Informar</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="blocking_reason_content">El contingut infringeix les condicions d\'ús</string>
+    <string name="connection_error_blocked">Connexió blocada</string>
+    <string name="connection_error_blocked_desc">La connexió està bloquejada per l\'operador del servidor:\n%1$s.</string>
+    <string name="report_archive_alert_title">Arxivar informe?</string>
+    <string name="file_error_blocked">El fitxer està blocat per l\'operador del servidor:\n%1$s.</string>
+    <string name="report_reason_alert_title">Motiu de l\'informe?</string>
+    <string name="group_reports_active_one">1 informe</string>
+    <string name="group_reports_active">%d informes</string>
+    <string name="group_reports_member_reports">Informes de membres</string>
+    <string name="chat_list_group_reports">Informes</string>
+    <string name="prefs_error_saving_settings">Error en desar configuració</string>
+    <string name="privacy_chat_list_open_links_no">No</string>
+    <string name="privacy_chat_list_open_web_link_question">Obrir l\'enllaç web?</string>
+    <string name="privacy_chat_list_open_links_yes">Sí</string>
+    <string name="privacy_chat_list_open_web_link">Obrir enllaç</string>
+    <string name="group_member_role_moderator">moderador</string>
+    <string name="privacy_chat_list_open_links_ask">Preguntar</string>
+    <string name="privacy_chat_list_open_links">Obrir enllaços de la llista de xat</string>
+    <string name="report_item_archived">informes arxivats</string>
+    <string name="report_item_visibility_moderators">Només ho veuen remitents i moderació</string>
+    <string name="report_item_visibility_submitter">Només ho veieu vosaltres i moderació</string>
+    <string name="error_creating_report">Error en crear informe</string>
+    <string name="text_field_set_chat_placeholder">Establir nom del xat…</string>
+    <string name="chat_ttl_options_footer">Suprimiu els missatges de xat del vostre dispositiu.</string>
+    <string name="change_automatic_deletion_question">Voleu canviar la supressió automàtica de missatges?</string>
+    <string name="chat_item_ttl_default">predeterminat (%s)</string>
+    <string name="chat_item_ttl_year">1 any</string>
+    <string name="disable_automatic_deletion">Desactivar la supressió de missatges</string>
+    <string name="disable_automatic_deletion_question">Desactivar la supressió automàtica de missatges?</string>
+    <string name="change_automatic_chat_deletion_message">Aquesta acció no es pot desfer; els missatges enviats i rebuts en aquest xat anteriors al seleccionat se suprimiran.</string>
+    <string name="disable_automatic_deletion_message">Els missatges d\'aquest xat no se suprimiran mai.</string>
+    <string name="network_smp_web_port_section_title">Port TCP per a missatgeria</string>
+    <string name="network_smp_web_port_toggle">Emprar port web</string>
+    <string name="network_smp_web_port_footer">Emprar el port TCP %1$s quan no se n\'especifica cap.</string>
+    <string name="mute_all_chat">Silenciar tot</string>
+    <string name="unread_mentions">Mencions no llegides</string>
+    <string name="max_group_mentions_per_message_reached">Podeu mencionar fins a %1$s membres per missatge!</string>
+    <string name="enable_sending_member_reports">Permetre denunciar missatges a moderació.</string>
+    <string name="disable_sending_member_reports">No permetre denunciar missatges a moderació.</string>
+    <string name="report_archive_alert_title_all">Arxivar totes les denúncies?</string>
+    <string name="report_archive_alert_title_nth">Arxivar %d denúncies?</string>
+    <string name="archive_reports">Arxivar denúncies</string>
+    <string name="report_archive_for_all_moderators">Per a totes les moderadores</string>
+    <string name="report_archive_for_me">Per a mi</string>
+    <string name="notification_group_report">Denúncia: %s</string>
+    <string name="member_reports_are_prohibited">En aquest grup no es permet denunciar missatges.</string>
+    <string name="group_members_can_send_reports">Els/les membres poden denunciar els missatges a moderació.</string>
+    <string name="report_archive_alert_desc_all">Totes les denúncies s\'arxivaran.</string>
+    <string name="v6_3_mentions">Mencionar els membres 👋</string>
+    <string name="v6_3_reports">Enviar denúncies privades</string>
+    <string name="v6_3_better_privacy_and_security">Millor privadesa i seguretat</string>
+    <string name="v6_3_organize_chat_lists_descr">No us perdeu missatges importants.</string>
+    <string name="v6_3_faster_sending_messages">Enviament de missatges més ràpid.</string>
+    <string name="v6_3_organize_chat_lists">Organitzar els xats en llistes</string>
+    <string name="v6_3_private_media_file_names">Noms de fitxers multimèdia privats.</string>
+    <string name="v6_3_set_message_expiration_in_chats">Establir la caducitat del missatge als xats.</string>
+    <string name="v6_3_mentions_descr">Rebeu notificació quan se us menciona.</string>
+    <string name="v6_3_better_groups_performance">Millor rendiment dels grups</string>
+    <string name="v6_3_faster_deletion_of_groups">Supressió més ràpida de grups.</string>
+    <string name="v6_3_reports_descr">Ajudar els administradors a moderar els seus grups.</string>
+    <string name="group_preview_rejected">rebutjat</string>
+    <string name="group_member_status_rejected">rebutjat</string>
+    <string name="group_member_status_pending_approval_short">pendent</string>
+    <string name="group_member_status_pending_approval">pendent d\'aprovació</string>
+    <string name="block_members_desc">Tots els missatges nous d\'aquests/es membres s\'amagaran!</string>
+    <string name="block_members_for_all_question">Blocar membres per a tots/es?</string>
+    <string name="operator_updated_conditions">Condicions actualitzades</string>
+    <string name="error_reading_passphrase">Error en llegir la contrasenya de la base de dades</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Els/les membres s\'eliminaran del xat; això no es pot desfer!</string>
+    <string name="unblock_members_desc">Els missatges d\'aquests/es membres es mostraran!</string>
+    <string name="unblock_members_for_all_question">Desblocar membres per a tots/es?</string>
+    <string name="feature_roles_moderators">moderació</string>
+    <string name="restore_passphrase_can_not_be_read_desc">La frase de contrasenya a Keystore no es pot llegir. Això pot haver passat després que l\'actualització del sistema sigui incompatible amb l\'aplicació. Si no és el cas, poseu-vos en contacte amb els desenvolupadors.</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Els/les membres s\'eliminaran del grup; això no es pot desfer!</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">La frase de contrasenya a Keystore no es pot llegir, introduïu-la manualment. Això pot haver passat després que l\'actualització del sistema sigui incompatible amb l\'aplicació. Si no és el cas, poseu-vos en contacte amb els desenvolupadors.</string>
+    <string name="button_remove_members_question">Expulsar membres?</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Política de privadesa i condicions d\'ús.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Els xats privats, els grups i els vostres contactes no són accessibles per als operadors de servidor.</string>
+    <string name="onboarding_conditions_accept">Acceptar</string>
+    <string name="onboarding_conditions_by_using_you_agree">En utilitzar SimpleX Chat accepteu:\n- enviar només contingut legal en grups públics.\n- Respectar els altres usuaris, sense correu brossa.</string>
+    <string name="onboarding_conditions_configure_server_operators">Configurar els operadors de servidor</string>
+    <string name="simplex_link_channel">Enllaç al canal SimpleX</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Aquest enllaç requereix una versió de l\'aplicació més recent. Actualitzeu l\'aplicació o demaneu al vostre contacte que enviï un enllaç compatible.</string>
+    <string name="unsupported_connection_link">Enllaç de connexió no compatible</string>
+    <string name="privacy_short_links">Emprar enllaços curts (BETA)</string>
+    <string name="full_link_button_text">Enllaç complet</string>
+    <string name="short_link_button_text">Enllaç curt</string>
+    <string name="network_smp_web_port_all">Tots els servidors</string>
+    <string name="network_smp_web_port_off">Apagat</string>
+    <string name="network_smp_web_port_preset_footer">Feu servir el port TCP 443 només per a servidors predefinits.</string>
+    <string name="network_smp_web_port_preset">Servidors predefinits</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
index c80d24f0bd..439b9df18d 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
@@ -72,10 +72,10 @@
     <string name="only_you_can_delete_messages">Nevratně mazat zprávy můžete pouze vy (váš kontakt je může označit ke smazání). (24 hodin)</string>
     <string name="message_deletion_prohibited">Nevratné mazání zpráv je v tomto chatu zakázáno.</string>
     <string name="prohibit_direct_messages">Přímé zprávy členům zakázány.</string>
-    <string name="ttl_sec">%d sec</string>
+    <string name="ttl_sec">%d s</string>
     <string name="ttl_s">%ds</string>
     <string name="ttl_min">%d min</string>
-    <string name="ttl_hour">%d hodinu</string>
+    <string name="ttl_hour">%d hodina</string>
     <string name="feature_offered_item_with_param">nabízeno %s: %2s</string>
     <string name="v4_2_group_links">Odkazy na skupiny</string>
     <string name="v4_3_voice_messages">Hlasové zprávy</string>
@@ -208,7 +208,7 @@
     <string name="connection_request_sent">Požadavek na připojení byl odeslán!</string>
     <string name="one_time_link">Jednorázová pozvánka</string>
     <string name="security_code">Bezpečnostní kód</string>
-    <string name="is_verified">%s je ověřeno</string>
+    <string name="is_verified">%s ověřen</string>
     <string name="chat_console">Chat konzole</string>
     <string name="smp_servers">SMP servery</string>
     <string name="smp_servers_preset_address">Přednastavená adresa serveru</string>
@@ -243,7 +243,7 @@
     <string name="decentralized">Decentralizovaná</string>
     <string name="how_it_works">Jak to funguje</string>
     <string name="how_simplex_works">Jak funguje SimpleX</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy odesílané pomocí <b>2 vrstvého koncového šifrování</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy.</string>
     <string name="onboarding_notifications_mode_title">Soukromé oznámení</string>
     <string name="onboarding_notifications_mode_periodic">Pravidelné</string>
     <string name="ignore">Ignorovat</string>
@@ -320,7 +320,7 @@
     <string name="smp_server_test_secure_queue">Zabezpečit frontu</string>
     <string name="service_notifications">Okamžitá oznámení!</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>V nastavení ji lze vypnout</b> - oznámení se budou zobrazovat pokud aplikace běží.]]></string>
-    <string name="turn_off_battery_optimization"><![CDATA[Pro použití, prosím <b>povolte pro SimpleX běh na pozadí</b> v dalším dialogu. Jinak budou oznámení vypnuta.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Povolte</b> v příštím dotazu okamžité přijímání notifikací.]]></string>
     <string name="periodic_notifications_desc">Aplikace pravidelně načítá nové zprávy - denně spotřebuje několik procent baterie. Aplikace nepoužívá push oznámení - data ze zařízení nejsou odesílána na servery.</string>
     <string name="enter_passphrase_notification_title">Je vyžadována přístupová fráze</string>
     <string name="enter_passphrase_notification_desc">Chcete-li dostávat oznámení, zadejte přístupovou frázi do databáze.</string>
@@ -343,8 +343,8 @@
     <string name="callstatus_calling">volání…</string>
     <string name="callstate_connected">připojen</string>
     <string name="callstate_ended">ukončen</string>
-    <string name="next_generation_of_private_messaging">Příští generace soukromé komunikace</string>
-    <string name="people_can_connect_only_via_links_you_share">Lidé se s vámi mohou spojit pouze prostřednictvím odkazu, který sdílíte.</string>
+    <string name="next_generation_of_private_messaging">Budoucnost soukromé komunikace</string>
+    <string name="people_can_connect_only_via_links_you_share">Rozhodněte, kdo se může připojit.</string>
     <string name="integrity_msg_bad_hash">špatný kontrolní součet zprávy</string>
     <string name="chat_database_imported">Databáze chatu importována</string>
     <string name="new_passphrase">Nová přístupová fráze…</string>
@@ -384,7 +384,7 @@
     <string name="delete_address">Smazat adresu</string>
     <string name="full_name__field">Celé jméno:</string>
     <string name="your_current_profile">Váš současný profil</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Pro zachování vašeho soukromí používá aplikace místo push oznámení <b>SimpleX službu na pozadí</b> - denně využije několik procent baterie.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Pro zvýšení soukromí, <b>SimpleX běží na pozadí</b> místo používání oznámení.]]></string>
     <string name="periodic_notifications">Pravidelná oznámení</string>
     <string name="simplex_service_notification_title">SimpleX Chat služba</string>
     <string name="simplex_service_notification_text">Příjem zpráv…</string>
@@ -446,7 +446,7 @@
     <string name="integrity_msg_bad_id">špatné ID zprávy</string>
     <string name="integrity_msg_duplicate">duplicitní zpráva</string>
     <string name="alert_title_skipped_messages">Přeskočené zprávy</string>
-    <string name="privacy_and_security">Ochrana osobních údajů a zabezpečení</string>
+    <string name="privacy_and_security">Soukromí a zabezpečení</string>
     <string name="your_privacy">Vaše soukromí</string>
     <string name="protect_app_screen">Skrývat aplikaci</string>
     <string name="send_link_previews">Odesílat náhledy odkazů</string>
@@ -468,7 +468,7 @@
     <string name="voice_messages">Hlasové zprávy</string>
     <string name="both_you_and_your_contacts_can_delete">Vy i váš kontakt můžete nevratně mazat odeslané zprávy. (24 hodin)</string>
     <string name="ttl_m">%dm</string>
-    <string name="ttl_mth">%dmth</string>
+    <string name="ttl_mth">%dm</string>
     <string name="ttl_hours">%d hodin</string>
     <string name="ttl_h">%dh</string>
     <string name="ttl_d">%dd</string>
@@ -574,7 +574,7 @@
     <string name="to_connect_via_link_title">Připojení prostřednictvím odkazu</string>
     <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Pokud jste dostali SimpleX Chat pozvánku, můžete ji otevřít v prohlížeči:</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Pokud zvolíte odmítnutí, odesílatel NEBUDE upozorněn.</string>
-    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 telefon: <b>Otevřete v mobilní aplikaci</b>, potom klikněte na <b>Připojit</b>.]]></string>
+    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 telefon: <b>Otevřete v mobilní aplikaci</b>, potom v aplikaci klepněte na <b>Připojit</b>.]]></string>
     <string name="reject_contact_button">Odmítnout</string>
     <string name="clear_chat_button">Smazat chat</string>
     <string name="clear_chat_menu_action">Vyčistit</string>
@@ -604,7 +604,7 @@
     <string name="paste_button">Vložit</string>
     <string name="this_string_is_not_a_connection_link">Tento řetězec není odkazem na připojení!</string>
     <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[Můžete se také připojit kliknutím na odkaz. Pokud se otevře v prohlížeči, klikněte na tlačítko <b>Otevřít v mobilní aplikaci</b>.]]></string>
-    <string name="is_not_verified">%s není ověřeno</string>
+    <string name="is_not_verified">%s neověřen</string>
     <string name="how_to_use_simplex_chat">Návod k použití</string>
     <string name="markdown_help">Nápověda k markdown</string>
     <string name="smp_servers_save">Uložit servery</string>
@@ -664,10 +664,10 @@
     <string name="privacy_redefined">Nové vymezení soukromí</string>
     <string name="first_platform_without_user_ids">Bez uživatelských identifikátorů</string>
     <string name="immune_to_spam_and_abuse">Odolná vůči spamu</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">K ochraně soukromí, místo uživatelských ID užívaných všemi ostatními platformami, SimpleX používá identifikátory pro fronty zpráv, zvlášť pro každý z vašich kontaktů.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">K ochraně soukromí, SimpleX používá ID pro každý z vašich kontaktů.</string>
     <string name="read_more_in_github_with_link"><![CDATA[Další informace najdete v našem <font color="#0088ff">úložišti GitHub</font>.]]></string>
     <string name="use_chat">Použijte chat</string>
-    <string name="onboarding_notifications_mode_subtitle">Lze změnit později v nastavení.</string>
+    <string name="onboarding_notifications_mode_subtitle">Jak ovlivňuje baterii</string>
     <string name="onboarding_notifications_mode_off">Když aplikace běží</string>
     <string name="onboarding_notifications_mode_service">Okamžité</string>
     <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Nejlepší pro baterii</b>. Budete přijímat oznámení pouze když aplikace běží (žádná služba na pozadí).]]></string>
@@ -678,7 +678,7 @@
     <string name="incoming_audio_call">Příchozí zvukový hovor</string>
     <string name="contact_wants_to_connect_via_call">%1$s se s vámi chce spojit prostřednictvím</string>
     <string name="video_call_no_encryption">videohovoru (nešifrovaného e2e).</string>
-    <string name="audio_call_no_encryption">zvukový hovor (nešifrováno e2e)</string>
+    <string name="audio_call_no_encryption">zvukový hovor (nešifrován e2e)</string>
     <string name="reject">Odmítnout</string>
     <string name="your_calls">Vaše hovory</string>
     <string name="always_use_relay">Spojení přes relé</string>
@@ -730,9 +730,9 @@
     <string name="delete_files_and_media_all">Odstranit všechny soubory</string>
     <string name="delete_files_and_media_desc">Tuto akci nelze vrátit zpět - všechny přijaté a odeslané soubory a média budou smazány. Obrázky s nízkým rozlišením zůstanou zachovány.</string>
     <string name="no_received_app_files">Žádné přijaté ani odeslané soubory</string>
-    <string name="total_files_count_and_size">%d soubor(ů) s celkovou velikostí %s</string>
+    <string name="total_files_count_and_size">%d soubor(y) s celkovou velikostí %s</string>
     <string name="chat_item_ttl_none">nikdy</string>
-    <string name="chat_item_ttl_seconds">%s vteřin(y)</string>
+    <string name="chat_item_ttl_seconds">%s sekund(y)</string>
     <string name="messages_section_title">Zprávy</string>
     <string name="messages_section_description">Toto nastavení se vztahuje na zprávy ve vašem aktuálním chat profilu.</string>
     <string name="delete_messages_after">Smazat zprávy po</string>
@@ -766,7 +766,7 @@
     <string name="restore_database_alert_title">Obnovit zálohu databáze\?</string>
     <string name="restore_database_alert_confirm">Obnovit</string>
     <string name="database_restore_error">Chyba při obnovování databáze</string>
-    <string name="restore_passphrase_not_found_desc">Přístupová fráze nebyla v klíčence nalezena, zadejte jej prosím ručně. K této situaci mohlo dojít, pokud jste obnovili data aplikace pomocí zálohovacího nástroje. Pokud tomu tak není, obraťte se na vývojáře.</string>
+    <string name="restore_passphrase_not_found_desc">Přístupová fráze nebyla v klíčence nalezena, zadejte ji prosím ručně. K této situaci mohlo dojít, pokud jste obnovili data aplikace pomocí zálohovacího nástroje. Pokud tomu tak není, kontaktujte prosím vývojáře.</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Chat můžete spustit v Nastavení / Databáze nebo restartováním aplikace.</string>
     <string name="group_invitation_item_description">pozvánka do skupiny %1$s</string>
     <string name="you_are_invited_to_group_join_to_connect_with_group_members">Jste zváni do skupiny. Připojte se k členům skupiny.</string>
@@ -893,22 +893,22 @@
     <string name="prohibit_sending_disappearing">Posílání mizících zpráv zakázáno.</string>
     <string name="prohibit_message_deletion">Nevratné mazání odeslaných zpráv zakázáno.</string>
     <string name="prohibit_sending_voice">Hlasové zprávy zakázány.</string>
-    <string name="group_members_can_send_disappearing">Členové skupiny mohou posílat mizící zprávy.</string>
-    <string name="disappearing_messages_are_prohibited">Mizící zprávy jsou v této skupině zakázány.</string>
-    <string name="group_members_can_send_dms">Členové skupiny mohou posílat přímé zprávy.</string>
+    <string name="group_members_can_send_disappearing">Členové mohou posílat mizící zprávy.</string>
+    <string name="disappearing_messages_are_prohibited">Mizící zprávy jsou zakázány.</string>
+    <string name="group_members_can_send_dms">Členové mohou posílat přímé zprávy.</string>
     <string name="direct_messages_are_prohibited_in_group">Přímé zprávy mezi členy jsou v této skupině zakázány.</string>
-    <string name="group_members_can_delete">Členové skupin mohou nevratně mazat odeslané zprávy. (24 hodin)</string>
-    <string name="message_deletion_prohibited_in_chat">Nevratné mazání zpráv je v této skupině zakázáno.</string>
-    <string name="group_members_can_send_voice">Členové skupiny mohou posílat hlasové zprávy.</string>
-    <string name="voice_messages_are_prohibited">Hlasové zprávy jsou v této skupině zakázány.</string>
+    <string name="group_members_can_delete">Členové mohou nevratně mazat odeslané zprávy. (24 hodin)</string>
+    <string name="message_deletion_prohibited_in_chat">Nevratné mazání zpráv je zakázáno.</string>
+    <string name="group_members_can_send_voice">Členové mohou posílat hlasové zprávy.</string>
+    <string name="voice_messages_are_prohibited">Hlasové zprávy jsou zakázány.</string>
     <string name="delete_after">Smazat za</string>
     <string name="ttl_month">%d měsíc</string>
     <string name="ttl_months">%d měsíců</string>
     <string name="ttl_day">%d den</string>
-    <string name="ttl_days">%d dnů</string>
+    <string name="ttl_days">%d dní</string>
     <string name="ttl_week">%d týden</string>
     <string name="ttl_weeks">%d týdnů</string>
-    <string name="ttl_w">%dw</string>
+    <string name="ttl_w">%dt</string>
     <string name="feature_offered_item">nabízeno %s</string>
     <string name="feature_cancelled_item">zrušeno %s</string>
     <string name="whats_new">Co je nového</string>
@@ -1038,7 +1038,7 @@
     <string name="la_no_app_password">Bez hesla aplikace</string>
     <string name="la_could_not_be_verified">Nemohli jste být ověřeni; Zkuste to prosím znovu.</string>
     <string name="la_minutes">%d minut</string>
-    <string name="la_seconds">%d vteřin</string>
+    <string name="la_seconds">%d sekund</string>
     <string name="la_immediately">Ihned</string>
     <string name="la_please_remember_to_store_password">Zapamatujte si jej nebo bezpečně uložte - neexistuje způsob, jak obnovit ztracené heslo!</string>
     <string name="lock_not_enabled">Zámek SimpleX není povolen!</string>
@@ -1063,7 +1063,7 @@
     <string name="decryption_error">Chyba dešifrování</string>
     <string name="alert_title_msg_bad_hash">Špatný hash zprávy</string>
     <string name="alert_title_msg_bad_id">Špatné ID zprávy</string>
-    <string name="alert_text_msg_bad_hash">Hash předchozí zprávy se liší.</string>
+    <string name="alert_text_msg_bad_hash">Kontrolní součet předchozí zprávy se liší.</string>
     <string name="alert_text_msg_bad_id">ID další zprávy je nesprávné (menší nebo rovno předchozí).
 \nMůže se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitováno.</string>
     <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d zpráv se nepodařilo dešifrovat.</string>
@@ -1114,7 +1114,7 @@
     <string name="error_loading_details">Chyba načítání podrobností</string>
     <string name="info_menu">Info</string>
     <string name="search_verb">Hledat</string>
-    <string name="auth_open_chat_profiles">Otevřít chat profily</string>
+    <string name="auth_open_chat_profiles">Změnit chat profily</string>
     <string name="edit_history">Historie</string>
     <string name="received_message">Přijatá zpráva</string>
     <string name="sent_message">Poslaná zpráva</string>
@@ -1141,7 +1141,7 @@
     <string name="share_text_sent_at">Posláno: %s</string>
     <string name="share_text_disappears_at">Zmizí: %s</string>
     <string name="share_text_moderated_at">Upraveno: %s</string>
-    <string name="current_version_timestamp">%s (aktuální)</string>
+    <string name="current_version_timestamp">%s (aktuálně)</string>
     <string name="dark_theme">Tmavý motiv</string>
     <string name="import_theme">Import motivu</string>
     <string name="theme_simplex">SimpleX</string>
@@ -1154,8 +1154,8 @@
     <string name="message_reactions_prohibited_in_this_chat">Reakce na zprávy jsou v tomto chatu zakázány.</string>
     <string name="prohibit_message_reactions">Zakázat reakce na zprávy.</string>
     <string name="prohibit_message_reactions_group">Zakázat reakce na zprávy.</string>
-    <string name="group_members_can_add_message_reactions">Členové skupin mohou přidávat reakce na zprávy.</string>
-    <string name="message_reactions_are_prohibited">Reakce na zprávy jsou v této skupině zakázány.</string>
+    <string name="group_members_can_add_message_reactions">Členové mohou přidávat reakce na zprávy.</string>
+    <string name="message_reactions_are_prohibited">Reakce na zprávy jsou zakázány.</string>
     <string name="custom_time_unit_months">měsíců</string>
     <string name="learn_more">Zjistit více</string>
     <string name="share_with_contacts">Sdílet s kontakty</string>
@@ -1192,9 +1192,7 @@
     <string name="custom_time_unit_minutes">minut</string>
     <string name="custom_time_unit_seconds">vteřin</string>
     <string name="whats_new_thanks_to_users_contribute_weblate">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
-    <string name="v5_1_better_messages_descr">- 5 minutové hlasové zprávy.
-\n- vlastní čas mizení.
-\n- historie úprav.</string>
+    <string name="v5_1_better_messages_descr">- 5 minutové hlasové zprávy.\n- volitelný čas mizení zpráv.\n- historie úprav.</string>
     <string name="custom_time_unit_days">dní</string>
     <string name="custom_time_unit_hours">hodin</string>
     <string name="custom_time_unit_weeks">týdnů</string>
@@ -1228,7 +1226,7 @@
     <string name="you_wont_lose_your_contacts_if_delete_address">Pokud později adresu odstraníte, o kontakty nepřijdete.</string>
     <string name="app_passcode_replaced_with_self_destruct">Přístupový kód aplikace je nahrazen sebedestrukčním přístupovým heslem.</string>
     <string name="item_info_no_text">žádný text</string>
-    <string name="non_fatal_errors_occured_during_import">Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.</string>
+    <string name="non_fatal_errors_occured_during_import">Během importu došlo k nezávažným chybám:</string>
     <string name="shutdown_alert_question">Vypnout\?</string>
     <string name="shutdown_alert_desc">Oznámení přestanou fungovat až do nového spuštění aplikace</string>
     <string name="settings_shutdown">Vypnout</string>
@@ -1246,9 +1244,7 @@
     <string name="fix_connection_not_supported_by_group_member">Opravit nepodporované členem skupiny</string>
     <string name="fix_connection_not_supported_by_contact">Opravit nepodporované kontaktem</string>
     <string name="v5_2_fix_encryption">Zachovat vaše připojení</string>
-    <string name="v5_2_more_things_descr">- více stabilní doručovaní zpráv.
-\n- o trochu lepší skupiny.
-\n- a více!</string>
+    <string name="v5_2_more_things_descr">- stabilnější doručování zpráv.\n- trochu lepší skupiny.\n- a více!</string>
     <string name="snd_conn_event_ratchet_sync_agreed">šifrování povoleno pro %s</string>
     <string name="snd_conn_event_ratchet_sync_required">vyžadováno opětovné vyjednávání šifrování pro %s</string>
     <string name="receipts_contacts_override_disabled">Odesílání potvrzení o doručení je vypnuto pro %d kontakty.</string>
@@ -1267,9 +1263,9 @@
     <string name="unfavorite_chat">Odoblíbit</string>
     <string name="abort_switch_receiving_address">Přerušit změnu adresy</string>
     <string name="allow_to_send_files">Povolit odesílání souborů a médii.</string>
-    <string name="group_members_can_send_files">Členové skupiny mohou posílat soubory a média.</string>
+    <string name="group_members_can_send_files">Členové mohou posílat soubory a média.</string>
     <string name="only_owners_can_enable_files_and_media">Pouze majitelé skupiny mohou povolit soubory a média.</string>
-    <string name="files_are_prohibited_in_group">Soubory a média jsou zakázány v této skupině.</string>
+    <string name="files_are_prohibited_in_group">Soubory a média jsou zakázány.</string>
     <string name="receipts_contacts_disable_keep_overrides">Vypnout (zachovat přepsání)</string>
     <string name="receipts_contacts_enable_for_all">Povolit pro všechny</string>
     <string name="receipts_contacts_enable_keep_overrides">Povolit (zachovat přepisování)</string>
@@ -1345,7 +1341,7 @@
     <string name="recipient_colon_delivery_status">%s: %s</string>
     <string name="rcv_group_event_2_members_connected">%s a %s připojen</string>
     <string name="rcv_group_event_3_members_connected">%s, %s a %s připojen</string>
-    <string name="rcv_group_event_n_members_connected">%s, %s a %d další členové připojeni</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s a %d jiných členů připojeno</string>
     <string name="privacy_message_draft">Rozepsáno</string>
     <string name="privacy_show_last_messages">Zobrazit poslední zprávy</string>
     <string name="send_receipts_disabled_alert_msg">Tato skupina má více než %1$d členů, doručenky nejsou odeslány.</string>
@@ -1377,9 +1373,7 @@
     <string name="v5_3_simpler_incognito_mode">Zjednodušený režim inkognito</string>
     <string name="v5_3_new_desktop_app_descr">Vytvořit nový profil v desktopové aplikaci. 💻</string>
     <string name="v5_3_simpler_incognito_mode_descr">Změnit inkognito při připojování.</string>
-    <string name="v5_3_discover_join_groups_descr">- připojit k adresáři skupin (BETA)!
-\n- doručenky (až 20 členů).
-\n- rychlejší a stabilnější.</string>
+    <string name="v5_3_discover_join_groups_descr">- připojení k adresáři skupin (BETA)!\n- doručenky (až 20 členů).\n- rychlejší a stabilnější.</string>
     <string name="member_contact_send_direct_message">odeslat přímou zprávu</string>
     <string name="rcv_direct_event_contact_deleted">smazaný kontakt</string>
     <string name="error_alert_title">Chyba</string>
@@ -1390,7 +1384,7 @@
     <string name="desktop_address">Adresa počítače</string>
     <string name="connect_plan_join_your_group">Připojit se do skupiny?</string>
     <string name="connect_plan_group_already_exists">Skupina již existuje!</string>
-    <string name="rcv_group_event_1_member_connected">%s připojený</string>
+    <string name="rcv_group_event_1_member_connected">%s připojen</string>
     <string name="this_device">Toto zařízení</string>
     <string name="desktop_device">Počítač</string>
     <string name="this_device_name">Jméno tohoto zařízení</string>
@@ -1429,8 +1423,8 @@
     <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Již se připojujete ke skupině <b>%1$s</b>.]]></string>
     <string name="v5_4_link_mobile_desktop">Propojit mobilní a stolní aplikace! 🔗</string>
     <string name="connect_plan_this_is_your_own_one_time_link">To je váš vlastní jednorázový odkaz!</string>
-    <string name="marked_deleted_items_description">%d zpráv označeno jako smazaná</string>
-    <string name="v5_4_link_mobile_desktop_descr">Prostřednictvím zabezpečeného kvant rezistentního protokolu.</string>
+    <string name="marked_deleted_items_description">%d zpráv označeno jako smazané</string>
+    <string name="v5_4_link_mobile_desktop_descr">Díky kvantům odolnému protokolu zabezpečení.</string>
     <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Otevřete <i>Použijte z PC</i> v aplikaci telefonu a naskenujte QR kód.]]></string>
     <string name="connect_plan_already_connecting">Již připojuji!</string>
     <string name="v5_4_block_group_members_descr">Skrýt nežádoucí zprávy.</string>
@@ -1472,7 +1466,7 @@
     <string name="connect_with_contact_name_question">Připojit s %1$s?</string>
     <string name="block_member_confirmation">Blokovat</string>
     <string name="unblock_member_question">Odblokovat člena?</string>
-    <string name="blocked_items_description">%d zpráv zablokováno</string>
+    <string name="blocked_items_description">%d zpráv blokováno</string>
     <string name="open_port_in_firewall_desc">Chcete-li povolit telefonu připojení k PC, otevřete tento port ve vašem firewallu, pokud je povolen</string>
     <string name="block_member_button">Blokovat člena</string>
     <string name="settings_section_title_use_from_desktop">Použít z PC</string>
@@ -1489,18 +1483,16 @@
     <string name="verify_code_on_mobile">Ověřit kód v telefonu</string>
     <string name="open_port_in_firewall_title">Otevřít port ve firewallu</string>
     <string name="enter_this_device_name">Zadejte jméno tohoto zařízení…</string>
-    <string name="non_content_uri_alert_text">Sdílíte neplatnou cestu souboru. Nahlaste problém vývojářům aplikace.</string>
+    <string name="non_content_uri_alert_text">Sdíleli jste neplatnou cestu souboru. Nahlaste problém vývojářům aplikace.</string>
     <string name="disconnect_remote_hosts">Odpojit mobilní telefony</string>
     <string name="block_member_question">Blokovat člena?</string>
-    <string name="rcv_group_events_count">%d skupinových událostí</string>
+    <string name="rcv_group_events_count">%d událostí skupiny</string>
     <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[To je váš odkaz pro skupinu <b>%1$s</b>!]]></string>
     <string name="verify_code_with_desktop">Ověřit kód s PC</string>
     <string name="scan_qr_code_from_desktop">Skenovat QR kód z PC</string>
     <string name="unblock_member_confirmation">Odblokovat</string>
     <string name="multicast_discoverable_via_local_network">Objevitelný přes lokální síť</string>
-    <string name="v5_4_more_things_descr">- volitelně oznámení odstraněným kontaktům.
-\n- profilová jména s mezeramy.
-\n- a více!</string>
+    <string name="v5_4_more_things_descr">- volitelné oznámení odstraněným kontaktům.\n- profilová jména s mezeramy.\n- a více!</string>
     <string name="non_content_uri_alert_title">Neplatná cesta souboru</string>
     <string name="connect_plan_you_have_already_requested_connection_via_this_address">Již jste požádali o spojení přes tuto adresu!</string>
     <string name="terminal_always_visible">Zobrazit konzoli v novém okně</string>
@@ -1543,7 +1535,7 @@
     <string name="possible_slow_function_desc">Provedení funkce trvá příliš dlouho: %1$d vteřin: %2$s</string>
     <string name="v5_5_join_group_conversation">Připojit se ke skupině</string>
     <string name="blocked_by_admin_item_description">blokováno adminem</string>
-    <string name="blocked_by_admin_items_description">%d zpráv zablokováno správcem</string>
+    <string name="blocked_by_admin_items_description">%d zpráv blokováno správcem</string>
     <string name="error_creating_message">Chyba vytváření zprávy</string>
     <string name="error_deleting_note_folder">Chyba odstranění soukromých poznámek</string>
     <string name="clear_note_folder_question">Smazat soukromé poznámky?</string>
@@ -1735,7 +1727,7 @@
     <string name="network_option_rcv_concurrency">Souběžné přijímání</string>
     <string name="simplex_links">SimpleX odkazy</string>
     <string name="feature_enabled_for">Povoleno pro</string>
-    <string name="group_members_can_send_simplex_links">Členové skupiny mohou odesílat SimpleX odkazy.</string>
+    <string name="group_members_can_send_simplex_links">Členové mohou odesílat SimpleX odkazy.</string>
     <string name="v5_7_call_sounds">Zvuky v hovoru</string>
     <string name="v5_7_forward_descr">Zdroje zpráv zůstávají důvěrné.</string>
     <string name="v5_7_network">Správa sítě</string>
@@ -1751,7 +1743,7 @@
     <string name="v5_6_quantum_resistant_encryption">Kvantům odolné šifrování</string>
     <string name="permissions_camera">Kamera</string>
     <string name="permissions_camera_and_record_audio">Kamera a mikrofon</string>
-    <string name="simplex_links_are_prohibited_in_group">SimpleX odkazy jsou v této skupině zakázány.</string>
+    <string name="simplex_links_are_prohibited_in_group">SimpleX odkazy jsou zakázány.</string>
     <string name="e2ee_info_no_pq"><![CDATA[Zprávy, soubory a hovory jsou chráněny <b>koncovým</b> šifrováním s dokonalým dopředným utajením, odmítnutím a obnovením po vloupání.]]></string>
     <string name="wallpaper_advanced_settings">Pokročilé nastavení</string>
     <string name="chat_theme_apply_to_all_modes">Všechny barevné režimy</string>
@@ -1860,7 +1852,7 @@
     <string name="smp_servers_configured">Nastavené SMP servery</string>
     <string name="servers_info_subscriptions_connections_pending">Probíhá</string>
     <string name="chunks_uploaded">Části nahrány</string>
-    <string name="n_file_errors">%1$d chuba souboru(ů):\n%2$s</string>
+    <string name="n_file_errors">%1$d chyba souboru:\n%2$s</string>
     <string name="n_other_file_errors">%1$d jiná chyba souboru(ů).</string>
     <string name="error_forwarding_messages">Chyba přeposílaní zpráv</string>
     <string name="srv_error_host">Adresa serveru není kompatibilní s nastavením sítě.</string>
@@ -1940,7 +1932,7 @@
     <string name="network_session_mode_server_description">Nové přihlašovací údaje SOCKS budou použity pro každý server.</string>
     <string name="servers_info_reconnect_servers_message">Znovu připojte všechny připojené servery pro vynucení doručení. Využívá další provoz.</string>
     <string name="reset_all_hints">Resetovat všechny tipy</string>
-    <string name="forward_files_in_progress_desc">%1$d soubor(y) stále stahuji.</string>
+    <string name="forward_files_in_progress_desc">%1$d soubor(y) se stále stahují.</string>
     <string name="v6_1_message_dates_descr">Lepší datování zpráv.</string>
     <string name="v6_1_better_security">Lepší zabezpečení ✅</string>
     <string name="chunks_deleted">Části odstraněny</string>
@@ -2014,7 +2006,7 @@
     <string name="servers_info_detailed_statistics_sent_messages_header">Odeslané zprávy</string>
     <string name="servers_info_detailed_statistics_sent_messages_total">Odeslaných celkem</string>
     <string name="server_address">Adresa serveru</string>
-    <string name="one_hand_ui">Dosažitelný panel nástrojů chatu</string>
+    <string name="one_hand_ui">Dosažitelné panely nástrojů</string>
     <string name="acknowledgement_errors">Chyba potvrzení</string>
     <string name="connections">Připojení</string>
     <string name="created">Vytvořen</string>
@@ -2041,4 +2033,351 @@
     <string name="cant_call_member_send_message_alert_text">Pošlete zprávu pro povolení volání.</string>
     <string name="accept_conditions">Přijmout podmínky</string>
     <string name="operator_conditions_accepted">Přijaté podmínky</string>
-</resources>
\ No newline at end of file
+    <string name="chat_list_add_list">Přidat seznam</string>
+    <string name="report_item_visibility_moderators">Vidí to pouze odesílatelé a moderátoři</string>
+    <string name="report_item_visibility_submitter">Vidite to pouze vy a moderátor</string>
+    <string name="report_item_archived">archivovaná hlášení</string>
+    <string name="errors_in_servers_configuration">Chyba v konfiguraci serverů.</string>
+    <string name="error_accepting_operator_conditions">Chyba při příjímání podmínek</string>
+    <string name="no_media_servers_configured_for_sending">Žádné servery pro odesílání souborů.</string>
+    <string name="onboarding_network_operators_continue">Pokračovat</string>
+    <string name="operator_open_changes">Otevřít změny</string>
+    <string name="no_chats_found">Nenalezen žádný chat</string>
+    <string name="report_item_archived_by">archivovaná hlášení podle %s</string>
+    <string name="display_name_accepted_invitation">přijmuté pozvání</string>
+    <string name="report_reason_community">Porušení pokynů komunity</string>
+    <string name="report_reason_illegal">Nevhodný obsah</string>
+    <string name="report_reason_other">Jiný důvod</string>
+    <string name="failed_to_save_servers">Chyba změny serverů</string>
+    <string name="report_reason_profile">Nevhodný profil</string>
+    <string name="for_chat_profile">Pro profil chatu %s:</string>
+    <string name="no_message_servers_configured">Žádné chatovací servery.</string>
+    <string name="no_message_servers_configured_for_private_routing">Žádné servery pro soukromé směrování chatů.</string>
+    <string name="no_media_servers_configured_for_private_routing">Žádné servery pro příjem souborů.</string>
+    <string name="no_message_servers_configured_for_receiving">Žádné servery pro příjem zpráv.</string>
+    <string name="delete_chat_list_warning">Všechny chaty budou ze seznamu odebrány %s, a seznam bude smazán</string>
+    <string name="for_social_media">Pro sociální sítě</string>
+    <string name="remote_hosts_section">Vzdálené telefony</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Podmínky budou přijaty pro operátora(y): <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Stejné podmínky budou platit pro operátora(y): <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Stejné podmínky budou platit pro operátora <b>%s</b>.]]></string>
+    <string name="operator_use_for_messages_private_routing">Pro soukromé směrování</string>
+    <string name="operator_open_conditions">Otevřít podmínky</string>
+    <string name="chat_archive">Nebo importovat soubor archivu</string>
+    <string name="blocking_reason_content">Obsah porušuje podmínky používání</string>
+    <string name="connection_error_blocked">Spojení blokováno</string>
+    <string name="connection_error_blocked_desc">Připojení je blokováno serverovým operátorem:\n%1$s.</string>
+    <string name="report_archive_alert_title">Archivovat hlášení?</string>
+    <string name="message_deleted_or_not_received_error_title">Žádná zpráva</string>
+    <string name="archive_verb">Archivovat</string>
+    <string name="archive_report">Archivovat hlášení</string>
+    <string name="delete_report">Vymazat hlášení</string>
+    <string name="file_error_blocked">Soubor je blokován operátorem serveru:\n%1$s.</string>
+    <string name="report_verb">Nahlásit</string>
+    <string name="no_unread_chats">Žádné nepřečtené chaty</string>
+    <string name="no_chats">Žádné chaty</string>
+    <string name="no_chats_in_list">Žádné chaty v seznamu %s.</string>
+    <string name="chat_list_contacts">Kontakty</string>
+    <string name="chat_list_favorites">Oblíbené</string>
+    <string name="chat_list_all">Vše</string>
+    <string name="report_compose_reason_header_illegal">Nahlásit obsah: uvidí ho pouze moderátoři skupiny.</string>
+    <string name="open_with_app">Otevřít pomocí %s</string>
+    <string name="create_list">Vytvořit seznam</string>
+    <string name="button_add_friends">Přidat prátele</string>
+    <string name="mute_all_chat">Ztlumit vše</string>
+    <string name="duplicated_list_error">Název seznamu a emoji by mělo být různé pro všechny seznamy.</string>
+    <string name="change_list">Změnit seznam</string>
+    <string name="list_name_field_placeholder">Název seznamu...</string>
+    <string name="debug_logs">Povolit logování</string>
+    <string name="onboarding_network_operators">Síťoví operátoři</string>
+    <string name="privacy_chat_list_open_links">Otevřít odkaz ze seznamu chatu</string>
+    <string name="privacy_chat_list_open_web_link_question">Otevřít webový odkaz?</string>
+    <string name="privacy_chat_list_open_links_ask">Zeptat se</string>
+    <string name="privacy_chat_list_open_links_no">Ne</string>
+    <string name="privacy_chat_list_open_web_link">Otevřít odkaz</string>
+    <string name="error_saving_database">Chyba ukládání databáze</string>
+    <string name="button_add_team_members">Přidat členy týmu</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Chat bude smazán pro všechny členy - tato akce je nevratná!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Chat bude pro vás smazán - tato akce je nevratná!</string>
+    <string name="button_leave_chat">Opustit chat</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Člen bude odstraněn z chatu - tato akce je nevratná!</string>
+    <string name="connection_not_ready">Připojení není připraveno.</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Podmínky budou automaticky přijaty pro povolené operátory dne: %s.</string>
+    <string name="operator_info_title">Síťový operátor</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[Podmínky jsou přijaty pro operátora(y): <b>%s</b>.]]></string>
+    <string name="network_preset_servers_title">Přednastavené servery</string>
+    <string name="operator_conditions_failed_to_load">Text aktuálních podmínek se nepodařilo načíst, podmínky si můžete prohlédnout prostřednictvím tohoto odkazu:</string>
+    <string name="operator_conditions_will_be_accepted_on">Podmínky budou přijaty dne: %s.</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Tyto podmínky budou také platit pro: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Podmínky budou přijaty pro operátor(y): <b>%s</b>.]]></string>
+    <string name="operator_added_xftp_servers">Přidány servery pro média &amp; soubory</string>
+    <string name="v6_2_network_decentralization_enable_flux">Povolte Flux v nastavení sítě a serverů pro lepší ochranu metadat.</string>
+    <string name="servers_info_proxied_servers_section_header">Servery přes proxy</string>
+    <string name="v6_2_business_chats_descr">Soukromí pro vaše zákazníky.</string>
+    <string name="group_member_role_moderator">moderátor</string>
+    <string name="operator_added_message_servers">Přidány chatovací servery</string>
+    <string name="operator">Operátor</string>
+    <string name="disable_automatic_deletion_question">Zakázat automatické mazání zpráv?</string>
+    <string name="chat_ttl_options_footer">Vymazat zprávy chatu z tohoto zařízení.</string>
+    <string name="disable_automatic_deletion">Zakázat mazání zpráv</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Chcete-li používat servery <b>%s</b>, přijměte podmínky používání.]]></string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi zařízení</b>: aby fungovaly notifikace, povolte prosím Autostart v systémovém nastavení.]]></string>
+    <string name="maximum_message_size_title">Zpráva je moc velká!</string>
+    <string name="maximum_message_size_reached_text">Zmenšete prosím velikost zprávy a odešlete ji znovu.</string>
+    <string name="maximum_message_size_reached_non_text">Zmenšete prosím velikost zprávy nebo odeberte média a odešlete ji znovu.</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[jednorázový odkaz může být použit <i>pouze s jedním kontaktem</i> - sdílejte osobně nebo přes jakoukoliv chatovací službu.]]></string>
+    <string name="connection_security">Zabezpečení připojení</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Aplikace vždy poběží na pozadí</string>
+    <string name="onboarding_notifications_mode_battery">Upozornění a baterie</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Například, pokud váš kontakt dostane zprávu pres Chat server SimpleX, vaše aplikace ji doručí pomocí Flux serveru.</string>
+    <string name="error_loading_chat_tags">Chyba načtení seznamů chatu</string>
+    <string name="error_creating_chat_tags">Chyba vytváření seznamu chatu</string>
+    <string name="error_updating_chat_tags">Chyba aktualizace seznamu chatů</string>
+    <string name="chat_list_businesses">Firmy</string>
+    <string name="chat_bottom_bar">Dosažitelný panel nástrojů chatu</string>
+    <string name="invite_to_chat_button">Pozvat do chatu</string>
+    <string name="only_chat_owners_can_change_prefs">Pouze vlastníci chatu mohou upravit předvolby.</string>
+    <string name="info_row_chat">Chat</string>
+    <string name="operator_conditions_of_use">Podmínky použití</string>
+    <string name="error_adding_server">Chyba přidání serveru</string>
+    <string name="appearance_app_toolbars">Panel nástrojů aplikace</string>
+    <string name="appearance_bars_blur_radius">Rozmazání</string>
+    <string name="direct_messages_are_prohibited">Přímé zprávy mezi členy jsou zakázány.</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">pro lepší ochranu metadat.</string>
+    <string name="connect_plan_chat_already_exists">Chat již existuje</string>
+    <string name="proxied">Přes proxy</string>
+    <string name="v6_2_business_chats">Firemní chaty</string>
+    <string name="v6_2_improved_chat_navigation">Vylepšená navigace chatu</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Otevřít chat na první nepřečtené zprávě.\n- Přejít na citované zprávy.</string>
+    <string name="report_archive_alert_title_all">Archivovat všechna hlášení?</string>
+    <string name="report_archive_alert_title_nth">Archivovat %d hlášení?</string>
+    <string name="report_archive_for_all_moderators">Pro všechny moderátory</string>
+    <string name="report_archive_for_me">Pro mě</string>
+    <string name="group_reports_active">%d reportů</string>
+    <string name="chat_list_groups">Skupiny</string>
+    <string name="list_menu">Seznam</string>
+    <string name="group_reports_member_reports">Hlášení členů</string>
+    <string name="chat_list_notes">Poznámky</string>
+    <string name="disable_automatic_deletion_message">Zprávy v tomto chatu nebudou nikdy smazány.</string>
+    <string name="change_order_chat_list_menu_action">Změnit řazení</string>
+    <string name="delete_chat_list_menu_action">Vymazat</string>
+    <string name="delete_chat_list_question">Vymazat seznam?</string>
+    <string name="edit_chat_list_menu_action">Upravit</string>
+    <string name="prefs_error_saving_settings">Chyba ukládání nastavení</string>
+    <string name="or_to_share_privately">Nebo sdílet soukromě</string>
+    <string name="business_address">Firemní adresa</string>
+    <string name="operator_conditions_accepted_on">Podmínky přijaté dne: %s.</string>
+    <string name="direct_messages_are_prohibited_in_chat">Přímé zprávy mezi členy jsou v tomto chatu zakázány.</string>
+    <string name="group_members_can_send_reports">Členové mohou zprávy nahlásit moderátorům.</string>
+    <string name="disable_sending_member_reports">Zakázat nahlašování zpráv moderátorům.</string>
+    <string name="error_updating_server_title">Chyba aktualizace serveru</string>
+    <string name="operator_server_alert_title">Operátor serveru</string>
+    <string name="v6_2_network_decentralization">Decentralizace sítě</string>
+    <string name="archive_reports">Archivovat hlášení</string>
+    <string name="leave_chat_question">Opustit chat?</string>
+    <string name="address_settings">Nastavení adres</string>
+    <string name="address_or_1_time_link">Adresa nebo jednorázový odkaz?</string>
+    <string name="add_to_list">Přidat na seznam</string>
+    <string name="add_your_team_members_to_conversations">Přidat členy týmu ke konverzaci</string>
+    <string name="report_archive_alert_desc_all">Všechna hlášení vám budou archivována</string>
+    <string name="enable_sending_member_reports">Povolit nahlašování zpráv moderátorům</string>
+    <string name="change_automatic_deletion_question">Změnit automatické mazání zpráv?</string>
+    <string name="create_1_time_link">Vytvořit jednorázový odkaz</string>
+    <string name="how_it_helps_privacy">Jak to pomáhá soukromí</string>
+    <string name="button_delete_chat">Vymazat chat</string>
+    <string name="delete_chat_question">Vymazat chat?</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Podmínky jsou již přijaty pro tohoto/tyto operátora(y): <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Tyto podmínky budou také platit pro: <b>%s</b>.]]></string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Již jste spojeni s <b>%1$s</b>.]]></string>
+    <string name="network_session_mode_session">Relace aplikace</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Podmínky budou přijaty pro povolené operátory po 30 dnech.</string>
+    <string name="sync_connection_desc">Připojení vyžaduje opětovné vyjednání šifrování.</string>
+    <string name="encryption_renegotiation_in_progress">Probíhá opětovné vyjednávání o šifrování.</string>
+    <string name="sync_connection_confirm">Opravit</string>
+    <string name="sync_connection_question">Opravit připojení?</string>
+    <string name="smp_servers_new_server">Nový server</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Všechny zprávy a soubory jsou odeslány s <b>koncovým šifrováním</b>, s post-quantovým zabezpečením v přímých zprávách.]]></string>
+    <string name="onboarding_notifications_mode_off_desc_short">Žádné služba na pozadí</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Kontrolovat zprávy každých 10 minut</string>
+    <string name="error_creating_report">Chyba vytváření hlášení</string>
+    <string name="chat_item_ttl_year">1 rok</string>
+    <string name="chat_item_ttl_default">výchozí (%s)</string>
+    <string name="network_proxy_random_credentials">Použijte náhodné přihlašovací údaje</string>
+    <string name="report_compose_reason_header_spam">Nahlásit spam: uvidí pouze skupinový moderátoři.</string>
+    <string name="operator_review_conditions">Přečíst podmínky</string>
+    <string name="operator_website">Webové stránky</string>
+    <string name="subscribed">Odebírán</string>
+    <string name="display_name_requested_to_connect">požádáno o připojení</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="no_media_servers_configured">Žádné mediální a souborové servery.</string>
+    <string name="temporary_file_error">Chyba dočasného souboru</string>
+    <string name="servers_info_transport_sessions_section_header">Přesunout sezení</string>
+    <string name="network_option_tcp_connection">TCP připojení</string>
+    <string name="operator_use_operator_toggle_description">Použité servery</string>
+    <string name="use_servers_of_operator_x">Použit %s</string>
+    <string name="operator_use_for_messages_receiving">Pro příjem</string>
+    <string name="color_mode_system">Systém</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="connection_error_quota">Nedoručené zprávy</string>
+    <string name="message_deleted_or_not_received_error_desc">Tato zpráva byla smazána, nebo dosud nebyla přijata.</string>
+    <string name="report_reason_alert_title">Důvod nahlášení?</string>
+    <string name="report_archive_alert_desc">Report bude archivován.</string>
+    <string name="moderate_messages_will_be_marked_warning">Zprávy budou pro všechny členy označeny jako moderované.</string>
+    <string name="chat_list_group_reports">Reporty</string>
+    <string name="report_compose_reason_header_profile">Nahlašte profil člena: uvidí pouze skupinový moderátoři.</string>
+    <string name="report_compose_reason_header_community">Nahlásit porušení: Uvidí pouze moderátoři skupiny.</string>
+    <string name="private_routing_show_message_status">Zobrazit stav zpráv</string>
+    <string name="app_check_for_updates_button_skip">Přeskočit tuto verzi</string>
+    <string name="chat_list_always_visible">Zobrazit seznam v novém okně</string>
+    <string name="v6_0_upgrade_app">Aktualizovat aplikaci automaticky</string>
+    <string name="chat_database_exported_not_all_files">Některé soubory nebyly exportovány</string>
+    <string name="unread_mentions">Nepřečtené zmínky</string>
+    <string name="share_address_publicly">Sdílet adresu veřejně</string>
+    <string name="share_simplex_address_on_social_media">Sdílent SimpleX adresu na sociálních médiích.</string>
+    <string name="share_1_time_link_with_a_friend">Sdílejte 1 rázový odkaz s přítelem</string>
+    <string name="network_socks_proxy">SOCKS Proxy</string>
+    <string name="app_check_for_updates_update_available">Dostupná aktualizace: %s</string>
+    <string name="app_check_for_updates_stable">Stabilní</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Můžete nastavit operátory v nastavení sítě a serverů.</string>
+    <string name="settings_message_shape_tail">Ocas</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Zastavíte přijímání zpráv z tohoto chatu. Chat historie bude zachována.</string>
+    <string name="xftp_servers_per_user">Servery pro nové soubory vašeho aktuálního chat profilu</string>
+    <string name="error_server_protocol_changed">Protokolu serveru se změnil.</string>
+    <string name="error_server_operator_changed">Operátor serveru se změnil.</string>
+    <string name="appearance_zoom">Zoom</string>
+    <string name="chat_theme_set_default_theme">Nastavit výchozí téma</string>
+    <string name="servers_info_uploaded">Nahráno</string>
+    <string name="privacy_chat_list_open_links_yes">Ano</string>
+    <string name="one_hand_ui_card_title">Přepnout chat seznam:</string>
+    <string name="change_automatic_chat_deletion_message">Tuto akci nelze zrušit - zprávy odeslané a přijaté v tomto chatu dříve než vybraná, budou smazány.</string>
+    <string name="servers_info_reset_stats_alert_message">Statistiky serverů budou obnoveny - nemůže být vráceno!</string>
+    <string name="v6_3_reports">Odešlete soukromý report</string>
+    <string name="v6_3_reports_descr">Pomozte administrátorům moderovat své skupiny.</string>
+    <string name="v6_3_faster_deletion_of_groups">Rychlejší mazání skupin.</string>
+    <string name="servers_info_starting_from">Od %s.</string>
+    <string name="max_group_mentions_per_message_reached">Můžete zmínit až %1$s členů ve zprávě!</string>
+    <string name="maximum_message_size_reached_forwarding">Musíte kopírovat a snížit velikost zprávy, abyste ji poslali.</string>
+    <string name="network_proxy_username">Jméno</string>
+    <string name="simplex_address_or_1_time_link">SimpleX adresa nebo 1 rázový odkaz?</string>
+    <string name="toolbar_settings">Nastavení</string>
+    <string name="save_list">Uložit seznam</string>
+    <string name="app_check_for_updates_canceled">Stažení aktualizace zrušeno</string>
+    <string name="chat_database_exported_save">Můžete uložit exportovaný archiv.</string>
+    <string name="operator_use_for_messages">Použit pro zprávy</string>
+    <string name="server_added_to_operator__name">Server přidán k operátoru %s.</string>
+    <string name="appearance_in_app_bars_alpha">Průhlednost</string>
+    <string name="v6_1_switch_chat_profile_descr">Přepínání chat profilu pro 1-rázové pozvánky.</string>
+    <string name="info_view_video_button">video</string>
+    <string name="new_chat_share_profile">Sdílet profil</string>
+    <string name="member_reports_are_prohibited">Reportování zpráv je zakázáno v této skupině.</string>
+    <string name="xftp_server">XFTP servr</string>
+    <string name="uploaded_files">Nahrané soubory</string>
+    <string name="subscription_results_ignored">Odběr ignorován</string>
+    <string name="srv_error_version">Verze serveru není kompatibilní s nastavením sítě.</string>
+    <string name="address_creation_instruction">Pro pozdější vytvoření adresy, klepněte v menu na Vytvořit SimpleX adresu.</string>
+    <string name="your_servers">Vaše servery</string>
+    <string name="view_updated_conditions">Zobrazit aktualizované podmínky</string>
+    <string name="group_reports_active_one">1 report</string>
+    <string name="group_preview_rejected">zamítnuto</string>
+    <string name="notification_group_report">Report: %s</string>
+    <string name="report_compose_reason_header_other">Nahlásit další: uvidí pouze skupinový moderátoři.</string>
+    <string name="you_can_set_connection_name_to_remember">Můžete nastavit název připojení, pro pamatování, s kým byl odkaz sdílen.</string>
+    <string name="switching_profile_error_message">Vaše připojení bylo přesunuto na %s, ale došlo k neočekávané chybě při přesměrování na profil.</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_user">Pro každý profil použijte různé přihlašovací údaje</string>
+    <string name="network_smp_proxy_mode_unknown">Neznámé servery</string>
+    <string name="private_routing_explanation">Pro ochranu vaší IP adresy, soukromé směrování používá vaše servery SMP k doručování zpráv.</string>
+    <string name="network_smp_web_port_toggle">Použít web portu</string>
+    <string name="network_smp_web_port_section_title">TCP port pro zprávy</string>
+    <string name="chat_main_profile_sent">Váš chat profil bude zaslán členům</string>
+    <string name="system_mode_toast">Režim systému</string>
+    <string name="v6_3_mentions">Zmínky členů 👋</string>
+    <string name="v6_3_organize_chat_lists">Organizujte konverzace do seznamů</string>
+    <string name="v6_3_better_groups_performance">Lepší výkon skupin</string>
+    <string name="v6_3_better_privacy_and_security">Lepší soukromí a bezpečnost</string>
+    <string name="v6_3_organize_chat_lists_descr">Nenechte si ujít důležité zprávy.</string>
+    <string name="v6_3_faster_sending_messages">Rychlejší odesílání zpráv.</string>
+    <string name="v6_3_private_media_file_names">Vlastní názvy souborů médií.</string>
+    <string name="servers_info_target">Zobrazuji informace pro</string>
+    <string name="upload_errors">Chyby nahrávání</string>
+    <string name="servers_info_proxied_servers_section_footer">Soukromé směrování se používá k doručování zpráv těmto serverům, protože k nim nejste připojeni.</string>
+    <string name="size">Velikost</string>
+    <string name="onboarding_network_operators_review_later">Přečíst později</string>
+    <string name="onboarding_network_operators_update">Aktualizovat</string>
+    <string name="operator_servers_title">%s servery</string>
+    <string name="servers_info_subscriptions_total">Celkem</string>
+    <string name="network_error_broker_version_desc">Verze serveru není kompatibilní s vaší aplikací: %1$s.</string>
+    <string name="connection_error_quota_desc">Připojení dosáhlo limitu nedoručených zpráv, váš kontakt je asi offline.</string>
+    <string name="operator_use_for_sending">Pro odeslílání</string>
+    <string name="operator_use_for_files">Použit pro soubory</string>
+    <string name="v6_2_network_decentralization_descr">Druhý přednastavený operátor v aplikaci!</string>
+    <string name="call_desktop_permission_denied_title">Chcete-li volat, povolte použití mikrofonu. Ukončete hovor a zkuste to znovu.</string>
+    <string name="servers_info_statistics_section_header">Statistiky</string>
+    <string name="subscription_errors">Chyby odběru</string>
+    <string name="onboarding_network_about_operators">O operátorech</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat a Flux udělali dohodu, a zahrnuly servery spravované Flux do aplikace.</string>
+    <string name="smp_server">SMP server</string>
+    <string name="contact_list_header_title">Vaše kontakty</string>
+    <string name="servers_info_private_data_disclaimer">Od %s.\nJsou všechna data uchovávána ve vašem zařízení.</string>
+    <string name="onboarding_choose_server_operators">Serverový operátoři</string>
+    <string name="onboarding_select_network_operators_to_use">Vybrat provozovatele sítě pro použití.</string>
+    <string name="onboarding_network_operators_configure_via_settings">Můžete nakonfigurovat servery v nastavení.</string>
+    <string name="icon_descr_sound_muted">Zvuk ztlumen</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Používat aplikaci jednou rukou.</string>
+    <string name="v6_1_better_security_descr">SinpleX protokoly přezkoumány Trail Bits.</string>
+    <string name="v6_1_better_calls_descr">Přepnínání zvuku a videa během hovoru.</string>
+    <string name="network_proxy_auth_mode_username_password">Vaše přihlašovací údaje mohou být zaslány nešifrované.</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Pokud je povolen více než jeden operátor, nikdo z nich nemá metadata, aby poznal, kdo s kým komunikuje.</string>
+    <string name="text_field_set_chat_placeholder">Nastavit název chatu..</string>
+    <string name="network_smp_web_port_footer">Použít TCP port %1$s, když není zadán žádný port.</string>
+    <string name="remote_ctrl_connection_stopped_identity_desc">Tento odkaz byl použit s jiným mobilním zařízením, vytvořte na počítači nový odkaz.</string>
+    <string name="v6_3_mentions_descr">Získejte upozornění, když jste zmíněni.</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">SimpleX adresa a 1 rázové odkazy je bezpečné sdílet přes všechny komunikátory.</string>
+    <string name="moderate_messages_will_be_deleted_warning">Zprávy budou smazány pro všechny členy.</string>
+    <string name="app_will_ask_to_confirm_unknown_file_servers">Aplikace vyžaduje potvrzení stahování z neznámých serverů (s výjimkou .onion nebo při aktivaci SOCKS proxy).</string>
+    <string name="you_need_to_allow_calls">Musíte povolit kontaktům volání, abyste jim mohli zavolat.</string>
+    <string name="v6_3_set_message_expiration_in_chats">Nastavení expirace zpráv.</string>
+    <string name="subscription_percentage">Zobrazit procenta</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">Nahraný archiv databáze bude ze serverů trvale odstraněn.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Pro ochranu před záměnou odkazů, můžete porovnat bezpečnostní kódy.</string>
+    <string name="you_can_still_view_conversation_with_contact">Stále si můžete prohlédnout rozhovor s %1$s v chat seznamu.</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Aplikace chrání vaše soukromí pomocí různých operátorů v každé konverzaci.</string>
+    <string name="one_hand_ui_change_instruction">Můžete jej změnit v nastavení Vzhledu.</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Role se změní na %s. Každý v chatu bude upozorněn.</string>
+    <string name="app_check_for_updates_notice_desc">Chcete-li být informováni o nových verzích, zapněte periodickou kontrolu pro Stabilní nebo Beta verze.</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_entity">Pro každé připojení použijte různé přihlašovací údaje.</string>
+    <string name="privacy_media_blur_radius_strong">Silný</string>
+    <string name="view_conditions">Zobrazit podmínky</string>
+    <string name="you_can_still_send_messages_to_contact">Můžete posílat zprávy %1$s z archivovaných kontaktů.</string>
+    <string name="chat_database_exported_migrate">Můžete přenést exportovanou databázi.</string>
+    <string name="group_member_status_rejected">zamítnuto</string>
+    <string name="privacy_media_blur_radius_soft">Jemný</string>
+    <string name="error_reading_passphrase">Chyba čtení přístupové fráze databáze</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Přístupová fráze v úlozišti klíčů nelze načíst, prosím zadejte ji ručně. To se může stát po aktualizaci systému nekompatibilní s aplikací. Pokud to tak není, kontaktujte prosím vývojáře.</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Přístupovou frázi v ůložišti klíčů nelze načíst. Mohlo se to stát po aktualizaci systému nekompatibilní s aplikací. Pokud to není váš případ, kontaktujte prosím vývojáře.</string>
+    <string name="operator_updated_conditions">Aktualizované podmínky</string>
+    <string name="group_member_status_pending_approval">čekám na schválení</string>
+    <string name="group_member_status_pending_approval_short">čekám</string>
+    <string name="block_members_for_all_question">Blokovat členy všem?</string>
+    <string name="block_members_desc">Všechny nové zprávy od těchto členů budou skryty!</string>
+    <string name="unblock_members_for_all_question">Odblokovat členy všem?</string>
+    <string name="feature_roles_moderators">moderátoři</string>
+    <string name="unblock_members_desc">Zprávy od těchto členů budou zobrazeny!</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Členové budou odstraněny ze skupiny - toto nelze zvrátit!</string>
+    <string name="button_remove_members_question">Odebrat členy?</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Členové budou odstraněny z chatu - toto nelze zvrátit!</string>
+    <string name="onboarding_conditions_by_using_you_agree">Použitím SimpleX chatu souhlasíte že:\n- ve veřejných skupinách budete zasílat pouze legální obsah.\n- budete respektovat ostatní uživatele – žádný spam.</string>
+    <string name="onboarding_conditions_accept">Přijmout</string>
+    <string name="onboarding_conditions_configure_server_operators">Nastavit operátora serveru</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Zásady ochrany soukromí a podmínky používání.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Soukromé konverzace, skupiny a kontakty nejsou přístupné provozovatelům serverů.</string>
+    <string name="unsupported_connection_link">Nepodporovaný odkaz k připojení</string>
+    <string name="privacy_short_links">Používejte krátké odkazy (BETA)</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Tento odkaz vyžaduje novější verzi aplikace. Prosím aktualizujte aplikaci nebo požádejte kontakt o odeslání kompatibilního odkazu.</string>
+    <string name="simplex_link_channel">odkaz SimpleX kanálu</string>
+    <string name="full_link_button_text">Úplný odkaz</string>
+    <string name="short_link_button_text">Krátký odkaz</string>
+    <string name="network_smp_web_port_all">Všechny servery</string>
+    <string name="network_smp_web_port_off">Vypnut</string>
+    <string name="network_smp_web_port_preset">Přednastavené servery</string>
+    <string name="network_smp_web_port_preset_footer">Použít TCP port 443 jen pro přednastavené servery.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
index be6896d932..53f31ecba9 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
@@ -20,7 +20,7 @@
     <string name="deleted_description">Gelöscht</string>
     <string name="marked_deleted_description">als gelöscht markiert</string>
     <string name="sending_files_not_yet_supported">Das Senden von Dateien wird noch nicht unterstützt</string>
-    <string name="receiving_files_not_yet_supported">Der Empfang von Dateien wird noch nicht unterstützt</string>
+    <string name="receiving_files_not_yet_supported">Das Herunterladen von Dateien wird noch nicht unterstützt</string>
     <string name="sender_you_pronoun">Profil</string>
     <string name="unknown_message_format">Unbekanntes Nachrichtenformat</string>
     <string name="invalid_message_format">Ungültiges Nachrichtenformat</string>
@@ -58,9 +58,9 @@
     <string name="error_sending_message">Fehler beim Senden der Nachricht</string>
     <string name="error_adding_members">Fehler beim Hinzufügen von Mitgliedern</string>
     <string name="error_joining_group">Fehler beim Beitritt zur Gruppe</string>
-    <string name="cannot_receive_file">Datei kann nicht empfangen werden</string>
+    <string name="cannot_receive_file">Datei kann nicht heruntergeladen werden</string>
     <string name="sender_cancelled_file_transfer">Der Absender hat die Dateiübertragung abgebrochen.</string>
-    <string name="error_receiving_file">Fehler beim Empfangen der Datei</string>
+    <string name="error_receiving_file">Fehler beim Herunterladen der Datei</string>
     <string name="error_creating_address">Fehler beim Erstellen der Adresse</string>
     <string name="contact_already_exists">Kontakt besteht bereits</string>
     <string name="you_are_already_connected_to_vName_via_this_link">Sie sind bereits mit %1$s verbunden.</string>
@@ -195,10 +195,10 @@
     <!-- Images - chat.simplex.app.views.chat.item.CIImageView.kt -->
     <string name="image_descr">Bild</string>
     <string name="icon_descr_waiting_for_image">Warten auf ein Bild</string>
-    <string name="icon_descr_asked_to_receive">Es wird um den Empfang eines Bildes gebeten</string>
+    <string name="icon_descr_asked_to_receive">Es wird um das Herunterladen eines Bildes gebeten</string>
     <string name="icon_descr_image_snd_complete">Bild gesendet</string>
     <string name="waiting_for_image">Warten auf ein Bild</string>
-    <string name="image_will_be_received_when_contact_is_online">Das Bild wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</string>
+    <string name="image_will_be_received_when_contact_is_online">Das Bild wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später nochmal nach!</string>
     <string name="image_saved">Bild wurde im Fotoalbum gespeichert</string>
     <!-- Files - CIFileView.kt -->
     <string name="icon_descr_file">Datei</string>
@@ -206,7 +206,7 @@
     <string name="contact_sent_large_file">Ihr Kontakt hat eine Datei gesendet, die größer ist als die derzeit unterstützte maximale Größe (%1$s).</string>
     <string name="maximum_supported_file_size">Die derzeit maximal unterstützte Dateigröße beträgt %1$s.</string>
     <string name="waiting_for_file">Warte auf Datei</string>
-    <string name="file_will_be_received_when_contact_is_online">Die Datei wird empfangen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später noch mal nach!</string>
+    <string name="file_will_be_received_when_contact_is_online">Die Datei wird heruntergeladen, sobald Ihr Kontakt online ist. Bitte warten oder schauen Sie später noch mal nach!</string>
     <string name="file_saved">Datei gespeichert</string>
     <string name="file_not_found">Datei nicht gefunden</string>
     <string name="error_saving_file">Fehler beim Speichern der Datei</string>
@@ -355,8 +355,8 @@
     <string name="chat_console">Chat-Konsole</string>
     <string name="smp_servers">SMP-Server</string>
     <string name="smp_servers_preset_address">Voreingestellte Serveradresse</string>
-    <string name="smp_servers_preset_add">Füge voreingestellte Server hinzu</string>
-    <string name="smp_servers_add">Füge Server hinzu</string>
+    <string name="smp_servers_preset_add">Voreingestellte Server hinzufügen</string>
+    <string name="smp_servers_add">Server hinzufügen</string>
     <string name="smp_servers_test_server">Teste Server</string>
     <string name="smp_servers_test_servers">Teste alle Server</string>
     <string name="smp_servers_save">Alle Server speichern</string>
@@ -544,7 +544,7 @@
 \n3. Die Verbindung wurde kompromittiert.</string>
     <!-- Privacy settings -->
     <string name="privacy_and_security">Datenschutz &amp; Sicherheit</string>
-    <string name="your_privacy">Ihre Privatsphäre</string>
+    <string name="your_privacy">Privatsphäre</string>
     <string name="protect_app_screen">App-Bildschirm schützen</string>
     <string name="auto_accept_images">Bilder automatisch akzeptieren</string>
     <string name="send_link_previews">Link-Vorschau senden</string>
@@ -585,30 +585,29 @@
     <string name="error_stopping_chat">Fehler beim Beenden des Chats</string>
     <string name="error_exporting_chat_database">Fehler beim Exportieren der Chat-Datenbank</string>
     <string name="import_database_question">Chat-Datenbank importieren?</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die importierte ERSETZT.
-\nDiese Aktion kann nicht rückgängig gemacht werden! Ihr Profil, Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die importierte ERSETZT.\nIhr Profil, Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren. Diese Aktion kann nicht rückgängig gemacht werden!</string>
     <string name="import_database_confirmation">Importieren</string>
     <string name="error_deleting_database">Fehler beim Löschen der Chat-Datenbank</string>
     <string name="error_importing_database">Fehler beim Importieren der Chat-Datenbank</string>
     <string name="chat_database_imported">Chat-Datenbank importiert</string>
     <string name="restart_the_app_to_use_imported_chat_database">Starten Sie die App neu, um die importierte Chat-Datenbank zu verwenden.</string>
     <string name="delete_chat_profile_question">Chat-Profil löschen?</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Diese Aktion kann nicht rückgängig gemacht werden! Ihr Profil, Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Ihr Profil, Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren. Diese Aktion kann nicht rückgängig gemacht werden!</string>
     <string name="chat_database_deleted">Chat-Datenbank gelöscht</string>
     <string name="restart_the_app_to_create_a_new_chat_profile">Starten Sie die App neu, um ein neues Chat-Profil zu erstellen.</string>
     <string name="you_must_use_the_most_recent_version_of_database">Sie dürfen die neueste Version Ihrer Chat-Datenbank NUR auf einem Gerät verwenden, andernfalls erhalten Sie möglicherweise keine Nachrichten mehr von einigen Ihrer Kontakte.</string>
     <string name="delete_files_and_media_question">Dateien und Medien löschen?</string>
-    <string name="delete_files_and_media_desc">Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten.</string>
-    <string name="no_received_app_files">Keine empfangenen oder gesendeten Dateien</string>
+    <string name="delete_files_and_media_desc">Es werden alle herunter- und hochgeladenen Dateien und Medien gelöscht. Bilder mit niedriger Auflösung bleiben erhalten. Diese Aktion kann nicht rückgängig gemacht werden!</string>
+    <string name="no_received_app_files">Keine herunter- oder hochgeladenen Dateien</string>
     <string name="total_files_count_and_size">%d Datei(en) mit einem Gesamtspeicherverbrauch von %s</string>
     <string name="chat_item_ttl_none">nie</string>
-    <string name="chat_item_ttl_day">täglich</string>
-    <string name="chat_item_ttl_week">wöchentlich</string>
-    <string name="chat_item_ttl_month">monatlich</string>
+    <string name="chat_item_ttl_day">Älter als ein Tag</string>
+    <string name="chat_item_ttl_week">Älter als eine Woche</string>
+    <string name="chat_item_ttl_month">Älter als ein Monat</string>
     <string name="chat_item_ttl_seconds">%s Sekunde(n)</string>
-    <string name="delete_messages_after">Löschen der Nachrichten</string>
+    <string name="delete_messages_after">Nachrichten löschen</string>
     <string name="enable_automatic_deletion_question">Automatisches Löschen von Nachrichten aktivieren?</string>
-    <string name="enable_automatic_deletion_message">Diese Aktion kann nicht rückgängig gemacht werden! Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern.</string>
+    <string name="enable_automatic_deletion_message">Es werden alle empfangenen und gesendeten Nachrichten, die über den ausgewählten Zeitraum hinaus gehen, gelöscht. Dieser Vorgang kann mehrere Minuten dauern. Diese Aktion kann nicht rückgängig gemacht werden!</string>
     <string name="delete_messages">Nachrichten löschen</string>
     <string name="error_changing_message_deletion">Fehler beim Ändern der Einstellung</string>
     <!-- DatabaseEncryptionView.kt -->
@@ -662,7 +661,7 @@
     <string name="restore_database_alert_desc">Bitte geben Sie das vorherige Passwort ein, nachdem Sie die Datenbanksicherung wiederhergestellt haben. Diese Aktion kann nicht rückgängig gemacht werden!</string>
     <string name="restore_database_alert_confirm">Wiederherstellen</string>
     <string name="database_restore_error">Fehler bei der Wiederherstellung der Datenbank</string>
-    <string name="restore_passphrase_not_found_desc">Das Passwort wurde nicht im Schlüsselbund gefunden. Bitte geben Sie es manuell ein. Das kann passieren, wenn Sie die App-Daten mit einem Backup-Programm wieder hergestellt haben. Bitte nehmen Sie Kontakt mit den Entwicklern auf, wenn das nicht der Fall ist.</string>
+    <string name="restore_passphrase_not_found_desc">Das Passwort wurde nicht im Schlüsselbund gefunden. Bitte geben Sie es manuell ein. Dies kann passieren, wenn Sie die App-Daten mit einem Backup-Programm wieder hergestellt haben. Wenden Sie sich bitte an die Entwickler, wenn dies nicht der Fall ist.</string>
     <!-- ChatModel.chatRunning interactions -->
     <string name="chat_is_stopped_indication">Der Chat wurde beendet</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Sie können den Chat über die App-Einstellungen/Datenbank oder durch Neustart der App starten.</string>
@@ -842,7 +841,7 @@
     <string name="chat_preferences">Chat-Präferenzen</string>
     <string name="contact_preferences">Kontakt-Präferenzen</string>
     <string name="group_preferences">Gruppen-Präferenzen</string>
-    <string name="set_group_preferences">Gruppen-Präferenzen einstellen</string>
+    <string name="set_group_preferences">Gruppen-Präferenzen festlegen</string>
     <string name="your_preferences">Ihre Präferenzen</string>
     <string name="direct_messages">Direkte Nachrichten</string>
     <string name="full_deletion">Für jeden löschen</string>
@@ -913,8 +912,8 @@
     <string name="onboarding_notifications_mode_periodic">Periodisch</string>
     <string name="allow_to_send_disappearing">Erlauben Sie das Senden von verschwindenden Nachrichten.</string>
     <string name="disappearing_prohibited_in_this_chat">In diesem Chat sind verschwindende Nachrichten nicht erlaubt.</string>
-    <string name="only_you_can_send_disappearing">Nur Sie können verschwindende Nachrichten senden.</string>
-    <string name="only_your_contact_can_send_disappearing">Nur Ihr Kontakt kann verschwindende Nachrichten senden.</string>
+    <string name="only_you_can_send_disappearing">Nur Sie können verschwindende Nachrichten versenden.</string>
+    <string name="only_your_contact_can_send_disappearing">Nur Ihr Kontakt kann verschwindende Nachrichten versenden.</string>
     <string name="failed_to_parse_chat_title">Fehler beim Laden des Chats</string>
     <string name="failed_to_parse_chats_title">Fehler beim Laden der Chats</string>
     <string name="contact_developers">Bitte aktualisieren Sie die App und nehmen Sie Kontakt mit den Entwicklern auf.</string>
@@ -923,8 +922,8 @@
     <string name="allow_your_contacts_to_send_disappearing_messages">Erlauben Sie Ihren Kontakten das Senden von verschwindenden Nachrichten.</string>
     <string name="prohibit_sending_disappearing_messages">Das Senden von verschwindenden Nachrichten nicht erlauben.</string>
     <string name="disappearing_messages_are_prohibited">Verschwindende Nachrichten sind nicht erlaubt.</string>
-    <string name="group_members_can_send_disappearing">Mitglieder können verschwindende Nachrichten senden.</string>
-    <string name="v4_3_improved_server_configuration_desc">Fügen Sie Server durch Scannen der QR-Codes hinzu.</string>
+    <string name="group_members_can_send_disappearing">Mitglieder können verschwindende Nachrichten versenden.</string>
+    <string name="v4_3_improved_server_configuration_desc">Server durch Scannen von QR-Codes hinzufügen.</string>
     <string name="v4_4_disappearing_messages">Verschwindende Nachrichten</string>
     <string name="accept_feature">Übernehmen</string>
     <string name="accept_feature_set_1_day">Einen Tag festlegen</string>
@@ -937,7 +936,7 @@
     <string name="to_verify_compare">Um die Ende-zu-Ende-Verschlüsselung mit Ihrem Kontakt zu überprüfen, müssen Sie den Sicherheitscode in Ihren Apps vergleichen oder scannen.</string>
     <string name="onboarding_notifications_mode_title">Private Benachrichtigungen</string>
     <string name="use_chat">Chat verwenden</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Ihr Kontakt und Sie können beide verschwindende Nachrichten senden.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Ihr Kontakt und Sie können beide verschwindende Nachrichten versenden.</string>
     <string name="ttl_h">%dh</string>
     <string name="v4_2_group_links">Gruppen-Links</string>
     <string name="new_in_version">Neu in %s</string>
@@ -1015,7 +1014,7 @@
     <string name="moderate_verb">Moderieren</string>
     <string name="moderate_message_will_be_marked_warning">Diese Nachricht wird für alle Mitglieder als moderiert gekennzeichnet.</string>
     <string name="you_are_observer">Sie sind Beobachter</string>
-    <string name="observer_cant_send_message_title">Sie können keine Nachrichten versenden!</string>
+    <string name="observer_cant_send_message_title">Sie sind Beobachter</string>
     <string name="group_member_role_observer">Beobachter</string>
     <string name="initial_member_role">Anfängliche Rolle</string>
     <string name="delete_member_message__question">Nachricht des Mitglieds löschen\?</string>
@@ -1078,22 +1077,22 @@
     <string name="mtr_error_no_down_migration">Die Datenbank-Version ist neuer als die App, keine Abwärts-Migration für: %s</string>
     <string name="hide_dev_options">Verberge:</string>
     <string name="database_migrations">Migrationen: %s</string>
-    <string name="image_will_be_received_when_contact_completes_uploading">Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
-    <string name="file_will_be_received_when_contact_completes_uploading">Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">Das Bild wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Die Datei wird heruntergeladen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
     <string name="delete_chat_profile">Chat-Profil löschen</string>
     <string name="delete_profile">Profil löschen</string>
     <string name="unhide_profile">Verbergen des Profils aufheben</string>
     <string name="profile_password">Passwort für Profil</string>
     <string name="unhide_chat_profile">Verbergen des Chat-Profils aufheben</string>
-    <string name="icon_descr_video_asked_to_receive">Aufforderung zum Empfang des Videos</string>
+    <string name="icon_descr_video_asked_to_receive">Aufforderung zum Herunterladen des Videos</string>
     <string name="videos_limit_desc">Es können nur 10 Videos zur gleichen Zeit versendet werden</string>
     <string name="videos_limit_title">Zu viele Videos auf einmal!</string>
     <string name="video_descr">Video</string>
     <string name="icon_descr_video_snd_complete">Video gesendet</string>
-    <string name="video_will_be_received_when_contact_completes_uploading">Das Video wird empfangen, sobald Ihr Kontakt das Hochladen beendet hat.</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Das Video wird heruntergeladen, sobald Ihr Kontakt das Hochladen beendet hat.</string>
     <string name="icon_descr_waiting_for_video">Auf das Video warten</string>
     <string name="waiting_for_video">Auf das Video warten</string>
-    <string name="video_will_be_received_when_contact_is_online">Das Video wird empfangen, wenn Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!</string>
+    <string name="video_will_be_received_when_contact_is_online">Das Video wird heruntergeladen, wenn Ihr Kontakt online ist. Bitte warten oder überprüfen Sie es später!</string>
     <string name="your_XFTP_servers">Ihre XFTP-Server</string>
     <string name="host_verb">Host</string>
     <string name="error_saving_xftp_servers">Fehler beim Speichern der XFTP-Server</string>
@@ -1160,11 +1159,11 @@
     <string name="both_you_and_your_contact_can_make_calls">Sowohl Sie als auch Ihr Kontakt können Anrufe tätigen.</string>
     <string name="only_you_can_make_calls">Nur Sie können Anrufe tätigen.</string>
     <string name="prohibit_calls">Audio-/Video-Anrufe nicht erlauben.</string>
-    <string name="stop_rcv_file__title">Den Empfang der Datei beenden\?</string>
-    <string name="stop_snd_file__title">Das Senden der Datei beenden\?</string>
-    <string name="stop_rcv_file__message">Der Empfang der Datei wird beendet.</string>
+    <string name="stop_rcv_file__title">Herunterladen der Datei beenden?</string>
+    <string name="stop_snd_file__title">Das Hochladen der Datei beenden?</string>
+    <string name="stop_rcv_file__message">Das Herunterladen der Datei wird beendet.</string>
     <string name="stop_snd_file__message">Das Senden der Datei wird beendet.</string>
-    <string name="stop_file__action">Datei beenden</string>
+    <string name="stop_file__action">Download beenden</string>
     <string name="revoke_file__message">Die Datei wird von den Servern gelöscht.</string>
     <string name="revoke_file__confirm">Widerrufen</string>
     <string name="revoke_file__action">Datei widerrufen</string>
@@ -1247,7 +1246,7 @@
     <string name="enable_self_destruct">Selbstzerstörung aktivieren</string>
     <string name="if_you_enter_passcode_data_removed">Wenn Sie diesen Zugangscode während des Öffnens der App eingeben, werden alle App-Daten unwiederbringlich gelöscht!</string>
     <string name="self_destruct_passcode">Selbstzerstörungs-Zugangscode</string>
-    <string name="set_passcode">Zugangscode einstellen</string>
+    <string name="set_passcode">Zugangscode festlegen</string>
     <string name="message_reactions_are_prohibited">Reaktionen auf Nachrichten sind nicht erlaubt.</string>
     <string name="error_loading_details">Fehler beim Laden von Details</string>
     <string name="received_message">Empfangene Nachricht</string>
@@ -1305,7 +1304,7 @@
     <string name="share_text_deleted_at">Gelöscht um: %s</string>
     <string name="info_row_disappears_at">Verschwindet um</string>
     <string name="share_text_disappears_at">Verschwindet um: %s</string>
-    <string name="edit_history">Nachrichtenverlauf bearbeiten</string>
+    <string name="edit_history">Nachrichtenverlauf</string>
     <string name="message_reactions_prohibited_in_this_chat">In diesem Chat sind Reaktionen auf Nachrichten nicht erlaubt.</string>
     <string name="item_info_no_text">Kein Text</string>
     <string name="non_fatal_errors_occured_during_import">Während des Imports sind nicht schwerwiegende Fehler aufgetreten:</string>
@@ -1323,7 +1322,7 @@
     <string name="abort_switch_receiving_address_question">Wechsel der Empfängeradresse beenden?</string>
     <string name="files_and_media_prohibited">Dateien und Medien sind nicht erlaubt!</string>
     <string name="only_owners_can_enable_files_and_media">Nur Gruppenbesitzer können Dateien und Medien aktivieren.</string>
-    <string name="group_members_can_send_files">Mitglieder können Dateien und Medien senden.</string>
+    <string name="group_members_can_send_files">Mitglieder können Dateien und Medien versenden.</string>
     <string name="abort_switch_receiving_address_desc">Der Wechsel der Empfängeradresse wird beendet. Die bisherige Adresse wird weiter verwendet.</string>
     <string name="files_are_prohibited_in_group">Dateien und Medien sind nicht erlaubt.</string>
     <string name="unfavorite_chat">Favorit entfernen</string>
@@ -1466,7 +1465,7 @@
     <string name="create_another_profile_button">Profil erstellen</string>
     <string name="group_members_2">%s und %s</string>
     <string name="connect_plan_join_your_group">Ihrer Gruppe beitreten?</string>
-    <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Sie sind bereits Mitglied in der Gruppe <b>%1$s</b>.]]></string>
+    <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Sie sind dieser Gruppe bereits beigetreten <b>%1$s</b>.]]></string>
     <string name="connect_plan_this_is_your_own_one_time_link">Das ist Ihr eigener Einmal-Link!</string>
     <string name="marked_deleted_items_description">%d Nachrichten als gelöscht markiert</string>
     <string name="connect_plan_group_already_exists">Gruppe besteht bereits!</string>
@@ -1484,7 +1483,7 @@
     <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[Sie sind bereits Mitglied in der Gruppe <b>%1$s</b>.]]></string>
     <string name="connect_plan_this_is_your_own_simplex_address">Das ist Ihre eigene SimpleX-Adresse!</string>
     <string name="correct_name_to">Richtiger Name für %s?</string>
-    <string name="delete_messages__question">%d Nachrichten löschen?</string>
+    <string name="delete_messages__question">Sollen %d Nachrichten gelöscht werden?</string>
     <string name="connect_with_contact_name_question">Mit %1$s verbinden?</string>
     <string name="remove_member_button">Mitglied entfernen</string>
     <string name="block_member_confirmation">Blockieren</string>
@@ -1653,8 +1652,8 @@
     <string name="v5_5_private_notes">Private Notizen</string>
     <string name="clear_note_folder_warning">Es werden alle Nachrichten gelöscht. Dies kann nicht rückgängig gemacht werden!</string>
     <string name="clear_note_folder_question">Private Notizen entfernen?</string>
-    <string name="rcv_group_event_member_blocked">%s wurde blockiert</string>
-    <string name="rcv_group_event_member_unblocked">%s wurde freigegeben</string>
+    <string name="rcv_group_event_member_blocked">es wurde %s blockiert</string>
+    <string name="rcv_group_event_member_unblocked">Es wurden %s freigegeben</string>
     <string name="snd_group_event_member_blocked">Sie haben %s blockiert</string>
     <string name="snd_group_event_member_unblocked">Sie haben %s freigegeben</string>
     <string name="block_for_all_question">Mitglied für Alle blockieren?</string>
@@ -1715,8 +1714,8 @@
     <string name="migrate_from_device_confirm_you_remember_passphrase">Bitte bestätigen Sie für die Migration, dass Sie sich an Ihr Datenbank-Passwort erinnern.</string>
     <string name="migrate_from_device_confirm_upload">Hochladen bestätigen</string>
     <string name="migrate_to_device_download_failed">Herunterladen fehlgeschlagen</string>
-    <string name="e2ee_info_no_pq"><![CDATA[Nachrichten, Dateien und Anrufe sind durch <b>Ende-zu-Ende-Verschlüsselung</b> mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.]]></string>
-    <string name="e2ee_info_pq"><![CDATA[Nachrichten, Dateien und Anrufe sind durch <b>Quantum-resistente E2E-Verschlüsselung</b> mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.]]></string>
+    <string name="e2ee_info_no_pq"><![CDATA[Nachrichten, Dateien und Anrufe sind durch <b>Ende-zu-Ende-Verschlüsselung</b> mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Nachrichten, Dateien und Anrufe sind durch <b>Quantum-resistente E2E-Verschlüsselung</b> mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung geschützt.]]></string>
     <string name="e2ee_info_no_pq_short">Dieser Chat ist durch Ende-zu-Ende-Verschlüsselung geschützt.</string>
     <string name="e2ee_info_pq_short">Dieser Chat ist durch Quantum-resistente Ende-zu-Ende-Verschlüsselung geschützt.</string>
     <string name="auth_open_migration_to_another_device">Migrationsansicht öffnen</string>
@@ -1791,7 +1790,7 @@
     <string name="simplex_links_not_allowed">SimpleX-Links sind nicht erlaubt</string>
     <string name="voice_messages_not_allowed">Sprachnachrichten sind nicht erlaubt</string>
     <string name="simplex_links">SimpleX-Links</string>
-    <string name="group_members_can_send_simplex_links">Mitglieder können SimpleX-Links senden.</string>
+    <string name="group_members_can_send_simplex_links">Mitglieder können SimpleX-Links versenden.</string>
     <string name="feature_roles_admins">Administratoren</string>
     <string name="feature_roles_all_members">Alle Mitglieder</string>
     <string name="feature_enabled_for">Aktiviert für</string>
@@ -1880,7 +1879,7 @@
     <string name="theme_remove_image">Bild entfernen</string>
     <string name="wallpaper_scale_repeat">Wiederholen</string>
     <string name="wallpaper_scale">Skalieren</string>
-    <string name="chat_theme_set_default_theme">Default-Design einstellen</string>
+    <string name="chat_theme_set_default_theme">Default-Design festlegen</string>
     <string name="color_wallpaper_tint">Wallpaper-Akzent</string>
     <string name="color_wallpaper_background">Wallpaper-Hintergrund</string>
     <string name="chat_theme_apply_to_mode">Anwenden auf</string>
@@ -1907,7 +1906,7 @@
     <string name="v5_8_private_routing">Privates Nachrichten-Routing 🚀</string>
     <string name="v5_8_private_routing_descr">Schützen Sie Ihre IP-Adresse vor den Nachrichten-Relais , die Ihr Kontakt ausgewählt hat.
 \nAktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</string>
-    <string name="v5_8_safe_files">Dateien sicher empfangen</string>
+    <string name="v5_8_safe_files">Dateien sicher herunterladen</string>
     <string name="v5_8_message_delivery_descr">Mit reduziertem Akkuverbrauch.</string>
     <string name="message_queue_info_none">Keine Information</string>
     <string name="info_row_debug_delivery">Debugging-Zustellung</string>
@@ -2025,8 +2024,7 @@
     <string name="appearance_zoom">Zoom</string>
     <string name="smp_server">SMP-Server</string>
     <string name="servers_info_target">Informationen zeigen für</string>
-    <string name="servers_info_private_data_disclaimer">Beginnend mit %s.
-\nAlle Daten werden nur auf Ihrem Gerät gespeichert.</string>
+    <string name="servers_info_private_data_disclaimer">Beginnend mit %s.\nAlle Daten werden nur auf Ihrem Gerät gespeichert.</string>
     <string name="servers_info_statistics_section_header">Statistiken</string>
     <string name="servers_info_transport_sessions_section_header">Transport-Sitzungen</string>
     <string name="servers_info_uploaded">Hochgeladen</string>
@@ -2091,10 +2089,10 @@
     <string name="toolbar_settings">Einstellungen</string>
     <string name="moderate_messages_will_be_deleted_warning">Die Nachrichten werden für alle Gruppenmitglieder gelöscht.</string>
     <string name="moderate_messages_will_be_marked_warning">Die Nachrichten werden für alle Mitglieder als moderiert markiert.</string>
-    <string name="delete_members_messages__question">%d Nachrichten der Mitglieder löschen?</string>
+    <string name="delete_members_messages__question">Sollen %d Nachrichten von Mitgliedern gelöscht werden?</string>
     <string name="compose_message_placeholder">Nachricht</string>
     <string name="delete_messages_mark_deleted_warning">Nachrichten werden zur Löschung markiert. Der/Die Empfänger hat/haben die Möglichkeit, diese Nachrichten aufzudecken.</string>
-    <string name="selected_chat_items_selected_n">%d ausgewählt</string>
+    <string name="selected_chat_items_selected_n">Es wurden %d ausgewählt</string>
     <string name="selected_chat_items_nothing_selected">Es wurde Nichts ausgewählt</string>
     <string name="select_verb">Auswählen</string>
     <string name="invite_friends_short">Einladen</string>
@@ -2156,7 +2154,7 @@
     <string name="forward_files_messages_deleted_after_selection_desc">Die Nachrichten wurden gelöscht, nachdem Sie sie ausgewählt hatten.</string>
     <string name="forward_alert_title_nothing_to_forward">Es gibt nichts zum Weiterleiten!</string>
     <string name="n_other_file_errors">%1$d andere(r) Datei-Fehler.</string>
-    <string name="forward_alert_title_messages_to_forward">%1$s Nachricht(en) weiterleiten?</string>
+    <string name="forward_alert_title_messages_to_forward">Soll(en) %1$s Nachricht(en) weitergeleitet werden?</string>
     <string name="forward_files_missing_desc">%1$d Datei(en) wurde(n) gelöscht.</string>
     <string name="forward_files_not_accepted_desc">%1$d Datei(en) wurde(n) nicht heruntergeladen.</string>
     <string name="forward_alert_forward_messages_without_files">Nachrichten ohne Dateien weiterleiten?</string>
@@ -2193,7 +2191,7 @@
     <string name="errors_in_servers_configuration">Fehler in der Server-Konfiguration.</string>
     <string name="for_chat_profile">Für das Chat-Profil %s:</string>
     <string name="no_media_servers_configured">Keine Medien- und Dateiserver.</string>
-    <string name="no_media_servers_configured_for_private_routing">Keine Server für den Empfang von Dateien.</string>
+    <string name="no_media_servers_configured_for_private_routing">Keine Server für das Herunterladen von Dateien.</string>
     <string name="no_media_servers_configured_for_sending">Keine Server für das Versenden von Dateien.</string>
     <string name="connection_error_quota">Nicht ausgelieferte Nachrichten</string>
     <string name="share_simplex_address_on_social_media">Die SimpleX-Adresse auf sozialen Medien teilen.</string>
@@ -2248,7 +2246,7 @@
     <string name="error_server_operator_changed">Der Server-Betreiber wurde geändert.</string>
     <string name="error_server_protocol_changed">Das Server-Protokoll wurde geändert.</string>
     <string name="appearance_in_app_bars_alpha">Transparenz</string>
-    <string name="v6_2_network_decentralization_enable_flux">Flux aktivieren</string>
+    <string name="v6_2_network_decentralization_enable_flux">Für einen besseren Metadatenschutz Flux in den Netzwerk- und Servereinstellungen aktivieren.</string>
     <string name="v6_2_network_decentralization">Dezentralisiertes Netzwerk</string>
     <string name="v6_2_network_decentralization_descr">Der zweite voreingestellte Netzwerk-Betreiber in der App!</string>
     <string name="v6_2_improved_chat_navigation">Verbesserte Chat-Navigation</string>
@@ -2286,7 +2284,7 @@
     <string name="all_message_and_files_e2e_encrypted"><![CDATA[Alle Nachrichten und Dateien werden <b>Ende-zu-Ende-verschlüsselt</b> versendet. In Direktnachrichten sogar mit Post-Quantum-Security.]]></string>
     <string name="button_add_team_members">Team-Mitglieder aufnehmen</string>
     <string name="button_add_friends">Freunde aufnehmen</string>
-    <string name="display_name_accepted_invitation">Einladung akzeptiert</string>
+    <string name="display_name_accepted_invitation">Einladung angenommen</string>
     <string name="business_address">Geschäftliche Adresse</string>
     <string name="v6_2_business_chats">Geschäftliche Chats</string>
     <string name="add_your_team_members_to_conversations">Nehmen Sie Team-Mitglieder in Ihre Unterhaltungen auf.</string>
@@ -2320,6 +2318,196 @@
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Wenn mehr als ein Betreiber aktiviert ist, hat keiner von ihnen Metadaten, um zu erfahren, wer mit wem kommuniziert.</string>
     <string name="info_row_chat">Chat</string>
     <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Sie sind bereits mit <b>%1$s</b> verbunden.]]></string>
-    <string name="onboarding_network_about_operators">Über Betreiber</string>
+    <string name="onboarding_network_about_operators">Über die Betreiber</string>
     <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX-Chat und Flux haben vereinbart, die von Flux betriebenen Server in die App aufzunehmen.</string>
-</resources>
\ No newline at end of file
+    <string name="sync_connection_desc">Die Verbindung erfordert eine Neuverhandlung der Verschlüsselung.</string>
+    <string name="encryption_renegotiation_in_progress">Die Neuverhandlung der Verschlüsselung läuft.</string>
+    <string name="sync_connection_confirm">Reparieren</string>
+    <string name="sync_connection_question">Verbindung reparieren?</string>
+    <string name="debug_logs">Log-Daten aktivieren</string>
+    <string name="error_saving_database">Fehler beim Speichern der Datenbank</string>
+    <string name="connection_not_ready">Verbindung noch nicht bereit.</string>
+    <string name="chat_list_all">Alle</string>
+    <string name="chat_list_businesses">Unternehmen</string>
+    <string name="error_creating_chat_tags">Fehler beim Erstellen der Chat-Liste</string>
+    <string name="error_loading_chat_tags">Fehler beim Laden der Chat-Listen</string>
+    <string name="error_updating_chat_tags">Fehler beim Aktualisieren der Chat-Liste</string>
+    <string name="chat_list_favorites">Favoriten</string>
+    <string name="list_menu">Liste</string>
+    <string name="no_chats">Keine Chats</string>
+    <string name="no_chats_found">Keine Chats gefunden</string>
+    <string name="no_chats_in_list">Keine Chats in der Liste %s.</string>
+    <string name="no_unread_chats">Keine ungelesenen Chats</string>
+    <string name="create_list">Liste erstellen</string>
+    <string name="delete_chat_list_menu_action">Löschen</string>
+    <string name="delete_chat_list_question">Liste löschen?</string>
+    <string name="edit_chat_list_menu_action">Bearbeiten</string>
+    <string name="list_name_field_placeholder">Listenname...</string>
+    <string name="duplicated_list_error">Der Listenname und das Emoji sollen für alle Listen unterschiedlich sein.</string>
+    <string name="save_list">Liste speichern</string>
+    <string name="delete_chat_list_warning">Alle Chats werden von der Liste %s entfernt und die Liste wird gelöscht</string>
+    <string name="chat_list_groups">Gruppen</string>
+    <string name="chat_list_contacts">Kontakte</string>
+    <string name="chat_list_add_list">Liste hinzufügen</string>
+    <string name="add_to_list">Zur Liste hinzufügen</string>
+    <string name="open_with_app">Mit %s öffnen</string>
+    <string name="chat_list_notes">Anmerkungen</string>
+    <string name="change_order_chat_list_menu_action">Anordnung ändern</string>
+    <string name="change_list">Liste ändern</string>
+    <string name="error_creating_report">Fehler beim Erstellen der Meldung</string>
+    <string name="prefs_error_saving_settings">Fehler beim Abspeichern der Einstellungen</string>
+    <string name="report_item_archived">Archivierte Meldung</string>
+    <string name="report_compose_reason_header_spam">Spam melden: Nur Gruppenmoderatoren werden es sehen.</string>
+    <string name="report_verb">Melden</string>
+    <string name="report_reason_other">Anderer Grund</string>
+    <string name="report_archive_alert_title">Meldung archivieren?</string>
+    <string name="group_member_role_moderator">Moderator</string>
+    <string name="report_compose_reason_header_illegal">Inhalt melden: Nur Gruppenmoderatoren werden es sehen.</string>
+    <string name="report_reason_illegal">Unangemessener Inhalt</string>
+    <string name="report_reason_profile">Unangemessenes Profil</string>
+    <string name="report_item_visibility_moderators">Nur Absender und Moderatoren sehen es</string>
+    <string name="report_item_visibility_submitter">Nur Sie und Moderatoren sehen es</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="archive_verb">Archiv</string>
+    <string name="report_reason_alert_title">Grund der Meldung?</string>
+    <string name="report_archive_alert_desc">Die Meldung wird für Sie archiviert.</string>
+    <string name="report_compose_reason_header_profile">Mitgliederprofil melden: Nur Gruppenmoderatoren werden es sehen.</string>
+    <string name="report_compose_reason_header_other">Anderes melden: Nur Gruppenmoderatoren werden es sehen.</string>
+    <string name="report_compose_reason_header_community">Verstoß melden: Nur Gruppenmoderatoren werden es sehen.</string>
+    <string name="archive_report">Meldung archivieren</string>
+    <string name="delete_report">Meldung löschen</string>
+    <string name="report_reason_community">Verstoß gegen die Gemeinschaftsrichtlinien</string>
+    <string name="report_item_archived_by">Archivierte Meldung von %s</string>
+    <string name="group_reports_active_one">Eine Meldung</string>
+    <string name="group_reports_active">%d Meldungen</string>
+    <string name="group_reports_member_reports">Mitglieder-Meldungen</string>
+    <string name="chat_list_group_reports">Meldungen</string>
+    <string name="blocking_reason_content">Inhalt verletzt Nutzungsbedingungen</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="connection_error_blocked">Verbindung blockiert</string>
+    <string name="file_error_blocked">Die Datei wird vom Serverbetreiber blockiert:\n%1$s.</string>
+    <string name="connection_error_blocked_desc">Die Verbindung wird vom Serverbetreiber blockiert:\n%1$s.</string>
+    <string name="privacy_chat_list_open_links_ask">Fragen</string>
+    <string name="privacy_chat_list_open_links_no">Nein</string>
+    <string name="privacy_chat_list_open_web_link">Web-Link öffnen</string>
+    <string name="privacy_chat_list_open_links">Web-Links aus der Chat-Liste öffnen</string>
+    <string name="privacy_chat_list_open_web_link_question">Web-Link öffnen?</string>
+    <string name="privacy_chat_list_open_links_yes">Ja</string>
+    <string name="text_field_set_chat_placeholder">Chat-Name festlegen…</string>
+    <string name="change_automatic_chat_deletion_message">Die älteren als die ausgewählten gesendeten und empfangenen Nachrichten in diesem Chat werden gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!</string>
+    <string name="change_automatic_deletion_question">Automatisches Löschen von Nachrichten ändern?</string>
+    <string name="chat_ttl_options_footer">Chat-Nachrichten von Ihrem Gerät löschen</string>
+    <string name="disable_automatic_deletion_question">Automatisches Löschen von Nachrichten deaktivieren?</string>
+    <string name="disable_automatic_deletion">Löschen von Nachrichten deaktivieren</string>
+    <string name="chat_item_ttl_year">Älter als ein Jahr</string>
+    <string name="chat_item_ttl_default">Default (%s)</string>
+    <string name="disable_automatic_deletion_message">Nachrichten in diesem Chat werden nie gelöscht.</string>
+    <string name="network_smp_web_port_footer">Solange kein Port konfiguriert ist, wird TCP-Port %1$s genutzt.</string>
+    <string name="network_smp_web_port_toggle">Web-Port nutzen</string>
+    <string name="network_smp_web_port_section_title">TCP-Port für Nachrichtenübermittlung</string>
+    <string name="max_group_mentions_per_message_reached">Sie können bis zu %1$s Mitglieder pro Nachricht erwähnen!</string>
+    <string name="mute_all_chat">Alle stummschalten</string>
+    <string name="unread_mentions">Ungelesene Erwähnungen</string>
+    <string name="member_reports_are_prohibited">Melden von Nachrichten ist in dieser Gruppe nicht erlaubt.</string>
+    <string name="report_archive_alert_title_all">Alle Meldungen archivieren?</string>
+    <string name="report_archive_alert_title_nth">Archiviere %d Meldungen?</string>
+    <string name="report_archive_for_all_moderators">Für alle Moderatoren</string>
+    <string name="report_archive_for_me">Für mich</string>
+    <string name="archive_reports">Meldungen archivieren</string>
+    <string name="group_members_can_send_reports">Mitglieder können Nachrichten an Moderatoren melden.</string>
+    <string name="disable_sending_member_reports">Melden von Nachrichten an Moderatoren nicht erlauben.</string>
+    <string name="enable_sending_member_reports">Melden von Nachrichten an Moderatoren erlauben.</string>
+    <string name="report_archive_alert_desc_all">Alle Meldungen werden für Sie archiviert.</string>
+    <string name="notification_group_report">Meldung: %s</string>
+    <string name="v6_3_reports_descr">Helfen Sie Administratoren bei der Moderation ihrer Gruppen.</string>
+    <string name="v6_3_mentions">Erwähnung von Mitgliedern 👋</string>
+    <string name="v6_3_reports">Private Meldungen senden</string>
+    <string name="v6_3_mentions_descr">Bei Erwähnung benachrichtigt werden.</string>
+    <string name="v6_3_private_media_file_names">Medien mit anonymisierten Dateinamen.</string>
+    <string name="v6_3_set_message_expiration_in_chats">Verfallsdatum von Nachrichten in Chats festlegen.</string>
+    <string name="v6_3_better_groups_performance">Bessere Leistung von Gruppen</string>
+    <string name="v6_3_faster_deletion_of_groups">Schnelleres löschen von Gruppen</string>
+    <string name="v6_3_faster_sending_messages">Schnelleres versenden von Nachrichten.</string>
+    <string name="group_preview_rejected">abgelehnt</string>
+    <string name="v6_3_better_privacy_and_security">Bessere(r) Security und Datenschutz</string>
+    <string name="v6_3_organize_chat_lists_descr">Verpassen Sie keine wichtigen Nachrichten.</string>
+    <string name="v6_3_organize_chat_lists">Chats in Listen verwalten</string>
+    <string name="group_member_status_rejected">abgelehnt</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Das Passwort kann nicht aus dem Schlüsselbund gelesen werden. Dies kann nach einer Systemaktualisierung passiert sein, die nicht mit der App kompatibel war. Wenden Sie sich bitte an die Entwickler, wenn dies nicht der Fall ist.</string>
+    <string name="group_member_status_pending_approval_short">ausstehend</string>
+    <string name="error_reading_passphrase">Fehler beim Lesen des Datenbank-Passworts</string>
+    <string name="operator_updated_conditions">Aktualisierte Nutzungsbedingungen</string>
+    <string name="group_member_status_pending_approval">ausstehende Genehmigung</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Das Passwort kann nicht aus dem Schlüsselbund gelesen werden. Bitte geben Sie es manuell ein. Dies kann nach einer Systemaktualisierung passiert sein, die nicht mit der App kompatibel war. Wenden Sie sich bitte an die Entwickler, wenn dies nicht der Fall ist.</string>
+    <string name="button_remove_members_question">Mitglieder entfernen?</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Mitglieder werden aus dem Chat entfernt. Dies kann nicht rückgängig gemacht werden!</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Mitglieder werden aus der Gruppe entfernt. Dies kann nicht rückgängig gemacht werden!</string>
+    <string name="unblock_members_for_all_question">Mitglieder für Alle freigeben?</string>
+    <string name="unblock_members_desc">Nachrichten dieser Mitglieder werden angezeigt!</string>
+    <string name="feature_roles_moderators">Moderatoren</string>
+    <string name="block_members_for_all_question">Mitglieder für Alle blockieren?</string>
+    <string name="block_members_desc">Alle neuen Nachrichten dieser Mitglieder werden nicht angezeigt!</string>
+    <string name="onboarding_conditions_by_using_you_agree">Durch die Nutzung von SimpleX Chat erklären Sie sich damit einverstanden:\n- nur legale Inhalte in öffentlichen Gruppen zu versenden.\n- andere Nutzer zu respektieren - kein Spam.</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Datenschutz- und Nutzungsbedingungen.</string>
+    <string name="onboarding_conditions_accept">Akzeptieren</string>
+    <string name="onboarding_conditions_configure_server_operators">Server-Betreiber konfigurieren</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Private Chats, Gruppen und Ihre Kontakte sind für Server-Betreiber nicht zugänglich.</string>
+    <string name="unsupported_connection_link">Verbindungs-Link wird nicht unterstützt</string>
+    <string name="privacy_short_links">Kurze Links verwenden (BETA)</string>
+    <string name="short_link_button_text">Verkürzter Link</string>
+    <string name="full_link_button_text">Vollständiger Link</string>
+    <string name="simplex_link_channel">SimpleX-Kanal-Link</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Für diesen Link wird eine neuere App-Version benötigt. Bitte aktualisieren Sie die App oder bitten Sie Ihren Kontakt einen kompatiblen Link zu senden.</string>
+    <string name="network_smp_web_port_all">Alle Server</string>
+    <string name="network_smp_web_port_off">Aus</string>
+    <string name="network_smp_web_port_preset_footer">TCP-Port 443 nur für voreingestellte Server verwenden.</string>
+    <string name="network_smp_web_port_preset">Voreingestellte Server</string>
+    <string name="group_new_support_chats">%d Chats mit Mitgliedern</string>
+    <string name="group_new_support_chats_short">%d Chat(s)</string>
+    <string name="report_sent_alert_title">Meldung wurde an die Moderatoren gesendet</string>
+    <string name="snd_group_event_member_accepted">Sie haben dieses Mitglied übernommen</string>
+    <string name="admission_stage_review_descr">Überprüfung der Mitglieder vor der Aufnahme (\"Anklopfen\").</string>
+    <string name="admission_stage_review">Überprüfung der Mitglieder</string>
+    <string name="member_criteria_all">alle</string>
+    <string name="member_criteria_off">Aus</string>
+    <string name="accept_pending_member_alert_confirmation_as_observer">Als Beobachter übernehmen</string>
+    <string name="accept_pending_member_alert_title">Mitglied übernehmen</string>
+    <string name="member_support">Chats mit Mitgliedern</string>
+    <string name="support_chat">Chat mit Administratoren</string>
+    <string name="no_support_chats">Keine Chats mit Mitgliedern</string>
+    <string name="reject_pending_member_button">Entfernen</string>
+    <string name="rcv_group_event_user_accepted">hat Sie übernommen</string>
+    <string name="button_support_chat_member">Chat mit einem Mitglied</string>
+    <string name="group_new_support_messages">%d Nachrichten</string>
+    <string name="accept_pending_member_alert_question">Ein Mitglied wird der Gruppe beitreten. Übernehmen?</string>
+    <string name="rcv_group_event_new_member_pending_review">Ein neues Mitglied will der Gruppe beitreten.</string>
+    <string name="group_member_status_pending_review_short">Überprüfung</string>
+    <string name="reviewed_by_admins">Von Administratoren überprüft</string>
+    <string name="set_member_admission">Aufnahme von Mitgliedern festlegen</string>
+    <string name="save_admission_question">Speichern der Aufnahme-Einstellungen?</string>
+    <string name="report_sent_alert_msg_view_in_support_chat">Sie können Ihre Meldungen im Chat mit den Administratoren sehen.</string>
+    <string name="button_support_chat">Chat mit Administratoren</string>
+    <string name="rcv_group_event_member_accepted">%1$s übernommen</string>
+    <string name="accept_pending_member_alert_confirmation_as_member">Als Mitglied übernehmen</string>
+    <string name="error_accepting_member">Fehler beim Übernehmen des Mitglieds</string>
+    <string name="member_admission">Aufnahme von Mitgliedern</string>
+    <string name="group_member_status_pending_review">Ausstehende Überprüfung</string>
+    <string name="group_new_support_chat_one">Chat mit einem Mitglied</string>
+    <string name="accept_pending_member_button">Übernehmen</string>
+    <string name="snd_group_event_user_pending_review">Bitte warten Sie auf die Überprüfung Ihrer Anfrage durch die Gruppen-Moderatoren, um der Gruppe beitreten zu können.</string>
+    <string name="cant_send_message_group_deleted">Gruppe wird gelöscht</string>
+    <string name="cant_send_message_rejected">Beitrittsanfrage abgelehnt</string>
+    <string name="cant_send_message_mem_removed">Von der Gruppe entfernt</string>
+    <string name="cant_send_message_you_left">Sie haben die Gruppe verlassen</string>
+    <string name="cant_send_message_contact_disabled">Kontakt deaktiviert</string>
+    <string name="cant_send_message_contact_not_synchronized">Nicht synchronisiert</string>
+    <string name="error_deleting_member_support_chat">Fehler beim Löschen des Chats mit dem Mitglied</string>
+    <string name="cant_send_message_contact_not_ready">Kontakt nicht bereit</string>
+    <string name="cant_send_message_alert_title">Sie können keine Nachrichten senden!</string>
+    <string name="delete_member_support_chat_button">Chat löschen</string>
+    <string name="delete_member_support_chat_alert_title">Chat mit dem Mitglied löschen?</string>
+    <string name="reject_pending_member_alert_title">Mitglied ablehnen?</string>
+    <string name="cant_send_message_generic">Es können keine Nachrichten gesendet werden</string>
+    <string name="cant_send_message_contact_deleted">Kontakt gelöscht</string>
+    <string name="cant_send_message_member_has_old_version">Das Mitglied hat eine alte App-Version</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
index 6163d7e873..5667c42d2d 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
@@ -7,9 +7,9 @@
     <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Bueno para la batería</b>. La aplicación comprueba si hay mensajes cada 10 minutos. Podrías perderte llamadas o mensajes urgentes.]]></string>
     <string name="accept_call_on_lock_screen">Aceptar</string>
     <string name="full_backup">Copia de seguridad de los datos de la aplicación</string>
-    <string name="chat_item_ttl_day">un dia</string>
-    <string name="chat_item_ttl_month">un mes</string>
-    <string name="chat_item_ttl_week">una semana</string>
+    <string name="chat_item_ttl_day">1 día</string>
+    <string name="chat_item_ttl_month">1 mes</string>
+    <string name="chat_item_ttl_week">1 semana</string>
     <string name="allow_disappearing_messages_only_if">Se permiten los mensajes temporales pero sólo si tu contacto también los permite.</string>
     <string name="v4_3_improved_server_configuration_desc">Añadir servidores mediante el escaneo de códigos QR.</string>
     <string name="smp_servers_preset_add">Añadir servidores predefinidos</string>
@@ -20,7 +20,7 @@
     <string name="allow_your_contacts_to_send_voice_messages">Permites a tus contactos enviar mensajes de voz.</string>
     <string name="chat_preferences_always">siempre</string>
     <string name="notifications_mode_off_desc">La aplicación sólo puede recibir notificaciones cuando se está ejecutando. No se iniciará ningún servicio en segundo plano.</string>
-    <string name="settings_section_title_icon">ICONO APLICACIÓN</string>
+    <string name="settings_section_title_icon">ICONO DE LA APLICACIÓN</string>
     <string name="turning_off_service_and_periodic">La optimización de la batería está activa, desactivando el servicio en segundo plano y las solicitudes periódicas de nuevos mensajes. Puedes volver a activarlos en Configuración.</string>
     <string name="notifications_mode_service_desc">El servicio está siempre en funcionamiento en segundo plano. Las notificaciones se muestran en cuanto haya mensajes nuevos.</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Se puede desactivar en Configuración</b> – las notificaciones se seguirán mostrando mientras la app esté en funcionamiento.]]></string>
@@ -29,15 +29,14 @@
     <string name="above_then_preposition_continuation">y después:</string>
     <string name="accept_connection_request__question">¿Aceptar solicitud de conexión\?</string>
     <string name="accept_contact_incognito_button">Aceptar incógnito</string>
-    <string name="clear_chat_warning">Se eliminarán todos los mensajes SOLO para tí. ¡No podrá deshacerse!</string>
+    <string name="clear_chat_warning">Se eliminarán todos los mensajes SOLO para tí. ¡No puede deshacerse!</string>
     <string name="smp_servers_add">Añadir servidor</string>
     <string name="network_enable_socks_info">¿Acceder a los servidores a través del proxy SOCKS en el puerto %d\? El proxy debe iniciarse antes de activar esta opción.</string>
     <string name="all_your_contacts_will_remain_connected">Todos tus contactos permanecerán conectados.</string>
     <string name="appearance_settings">Apariencia</string>
     <string name="app_version_title">Versión</string>
     <string name="network_session_mode_user_description"><![CDATA[Se usará una conexión TCP (y credenciales SOCKS) independiente <b>por cada perfil que tengas en la aplicación</b>.]]></string>
-    <string name="network_session_mode_entity_description">Se usará una conexión TCP (y credenciales SOCKS) independiente <b>por cada contacto y miembro del grupo</b>. 
-\n<b>Recuerda</b>: si tienes muchas conexiones, el consumo de batería y tráfico pueden ser sustancialmente mayores y algunas conexiones pueden fallar.</string>
+    <string name="network_session_mode_entity_description"><![CDATA[Se usará una conexión TCP (y credenciales SOCKS) independiente <b>por cada contacto y miembro del grupo</b>. \n<b>Recuerda</b>: si tienes muchas conexiones, el consumo de batería y tráfico pueden aumentar bastante y algunas conexiones pueden fallar.]]></string>
     <string name="a_plus_b">a + b</string>
     <string name="about_simplex">Acerca de SimpleX</string>
     <string name="bold_text">negrita</string>
@@ -50,7 +49,7 @@
     <string name="icon_descr_audio_on">Audio activado</string>
     <string name="integrity_msg_bad_id">ID de mensaje erróneo</string>
     <string name="auto_accept_images">Auto aceptar imágenes</string>
-    <string name="users_delete_all_chats_deleted">Se eliminarán todos los chats y mensajes. ¡No podrá deshacerse!</string>
+    <string name="users_delete_all_chats_deleted">Se eliminarán todos los chats y mensajes. ¡No puede deshacerse!</string>
     <string name="accept_feature">Aceptar</string>
     <string name="allow_to_send_disappearing">Se permiten mensajes temporales.</string>
     <string name="keychain_is_storing_securely">Android Keystore se usará para almacenar de forma segura la frase de contraseña - permite que el servicio de notificación funcione.</string>
@@ -73,7 +72,7 @@
     <string name="smp_servers_add_to_another_device">Añadir a otro dispositivo</string>
     <string name="app_version_name">Versión de la aplicación: v%s</string>
     <string name="icon_descr_asked_to_receive">Solicita recibir la imagen</string>
-    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Recuerda</b>: NO podrás recuperar o cambiar la frase de contraseña si la pierdes.]]></string>
+    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Recuerda</b>: Si la pierdes NO podrás recuperar o cambiar la frase de contraseña.]]></string>
     <string name="both_you_and_your_contact_can_send_voice">Tanto tú como tu contacto podéis enviar mensajes de voz.</string>
     <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>¡Consume más energía!</b> La aplicación está siempre en segundo plano y las notificaciones se muestran de inmediato.]]></string>
     <string name="both_you_and_your_contacts_can_delete">Tanto tú como tu contacto podéis eliminar los mensajes enviados de forma irreversible. (24 horas)</string>
@@ -88,7 +87,7 @@
     <string name="delete_contact_question">¿Eliminar contacto\?</string>
     <string name="delete_message__question">¿Eliminar mensaje\?</string>
     <string name="delete_chat_profile_question">¿Eliminar perfil?</string>
-    <string name="rcv_group_event_group_deleted">grupo eliminado</string>
+    <string name="rcv_group_event_group_deleted">ha eliminado el grupo</string>
     <string name="delete_group_question">¿Eliminar grupo\?</string>
     <string name="delete_messages_after">Eliminar en</string>
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Autenticación de dispositivo desactivada. Puedes habilitar Bloqueo SimpleX en Configuración, después de activar la autenticación de dispositivo.</string>
@@ -109,9 +108,9 @@
     <string name="encrypted_audio_call">Llamada con cifrado de extremo a extremo</string>
     <string name="status_e2e_encrypted">cifrado de extremo a extremo</string>
     <string name="integrity_msg_duplicate">mensaje duplicado</string>
-    <string name="settings_developer_tools">Herramientas desarrollo</string>
+    <string name="settings_developer_tools">Herramientas para desarrolladores</string>
     <string name="delete_files_and_media_for_all_users">Eliminar los archivos de todos los perfiles</string>
-    <string name="delete_messages">Eliminar mensaje</string>
+    <string name="delete_messages">Activar</string>
     <string name="database_encrypted">¡Base de datos cifrada!</string>
     <string name="encrypted_with_random_passphrase">La base de datos está cifrada con una contraseña aleatoria, puedes cambiarla.</string>
     <string name="database_error">Error en base de datos</string>
@@ -130,14 +129,14 @@
     <string name="ttl_week">%d semana</string>
     <string name="ttl_weeks">%d semanas</string>
     <string name="v4_4_disappearing_messages">Mensajes temporales</string>
-    <string name="auth_confirm_credential">Canfirma tus credenciales</string>
+    <string name="auth_confirm_credential">Confirma tus credenciales</string>
     <string name="group_member_status_introduced">conectando (presentado)</string>
     <string name="group_member_status_intro_invitation">conectando (invitación de presentación )</string>
     <string name="group_member_status_accepted">conectando (aceptado)</string>
     <string name="group_member_status_announced">conectando (anunciado)</string>
     <string name="connection_local_display_name">conexión %1$d</string>
     <string name="connect_via_link_or_qr">Conecta vía enlace / Código QR</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacto y todos los mensajes serán eliminados. ¡No podrá deshacerse!</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacto y todos los mensajes serán eliminados. ¡No puede deshacerse!</string>
     <string name="icon_descr_contact_checked">Contacto verificado</string>
     <string name="status_contact_has_e2e_encryption">el contacto dispone de cifrado de extremo a extremo</string>
     <string name="smp_server_test_disconnect">Desconectar</string>
@@ -159,7 +158,7 @@
     <string name="icon_descr_server_status_connected">Conectado</string>
     <string name="copied">Copiado en portapapeles</string>
     <string name="share_one_time_link">Crea enlace de invitación de un uso.</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code"><![CDATA[💻 Ordenador: escanéa el código QR desde la aplicación mediante <b>Escanear código QR </b>]]></string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code"><![CDATA[💻 Ordenador: escanea el código QR desde la aplicación mediante <b>Escanear código QR </b>]]></string>
     <string name="delete_contact_menu_action">Eliminar</string>
     <string name="delete_group_menu_action">Eliminar</string>
     <string name="alert_title_contact_connection_pending">¡El contacto aun no se ha conectado!</string>
@@ -170,7 +169,7 @@
     <string name="callstatus_connecting">conectando llamada…</string>
     <string name="allow_accepting_calls_from_lock_screen">Activar llamadas desde la pantalla de bloqueo en Configuración</string>
     <string name="database_encryption_will_be_updated">La contraseña de cifrado de la base de datos será actualizada y almacenada en Keystore.</string>
-    <string name="group_member_status_connecting">conectando</string>
+    <string name="group_member_status_connecting">conectando...</string>
     <string name="group_member_status_creator">creador</string>
     <string name="ttl_min">%d min</string>
     <string name="connection_timeout">Tiempo de conexión agotado</string>
@@ -209,7 +208,7 @@
     <string name="button_delete_group">Eliminar grupo</string>
     <string name="button_edit_group_profile">Editar perfil de grupo</string>
     <string name="info_row_connection">Conexión</string>
-    <string name="users_delete_profile_for">Eliminar el perfil de chat para</string>
+    <string name="users_delete_profile_for">Eliminar el perfil</string>
     <string name="theme_dark">Oscuro</string>
     <string name="ttl_d">%dd</string>
     <string name="ttl_days">%d días</string>
@@ -217,7 +216,7 @@
     <string name="group_member_status_connected">conectado</string>
     <string name="conn_level_desc_direct">directa</string>
     <string name="chat_preferences_contact_allows">El contacto permite</string>
-    <string name="chat_preferences_default">predeterminado (%s)</string>
+    <string name="chat_preferences_default">predefinido (%s)</string>
     <string name="full_deletion">Eliminar para todos</string>
     <string name="feature_enabled">activado</string>
     <string name="contacts_can_mark_messages_for_deletion">Tus contactos sólo pueden marcar los mensajes para eliminar. Tu podrás verlos.</string>
@@ -239,8 +238,7 @@
     <string name="icon_descr_email">Email</string>
     <string name="connect_button">Conectar</string>
     <string name="connect_via_link">Conectar mediante enlace</string>
-    <string name="database_passphrase_and_export">Base de Datos y
-\nContraseña</string>
+    <string name="database_passphrase_and_export">Base de Datos y Contraseña</string>
     <string name="contribute">Contribuye</string>
     <string name="core_version">Core versión: v%s</string>
     <string name="delete_image">Eliminar imagen</string>
@@ -273,7 +271,7 @@
     <string name="change_role">Cambiar rol</string>
     <string name="v4_5_transport_isolation_descr">Mediante perfil (predeterminado) o por conexión (BETA)</string>
     <string name="snd_conn_event_switch_queue_phase_changing">cambiando de servidor…</string>
-    <string name="chat_preferences">Preferencias de Chat</string>
+    <string name="chat_preferences">Preferencias generales</string>
     <string name="feature_cancelled_item">cancelado %s</string>
     <string name="chat_is_stopped">SimpleX está parado</string>
     <string name="settings_section_title_calls">LLAMADAS</string>
@@ -310,15 +308,15 @@
     <string name="error_saving_group_profile">Error al guardar perfil de grupo</string>
     <string name="exit_without_saving">Salir sin guardar</string>
     <string name="file_saved">Archivo guardado</string>
-    <string name="icon_descr_flip_camera">Voltear la cámara</string>
+    <string name="icon_descr_flip_camera">Girar la cámara</string>
     <string name="group_invitation_expired">Invitación de grupo caducada</string>
     <string name="alert_message_group_invitation_expired">La invitación al grupo ya no es válida, ha sido eliminada por el remitente.</string>
-    <string name="delete_group_for_self_cannot_undo_warning">El grupo será eliminado para tí. ¡No podrá deshacerse!</string>
+    <string name="delete_group_for_self_cannot_undo_warning">El grupo será eliminado para tí. ¡No puede deshacerse!</string>
     <string name="how_to_use_markdown">Cómo usar la sintaxis markdown</string>
     <string name="description_via_one_time_link_incognito">en modo incógnito mediante enlace de un solo uso</string>
     <string name="simplex_link_contact">Dirección de contacto SimpleX</string>
     <string name="error_saving_smp_servers">Error al guardar servidores SMP</string>
-    <string name="simplex_link_mode_browser_warning">Abrir el enlace en el navegador puede reducir la privacidad y seguridad de la conexión. Los enlaces SimpleX que no son de confianza aparecerán en rojo.</string>
+    <string name="simplex_link_mode_browser_warning">Abrir el enlace en el navegador puede reducir la privacidad y seguridad de la conexión. Los enlaces de SimpleX que no son de confianza aparecerán en rojo.</string>
     <string name="error_setting_network_config">Error al actualizar la configuración de red</string>
     <string name="error_creating_address">Error al crear dirección</string>
     <string name="error_deleting_user">Error al eliminar perfil</string>
@@ -330,7 +328,7 @@
     <string name="error_changing_message_deletion">Error al cambiar configuración</string>
     <string name="file_with_path">Archivo: %s</string>
     <string name="failed_to_active_user_title">¡Error al cambiar perfil!</string>
-    <string name="smp_servers_enter_manually">Introduce el servidor manualmente</string>
+    <string name="smp_servers_enter_manually">Añadir manualmente</string>
     <string name="how_to_use_your_servers">Cómo usar los servidores</string>
     <string name="error_stopping_chat">Error al parar SimpleX</string>
     <string name="enter_correct_passphrase">Introduce la contraseña correcta.</string>
@@ -344,7 +342,7 @@
     <string name="error_changing_address">Error al cambiar dirección</string>
     <string name="error_saving_file">Error al guardar archivo</string>
     <string name="icon_descr_server_status_error">Error</string>
-    <string name="from_gallery_button">De la Galería</string>
+    <string name="from_gallery_button">De la galería</string>
     <string name="gallery_image_button">Imagen</string>
     <string name="gallery_video_button">Vídeo</string>
     <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Si has recibido un enlace de invitación a SimpleX Chat puedes abrirlo en tu navegador:</string>
@@ -356,7 +354,7 @@
     <string name="ignore">Ignorar</string>
     <string name="error_deleting_database">Error al eliminar base de datos</string>
     <string name="encrypted_database">Base de datos cifrada</string>
-    <string name="error_removing_member">Error al eliminar miembro</string>
+    <string name="error_removing_member">Error al expulsar miembro</string>
     <string name="group_members_can_send_voice">Los miembros pueden enviar mensajes de voz.</string>
     <string name="description_via_contact_address_link_incognito">en modo incógnito mediante enlace de dirección del contacto</string>
     <string name="failed_to_create_user_title">¡Error al crear perfil!</string>
@@ -412,7 +410,7 @@
     <string name="v4_3_improved_privacy_and_security_desc">Ocultar pantalla de aplicaciones en aplicaciones recientes.</string>
     <string name="encrypt_database">Cifrar</string>
     <string name="icon_descr_expand_role">Ampliar la selección de roles</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">El grupo será eliminado para todos los miembros. ¡No podrá deshacerse!</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">El grupo será eliminado para todos los miembros. ¡No puede deshacerse!</string>
     <string name="network_option_enable_tcp_keep_alive">Activar TCP keep-alive</string>
     <string name="feature_enabled_for_you">activado para tí</string>
     <string name="server_error">error</string>
@@ -429,7 +427,7 @@
     <string name="icon_descr_help">ayuda</string>
     <string name="share_link">Compartir enlace</string>
     <string name="how_it_works">Cómo funciona</string>
-    <string name="delete_message_cannot_be_undone_warning">El mensaje será eliminado. ¡No podrá deshacerse!</string>
+    <string name="delete_message_cannot_be_undone_warning">El mensaje será eliminado. ¡No puede deshacerse!</string>
     <string name="incognito_info_protects">El modo incógnito protege tu privacidad creando un perfil aleatorio por cada contacto.</string>
     <string name="turn_off_battery_optimization"><![CDATA[<b>Da permiso</b> en el siguiente diálogo para recibir notificaciones instantáneas.]]></string>
     <string name="install_simplex_chat_for_terminal">Instalar terminal de SimpleX Chat</string>
@@ -491,7 +489,7 @@
     <string name="moderated_description">eliminado por el moderador</string>
     <string name="display_name_invited_to_connect">invitación a conectarse</string>
     <string name="service_notifications_disabled">¡Las notificaciones instantáneas están desactivadas!</string>
-    <string name="notification_preview_new_message">mensaje nuevo</string>
+    <string name="notification_preview_new_message">nuevo mensaje</string>
     <string name="notification_new_contact_request">Nueva solicitud de contacto</string>
     <string name="auth_log_in_using_credential">Inicie sesión con sus credenciales</string>
     <string name="message_delivery_error_title">Error en la entrega del mensaje</string>
@@ -520,7 +518,7 @@
     <string name="ok">OK</string>
     <string name="only_stored_on_members_devices">(sólo almacenado por miembros del grupo)</string>
     <string name="markdown_help">Ayuda sintaxis markdown</string>
-    <string name="network_and_servers">Servidores y Redes</string>
+    <string name="network_and_servers">Servidores y Red</string>
     <string name="network_use_onion_hosts_prefer_desc">Se usarán hosts .onion si están disponibles.</string>
     <string name="italic_text">cursiva</string>
     <string name="incoming_audio_call">Llamada audio entrante</string>
@@ -565,7 +563,7 @@
     <string name="leave_group_button">Salir</string>
     <string name="leave_group_question">¿Salir del grupo\?</string>
     <string name="group_member_role_owner">propietario</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">El miembro será expulsado del grupo. ¡No podrá deshacerse!</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">El miembro será expulsado del grupo. ¡No puede deshacerse!</string>
     <string name="only_group_owners_can_enable_voice">Sólo los propietarios del grupo pueden activar los mensajes de voz.</string>
     <string name="icon_descr_more_button">Más</string>
     <string name="mark_code_verified">Marcar como verificado</string>
@@ -579,7 +577,7 @@
     <string name="database_restore_error">Error al restaurar base de datos</string>
     <string name="select_contacts">Seleccionar contactos</string>
     <string name="save_group_profile">Guardar perfil de grupo</string>
-    <string name="reset_color">Restablecer colores</string>
+    <string name="reset_color">Reiniciar colores</string>
     <string name="only_you_can_send_disappearing">Sólo tú puedes enviar mensajes temporales.</string>
     <string name="only_your_contact_can_send_disappearing">Sólo tu contacto puede enviar mensajes temporales.</string>
     <string name="prohibit_sending_voice">No se permiten mensajes de voz.</string>
@@ -597,7 +595,7 @@
     <string name="callstatus_rejected">llamada rechazada</string>
     <string name="secret_text">secreto</string>
     <string name="open_simplex_chat_to_accept_call">Abrir SimpleX Chat para aceptar llamada</string>
-    <string name="network_options_reset_to_defaults">Restablecer valores predetarminados</string>
+    <string name="network_options_reset_to_defaults">Reiniciar a valores predetarminados</string>
     <string name="icon_descr_server_status_pending">Pendiente</string>
     <string name="periodic_notifications">Notificaciones periódicas</string>
     <string name="store_passphrase_securely">Guarda la contraseña de forma segura, NO podrás cambiarla si la pierdes.</string>
@@ -606,7 +604,7 @@
     <string name="onboarding_notifications_mode_title">Notificaciones privadas</string>
     <string name="image_descr_profile_image">imagen del perfil</string>
     <string name="prohibit_sending_voice_messages">No se permiten mensajes de voz.</string>
-    <string name="protect_app_screen">Proteger la pantalla de la aplicación</string>
+    <string name="protect_app_screen">Proteger pantalla de la aplicación</string>
     <string name="read_more_in_github_with_link"><![CDATA[Conoce más en nuestro <font color="#0088ff">repositorio GitHub</font> .]]></string>
     <string name="icon_descr_record_voice_message">Grabar mensaje de voz</string>
     <string name="rcv_group_event_member_deleted">ha expulsado a %1$s</string>
@@ -681,22 +679,21 @@
     <string name="open_chat">Abrir chat</string>
     <string name="restore_database">Restaurar copia de seguridad de la base de datos</string>
     <string name="save_passphrase_and_open_chat">Guardar contraseña y abrir el chat</string>
-    <string name="restore_passphrase_not_found_desc">La contraseña no se ha encontrado en Keystore, introdúcela manualmente. Esto puede haber ocurrido si has restaurado los datos de la aplicación con una herramienta de copia de seguridad. Si no es así, por favor ponte en contacto con los desarrolladores.</string>
+    <string name="restore_passphrase_not_found_desc">La frase de contraseña no se ha encontrado en Keystore. Por favor, introdúcela manualmente. Puede deberse a que hayas restaurado los datos de la aplicación mediante alguna herramienta para copias de seguridad. Si no es así, por favor, ponte en contacto con los desarrolladores.</string>
     <string name="remove_member_confirmation">Expulsar</string>
     <string name="button_remove_member">Expulsar miembro</string>
     <string name="button_send_direct_message">Enviar mensaje directo</string>
-    <string name="reset_verb">Restablecer</string>
+    <string name="reset_verb">Reiniciar</string>
     <string name="paste_button">Pegar</string>
     <string name="security_code">Código de seguridad</string>
     <string name="scan_code_from_contacts_app">Escanea el código de seguridad desde la aplicación de tu contacto.</string>
     <string name="smp_servers_save">Guardar servidores</string>
-    <string name="smp_servers_scan_qr">Escanear código QR del servidor</string>
+    <string name="smp_servers_scan_qr">Escanear código QR</string>
     <string name="smp_servers_preset_server">Servidor predefinido</string>
     <string name="save_and_notify_contact">Guardar y notificar contacto</string>
     <string name="save_preferences_question">¿Guardar preferencias\?</string>
     <string name="save_and_notify_group_members">Guardar y notificar grupo</string>
-    <string name="connection_error_auth_desc">A menos que tu contacto haya eliminado la conexión o el enlace haya sido usado, podría ser un error. Por favor, notifícalo.
-\nPara conectarte pide a tu contacto que cree otro enlace y comprueba la conexión de red.</string>
+    <string name="connection_error_auth_desc">A menos que tu contacto haya eliminado la conexión o el enlace se haya usado, podría ser un error. Por favor, notifícalo. \nPara conectarte pide a tu contacto que cree otro enlace y comprueba la conexión de red.</string>
     <string name="periodic_notifications_desc">La aplicación recoge nuevos mensajes periódicamente lo que consume un pequeño porcentaje de batería al día. La aplicación no usa notificaciones push por tanto los datos de tu dispositivo no se envían a los servidores push.</string>
     <string name="la_notice_title_simplex_lock">Bloqueo SimpleX</string>
     <string name="auth_unlock">Desbloquear</string>
@@ -745,15 +742,15 @@
     <string name="icon_descr_settings">Configuración</string>
     <string name="icon_descr_speaker_off">Altavoz desactivado</string>
     <string name="add_contact_or_create_group">Inciar chat nuevo</string>
-    <string name="stop_chat_to_export_import_or_delete_chat_database">Para exportar, importar o eliminar la base de datos debes parar SimpleX. Mientra tanto no podrás recibir o enviar mensajes.</string>
-    <string name="thank_you_for_installing_simplex">Gracias por instalar SimpleX Chat!</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Para proteger tu privacidad, SimpleX dispone de identificadores para las colas de mensajes, independientes para cada uno de tus contactos.</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Para exportar, importar o eliminar la base de datos debes parar SimpleX. Mientra tanto no podrás enviar ni recibir mensajes.</string>
+    <string name="thank_you_for_installing_simplex">¡Gracias por instalar SimpleX Chat!</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Para proteger tu privacidad, SimpleX usa identificadores distintos para cada uno de tus contactos.</string>
     <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Para proteger tu información, activa el Bloqueo SimpleX.
 \nSe te pedirá que completes la autenticación antes de activar esta función.</string>
-    <string name="updating_settings_will_reconnect_client_to_all_servers">Al actualizar la configuración el cliente se reconectará a todos los servidores.</string>
+    <string name="updating_settings_will_reconnect_client_to_all_servers">Para actualizar la configuración el cliente se reconectará a todos los servidores.</string>
     <string name="use_simplex_chat_servers__question">¿Usar servidores SimpleX Chat\?</string>
     <string name="simplex_link_group">Enlace de grupo SimpleX</string>
-    <string name="simplex_link_invitation">Invitación única SimpleX</string>
+    <string name="simplex_link_invitation">Invitación SimpleX de un uso</string>
     <string name="simplex_link_mode">Enlaces SimpleX</string>
     <string name="error_smp_test_server_auth">El servidor requiere autorización para crear colas, comprueba la contraseña</string>
     <string name="enter_passphrase_notification_desc">Para recibir notificaciones, introduce la contraseña de la base de datos</string>
@@ -784,8 +781,8 @@
     <string name="is_not_verified">%s no está verificado</string>
     <string name="smp_servers_test_server">Probar servidor</string>
     <string name="smp_servers_test_servers">Probar servidores</string>
-    <string name="star_on_github">Estrella en GitHub</string>
-    <string name="smp_servers_per_user">Lista de servidores para las conexiones nuevas del perfil</string>
+    <string name="star_on_github">Califica en GitHub</string>
+    <string name="smp_servers_per_user">Servidores para conexiones nuevas en tu perfil</string>
     <string name="network_disable_socks">¿Usar conexión directa a Internet\?</string>
     <string name="profile_is_only_shared_with_your_contacts">El perfil sólo se comparte con tus contactos.</string>
     <string name="callstate_starting">inicializando…</string>
@@ -825,7 +822,7 @@
     <string name="smp_servers_test_failed">¡Prueba no superada!</string>
     <string name="smp_servers_test_some_failed">Algunos servidores no han superado la prueba:</string>
     <string name="smp_servers_use_server">Usar servidor</string>
-    <string name="smp_servers_use_server_for_new_conn">Usar para conexiones nuevas</string>
+    <string name="smp_servers_use_server_for_new_conn">Para conexiones nuevas</string>
     <string name="theme_system">Sistema</string>
     <string name="description_via_one_time_link">mediante enlace de un solo uso</string>
     <string name="your_chats">Chats</string>
@@ -873,7 +870,7 @@
     <string name="simplex_link_mode_browser">Mediante navegador</string>
     <string name="simplex_link_connection">mediante %1$s</string>
     <string name="simplex_service_notification_title">Servicio SimpleX Chat</string>
-    <string name="personal_welcome">¡Bienvenido %1$s !</string>
+    <string name="personal_welcome">¡Bienvenido %1$s!</string>
     <string name="group_preview_you_are_invited">has sido invitado al grupo</string>
     <string name="waiting_for_file">Esperando archivo</string>
     <string name="icon_descr_waiting_for_image">Esperando imagen</string>
@@ -938,7 +935,7 @@
     <string name="your_chat_profiles">Mis perfiles</string>
     <string name="your_simplex_contact_address">Mi dirección SimpleX</string>
     <string name="smp_servers_your_server">Tu servidor</string>
-    <string name="smp_servers_your_server_address">Dirección del servidor</string>
+    <string name="smp_servers_your_server_address">Dirección de tu servidor</string>
     <string name="your_current_profile">Tu perfil actual</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos. Los servidores SimpleX no pueden ver tu perfil.</string>
     <string name="language_system">Sistema</string>
@@ -995,10 +992,10 @@
     <string name="confirm_database_upgrades">Confirmar actualizaciones de la bases de datos</string>
     <string name="mtr_error_no_down_migration">la versión de la base de datos es más reciente que la aplicación, pero no hay migración hacia versión anterior para: %s</string>
     <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
-    <string name="developer_options">IDs de la base de datos y opciónes de aislamiento de transporte.</string>
+    <string name="developer_options">IDs de la base de datos y opciones de aislamiento de transporte.</string>
     <string name="file_will_be_received_when_contact_completes_uploading">El archivo se recibirá cuando el contacto termine de subirlo.</string>
     <string name="image_will_be_received_when_contact_completes_uploading">La imagen se recibirá cuando el contacto termine de subirla.</string>
-    <string name="show_developer_options">Mostrar opciones de desarrollador</string>
+    <string name="show_developer_options">Mostrar opciones para desarrolladores</string>
     <string name="hide_dev_options">Ocultar:</string>
     <string name="show_dev_options">Mostrar:</string>
     <string name="delete_chat_profile">Eliminar perfil</string>
@@ -1109,7 +1106,7 @@
     <string name="opening_database">Abriendo base de datos…</string>
     <string name="error_setting_address">Error al introducir dirección</string>
     <string name="read_more_in_user_guide_with_link"><![CDATA[Conoce más en la <font color="#0088ff">Guía de Usuario</font>.]]></string>
-    <string name="one_time_link_short">Enlace de un uso</string>
+    <string name="one_time_link_short">Enlace de un solo uso</string>
     <string name="simplex_address">Dirección SimpleX</string>
     <string name="you_can_accept_or_reject_connection">Cuando alguien solicite conectarse podrás aceptar o rechazar su solicitud.</string>
     <string name="share_address">Compartir dirección</string>
@@ -1146,7 +1143,7 @@
     <string name="color_sent_message">Mensaje enviado</string>
     <string name="stop_sharing">Dejar de compartir</string>
     <string name="stop_sharing_address">¿Dejar de compartir la dirección\?</string>
-    <string name="theme_colors_section_title">COLORES DEL INTERFAZ</string>
+    <string name="theme_colors_section_title">COLORES DE LA INTERFAZ</string>
     <string name="you_can_create_it_later">Puedes crearla más tarde</string>
     <string name="share_address_with_contacts_question">¿Compartir la dirección con los contactos\?</string>
     <string name="share_with_contacts">Compartir con contactos</string>
@@ -1236,7 +1233,7 @@
     <string name="settings_section_title_app">APLICACIÓN</string>
     <string name="settings_restart_app">Reiniciar</string>
     <string name="settings_shutdown">Cerrar</string>
-    <string name="shutdown_alert_desc">Las notificaciones dejarán de funcionar hasta que reinicies la aplicación</string>
+    <string name="shutdown_alert_desc">Las notificaciones dejarán de funcionar hasta que vuelvas a iniciar la aplicación</string>
     <string name="la_mode_off">Desactivado</string>
     <string name="error_aborting_address_change">Error al cancelar cambio de dirección</string>
     <string name="no_filtered_chats">Sin chats filtrados</string>
@@ -1368,9 +1365,9 @@
     <string name="v5_3_encrypt_local_files">Cifra archivos almacenados y multimedia</string>
     <string name="error_creating_member_contact">Error al establecer contacto con el miembro</string>
     <string name="socks_proxy_setting_limitations"><![CDATA[<b>Recuerda</b>: los servidores están conectados mediante proxy SOCKS, pero las llamadas y las previsualizaciones de enlaces usan conexión directa.]]></string>
-    <string name="encrypt_local_files">Cifra archivos locales</string>
+    <string name="encrypt_local_files">Cifrar archivos locales</string>
     <string name="v5_3_new_desktop_app">Nueva aplicación para ordenador!</string>
-    <string name="v5_3_new_interface_languages">6 idiomas nuevos para el interfaz</string>
+    <string name="v5_3_new_interface_languages">6 nuevos idiomas para la interfaz</string>
     <string name="v5_3_encrypt_local_files_descr">Cifrado de los nuevos archivos locales (excepto vídeos).</string>
     <string name="compose_send_direct_message_to_connect">Envía un mensaje para conectar</string>
     <string name="v5_3_discover_join_groups">Descubre y únete a grupos</string>
@@ -1476,14 +1473,14 @@
     <string name="found_desktop">Ordenador encontrado</string>
     <string name="not_compatible">¡No compatible!</string>
     <string name="waiting_for_mobile_to_connect">Esperando conexión móvil:</string>
-    <string name="remove_member_button">Eliminar miembro</string>
+    <string name="remove_member_button">Expulsar miembro</string>
     <string name="unblock_member_question">¿Desbloquear miembro?</string>
     <string name="open_port_in_firewall_desc">Para permitir que la aplicación móvil se conecte al ordenador, abre este puerto en el firewall si está habilitado</string>
     <string name="settings_section_title_use_from_desktop">Usar desde ordenador</string>
     <string name="session_code">Código de sesión</string>
     <string name="connect_plan_repeat_join_request">¿Repetir solicitud de admisión?</string>
     <string name="create_chat_profile">Crear perfil de chat</string>
-    <string name="button_remove_member_question">¿Eliminar miembro?</string>
+    <string name="button_remove_member_question">¿Expulsar miembro?</string>
     <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">¡Ya estás conectando mediante este enlace de un solo uso!</string>
     <string name="unlink_desktop">Desenlazar</string>
     <string name="this_device_name_shared_with_mobile">El nombre del dispositivo será compartido con el cliente móvil conectado.</string>
@@ -1518,10 +1515,10 @@
     <string name="enable_sending_recent_history">Se envían hasta 100 mensajes más recientes a los miembros nuevos.</string>
     <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Añadir contacto</b>: crea un enlace de invitación nuevo o usa un enlace recibido.]]></string>
     <string name="disable_sending_recent_history">No se envía el historial a los miembros nuevos.</string>
-    <string name="or_show_this_qr_code">O muestra este código QR</string>
+    <string name="or_show_this_qr_code">O muestra el código QR</string>
     <string name="recent_history_is_sent_to_new_members">Hasta 100 últimos mensajes son enviados a los miembros nuevos.</string>
-    <string name="code_you_scanned_is_not_simplex_link_qr_code">El código QR escaneado no es un enlace SimpleX.</string>
-    <string name="the_text_you_pasted_is_not_a_link">El texto pegado no es un enlace SimpleX.</string>
+    <string name="code_you_scanned_is_not_simplex_link_qr_code">El código QR escaneado no es un enlace de SimpleX.</string>
+    <string name="the_text_you_pasted_is_not_a_link">El texto pegado no es un enlace de SimpleX.</string>
     <string name="enable_camera_access">Permitir acceso a la cámara</string>
     <string name="you_can_view_invitation_link_again">Podrás ver el enlace de invitación en detalles de conexión.</string>
     <string name="keep_unused_invitation_question">¿Guardar invitación no usada?</string>
@@ -1545,7 +1542,7 @@
     <string name="error_creating_message">Error al crear mensaje</string>
     <string name="error_deleting_note_folder">Error al eliminar notas privadas</string>
     <string name="clear_note_folder_question">¿Eliminar notas privadas?</string>
-    <string name="developer_options_section">Opciones desarrollador</string>
+    <string name="developer_options_section">Opciones para desarrolladores</string>
     <string name="rcv_group_event_member_blocked">ha bloqueado a %s</string>
     <string name="rcv_group_event_member_unblocked">ha desbloqueado a %s</string>
     <string name="snd_group_event_member_blocked">has bloqueado a %s</string>
@@ -1555,7 +1552,7 @@
     <string name="block_for_all_question">¿Bloqear miembro para todos?</string>
     <string name="share_text_created_at">Creado: %s</string>
     <string name="block_for_all">Bloquear para todos</string>
-    <string name="unblock_for_all_question">¿Desbloquear miembro para todos?</string>
+    <string name="unblock_for_all_question">¿Desbloquear el miembro para todos?</string>
     <string name="unblock_for_all">Desbloquear para todos</string>
     <string name="member_info_member_blocked">bloqueado</string>
     <string name="member_blocked_by_admin">bloqueado por administrador</string>
@@ -1573,15 +1570,14 @@
     <string name="remote_ctrl_error_inactive">El ordenador está inactivo</string>
     <string name="remote_ctrl_error_busy">El ordenador está ocupado</string>
     <string name="agent_critical_error_title">Error crítico</string>
-    <string name="clear_note_folder_warning">Todos los mensajes serán borrados. ¡No podrá deshacerse!</string>
+    <string name="clear_note_folder_warning">Todos los mensajes serán eliminados. ¡No puede deshacerse!</string>
     <string name="start_chat_question">¿Iniciar chat?</string>
     <string name="welcome_message_is_too_long">Mensaje de bienvenida demasiado largo</string>
     <string name="remote_ctrl_error_timeout">Tiempo de espera para conectar con el ordenador agotado</string>
     <string name="remote_ctrl_error_bad_invitation">El ordenador tiene un código de invitación incorrecto</string>
     <string name="remote_ctrl_error_disconnected">El ordenador ha sido desconectado</string>
     <string name="group_member_status_unknown">estado desconocido</string>
-    <string name="database_migration_in_progress">Migración de la base de datos en progreso.
-\nPodría tardar varios minutos.</string>
+    <string name="database_migration_in_progress">Migración de la base de datos en curso. \nPodría tardar varios minutos.</string>
     <string name="remote_ctrl_error_bad_version">El ordenador tiene una versión sin soporte. Por favor, asegúrate de usar la misma versión en ambos dispositivos</string>
     <string name="profile_update_event_contact_name_changed">el contacto %1$s ha cambiado a %2$s</string>
     <string name="profile_update_event_updated_profile">perfil actualizado</string>
@@ -1687,8 +1683,8 @@
     <string name="migrate_from_device_error_saving_settings">Error al guardar ajustes</string>
     <string name="migrate_from_device_exported_file_doesnt_exist">El archivo exportado no existe</string>
     <string name="migrate_from_device_chat_should_be_stopped">Para continuar, SimpleX debe estar parado.</string>
-    <string name="e2ee_info_no_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos mediante <b>cifrado de extremo a extremo</b> con secreto perfecto hacía adelante, repudio y recuperación tras ataque.]]></string>
-    <string name="e2ee_info_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos mediante <b>cifrado de extremo a extremo resistente a tecnología cuántica</b> con secreto perfecto hacía adelante, repudio y recuperación tras ataque.]]></string>
+    <string name="e2ee_info_no_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos mediante <b>cifrado de extremo a extremo</b> con secreto perfecto hacia adelante, repudio y recuperación tras ataque.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos mediante <b>cifrado de extremo a extremo resistente a tecnología cuántica</b> con secreto perfecto hacia adelante, repudio y recuperación tras ataque.]]></string>
     <string name="migrate_to_device_title">Migrar aquí</string>
     <string name="migrate_from_device_to_another_device">Migrar a otro dispositivo</string>
     <string name="v5_6_app_data_migration_descr">Migrar a otro dispositivo mediante código QR.</string>
@@ -1715,7 +1711,7 @@
     <string name="simplex_links_not_allowed">Enlaces SimpleX no permitidos</string>
     <string name="voice_messages_not_allowed">Mensajes de voz no permitidos</string>
     <string name="simplex_links">Enlaces SimpleX</string>
-    <string name="group_members_can_send_simplex_links">Los miembros pueden enviar enlaces SimpleX.</string>
+    <string name="group_members_can_send_simplex_links">Los miembros pueden enviar enlaces de SimpleX.</string>
     <string name="simplex_links_are_prohibited_in_group">Enlaces SimpleX no permitidos.</string>
     <string name="feature_roles_owners">propietarios</string>
     <string name="network_type_cellular">Móvil</string>
@@ -1761,7 +1757,7 @@
 \nError del servidor de destino: %2$s</string>
     <string name="snd_error_proxy">Servidor de reenvío: %1$s
 \nError: %2$s</string>
-    <string name="snd_error_expired">Problema en la red - el mensaje ha expirado tras muchos intentos de envío.</string>
+    <string name="snd_error_expired">Problema en la red - el mensaje ha caducado tras muchos intentos de envío.</string>
     <string name="srv_error_version">La versión del servidor es incompatible con la configuración de la red.</string>
     <string name="network_smp_proxy_mode_private_routing">Enrutamiento privado</string>
     <string name="network_smp_proxy_mode_unknown">Servidores desconocidos</string>
@@ -1785,7 +1781,7 @@
     <string name="srv_error_host">La dirección del servidor es incompatible con la configuración de la red.</string>
     <string name="network_smp_proxy_mode_unprotected">Con IP desprotegida</string>
     <string name="snd_error_auth">Clave incorrecta o conexión desconocida - probablemente esta conexión fue eliminada</string>
-    <string name="network_smp_proxy_mode_unknown_description">Usar enrutamiento privado con servidores de retransmisión desconocidos.</string>
+    <string name="network_smp_proxy_mode_unknown_description">Usar enrutamiento privado con servidores de mensaje desconocidos.</string>
     <string name="network_smp_proxy_fallback_allow_protected_description">Enviar mensajes directamente cuando tu dirección IP está protegida y tu servidor o el de destino no admitan enrutamiento privado.</string>
     <string name="file_not_approved_title">¡Servidores desconocidos!</string>
     <string name="file_not_approved_descr">Sin Tor o VPN, tu dirección IP será visible para estos relés XFTP:
@@ -1811,10 +1807,10 @@
     <string name="color_received_quote">Respuesta recibida</string>
     <string name="wallpaper_scale_repeat">Mosaico</string>
     <string name="theme_remove_image">Quitar imagen</string>
-    <string name="reset_single_color">Restablecer color</string>
+    <string name="reset_single_color">Reiniciar color</string>
     <string name="wallpaper_scale">Escala</string>
     <string name="color_sent_quote">Respuesta enviada</string>
-    <string name="chat_theme_set_default_theme">Establecer tema predeterminado</string>
+    <string name="chat_theme_set_default_theme">Establecer tema predefinido</string>
     <string name="color_mode_system">Sistema</string>
     <string name="color_wallpaper_background">Color de fondo</string>
     <string name="wallpaper_scale_fit">Encaje</string>
@@ -1826,7 +1822,7 @@
     <string name="message_queue_info_server_info">información cola del servidor: %1$s
 \n
 \núltimo mensaje recibido: %2$s</string>
-    <string name="chat_theme_reset_to_app_theme">Restablecer al tema de la aplicación</string>
+    <string name="chat_theme_reset_to_app_theme">Reiniciar al tema de la aplicación</string>
     <string name="v5_8_private_routing">Enrutamiento privado de mensajes 🚀</string>
     <string name="v5_8_safe_files">Recibe archivos de forma segura</string>
     <string name="v5_8_message_delivery">Mejora del envío de mensajes</string>
@@ -1838,14 +1834,13 @@
     <string name="v5_8_chat_themes">Nuevos temas de chat</string>
     <string name="message_queue_info">Información cola de mensajes</string>
     <string name="message_queue_info_none">ninguno</string>
-    <string name="v5_8_private_routing_descr">Protege tu dirección IP de los servidores de retransmisión elegidos por tus contactos.
-\nActívalo en ajustes de *Servidores y Redes*.</string>
-    <string name="chat_theme_reset_to_user_theme">Restablecer al tema del usuario</string>
+    <string name="v5_8_private_routing_descr">Protege tu dirección IP de los servidores elegidos por tus contactos.\nActívalo en *Servidores y Red*.</string>
+    <string name="chat_theme_reset_to_user_theme">Reiniciar al tema del usuario</string>
     <string name="error_initializing_web_view">Error al inicializar WebView. Actualiza tu sistema a la última versión. Por favor, ponte en contacto con los desarrolladores.
 \nError: %s</string>
     <string name="v5_8_persian_ui">Interfaz en persa</string>
     <string name="file_error_auth">Clave incorrecta o dirección del bloque del archivo desconocida. Es probable que el archivo se haya eliminado.</string>
-    <string name="file_error_no_file">Archivo no encontrado, probablemente haya sido borrado o cancelado.</string>
+    <string name="file_error_no_file">Archivo no encontrado, probablemente haya sido eliminado o cancelado.</string>
     <string name="file_error_relay">Error del servidor de archivos: %1$s</string>
     <string name="file_error">Error de archivo</string>
     <string name="temporary_file_error">Error en archivo temporal</string>
@@ -1859,10 +1854,10 @@
     <string name="remote_ctrl_connection_stopped_identity_desc">Este enlace ha sido usado en otro dispositivo móvil, por favor crea un enlace nuevo en el ordenador.</string>
     <string name="cannot_share_message_alert_title">No se puede enviar el mensaje</string>
     <string name="cannot_share_message_alert_text">Las preferencias seleccionadas no permiten este mensaje.</string>
-    <string name="servers_info">Info servidores</string>
+    <string name="servers_info">Estadísticas servidores</string>
     <string name="servers_info_files_tab">Archivos</string>
     <string name="servers_info_target">Mostrando</string>
-    <string name="subscribed">Suscrito</string>
+    <string name="subscribed">Suscritas</string>
     <string name="subscription_errors">Errores de suscripción</string>
     <string name="subscription_results_ignored">Suscripciones ignoradas</string>
     <string name="app_check_for_updates_notice_desc">Para ser notificado sobre versiones nuevas, activa el chequeo periódico para las versiones Estable o Beta.</string>
@@ -1883,7 +1878,7 @@
     <string name="servers_info_subscriptions_total">Total</string>
     <string name="servers_info_transport_sessions_section_header">Sesiones de transporte</string>
     <string name="xftp_server">Servidor XFTP</string>
-    <string name="servers_info_proxied_servers_section_footer">No estás conectado a estos servidores. Para enviarles mensajes se usa el enrutamiento privado.</string>
+    <string name="servers_info_proxied_servers_section_footer">No tienes conexión directa a estos servidores. Los mensajes destinados a estos usan enrutamiento privado.</string>
     <string name="all_users">Todos los perfiles</string>
     <string name="servers_info_sessions_connected">Conectadas</string>
     <string name="servers_info_detailed_statistics">Estadísticas detalladas</string>
@@ -1905,10 +1900,10 @@
     <string name="private_routing_error">Error de enrutamiento privado</string>
     <string name="network_error_broker_host_desc">La dirección del servidor es incompatible con la configuración de red: %1$s.</string>
     <string name="network_error_broker_version_desc">La versión del servidor es incompatible con tu aplicación: %1$s.</string>
-    <string name="appearance_font_size">Tamaño fuente</string>
-    <string name="servers_info_reset_stats_alert_error_title">Error al restablecer las estadísticas</string>
-    <string name="servers_info_reset_stats_alert_confirm">Restablecer</string>
-    <string name="servers_info_reset_stats_alert_message">Las estadísticas de los servidores serán restablecidas. ¡No podrá deshacerse!</string>
+    <string name="appearance_font_size">Tamaño de la fuente</string>
+    <string name="servers_info_reset_stats_alert_error_title">Error al reiniciar las estadísticas</string>
+    <string name="servers_info_reset_stats_alert_confirm">Reiniciar</string>
+    <string name="servers_info_reset_stats_alert_message">Las estadísticas de los servidores serán restablecidas. ¡No puede deshacerse!</string>
     <string name="servers_info_downloaded">Descargado</string>
     <string name="smp_server">Servidor SMP</string>
     <string name="message_forwarded_desc">Aún no hay conexión directa, el mensaje es reenviado por el administrador.</string>
@@ -1945,16 +1940,16 @@
     <string name="servers_info_reconnect_all_servers_button">Reconectar todos los servidores</string>
     <string name="servers_info_reconnect_server_title">¿Reconectar servidor?</string>
     <string name="servers_info_reconnect_servers_title">¿Reconectar servidores?</string>
-    <string name="servers_info_reconnect_server_message">Reconectar el servidor para forzar la entrega de mensajes. Usa tráfico adicional.</string>
+    <string name="servers_info_reconnect_server_message">Reconectar con el servidor para forzar la entrega de mensajes. Se usa tráfico adicional.</string>
     <string name="servers_info_reconnect_servers_message">Reconectar todos los servidores para forzar la entrega de mensajes. Usa tráfico adicional.</string>
-    <string name="servers_info_reset_stats">Restablecer todas las estadísticas</string>
-    <string name="servers_info_reset_stats_alert_title">¿Restablecer todas las estadísticas?</string>
+    <string name="servers_info_reset_stats">Reiniciar estadísticas</string>
+    <string name="servers_info_reset_stats_alert_title">¿Reiniciar todas las estadísticas?</string>
     <string name="servers_info_detailed_statistics_sent_messages_header">Mensajes enviados</string>
     <string name="servers_info_detailed_statistics_sent_messages_total">Total enviados</string>
     <string name="downloaded_files">Archivos descargados</string>
     <string name="download_errors">Errores de descarga</string>
     <string name="duplicates_label">duplicados</string>
-    <string name="expired_label">expirados</string>
+    <string name="expired_label">caducados</string>
     <string name="open_server_settings_button">Abrir configuración del servidor</string>
     <string name="other_label">otros</string>
     <string name="other_errors">otros errores</string>
@@ -1968,8 +1963,7 @@
     <string name="size">Tamaño</string>
     <string name="servers_info_subscriptions_connections_subscribed">Conexiones activas</string>
     <string name="servers_info_starting_from">Iniciado el %s.</string>
-    <string name="servers_info_private_data_disclaimer">Iniciado el %s
-\nTodos los datos son privados a tu dispositivo</string>
+    <string name="servers_info_private_data_disclaimer">Iniciado el %s \nLos datos son privados en tu dispositivo.</string>
     <string name="chunks_deleted">Bloques eliminados</string>
     <string name="chunks_downloaded">Bloques descargados</string>
     <string name="chunks_uploaded">Bloques subidos</string>
@@ -2003,10 +1997,10 @@
     <string name="toolbar_settings">Configuración</string>
     <string name="confirm_delete_contact_question">¿Confirmas la eliminación del contacto?</string>
     <string name="contact_deleted">¡Contacto eliminado!</string>
-    <string name="delete_contact_cannot_undo_warning">El contacto será eliminado. ¡No podrá deshacerse!</string>
+    <string name="delete_contact_cannot_undo_warning">El contacto será eliminado. ¡No puede deshacerse!</string>
     <string name="conversation_deleted">¡Conversación eliminada!</string>
     <string name="delete_without_notification">Elimina sin notificar</string>
-    <string name="only_delete_conversation">Sólo borrar la conversación</string>
+    <string name="only_delete_conversation">Eliminar sólo la conversación</string>
     <string name="keep_conversation">Conservar conversación</string>
     <string name="info_view_search_button">buscar</string>
     <string name="deleted_chats">Contactos archivados</string>
@@ -2024,7 +2018,7 @@
     <string name="calls_prohibited_ask_to_enable_calls_alert_text">Por favor, pide a tu contacto que active las llamadas.</string>
     <string name="cant_call_member_send_message_alert_text">Enviar mensaje para activar llamadas.</string>
     <string name="v6_0_delete_many_messages_descr">Elimina hasta 20 mensajes a la vez.</string>
-    <string name="v6_0_reachable_chat_toolbar">Barra de herramientas accesible</string>
+    <string name="v6_0_reachable_chat_toolbar">Barra de menú accesible</string>
     <string name="v6_0_your_contacts_descr">Archiva contactos para charlar más tarde.</string>
     <string name="chat_database_exported_save">Puedes guardar el archivo exportado.</string>
     <string name="privacy_media_blur_radius_strong">Fuerte</string>
@@ -2039,7 +2033,7 @@
     <string name="proxy_destination_error_broker_host">La dirección del servidor de destino de %1$s es incompatible con la configuración del servidor de reenvío %2$s.</string>
     <string name="proxy_destination_error_broker_version">La versión del servidor de destino de %1$s es incompatible con el servidor de reenvío %2$s.</string>
     <string name="contact_list_header_title">Tus contactos</string>
-    <string name="you_need_to_allow_calls">Necesitas permitir que tus contacto llamen para poder llamarles.</string>
+    <string name="you_need_to_allow_calls">Debes permitir que tus contacto te llamen para poder llamarles.</string>
     <string name="smp_proxy_error_connecting">Error al conectar con el servidor de reenvío %1$s. Por favor, inténtalo más tarde.</string>
     <string name="smp_proxy_error_broker_host">La dirección del servidor de reenvío es incompatible con la configuración de red: %1$s.</string>
     <string name="proxy_destination_error_failed_to_connect">El servidor de reenvío %1$s no ha podido conectarse al servidor de destino %2$s. Por favor, intentalo más tarde.</string>
@@ -2069,14 +2063,13 @@
     <string name="forward_alert_forward_messages_without_files">¿Reenviar mensajes sin los archivos?</string>
     <string name="network_proxy_incorrect_config_desc">Asegúrate de que la configuración del proxy es correcta.</string>
     <string name="forward_files_missing_desc">%1$d archivo(s) ha(n) sido eliminado(s).</string>
-    <string name="n_file_errors">%1$d error(es) de archivo
-\n%2$s</string>
+    <string name="n_file_errors">%1$d error(es) de archivo:\n%2$s</string>
     <string name="forward_files_failed_to_receive_desc">La descarga ha fallado para %1$d archivo(s).</string>
     <string name="forward_files_not_accepted_desc">%1$d archivo(s) no se ha(n) descargado.</string>
     <string name="forward_files_messages_deleted_after_selection_title">%1$s mensajes no enviados</string>
     <string name="forward_files_not_accepted_receive_files">Descargar</string>
     <string name="compose_forward_messages_n">Reenviando %1$s mensajes</string>
-    <string name="forward_files_messages_deleted_after_selection_desc">Los mensajes han sido borrados después de seleccionarlos.</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">Los mensajes han sido eliminados después de seleccionarlos.</string>
     <string name="forward_alert_title_nothing_to_forward">¡Nada para reenviar!</string>
     <string name="compose_save_messages_n">Guardando %1$s mensajes</string>
     <string name="network_proxy_auth_mode_no_auth">No uses credenciales con proxy.</string>
@@ -2090,10 +2083,10 @@
     <string name="network_proxy_auth_mode_username_password">Tus credenciales podrían ser enviadas sin cifrar.</string>
     <string name="migrate_from_device_remove_archive_question">¿Eliminar archivo?</string>
     <string name="migrate_from_device_uploaded_archive_will_be_removed">El archivo de bases de datos subido será eliminado permanentemente de los servidores.</string>
-    <string name="delete_messages_cannot_be_undone_warning">Los mensajes serán eliminados. ¡No podrá deshacerse!</string>
+    <string name="delete_messages_cannot_be_undone_warning">Los mensajes serán eliminados. ¡No puede deshacerse!</string>
     <string name="switching_profile_error_title">Error al cambiar perfil</string>
     <string name="select_chat_profile">Selecciona perfil de chat</string>
-    <string name="new_chat_share_profile">Comparte perfil</string>
+    <string name="new_chat_share_profile">Perfil a compartir</string>
     <string name="switching_profile_error_message">Tu conexión ha sido trasladada a %s pero ha ocurrido un error inesperado al redirigirte al perfil.</string>
     <string name="icon_descr_sound_muted">Sonido silenciado</string>
     <string name="error_initializing_web_view_wrong_arch">Error al iniciar WebView. Asegúrate de tener WebView instalado y que sea compatible con la arquitectura amr64.\nError: %s</string>
@@ -2101,12 +2094,12 @@
     <string name="settings_message_shape_corner">Esquinas</string>
     <string name="settings_message_shape_tail">Cola</string>
     <string name="network_session_mode_session_description">Se usarán credenciales SOCKS nuevas cada vez que inicies la aplicación.</string>
-    <string name="network_session_mode_session">Sesión de aplicación</string>
+    <string name="network_session_mode_session">por sesión</string>
     <string name="call_desktop_permission_denied_safari">Abre la configuración de Safari / Sitios Web / Micrófono y a continuación selecciona Permitir para localhost.</string>
     <string name="call_desktop_permission_denied_chrome">Pulsa el botón info del campo dirección para permitir el uso del micrófono.</string>
     <string name="call_desktop_permission_denied_title">Para hacer llamadas, permite el uso del micrófono. Cuelga e intenta llamar de nuevo.</string>
-    <string name="network_session_mode_server_description">Se usarán credenciales SOCKS nuevas por cada servidor.</string>
-    <string name="network_session_mode_server">Servidor</string>
+    <string name="network_session_mode_server_description">Se usarán credenciales SOCKS nuevas para cada servidor.</string>
+    <string name="network_session_mode_server">por servidor</string>
     <string name="v6_1_better_calls">Llamadas mejoradas</string>
     <string name="v6_1_message_dates_descr">Sistema de fechas mejorado.</string>
     <string name="v6_1_better_user_experience">Experiencia de usuario mejorada</string>
@@ -2115,18 +2108,18 @@
     <string name="v6_1_better_security_descr">Protocolos de SimpleX auditados por Trail of Bits.</string>
     <string name="v6_1_better_calls_descr">Intercambia audio y video durante la llamada.</string>
     <string name="v6_1_better_security">Seguridad mejorada ✅</string>
-    <string name="v6_1_delete_many_messages_descr">Borra o modera hasta 200 mensajes a la vez.</string>
+    <string name="v6_1_delete_many_messages_descr">Elimina o modera hasta 200 mensajes a la vez.</string>
     <string name="v6_1_switch_chat_profile_descr">Cambia el perfil de chat para invitaciones de un solo uso.</string>
     <string name="failed_to_save_servers">Error al guardar servidores</string>
     <string name="errors_in_servers_configuration">Error en la configuración del servidor.</string>
     <string name="for_chat_profile">Para el perfil de chat %s:</string>
-    <string name="no_message_servers_configured">Ningún servidor de mensajes.</string>
-    <string name="no_media_servers_configured_for_private_routing">Ningún servidor para recibir archivos.</string>
-    <string name="no_media_servers_configured_for_sending">Ningún servidor para enviar archivos.</string>
+    <string name="no_message_servers_configured">Sin servidores para mensajes.</string>
+    <string name="no_media_servers_configured_for_private_routing">Sin servidores para recibir archivos.</string>
+    <string name="no_media_servers_configured_for_sending">Sin servidores para enviar archivos.</string>
     <string name="connection_security">Seguridad de conexión</string>
     <string name="share_1_time_link_with_a_friend">Compartir enlace de un uso con un amigo</string>
     <string name="share_simplex_address_on_social_media">Comparte tu dirección SimpleX en redes sociales.</string>
-    <string name="address_settings">Configuración de dirección</string>
+    <string name="address_settings">Ajustes de dirección</string>
     <string name="create_1_time_link">Crear enlace de un uso</string>
     <string name="for_social_media">Para redes sociales</string>
     <string name="simplex_address_or_1_time_link">¿Dirección SimpleX o enlace de un uso?</string>
@@ -2142,7 +2135,7 @@
     <string name="operator_servers_title">%s servidores</string>
     <string name="operator_conditions_will_be_accepted_on">Las condiciones serán aceptadas el: %s.</string>
     <string name="operator_conditions_of_use">Condiciones de uso</string>
-    <string name="operator_use_for_messages_private_routing">Para el enrutamiento privado</string>
+    <string name="operator_use_for_messages_private_routing">Para enrutamiento privado</string>
     <string name="error_adding_server">Error al añadir servidor</string>
     <string name="operator_open_changes">Abrir cambios</string>
     <string name="operator_open_conditions">Abrir condiciones</string>
@@ -2158,49 +2151,49 @@
     <string name="operator_conditions_accepted">Condiciones aceptadas</string>
     <string name="operator_added_xftp_servers">Servidores de archivos y multimedia añadidos</string>
     <string name="operator_added_message_servers">Servidores de mensajes añadidos</string>
-    <string name="address_or_1_time_link">¿Dirección o enlace de un uso?</string>
+    <string name="address_or_1_time_link">¿Dirección o enlace de un solo uso?</string>
     <string name="operator_conditions_accepted_for_enabled_operators_on">Las condiciones serán aceptadas automáticamente para los operadores habilitados el: %s.</string>
     <string name="onboarding_network_operators_continue">Continuar</string>
     <string name="operator_conditions_failed_to_load">El texto con las condiciones actuales no se ha podido cargar, puedes revisar las condiciones en el siguiente enlace:</string>
-    <string name="v6_2_network_decentralization_enable_flux">Habilita Flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">Activa Flux en Servidores y Red para mejorar la privacidad de los metadatos.</string>
     <string name="error_accepting_operator_conditions">Error al aceptar las condiciones</string>
     <string name="error_updating_server_title">Error al actualizar el servidor</string>
     <string name="v6_2_network_decentralization_enable_flux_reason">para mejorar la privacidad de los metadatos.</string>
     <string name="message_deleted_or_not_received_error_title">Ningún mensaje</string>
     <string name="smp_servers_new_server">Servidor nuevo</string>
-    <string name="no_media_servers_configured">Ningún servidor de archivos y multimedia.</string>
-    <string name="no_message_servers_configured_for_private_routing">Ningún servidor para enrutamiento privado.</string>
-    <string name="no_message_servers_configured_for_receiving">Ningún servidor para recibir mensajes.</string>
+    <string name="no_media_servers_configured">Sin servidores para archivos y multimedia.</string>
+    <string name="no_message_servers_configured_for_private_routing">Sin servidores para enrutamiento privado.</string>
+    <string name="no_message_servers_configured_for_receiving">Sin servidores para recibir mensajes.</string>
     <string name="operator_server_alert_title">Servidor del operador</string>
     <string name="or_to_share_privately">O para compartir en privado</string>
     <string name="onboarding_select_network_operators_to_use">Selecciona los operadores de red a utilizar</string>
-    <string name="share_address_publicly">Campartir dirección públicamente</string>
-    <string name="simplex_address_and_1_time_links_are_safe_to_share">Compartir los enlaces de un uso y las direcciones SimpleX es seguro a través de cualquier medio.</string>
+    <string name="share_address_publicly">Compartir dirección públicamente</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Compartir enlaces de un solo uso y direcciones SimpleX es seguro a través de cualquier medio.</string>
     <string name="onboarding_network_operators_update">Actualizar</string>
     <string name="operator_website">Sitio web</string>
     <string name="your_servers">Tus servidores</string>
     <string name="use_servers_of_operator_x">Usar %s</string>
     <string name="operator_use_operator_toggle_description">Usar servidores</string>
-    <string name="operator_use_for_messages">Usar para mensajes</string>
+    <string name="operator_use_for_messages">Uso para mensajes</string>
     <string name="view_conditions">Ver condiciones</string>
     <string name="operator_use_for_messages_receiving">Para recibir</string>
     <string name="operator_use_for_sending">Para enviar</string>
-    <string name="operator_use_for_files">Usar para archivos</string>
+    <string name="operator_use_for_files">Uso para archivos</string>
     <string name="appearance_in_app_bars_alpha">Transparencia</string>
     <string name="view_updated_conditions">Ver condiciones actualizadas</string>
     <string name="connection_error_quota">Mensajes no entregados</string>
     <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Los enlaces de un uso pueden ser usados <i>solamente con un contacto</i> - comparte en persona o mediante cualquier aplicación de mensajería.]]></string>
     <string name="you_can_set_connection_name_to_remember">Puedes añadir un nombre a la conexión para recordar a quién corresponde.</string>
     <string name="onboarding_network_operators_app_will_use_different_operators">La aplicación protege tu privacidad mediante el uso de diferentes operadores en cada conversación.</string>
-    <string name="onboarding_network_operators_conditions_you_can_configure">Puedes configurar los operadores desde Servidores y Redes.</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Puedes configurar los operadores desde los ajustes de Servidores y Red.</string>
     <string name="operators_conditions_accepted_for"><![CDATA[Las condiciones se han aceptado para el(los) operador(s): <b>%s</b>.]]></string>
     <string name="operators_conditions_will_be_accepted_for"><![CDATA[Las condiciones serán aceptadas para el/los operador(es): <b>%s</b>.]]></string>
     <string name="operator_conditions_accepted_for_some"><![CDATA[Las condiciones ya se han aceptado para el/los siguiente(s) operador(s): <b>%s</b>.]]></string>
     <string name="operator_same_conditions_will_be_applied"><![CDATA[Las mismas condiciones se aplican al operador <b>%s</b>.]]></string>
     <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Las condiciones serán aceptadas para el/los operador(es): <b>%s</b>.]]></string>
     <string name="operators_conditions_will_also_apply"><![CDATA[Estas condiciones también se aplican para: <b>%s</b>.]]></string>
-    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Para usar los servidores de <b>%s</b>, acepta las condiciones de uso.]]></string>
-    <string name="xftp_servers_per_user">Los servidores para archivos nuevos en tu perfil actual</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Para usar los servidores de <b>%s</b>, debes aceptar las condiciones de uso.]]></string>
+    <string name="xftp_servers_per_user">Servidores para enviar archivos en tu perfil</string>
     <string name="v6_2_network_decentralization_descr">¡Segundo operador predefinido!</string>
     <string name="onboarding_network_operators_configure_via_settings">Puedes configurar los servidores a través de su configuración.</string>
     <string name="to_protect_against_your_link_replaced_compare_codes">Para protegerte contra una sustitución del enlace, puedes comparar los códigos de seguridad con tu contacto.</string>
@@ -2209,7 +2202,7 @@
     <string name="onboarding_network_operators_app_will_use_for_routing">Por ejemplo, si tu contacto recibe a través de un servidor de SimpleX Chat, tu aplicación enviará a través de un servidor de Flux.</string>
     <string name="address_creation_instruction">Pulsa Crear dirección SimpleX en el menú para crearla más tarde.</string>
     <string name="connection_error_quota_desc">La conexión ha alcanzado el límite de mensajes no entregados. es posible que tu contacto esté desconectado.</string>
-    <string name="message_deleted_or_not_received_error_desc">El mensaje ha sido borrado o aún no se ha recibido.</string>
+    <string name="message_deleted_or_not_received_error_desc">El mensaje ha sido eliminado o aún no se ha recibido.</string>
     <string name="remote_hosts_section">Móvil remoto</string>
     <string name="chat_archive">O importa desde un archivo</string>
     <string name="direct_messages_are_prohibited_in_chat">Mensajes directos entre miembros de este chat no permitidos.</string>
@@ -2217,18 +2210,18 @@
     <string name="maximum_message_size_reached_text">Por favor, reduce el tamaño del mensaje y envíalo de nuevo.</string>
     <string name="maximum_message_size_reached_non_text">Por favor, reduce el tamaño del mensaje o elimina los archivos y envíalo de nuevo.</string>
     <string name="maximum_message_size_reached_forwarding">Puedes copiar y reducir el tamaño del mensaje para enviarlo.</string>
-    <string name="add_your_team_members_to_conversations">Añade a los miembros de tu equipo a las conversaciones.</string>
+    <string name="add_your_team_members_to_conversations">Añade a miembros de tu equipo a las conversaciones.</string>
     <string name="onboarding_notifications_mode_battery">Notificaciones y batería</string>
     <string name="invite_to_chat_button">Invitar al chat</string>
     <string name="button_add_friends">Añadir amigos</string>
     <string name="button_add_team_members">Añadir miembros del equipo</string>
-    <string name="delete_chat_for_all_members_cannot_undo_warning">El chat será eliminado para todos los miembros. ¡No podrá deshacerse!</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">El chat será eliminado para todos los miembros. ¡No puede deshacerse!</string>
     <string name="button_delete_chat">Eliminar chat</string>
     <string name="delete_chat_question">¿Eliminar chat?</string>
     <string name="button_leave_chat">Salir del chat</string>
-    <string name="delete_chat_for_self_cannot_undo_warning">El chat será eliminado para tí. ¡No podrá deshacerse!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">El chat será eliminado para tí. ¡No puede deshacerse!</string>
     <string name="only_chat_owners_can_change_prefs">Sólo los propietarios del chat pueden cambiar las preferencias.</string>
-    <string name="member_will_be_removed_from_chat_cannot_be_undone">El miembro será eliminado del chat. ¡No podrá deshacerse!</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">El miembro será eliminado del chat. ¡No puede deshacerse!</string>
     <string name="member_role_will_be_changed_with_notification_chat">El rol cambiará a %s. Todos serán notificados.</string>
     <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Dejarás de recibir mensajes de este chat. El historial del chat se conserva.</string>
     <string name="how_it_helps_privacy">Cómo ayuda a la privacidad</string>
@@ -2243,7 +2236,7 @@
     <string name="onboarding_notifications_mode_periodic_desc_short">Comprobar mensajes cada 10 min.</string>
     <string name="onboarding_notifications_mode_off_desc_short">Sin servicio en segundo plano</string>
     <string name="info_row_chat">Chat</string>
-    <string name="chat_bottom_bar">Barra de herramientas accesible</string>
+    <string name="chat_bottom_bar">Barra de chat accesible</string>
     <string name="direct_messages_are_prohibited">Mensajes directos entre miembros no permitidos.</string>
     <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Ya estás conectado con <b>%1$s</b>.]]></string>
     <string name="connect_plan_chat_already_exists">¡El chat ya existe!</string>
@@ -2251,5 +2244,147 @@
     <string name="onboarding_notifications_mode_service_desc_short">La aplicación siempre funciona en segundo plano</string>
     <string name="all_message_and_files_e2e_encrypted"><![CDATA[Todos los mensajes y archivos son enviados <b>cifrados de extremo a extremo</b> y con seguridad postcuántica en mensajes directos.]]></string>
     <string name="maximum_message_size_title">¡Mensaje demasiado largo!</string>
-    <string name="onboarding_network_operators_simplex_flux_agreement">Simplex Chat y Flux han acordado incluir servidores operados por Flux en la aplicación.</string>
-</resources>
\ No newline at end of file
+    <string name="onboarding_network_operators_simplex_flux_agreement">Simplex Chat y Flux han acordado incluir en la aplicación servidores operados por Flux.</string>
+    <string name="debug_logs">Activar registros</string>
+    <string name="error_saving_database">Error al guardar base de datos</string>
+    <string name="sync_connection_desc">La conexión requiere renegociar el cifrado.</string>
+    <string name="encryption_renegotiation_in_progress">Renegociación de cifrado en curso.</string>
+    <string name="sync_connection_confirm">Reparar</string>
+    <string name="sync_connection_question">¿Reparar conexión?</string>
+    <string name="connection_not_ready">Conexión no establecida.</string>
+    <string name="error_loading_chat_tags">Error al cargar listas de chat</string>
+    <string name="error_updating_chat_tags">Error al actualizar las listas de chat</string>
+    <string name="chat_list_favorites">Favoritos</string>
+    <string name="list_menu">Lista</string>
+    <string name="no_chats">Sin chats</string>
+    <string name="no_chats_found">Ningún chat encontrado</string>
+    <string name="no_chats_in_list">Sin chats en la lista %s.</string>
+    <string name="chat_list_add_list">Añadir lista</string>
+    <string name="chat_list_all">Todo</string>
+    <string name="chat_list_businesses">Empresas</string>
+    <string name="chat_list_contacts">Contactos</string>
+    <string name="chat_list_groups">Grupos</string>
+    <string name="open_with_app">Abrir con %s</string>
+    <string name="add_to_list">Añadir a la lista</string>
+    <string name="delete_chat_list_warning">Todos los chats se quitarán de la lista %s y esta será eliminada</string>
+    <string name="create_list">Crear lista</string>
+    <string name="delete_chat_list_menu_action">Eliminar</string>
+    <string name="delete_chat_list_question">¿Eliminar lista?</string>
+    <string name="edit_chat_list_menu_action">Editar</string>
+    <string name="list_name_field_placeholder">Nombre de la lista...</string>
+    <string name="duplicated_list_error">El nombre y el emoji deben ser diferentes en todas las listas.</string>
+    <string name="save_list">Guardar lista</string>
+    <string name="no_unread_chats">Ningún chat sin leer</string>
+    <string name="error_creating_chat_tags">Error al crear lista de chat</string>
+    <string name="chat_list_notes">Notas</string>
+    <string name="change_order_chat_list_menu_action">Reordenar</string>
+    <string name="change_list">Cambiar lista</string>
+    <string name="error_creating_report">Error al crear informe</string>
+    <string name="prefs_error_saving_settings">Error al guardar la configuración</string>
+    <string name="report_item_archived_by">informe archivado por %s</string>
+    <string name="report_archive_alert_title">¿Archivar informe?</string>
+    <string name="report_archive_alert_desc">El informe será archivado para ti.</string>
+    <string name="report_verb">Informar</string>
+    <string name="delete_report">Eliminar informe</string>
+    <string name="group_reports_active_one">1 informe</string>
+    <string name="chat_list_group_reports">Informes</string>
+    <string name="report_compose_reason_header_spam">Informar de spam: sólo los moderadores del grupo lo verán.</string>
+    <string name="report_compose_reason_header_community">Informar de violación: sólo los moderadores del grupo lo verán.</string>
+    <string name="report_compose_reason_header_illegal">Informar de contenido: sólo los moderadores del grupo lo verán.</string>
+    <string name="report_compose_reason_header_other">Informar de otros: sólo los moderadores del grupo lo verán.</string>
+    <string name="group_member_role_moderator">moderador</string>
+    <string name="blocking_reason_content">El contenido viola las condiciones de uso.</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="connection_error_blocked">Conexión bloqueada</string>
+    <string name="connection_error_blocked_desc">Conexión bloqueada por el operador del servidor:\n%1$s.</string>
+    <string name="report_reason_alert_title">¿Motivo del informe?</string>
+    <string name="file_error_blocked">Archivo bloqueado por el operador del servidor:\n%1$s</string>
+    <string name="archive_verb">Archivar</string>
+    <string name="archive_report">Archivar informe</string>
+    <string name="group_reports_member_reports">Informes de miembros</string>
+    <string name="group_reports_active">%d informes</string>
+    <string name="report_compose_reason_header_profile">Informar del perfil de un miembro: sólo los moderadores del grupo lo verán.</string>
+    <string name="report_reason_other">Otro motivo</string>
+    <string name="report_item_archived">informes archivados</string>
+    <string name="report_reason_community">Violación de las normas de la comunidad</string>
+    <string name="report_reason_illegal">Contenido inapropiado</string>
+    <string name="report_reason_profile">Perfil inapropiado</string>
+    <string name="report_item_visibility_moderators">Solo el remitente y el moderador pueden verlo</string>
+    <string name="report_item_visibility_submitter">Solo tú y los moderadores podéis verlo</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="privacy_chat_list_open_links">Abrir enlaces desde listado de chats</string>
+    <string name="privacy_chat_list_open_links_yes">Si</string>
+    <string name="privacy_chat_list_open_links_no">No</string>
+    <string name="privacy_chat_list_open_web_link_question">¿Abrir enlace web?</string>
+    <string name="privacy_chat_list_open_links_ask">Preguntar</string>
+    <string name="privacy_chat_list_open_web_link">Abrir enlace</string>
+    <string name="text_field_set_chat_placeholder">Nombre para el chat…</string>
+    <string name="disable_automatic_deletion_question">¿Desactivar la eliminación automática de mensajes?</string>
+    <string name="disable_automatic_deletion">Desactivar</string>
+    <string name="change_automatic_deletion_question">¿Modificar la eliminación automática de mensajes?</string>
+    <string name="chat_ttl_options_footer">Elimina los mensajes del dispositivo</string>
+    <string name="disable_automatic_deletion_message">Los mensajes de esta conversación nunca se eliminan.</string>
+    <string name="change_automatic_chat_deletion_message">Todos los mensajes previos al período seleccionado serán eliminados del chat. ¡No puede deshacerse!</string>
+    <string name="chat_item_ttl_year">1 año</string>
+    <string name="chat_item_ttl_default">predefinido (%s)</string>
+    <string name="network_smp_web_port_section_title">Puerto TCP para mensajes</string>
+    <string name="network_smp_web_port_footer">Se usa el puerto TCP %1$s cuando no se ha especificado otro.</string>
+    <string name="network_smp_web_port_toggle">Usar puerto web</string>
+    <string name="mute_all_chat">Silenciar todo</string>
+    <string name="unread_mentions">Menciones sin leer</string>
+    <string name="max_group_mentions_per_message_reached">¡Puedes mencionar hasta %1$s miembros por mensaje!</string>
+    <string name="group_members_can_send_reports">Los miembros pueden informar de mensajes a los moderadores.</string>
+    <string name="disable_sending_member_reports">No se permite informar de mensajes a los moderadores.</string>
+    <string name="enable_sending_member_reports">Se permite informar de mensajes a los moderadores.</string>
+    <string name="notification_group_report">Informe: %s</string>
+    <string name="report_archive_alert_title_nth">¿Archivar %d informes?</string>
+    <string name="archive_reports">Archivar informes</string>
+    <string name="report_archive_for_all_moderators">Para todos los moderadores</string>
+    <string name="report_archive_for_me">para mí</string>
+    <string name="member_reports_are_prohibited">No se permite informar de mensajes en este grupo.</string>
+    <string name="report_archive_alert_desc_all">Todos los informes serán archivados para ti.</string>
+    <string name="report_archive_alert_title_all">¿Archivar todos los informes?</string>
+    <string name="v6_3_mentions_descr">Las menciones ahora se notifican.</string>
+    <string name="v6_3_mentions">Menciona a miembros 👋</string>
+    <string name="v6_3_organize_chat_lists_descr">No pierdas los mensajes importantes.</string>
+    <string name="v6_3_organize_chat_lists">Organiza tus chats en listas</string>
+    <string name="v6_3_private_media_file_names">Nombres privados en archivos de media.</string>
+    <string name="v6_3_faster_deletion_of_groups">Eliminación más rápida de grupos.</string>
+    <string name="v6_3_faster_sending_messages">Envío más rápido de mensajes.</string>
+    <string name="v6_3_reports_descr">Ayuda a los admins a moderar sus grupos.</string>
+    <string name="v6_3_better_groups_performance">Rendimiento de grupos mejorado</string>
+    <string name="v6_3_better_privacy_and_security">Privacidad y seguridad mejoradas</string>
+    <string name="v6_3_reports">Envía informes privados</string>
+    <string name="v6_3_set_message_expiration_in_chats">Establece el vencimiento para los mensajes en los chats.</string>
+    <string name="group_preview_rejected">rechazado</string>
+    <string name="group_member_status_rejected">rechazado</string>
+    <string name="button_remove_members_question">¿Expulsar miembros?</string>
+    <string name="unblock_members_desc">¡Los mensajes de estos miembros serán mostrados!</string>
+    <string name="unblock_members_for_all_question">¿Desbloquear los miembros para todos?</string>
+    <string name="block_members_desc">¡Todos los mensajes nuevos de estos miembros estarán ocultos!</string>
+    <string name="block_members_for_all_question">¿Bloquear miembros para todos?</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Los miembros serán expulsados del chat. ¡No puede deshacerse!</string>
+    <string name="operator_updated_conditions">Condiciones actualizadas</string>
+    <string name="feature_roles_moderators">moderadores</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Los miembros serán expulsados del grupo. ¡No puede deshacerse!</string>
+    <string name="group_member_status_pending_approval">pendiente de aprobación</string>
+    <string name="group_member_status_pending_approval_short">pendiente</string>
+    <string name="error_reading_passphrase">Error al leer la frase de contraseña de la base de datos</string>
+    <string name="restore_passphrase_can_not_be_read_desc">La frase de contraseña no se ha podido leer en Keystore. Puede deberse a alguna actualización del sistema incompatible con la aplicación. Si no es así, por favor, ponte en contacto con los desarrolladores.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">La frase de contraseña no se ha podido leer en Keystore. Por favor, introdúcela manualmente. Puede deberse a alguna actualización del sistema incompatible con la aplicación. Si no es así, por favor, ponte en contacto con los desarrolladores.</string>
+    <string name="onboarding_conditions_accept">Aceptar</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Política de privacidad y condiciones de uso.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Los chats privados, los grupos y tus contactos no son accesibles para los operadores de servidores.</string>
+    <string name="onboarding_conditions_by_using_you_agree">Al usar SimpleX Chat, aceptas:\n- enviar únicamente contenido legal en los grupos públicos.\n- respetar a los demás usuarios - spam prohibido.</string>
+    <string name="onboarding_conditions_configure_server_operators">Configurar operadores de servidores</string>
+    <string name="simplex_link_channel">Enlace de canal SimpleX</string>
+    <string name="full_link_button_text">Enlace completo</string>
+    <string name="short_link_button_text">Enlace corto</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Este enlace requiere una versión más reciente de la aplicación. Por favor, actualiza la aplicación o pide a tu contacto un enlace compatible.</string>
+    <string name="unsupported_connection_link">Enlace de conexión no compatible</string>
+    <string name="privacy_short_links">Usar enlaces cortos (BETA)</string>
+    <string name="network_smp_web_port_preset_footer">Usar puerto TCP 443 solo en servidores predefinidos.</string>
+    <string name="network_smp_web_port_all">Todos los servidores</string>
+    <string name="network_smp_web_port_preset">Servidores predefinidos</string>
+    <string name="network_smp_web_port_off">No</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/fa/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/fa/strings.xml
index 866506460c..b8e99587f7 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/fa/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/fa/strings.xml
@@ -1850,4 +1850,5 @@
 \nلطفا هر مشکل دیگری را با توسعه‌دهندگان به اشتراک بگذارید.</string>
     <string name="remote_ctrl_connection_stopped_identity_desc">این لینک توسط موبایل دیگری استفاده شده است، لطفا لینک جدیدی در کامپیوتر بسازید.</string>
     <string name="file_error_relay">خطای سرور پرونده:%1$s</string>
-</resources>
\ No newline at end of file
+    <string name="n_file_errors">%1$d خطای پرونده:\n%2$s</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/fi/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/fi/strings.xml
index 26847aeaf5..1dd6598ef3 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/fi/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/fi/strings.xml
@@ -1501,4 +1501,4 @@
     <string name="desktop_incompatible_version">Yhteensopimaton versio</string>
     <string name="new_mobile_device">Uusi mobiililaite</string>
     <string name="this_device">Tämä laite</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml
index 62891fd8b8..43fcb2f5f7 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml
@@ -80,14 +80,14 @@
     <string name="service_notifications">Notifications instantanées !</string>
     <string name="service_notifications_disabled">Les notifications instantanées sont désactivées !</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Il peut être désactivé via les paramètres</b> - les notifications seront toujours affichées lorsque l\'application est en cours d\'exécution.]]></string>
-    <string name="turning_off_service_and_periodic">L\'optimisation de la batterie est active et désactive le service de fond et les demandes périodiques de nouveaux messages. Vous pouvez les réactiver via les paramètres.</string>
+    <string name="turning_off_service_and_periodic">Lorsque l\'optimisation de la batterie est activée, le service en arrière-plan et les demandes périodiques de nouveaux messages sont désactivés. Il est possible de les réactiver dans les paramètres.</string>
     <string name="periodic_notifications">Notifications périodiques</string>
     <string name="periodic_notifications_disabled">Les notifications périodiques sont désactivées !</string>
     <string name="enter_passphrase_notification_title">Une phrase secrète est nécessaire</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Pour l\'utiliser, veuillez <b>autoriser SimpleX à fonctionner en arrière-plan</b> dans la fenêtre de dialogue suivante. Sinon, les notifications seront désactivées.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Autoriser le</b> dans la boîte de dialogue suivante pour recevoir des notifications instantanément.]]></string>
     <string name="error_smp_test_server_auth">Le serveur requiert une autorisation pour créer des files d\'attente, vérifiez le mot de passe</string>
     <string name="periodic_notifications_desc">L\'application récupère périodiquement les nouveaux messages - elle utilise un peu votre batterie chaque jour. L\'application n\'utilise pas les notifications push - les données de votre appareil ne sont pas envoyées aux serveurs.</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Pour protéger votre vie privée, au lieu des notifications push, l\'application possède un <b>SimpleX service de fond</b> - il utilise quelques pour cent de la batterie par jour.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Pour protéger votre vie privée, <b>SimpleX fonctionne en arrière-plan</b> au lieu d\'utiliser les notifications push.]]></string>
     <string name="hide_notification">Cacher</string>
     <string name="settings_notification_preview_mode_title">Aperçu affiché</string>
     <string name="notification_preview_mode_contact">Nom du contact</string>
@@ -147,8 +147,8 @@
     <string name="you_have_no_chats">Vous n\'avez aucune discussion</string>
     <string name="images_limit_title">Trop d’images !</string>
     <string name="share_file">Partager le fichier…</string>
-    <string name="attach">Attacher</string>
-    <string name="icon_descr_cancel_image_preview">Annuler l’aperçu d’image</string>
+    <string name="attach">Joindre</string>
+    <string name="icon_descr_cancel_image_preview">Annuler l\'aperçu de l\'image</string>
     <string name="icon_descr_cancel_file_preview">Annuler l’aperçu du fichier</string>
     <string name="icon_descr_sent_msg_status_send_failed">échec d’envoi</string>
     <string name="icon_descr_received_msg_status_unread">non lu</string>
@@ -275,7 +275,7 @@
     <string name="icon_descr_email">E-mail</string>
     <string name="connect_button">Se connecter</string>
     <string name="notifications_mode_off_desc">L\'application peut recevoir des notifications uniquement lorsqu\'elle est en cours d\'exécution, aucun service d\'arrière-plan ne sera lancé.</string>
-    <string name="notifications_mode_service_desc">Le service d\'arrière-plan fonctionne en permanence. Les notifications s\'affichent dès que les messages sont disponibles.</string>
+    <string name="notifications_mode_service_desc">Le service est toujours en cours d’exécution en arrière-plan, les notifications s’afficheront dès que les messages seront disponibles.</string>
     <string name="notification_preview_mode_message_desc">Afficher le contact et le message</string>
     <string name="notification_display_mode_hidden_desc">Masquer le contact et le message</string>
     <string name="auth_log_in_using_credential">Connectez-vous en utilisant votre identifiant</string>
@@ -302,7 +302,7 @@
     <string name="invalid_contact_link">Lien invalide !</string>
     <string name="this_link_is_not_a_valid_connection_link">Ce lien n\'est pas un lien de connexion valide !</string>
     <string name="connection_request_sent">Demande de connexion envoyée !</string>
-    <string name="file_will_be_received_when_contact_is_online">Le fichier sera reçu quand votre contact sera en ligne, merci d\'attendre ou de revenir plus tard !</string>
+    <string name="file_will_be_received_when_contact_is_online">Le fichier sera reçu lorsque votre contact sera en ligne, veuillez patienter ou vérifier plus tard !</string>
     <string name="voice_message_send_text">Message vocal…</string>
     <string name="maximum_supported_file_size">La taille maximale supportés des fichiers actuellement est de %1$s.</string>
     <string name="voice_message_with_duration">Message vocal (%1$s)</string>
@@ -370,11 +370,11 @@
     <string name="callstate_received_confirmation">confimation reçu…</string>
     <string name="callstate_connecting">connexion…</string>
     <string name="opensource_protocol_and_code_anybody_can_run_servers">N\'importe qui peut heberger un serveur.</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Pour protéger votre vie privée, au lieu d\'IDs utilisés par toutes les autres plateformes, SimpleX possède des IDs pour les queues de messages, distinctes pour chacun de vos contacts.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Pour protéger votre vie privée, SimpleX utilise des identifiants distincts pour chacun de vos contacts.</string>
     <string name="paste_the_link_you_received">Collez le lien que vous avez reçu</string>
     <string name="use_chat">Utiliser le chat</string>
     <string name="onboarding_notifications_mode_title">Notifications privées</string>
-    <string name="onboarding_notifications_mode_subtitle">Peut être modifié ultérieurement via les paramètres.</string>
+    <string name="onboarding_notifications_mode_subtitle">Comment il affecte la batterie</string>
     <string name="onboarding_notifications_mode_off">Quand l\'application fonctionne</string>
     <string name="onboarding_notifications_mode_periodic">Périodique</string>
     <string name="onboarding_notifications_mode_service">Instantanée</string>
@@ -438,7 +438,7 @@
     <string name="callstate_waiting_for_confirmation">en attente de confirmation…</string>
     <string name="callstate_connected">connecté</string>
     <string name="callstate_ended">terminé</string>
-    <string name="next_generation_of_private_messaging">La nouvelle génération \nde messagerie privée</string>
+    <string name="next_generation_of_private_messaging">L\'avenir de la messagerie</string>
     <string name="privacy_redefined">La vie privée redéfinie</string>
     <string name="first_platform_without_user_ids">Aucun identifiant d\'utilisateur.</string>
     <string name="immune_to_spam_and_abuse">Protégé du spam</string>
@@ -448,12 +448,12 @@
     <string name="make_private_connection">Établir une connexion privée</string>
     <string name="how_it_works">Comment ça fonctionne</string>
     <string name="how_simplex_works">Comment SimpleX fonctionne</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un <b>chiffrement de bout en bout à deux couches</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages.</string>
     <string name="read_more_in_github_with_link"><![CDATA[Pour en savoir plus, consultez notre <font color="#0088ff">GitHub repository</font>.]]></string>
     <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Batterie peu utilisée</b>. L\'app vérifie les messages toutes les 10 minutes. Vous risquez de manquer des appels ou des messages urgents.]]></string>
     <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Consomme davantage de batterie </b> L\'app fonctionne toujours en arrière-plan - les notifications s\'affichent instantanément.]]></string>
     <string name="integrity_msg_skipped">%1$d message(s) manqué(s)</string>
-    <string name="integrity_msg_bad_id">ID de message incorrecte</string>
+    <string name="integrity_msg_bad_id">ID du message incorrect</string>
     <string name="settings_section_title_settings">PARAMÈTRES</string>
     <string name="alert_text_skipped_messages_it_can_happen_when">Cela peut arriver quand :
 \n1. Les messages ont expiré dans le client expéditeur après 2 jours ou sur le serveur après 30 jours.
@@ -575,7 +575,7 @@
     <string name="contact_wants_to_connect_via_call">%1$s veut se connecter à vous via</string>
     <string name="your_calls">Vos appels</string>
     <string name="always_use_relay">Se connecter via relais</string>
-    <string name="call_on_lock_screen">Appels en écran verrouillé :</string>
+    <string name="call_on_lock_screen">Appels sur l\'écran de verrouillage :</string>
     <string name="show_call_on_lock_screen">Afficher</string>
     <string name="no_call_on_lock_screen">Désactiver</string>
     <string name="your_ice_servers">Vos serveurs ICE</string>
@@ -595,12 +595,12 @@
     <string name="icon_descr_call_missed">Appel manqué</string>
     <string name="icon_descr_call_connecting">Appel en connexion</string>
     <string name="answer_call">Répondre à l\'appel</string>
-    <string name="integrity_msg_bad_hash">hash de message incorrect</string>
+    <string name="integrity_msg_bad_hash">mauvais hachage du message</string>
     <string name="integrity_msg_duplicate">message dupliqué</string>
     <string name="alert_title_skipped_messages">Messages manqués</string>
     <string name="privacy_and_security">Vie privée et sécurité</string>
     <string name="protect_app_screen">Protéger l\'écran de l\'app</string>
-    <string name="auto_accept_images">Images auto-acceptées</string>
+    <string name="auto_accept_images">Acceptation automatique des images</string>
     <string name="full_backup">Sauvegarde des données de l\'app</string>
     <string name="settings_section_title_you">VOUS</string>
     <string name="settings_section_title_help">AIDE</string>
@@ -638,7 +638,7 @@
     <string name="change_database_passphrase_question">Changer la phrase secrète de la base de données \?</string>
     <string name="database_will_be_encrypted">La base de données sera chiffrée.</string>
     <string name="keychain_error">Erreur de la keychain</string>
-    <string name="file_with_path">Fichier : %s</string>
+    <string name="file_with_path">Fichier : %s</string>
     <string name="database_passphrase_is_required">La phrase secrète de la base de données est nécessaire pour ouvrir le chat.</string>
     <string name="save_passphrase_and_open_chat">Enregistrer la phrase secrète et ouvrir le chat</string>
     <string name="open_chat">Ouvrir le chat</string>
@@ -753,8 +753,8 @@
     <string name="theme_system">Système</string>
     <string name="allow_direct_messages">Autoriser l\'envoi de messages directs aux membres.</string>
     <string name="prohibit_direct_messages">Interdire l\'envoi de messages directs aux membres.</string>
-    <string name="group_members_can_delete">Les membres du groupe peuvent supprimer de manière irréversible les messages envoyés. (24 heures)</string>
-    <string name="message_deletion_prohibited_in_chat">La suppression irréversible de messages est interdite dans ce groupe.</string>
+    <string name="group_members_can_delete">Les membres peuvent supprimer de manière irréversible les messages envoyés. (24 heures)</string>
+    <string name="message_deletion_prohibited_in_chat">La suppression irréversible de messages est interdite.</string>
     <string name="sending_via">Envoi via</string>
     <string name="network_status">État du réseau</string>
     <string name="switch_receiving_address">Changer d\'adresse de réception</string>
@@ -789,8 +789,8 @@
     <string name="only_you_can_send_disappearing">Seulement vous pouvez envoyer des messages éphémères.</string>
     <string name="only_you_can_send_voice">Vous seul pouvez envoyer des messages vocaux.</string>
     <string name="allow_to_delete_messages">Autoriser la suppression irréversible de messages envoyés. (24 heures)</string>
-    <string name="disappearing_messages_are_prohibited">Les messages éphémères sont interdits dans ce groupe.</string>
-    <string name="group_members_can_send_voice">Les membres du groupe peuvent envoyer des messages vocaux.</string>
+    <string name="disappearing_messages_are_prohibited">Les messages éphémères sont interdits.</string>
+    <string name="group_members_can_send_voice">Les membres peuvent envoyer des messages vocaux.</string>
     <string name="delete_after">Supprimer après</string>
     <string name="ttl_sec">%d sec</string>
     <string name="ttl_s">%ds</string>
@@ -818,7 +818,7 @@
     <string name="allow_your_contacts_to_send_disappearing_messages">Autorise votre contact à envoyer des messages éphémères.</string>
     <string name="conn_level_desc_direct">directe</string>
     <string name="group_is_decentralized">Entièrement décentralisé – visible que par ses membres.</string>
-    <string name="group_members_can_send_disappearing">Les membres du groupes peuvent envoyer des messages éphémères.</string>
+    <string name="group_members_can_send_disappearing">Les membres peuvent envoyer des messages éphémères.</string>
     <string name="prohibit_sending_disappearing_messages">Interdire l’envoi de messages éphémères.</string>
     <string name="incognito_info_protects">Le mode incognito protège votre vie privée en utilisant un nouveau profil aléatoire pour chaque contact.</string>
     <string name="updating_settings_will_reconnect_client_to_all_servers">La mise à jour des ces paramètres reconnectera le client à tous les serveurs.</string>
@@ -828,8 +828,8 @@
     <string name="allow_irreversible_message_deletion_only_if">Autoriser la suppression irréversible des messages uniquement si votre contact vous l\'autorise. (24 heures)</string>
     <string name="only_your_contact_can_delete">Seul votre contact peut supprimer de manière irréversible des messages (vous pouvez les marquer comme supprimé). (24 heures)</string>
     <string name="only_your_contact_can_send_disappearing">Seulement votre contact peut envoyer des messages éphémères.</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Vous et votre contact êtes tous deux en mesure d\'envoyer des messages éphémères.</string>
-    <string name="voice_messages_are_prohibited">Les messages vocaux sont interdits dans ce groupe.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Vous et votre contact pouvez envoyer des messages éphémères.</string>
+    <string name="voice_messages_are_prohibited">Les messages vocaux sont interdits.</string>
     <string name="group_display_name_field">Saisir le nom du groupe :</string>
     <string name="conn_level_desc_indirect">indirecte (%1$s)</string>
     <string name="info_row_group">Groupe</string>
@@ -842,9 +842,9 @@
     <string name="network_options_reset_to_defaults">Réinitialisation des valeurs par défaut</string>
     <string name="network_option_protocol_timeout">Délai du protocole</string>
     <string name="network_option_ping_interval">Intervalle de PING</string>
-    <string name="both_you_and_your_contacts_can_delete">Vous et votre contact êtes tous deux en mesure de supprimer de manière irréversible les messages envoyés. (24 heures)</string>
+    <string name="both_you_and_your_contacts_can_delete">Vous et votre contact pouvez supprimer de manière irréversible les messages envoyés. (24 heures)</string>
     <string name="message_deletion_prohibited">La suppression irréversible de message est interdite dans ce chat.</string>
-    <string name="both_you_and_your_contact_can_send_voice">Vous et votre contact êtes tous deux en mesure d\'envoyer des messages vocaux.</string>
+    <string name="both_you_and_your_contact_can_send_voice">Vous et votre contact pouvez envoyer des messages vocaux.</string>
     <string name="only_your_contact_can_send_voice">Seul votre contact peut envoyer des messages vocaux.</string>
     <string name="voice_prohibited_in_this_chat">Les messages vocaux sont interdits dans ce chat.</string>
     <string name="disappearing_prohibited_in_this_chat">Les messages éphémères sont interdits dans cette discussion.</string>
@@ -853,7 +853,7 @@
     <string name="allow_to_send_disappearing">Autorise l’envoi de messages éphémères.</string>
     <string name="prohibit_sending_disappearing">Interdire l’envoi de messages éphémères.</string>
     <string name="prohibit_message_deletion">Interdire la suppression irréversible des messages.</string>
-    <string name="group_members_can_send_dms">Les membres du groupe peuvent envoyer des messages directs.</string>
+    <string name="group_members_can_send_dms">Les membres peuvent envoyer des messages directs.</string>
     <string name="direct_messages_are_prohibited_in_group">Les messages directs entre membres sont interdits dans ce groupe.</string>
     <string name="v4_4_live_messages_desc">Les destinataires voient les mises à jour au fur et à mesure que vous les tapez.</string>
     <string name="v4_4_verify_connection_security">Vérifier la sécurité de la connexion</string>
@@ -872,7 +872,7 @@
     <string name="v4_4_disappearing_messages_desc">Les messages envoyés seront supprimés après une durée déterminée.</string>
     <string name="v4_4_live_messages">Messages dynamiques</string>
     <string name="accept_feature">Accepter</string>
-    <string name="v4_2_auto_accept_contact_requests">Demandes de contact auto-acceptées</string>
+    <string name="v4_2_auto_accept_contact_requests">Acceptation automatique des demandes de contact</string>
     <string name="whats_new">Quoi de neuf \?</string>
     <string name="v4_2_group_links_desc">Les admins peuvent créer les liens qui permettent de rejoindre les groupes.</string>
     <string name="accept_feature_set_1_day">Définir 1 jour</string>
@@ -916,11 +916,11 @@
     <string name="failed_to_create_user_duplicate_desc">Vous avez déjà un profil de chat avec ce même nom affiché. Veuillez choisir un autre nom.</string>
     <string name="failed_to_create_user_duplicate_title">Nom d\'affichage en double !</string>
     <string name="v4_4_french_interface">Interface en français</string>
-    <string name="v4_5_transport_isolation_descr">Par profil de chat (par défaut) ou par connexion (BETA).</string>
+    <string name="v4_5_transport_isolation_descr">Par profil de discussion (par défaut) ou par connexion (BETA).</string>
     <string name="v4_5_italian_interface">Interface en italien</string>
     <string name="v4_5_message_draft">Brouillon de message</string>
-    <string name="v4_5_reduced_battery_usage_descr">Plus d\'améliorations à venir !</string>
-    <string name="v4_5_multiple_chat_profiles">Différents profils de chat</string>
+    <string name="v4_5_reduced_battery_usage_descr">D\'autres améliorations sont à venir !</string>
+    <string name="v4_5_multiple_chat_profiles">Profils de discussion multiples</string>
     <string name="v4_5_message_draft_descr">Conserver le brouillon du dernier message, avec les pièces jointes.</string>
     <string name="v4_5_reduced_battery_usage">Réduction de la consommation de batterie</string>
     <string name="v4_5_private_filenames">Noms de fichiers privés</string>
@@ -947,7 +947,7 @@
     <string name="button_add_welcome_message">Ajouter un message d\'accueil</string>
     <string name="v4_6_group_moderation">Modération de groupe</string>
     <string name="user_hide">Cacher</string>
-    <string name="muted_when_inactive">Mute en cas d\'inactivité !</string>
+    <string name="muted_when_inactive">Mise en sourdine en cas d\'inactivité !</string>
     <string name="confirm_password">Confirmer le mot de passe</string>
     <string name="v4_6_reduced_battery_usage">Réduction accrue de l\'utilisation de la batterie</string>
     <string name="v4_6_chinese_spanish_interface">Interface en chinois et en espagnol</string>
@@ -1035,7 +1035,7 @@
     <string name="lock_not_enabled">SimpleX Lock n\'est pas activé !</string>
     <string name="la_lock_mode_system">Authentification du système</string>
     <string name="la_authenticate">Authentification</string>
-    <string name="la_auth_failed">Echec de l\'authentification</string>
+    <string name="la_auth_failed">Échec de l’authentification</string>
     <string name="la_change_app_passcode">Modifier le code d\'accès</string>
     <string name="la_current_app_passcode">Code d\'accès actuel</string>
     <string name="la_minutes">%d minutes</string>
@@ -1055,18 +1055,17 @@
     <string name="passcode_set">Code d\'accès défini !</string>
     <string name="la_mode_system">Système</string>
     <string name="authentication_cancelled">Authentification annulée</string>
-    <string name="alert_title_msg_bad_id">Mauvais ID de message</string>
-    <string name="alert_text_msg_bad_hash">Le hash du message précédent est différent.</string>
+    <string name="alert_title_msg_bad_id">ID du message incorrect</string>
+    <string name="alert_text_msg_bad_hash">Le hash du message précédent est différent.\"</string>
     <string name="alert_text_msg_bad_id">L\'ID du message suivant est incorrect (inférieur ou égal au précédent).
 \nCela peut se produire en raison d\'un bug ou lorsque la connexion est compromise.</string>
     <string name="decryption_error">Erreur de déchiffrement</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">Cela peut se produire lorsque vous ou votre contact avez utilisé une ancienne sauvegarde de base de données.</string>
-    <string name="alert_title_msg_bad_hash">Mauvais hash de message</string>
+    <string name="alert_title_msg_bad_hash">Mauvais hachage du message</string>
     <string name="allow_calls_only_if">Autoriser les appels que si votre contact les autorise.</string>
     <string name="allow_your_contacts_to_call">Autorise vos contacts à vous appeler.</string>
     <string name="audio_video_calls">Appels audio/vidéo</string>
-    <string name="available_in_v51">"
-\nDisponible dans la v5.1"</string>
+    <string name="available_in_v51">\nDisponible dans la v5.1</string>
     <string name="prohibit_calls">Interdire les appels audio/vidéo.</string>
     <string name="revoke_file__message">Le fichier sera supprimé des serveurs.</string>
     <string name="revoke_file__confirm">Révoquer</string>
@@ -1075,7 +1074,7 @@
     <string name="stop_snd_file__message">L\'envoi du fichier sera interrompu.</string>
     <string name="alert_text_fragment_please_report_to_developers">Veuillez le signaler aux développeurs.</string>
     <string name="submit_passcode">Soumettre</string>
-    <string name="both_you_and_your_contact_can_make_calls">Vous et votre contact pouvez tous deux passer des appels.</string>
+    <string name="both_you_and_your_contact_can_make_calls">Vous et votre contact pouvez passer des appels.</string>
     <string name="only_you_can_make_calls">Vous seul pouvez passer des appels.</string>
     <string name="calls_prohibited_with_this_contact">Les appels audio/vidéo sont interdits.</string>
     <string name="confirm_passcode">Confirmer le code d\'accès</string>
@@ -1119,7 +1118,7 @@
     <string name="share_address">Partager l\'adresse</string>
     <string name="you_can_share_this_address_with_your_contacts">Vous pouvez partager cette adresse avec vos contacts pour leur permettre de se connecter avec %s.</string>
     <string name="group_welcome_preview">Aperçu</string>
-    <string name="color_background">Fond</string>
+    <string name="color_background">Arrière-plan</string>
     <string name="dark_theme">Thème sombre</string>
     <string name="export_theme">Exporter le thème</string>
     <string name="import_theme">Importer un thème</string>
@@ -1133,7 +1132,7 @@
     <string name="add_address_to_your_profile">Ajoutez une adresse à votre profil, afin que vos contacts puissent la partager avec d\'autres personnes. La mise à jour du profil sera envoyée à vos contacts.</string>
     <string name="color_secondary_variant">Secondaire supplémentaire</string>
     <string name="all_your_contacts_will_remain_connected_update_sent">Tous vos contacts resteront connectés. La mise à jour du profil sera envoyée à vos contacts.</string>
-    <string name="auto_accept_contact">Auto-accepter</string>
+    <string name="auto_accept_contact">Acceptation automatique</string>
     <string name="create_simplex_address">Créer une adresse SimpleX</string>
     <string name="customize_theme_title">Personnaliser le thème</string>
     <string name="continue_to_next_step">Continuer</string>
@@ -1144,7 +1143,7 @@
     <string name="email_invite_body">Bonjour !
 \nContactez-moi via SimpleX Chat : %s</string>
     <string name="if_you_cant_meet_in_person">Si vous ne pouvez pas vous rencontrer en personne, montrez le code QR lors d\'un appel vidéo ou partagez le lien.</string>
-    <string name="auth_open_chat_profiles">Ouvrir les profils de chat</string>
+    <string name="auth_open_chat_profiles">Changer de profil de discussion</string>
     <string name="color_surface">Menus et alertes</string>
     <string name="color_received_message">Message reçu</string>
     <string name="import_theme_error_desc">Assurez-vous que le fichier a une syntaxe YAML correcte. Exporter le thème pour avoir un exemple de la structure du fichier du thème.</string>
@@ -1181,8 +1180,8 @@
     <string name="only_you_can_add_message_reactions">Vous seul pouvez ajouter des réactions aux messages.</string>
     <string name="allow_message_reactions">Autoriser les réactions aux messages.</string>
     <string name="prohibit_message_reactions_group">Interdire les réactions aux messages.</string>
-    <string name="group_members_can_add_message_reactions">Les membres du groupe peuvent ajouter des réactions aux messages.</string>
-    <string name="message_reactions_are_prohibited">Les réactions aux messages sont interdites dans ce groupe.</string>
+    <string name="group_members_can_add_message_reactions">Les membres peuvent ajouter des réactions aux messages.</string>
+    <string name="message_reactions_are_prohibited">Les réactions aux messages sont interdites.</string>
     <string name="custom_time_unit_hours">heures</string>
     <string name="custom_time_unit_minutes">minutes</string>
     <string name="custom_time_unit_seconds">secondes</string>
@@ -1250,8 +1249,8 @@
     <string name="network_option_protocol_timeout_per_kb">Délai d\'attente du protocole par KB</string>
     <string name="files_and_media_prohibited">Fichiers et médias interdits !</string>
     <string name="allow_to_send_files">Permet l\'envoi de fichiers et de médias.</string>
-    <string name="group_members_can_send_files">Les membres du groupe peuvent envoyer des fichiers et des médias.</string>
-    <string name="files_are_prohibited_in_group">Les fichiers et les médias sont interdits dans ce groupe.</string>
+    <string name="group_members_can_send_files">Les membres peuvent envoyer des fichiers et des médias.</string>
+    <string name="files_are_prohibited_in_group">Les fichiers et les médias sont interdits.</string>
     <string name="fix_connection_not_supported_by_group_member">Correction non prise en charge par un membre du groupe</string>
     <string name="settings_section_title_delivery_receipts">ENVOYER DES ACCUSÉS DE RÉCEPTION AUX</string>
     <string name="sync_connection_force_desc">Le chiffrement fonctionne et le nouvel accord de chiffrement n\'est pas nécessaire. Cela peut provoquer des erreurs de connexion !</string>
@@ -1273,7 +1272,7 @@
     <string name="receipts_contacts_enable_for_all">Activer pour tous</string>
     <string name="receipts_contacts_enable_keep_overrides">Activer (conserver les remplacements)</string>
     <string name="snd_conn_event_ratchet_sync_agreed">chiffrement accepté pour %s</string>
-    <string name="v5_2_favourites_filter_descr">Filtrer les messages non lus et favoris.</string>
+    <string name="v5_2_favourites_filter_descr">Filtrer les favoris et les messages non lus.</string>
     <string name="v5_2_favourites_filter">Recherche de message plus rapide</string>
     <string name="in_reply_to">En réponse à</string>
     <string name="v5_2_more_things_descr">- une diffusion plus stable des messages.
@@ -1424,7 +1423,7 @@
     <string name="unblock_member_desc">Les messages de %s seront affichés !</string>
     <string name="error_sending_message_contact_invitation">Erreur lors de l\'envoi de l\'invitation</string>
     <string name="non_content_uri_alert_text">Vous avez partagé un chemin de fichier non valide. Signalez le problème aux développeurs de l\'application.</string>
-    <string name="block_member_question">Bloquer ce membre ?</string>
+    <string name="block_member_question">Bloquer ce membre ?</string>
     <string name="rcv_group_events_count">%d événements de groupe</string>
     <string name="invalid_name">Nom invalide !</string>
     <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Voici votre lien pour le groupe <b>%1$s</b> !]]></string>
@@ -1480,7 +1479,7 @@
     <string name="disconnect_remote_host">Se déconnecter</string>
     <string name="group_member_role_author">auteur</string>
     <string name="connected_to_mobile">Connecté au portable</string>
-    <string name="bad_desktop_address">Mauvaise adresse de bureau</string>
+    <string name="bad_desktop_address">Adresse de bureau incorrecte</string>
     <string name="paste_desktop_address">Coller l\'adresse du bureau</string>
     <string name="verify_code_with_desktop">Vérifier le code avec le bureau</string>
     <string name="scan_qr_code_from_desktop">Scannez le code QR du bureau</string>
@@ -1680,7 +1679,7 @@
     <string name="migrate_from_device_bytes_uploaded">%s envoyé</string>
     <string name="migrate_from_device_uploading_archive">Envoi de l\'archive</string>
     <string name="migrate_from_device_finalize_migration">Finaliser le transfert</string>
-    <string name="migrate_from_device_migration_complete">Transfert terminé</string>
+    <string name="migrate_from_device_migration_complete">Migration terminée</string>
     <string name="migrate_from_device_start_chat">Démarrer le chat</string>
     <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Vous <b>ne devez pas</b> utiliser la même base de données sur deux appareils.]]></string>
     <string name="migrate_from_device_verify_database_passphrase">Vérifier la phrase secrète de la base de données</string>
@@ -1691,7 +1690,7 @@
     <string name="migrate_to_device_import_failed">Échec de l\'importation</string>
     <string name="invalid_file_link">Lien invalide</string>
     <string name="migrate_to_device_title">Transférer ici</string>
-    <string name="migrate_to_device_migrating">Transfert</string>
+    <string name="migrate_to_device_migrating">Migration</string>
     <string name="or_paste_archive_link">Ou coller le lien de l\'archive</string>
     <string name="migrate_from_device_or_share_this_file_link">Ou partagez en toute sécurité le lien de ce fichier</string>
     <string name="paste_archive_link">Coller le lien de l\'archive</string>
@@ -1717,10 +1716,10 @@
     <string name="feature_roles_all_members">tous les membres</string>
     <string name="allow_to_send_simplex_links">Autorise l\'envoi de liens SimpleX.</string>
     <string name="feature_enabled_for">Activé pour</string>
-    <string name="group_members_can_send_simplex_links">Les membres du groupe peuvent envoyer des liens SimpleX.</string>
+    <string name="group_members_can_send_simplex_links">Les membres peuvent envoyer des liens SimpleX.</string>
     <string name="feature_roles_owners">propriétaires</string>
     <string name="prohibit_sending_simplex_links">Interdire l\'envoi de liens SimpleX</string>
-    <string name="simplex_links_are_prohibited_in_group">Les liens SimpleX sont interdits dans ce groupe.</string>
+    <string name="simplex_links_are_prohibited_in_group">Les liens SimpleX sont interdits.</string>
     <string name="network_type_no_network_connection">Pas de connexion au réseau</string>
     <string name="network_type_network_wifi">WiFi</string>
     <string name="network_type_ethernet">Ethernet câblé</string>
@@ -1848,7 +1847,7 @@
     <string name="file_error">Erreur de fichier</string>
     <string name="temporary_file_error">Erreur de fichier temporaire</string>
     <string name="info_row_file_status">Statut du fichier</string>
-    <string name="share_text_file_status">Statut du fichier: %s</string>
+    <string name="share_text_file_status">Statut du fichier : %s</string>
     <string name="info_row_message_status">Statut du message</string>
     <string name="share_text_message_status">Statut du message: %s</string>
     <string name="copy_error">Erreur de copie</string>
@@ -1951,8 +1950,7 @@
     <string name="servers_info">Infos serveurs</string>
     <string name="servers_info_target">Afficher les informations pour</string>
     <string name="servers_info_starting_from">À partir de %s.</string>
-    <string name="servers_info_private_data_disclaimer">À partir de %s.
-\nToutes les données restent confinées dans votre appareil.</string>
+    <string name="servers_info_private_data_disclaimer">À partir de %s. \nToutes les données restent confinées dans votre appareil.</string>
     <string name="servers_info_statistics_section_header">Statistiques</string>
     <string name="servers_info_subscriptions_total">Total</string>
     <string name="xftp_server">Serveur XFTP</string>
@@ -2001,7 +1999,7 @@
     <string name="no_filtered_contacts">Pas de contacts filtrés</string>
     <string name="paste_link">Coller le lien</string>
     <string name="contact_list_header_title">Vos contacts</string>
-    <string name="one_hand_ui">Barre d\'outils accessible</string>
+    <string name="one_hand_ui">Barre d\'app accessible</string>
     <string name="cant_call_contact_deleted_alert_text">Le contact est supprimé.</string>
     <string name="calls_prohibited_alert_title">Les appels ne sont pas autorisés !</string>
     <string name="you_need_to_allow_calls">Vous devez autoriser votre contact à appeler pour pouvoir l\'appeler.</string>
@@ -2017,7 +2015,7 @@
     <string name="calls_prohibited_ask_to_enable_calls_alert_text">Veuillez demander à votre contact d\'autoriser les appels.</string>
     <string name="cant_call_member_send_message_alert_text">Envoyer un message pour activer les appels.</string>
     <string name="v6_0_your_contacts_descr">Archiver les contacts pour discuter plus tard.</string>
-    <string name="v6_0_privacy_blur">Rendez les images floues et protégez-les contre les regards indiscrets.</string>
+    <string name="v6_0_privacy_blur">Flouter pour une meilleure confidentialité.</string>
     <string name="v6_0_connect_faster_descr">Connectez-vous à vos amis plus rapidement.</string>
     <string name="v6_0_connection_servers_status_descr">État de la connexion et des serveurs.</string>
     <string name="chat_database_exported_title">Exportation de la base de données des discussions</string>
@@ -2114,4 +2112,236 @@
     <string name="v6_1_better_security_descr">Protocoles SimpleX audité par Trail of Bits.</string>
     <string name="v6_1_better_calls_descr">Passer de l\'audio à la vidéo pendant l\'appel.</string>
     <string name="v6_1_switch_chat_profile_descr">Changer de profil de chat pour les invitations à usage unique.</string>
-</resources>
\ No newline at end of file
+    <string name="report_item_archived">rapport archivé</string>
+    <string name="add_your_team_members_to_conversations">Ajoutez les membres de votre équipe aux conversations.</string>
+    <string name="onboarding_notifications_mode_service_desc_short">L\'application tourne toujours en arrière-plan</string>
+    <string name="report_item_archived_by">rapport archivé par %s</string>
+    <string name="report_reason_other">Autre raison</string>
+    <string name="archive_verb">Archive</string>
+    <string name="group_reports_active_one">1 rapport</string>
+    <string name="address_settings">Paramètres de l\'adresse</string>
+    <string name="appearance_app_toolbars">Barres d\'outils de l\'application</string>
+    <string name="display_name_accepted_invitation">invitation acceptée</string>
+    <string name="archive_report">Archiver le signalement</string>
+    <string name="privacy_chat_list_open_links_ask">Demander</string>
+    <string name="add_to_list">Ajouter à la liste</string>
+    <string name="delete_chat_list_warning">Toutes les discussions seront supprimées de la liste %s, et la liste sera supprimée</string>
+    <string name="button_add_team_members">Ajouter des membres à l\'équipe</string>
+    <string name="operator_conditions_accepted">Conditions acceptées</string>
+    <string name="button_add_friends">Ajouter des amis</string>
+    <string name="accept_conditions">Accepter les conditions</string>
+    <string name="chat_list_add_list">Ajouter une liste</string>
+    <string name="chat_list_all">Tous</string>
+    <string name="onboarding_network_about_operators">À propos des opérateurs</string>
+    <string name="report_archive_alert_title">Archiver le signalement ?</string>
+    <string name="business_address">Adresse professionnelle</string>
+    <string name="v6_2_business_chats">Discussions professionnelles</string>
+    <string name="appearance_bars_blur_radius">Flouter</string>
+    <string name="operator_conditions_accepted_on">Conditions acceptées le : %s.</string>
+    <string name="report_reason_community">Violation des directives communautaires</string>
+    <string name="operator_conditions_of_use">Conditions d\'utilisation</string>
+    <string name="create_1_time_link">Créer un lien unique</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Les conditions seront acceptées pour le(s) opérateur(s) : <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_on">Les conditions seront acceptées le : %s.</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Pour utiliser les serveurs de <b>%s</b>, acceptez les conditions d\'utilisation.]]></string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Tous les messages et fichiers sont envoyés <b> chiffrés de bout en bout</b>, avec une sécurité post-quantique dans les messages directs.]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Réception des messages toutes les 10 minutes</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[Les conditions sont acceptées pour le(s) opérateur(s) : <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Les mêmes conditions s\'appliquent aux opérateurs : <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Ces conditions s\'appliquent également à : <b>%s</b>.]]></string>
+    <string name="connect_plan_chat_already_exists">La discussion existe déjà !</string>
+    <string name="connection_error_blocked_desc">La connexion est bloquée par l\'opérateur du serveur :\n%1$s.</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Les conditions seront automatiquement acceptées pour les opérateurs activés le : %s.</string>
+    <string name="blocking_reason_content">Le contenu viole les conditions d\'utilisation</string>
+    <string name="delete_report">Supprimer le rapport</string>
+    <string name="connection_not_ready">La connexion n\'est pas prête.</string>
+    <string name="connection_error_blocked">Connexion bloquée</string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Ces conditions s\'appliquent également à : <b>%s</b>.]]></string>
+    <string name="chat_list_contacts">Contacts</string>
+    <string name="onboarding_network_operators_continue">Continuer</string>
+    <string name="create_list">Créer une liste</string>
+    <string name="delete_chat_list_menu_action">Supprimer</string>
+    <string name="delete_chat_list_question">Supprimer la liste ?</string>
+    <string name="button_delete_chat">Supprimer la discussion</string>
+    <string name="info_row_chat">Discussions</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Les conditions sont déjà acceptées pour le(s) opérateur(s) suivant(s) : <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Les conditions seront acceptées pour le(s) opérateur(s) : <b>%s</b>.]]></string>
+    <string name="operator_conditions_failed_to_load">Le texte sur les conditions actuelles n\'a pas pu être chargé. Vous pouvez consulter les conditions en cliquant sur ce lien :</string>
+    <string name="direct_messages_are_prohibited">Les messages directs entre membres sont interdits.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Vous êtes déjà connecté avec <b>%1$s</b>.]]></string>
+    <string name="delete_chat_question">Supprimer la discussion ?</string>
+    <string name="operator_added_xftp_servers">Ajout de serveurs de médias et de fichiers</string>
+    <string name="operator_added_message_servers">Ajout de serveurs de messages</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Les mêmes conditions s\'appliquent à l\'opérateur <b>%s</b>.]]></string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Appareils Xiaomi</b> : veuillez activer le démarrage automatique dans les paramètres du système pour que les notifications fonctionnent.]]></string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">La discussion sera supprimé pour tous les membres - cela ne peut pas être annulé !</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Le discussion sera supprimé pour vous - il n\'est pas possible de revenir en arrière !</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Les conditions seront acceptées pour les opérateurs activés après 30 jours.</string>
+    <string name="sync_connection_desc">La connexion nécessite une renégociation du chiffrement.</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Lien utilisable une seule fois <i>avec un seul contact</i> - partagez en personne ou via n\'importe quelle messagerie.]]></string>
+    <string name="address_or_1_time_link">Adresse ou lien unique ?</string>
+    <string name="connection_security">Sécurité des connexions</string>
+    <string name="chat_list_businesses">Professionnels</string>
+    <string name="file_error_blocked">Le fichier est bloqué par l\'opérateur du serveur :\n%1$s.</string>
+    <string name="chat_list_favorites">Favoris</string>
+    <string name="group_reports_active">%d rapports</string>
+    <string name="group_member_role_moderator">modérateur(trice)</string>
+    <string name="v6_2_network_decentralization">Décentralisation du réseau</string>
+    <string name="report_item_visibility_submitter">Seuls vous et les modérateurs le voient</string>
+    <string name="report_item_visibility_moderators">Seuls l\'expéditeur et les modérateurs le voient</string>
+    <string name="failed_to_save_servers">Erreur d\'enregistrement des serveurs</string>
+    <string name="no_message_servers_configured_for_receiving">Pas de serveurs pour recevoir des messages.</string>
+    <string name="message_deleted_or_not_received_error_title">Pas de message</string>
+    <string name="for_social_media">Pour les réseaux sociaux</string>
+    <string name="onboarding_network_operators_review_later">Vérifier plus tard</string>
+    <string name="network_preset_servers_title">Serveurs prédéfinis</string>
+    <string name="report_compose_reason_header_other">Signaler autre : seuls les modérateurs du groupe le verront.</string>
+    <string name="debug_logs">Activer les journaux (logs)</string>
+    <string name="onboarding_notifications_mode_battery">Notifications et batterie</string>
+    <string name="display_name_requested_to_connect">demande à se connecter</string>
+    <string name="no_media_servers_configured">Pas de serveurs de médias et de fichiers.</string>
+    <string name="no_message_servers_configured">Pas de serveurs de messages.</string>
+    <string name="no_media_servers_configured_for_private_routing">Pas de serveurs pour recevoir des fichiers.</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="prefs_error_saving_settings">Erreur d\'enregistrement des paramètres</string>
+    <string name="error_creating_report">Erreur lors de la création du rapport</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Les adresses SimpleX et les liens à usage unique peuvent être partagés en toute sécurité via n\'importe quelle messagerie.</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="report_verb">Signaler</string>
+    <string name="no_unread_chats">Pas de discussions non lues</string>
+    <string name="chat_list_groups">Groupes</string>
+    <string name="chat_list_group_reports">Signalements</string>
+    <string name="report_compose_reason_header_profile">Signaler le profil d\'un membre : seuls les modérateurs du groupe le verront.</string>
+    <string name="report_compose_reason_header_spam">Signaler le spam : seuls les modérateurs du groupe le verront.</string>
+    <string name="privacy_chat_list_open_web_link">Ouvrir le lien</string>
+    <string name="privacy_chat_list_open_links">Ouvrir des liens depuis la liste de discussion</string>
+    <string name="error_updating_server_title">Erreur de mise à jour du serveur</string>
+    <string name="xftp_servers_per_user">Les serveurs pour les nouveaux fichiers de votre profil de discussion actuel</string>
+    <string name="operator_server_alert_title">Serveur de l\'opérateur</string>
+    <string name="error_server_protocol_changed">Le protocole du serveur a été modifié.</string>
+    <string name="v6_2_network_decentralization_enable_flux">Activer Flux</string>
+    <string name="message_deleted_or_not_received_error_desc">Ce message a été supprimé ou n\'a pas encore été reçu.</string>
+    <string name="address_creation_instruction">Appuyez sur Créer une adresse SimpleX dans le menu pour la créer ultérieurement.</string>
+    <string name="share_address_publicly">Partager publiquement votre adresse</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Par exemple, si votre contact reçoit des messages via un serveur SimpleX Chat, votre application les transmettra via un serveur Flux.</string>
+    <string name="only_chat_owners_can_change_prefs">Seuls les propriétaires peuvent modifier les préférences.</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Le rôle deviendra %s. Toutes les personnes présentes dans le discussion en seront informées.</string>
+    <string name="error_creating_chat_tags">Erreur lors de la création d\'une liste de discussion</string>
+    <string name="error_loading_chat_tags">Erreur de chargement des listes de discussion</string>
+    <string name="error_updating_chat_tags">Erreur de mise à jour de la liste des discussions</string>
+    <string name="no_chats">Pas de discussions</string>
+    <string name="no_chats_found">Pas de discussions trouvées</string>
+    <string name="open_with_app">Ouvrir avec %s</string>
+    <string name="save_list">Sauvegarder la liste</string>
+    <string name="edit_chat_list_menu_action">Modifier</string>
+    <string name="share_simplex_address_on_social_media">Partagez votre adresse SimpleX sur les réseaux sociaux.</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Pas de service d\'arrière-plan</string>
+    <string name="chat_bottom_bar">Barre de discussion accessible</string>
+    <string name="operator_review_conditions">Vérifier les conditions</string>
+    <string name="operator">Opérateur</string>
+    <string name="operator_servers_title">Serveurs %s</string>
+    <string name="chat_archive">Ou importer un fichier d\'archive</string>
+    <string name="operator_open_conditions">Ouvrir les conditions</string>
+    <string name="operator_use_for_messages_private_routing">Pour le routage privé</string>
+    <string name="no_message_servers_configured_for_private_routing">Pas de serveurs pour le routage privé des messages.</string>
+    <string name="error_accepting_operator_conditions">Erreur lors de la validation des conditions</string>
+    <string name="errors_in_servers_configuration">Erreurs dans la configuration des serveurs.</string>
+    <string name="for_chat_profile">Pour le profil de discussion %s :</string>
+    <string name="no_media_servers_configured_for_sending">Pas de serveurs pour envoyer des fichiers.</string>
+    <string name="maximum_message_size_reached_text">Veuillez réduire la taille du message et envoyer le à nouveau.</string>
+    <string name="maximum_message_size_reached_non_text">Veuillez réduire la taille du message ou supprimer le média et renvoyer le message.</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">pour une meilleure protection des métadonnées.</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Premier message non lu à l\'ouverture.\n- Sauter aux messages cités.</string>
+    <string name="v6_2_business_chats_descr">Respect de la vie privée de vos clients.</string>
+    <string name="v6_2_network_decentralization_descr">Le deuxième opérateur prédéfini de l\'application !</string>
+    <string name="error_adding_server">Erreur lors de l\'ajout du serveur</string>
+    <string name="error_saving_database">Erreur d\'enregistrement de la base de données</string>
+    <string name="report_compose_reason_header_illegal">Signaler un contenu : seuls les modérateurs du groupe le verront.</string>
+    <string name="onboarding_choose_server_operators">Opérateurs de serveur</string>
+    <string name="no_chats_in_list">Pas de discussions dans la liste %s.</string>
+    <string name="error_server_operator_changed">L\'opérateur du serveur a changé.</string>
+    <string name="privacy_chat_list_open_web_link_question">Ouvrir le lien web ?</string>
+    <string name="report_compose_reason_header_community">Signaler une infraction : seuls les modérateurs du groupe le verront.</string>
+    <string name="connection_error_quota_desc">La connexion a atteint la limite des messages non délivrés, votre contact est peut-être hors ligne.</string>
+    <string name="server_added_to_operator__name">Serveur ajouté à l\'opérateur %s.</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">L\'application protège votre vie privée en utilisant des opérateurs différents pour chaque conversation.</string>
+    <string name="onboarding_select_network_operators_to_use">Sélectionnez les opérateurs de réseau à utiliser.</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat et Flux ont conclu un accord pour inclure les serveurs exploités par Flux dans l\'application.</string>
+    <string name="chat_list_notes">Notes</string>
+    <string name="or_to_share_privately">Ou à partager en privé</string>
+    <string name="simplex_address_or_1_time_link">Adresse SimpleX ou lien unique ?</string>
+    <string name="encryption_renegotiation_in_progress">Renégociation du chiffrement en cours.</string>
+    <string name="sync_connection_confirm">Réparer</string>
+    <string name="sync_connection_question">Réparer la connexion ?</string>
+    <string name="share_1_time_link_with_a_friend">Partager un lien unique avec un ami</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Pour vous protéger contre le remplacement de votre lien, vous pouvez comparer les codes de sécurité des contacts.</string>
+    <string name="how_it_helps_privacy">Comment il contribue à la protection de la vie privée</string>
+    <string name="report_reason_alert_title">Motif du signalement ?</string>
+    <string name="report_archive_alert_desc">Le rapport sera archivé pour vous.</string>
+    <string name="report_reason_illegal">Contenu inapproprié</string>
+    <string name="smp_servers_new_server">Nouveau serveur</string>
+    <string name="onboarding_network_operators_configure_via_settings">Vous pouvez configurer les serveurs via les paramètres.</string>
+    <string name="operator_use_for_sending">Pour envoyer</string>
+    <string name="report_reason_profile">Profil inapproprié</string>
+    <string name="operator_website">Site web</string>
+    <string name="list_menu">Liste</string>
+    <string name="group_reports_member_reports">Signalement des membres</string>
+    <string name="change_order_chat_list_menu_action">Modifier l\'ordre</string>
+    <string name="onboarding_network_operators_update">Mise à jour</string>
+    <string name="direct_messages_are_prohibited_in_chat">Les messages directs entre membres sont interdits dans cette discussion.</string>
+    <string name="privacy_chat_list_open_links_no">Non</string>
+    <string name="privacy_chat_list_open_links_yes">Oui</string>
+    <string name="operator_info_title">Opérateur de réseau</string>
+    <string name="operator_use_for_files">Utiliser pour les fichiers</string>
+    <string name="operator_use_for_messages">Utiliser pour les messages</string>
+    <string name="view_conditions">Voir les conditions</string>
+    <string name="onboarding_network_operators">Opérateurs de réseau</string>
+    <string name="invite_to_chat_button">Inviter à discuter</string>
+    <string name="duplicated_list_error">Le nom de liste et l\'emoji doivent être différents pour toutes les listes.</string>
+    <string name="list_name_field_placeholder">Nom de la liste...</string>
+    <string name="leave_chat_question">Quitter la discussion ?</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Vous ne recevrez plus de messages de cette discussion. L\'historique sera préservé.</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Le membre sera retiré de la discussion - cela ne peut pas être annulé !</string>
+    <string name="chat_main_profile_sent">Votre profil de discussion sera envoyé aux autres membres</string>
+    <string name="your_servers">Vos serveurs</string>
+    <string name="use_servers_of_operator_x">Utiliser %s</string>
+    <string name="operator_use_operator_toggle_description">Utiliser les serveurs</string>
+    <string name="operator_use_for_messages_receiving">Pour recevoir</string>
+    <string name="operator_open_changes">Ouvrir les modifications</string>
+    <string name="connection_error_quota">Messages non distribués</string>
+    <string name="maximum_message_size_reached_forwarding">Vous pouvez copier et réduire la taille du message pour l\'envoyer.</string>
+    <string name="button_leave_chat">Quitter la discussion</string>
+    <string name="view_updated_conditions">Voir les conditions mises à jour</string>
+    <string name="v6_2_improved_chat_navigation">Navigation améliorée dans les discussions</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Lorsque plusieurs opérateurs sont activés, aucun d\'entre eux ne dispose de métadonnées permettant de savoir qui communique avec qui.</string>
+    <string name="maximum_message_size_title">Le message est trop volumineux !</string>
+    <string name="remote_hosts_section">Mobiles à distance</string>
+    <string name="change_list">Modifier la liste</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Vous pouvez définir les opérateurs dans les paramètres Réseau et serveurs.</string>
+    <string name="appearance_in_app_bars_alpha">Transparence</string>
+    <string name="you_can_set_connection_name_to_remember">Vous pouvez définir un nom de connexion pour vous rappeler avec qui le lien a été partagé.</string>
+    <string name="enable_sending_member_reports">Autoriser le signalement des messages aux modérateurs.</string>
+    <string name="chat_item_ttl_year">1 an</string>
+    <string name="report_archive_alert_desc_all">Tous les signalements seront archivés pour vous.</string>
+    <string name="report_archive_alert_title_all">Archiver tous les signalements ?</string>
+    <string name="report_archive_alert_title_nth">Archiver %d signalements ?</string>
+    <string name="change_automatic_deletion_question">Modifier la suppression automatique des messages ?</string>
+    <string name="chat_ttl_options_footer">Supprimer les messages de discussion de votre appareil.</string>
+    <string name="chat_item_ttl_default">par défaut (%s)</string>
+    <string name="block_members_for_all_question">Bloquer ces membres pour tous ?</string>
+    <string name="disable_automatic_deletion_question">Désactiver la suppression automatique des messages ?</string>
+    <string name="disable_automatic_deletion">Désactiver la suppression des messages</string>
+    <string name="v6_3_organize_chat_lists_descr">Ne manquez pas les messages importants.</string>
+    <string name="v6_3_mentions_descr">Recevoir une notification en cas de mention.</string>
+    <string name="v6_3_better_privacy_and_security">Vie privée et sécurité renforcées</string>
+    <string name="v6_3_faster_deletion_of_groups">Suppression plus rapide des groupes.</string>
+    <string name="v6_3_faster_sending_messages">Envoi plus rapide des messages.</string>
+    <string name="report_archive_for_me">Pour moi</string>
+    <string name="archive_reports">Archiver les rapports</string>
+    <string name="report_archive_for_all_moderators">Pour tous les modérateurs</string>
+    <string name="group_members_can_send_reports">Les membres peuvent signaler des messages aux modérateurs.</string>
+    <string name="v6_3_better_groups_performance">Groupes plus performants</string>
+    <string name="error_reading_passphrase">Erreur lors de la lecture de la phase secrète de la base de données</string>
+    <string name="v6_3_reports_descr">Aider les administrateurs à modérer leurs groupes.</string>
+    <string name="block_members_desc">Tous les nouveaux messages de ces membres seront cachés !</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/hr/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/hr/strings.xml
index bd1875a788..3084b8569b 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/hr/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/hr/strings.xml
@@ -1,5 +1,1487 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="search_verb">Pretraži</string>
-  <string name="la_mode_off">Isključeno</string>
-</resources>
\ No newline at end of file
+    <string name="search_verb">Pretraži</string>
+    <string name="la_mode_off">Isključeno</string>
+    <string name="abort_switch_receiving_address_confirm">Prekini</string>
+    <string name="v6_1_forward_many_messages_descr">Prosledi do 20 poruka odjednom.</string>
+    <string name="notification_display_mode_hidden_desc">Sakriti kontakt i poruku</string>
+    <string name="n_file_errors">%1$d greska(e) datoteka:\n%2$s</string>
+    <string name="forward_files_in_progress_desc">%1$d datoteka se i dalje preuzima.</string>
+    <string name="forward_files_failed_to_receive_desc">%1$d datoteka neuspešno preuzeta.</string>
+    <string name="forward_files_missing_desc">%1$d odstranjene datoteke.</string>
+    <string name="forward_files_not_accepted_desc">%1$d datoteka nije preuzeta.</string>
+    <string name="callstate_ended">završen</string>
+    <string name="contact_wants_to_connect_via_call">%1$s želi da se poveže sa tobom putem</string>
+    <string name="accept">Prihvatiti</string>
+    <string name="group_invitation_expired">Pozivnica za grupu je istekla</string>
+    <string name="group_link">Grupni link</string>
+    <string name="user_hide">Sakriti</string>
+    <string name="wallpaper_preview_hello_alice">Dobar dan!</string>
+    <string name="recent_history_is_not_sent_to_new_members">Istorija nije poslana novim članovima.</string>
+    <string name="hide_verb">Sakriti</string>
+    <string name="send_disappearing_message_5_minutes">5 minuta</string>
+    <string name="simplex_link_mode_full">Ceo Link</string>
+    <string name="forward_multiple">Proslediti poruke…</string>
+    <string name="abort_switch_receiving_address_question">Prekini menjanje adrese?</string>
+    <string name="if_you_cant_meet_in_person">Ako se ne možeš sastati, pokaži QR kod u video pozivu ili podeli link.</string>
+    <string name="hide_profile">Sakriti profil</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="callstatus_accepted">prihvati poziv</string>
+    <string name="permissions_required">Dodeliti dozvolu</string>
+    <string name="audio_device_wired_headphones">Slušalice</string>
+    <string name="settings_section_title_help">POMOĆ</string>
+    <string name="delete_group_for_self_cannot_undo_warning">Grupa će biti obrisana za Vas – ovo ne može da se poništi!</string>
+    <string name="color_primary">Akcenat</string>
+    <string name="v4_2_group_links">Grupni linkovi</string>
+    <string name="v5_5_new_interface_languages">Madjarski i Turski UI</string>
+    <string name="how_to_use_markdown">Kako koristiti markdown</string>
+    <string name="from_gallery_button">Iz Galerije</string>
+    <string name="group_reports_active_one">1 izveštaj</string>
+    <string name="learn_more_about_address">O SimpleX adresama</string>
+    <string name="above_then_preposition_continuation">iznad, onda:</string>
+    <string name="accept_connection_request__question">Prihvati zahtev za vezu?</string>
+    <string name="email_invite_body">Zdravo!\nPoveži se sa mnom pomoću SimpleX Razgovora: %s</string>
+    <string name="icon_descr_group_inactive">Grupa neaktivna</string>
+    <string name="group_is_decentralized">U potpunosti decentralizovan - vidljivo samo za članove grupe.</string>
+    <string name="group_full_name_field">Celo ime grupe:</string>
+    <string name="icon_descr_help">pomoć</string>
+    <string name="full_name__field">Celo Ime:</string>
+    <string name="icon_descr_hang_up">Prekini poziv</string>
+    <string name="accept_feature">Prihvatiti</string>
+    <string name="v4_4_french_interface">Francuski interfejs</string>
+    <string name="v4_3_improved_privacy_and_security_desc">Sakriti ekran aplikacije u nedavnim aplikacijama.</string>
+    <string name="custom_time_unit_hours">sati</string>
+    <string name="send_disappearing_message_30_seconds">30 sekundi</string>
+    <string name="hide_dev_options">Sakriti:</string>
+    <string name="hide_notification">Sakriti</string>
+    <string name="forward_alert_forward_messages_without_files">Prosledi poruke bez datoteka?</string>
+    <string name="how_to">Kako da</string>
+    <string name="accept_call_on_lock_screen">Prihvatiti</string>
+    <string name="alert_text_decryption_error_too_many_skipped">%1$d poruke preskočene.</string>
+    <string name="integrity_msg_skipped">%1$d preskočena poruka(e)</string>
+    <string name="chat_item_ttl_month">1 mesec</string>
+    <string name="chat_item_ttl_week">1 nedelja</string>
+    <string name="alert_message_group_invitation_expired">Pozivnica za grupu više nije validna. Pošiljalac je uklonio.</string>
+    <string name="alert_title_no_group">Grupa nije pronadjena!</string>
+    <string name="accept_conditions">Prihvati uslove</string>
+    <string name="connect_plan_group_already_exists">Grupa već postoji!</string>
+    <string name="call_service_notification_end_call">Prekini razgovor</string>
+    <string name="edit_history">Istorija</string>
+    <string name="permissions_grant">Dodeliti dozvolu(e) za uspostavljanje poziva</string>
+    <string name="how_it_works">Kako radi</string>
+    <string name="group_info_section_title_num_members">%1$s ČLANOVI</string>
+    <string name="group_display_name_field">Upiši ime grupe:</string>
+    <string name="how_to_use_your_servers">Kako koristiti svoje servere</string>
+    <string name="enter_one_ICE_server_per_line">ICE serveri (jedan po liniji)</string>
+    <string name="abort_switch_receiving_address">Prekini menjanje adrese</string>
+    <string name="found_desktop">Nadji Radnu Površinu</string>
+    <string name="notification_preview_mode_hidden">Skriveno</string>
+    <string name="forward_files_messages_deleted_after_selection_title">%1$s poruke nisu prosledjene</string>
+    <string name="chat_list_groups">Grupe</string>
+    <string name="how_to_use_simplex_chat">Kako se koristi</string>
+    <string name="about_simplex_chat">O SimpleX Razgovoru</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d neuspešno u dešifrovanje poruke.</string>
+    <string name="snd_group_event_group_profile_updated">grupni profil ažuriran</string>
+    <string name="group_member_status_group_deleted">grupa odstranjena</string>
+    <string name="info_row_group">Grupa</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Ako izabereš da odbiješ pošiljalac NEĆE biti obavešten.</string>
+    <string name="v4_6_hidden_chat_profiles">Skriveni razgovori</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">Grupa će biti obrisana za sve članove – ovo se ne može poništiti!</string>
+    <string name="host_verb">Domaćin</string>
+    <string name="onboarding_notifications_mode_subtitle">Kako utiče na bateriju</string>
+    <string name="how_it_helps_privacy">Kako pomaže privatnosti</string>
+    <string name="how_simplex_works">Kako SimpleX radi</string>
+    <string name="group_profile_is_stored_on_members_devices">Grupni profil je uskladnjen na uredjajima korisnika, ne na serverima.</string>
+    <string name="onboarding_network_about_operators">O operatorima</string>
+    <string name="hidden_profile_password">Skrivena šifra profila</string>
+    <string name="chat_item_ttl_day">1 dan</string>
+    <string name="enter_correct_passphrase">Upiši ispravnu pristupnu frazu.</string>
+    <string name="send_disappearing_message_1_minute">1 minut</string>
+    <string name="accept_contact_button">Prihvatiti</string>
+    <string name="wallpaper_preview_hello_bob">Dobro jutro!</string>
+    <string name="v4_6_reduced_battery_usage">Dodatno smanjena potrošnja baterije.</string>
+    <string name="about_simplex">O SimpleX</string>
+    <string name="display_name_accepted_invitation">prihvaćena pozivnica</string>
+    <string name="info_view_message_button">poruka</string>
+    <string name="delete_and_notify_contact">Odstraniti i obavestiti kontakte</string>
+    <string name="delete_contact_question">Odstraniti kontakt?</string>
+    <string name="migrate_from_device_delete_database_from_device">Odstraniti bazu podataka sa ovog uređaja</string>
+    <string name="button_delete_contact">Odstraniti kontakt</string>
+    <string name="icon_descr_server_status_error">Greška</string>
+    <string name="info_row_deleted_at">Odstranjeno u</string>
+    <string name="network_proxy_password">Šifra</string>
+    <string name="app_check_for_updates_update_available">Ažuriranje dostupno: %s</string>
+    <string name="create_address">Napravi adresu</string>
+    <string name="rcv_direct_event_contact_deleted">odstranjen kontakt</string>
+    <string name="button_add_welcome_message">Dodaj poruku dobrodošlice</string>
+    <string name="share_text_sent_at">Poslano u: %s</string>
+    <string name="update_network_settings_confirmation">Ažuriraj</string>
+    <string name="profile_password">Šifra profila</string>
+    <string name="v5_6_safer_groups_descr">Administratori mogu da blokiraju.</string>
+    <string name="servers_info_modal_error_title">Greška</string>
+    <string name="create_1_time_link">Napravi jednokratnu poveznicu</string>
+    <string name="paste_button">Nalepiti</string>
+    <string name="settings_section_title_settings">PODEŠAVANJE</string>
+    <string name="settings_section_title_profile_images">Profilne slike</string>
+    <string name="acknowledged">Razumeo</string>
+    <string name="deleted">Odstranjeno</string>
+    <string name="deleted_description">odstranjeno</string>
+    <string name="create_profile_button">Napraviti</string>
+    <string name="settings_section_title_messages">PORUKE I DATOTEKE</string>
+    <string name="compose_message_placeholder">Poruka</string>
+    <string name="conn_stats_section_title_servers">SERVERI</string>
+    <string name="delete_chat_profile">Odstraniti profil razgovora</string>
+    <string name="feature_roles_admins">administratori</string>
+    <string name="random_port">Nasumično</string>
+    <string name="server_error">greška</string>
+    <string name="ci_status_other_error">Greška: %1$s</string>
+    <string name="delete_messages__question">Odstraniti %d poruke?</string>
+    <string name="delete_verb">Odstraniti</string>
+    <string name="toolbar_settings">Podešavanje</string>
+    <string name="onboarding_network_operators_update">Ažuriraj</string>
+    <string name="delete_files_and_media_all">Odstraniti sve datoteke</string>
+    <string name="delete_chat_profile_question">Odstraniti profil razgovora?</string>
+    <string name="messages_section_title">Poruke</string>
+    <string name="group_member_role_admin">administrator</string>
+    <string name="share_text_deleted_at">Odstranjeno u: %s</string>
+    <string name="v5_7_shape_profile_images">Oblikuj profilne slike</string>
+    <string name="servers_info_subscriptions_connections_subscribed">Aktivne veze</string>
+    <string name="smp_servers_add_to_another_device">Dodaj na drugi uredjaj</string>
+    <string name="error">Greška</string>
+    <string name="error_alert_title">Greška</string>
+    <string name="address_section_title">Adresa</string>
+    <string name="acknowledgement_errors">Greške pri potvrdi</string>
+    <string name="list_menu">Lista</string>
+    <string name="list_name_field_placeholder">Ime liste...</string>
+    <string name="delete_chat_list_menu_action">Odstraniti</string>
+    <string name="delete_after">Odstraniti nakon</string>
+    <string name="add_address_to_your_profile">Dodaj adresu na svoj profil da bi tvoji kontakti mogli da dele sa ostalima. Ažuriranje profila biće poslano tvojim kontaktima.</string>
+    <string name="add_contact_tab">Dodaj kontakt</string>
+    <string name="chat_list_add_list">Dodaj listu</string>
+    <string name="password_to_show">Prikazati šifru</string>
+    <string name="delete_contact_menu_action">Odstraniti</string>
+    <string name="abort_switch_receiving_address_desc">Promena adrese će biti prekinuta. Biće upotrebljena stara adresa.</string>
+    <string name="sent_directly">Poslano direktno</string>
+    <string name="chat_list_all">Sve</string>
+    <string name="info_row_sent_at">Poslano u</string>
+    <string name="icon_descr_sent_msg_status_sent">poslano</string>
+    <string name="users_delete_profile_for">Odstraniti profil razgovora za</string>
+    <string name="accept_contact_incognito_button">Prihvati anonimno</string>
+    <string name="share_verb">Podeliti</string>
+    <string name="add_to_list">Dodaj na listu</string>
+    <string name="network_enable_socks_info">Pristup na servere pomoću SOCKS proxy na portu %d? Proxy mora da bude uključen pre omogućavanja ove opcije.</string>
+    <string name="operator_conditions_accepted">Prihvaćeni uslovi</string>
+    <string name="smp_servers_add">Dodaj server</string>
+    <string name="smp_servers_preset_add">Dodaj unapred postavljene servere</string>
+    <string name="delete_address__question">Odstraniti adresu?</string>
+    <string name="rcv_group_event_group_deleted">odstranjena grupa</string>
+    <string name="users_add">Dodaj nalog</string>
+    <string name="users_delete_question">Odstraniti profil razgovora?</string>
+    <string name="create_address_button">Napraviti</string>
+    <string name="delete_chat_question">Odstraniti razgovor?</string>
+    <string name="delete_address">Odstranjena adresa</string>
+    <string name="delete_database">Odstranjena baza podataka</string>
+    <string name="migrate_from_device_archive_and_upload">Arhiviraj i otpremi</string>
+    <string name="button_delete_chat">Odstraniti razgovor</string>
+    <string name="display_name__field">Ime profila:</string>
+    <string name="v4_3_improved_server_configuration_desc">Dodaj server skeniranjem QR koda.</string>
+    <string name="update_database">Ažuriraj</string>
+    <string name="color_primary_variant">Dodatni akcent</string>
+    <string name="delete_group_menu_action">Odstraniti</string>
+    <string name="settings_section_title_user_theme">Tema profila</string>
+    <string name="operator_added_message_servers">Dodat serveri za poruke</string>
+    <string name="color_primary_variant2">Dodatni akcent 2</string>
+    <string name="icon_descr_settings">Podešavanje</string>
+    <string name="address_settings">Podešavanje adrese</string>
+    <string name="add_your_team_members_to_conversations">Dodaj tvoje članove tima u konverzaciju.</string>
+    <string name="button_add_friends">Dodaj prijatelja</string>
+    <string name="button_add_team_members">Dodaj člana tima</string>
+    <string name="archive_verb">Arhiva</string>
+    <string name="info_view_connect_button">poveži</string>
+    <string name="use_camera_button">Kamera</string>
+    <string name="icon_descr_more_button">Više</string>
+    <string name="auth_unlock">Otključaj</string>
+    <string name="network_smp_proxy_mode_unprotected">Nezaštićeno</string>
+    <string name="network_smp_proxy_mode_unknown">Nepoznati serveri</string>
+    <string name="audio_device_bluetooth">Bluetooth</string>
+    <string name="call_on_lock_screen">Pozivi na zaključanom ekranu:</string>
+    <string name="ttl_days">%d dana</string>
+    <string name="multicast_connect_automatically">Poveži automatski</string>
+    <string name="servers_info_sessions_connected">Povezano</string>
+    <string name="servers_info_sessions_errors">Greške</string>
+    <string name="servers_info_downloaded">Preuzeto</string>
+    <string name="callstate_connecting">povezivanje…</string>
+    <string name="permissions_camera">Kamera</string>
+    <string name="ttl_month">%d mesec</string>
+    <string name="file_not_found">Datoteka nije pronađena</string>
+    <string name="blocked_by_admin_items_description">%d poruke blokirane administratorom</string>
+    <string name="group_reports_active">%d izvještaji</string>
+    <string name="info_view_call_button">poziv</string>
+    <string name="camera_not_available">Kamera nije dostupna</string>
+    <string name="callstatus_calling">pozivanje…</string>
+    <string name="ttl_min">%d min</string>
+    <string name="ttl_sec">%d sec</string>
+    <string name="downloaded_files">Preuzeti datoteke</string>
+    <string name="blocked_by_admin_item_description">blokirano administratorom</string>
+    <string name="sender_you_pronoun">Vi</string>
+    <string name="group_member_status_unknown">nepoznat status</string>
+    <string name="connect_via_link_incognito">Poveži se anonimno</string>
+    <string name="callstatus_error">greška u pozivu</string>
+    <string name="connect_via_link_verb">Poveži</string>
+    <string name="unknown_message_format">nepoznat format poruke</string>
+    <string name="notification_contact_connected">Povezano</string>
+    <string name="ttl_s">%ds</string>
+    <string name="ttl_hours">%d sata(i)</string>
+    <string name="servers_info_sessions_connecting">Povezivanje</string>
+    <string name="display_name_connecting">povezivanje…</string>
+    <string name="smp_server_test_connect">Poveži</string>
+    <string name="connect_button">Poveži</string>
+    <string name="rcv_group_event_member_connected">povezano</string>
+    <string name="server_connected">povezano</string>
+    <string name="forward_files_not_accepted_receive_files">Preuzimanje</string>
+    <string name="network_settings_title">Napredna podešavanja</string>
+    <string name="icon_descr_call_progress">Poziv u toku</string>
+    <string name="settings_section_title_calls">POZIVI</string>
+    <string name="v5_4_block_group_members">Blokiraj članove grupe</string>
+    <string name="file_not_approved_title">Nepoznati serveri!</string>
+    <string name="icon_descr_file">Datoteka</string>
+    <string name="choose_file">Datoteka</string>
+    <string name="unmute_chat">Uključiti zvuk</string>
+    <string name="permissions_camera_and_record_audio">Kamera i mikrofon</string>
+    <string name="group_info_member_you">vi: %1$s</string>
+    <string name="connected_to_mobile">Povezano sa telefonom</string>
+    <string name="blocked_item_description">blokirano</string>
+    <string name="blocked_items_description">%d poruka blokirano</string>
+    <string name="server_connecting">povezivanje</string>
+    <string name="connected_mobile">Povezan telefon</string>
+    <string name="settings_section_title_you">VI</string>
+    <string name="v6_0_privacy_blur">Zamućeno za bolju privatnost.</string>
+    <string name="ttl_months">%d meseca(i)</string>
+    <string name="icon_descr_call_ended">Poziv završen</string>
+    <string name="cancel_verb">Poništiti</string>
+    <string name="connection_error_auth_desc">Osim ako vaš kontakt nije obrisao vezu ili je ova pozivnica već korišćena, moguće je da je u pitanju greška - molimo vas da je prijavite.\nDa biste se povezali, molimo vas da zamolite vaš kontakt da kreira novu pozivnicu i proverite da li imate stabilnu mrežnu konekciju.</string>
+    <string name="contact_connection_pending">povezivanje…</string>
+    <string name="user_unmute">Uključiti zvuk</string>
+    <string name="group_member_status_connected">povezano</string>
+    <string name="icon_descr_server_status_connected">Povezano</string>
+    <string name="download_file">Preuzimanje</string>
+    <string name="connect_via_member_address_alert_title">Povezati direktno?</string>
+    <string name="ttl_day">%d dan</string>
+    <string name="ttl_h">%dh</string>
+    <string name="ttl_m">%dm</string>
+    <string name="ttl_mth">%dmon</string>
+    <string name="group_connection_pending">povezivanje…</string>
+    <string name="icon_descr_received_msg_status_unread">nepročitano</string>
+    <string name="callstatus_ended">poziv završen %1$s</string>
+    <string name="callstatus_in_progress">poziv u toku</string>
+    <string name="rcv_group_event_member_created_contact">povezano direktno</string>
+    <string name="chat_preferences_on">uključeno</string>
+    <string name="ttl_hour">%d sat</string>
+    <string name="bold_text">podebljano</string>
+    <string name="member_info_member_blocked">blokirano</string>
+    <string name="wallpaper_advanced_settings">Napredna podešavanja</string>
+    <string name="rcv_group_event_member_blocked">blokirano %s</string>
+    <string name="block_for_all">Blokiraj za sve</string>
+    <string name="callstate_connected">povezano</string>
+    <string name="call_already_ended">Poziv već završen!</string>
+    <string name="unknown_error">Nepoznata greška</string>
+    <string name="group_member_status_connecting">povezivanje</string>
+    <string name="group_member_status_accepted">povezivanje (prihvaćeno)</string>
+    <string name="block_for_all_question">Blokiraj člana za sve?</string>
+    <string name="block_member_button">Blokiraj člana</string>
+    <string name="member_blocked_by_admin">Blokirano administratorom</string>
+    <string name="block_member_question">Blokiraj člana?</string>
+    <string name="appearance_bars_blur_radius">Zamućeno</string>
+    <string name="unlink_desktop">Otkači</string>
+    <string name="la_minutes">%d minut(a)</string>
+    <string name="app_check_for_updates">Proveri ažuriranje</string>
+    <string name="app_check_for_updates_stable">Stabilno</string>
+    <string name="settings_section_title_files">DATOTEKE</string>
+    <string name="migrate_from_device_bytes_uploaded">%s otpremljeno</string>
+    <string name="disable_notifications_button">Onemogućiti obavještenja</string>
+    <string name="is_not_verified">%s nije verifikovan</string>
+    <string name="clear_note_folder_warning">Sve poruke biće odstranjene - ovo ne može biti vraćeno!</string>
+    <string name="network_session_mode_user">Profil Chata</string>
+    <string name="app_check_for_updates_notice_disable">Onemogućiti</string>
+    <string name="ttl_week">%d nedelja</string>
+    <string name="v5_4_more_things_descr">- neobavezno obavestiti o obrisanim kontaktima.\n- imena profila sa razmacima.\n- i još mnogo toga!\"</string>
+    <string name="migrate_to_device_importing_archive">Uvoženje arhive</string>
+    <string name="servers_info_files_tab">Datoteke</string>
+    <string name="servers_info_uploaded">Otpremljeno</string>
+    <string name="is_verified">%s je verifikovan</string>
+    <string name="chat_console">Konzola chata</string>
+    <string name="scan_QR_code">Skenirati QR kod</string>
+    <string name="network_session_mode_server">Server</string>
+    <string name="no_call_on_lock_screen">Onemogućiti</string>
+    <string name="settings_section_title_chat_database">BAZA PODATAKA CHATA</string>
+    <string name="send_receipts_disabled">onemogućeno</string>
+    <string name="import_theme_error">Greška pri uvoženju teme</string>
+    <string name="files_are_prohibited_in_group">Datoteke i medijski sadržaji su zabranjeni.</string>
+    <string name="or_paste_archive_link">Ili nalepiti link arhive</string>
+    <string name="receipts_groups_disable_for_all">Onemogućeno za sve grupe</string>
+    <string name="info_row_disappears_at">Nestaje u</string>
+    <string name="files_and_media">Datoteke i medijski sadržaji</string>
+    <string name="feature_roles_all_members">svi članovi</string>
+    <string name="v4_4_disappearing_messages">Poruke koje nestaju</string>
+    <string name="member_info_member_disabled">onemogućeno</string>
+    <string name="allow_calls_question">Dozvoliti pozive?</string>
+    <string name="la_seconds">%d sekunde(i)</string>
+    <string name="or_scan_qr_code">Ili skenirati QR kod</string>
+    <string name="app_check_for_updates_disabled">Onemogućeno</string>
+    <string name="settings_section_title_app">Aplikacija</string>
+    <string name="settings_section_title_chats">RAZGOVORI</string>
+    <string name="files_and_media_prohibited">Datoteke i medijski sadržaji su zabranjeni!</string>
+    <string name="disappearing_prohibited_in_this_chat">Poruke koje nestaju su zabranjene u ovom razgovoru.</string>
+    <string name="chat_is_stopped_indication">Chat je zaustavljen</string>
+    <string name="file_saved">Datoteka sačuvana</string>
+    <string name="app_version_title">Verzija aplikacije</string>
+    <string name="app_version_name">Verzija aplikacije: v%s</string>
+    <string name="settings_section_title_chat_theme">Tema razgovora</string>
+    <string name="chat_item_ttl_seconds">%s sekunda(i)</string>
+    <string name="chat_database_exported_title">Baza podataka Chata izvezena</string>
+    <string name="operator">Operator</string>
+    <string name="operator_server_alert_title">Operacioni server</string>
+    <string name="timed_messages">Poruke koje nestaju</string>
+    <string name="disappearing_messages_are_prohibited">Poruke koje nestaju su zabranjene.</string>
+    <string name="server_address">Adresa servera</string>
+    <string name="files_and_media_not_allowed">Datoteke i medijski sadržaji nisu dozvoljeni</string>
+    <string name="allow_verb">Dozvoliti</string>
+    <string name="chat_with_developers">Razgovor sa kreatorima</string>
+    <string name="your_chats">Razgovori</string>
+    <string name="ttl_weeks">%d nedelja(e)</string>
+    <string name="desktop_device">Računar</string>
+    <string name="direct_messages_are_prohibited">Direktne poruke između članova su zabranjene.</string>
+    <string name="direct_messages_are_prohibited_in_group">Direktne poruke između članova su zabranjene u ovoj grupi.</string>
+    <string name="operator_servers_title">%s serveri</string>
+    <string name="turn_off_battery_optimization_button">Dozvoliti</string>
+    <string name="direct_messages">Direktne poruke</string>
+    <string name="receipts_contacts_disable_for_all">Onemogućeno za sve</string>
+    <string name="migrate_to_device_chat_migrated">Chat migriran!</string>
+    <string name="group_members_n">%s, %s i %d članovi</string>
+    <string name="smp_server_test_disconnect">Prekinuti vezu</string>
+    <string name="connect_plan_chat_already_exists">Chat već postoji!</string>
+    <string name="chat_database_deleted">Baza podataka Chata odstranjena</string>
+    <string name="app_check_for_updates_notice_title">Proveri ažuriranje</string>
+    <string name="chat_is_stopped_you_should_transfer_database">Chat je zaustavljen. Ako već koristiš ovu bazu podataka na drugom uređaju, trebala bi se vratiti pre nego što se pokrene chat.</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Proveri poruke svakih 10 minuta</string>
+    <string name="rcv_group_event_1_member_connected">%s povezan</string>
+    <string name="rcv_group_event_3_members_connected">%s, %s i %s povezani</string>
+    <string name="conn_level_desc_direct">direktno</string>
+    <string name="info_row_chat">Chat</string>
+    <string name="image_descr_qr_code">QR kod</string>
+    <string name="chat_is_running">Chat je pokrenut</string>
+    <string name="import_database">Uvesti bazu podataka</string>
+    <string name="chat_database_section">BAZA PODATAKA CHATA</string>
+    <string name="chat_is_stopped">Chat je zaustavljen</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s i %d ostali članovi povezani</string>
+    <string name="migrate_to_device_import_failed">Uvoz neuspešan</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Razgovor će biti odstranjen za tebe - ovo se ne može vratiti!</string>
+    <string name="import_theme">Uvesti temu</string>
+    <string name="chat_database_imported">Baza podataka Chata uvezena</string>
+    <string name="current_version_timestamp">%s (sadašnji)</string>
+    <string name="share_text_disappears_at">Nestaje u: %s</string>
+    <string name="import_database_confirmation">Uvesti</string>
+    <string name="settings_section_title_chat_colors">Boje Chata</string>
+    <string name="recipient_colon_delivery_status">%s: %s</string>
+    <string name="chat_archive">Ili uvesti arhiviranu datoteku</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Razgovor će biti odstranjen za sve članove - ovo se ne može vratiti!</string>
+    <string name="direct_messages_are_prohibited_in_chat">Direktne poruke između članova su zabranjene u ovim porukama.</string>
+    <string name="disconnect_remote_host">Prekinuti vezu</string>
+    <string name="migrate_to_device_bytes_downloaded">%s preuzeto</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Već ste povezani na %1$s.</string>
+    <string name="voice_messages_not_allowed">Glasovne poruke nisu dozvoljenje</string>
+    <string name="connection_error">Greška u vezi</string>
+    <string name="smp_servers_test_server">Test server</string>
+    <string name="audio_call_no_encryption">audio poziv (nije e2e šifrovan)</string>
+    <string name="new_chat">Novi razgovor</string>
+    <string name="save_and_notify_contact">Sačuvati i obavestiti kontakt</string>
+    <string name="save_and_notify_group_members">Sačuvati i obavestiti članove grupe</string>
+    <string name="secret_text">tajna</string>
+    <string name="video_call_no_encryption">video poziv (nije e2e šifrovan)</string>
+    <string name="icon_descr_video_on">Video uključen</string>
+    <string name="icon_descr_audio_off">Audio isključeno</string>
+    <string name="icon_descr_audio_on">Audio uključeno</string>
+    <string name="theme_black">Crna</string>
+    <string name="chat_preferences_off">isključeno</string>`
+  <string name="v4_5_italian_interface_descr">Zahvaljujući korisnicima – doprinesi pomoću Weblate!</string>
+    <string name="migrate_from_device_start_chat">Započeti razgovor</string>
+    <string name="italic_text">italic</string>
+    <string name="edit_verb">Urediti</string>
+    <string name="save_verb">Sačuvati</string>
+    <string name="video_descr">Video</string>
+    <string name="block_member_confirmation">Blok</string>
+    <string name="custom_time_unit_seconds">sekunde</string>
+    <string name="smp_servers_test_servers">Test serveri</string>
+    <string name="your_settings">Vaša podešavanja</string>
+    <string name="permissions_record_audio">Mikrofon</string>
+    <string name="settings_message_shape_corner">Ugao</string>
+    <string name="fix_connection_confirm">Popraviti</string>
+    <string name="secured">Obezbeđeno</string>
+    <string name="connections">Veze</string>
+    <string name="notification_preview_new_message">nova poruka</string>
+    <string name="icon_descr_email">Email</string>
+    <string name="network_enable_socks">Koristi SOCKS proxy?</string>
+    <string name="connection_error_blocked">Veza blokirana</string>
+    <string name="notifications">Obaveštenja</string>
+    <string name="gallery_video_button">Video</string>
+    <string name="you_accepted_connection">Prihvatili ste vezu</string>
+    <string name="clear_verb">Očistiti</string>
+    <string name="simplex_address">SimpleX adresa</string>
+    <string name="image_descr_simplex_logo">SimpleX Logo</string>
+    <string name="show_dev_options">Prikazati:</string>
+    <string name="settings_section_title_device">UREĐAJ</string>
+    <string name="new_message">Nova poruka</string>
+    <string name="color_secondary">Sekundarni</string>
+    <string name="receipts_section_contacts">Kontakti</string>
+    <string name="privacy_media_blur_radius_off">Isključeno</string>
+    <string name="v5_0_polish_interface_descr">Zahvaljujući korisnicima – doprinesi pomoću Weblate!</string>
+    <string name="enable_receipts_all">Omogućiti</string>
+    <string name="your_servers">Vaši serveri</string>
+    <string name="network_options_save">Sačuvati</string>
+    <string name="network_option_seconds_label">sek</string>
+    <string name="v4_3_voice_messages">Glasovne poruke</string>
+    <string name="ok">OK</string>
+    <string name="call_service_notification_audio_call">Audio poziv</string>
+    <string name="call_service_notification_video_call">Video poziv</string>
+    <string name="smp_servers_use_server">Koristi server</string>
+    <string name="smp_servers_your_server_address">Adresa vašeg servera</string>
+    <string name="your_SMP_servers">Vaši SMP serveri</string>
+    <string name="your_XFTP_servers">Vaši XFTP serveri</string>
+    <string name="onboarding_notifications_mode_battery">Obaveštenja i baterija</string>
+    <string name="show_call_on_lock_screen">Prikazati</string>
+    <string name="status_e2e_encrypted">e2e šifrovano</string>
+    <string name="open_verb">Otvoriti</string>
+    <string name="enable_automatic_deletion_question">Omogući automatsko brisanje poruka?</string>
+    <string name="snd_conn_event_ratchet_sync_ok">šifrovanje ok za %s</string>
+    <string name="user_mute">Isključiti zvuk</string>
+    <string name="theme_simplex">SimpleX</string>
+    <string name="theme">Teme</string>
+    <string name="voice_messages">Glasovne poruke</string>
+    <string name="calls_prohibited_with_this_contact">Audio/video pozivi su zabranjeni.</string>
+    <string name="connect_plan_open_group">Otvoriti grupu</string>
+    <string name="all_users">Svi profili</string>
+    <string name="add_contact_or_create_group">Započeti novi razgovor</string>
+    <string name="clear_chat_menu_action">Očistiti</string>
+    <string name="clear_chat_button">Očistiti razgovor</string>
+    <string name="smp_servers_your_server">Tvoj server</string>
+    <string name="snd_conn_event_ratchet_sync_agreed">šifrovanje prihvaćeno za %s</string>
+    <string name="voice_messages_are_prohibited">Glasovne poruke su zabranjene.</string>
+    <string name="connection_local_display_name">veza %1$d</string>
+    <string name="icon_descr_video_off">Video isključen</string>
+    <string name="message_queue_info_none">ništa</string>
+    <string name="info_row_connection">Veza</string>
+    <string name="chat_list_favorites">Omiljeno</string>
+    <string name="chat_list_contacts">Kontakti</string>
+    <string name="favorite_chat">Omiljen</string>
+    <string name="network_smp_proxy_mode_never">Nikada</string>
+    <string name="network_session_mode_entity">Veza</string>
+    <string name="settings_section_title_themes">TEME</string>
+    <string name="audio_video_calls">Audio/video pozivi</string>
+    <string name="chat_preferences_no">ne</string>
+    <string name="conn_event_ratchet_sync_ok">šifrovanje ok</string>
+    <string name="conn_event_ratchet_sync_agreed">šifrovanje prihvaćeno</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">Zahvaljujući korisnicima – doprinesi pomoću Weblate!</string>
+    <string name="back">Nazad</string>
+    <string name="your_simplex_contact_address">Vaša SimpleX adresa</string>
+    <string name="save_and_notify_contacts">Sačuvati i obavestiti kontakte</string>
+    <string name="v4_4_french_interface_descr">Zahvaljujući korisnicima – doprinesi pomoću Weblate!</string>
+    <string name="icon_descr_edited">uređeno</string>
+    <string name="privacy_chat_list_open_links_no">Ne</string>
+    <string name="network_smp_proxy_fallback_prohibit">Ne</string>
+    <string name="keep_conversation">Zadržite konverzaciju</string>
+    <string name="icon_descr_address">SimpleX Adresa</string>
+    <string name="save_servers_button">Sačuvati</string>
+    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="settings_section_title_experimenta">EKSPERIMENTALNO</string>
+    <string name="chat_item_ttl_none">nikada</string>
+    <string name="clear_contacts_selection_button">Očistiti</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Zahvaljujući korisnicima – doprinesi pomoću Weblate!</string>
+    <string name="encrypted_audio_call">e2e šifrovan zvučni poziv</string>
+    <string name="icon_descr_video_call">video poziv</string>
+    <string name="use_servers_of_operator_x">Koristi %s</string>
+    <string name="operator_use_operator_toggle_description">Koristi servere</string>
+    <string name="contact_list_header_title">Vaši kontakti</string>
+    <string name="network_use_onion_hosts_no">Ne</string>
+    <string name="start_chat_question">Započeti razgovor?</string>
+    <string name="info_view_open_button">otvoriti</string>
+    <string name="onboarding_network_operators_continue">Nastaviti</string>
+    <string name="rcv_group_event_open_chat">Otvoriti</string>
+    <string name="color_background">Pozadina</string>
+    <string name="icon_descr_audio_call">audio poziv</string>
+    <string name="settings_audio_video_calls">Audio &amp; video pozivi</string>
+    <string name="chat_database_exported_continue">Nastaviti</string>
+    <string name="v4_6_audio_video_calls">Audio i video pozivi</string>
+    <string name="edit_chat_list_menu_action">Urediti</string>
+    <string name="feature_off">isključeno</string>
+    <string name="voice_prohibited_in_this_chat">Glasovne poruke su zabranjene u ovom razgovoru.</string>
+    <string name="mute_chat">Isključiti zvuk</string>
+    <string name="keep_invitation_link">Zadržati</string>
+    <string name="sync_connection_confirm">Popraviti</string>
+    <string name="clear_chat_question">Očistiti razgovor?</string>
+    <string name="clear_note_folder_question">Očistiti privatne beleške?</string>
+    <string name="continue_to_next_step">Nastaviti</string>
+    <string name="report_item_archived">arhivirani izveštaj</string>
+    <string name="app_check_for_updates_installed_successfully_title">Uspešno instalirano</string>
+    <string name="scan_from_mobile">Skenirati telefonom</string>
+    <string name="network_option_ping_interval">PING interval</string>
+    <string name="servers_info_subscriptions_connections_pending">Na čekanju</string>
+    <string name="servers_info_detailed_statistics_sent_messages_header">Poslane poruke</string>
+    <string name="security_code">Bezbednostni kod</string>
+    <string name="chat_with_the_founder">Poslati pitanja i ideje</string>
+    <string name="migrate_to_device_repeat_import">Ponoviti uvoz</string>
+    <string name="service_notifications">Trenutna obaveštenja!</string>
+    <string name="icon_descr_send_message">Poslati Poruku</string>
+    <string name="onboarding_notifications_mode_service">Trenutno</string>
+    <string name="remove_member_button">Ukloniti člana</string>
+    <string name="send_verb">Poslati</string>
+    <string name="saved_chat_item_info_tab">Sačuvano</string>
+    <string name="gallery_image_button">Slika</string>
+    <string name="one_time_link_short">jednokratna veza</string>
+    <string name="network_proxy_random_credentials">Koristi nasumične pristupne podatke</string>
+    <string name="port_verb">Port</string>
+    <string name="network_proxy_username">Korisničko ime</string>
+    <string name="network_proxy_port">port %d</string>
+    <string name="save_settings_question">Sačuvati podešavanja?</string>
+    <string name="onboarding_notifications_mode_title">Privatna obaveštenja</string>
+    <string name="incoming_audio_call">Dolazni audio poziv</string>
+    <string name="status_no_e2e_encryption">bez e2e šifrovanja</string>
+    <string name="icon_descr_flip_camera">Okrenuti kameru</string>
+    <string name="rcv_group_event_member_unblocked">odblokiran %s</string>
+    <string name="profile_update_event_removed_address">uklonjena kontakt adresa</string>
+    <string name="snd_conn_event_ratchet_sync_started">prihvatiti šifrovanje za %s…</string>
+    <string name="group_member_status_removed">uklonjeno</string>
+    <string name="group_member_status_left">levo</string>
+    <string name="button_leave_group">Napustiti grupu</string>
+    <string name="role_in_group">Uloga</string>
+    <string name="color_mode_light">Svetlo</string>
+    <string name="ttl_w">%dn</string>
+    <string name="invalid_file_link">Nevažeća veza</string>
+    <string name="servers_info_statistics_section_header">Statistika</string>
+    <string name="reconnect">Ponovo povezati</string>
+    <string name="size">Veličina</string>
+    <string name="delete_image">Odstraniti sliku</string>
+    <string name="callstatus_missed">propušten poziv</string>
+    <string name="icon_descr_call_rejected">Odbijeni poziv</string>
+    <string name="icon_descr_call_pending_sent">Poziv na čekanju</string>
+    <string name="sent_message">Poslana poruka</string>
+    <string name="v5_4_incognito_groups">Anonimne grupe</string>
+    <string name="custom_time_picker_select">Izabrati</string>
+    <string name="invite_friends_short">Pozvati</string>
+    <string name="report_item_archived_by">arhivirani izveštaj od %s</string>
+    <string name="invalid_chat">nevažeći razgovor</string>
+    <string name="simplex_link_mode_description">Opis</string>
+    <string name="icon_descr_instant_notifications">Trenutna obaveštenja</string>
+    <string name="auth_stop_chat">Zaustaviti razgovor</string>
+    <string name="disappearing_message">Poruka koja nestaje</string>
+    <string name="no_details">bez detalja</string>
+    <string name="scan_code">Skenirati kod</string>
+    <string name="join_group_button">Pristupiti</string>
+    <string name="join_group_question">Pristupiti grupi?</string>
+    <string name="profile_update_event_member_name_changed">član %1$s promenjen u %2$s</string>
+    <string name="button_welcome_message">Poruka dobrodošlice</string>
+    <string name="theme_remove_image">Ukloniti sliku</string>
+    <string name="v5_5_private_notes">Privatne beleške</string>
+    <string name="error_parsing_uri_title">Nevažeća veza</string>
+    <string name="personal_welcome">Dobrodošli %1$s!</string>
+    <string name="periodic_notifications">Periodična obaveštenja</string>
+    <string name="auth_open_chat_console">Otvoriti konzolu razgovora</string>
+    <string name="info_view_search_button">pretraži</string>
+    <string name="info_view_video_button">video</string>
+    <string name="call_connection_peer_to_peer">peer-to-peer</string>
+    <string name="incognito_info_protects">Anonimni režim štiti Vašu privatnost koristeći novi nasumični profil za svaki kontakt.</string>
+    <string name="custom_time_unit_weeks">nedelje</string>
+    <string name="agent_internal_error_title">Interna greška</string>
+    <string name="saved_from_description">Sačuvano od %s</string>
+    <string name="saved_description">sačuvano</string>
+    <string name="group_member_status_invited">pozvan</string>
+    <string name="saved_message_title">Sačuvana poruka</string>
+    <string name="reset_color">Obnoviti boje</string>
+    <string name="link_a_mobile">Povezati telefon</string>
+    <string name="report_archive_alert_title">Arhiviraj izveštaj?</string>
+    <string name="delivery">Prijem</string>
+    <string name="report_verb">Izveštaj</string>
+    <string name="in_reply_to">U odgovoru na</string>
+    <string name="chat_list_group_reports">Izveštaji</string>
+    <string name="chat_list_notes">Beleške</string>
+    <string name="send_live_message">Poslati živu poruku</string>
+    <string name="delete_pending_connection__question">Odstraniti veze na čekanju?</string>
+    <string name="scan_paste_link">Skenirati / Nalepiti link</string>
+    <string name="incorrect_code">Neispravan bezbednostni kod!</string>
+    <string name="callstatus_rejected">odbijeni poziv</string>
+    <string name="action_button_add_members">Pozvati</string>
+    <string name="member_info_member_inactive">neaktivan</string>
+    <string name="network_options_save_and_reconnect">Sačuvati i ponovo povezati</string>
+    <string name="thousand_abbreviation">k</string>
+    <string name="connect_via_group_link">Pristupiti grupi?</string>
+    <string name="invalid_message_format">nevažeći format poruke</string>
+    <string name="la_notice_turn_on">Uključiti</string>
+    <string name="delete_message__question">Odstraniti poruku?</string>
+    <string name="profile_update_event_removed_picture">uklonjena profilna slika</string>
+    <string name="image_descr_profile_image">profilna slika</string>
+    <string name="color_mode_dark">Tamno</string>
+    <string name="linked_mobiles">Povezani telefoni</string>
+    <string name="subscribed">Pretplaćen</string>
+    <string name="privacy_chat_list_open_links_ask">Pitati</string>
+    <string name="invite_to_group_button">Pozvati u grupu</string>
+    <string name="color_mode_system">Sistem</string>
+    <string name="theme_system">Sistem</string>
+    <string name="theme_light">Svetlo</string>
+    <string name="reset_single_color">Obnoviti boju</string>
+    <string name="chat_theme_apply_to_light_mode">Svetlosni režim</string>
+    <string name="chat_theme_apply_to_dark_mode">Tamni režim</string>
+    <string name="v5_5_join_group_conversation">Pristupiti grupnoj konverzaciji</string>
+    <string name="desktop_address">Adresa računara</string>
+    <string name="connect_plan_join_your_group">Pristupiti Vašoj grupi?</string>
+    <string name="service_notifications_disabled">Trenutna obaveštenja su onemogućena!</string>
+    <string name="stop_file__action">Zaustaviti datoteku</string>
+    <string name="group_preview_join_as">pristupiti kao %s</string>
+    <string name="info_menu">Informacije</string>
+    <string name="reply_verb">Odgovoriti</string>
+    <string name="member_inactive_title">Član neaktivan</string>
+    <string name="network_socks_proxy_settings">SOCKS proxy podešavanje</string>
+    <string name="network_socks_proxy">SOCKS proxy</string>
+    <string name="icon_descr_call_missed">Propušten poziv</string>
+    <string name="delete_messages_after">Odstraniti poruke nakon</string>
+    <string name="delete_messages">Odstraniti poruke</string>
+    <string name="rcv_group_event_member_left">levo</string>
+    <string name="rcv_conn_event_verification_code_reset">bezbednostni kod promenjen</string>
+    <string name="info_row_local_name">Lokalno ime</string>
+    <string name="item_info_current">(trenutno)</string>
+    <string name="view_conditions">Pogledati uslove</string>
+    <string name="language_system">Sistem</string>
+    <string name="theme_dark">Tamno</string>
+    <string name="dark_theme">Tamna tema</string>
+    <string name="v6_0_increase_font_size">Povećati veličinu slova.</string>
+    <string name="servers_info_details">Detalji</string>
+    <string name="servers_info_reset_stats_alert_confirm">Obnoviti</string>
+    <string name="servers_info_reset_stats">Obnoviti statistiku</string>
+    <string name="la_mode_system">Sistem</string>
+    <string name="compose_send_direct_message_to_connect">Poslati direktnu poruku za povezivanje</string>
+    <string name="image_descr">Slika</string>
+    <string name="icon_descr_server_status_pending">Na čekanju</string>
+    <string name="smp_servers">SMP serveri</string>
+    <string name="display_name">Upišite Vaše ime:</string>
+    <string name="open_chat">Otvoriti razgovor</string>
+    <string name="rcv_group_event_member_added">pozvan %1$s</string>
+    <string name="conn_event_ratchet_sync_started">prihvatiti šifrovanje…</string>
+    <string name="sending_via">Slanje pomoću</string>
+    <string name="smp_server_test_delete_queue">Odstraniti redosled</string>
+    <string name="note_folder_local_display_name">Privatne beleške</string>
+    <string name="invalid_data">nevažeći podaci</string>
+    <string name="stop_chat_confirmation">Zaustaviti</string>
+    <string name="fix_connection">Popraviti vezu</string>
+    <string name="stop_file__confirm">Zaustaviti</string>
+    <string name="member_contact_send_direct_message">poslati direktnu poruku</string>
+    <string name="attach">Priložiti</string>
+    <string name="save_list">Sačuvati listu</string>
+    <string name="self_destruct">Samouništenje</string>
+    <string name="bad_desktop_address">Pogrešna adresa računara</string>
+    <string name="agent_critical_error_title">Kritična greška</string>
+    <string name="rcv_group_event_member_deleted">uklonjeno %1$s</string>
+    <string name="group_member_role_member">član</string>
+    <string name="initial_member_role">Početna uloga</string>
+    <string name="conn_level_desc_indirect">posredan (%1$s)</string>
+    <string name="saved_from_chat_item_info_title">Sačuvano od</string>
+    <string name="periodic_notifications_disabled">Periodična obaveštenja su onemogućena!</string>
+    <string name="group_welcome_title">Poruka dobrodošlice</string>
+    <string name="open_with_app">Otvoriti pomoću %s</string>
+    <string name="migrate_from_device_remove_archive_question">Ukloniti arhivu?</string>
+    <string name="selected_chat_items_selected_n">Izabrano %d</string>
+    <string name="welcome">Dobrodošli!</string>
+    <string name="videos_limit_title">Previše video snimaka!</string>
+    <string name="send_disappearing_message_send">Poslati</string>
+    <string name="reset_verb">Obnoviti</string>
+    <string name="invalid_contact_link">Nevažeća veza!</string>
+    <string name="select_chat_profile">Izabrati profil razgovora</string>
+    <string name="smp_servers_scan_qr">Skenirati QR kod servera</string>
+    <string name="network_settings">Napredna mrežna podešavanja</string>
+    <string name="settings_section_title_socks">SOCKS PROXY</string>
+    <string name="settings_section_title_incognito">Anonimni režim</string>
+    <string name="network_option_ping_count">broj PING</string>
+    <string name="servers_info_reset_stats_alert_title">Obnoviti statistiku?</string>
+    <string name="icon_descr_add_members">Pozvati članove</string>
+    <string name="network_option_tcp_connection">TCP veza</string>
+    <string name="servers_info">Informacije o serveru</string>
+    <string name="fix_connection_question">Popraviti vezu?</string>
+    <string name="deleted_chats">Arhivirani kontakti</string>
+    <string name="archive_report">Arhivirati izveštaj</string>
+    <string name="scan_qr_code_from_desktop">Skenirati QR kod sa radne površine</string>
+    <string name="leave_chat_question">Napustiti razgovor?</string>
+    <string name="incoming_video_call">Dolazni video poziv</string>
+    <string name="button_add_members">Pozvati članove</string>
+    <string name="dark_mode_colors">Tamni režim boja</string>
+    <string name="ttl_d">%dd</string>
+    <string name="linked_desktops">Povezane radne površine</string>
+    <string name="whats_new">Šta je novo</string>
+    <string name="remove_passphrase">Ukloniti</string>
+    <string name="attempts_label">pokušaji</string>
+    <string name="incognito">Anonimno</string>
+    <string name="delete_profile">Odstraniti profil</string>
+    <string name="icon_descr_video_snd_complete">Video poslan</string>
+    <string name="smp_servers_save">Sačuvati servere</string>
+    <string name="smp_save_servers_question">Sačuvati servere?</string>
+    <string name="button_remove_member">Ukloniti člana</string>
+    <string name="item_info_no_text">bez teksta</string>
+    <string name="welcome_message_is_too_long">Poruka dobrodošlice je preduga</string>
+    <string name="migrate_from_device_archiving_database">Arhiviraj bazu podataka</string>
+    <string name="onboarding_notifications_mode_periodic">Periodično</string>
+    <string name="remove_member_confirmation">Ukloniti</string>
+    <string name="member_info_section_title_member">ČLAN</string>
+    <string name="joining_group">Pristupanje grupi</string>
+    <string name="smp_server">SMP server</string>
+    <string name="invite_to_chat_button">Pozvati u razgovor</string>
+    <string name="unblock_member_confirmation">Odblokirati</string>
+    <string name="v4_5_italian_interface">Italijanski interfejs</string>
+    <string name="file_with_path">Datoteka: %s</string>
+    <string name="join_group_incognito_button">Pristupiti anonimno</string>
+    <string name="leave_group_question">Napustiti grupu?</string>
+    <string name="devices">Uređaji</string>
+    <string name="select_verb">Izabrati</string>
+    <string name="send_receipts">Poslati potvrde</string>
+    <string name="sync_connection_question">Popraviti vezu?</string>
+    <string name="leave_group_button">Napustiti</string>
+    <string name="button_leave_chat">Napustiti razgovor</string>
+    <string name="select_contacts">Izabrati kontakte</string>
+    <string name="button_send_direct_message">Poslati direktnu poruku</string>
+    <string name="button_remove_member_question">Ukloniti člana?</string>
+    <string name="wallpaper_scale_repeat">Ponoviti</string>
+    <string name="appearance_font_size">Veličina teksta</string>
+    <string name="v5_0_large_files_support">Videa i datoteke do 1gb</string>
+    <string name="desktop_incompatible_version">Nekompatibilna verzija</string>
+    <string name="migrate_to_device_repeat_download">Ponoviti preuzimanje</string>
+    <string name="stop_chat_question">Zaustaviti razgovor?</string>
+    <string name="delete_link">Odstraniti vezu</string>
+    <string name="share_text_created_at">Kreirano u: %s</string>
+    <string name="feature_roles_owners">vlasnici</string>
+    <string name="migrate_to_device_finalize_migration">Dovršiti migraciju na drugom uređaju.</string>
+    <string name="network_type_other">Drugo</string>
+    <string name="created">Kreirano</string>
+    <string name="other_errors">Ostale greške</string>
+    <string name="retry_verb">Ponoviti</string>
+    <string name="encrypt_database_question">Šifrovati bazu podataka?</string>
+    <string name="group_members_2">%s i %s</string>
+    <string name="group_member_role_owner">vlasnik</string>
+    <string name="copy_verb">Kopirati</string>
+    <string name="submit_passcode">Predati</string>
+    <string name="xftp_servers_other">Ostali XFTP serveri</string>
+    <string name="create_simplex_address">Napraviti SimpleX adresu</string>
+    <string name="encrypt_database">Šifrovati</string>
+    <string name="info_row_created_at">Kreirano u</string>
+    <string name="operator_open_conditions">Otvoriti uslove</string>
+    <string name="v6_0_connection_servers_status">Kontrolisanje vaše mreže</string>
+    <string name="copied">Kopirano</string>
+    <string name="message_too_large">Poruka je prevelika</string>
+    <string name="smp_server_test_upload_file">Otpremiti datoteku</string>
+    <string name="smp_server_test_create_file">Napraviti datoteku</string>
+    <string name="create_group">Napraviti tajnu grupu</string>
+    <string name="group_member_status_creator">kreator</string>
+    <string name="reveal_verb">Otkriti</string>
+    <string name="create_list">Napraviti listu</string>
+    <string name="copy_error">Greška pri kopiranju</string>
+    <string name="rcv_group_event_2_members_connected">%s i %s su povezani</string>
+    <string name="create_group_button">Napraviti grupu</string>
+    <string name="create_secret_group_title">Napraviti tajnu grupu</string>
+    <string name="v5_1_message_reactions_descr">Napokon ih imamo! 🚀</string>
+    <string name="migrate_from_device_finalize_migration">Dovršiti migraciju</string>
+    <string name="selected_chat_items_nothing_selected">Ništa nije izabrano</string>
+    <string name="conversation_deleted">Konverzacija odstranjena!</string>
+    <string name="smp_servers_other">Ostali SMP serveri</string>
+    <string name="core_version">Verzija jezgra: v%s</string>
+    <string name="encrypted_database">Šifrovati bazu podataka</string>
+    <string name="delete_link_question">Odstraniti vezu?</string>
+    <string name="subscription_results_ignored">Pretplata ignorisana</string>
+    <string name="create_chat_profile">Napraviti profil razgovora</string>
+    <string name="create_another_profile_button">Napraviti profil</string>
+    <string name="subscription_errors">Greške u pretplati</string>
+    <string name="wallpaper_scale_fit">Pasent</string>
+    <string name="delete_chat_list_question">Odstraniti listu?</string>
+    <string name="operator_use_for_messages_receiving">Za primanje</string>
+    <string name="other_label">drugo</string>
+    <string name="create_profile">Napraviti profil</string>
+    <string name="people_can_connect_only_via_links_you_share">Vi odlučujete ko se može povezati.</string>
+    <string name="delete_group_question">Odstraniti grupu?</string>
+    <string name="restore_database_alert_confirm">Obnoviti</string>
+    <string name="switch_verb">Prebaciti</string>
+    <string name="app_check_for_updates_beta">Beta</string>
+    <string name="edit_image">Urediti sliku</string>
+    <string name="receipts_section_groups">Mala grupa (max 20)</string>
+    <string name="info_row_received_at">Primljeno u</string>
+    <string name="feature_cancelled_item">otkazano %s</string>
+    <string name="callstate_received_confirmation">primljena potvrda…</string>
+    <string name="v5_4_better_groups">Bolje grupe</string>
+    <string name="report_reason_other">Drugi razlog</string>
+    <string name="v6_0_your_contacts_descr">Arhivirati kontakte za kasniji razgovor.</string>
+    <string name="servers_info_detailed_statistics_received_messages_header">Primljene poruke</string>
+    <string name="v6_1_better_security">Bolja sigurnost ✅</string>
+    <string name="button_create_group_link">Napraviti vezu</string>
+    <string name="received_message">Primljena poruka</string>
+    <string name="contact_tap_to_connect">Dodirnuti za Povezivanje</string>
+    <string name="chat_help_tap_button">Dodirnuti dugme</string>
+    <string name="open_port_in_firewall_title">Otvoriti port u firewallu</string>
+    <string name="share_text_received_at">Primljeno u: %s</string>
+    <string name="simplex_link_mode_browser">Pomoću pretraživača</string>
+    <string name="share_address_publicly">Podeliti adresu javno</string>
+    <string name="app_check_for_updates_button_skip">Preskočiti ovu verziju</string>
+    <string name="app_check_for_updates_button_remind_later">Podseti kasnije</string>
+    <string name="icon_descr_call_connecting">Povezivanje poziva</string>
+    <string name="answer_call">Odgovoriti na poziv</string>
+    <string name="settings_section_title_network_connection">Mrežna veza</string>
+    <string name="v6_2_network_decentralization">Decentralizacija mreže</string>
+    <string name="v6_2_business_chats">Biznis razgovori</string>
+    <string name="completed">Završeno</string>
+    <string name="expand_verb">Proširiti</string>
+    <string name="show_QR_code">Prikazati QR kod</string>
+    <string name="smp_server_test_download_file">Preuzeti datoteku</string>
+    <string name="create_group_link">Napraviti grupni link</string>
+    <string name="chat_list_businesses">Biznisi</string>
+    <string name="v6_1_better_user_experience">Bolje korisničko iskustvo</string>
+    <string name="possible_slow_function_title">Spora funkcija</string>
+    <string name="button_edit_group_profile">Urediti profil grupe</string>
+    <string name="tap_to_activate_profile">Dodirnuti za aktivaciju profila.</string>
+    <string name="theme_destination_app_theme">Tema aplikacije</string>
+    <string name="group_invitation_tap_to_join">Dodirnuti za pristup</string>
+    <string name="group_invitation_tap_to_join_incognito">Dodirnuti za anonimni pristup</string>
+    <string name="share_address">Podeliti adresu</string>
+    <string name="settings_message_shape_tail">Rep</string>
+    <string name="v6_1_better_calls">Bolji pozivi</string>
+    <string name="business_address">Biznis adresa</string>
+    <string name="color_received_message">Primljena poruka</string>
+    <string name="group_member_status_complete">završiti</string>
+    <string name="icon_descr_expand_role">Proširiti selekciju uloga</string>
+    <string name="opening_database">Otvaranje baze podataka…</string>
+    <string name="refresh_qr_code">Obnoviti</string>
+    <string name="icon_descr_speaker_off">Zvučnik isključen</string>
+    <string name="colored_text">obojen</string>
+    <string name="share_link">Podeli vezu</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="audio_device_speaker">Zvučnik</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="no_chats_found">Razgovori nisu pronađeni</string>
+    <string name="icon_descr_speaker_on">Zvučnik uključen</string>
+    <string name="v5_6_safer_groups">Bezbednije grupe</string>
+    <string name="reject_contact_button">Odbiti</string>
+    <string name="reject">Odbiti</string>
+    <string name="no_chats_in_list">Razgovori nisu u listi %s.</string>
+    <string name="images_limit_title">Previše slika!</string>
+    <string name="group_member_role_author">autor</string>
+    <string name="export_theme">Izvesti temu</string>
+    <string name="v4_4_live_messages">Žive poruke</string>
+    <string name="operator_website">Website</string>
+    <string name="custom_time_unit_days">dani</string>
+    <string name="compose_forward_messages_n">Prosleđivanje %1$s poruka</string>
+    <string name="network_use_onion_hosts_prefer">Kada je dostupno</string>
+    <string name="v5_7_forward">Proslediti i sačuvati poruke</string>
+    <string name="forwarded_chat_item_info_tab">Prosleđeno</string>
+    <string name="snd_error_proxy">Server za prosleđivanje: %1$s\nGreška: %2$s</string>
+    <string name="mark_read">Označiti da je pročitano</string>
+    <string name="snd_error_proxy_relay">Server za prosleđivanje : %1$s\nGreška odredišnog servera: %2$s</string>
+    <string name="verify_connections">Verifikovati veze</string>
+    <string name="chat_theme_apply_to_mode">Primeniti na</string>
+    <string name="migrate_from_device_stopping_chat">Zaustavljanje razgovora</string>
+    <string name="paste_the_link_you_received">Nalepiti link koji ste primili</string>
+    <string name="rate_the_app">Oceniti aplikaciju</string>
+    <string name="no_unread_chats">Nema nepročitanih razgovora</string>
+    <string name="report_archive_alert_desc">Izveštaj će biti arhiviran za Vas.</string>
+    <string name="keep_unused_invitation_question">Sačuvati neiskorišćenu pozivnicu?</string>
+    <string name="voice_message_send_text">Glasovna poruka…</string>
+    <string name="connect_use_current_profile">Koristiti trenutni profil</string>
+    <string name="paste_link">Nalepiti link</string>
+    <string name="v5_5_simpler_connect_ui">Nalepiti link za povezivanje!</string>
+    <string name="live">ŽIVO</string>
+    <string name="star_on_github">Zvezdica na GitHubu</string>
+    <string name="wallpaper_scale">Razmera</string>
+    <string name="v4_4_verify_connection_security">Verifikovati bezbednost veze</string>
+    <string name="current_user">Trenutni profil</string>
+    <string name="button_delete_group">Odstraniti grupu</string>
+    <string name="forwarded_description">prosleđeno</string>
+    <string name="notification_preview_mode_message">Tekst poruke</string>
+    <string name="forwarded_from_chat_item_info_title">Prosleđeno od</string>
+    <string name="loading_chats">Učitavanje razgovora…</string>
+    <string name="forward_alert_title_messages_to_forward">Proslediti %1$s poruku(e)?</string>
+    <string name="connection_security">Bezbednost veze</string>
+    <string name="onboarding_notifications_mode_off">Kada je aplikacija pokrenuta</string>
+    <string name="forward_chat_item">Proslediti</string>
+    <string name="large_file">Velika datoteka!</string>
+    <string name="migrate_to_device_apply_onion">Primeniti</string>
+    <string name="delete_message_cannot_be_undone_warning">Poruka će biti odstranjena - ovo se ne može poništiti!</string>
+    <string name="maximum_message_size_title">Poruka je prevelika!</string>
+    <string name="loading_remote_file_title">Učitavanje datoteke</string>
+    <string name="voice_message">Glasovna poruka</string>
+    <string name="voice_message_with_duration">Glasovna poruka (%1$s)</string>
+    <string name="learn_more">Naučiti više</string>
+    <string name="mark_code_verified">Označiti da je verifikovano</string>
+    <string name="use_chat">Koristiti razgovor</string>
+    <string name="mark_unread">Označiti da nije pročitano</string>
+    <string name="verify_connection">Verifikovati vezu</string>
+    <string name="display_name_requested_to_connect">zahtev za povezivanje</string>
+    <string name="tap_to_scan">Dodirnuti za skeniranje</string>
+    <string name="unknown_database_error_with_info">Nepoznata greška u bazi podataka: %s</string>
+    <string name="servers_info_messages_received">Primljene poruke</string>
+    <string name="duplicates_label">duplikati</string>
+    <string name="chat_preferences_yes">da</string>
+    <string name="migrate_from_device_migration_complete">Migracija završena</string>
+    <string name="network_smp_proxy_fallback_allow">Da</string>
+    <string name="v6_2_network_decentralization_enable_flux">Omogućiti flux</string>
+    <string name="error_with_info">Greška: %s</string>
+    <string name="error_stopping_chat">Greška u zaustavljanju razgovora</string>
+    <string name="contribute">Doprinesite</string>
+    <string name="moderated_item_description">moderirao %s</string>
+    <string name="la_current_app_passcode">Trenutan Pin kod</string>
+    <string name="waiting_for_video">Čekanje na video</string>
+    <string name="waiting_for_file">Čekanje na dokument</string>
+    <string name="network_use_onion_hosts_required">Neophodno</string>
+    <string name="network_smp_proxy_mode_always">Uvek</string>
+    <string name="app_check_for_updates_button_download">Preuzimanje %s (%s)</string>
+    <string name="ignore">Ignorisati</string>
+    <string name="new_passcode">Novi Pin kod</string>
+    <string name="la_app_passcode">Pin kod aplikacije</string>
+    <string name="enabled_self_destruct_passcode">Omogućiti pin kod za samouništenje</string>
+    <string name="self_destruct_passcode">Pin kod za samouništenje</string>
+    <string name="settings_shutdown">Isključiti</string>
+    <string name="info_row_moderated_at">Moderirano u</string>
+    <string name="recent_history">Vidljiva istorija</string>
+    <string name="remote_ctrl_disconnected_with_reason">Prekinuta veza iz razloga: %s</string>
+    <string name="network_type_cellular">Mobilna</string>
+    <string name="servers_info_messages_sent">Poruke poslane</string>
+    <string name="for_everybody">Za sve</string>
+    <string name="debug_logs">Omogući evidenciju</string>
+    <string name="la_immediately">Odmah</string>
+    <string name="icon_descr_sent_msg_status_send_failed">greška u slanju</string>
+    <string name="smp_servers_delete_server">Odstraniti server</string>
+    <string name="snd_group_event_member_blocked">blokirali ste %s</string>
+    <string name="v5_6_quantum_resistant_encryption">Kvantno otporno šifrovanje</string>
+    <string name="dont_create_address">Ne praviti adresu</string>
+    <string name="receipts_groups_enable_for_all">Omogućiti svim grupama</string>
+    <string name="dont_show_again">Ne prikazivati ponovo</string>
+    <string name="custom_time_unit_minutes">minuti</string>
+    <string name="custom_time_unit_months">meseci</string>
+    <string name="group_welcome_preview">Pregled</string>
+    <string name="la_enter_app_passcode">Uneti Pin kod</string>
+    <string name="network_session_mode_session">Sesija aplikacije</string>
+    <string name="notification_preview_mode_contact_desc">Prikazati samo kontakt</string>
+    <string name="group_member_status_unknown_short">nepoznato</string>
+    <string name="change_order_chat_list_menu_action">Promeniti redosled</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">promena adrese za %s…</string>
+    <string name="failed_to_active_user_title">Greška u promeni profila!</string>
+    <string name="connect_use_new_incognito_profile">Koristiti novi anoniman profil</string>
+    <string name="display_name_connection_established">veza uspostavljena</string>
+    <string name="change_list">Promeniti listu</string>
+    <string name="audio_device_earpiece">Slušalica</string>
+    <string name="shutdown_alert_question">Isključiti?</string>
+    <string name="this_device">Ovaj uređaj</string>
+    <string name="enable_self_destruct">Omogućiti samouništenje</string>
+    <string name="notifications_mode_service">Uvek uključeno</string>
+    <string name="delete_report">Odstraniti izveštaj</string>
+    <string name="icon_descr_image_snd_complete">Poslana slika</string>
+    <string name="confirm_verb">Potvrditi</string>
+    <string name="v5_2_more_things">Još nekoliko stvari</string>
+    <string name="connect_via_invitation_link">Povezati pomoću jednokratnog linka?</string>
+    <string name="la_mode_passcode">Pin kod</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Vi i Vaš kontakt, možete da šaljete poruke koje nestaju.</string>
+    <string name="v5_7_call_sounds">Zvukovi u pozivu</string>
+    <string name="conn_event_disabled_pq">standardno od kraja-do-kraja šifrovanje</string>
+    <string name="group_member_role_moderator">moderator</string>
+    <string name="chat_preferences_always">uvek</string>
+    <string name="v4_5_reduced_battery_usage">Smanjiti upotrebu baterije</string>
+    <string name="servers_info_proxied_servers_section_header">Proxied(posrednički) serveri</string>
+    <string name="smp_servers_new_server">Novi server</string>
+    <string name="subscription_percentage">Prikazati procente</string>
+    <string name="exit_without_saving">Napustiti bez čuvanja</string>
+    <string name="run_chat_section">POKRENUTI RAZGOVOR</string>
+    <string name="unblock_for_all_question">Odblokirati člana za sve?</string>
+    <string name="migrate_to_device_database_init">Priprema za preuzimanje</string>
+    <string name="proxied">Proxied(posredovan)</string>
+    <string name="decryption_error">Greška u dešifrovanju</string>
+    <string name="settings_notification_preview_mode_title">Prikazati pregled</string>
+    <string name="database_migrations">Migracije: %s</string>
+    <string name="alert_message_no_group">Ova grupa više ne postoji.</string>
+    <string name="snd_group_event_changed_member_role">promenili ste ulogu %s u %s</string>
+    <string name="group_member_role_observer">posmatrač</string>
+    <string name="info_row_message_status">Status poruke</string>
+    <string name="info_row_file_status">Status datoteke</string>
+    <string name="chat_preferences_default">podrazumevano (%s)</string>
+    <string name="v5_8_persian_ui">Persijski UI</string>
+    <string name="servers_info_reset_stats_alert_message">Statistika servera ce biti obnovljena - ovo se ne može poništiti!</string>
+    <string name="la_change_app_passcode">Promeniti pin kod</string>
+    <string name="icon_descr_waiting_for_image">Čekanje na sliku</string>
+    <string name="waiting_for_image">Čekanje na sliku</string>
+    <string name="icon_descr_waiting_for_video">Čekanje na video</string>
+    <string name="to_start_a_new_chat_help_header">Za početak novog razgovora</string>
+    <string name="receipts_contacts_enable_for_all">Omogućiti svima</string>
+    <string name="error_starting_chat">Greška u pokretanju razgovora</string>
+    <string name="rcv_group_event_changed_member_role">uloga promenjena iz %s u %s</string>
+    <string name="change_member_role_question">Promeniti ulogu grupe?</string>
+    <string name="smp_server_test_delete_file">Odstraniti datoteku</string>
+    <string name="icon_descr_simplex_team">SimpleX Tim</string>
+    <string name="moderated_description">moderirano</string>
+    <string name="connection_error_blocked_desc">Operator servera blokira vezu:\n%1$s.</string>
+    <string name="change_role">Promeniti ulogu</string>
+    <string name="this_device_name">Ime ovog uređaja</string>
+    <string name="tap_to_start_new_chat">Dodirnuti za početak novog razgovora</string>
+    <string name="group_preview_you_are_invited">pozvani ste u grupu</string>
+    <string name="image_saved">Slika sačuvana u Galeriji</string>
+    <string name="rcv_group_event_changed_your_role">vaša uloga je promenjena u %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">promenili ste adresu</string>
+    <string name="cant_call_contact_deleted_alert_text">Kontakt je odstranjen.</string>
+    <string name="v5_1_japanese_portuguese_interface">Japanski i Portugalski UI</string>
+    <string name="v5_1_self_destruct_passcode">Pin kod za samouništenje</string>
+    <string name="v5_3_discover_join_groups">Pronađite i pristupite grupama</string>
+    <string name="for_me_only">Odstraniti za mene</string>
+    <string name="image_decoding_exception_title">Greška u dekodiranju</string>
+    <string name="icon_descr_server_status_disconnected">Prekinuta veza</string>
+    <string name="confirm_delete_contact_question">Potvrditi brisanje kontakta?</string>
+    <string name="switching_profile_error_title">Greška u promeni profila</string>
+    <string name="self_destruct_passcode_changed">Pin kod za samouništenje promenjen!</string>
+    <string name="self_destruct_passcode_enabled">Pin kod za samouništenje omogućen!</string>
+    <string name="import_database_question">Uvesti bazu podataka razgovora?</string>
+    <string name="unblock_member_button">Odblokirati člana</string>
+    <string name="unblock_member_question">Odblokirati člana?</string>
+    <string name="send_errors">Poslati greške</string>
+    <string name="change_verb">Promeniti</string>
+    <string name="waiting_for_desktop">Čekanje na računar…</string>
+    <string name="dont_enable_receipts">Ne dozvoliti</string>
+    <string name="feature_enabled">omogućeno</string>
+    <string name="incognito_random_profile">Vaš nasumičan profil</string>
+    <string name="please_try_later">Molimo pokušajte kasnije.</string>
+    <string name="send_us_an_email">Pošaljite nam email</string>
+    <string name="share_text_moderated_at">Moderirano u: %s</string>
+    <string name="migrate_from_device_confirm_upload">Potvrditi otpremanje</string>
+    <string name="wallpaper_scale_fill">Popuniti</string>
+    <string name="decryption_errors">Greške u dešifrovanju</string>
+    <string name="servers_info_subscriptions_total">Ukupno</string>
+    <string name="confirm_database_upgrades">Potvrditi unapređenje baze podataka</string>
+    <string name="you_are_invited_to_group">Pozvani ste u grupu</string>
+    <string name="snd_group_event_changed_role_for_yourself">promenili ste vašu ulogu na %s</string>
+    <string name="send_receipts_disabled_alert_title">Potvrda je onemogućena</string>
+    <string name="immune_to_spam_and_abuse">Imunitet na spam</string>
+    <string name="integrity_msg_duplicate">duplikat poruke</string>
+    <string name="privacy_chat_list_open_links_yes">Da</string>
+    <string name="database_error">Greška u bazi podataka</string>
+    <string name="chat_item_ttl_default">podrazumevano (%s)</string>
+    <string name="chat_item_ttl_year">1 godina</string>
+    <string name="snd_group_event_member_deleted">uklonili ste %1$s</string>
+    <string name="snd_group_event_user_left">napustili ste</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">promenili ste adresu za %s</string>
+    <string name="unblock_for_all">Odblokirati za sve</string>
+    <string name="share_text_message_status">Status poruke: %s</string>
+    <string name="share_text_file_status">Status datoteke: %s</string>
+    <string name="network_option_tcp_connection_timeout">TCP veza тајм-аут</string>
+    <string name="color_sent_message">Poslana poruka</string>
+    <string name="feature_enabled_for_contact">Omogućeno za kontakt</string>
+    <string name="feature_enabled_for_you">Omogućeno za Vas</string>
+    <string name="both_you_and_your_contact_can_send_voice">Vi i Vaš kontakt, možete da šaljete glasovne poruke.</string>
+    <string name="feature_enabled_for">Omogućeno za</string>
+    <string name="v6_0_upgrade_app">Nadograditi aplikaciju automatski</string>
+    <string name="v5_7_new_interface_languages">Litvanski UI</string>
+    <string name="servers_info_target">Prikazati informacije za</string>
+    <string name="network_type_network_wifi">WiFi</string>
+    <string name="in_developing_title">Uskoro!</string>
+    <string name="expired_label">istekao</string>
+    <string name="both_you_and_your_contact_can_make_calls">Vi i Vaš kontakt, možete da obavljate pozive.</string>
+    <string name="contact_already_exists">Kontakt već postoji</string>
+    <string name="view_security_code">Pogledati bezbednostni kod</string>
+    <string name="share_invitation_link">Podeliti jednokratnu veza</string>
+    <string name="forward_message">Proslediti poruku…</string>
+    <string name="address_or_1_time_link">Adresa ili jednokratna veza?</string>
+    <string name="enable_camera_access">Omogućiti pristup kameri</string>
+    <string name="invalid_QR_code">Nevažeći QR kod</string>
+    <string name="one_time_link">Jednokratna pozivnica</string>
+    <string name="enter_welcome_message">Uneti poruku dobrodošlice…</string>
+    <string name="compose_save_messages_n">Čuvanje %1$s poruka</string>
+    <string name="network_session_mode_transport_isolation">Prenosna izolacija</string>
+    <string name="enter_welcome_message_optional">Uneti poruku dobrodošlice… (neobavezno)</string>
+    <string name="privacy_message_draft">Koncept poruke</string>
+    <string name="incorrect_passcode">Neispravan pin kod</string>
+    <string name="callstate_waiting_for_confirmation">čeka se potvrda…</string>
+    <string name="smp_servers_enter_manually">Uneti server ručno</string>
+    <string name="status_contact_has_no_e2e_encryption">kontakt nema e2e šifrovanje</string>
+    <string name="contact_deleted">Kontakt odstranjen!</string>
+    <string name="invalid_qr_code">Nevažeći QR kod</string>
+    <string name="v4_2_security_assessment">Procena bezbednosti</string>
+    <string name="smp_server_test_compare_file">Uporediti datoteku</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Kontakt i sve poruke biće odstranjene - ovo ne može biti vraćeno!</string>
+    <string name="revoke_file__message">Datoteka će biti odstranjena sa servera.</string>
+    <string name="revoke_file__confirm">Opozvati</string>
+    <string name="icon_descr_cancel_image_preview">Poništiti pregled slike</string>
+    <string name="sender_at_ts">%s u %s</string>
+    <string name="icon_descr_cancel_live_message">Poništiti živu poruku</string>
+    <string name="add_contact">Jednokratna pozivnica</string>
+    <string name="smp_servers_invalid_address">Nevažeća adresa server!</string>
+    <string name="saved_ICE_servers_will_be_removed">Sačuvani WebRTC ICE biće uklonjeni.</string>
+    <string name="la_lock_mode_passcode">Unos pin koda</string>
+    <string name="message_forwarded_title">Prosleđena poruka</string>
+    <string name="forward_alert_title_nothing_to_forward">Ništa za prosleđivanje</string>
+    <string name="onboarding_network_operators_review_later">Pregledati kasnije</string>
+    <string name="status_contact_has_e2e_encryption">kontakt ima e2e šifrovanje</string>
+    <string name="lock_after">Zaključati nakon</string>
+    <string name="notification_preview_somebody">Skriven kontakt:</string>
+    <string name="icon_descr_cancel_file_preview">Poništiti pregled datoteke</string>
+    <string name="receipts_contacts_title_enable">Omogućiti potvrde?</string>
+    <string name="receipts_groups_title_enable">Omogućiti potvrde za grupe?</string>
+    <string name="appearance_in_app_bars_alpha">Transparentnost</string>
+    <string name="operator_review_conditions">Pregled uslova</string>
+    <string name="migrate_from_device_cancel_migration">Poništiti migraciju</string>
+    <string name="revoke_file__action">Opozvati datoteku</string>
+    <string name="revoke_file__title">Opozvati datoteku?</string>
+    <string name="live_message">Živa poruka!</string>
+    <string name="download_errors">Greške u preuzimanju</string>
+    <string name="save_welcome_message_question">Sačuvati poruku dobrodošlice?</string>
+    <string name="not_compatible">Nekompatibilno!</string>
+    <string name="migrate_from_device_database_init">Pripremanje otpremanja</string>
+    <string name="save_profile_password">Sačuvati šifru profila</string>
+    <string name="webrtc_ice_servers">WebRTC ICE serveri</string>
+    <string name="settings_notification_preview_title">Pregled obaveštenja</string>
+    <string name="callstatus_connecting">povezivanje poziva…</string>
+    <string name="passcode_not_changed">Pin kod nije promenjen!</string>
+    <string name="export_database">Izvesti bazu podataka</string>
+    <string name="alert_title_group_invitation_expired">Istekla pozivnica!</string>
+    <string name="group_invitation_item_description">pozivnica u grupu %1$s</string>
+    <string name="incompatible_database_version">Nekompatibilna verzija baze podataka</string>
+    <string name="network_status">Status mreže</string>
+    <string name="operator_use_for_sending">Za slanje</string>
+    <string name="v4_5_message_draft">Koncept poruke</string>
+    <string name="v4_5_transport_isolation">Prenosna izolacija</string>
+    <string name="enter_this_device_name">Uneti ime ovog uređaja…</string>
+    <string name="servers_info_transport_sessions_section_header">Prenosne sesije</string>
+    <string name="migrate_to_device_download_failed">Neuspešno preuzimanje</string>
+    <string name="stop_sharing_address">Zaustaviti deljenje adrese?</string>
+    <string name="error_receiving_file">Greška u primanju datoteke</string>
+    <string name="error_saving_file">Greška u čuvanju datoteke</string>
+    <string name="new_chat_share_profile">Podeliti profil</string>
+    <string name="stop_sharing">Zaustaviti deljenje</string>
+    <string name="privacy_show_last_messages">Prikazati poslednje poruke</string>
+    <string name="v6_0_delete_many_messages_descr">Odstraniti do 20 poruka odjednom.</string>
+    <string name="remote_host_error_disconnected"><![CDATA[Mobilni <b>%s</b> prekinuta veza]]></string>
+    <string name="connect_plan_this_is_your_own_simplex_address">Ovo je Vaša vlastita SimpleX adresa!</string>
+    <string name="clear_verification">Očistiti verifikaciju</string>
+    <string name="unable_to_open_browser_title">Greška u otvaranju pretraživača</string>
+    <string name="no_chats">Nema razgovora</string>
+    <string name="connect_with_contact_name_question">Povezati se sa %1$s?</string>
+    <string name="contact_wants_to_connect_with_you">želi da se poveze sa Vama!</string>
+    <string name="private_routing_show_message_status">Prikazati status poruke</string>
+    <string name="connection_not_ready">Veza nije spremna.</string>
+    <string name="v6_0_connect_faster_descr">Povežite se brže sa svojim prijateljima.</string>
+    <string name="remote_host_was_disconnected_toast"><![CDATA[Mobilni <b>%s</b> prekinuta veza]]></string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">Datoteka je odstranjena ill je link neispravan</string>
+    <string name="servers_info_detailed_statistics_sent_messages_total">Ukupno poslano</string>
+    <string name="for_social_media">Za društvene mreže</string>
+    <string name="remote_host_error_missing"><![CDATA[Mobilni <b>%s</b> nedostaje]]></string>
+    <string name="migrate_to_device_downloading_archive">Preuzimanje arhive</string>
+    <string name="servers_info_detailed_statistics_received_total">Ukupno primljeno</string>
+    <string name="remote_host_error_inactive"><![CDATA[Mobilni <b>%s</b> je neaktivan]]></string>
+    <string name="notification_preview_mode_contact">Ime kontakta</string>
+    <string name="message_delivery_error_title">Greška pri isporuci poruke</string>
+    <string name="delete_messages_mark_deleted_warning">Poruke će biti označene za odstranjivanje. Primaoci će moći da otkriju te poruke.</string>
+    <string name="delete_files_and_media_question">Odstraniti datoteke i medijski sadržaj?</string>
+    <string name="stop_rcv_file__message">Primanje datoteke biće zaustavljeno.</string>
+    <string name="file_will_be_received_when_contact_is_online">Datoteka će biti primljena kada vaš kontakt bude na mreži, molimo sačekajte ili proverite kasnije!</string>
+    <string name="choose_file_title">Izabrati datoteku</string>
+    <string name="migrate_to_device_migrating">Migriranje</string>
+    <string name="migrate_from_device_title">Migriraj uređaj</string>
+    <string name="stop_snd_file__title">Zaustaviti slanje datoteke?</string>
+    <string name="no_selected_chat">Nije izabran nijedan razgovor</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">promena adrese…</string>
+    <string name="remote_host_error_busy"><![CDATA[Mobilni <b>%s</b> je zauzet]]></string>
+    <string name="snd_conn_event_switch_queue_phase_changing">promena adrese…</string>
+    <string name="recent_history_is_sent_to_new_members">Do 100 poslednjih poruka se šalje novim članovima.</string>
+    <string name="v5_1_better_messages">Bolje poruke</string>
+    <string name="delete_messages_cannot_be_undone_warning">Poruke će biti odstranjene - ovo se ne može poništiti!</string>
+    <string name="stop_snd_file__message">Slanje datoteke biće zaustavljeno.</string>
+    <string name="stop_rcv_file__title">Zaustaviti primanje datoteke?</string>
+    <string name="file_error">Greška u datoteci</string>
+    <string name="delete_without_notification">Odstraniti bez obaveštenja</string>
+    <string name="migrate_from_device_upload_failed">Greška u otpremanju</string>
+    <string name="servers_info_detailed_statistics_receive_errors">Ukupno grešaka</string>
+    <string name="servers_info_detailed_statistics">Detaljna statistika</string>
+    <string name="deletion_errors">Greška prilikom odstranjivanja</string>
+    <string name="migrate_from_device_repeat_upload">Ponoviti otpremanje</string>
+    <string name="settings_section_title_use_from_desktop">Koristiti sa računara</string>
+    <string name="connect_to_desktop">Povezati sa računarom</string>
+    <string name="connected_to_desktop">Povezano sa računarom</string>
+    <string name="allow_voice_messages_question">Dozvoliti glasovne poruke?</string>
+    <string name="switch_receiving_address_question">Promeniti prijemnu adresu?</string>
+    <string name="message_reactions">Reakcije na poruku</string>
+    <string name="allow_message_reactions">Dozvoliti reakcije na poruku.</string>
+    <string name="v5_1_message_reactions">Reakcije na poruku</string>
+    <string name="switch_receiving_address">Promeniti prijemnu adresu</string>
+    <string name="message_deleted_or_not_received_error_title">Nema poruka</string>
+    <string name="no_history">Nema istorije</string>
+    <string name="message_reactions_are_prohibited">Reakcije na poruku su zabranjene.</string>
+    <string name="smp_server_test_secure_queue">Bezbedan redosled</string>
+    <string name="smp_server_test_create_queue">Napraviti redosled</string>
+    <string name="network_socks_toggle_use_socks_proxy">Koristiti SOCKS proxy</string>
+    <string name="error_encrypting_database">Greška pri šifrovanju baze podataka</string>
+    <string name="operator_use_for_messages">Koristiti za poruke</string>
+    <string name="failed_to_create_user_title">Greška pri kreiranju profila!</string>
+    <string name="error_loading_details">Greška pri učitavanju detalja</string>
+    <string name="error_saving_xftp_servers">Greška pri čuvanju XFTP servera</string>
+    <string name="uploaded_files">Otpremljene datoteke</string>
+    <string name="open_server_settings_button">Otvoriti podešavanja servera</string>
+    <string name="error_deleting_note_folder">Greška pri odstranjivanju privatnih beleški</string>
+    <string name="error_forwarding_messages">Greška pri prosleđivanju poruka</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">Poruke su odstranjene nakon što ste ih odabrali.</string>
+    <string name="network_smp_proxy_mode_never_description">NE koristiti privatno usmeravanje.</string>
+    <string name="network_smp_proxy_fallback_allow_protected">Kada je IP skrivena</string>
+    <string name="appearance_settings">Izgled</string>
+    <string name="invite_friends">Pozvati prijatelje</string>
+    <string name="confirm_password">Potvrditi šifru</string>
+    <string name="confirm_passcode">Potvrditi pin kod</string>
+    <string name="set_passcode">Odrediti pin kod</string>
+    <string name="if_you_enter_self_destruct_code">Ako unesete Vaš pin kod za samouništenje prilikom otvaranja aplikacije:</string>
+    <string name="receipts_contacts_title_disable">Onemogućiti potvrde?</string>
+    <string name="group_member_status_introduced">povezivanje (uvedeno)</string>
+    <string name="enter_password_to_show">Uneti šifru u pretragu</string>
+    <string name="error_loading_xftp_servers">Greška pri učitavanju XFTP servera</string>
+    <string name="error_deleting_group">Greška pri odstranjivanju grupe</string>
+    <string name="cannot_share_message_alert_title">Nije moguće poslati poruku</string>
+    <string name="send_disappearing_message">Poslati poruku koja nestaje</string>
+    <string name="message_servers">Serveri za poruke</string>
+    <string name="whats_new_read_more">Pročitati više</string>
+    <string name="xftp_server">XFTP server</string>
+    <string name="error_creating_address">Greška pri pravljenju adrese</string>
+    <string name="icon_descr_sent_msg_status_unauthorized_send">neovlašćeno slanje</string>
+    <string name="verify_security_code">Verifikovati bezbednostni kod</string>
+    <string name="icon_descr_close_button">Dugme zatvoriti</string>
+    <string name="error_joining_group">Greška pri pristupanju grupi</string>
+    <string name="developer_options_section">Opcije za programere</string>
+    <string name="settings_developer_tools">Alati za programere</string>
+    <string name="chat_preferences">Preference chata</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Potvrdite da su mrežna podešavanja za ovaj uređaj ispravna.</string>
+    <string name="blocking_reason_content">Sadržaj krši uslove korišćenja</string>
+    <string name="cannot_receive_file">Nije moguće primiti datoteku</string>
+    <string name="error_creating_message">Greška pri kreiranju poruke</string>
+    <string name="turn_off_system_restriction_button">Otvoriti podešavanja aplikacije</string>
+    <string name="auth_enable_simplex_lock">Omogućiti SimpleX Zaključavanje</string>
+    <string name="share_file">Podeliti datoteku…</string>
+    <string name="send_disappearing_message_custom_time">Prilagođeno vreme</string>
+    <string name="servers_info_connected_servers_section_header">Povezani serveri</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">Vaš profil će biti poslan kontaktu od koga ste primili ovu vezu.</string>
+    <string name="notifications_mode_periodic">Pokrenuti periodično</string>
+    <string name="alert_title_skipped_messages">Preskočene poruke</string>
+    <string name="passcode_set">Pin kod postavljen!</string>
+    <string name="all_app_data_will_be_cleared">Svi podaci u aplikaciji su odstranjeni.</string>
+    <string name="app_passcode_replaced_with_self_destruct">Pin kod aplikacije je zamenjen pin kodom za samouništenje.</string>
+    <string name="settings_section_title_support">POTPORI SIMPLEX CHAT</string>
+    <string name="settings_section_title_message_shape">Oblik poruke</string>
+    <string name="settings_section_title_icon">IKONA APLIKACIJE</string>
+    <string name="database_passphrase">Pristupna fraza baze podataka</string>
+    <string name="set_passphrase">Odrediti pristupnu frazu</string>
+    <string name="database_will_be_encrypted">Baza podataka će biti šifrovana.</string>
+    <string name="wrong_passphrase_title">Neispravna pristupna fraza!</string>
+    <string name="enter_passphrase">Uneti pristupnu frazu…</string>
+    <string name="operator_conditions_of_use">Uslovi korišćenja</string>
+    <string name="error_adding_server">Greška pri dodavanju servera</string>
+    <string name="color_received_quote">Primljen odgovor</string>
+    <string name="appearance_zoom">Uvećanje</string>
+    <string name="allow_your_contacts_to_send_voice_messages">Dozvoliti slanje glasovnih poruka Vašim kontaktima.</string>
+    <string name="allow_voice_messages_only_if">Dozvoliti glasovne poruke samo ako ih Vaš kontakt dozvoljava.</string>
+    <string name="allow_your_contacts_adding_message_reactions">Dozvoli svojim kontaktima dodavanje reakcija na poruke.</string>
+    <string name="allow_direct_messages">Dozvoliti slanje direktnih poruka članovima.</string>
+    <string name="prohibit_direct_messages">Zabraniti slanje direktnih poruka članovima.</string>
+    <string name="allow_to_send_voice">Dozvoliti slanje glasovnih poruka.</string>
+    <string name="allow_to_send_simplex_links">Dozvoliti slanje SimpleX veza.</string>
+    <string name="simplex_links_are_prohibited_in_group">SimpleX veze su zabranjene.</string>
+    <string name="v5_4_incognito_groups_descr">Napraviti grupu koristeći nasumičan profil.</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Koristiti aplikaciju jednom rukom.</string>
+    <string name="migrate_to_device_confirm_network_settings">Potvrditi mrežna podešavanja</string>
+    <string name="error_saving_database">Greška pri čuvanju baze podataka</string>
+    <string name="color_sent_quote">Poslan odgovor</string>
+    <string name="mute_all_chat">Isključiti zvuk svima</string>
+    <string name="network_proxy_incorrect_config_title">Greška pri čuvanju proxy</string>
+    <string name="or_to_share_privately">Ili deliti privatno</string>
+    <string name="error_saving_user_password">Greška pri čuvanju korisničke šifre</string>
+    <string name="your_preferences">Vaše preference</string>
+    <string name="servers_info_previously_connected_servers_section_header">Prethodno povezani serveri</string>
+    <string name="chunks_downloaded">Komadi su preuzeti</string>
+    <string name="disable_automatic_deletion_question">Onemogućiti automatsko brisanje poruka?</string>
+    <string name="thank_you_for_installing_simplex">Hvala Vam što ste instalirali SimpleX Chat!</string>
+    <string name="smp_servers_test_some_failed">Neki serveri nisu prošli test:</string>
+    <string name="operator_info_title">Mrežni operator</string>
+    <string name="migrate_to_device_try_again">Možete pokušati ponovo.</string>
+    <string name="sent_via_proxy">Poslano putem proxy</string>
+    <string name="display_name_invited_to_connect">pozvan za povezivanje</string>
+    <string name="simplex_link_connection">pomoću %1$s</string>
+    <string name="error_loading_smp_servers">Greška pri učitavanju SMP servera</string>
+    <string name="error_saving_smp_servers">Greška pri čuvanju SMP servera</string>
+    <string name="error_changing_address">Greška pri promeni adrese</string>
+    <string name="enter_passphrase_notification_title">Pristupnu frazu je potrebna</string>
+    <string name="v6_3_mentions">Spomenuti članove 👋</string>
+    <string name="v6_3_better_privacy_and_security">Bolja privatnost i bezbednost</string>
+    <string name="v6_3_organize_chat_lists_descr">Ne propustiti bitne poruke.</string>
+    <string name="custom_time_picker_custom">prilagođen</string>
+    <string name="discover_on_network">Otkriti pomoću lokalne mreže</string>
+    <string name="migrate_to_device_enter_passphrase">Uneti pristupnu frazu</string>
+    <string name="migrate_from_device_check_connection_and_try_again">Proverite internet vezu i pokušajte ponovo</string>
+    <string name="servers_info_missing">Bez Informacija, pokušajte ponovo da učitate</string>
+    <string name="chunks_deleted">Komadi su odstranjeni</string>
+    <string name="ntf_channel_calls">SimpleX Chat pozivi</string>
+    <string name="xftp_servers">XFTP serveri</string>
+    <string name="network_and_servers">Mreža i serveri</string>
+    <string name="configure_ICE_servers">Podesite ICE servere</string>
+    <string name="network_disable_socks">Koristiti direktnu internet vezu?</string>
+    <string name="app_check_for_updates_button_install">Instalirati ažuriranje</string>
+    <string name="your_calls">Vaši pozivi</string>
+    <string name="enable_lock">Omogućiti zaključavanje</string>
+    <string name="info_row_database_id">ID Baze podataka</string>
+    <string name="info_row_updated_at">Zapis ažuriran u</string>
+    <string name="operator_use_for_files">Koristiti za datoteke</string>
+    <string name="turning_off_service_and_periodic">Optimizacija baterije je aktivna, isključeni su usluga u pozadini i periodični zahtevi za nove poruke. Možete ih ponovo omogućiti putem podešavanja.</string>
+    <string name="la_authenticate">Potvrda identiteta</string>
+    <string name="smp_servers_test_failed">Test servera nije uspeo!</string>
+    <string name="error_exporting_chat_database">Greška pri izvoženju baze podataka razgovora</string>
+    <string name="network_option_protocol_timeout">Vremensko ograničenje protokola</string>
+    <string name="error_sending_message">Greška pri slanju poruke</string>
+    <string name="error_deleting_contact">Greška pri odstranjivanju kontakta</string>
+    <string name="share_one_time_link">Napraviti jednokratnu pozivnicu</string>
+    <string name="markdown_help">Markdown pomoć</string>
+    <string name="allow_to_send_files">Dozvoliti slanje datoteka i medijskog sadržaji.</string>
+    <string name="passcode_changed">Pin kod promenjen!</string>
+    <string name="share_text_database_id">ID Baze podataka: %d</string>
+    <string name="simplex_link_mode">SimpleX veze</string>
+    <string name="operator_added_xftp_servers">Dodani serveri za medije i datoteke</string>
+    <string name="connect__your_profile_will_be_shared">Vas profil %1$s će biti deljen.</string>
+    <string name="callstate_received_answer">primljen odgovor…</string>
+    <string name="onboarding_network_operators">Mrežni operatori</string>
+    <string name="network_smp_proxy_mode_private_routing">Privatno usmeravanje</string>
+    <string name="non_content_uri_alert_title">Nevažeća putanja datoteke</string>
+    <string name="moderate_verb">Moderirati</string>
+    <string name="moderated_items_description">%1$d poruke moderirane %2$s</string>
+    <string name="unblock_member_desc">Poruke od %s biće prikazane!</string>
+    <string name="database_passphrase_and_export">Pristupna fraza baze podataka i izvoz</string>
+    <string name="network_smp_proxy_mode_unknown_description">Koristite privatno usmeravanje sa nepoznatim serverima.</string>
+    <string name="privacy_media_blur_radius_strong">Intenzivno</string>
+    <string name="delete_message_mark_deleted_warning">Poruka će biti označena za ostranjivanje. Primaoci će moći da otkriju ovu poruku.</string>
+    <string name="privacy_and_security">Privatnost i bezbednost</string>
+    <string name="ntf_channel_messages">SimpleX Chat poruke</string>
+    <string name="migrate_from_device_try_again">Možete pokušati ponovo.</string>
+    <string name="migrate_from_device_error_saving_settings">Greška pri čuvanju podešavanja</string>
+    <string name="v4_6_group_welcome_message_descr">Postavi poruku koja će biti prikazana novim članovima!</string>
+    <string name="failed_to_save_servers">Greška pri čuvanju servera</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Član će biti uklonjen iz razgovora – ovo se ne može poništiti!</string>
+    <string name="profile_update_event_updated_profile">ažuriran profil</string>
+    <string name="group_member_status_announced">povezivanje (najavljeno)</string>
+    <string name="error_changing_role">Greška u promeni uloge</string>
+    <string name="v5_1_custom_themes">Prilagođena tema</string>
+    <string name="v5_2_favourites_filter">Pronaći razgovore brže</string>
+    <string name="your_privacy">Vaša privatnost</string>
+    <string name="past_member_vName">Bivši član %1$s</string>
+    <string name="network_option_protocol_timeout_per_kb">Vremensko ograničenje protokola po KB</string>
+    <string name="privacy_media_blur_radius_soft">Blago</string>
+    <string name="share_image">Podeliti medije…</string>
+    <string name="network_smp_proxy_fallback_prohibit_description">NE šaljite poruke direktno, čak i ako vaš ili odredišni serveri ne podržavaju privatno usmeravanje.</string>
+    <string name="change_self_destruct_passcode">Promeniti pin kod za samouništenje</string>
+    <string name="update_database_passphrase">Ažurirati pristupna frazu baze podataka</string>
+    <string name="report_archive_for_me">Za mene</string>
+    <string name="share_message">Podeliti poruku…</string>
+    <string name="archive_reports">Arhivirati izveštaje</string>
+    <string name="simplex_links_not_allowed">SimpleX veze nisu dozvoljene</string>
+    <string name="change_automatic_deletion_question">Promeniti automatsko brisanje poruka?</string>
+    <string name="voice_messages_prohibited">Glasovne poruke su zabranjene!</string>
+    <string name="or_show_this_qr_code">Ili prikazati ovaj kod</string>
+    <string name="smp_servers_use_server_for_new_conn">Koristiti za nove konekcije</string>
+    <string name="your_ICE_servers">Vaši ICE serveri</string>
+    <string name="callstate_starting">pokretanje…</string>
+    <string name="permissions_open_settings">Otvoriti podešavanje</string>
+    <string name="call_desktop_permission_denied_title">Za odvijanje poziva, dozvoliti upotrebu mikrofona. Završite razgovor i pokušajte ponovo.</string>
+    <string name="database_encrypted">Baza podataka je šifrovana!</string>
+    <string name="share_text_updated_at">Zapis ažuriran u: %s</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">Član će biti uklonjen iz grupe – ovo se ne može poništiti!</string>
+    <string name="calls_prohibited_alert_title">Pozivi zabranjeni!</string>
+    <string name="available_in_v51">\nDostupno u v5.1</string>
+    <string name="simplex_links">SimpleX veze</string>
+    <string name="full_deletion">Odstraniti za sve</string>
+    <string name="allow_to_send_disappearing">Dozvoliti slanje poruka koje nestaju.</string>
+    <string name="v5_0_app_passcode">Pin kod aplikacije</string>
+    <string name="v5_4_block_group_members_descr">Za sakrivanje neželjenih poruka.</string>
+    <string name="prefs_error_saving_settings">Greška pri čuvanju podešavanja</string>
+    <string name="invalid_name">Nevažeće ime!</string>
+    <string name="chunks_uploaded">Komadi su otpremljeni</string>
+    <string name="upload_errors">Greške u otpremanju</string>
+    <string name="network_smp_proxy_mode_always_description">Uvek koristiti privatno usmeravanje.</string>
+    <string name="markdown_in_messages">Markdown u porukama</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Kada je omogućeno više od jednog operatera, nijedan od njih nema metapodatke da nauči ko komunicira sa kim.</string>
+    <string name="allow_your_contacts_to_call">Dozvoliti vašim kontaktima da vas zovu.</string>
+    <string name="servers_info_subscriptions_section_header">Prijem poruke</string>
+    <string name="migrate_from_device_error_exporting_archive">Greška pri izvoženju baze podataka razgovora</string>
+    <string name="you_can_make_address_visible_via_settings">Možete učiniti vidljivim vašim SimpleX kontaktima putem Podešavanja.</string>
+    <string name="error_sending_message_contact_invitation">Greška pri slanju pozivnice</string>
+    <string name="skip_inviting_button">Preskočiti pozivanje članova</string>
+    <string name="operator_use_for_messages_private_routing">Za privatno usmeravanje</string>
+    <string name="color_secondary_variant">Dodatni sekundarni</string>
+    <string name="servers_info_starting_from">Pokretanje iz %s.</string>
+    <string name="your_ice_servers">Vaši ICE serveri</string>
+    <string name="use_random_passphrase">Koristiti nasumičnu pristupnu frazu</string>
+    <string name="auth_disable_simplex_lock">Onemogućiti SimpleX Zaključavanje</string>
+    <string name="servers_info_reconnect_server_title">Ponovo povezati server?</string>
+    <string name="no_received_app_files">Nema primljenih niti poslanih datoteka</string>
+    <string name="integrity_msg_bad_hash">neispravan hash poruke</string>
+    <string name="alert_title_msg_bad_id">Neispravan ID poruke</string>
+    <string name="servers_info_reconnect_servers_title">Ponovo povezati servere?</string>
+    <string name="notification_preview_mode_message_desc">Prikazati kontakt i poruku</string>
+    <string name="show_developer_options">Prikazati opcije za programere</string>
+    <string name="alert_title_msg_bad_hash">Neispravan hash poruke</string>
+    <string name="servers_info_reconnect_server_message">Ponovo povezati server kako biste prisilili dostavu poruke. To koristi dodatni saobraćaj.</string>
+    <string name="integrity_msg_bad_id">neispravan ID poruke</string>
+    <string name="xftp_servers_configured">Konfigurisani XFTP serveri</string>
+    <string name="message_delivery_warning_title">Upozorenje pri isporuci poruke</string>
+    <string name="connect_via_link_or_qr">Povezati se pomoću linka / QR koda</string>
+    <string name="failed_to_create_user_duplicate_desc">Već imate chat profil sa istim prikaznim imenom. Molimo vas da odaberete drugo ime.</string>
+    <string name="la_auth_failed">Greška u autentifikaciji</string>
+    <string name="v4_3_improved_server_configuration">Unapređena konfiguracija servera</string>
+    <string name="n_other_file_errors">%1$d ostale greška datoteke(a).</string>
+    <string name="auth_unavailable">Autentifikacija nije dostupna</string>
+    <string name="smp_servers_configured">Konfigurisani SMP serveri</string>
+    <string name="auto_accept_contact">Automatsko prihvatanje</string>
+    <string name="save_preferences_question">Sačuvati preference?</string>
+    <string name="unable_to_open_browser_desc">Za pozive je potreban podrazumevani veb pretraživač. Molimo vas da konfigurišete podrazumevani pretraživač u sistemu i podelite više informacija sa programerima.</string>
+    <string name="snd_group_event_member_unblocked">odblokirali ste %s</string>
+    <string name="you_are_observer">Vi ste posmatrač.</string>
+    <string name="v4_3_improved_privacy_and_security">Unapređena privatnost i bezbednost</string>
+    <string name="v5_6_app_data_migration_descr">Migriraj na drugi uređaj pomoću QR koda.</string>
+    <string name="group_preview_rejected">odbijeno</string>
+    <string name="new_passphrase">Nova pristupna fraza…</string>
+    <string name="v4_2_auto_accept_contact_requests">Automatsko prihvatanje zahteva za kontakt</string>
+    <string name="only_your_contact_can_send_disappearing">Samo Vaši kontakti mogu slati poruke koje nestaju.</string>
+    <string name="only_your_contact_can_send_voice">Samo Vaši kontakti mogu slati glasovne poruke.</string>
+    <string name="chat_preferences_you_allow">Vi dozvoljavate</string>
+    <string name="open_database_folder">Otvoriti fasciklu baze podataka</string>
+    <string name="save_and_update_group_profile">Sačuvati i ažurirati grupni profil</string>
+    <string name="v5_8_message_delivery_descr">Uz smanjenu potrošnju baterije.</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(skenirati ili nalepiti iz memorije)</string>
+    <string name="connection_error_auth">Greška u vezi (AUTH)</string>
+    <string name="contact_developers">Ažurirajte aplikaciju i kontaktirajte programere.</string>
+    <string name="non_fatal_errors_occured_during_import">Tokom uvoza došlo je do nekih nefatalnih grešaka:</string>
+    <string name="save_passphrase_in_settings">Sačuvati pristupnu frazu u podešavanjima</string>
+    <string name="you_sent_group_invitation">Poslali ste grupnu pozivnicu</string>
+    <string name="conn_event_enabled_pq">kvantno otporna e2e šifrovanju</string>
+    <string name="only_your_contact_can_make_calls">Samo Vaši kontakti mogu upućivati pozive.</string>
+    <string name="disable_sending_recent_history">Ne slati istoriju novim članovima.</string>
+    <string name="group_members_can_send_voice">Članovi mogu da šalju glasovne poruke.</string>
+    <string name="v5_5_message_delivery_descr">Uz smanjenu potrošnju baterije.</string>
+    <string name="migrate_to_device_error_downloading_archive">Greška pri preuzimanju arhive</string>
+    <string name="delete_chat_list_warning">Svi razgovori biće uklonjeni sa liste %s, a lista odstranjena</string>
+    <string name="this_QR_code_is_not_a_link">Ovaj QR kod nije link!</string>
+    <string name="connect_plan_already_connecting">Već se povezujete!</string>
+    <string name="migrate_from_device_to_another_device">Migriraj na drugi uređaj</string>
+    <string name="operator_open_changes">Otvoriti promene</string>
+    <string name="decentralized">Decentralizovano</string>
+    <string name="no_info_on_delivery">Nema informacija o prijem</string>
+    <string name="connect_via_link">Povezati se pomoću linka</string>
+    <string name="v5_2_fix_encryption">Zadržati Vaše konekcije</string>
+    <string name="migrate_to_device_title">Migriraj ovde</string>
+    <string name="connect_plan_connect_via_link">Povezati se pomoću linka?</string>
+    <string name="install_simplex_chat_for_terminal">Instaliraj SimpleX Chat za terminal</string>
+    <string name="network_smp_web_port_toggle">Koristiti web port</string>
+    <string name="only_you_can_make_calls">Samo Vi možete da upućujete pozive.</string>
+    <string name="app_check_for_updates_button_open">Otvoriti lokaciju datoteke</string>
+    <string name="group_member_status_rejected">odbijeno</string>
+    <string name="save_group_profile">Sačuvati grupni profil</string>
+    <string name="only_you_can_send_disappearing">Samo vi možete slati poruke koje nestaju.</string>
+    <string name="v4_4_verify_connection_security_desc">Uporedite sigurnosne kodove sa vašim kontaktima.</string>
+    <string name="auto_accept_images">Automatsko prihvatanje slika</string>
+    <string name="color_title">Naslov</string>
+    <string name="wrong_passphrase">Neispravna pristupna fraza baze podataka</string>
+    <string name="migrate_from_another_device">Migriraj sa drugog uređaja</string>
+    <string name="only_you_can_send_voice">Samo vi možete slati glasovne poruke</string>
+    <string name="only_your_contact_can_add_message_reactions">Samo vi možete stavljati reakcije na poruke.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
index 531e29de20..1a1ca0e8a6 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d üzenet visszafejtése sikertelen.</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">Nem sikerült visszafejteni %1$d üzenetet.</string>
     <string name="alert_text_decryption_error_too_many_skipped">%1$d üzenet kihagyva.</string>
     <string name="integrity_msg_skipped">%1$d üzenet kihagyva</string>
     <string name="group_info_section_title_num_members">%1$s TAG</string>
@@ -10,197 +10,196 @@
     <string name="send_disappearing_message_5_minutes">5 perc</string>
     <string name="send_disappearing_message_1_minute">1 perc</string>
     <string name="learn_more_about_address">A SimpleX-címről</string>
-    <string name="abort_switch_receiving_address_question">Címváltoztatás megszakítása?</string>
+    <string name="abort_switch_receiving_address_question">Megszakítja a cím módosítását?</string>
     <string name="abort_switch_receiving_address_confirm">Megszakítás</string>
     <string name="send_disappearing_message_30_seconds">30 másodperc</string>
-    <string name="one_time_link_short">Egyszer használható meghívó-hivatkozás</string>
-    <string name="contact_wants_to_connect_via_call">%1$s szeretne kapcsolatba lépni Önnel ezen keresztül:</string>
-    <string name="about_simplex_chat">SimpleX Chat névjegye</string>
+    <string name="one_time_link_short">Egyszer használható meghívó</string>
+    <string name="contact_wants_to_connect_via_call">%1$s szeretne kapcsolatba lépni Önnel a következőn keresztül:</string>
+    <string name="about_simplex_chat">A SimpleX Chat névjegye</string>
     <string name="chat_item_ttl_day">1 nap</string>
-    <string name="abort_switch_receiving_address">Címváltoztatás megszakítása</string>
+    <string name="abort_switch_receiving_address">Cím módosításának megszakítása</string>
     <string name="about_simplex">A SimpleXről</string>
-    <string name="color_primary">Kiemelés</string>
+    <string name="color_primary">Kiemelőszín</string>
     <string name="callstatus_accepted">fogadott hívás</string>
-    <string name="network_enable_socks_info">Hozzáférés a kiszolgálókhoz SOCKS proxyn keresztül a(z) %d porton? A proxyt el kell indítani, mielőtt engedélyezné ezt az opciót.</string>
+    <string name="network_enable_socks_info">Hozzáférés a kiszolgálókhoz SOCKS-proxyn a következő porton keresztül: %d? A proxyt el kell indítani, mielőtt engedélyezné ezt az opciót.</string>
     <string name="accept_feature">Elfogadás</string>
     <string name="accept_call_on_lock_screen">Elfogadás</string>
     <string name="above_then_preposition_continuation">gombra fent, majd:</string>
     <string name="accept_contact_incognito_button">Elfogadás inkognitóban</string>
-    <string name="accept_connection_request__question">Kapcsolatkérés elfogadása?</string>
+    <string name="accept_connection_request__question">Elfogadja a meghívási kérést?</string>
     <string name="accept_contact_button">Elfogadás</string>
     <string name="accept">Elfogadás</string>
-    <string name="add_address_to_your_profile">Cím hozzáadása a profilhoz, hogy az ismerősei megoszthassák másokkal. A profilfrissítés elküldésre kerül az ismerősök számára.</string>
-    <string name="color_primary_variant">További kiemelés</string>
+    <string name="add_address_to_your_profile">Cím hozzáadása a profilhoz, hogy a partnerei megoszthassák másokkal. A profilfrissítés el lesz küldve partnerei számára.</string>
+    <string name="color_primary_variant">További kiemelőszín</string>
     <string name="callstatus_error">híváshiba</string>
     <string name="v5_4_block_group_members">Csoporttagok letiltása</string>
     <string name="la_authenticate">Hitelesítés</string>
-    <string name="empty_chat_profile_is_created">Egy üres csevegési profil jön létre a megadott névvel, és az alkalmazás a szokásos módon megnyílik.</string>
+    <string name="empty_chat_profile_is_created">Egy üres csevegési profil lesz létrehozva a megadott névvel, és az alkalmazás a szokásos módon megnyílik.</string>
     <string name="feature_cancelled_item">%s visszavonva</string>
     <string name="smp_servers_preset_add">Előre beállított kiszolgálók hozzáadása</string>
     <string name="calls_prohibited_with_this_contact">A hívások kezdeményezése le van tiltva ebben a csevegésben.</string>
-    <string name="network_session_mode_entity_description"><![CDATA[<b>Az összes ismerőséhez és csoporttaghoz</b> külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.\n<b>Megjegyzés:</b> ha sok kapcsolata van, az akkumulátor-használat és az adatforgalom jelentősen megnövekedhet, és néhány kapcsolódási kísérlet sikertelen lehet.]]></string>
+    <string name="network_session_mode_entity_description"><![CDATA[<b>Az összes partneréhez és csoporttaghoz</b> külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.\n<b>Megjegyzés:</b> ha sok kapcsolata van, az akkumulátor-használat és az adatforgalom jelentősen megnövekedhet, és néhány kapcsolódási kísérlet sikertelen lehet.]]></string>
     <string name="icon_descr_cancel_link_preview">hivatkozás előnézetének visszavonása</string>
     <string name="network_session_mode_user_description"><![CDATA[<b>Az összes csevegési profiljához az alkalmazásban</b> külön TCP-kapcsolat (és SOCKS-hitelesítőadat) lesz használva.]]></string>
     <string name="both_you_and_your_contact_can_send_disappearing">Mindkét fél küldhet eltűnő üzeneteket.</string>
-    <string name="keychain_is_storing_securely">Az Android Keystore-t a jelmondat biztonságos tárolására használják - lehetővé teszi az értesítési szolgáltatás működését.</string>
-    <string name="alert_title_msg_bad_hash">Hibás az üzenet hasító értéke</string>
+    <string name="keychain_is_storing_securely">Az Android Keystore-t a jelmondat biztonságos tárolására használják – lehetővé teszi az értesítési szolgáltatás működését.</string>
+    <string name="alert_title_msg_bad_hash">Érvénytelen az üzenet hasítóértéke</string>
     <string name="color_background">Háttér</string>
-    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Megjegyzés:</b> az üzenet- és fájlközvetítő-kiszolgálók SOCKS proxyn keresztül kapcsolódnak. A hívások és a hivatkozások előnézetének elküldése közvetlen kapcsolatot használnak.]]></string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Megjegyzés:</b> az üzenet- és fájltovábbító kiszolgálók SOCKS-proxyn keresztül kapcsolódnak. A hívások és a hivatkozások előnézetének elküldése közvetlen kapcsolatot használnak.]]></string>
     <string name="full_backup">Alkalmazásadatok biztonsági mentése</string>
     <string name="database_initialization_error_title">Az adatbázis előkészítése sikertelen</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Az ismerőseivel kapcsolatban marad. A profil-változtatások frissítésre kerülnek az ismerősöknél.</string>
+    <string name="all_your_contacts_will_remain_connected_update_sent">A partnereivel kapcsolatban marad. A profilfrissítés el lesz küldve a partnerei számára.</string>
     <string name="v4_5_transport_isolation_descr">A csevegési profillal (alapértelmezett), vagy a kapcsolattal (BÉTA).</string>
-    <string name="connect__a_new_random_profile_will_be_shared">Egy új véletlenszerű profil lesz megosztva.</string>
-    <string name="allow_voice_messages_only_if">A hangüzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
-    <string name="app_version_code">Az alkalmazás build száma: %s</string>
+    <string name="connect__a_new_random_profile_will_be_shared">Egy új, véletlenszerű profil lesz megosztva.</string>
+    <string name="allow_voice_messages_only_if">A hangüzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
+    <string name="app_version_code">Az alkalmazás összeállítási száma: %s</string>
     <string name="audio_video_calls">Hang- és videóhívások</string>
     <string name="network_settings">Speciális hálózati beállítások</string>
-    <string name="allow_your_contacts_to_send_voice_messages">A hangüzenetek küldése engedélyezve van az ismerősei számára.</string>
+    <string name="allow_your_contacts_to_send_voice_messages">A hangüzenetek küldése engedélyezve van a partnerei számára.</string>
     <string name="settings_audio_video_calls">Hang- és videóhívások</string>
     <string name="v5_3_encrypt_local_files_descr">Az alkalmazás titkosítja a helyi fájlokat (a videók kivételével).</string>
     <string name="answer_call">Hívás fogadása</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Az eltűnő üzenetek küldésének engedélyezése az ismerősei számára.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Az eltűnő üzenetek küldésének engedélyezése a partnerei számára.</string>
     <string name="connect_plan_already_connecting">Kapcsolódás folyamatban!</string>
     <string name="cannot_receive_file">Nem lehet fogadni a fájlt</string>
     <string name="auth_unavailable">Hitelesítés elérhetetlen</string>
-    <string name="app_version_title">Alkalmazás verzió</string>
+    <string name="app_version_title">Az alkalmazás verziója</string>
     <string name="button_add_welcome_message">Üdvözlőüzenet hozzáadása</string>
     <string name="snd_conn_event_ratchet_sync_started">titkosítás elfogadása %s számára…</string>
-    <string name="available_in_v51">"
-\nElérhető a v5.1-ben"</string>
+    <string name="available_in_v51">\nElérhető az v5.1-es kiadásban</string>
     <string name="both_you_and_your_contacts_can_delete">Mindkét fél véglegesen törölheti az elküldött üzeneteket. (24 óra)</string>
     <string name="v5_4_better_groups">Továbbfejlesztett csoportok</string>
-    <string name="clear_chat_warning">Az összes üzenet törlésre kerül - ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.</string>
+    <string name="clear_chat_warning">Az összes üzenet törölve lesz – ez a művelet nem vonható vissza! Az üzenetek CSAK az Ön számára törlődnek.</string>
     <string name="icon_descr_call_ended">Hívás befejeződött</string>
     <string name="settings_section_title_calls">HÍVÁSOK</string>
     <string name="rcv_group_and_other_events">és további %d esemény</string>
     <string name="address_section_title">Cím</string>
-    <string name="connect_plan_already_joining_the_group">Csatlakozás folyamatban!</string>
+    <string name="connect_plan_already_joining_the_group">A csatlakozás folyamatban van a csoporthoz!</string>
     <string name="auto_accept_contact">Automatikus elfogadás</string>
-    <string name="notifications_mode_service_desc">A háttérszolgáltatás mindig fut - az értesítések megjelennek, amint az üzenetek elérhetővé válnak.</string>
+    <string name="notifications_mode_service_desc">A háttérszolgáltatás mindig fut – az értesítések megjelennek, amint az üzenetek elérhetővé válnak.</string>
     <string name="allow_to_delete_messages">Az elküldött üzenetek végleges törlése engedélyezve van. (24 óra)</string>
     <string name="both_you_and_your_contact_can_send_voice">Mindkét fél küldhet hangüzeneteket.</string>
     <string name="alert_title_msg_bad_id">Téves üzenet ID</string>
-    <string name="allow_your_contacts_adding_message_reactions">Az üzenetreakciók küldése engedélyezve van az ismerősei számára.</string>
+    <string name="allow_your_contacts_adding_message_reactions">A reakciók hozzáadása az üzenetekhez engedélyezve van a partnerei számára.</string>
     <string name="allow_to_send_voice">A hangüzenetek küldése engedélyezve van.</string>
-    <string name="allow_message_reactions_only_if">Az üzenetreakciók küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
+    <string name="allow_message_reactions_only_if">A reakciók hozzáadása az üzenetekhez csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
     <string name="back">Vissza</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Kikapcsolható a beállításokban</b> – az értesítések továbbra is megjelenítésre kerülnek amíg az alkalmazás fut.]]></string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Kikapcsolható a beállításokban</b> – az értesítések továbbra is meg lesznek jelenítve amíg az alkalmazás fut.]]></string>
     <string name="v4_2_group_links_desc">Az adminisztrátorok hivatkozásokat hozhatnak létre a csoportokhoz való csatlakozáshoz.</string>
     <string name="call_on_lock_screen">Hívások a zárolási képernyőn:</string>
     <string name="conn_event_ratchet_sync_started">titkosítás elfogadása…</string>
-    <string name="invite_prohibited">Nem lehet meghívni az ismerőst!</string>
+    <string name="invite_prohibited">Nem lehet meghívni a partnert!</string>
     <string name="integrity_msg_bad_id">téves üzenet ID</string>
-    <string name="v4_2_auto_accept_contact_requests">Kapcsolatkérések automatikus elfogadása</string>
-    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Megjegyzés:</b> NEM fogja tudni helyreállítani, vagy megváltoztatni a jelmondatot abban az esetben, ha elveszíti.]]></string>
+    <string name="v4_2_auto_accept_contact_requests">Meghívási kérések automatikus elfogadása</string>
+    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Megjegyzés:</b> NEM fogja tudni helyreállítani, vagy módosítani a jelmondatot abban az esetben, ha elveszíti.]]></string>
     <string name="callstatus_calling">hívás…</string>
-    <string name="color_secondary_variant">További másodlagos</string>
+    <string name="color_secondary_variant">További másodlagos szín</string>
     <string name="smp_servers_add_to_another_device">Hozzáadás egy másik eszközhöz</string>
-    <string name="allow_message_reactions">Az üzenetreakciók küldése engedélyezve van.</string>
+    <string name="allow_message_reactions">A reakciók hozzáadása az üzenetekhez engedélyezve van.</string>
     <string name="icon_descr_cancel_file_preview">Fájlelőnézet visszavonása</string>
     <string name="all_group_members_will_remain_connected">Az összes csoporttag kapcsolatban marad.</string>
-    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Több akkumulátort használ</b>! Az alkalmazás mindig fut a háttérben - az értesítések azonnal megjelennek.]]></string>
+    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Több akkumulátort használ</b>! Az alkalmazás mindig fut a háttérben – az értesítések azonnal megjelennek.]]></string>
     <string name="block_member_confirmation">Letiltás</string>
     <string name="group_member_role_admin">adminisztrátor</string>
     <string name="icon_descr_cancel_image_preview">Képelőnézet visszavonása</string>
-    <string name="v5_1_self_destruct_passcode_descr">A jelkód megadása után az összes adat törlésre kerül.</string>
+    <string name="v5_1_self_destruct_passcode_descr">A jelkód megadása után az összes adat törölve lesz.</string>
     <string name="icon_descr_video_asked_to_receive">Felkérték a videó fogadására</string>
     <string name="block_member_button">Letiltás</string>
-    <string name="v5_2_more_things">Még néhány dolog</string>
+    <string name="v5_2_more_things">Néhány további dolog</string>
     <string name="authentication_cancelled">Hitelesítés visszavonva</string>
     <string name="allow_to_send_files">A fájlok- és a médiatartalmak küldése engedélyezve van.</string>
-    <string name="users_delete_all_chats_deleted">Az összes csevegés és üzenet törlésre kerül - ez a művelet nem vonható vissza!</string>
+    <string name="users_delete_all_chats_deleted">Az összes csevegés és üzenet törölve lesz – ez a művelet nem vonható vissza!</string>
     <string name="icon_descr_audio_call">hanghívás</string>
     <string name="bold_text">félkövér</string>
-    <string name="app_passcode_replaced_with_self_destruct">Az alkalmazás jelkód helyettesítésre kerül egy önmegsemmisítő jelkóddal.</string>
-    <string name="v5_3_new_interface_languages_descr">Arab, bulgár, finn, héber, thai és ukrán - köszönet a felhasználóknak és a Weblate-nek.</string>
-    <string name="allow_voice_messages_question">Hangüzenetek engedélyezése?</string>
-    <string name="always_use_relay">Mindig használjon közvetítő-kiszolgálót</string>
+    <string name="app_passcode_replaced_with_self_destruct">Az alkalmazás-jelkód helyettesítve lesz egy önmegsemmisítő-jelkóddal.</string>
+    <string name="v5_3_new_interface_languages_descr">Arab, bolgár, finn, héber, thai és ukrán – köszönet a felhasználóknak és a Weblate-nek.</string>
+    <string name="allow_voice_messages_question">Engedélyezi a hangüzeneteket?</string>
+    <string name="always_use_relay">Mindig használjon továbbítókiszolgálót</string>
     <string name="chat_preferences_always">mindig</string>
     <string name="call_already_ended">A hívás már befejeződött!</string>
     <string name="turn_off_battery_optimization_button">Engedélyezés</string>
-    <string name="all_your_contacts_will_remain_connected">Az összes ismerősével kapcsolatban marad.</string>
+    <string name="all_your_contacts_will_remain_connected">Az összes partnerével kapcsolatban marad.</string>
     <string name="icon_descr_cancel_live_message">Élő csevegési üzenet visszavonása</string>
-    <string name="allow_irreversible_message_deletion_only_if">Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)</string>
+    <string name="allow_irreversible_message_deletion_only_if">Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi. (24 óra)</string>
     <string name="v4_6_audio_video_calls">Hang- és videóhívások</string>
-    <string name="integrity_msg_bad_hash">hibás az üzenet hasító értéke</string>
+    <string name="integrity_msg_bad_hash">érvénytelen az üzenet hasítóértéke</string>
     <string name="notifications_mode_service">Mindig fut</string>
-    <string name="keychain_allows_to_receive_ntfs">Az Android Keystore biztonságosan fogja tárolni a jelmondatot az alkalmazás újraindítása, vagy a jelmondat megváltoztatás után - lehetővé teszi az értesítések fogadását.</string>
+    <string name="keychain_allows_to_receive_ntfs">Az Android Keystore biztonságosan fogja tárolni a jelmondatot az alkalmazás újraindítása, vagy a jelmondat módosítása után – lehetővé teszi az értesítések fogadását.</string>
     <string name="all_app_data_will_be_cleared">Az összes alkalmazásadat törölve.</string>
     <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Legjobb akkumulátoridő</b>. Csak akkor kap értesítéseket, amikor az alkalmazás meg van nyitva. (NINCS háttérszolgáltatás.)]]></string>
     <string name="appearance_settings">Megjelenés</string>
-    <string name="turning_off_service_and_periodic">Az akkumulátor-optimalizálás aktív, ez kikapcsolja a háttérszolgáltatást és az új üzenetek rendszeres lekérdezését. A beállításokban újraengedélyezheti.</string>
-    <string name="block_member_question">Biztosan letiltja?</string>
+    <string name="turning_off_service_and_periodic">Az akkumulátor-optimalizálás aktív, ez kikapcsolja a háttérszolgáltatást és az új üzenetek időszakos lekérdezését. Ezt a beállításokban újraengedélyezheti.</string>
+    <string name="block_member_question">Letiltja a tagot?</string>
     <string name="callstatus_ended">%1$s hívása befejeződött</string>
     <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Jó akkumulátoridő</b>. Az alkalmazás 10 percenként ellenőrzi az új üzeneteket. Előfordulhat, hogy hívásokról, vagy a sürgős üzenetekről marad le.]]></string>
     <string name="group_member_role_author">szerző</string>
-    <string name="allow_your_contacts_irreversibly_delete">Az elküldött üzenetek végleges törlése engedélyezve van az ismerősei számára. (24 óra)</string>
+    <string name="allow_your_contacts_irreversibly_delete">Az elküldött üzenetek végleges törlése engedélyezve van a partnerei számára. (24 óra)</string>
     <string name="cancel_verb">Mégse</string>
-    <string name="notifications_mode_off_desc">Az alkalmazás csak akkor tud értesítéseket fogadni, amikor meg van nyitva. A háttérszolgáltatás nem indul el</string>
+    <string name="notifications_mode_off_desc">Az alkalmazás csak akkor tud értesítéseket fogadni, amikor meg van nyitva. A háttérszolgáltatás nem fog elindulni</string>
     <string name="v5_1_better_messages">Továbbfejlesztett üzenetek</string>
-    <string name="abort_switch_receiving_address_desc">A cím módosítása megszakad. A régi fogadási cím kerül felhasználásra.</string>
+    <string name="abort_switch_receiving_address_desc">A cím módosítása meg fog szakadni. A régi fogadási cím lesz használva.</string>
     <string name="allow_verb">Engedélyezés</string>
-    <string name="bad_desktop_address">Hibás számítógép cím</string>
+    <string name="bad_desktop_address">Érvénytelen számítógépcím</string>
     <string name="users_add">Profil hozzáadása</string>
-    <string name="attach">Csatolás</string>
+    <string name="attach">Mellékelés</string>
     <string name="v5_0_app_passcode">Alkalmazás jelkód</string>
     <string name="icon_descr_asked_to_receive">Felkérték a kép fogadására</string>
     <string name="use_camera_button">Kamera</string>
     <string name="cannot_access_keychain">Nem érhető el a Keystore az adatbázis jelszavának mentéséhez</string>
     <string name="callstatus_in_progress">hívás folyamatban</string>
     <string name="auto_accept_images">Képek automatikus elfogadása</string>
-    <string name="allow_your_contacts_to_call">A hívások kezdeményezése engedélyezve van az ismerősei számára.</string>
+    <string name="allow_your_contacts_to_call">A hívások kezdeményezése engedélyezve van a partnerei számára.</string>
     <string name="settings_section_title_icon">ALKALMAZÁSIKON</string>
     <string name="v4_3_improved_server_configuration_desc">Kiszolgáló hozzáadása QR-kód beolvasásával.</string>
     <string name="allow_to_send_disappearing">Az eltűnő üzenetek küldése engedélyezve van.</string>
-    <string name="allow_disappearing_messages_only_if">Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
+    <string name="allow_disappearing_messages_only_if">Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
     <string name="icon_descr_audio_off">Hang kikapcsolva</string>
     <string name="allow_direct_messages">A közvetlen üzenetek küldése a tagok között engedélyezve van.</string>
     <string name="settings_section_title_app">ALKALMAZÁS</string>
     <string name="icon_descr_call_progress">Hívás folyamatban</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Mindkét fél küldhet üzenetreakciókat.</string>
+    <string name="both_you_and_your_contact_can_add_message_reactions">Mindkét fél hozzáadhat az üzenetekhez reakciókat.</string>
     <string name="both_you_and_your_contact_can_make_calls">Mindkét fél tud hívásokat kezdeményezni.</string>
     <string name="la_auth_failed">Sikertelen hitelesítés</string>
-    <string name="block_member_desc">Az összes %s által írt új üzenet elrejtésre kerül!</string>
-    <string name="app_version_name">Alkalmazás verzió: v%s</string>
-    <string name="allow_calls_only_if">A hívások kezdeményezése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
+    <string name="block_member_desc">%s összes új üzenete el lesz rejtve!</string>
+    <string name="app_version_name">Az alkalmazás verziója: v%s</string>
+    <string name="allow_calls_only_if">A hívások kezdeményezése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
     <string name="smp_servers_add">Kiszolgáló hozzáadása</string>
     <string name="icon_descr_audio_on">Hang bekapcsolva</string>
     <string name="audio_call_no_encryption">hanghívás (nem e2e titkosított)</string>
     <string name="blocked_item_description">letiltva</string>
-    <string name="change_database_passphrase_question">Adatbázis-jelmondat megváltoztatása?</string>
+    <string name="change_database_passphrase_question">Módosítja az adatbázis jelmondatát?</string>
     <string name="callstate_connected">kapcsolódva</string>
-    <string name="la_change_app_passcode">Jelkód megváltoztatása</string>
-    <string name="rcv_group_event_changed_member_role">%s szerepkörét megváltoztatta erre: %s</string>
-    <string name="switch_receiving_address">A fogadó cím megváltoztatása</string>
-    <string name="change_verb">Változtatás</string>
+    <string name="la_change_app_passcode">Jelkód módosítása</string>
+    <string name="rcv_group_event_changed_member_role">a következőre módosította %s szerepkörét: „%s”</string>
+    <string name="switch_receiving_address">Fogadási cím módosítása</string>
+    <string name="change_verb">Módosítás</string>
     <string name="confirm_passcode">Jelkód megerősítése</string>
     <string name="confirm_password">Jelszó megerősítése</string>
-    <string name="change_member_role_question">Csoport szerepkör megváltoztatása?</string>
-    <string name="change_lock_mode">Zárolási mód megváltoztatása</string>
+    <string name="change_member_role_question">Módosítja a tag szerepkörét?</string>
+    <string name="change_lock_mode">Zárolási mód módosítása</string>
     <string name="notification_contact_connected">Kapcsolódott</string>
     <string name="rcv_group_event_member_connected">kapcsolódott</string>
     <string name="connect_via_link_verb">Kapcsolódás</string>
     <string name="group_member_status_connected">kapcsolódott</string>
     <string name="connected_mobile">Társított hordozható eszköz</string>
     <string name="server_connected">kapcsolódva</string>
-    <string name="change_role">Szerepkör megváltoztatása</string>
+    <string name="change_role">Szerepkör módosítása</string>
     <string name="icon_descr_server_status_connected">Kapcsolódva</string>
     <string name="auth_confirm_credential">Hitelesítőadatok megerősítése</string>
-    <string name="switch_receiving_address_question">Megváltoztatja a fogadó címet?</string>
-    <string name="rcv_conn_event_switch_queue_phase_completed">cím megváltoztatva</string>
-    <string name="change_self_destruct_mode">Önmegsemmisítő mód megváltoztatása</string>
-    <string name="rcv_group_event_changed_your_role">megváltoztatta az Ön szerepkörét erre: %s</string>
+    <string name="switch_receiving_address_question">Módosítja a fogadási címet?</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">módosította a címet az Ön számára</string>
+    <string name="change_self_destruct_mode">Önmegsemmisítő-mód módosítása</string>
+    <string name="rcv_group_event_changed_your_role">a következőre módosította az Ön szerepkörét: „%s”</string>
     <string name="connect_button">Kapcsolódás</string>
-    <string name="connect_via_member_address_alert_title">Közvetlen kapcsolódás?</string>
+    <string name="connect_via_member_address_alert_title">Közvetlenül kapcsolódik?</string>
     <string name="smp_server_test_connect">Kapcsolódás</string>
     <string name="rcv_group_event_member_created_contact">közvetlenül kapcsolódott</string>
     <string name="connection_local_display_name">kapcsolat %1$d</string>
-    <string name="status_contact_has_e2e_encryption">az ismerős e2e titkosítással rendelkezik</string>
+    <string name="status_contact_has_e2e_encryption">a partner e2e titkosítással rendelkezik</string>
     <string name="v5_4_incognito_groups_descr">Csoport létrehozása véletlenszerű profillal.</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Az ismerős és az összes üzenet törlésre kerül - ez a művelet nem vonható vissza!</string>
-    <string name="contacts_can_mark_messages_for_deletion">Az ismerősei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.</string>
-    <string name="connect_via_invitation_link">Kapcsolódás egyszer használható meghívó-hivatkozással?</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">A partner és az összes üzenet törölve lesz – ez a művelet nem vonható vissza!</string>
+    <string name="contacts_can_mark_messages_for_deletion">A partnerei törlésre jelölhetnek üzeneteket; Ön majd meg tudja nézni azokat.</string>
+    <string name="connect_via_invitation_link">Kapcsolódik az egyszer használható meghívóval?</string>
     <string name="connect_via_link_or_qr">Kapcsolódás egy hivatkozáson vagy QR-kódon keresztül</string>
     <string name="connection_error_auth">Kapcsolódási hiba (AUTH)</string>
     <string name="notification_preview_mode_contact">Csak név</string>
@@ -208,40 +207,40 @@
     <string name="create_address">Cím létrehozása</string>
     <string name="copy_verb">Másolás</string>
     <string name="continue_to_next_step">Folytatás</string>
-    <string name="connect_plan_connect_via_link">Kapcsolódás egy hivatkozáson keresztül?</string>
-    <string name="contact_already_exists">Az ismerős már létezik</string>
+    <string name="connect_plan_connect_via_link">Kapcsolódik egy hivatkozáson keresztül?</string>
+    <string name="contact_already_exists">A partner már létezik</string>
     <string name="core_version">Fő verzió: v%s</string>
-    <string name="icon_descr_contact_checked">Ismerős ellenőrizve</string>
-    <string name="connect_plan_connect_to_yourself">Kapcsolódás saját magához?</string>
+    <string name="icon_descr_contact_checked">Partner ellenőrizve</string>
+    <string name="connect_plan_connect_to_yourself">Kapcsolódik saját magához?</string>
     <string name="copied">Kimásolva a vágólapra</string>
-    <string name="connection_request_sent">Kapcsolatkérés elküldve!</string>
+    <string name="connection_request_sent">Meghívási kérés elküldve!</string>
     <string name="connecting_to_desktop">Kapcsolódás a számítógéphez</string>
     <string name="network_session_mode_entity">Kapcsolat</string>
-    <string name="correct_name_to">Név helyesbítése erre: %s?</string>
+    <string name="correct_name_to">Helyesbíti a nevet a következőre: %s?</string>
     <string name="connection_timeout">Időtúllépés kapcsolódáskor</string>
-    <string name="connect_with_contact_name_question">Kapcsolódás a következővel: %1$s?</string>
+    <string name="connect_with_contact_name_question">Kapcsolódik vele: %1$s?</string>
     <string name="create_profile_button">Létrehozás</string>
-    <string name="contact_preferences">Ismerős beállításai</string>
+    <string name="contact_preferences">Partnerbeállítások</string>
     <string name="info_row_connection">Kapcsolat</string>
     <string name="desktop_connection_terminated">Kapcsolat megszakítva</string>
     <string name="display_name_connection_established">kapcsolat létrehozva</string>
-    <string name="status_contact_has_no_e2e_encryption">az ismerősnek nincs e2e titkosítása</string>
-    <string name="chat_preferences_contact_allows">Ismerős engedélyezi</string>
+    <string name="status_contact_has_no_e2e_encryption">a partner nem rendelkezik e2e titkosítással</string>
+    <string name="chat_preferences_contact_allows">Partner engedélyezi</string>
     <string name="notification_preview_somebody">Rejtett név:</string>
     <string name="connect_to_desktop">Társítás számítógéppel</string>
     <string name="icon_descr_context">Szövegkörnyezeti ikon</string>
     <string name="connect_via_link">Kapcsolódás egy hivatkozáson keresztül</string>
-    <string name="receipts_section_contacts">Ismerősök</string>
+    <string name="receipts_section_contacts">Partnerek</string>
     <string name="connection_error">Kapcsolódási hiba</string>
-    <string name="alert_title_contact_connection_pending">Az ismerős még nem kapcsolódott!</string>
-    <string name="v5_3_discover_join_groups_descr">- kapcsolódás könyvtár szolgáltatáshoz (BÉTA)!\n- kézbesítési jelentések (20 tagig).\n- gyorsabb és stabilabb.</string>
-    <string name="contribute">Hozzájárulás</string>
+    <string name="alert_title_contact_connection_pending">A partnere még nem kapcsolódott!</string>
+    <string name="v5_3_discover_join_groups_descr">- kapcsolódás könyvtár szolgáltatáshoz (BÉTA)!\n- kézbesítési jelentések (legfeljebb 20 tagig).\n- gyorsabb és stabilabb.</string>
+    <string name="contribute">Közreműködés</string>
     <string name="group_member_status_intro_invitation">kapcsolódás (bemutatkozó meghívó)</string>
     <string name="create_simplex_address">SimpleX-cím létrehozása</string>
-    <string name="rcv_direct_event_contact_deleted">törölt ismerős</string>
-    <string name="delete_member_message__question">Csoporttag üzenetének törlése?</string>
+    <string name="rcv_direct_event_contact_deleted">törölt partner</string>
+    <string name="delete_member_message__question">Törli a tag üzenetét?</string>
     <string name="chat_is_running">A csevegés fut</string>
-    <string name="share_one_time_link">Egyszer használható meghívó-hivatkozás létrehozása</string>
+    <string name="share_one_time_link">Egyszer használható meghívó létrehozása</string>
     <string name="delete_link">Törlés</string>
     <string name="notifications_mode_periodic_desc">Új üzenetek ellenőrzése 10 percenként, legfeljebb 1 percen keresztül</string>
     <string name="delete_database">Adatbázis törlése</string>
@@ -249,11 +248,11 @@
     <string name="network_session_mode_user">Csevegési profil</string>
     <string name="create_another_profile_button">Profil létrehozása</string>
     <string name="connected_desktop">Társított számítógép</string>
-    <string name="share_text_deleted_at">Törölve ekkor: %s</string>
-    <string name="info_row_deleted_at">Törölve ekkor:</string>
+    <string name="share_text_deleted_at">Törölve: %s</string>
+    <string name="info_row_deleted_at">Törölve</string>
     <string name="v4_6_chinese_spanish_interface">Kínai és spanyol kezelőfelület</string>
-    <string name="alert_title_cant_invite_contacts">Nem lehet meghívni az ismerősöket!</string>
-    <string name="chat_is_stopped_indication">A csevegés leállt</string>
+    <string name="alert_title_cant_invite_contacts">Nem lehet meghívni a partnereket!</string>
+    <string name="chat_is_stopped_indication">A csevegés megállt</string>
     <string name="theme_dark">Sötét</string>
     <string name="create_profile">Profil létrehozása</string>
     <string name="rcv_group_event_group_deleted">törölt csoport</string>
@@ -272,15 +271,15 @@
     <string name="maximum_supported_file_size">Jelenleg támogatott legnagyobb fájl méret: %1$s.</string>
     <string name="smp_server_test_delete_file">Fájl törlése</string>
     <string name="in_developing_title">Hamarosan!</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">cím megváltoztatása nála: %s …</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">cím módosítása %s számára…</string>
     <string name="chat_database_imported">Csevegési adatbázis importálva</string>
     <string name="delete_messages">Üzenetek törlése</string>
     <string name="clear_chat_menu_action">Kiürítés</string>
     <string name="icon_descr_close_button">Bezárás gomb</string>
-    <string name="chat_is_stopped">A csevegés leállt</string>
+    <string name="chat_is_stopped">A csevegés megállt</string>
     <string name="item_info_current">(jelenlegi)</string>
     <string name="v5_1_custom_themes_descr">Témák személyre szabása és megosztása.</string>
-    <string name="delete_chat_profile_question">Csevegési profil törlése?</string>
+    <string name="delete_chat_profile_question">Törli a csevegési profilt?</string>
     <string name="create_group">Titkos csoport létrehozása</string>
     <string name="connected_to_desktop">Kapcsolódva a számítógéphez</string>
     <string name="configure_ICE_servers">ICE-kiszolgálók beállítása</string>
@@ -289,43 +288,43 @@
     <string name="group_member_status_creator">készítő</string>
     <string name="confirm_verb">Megerősítés</string>
     <string name="for_me_only">Csak nálam</string>
-    <string name="delete_messages__question">%d üzenet törlése?</string>
+    <string name="delete_messages__question">Töröl %d üzenetet?</string>
     <string name="v5_1_custom_themes">Egyéni témák</string>
     <string name="group_member_status_accepted">kapcsolódás (elfogadva)</string>
     <string name="smp_servers_check_address">Kiszolgáló címének ellenőrzése és újrapróbálkozás.</string>
-    <string name="delete_group_question">Csoport törlése?</string>
+    <string name="delete_group_question">Törli a csoportot?</string>
     <string name="confirm_database_upgrades">Adatbázis fejlesztésének megerősítése</string>
     <string name="create_your_profile">Saját profil létrehozása</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">cím megváltoztatása…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">cím módosítása…</string>
     <string name="display_name_connecting">kapcsolódás…</string>
     <string name="icon_descr_call_connecting">Hívás kapcsolása</string>
-    <string name="delete_files_and_media_question">A fájlok- és a médiatartalmak törlése?</string>
+    <string name="delete_files_and_media_question">Törli a fájl- és a médiatartalmakat?</string>
     <string name="group_member_status_complete">befejezett</string>
     <string name="chat_database_section">CSEVEGÉSI ADATBÁZIS</string>
-    <string name="change_self_destruct_passcode">Önmegsemmisító jelkód megváltoztatása</string>
-    <string name="smp_server_test_create_queue">Sorbaállítás létrehozása</string>
+    <string name="change_self_destruct_passcode">Önmegsemmisítő-jelkód módosítása</string>
+    <string name="smp_server_test_create_queue">Sorba állítás létrehozása</string>
     <string name="colored_text">színezett</string>
     <string name="callstate_connecting">kapcsolódás…</string>
     <string name="dark_theme">Sötét téma</string>
     <string name="deleted_description">törölve</string>
-    <string name="users_delete_question">Csevegési profil törlése?</string>
+    <string name="users_delete_question">Törli a csevegési profilt?</string>
     <string name="chat_with_developers">Csevegés a fejlesztőkkel</string>
-    <string name="delete_link_question">Hivatkozás törlése?</string>
+    <string name="delete_link_question">Törli a hivatkozást?</string>
     <string name="server_connecting">kapcsolódás</string>
-    <string name="send_disappearing_message_custom_time">Egyéni időbeállítás</string>
+    <string name="send_disappearing_message_custom_time">Egyéni időköz</string>
     <string name="connect_via_link_incognito">Kapcsolódás inkognitóban</string>
     <string name="settings_section_title_chats">CSEVEGÉSEK</string>
     <string name="v5_3_new_desktop_app_descr">Új profil létrehozása a számítógép alkalmazásban. 💻</string>
     <string name="group_member_status_announced">kapcsolódás (bejelentve)</string>
     <string name="contact_connection_pending">kapcsolódás…</string>
     <string name="chat_database_deleted">Csevegési adatbázis törölve</string>
-    <string name="group_member_status_introduced">kapcsolódás (bejelentve)</string>
+    <string name="group_member_status_introduced">kapcsolódás (bemutatkozva)</string>
     <string name="create_group_link">Csoporthivatkozás létrehozása</string>
     <string name="chat_console">Csevegési konzol</string>
     <string name="delete_files_and_media_for_all_users">Fájlok törlése az összes csevegési profilból</string>
-    <string name="smp_server_test_delete_queue">Sorbaállítás törlése</string>
-    <string name="button_delete_contact">Ismerős törlése</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">cím megváltoztatása…</string>
+    <string name="smp_server_test_delete_queue">Sorba állítás törlése</string>
+    <string name="button_delete_contact">Partner törlése</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">cím módosítása…</string>
     <string name="connected_to_mobile">Társítva a hordozható eszközhöz</string>
     <string name="current_passphrase">Jelenlegi jelmondat…</string>
     <string name="choose_file_title">Fájl kiválasztása</string>
@@ -333,33 +332,33 @@
     <string name="smp_server_test_create_file">Fájl létrehozása</string>
     <string name="create_secret_group_title">Tikos csoport létrehozása</string>
     <string name="clear_contacts_selection_button">Elvetés</string>
-    <string name="delete_contact_question">Ismerős törlése?</string>
+    <string name="delete_contact_question">Törli a partnert?</string>
     <string name="clear_verb">Kiürítés</string>
     <string name="create_address_and_let_people_connect">Cím létrehozása, hogy az emberek kapcsolatba léphessenek Önnel.</string>
-    <string name="v4_4_verify_connection_security_desc">Biztonsági kódok összehasonlítása az ismerősökével.</string>
+    <string name="v4_4_verify_connection_security_desc">Biztonsági kódok összehasonlítása a partnerekével.</string>
     <string name="smp_server_test_compare_file">Fájl-összehasonlítás</string>
     <string name="your_chats">Csevegések</string>
-    <string name="delete_message__question">Üzenet törlése?</string>
-    <string name="delete_pending_connection__question">Függőben lévő ismerőskérelem törlése?</string>
+    <string name="delete_message__question">Törli az üzenetet?</string>
+    <string name="delete_pending_connection__question">Törli a függőben lévő meghívót?</string>
     <string name="database_encrypted">Adatbázis titkosítva!</string>
-    <string name="clear_chat_question">Üzenetek kiürítése?</string>
+    <string name="clear_chat_question">Kiüríti a csevegést?</string>
     <string name="database_downgrade">Adatbázis visszafejlesztése</string>
     <string name="clear_chat_button">Üzenetek kiürítése</string>
-    <string name="database_passphrase_will_be_updated">Adatbázis titkosítási jelmondat frissítve lesz.</string>
+    <string name="database_passphrase_will_be_updated">Az adatbázis titkosítási jelmondata frissítve lesz.</string>
     <string name="multicast_connect_automatically">Kapcsolódás automatikusan</string>
     <string name="database_error">Adatbázishiba</string>
-    <string name="database_encryption_will_be_updated_in_settings">Adatbázis titkosítási jelmondat frissül és eltárolásra kerül a beállításokban.</string>
+    <string name="database_encryption_will_be_updated_in_settings">Az adatbázis titkosítási jelmondata frissülni fog és a beállításokban lesz tárolva.</string>
     <string name="info_row_database_id">Adatbázis-azonosító</string>
     <string name="share_text_database_id">Adatbázis-azonosító: %d</string>
-    <string name="developer_options">Adatbázis-azonosítók és átvitel-izolációs beállítások.</string>
-    <string name="database_encryption_will_be_updated">Az adatbázis-titkosítási jelmondat megváltoztatásra és mentésre kerül a Keystore-ban.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored_in_settings">Az adatbázis titkosításra kerül és a jelmondat eltárolásra a beállításokban.</string>
+    <string name="developer_options">Adatbázis-azonosítók és átvitelelkülönítési beállítások.</string>
+    <string name="database_encryption_will_be_updated">Az adatbázis titkosítási jelmondata frissülni fog és a Keystore-ban lesz tárolva.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored_in_settings">Az adatbázis titkosítva lesz, a jelmondat pedig a beállításokban lesz tárolva.</string>
     <string name="smp_servers_delete_server">Kiszolgáló törlése</string>
     <string name="auth_device_authentication_is_disabled_turning_off">Az eszközön nincs beállítva a képernyőzár. A SimpleX-zár ki van kapcsolva.</string>
     <string name="no_call_on_lock_screen">Letiltás</string>
     <string name="receipts_groups_disable_for_all">Letiltás az összes csoport számára</string>
     <string name="receipts_groups_enable_for_all">Engedélyezés az összes csoport számára</string>
-    <string name="feature_enabled_for_contact">engedélyezve az ismerős számára</string>
+    <string name="feature_enabled_for_contact">engedélyezve a partner számára</string>
     <string name="disappearing_messages_are_prohibited">Az eltűnő üzenetek küldése le van tiltva.</string>
     <string name="delete_address">Cím törlése</string>
     <string name="ttl_week">%d hét</string>
@@ -367,23 +366,23 @@
     <string name="ttl_s">%dmp</string>
     <string name="delivery_receipts_title">Kézbesítési jelentések!</string>
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Az eszközön nincs beállítva a képernyőzár. A SimpleX-zár az „Adatvédelem és biztonság” menüben kapcsolható be, miután beállította a képernyőzárat az eszközén.</string>
-    <string name="decryption_error">Titkosítás visszafejtési hiba</string>
-    <string name="share_text_disappears_at">Eltűnik ekkor: %s</string>
+    <string name="decryption_error">Titkosításvisszafejtési hiba</string>
+    <string name="share_text_disappears_at">Eltűnik: %s</string>
     <string name="icon_descr_edited">szerkesztve</string>
     <string name="delete_verb">Törlés</string>
     <string name="ttl_hours">%d óra</string>
     <string name="ttl_months">%d hónap</string>
-    <string name="delete_address__question">Cím törlése?</string>
-    <string name="receipts_contacts_title_disable">Kézbesítési jelentések letiltása?</string>
+    <string name="delete_address__question">Törli a címet?</string>
+    <string name="receipts_contacts_title_disable">Letiltja a kézbesítési jelentéseket?</string>
     <string name="passphrase_is_different">Az adatbázis-jelmondat eltér a Keystore-ban lévőtől.</string>
     <string name="direct_messages">Közvetlen üzenetek</string>
     <string name="icon_descr_email">E-mail</string>
-    <string name="receipts_contacts_disable_for_all">Letiltás az összes tag számára</string>
+    <string name="receipts_contacts_disable_for_all">Letiltás</string>
     <string name="settings_developer_tools">Fejlesztői eszközök</string>
     <string name="database_passphrase">Adatbázis-jelmondat</string>
     <string name="ttl_days">%d nap</string>
     <string name="icon_descr_server_status_disconnected">Kapcsolat bontva</string>
-    <string name="encrypted_with_random_passphrase">Az adatbázis egy véletlenszerű jelmondattal van titkosítva, ami megváltoztatható.</string>
+    <string name="encrypted_with_random_passphrase">Az adatbázis egy véletlenszerű jelmondattal van titkosítva, amelyet szabadon módosíthat.</string>
     <string name="ttl_h">%dó</string>
     <string name="ttl_w">%dhét</string>
     <string name="discover_on_network">Felfedezés helyi hálózaton keresztül</string>
@@ -392,41 +391,41 @@
     <string name="disappearing_message">Eltűnő üzenet</string>
     <string name="dont_create_address">Ne hozzon létre címet</string>
     <string name="dont_show_again">Ne mutasd újra</string>
-    <string name="auth_disable_simplex_lock">SimpleX zár kikapcsolása</string>
+    <string name="auth_disable_simplex_lock">SimpleX-zár kikapcsolása</string>
     <string name="status_e2e_encrypted">e2e titkosított</string>
     <string name="settings_section_title_device">ESZKÖZ</string>
     <string name="encrypted_video_call">e2e titkosított videóhívás</string>
     <string name="conn_level_desc_direct">közvetlen</string>
     <string name="desktop_device">Számítógép</string>
     <string name="la_minutes">%d perc</string>
-    <string name="num_contacts_selected">%d ismerős kiválasztva</string>
+    <string name="num_contacts_selected">%d partner kijelölve</string>
     <string name="enable_receipts_all">Engedélyezés</string>
     <string name="ttl_mth">%dhónap</string>
     <string name="direct_messages_are_prohibited_in_group">A közvetlen üzenetek küldése a tagok között le van tiltva ebben a csoportban.</string>
     <string name="ttl_min">%d perc</string>
-    <string name="set_password_to_export_desc">Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt változtassa meg a jelmondatot.</string>
-    <string name="receipts_groups_title_disable">Kézbesítés jelentések letiltása a csoportok számára?</string>
+    <string name="set_password_to_export_desc">Az adatbázis egy véletlenszerű jelmondattal van titkosítva. Exportálás előtt módosítsa.</string>
+    <string name="receipts_groups_title_disable">Letiltja a kézbesítési jelentéseket a csoportok számára?</string>
     <string name="custom_time_unit_days">nap</string>
     <string name="ttl_day">%d nap</string>
-    <string name="failed_to_create_user_duplicate_title">Duplikált megjelenített név!</string>
+    <string name="failed_to_create_user_duplicate_title">Duplikált megjelenítendő név!</string>
     <string name="receipts_contacts_disable_keep_overrides">Letiltás (felülírások megtartásával)</string>
     <string name="database_upgrade">Adatbázis fejlesztése</string>
     <string name="blocked_items_description">%d üzenet letiltva</string>
-    <string name="info_row_disappears_at">Eltűnik ekkor:</string>
+    <string name="info_row_disappears_at">Eltűnik</string>
     <string name="ttl_weeks">%d hét</string>
     <string name="feature_enabled_for_you">engedélyezve az Ön számára</string>
     <string name="timed_messages">Eltűnő üzenetek</string>
     <string name="delete_group_menu_action">Törlés</string>
-    <string name="delete_and_notify_contact">Törlés, és az ismerős értesítése</string>
+    <string name="delete_and_notify_contact">Törlés, és a partner értesítése</string>
     <string name="send_receipts_disabled">letiltva</string>
-    <string name="la_seconds">%d másodperc</string>
+    <string name="la_seconds">%d mp</string>
     <string name="delete_files_and_media_all">Az összes fájl törlése</string>
-    <string name="database_will_be_encrypted">Az adatbázis titkosításra kerül.</string>
+    <string name="database_will_be_encrypted">Az adatbázis titkosítva lesz.</string>
     <string name="database_passphrase_and_export">Adatbázis-jelmondat és -exportálás</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">Az adatbázis titkosításra kerül és a jelmondat a Keystore-ban lesz tárolva.</string>
-    <string name="enable_automatic_deletion_question">Automatikus üzenet törlés engedélyezése?</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">Az adatbázis titkosítva lesz, a jelmondat pedig a Keystore-ban lesz tárolva.</string>
+    <string name="enable_automatic_deletion_question">Engedélyezi az automatikus üzenettörlést?</string>
     <string name="delete_contact_menu_action">Törlés</string>
-    <string name="mtr_error_no_down_migration">az adatbázis verziója újabb, mint az alkalmazásé, visszafelé átköltöztetés nem lehetséges a következőhöz: %s</string>
+    <string name="mtr_error_no_down_migration">az adatbázis verziója újabb, mint az alkalmazásé, de a visszafelé történő átköltöztetés viszont nem lehetséges a következőhöz: %s</string>
     <string name="simplex_link_mode_description">Leírás</string>
     <string name="ttl_hour">%d óra</string>
     <string name="ttl_m">%dp</string>
@@ -435,7 +434,7 @@
     <string name="receipts_groups_disable_keep_overrides">Letiltás (csoport felülírások megtartásával)</string>
     <string name="rcv_group_events_count">%d csoportesemény</string>
     <string name="ttl_month">%d hónap</string>
-    <string name="button_edit_group_profile">A csoport profiljának szerkesztése</string>
+    <string name="button_edit_group_profile">Csoportprofil szerkesztése</string>
     <string name="encrypted_audio_call">e2e titkosított hanghívás</string>
     <string name="ttl_sec">%d mp</string>
     <string name="decentralized">Decentralizált</string>
@@ -448,170 +447,170 @@
     <string name="disappearing_prohibited_in_this_chat">Az eltűnő üzenetek küldése le van tiltva ebben a csevegésben.</string>
     <string name="chat_preferences_default">alapértelmezett (%s)</string>
     <string name="integrity_msg_duplicate">duplikált üzenet</string>
-    <string name="disconnect_desktop_question">Számítógép leválasztása?</string>
-    <string name="desktop_app_version_is_incompatible">Számítógép-alkalmazás verziója %s nem kompatibilis ezzel az alkalmazással.</string>
+    <string name="disconnect_desktop_question">Leválasztja a számítógépet?</string>
+    <string name="desktop_app_version_is_incompatible">A számítógép-alkalmazás verziója (%s) nem kompatibilis ezzel az alkalmazással.</string>
     <string name="delivery">Kézbesítés</string>
-    <string name="total_files_count_and_size">%d fájl %s összméretben</string>
+    <string name="total_files_count_and_size">%d fájl, %s összméretben</string>
     <string name="database_passphrase_is_required">A csevegés megnyitásához adja meg az adatbázis jelmondatát.</string>
     <string name="ttl_d">%dnap</string>
     <string name="receipts_contacts_enable_for_all">Engedélyezés az összes tag számára</string>
     <string name="delivery_receipts_are_disabled">A kézbesítési jelentések le vannak tiltva!</string>
     <string name="expand_verb">Kibontás</string>
-    <string name="error_sending_message">Hiba az üzenet küldésekor</string>
-    <string name="la_enter_app_passcode">Jelkód megadása</string>
+    <string name="error_sending_message">Hiba történt az üzenet elküldésekor</string>
+    <string name="la_enter_app_passcode">Adja meg a jelkódot</string>
     <string name="for_everybody">Mindenkinél</string>
-    <string name="encryption_renegotiation_error">Titkosítás újraegyeztetési hiba</string>
-    <string name="error_encrypting_database">Hiba az adatbázis titkosításakor</string>
-    <string name="error_deleting_group">Hiba a csoport törlésekor</string>
+    <string name="encryption_renegotiation_error">Hiba történt a titkosítás újraegyeztetésekor</string>
+    <string name="error_encrypting_database">Hiba történt az adatbázis titkosításakor</string>
+    <string name="error_deleting_group">Hiba történt a csoport törlésekor</string>
     <string name="exit_without_saving">Kilépés mentés nélkül</string>
     <string name="v5_3_encrypt_local_files">A tárolt fájlok- és a médiatartalmak titkosítása</string>
-    <string name="error_setting_address">Hiba a cím beállításakor</string>
+    <string name="error_setting_address">Hiba történt a cím beállításakor</string>
     <string name="group_invitation_expired">A csoportmeghívó lejárt</string>
-    <string name="error_saving_ICE_servers">Hiba az ICE-kiszolgálók mentésekor</string>
+    <string name="error_saving_ICE_servers">Hiba történt az ICE-kiszolgálók mentésekor</string>
     <string name="error_alert_title">Hiba</string>
     <string name="icon_descr_server_status_error">Hiba</string>
-    <string name="error_loading_xftp_servers">Hiba az XFTP-kiszolgálók betöltésekor</string>
-    <string name="error_loading_smp_servers">Hiba az SMP-kiszolgálók betöltésekor</string>
-    <string name="error_setting_network_config">Hiba a hálózat konfigurációjának frissítésekor</string>
+    <string name="error_loading_xftp_servers">Hiba történt az XFTP-kiszolgálók betöltésekor</string>
+    <string name="error_loading_smp_servers">Hiba történt az SMP-kiszolgálók betöltésekor</string>
+    <string name="error_setting_network_config">Hiba történt a hálózat konfigurációjának frissítésekor</string>
     <string name="network_option_enable_tcp_keep_alive">TCP életben tartása</string>
     <string name="icon_descr_flip_camera">Kamera váltás</string>
     <string name="email_invite_body">Üdvözlöm!\nCsatlakozzon hozzám a SimpleX Chaten keresztül: %s</string>
-    <string name="display_name_cannot_contain_whitespace">A megjelenített név nem tartalmazhat szóközöket.</string>
+    <string name="display_name_cannot_contain_whitespace">A megjelenítendő név nem tartalmazhat szóközöket.</string>
     <string name="info_row_group">Csoport</string>
-    <string name="enter_welcome_message_optional">Üdvözlőüzenet megadása… (nem kötelező)</string>
-    <string name="error_exporting_chat_database">Hiba a csevegési adatbázis exportálásakor</string>
-    <string name="error_saving_file">Hiba a fájl mentésekor</string>
+    <string name="enter_welcome_message_optional">Adja meg az üdvözlőüzenetet… (nem kötelező)</string>
+    <string name="error_exporting_chat_database">Hiba történt a csevegési adatbázis exportálásakor</string>
+    <string name="error_saving_file">Hiba történt a fájl mentésekor</string>
     <string name="encrypt_local_files">Helyi fájlok titkosítása</string>
     <string name="snd_conn_event_ratchet_sync_agreed">titkosítás elfogadva %s számára</string>
     <string name="marked_deleted_items_description">%d üzenet megjelölve törlésre</string>
-    <string name="conn_event_ratchet_sync_allowed">titkosítás újra egyeztetése engedélyezve</string>
+    <string name="conn_event_ratchet_sync_allowed">a titkosítás újraegyeztetése engedélyezve van</string>
     <string name="enable_self_destruct">Önmegsemmisítés engedélyezése</string>
     <string name="v5_2_favourites_filter_descr">Olvasatlan és kedvenc csevegésekre való szűrés.</string>
-    <string name="failed_to_parse_chats_title">A csevegések betöltése sikertelen</string>
+    <string name="failed_to_parse_chats_title">Nem sikerült betölteni a csevegéseket</string>
     <string name="connect_plan_group_already_exists">A csoport már létezik!</string>
     <string name="v4_4_french_interface">Francia kezelőfelület</string>
     <string name="v4_2_group_links">Csoporthivatkozások</string>
     <string name="v5_1_message_reactions_descr">Végre, megvannak! 🚀</string>
-    <string name="error_starting_chat">Hiba a csevegés elindításakor</string>
+    <string name="error_starting_chat">Hiba történt a csevegés elindításakor</string>
     <string name="group_profile_is_stored_on_members_devices">A csoport profilja a tagok eszközein tárolódik, nem a kiszolgálókon.</string>
-    <string name="enter_passphrase">Jelmondat megadása…</string>
-    <string name="error_updating_user_privacy">Hiba a felhasználói adatvédelem frissítésekor</string>
+    <string name="enter_passphrase">Adja meg a jelmondatot…</string>
+    <string name="error_updating_user_privacy">Hiba történt a felhasználói adatvédelem frissítésekor</string>
     <string name="encrypt_database">Titkosít</string>
     <string name="alert_title_no_group">Csoport nem található!</string>
-    <string name="error_saving_smp_servers">Hiba az SMP-kiszolgálók mentésekor</string>
+    <string name="error_saving_smp_servers">Hiba történt az SMP-kiszolgálók mentésekor</string>
     <string name="downgrade_and_open_chat">Visszafejlesztés és a csevegés megnyitása</string>
     <string name="icon_descr_group_inactive">A csoport inaktív</string>
     <string name="v5_0_large_files_support_descr">Gyors és nem kell várni, amíg a feladó online lesz!</string>
-    <string name="error_joining_group">Hiba a csoporthoz való csatlakozáskor</string>
+    <string name="error_joining_group">Hiba történt a csoporthoz való csatlakozáskor</string>
     <string name="favorite_chat">Kedvenc</string>
-    <string name="v4_6_group_moderation">Csoport moderáció</string>
+    <string name="v4_6_group_moderation">Csoport moderálása</string>
     <string name="choose_file">Fájl</string>
     <string name="group_link">Csoporthivatkozás</string>
-    <string name="snd_conn_event_ratchet_sync_required">titkosítás-újraegyeztetés szükséges ehhez: %s</string>
-    <string name="failed_to_active_user_title">Hiba a profilváltáskor!</string>
+    <string name="snd_conn_event_ratchet_sync_required">a titkosítás újraegyeztetése szükséges %s számára</string>
+    <string name="failed_to_active_user_title">Hiba történt a profilváltáskor!</string>
     <string name="settings_experimental_features">Kísérleti funkciók</string>
     <string name="receipts_contacts_enable_keep_overrides">Engedélyezés (felülírások megtartásával)</string>
     <string name="enter_correct_passphrase">Adja meg a helyes jelmondatot.</string>
-    <string name="delete_group_for_self_cannot_undo_warning">A csoport törlésre kerül az Ön számára - ez a művelet nem vonható vissza!</string>
-    <string name="encrypt_database_question">Adatbázis titkosítása?</string>
+    <string name="delete_group_for_self_cannot_undo_warning">A csoport törölve lesz az Ön számára – ez a művelet nem vonható vissza!</string>
+    <string name="encrypt_database_question">Titkosítja az adatbázist?</string>
     <string name="allow_accepting_calls_from_lock_screen">A zárolási képernyőn megjelenő hívások engedélyezése a Beállításokban.</string>
     <string name="conn_event_ratchet_sync_agreed">titkosítás elfogadva</string>
-    <string name="receipts_contacts_title_enable">Kézbesítési jelentések engedélyezése?</string>
-    <string name="error_saving_group_profile">Hiba a csoportprofil mentésekor</string>
+    <string name="receipts_contacts_title_enable">Engedélyezi a kézbesítési jelentéseket?</string>
+    <string name="error_saving_group_profile">Hiba történt a csoportprofil mentésekor</string>
     <string name="server_error">hiba</string>
     <string name="revoke_file__message">A fájl törölve lesz a kiszolgálókról.</string>
     <string name="v5_2_disappear_one_message_descr">Akkor is, ha le van tiltva a beszélgetésben.</string>
     <string name="v5_4_better_groups_descr">Gyorsabb csatlakozás és megbízhatóbb üzenetkézbesítés.</string>
     <string name="enable_lock">Zárolás engedélyezése</string>
     <string name="settings_section_title_help">SÚGÓ</string>
-    <string name="group_is_decentralized">Teljesen decentralizált - csak a tagok számára látható.</string>
+    <string name="group_is_decentralized">Teljesen decentralizált – csak a tagok számára látható.</string>
     <string name="file_with_path">Fájl: %s</string>
     <string name="icon_descr_hang_up">Hívás befejezése</string>
-    <string name="error_deleting_link_for_group">Hiba a csoporthivatkozás törlésekor</string>
+    <string name="error_deleting_link_for_group">Hiba történt a csoporthivatkozás törlésekor</string>
     <string name="file_saved">Fájl elmentve</string>
     <string name="fix_connection_question">Kapcsolat javítása?</string>
     <string name="files_and_media">Fájlok és médiatartalmak</string>
     <string name="section_title_for_console">KONZOLHOZ</string>
-    <string name="alert_text_encryption_renegotiation_failed">Sikertelen titkosítás-újraegyeztetés.</string>
-    <string name="error_deleting_user">Hiba a felhasználó-profil törlésekor</string>
+    <string name="alert_text_encryption_renegotiation_failed">Nem sikerült a titkosítást újraegyeztetni.</string>
+    <string name="error_deleting_user">Hiba történt a felhasználóprofil törlésekor</string>
     <string name="fix_connection_not_supported_by_group_member">Csoporttag általi javítás nem támogatott</string>
-    <string name="enter_welcome_message">Üdvözlőüzenet megadása…</string>
+    <string name="enter_welcome_message">Adja meg az üdvözlőüzenetet…</string>
     <string name="encrypted_database">Titkosított adatbázis</string>
-    <string name="enter_password_to_show">Jelszó megadása a keresőben</string>
+    <string name="enter_password_to_show">Adja meg a jelszót a keresőben</string>
     <string name="file_will_be_received_when_contact_completes_uploading">A fájl akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</string>
     <string name="smp_server_test_download_file">Fájl letöltése</string>
-    <string name="failed_to_parse_chat_title">A csevegés betöltése sikertelen</string>
-    <string name="smp_servers_enter_manually">Kiszolgáló megadása kézzel</string>
+    <string name="failed_to_parse_chat_title">Nem sikerült betölteni a csevegést</string>
+    <string name="smp_servers_enter_manually">Adja meg a kiszolgálót kézzel</string>
     <string name="file_will_be_received_when_contact_is_online">A fájl akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</string>
-    <string name="error_creating_link_for_group">Hiba a csoporthivatkozás létrehozásakor</string>
+    <string name="error_creating_link_for_group">Hiba történt a csoporthivatkozás létrehozásakor</string>
     <string name="from_gallery_button">A galériából</string>
     <string name="receipts_groups_enable_keep_overrides">Engedélyezés (csoport felülírások megtartásával)</string>
-    <string name="error_deleting_contact">Hiba az ismerős törlésekor</string>
+    <string name="error_deleting_contact">Hiba történt a partner törlésekor</string>
     <string name="group_members_can_delete">A tagok véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</string>
-    <string name="error_changing_role">Hiba a szerepkör megváltoztatásakor</string>
+    <string name="error_changing_role">Hiba történt a szerepkör módosításakor</string>
     <string name="fix_connection_confirm">Javítás</string>
     <string name="group_members_can_send_disappearing">A tagok küldhetnek eltűnő üzeneteket.</string>
     <string name="fix_connection">Kapcsolat javítása</string>
-    <string name="failed_to_create_user_title">Hiba a profil létrehozásakor!</string>
-    <string name="error_adding_members">Hiba a tag(ok) hozzáadásakor</string>
+    <string name="failed_to_create_user_title">Hiba történt a profil létrehozásakor!</string>
+    <string name="error_adding_members">Hiba történt a tag(ok) hozzáadásakor</string>
     <string name="icon_descr_file">Fájl</string>
     <string name="group_members_can_send_files">A tagok küldhetnek fájlokat és médiatartalmakat.</string>
     <string name="delete_after">Törlés ennyi idő után</string>
-    <string name="error_changing_message_deletion">Hiba a beállítás megváltoztatásakor</string>
-    <string name="error_updating_link_for_group">Hiba a csoporthivatkozás frissítésekor</string>
+    <string name="error_changing_message_deletion">Hiba történt a beállítás módosításakor</string>
+    <string name="error_updating_link_for_group">Hiba történt a csoporthivatkozás frissítésekor</string>
     <string name="group_member_status_group_deleted">a csoport törölve</string>
     <string name="snd_group_event_group_profile_updated">csoportprofil frissítve</string>
-    <string name="error_deleting_pending_contact_connection">Hiba a függőben lévő ismerős kapcsolatának törlésekor</string>
-    <string name="error_importing_database">Hiba a csevegési adatbázis importálásakor</string>
-    <string name="error_enabling_delivery_receipts">Hiba a kézbesítési jelentések engedélyezésekor!</string>
-    <string name="error_saving_xftp_servers">Hiba az XFTP-kiszolgálók mentésekor</string>
+    <string name="error_deleting_pending_contact_connection">Hiba történt a függőben lévő meghívó törlésekor</string>
+    <string name="error_importing_database">Hiba történt a csevegési adatbázis importálásakor</string>
+    <string name="error_enabling_delivery_receipts">Hiba történt a kézbesítési jelentések engedélyezésekor!</string>
+    <string name="error_saving_xftp_servers">Hiba történt az XFTP-kiszolgálók mentésekor</string>
     <string name="group_members_can_send_dms">A tagok küldhetnek egymásnak közvetlen üzeneteket.</string>
-    <string name="error_removing_member">Hiba a tag eltávolításakor</string>
+    <string name="error_removing_member">Hiba történt a tag eltávolításakor</string>
     <string name="callstate_ended">befejeződött</string>
     <string name="v4_6_group_welcome_message">A csoport üdvözlőüzenete</string>
-    <string name="group_display_name_field">Csoport neve:</string>
-    <string name="error_sending_message_contact_invitation">Hiba a meghívó küldésekor</string>
+    <string name="group_display_name_field">Adja meg a csoport nevét:</string>
+    <string name="error_sending_message_contact_invitation">Hiba történt a meghívó elküldésekor</string>
     <string name="display_name">Adjon meg egy nevet:</string>
-    <string name="error_saving_user_password">Hiba a felhasználó jelszavának mentésekor</string>
+    <string name="error_saving_user_password">Hiba történt a felhasználó jelszavának mentésekor</string>
     <string name="export_theme">Téma exportálása</string>
     <string name="enter_this_device_name">Adja meg ennek az eszköznek a nevét…</string>
     <string name="error">Hiba</string>
     <string name="alert_message_group_invitation_expired">A csoportmeghívó már nem érvényes, a küldője eltávolította.</string>
     <string name="group_full_name_field">A csoport teljes neve:</string>
     <string name="icon_descr_help">súgó</string>
-    <string name="enabled_self_destruct_passcode">Önmegsemmisítő jelkód engedélyezése</string>
+    <string name="enabled_self_destruct_passcode">Önmegsemmisítő-jelkód engedélyezése</string>
     <string name="settings_section_title_experimenta">KÍSÉRLETI</string>
-    <string name="error_aborting_address_change">Hiba a cím megváltoztatásának megszakításakor</string>
-    <string name="error_receiving_file">Hiba a fájl fogadásakor</string>
+    <string name="error_aborting_address_change">Hiba történt a cím módosításának megszakításakor</string>
+    <string name="error_receiving_file">Hiba történt a fájl fogadásakor</string>
     <string name="conn_event_ratchet_sync_ok">titkosítás rendben</string>
-    <string name="error_deleting_contact_request">Hiba a kapcsolatkérés törlésekor</string>
-    <string name="receipts_groups_title_enable">Kézbesítési jelentések engedélyezése a csoportok számára?</string>
-    <string name="fix_connection_not_supported_by_contact">Ismerős általi javítás nem támogatott</string>
+    <string name="error_deleting_contact_request">Hiba történt a meghívási kérés törlésekor</string>
+    <string name="receipts_groups_title_enable">Engedélyezi a kézbesítési jelentéseket a csoportok számára?</string>
+    <string name="fix_connection_not_supported_by_contact">Partner általi javítás nem támogatott</string>
     <string name="file_not_found">Fájl nem található</string>
     <string name="smp_server_test_disconnect">Kapcsolat bontása</string>
     <string name="group_members_can_add_message_reactions">A tagok reakciókat adhatnak hozzá az üzenetekhez.</string>
     <string name="export_database">Adatbázis exportálása</string>
     <string name="full_name__field">Teljes név:</string>
     <string name="v4_6_reduced_battery_usage">Tovább csökkentett akkumulátor-használat</string>
-    <string name="error_stopping_chat">Hiba a csevegés megállításakor</string>
+    <string name="error_stopping_chat">Hiba történt a csevegés megállításakor</string>
     <string name="snd_conn_event_ratchet_sync_ok">titkosítás rendben %s számára</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">A csoport törlésre kerül az összes tag számára - ez a művelet nem vonható vissza!</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">A csoport törölve lesz az összes tag számára – ez a művelet nem vonható vissza!</string>
     <string name="v5_2_fix_encryption_descr">Titkosítás javítása az adatmentések helyreállítása után.</string>
-    <string name="error_deleting_database">Hiba a csevegési adatbázis törlésekor</string>
+    <string name="error_deleting_database">Hiba történt a csevegési adatbázis törlésekor</string>
     <string name="simplex_link_mode_full">Teljes hivatkozás</string>
-    <string name="error_changing_address">Hiba a cím megváltoztatásakor</string>
+    <string name="error_changing_address">Hiba történt a cím módosításakor</string>
     <string name="group_members_can_send_voice">A tagok küldhetnek hangüzeneteket.</string>
     <string name="group_preferences">Csoportbeállítások</string>
     <string name="error_with_info">Hiba: %s</string>
     <string name="v4_4_disappearing_messages">Eltűnő üzenetek</string>
     <string name="auth_enable_simplex_lock">SimpleX-zár bekapcsolása</string>
-    <string name="error_synchronizing_connection">Hiba a kapcsolat szinkronizálásakor</string>
-    <string name="error_creating_address">Hiba a cím létrehozásakor</string>
+    <string name="error_synchronizing_connection">Hiba történt a kapcsolat szinkronizálásakor</string>
+    <string name="error_creating_address">Hiba történt a cím létrehozásakor</string>
     <string name="feature_enabled">engedélyezve</string>
-    <string name="error_loading_details">Hiba a részletek betöltésekor</string>
-    <string name="error_accepting_contact_request">Hiba történt a kapcsolatkérés elfogadásakor</string>
-    <string name="snd_conn_event_ratchet_sync_allowed">titkosítás újraegyeztetése engedélyezett %s számára</string>
-    <string name="conn_event_ratchet_sync_required">titkosítás-újraegyeztetés szükséges</string>
+    <string name="error_loading_details">Hiba történt a részletek betöltésekor</string>
+    <string name="error_accepting_contact_request">Hiba történt a meghívási kérés elfogadásakor</string>
+    <string name="snd_conn_event_ratchet_sync_allowed">a titkosítás újraegyeztetése engedélyezve van %s számára</string>
+    <string name="conn_event_ratchet_sync_required">a titkosítás újraegyeztetése szükséges</string>
     <string name="v4_6_hidden_chat_profiles">Rejtett csevegési profilok</string>
     <string name="files_and_media_section">Fájlok és médiatartalmak</string>
     <string name="image_saved">A kép elmentve a „Galériába”</string>
@@ -619,11 +618,11 @@
     <string name="la_immediately">Azonnal</string>
     <string name="files_and_media_prohibited">A fájlok- és a médiatartalmak küldése le van tiltva!</string>
     <string name="hide_profile">Profil elrejtése</string>
-    <string name="how_to_use_your_servers">Kiszolgálók használata</string>
+    <string name="how_to_use_your_servers">Hogyan használja a saját kiszolgálóit</string>
     <string name="v5_2_favourites_filter">Csevegési üzenetek gyorsabb megtalálása</string>
     <string name="import_theme">Téma importálása</string>
-    <string name="import_theme_error">Hiba a téma importálásakor</string>
-    <string name="notification_display_mode_hidden_desc">Ismerős nevének és az üzenet tartalmának elrejtése</string>
+    <string name="import_theme_error">Hiba történt a téma importálásakor</string>
+    <string name="notification_display_mode_hidden_desc">Partner nevének és az üzenet tartalmának elrejtése</string>
     <string name="incompatible_database_version">Nem kompatibilis adatbázis-verzió</string>
     <string name="how_simplex_works">Hogyan működik a SimpleX</string>
     <string name="desktop_incompatible_version">Nem kompatibilis verzió</string>
@@ -653,33 +652,33 @@
     <string name="import_database_confirmation">Importálás</string>
     <string name="icon_descr_instant_notifications">Azonnali értesítések</string>
     <string name="settings_section_title_incognito">Inkognitómód</string>
-    <string name="import_database_question">Csevegési adatbázis importálása?</string>
+    <string name="import_database_question">Importálja a csevegési adatbázist?</string>
     <string name="service_notifications_disabled">Az azonnali értesítések le vannak tiltva!</string>
     <string name="service_notifications">Azonnali értesítések!</string>
     <string name="image_descr">Kép</string>
     <string name="files_are_prohibited_in_group">A fájlok- és a médiatartalmak küldése le van tiltva.</string>
     <string name="how_it_works">Hogyan működik</string>
-    <string name="hide_dev_options">Elrejtés:</string>
-    <string name="error_creating_member_contact">Hiba az ismerőssel történő kapcsolat létrehozásában</string>
+    <string name="hide_dev_options">Elrejtve:</string>
+    <string name="error_creating_member_contact">Hiba történt a partnerrel történő kapcsolat létrehozásában</string>
     <string name="enter_one_ICE_server_per_line">ICE-kiszolgálók (soronként egy)</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Ha nem tud személyesen találkozni, <b>beolvashatja a QR-kódot a videohívásban</b>, vagy az ismerőse megoszthat egy meghívó-hivatkozást.]]></string>
-    <string name="if_you_enter_passcode_data_removed">Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen eltávolításra kerül!</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Ha nem tud személyesen találkozni, <b>beolvashatja a QR-kódot a videohívásban</b>, vagy a partnere megoszthat egy meghívási hivatkozást.]]></string>
+    <string name="if_you_enter_passcode_data_removed">Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen el lesz távolítva!</string>
     <string name="if_you_cant_meet_in_person">Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Ha nem tud személyesen találkozni, <b>mutassa meg a QR-kódot a videohívásban</b>, vagy ossza meg a hivatkozást.]]></string>
-    <string name="network_disable_socks_info">Megerősítés esetén az üzenetküldő-kiszolgálók látni fogják az IP-címét és a szolgáltatóját – azt, hogy mely kiszolgálókhoz kapcsolódik.</string>
+    <string name="network_disable_socks_info">Megerősítés esetén az üzenetváltó-kiszolgálók látni fogják az IP-címét és a szolgáltatóját – azt, hogy mely kiszolgálókhoz kapcsolódik.</string>
     <string name="image_will_be_received_when_contact_completes_uploading">A kép akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</string>
     <string name="desktop_scan_QR_code_from_app_via_scan_QR_code"><![CDATA[💻 számítógép: a megjelenített QR-kód beolvasása az alkalmazásból, a <b>QR-kód beolvasásával</b>.]]></string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">A kapott SimpleX Chat-meghívó-hivatkozását megnyithatja a böngészőjében:</string>
-    <string name="if_you_enter_self_destruct_code">Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">A kapott SimpleX Chat-meghívási hivatkozását megnyithatja a böngészőjében:</string>
+    <string name="if_you_enter_self_destruct_code">Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő-jelkódot:</string>
     <string name="found_desktop">Megtalált számítógép</string>
     <string name="desktop_devices">Számítógépek</string>
     <string name="how_to_use_markdown">A markdown használata</string>
     <string name="create_chat_profile">Csevegési profil létrehozása</string>
-    <string name="immune_to_spam_and_abuse">Levélszemét elleni védelem</string>
+    <string name="immune_to_spam_and_abuse">Védett a kéretlen tartalommal szemben</string>
     <string name="disconnect_remote_hosts">Hordozható eszközök leválasztása</string>
-    <string name="v4_5_multiple_chat_profiles_descr">Különböző nevek, profilképek és átvitel-izoláció.</string>
+    <string name="v4_5_multiple_chat_profiles_descr">Különböző nevek, profilképek és átvitelelkülönítés.</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Elutasítás esetén a feladó NEM kap értesítést.</string>
-    <string name="icon_descr_expand_role">Szerepkörválasztás bővítése</string>
+    <string name="icon_descr_expand_role">Szerepkörválasztó kibontása</string>
     <string name="image_will_be_received_when_contact_is_online">A kép akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</string>
     <string name="group_member_status_invited">meghíva</string>
     <string name="invalid_connection_link">Érvénytelen kapcsolattartási hivatkozás</string>
@@ -687,20 +686,20 @@
     <string name="no_details">nincsenek részletek</string>
     <string name="icon_descr_call_missed">Nem fogadott hívás</string>
     <string name="theme_light">Világos</string>
-    <string name="delete_message_cannot_be_undone_warning">Az üzenet törlésre kerül - ez a művelet nem vonható vissza!</string>
+    <string name="delete_message_cannot_be_undone_warning">Az üzenet törölve lesz – ez a művelet nem vonható vissza!</string>
     <string name="markdown_help">Markdown súgó</string>
     <string name="notification_preview_new_message">új üzenet</string>
     <string name="old_database_archive">Régi adatbázis-archívum</string>
     <string name="network_settings_title">Speciális beállítások</string>
     <string name="no_info_on_delivery">Nincs kézbesítési információ</string>
     <string name="moderated_description">moderált</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">A tag eltávolítása a csoportból - ez a művelet nem vonható vissza!</string>
-    <string name="ensure_xftp_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy az XFTP-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.</string>
-    <string name="no_contacts_selected">Nincs kiválasztva ismerős</string>
-    <string name="no_received_app_files">Nincsenek fogadott, vagy küldött fájlok</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">A tag el lesz távolítva a csoportból – ez a művelet nem vonható vissza!</string>
+    <string name="ensure_xftp_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy a megadott XFTP-kiszolgálók címei megfelelő formátumúak, soronként elkülönítettek, és nincsenek duplikálva.</string>
+    <string name="no_contacts_selected">Nincs partner kijelölve</string>
+    <string name="no_received_app_files">Nincsenek fogadott vagy küldött fájlok</string>
     <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 hordozható eszköz: koppintson a <b>Megnyitás hordozható eszköz-alkalmazásban</b>, majd koppintson a <b>Kapcsolódás</b> gombra az alkalmazásban.]]></string>
     <string name="markdown_in_messages">Markdown az üzenetekben</string>
-    <string name="group_invitation_item_description">meghívás a %1$s csoportba</string>
+    <string name="group_invitation_item_description">meghívás a(z) %1$s csoportba</string>
     <string name="lock_mode">Zárolási mód</string>
     <string name="new_mobile_device">Új hordozható eszköz</string>
     <string name="v5_2_fix_encryption">Kapcsolatok megtartása</string>
@@ -715,13 +714,13 @@
     <string name="v5_4_link_mobile_desktop">Társítsa össze a hordozható eszköz- és számítógépes alkalmazásokat! 🔗</string>
     <string name="conn_level_desc_indirect">közvetett (%1$s)</string>
     <string name="v4_6_reduced_battery_usage_descr">Hamarosan további fejlesztések érkeznek!</string>
-    <string name="message_reactions_prohibited_in_this_chat">Az üzenetreakciók küldése le van tiltva ebben a csevegésben.</string>
+    <string name="message_reactions_prohibited_in_this_chat">A reakciók hozzáadása az üzenetekhez le van tiltva ebben a csevegésben.</string>
     <string name="incorrect_code">Helytelen biztonsági kód!</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Ez akkor fordulhat elő, ha Ön vagy az ismerőse régi adatbázis biztonsági mentést használt.</string>
+    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Ez akkor fordulhat elő, ha Ön vagy a partnere egy régi adatbázis biztonsági mentését használta.</string>
     <string name="v5_3_new_desktop_app">Új számítógép-alkalmazás!</string>
     <string name="v4_6_group_moderation_descr">Most már az adminisztrátorok is:\n- törölhetik a tagok üzeneteit.\n- letilthatnak tagokat (megfigyelő szerepkör)</string>
     <string name="rcv_group_event_member_added">meghívta őt: %1$s</string>
-    <string name="message_reactions_are_prohibited">A reakciók küldése az üzenetekre le van tiltva.</string>
+    <string name="message_reactions_are_prohibited">A reakciók hozzáadása az üzenetekhez le van tiltva.</string>
     <string name="network_use_onion_hosts_no">Nem</string>
     <string name="item_info_no_text">nincs szöveg</string>
     <string name="member_info_section_title_member">TAG</string>
@@ -734,14 +733,14 @@
     <string name="thousand_abbreviation">k</string>
     <string name="chat_item_ttl_none">soha</string>
     <string name="new_desktop"><![CDATA[<i>(új)</i>]]></string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy az SMP-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.</string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy a megadott SMP-kiszolgálók címei megfelelő formátumúak, soronként elkülönítettek, és nincsenek duplikálva.</string>
     <string name="network_use_onion_hosts_no_desc">Az onion-kiszolgálók nem lesznek használva.</string>
     <string name="custom_time_unit_minutes">perc</string>
     <string name="learn_more">Tudjon meg többet</string>
-    <string name="notification_new_contact_request">Új kapcsolatkérés</string>
+    <string name="notification_new_contact_request">Új meghívási kérés</string>
     <string name="joining_group">Csatlakozás a csoporthoz</string>
     <string name="linked_desktop_options">Társított számítógép beállítások</string>
-    <string name="rcv_group_event_invited_via_your_group_link">meghíva az Ön csoporthivatkozásán keresztül</string>
+    <string name="rcv_group_event_invited_via_your_group_link">meghíva a saját csoporthivatkozásán keresztül</string>
     <string name="rcv_group_event_member_left">elhagyta a csoportot</string>
     <string name="linked_desktops">Társított számítógépek</string>
     <string name="la_no_app_password">Nincs alkalmazás jelkód</string>
@@ -758,7 +757,7 @@
     <string name="v5_2_disappear_one_message">Egy üzenet eltüntetése</string>
     <string name="v4_3_irreversible_message_deletion">Végleges üzenettörlés</string>
     <string name="videos_limit_desc">Egyszerre csak 10 videó küldhető el</string>
-    <string name="only_you_can_add_message_reactions">Csak Ön adhat hozzá üzenetreakciókat.</string>
+    <string name="only_you_can_add_message_reactions">Csak Ön adhat hozzá reakciókat az üzenetekhez.</string>
     <string name="group_member_status_left">elhagyta a csoportot</string>
     <string name="message_deletion_prohibited">Az üzenetek végleges törlése le van tiltva ebben a csevegésben.</string>
     <string name="v4_3_voice_messages_desc">Max 40 másodperc, azonnal fogadható.</string>
@@ -768,34 +767,34 @@
     <string name="system_restricted_background_in_call_title">Nincsenek háttérhívások</string>
     <string name="messages_section_title">Üzenetek</string>
     <string name="linked_mobiles">Társított hordozható eszköz</string>
-    <string name="incognito_info_allows">Lehetővé teszi, hogy egyetlen csevegőprofilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.</string>
+    <string name="incognito_info_allows">Lehetővé teszi, hogy egyetlen csevegési profilon belül több névtelen kapcsolat legyen, anélkül, hogy megosztott adatok lennének közöttük.</string>
     <string name="delete_message_mark_deleted_warning">Az üzenet törlésre lesz jelölve. A címzett(ek) képes(ek) lesz(nek) felfedni ezt az üzenetet.</string>
     <string name="leave_group_button">Elhagyás</string>
     <string name="ok">Rendben</string>
     <string name="no_filtered_chats">Nincsenek szűrt csevegések</string>
     <string name="invalid_data">érvénytelen adat</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.</string>
-    <string name="only_owners_can_enable_files_and_media">Csak a csoporttulajdonosok engedélyezhetik a fájlok- és a médiatartalmak küldését.</string>
-    <string name="loading_remote_file_title">A fájl betöltése</string>
-    <string name="no_contacts_to_add">Nincs hozzáadandó ismerős</string>
+    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy a megadott WebRTC ICE-kiszolgálók címei megfelelő formátumúak, soronként elkülönítettek, és nincsenek duplikálva.</string>
+    <string name="only_owners_can_enable_files_and_media">Csak a csoport tulajdonosai engedélyezhetik a fájlok- és a médiatartalmak küldését.</string>
+    <string name="loading_remote_file_title">Fájl betöltése…</string>
+    <string name="no_contacts_to_add">Nincs hozzáadandó partner</string>
     <string name="v4_5_message_draft">Üzenetvázlat</string>
-    <string name="display_name_invited_to_connect">meghívta, hogy csatlakozzon</string>
-    <string name="add_contact">Egyszer használható meghívó-hivatkozás</string>
+    <string name="display_name_invited_to_connect">Függőben lévő meghívó</string>
+    <string name="add_contact">Egyszer használható meghívó</string>
     <string name="notifications">Értesítések</string>
     <string name="images_limit_desc">Egyszerre csak 10 kép küldhető el</string>
-    <string name="feature_offered_item_with_param">ajánlott %s: %2s</string>
+    <string name="feature_offered_item_with_param">ajánlotta: %s, ekkor: %2s</string>
     <string name="not_compatible">Nem kompatibilis!</string>
     <string name="make_profile_private">Tegye priváttá a profilját!</string>
     <string name="message_delivery_error_title">Üzenetkézbesítési hiba</string>
-    <string name="v4_5_multiple_chat_profiles">Több csevegőprofil</string>
+    <string name="v4_5_multiple_chat_profiles">Több csevegési profil</string>
     <string name="marked_deleted_description">törlésre jelölve</string>
     <string name="user_mute">Némítás</string>
     <string name="link_a_mobile">Hordozható eszköz társítása</string>
     <string name="settings_notifications_mode_title">Értesítési szolgáltatás</string>
-    <string name="only_group_owners_can_enable_voice">Csak a csoporttulajdonosok engedélyezhetik a hangüzenetek küldését.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">A felhasználói profilok, névjegyek, csoportok és üzenetek csak az eszközön kerülnek tárolásra a kliensen belül.</string>
+    <string name="only_group_owners_can_enable_voice">Csak a csoport tulajdonosai engedélyezhetik a hangüzenetek küldését.</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">A felhasználói profilok, partnerek, csoportok és üzenetek csak az eszközön vannak tárolva a kliensen belül.</string>
     <string name="invalid_migration_confirmation">Érvénytelen átköltöztetési visszaigazolás</string>
-    <string name="only_group_owners_can_change_prefs">Csak a csoporttulajdonosok módosíthatják a csoportbeállításokat.</string>
+    <string name="only_group_owners_can_change_prefs">Csak a csoport tulajdonosai módosíthatják a csoportbeállításokat.</string>
     <string name="no_history">Nincsenek előzmények</string>
     <string name="invalid_QR_code">Érvénytelen QR-kód</string>
     <string name="mark_read">Megjelölés olvasottként</string>
@@ -803,44 +802,44 @@
     <string name="mark_unread">Megjelölés olvasatlanként</string>
     <string name="icon_descr_more_button">Továbbiak</string>
     <string name="auth_log_in_using_credential">Bejelentkezés hitelesítőadatokkal</string>
-    <string name="invalid_message_format">érvénytelen üzenet formátum</string>
+    <string name="invalid_message_format">érvénytelen üzenet-formátum</string>
     <string name="join_group_button">Csatlakozás</string>
     <string name="shutdown_alert_desc">Az értesítések az alkalmazás elindításáig nem fognak működni</string>
     <string name="chat_preferences_off">kikapcsolva</string>`
   <string name="this_device_version"><![CDATA[<i>(ez az eszköz: v%s)</i>]]></string>
-    <string name="feature_offered_item">ajánlott %s</string>
+    <string name="feature_offered_item">%s ajánlotta</string>
     <string name="button_leave_group">Csoport elhagyása</string>
-    <string name="unblock_member_desc">Az összes %s által írt üzenet megjelenik!</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">Ez akkor fordulhat elő, ha:\n1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.\n2. Az üzenet visszafejtése sikertelen volt, mert Ön, vagy az ismerőse régebbi adatbázis biztonsági mentést használt.\n3. A kapcsolat sérült.</string>
+    <string name="unblock_member_desc">%s összes üzenete meg fog jelenni!</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">Ez akkor fordulhat elő, ha:\n1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.\n2. Nem sikerült az üzenetet visszafejteni, mert Ön, vagy a partnere egy régi adatbázis biztonsági mentését használta.\n3. A kapcsolat sérült.</string>
     <string name="group_member_role_observer">megfigyelő</string>
     <string name="description_via_group_link_incognito">inkognitó a csoporthivatkozáson keresztül</string>
     <string name="network_use_onion_hosts_prefer_desc">Onion-kiszolgálók használata, ha azok rendelkezésre állnak.</string>
-    <string name="invite_friends">Ismerősök meghívása</string>
+    <string name="invite_friends">Barátok meghívása</string>
     <string name="color_surface">Menük és figyelmeztetések</string>
     <string name="icon_descr_add_members">Tagok meghívása</string>
     <string name="group_preview_join_as">csatlakozás mint %s</string>
-    <string name="no_selected_chat">Nincs kiválasztva csevegés</string>
+    <string name="no_selected_chat">Nincs csevegés kijelölve</string>
     <string name="users_delete_data_only">Csak helyi profiladatok</string>
-    <string name="description_via_one_time_link_incognito">inkognitó egy egyszer használható hivatkozáson keresztül</string>
-    <string name="share_text_moderated_at">Moderálva lett ekkor: %s</string>
-    <string name="one_time_link">Egyszer használható meghívó-hivatkozás</string>
+    <string name="description_via_one_time_link_incognito">inkognitó egy egyszer használható meghívón keresztül</string>
+    <string name="share_text_moderated_at">Moderálva: %s</string>
+    <string name="one_time_link">Egyszer használható meghívó</string>
     <string name="invalid_name">Érvénytelen név!</string>
     <string name="email_invite_subject">Beszélgessünk a SimpleX Chatben</string>
-    <string name="info_row_moderated_at">Moderálva ekkor:</string>
+    <string name="info_row_moderated_at">Moderálva</string>
     <string name="v4_4_live_messages">Élő üzenetek</string>
     <string name="mark_code_verified">Hitelesítés</string>
     <string name="v5_2_message_delivery_receipts">Üzenetkézbesítési jelentések!</string>
     <string name="image_descr_link_preview">hivatkozás előnézeti képe</string>
-    <string name="leave_group_question">Csoport elhagyása?</string>
+    <string name="leave_group_question">Elhagyja a csoportot?</string>
     <string name="chat_preferences_no">nem</string>
     <string name="v4_5_reduced_battery_usage_descr">Hamarosan további fejlesztések érkeznek!</string>
     <string name="feature_off">kikapcsolva</string>
     <string name="install_simplex_chat_for_terminal">SimpleX Chat telepítése a terminálhoz</string>
-    <string name="self_destruct_new_display_name">Új megjelenített név:</string>
+    <string name="self_destruct_new_display_name">Új megjelenítendő név:</string>
     <string name="new_passphrase">Új jelmondat…</string>
     <string name="callstatus_missed">nem fogadott hívás</string>
     <string name="database_migrations">Átköltöztetés: %s</string>
-    <string name="in_reply_to">Válaszul erre:</string>
+    <string name="in_reply_to">Válaszul erre</string>
     <string name="notification_preview_mode_message">Név és üzenet</string>
     <string name="notifications_will_be_hidden">Az értesítések csak az alkalmazás bezárásáig érkeznek!</string>
     <string name="info_menu">Információ</string>
@@ -850,7 +849,7 @@
     <string name="moderated_item_description">moderálva lett %s által</string>
     <string name="import_theme_error_desc">Győződjön meg arról, hogy a fájl helyes YAML-szintaxist tartalmaz. Exportálja a témát, hogy legyen egy példa a témafájl szerkezetére.</string>
     <string name="italic_text">dőlt</string>
-    <string name="non_content_uri_alert_title">Érvénytelen fájl elérési útvonal</string>
+    <string name="non_content_uri_alert_title">Érvénytelen a fájl elérési útvonala</string>
     <string name="connect_via_group_link">Csatlakozik a csoporthoz?</string>
     <string name="status_no_e2e_encryption">nincs e2e titkosítás</string>
     <string name="new_database_archive">Új adatbázis-archívum</string>
@@ -860,25 +859,25 @@
     <string name="incoming_audio_call">Bejövő hanghívás</string>
     <string name="keychain_error">Kulcstartóhiba</string>
     <string name="join_group_question">Csatlakozik a csoporthoz?</string>
-    <string name="incognito_info_protects">Az inkognitómód védi személyes adatait azáltal, hogy az összes ismerőséhez új, véletlenszerű profilt használ.</string>
+    <string name="incognito_info_protects">Az inkognitómód úgy védi a személyes adatait, hogy az összes partneréhez új, véletlenszerű profilt használ.</string>
     <string name="v5_2_more_things_descr">- stabilabb üzenetkézbesítés.\n- picit továbbfejlesztett csoportok.\n- és még sok más!</string>
     <string name="v5_1_message_reactions">Üzenetreakciók</string>
     <string name="no_connected_mobile">Nincs társított hordozható eszköz</string>
     <string name="network_status">Hálózat állapota</string>
     <string name="new_passcode">Új jelkód</string>
-    <string name="message_delivery_error_desc">Valószínűleg ez az ismerős törölte Önnel a kapcsolatot.</string>
+    <string name="message_delivery_error_desc">Valószínűleg ez a partner törölte Önnel a kapcsolatot.</string>
     <string name="join_group_incognito_button">Csatlakozás inkognitóban</string>
     <string name="open_chat">Csevegés megnyitása</string>
     <string name="callstatus_rejected">elutasított hívás</string>
-    <string name="onboarding_notifications_mode_periodic">Rendszeres</string>
+    <string name="onboarding_notifications_mode_periodic">Időszakos</string>
     <string name="feature_received_prohibited">fogadott, tiltott</string>
-    <string name="connect_plan_repeat_connection_request">Kapcsolatkérés megismétlése?</string>
-    <string name="only_you_can_delete_messages">Véglegesen csak Ön törölhet üzeneteket (ismerőse csak törlésre jelölheti őket ). (24 óra)</string>
+    <string name="connect_plan_repeat_connection_request">Megismétli a meghívási kérést?</string>
+    <string name="only_you_can_delete_messages">Véglegesen csak Ön törölhet üzeneteket (partnere csak törlésre jelölheti meg őket ). (24 óra)</string>
     <string name="role_in_group">Szerepkör</string>
-    <string name="simplex_link_contact">SimpleX-kapcsolattartási-cím</string>
+    <string name="simplex_link_contact">SimpleX kapcsolattartási cím</string>
     <string name="stop_file__confirm">Megállítás</string>
     <string name="smp_servers_preset_server">Előre beállított kiszolgáló</string>
-    <string name="add_contact_or_create_group">Új csevegés kezdése</string>
+    <string name="add_contact_or_create_group">Új csevegés indítása</string>
     <string name="opensource_protocol_and_code_anybody_can_run_servers">Bárki üzemeltethet kiszolgálókat.</string>
     <string name="rcv_group_event_open_chat">Megnyitás</string>
     <string name="network_option_protocol_timeout">Protokoll időtúllépése</string>
@@ -889,7 +888,7 @@
     <string name="description_via_group_link">a csoporthivatkozáson keresztül</string>
     <string name="network_option_ping_interval">Időtartam a PING-ek között</string>
     <string name="send_disappearing_message">Eltűnő üzenet küldése</string>
-    <string name="self_destruct_passcode">Önmegsemmisítési jelkód</string>
+    <string name="self_destruct_passcode">Önmegsemmisítő-jelkód</string>
     <string name="save_and_update_group_profile">Mentés és a csoportprofil frissítése</string>
     <string name="your_privacy">Adatvédelem</string>
     <string name="your_simplex_contact_address">Profil SimpleX-címe</string>
@@ -899,50 +898,50 @@
     <string name="only_you_can_send_voice">Csak Ön tud hangüzeneteket küldeni.</string>
     <string name="update_network_settings_confirmation">Frissítés</string>
     <string name="icon_descr_video_snd_complete">Videó elküldve</string>
-    <string name="update_database_passphrase">Adatbázis-jelmondat megváltoztatása</string>
+    <string name="update_database_passphrase">Az adatbázis jelmondatának módosítása</string>
     <string name="turn_off_system_restriction_button">Alkalmazás beállítások megnyitása</string>
-    <string name="passcode_not_changed">A jelkód nem változott!</string>
+    <string name="passcode_not_changed">A jelkód nem módosult!</string>
     <string name="refresh_qr_code">Frissítés</string>
-    <string name="custom_time_picker_select">Kiválasztás</string>
+    <string name="custom_time_picker_select">Kijelölés</string>
     <string name="only_you_can_make_calls">Csak Ön tud hívásokat indítani.</string>
-    <string name="smp_server_test_secure_queue">Biztonságos sorbaállítás</string>
+    <string name="smp_server_test_secure_queue">Biztonságos sorba állítás</string>
     <string name="rate_the_app">Értékelje az alkalmazást</string>
-    <string name="share_invitation_link">Egyszer használható meghívó-hivatkozás megosztása</string>
-    <string name="database_restore_error">Hiba az adatbázis visszaállításakor</string>
+    <string name="share_invitation_link">Egyszer használható meghívó megosztása</string>
+    <string name="database_restore_error">Hiba történt az adatbázis visszaállításakor</string>
     <string name="group_members_2">%s és %s</string>
     <string name="chat_preferences_you_allow">Ön engedélyezi</string>
     <string name="v4_5_reduced_battery_usage">Csökkentett akkumulátor-használat</string>
-    <string name="save_and_notify_contacts">Mentés és az ismerősök értesítése</string>
+    <string name="save_and_notify_contacts">Mentés és a partnerek értesítése</string>
     <string name="group_welcome_preview">Előnézet</string>
-    <string name="use_chat">Csevegés használata</string>
+    <string name="use_chat">SimpleX Chat használata</string>
     <string name="share_verb">Megosztás</string>
     <string name="received_message">Fogadott üzenet</string>
     <string name="button_welcome_message">Üdvözlőüzenet</string>
     <string name="rcv_group_event_n_members_connected">%s, %s és további %d tag kapcsolódott</string>
-    <string name="only_your_contact_can_make_calls">Csak az ismerőse tud hívást indítani.</string>
+    <string name="only_your_contact_can_make_calls">Csak a partnere tud hívást indítani.</string>
     <string name="settings_section_title_themes">TÉMÁK</string>
     <string name="videos_limit_title">Túl sok videó!</string>
     <string name="welcome">Üdvözöljük!</string>
-    <string name="v5_1_self_destruct_passcode">Önmegsemmisítési jelkód</string>
+    <string name="v5_1_self_destruct_passcode">Önmegsemmisítő-jelkód</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(beolvasás, vagy beillesztés a vágólapról)</string>
     <string name="waiting_for_video">Várakozás a videóra</string>
     <string name="reply_verb">Válasz</string>
-    <string name="connect_plan_this_is_your_own_one_time_link">Ez az Ön egyszer használható meghívó-hivatkozása!</string>
+    <string name="connect_plan_this_is_your_own_one_time_link">Ez a saját egyszer használható meghívója!</string>
     <string name="ntf_channel_calls">SimpleX Chat hívások</string>
     <string name="connect_use_new_incognito_profile">Új inkognitóprofil használata</string>
     <string name="contact_developers">Frissítse az alkalmazást, és lépjen kapcsolatba a fejlesztőkkel.</string>
     <string name="theme_simplex">SimpleX</string>
     <string name="send_link_previews">Hivatkozás előnézete</string>
-    <string name="rcv_conn_event_verification_code_reset">a biztonsági kód megváltozott</string>
-    <string name="notification_preview_mode_contact_desc">Csak az ismerős nevének megjelenítése</string>
+    <string name="rcv_conn_event_verification_code_reset">a biztonsági kód módosult</string>
+    <string name="notification_preview_mode_contact_desc">Csak a partner nevének megjelenítése</string>
     <string name="icon_descr_speaker_on">Hangszóró bekapcsolva</string>
     <string name="restart_the_app_to_use_imported_chat_database">Importált csevegési adatbázis használatához indítsa újra az alkalmazást.</string>
     <string name="icon_descr_sent_msg_status_unauthorized_send">jogosulatlan küldés</string>
-    <string name="only_your_contact_can_send_voice">Csak az ismerőse tud hangüzeneteket küldeni.</string>
+    <string name="only_your_contact_can_send_voice">Csak a partnere tud hangüzeneteket küldeni.</string>
     <string name="icon_descr_settings">Beállítások</string>
-    <string name="scan_qr_to_connect_to_contact">A kapcsolódáshoz az ismerőse beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</string>
+    <string name="scan_qr_to_connect_to_contact">A kapcsolódáshoz a partnere beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</string>
     <string name="callstate_received_confirmation">visszaigazolás fogadása…</string>
-    <string name="scan_code_from_contacts_app">Biztonsági kód beolvasása az ismerősének alkalmazásából.</string>
+    <string name="scan_code_from_contacts_app">Biztonsági kód beolvasása a partnere alkalmazásából.</string>
     <string name="observer_cant_send_message_desc">Lépjen kapcsolatba a csoport adminisztrátorával.</string>
     <string name="icon_descr_video_on">Videó bekapcsolva</string>
     <string name="display_name__field">Profilnév:</string>
@@ -951,25 +950,25 @@
     <string name="star_on_github">Csillagozás a GitHubon</string>
     <string name="remove_member_confirmation">Eltávolítás</string>
     <string name="search_verb">Keresés</string>
-    <string name="sync_connection_force_question">Titkosítás újraegyeztetése?</string>
-    <string name="self_destruct_passcode_enabled">Az önmegsemmisítési jelkód engedélyezve!</string>
+    <string name="sync_connection_force_question">Újraegyezteti a titkosítást?</string>
+    <string name="self_destruct_passcode_enabled">Az önmegsemmisítő-jelkód engedélyezve!</string>
     <string name="v4_2_security_assessment">Biztonsági kiértékelés</string>
     <string name="color_title">Cím</string>
     <string name="icon_descr_send_message">Üzenet elküldése</string>
     <string name="restore_database">Adatbázismentés visszaállítása</string>
     <string name="revoke_file__confirm">Visszavonás</string>
-    <string name="ask_your_contact_to_enable_voice">Kérje meg az ismerősét, hogy engedélyezze a hangüzenetek küldését.</string>
-    <string name="description_you_shared_one_time_link">Ön egy egyszer használható meghívó-hivatkozást osztott meg</string>
+    <string name="ask_your_contact_to_enable_voice">Kérje meg a partnerét, hogy engedélyezze a hangüzenetek küldését.</string>
+    <string name="description_you_shared_one_time_link">Ön egy egyszer használható meghívót osztott meg</string>
     <string name="simplex_link_mode_browser_warning">A hivatkozás megnyitása a böngészőben gyengítheti az adatvédelmet és a biztonságot. A megbízhatatlan SimpleX-hivatkozások pirossal vannak kiemelve.</string>
     <string name="your_ice_servers">Saját ICE-kiszolgálók</string>
     <string name="you_accepted_connection">Kapcsolat létrehozása</string>
     <string name="reject_contact_button">Elutasítás</string>
-    <string name="notification_preview_mode_message_desc">Ismerős nevének és az üzenet tartalmának megjelenítése</string>
+    <string name="notification_preview_mode_message_desc">Partner nevének és az üzenet tartalmának megjelenítése</string>
     <string name="settings_section_title_settings">BEÁLLÍTÁSOK</string>
     <string name="save_profile_password">Profiljelszó mentése</string>
-    <string name="stop_snd_file__title">Fájlküldés megállítása?</string>
-    <string name="unlink_desktop_question">Számítógép leválasztása?</string>
-    <string name="voice_messages_prohibited">A hangüzenetek le vannak tilva!</string>
+    <string name="stop_snd_file__title">Megállítja a fájlküldést?</string>
+    <string name="unlink_desktop_question">Leválasztja a számítógépet?</string>
+    <string name="voice_messages_prohibited">A hangüzenetek le vannak tiltva!</string>
     <string name="compose_send_direct_message_to_connect">Közvetlen üzenet küldése a kapcsolódáshoz</string>
     <string name="network_option_ping_count">PING-ek száma</string>
     <string name="show_developer_options">Fejlesztői beállítások megjelenítése</string>
@@ -980,7 +979,7 @@
     <string name="current_version_timestamp">%s (jelenlegi)</string>
     <string name="smp_servers_your_server">Saját SMP-kiszolgáló</string>
     <string name="random_port">Véletlen</string>
-    <string name="share_with_contacts">Megosztás az ismerősökkel</string>
+    <string name="share_with_contacts">Megosztás a partnerekkel</string>
     <string name="sender_you_pronoun">Ön</string>
     <string name="you_have_no_chats">Nincsenek csevegései</string>
     <string name="send_disappearing_message_send">Küldés</string>
@@ -988,23 +987,23 @@
     <string name="recipient_colon_delivery_status">%s: %s</string>
     <string name="system_restricted_background_desc">A SimpleX nem tud a háttérben futni. Csak akkor fog értesítéseket kapni, amikor az alkalmazás meg van nyitva.</string>
     <string name="images_limit_title">Túl sok kép!</string>
-    <string name="group_members_n">%s, %s és %d tag</string>
+    <string name="group_members_n">%s, %s és további %d tag</string>
     <string name="auth_stop_chat">Csevegési szolgáltatás megállítása</string>
     <string name="simplex_link_mode">SimpleX-hivatkozások</string>
-    <string name="v4_4_disappearing_messages_desc">Az elküldött üzenetek törlésre kerülnek a beállított idő után.</string>
+    <string name="v4_4_disappearing_messages_desc">Az elküldött üzenetek törölve lesznek a beállított idő után.</string>
     <string name="user_unmute">Némítás megszüntetése</string>
-    <string name="share_text_sent_at">Elküldve ekkor: %s</string>
+    <string name="share_text_sent_at">Elküldve: %s</string>
     <string name="connect_use_current_profile">Jelenlegi profil használata</string>
     <string name="this_device">Ez az eszköz</string>
-    <string name="share_address_with_contacts_question">Megosztja a címet az ismerőseivel?</string>
+    <string name="share_address_with_contacts_question">Megosztja a címet a partnereivel?</string>
     <string name="profile_password">Profiljelszó</string>
     <string name="theme">Téma</string>
-    <string name="remove_passphrase_from_settings">Jelmondat eltávolítása a beállításokból?</string>
+    <string name="remove_passphrase_from_settings">Eltávolítja a jelmondatot a beállításokból?</string>
     <string name="simplex_link_group">SimpleX-csoporthivatkozás</string>
     <string name="icon_descr_waiting_for_image">Várakozás a képre</string>
     <string name="self_destruct">Önmegsemmisítés</string>
     <string name="callstate_waiting_for_answer">várakozás a válaszra…</string>
-    <string name="text_field_set_contact_placeholder">Ismerős nevének beállítása…</string>
+    <string name="text_field_set_contact_placeholder">Partner nevének beállítása…</string>
     <string name="unblock_member_button">Tag feloldása</string>
     <string name="scan_QR_code">QR-kód beolvasása</string>
     <string name="smp_servers_test_server">Kiszolgáló tesztelése</string>
@@ -1015,41 +1014,41 @@
     <string name="la_mode_system">Rendszer</string>
     <string name="submit_passcode">Elküldés</string>
     <string name="security_code">Biztonsági kód</string>
-    <string name="enter_correct_current_passphrase">Adja meg a helyes, jelenlegi jelmondatát.</string>
+    <string name="enter_correct_current_passphrase">Adja meg a helyes, jelenlegi jelmondatot.</string>
     <string name="prohibit_message_deletion">Az elküldött üzenetek végleges törlése le van tiltva.</string>
-    <string name="prohibit_message_reactions">Az üzenetreakciók küldése le van tiltva.</string>
+    <string name="prohibit_message_reactions">A reakciók hozzáadása az üzenethez le van tiltva.</string>
     <string name="use_random_passphrase">Véletlenszerű jelmondat használata</string>
     <string name="call_connection_peer_to_peer">egyenrangú</string>
     <string name="run_chat_section">CSEVEGÉSI SZOLGÁLTATÁS INDÍTÁSA</string>
     <string name="paste_the_link_you_received">Kapott hivatkozás beillesztése</string>
-    <string name="smp_save_servers_question">Kiszolgálók mentése?</string>
+    <string name="smp_save_servers_question">Menti a kiszolgálókat?</string>
     <string name="v4_2_security_assessment_desc">A SimpleX Chat biztonsága a Trail of Bits által lett auditálva.</string>
     <string name="rcv_group_event_updated_group_profile">frissítette a csoport profilját</string>
     <string name="settings_section_title_support">SIMPLEX CHAT TÁMOGATÁSA</string>
     <string name="simplex_service_notification_title">SimpleX Chat szolgáltatás</string>
-    <string name="observer_cant_send_message_title">Nem lehet üzeneteket küldeni!</string>
+    <string name="observer_cant_send_message_title">Ön megfigyelő</string>
     <string name="is_verified">%s hitelesítve</string>
-    <string name="password_to_show">Jelszó megjelenítése</string>
+    <string name="password_to_show">Jelszó a megjelenítéshez</string>
     <string name="privacy_and_security">Adatvédelem és biztonság</string>
     <string name="button_remove_member">Eltávolítás</string>
     <string name="passcode_set">A jelkód beállítva!</string>
     <string name="sent_message">Elküldött üzenet</string>
-    <string name="select_contacts">Ismerősök kiválasztása</string>
+    <string name="select_contacts">Partnerek kijelölése</string>
     <string name="unknown_message_format">ismeretlen üzenetformátum</string>
     <string name="smp_servers_save">Kiszolgálók mentése</string>
     <string name="group_welcome_title">Üdvözlőüzenet</string>
     <string name="network_option_seconds_label">mp</string>
-    <string name="profile_update_will_be_sent_to_contacts">A profilfrissítés elküldésre került az ismerősök számára.</string>
+    <string name="profile_update_will_be_sent_to_contacts">A profilfrissítés el lesz küldve a partnerei számára.</string>
     <string name="v5_3_simpler_incognito_mode">Egyszerűsített inkognitómód</string>
-    <string name="save_welcome_message_question">Üdvözlőüzenet mentése?</string>
+    <string name="save_welcome_message_question">Menti az üdvözlőüzenetet?</string>
     <string name="restart_the_app_to_create_a_new_chat_profile">Új csevegési fiók létrehozásához indítsa újra az alkalmazást.</string>
     <string name="toast_permission_denied">Engedély megtagadva!</string>
-    <string name="icon_descr_call_pending_sent">Főggőben lévő hívás</string>
+    <string name="icon_descr_call_pending_sent">Függőben lévő hívás</string>
     <string name="opening_database">Adatbázis megnyitása…</string>
-    <string name="shutdown_alert_question">Leállítás?</string>
+    <string name="shutdown_alert_question">Leállítja az alkalmazást?</string>
     <string name="enter_passphrase_notification_title">Jelmondat szükséges</string>
     <string name="onboarding_notifications_mode_title">Privát értesítések</string>
-    <string name="you_invited_a_contact">Meghívta egy ismerősét</string>
+    <string name="you_invited_a_contact">Ön meghívta egy partnerét</string>
     <string name="is_not_verified">%s nincs hitelesítve</string>
     <string name="contact_tap_to_connect">Koppintson ide a kapcsolódáshoz</string>
     <string name="this_device_name">Ennek az eszköznek a neve</string>
@@ -1062,7 +1061,7 @@
     <string name="setup_database_passphrase">Adatbázis-jelmondat beállítása</string>
     <string name="color_sent_message">Üzenetbuborék színe</string>
     <string name="notifications_mode_periodic">Időszakosan indul</string>
-    <string name="connect_plan_this_is_your_own_simplex_address">Ez az Ön SimpleX-címe!</string>
+    <string name="connect_plan_this_is_your_own_simplex_address">Ez a saját SimpleX-címe!</string>
     <string name="group_member_status_removed">eltávolítva</string>
     <string name="share_link">Megosztás</string>
     <string name="icon_descr_simplex_team">SimpleX csapat</string>
@@ -1071,61 +1070,61 @@
     <string name="group_member_role_owner">tulajdonos</string>
     <string name="la_notice_turn_on">Bekapcsolás</string>
     <string name="rcv_group_event_3_members_connected">%s, %s és %s kapcsolódott</string>
-    <string name="simplex_link_invitation">Egyszer használható SimpleX-meghívó-hivatkozás</string>
+    <string name="simplex_link_invitation">Egyszer használható SimpleX-meghívó</string>
     <string name="your_calls">Hívások</string>
     <string name="icon_descr_sent_msg_status_send_failed">nem sikerült elküldeni</string>
     <string name="theme_colors_section_title">KEZELŐFELÜLET SZÍNEI</string>
-    <string name="restore_database_alert_desc">Előző jelszó megadása az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.</string>
-    <string name="color_secondary">Másodlagos</string>
-    <string name="settings_section_title_socks">SOCKS PROXY</string>
+    <string name="restore_database_alert_desc">Adja meg a korábbi jelszót az adatbázis biztonsági mentésének visszaállítása után. Ez a művelet nem vonható vissza.</string>
+    <string name="color_secondary">Másodlagos szín</string>
+    <string name="settings_section_title_socks">SOCKS-PROXY</string>
     <string name="save_servers_button">Mentés</string>
     <string name="settings_restart_app">Újraindítás</string>
     <string name="smp_servers">SMP-kiszolgálók</string>
     <string name="video_descr">Videó</string>
     <string name="save_auto_accept_settings">Automatikus elfogadási beállítások mentése</string>
-    <string name="sync_connection_force_confirm">Újraegyzetetés</string>
+    <string name="sync_connection_force_confirm">Újraegyeztetés</string>
     <string name="icon_descr_waiting_for_video">Várakozás a videóra</string>
     <string name="your_XFTP_servers">Saját XFTP-kiszolgálók</string>
     <string name="icon_descr_video_off">Videó kikapcsolva</string>
     <string name="v4_5_private_filenames">Privát fájlnevek</string>
-    <string name="save_settings_question">Beállítások mentése?</string>
+    <string name="save_settings_question">Menti a beállításokat?</string>
     <string name="la_mode_passcode">Jelkód</string>
     <string name="unknown_error">Ismeretlen hiba</string>
     <string name="smp_servers_your_server_address">Saját SMP-kiszolgálójának címe</string>
-    <string name="auth_open_chat_console">Csevegés konzol megnyitása</string>
+    <string name="auth_open_chat_console">Csevegési konzol megnyitása</string>
     <string name="remove_member_button">Eltávolítás</string>
     <string name="set_database_passphrase">Adatbázis-jelmondat beállítása</string>
     <string name="view_security_code">Biztonsági kód megtekintése</string>
-    <string name="unblock_member_question">Tag feloldása?</string>
-    <string name="sender_may_have_deleted_the_connection_request">A küldő törölhette a kapcsolatkérést.</string>
-    <string name="wrong_passphrase">Hibás adatbázis-jelmondat</string>
+    <string name="unblock_member_question">Feloldja a tag letiltását?</string>
+    <string name="sender_may_have_deleted_the_connection_request">A küldője törölhette a meghívási kérést.</string>
+    <string name="wrong_passphrase">Érvénytelen adatbázis-jelmondat</string>
     <string name="your_SMP_servers">Saját SMP-kiszolgálók</string>
     <string name="send_receipts_disabled_alert_title">A kézbesítési jelentések le vannak tiltva</string>
     <string name="open_database_folder">Adatbázismappa megnyitása</string>
-    <string name="description_via_one_time_link">egyszer használható meghívó-hivatkozáson keresztül</string>
+    <string name="description_via_one_time_link">egy egyszer használható meghívón keresztül</string>
     <string name="set_group_preferences">Csoportbeállítások megadása</string>
-    <string name="simplex_link_connection">ezen keresztül: %1$s</string>
+    <string name="simplex_link_connection">a következőn keresztül: %1$s</string>
     <string name="chat_preferences_yes">igen</string>
     <string name="voice_message">Hangüzenet</string>
     <string name="settings_section_title_use_from_desktop">Társítás számítógéppel</string>
     <string name="settings_section_title_you">PROFIL</string>
-    <string name="network_proxy_port">port %d</string>
+    <string name="network_proxy_port">%d-s port</string>
     <string name="to_connect_via_link_title">Kapcsolódás egy hivatkozáson keresztül</string>
     <string name="share_address">Cím megosztása</string>
     <string name="smp_servers_scan_qr">A kiszolgáló QR-kódjának beolvasása</string>
     <string name="stop_chat_confirmation">Megállítás</string>
-    <string name="stop_sharing_address">Címmegosztás megállítása?</string>
-    <string name="auth_open_chat_profiles">Csevegési profilok megváltoztatása</string>
-    <string name="connect_plan_repeat_join_request">Csatlakozáskérés megismétlése?</string>
+    <string name="stop_sharing_address">Megállítja a címmegosztást?</string>
+    <string name="auth_open_chat_profiles">Csevegési profilok módosítása</string>
+    <string name="connect_plan_repeat_join_request">Megismétli a meghívási kérést?</string>
     <string name="waiting_for_image">Várakozás a képre</string>
     <string name="v4_3_voice_messages">Hangüzenetek</string>
-    <string name="button_remove_member_question">Biztosan eltávolítja?</string>
+    <string name="button_remove_member_question">Eltávolítja a tagot?</string>
     <string name="verify_security_code">Biztonsági kód hitelesítése</string>
     <string name="rcv_group_event_user_deleted">eltávolította Önt</string>
     <string name="simplex_address">SimpleX-cím</string>
-    <string name="show_dev_options">Megjelenítés:</string>
+    <string name="show_dev_options">Megjelenítve:</string>
     <string name="callstate_received_answer">válasz fogadása…</string>
-    <string name="restore_database_alert_title">Adatbázismentés visszaállítása?</string>
+    <string name="restore_database_alert_title">Visszaállítja az adatbázismentést?</string>
     <string name="simplex_service_notification_text">Üzenetek fogadása…</string>
     <string name="rcv_group_event_2_members_connected">%s és %s kapcsolódott</string>
     <string name="you_are_observer">Ön megfigyelő</string>
@@ -1133,34 +1132,34 @@
     <string name="set_passcode">Jelkód beállítása</string>
     <string name="whats_new">Újdonságok</string>
     <string name="connect_plan_open_group">Csoport megnyitása</string>
-    <string name="info_row_sent_at">Elküldve ekkor:</string>
+    <string name="info_row_sent_at">Elküldve</string>
     <string name="prohibit_sending_voice">A hangüzenetek küldése le van tiltva.</string>
-    <string name="privacy_show_last_messages">Szobák utolsó üzeneteinek megjelenítése a listanézetben</string>
+    <string name="privacy_show_last_messages">Legutóbbi üzenet előnézetének megjelenítése</string>
     <string name="smp_servers_preset_address">Az előre beállított kiszolgáló címe</string>
-    <string name="periodic_notifications_disabled">Rendszeres értesítések letiltva!</string>
-    <string name="passcode_changed">A jelkód megváltozott!</string>
+    <string name="periodic_notifications_disabled">Időszakos értesítések letiltva!</string>
+    <string name="passcode_changed">A jelkód módosult!</string>
     <string name="notifications_mode_off">Akkor fut, amikor az alkalmazás meg van nyitva</string>
     <string name="this_QR_code_is_not_a_link">Ez a QR-kód nem egy hivatkozás!</string>
     <string name="waiting_for_file">Várakozás a fájlra</string>
     <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
     <string name="unlink_desktop">Szétkapcsolás</string>
     <string name="incognito_random_profile">Véletlenszerű profil</string>
-    <string name="wrong_passphrase_title">Hibás jelmondat!</string>
-    <string name="prohibit_message_reactions_group">Az üzenetreakciók küldése le van tiltva.</string>
+    <string name="wrong_passphrase_title">Érvénytelen jelmondat!</string>
+    <string name="prohibit_message_reactions_group">A reakciók hozzáadása az üzenetekhez le van tiltva.</string>
     <string name="language_system">Rendszer</string>
     <string name="icon_descr_received_msg_status_unread">olvasatlan</string>
     <string name="icon_descr_server_status_pending">Függőben</string>
     <string name="personal_welcome">Üdvözöljük %1$s!</string>
-    <string name="remove_passphrase_from_keychain">Jelmondat eltávolítása a Keystrore-ból?</string>
+    <string name="remove_passphrase_from_keychain">Eltávolítja a jelmondatot a Keystrore-ból?</string>
     <string name="auth_unlock">Feloldás</string>
     <string name="prohibit_sending_disappearing_messages">Az eltűnő üzenetek küldése le van tiltva.</string>
     <string name="gallery_video_button">Videó</string>
     <string name="update_database">Frissítés</string>
     <string name="open_verb">Megnyitás</string>
-    <string name="periodic_notifications">Rendszeres értesítések</string>
+    <string name="periodic_notifications">Időszakos értesítések</string>
     <string name="alert_title_skipped_messages">Kihagyott üzenetek</string>
     <string name="prohibit_sending_voice_messages">A hangüzenetek küldése le van tiltva.</string>
-    <string name="set_contact_name">Ismerős nevének beállítása</string>
+    <string name="set_contact_name">Partner nevének beállítása</string>
     <string name="only_you_can_send_disappearing">Csak Ön tud eltűnő üzeneteket küldeni.</string>
     <string name="share_image">Médiatartalom megosztása…</string>
     <string name="group_info_member_you">Ön: %1$s</string>
@@ -1168,15 +1167,15 @@
     <string name="reset_color">Színek visszaállítása</string>
     <string name="network_options_save">Mentés</string>
     <string name="switch_verb">Váltás</string>
-    <string name="paste_the_link_you_received_to_connect_with_your_contact">A kapott hivatkozás beillesztése az ismerőshöz való kapcsolódáshoz…</string>
+    <string name="paste_the_link_you_received_to_connect_with_your_contact">A kapott hivatkozás beillesztése a partnerhez való kapcsolódáshoz…</string>
     <string name="scan_code">Beolvasás</string>
-    <string name="open_port_in_firewall_title">Port megnyitása a tűzfalon</string>
+    <string name="open_port_in_firewall_title">Port nyitása a tűzfalban</string>
     <string name="callstate_starting">indítás…</string>
     <string name="settings_shutdown">Leállítás</string>
     <string name="icon_descr_sent_msg_status_sent">elküldve</string>
-    <string name="network_socks_toggle_use_socks_proxy">SOCKS proxy használata</string>
+    <string name="network_socks_toggle_use_socks_proxy">SOCKS-proxy használata</string>
     <string name="send_live_message">Élő üzenet küldése</string>
-    <string name="privacy_redefined">Adatvédelem újraértelmezve</string>
+    <string name="privacy_redefined">Újraértelmezett adatvédelem</string>
     <string name="voice_message_send_text">Hangüzenet…</string>
     <string name="protect_app_screen">Alkalmazás képernyőjének védelme</string>
     <string name="show_QR_code">QR-kód megjelenítése</string>
@@ -1185,13 +1184,13 @@
     <string name="send_receipts">Kézbesítési jelentések küldése</string>
     <string name="icon_descr_address">SimpleX-cím</string>
     <string name="chat_help_tap_button">Koppintson a</string>
-    <string name="save_and_notify_contact">Mentés és az ismerős értesítése</string>
+    <string name="save_and_notify_contact">Mentés és a partner értesítése</string>
     <string name="icon_descr_call_rejected">Elutasított hívás</string>
-    <string name="network_socks_proxy_settings">SOCKS proxy beállítások</string>
+    <string name="network_socks_proxy_settings">SOCKS-proxybeállítások</string>
     <string name="image_descr_qr_code">QR-kód</string>
     <string name="renegotiate_encryption">Titkosítás újraegyeztetése</string>
     <string name="remove_passphrase">Eltávolítás</string>
-    <string name="network_use_onion_hosts">Onion kiszolgálók használata</string>
+    <string name="network_use_onion_hosts">Onion-kiszolgálók használata</string>
     <string name="reveal_verb">Felfedés</string>
     <string name="la_lock_mode">Zárolási mód</string>
     <string name="revoke_file__action">Fájl visszavonása</string>
@@ -1199,41 +1198,41 @@
     <string name="prohibit_sending_files">A fájlok- és a médiatartalmak küldése le van tiltva.</string>
     <string name="share_file">Fájl megosztása…</string>
     <string name="save_verb">Mentés</string>
-    <string name="call_connection_via_relay">közvetítő-kiszolgálón keresztül</string>
+    <string name="call_connection_via_relay">egy továbbítókiszolgálón keresztül</string>
     <string name="stop_sharing">Megosztás megállítása</string>
     <string name="snd_group_event_member_deleted">Ön eltávolította őt: %1$s</string>
     <string name="save_passphrase_and_open_chat">Jelmondat mentése és a csevegés megnyitása</string>
-    <string name="save_preferences_question">Beállítások mentése?</string>
-    <string name="first_platform_without_user_ids">Nincsenek felhasználó-azonosítók.</string>
+    <string name="save_preferences_question">Menti a beállításokat?</string>
+    <string name="first_platform_without_user_ids">Nincsenek felhasználói azonosítók.</string>
     <string name="prohibit_direct_messages">A közvetlen üzenetek küldése a tagok között le van tiltva.</string>
-    <string name="network_enable_socks">SOCKS proxy használata?</string>
+    <string name="network_enable_socks">SOCKS-proxy használata?</string>
     <string name="icon_descr_speaker_off">Hangszóró kikapcsolva</string>
     <string name="custom_time_unit_weeks">hét</string>
     <string name="show_call_on_lock_screen">Megjelenítés</string>
     <string name="webrtc_ice_servers">WebRTC ICE-kiszolgálók</string>
-    <string name="revoke_file__title">Fájl visszavonása?</string>
+    <string name="revoke_file__title">Visszavonja a fájlt?</string>
     <string name="button_send_direct_message">Közvetlen üzenet küldése</string>
     <string name="reject">Elutasítás</string>
     <string name="send_verb">Küldés</string>
-    <string name="la_lock_mode_system">Rendszerhitelesítés</string>
+    <string name="la_lock_mode_system">Rendszer-hitelesítés</string>
     <string name="simplex_link_mode_browser">Böngészőn keresztül</string>
     <string name="v4_6_hidden_chat_profiles_descr">Védje meg a csevegési profiljait egy jelszóval!</string>
-    <string name="only_your_contact_can_send_disappearing">Csak az ismerőse tud eltűnő üzeneteket küldeni.</string>
+    <string name="only_your_contact_can_send_disappearing">Csak a partnere tud eltűnő üzeneteket küldeni.</string>
     <string name="your_ICE_servers">Saját ICE-kiszolgálók</string>
-    <string name="scan_qr_code_from_desktop">QR-kód beolvasása számítógépről</string>
+    <string name="scan_qr_code_from_desktop">QR-kód beolvasása a számítógépről</string>
     <string name="image_descr_simplex_logo">SimpleX logó</string>
     <string name="unblock_member_confirmation">Feloldás</string>
     <string name="unmute_chat">Némítás megszüntetése</string>
     <string name="open_simplex_chat_to_accept_call">SimpleX Chat megnyitása a hívás fogadásához</string>
-    <string name="stop_rcv_file__title">Fájlfogadás megállítása?</string>
-    <string name="v5_4_more_things_descr">- értesíti az ismerősöket a törlésről (nem kötelező)\n- profil nevek szóközökkel\n- és még sok más!</string>
+    <string name="stop_rcv_file__title">Megállítja a fájlfogadást?</string>
+    <string name="v5_4_more_things_descr">- partnerek értesítése a törlésről (nem kötelező)\n- profilnevek szóközökkel\n- és még sok más!</string>
     <string name="v5_0_polish_interface">Lengyel kezelőfelület</string>
     <string name="smp_servers_use_server">Kiszolgáló használata</string>
-    <string name="share_text_received_at">Fogadva ekkor: %s</string>
+    <string name="share_text_received_at">Fogadva: %s</string>
     <string name="la_notice_title_simplex_lock">SimpleX-zár</string>
     <string name="save_and_notify_group_members">Mentés és a csoporttagok értesítése</string>
     <string name="reset_verb">Visszaállítás</string>
-    <string name="only_your_contact_can_add_message_reactions">Csak az ismerőse tud üzenetreakciókat küldeni.</string>
+    <string name="only_your_contact_can_add_message_reactions">Csak a partnere adhat hozzá reakciókat az üzenetekhez.</string>
     <string name="voice_messages">Hangüzenetek</string>
     <string name="snd_group_event_user_left">Ön elhagyta a csoportot</string>
     <string name="icon_descr_record_voice_message">Hangüzenet rögzítése</string>
@@ -1252,259 +1251,259 @@
     <string name="verify_connection">Kapcsolat hitelesítése</string>
     <string name="whats_new_read_more">Tudjon meg többet</string>
     <string name="sender_cancelled_file_transfer">A fájl küldője visszavonta az átvitelt.</string>
-    <string name="stop_chat_question">Csevegési szolgáltatás megállítása?</string>
-    <string name="info_row_received_at">Fogadva ekkor:</string>
+    <string name="stop_chat_question">Megállítja a csevegést?</string>
+    <string name="info_row_received_at">Fogadva</string>
     <string name="accept_feature_set_1_day">Beállítva 1 nap</string>
     <string name="user_unhide">Felfedés</string>
     <string name="color_received_message">Fogadott üzenetbuborék színe</string>
-    <string name="only_your_contact_can_delete">Csak az ismerőse tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)</string>
-    <string name="self_destruct_passcode_changed">Az önmegsemmisítési jelkód megváltozott!</string>
+    <string name="only_your_contact_can_delete">Csak a partnere tudja az üzeneteket véglegesen törölni (Ön csak törlésre jelölheti meg azokat). (24 óra)</string>
+    <string name="self_destruct_passcode_changed">Az önmegsemmisítő-jelkód módosult!</string>
     <string name="using_simplex_chat_servers">SimpleX Chat-kiszolgálók használatban.</string>
     <string name="use_simplex_chat_servers__question">SimpleX Chat-kiszolgálók használata?</string>
     <string name="unhide_chat_profile">Csevegési profil felfedése</string>
-    <string name="v5_0_large_files_support">Videók és fájlok 1Gb méretig</string>
-    <string name="network_option_tcp_connection_timeout">TCP kapcsolat időtúllépése</string>
-    <string name="connect__your_profile_will_be_shared">A(z) %1$s nevű profiljának SimpleX-címe megosztásra fog kerülni.</string>
+    <string name="v5_0_large_files_support">Videók és fájlok legfeljebb 1GB méretig</string>
+    <string name="network_option_tcp_connection_timeout">TCP-kapcsolat időtúllépése</string>
+    <string name="connect__your_profile_will_be_shared">A(z) %1$s nevű profilja meg lesz osztva.</string>
     <string name="you_are_already_connected_to_vName_via_this_link">Ön már kapcsolódott a következőhöz: %1$s.</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Jelenlegi csevegési adatbázis TÖRLÉSRE és FELCSERÉLÉSRE kerül az importált által!\nEz a művelet nem vonható vissza - profiljai, ismerősei, csevegési üzenetei és fájljai véglegesen törölve lesznek.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">A jelenlegi csevegési adatbázis TÖRÖLVE és CSERÉLVE lesz az importáltra!\nEz a művelet nem vonható vissza – profiljai, partnerei, csevegési üzenetei és fájljai véglegesen törölve lesznek.</string>
     <string name="chat_with_the_founder">Ötletek és javaslatok</string>
     <string name="database_downgrade_warning">Figyelmeztetés: néhány adat elveszhet!</string>
     <string name="tap_to_start_new_chat">Koppintson ide az új csevegés indításához</string>
     <string name="waiting_for_desktop">Várakozás a számítógépre…</string>
-    <string name="next_generation_of_private_messaging">Az üzenetküldés jövője</string>
-    <string name="update_network_settings_question">Hálózati beállítások megváltoztatása?</string>
+    <string name="next_generation_of_private_messaging">Az üzenetváltás jövője</string>
+    <string name="update_network_settings_question">Módosítja a hálózati beállításokat?</string>
     <string name="waiting_for_mobile_to_connect">Várakozás a hordozható eszköz társítására:</string>
     <string name="v4_4_verify_connection_security">Biztonságos kapcsolat hitelesítése</string>
     <string name="sending_files_not_yet_supported">fájlok küldése egyelőre még nem támogatott</string>
-    <string name="snd_conn_event_switch_queue_phase_completed_for_member">cím megváltoztatva nála: %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">Ön módosította a címet %s számára</string>
     <string name="receiving_files_not_yet_supported">fájlok fogadása egyelőre még nem támogatott</string>
     <string name="save_group_profile">Csoportprofil mentése</string>
     <string name="network_options_reset_to_defaults">Visszaállítás alapértelmezettre</string>
-    <string name="connection_error_auth_desc">Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</string>
+    <string name="connection_error_auth_desc">Hacsak a partnere nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg a partnerét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</string>
     <string name="video_call_no_encryption">videóhívás (nem e2e titkosított)</string>
     <string name="smp_servers_use_server_for_new_conn">Alkalmazás új kapcsolatokhoz</string>
-    <string name="periodic_notifications_desc">Az új üzenetek rendszeresen letöltésre kerülnek az alkalmazás által – naponta néhány százalékot használ az akkumulátorból. Az alkalmazás nem használ push-értesítéseket – az eszközről származó adatok nem kerülnek elküldésre a kiszolgálóknak.</string>
+    <string name="periodic_notifications_desc">Az új üzeneteket az alkalmazás időszakosan lekéri – naponta néhány százalékot használ az akkumulátorból. Az alkalmazás nem használ push-értesítéseket – az eszközről származó adatok nem lesznek elküldve a kiszolgálóknak.</string>
     <string name="paste_desktop_address">Számítógép címének beillesztése</string>
-    <string name="description_via_contact_address_link">kapcsolattartási cím-hivatkozáson keresztül</string>
+    <string name="description_via_contact_address_link">a kapcsolattartási címhivatkozáson keresztül</string>
     <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Az adatvédelem növelése érdekében <b> a SimpleX a háttérben fut</b> a push értesítések használata helyett.]]></string>
-    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Az ismerősének online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.\nVisszavonhatja ezt az ismerőskérelmet és eltávolíthatja az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).</string>
-    <string name="restore_passphrase_not_found_desc">A jelszó nem található a Keystore-ban, ezért kézzel szükséges megadni. Ez akkor történhetett meg, ha visszaállította az alkalmazás adatait egy biztonságimentési eszközzel. Ha nem így történt, akkor lépjen kapcsolatba a fejlesztőkkel.</string>
-    <string name="your_contacts_will_remain_connected">Az ismerősei továbbra is kapcsolódva maradnak.</string>
-    <string name="error_xftp_test_server_auth">A kiszolgálónak engedélyre van szüksége a várólisták létrehozásához, ellenőrizze jelszavát</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">A partnereinek online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.\nVisszavonhatja ezt a partnerkérelmet és eltávolíthatja a partnert (ezt később ismét megpróbálhatja egy új hivatkozással).</string>
+    <string name="restore_passphrase_not_found_desc">A jelmondat nem található a Keystore-ban, ezért kézzel szükséges megadni. Ez akkor történhetett meg, ha visszaállította az alkalmazás adatait egy biztonsági mentési eszközzel. Ha nem így történt, akkor lépjen kapcsolatba a fejlesztőkkel.</string>
+    <string name="your_contacts_will_remain_connected">A partnerei továbbra is kapcsolódva maradnak.</string>
+    <string name="error_xftp_test_server_auth">A kiszolgálónak hitelesítésre van szüksége a feltöltéshez, ellenőrizze jelszavát</string>
     <string name="database_initialization_error_desc">Az adatbázis nem működik megfelelően. Koppintson ide a további információkért</string>
     <string name="stop_snd_file__message">A fájl küldése le fog állni.</string>
-    <string name="trying_to_connect_to_server_to_receive_messages">Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</string>
+    <string name="trying_to_connect_to_server_to_receive_messages">Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.</string>
     <string name="la_could_not_be_verified">Nem sikerült hitelesíteni; próbálja meg újra.</string>
     <string name="moderate_message_will_be_marked_warning">Az üzenet az összes tag számára moderáltként lesz megjelölve.</string>
     <string name="enter_passphrase_notification_desc">Értesítések fogadásához adja meg az adatbázis jelmondatát</string>
     <string name="error_smp_test_failed_at_step">A teszt a(z) %s lépésnél sikertelen volt.</string>
     <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Az alkalmazás elindításához vagy 30 másodpercnyi háttérben töltött idő után, az alkalmazáshoz való visszatéréshez hitelesítésre lesz szükség.</string>
-    <string name="moderate_message_will_be_deleted_warning">Az üzenet az összes tag számára törlésre kerül.</string>
+    <string name="moderate_message_will_be_deleted_warning">Az üzenet az összes tag számára törölve lesz.</string>
     <string name="video_decoding_exception_desc">A videó nem dekódolható. Próbálja ki egy másik videóval, vagy lépjen kapcsolatba a fejlesztőkkel.</string>
     <string name="this_text_is_available_in_settings">Ez a szöveg a „Beállításokban” érhető el</string>
-    <string name="profile_will_be_sent_to_contact_sending_link">A profilja elküldésre kerül az ismerőse számára, akitől ezt a hivatkozást kapta.</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">A profilja el lesz küldve a partnere számára, akitől ezt a hivatkozást kapta.</string>
     <string name="system_restricted_background_in_call_desc">Az alkalmazás 1 perc után bezárható a háttérben.</string>
-    <string name="group_preview_you_are_invited">meghívást kapott a csoportba</string>
+    <string name="group_preview_you_are_invited">Ön meghívást kapott a csoportba</string>
     <string name="turn_off_battery_optimization"><![CDATA[<b>Engedélyezze</b> a következő párbeszédpanelen az azonnali értesítések fogadásához.]]></string>
-    <string name="error_smp_test_server_auth">A kiszolgálónak engedélyre van szüksége a sorbaállítás létrehozásához, ellenőrizze jelszavát</string>
+    <string name="error_smp_test_server_auth">A kiszolgálónak engedélyre van szüksége a sorba állítás létrehozásához, ellenőrizze a jelszavát</string>
     <string name="you_will_join_group">Kapcsolódni fog a csoport összes tagjához.</string>
     <string name="error_smp_test_certificate">Lehetséges, hogy a kiszolgáló címében szereplő tanúsítvány-ujjlenyomat helytelen</string>
     <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">A biztonsága érdekében kapcsolja be a SimpleX-zár funkciót.\nA funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beállítására az eszközén.</string>
     <string name="video_will_be_received_when_contact_is_online">A videó akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</string>
-    <string name="network_error_desc">Ellenőrizze a hálózati kapcsolatát a következővel: %1$s, és próbálja újra.</string>
+    <string name="network_error_desc">Ellenőrizze a hálózati kapcsolatát vele: %1$s, és próbálja újra.</string>
     <string name="you_can_turn_on_lock">A SimpleX-zár az „Adatvédelem és biztonság” menüben kapcsolható be.</string>
     <string name="app_was_crashed">Az alkalmazás összeomlott</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg az ismerősét, hogy küldjön egy másikat.</string>
+    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg a partnerét, hogy küldjön egy másikat.</string>
     <string name="image_decoding_exception_desc">A kép nem dekódolható. Próbálja meg egy másik képpel, vagy lépjen kapcsolatba a fejlesztőkkel.</string>
-    <string name="non_content_uri_alert_text">Érvénytelen fájl elérési útvonalat osztott meg. Jelentse a problémát az alkalmazás fejlesztőinek.</string>
-    <string name="failed_to_create_user_duplicate_desc">Már van egy csevegési profil ugyanezzel a megjelenített névvel. Válasszon egy másik nevet.</string>
-    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál (hiba: %1$s).</string>
+    <string name="non_content_uri_alert_text">Érvénytelen fájlelérési útvonalat osztott meg. Jelentse a problémát az alkalmazás fejlesztőinek.</string>
+    <string name="failed_to_create_user_duplicate_desc">Már van egy csevegési profil ugyanezzel a megjelenítendő névvel. Válasszon egy másik nevet.</string>
+    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál (hiba: %1$s).</string>
     <string name="stop_rcv_file__message">A fájl fogadása le fog állni.</string>
     <string name="la_please_remember_to_store_password">Ne felejtse el, vagy tárolja biztonságosan – az elveszett jelszót nem lehet visszaállítani!</string>
     <string name="video_will_be_received_when_contact_completes_uploading">A videó akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</string>
-    <string name="description_you_shared_one_time_link_incognito">Ön egy egyszer használható meghívó-hivatkozást osztott meg inkognitóban</string>
-    <string name="connected_to_server_to_receive_messages_from_contact">Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</string>
+    <string name="description_you_shared_one_time_link_incognito">Ön egy egyszer használható meghívót osztott meg inkognitóban</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">Ön már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott partnerétől érkező üzenetek fogadására szolgál.</string>
     <string name="you_can_enable_delivery_receipts_later">Később engedélyezheti a „Beállításokban”</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</string>
     <string name="mtr_error_different">különböző átköltöztetés az alkalmazásban/adatbázisban: %s / %s</string>
     <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[A kapcsolódás már folyamatban van a következőhöz: <b>%1$s</b>.]]></string>
     <string name="unhide_profile">Profil felfedése</string>
     <string name="this_link_is_not_a_valid_connection_link">Ez nem egy érvényes kapcsolattartási hivatkozás!</string>
-    <string name="to_verify_compare">A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) az ismerőse eszközén lévő kóddal.</string>
-    <string name="you_must_use_the_most_recent_version_of_database">A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi ismerősétől.</string>
-    <string name="messages_section_description">Ez a beállítás csak a jelenlegi csevegési profiljában lévő üzenetekre vonatkozik</string>
-    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Meghívást kapott a csoportba. Csatlakozzon, hogy kapcsolatba léphessen a csoport tagjaival.</string>
+    <string name="to_verify_compare">A végpontok közötti titkosítás hitelesítéséhez hasonlítsa össze (vagy olvassa be a QR-kódot) a partnere eszközén lévő kóddal.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">A csevegési adatbázis legfrissebb verzióját CSAK egy eszközön kell használnia, ellenkező esetben előfordulhat, hogy az üzeneteket nem fogja megkapni valamennyi partnerétől.</string>
+    <string name="messages_section_description">Ez a beállítás csak az Ön jelenlegi csevegési profiljában lévő üzenetekre vonatkozik</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Ön meghívást kapott a csoportba. Csatlakozzon, hogy kapcsolatba léphessen a csoport tagjaival.</string>
     <string name="alert_message_no_group">Ez a csoport már nem létezik.</string>
     <string name="connect_plan_you_are_already_joining_the_group_via_this_link">A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül.</string>
-    <string name="you_are_invited_to_group">Meghívást kapott a csoportba</string>
-    <string name="contact_sent_large_file">Az ismerőse a jelenleg megengedett maximális méretű (%1$s) fájlnál nagyobbat küldött.</string>
-    <string name="we_do_not_store_contacts_or_messages_on_servers">Az ismerősei és az üzenetek (kézbesítés után) nem kerülnek tárolásra a SimpleX-kiszolgálókon.</string>
+    <string name="you_are_invited_to_group">Ön meghívást kapott a csoportba</string>
+    <string name="contact_sent_large_file">A partnere a jelenleg megengedett maximális méretű (%1$s) fájlnál nagyobbat küldött.</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">A partnerei és az üzenetek (kézbesítés után) nem a SimpleX-kiszolgálókon vannak tárolva.</string>
     <string name="you_can_use_markdown_to_format_messages__prompt">Üzenetek formázása a szövegbe szúrt speciális karakterekkel:</string>
     <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[A hivatkozásra kattintva is kapcsolódhat. Ha megnyílik a böngészőben, kattintson a<b>Megnyitás az alkalmazásban</b> gombra.]]></string>
-    <string name="your_chat_profile_will_be_sent_to_your_contact">A csevegési profilja elküldésre kerül\naz ismerőse számára</string>
-    <string name="invite_prohibited_description">Egy olyan ismerősét próbálja meghívni, akivel inkognitó-profilt osztott meg abban a csoportban, amelyben a saját fő profilja van használatban</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">A csevegési profilja el lesz küldve\na partnere számára</string>
+    <string name="invite_prohibited_description">Egy olyan partnerét próbálja meghívni, akivel inkognitóprofilt osztott meg abban a csoportban, amelyben a fő profilja van használatban</string>
     <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[A csatlakozás már folyamatban van a(z) <b>%1$s</b> nevű csoporthoz.]]></string>
     <string name="onboarding_notifications_mode_off">Amikor az alkalmazás fut</string>
-    <string name="alert_title_cant_invite_contacts_descr">Inkognitóprofilt használ ehhez a csoporthoz - fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva</string>
-    <string name="v4_5_transport_isolation">Átvitel-izoláció</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Akkor lesz kapcsolódva, ha a kapcsolatkérése elfogadásra kerül, várjon, vagy ellenőrizze később!</string>
+    <string name="alert_title_cant_invite_contacts_descr">Inkognitóprofilt használ ehhez a csoporthoz – fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva</string>
+    <string name="v4_5_transport_isolation">Átvitelelkülönítés</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Akkor lesz kapcsolódva, ha a meghívási kérése el lesz fogadva, várjon, vagy ellenőrizze később!</string>
     <string name="voice_messages_are_prohibited">A hangüzenetek küldése le van tiltva.</string>
     <string name="system_restricted_background_in_call_warn"><![CDATA[A háttérben való hívásokhoz válassza ki az <b>Alkalmazás akkumulátor-használata</b> / <b>Korlátlan</b> módot az alkalmazás beállításaiban.]]></string>
-    <string name="v5_4_link_mobile_desktop_descr">Biztonságos kvantumrezisztens-protokollon keresztül.</string>
-    <string name="v5_1_better_messages_descr">- 5 perc hosszúságú hangüzenetek.\n- egyéni üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.</string>
+    <string name="v5_4_link_mobile_desktop_descr">Biztonságos kvantumbiztos protokollon keresztül.</string>
+    <string name="v5_1_better_messages_descr">- legfeljebb 5 perc hosszúságú hangüzenetek.\n- egyéni üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.</string>
     <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Válassza a <i>Társítás számítógéppel</i> menüt a hordozható eszköz alkalmazásban és olvassa be a QR-kódot.]]></string>
     <string name="sender_at_ts">%s ekkor: %s</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Akkor lesz kapcsolódva, amikor az ismerősének eszköze online lesz, várjon, vagy ellenőrizze később!</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Akkor lesz kapcsolódva, amikor a partnerének az eszköze online lesz, várjon, vagy ellenőrizze később!</string>
     <string name="v5_4_block_group_members_descr">Kéretlen üzenetek elrejtése.</string>
-    <string name="disable_onion_hosts_when_not_supported"><![CDATA[Állítsa az <i>Onion kiszolgálók használata</i> opciót „Nemre”, ha a SOCKS proxy nem támogatja őket.]]></string>
+    <string name="disable_onion_hosts_when_not_supported"><![CDATA[Állítsa az <i>Onion-kiszolgálók használata</i> opciót „Nemre”, ha a SOCKS-proxy nem támogatja őket.]]></string>
     <string name="you_can_share_your_address">Megoszthatja a címét egy hivatkozásként vagy egy QR-kódként – így bárki kapcsolódhat Önhöz.</string>
     <string name="you_can_create_it_later">Létrehozás később</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">A profilja az eszközén van tárolva és csak az ismerőseivel kerül megosztásra. A SimpleX-kiszolgálók nem láthatják a profilját.</string>
-    <string name="snd_group_event_changed_member_role">Ön megváltoztatta %s szerepkörét erre: %s</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">A profilja az eszközén van tárolva és csak a partnereivel van megosztva. A SimpleX-kiszolgálók nem láthatják a profilját.</string>
+    <string name="snd_group_event_changed_member_role">Ön a következőre módosította %s szerepkörét: „%s”</string>
     <string name="you_rejected_group_invitation">Csoportmeghívó elutasítva</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Az Ön adatainak védelme érdekében a SimpleX külön üzenet-azonosítókat használ minden egyes kapcsolatához.</string>
-    <string name="to_share_with_your_contact">(a megosztáshoz az ismerősével)</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Adatainak védelme érdekében a SimpleX külön üzenet-azonosítókat használ minden egyes kapcsolatához.</string>
+    <string name="to_share_with_your_contact">(a megosztáshoz a partnerével)</string>
     <string name="you_sent_group_invitation">Csoportmeghívó elküldve</string>
-    <string name="update_network_session_mode_question">Átvitel-izoláció módjának frissítése?</string>
-    <string name="network_session_mode_transport_isolation">Átvitel-izoláció</string>
+    <string name="update_network_session_mode_question">Frissíti az átvitelelkülönítési módot?</string>
+    <string name="network_session_mode_transport_isolation">Átvitelelkülönítés</string>
     <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Ettől a csoporttól nem fog értesítéseket kapni. A csevegési előzmények megmaradnak.</string>
-    <string name="database_is_not_encrypted">A csevegési adatbázis nem titkosított - állítson be egy jelmondatot annak védelméhez.</string>
-    <string name="network_disable_socks">Közvetlen internet kapcsolat használata?</string>
+    <string name="database_is_not_encrypted">A csevegési adatbázis nem titkosított – állítson be egy jelmondatot annak védelméhez.</string>
+    <string name="network_disable_socks">Közvetlen internetkapcsolat használata?</string>
     <string name="you_will_still_receive_calls_and_ntfs">Továbbra is kap hívásokat és értesítéseket a némított profiloktól, ha azok aktívak.</string>
-    <string name="group_main_profile_sent">A fő csevegési profilja elküldésre kerül a csoporttagok számára</string>
+    <string name="group_main_profile_sent">A fő csevegési profilja el lesz küldve a csoporttagok számára</string>
     <string name="you_can_enable_delivery_receipts_later_alert">Később engedélyezheti őket az „Adatvédelem és biztonság” menüben.</string>
-    <string name="to_reveal_profile_enter_password">Rejtett profilja felfedéséhez írja be a teljes jelszavát a keresőmezőbe a „Csevegési profilok” menüben.</string>
+    <string name="to_reveal_profile_enter_password">Rejtett profilja felfedéséhez adja meg a teljes jelszót a keresőmezőben, a „Csevegési profilok” menüben.</string>
     <string name="upgrade_and_open_chat">Fejlesztés és a csevegés megnyitása</string>
-    <string name="you_need_to_allow_to_send_voice">Engedélyeznie kell a hangüzenetek küldését az ismerőse számára, hogy hangüzeneteket küldhessenek egymásnak.</string>
+    <string name="you_need_to_allow_to_send_voice">Engedélyeznie kell a hangüzenetek küldését a partnere számára, hogy hangüzeneteket küldhessenek egymásnak.</string>
     <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[Ön már a(z) <b>%1$s</b> nevű csoport tagja.]]></string>
-    <string name="snd_conn_event_switch_queue_phase_completed">cím megváltoztatva</string>
-    <string name="v4_3_irreversible_message_deletion_desc">Az ismerősei engedélyezhetik a teljes üzenet törlést.</string>
-    <string name="you_have_to_enter_passphrase_every_time">A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul - nem az eszközön kerül tárolásra.</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">Ön módosította a címet</string>
+    <string name="v4_3_irreversible_message_deletion_desc">A partnerei engedélyezhetik a teljes üzenet törlését.</string>
+    <string name="you_have_to_enter_passphrase_every_time">A jelmondatot minden alkalommal meg kell adnia, amikor az alkalmazás elindul – nem az eszközön van tárolva.</string>
     <string name="open_port_in_firewall_desc">Ha engedélyezni szeretné a hordozható eszköz-alkalmazás társítását a számítógéphez, akkor nyissa meg ezt a portot a tűzfalában, miután engedélyezte azt</string>
-    <string name="your_profile_is_stored_on_your_device">A profilja, az ismerősei és az elküldött üzenetei az eszközén kerülnek tárolásra.</string>
+    <string name="your_profile_is_stored_on_your_device">A profilja, a partnerei és az elküldött üzenetei a saját eszközén vannak tárolva.</string>
     <string name="system_restricted_background_warn"><![CDATA[Az értesítések engedélyezéséhez válassza ki az <b>Alkalmazás akkumulátor-használata</b> / <b>Korlátlan</b> módot az alkalmazás beállításaiban.]]></string>
-    <string name="this_string_is_not_a_connection_link">Ez a karakterlánc nem egy meghívó-hivatkozás!</string>
-    <string name="to_start_a_new_chat_help_header">Új csevegés kezdése</string>
-    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">A kapcsolódás már folyamatban van ezen az egyszer használható meghívó-hivatkozáson keresztül!</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Nem veszíti el az ismerőseit, ha később törli a címét.</string>
+    <string name="this_string_is_not_a_connection_link">Ez a karakterlánc nem egy meghívási hivatkozás!</string>
+    <string name="to_start_a_new_chat_help_header">Új csevegés indításához</string>
+    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">A kapcsolódás már folyamatban van ezen az egyszer használható meghívón keresztül!</string>
+    <string name="you_wont_lose_your_contacts_if_delete_address">Nem veszíti el a partnereit, ha később törli a címét.</string>
     <string name="updating_settings_will_reconnect_client_to_all_servers">A beállítások frissítése a kiszolgálókhoz való újra kapcsolódással jár.</string>
     <string name="contact_wants_to_connect_with_you">kapcsolatba akar lépni Önnel!</string>
-    <string name="snd_group_event_changed_role_for_yourself">saját szerepköre megváltozott erre: %s</string>
+    <string name="snd_group_event_changed_role_for_yourself">Ön a következőre módosította a saját szerepkörét: „%s”</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">A csevegési szolgáltatás elindítható a „Beállítások / Adatbázis” menüben vagy az alkalmazás újraindításával.</string>
     <string name="verify_code_on_mobile">Kód hitelesítése a hordozható eszközön</string>
-    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Ön csatlakozott ehhez a csoporthoz. Kapcsolódás a meghívó csoporttaghoz.</string>
     <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Kapcsolatba léphet <font color="#0088ff">a SimpleX Chat fejlesztőivel, ahol bármiről kérdezhet és értesülhet a friss hírekről</font>.]]></string>
     <string name="v4_2_auto_accept_contact_requests_desc">Nem kötelező üdvözlőüzenettel.</string>
     <string name="unknown_database_error_with_info">Ismeretlen adatbázishiba: %s</string>
-    <string name="you_can_hide_or_mute_user_profile">Elrejtheti vagy lenémíthatja a felhasználó-profiljait - koppintson (vagy számítógép-alkalmazásban kattintson) hosszan a profilra a felugró menühöz.</string>
-    <string name="v5_3_simpler_incognito_mode_descr">Inkognitómód használata kapcsolódáskor.</string>
-    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Megoszthat egy hivatkozást vagy QR-kódot - így bárki csatlakozhat a csoporthoz. Ha a csoport később törlésre kerül, akkor nem fogja elveszíteni annak tagjait.</string>
-    <string name="you_joined_this_group">Csatlakozott ehhez a csoporthoz</string>
-    <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Ez az Ön hivatkozása a(z) <b>%1$s</b> nevű csoporthoz!]]></string>
+    <string name="you_can_hide_or_mute_user_profile">Elrejtheti vagy lenémíthatja a felhasználóprofiljait – koppintson (vagy számítógép-alkalmazásban kattintson) hosszan a profilra a felugró menühöz.</string>
+    <string name="v5_3_simpler_incognito_mode_descr">Inkognitóra váltás kapcsolódáskor.</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Megoszthat egy hivatkozást vagy QR-kódot – így bárki csatlakozhat a csoporthoz. Ha a csoportot Ön később törli, akkor nem fogja elveszíteni annak tagjait.</string>
+    <string name="you_joined_this_group">Ön csatlakozott ehhez a csoporthoz</string>
+    <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Ez a saját hivatkozása a(z) <b>%1$s</b> nevű csoporthoz!]]></string>
     <string name="voice_prohibited_in_this_chat">A hangüzenetek küldése le van tiltva ebben a csevegésben.</string>
     <string name="you_control_your_chat">Ön irányítja csevegését!</string>
     <string name="verify_code_with_desktop">Kód hitelesítése a számítógépen</string>
     <string name="v4_5_private_filenames_descr">Az időzóna védelmének érdekében a kép-/hangfájlok UTC-t használnak.</string>
-    <string name="connect_via_member_address_alert_desc">A kapcsolatkérés elküldésre kerül ezen csoporttag számára.</string>
-    <string name="incognito_info_share">Inkognitó-profil megosztása esetén a rendszer azt a profilt fogja használni azokhoz a csoportokhoz, amelyekbe meghívást kapott.</string>
-    <string name="connect_plan_you_have_already_requested_connection_via_this_address">Már küldött egy kapcsolatkérést ezen a címen keresztül!</string>
-    <string name="you_can_share_this_address_with_your_contacts">Megoszthatja ezt a SimpleX-címet az ismerőseivel, hogy kapcsolatba léphessenek vele: %s.</string>
-    <string name="you_can_accept_or_reject_connection">Amikor az emberek kapcsolatot kérnek, Ön elfogadhatja vagy elutasíthatja azokat.</string>
+    <string name="connect_via_member_address_alert_desc">A meghívási kérés el lesz küldve ezen csoporttag számára.</string>
+    <string name="incognito_info_share">Inkognitóprofil megosztása esetén a rendszer azt a profilt fogja használni azokhoz a csoportokhoz, amelyekbe meghívást kapott.</string>
+    <string name="connect_plan_you_have_already_requested_connection_via_this_address">Már küldött egy meghívási kérést ezen a címen keresztül!</string>
+    <string name="you_can_share_this_address_with_your_contacts">Megoszthatja ezt a SimpleX-címet a partnereivel, hogy kapcsolatba léphessenek vele: %s.</string>
+    <string name="you_can_accept_or_reject_connection">Amikor az emberek meghívót küldenek, Ön elfogadhatja vagy elutasíthatja azokat.</string>
     <string name="v4_6_group_welcome_message_descr">Megjelenítendő üzenet beállítása az új tagok számára!</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</string>
-    <string name="sending_delivery_receipts_will_be_enabled">A kézbesítési jelentés küldése az összes ismerőse számára engedélyezésre kerül.</string>
-    <string name="network_option_protocol_timeout_per_kb">Protokoll időtúllépése KB-onként</string>
-    <string name="database_backup_can_be_restored">Az adatbázis-jelmondat megváltoztatására tett kísérlet nem fejeződött be.</string>
-    <string name="enable_automatic_deletion_message">Ez a művelet nem vonható vissza - a kiválasztottnál korábban küldött és fogadott üzenetek törlésre kerülnek. Ez több percet is igénybe vehet.</string>
-    <string name="profile_is_only_shared_with_your_contacts">A profilja csak az ismerőseivel kerül megosztásra.</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">Köszönet a felhasználóknak a Weblate-en való közreműködésért!</string>
+    <string name="sending_delivery_receipts_will_be_enabled">A kézbesítési jelentések küldése az összes partnere számára engedélyezve lesz.</string>
+    <string name="network_option_protocol_timeout_per_kb">Protokoll időtúllépése kB-onként</string>
+    <string name="database_backup_can_be_restored">Az adatbázis jelmondatának módosítására tett kísérlet nem fejeződött be.</string>
+    <string name="enable_automatic_deletion_message">Ez a művelet nem vonható vissza – a kijelöltnél korábban küldött és fogadott üzenetek törölve lesznek. Ez több percet is igénybe vehet.</string>
+    <string name="profile_is_only_shared_with_your_contacts">A profilja csak a partnereivel van megosztva.</string>
     <string name="smp_servers_test_some_failed">Néhány kiszolgáló megbukott a teszten:</string>
     <string name="group_invitation_tap_to_join">Koppintson ide a csatlakozáshoz</string>
-    <string name="delete_files_and_media_desc">Ez a művelet nem vonható vissza - az összes fogadott és küldött fájl a médiatartalmakkal együtt törlésre kerülnek. Az alacsony felbontású képek viszont megmaradnak.</string>
-    <string name="receipts_contacts_override_enabled">A kézbesítési jelentések engedélyezve vannak %d ismerősnél</string>
-    <string name="sending_via">Küldés ezen keresztül:</string>
-    <string name="v5_0_polish_interface_descr">Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</string>
-    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">A kézbesítési jelentések küldése engedélyezésre kerül az összes látható csevegési profilban lévő összes ismerőse számára.</string>
+    <string name="delete_files_and_media_desc">Ez a művelet nem vonható vissza – az összes fogadott és küldött fájl a médiatartalmakkal együtt törölve lesznek. Az alacsony felbontású képek viszont megmaradnak.</string>
+    <string name="receipts_contacts_override_enabled">A kézbesítési jelentések engedélyezve vannak %d partnernél</string>
+    <string name="sending_via">Küldés a következőn keresztül:</string>
+    <string name="v5_0_polish_interface_descr">Köszönet a felhasználóknak a Weblate-en való közreműködésért!</string>
+    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">A kézbesítési jelentések küldése engedélyezve lesz az összes látható csevegési profilban lévő összes partnere számára.</string>
     <string name="v4_6_audio_video_calls_descr">Bluetooth támogatás és további fejlesztések.</string>
     <string name="in_developing_desc">Ez a funkció még nem támogatott. Próbálja meg a következő kiadásban.</string>
-    <string name="share_text_updated_at">A bejegyzés frissítve: %s</string>
+    <string name="share_text_updated_at">Bejegyzés frissítve: %s</string>
     <string name="skip_inviting_button">Tagok meghívásának kihagyása</string>
-    <string name="receipts_section_description_1">Ezek felülbírálhatók az ismerős- és csoportbeállításokban.</string>
-    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Az ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!</string>
-    <string name="you_can_change_it_later">A véletlenszerű jelmondat egyszerű szövegként van tárolva a beállításokban.\nEz később megváltoztatható.</string>
+    <string name="receipts_section_description_1">Ezek felülbírálhatók a partner- és csoportbeállításokban.</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">A partnere, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!</string>
+    <string name="you_can_change_it_later">A véletlenszerű jelmondat egyszerű szövegként van tárolva a beállításokban.\nEzt később módosíthatja.</string>
     <string name="group_invitation_tap_to_join_incognito">Koppintson ide az inkognitóban való kapcsolódáshoz</string>
     <string name="set_password_to_export">Jelmondat beállítása az exportáláshoz</string>
     <string name="receipts_groups_override_disabled">A kézbesítési jelentések le vannak tiltva %d csoportban</string>
     <string name="non_fatal_errors_occured_during_import">Néhány nem végzetes hiba történt az importáláskor:</string>
-    <string name="v4_5_italian_interface_descr">Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</string>
-    <string name="relay_server_if_necessary">A közvetítő-kiszolgáló csak szükség esetén kerül használatra. Egy másik fél megfigyelheti az IP-címet.</string>
-    <string name="v5_0_app_passcode_descr">Rendszerhitelesítés helyetti beállítás.</string>
-    <string name="switch_receiving_address_desc">A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.</string>
+    <string name="v4_5_italian_interface_descr">Köszönet a felhasználóknak a Weblate-en való közreműködésért!</string>
+    <string name="relay_server_if_necessary">A továbbítókiszolgáló csak szükség esetén lesz használva. Egy másik fél megfigyelheti az IP-címét.</string>
+    <string name="v5_0_app_passcode_descr">Beállítás a rendszer-hitelesítés helyett.</string>
+    <string name="switch_receiving_address_desc">A fogadási cím egy másik kiszolgálóra fog módosulni. A cím módosítása a feladó online állapotba kerülése után fejeződik be.</string>
     <string name="stop_chat_to_export_import_or_delete_chat_database">A csevegés megállítása a csevegési adatbázis exportálásához, importálásához vagy törléséhez. A csevegés megállításakor nem tud üzeneteket fogadni és küldeni.</string>
     <string name="save_passphrase_in_keychain">Jelmondat mentése a Keystore-ba</string>
-    <string name="v4_6_chinese_spanish_interface_descr">Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Köszönet a felhasználóknak a Weblate-en való közreműködésért!</string>
     <string name="save_passphrase_in_settings">Jelmondat mentése a beállításokban</string>
-    <string name="send_receipts_disabled_alert_msg">Ennek a csoportnak több mint %1$d tagja van, a kézbesítési jelentések nem kerülnek elküldésre.</string>
+    <string name="send_receipts_disabled_alert_msg">Ennek a csoportnak több mint %1$d tagja van, a kézbesítési jelentések nem lesznek elküldve.</string>
     <string name="v5_2_message_delivery_receipts_descr">A második jelölés, amit kihagytunk! ✅</string>
-    <string name="relay_server_protects_ip">A közvetítő-kiszolgáló megvédi az IP-címet, de megfigyelheti a hívás időtartamát.</string>
+    <string name="relay_server_protects_ip">A továbbítókiszolgáló megvédi az IP-címét, de megfigyelheti a hívás időtartamát.</string>
     <string name="v4_5_message_draft_descr">Az utolsó üzenet tervezetének megőrzése a mellékletekkel együtt.</string>
-    <string name="saved_ICE_servers_will_be_removed">A mentett WebRTC ICE-kiszolgálók eltávolításra kerülnek.</string>
+    <string name="saved_ICE_servers_will_be_removed">A mentett WebRTC ICE-kiszolgálók el lesznek távolítva.</string>
     <string name="receipts_groups_override_enabled">A kézbesítési jelentések engedélyezve vannak %d csoportban</string>
-    <string name="member_role_will_be_changed_with_notification">A szerepkör meg fog változni erre: %s. A csoport tagjai értesítést fognak kapni.</string>
+    <string name="member_role_will_be_changed_with_notification">A tag szerepköre a következőre fog módosulni: „%s”. A csoport összes tagja értesítést fog kapni.</string>
     <string name="users_delete_with_connections">Profil és kiszolgálókapcsolatok</string>
-    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Egy üzenetküldő- és alkalmazásplatform, amely védi az adatait és biztonságát.</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Egy üzenetváltó- és alkalmazásplatform, amely védi az adatait és biztonságát.</string>
     <string name="tap_to_activate_profile">A profil aktiválásához koppintson az ikonra.</string>
-    <string name="receipts_contacts_override_disabled">A kézbesítési jelentések le vannak tiltva %d ismerősnél</string>
+    <string name="receipts_contacts_override_disabled">A kézbesítési jelentések le vannak tiltva %d partnernél</string>
     <string name="session_code">Munkamenet kód</string>
-    <string name="v4_4_french_interface_descr">Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</string>
+    <string name="v4_4_french_interface_descr">Köszönet a felhasználóknak a Weblate-en való közreműködésért!</string>
     <string name="receipts_section_groups">Kis csoportok (max. 20 tag)</string>
     <string name="connection_you_accepted_will_be_cancelled">Az Ön által elfogadott kérelem vissza lesz vonva!</string>
-    <string name="send_live_message_desc">Élő üzenet küldése - a címzett(ek) számára frissül, ahogy beírja</string>
+    <string name="send_live_message_desc">Élő üzenet küldése – az üzenet a címzett(ek) számára valós időben frissül, ahogy Ön beírja az üzenetet</string>
     <string name="settings_section_title_delivery_receipts">A KÉZBESÍTÉSI JELENTÉSEKET A KÖVETKEZŐ CÍMRE KELL KÜLDENI</string>
-    <string name="alert_text_msg_bad_id">A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</string>
-    <string name="this_device_name_shared_with_mobile">Az eszköz neve megosztásra kerül a társított hordozható eszközön használt alkalmazással.</string>
+    <string name="alert_text_msg_bad_id">A következő üzenet azonosítója érvénytelen (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba vagy sérült kapcsolat esetén fordulhat elő.</string>
+    <string name="this_device_name_shared_with_mobile">Az eszköz neve meg lesz osztva a társított hordozható eszközön használt alkalmazással.</string>
     <string name="v4_4_live_messages_desc">A címzettek a beírás közben látják a szövegváltozásokat.</string>
-    <string name="store_passphrase_securely">Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja megváltoztatni.</string>
-    <string name="passphrase_will_be_saved_in_settings">A jelmondat a beállításokban egyszerű szövegként kerül tárolásra, miután megváltoztatta vagy újraindította az alkalmazást.</string>
-    <string name="smp_servers_per_user">A jelenlegi csevegési profilhoz tartozó új kapcsolatok kiszolgálói</string>
-    <string name="receiving_via">Fogadás ezen keresztül:</string>
+    <string name="store_passphrase_securely">Tárolja el biztonságosan jelmondatát, mert ha elveszíti azt, NEM tudja módosítani.</string>
+    <string name="passphrase_will_be_saved_in_settings">A jelmondat a beállításokban egyszerű szövegként lesz tárolva, miután módosította azt vagy újraindította az alkalmazást.</string>
+    <string name="smp_servers_per_user">A jelenlegi csevegési profiljához tartozó új kapcsolatok kiszolgálói</string>
+    <string name="receiving_via">Fogadás a következőn keresztül:</string>
     <string name="store_passphrase_securely_without_recover">Tárolja el biztonságosan jelmondát, mert ha elveszti azt, akkor NEM férhet hozzá a csevegéshez.</string>
-    <string name="member_role_will_be_changed_with_invitation">A szerepkör meg fog változni erre: %s. A tag új meghívót fog kapni.</string>
-    <string name="icon_descr_profile_image_placeholder">profilkép helyőrző</string>
+    <string name="member_role_will_be_changed_with_invitation">A tag szerepköre a következőre fog módosulni: „%s”. A tag új meghívást fog kapni.</string>
+    <string name="icon_descr_profile_image_placeholder">profilkép helyőrzője</string>
     <string name="sync_connection_force_desc">A titkosítás működik, és új titkosítási egyezményre nincs szükség. Ez kapcsolati hibákat eredményezhet!</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Ez a művelet nem vonható vissza - profiljai, ismerősei, üzenetei és fájljai véglegesen törlésre kerülnek.</string>
-    <string name="info_row_updated_at">A bejegyzés frissítve</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Ez a művelet nem vonható vissza – profiljai, partnerei, üzenetei és fájljai véglegesen törölve lesznek.</string>
+    <string name="info_row_updated_at">Bejegyzés frissítve</string>
     <string name="read_more_in_user_guide_with_link"><![CDATA[További információ a <font color="#0088ff">Használati útmutatóban</font> olvasható.]]></string>
     <string name="settings_is_storing_in_clear_text">A jelmondat a beállításokban egyszerű szövegként van tárolva.</string>
     <string name="terminal_always_visible">Konzol megjelenítése új ablakban</string>
-    <string name="alert_text_msg_bad_hash">Az előző üzenet hasító értéke különbözik.</string>
-    <string name="receipts_section_description">Ezek a beállítások csak a jelenlegi profiljára vonatkoznak</string>
+    <string name="alert_text_msg_bad_hash">Az előző üzenet hasítóértéke különbözik.</string>
+    <string name="receipts_section_description">Ezek a beállítások csak a jelenlegi csevegési profiljára vonatkoznak</string>
     <string name="loading_remote_file_desc">Várjon, amíg a fájl betöltődik a társított hordozható eszközről</string>
     <string name="read_more_in_github_with_link"><![CDATA[További információ a <font color="#0088ff">GitHub tárolónkban</font>.]]></string>
-    <string name="error_showing_content">hiba a tartalom megjelenítésekor</string>
-    <string name="error_showing_message">hiba az üzenet megjelenítésekor</string>
-    <string name="you_can_make_address_visible_via_settings">Láthatóvá teheti a SimpleXbeli ismerősei számára a „Beállításokban”.</string>
-    <string name="recent_history_is_sent_to_new_members">Legfeljebb az utolsó 100 üzenet kerül elküldésre az új tagok számára.</string>
+    <string name="error_showing_content">Hiba történt a tartalom megjelenítésekor</string>
+    <string name="error_showing_message">Hiba történt az üzenet megjelenítésekor</string>
+    <string name="you_can_make_address_visible_via_settings">Láthatóvá teheti a SimpleXbeli partnerei számára a „Beállításokban”.</string>
+    <string name="recent_history_is_sent_to_new_members">Legfeljebb az utolsó 100 üzenet lesz elküldve az új tagok számára.</string>
     <string name="code_you_scanned_is_not_simplex_link_qr_code">A beolvasott QR-kód nem egy SimpleX-QR-kód-hivatkozás.</string>
     <string name="the_text_you_pasted_is_not_a_link">A beillesztett szöveg nem egy SimpleX-hivatkozás.</string>
-    <string name="you_can_view_invitation_link_again">A meghívó-hivatkozását újra megtekintheti a kapcsolat részleteinél.</string>
-    <string name="start_chat_question">Csevegés indítása?</string>
+    <string name="you_can_view_invitation_link_again">A meghívási hivatkozást újra megtekintheti a kapcsolat részleteinél.</string>
+    <string name="start_chat_question">Elindítja a csevegést?</string>
     <string name="recent_history">Látható előzmények</string>
     <string name="la_app_passcode">Alkalmazás jelkód</string>
-    <string name="add_contact_tab">Ismerős hozzáadása</string>
+    <string name="add_contact_tab">Partner hozzáadása</string>
     <string name="tap_to_scan">Koppintson ide a QR-kód beolvasásához</string>
     <string name="tap_to_paste_link">Koppintson ide a hivatkozás beillesztéséhez</string>
-    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Ismerős hozzáadása</b>: új meghívó-hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.]]></string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Partner hozzáadása</b>: új meghívási hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.]]></string>
     <string name="create_group_button_to_create_new_group"><![CDATA[<b>Csoport létrehozása</b>: új csoport létrehozásához.]]></string>
-    <string name="chat_is_stopped_you_should_transfer_database">A csevegés leállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés megkezdése előtt.</string>
-    <string name="recent_history_is_not_sent_to_new_members">Az előzmények nem kerülnek elküldésre az új tagok számára.</string>
+    <string name="chat_is_stopped_you_should_transfer_database">A csevegés megállt. Ha már használta ezt az adatbázist egy másik eszközön, úgy visszaállítás szükséges a csevegés elindítása előtt.</string>
+    <string name="recent_history_is_not_sent_to_new_members">Az előzmények nem lesznek elküldve az új tagok számára.</string>
     <string name="retry_verb">Újrapróbálkozás</string>
     <string name="camera_not_available">A kamera nem elérhető</string>
-    <string name="enable_sending_recent_history">Az utolsó 100 üzenet elküldése az új tagok számára.</string>
-    <string name="disable_sending_recent_history">Az előzmények ne kerüljenek elküldésre az új tagok számára.</string>
+    <string name="enable_sending_recent_history">Legfeljebb az utolsó 100 üzenet elküldése az új tagok számára.</string>
+    <string name="disable_sending_recent_history">Az előzmények ne legyenek elküldve az új tagok számára.</string>
     <string name="or_show_this_qr_code">Vagy mutassa meg ezt a kódot</string>
     <string name="enable_camera_access">Kamera hozzáférés engedélyezése</string>
-    <string name="keep_unused_invitation_question">Fel nem használt meghívó megtartása?</string>
-    <string name="share_this_1_time_link">Ennek az egyszer használható meghívó-hivatkozásnak a megosztása</string>
+    <string name="keep_unused_invitation_question">Megtartja a fel nem használt meghívót?</string>
+    <string name="share_this_1_time_link">Ennek az egyszer használható meghívónak a megosztása</string>
     <string name="new_chat">Új csevegés</string>
     <string name="loading_chats">Csevegések betöltése…</string>
     <string name="creating_link">Hivatkozás létrehozása…</string>
@@ -1516,7 +1515,7 @@
     <string name="agent_critical_error_title">Kritikus hiba</string>
     <string name="agent_internal_error_title">Belső hiba</string>
     <string name="remote_ctrl_error_bad_version">Nem támogatott a számítógép által használt alkalmazás verziója. Győződjön meg arról, hogy mindkét eszközön ugyanazt a verziót használja</string>
-    <string name="remote_ctrl_error_bad_invitation">Számítógép-alkalmazásban hibás meghívókód szerepel</string>
+    <string name="remote_ctrl_error_bad_invitation">A számítógépes alkalmazásban érvénytelen meghívókód szerepel</string>
     <string name="remote_ctrl_error_busy">Számítógép elfoglalt</string>
     <string name="remote_ctrl_error_inactive">Számítógép inaktív</string>
     <string name="restart_chat_button">Csevegés újraindítása</string>
@@ -1524,14 +1523,14 @@
     <string name="remote_ctrl_error_disconnected">Kapcsolat bontva a számítógéppel</string>
     <string name="remote_host_was_disconnected_title">A kapcsolat megszakadt</string>
     <string name="remote_ctrl_was_disconnected_title">A kapcsolat megszakadt</string>
-    <string name="remote_ctrl_error_bad_state">Számítógép kapcsolata rossz állapotban van</string>
+    <string name="remote_ctrl_error_bad_state">A kapcsolat a számítógéppel rossz állapotban van</string>
     <string name="agent_critical_error_desc">Jelentse a fejlesztőknek:\n%s\n\nAz alkalmazás újraindítása javasolt.</string>
     <string name="agent_internal_error_desc">Jelentse a fejlesztőknek:
 \n%s</string>
     <string name="remote_host_error_bad_version"><![CDATA[A(z) <b>%s</b> hordozható eszköz által használt alkalmazás verziója nem támogatott. Győződjön meg arról, hogy mindkét eszközön ugyanazt a verziót használja]]></string>
     <string name="remote_host_error_disconnected"><![CDATA[Kapcsolat bontva a(z) <b>%s</b> nevű hordozható eszközzel]]></string>
     <string name="failed_to_create_user_invalid_title">Érvénytelen megjelenítendő név!</string>
-    <string name="failed_to_create_user_invalid_desc">Ez a megjelenített név érvénytelen. Válasszon egy másik nevet.</string>
+    <string name="failed_to_create_user_invalid_desc">Ez a megjelenítendő név érvénytelen. Válasszon egy másik nevet.</string>
     <string name="remote_host_disconnected_from"><![CDATA[Kapcsolat bontva a(z) <b>%s</b> nevű hordozható eszközzel, a következő okból: %s]]></string>
     <string name="remote_ctrl_disconnected_with_reason">Kapcsolat bontva a következő okból: %s</string>
     <string name="remote_host_error_missing"><![CDATA[A(z) <b>%s</b> hordozható eszköz nem található]]></string>
@@ -1544,28 +1543,28 @@
     <string name="developer_options_section">Fejlesztői beállítások</string>
     <string name="possible_slow_function_desc">A funkció végrehajtása túl sokáig tart: %1$d másodperc: %2$s</string>
     <string name="remote_host_error_busy"><![CDATA[A(z) <b>%s</b> hordozható eszköz elfoglalt]]></string>
-    <string name="past_member_vName">Már nem tag %1$s</string>
+    <string name="past_member_vName">(Már nem tag) %1$s</string>
     <string name="group_member_status_unknown">ismeretlen állapot</string>
-    <string name="profile_update_event_member_name_changed">%1$s megváltoztatta a nevét erre: %2$s</string>
+    <string name="profile_update_event_member_name_changed">%1$s a következőre módosította a nevét: %2$s</string>
     <string name="profile_update_event_removed_address">eltávolította a kapcsolattartási címet</string>
     <string name="profile_update_event_removed_picture">eltávolította a profilképét</string>
-    <string name="profile_update_event_set_new_address">új kapcsolattartási cím beállítása</string>
+    <string name="profile_update_event_set_new_address">új kapcsolattartási címet állított be</string>
     <string name="profile_update_event_set_new_picture">új profilképet állított be</string>
     <string name="profile_update_event_updated_profile">frissített profil</string>
-    <string name="profile_update_event_contact_name_changed">%1$s megváltoztatta a nevét erre: %2$s</string>
+    <string name="profile_update_event_contact_name_changed">%1$s a következőre módosította a nevét: %2$s</string>
     <string name="note_folder_local_display_name">Privát jegyzetek</string>
-    <string name="error_deleting_note_folder">Hiba a privát jegyzetek törlésekor</string>
-    <string name="error_creating_message">Hiba az üzenet létrehozásakor</string>
-    <string name="clear_note_folder_question">Privát jegyzetek kiürítése?</string>
-    <string name="info_row_created_at">Létrehozva ekkor:</string>
+    <string name="error_deleting_note_folder">Hiba történt a privát jegyzetek törlésekor</string>
+    <string name="error_creating_message">Hiba történt az üzenet létrehozásakor</string>
+    <string name="clear_note_folder_question">Kiüríti a privát jegyzeteket?</string>
+    <string name="info_row_created_at">Létrehozva</string>
     <string name="saved_message_title">Mentett üzenet</string>
-    <string name="share_text_created_at">Megosztva ekkor: %s</string>
-    <string name="clear_note_folder_warning">Az összes üzenet törlésre kerül – ez a művelet nem vonható vissza!</string>
+    <string name="share_text_created_at">Létrehozva: %s</string>
+    <string name="clear_note_folder_warning">Az összes üzenet törölve lesz – ez a művelet nem vonható vissza!</string>
     <string name="v5_5_message_delivery">Továbbfejlesztett üzenetkézbesítés</string>
     <string name="v5_5_join_group_conversation">Csatlakozás csoportos beszélgetésekhez</string>
     <string name="v5_5_simpler_connect_ui">Hivatkozás beillesztése a kapcsolódáshoz!</string>
     <string name="v5_5_private_notes">Privát jegyzetek</string>
-    <string name="v5_5_simpler_connect_ui_descr">A keresősáv elfogadja a meghívó-hivatkozásokat.</string>
+    <string name="v5_5_simpler_connect_ui_descr">A keresősáv elfogadja a meghívási hivatkozásokat.</string>
     <string name="v5_5_private_notes_descr">Titkosított fájlokkal és médiatartalmakkal.</string>
     <string name="v5_5_message_delivery_descr">Csökkentett akkumulátor-használattal.</string>
     <string name="v5_5_new_interface_languages">Magyar és török kezelőfelület</string>
@@ -1576,29 +1575,29 @@
     <string name="blocked_by_admin_item_description">letiltva az adminisztrátor által</string>
     <string name="member_blocked_by_admin">Letiltva az adminisztrátor által</string>
     <string name="rcv_group_event_member_blocked">letiltotta őt: %s</string>
-    <string name="block_for_all">Letiltás az összes tag számára</string>
-    <string name="block_for_all_question">Az összes tag számára letiltja ezt a tagot?</string>
+    <string name="block_for_all">Letiltás</string>
+    <string name="block_for_all_question">Az összes tag számára letiltja a tagot?</string>
     <string name="blocked_by_admin_items_description">%d üzenetet letiltott az adminisztrátor</string>
-    <string name="unblock_for_all">Letiltás feloldása az összes tag számára</string>
+    <string name="unblock_for_all">Feloldás</string>
     <string name="unblock_for_all_question">Az összes tag számára feloldja a tag letiltását?</string>
     <string name="snd_group_event_member_blocked">Ön letiltotta őt: %s</string>
-    <string name="error_blocking_member_for_all">Hiba a tag az összes csoporttag számára való letiltásakor</string>
+    <string name="error_blocking_member_for_all">Hiba történt a tag az összes csoporttag számára való letiltásakor</string>
     <string name="message_too_large">Az üzenet túl nagy</string>
     <string name="welcome_message_is_too_long">Az üdvözlőüzenet túl hosszú</string>
     <string name="database_migration_in_progress">Az adatbázis átköltöztetése folyamatban van.\nEz eltarthat néhány percig.</string>
     <string name="call_service_notification_audio_call">Hanghívás</string>
     <string name="call_service_notification_end_call">A hívás befejeződött</string>
     <string name="call_service_notification_video_call">Videóhívás</string>
-    <string name="unable_to_open_browser_title">Hiba a böngésző megnyitásakor</string>
+    <string name="unable_to_open_browser_title">Hiba történt a böngésző megnyitásakor</string>
     <string name="unable_to_open_browser_desc">A hívásokhoz egy alapértelmezett webböngésző szükséges. Állítson be egy alapértelmezett webböngészőt az eszközön, és osszon meg további információkat a SimpleX Chat fejlesztőivel.</string>
     <string name="migrate_to_device_confirm_network_settings">Hálózati beállítások megerősítése</string>
-    <string name="migrate_from_device_error_exporting_archive">Hiba a csevegési adatbázis exportálásakor</string>
+    <string name="migrate_from_device_error_exporting_archive">Hiba történt a csevegési adatbázis exportálásakor</string>
     <string name="migrate_to_device_apply_onion">Alkalmaz</string>
     <string name="migrate_from_device_archive_and_upload">Archiválás és feltöltés</string>
     <string name="migrate_from_device_confirm_upload">Feltöltés megerősítése</string>
-    <string name="migrate_from_device_error_deleting_database">Hiba az adatbázis törlésekor</string>
+    <string name="migrate_from_device_error_deleting_database">Hiba történt az adatbázis törlésekor</string>
     <string name="v5_6_safer_groups_descr">Az adminisztrátorok egy tagot a csoport összes tagja számára letilthatnak.</string>
-    <string name="migrate_from_device_all_data_will_be_uploaded">Az összes ismerőse, -beszélgetése és -fájlja biztonságosan titkosításra kerülnek, melyek részletekben feltöltődnek a beállított XFTP-közvetítő-kiszolgálóra.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Az összes partnere, -beszélgetése és -fájlja biztonságosan titkosítva lesz, majd töredékekre bontva feltöltődnek a beállított XFTP-továbbítókiszolgálókra.</string>
     <string name="v5_6_app_data_migration">Alkalmazásadatok átköltöztetése</string>
     <string name="migrate_from_device_archiving_database">Adatbázis archiválása</string>
     <string name="migrate_from_device_cancel_migration">Átköltöztetés visszavonása</string>
@@ -1610,13 +1609,13 @@
     <string name="migrate_to_device_downloading_archive">Archívum letöltése</string>
     <string name="migrate_to_device_downloading_details">Letöltési hivatkozás részletei</string>
     <string name="v5_6_quantum_resistant_encryption_descr">Engedélyezés a közvetlen csevegésekben (BÉTA)!</string>
-    <string name="migrate_to_device_enter_passphrase">Jelmondat megadása</string>
-    <string name="migrate_from_device_error_saving_settings">Hiba a beállítások mentésekor</string>
-    <string name="migrate_to_device_error_downloading_archive">Hiba az archívum letöltésekor</string>
-    <string name="migrate_from_device_error_uploading_archive">Hiba az archívum feltöltésekor</string>
-    <string name="migrate_from_device_error_verifying_passphrase">Hiba a jelmondat hitelesítésekor:</string>
+    <string name="migrate_to_device_enter_passphrase">Adja meg a jelmondatot</string>
+    <string name="migrate_from_device_error_saving_settings">Hiba történt a beállítások mentésekor</string>
+    <string name="migrate_to_device_error_downloading_archive">Hiba történt az archívum letöltésekor</string>
+    <string name="migrate_from_device_error_uploading_archive">Hiba történt az archívum feltöltésekor</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Hiba történt a jelmondat hitelesítésekor:</string>
     <string name="migrate_from_device_exported_file_doesnt_exist">Az exportált fájl nem létezik</string>
-    <string name="migrate_to_device_file_delete_or_link_invalid">A fájl törlésre került, vagy érvénytelen hivatkozás</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">A fájl törölve lett, vagy érvénytelen a hivatkozás</string>
     <string name="migrate_to_device_bytes_downloaded">%s letöltve</string>
     <string name="migrate_to_device_importing_archive">Archívum importálása</string>
     <string name="migrate_from_device_database_init">Feltöltés előkészítése</string>
@@ -1629,7 +1628,7 @@
     <string name="or_paste_archive_link">Vagy az archívum hivatkozásának beillesztése</string>
     <string name="paste_archive_link">Archívum hivatkozásának beillesztése</string>
     <string name="migrate_to_device_repeat_download">Letöltés ismét</string>
-    <string name="migrate_to_device_import_failed">Sikertelen importálás</string>
+    <string name="migrate_to_device_import_failed">Nem sikerült az importálás</string>
     <string name="migrate_to_device_confirm_network_settings_footer">Ellenőrizze, hogy a hálózati beállítások megfelelők-e ehhez az eszközhöz.</string>
     <string name="migrate_from_device_chat_should_be_stopped">A folytatáshoz a csevegést meg kell szakítani.</string>
     <string name="migrate_from_device_stopping_chat">Csevegés megállítása folyamatban</string>
@@ -1645,29 +1644,29 @@
     <string name="migrate_from_device_bytes_uploaded">%s feltöltve</string>
     <string name="migrate_from_device_upload_failed">Sikertelen feltöltés</string>
     <string name="migrate_from_device_uploading_archive">Archívum feltöltése</string>
-    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, és üzenetkézbesítési hibákat okozhat</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Figyelmeztetés: a csevegés elindítása egyszerre több eszközön nem támogatott, mert üzenetkézbesítési hibákat okoz</string>
     <string name="migrate_to_device_repeat_import">Importálás ismét</string>
     <string name="conn_event_disabled_pq">szabványos végpontok közötti titkosítás</string>
     <string name="migrate_to_device_title">Átköltöztetés ide</string>
     <string name="migrate_from_device_title">Eszköz átköltöztetése</string>
     <string name="migrate_from_device_to_another_device">Átköltöztetés egy másik eszközre</string>
-    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Figyelmeztetés:</b> az archívum törlésre kerül.]]></string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Figyelmeztetés:</b> az archívum törölve lesz.]]></string>
     <string name="migrate_from_another_device">Átköltöztetés egy másik eszközről</string>
-    <string name="v5_6_quantum_resistant_encryption">Kvantumrezisztens titkosítás</string>
+    <string name="v5_6_quantum_resistant_encryption">Kvantumbiztos titkosítás</string>
     <string name="migrate_from_device_try_again">Megpróbálhatja még egyszer.</string>
     <string name="migrate_from_device_migration_complete">Átköltöztetés befejezve</string>
     <string name="v5_6_app_data_migration_descr">Átköltöztetés egy másik eszközre QR-kód használatával.</string>
     <string name="migrate_to_device_migrating">Átköltöztetés</string>
-    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Megjegyzés:</b> ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja az ismerőseitől érkező üzenetek visszafejtését.]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Megjegyzés:</b> ha két eszközön is ugyanazt az adatbázist használja, akkor biztonsági védelemként megszakítja a partnereitől érkező üzenetek visszafejtését.]]></string>
     <string name="migrate_to_device_try_again">Megpróbálhatja még egyszer.</string>
     <string name="invalid_file_link">Érvénytelen hivatkozás</string>
-    <string name="conn_event_enabled_pq">végpontok közötti kvantumrezisztens titkosítás</string>
+    <string name="conn_event_enabled_pq">végpontok közötti kvantumbiztos titkosítás</string>
     <string name="e2ee_info_no_pq_short">Ez a csevegés végpontok közötti titkosítással védett.</string>
     <string name="auth_open_migration_to_another_device">Átköltöztetési párbeszédablak megnyitása</string>
-    <string name="e2ee_info_pq_short">Ez a csevegés végpontok közötti kvantumrezisztens tikosítással védett.</string>
-    <string name="e2ee_info_no_pq"><![CDATA[Az üzeneteket, fájlokat és hívásokat <b>végpontok közötti titkosítással</b>, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.]]></string>
-    <string name="e2ee_info_pq"><![CDATA[Az üzeneteket, fájlokat és hívásokat <b>végpontok közötti kvantumrezisztens titkosítással</b>, sérülés utáni titkosság-védelemmel és -helyreállítással, továbbá visszautasítással védi.]]></string>
-    <string name="error_showing_desktop_notification">Hiba az értesítés megjelenítésekor, lépjen kapcsolatba a fejlesztőkkel.</string>
+    <string name="e2ee_info_pq_short">Ez a csevegés végpontok közötti kvantumbiztos titkosítással védett.</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Az üzenetek, a fájlok és a hívások <b>végpontok közötti titkosítással</b>, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Az üzenetek, a fájlok és a hívások <b>végpontok közötti kvantumbiztos titkosítással</b>, kompromittálás előtti és utáni titkosságvédelemmel, illetve letagadhatósággal vannak védve.]]></string>
+    <string name="error_showing_desktop_notification">Hiba történt az értesítés megjelenítésekor, lépjen kapcsolatba a fejlesztőkkel.</string>
     <string name="permissions_find_in_settings_and_grant">Keresse meg ezt az engedélyt az Android beállításaiban, és adja meg kézzel.</string>
     <string name="permissions_grant_in_settings">Engedélyezés a beállításokban</string>
     <string name="permissions_grant">Engedély(ek) megadása a hívások kezdeményezéséhez</string>
@@ -1678,7 +1677,7 @@
     <string name="permissions_required">Engedélyek megadása</string>
     <string name="network_type_ethernet">Vezetékes Ethernet</string>
     <string name="network_type_cellular">Mobilhálózat</string>
-    <string name="settings_section_title_network_connection">Internetkapcsolat</string>
+    <string name="settings_section_title_network_connection">Hálózati kapcsolat</string>
     <string name="network_type_no_network_connection">Nincs hálózati kapcsolat</string>
     <string name="network_type_other">További</string>
     <string name="network_type_network_wifi">Wi-Fi</string>
@@ -1694,13 +1693,13 @@
     <string name="prohibit_sending_simplex_links">A SimpleX-hivatkozások küldése le van tiltva</string>
     <string name="files_and_media_not_allowed">A fájlok- és médiatartalmak nincsenek engedélyezve</string>
     <string name="allow_to_send_simplex_links">A SimpleX-hivatkozások küldése engedélyezve van.</string>
-    <string name="feature_enabled_for">Számukra engedélyezve:</string>
+    <string name="feature_enabled_for">Számukra engedélyezve</string>
     <string name="saved_description">mentett</string>
     <string name="saved_from_description">elmentve innen: %s</string>
-    <string name="forwarded_from_chat_item_info_title">Továbbítva innen:</string>
+    <string name="forwarded_from_chat_item_info_title">Továbbítva innen</string>
     <string name="recipients_can_not_see_who_message_from">A címzett(ek) nem látja(k), hogy kitől származik ez az üzenet.</string>
     <string name="saved_chat_item_info_tab">Mentett</string>
-    <string name="saved_from_chat_item_info_title">Elmentve innen:</string>
+    <string name="saved_from_chat_item_info_title">Elmentve innen</string>
     <string name="download_file">Letöltés</string>
     <string name="forward_chat_item">Továbbítás</string>
     <string name="forwarded_chat_item_info_tab">Továbbított</string>
@@ -1719,45 +1718,45 @@
     <string name="v5_7_call_sounds">Bejövő hívás csengőhangja</string>
     <string name="v5_7_forward_descr">Az üzenet forrása titokban marad.</string>
     <string name="settings_section_title_profile_images">Profilképek</string>
-    <string name="v5_7_shape_profile_images">Profilkép alakzat</string>
+    <string name="v5_7_shape_profile_images">Profilkép alakzata</string>
     <string name="v5_7_shape_profile_images_descr">Négyzet, kör vagy bármi a kettő között.</string>
     <string name="snd_error_relay">Célkiszolgáló-hiba: %1$s</string>
-    <string name="snd_error_proxy">Továbbító kiszolgáló: %1$s\nHiba: %2$s</string>
-    <string name="snd_error_expired">Hálózati problémák - az üzenet többszöri elküldési kísérlet után lejárt.</string>
+    <string name="snd_error_proxy">Továbbítókiszolgáló: %1$s\nHiba: %2$s</string>
+    <string name="snd_error_expired">Hálózati problémák – az üzenet többszöri elküldési kísérlet után lejárt.</string>
     <string name="srv_error_version">A kiszolgáló verziója nem kompatibilis a hálózati beállításokkal.</string>
-    <string name="snd_error_auth">Hibás kulcs vagy ismeretlen kapcsolat - valószínűleg ez a kapcsolat törlődött.</string>
-    <string name="snd_error_proxy_relay">Továbbító-kiszolgáló: %1$s\nCélkiszolgáló hiba: %2$s</string>
+    <string name="snd_error_auth">Érvénytelen kulcs vagy ismeretlen kapcsolat – valószínűleg ez a kapcsolat törlődött.</string>
+    <string name="snd_error_proxy_relay">Továbbítókiszolgáló: %1$s\nCélkiszolgáló-hiba: %2$s</string>
     <string name="ci_status_other_error">Hiba: %1$s</string>
-    <string name="snd_error_quota">Kapacitás túllépés - a címzett nem kapta meg a korábban elküldött üzeneteket.</string>
+    <string name="snd_error_quota">Kapacitás túllépés – a címzett nem kapta meg a korábban elküldött üzeneteket.</string>
     <string name="message_delivery_warning_title">Üzenetkézbesítési figyelmeztetés</string>
     <string name="srv_error_host">A kiszolgáló címe nem kompatibilis a hálózati beállításokkal.</string>
     <string name="network_smp_proxy_mode_never">Soha</string>
     <string name="network_smp_proxy_mode_unknown">Ismeretlen kiszolgálók</string>
     <string name="network_smp_proxy_fallback_allow_protected">Ha az IP-cím rejtett</string>
-    <string name="private_routing_show_message_status">Üzenetállapot megjelenítése</string>
+    <string name="private_routing_show_message_status">Üzenet állapotának megjelenítése</string>
     <string name="network_smp_proxy_fallback_allow_downgrade">Visszafejlesztés engedélyezése</string>
     <string name="network_smp_proxy_mode_always">Mindig</string>
     <string name="network_smp_proxy_fallback_prohibit">Nem</string>
     <string name="network_smp_proxy_mode_unprotected">Nem védett</string>
     <string name="network_smp_proxy_fallback_allow">Igen</string>
-    <string name="network_smp_proxy_mode_never_description">Ne használjon privát útválasztást.</string>
+    <string name="network_smp_proxy_mode_never_description">NE használjon privát útválasztást.</string>
     <string name="network_smp_proxy_mode_private_routing">Privát útválasztás</string>
     <string name="network_smp_proxy_mode_unknown_description">Használjon privát útválasztást ismeretlen kiszolgálókkal.</string>
     <string name="network_smp_proxy_mode_always_description">Mindig használjon privát útválasztást.</string>
     <string name="update_network_smp_proxy_mode_question">Üzenet-útválasztási mód</string>
-    <string name="network_smp_proxy_fallback_allow_protected_description">Közvetlen üzenetküldés, ha az IP-cím védett és az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
-    <string name="network_smp_proxy_fallback_allow_description">Közvetlen üzenetküldés, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
+    <string name="network_smp_proxy_fallback_allow_protected_description">Közvetlen üzenetküldés, ha az IP-cím védett és a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
+    <string name="network_smp_proxy_fallback_allow_description">Közvetlen üzenetküldés, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
     <string name="private_routing_explanation">Az IP-cím védelmének érdekében a privát útválasztás az SMP-kiszolgálókat használja az üzenetek kézbesítéséhez.</string>
     <string name="update_network_smp_proxy_fallback_question">Üzenet-útválasztási tartalék</string>
     <string name="settings_section_title_private_message_routing">PRIVÁT ÜZENET-ÚTVÁLASZTÁS</string>
-    <string name="network_smp_proxy_mode_unprotected_description">Használjon privát útválasztást ismeretlen kiszolgálókkal, ha az IP-cím nem védett.</string>
-    <string name="network_smp_proxy_fallback_prohibit_description">Ne küldjön üzeneteket közvetlenül, még akkor sem, ha az Ön kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
-    <string name="without_tor_or_vpn_ip_address_will_be_visible_to_file_servers">Tor vagy VPN nélkül az IP-címe látható lesz a fájlkiszolgálók számára.</string>
+    <string name="network_smp_proxy_mode_unprotected_description">Használjon privát útválasztást az ismeretlen kiszolgálókkal, ha az IP-cím nem védett.</string>
+    <string name="network_smp_proxy_fallback_prohibit_description">NE küldjön üzeneteket közvetlenül, még akkor sem, ha a saját kiszolgálója vagy a célkiszolgáló nem támogatja a privát útválasztást.</string>
+    <string name="without_tor_or_vpn_ip_address_will_be_visible_to_file_servers">Tor vagy VPN nélkül az IP-címe láthatóvá válik a fájlkiszolgálók számára.</string>
     <string name="settings_section_title_files">FÁJLOK</string>
     <string name="protect_ip_address">IP-cím védelme</string>
-    <string name="app_will_ask_to_confirm_unknown_file_servers">Az alkalmazás kérni fogja az ismeretlen fájlkiszolgálókról történő letöltések megerősítését (kivéve, ha az .onion vagy a SOCKS proxy engedélyezve van).</string>
+    <string name="app_will_ask_to_confirm_unknown_file_servers">Az alkalmazás kérni fogja az ismeretlen fájlkiszolgálókról történő letöltések megerősítését (kivéve, ha az .onion vagy a SOCKS-proxy engedélyezve van).</string>
     <string name="file_not_approved_title">Ismeretlen kiszolgálók!</string>
-    <string name="file_not_approved_descr">Tor vagy VPN nélkül az IP-címe látható lesz az XFTP-közvetítő-kiszolgálók számára:\n%1$s.</string>
+    <string name="file_not_approved_descr">Tor vagy VPN nélkül az IP-címe láthatóvá válik a következő XFTP-továbbítókiszolgálók számára:\n%1$s.</string>
     <string name="chat_theme_apply_to_all_modes">Összes színmód</string>
     <string name="theme_black">Fekete</string>
     <string name="color_mode">Színmód</string>
@@ -1773,7 +1772,7 @@
     <string name="settings_section_title_chat_theme">Csevegés témája</string>
     <string name="wallpaper_scale_fill">Kitöltés</string>
     <string name="settings_section_title_user_theme">Profiltéma</string>
-    <string name="chat_list_always_visible">Csevegőlista megjelenítése új ablakban</string>
+    <string name="chat_list_always_visible">Csevegési lista megjelenítése új ablakban</string>
     <string name="color_mode_light">Világos</string>
     <string name="chat_theme_apply_to_light_mode">Világos mód</string>
     <string name="color_received_quote">Fogadott válaszüzenet-buborék színe</string>
@@ -1784,12 +1783,12 @@
     <string name="color_sent_quote">Válaszüzenet-buborék színe</string>
     <string name="chat_theme_set_default_theme">Alapértelmezett téma beállítása</string>
     <string name="color_mode_system">Rendszer</string>
-    <string name="color_wallpaper_tint">Háttérkép kiemelés</string>
+    <string name="color_wallpaper_tint">Háttérkép kiemelőszíne</string>
     <string name="color_wallpaper_background">Háttérkép háttérszíne</string>
-    <string name="color_primary_variant2">További kiemelés 2</string>
+    <string name="color_primary_variant2">További kiemelőszín 2</string>
     <string name="theme_destination_app_theme">Alkalmazás téma</string>
     <string name="v5_8_persian_ui">Perzsa kezelőfelület</string>
-    <string name="v5_8_private_routing_descr">Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.\nEngedélyezze a *Hálózat és kiszolgálók* menüben.</string>
+    <string name="v5_8_private_routing_descr">Védje az IP-címét a partnerei által kiválasztott üzenetváltási továbbítókiszolgálókkal szemben.\nEngedélyezze a *Hálózat és kiszolgálók* menüben.</string>
     <string name="v5_8_safe_files_descr">Ismeretlen kiszolgálókról származó fájlok megerősítése.</string>
     <string name="v5_8_message_delivery">Javított üzenetkézbesítés</string>
     <string name="chat_theme_reset_to_app_theme">Alkalmazás témájának visszaállítása</string>
@@ -1798,26 +1797,26 @@
     <string name="v5_8_private_routing">Privát üzenet-útválasztás 🚀</string>
     <string name="v5_8_safe_files">Fájlok biztonságos fogadása</string>
     <string name="v5_8_message_delivery_descr">Csökkentett akkumulátor-használattal.</string>
-    <string name="error_initializing_web_view">Hiba a WebView előkészítésekor. Frissítse rendszerét az új verzióra. Lépjen kapcsolatba a fejlesztőkkel.\nHiba: %s</string>
+    <string name="error_initializing_web_view">Hiba történt a WebView előkészítésekor. Frissítse rendszerét az új verzióra. Lépjen kapcsolatba a fejlesztőkkel.\nHiba: %s</string>
     <string name="chat_theme_reset_to_user_theme">Felhasználó által létrehozott téma visszaállítása</string>
-    <string name="message_queue_info">Üzenet-sorbaállítási információ</string>
+    <string name="message_queue_info">Üzenetsorbaállítási információ</string>
     <string name="message_queue_info_none">nincs</string>
     <string name="info_row_debug_delivery">Kézbesítési hibák felderítése</string>
-    <string name="message_queue_info_server_info">a kiszolgáló sorbaállítási információi: %1$s\n\nutoljára kézbesített üzenet: %2$s</string>
-    <string name="file_error_auth">Hibás kulcs vagy ismeretlen fájltöredék cím - valószínűleg a fájl törlődött.</string>
-    <string name="temporary_file_error">Ideiglenesfájl-hiba</string>
-    <string name="info_row_message_status">Üzenetállapot</string>
-    <string name="share_text_message_status">Üzenetállapot: %s</string>
+    <string name="message_queue_info_server_info">a kiszolgáló sorbaállítási információi: %1$s\n\nutoljára fogadott üzenet: %2$s</string>
+    <string name="file_error_auth">Érvénytelen kulcs vagy ismeretlen fájltöredékcím – valószínűleg a fájl törlődött.</string>
+    <string name="temporary_file_error">Ideiglenes fájlhiba</string>
+    <string name="info_row_message_status">Üzenet állapota</string>
+    <string name="share_text_message_status">Üzenet állapota: %s</string>
     <string name="file_error">Fájlhiba</string>
-    <string name="file_error_no_file">A fájl nem található - valószínűleg a fájlt törölték vagy visszavonták.</string>
+    <string name="file_error_no_file">A fájl nem található – valószínűleg a fájlt törölték vagy visszavonták.</string>
     <string name="file_error_relay">Fájlkiszolgáló-hiba: %1$s</string>
-    <string name="info_row_file_status">Fájlállapot</string>
-    <string name="share_text_file_status">Fájlállapot: %s</string>
+    <string name="info_row_file_status">Fájl állapota</string>
+    <string name="share_text_file_status">Fájl állapota: %s</string>
     <string name="copy_error">Másolási hiba</string>
     <string name="remote_ctrl_connection_stopped_identity_desc">Ezt a hivatkozást egy másik hordozható eszközön már használták, hozzon létre egy új hivatkozást a számítógépén.</string>
     <string name="remote_ctrl_connection_stopped_desc">Ellenőrizze, hogy a hordozható eszköz és a számítógép ugyanahhoz a helyi hálózathoz csatlakozik-e, valamint a számítógép tűzfalában engedélyezve van-e a kapcsolat.\nMinden további problémát osszon meg a fejlesztőkkel.</string>
     <string name="cannot_share_message_alert_title">Nem lehet üzenetet küldeni</string>
-    <string name="cannot_share_message_alert_text">A kiválasztott csevegési beállítások tiltják ezt az üzenetet.</string>
+    <string name="cannot_share_message_alert_text">A kijelölt csevegési beállítások tiltják ezt az üzenetet.</string>
     <string name="please_try_later">Próbálja meg később.</string>
     <string name="network_error_broker_host_desc">A kiszolgáló címe nem kompatibilis a hálózati beállításokkal: %1$s.</string>
     <string name="member_inactive_title">Inaktív tag</string>
@@ -1835,18 +1834,18 @@
     <string name="servers_info_sessions_connecting">Kapcsolódás</string>
     <string name="servers_info_sessions_errors">Hibák</string>
     <string name="servers_info_subscriptions_connections_pending">Függőben</string>
-    <string name="servers_info_private_data_disclaimer">Statisztikagyűjtés kezdete: %s.\nAz összes adat biztonságban van az eszközén.</string>
+    <string name="servers_info_private_data_disclaimer">Statisztikagyűjtés kezdete: %s.\nAz összes adat privát módon van tárolva az eszközén.</string>
     <string name="servers_info_messages_sent">Elküldött üzenetek</string>
     <string name="servers_info_proxied_servers_section_header">Proxyzott kiszolgálók</string>
-    <string name="servers_info_reconnect_servers_title">Újrakapcsolódás a kiszolgálókhoz?</string>
-    <string name="servers_info_reconnect_server_title">Újrakapcsolódás a kiszolgálóhoz?</string>
-    <string name="servers_info_reconnect_server_error">Hiba a kiszolgálóhoz való újrakapcsolódáskor</string>
+    <string name="servers_info_reconnect_servers_title">Újrakapcsolódik a kiszolgálókhoz?</string>
+    <string name="servers_info_reconnect_server_title">Újrakapcsolódik a kiszolgálóhoz?</string>
+    <string name="servers_info_reconnect_server_error">Hiba történt a kiszolgálóhoz való újrakapcsolódáskor</string>
     <string name="servers_info_reconnect_all_servers_button">Újrakapcsolódás az összes kiszolgálóhoz</string>
-    <string name="servers_info_reset_stats_alert_error_title">Hiba a statisztikák visszaállításakor</string>
+    <string name="servers_info_reset_stats_alert_error_title">Hiba történt a statisztikák visszaállításakor</string>
     <string name="servers_info_reset_stats_alert_confirm">Visszaállítás</string>
     <string name="servers_info_reset_stats">Az összes statisztika visszaállítása</string>
-    <string name="servers_info_reset_stats_alert_title">Az összes statisztika visszaállítása?</string>
-    <string name="servers_info_reset_stats_alert_message">A kiszolgálók statisztikái visszaállnak - ez a művelet nem vonható vissza!</string>
+    <string name="servers_info_reset_stats_alert_title">Visszaállítja az összes statisztikát?</string>
+    <string name="servers_info_reset_stats_alert_message">A kiszolgálók statisztikái visszaállnak – ez a művelet nem vonható vissza!</string>
     <string name="servers_info_detailed_statistics">Részletes statisztikák</string>
     <string name="servers_info_downloaded">Letöltve</string>
     <string name="expired_label">lejárt</string>
@@ -1857,7 +1856,7 @@
     <string name="send_errors">Üzenetküldési hibák</string>
     <string name="sent_directly">Közvetlenül küldött</string>
     <string name="servers_info_detailed_statistics_sent_messages_total">Összes elküldött üzenet</string>
-    <string name="sent_via_proxy">Proxyn keresztül küldve</string>
+    <string name="sent_via_proxy">Proxyn keresztül küldött</string>
     <string name="smp_server">SMP-kiszolgáló</string>
     <string name="servers_info_starting_from">Statisztikagyűjtés kezdete: %s.</string>
     <string name="servers_info_uploaded">Feltöltve</string>
@@ -1871,17 +1870,17 @@
     <string name="deletion_errors">Törlési hibák</string>
     <string name="size">Méret</string>
     <string name="uploaded_files">Feltöltött fájlok</string>
-    <string name="chunks_downloaded">Letöltött fájltöredékek</string>
+    <string name="chunks_downloaded">Letöltött töredékek</string>
     <string name="downloaded_files">Letöltött fájlok</string>
     <string name="open_server_settings_button">Kiszolgáló-beállítások megnyitása</string>
     <string name="server_address">Kiszolgáló címe</string>
     <string name="upload_errors">Feltöltési hibák</string>
-    <string name="acknowledged">Nyugtázva</string>
-    <string name="acknowledgement_errors">Nyugtázott hibák</string>
+    <string name="acknowledged">Visszaigazolt</string>
+    <string name="acknowledgement_errors">Visszaigazolási hibák</string>
     <string name="attempts_label">próbálkozások</string>
-    <string name="chunks_deleted">Törölt fájltöredékek</string>
+    <string name="chunks_deleted">Törölt töredékek</string>
     <string name="all_users">Összes profil</string>
-    <string name="chunks_uploaded">Feltöltött fájltöredékek</string>
+    <string name="chunks_uploaded">Feltöltött töredékek</string>
     <string name="completed">Elkészült</string>
     <string name="servers_info_connected_servers_section_header">Kapcsolódott kiszolgálók</string>
     <string name="xftp_servers_configured">Konfigurált XFTP-kiszolgálók</string>
@@ -1893,7 +1892,7 @@
     <string name="servers_info_messages_received">Fogadott üzenetek</string>
     <string name="download_errors">Letöltési hibák</string>
     <string name="servers_info_modal_error_title">Hiba</string>
-    <string name="servers_info_reconnect_servers_error">Hiba a kiszolgálókhoz való újrakapcsolódáskor</string>
+    <string name="servers_info_reconnect_servers_error">Hiba történt a kiszolgálókhoz való újrakapcsolódáskor</string>
     <string name="servers_info_files_tab">Fájlok</string>
     <string name="appearance_font_size">Betűméret</string>
     <string name="servers_info_missing">Nincs információ, próbálja meg újratölteni</string>
@@ -1906,7 +1905,7 @@
     <string name="servers_info_transport_sessions_section_header">Munkamenetek átvitele</string>
     <string name="servers_info_subscriptions_total">Összes kapcsolat</string>
     <string name="servers_info_statistics_section_header">Statisztikák</string>
-    <string name="servers_info_target">Információk megjelenítése ehhez:</string>
+    <string name="servers_info_target">Információk megjelenítése a következőhöz</string>
     <string name="network_error_broker_version_desc">A kiszolgáló verziója nem kompatibilis az alkalmazással: %1$s.</string>
     <string name="servers_info_proxied_servers_section_footer">Ön nem kapcsolódik ezekhez a kiszolgálókhoz. A privát útválasztás az üzenetek kézbesítésére szolgál.</string>
     <string name="servers_info_subscriptions_connections_subscribed">Aktív kapcsolatok száma</string>
@@ -1919,96 +1918,96 @@
     <string name="app_check_for_updates">Frissítések keresése</string>
     <string name="app_check_for_updates_notice_title">Frissítések keresése</string>
     <string name="app_check_for_updates_download_started">Alkalmazásfrissítés letöltése, ne zárja be az alkalmazást</string>
-    <string name="app_check_for_updates_button_download">Letöltés - %s (%s)</string>
+    <string name="app_check_for_updates_button_download">Letöltés – %s (%s)</string>
     <string name="app_check_for_updates_installed_successfully_title">Sikeresen telepítve</string>
     <string name="app_check_for_updates_button_install">Frissítés telepítése</string>
     <string name="app_check_for_updates_button_open">Fájl helyének megnyitása</string>
     <string name="app_check_for_updates_installed_successfully_desc">Indítsa újra az alkalmazást.</string>
     <string name="app_check_for_updates_button_remind_later">Emlékeztessen később</string>
-    <string name="app_check_for_updates_button_skip">Hagyja ki ezt a verziót</string>
+    <string name="app_check_for_updates_button_skip">Ezen verzió kihagyása</string>
     <string name="app_check_for_updates_notice_desc">Ha értesítést szeretne kapni az új kiadásokról, kapcsolja be a stabil vagy béta verziók időszakos ellenőrzését.</string>
-    <string name="app_check_for_updates_update_available">Frissítés érhető el: %s</string>
+    <string name="app_check_for_updates_update_available">Új verzió érhető el: %s</string>
     <string name="app_check_for_updates_canceled">A frissítés letöltése megszakítva</string>
     <string name="app_check_for_updates_beta">Béta</string>
     <string name="app_check_for_updates_notice_disable">Letiltás</string>
     <string name="app_check_for_updates_disabled">Letiltva</string>
     <string name="app_check_for_updates_stable">Stabil</string>
-    <string name="smp_proxy_error_connecting">Hiba a(z) %1$s továbbító-kiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</string>
-    <string name="proxy_destination_error_broker_version">A(z) %1$s célkiszolgáló verziója nem kompatibilis a(z) %2$s továbbító kiszolgálóval.</string>
-    <string name="proxy_destination_error_failed_to_connect">A(z) %1$s továbbító-kiszolgáló nem tudott csatlakozni a(z) %2$s célkiszolgálóhoz. Próbálja meg később.</string>
-    <string name="proxy_destination_error_broker_host">A(z) %1$s célkiszolgáló címe nem kompatibilis a(z) %2$s továbbító-kiszolgáló beállításaival.</string>
+    <string name="smp_proxy_error_connecting">Hiba történt a(z) %1$s továbbítókiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</string>
+    <string name="proxy_destination_error_broker_version">A(z) %1$s célkiszolgáló verziója nem kompatibilis a(z) %2$s továbbítókiszolgálóval.</string>
+    <string name="proxy_destination_error_failed_to_connect">A(z) %1$s továbbítókiszolgáló nem tudott kapcsolódni a(z) %2$s célkiszolgálóhoz. Próbálja meg később.</string>
+    <string name="proxy_destination_error_broker_host">A(z) %1$s célkiszolgáló címe nem kompatibilis a(z) %2$s továbbítókiszolgáló beállításaival.</string>
     <string name="privacy_media_blur_radius">Médiatartalom elhomályosítása</string>
     <string name="privacy_media_blur_radius_medium">Közepes</string>
     <string name="privacy_media_blur_radius_off">Kikapcsolva</string>
     <string name="privacy_media_blur_radius_soft">Enyhe</string>
     <string name="privacy_media_blur_radius_strong">Erős</string>
-    <string name="smp_proxy_error_broker_host">A továbbító-kiszolgáló címe nem kompatibilis a hálózati beállításokkal: %1$s.</string>
-    <string name="smp_proxy_error_broker_version">A továbbító-kiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %1$s.</string>
+    <string name="smp_proxy_error_broker_host">A továbbítókiszolgáló címe nem kompatibilis a hálózati beállításokkal: %1$s.</string>
+    <string name="smp_proxy_error_broker_version">A továbbítókiszolgáló verziója nem kompatibilis a hálózati beállításokkal: %1$s.</string>
     <string name="info_view_call_button">hívás</string>
-    <string name="delete_contact_cannot_undo_warning">Az ismerős törlésre fog kerülni - ez a művelet nem vonható vissza!</string>
+    <string name="delete_contact_cannot_undo_warning">A partner törölve lesz – ez a művelet nem vonható vissza!</string>
     <string name="only_delete_conversation">Csak a beszélgetés törlése</string>
     <string name="info_view_open_button">megnyitás</string>
     <string name="conversation_deleted">Beszélgetés törölve!</string>
-    <string name="contact_deleted">Ismerős törölve!</string>
-    <string name="deleted_chats">Archivált ismerősök</string>
-    <string name="no_filtered_contacts">Nincsenek szűrt ismerősök</string>
+    <string name="contact_deleted">Partner törölve!</string>
+    <string name="deleted_chats">Archivált partnerek</string>
+    <string name="no_filtered_contacts">Nincsenek szűrt partnerek</string>
     <string name="paste_link">Hivatkozás beillesztése</string>
     <string name="calls_prohibited_alert_title">A hívások le vannak tiltva!</string>
-    <string name="cant_call_contact_alert_title">Nem lehet felhívni az ismerőst</string>
+    <string name="cant_call_contact_alert_title">Nem lehet felhívni a partnert</string>
     <string name="cant_send_message_to_member_alert_title">Nem lehet üzenetet küldeni a csoporttagnak</string>
-    <string name="cant_call_contact_connecting_wait_alert_text">Kapcsolódás az ismerőshöz, várjon vagy ellenőrizze később!</string>
-    <string name="cant_call_contact_deleted_alert_text">Törölt ismerős.</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">Kapcsolódás a partnerhez, várjon vagy ellenőrizze később!</string>
+    <string name="cant_call_contact_deleted_alert_text">Törölt partner.</string>
     <string name="cant_call_member_alert_title">Nem lehet felhívni a csoporttagot</string>
-    <string name="allow_calls_question">Hívások engedélyezése?</string>
+    <string name="allow_calls_question">Engedélyezi a hívásokat?</string>
     <string name="action_button_add_members">Meghívás</string>
     <string name="info_view_message_button">üzenet</string>
     <string name="keep_conversation">Beszélgetés megtartása</string>
-    <string name="confirm_delete_contact_question">Biztosan törli az ismerőst?</string>
+    <string name="confirm_delete_contact_question">Biztosan törli a partnert?</string>
     <string name="info_view_connect_button">kapcsolódás</string>
     <string name="one_hand_ui">Könnyen elérhető alkalmazás-eszköztárak</string>
     <string name="delete_without_notification">Törlés értesítés nélkül</string>
     <string name="toolbar_settings">Beállítások</string>
     <string name="info_view_search_button">keresés</string>
     <string name="info_view_video_button">videó</string>
-    <string name="you_can_still_send_messages_to_contact">Az „Archivált ismerősökből” továbbra is küldhet üzeneteket neki: %1$s.</string>
-    <string name="contact_list_header_title">Ismerősök</string>
-    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Kérje meg az ismerősét, hogy engedélyezze a hívásokat.</string>
+    <string name="you_can_still_send_messages_to_contact">Az „Archivált partnerekből” továbbra is küldhet üzeneteket neki: %1$s.</string>
+    <string name="contact_list_header_title">Partnerek</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Kérje meg a partnerét, hogy engedélyezze a hívásokat.</string>
     <string name="cant_call_member_send_message_alert_text">Üzenet küldése a hívások engedélyezéséhez.</string>
-    <string name="you_need_to_allow_calls">Engedélyeznie kell a hívásokat az ismerőse számára, hogy fel tudják hívni egymást.</string>
-    <string name="you_can_still_view_conversation_with_contact">A(z) %1$s nevű ismerősével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.</string>
+    <string name="you_need_to_allow_calls">Engedélyeznie kell a hívásokat a partnere számára, hogy fel tudják hívni egymást.</string>
+    <string name="you_can_still_view_conversation_with_contact">A(z) %1$s nevű partnerével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.</string>
     <string name="compose_message_placeholder">Üzenet…</string>
-    <string name="select_verb">Kiválasztás</string>
+    <string name="select_verb">Kijelölés</string>
     <string name="moderate_messages_will_be_marked_warning">Az üzenetek az összes tag számára moderáltként lesznek megjelölve.</string>
-    <string name="selected_chat_items_nothing_selected">Nincs kiválasztva semmi</string>
+    <string name="selected_chat_items_nothing_selected">Nincs semmi kijelölve</string>
     <string name="delete_messages_mark_deleted_warning">Az üzenetek törlésre lesznek jelölve. A címzett(ek) képes(ek) lesz(nek) felfedni ezt az üzenetet.</string>
     <string name="delete_members_messages__question">Törli a tagok %d üzenetét?</string>
-    <string name="selected_chat_items_selected_n">%d kiválasztva</string>
-    <string name="moderate_messages_will_be_deleted_warning">Az üzenetek az összes tag számára törlésre kerülnek.</string>
+    <string name="selected_chat_items_selected_n">%d kijelölve</string>
+    <string name="moderate_messages_will_be_deleted_warning">Az üzenetek az összes tag számára törölve lesznek.</string>
     <string name="chat_database_exported_title">Csevegési adatbázis exportálva</string>
     <string name="v6_0_connection_servers_status_descr">Kapcsolatok- és kiszolgálók állapotának megjelenítése.</string>
-    <string name="v6_0_connect_faster_descr">Kapcsolódjon gyorsabban az ismerőseihez.</string>
+    <string name="v6_0_connect_faster_descr">Kapcsolódjon gyorsabban a partnereihez.</string>
     <string name="chat_database_exported_continue">Folytatás</string>
-    <string name="v6_0_connection_servers_status">Ellenőrízze a hálózatát</string>
+    <string name="v6_0_connection_servers_status">Ellenőrizze a hálózatát</string>
     <string name="media_and_file_servers">Média- és fájlkiszolgálók</string>
     <string name="v6_0_delete_many_messages_descr">Legfeljebb 20 üzenet egyszerre való törlése.</string>
     <string name="v6_0_private_routing_descr">Védi az IP-címét és a kapcsolatait.</string>
     <string name="v6_0_reachable_chat_toolbar">Könnyen elérhető eszköztár</string>
     <string name="message_servers">Üzenetkiszolgálók</string>
-    <string name="network_socks_proxy">SOCKS proxy</string>
-    <string name="chat_database_exported_not_all_files">Néhány fájl nem került exportálásra:</string>
+    <string name="network_socks_proxy">SOCKS-proxy</string>
+    <string name="chat_database_exported_not_all_files">Néhány fájl nem lett exportálva</string>
     <string name="chat_database_exported_migrate">Az exportált adatbázist átköltöztetheti.</string>
     <string name="network_options_save_and_reconnect">Mentés és újrakapcsolódás</string>
     <string name="v6_0_reachable_chat_toolbar_descr">Használja az alkalmazást egy kézzel.</string>
-    <string name="v6_0_your_contacts_descr">Az ismerősök archiválása a későbbi csevegéshez.</string>
-    <string name="network_option_tcp_connection">TCP kapcsolat</string>
+    <string name="v6_0_your_contacts_descr">A partnerek archiválása a későbbi csevegéshez.</string>
+    <string name="network_option_tcp_connection">TCP-kapcsolat</string>
     <string name="chat_database_exported_save">Az exportált archívumot elmentheti.</string>
     <string name="reset_all_hints">Tippek visszaállítása</string>
-    <string name="one_hand_ui_card_title">Csevegőlista átváltása:</string>
+    <string name="one_hand_ui_card_title">Csevegési lista átváltása:</string>
     <string name="one_hand_ui_change_instruction">Ezt a „Megjelenés” menüben módosíthatja.</string>
     <string name="v6_0_new_media_options">Új médiabeállítások</string>
     <string name="v6_0_chat_list_media">Lejátszás a csevegési listából.</string>
     <string name="v6_0_privacy_blur">Elhomályosítás a jobb adatvédelemért.</string>
-    <string name="v6_0_upgrade_app">Automatikus frissítés</string>
+    <string name="v6_0_upgrade_app">Automatikus alkalmazás-frissítés</string>
     <string name="create_address_button">Létrehozás</string>
     <string name="v6_0_upgrade_app_descr">Új verziók letöltése a GitHubról.</string>
     <string name="v6_0_increase_font_size">Betűméret növelése.</string>
@@ -2017,29 +2016,29 @@
     <string name="new_message">Új üzenet</string>
     <string name="error_parsing_uri_title">Érvénytelen hivatkozás</string>
     <string name="error_parsing_uri_desc">Ellenőrizze, hogy a SimpleX-hivatkozás helyes-e.</string>
-    <string name="switching_profile_error_title">Hiba a profilváltáskor</string>
+    <string name="switching_profile_error_title">Hiba történt a profilváltáskor</string>
     <string name="switching_profile_error_message">A kapcsolata át lett helyezve ide: %s, de egy váratlan hiba történt a profilra való átirányításkor.</string>
-    <string name="delete_messages_cannot_be_undone_warning">Az üzenetek törlésre kerülnek - ez a művelet nem vonható vissza!</string>
-    <string name="migrate_from_device_remove_archive_question">Archívum eltávolítása?</string>
-    <string name="migrate_from_device_uploaded_archive_will_be_removed">A feltöltött adatbázis-archívum véglegesen eltávolításra kerül a kiszolgálókról.</string>
+    <string name="delete_messages_cannot_be_undone_warning">Az üzenetek törölve lesznek – ez a művelet nem vonható vissza!</string>
+    <string name="migrate_from_device_remove_archive_question">Eltávolítja az archívumot?</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">A feltöltött adatbázis-archívum véglegesen el lesz távolítva a kiszolgálókról.</string>
     <string name="settings_section_title_chat_database">CSEVEGÉSI ADATBÁZIS</string>
     <string name="new_chat_share_profile">Profil megosztása</string>
     <string name="system_mode_toast">Rendszerbeállítások használata</string>
-    <string name="select_chat_profile">Csevegési profil kiválasztása</string>
+    <string name="select_chat_profile">Csevegési profil kijelölése</string>
     <string name="network_proxy_auth_mode_no_auth">Ne használja a hitelesítőadatokat proxyval.</string>
     <string name="network_proxy_auth_mode_isolate_by_auth_user">Különböző proxy-hitelesítőadatok használata az összes profilhoz.</string>
     <string name="network_proxy_auth_mode_isolate_by_auth_entity">Különböző proxy-hitelesítőadatok használata az összes kapcsolathoz.</string>
     <string name="network_proxy_password">Jelszó</string>
     <string name="network_proxy_username">Felhasználónév</string>
     <string name="network_proxy_auth_mode_username_password">A hitelesítőadatai titkosítatlanul is elküldhetők.</string>
-    <string name="network_proxy_incorrect_config_title">Hiba a proxy mentésekor</string>
+    <string name="network_proxy_incorrect_config_title">Hiba történt a proxy mentésekor</string>
     <string name="network_proxy_incorrect_config_desc">Győződjön meg arról, hogy a proxy konfigurációja helyes.</string>
     <string name="network_proxy_auth">Proxyhitelesítés</string>
     <string name="network_proxy_random_credentials">Véletlenszerű hitelesítőadatok használata</string>
     <string name="n_other_file_errors">%1$d egyéb fájlhiba.</string>
     <string name="forward_alert_title_nothing_to_forward">Nincs mit továbbítani!</string>
     <string name="forward_files_in_progress_desc">%1$d fájl letöltése még folyamatban van.</string>
-    <string name="forward_files_failed_to_receive_desc">%1$d fájlt nem sikerült letölteni.</string>
+    <string name="forward_files_failed_to_receive_desc">Nem sikerült letölteni %1$d fájlt.</string>
     <string name="forward_files_not_accepted_desc">%1$d fájl nem lett letöltve.</string>
     <string name="forward_files_not_accepted_receive_files">Letöltés</string>
     <string name="forward_files_missing_desc">%1$d fájl törölve lett.</string>
@@ -2047,13 +2046,13 @@
     <string name="forward_multiple">Üzenetek továbbítása…</string>
     <string name="n_file_errors">%1$d fájlhiba:\n%2$s</string>
     <string name="forward_files_messages_deleted_after_selection_title">%1$s üzenet nem lett továbbítva</string>
-    <string name="forward_alert_title_messages_to_forward">%1$s üzenet továbbítása?</string>
-    <string name="forward_alert_forward_messages_without_files">Üzenetek továbbítása fájlok nélkül?</string>
-    <string name="forward_files_messages_deleted_after_selection_desc">Az üzeneteket törölték miután kiválasztotta őket.</string>
+    <string name="forward_alert_title_messages_to_forward">Továbbít %1$s üzenetet?</string>
+    <string name="forward_alert_forward_messages_without_files">Továbbítja az üzeneteket fájlok nélkül?</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">Az üzeneteket törölték miután kijelölte őket.</string>
     <string name="compose_save_messages_n">%1$s üzenet mentése</string>
-    <string name="error_forwarding_messages">Hiba az üzenetek továbbításakor</string>
+    <string name="error_forwarding_messages">Hiba történt az üzenetek továbbításakor</string>
     <string name="icon_descr_sound_muted">Hang elnémítva</string>
-    <string name="error_initializing_web_view_wrong_arch">Hiba a WebView előkészítésekor. Győződjön meg arról, hogy a WebView telepítve van-e, és támogatja-e az arm64 architektúrát.\nHiba: %s</string>
+    <string name="error_initializing_web_view_wrong_arch">Hiba történt a WebView előkészítésekor. Győződjön meg arról, hogy a WebView telepítve van-e, és támogatja-e az arm64 architektúrát.\nHiba: %s</string>
     <string name="settings_message_shape_corner">Sarok</string>
     <string name="settings_section_title_message_shape">Üzenetbuborék alakja</string>
     <string name="settings_message_shape_tail">Farok</string>
@@ -2067,19 +2066,19 @@
     <string name="v6_1_better_calls">Továbbfejlesztett hívásélmény</string>
     <string name="v6_1_message_dates_descr">Továbbfejlesztett üzenetdátumok.</string>
     <string name="v6_1_better_user_experience">Továbbfejlesztett felhasználói élmény</string>
-    <string name="v6_1_customizable_message_descr">Testreszabható üzenetbuborékok.</string>
+    <string name="v6_1_customizable_message_descr">Személyre szabható üzenetbuborékok.</string>
     <string name="v6_1_delete_many_messages_descr">Legfeljebb 200 üzenet egyszerre való törlése, vagy moderálása.</string>
     <string name="v6_1_forward_many_messages_descr">Legfeljebb 20 üzenet egyszerre való továbbítása.</string>
     <string name="v6_1_better_calls_descr">Hang/Videó váltása hívás közben.</string>
-    <string name="v6_1_switch_chat_profile_descr">Csevegési profilváltás az egyszer használható meghívó-hivatkozásokhoz.</string>
+    <string name="v6_1_switch_chat_profile_descr">Csevegési profilváltás az egyszer használható meghívókhoz.</string>
     <string name="v6_1_better_security">Továbbfejlesztett biztonság ✅</string>
-    <string name="v6_1_better_security_descr">A SimpleX Chat biztonsága a Trail of Bits által lett felülvizsgálva.</string>
-    <string name="failed_to_save_servers">Hiba a kiszolgálók mentésekor</string>
+    <string name="v6_1_better_security_descr">A SimpleX-protokollokat a Trail of Bits auditálta.</string>
+    <string name="failed_to_save_servers">Hiba történt a kiszolgálók mentésekor</string>
     <string name="no_message_servers_configured">Nincsenek üzenet-kiszolgálók.</string>
-    <string name="no_message_servers_configured_for_receiving">Nincsenek üzenetfogadó-kiszolgálók.</string>
+    <string name="no_message_servers_configured_for_receiving">Nincsenek üzenetfogadási kiszolgálók.</string>
     <string name="no_media_servers_configured">Nincsenek média- és fájlkiszolgálók.</string>
     <string name="for_chat_profile">A(z) %s nevű csevegési profilhoz:</string>
-    <string name="address_or_1_time_link">Cím vagy egyszer használható meghívó-hivatkozás?</string>
+    <string name="address_or_1_time_link">Cím vagy egyszer használható meghívó?</string>
     <string name="smp_servers_new_server">Új kiszolgáló</string>
     <string name="address_settings">Címbeállítások</string>
     <string name="network_preset_servers_title">Előre beállított kiszolgálók</string>
@@ -2087,31 +2086,31 @@
     <string name="view_conditions">Feltételek megtekintése</string>
     <string name="no_message_servers_configured_for_private_routing">Nincsenek kiszolgálók a privát üzenet-útválasztáshoz.</string>
     <string name="no_media_servers_configured_for_sending">Nincsenek fájlküldő-kiszolgálók.</string>
-    <string name="no_media_servers_configured_for_private_routing">Nincsenek fájlfogadó-kiszolgálók.</string>
+    <string name="no_media_servers_configured_for_private_routing">Nincsenek fájlfogadási kiszolgálók.</string>
     <string name="errors_in_servers_configuration">Hibák a kiszolgálók konfigurációjában.</string>
-    <string name="error_accepting_operator_conditions">Hiba a feltételek elfogadásakor</string>
+    <string name="error_accepting_operator_conditions">Hiba történt a feltételek elfogadásakor</string>
     <string name="connection_error_quota">Kézbesítetlen üzenetek</string>
-    <string name="connection_error_quota_desc">A kapcsolat elérte a kézbesítetlen üzenetek számának határát, az Ön ismerőse lehet, hogy offline állapotban van.</string>
+    <string name="connection_error_quota_desc">A kapcsolat elérte a kézbesítetlen üzenetek számának határát, a partnere lehet, hogy offline állapotban van.</string>
     <string name="message_deleted_or_not_received_error_title">Nincs üzenet</string>
-    <string name="message_deleted_or_not_received_error_desc">Ez az üzenet törlésre került vagy még nem érkezett meg.</string>
+    <string name="message_deleted_or_not_received_error_desc">Ez az üzenet törölve lett vagy még nem érkezett meg.</string>
     <string name="address_creation_instruction">Koppintson a SimpleX-cím létrehozása menüpontra a későbbi létrehozáshoz.</string>
     <string name="share_address_publicly">Cím nyilvános megosztása</string>
     <string name="share_simplex_address_on_social_media">SimpleX-cím megosztása a közösségi médiában.</string>
-    <string name="share_1_time_link_with_a_friend">Egyszer használható meghívó-hivatkozás megosztása egy baráttal</string>
-    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Az egyszer használható meghívó-hivatkozás csak <i>egyetlen ismerőssel használható</i> - személyesen vagy bármilyen üzenetküldőn keresztül megosztható.]]></string>
-    <string name="you_can_set_connection_name_to_remember">Beállíthatja az ismerős nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.</string>
+    <string name="share_1_time_link_with_a_friend">Egyszer használható meghívó megosztása egy baráttal</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Az egyszer használható meghívó egy hivatkozás és <i>csak egyetlen partnerrel használható</i> – személyesen vagy bármilyen üzenetváltó-alkalmazáson keresztül megosztható.]]></string>
+    <string name="you_can_set_connection_name_to_remember">Beállíthatja a partner nevét, hogy emlékezzen arra, hogy kivel osztotta meg a hivatkozást.</string>
     <string name="connection_security">Kapcsolatbiztonság</string>
-    <string name="simplex_address_and_1_time_links_are_safe_to_share">A SimpleX-cím és az egyszer használható meghívó-hivatkozás biztonságosan megosztható bármilyen üzenetküldőn keresztül.</string>
-    <string name="to_protect_against_your_link_replaced_compare_codes">A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat az ismerősével.</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">A SimpleX-cím és az egyszer használható meghívó biztonságosan megosztható bármilyen üzenetváltó-alkalmazáson keresztül.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">A hivatkozás cseréje elleni védelem érdekében összehasonlíthatja a biztonsági kódokat a partnerével.</string>
     <string name="for_social_media">A közösségi médiához</string>
     <string name="or_to_share_privately">Vagy a privát megosztáshoz</string>
-    <string name="simplex_address_or_1_time_link">SimpleX-cím vagy egyszer használható meghívó-hivatkozás?</string>
-    <string name="create_1_time_link">Egyszer használható meghívó-hivatkozás létrehozása</string>
-    <string name="onboarding_choose_server_operators">Kiszolgáló-üzemeltetők</string>
-    <string name="onboarding_network_operators">Hálózati üzemeltetők</string>
-    <string name="onboarding_network_operators_app_will_use_different_operators">Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetésben más-más üzemeltetőt használ.</string>
-    <string name="onboarding_network_operators_app_will_use_for_routing">Például, ha az Ön ismerőse egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.</string>
-    <string name="onboarding_select_network_operators_to_use">Válassza ki a használni kívánt hálózati üzemeltetőket.</string>
+    <string name="simplex_address_or_1_time_link">SimpleX-cím vagy egyszer használható meghívó?</string>
+    <string name="create_1_time_link">Egyszer használható meghívó létrehozása</string>
+    <string name="onboarding_choose_server_operators">Kiszolgálóüzemeltetők</string>
+    <string name="onboarding_network_operators">Hálózatüzemeltetők</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Az alkalmazás úgy védi az adatait, hogy minden egyes beszélgetéshez más-más üzemeltetőt használ.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Például, ha a partnere egy SimpleX Chat-kiszolgálón keresztül fogadja az üzeneteket, akkor az Ön alkalmazása egy Flux-kiszolgálón keresztül fogja azokat kézbesíteni.</string>
+    <string name="onboarding_select_network_operators_to_use">Jelölje ki a használni kívánt hálózatüzemeltetőket.</string>
     <string name="onboarding_network_operators_review_later">Felülvizsgálat később</string>
     <string name="onboarding_network_operators_configure_via_settings">A kiszolgálókat a „Hálózat és kiszolgálók” menüben konfigurálhatja.</string>
     <string name="onboarding_network_operators_conditions_will_be_accepted">A feltételek 30 nap elteltével lesznek elfogadva az engedélyezett üzemeltetők számára.</string>
@@ -2120,27 +2119,27 @@
     <string name="onboarding_network_operators_continue">Folytatás</string>
     <string name="operator_review_conditions">Feltételek felülvizsgálata</string>
     <string name="operator_conditions_accepted">Elfogadott feltételek</string>
-    <string name="operator_conditions_accepted_for_enabled_operators_on">A feltételek automatikusan elfogadásra kerülnek az engedélyezett üzemeltetők számára: %s.</string>
-    <string name="your_servers">Az Ön kiszolgálói</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">A feltételek automatikusan el lesznek fogadva az engedélyezett üzemeltetők számára a következő időpontban: %s.</string>
+    <string name="your_servers">Saját kiszolgálók</string>
     <string name="operators_conditions_accepted_for"><![CDATA[A következő üzemeltető(k) számára elfogadott feltételek: <b>%s</b>.]]></string>
-    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Automatikus feltétel-elfogadás a következő üzemeltető(k) számára: <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[A feltételek el lesznek fogadva a következő üzemeltető(k) számára: <b>%s</b>.]]></string>
     <string name="operator_servers_title">%s kiszolgáló</string>
-    <string name="operator_info_title">Hálózati üzemeltető</string>
+    <string name="operator_info_title">Hálózatüzemeltető</string>
     <string name="operator_website">Weboldal</string>
-    <string name="operator_conditions_accepted_on">Feltételek elfogadva ekkor: %s.</string>
-    <string name="operator_conditions_will_be_accepted_on">A feltételek ekkor lesznek elfogadva: %s.</string>
+    <string name="operator_conditions_accepted_on">Feltételek elfogadásának ideje: %s.</string>
+    <string name="operator_conditions_will_be_accepted_on">A feltételek el lesznek elfogadva a következő időpontban: %s.</string>
     <string name="operator_use_operator_toggle_description">Kiszolgálók használata</string>
     <string name="use_servers_of_operator_x">%s használata</string>
-    <string name="operator_conditions_failed_to_load">A jelenlegi feltételek szövegét nem lehetett betölteni, a feltételeket ezen a hivatkozáson keresztül vizsgálhatja felül:</string>
+    <string name="operator_conditions_failed_to_load">A jelenlegi feltételek szövegét nem sikerült betölteni, a feltételeket a következő hivatkozáson keresztül vizsgálhatja felül:</string>
     <string name="operator_conditions_accepted_for_some"><![CDATA[A feltételek már el lettek fogadva a következő üzemeltető(k) számára: <b>%s</b>.]]></string>
-    <string name="operator_same_conditions_will_be_applied"><![CDATA[Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető számára: <b>%s</b>.]]></string>
-    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető(k) számára: <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető számára is: <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Ugyanezek a feltételek lesznek elfogadva a következő üzemeltető(k) számára is: <b>%s</b>.]]></string>
     <string name="operator_conditions_will_be_applied"><![CDATA[Ezek a feltételek lesznek elfogadva a következő számára is: <b>%s</b>.]]></string>
     <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[A feltételek el lesznek fogadva a következő üzemeltető(k) számára: <b>%s</b>.]]></string>
     <string name="operators_conditions_will_also_apply"><![CDATA[Ezek a feltételek lesznek elfogadva a következő számára is: <b>%s</b>.]]></string>
     <string name="accept_conditions">Feltételek elfogadása</string>
     <string name="operator_conditions_of_use">Használati feltételek</string>
-    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[A(z) <b>%s</b> kiszolgálók használatához fogadja el a használati feltételeket.]]></string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[A(z) <b>%s</b> kiszolgálóinak használatához fogadja el a használati feltételeket.]]></string>
     <string name="operator_use_for_messages">Használat az üzenetekhez</string>
     <string name="operator_use_for_messages_receiving">A fogadáshoz</string>
     <string name="operator_use_for_messages_private_routing">A privát útválasztáshoz</string>
@@ -2149,54 +2148,54 @@
     <string name="operator_use_for_sending">A küldéshez</string>
     <string name="operator_added_xftp_servers">Hozzáadott média- és fájlkiszolgálók</string>
     <string name="operator_open_conditions">Feltételek megnyitása</string>
-    <string name="operator_open_changes">Változások megnyitása</string>
-    <string name="error_updating_server_title">Hiba a kiszolgáló frissítésekor</string>
-    <string name="error_server_protocol_changed">A kiszolgáló-protokoll megváltozott.</string>
-    <string name="error_server_operator_changed">A kiszolgáló üzemeltetője megváltozott.</string>
+    <string name="operator_open_changes">Módosítások megtekintése</string>
+    <string name="error_updating_server_title">Hiba történt a kiszolgáló frissítésekor</string>
+    <string name="error_server_protocol_changed">A kiszolgáló-protokoll módosult.</string>
+    <string name="error_server_operator_changed">A kiszolgáló üzemeltetője módosult.</string>
     <string name="operator_server_alert_title">Kiszolgáló-üzemeltető</string>
     <string name="server_added_to_operator__name">Kiszolgáló hozzáadva a következő üzemeltetőhöz: %s.</string>
-    <string name="error_adding_server">Hiba a kiszolgáló hozzáadásakor</string>
+    <string name="error_adding_server">Hiba történt a kiszolgáló hozzáadásakor</string>
     <string name="appearance_in_app_bars_alpha">Átlátszóság</string>
     <string name="appearance_bars_blur_radius">Elhomályosítás</string>
     <string name="v6_2_network_decentralization">Hálózati decentralizáció</string>
     <string name="v6_2_network_decentralization_descr">A második előre beállított üzemeltető az alkalmazásban!</string>
-    <string name="v6_2_network_decentralization_enable_flux">Flux engedélyezése</string>
+    <string name="v6_2_network_decentralization_enable_flux">A Flux kiszolgálókat engedélyezheti a beállításokban, a „Hálózat és kiszolgálók” menüben, a metaadatok jobb védelme érdekében.</string>
     <string name="appearance_app_toolbars">Alkalmazás-eszköztárak</string>
     <string name="v6_2_network_decentralization_enable_flux_reason">a metaadatok jobb védelme érdekében.</string>
     <string name="v6_2_improved_chat_navigation">Javított csevegési navigáció</string>
     <string name="v6_2_improved_chat_navigation_descr">- Csevegés megnyitása az első olvasatlan üzenetnél.\n- Ugrás az idézett üzenetekre.</string>
     <string name="view_updated_conditions">Frissített feltételek megtekintése</string>
-    <string name="xftp_servers_per_user">Az Ön jelenlegi csevegőprofiljához tartozó új fájlok kiszolgálói</string>
+    <string name="xftp_servers_per_user">A jelenlegi csevegési profiljához tartozó új fájlok kiszolgálói</string>
     <string name="chat_archive">Vagy archívumfájl importálása</string>
     <string name="remote_hosts_section">Távoli hordozható eszközök</string>
     <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi eszközök</b>: engedélyezze az automatikus indítást a rendszerbeállításokban, hogy az értesítések működjenek.]]></string>
     <string name="maximum_message_size_reached_forwarding">A küldéshez másolhatja és csökkentheti az üzenet méretét.</string>
-    <string name="add_your_team_members_to_conversations">Adja hozzá csapattagjait a beszélgetésekhez.</string>
+    <string name="add_your_team_members_to_conversations">Adja hozzá a munkatársait a beszélgetésekhez.</string>
     <string name="business_address">Üzleti cím</string>
-    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Az összes üzenet és fájl <b>végpontok közötti titkosítással</b>, a közvetlen üzenetek továbbá kvantumrezisztens titkosítással is rendelkeznek.]]></string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Az összes üzenet és fájl <b>végpontok közötti titkosítással</b>, a közvetlen üzenetek továbbá kvantumbiztos titkosítással is rendelkeznek.]]></string>
     <string name="how_it_helps_privacy">Hogyan segíti az adatvédelmet</string>
     <string name="onboarding_notifications_mode_off_desc_short">Nincs háttérszolgáltatás</string>
     <string name="onboarding_notifications_mode_battery">Értesítések és akkumulátor</string>
     <string name="onboarding_notifications_mode_service_desc_short">Az alkalmazás mindig fut a háttérben</string>
-    <string name="leave_chat_question">Csevegés elhagyása?</string>
+    <string name="leave_chat_question">Elhagyja a csevegést?</string>
     <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Ön nem fog több üzenetet kapni ebből a csevegésből, de a csevegés előzményei megmaradnak.</string>
     <string name="button_delete_chat">Csevegés törlése</string>
     <string name="invite_to_chat_button">Meghívás a csevegésbe</string>
     <string name="button_add_friends">Barátok hozzáadása</string>
-    <string name="button_add_team_members">Csapattagok hozzáadása</string>
-    <string name="delete_chat_for_all_members_cannot_undo_warning">A csevegés minden tag számára törlésre kerül - ezt a műveletet nem lehet visszavonni!</string>
-    <string name="delete_chat_for_self_cannot_undo_warning">A csevegés törlésre kerül az Ön számára - ezt a műveletet nem lehet visszavonni!</string>
-    <string name="delete_chat_question">Csevegés törlése?</string>
+    <string name="button_add_team_members">Munkatársak hozzáadása</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">A csevegés minden tag számára törölve lesz – ez a művelet nem vonható vissza!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">A csevegés törölve lesz az Ön számára – ez a művelet nem vonható vissza!</string>
+    <string name="delete_chat_question">Törli a csevegést?</string>
     <string name="button_leave_chat">Csevegés elhagyása</string>
-    <string name="only_chat_owners_can_change_prefs">Csak a csevegés tulajdonosai módosíthatják a beállításokat.</string>
+    <string name="only_chat_owners_can_change_prefs">Csak a csevegés tulajdonosai módosíthatják a csevegési beállításokat.</string>
     <string name="chat_bottom_bar">Könnyen elérhető csevegési eszköztár</string>
-    <string name="member_will_be_removed_from_chat_cannot_be_undone">A tag el lesz távolítva a csevegésből - ezt a műveletet nem lehet visszavonni!</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">A tag el lesz távolítva a csevegésből – ez a művelet nem vonható vissza!</string>
     <string name="info_row_chat">Csevegés</string>
-    <string name="member_role_will_be_changed_with_notification_chat">A szerepkör meg fog változni a következőre: %s. A csevegés tagjai értesítést fognak kapni.</string>
-    <string name="chat_main_profile_sent">Az Ön csevegési profilja el lesz küldve a csevegésben résztvevő tagok számára</string>
+    <string name="member_role_will_be_changed_with_notification_chat">A tag szerepköre a következőre fog módosulni: „%s”. A csevegés összes tagja értesítést fog kapni.</string>
+    <string name="chat_main_profile_sent">A csevegési profilja el lesz küldve a csevegésben résztvevő tagok számára</string>
     <string name="direct_messages_are_prohibited">A tagok közötti közvetlen üzenetek le vannak tiltva.</string>
     <string name="v6_2_business_chats">Üzleti csevegések</string>
-    <string name="v6_2_business_chats_descr">Az Ön ügyfeleinek adatvédelme.</string>
+    <string name="v6_2_business_chats_descr">Saját ügyfeleinek adatvédelme.</string>
     <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Ön már kapcsolódva van vele: <b>%1$s</b>.]]></string>
     <string name="connect_plan_chat_already_exists">A csevegés már létezik!</string>
     <string name="maximum_message_size_reached_text">Csökkentse az üzenet méretét, és küldje el újra.</string>
@@ -2206,7 +2205,202 @@
     <string name="direct_messages_are_prohibited_in_chat">A tagok közötti közvetlen üzenetek le vannak tiltva ebben a csevegésben.</string>
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Amikor egynél több üzemeltető van engedélyezve, akkor egyik sem rendelkezik olyan metaadatokkal, amelyekből megtudható, hogy ki kivel kommunikál.</string>
     <string name="display_name_accepted_invitation">elfogadott meghívó</string>
-    <string name="display_name_requested_to_connect">kérelmezve a kapcsolódáshoz</string>
+    <string name="display_name_requested_to_connect">Függőben lévő meghívási kérelem</string>
     <string name="onboarding_network_about_operators">Az üzemeltetőkről</string>
     <string name="onboarding_network_operators_simplex_flux_agreement">A SimpleX Chat és a Flux megállapodást kötött arról, hogy a Flux által üzemeltetett kiszolgálókat beépítik az alkalmazásba.</string>
-</resources>
\ No newline at end of file
+    <string name="encryption_renegotiation_in_progress">A titkosítás újraegyeztetése folyamatban van.</string>
+    <string name="sync_connection_desc">A kapcsolat titkosítása újraegyeztetést igényel.</string>
+    <string name="sync_connection_confirm">Javítás</string>
+    <string name="sync_connection_question">Kapcsolat javítása?</string>
+    <string name="debug_logs">Naplózás engedélyezése</string>
+    <string name="error_saving_database">Hiba történt az adatbázis mentésekor</string>
+    <string name="strikethrough_text">áthúzott</string>
+    <string name="users_delete_profile_for">A következő csevegési profil törlése</string>
+    <string name="delete_messages_after">Üzenetek törlése ennyi idő után</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="connection_not_ready">A kapcsolat nem áll készen.</string>
+    <string name="open_with_app">Megnyitás a következővel: %s</string>
+    <string name="list_menu">Lista</string>
+    <string name="chat_list_groups">Csoportok</string>
+    <string name="chat_list_add_list">Lista hozzáadása</string>
+    <string name="chat_list_all">Összes</string>
+    <string name="add_to_list">Hozzáadás listához</string>
+    <string name="error_creating_chat_tags">Hiba történt a csevegési lista létrehozásakor</string>
+    <string name="error_loading_chat_tags">Hiba történt a csevegési lista betöltésekor</string>
+    <string name="error_updating_chat_tags">Hiba történt a csevegési lista frissítésekor</string>
+    <string name="chat_list_businesses">Üzleti</string>
+    <string name="chat_list_contacts">Partnerek</string>
+    <string name="chat_list_favorites">Kedvencek</string>
+    <string name="no_chats">Nincsenek csevegések</string>
+    <string name="no_chats_found">Nem találhatók csevegések</string>
+    <string name="no_unread_chats">Nincsenek olvasatlan csevegések</string>
+    <string name="create_list">Lista létrehozása</string>
+    <string name="save_list">Lista mentése</string>
+    <string name="delete_chat_list_warning">Az összes csevegés el lesz távolítva a következő listáról, és a lista is törlődik: %s</string>
+    <string name="delete_chat_list_menu_action">Törlés</string>
+    <string name="delete_chat_list_question">Törli a listát?</string>
+    <string name="edit_chat_list_menu_action">Szerkesztés</string>
+    <string name="list_name_field_placeholder">Lista neve…</string>
+    <string name="duplicated_list_error">Az összes lista nevének és emodzsijának különbözőnek kell lennie.</string>
+    <string name="no_chats_in_list">Nincsenek csevegések a(z) %s nevű listában.</string>
+    <string name="chat_list_notes">Jegyzetek</string>
+    <string name="change_list">Lista módosítása</string>
+    <string name="change_order_chat_list_menu_action">Elrendezés módosítása</string>
+    <string name="error_creating_report">Hiba történt a jelentés létrehozásakor</string>
+    <string name="prefs_error_saving_settings">Hiba történt a beállítások mentésekor</string>
+    <string name="report_archive_alert_desc">A jelentés archiválva lesz az Ön számára.</string>
+    <string name="report_compose_reason_header_illegal">Tartalom jelentése: csak a csoport moderátorai látják.</string>
+    <string name="archive_verb">Archívum</string>
+    <string name="report_archive_alert_title">Archiválja a jelentést?</string>
+    <string name="report_item_archived">archivált jelentés</string>
+    <string name="group_member_role_moderator">moderátor</string>
+    <string name="report_reason_community">Közösségi irányelvek megsértése</string>
+    <string name="report_compose_reason_header_spam">Kéretlen tartalom jelentése: csak a csoport moderátorai látják.</string>
+    <string name="report_item_visibility_moderators">Csak a küldő és a moderátorok látják</string>
+    <string name="report_item_visibility_submitter">Csak Ön és a moderátorok látják</string>
+    <string name="report_reason_alert_title">Jelentés indoklása?</string>
+    <string name="report_reason_spam">Kéretlen tartalom</string>
+    <string name="report_reason_other">Egyéb indoklás</string>
+    <string name="report_reason_illegal">Kifogásolt tartalom</string>
+    <string name="report_reason_profile">Kifogásolt profil</string>
+    <string name="report_verb">Jelentés</string>
+    <string name="report_compose_reason_header_profile">Tag profiljának jelentése: csak a csoport moderátorai látják.</string>
+    <string name="report_compose_reason_header_other">Egyéb jelentés: csak a csoport moderátorai látják.</string>
+    <string name="report_compose_reason_header_community">Szabálysértés jelentése: csak a csoport moderátorai látják.</string>
+    <string name="archive_report">Jelentés archiválása</string>
+    <string name="delete_report">Jelentés törlése</string>
+    <string name="group_reports_member_reports">Tagok jelentései</string>
+    <string name="group_reports_active_one">1 jelentés</string>
+    <string name="chat_list_group_reports">Jelentések</string>
+    <string name="report_item_archived_by">%s által archivált jelentés</string>
+    <string name="group_reports_active">%d jelentés</string>
+    <string name="blocking_reason_spam">Kéretlen tartalom</string>
+    <string name="blocking_reason_content">A tartalom sérti a használati feltételeket</string>
+    <string name="connection_error_blocked">A kapcsolat le van tiltva</string>
+    <string name="file_error_blocked">A kiszolgáló üzemeltetője letiltotta a fájlt:\n%1$s.</string>
+    <string name="connection_error_blocked_desc">A kiszolgáló üzemeltetője letiltotta a kapcsolatot:\n%1$s.</string>
+    <string name="privacy_chat_list_open_links_ask">Mindig kérdezzen rá</string>
+    <string name="privacy_chat_list_open_links_yes">Igen</string>
+    <string name="privacy_chat_list_open_web_link">Hivatkozás megnyitása</string>
+    <string name="privacy_chat_list_open_links">Hivatkozás megnyitása a csevegési listából</string>
+    <string name="privacy_chat_list_open_links_no">Nem</string>
+    <string name="privacy_chat_list_open_web_link_question">Megnyitja a webhivatkozást?</string>
+    <string name="text_field_set_chat_placeholder">Csevegés nevének beállítása…</string>
+    <string name="disable_automatic_deletion_question">Letiltja az automatikus üzenettörlést?</string>
+    <string name="disable_automatic_deletion">Üzenetek törlésének letiltása</string>
+    <string name="disable_automatic_deletion_message">Az ebben a csevegésben lévő üzenetek soha nem lesznek törölve.</string>
+    <string name="chat_item_ttl_year">1 év</string>
+    <string name="chat_item_ttl_default">alapértelmezett (%s)</string>
+    <string name="chat_ttl_options_footer">Csevegési üzenetek törlése a saját eszközéről.</string>
+    <string name="change_automatic_deletion_question">Módosítja az automatikus üzenettörlést?</string>
+    <string name="change_automatic_chat_deletion_message">Ez a művelet nem vonható vissza – a kijelölt üzenettől korábban küldött és fogadott üzenetek törölve lesznek a csevegésből.</string>
+    <string name="network_smp_web_port_footer">A következő TCP-port használata, amikor nincs port megadva: %1$s.</string>
+    <string name="network_smp_web_port_section_title">TCP-port az üzenetváltáshoz</string>
+    <string name="network_smp_web_port_toggle">Webport használata</string>
+    <string name="unread_mentions">Olvasatlan említések</string>
+    <string name="mute_all_chat">Összes némítása</string>
+    <string name="max_group_mentions_per_message_reached">Legfeljebb %1$s tagot említhet meg egy üzenetben!</string>
+    <string name="enable_sending_member_reports">Az üzenetek jelentése a moderátorok felé engedélyezve van.</string>
+    <string name="disable_sending_member_reports">Az üzenetek a moderátorok felé történő jelentésének megtiltása.</string>
+    <string name="report_archive_alert_title_all">Archiválja az összes jelentést?</string>
+    <string name="report_archive_alert_title_nth">Archivál %d jelentést?</string>
+    <string name="report_archive_for_me">Csak magamnak</string>
+    <string name="archive_reports">Jelentések archiválása</string>
+    <string name="report_archive_for_all_moderators">Az összes moderátor számára</string>
+    <string name="member_reports_are_prohibited">Az üzenetek jelentése ebben a csoportban le van tiltva.</string>
+    <string name="group_members_can_send_reports">A tagok jelenthetik az üzeneteket a moderátorok felé.</string>
+    <string name="report_archive_alert_desc_all">Az összes jelentés archiválva lesz az Ön számára.</string>
+    <string name="notification_group_report">Jelentés: %s</string>
+    <string name="v6_3_mentions">Tagok említése 👋</string>
+    <string name="v6_3_reports">Privát jelentések küldése</string>
+    <string name="v6_3_organize_chat_lists_descr">Ne maradjon le a fontos üzenetekről.</string>
+    <string name="v6_3_faster_sending_messages">Gyorsabb üzenetküldés.</string>
+    <string name="v6_3_faster_deletion_of_groups">Gyorsabb csoporttörlés.</string>
+    <string name="v6_3_reports_descr">Segítsen az adminisztrátoroknak a csoportjaik moderálásában.</string>
+    <string name="v6_3_private_media_file_names">Privát nevek a médiafájlokhoz.</string>
+    <string name="v6_3_set_message_expiration_in_chats">Üzenetek eltűnési idejének módosítása a csevegésekben.</string>
+    <string name="v6_3_better_groups_performance">Továbbfejlesztett, gyorsabb csoportok</string>
+    <string name="v6_3_better_privacy_and_security">Továbbfejlesztett adatvédelem és biztonság</string>
+    <string name="v6_3_mentions_descr">Kapjon értesítést, ha megemlítik.</string>
+    <string name="v6_3_organize_chat_lists">Csevegések listákba szervezése</string>
+    <string name="group_preview_rejected">elutasítva</string>
+    <string name="group_member_status_rejected">elutasítva</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">A jelmondat nem olvasható a Keystore-ban, ezért kézzel szükséges megadni. Ez az alkalmazással nem kompatibilis rendszerfrissítés után történhetett meg. Ha nem így történt, akkor lépjen kapcsolatba a fejlesztőkkel.</string>
+    <string name="group_member_status_pending_approval_short">függőben</string>
+    <string name="group_member_status_pending_approval">jóváhagyásra vár</string>
+    <string name="error_reading_passphrase">Hiba történt az adatbázis-jelmondat olvasásakor</string>
+    <string name="restore_passphrase_can_not_be_read_desc">A jelmondat nem olvasható a Keystore-ban. Ez az alkalmazással nem kompatibilis rendszerfrissítés után történhetett meg. Ha nem így történt, akkor lépjen kapcsolatba a fejlesztőkkel.</string>
+    <string name="operator_updated_conditions">Frissített feltételek</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">A tagok el lesznek távolítva a csoportból – ez a művelet nem vonható vissza!</string>
+    <string name="button_remove_members_question">Eltávolítja a tagokat?</string>
+    <string name="block_members_for_all_question">Az összes tag számára letiltja ezeket a tagokat?</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">A tagok el lesznek távolítva a csevegésből – ez a művelet nem vonható vissza!</string>
+    <string name="unblock_members_for_all_question">Az összes tag számára feloldja a tagok letiltását?</string>
+    <string name="block_members_desc">Ezen tagok összes új üzenete el lesz rejtve!</string>
+    <string name="unblock_members_desc">A tagok összes üzenete meg fog jelenni!</string>
+    <string name="feature_roles_moderators">moderátorok</string>
+    <string name="onboarding_conditions_accept">Elfogadás</string>
+    <string name="onboarding_conditions_by_using_you_agree">A SimpleX Chat használatával Ön elfogadja, hogy:\n- csak elfogadott tartalmakat tesz közzé a nyilvános csoportokban.\n- tiszteletben tartja a többi felhasználót, és nem küld kéretlen tartalmat senkinek.</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Adatvédelmi szabályzat és felhasználási feltételek.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">A privát csevegések, a csoportok és a partnerek nem érhetők el a szerver üzemeltetői számára.</string>
+    <string name="onboarding_conditions_configure_server_operators">Kiszolgálóüzemeltetők beállítása</string>
+    <string name="unsupported_connection_link">Nem támogatott kapcsolattartási hivatkozás</string>
+    <string name="privacy_short_links">Rövid hivatkozások használata (béta)</string>
+    <string name="short_link_button_text">Rövid hivatkozás</string>
+    <string name="full_link_button_text">Teljes hivatkozás</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Ez a hivatkozás újabb alkalmazásverziót igényel. Frissítse az alkalmazást vagy kérjen egy kompatibilis hivatkozást a partnerétől.</string>
+    <string name="simplex_link_channel">SimpleX-csatornahivatkozás</string>
+    <string name="network_smp_web_port_all">Összes kiszolgáló</string>
+    <string name="network_smp_web_port_off">Kikapcsolva</string>
+    <string name="network_smp_web_port_preset">Előre beállított kiszolgálók</string>
+    <string name="network_smp_web_port_preset_footer">A 443-as TCP-port használata kizárólag az előre beállított kiszolgálokhoz.</string>
+    <string name="error_accepting_member">Hiba a tag befogadásakor</string>
+    <string name="group_new_support_chats">%d csevegés a tagokkal</string>
+    <string name="group_new_support_messages">%d üzenet</string>
+    <string name="group_new_support_chat_one">1 csevegés egy taggal</string>
+    <string name="group_new_support_chats_short">%d csevegés</string>
+    <string name="report_sent_alert_title">A jelentés el lett küldve a moderátoroknak</string>
+    <string name="report_sent_alert_msg_view_in_support_chat">A jelentéseket megtekintheti a „Csevegés az adminisztrátorokkal” menüben.</string>
+    <string name="group_member_status_pending_review">függőben lévő áttekintés</string>
+    <string name="group_member_status_pending_review_short">áttekintés</string>
+    <string name="button_support_chat">Csevegés az adminisztrátorokkal</string>
+    <string name="member_support">Csevegés a tagokkal</string>
+    <string name="member_admission">Tagbefogadás</string>
+    <string name="no_support_chats">Nincsenek csevegések a tagokkal</string>
+    <string name="admission_stage_review">Tagok áttekintése</string>
+    <string name="admission_stage_review_descr">Tagok áttekintése a befogadás előtt (kopogtatás).</string>
+    <string name="support_chat">Csevegés az adminisztrátorokkal</string>
+    <string name="accept_pending_member_alert_question">A tag csatlakozni akar a csoporthoz, befogadja a tagot?</string>
+    <string name="reject_pending_member_button">Eltávolítás</string>
+    <string name="accept_pending_member_button">Befogadás</string>
+    <string name="accept_pending_member_alert_title">Tag befogadása</string>
+    <string name="member_criteria_all">összes</string>
+    <string name="button_support_chat_member">Csevegés a taggal</string>
+    <string name="rcv_group_event_new_member_pending_review">Új tag szeretne csatlakozni a csoporthoz.</string>
+    <string name="member_criteria_off">kikapcsolva</string>
+    <string name="accept_pending_member_alert_confirmation_as_observer">Befogadás megfigyelőként</string>
+    <string name="snd_group_event_user_pending_review">Várja meg, amíg a csoport moderátorai áttekintik a csoporthoz való csatlakozási kérelmét.</string>
+    <string name="rcv_group_event_user_accepted">befogadta Önt</string>
+    <string name="set_member_admission">Tagbefogadás beállítása</string>
+    <string name="save_admission_question">Elmenti a befogadási beállításokat?</string>
+    <string name="snd_group_event_member_accepted">Ön befogadta ezt a tagot</string>
+    <string name="accept_pending_member_alert_confirmation_as_member">Befogadás tagként</string>
+    <string name="rcv_group_event_member_accepted">befogadta őt: %1$s</string>
+    <string name="reviewed_by_admins">áttekintve a moderátorok által</string>
+    <string name="cant_send_message_generic">nem lehet üzeneteket küldeni</string>
+    <string name="cant_send_message_contact_disabled">partner letiltva</string>
+    <string name="cant_send_message_group_deleted">csoport törölve</string>
+    <string name="cant_send_message_mem_removed">eltávolítva a csoportból</string>
+    <string name="cant_send_message_rejected">csatlakozási kérelem elutasítva</string>
+    <string name="cant_send_message_you_left">Ön elhagyta a csoportot</string>
+    <string name="cant_send_message_member_has_old_version">a tag régi verziót használ</string>
+    <string name="error_deleting_member_support_chat">Hiba a taggal való csevegés törlésekor</string>
+    <string name="cant_send_message_alert_title">Ön nem tud üzeneteket küldeni!</string>
+    <string name="cant_send_message_contact_not_ready">a kapcsolat nem áll készen</string>
+    <string name="cant_send_message_contact_not_synchronized">nincs szinkronizálva</string>
+    <string name="delete_member_support_chat_alert_title">Törli a taggal való csevegést?</string>
+    <string name="cant_send_message_contact_deleted">partner törölve</string>
+    <string name="delete_member_support_chat_button">Csevegés törlése</string>
+    <string name="reject_pending_member_button">Elutasítás</string>
+    <string name="reject_pending_member_alert_title">Elutasítja a tagot?</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_alternate_email.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_alternate_email.svg
new file mode 100644
index 0000000000..39007022b8
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_alternate_email.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22"><path d="M480-90q-80.91 0-152.07-30.76-71.15-30.77-123.79-83.5Q151.5-257 120.75-328.09 90-399.17 90-480q0-80.91 30.76-152.07 30.77-71.15 83.5-123.79Q257-808.5 328.09-839.25 399.17-870 480-870q80.91 0 152.07 30.76 71.15 30.77 123.79 83.5Q808.5-703 839.25-631.91 870-560.83 870-480v55.97q0 56.93-39.5 96.98Q791-287 734-287q-34.5 0-64.5-15.25T619-345q-27.5 28.5-63.75 43.25T480.14-287q-80.64 0-136.89-56.25Q287-399.5 287-480t56.25-136.75Q399.5-673 480-673t136.75 56.25Q673-560.5 673-480.15V-424q0 26 17.5 44t43.5 18q26 0 43.5-18t17.5-44v-56q0-131.5-91.75-223.25T480-795q-131.5 0-223.25 91.75T165-480q0 131.5 91.75 223.25T480-165h159.5q15.5 0 26.5 11t11 26.5q0 15.5-11 26.5t-26.5 11H480Zm-.12-272q49.12 0 83.62-34.38 34.5-34.38 34.5-83.5t-34.38-83.62q-34.38-34.5-83.5-34.5t-83.62 34.38q-34.5 34.38-34.5 83.5t34.38 83.62q34.38 34.5 83.5 34.5Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_at.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_at.svg
new file mode 100644
index 0000000000..d0d34555df
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_at.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22" fill="#000000"><path d="M480-85q-82.01 0-154.15-31.13-72.13-31.13-125.49-84.5Q147-254 116-326.02q-31-72.03-31-153.92 0-81.97 31.13-154.13 31.13-72.17 84.5-125.55Q254-813 326.02-844q72.03-31 153.92-31 81.97 0 154.13 31.13 72.17 31.13 125.55 84.5Q813-706 844-633.9q31 72.11 31 154.09v51.78q0 54.97-38.92 92.75T741-297.5q-36.08 0-67.41-17.75Q642.25-333 625.5-364.5q-25.5 34-64.33 50.5-38.84 16.5-81.02 16.5-76.26 0-129.95-53-53.7-53-53.7-129.76 0-76.77 53.7-130.5Q403.89-664.5 480-664.5q76.1 0 129.8 53.76 53.7 53.76 53.7 130.58V-428q0 30.61 22.86 51.81Q709.22-355 740.5-355t54.14-21.19q22.86-21.2 22.86-51.81v-52q0-141.38-98.06-239.44T480-817.5q-141.37 0-239.44 98.06Q142.5-621.38 142.5-480q0 141.37 98.06 239.44Q338.63-142.5 480-142.5h184q11.67 0 20.09 8.46 8.41 8.47 8.41 20.22 0 12.32-8.41 20.57Q675.67-85 664-85H480Zm0-270q52.5 0 89.25-36.44t36.75-88.5q0-53.56-36.75-90.31T480-607q-52.5 0-89.25 36.69T354-480.06q0 52.06 36.75 88.56T480-355Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_checklist.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_checklist.svg
new file mode 100644
index 0000000000..947e78c1e5
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_checklist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="m225.5-216-140-140 40-40.5 100 99 179-179L445-435 225.5-216Zm0-320-140-140 40-40.5 100 99 179-179L445-755 225.5-536ZM521-291.5V-349h354v57.5H521Zm0-320V-669h354v57.5H521Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_group_off.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_group_off.svg
new file mode 100644
index 0000000000..710213ff55
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_group_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22" fill="#000000"><path d="m811.5-67-192-191h57v33q0 24.39-17.05 41.45Q642.39-166.5 618-166.5H103q-24.44 0-40.97-16.77Q45.5-200.03 45.5-224v-33.6q0-34.57 17.46-62.33 17.46-27.75 49.32-41.53Q185-393 242.5-407t118.27-14q28.11 0 54.48 3 26.37 3 52.75 8l-74-73.5q-8.17 2-16.3 2.5t-16.73.5Q296-480.5 255-521.38T214-627.5q0-8.37.5-16.65t2.5-16.35l-164.5-165q-9-8.5-9-20.5t8.75-20.5Q61-875 73-875t20.6 8.59L853-107.5q8.5 8.67 8.5 20.23T853-66.85Q843.97-58 831.98-58 820-58 811.5-67Zm-189-355.5q68 8.5 126.8 22.9 58.79 14.39 96.2 34.1 33 17.5 51.25 45.5T915-257.12v90.62h-39L726-317q-13-36-39.75-62t-63.75-43.5Zm-261.37 59q-56.37 0-105.25 10.75T135-310q-14 6.5-23 21.5t-9 31v33.5h516v-34.5l-64.5-65q-58-23.5-100.75-31.75t-92.62-8.25ZM535-508q15.5-22.5 23.75-53.18 8.25-30.67 8.25-66.88 0-44.28-12.25-78.11T518.5-768q10-2.81 23-4.66 13-1.84 23.5-1.84 65.24 0 106.12 41.03Q712-692.45 712-627.81q0 64.84-42.6 105.82Q626.8-481 562-481l-27-27Zm-45-45-43.5-43.5q2-7 3-14.75t1-16.25q0-39.09-25.21-64.29Q400.09-717 361-717q-8.5 0-16.25 1T330-713l-43.5-43.5q15.5-8.75 34.5-13.38 19-4.62 40-4.62 65.24 0 106.12 40.88Q508-692.74 508-627.5q0 21-4.62 40-4.63 19-13.38 34.5ZM367-224Zm21.5-431Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_help_filled.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_help_filled.svg
new file mode 100644
index 0000000000..ba3d3a393a
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_help_filled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#000000"><path d="M484.41-250.5q15.33 0 25.96-10.54T521-286.91q0-15.33-10.54-25.96t-25.87-10.63q-15.33 0-25.96 10.54T448-287.09q0 15.33 10.54 25.96t25.87 10.63ZM450-394h57q0-25.5 6.75-46.75t39.75-48.75q31-25.5 43.5-50.25T609.5-594q0-52.28-33.49-83.89-33.48-31.61-89.81-31.61-48.32 0-85.18 23.84-36.86 23.84-54.02 66.16l51.61 19q10.89-28 32.89-43 22.01-15 51.5-15 34 0 55 18.5t21 47.5q0 22-12.96 41.2-12.96 19.19-37.77 40.36Q479-486 464.5-459.93 450-433.85 450-394Zm30.06 309q-80.97 0-153.13-31.26-72.15-31.27-125.79-85Q147.5-255 116.25-327.02 85-399.05 85-479.94q0-81.97 31.26-154.13 31.27-72.15 85-125.54Q255-813 327.02-844q72.03-31 152.92-31 81.97 0 154.13 31.13 72.17 31.13 125.55 84.5Q813-706 844-633.98q31 72.03 31 153.92 0 80.97-31.01 153.13-31.02 72.15-84.5 125.79Q706-147.5 633.98-116.25 561.95-85 480.06-85Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important.svg
new file mode 100644
index 0000000000..37c79840d7
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22"><path d="M204-207.5q-15.5 0-26.5-11t-11-26.5q0-15.5 11-26.5t26.5-11h37.5v-271q0-83 50.25-147.5T422-786v-26q0-23.96 16.88-40.73 16.88-16.77 41-16.77T521-852.73q17 16.77 17 40.73v26q80 20.5 130.25 85t50.25 147.5v271H756q15.5 0 26.5 11t11 26.5q0 15.5-11 26.5t-26.5 11H204ZM480-500Zm0 408q-32.5 0-55.25-22.75T402-170h156q0 32.5-22.75 55.25T480-92ZM316.5-282.5h327v-271q0-67.44-48.04-115.47T479.96-717q-67.46 0-115.46 48.03t-48 115.47v271ZM480-437q15.5 0 26.5-11t11-26.5v-123q0-15.5-11-26.5T480-635q-15.5 0-26.5 11t-11 26.5v123q0 15.5 11 26.5t26.5 11Zm-.11 114Q496-323 507-333.89q11-10.9 11-27Q518-377 507.11-388q-10.9-11-27-11Q464-399 453-388.11q-11 10.9-11 27Q442-345 452.89-334q10.9 11 27 11Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important_filled.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important_filled.svg
new file mode 100644
index 0000000000..75f247a21e
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_notification_important_filled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22"><path d="M204-207.5q-15.5 0-26.5-11t-11-26.5q0-15.5 11-26.5t26.5-11h37.5v-271q0-83 50.25-147.5T422-786v-26q0-23.96 16.88-40.73 16.88-16.77 41-16.77T521-852.73q17 16.77 17 40.73v26q80 20.5 130.25 85t50.25 147.5v271H756q15.5 0 26.5 11t11 26.5q0 15.5-11 26.5t-26.5 11H204ZM480-92q-32.5 0-55.25-22.75T402-170h156q0 32.5-22.75 55.25T480-92Zm0-345q15.5 0 26.5-11t11-26.5v-123q0-15.5-11-26.5T480-635q-15.5 0-26.5 11t-11 26.5v123q0 15.5 11 26.5t26.5 11Zm-.11 114Q496-323 507-333.89q11-10.9 11-27Q518-377 507.11-388q-10.9-11-27-11Q464-399 453-388.11q-11 10.9-11 27Q442-345 452.89-334q10.9 11 27 11Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_person_edit.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_person_edit.svg
new file mode 100644
index 0000000000..7082a9c0d4
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_person_edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M500-224Zm-335.5 57.5v-91q0-37.75 18.75-64.12Q202-348 231.68-361.67 298-391 358.5-406t121.28-15q37.97 0 74.55 6t74.17 17l-45.43 45q-26.57-5.5-51.47-8-24.89-2.5-51.36-2.5-56.74 0-109.74 11.5-53 11.5-116 42-14 7-23.25 21.73T222-257.26V-224h278v57.5H164.5Zm393 41.5v-121.5L778-466q9-8.5 19.75-12.5 10.76-4 21.51-4 11.73 0 22.49 4.25Q852.5-474 861.5-465l37 37q8.76 8.85 12.63 19.68Q915-397.5 915-386.75t-4.38 22.03q-4.38 11.28-13.05 19.74L679-125H557.5Zm299-262-37-37 37 37Zm-240 203h37.76L776.5-307l-17.89-19-18.88-18L616.5-222v38Zm142-142-19-18 37 37-18-19ZM480-480.5q-62 0-104.75-42.75T332.5-628q0-62 42.75-104.75T480-775.5q62 0 104.75 42.75T627.5-628q0 62-42.75 104.75T480-480.5Zm0-57.5q38 0 64-26t26-64q0-38-26-64t-64-26q-38 0-64 26t-26 64q0 38 26 64t64 26Zm0-90Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/in/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/in/strings.xml
index eeedcaa450..b69ed8405f 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/in/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/in/strings.xml
@@ -216,7 +216,7 @@
     <string name="network_smp_proxy_mode_never">TIdak pernah</string>
     <string name="privacy_media_blur_radius_off">Mati</string>
     <string name="videos_limit_desc">Hanya 10 video dapat dikirim pada saat bersamaan</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Hanya perangkat klien yang menyimpan profil pengguna, kontak, grup, dan pesan yang dikirim dengan <b>enkripsi ujung-ke-ujung 2 lapis</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Hanya perangkat klien yang menyimpan profil pengguna, kontak, grup, dan pesan.</string>
     <string name="only_group_owners_can_enable_voice">Hanya pemilik grup yang dapat mengaktifkan pesan suara.</string>
     <string name="clear_note_folder_warning">Seluruh pesan akan dihapus - ini tidak bisa dibatalkan!</string>
     <string name="network_smp_proxy_fallback_allow_downgrade">Izinkan turun versi</string>
@@ -487,8 +487,8 @@
     <string name="message_deletion_prohibited">Hapus pesan tidak dapat dibatalkan dilarang dalam obrolan ini.</string>
     <string name="calls_prohibited_with_this_contact">Panggilan audio/video dilarang.</string>
     <string name="prohibit_message_reactions_group">Reaksi pesan dilarang.</string>
-    <string name="group_members_can_send_disappearing">Anggota grup dapat mengirim pesan sementara.</string>
-    <string name="disappearing_messages_are_prohibited">Pesan sementara dilarang di grup ini.</string>
+    <string name="group_members_can_send_disappearing">Anggota dapat mengirim pesan sementara.</string>
+    <string name="disappearing_messages_are_prohibited">Pesan sementara dilarang.</string>
     <string name="ttl_week">%d minggu</string>
     <string name="ttl_weeks">%d minggu</string>
     <string name="v4_2_security_assessment_desc">Keamanan SimpleX Chat diaudit oleh Trail of Bits.</string>
@@ -561,11 +561,11 @@
     <string name="disappearing_prohibited_in_this_chat">Pesan sementara dilarang dalam obrolan ini.</string>
     <string name="voice_prohibited_in_this_chat">Pesan suara dilarang dalam obrolan ini.</string>
     <string name="both_you_and_your_contact_can_add_message_reactions">Anda dan kontak dapat menambahkan reaksi pesan.</string>
-    <string name="group_members_can_delete">Anggota grup dapat hapus pesan terkirim secara permanen. (24 jam)</string>
-    <string name="group_members_can_send_voice">Anggota grup dapat mengirim pesan suara.</string>
-    <string name="message_deletion_prohibited_in_chat">Hapus pesan yang tidak dapat dibatalkan dilarang di grup ini.</string>
+    <string name="group_members_can_delete">Anggota dapat hapus pesan terkirim secara permanen. (24 jam)</string>
+    <string name="group_members_can_send_voice">Anggota dapat mengirim pesan suara.</string>
+    <string name="message_deletion_prohibited_in_chat">Hapus pesan yang tidak dapat dibatalkan dilarang.</string>
     <string name="direct_messages_are_prohibited_in_group">Pesan pribadi antar anggota dilarang di grup ini.</string>
-    <string name="group_members_can_send_simplex_links">Anggota grup dapat kirim tautan SimpleX.</string>
+    <string name="group_members_can_send_simplex_links">Anggota dapat kirim tautan SimpleX.</string>
     <string name="ttl_hours">%d jam</string>
     <string name="ttl_hour">%d jam</string>
     <string name="ttl_day">%d hari</string>
@@ -715,7 +715,7 @@
     <string name="hidden_profile_password">Kata sandi profil tersembunyi</string>
     <string name="permissions_record_audio">Mikrofon</string>
     <string name="privacy_redefined">Privasi didefinisikan ulang</string>
-    <string name="onboarding_notifications_mode_subtitle">Ini dapat diubah nanti di pengaturan.</string>
+    <string name="onboarding_notifications_mode_subtitle">Hal yang mempengaruhi baterai</string>
     <string name="onboarding_notifications_mode_off">Saat aplikasi sedang berjalan</string>
     <string name="onboarding_notifications_mode_title">Notifikasi pribadi</string>
     <string name="onboarding_notifications_mode_service">Instan</string>
@@ -960,8 +960,8 @@
     <string name="appearance_font_size">Ukuran huruf</string>
     <string name="prohibit_direct_messages">Kirim pesan pribadi ke anggota dilarang.</string>
     <string name="prohibit_sending_simplex_links">Kirim tautan SimpleX dilarang</string>
-    <string name="message_reactions_are_prohibited">Reaksi pesan dilarang di grup ini.</string>
-    <string name="simplex_links_are_prohibited_in_group">Tautan SimpleX dilarang di grup ini.</string>
+    <string name="message_reactions_are_prohibited">Reaksi pesan dilarang.</string>
+    <string name="simplex_links_are_prohibited_in_group">Tautan SimpleX dilarang.</string>
     <string name="network_session_mode_server">Server</string>
     <string name="network_smp_proxy_mode_unprotected">Tak terlindungi</string>
     <string name="network_session_mode_session">Sesi aplikasi</string>
@@ -997,7 +997,7 @@
     <string name="call_on_lock_screen">Panggilan pada layar terkunci:</string>
     <string name="audio_device_speaker">Speaker</string>
     <string name="permissions_grant_in_settings">Izin dalam pengaturan</string>
-    <string name="next_generation_of_private_messaging">Generasi baru\ndari perpesanan pribadi</string>
+    <string name="next_generation_of_private_messaging">Perpesanan masa depan</string>
     <string name="permissions_find_in_settings_and_grant">Temukan izin ini di pengaturan Android dan ubah secara manual.</string>
     <string name="audio_device_earpiece">Earpiece</string>
     <string name="no_call_on_lock_screen">Matikan</string>
@@ -1052,9 +1052,9 @@
     <string name="enable_sending_recent_history">Kirim hingga 100 pesan terakhir untuk anggota baru.</string>
     <string name="prohibit_sending_disappearing">Kirim pesan sementara dilarang.</string>
     <string name="disable_sending_recent_history">Jangan perlihat pesan riwayat ke anggota baru.</string>
-    <string name="group_members_can_send_dms">Anggota grup dapat mengirim pesan pribadi.</string>
-    <string name="voice_messages_are_prohibited">Pesan suara dilarang di grup ini.</string>
-    <string name="group_members_can_add_message_reactions">Anggota grup dapat memberi reaksi pesan.</string>
+    <string name="group_members_can_send_dms">Anggota dapat mengirim pesan pribadi.</string>
+    <string name="voice_messages_are_prohibited">Pesan suara dilarang.</string>
+    <string name="group_members_can_add_message_reactions">Anggota dapat memberi reaksi pesan.</string>
     <string name="ttl_month">%d bulan</string>
     <string name="feature_roles_owners">pemilik</string>
     <string name="ttl_sec">%d dtk</string>
@@ -1064,8 +1064,8 @@
     <string name="ttl_m">%db</string>
     <string name="ttl_mth">%dbln</string>
     <string name="whats_new">Apa yang baru</string>
-    <string name="group_members_can_send_files">Anggota grup dapat kirim berkas dan media.</string>
-    <string name="files_are_prohibited_in_group">Berkas dan media dilarang di grup ini.</string>
+    <string name="group_members_can_send_files">Anggota dapat kirim berkas dan media.</string>
+    <string name="files_are_prohibited_in_group">Berkas dan media dilarang.</string>
     <string name="recent_history_is_not_sent_to_new_members">Riwayat pesan tidak dikirim ke anggota baru.</string>
     <string name="v4_3_improved_privacy_and_security_desc">Sembunyikan layar aplikasi di aplikasi terbaru.</string>
     <string name="v4_3_irreversible_message_deletion_desc">Kontak Anda dapat mengizinkan hapus semua pesan.</string>
@@ -1160,7 +1160,7 @@
     <string name="error_updating_user_privacy">Gagal perbarui privasi pengguna</string>
     <string name="possible_slow_function_title">Fungsi lambat</string>
     <string name="icon_descr_instant_notifications">Notifikasi instan</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Untuk menggunakannya, harap <b>izinkan SimpleX berjalan di latar belakang</b> pada dialog berikutnya. Jika tidak, notifikasi akan dimatikan.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Izinkan</b> pada dialog berikutnya untuk menerima pemberitahuan secara instan.]]></string>
     <string name="turning_off_service_and_periodic">Optimalisasi baterai aktif, mematikan layanan latar belakang dan permintaan pesan baru secara berkala. Anda dapat aktifkan kembali di pengaturan.</string>
     <string name="turn_off_system_restriction_button">Buka pengaturan aplikasi</string>
     <string name="periodic_notifications_disabled">Notifikasi berkala dinonaktifkan!</string>
@@ -1265,7 +1265,7 @@
     <string name="error_xftp_test_server_auth">Server perlu otorisasi untuk mengunggah, periksa kata sandi</string>
     <string name="smp_server_test_create_queue">Buat antrian</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Dapat dimatikan melalui pengaturan</b> – notifikasi akan tetap ditampilkan saat aplikasi berjalan.]]></string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Untuk menjaga privasi, alih-alih notifikasi push, aplikasi ini memiliki <b>layanan latar belakang SimpleX</b> – yang gunakan beberapa persen baterai per hari.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Untuk tingkatkan privasi, <b>SimpleX berjalan di latar belakang</b> alih-alih gunakan notifikasi push.]]></string>
     <string name="periodic_notifications_desc">Aplikasi terima pesan baru secara berkala — aplikasi ini memakai beberapa persen baterai per hari. Aplikasi ini tidak gunakan notifikasi push — data dari perangkat tidak dikirim ke server.</string>
     <string name="simplex_service_notification_title">Layanan SimpleX Chat</string>
     <string name="notification_preview_mode_contact">Nama kontak</string>
@@ -1347,4 +1347,1016 @@
     <string name="conn_level_desc_direct">langsung</string>
     <string name="sending_via">Kirim via</string>
     <string name="receiving_via">Terima via</string>
-</resources>
\ No newline at end of file
+    <string name="icon_descr_contact_checked">Kontak diperiksa</string>
+    <string name="invite_prohibited">Tak dapat undang kontak!</string>
+    <string name="snd_conn_event_ratchet_sync_agreed">enkripsi disetujui untuk %s</string>
+    <string name="group_member_status_creator">pembuat</string>
+    <string name="group_member_status_connecting">menghubungkan</string>
+    <string name="delete_group_question">Hapus grup?</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">Grup akan dihapus untuk semua anggota - ini tidak dapat dibatalkan!</string>
+    <string name="create_group_link">Buat tautan grup</string>
+    <string name="group_member_status_introduced">menghubungkan (diperkenalkan)</string>
+    <string name="rcv_conn_event_verification_code_reset">kode keamanan berubah</string>
+    <string name="num_contacts_selected">%d kontak dipilih</string>
+    <string name="group_link">Tautan grup</string>
+    <string name="past_member_vName">Anggota lama %1$s</string>
+    <string name="conn_event_disabled_pq">enkripsi end-to-end standar</string>
+    <string name="conn_event_enabled_pq">enkripsi e2e quantum resistant</string>
+    <string name="group_member_status_intro_invitation">menghubungkan (undangan perkenalan)</string>
+    <string name="group_member_status_unknown_short">tidak dikenal</string>
+    <string name="button_delete_chat">Hapus obrolan</string>
+    <string name="button_add_friends">Tambah teman</string>
+    <string name="button_add_team_members">Tambah anggota tim</string>
+    <string name="button_leave_group">Keluar grup</string>
+    <string name="group_member_status_announced">menghubungkan (diumumkan)</string>
+    <string name="group_member_status_accepted">menghubungkan (diterima)</string>
+    <string name="button_delete_group">Hapus grup</string>
+    <string name="delete_group_for_self_cannot_undo_warning">Grup akan dihapus untuk Anda - ini tidak dapat dibatalkan!</string>
+    <string name="delete_chat_question">Hapus obrolan?</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Obrolan akan dihapus untuk semua anggota - ini tidak dapat dibatalkan!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Obrolan akan dihapus untuk Anda - ini tidak dapat dibatalkan!</string>
+    <string name="button_leave_chat">Tinggalkan obrolan</string>
+    <string name="button_edit_group_profile">Edit profil grup</string>
+    <string name="button_welcome_message">Pesan sambutan</string>
+    <string name="button_add_members">Undang anggota</string>
+    <string name="group_info_member_you">anda: %1$s</string>
+    <string name="invite_prohibited_description">Anda mencoba mengundang kontak yang telah Anda bagikan profil samaran ke grup tempat Anda menggunakan profil utama</string>
+    <string name="invite_to_group_button">Undang ke grup</string>
+    <string name="invite_to_chat_button">Undang ke obrolan</string>
+    <string name="select_contacts">Pilih kontak</string>
+    <string name="skip_inviting_button">Lewati undang anggota</string>
+    <string name="address_or_1_time_link">Alamat atau tautan 1-kali?</string>
+    <string name="developer_options_section">Opsi pengembang</string>
+    <string name="onboarding_choose_server_operators">Operator server</string>
+    <string name="onboarding_network_operators">Operator jaringan</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Aplikasi ini melindungi privasi Anda dengan gunakan operator yang berbeda setiap percakapan.</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Ketentuan akan diterima untuk operator yang diaktifkan setelah 30 hari.</string>
+    <string name="settings_developer_tools">Alat pengembang</string>
+    <string name="settings_section_title_chat_colors">Warna obrolan</string>
+    <string name="rcv_group_event_member_created_contact">terhubung langsung</string>
+    <string name="remote_ctrl_error_bad_state">Koneksi ke desktop dalam kondisi buruk</string>
+    <string name="confirm_delete_contact_question">Konfirmasi hapus kontak?</string>
+    <string name="send_disappearing_message_custom_time">Waktu kustom</string>
+    <string name="choose_file_title">Pilih berkas</string>
+    <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Anda dapat <font color="#0088ff">terhubung ke pengembang SimpleX Chat untuk mengajukan pertanyaan dan menerima pembaruan</font>.]]></string>
+    <string name="clear_chat_question">Hapus obrolan?</string>
+    <string name="network_proxy_auth_mode_no_auth">Jangan gunakan kredensial dengan proxy.</string>
+    <string name="disable_onion_hosts_when_not_supported"><![CDATA[Atur <i>Gunakan host .onion</i> ke Tidak jika proxy SOCKS tidak mendukung.]]></string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Harap diperhatikan</b>: relay pesan dan berkas terhubung melalui proxy SOCKS. Panggilan dan pengiriman pratinjau tautan menggunakan koneksi langsung.]]></string>
+    <string name="network_smp_proxy_fallback_prohibit_description">JANGAN mengirim pesan secara langsung, meskipun server Anda atau server tujuan tidak mendukung routing pribadi.</string>
+    <string name="display_name_cannot_contain_whitespace">Nama tampilan tidak boleh terdapat spasi.</string>
+    <string name="you_can_change_it_later">Frasa sandi acak disimpan dalam pengaturan sebagai teks biasa.\nAnda dapat mengubahnya nanti.</string>
+    <string name="setup_database_passphrase">Pasang frasa sandi basis data</string>
+    <string name="database_will_be_encrypted">Basis data akan dienkripsi.</string>
+    <string name="database_upgrade">Peningkatan basis data</string>
+    <string name="confirm_database_upgrades">Konfirmasi peningkatan basis data</string>
+    <string name="downgrade_and_open_chat">Turunkan dan buka obrolan</string>
+    <string name="rcv_group_event_changed_member_role">mengubah hak %s menjadi %s</string>
+    <string name="share_text_deleted_at">Dihapus pada: %s</string>
+    <string name="delete_profile">Hapus profil</string>
+    <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Ini adalah tautan untuk grup <b>%1$s</b>!]]></string>
+    <string name="migrate_from_device_cancel_migration">Batal pindah</string>
+    <string name="chunks_uploaded">Potongan diunggah</string>
+    <string name="info_view_connect_button">hubungkan</string>
+    <string name="conversation_deleted">Percakapan dihapus!</string>
+    <string name="disappearing_message">Pesan sementara</string>
+    <string name="clear_note_folder_question">Hapus catatan pribadi?</string>
+    <string name="chat_is_stopped">Obrolan dihentikan</string>
+    <string name="database_passphrase">Frasa sandi basis data</string>
+    <string name="confirm_new_passphrase">Konfirmasi frasa sandi baru…</string>
+    <string name="change_database_passphrase_question">Ubah frasa sandi basis data?</string>
+    <string name="cannot_access_keychain">Tidak dapat mengakses Keystore untuk menyimpan kata sandi basis data</string>
+    <string name="database_downgrade">Penurunan basis data</string>
+    <string name="chat_is_stopped_indication">Obrolan dihentikan</string>
+    <string name="button_create_group_link">Buat tautan</string>
+    <string name="info_row_deleted_at">Dihapus di</string>
+    <string name="direct_messages_are_prohibited_in_chat">Pesan pribadi antar anggota dilarang dalam obrolan ini.</string>
+    <string name="delivery_receipts_title">Tanda terima pengirim!</string>
+    <string name="this_device_version"><![CDATA[<i>(perangkat ini v%s)</i>]]></string>
+    <string name="devices">Perangkat</string>
+    <string name="remote_ctrl_was_disconnected_title">Koneksi terputus</string>
+    <string name="copy_error">Gagal salin</string>
+    <string name="discover_on_network">Temukan melalui jaringan lokal</string>
+    <string name="remote_ctrl_error_bad_invitation">Kode undangan desktop salah</string>
+    <string name="remote_ctrl_error_disconnected">Desktop terputus</string>
+    <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[Anda sudah terhubung ke <b>%1$s</b>.]]></string>
+    <string name="migrate_to_device_confirm_network_settings">Konfirmasi pengaturan jaringan</string>
+    <string name="chunks_deleted">Potongan dihapus</string>
+    <string name="chunks_downloaded">Potongan diunduh</string>
+    <string name="downloaded_files">Berkas terunduh</string>
+    <string name="download_errors">Gagal unduh</string>
+    <string name="delete_files_and_media_all">Hapus semua berkas</string>
+    <string name="delete_files_and_media_question">Hapus berkas dan media?</string>
+    <string name="total_files_count_and_size">%d berkas dengan total ukuran %s</string>
+    <string name="chat_database_exported_continue">Lanjutkan</string>
+    <string name="rcv_direct_event_contact_deleted">kontak dihapus</string>
+    <string name="alert_title_cant_invite_contacts">Tak dapat undang kontak!</string>
+    <string name="info_row_disappears_at">Terhapus pada</string>
+    <string name="share_text_disappears_at">Terhapus pada: %s</string>
+    <string name="item_info_current">(saat ini)</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Ketentuan yang sama akan berlaku untuk operator <b>%s</b>.]]></string>
+    <string name="appearance_bars_blur_radius">Buram</string>
+    <string name="appearance_in_app_bars_alpha">Transparansi</string>
+    <string name="appearance_app_toolbars">Bilah alat aplikasi</string>
+    <string name="v6_0_connection_servers_status_descr">Status koneksi dan server.</string>
+    <string name="remote_ctrl_error_bad_version">Desktop memiliki versi tidak didukung. Pastikan Anda gunakan versi yang sama di kedua perangkat</string>
+    <string name="migrate_to_device_chat_migrated">Obrolan dipindahkan!</string>
+    <string name="migrate_from_device_delete_database_from_device">Hapus basis data dari perangkat ini</string>
+    <string name="delete_files_and_media_for_all_users">Hapus berkas untuk semua profil obrolan</string>
+    <string name="info_row_created_at">Dibuat di</string>
+    <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Terbaik untuk baterai</b>. Anda akan menerima notifikasi saat aplikasi sedang berjalan (TANPA layanan latar belakang).]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Baik untuk baterai</b>. Aplikasi memeriksa pesan setiap 10 menit. Anda mungkin melewatkan panggilan atau pesan penting.]]></string>
+    <string name="settings_section_title_chat_theme">Tema obrolan</string>
+    <string name="chat_database_section">BASIS DATA OBROLAN</string>
+    <string name="set_password_to_export_desc">Basis data dienkripsi menggunakan frasa sandi acak. Harap ubah frasa sandi sebelum mengekspor.</string>
+    <string name="chat_database_exported_title">Basis data obrolan diekspor</string>
+    <string name="current_passphrase">Frasa sandi saat ini…</string>
+    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Harap diperhatikan</b>: Anda TIDAK akan dapat pulihkan atau ubah frasa sandi jika hilang.]]></string>
+    <string name="encrypted_with_random_passphrase">Basis data dienkripsi menggunakan frasa sandi acak, Anda dapat mengubahnya.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored_in_settings">Basis data akan dienkripsi dan frasa sandi disimpan dalam pengaturan.</string>
+    <string name="mtr_error_no_down_migration">versi database lebih baru daripada aplikasi, tetapi tidak ada penurunan migrasi untuk: %s</string>
+    <string name="rcv_group_events_count">%d acara grup</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">mengubah alamat untuk Anda</string>
+    <string name="info_row_database_id">ID basis data</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">Menghubungkan ke kontak, harap tunggu atau periksa nanti!</string>
+    <string name="users_delete_question">Hapus profil obrolan?</string>
+    <string name="deletion_errors">Gagal hapus</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Perangkat Xiaomi</b>: harap aktifkan Autostart di pengaturan sistem agar notifikasi berfungsi.]]></string>
+    <string name="clear_chat_button">Hapus obrolan</string>
+    <string name="connect_via_link_or_qr">Hubungkan via tautan / kode QR</string>
+    <string name="connect__a_new_random_profile_will_be_shared">Profil acak baru akan dibagikan.</string>
+    <string name="connection_request_sent">Permintaan koneksi terkirim!</string>
+    <string name="connection_security">Keamanan koneksi</string>
+    <string name="correct_name_to">Nama telah benar untuk %s?</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Anda dapat konfigurasi operator di pengaturan Jaringan dan server.</string>
+    <string name="database_error">Kesalahan basis data</string>
+    <string name="passphrase_is_different">Frasa sandi basis data berbeda dengan yang disimpan di Keystore.</string>
+    <string name="change_member_role_question">Ubah hak grup?</string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Ketentuan ini juga berlaku untuk: <b>%s</b>.]]></string>
+    <string name="operator_conditions_of_use">Ketentuan Penggunaan</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Ketentuan akan diterima untuk operator: <b>%s</b>.]]></string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Untuk gunakan server <b>%s</b>, terima ketentuan penggunaan.]]></string>
+    <string name="operator_added_message_servers">Menambahkan server pesan</string>
+    <string name="delete_chat_profile">Hapus profil obrolan</string>
+    <string name="v6_2_business_chats">Obrolan bisnis</string>
+    <string name="remote_ctrl_disconnected_with_reason">Terputus dikarenakan: %s</string>
+    <string name="remote_host_disconnected_from"><![CDATA[Terputus dari ponsel <b>%s</b> dengan alasan: %s]]></string>
+    <string name="remote_ctrl_error_busy">Desktop sedang sibuk</string>
+    <string name="rcv_group_event_group_deleted">grup dihapus</string>
+    <string name="profile_update_event_contact_name_changed">kontak %1$s diubah menjadi %2$s</string>
+    <string name="calls_prohibited_alert_title">Panggilan dilarang!</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Ketentuan sudah diterima untuk operator berikut: <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Ketentuan yang sama akan berlaku untuk operator: <b>%s</b>.]]></string>
+    <string name="operator_conditions_failed_to_load">Teks ketentuan saat ini tidak dapat dimuat, Anda dapat meninjau ketentuan via tautan ini:</string>
+    <string name="direct_messages_are_prohibited">Pesan pribadi antar anggota dilarang.</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Pilih <i>Pindah dari perangkat lain</i> pada perangkat baru dan pindai kode QR.]]></string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Kontak dan semua pesan akan dihapus - ini tidak dapat dibatalkan!</string>
+    <string name="delete_contact_cannot_undo_warning">Kontak akan dihapus - ini tidak dapat dibatalkan!</string>
+    <string name="delete_contact_question">Hapus kontak?</string>
+    <string name="contact_deleted">Kontak dihapus!</string>
+    <string name="delete_without_notification">Hapus tanpa notifikasi</string>
+    <string name="switch_receiving_address_question">Ubah alamat penerima?</string>
+    <string name="icon_descr_server_status_disconnected">Terputus</string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Tambahkan kontak</b>: untuk buat tautan undangan baru, atau terhubung via tautan yang Anda terima.]]></string>
+    <string name="delete_pending_connection__question">Hapus koneksi yang tertunda?</string>
+    <string name="alert_title_contact_connection_pending">Kontak belum terhubung!</string>
+    <string name="delete_address">Hapus alamat</string>
+    <string name="delete_database">Hapus basis data</string>
+    <string name="chat_database_deleted">Basis data obrolan dihapus</string>
+    <string name="chat_database_imported">Basis data obrolan diimpor</string>
+    <string name="send_receipts_disabled">Dimatikan</string>
+    <string name="v6_0_connection_servers_status">Kontrol jaringan Anda</string>
+    <string name="connecting_to_desktop">Menghubungkan ke desktop</string>
+    <string name="desktop_app_version_is_incompatible">Versi aplikasi desktop %s tidak kompatibel dengan aplikasi ini.</string>
+    <string name="remote_host_error_bad_state"><![CDATA[Koneksi ponsel <b>%s</b> dalam kondisi buruk]]></string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Autentikasi perangkat tidak diaktifkan. Anda dapat aktifkan SimpleX Lock via Pengaturan, setelah mengaktifkan autentikasi perangkat.</string>
+    <string name="auth_unavailable">Autentikasi tidak tersedia</string>
+    <string name="auth_confirm_credential">Konfirmasi kredensial Anda</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">Autentikasi perangkat mati. Matikan SimpleX Lock.</string>
+    <string name="auth_disable_simplex_lock">Matikan Kunci SimpleX</string>
+    <string name="snd_error_relay">Kesalahan server tujuan: %1$s</string>
+    <string name="delete_and_notify_contact">Hapus dan beritahu kontak</string>
+    <string name="button_delete_contact">Hapus kontak</string>
+    <string name="icon_descr_cancel_live_message">Batal pesan langsung</string>
+    <string name="confirm_verb">Konfirmasi</string>
+    <string name="create_group">Buat grup rahasia</string>
+    <string name="camera_not_available">Kamera tidak tersedia</string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code"><![CDATA[💻 desktop: pindai kode QR yang ditampilkan dari aplikasi, via <b>Pindai kode QR</b>.]]></string>
+    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 ponsel: ketuk <b>Buka di aplikasi seluler</b>, lalu ketuk <b>Hubungkan</b> di aplikasi.]]></string>
+    <string name="delete_contact_menu_action">Hapus</string>
+    <string name="delete_group_menu_action">Hapus</string>
+    <string name="icon_descr_cancel_link_preview">batal pratinjau tautan</string>
+    <string name="icon_descr_close_button">Tombol tutup</string>
+    <string name="icon_descr_email">Email</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Jika Anda tidak dapat bertemu langsung, Anda dapat <b>pindai kode QR dalam panggilan video</b>, atau kontak Anda dapat bagikan tautan undangan.]]></string>
+    <string name="read_more_in_user_guide_with_link"><![CDATA[Lebih lanjut di <font color="#0088ff">Panduan Pengguna</font>.]]></string>
+    <string name="enable_receipts_all">Aktifkan</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Ketika lebih dari satu operator diaktifkan, tidak satupun dari mereka memiliki metadata untuk mengetahui siapa yang berkomunikasi.</string>
+    <string name="chat_is_running">Obrolan sedang berjalan</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">Basis data akan dienkripsi dan frasa sandi disimpan di Keystore.</string>
+    <string name="rcv_group_event_changed_your_role">mengubah hak Anda jadi %s</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">mengubah alamat…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">mengubah alamat untuk %s…</string>
+    <string name="share_text_database_id">ID basis data: %d</string>
+    <string name="operator_added_xftp_servers">Menambahkan media dan berkas server</string>
+    <string name="connect_plan_chat_already_exists">Obrolan sudah ada!</string>
+    <string name="database_encrypted">Basis data dienkripsi!</string>
+    <string name="database_encryption_will_be_updated_in_settings">Frasa sandi enkripsi basis data akan diperbarui dan disimpan di pengaturan.</string>
+    <string name="database_encryption_will_be_updated">Frasa sandi enkripsi basis data akan diperbarui dan disimpan di Keystore.</string>
+    <string name="mtr_error_different">migrasi berbeda di aplikasi/basis data: %s / %s</string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Jika Anda tidak dapat bertemu langsung, <b>tunjukkan kode QR dalam panggilan video</b>, atau bagikan tautan.]]></string>
+    <string name="dont_create_address">Jangan buat alamat</string>
+    <string name="servers_info_details">Rincian</string>
+    <string name="connections">Koneksi</string>
+    <string name="connected_to_mobile">Terhubung ke ponsel</string>
+    <string name="dont_enable_receipts">Jangan aktifkan</string>
+    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Buka <i>Gunakan dari desktop</i> di aplikasi seluler dan pindai kode QR.]]></string>
+    <string name="desktop_device">Desktop</string>
+    <string name="display_name_accepted_invitation">undangan diterima</string>
+    <string name="display_name_requested_to_connect">diminta untuk terhubung</string>
+    <string name="auth_open_chat_profiles">Ubah profil obrolan</string>
+    <string name="snd_error_quota">Kapasitas terlampaui - penerima tidak menerima pesan yang dikirim sebelumnya.</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[tautan 1-kali dapat digunakan <i>hanya dengan satu kontak</i> - bagikan secara langsung atau melalui messenger apa pun.]]></string>
+    <string name="copied">Disalin ke papan klip</string>
+    <string name="share_one_time_link">Buat tautan undangan satu-kali</string>
+    <string name="maximum_supported_file_size">Saat ini maksimal ukuran berkas adalah %1$s.</string>
+    <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[Anda juga dapat terhubung dengan ketuk tautan. Jika tautan terbuka di peramban, ketuk <b>Buka di ponsel</b>.]]></string>
+    <string name="address_settings">Pengaturan alamat</string>
+    <string name="add_your_team_members_to_conversations">Tambahkan anggota tim Anda ke percakapan.</string>
+    <string name="business_address">Alamat bisnis</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Semua pesan dan berkas dikirim <b>dengan enkripsi end-to-end</b>, dengan keamanan post-quantum dalam pesan pribadi.]]></string>
+    <string name="create_1_time_link">Buat tautan 1-kali</string>
+    <string name="onboarding_notifications_mode_battery">Notifikasi dan baterai</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Tiada layanan latar belakang</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Aplikasi selalu berjalan di latar belakang</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Periksa pesan setiap 10 menit</string>
+    <string name="onboarding_select_network_operators_to_use">Pilih operator jaringan yang akan digunakan.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Misalnya, jika kontak Anda menerima pesan melalui server SimpleX Chat, aplikasi Anda akan mengirimkannya melalui server Flux.</string>
+    <string name="how_it_helps_privacy">Bagaimana ini membantu privasi</string>
+    <string name="onboarding_network_operators_continue">Lanjutkan</string>
+    <string name="onboarding_network_operators_configure_via_settings">Anda dapat konfigurasi server di pengaturan.</string>
+    <string name="read_more_in_github_with_link"><![CDATA[Lebih lengkap di <font color="#0088ff">repositori GitHub</font> kami.]]></string>
+    <string name="onboarding_network_operators_review_later">Nilai nanti</string>
+    <string name="onboarding_network_operators_update">Perbarui</string>
+    <string name="migrate_to_device_downloading_details">Rincian tautan unduhan</string>
+    <string name="network_session_mode_user_description"><![CDATA[Koneksi TCP terpisah (dan kredensial SOCKS) akan digunakan <b>untuk setiap profil obrolan yang Anda miliki di aplikasi</b>.]]></string>
+    <string name="network_session_mode_entity_description"><![CDATA[Koneksi TCP terpisah (dan kredensial SOCKS) akan digunakan <b>untuk setiap kontak dan anggota grup</b>.\n<b>Harap diperhatikan</b>: jika Anda memiliki banyak koneksi, konsumsi baterai dan lalu lintas dapat jauh lebih tinggi dan beberapa koneksi mungkin gagal.]]></string>
+    <string name="app_check_for_updates_download_started">Mengunduh pembaruan aplikasi, jangan tutup aplikasi</string>
+    <string name="app_check_for_updates_notice_disable">Mati</string>
+    <string name="create_simplex_address">Buat alamat SimpleX</string>
+    <string name="create_address_and_let_people_connect">Buat alamat agar orang dapat terhubung dengan Anda.</string>
+    <string name="continue_to_next_step">Lanjutkan</string>
+    <string name="delete_image">Hapus gambar</string>
+    <string name="edit_image">Edit gambar</string>
+    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Mengonsumsi banyak baterai</b>! Aplikasi selalu berjalan di latar belakang – notifikasi ditampilkan secara instan.]]></string>
+    <string name="settings_message_shape_corner">Sudut</string>
+    <string name="dont_show_again">Jangan tampilkan lagi</string>
+    <string name="migrate_from_device_confirm_upload">Konfirmasi unggahan</string>
+    <string name="migrate_from_device_archive_and_upload">Arsip dan unggah</string>
+    <string name="deleted">Dihapus</string>
+    <string name="desktop_connection_terminated">Koneksi dihentikan</string>
+    <string name="desktop_address">Alamat desktop</string>
+    <string name="desktop_devices">Perangkat desktop</string>
+    <string name="onboarding_network_about_operators">Tentang operator</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat dan Flux membuat kesepakatan untuk sertakan server yang dioperasikan Flux ke aplikasi.</string>
+    <string name="delete_chat_profile_question">Hapus profil obrolan?</string>
+    <string name="chat_is_stopped_you_should_transfer_database">Obrolan dihentikan. Jika Anda sudah gunakan basis data ini di perangkat lain, Anda harus transfer kembali sebelum memulai obrolan.</string>
+    <string name="database_passphrase_will_be_updated">Frasa sandi enkripsi basis data akan diperbarui.</string>
+    <string name="database_passphrase_is_required">Frasa sandi basis data diperlukan untuk membuka obrolan.</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Ketentuan ini juga berlaku untuk: <b>%s</b>.]]></string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Anda <b>tidak</b> boleh menggunakan basis data yang sama pada dua perangkat.]]></string>
+    <string name="connected_to_desktop">Terhubung ke desktop</string>
+    <string name="connect_to_desktop">Hubungkan ke desktop</string>
+    <string name="custom_time_unit_days">hari</string>
+    <string name="decryption_errors">kesalahan dekripsi</string>
+    <string name="disconnect_remote_hosts">Putuskan ponsel</string>
+    <string name="multicast_discoverable_via_local_network">Dapat ditemukan melalui jaringan lokal</string>
+    <string name="duplicates_label">duplikat</string>
+    <string name="v6_1_better_security">Keamanan yang lebih baik ✅</string>
+    <string name="v6_1_customizable_message_descr">Bentuk pesan yang dapat disesuaikan.</string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Harap diperhatikan</b>: menggunakan database yang sama pada dua perangkat akan merusak dekripsi pesan dari koneksi Anda, sebagai perlindungan keamanan.]]></string>
+    <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Anda sudah bergabung dengan grup <b>%1$s</b>.]]></string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">mengubah alamat…</string>
+    <string name="delete_link_question">Hapus tautan?</string>
+    <string name="delete_link">Hapus tautan</string>
+    <string name="disconnect_remote_host">Putuskan</string>
+    <string name="servers_info_connected_servers_section_header">Server terhubung</string>
+    <string name="delete_member_message__question">Hapus pesan anggota?</string>
+    <string name="v6_1_message_dates_descr">Tanggal pesan lebih baik.</string>
+    <string name="new_desktop"><![CDATA[<i>(baru)</i>]]></string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Anda sudah terhubung dengan <b>%1$s</b>.]]></string>
+    <string name="created">Dibuat</string>
+    <string name="delete_members_messages__question">Hapus %d pesan anggota?</string>
+    <string name="failed_to_save_servers">Gagal simpan server</string>
+    <string name="ci_status_other_error">Galat: %1$s</string>
+    <string name="image_will_be_received_when_contact_completes_uploading">Gambar akan diterima setelah kontak Anda selesai mengunggah.</string>
+    <string name="error_saving_file">Gagal simpan berkas</string>
+    <string name="invalid_contact_link">Tautan tidak valid!</string>
+    <string name="app_check_for_updates_button_install">Instal pembaruan</string>
+    <string name="hide_dev_options">Sembunyikan:</string>
+    <string name="for_social_media">Untuk media sosial</string>
+    <string name="settings_experimental_features">Fitur eksperimental</string>
+    <string name="auth_enable_simplex_lock">Aktifkan Kunci SimpleX</string>
+    <string name="file_error_no_file">Berkas tidak ditemukan - kemungkinan besar telah dihapus atau dibatalkan.</string>
+    <string name="file_error_relay">Kesalahan berkas server: %1$s</string>
+    <string name="in_reply_to">Balasan untuk</string>
+    <string name="choose_file">Berkas</string>
+    <string name="gallery_image_button">gambar</string>
+    <string name="favorite_chat">Favorit</string>
+    <string name="exit_without_saving">Keluar tanpa menyimpan</string>
+    <string name="file_with_path">Berkas: %s</string>
+    <string name="group_invitation_item_description">undangan ke grup %1$s</string>
+    <string name="alert_title_no_group">Grup tidak ditemukan!</string>
+    <string name="error_sending_message_contact_invitation">Gagal kirim undangan</string>
+    <string name="action_button_add_members">Undang</string>
+    <string name="info_row_file_status">Status berkas</string>
+    <string name="error_changing_role">Gagal ganti hak</string>
+    <string name="error_removing_member">Gagal hapus anggota</string>
+    <string name="incognito">Samaran</string>
+    <string name="incognito_info_protects">Mode samaran melindungi privasi Anda dengan menggunakan profil acak baru untuk setiap kontak.</string>
+    <string name="error_enabling_delivery_receipts">Gagal aktifkan tanda terima pengirim!</string>
+    <string name="enter_this_device_name">Masukkan nama perangkat ini…</string>
+    <string name="migrate_to_device_import_failed">Impor gagal</string>
+    <string name="migrate_to_device_error_downloading_archive">Gagal unduh arsipan</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">Berkas yang diekspor tidak ada</string>
+    <string name="migrate_from_device_finalize_migration">Selesaikan migrasi</string>
+    <string name="servers_info_reset_stats_alert_error_title">Gagal atur ulang statistik</string>
+    <string name="error_importing_database">Gagal impor basis data obrolan</string>
+    <string name="error_deleting_database">Gagal hapus basis data obrolan</string>
+    <string name="files_and_media_section">Berkas dan media</string>
+    <string name="encrypt_database_question">Enkripsi basis data?</string>
+    <string name="incompatible_database_version">Versi basis data tidak kompatibel</string>
+    <string name="section_title_for_console">UNTUK KONSOL</string>
+    <string name="connect_plan_group_already_exists">Grup sudah ada!</string>
+    <string name="migrate_to_device_enter_passphrase">Masukkan frasa sandi</string>
+    <string name="enable_automatic_deletion_question">Aktifkan hapus pesan otomatis?</string>
+    <string name="encrypted_database">Basis data terenkripsi</string>
+    <string name="invalid_migration_confirmation">Konfirmasi migrasi tidak valid</string>
+    <string name="group_invitation_expired">Undangan grup kedaluwarsa</string>
+    <string name="conn_event_ratchet_sync_allowed">negosiasi ulang enkripsi diperbolehkan</string>
+    <string name="conn_event_ratchet_sync_required">negosiasi ulang enkripsi diperlukan</string>
+    <string name="snd_conn_event_ratchet_sync_allowed">negosiasi ulang enkripsi diizinkan untuk %s</string>
+    <string name="v6_2_network_decentralization_enable_flux">Aktifkan Flux di pengaturan Jaringan dan server untuk privasi metadata yang lebih baik.</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">untuk privasi metadata lebih baik.</string>
+    <string name="v6_2_improved_chat_navigation">Navigasi obrolan ditingkatkan</string>
+    <string name="error">Galat</string>
+    <string name="migrate_to_device_finalize_migration">Selesaikan migrasi pada perangkat lain.</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Gagal verifikasi frasa sandi:</string>
+    <string name="servers_info_reconnect_server_error">Gagal hubungkan ulang server</string>
+    <string name="servers_info_reconnect_servers_error">Gagal hubungkan ulang server</string>
+    <string name="settings_section_title_experimenta">EKSPERIMENTAL</string>
+    <string name="export_database">Ekspor basis data</string>
+    <string name="import_database">Impor basis data</string>
+    <string name="error_stopping_chat">Gagal hentikan obrolan</string>
+    <string name="error_changing_message_deletion">Gagal ganti pengaturan</string>
+    <string name="error_with_info">Galat: %s</string>
+    <string name="icon_descr_group_inactive">Grup tidak aktif</string>
+    <string name="alert_title_group_invitation_expired">Undangan kedaluwarsa!</string>
+    <string name="snd_group_event_group_profile_updated">profil grup diperbarui</string>
+    <string name="initial_member_role">Hak awal</string>
+    <string name="error_creating_link_for_group">Gagal membuat tautan grup</string>
+    <string name="error_deleting_link_for_group">Gagal hapus tautan grup</string>
+    <string name="error_updating_link_for_group">Gagal perbarui tautan grup</string>
+    <string name="error_creating_member_contact">Gagal membuat kontak anggota</string>
+    <string name="user_hide">Sembunyikan</string>
+    <string name="image_will_be_received_when_contact_is_online">Gambar akan diterima saat kontak Anda online, harap tunggu atau periksa nanti!</string>
+    <string name="file_error">Kesalahan berkas</string>
+    <string name="from_gallery_button">Dari Galeri</string>
+    <string name="how_to_use_markdown">Cara menggunakan markdown</string>
+    <string name="alert_message_group_invitation_expired">Undangan grup tidak lagi berlaku, telah dihapus oleh pengirim.</string>
+    <string name="operator_use_for_messages_private_routing">Untuk routing pribadi</string>
+    <string name="error_updating_server_title">Gagal perbarui server</string>
+    <string name="enter_password_to_show">Masukkan kata sandi dalam pencarian</string>
+    <string name="enter_correct_passphrase">Masukkan frasa sandi yang benar.</string>
+    <string name="custom_time_unit_hours">jam</string>
+    <string name="desktop_incompatible_version">Versi tidak kompatibel</string>
+    <string name="servers_info_sessions_errors">Galat</string>
+    <string name="snd_error_proxy">Server penerusan: %1$s\nKesalahan: %2$s</string>
+    <string name="snd_error_proxy_relay">Server penerusan: %1$s\nKesalahan server tujuan: %2$s</string>
+    <string name="files_and_media_prohibited">Berkas dan media dilarang!</string>
+    <string name="file_will_be_received_when_contact_completes_uploading">Berkas akan diterima setelah kontak Anda selesai mengunggah.</string>
+    <string name="file_will_be_received_when_contact_is_online">Berkas akan diterima saat kontak Anda online, harap tunggu atau periksa nanti!</string>
+    <string name="enable_camera_access">Aktifkan akses kamera</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Jika Anda menerima tautan undangan SimpleX Chat, Anda dapat buka di peramban Anda:</string>
+    <string name="icon_descr_help">bantuan</string>
+    <string name="if_you_cant_meet_in_person">Jika Anda tidak dapat bertemu langsung, tunjukkan kode QR dalam panggilan video, atau bagikan tautan.</string>
+    <string name="network_option_enable_tcp_keep_alive">Aktifkan TCP keep-alive</string>
+    <string name="error_starting_chat">Gagal memulai obrolan</string>
+    <string name="settings_section_title_incognito">Mode samaran</string>
+    <string name="migrate_from_device_error_deleting_database">Gagal hapus basis data</string>
+    <string name="invalid_QR_code">Kode QR tidak valid</string>
+    <string name="error_encrypting_database">Gagal enkripsi basis data</string>
+    <string name="icon_descr_server_status_error">Galat</string>
+    <string name="import_database_confirmation">Impor</string>
+    <string name="expired_label">kedaluwarsa</string>
+    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Jika Anda memilih menolak, pengirim TIDAK akan diberitahu.</string>
+    <string name="errors_in_servers_configuration">Kesalahan dalam konfigurasi server.</string>
+    <string name="for_chat_profile">Untuk profil obrolan %s:</string>
+    <string name="error_accepting_operator_conditions">Gagal menerima ketentuan</string>
+    <string name="app_check_for_updates_installed_successfully_title">Berhasil diinstal</string>
+    <string name="hide_profile">Sembunyikan profil</string>
+    <string name="enter_passphrase">Masukkan frasa sandi…</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">Berkas telah dihapus atau tautan tidak valid</string>
+    <string name="enter_welcome_message_optional">Masukkan pesan sambutan… (opsional)</string>
+    <string name="full_name__field">Nama lengkap:</string>
+    <string name="migrate_from_device_chat_should_be_stopped">Untuk melanjutkan, obrolan harus dihentikan.</string>
+    <string name="snd_conn_event_ratchet_sync_required">negosiasi ulang enkripsi diperlukan untuk %s</string>
+    <string name="icon_descr_expand_role">Perluas pemilihan hak</string>
+    <string name="found_desktop">Ditemukan desktop</string>
+    <string name="migrate_from_device_error_saving_settings">Gagal simpan pengaturan</string>
+    <string name="snd_conn_event_ratchet_sync_ok">enkripsi ok untuk %s</string>
+    <string name="error_exporting_chat_database">Gagal ekspor basis data obrolan</string>
+    <string name="import_database_question">Impor basis data obrolan?</string>
+    <string name="conn_level_desc_indirect">tidak langsung (%1$s)</string>
+    <string name="error_adding_server">Gagal menambah server</string>
+    <string name="migrate_from_device_error_uploading_archive">Gagal perbarui arsipan</string>
+    <string name="error_blocking_member_for_all">Gagal blokir anggota untuk semua</string>
+    <string name="error_saving_user_password">Gagal simpan kata sandi pengguna</string>
+    <string name="invalid_file_link">Tautan tidak valid</string>
+    <string name="no_message_servers_configured">Tiada server pesan.</string>
+    <string name="no_message_servers_configured_for_private_routing">Tiada server untuk routing pesan pribadi.</string>
+    <string name="no_media_servers_configured">Tiada server media dan berkas.</string>
+    <string name="no_message_servers_configured_for_receiving">Tiada server untuk menerima pesan.</string>
+    <string name="or_to_share_privately">Atau bagikan secara pribadi</string>
+    <string name="save_and_notify_group_members">Simpan dan beritahu anggota grup</string>
+    <string name="current_version_timestamp">%s (saat ini)</string>
+    <string name="unblock_member_desc">Pesan dari %s akan ditampilkan!</string>
+    <string name="auth_log_in_using_credential">Masuk dengan kredensial Anda</string>
+    <string name="send_disappearing_message_send">Kirim</string>
+    <string name="save_and_notify_contacts">Simpan dan beritahu kontak</string>
+    <string name="alert_title_msg_bad_id">ID pesan salah</string>
+    <string name="keychain_error">Kesalahan Keychain</string>
+    <string name="save_passphrase_and_open_chat">Simpan frasa sandi dan buka obrolan</string>
+    <string name="open_chat">Buka obrolan</string>
+    <string name="restore_passphrase_not_found_desc">Frasa sandi tidak ditemukan di Keystore, silakan masukkan secara manual. Hal ini mungkin terjadi jika Anda memulihkan data aplikasi menggunakan alat cadangan. Jika tidak demikian, silakan hubungi pengembang.</string>
+    <string name="one_hand_ui">Toolbar aplikasi yang dijangkau</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">Anggota akan dihapus dari grup - ini tidak dapat dibatalkan!</string>
+    <string name="network_option_protocol_timeout_per_kb">Batas waktu protokol per KB</string>
+    <string name="network_option_rcv_concurrency">Menerima konkurensi</string>
+    <string name="profile_password">Kata sandi profil</string>
+    <string name="v4_5_italian_interface">Antarmuka Italia</string>
+    <string name="link_a_mobile">Hubungkan ponsel</string>
+    <string name="you_can_enable_delivery_receipts_later_alert">Anda dapat aktifkan nanti di pengaturan Privasi dan Keamanan aplikasi.</string>
+    <string name="linked_desktop_options">Opsi desktop tertaut</string>
+    <string name="migrate_from_device_try_again">Anda dapat mencoba lagi.</string>
+    <string name="servers_info_reset_stats_alert_confirm">Reset</string>
+    <string name="settings_restart_app">Mulai ulang</string>
+    <string name="restart_the_app_to_use_imported_chat_database">Mulai ulang aplikasi untuk gunakan basis data obrolan yang diimpor.</string>
+    <string name="restore_database">Pulihkan cadangan basis data</string>
+    <string name="database_restore_error">Gagal pulihkan basis data</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Anda dapat bagikan tautan atau kode QR - siapa pun dapat bergabung ke grup. Anda tidak akan kehilangan anggota grup jika nanti Anda hapus.</string>
+    <string name="send_receipts_disabled_alert_title">Tanda terima dimatikan</string>
+    <string name="you_can_share_this_address_with_your_contacts">Anda dapat bagikan alamat ini dengan kontak agar dapat terhubung dengan %s.</string>
+    <string name="you_can_enable_delivery_receipts_later">Anda dapat aktifkan nanti di Pengaturan</string>
+    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">Kirim tanda terima pengirim akan diaktifkan untuk semua kontak di semua profil obrolan yang terlihat.</string>
+    <string name="or_paste_archive_link">Atau tempel tautan arsip</string>
+    <string name="migrate_to_device_database_init">Mempersiapkan unduhan</string>
+    <string name="migrate_to_device_title">Pindah ke sini</string>
+    <string name="migrate_to_device_repeat_import">Impor ulang</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Harap konfirmasi bahwa pengaturan jaringan sudah benar untuk perangkat ini.</string>
+    <string name="migrate_from_device_database_init">Mempersiapkan unggahan</string>
+    <string name="servers_info_reconnect_servers_message">Hubungkan ulang semua server yang terhubung untuk paksa kirim pesan. Ini menggunakan lalu lintas tambahan.</string>
+    <string name="servers_info_reconnect_server_title">Hubungkan ulang server?</string>
+    <string name="servers_info_reset_stats">Reset semua statistik</string>
+    <string name="servers_info_reset_stats_alert_title">Reset seluruh statistik?</string>
+    <string name="servers_info_reconnect_all_servers_button">Hubungkan ulang semua server</string>
+    <string name="save_passphrase_in_keychain">Simpan frasa sandi di Keystore</string>
+    <string name="info_row_local_name">Nama lokal</string>
+    <string name="info_row_sent_at">Dikirim pada</string>
+    <string name="info_row_received_at">Diterima pada</string>
+    <string name="network_options_reset_to_defaults">Reset ke bawaan</string>
+    <string name="v6_2_network_decentralization">Jaringan desentralisasi</string>
+    <string name="sending_delivery_receipts_will_be_enabled">Kirim tanda terima pengirim akan diaktifkan untuk semua kontak.</string>
+    <string name="linked_desktops">Desktop terhubung</string>
+    <string name="migrate_to_device_bytes_downloaded">%s diunduh</string>
+    <string name="servers_info_messages_received">Pesan diterima</string>
+    <string name="info_row_updated_at">Catatan diperbarui pada</string>
+    <string name="settings_section_title_messages">PESAN DAN BERKAS</string>
+    <string name="settings_section_title_user_theme">Tema profil</string>
+    <string name="settings_section_title_profile_images">Gambar profil</string>
+    <string name="enter_correct_current_passphrase">Harap masukkan frasa sandi saat ini yang benar.</string>
+    <string name="database_migrations">Migrasi: %s</string>
+    <string name="rcv_group_event_1_member_connected">%s terhubung</string>
+    <string name="profile_update_event_member_name_changed">anggota %1$s berubah menjadi %2$s</string>
+    <string name="info_row_message_status">Status pesan</string>
+    <string name="info_row_moderated_at">Dimoderasi pada</string>
+    <string name="button_send_direct_message">Kirim pesan pribadi</string>
+    <string name="network_option_protocol_timeout">Batas waktu protokol</string>
+    <string name="network_options_save_and_reconnect">Simpan dan hubungkan ulang</string>
+    <string name="incognito_info_allows">Memungkinkan adanya banyak koneksi anonim tanpa ada data bersama di antara mereka dalam satu profil obrolan.</string>
+    <string name="servers_info_reconnect_servers_title">Hubungkan ulang server?</string>
+    <string name="maximum_message_size_title">Pesan terlalu besar!</string>
+    <string name="maximum_message_size_reached_non_text">Mohon kurangi ukuran pesan atau hapus media dan kirim lagi.</string>
+    <string name="maximum_message_size_reached_text">Mohon kurangi ukuran pesan dan kirim lagi.</string>
+    <string name="maximum_message_size_reached_forwarding">Anda dapat salin dan kurangi ukuran pesan untuk kirim.</string>
+    <string name="reset_verb">Reset</string>
+    <string name="send_live_message_desc">Kirim pesan langsung - pesan akan diperbarui pada penerima saat Anda mengetik</string>
+    <string name="icon_descr_send_message">Kirim Pesan</string>
+    <string name="mark_unread">Tandai belum dibaca</string>
+    <string name="you_can_set_connection_name_to_remember">Anda dapat setel nama koneksi, untuk mengingat dengan siapa tautan dibagikan.</string>
+    <string name="app_check_for_updates_button_open">Buka lokasi berkas</string>
+    <string name="app_check_for_updates_installed_successfully_desc">Silakan mulai ulang aplikasi.</string>
+    <string name="join_group_incognito_button">Gabung ke samaran</string>
+    <string name="sender_at_ts">%s pada %s</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Anggota akan dihapus dari obrolan - ini tidak dapat dibatalkan!</string>
+    <string name="operator_server_alert_title">Server operator</string>
+    <string name="server_added_to_operator__name">Server ditambah ke operator %s.</string>
+    <string name="error_server_operator_changed">Operator server berubah.</string>
+    <string name="error_server_protocol_changed">Protokol server berubah.</string>
+    <string name="network_option_ping_count">Jumlah PING</string>
+    <string name="network_option_ping_interval">Interval PING</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Buka obrolan pada pesan belum dibaca pertama.\n- Lompat ke pesan yang dikutip.</string>
+    <string name="custom_time_picker_select">Pilih</string>
+    <string name="servers_info_reconnect_server_message">Hubungkan ulang server untuk paksa kirim pesan. Ini menggunakan lalu lintas tambahan.</string>
+    <string name="chat_bottom_bar">Bilah alat obrolan yang dijangkau</string>
+    <string name="profile_update_event_removed_picture">foto profil dihapus</string>
+    <string name="rcv_group_event_2_members_connected">%s dan %s terhubung</string>
+    <string name="v6_2_business_chats_descr">Privasi untuk pelanggan Anda.</string>
+    <string name="migrate_to_device_repeat_download">Unduh ulang</string>
+    <string name="migrate_to_device_try_again">Anda dapat mencoba lagi.</string>
+    <string name="migrate_from_device_remove_archive_question">Hapus arsip?</string>
+    <string name="migrate_from_device_repeat_upload">Unggah ulang</string>
+    <string name="keep_conversation">Simpan percakapan</string>
+    <string name="you_can_still_send_messages_to_contact">Anda dapat kirim pesan ke %1$s dari kontak yang diarsip.</string>
+    <string name="switch_receiving_address_desc">Alamat penerima akan diubah ke server lain. Perubahan alamat akan selesai setelah pengirim online.</string>
+    <string name="ask_your_contact_to_enable_voice">Minta kontak Anda untuk aktifkan kirim pesan suara.</string>
+    <string name="image_descr_profile_image">gambar profil</string>
+    <string name="save_auto_accept_settings">Simpan pengaturan terima otomatis</string>
+    <string name="share_text_updated_at">Catatan diperbarui pada: %s</string>
+    <string name="network_option_seconds_label">dtk</string>
+    <string name="bad_desktop_address">Alamat desktop salah</string>
+    <string name="scan_qr_code_from_desktop">Pindai kode QR dari desktop</string>
+    <string name="servers_info_messages_sent">Pesan terkirim</string>
+    <string name="moderated_item_description">dimoderasi oleh %s</string>
+    <string name="auth_open_chat_console">Buka konsol obrolan</string>
+    <string name="message_delivery_warning_title">Peringatan kirim pesan</string>
+    <string name="message_delivery_error_title">Kesalahan kirim pesan</string>
+    <string name="recipients_can_not_see_who_message_from">Penerima tidak dapat melihat siapa pengirim pesan ini.</string>
+    <string name="observer_cant_send_message_desc">Silakan hubungi admin grup.</string>
+    <string name="loading_remote_file_title">Memuat berkas</string>
+    <string name="loading_remote_file_desc">Harap tunggu sementara berkas sedang dimuat dari ponsel yang terhubung</string>
+    <string name="icon_descr_server_status_pending">Tertunda</string>
+    <string name="sync_connection_force_question">Negosiasi ulang enkripsi?</string>
+    <string name="sync_connection_force_confirm">Negosiasi ulang</string>
+    <string name="send_disappearing_message">Kirim pesan sementara</string>
+    <string name="send_verb">Kirim</string>
+    <string name="scan_QR_code">Pindai kode QR</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(pindai atau tempel dari papan klip)</string>
+    <string name="toast_permission_denied">Izin Ditolak!</string>
+    <string name="mark_read">Tandai dibaca</string>
+    <string name="image_descr_link_preview">tautan pratinjau gambar</string>
+    <string name="you_can_share_your_address">Anda dapat bagikan alamat sebagai tautan atau kode QR - siapa pun dapat terhubung dengan Anda.</string>
+    <string name="network_options_save">Simpan</string>
+    <string name="make_profile_private">Jadikan profil pribadi!</string>
+    <string name="remote_hosts_section">Ponsel jarak jauh</string>
+    <string name="run_chat_section">JALANKAN OBROLAN</string>
+    <string name="store_passphrase_securely_without_recover">Harap simpan frasa sandi dengan aman, Anda TIDAK akan dapat mengakses obrolan jika hilang.</string>
+    <string name="rcv_group_event_member_deleted">dihapus %1$s</string>
+    <string name="share_text_sent_at">Dikirim pada: %s</string>
+    <string name="integrity_msg_bad_id">ID pesan salah</string>
+    <string name="remove_passphrase_from_keychain">Hapus frasa sandi dari Keystore?</string>
+    <string name="remove_passphrase_from_settings">Hapus frasa sandi dari pengaturan?</string>
+    <string name="save_passphrase_in_settings">Simpan frasa sandi di pengaturan</string>
+    <string name="proxied">Diproxy</string>
+    <string name="paste_the_link_you_received_to_connect_with_your_contact">Tempel tautan yang Anda terima untuk terhubung dengan kontak…</string>
+    <string name="other_label">lainnya</string>
+    <string name="send_live_message">Kirim pesan langsung</string>
+    <string name="live_message">Pesan langsung!</string>
+    <string name="image_descr_qr_code">Kode QR</string>
+    <string name="migrate_to_device_migrating">Memindah</string>
+    <string name="server_address">Alamat server</string>
+    <string name="open_server_settings_button">Buka pengaturan server</string>
+    <string name="profile_update_event_removed_address">alamat kontak dihapus</string>
+    <string name="v6_0_chat_list_media">Putar dari daftar obrolan.</string>
+    <string name="linked_mobiles">Ponsel terhubung</string>
+    <string name="scan_from_mobile">Pindai dari ponsel</string>
+    <string name="network_type_other">Lainnya</string>
+    <string name="no_media_servers_configured_for_private_routing">Tiada server untuk menerima berkas.</string>
+    <string name="no_media_servers_configured_for_sending">Tiada server untuk kirim berkas.</string>
+    <string name="message_deleted_or_not_received_error_title">Tiada pesan</string>
+    <string name="auth_open_migration_to_another_device">Buka layar migrasi</string>
+    <string name="delete_messages_cannot_be_undone_warning">Pesan akan dihapus - ini tidak dapat dibatalkan!</string>
+    <string name="icon_descr_profile_image_placeholder">tempat penampung gambar profil</string>
+    <string name="srv_error_host">Alamat server tidak kompatibel dengan pengaturan jaringan.</string>
+    <string name="password_to_show">Kata sandi ditampilkan</string>
+    <string name="app_check_for_updates_button_remind_later">Ingatkan nanti</string>
+    <string name="restore_database_alert_desc">Harap masukkan kata sandi sebelumnya setelah memulihkan cadangan basis data. Tindakan ini tidak dapat dibatalkan.</string>
+    <string name="restore_database_alert_confirm">Pulihkan</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Anda dapat mulai obrolan via Pengaturan aplikasi / Basis Data atau dengan mulai ulang aplikasi.</string>
+    <string name="only_chat_owners_can_change_prefs">Hanya pemilik obrolan yang dapat ubah preferensi.</string>
+    <string name="send_receipts">Kirim tanda terima</string>
+    <string name="custom_time_unit_seconds">detik</string>
+    <string name="agent_critical_error_desc">Harap laporkan ke pengembang:\n%s\n\nDisarankan untuk memulai ulang aplikasi.</string>
+    <string name="custom_time_unit_minutes">menit</string>
+    <string name="network_session_mode_session_description">Kredensial SOCKS baru akan digunakan setiap kali Anda memulai aplikasi.</string>
+    <string name="email_invite_subject">Mari bicara di SimpleX Chat</string>
+    <string name="save_and_notify_contact">Simpan dan beritahu kontak</string>
+    <string name="save_preferences_question">Simpan preferensi?</string>
+    <string name="you_can_create_it_later">Anda dapat buat nanti</string>
+    <string name="join_group_question">Gabung ke grup?</string>
+    <string name="joining_group">Bergabung dengan grup</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Minta kontak Anda untuk aktifkan panggilan.</string>
+    <string name="you_can_hide_or_mute_user_profile">Anda dapat sembunyikan atau matikan profil pengguna - tekan tahan untuk buka menu.</string>
+    <string name="v4_5_reduced_battery_usage">Penggunaan baterai sedikit</string>
+    <string name="migrate_from_device_migration_complete">Berhasil dipindah</string>
+    <string name="icon_descr_record_voice_message">Rekam pesan suara</string>
+    <string name="servers_info_subscriptions_section_header">Penerima pesan</string>
+    <string name="alert_title_msg_bad_hash">Hash pesan salah</string>
+    <string name="leave_chat_question">Keluar dari obrolan?</string>
+    <string name="store_passphrase_securely">Harap simpan frasa sandi dengan aman, Anda TIDAK akan dapat mengubahnya jika hilang.</string>
+    <string name="restore_database_alert_title">Pulihkan cadangan basis data?</string>
+    <string name="share_text_moderated_at">Dimoderasi pada: %s</string>
+    <string name="share_text_received_at">Diterima pada: %s</string>
+    <string name="chat_archive">Atau impor berkas arsip</string>
+    <string name="agent_internal_error_desc">Harap laporkan ke pengembang:\n%s</string>
+    <string name="display_name__field">Nama profil:</string>
+    <string name="servers_info_subscriptions_connections_pending">Tertunda</string>
+    <string name="servers_info_previously_connected_servers_section_header">Server yang terhubung sebelumnya</string>
+    <string name="servers_info_proxied_servers_section_header">Server proxy</string>
+    <string name="delete_messages_mark_deleted_warning">Pesan akan ditandai sebagai dihapus. Penerima tetap dapat melihat pesan tersebut.</string>
+    <string name="delete_message_mark_deleted_warning">Pesan akan ditandai sebagai dihapus. Penerima tetap dapat melihat pesan ini.</string>
+    <string name="sync_connection_confirm">Perbaiki</string>
+    <string name="sync_connection_question">Perbaiki koneksi?</string>
+    <string name="smp_servers_new_server">Server baru</string>
+    <string name="message_queue_info">Info antrian pesan</string>
+    <string name="settings_section_title_message_shape">Bentuk pesan</string>
+    <string name="settings_section_title_private_message_routing">ROUTING PESAN PRIBADI</string>
+    <string name="message_queue_info_server_info">info antrean server: %1$s\n\npesan terakhir diterima: %2$s</string>
+    <string name="users_delete_data_only">Hanya data profil lokal</string>
+    <string name="operator_open_changes">Buka perubahan</string>
+    <string name="operator_open_conditions">Ketentuan terbuka</string>
+    <string name="migrate_from_device_or_share_this_file_link">Atau bagikan tautan berkas dengan aman</string>
+    <string name="paste_desktop_address">Tempel alamat desktop</string>
+    <string name="users_delete_with_connections">Profil dan koneksi server</string>
+    <string name="other_errors">Kesalahan lainnya</string>
+    <string name="secured">Aman</string>
+    <string name="send_errors">Kesalahan kirim</string>
+    <string name="sent_directly">Dikirim langsung</string>
+    <string name="sent_via_proxy">Dikirim via proxy</string>
+    <string name="profile_update_will_be_sent_to_contacts">Pembaruan profil akan dikirim ke kontak Anda.</string>
+    <string name="paste_archive_link">Tempel tautan arsip</string>
+    <string name="remote_ctrl_connection_stopped_desc">Harap periksa apakah perangkat seluler dan desktop terhubung ke jaringan lokal yang sama, dan firewall desktop mengizinkan koneksi.\nHarap sampaikan masalah lain kepada pengembang.</string>
+    <string name="sync_connection_desc">Koneksi memerlukan negosiasi ulang enkripsi.</string>
+    <string name="encryption_renegotiation_in_progress">Negosiasi ulang enkripsi sedang berlangsung.</string>
+    <string name="connection_error_quota">Pesan yang tidak terkirim</string>
+    <string name="message_deleted_or_not_received_error_desc">Pesan ini telah dihapus atau belum diterima.</string>
+    <string name="to_connect_via_link_title">Untuk terhubung via tautan</string>
+    <string name="app_check_for_updates_notice_desc">Untuk mendapatkan pemberitahuan tentang rilis baru, aktifkan pemeriksaan berkala untuk versi Stabil atau Beta.</string>
+    <string name="simplex_address_or_1_time_link">Alamat SimpleX atau tautan 1-kali?</string>
+    <string name="settings_shutdown">Matikan</string>
+    <string name="terminal_always_visible">Lihat konsol di jendela baru</string>
+    <string name="user_unmute">Bunyikan</string>
+    <string name="unlink_desktop">Putuskan</string>
+    <string name="auth_unlock">Buka</string>
+    <string name="file_error_auth">Kunci salah atau alamat potongan berkas tidak dikenal - kemungkinan berkas dihapus.</string>
+    <string name="srv_error_version">Versi server tidak kompatibel dengan pengaturan jaringan.</string>
+    <string name="you_are_observer">Anda adalah pengamat</string>
+    <string name="to_start_a_new_chat_help_header">Untuk memulai obrolan baru</string>
+    <string name="gallery_video_button">Video</string>
+    <string name="connection_you_accepted_will_be_cancelled">Koneksi yang Anda terima akan dibatalkan!</string>
+    <string name="this_QR_code_is_not_a_link">Kode QR ini bukan tautan!</string>
+    <string name="unmute_chat">Bunyikan</string>
+    <string name="network_session_mode_transport_isolation">Isolasi transport</string>
+    <string name="update_network_session_mode_question">Perbarui mode isolasi transport?</string>
+    <string name="private_routing_explanation">Untuk melindungi alamat IP, routing pribadi menggunakan server SMP untuk mengirim pesan.</string>
+    <string name="show_internal_errors">Perlihat kesalahan internal</string>
+    <string name="show_slow_api_calls">Lihat panggilan API lambat</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">Kami tidak menyimpan kontak atau pesan Anda (setelah terkirim) di server.</string>
+    <string name="your_profile_is_stored_on_your_device">Profil, kontak, dan pesan terkirim Anda disimpan di perangkat Anda.</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Platform perpesanan dan aplikasi yang melindungi privasi dan keamanan Anda.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Untuk melindungi privasi Anda, SimpleX gunakan ID terpisah untuk setiap kontak.</string>
+    <string name="settings_section_title_socks">PROXY SOCKS</string>
+    <string name="one_hand_ui_card_title">Alihkan daftar obrolan:</string>
+    <string name="upgrade_and_open_chat">Tingkatkan dan buka obrolan</string>
+    <string name="group_invitation_tap_to_join_incognito">Ketuk untuk gabung ke samaran</string>
+    <string name="snd_group_event_member_blocked">Anda memblokir %s</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s dan %d anggota lainnya terhubung</string>
+    <string name="send_receipts_disabled_alert_msg">Grup ini memiliki lebih dari %1$d anggota, tanda terima kiriman tidak dikirimkan.</string>
+    <string name="connect_via_member_address_alert_desc">Permintaan koneksi akan dikirim ke anggota grup ini.</string>
+    <string name="unhide_chat_profile">Perlihat profil obrolan</string>
+    <string name="incognito_random_profile">Profil random Anda</string>
+    <string name="migrate_from_device_bytes_uploaded">%s diunggah</string>
+    <string name="debug_logs">Aktifkan log</string>
+    <string name="profile_is_only_shared_with_your_contacts">Profil hanya dibagikan dengan kontak Anda.</string>
+    <string name="settings_message_shape_tail">Ekor</string>
+    <string name="stop_chat_confirmation">Berhenti</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Tindakan ini tidak dapat dibatalkan - profil, kontak, pesan, dan berkas Anda akan hilang secara permanen.</string>
+    <string name="non_fatal_errors_occured_during_import">Beberapa kesalahan tidak fatal terjadi selama impor:</string>
+    <string name="chat_database_exported_save">Anda dapat menyimpan arsip yang diekspor.</string>
+    <string name="v4_5_italian_interface_descr">Terima kasih kepada pengguna – kontribusi via Weblate!</string>
+    <string name="connect_plan_this_is_your_own_one_time_link">Ini adalah tautan 1-kali milik Anda!</string>
+    <string name="moderate_message_will_be_marked_warning">Pesan akan ditandai sebagai dimoderasi untuk semua anggota.</string>
+    <string name="moderate_messages_will_be_deleted_warning">Pesan akan dihapus untuk semua anggota.</string>
+    <string name="moderate_messages_will_be_marked_warning">Pesan akan ditandai sebagai dimoderasi untuk semua anggota.</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Video akan diterima saat kontak Anda selesai mengunggah.</string>
+    <string name="contact_sent_large_file">Kontak Anda mengirim berkas yang lebih besar dari ukuran maksimal (%1$s).</string>
+    <string name="temporary_file_error">Kesalahan berkas sementara</string>
+    <string name="voice_message_send_text">Pesan suara…</string>
+    <string name="you_accepted_connection">Anda menerima koneksi</string>
+    <string name="you_must_use_the_most_recent_version_of_database">Anda harus menggunakan versi terbaru basis data obrolan Anda pada satu perangkat SAJA, jika tidak, Anda mungkin berhenti menerima pesan dari beberapa kontak.</string>
+    <string name="chat_database_exported_not_all_files">Beberapa berkas tidak diekspor</string>
+    <string name="chat_database_exported_migrate">Anda dapat memindahkan basis data yang diekspor.</string>
+    <string name="passphrase_will_be_saved_in_settings">Frasa sandi akan disimpan dalam pengaturan sebagai teks biasa setelah Anda mengubahnya atau memulai ulang aplikasi.</string>
+    <string name="database_backup_can_be_restored">Upaya untuk mengubah frasa sandi basis data tidak selesai.</string>
+    <string name="network_option_tcp_connection_timeout">Waktu koneksi TCP habis</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">Terima kasih kepada pengguna – kontribusi via Weblate!</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">Arsip basis data yang diunggah akan dihapus secara permanen dari server.</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Peringatan: memulai obrolan di beberapa perangkat tidak didukung dan akan menyebabkan gagal kirim pesan</string>
+    <string name="migrate_from_device_verify_passphrase">Verifikasi frasa sandi</string>
+    <string name="upload_errors">Kesalahan unggah</string>
+    <string name="set_passphrase">Setel frasa sandi</string>
+    <string name="enable_automatic_deletion_message">Tindakan ini tidak dapat dibatalkan - pesan yang dikirim dan diterima sebelum waktu yang dipilih akan dihapus. Mungkin perlu waktu beberapa menit.</string>
+    <string name="one_hand_ui_change_instruction">Anda dapat ubah di pengaturan Tampilan.</string>
+    <string name="alert_message_no_group">Grup ini tidak ada lagi.</string>
+    <string name="you_rejected_group_invitation">Anda menolak undangan grup</string>
+    <string name="snd_group_event_changed_role_for_yourself">Anda mengubah hak Anda menjadi %s</string>
+    <string name="snd_group_event_changed_member_role">Anda mengubah hak %s menjadi %s</string>
+    <string name="view_conditions">Lihat ketentuan</string>
+    <string name="xftp_servers_per_user">Server untuk berkas baru dari profil obrolan Anda saat ini</string>
+    <string name="v6_0_upgrade_app">Perbarui aplikasi secara otomatis</string>
+    <string name="v6_2_network_decentralization_descr">Operator prasetel kedua dalam aplikasi!</string>
+    <string name="view_updated_conditions">Lihat ketentuan yang diperbarui</string>
+    <string name="this_device_name_shared_with_mobile">Nama perangkat akan dibagikan dengan klien seluler yang terhubung.</string>
+    <string name="remote_ctrl_error_timeout">Batas waktu tercapai saat menghubungkan ke desktop</string>
+    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">Anda sudah terhubung melalui tautan 1-kali ini!</string>
+    <string name="settings_section_title_use_from_desktop">Gunakan dari desktop</string>
+    <string name="delete_files_and_media_desc">Tindakan ini tidak dapat dibatalkan - semua berkas dan media yang diterima dan dikirim akan dihapus. Gambar beresolusi rendah akan tetap ada.</string>
+    <string name="member_role_will_be_changed_with_notification">Hak akan diubah menjadi %s. Semua orang dalam grup akan diberitahu.</string>
+    <string name="database_is_not_encrypted">Basis data obrolan Anda tidak dienkripsi - setel frasa sandi untuk melindunginya.</string>
+    <string name="you_are_invited_to_group">Anda diundang ke grup</string>
+    <string name="waiting_for_mobile_to_connect">Menunggu ponsel terhubung:</string>
+    <string name="set_database_passphrase">Setel frasa sandi basis data</string>
+    <string name="update_database">Perbarui</string>
+    <string name="update_database_passphrase">Perbarui frasa sandi basis data</string>
+    <string name="snd_group_event_member_deleted">Anda menghapus %1$s</string>
+    <string name="group_members_n">%s, %s dan %d anggota</string>
+    <string name="recipient_colon_delivery_status">%s: %s</string>
+    <string name="update_network_settings_confirmation">Perbarui</string>
+    <string name="verify_connection">Verifikasi koneksi</string>
+    <string name="subscribed">Berlangganan</string>
+    <string name="error_saving_database">Gagal simpan basis data</string>
+    <string name="settings_is_storing_in_clear_text">Frasa sandi disimpan di pengaturan sebagai teks biasa.</string>
+    <string name="video_decoding_exception_desc">Video tidak dapat didekodekan. Silakan coba video lain atau hubungi pengembang.</string>
+    <string name="sync_connection_force_desc">Enkripsi berfungsi dan perjanjian enkripsi baru tidak diperlukan. Hal ini dapat mengakibatkan kesalahan koneksi!</string>
+    <string name="share_address_publicly">Bagikan alamat secara publik</string>
+    <string name="share_simplex_address_on_social_media">Bagikan alamat SimpleX di media sosial.</string>
+    <string name="share_1_time_link_with_a_friend">Bagikan tautan 1-kali dengan teman</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Alamat SimpleX dan tautan 1-kali aman untuk dibagikan ke messenger lain.</string>
+    <string name="you_can_use_markdown_to_format_messages__prompt">Anda dapat gunakan markdown untuk format pesan:</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Anda akan berhenti menerima pesan dari obrolan ini. Riwayat obrolan akan disimpan.</string>
+    <string name="operator_use_for_messages">Gunakan untuk pesan</string>
+    <string name="operator_use_for_files">Gunakan untuk berkas</string>
+    <string name="network_option_tcp_connection">Koneksi TCP</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Anda masih akan menerima panggilan dan notifikasi dari profil yang dibisukan ketika profil tersebut aktif.</string>
+    <string name="incognito_info_share">Saat Anda berbagi profil samaran dengan seseorang, profil ini akan digunakan untuk grup tempat Anda diundang.</string>
+    <string name="remote_ctrl_connection_stopped_identity_desc">Tautan ini digunakan dengan perangkat seluler lain, silakan buat tautan baru di desktop.</string>
+    <string name="your_contacts_will_remain_connected">Kontak Anda akan tetap terhubung.</string>
+    <string name="unlink_desktop_question">Putuskan desktop?</string>
+    <string name="database_downgrade_warning">Peringatan: Anda akan kehilangan beberapa data!</string>
+    <string name="subscription_errors">Kesalahan berlangganan</string>
+    <string name="moderate_message_will_be_deleted_warning">Pesan akan dihapus untuk semua anggota.</string>
+    <string name="verify_code_on_mobile">Verifikasi kode di ponsel</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Anda diundang ke grup. Bergabung untuk terhubung dengan anggota grup.</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Profil Anda disimpan di perangkat dan hanya dibagikan dengan kontak. Server SimpleX tidak dapat melihat profil Anda.</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">Anda mengubah alamat untuk %s</string>
+    <string name="rcv_group_event_updated_group_profile">profil grup diperbarui</string>
+    <string name="rcv_group_event_3_members_connected">%s, %s dan %s terhubung</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Hak akan diubah menjadi %s. Semua orang dalam obrolan akan diberitahu.</string>
+    <string name="custom_time_unit_weeks">minggu</string>
+    <string name="migrate_from_device_upload_failed">Gagal unggah</string>
+    <string name="migrate_from_device_uploading_archive">Mengunggah arsip</string>
+    <string name="servers_info_proxied_servers_section_footer">Anda tidak terhubung ke server ini. Routing pribadi digunakan untuk kirim pesan ke server ini.</string>
+    <string name="video_will_be_received_when_contact_is_online">Video akan diterima saat kontak Anda online, harap tunggu atau periksa nanti!</string>
+    <string name="verify_security_code">Verifikasi kode keamanan</string>
+    <string name="you_can_still_view_conversation_with_contact">Anda masih dapat melihat percakapan dengan %1$s dalam daftar obrolan.</string>
+    <string name="voice_messages_prohibited">Pesan suara dilarang!</string>
+    <string name="chat_help_tap_button">Tombol ketuk</string>
+    <string name="unfavorite_chat">Batal favorit</string>
+    <string name="you_invited_a_contact">Anda mengundang kontak</string>
+    <string name="icon_descr_address">Alamat SimpleX</string>
+    <string name="contact_wants_to_connect_with_you">ingin terhubung dengan Anda!</string>
+    <string name="show_QR_code">Lihat kode QR</string>
+    <string name="share_address_with_contacts_question">Bagikan alamat dengan kontak?</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Basis data obrolan Anda saat ini akan DIHAPUS dan DIGANTI dengan yang diimpor.\nTindakan ini tidak dapat dibatalkan - profil, kontak, pesan, dan berkas Anda akan hilang secara permanen.</string>
+    <string name="unknown_error">Kesalahan tidak diketahui</string>
+    <string name="unknown_database_error_with_info">Kesalahan basis data tidak diketahui: %s</string>
+    <string name="wrong_passphrase_title">Frase sandi salah!</string>
+    <string name="connect_plan_you_have_already_requested_connection_via_this_address">Anda telah meminta koneksi melalui alamat ini!</string>
+    <string name="auth_stop_chat">Hentikan obrolan</string>
+    <string name="observer_cant_send_message_title">Anda tidak dapat kirim pesan!</string>
+    <string name="voice_message_with_duration">Pesan suara (%1$s)</string>
+    <string name="view_security_code">Lihat kode keamanan</string>
+    <string name="you_need_to_allow_to_send_voice">Anda perlu mengizinkan kontak mengirim pesan suara agar dapat mengirimkannya.</string>
+    <string name="to_share_with_your_contact">(untuk dibagikan dengan kontak Anda)</string>
+    <string name="tap_to_scan">Ketuk untuk pindai</string>
+    <string name="thank_you_for_installing_simplex">Terima kasih telah memasang SimpleX Chat!</string>
+    <string name="set_contact_name">Setel nama kontak</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Kontak Anda harus online agar koneksi dapat selesai.\nAnda dapat batalkan koneksi ini dan hapus kontak (dan coba lagi nanti dengan tautan baru).</string>
+    <string name="image_descr_simplex_logo">Logo SimpleX</string>
+    <string name="icon_descr_simplex_team">Tim SimpleX</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Anda akan terhubung saat perangkat kontak Anda online, harap tunggu atau periksa nanti!</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Anda akan terhubung saat permintaan koneksi Anda diterima. Harap tunggu atau periksa nanti!</string>
+    <string name="share_invitation_link">Bagikan tautan 1-kali</string>
+    <string name="you_can_accept_or_reject_connection">Saat orang meminta untuk terhubung, Anda dapat terima atau menolaknya.</string>
+    <string name="you_wont_lose_your_contacts_if_delete_address">Anda tidak akan kehilangan kontak jika menghapus alamat Anda nanti.</string>
+    <string name="shutdown_alert_question">Matikan?</string>
+    <string name="stop_chat_question">Hentikan obrolan?</string>
+    <string name="you_joined_this_group">Anda bergabung ke grup ini</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Hentikan obrolan untuk ekspor, impor, atau hapus basis data obrolan. Anda tidak akan dapat terima dan kirim pesan saat obrolan dihentikan.</string>
+    <string name="messages_section_description">Pengaturan ini berlaku untuk pesan di profil obrolan Anda saat ini</string>
+    <string name="your_chat_database">Basis data obrolan Anda</string>
+    <string name="rcv_group_event_member_unblocked">buka blokir %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">Anda mengubah alamat</string>
+    <string name="operator_use_for_sending">Untuk kirim</string>
+    <string name="migrate_from_device_stopping_chat">Menghentikan obrolan</string>
+    <string name="unhide_profile">Perlihat profil</string>
+    <string name="you_have_to_enter_passphrase_every_time">Anda harus masukkan frasa sandi setiap aplikasi dibuka - frasa sandi tidak disimpan di perangkat.</string>
+    <string name="smp_server">Server SMP</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">Profil obrolan Anda akan dikirim\nke kontak Anda</string>
+    <string name="share_address">Bagikan alamat</string>
+    <string name="member_role_will_be_changed_with_invitation">Hak akan diubah menjadi %s. Anggota akan menerima undangan baru.</string>
+    <string name="update_network_settings_question">Perbarui pengaturan jaringan?</string>
+    <string name="tap_to_activate_profile">Ketuk untuk aktifkan profil.</string>
+    <string name="servers_info_starting_from">Mulai dari %s.</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">Anda akan terhubung ke grup saat perangkat pemilik grup sedang online, harap tunggu atau periksa nanti!</string>
+    <string name="show_dev_options">Lihat:</string>
+    <string name="wrong_passphrase">Frasa sandi basis data salah</string>
+    <string name="profile_update_event_set_new_picture">setel foto profil baru</string>
+    <string name="profile_update_event_updated_profile">profil diperbarui</string>
+    <string name="size">Ukuran</string>
+    <string name="uploaded_files">Berkas diunggah</string>
+    <string name="connection_error_quota_desc">Koneksi mencapai batas pesan yang tidak terkirim, kontak Anda mungkin sedang offline.</string>
+    <string name="lock_not_enabled">Kunci SimpleX tidak diaktifkan!</string>
+    <string name="you_can_turn_on_lock">Anda dapat aktifkan Kunci SimpleX di Pengaturan.</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Kontak yang Anda bagikan tautan ini TIDAK akan dapat terhubung!</string>
+    <string name="image_decoding_exception_desc">Gambar tidak dapat didekodekan. Silakan coba gambar lain atau hubungi pengembang.</string>
+    <string name="snd_error_auth">Kunci salah atau koneksi tidak dikenal - kemungkinan besar koneksi ini dihapus.</string>
+    <string name="add_contact_or_create_group">Mulai obrolan baru</string>
+    <string name="address_creation_instruction">Ketuk Buat alamat SimpleX di menu untuk membuatnya nanti.</string>
+    <string name="scan_qr_to_connect_to_contact">Untuk terhubung, kontak Anda dapat pindai kode QR atau gunakan tautan di aplikasi.</string>
+    <string name="connect__your_profile_will_be_shared">Profil Anda %1$s akan dibagikan.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Untuk melindungi tautan Anda dari penggantian, Anda dapat membandingkan kode keamanan kontak.</string>
+    <string name="app_check_for_updates_canceled">Pembaruan unduhan dibatalkan</string>
+    <string name="your_current_profile">Profil Anda saat ini</string>
+    <string name="alert_title_cant_invite_contacts_descr">Anda menggunakan profil samaran untuk grup ini - untuk mencegah berbagi profil utama Anda, undang kontak tidak diizinkan</string>
+    <string name="chat_list_always_visible">Lihat daftar obrolan di jendela baru</string>
+    <string name="you_sent_group_invitation">Anda mengirim undangan grup</string>
+    <string name="this_link_is_not_a_valid_connection_link">Tautan ini bukan tautan koneksi yang valid!</string>
+    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Anda akan berhenti menerima pesan dari grup ini. Riwayat obrolan akan disimpan.</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Anda bergabung ke grup ini. Menghubungkan untuk undang anggota grup.</string>
+    <string name="snd_group_event_member_unblocked">Anda buka blokir %s</string>
+    <string name="waiting_for_desktop">Menunggu desktop…</string>
+    <string name="v6_1_switch_chat_profile_descr">Ganti profil obrolan untuk undangan 1-kali.</string>
+    <string name="to_reveal_profile_enter_password">Untuk perlihat profil tersembunyi Anda, masukkan kata sandi lengkap di kolom pencarian di halaman Profil obrolan Anda.</string>
+    <string name="you_control_your_chat">Anda mengendalikan obrolan Anda!</string>
+    <string name="operator_use_for_messages_receiving">Untuk terima</string>
+    <string name="user_unhide">Perlihat</string>
+    <string name="updating_settings_will_reconnect_client_to_all_servers">Perbarui pengaturan akan menghubungkan ulang klien ke semua server.</string>
+    <string name="migrate_from_device_verify_database_passphrase">Verifikasi frasa sandi basis data</string>
+    <string name="xftp_server">Server XFTP</string>
+    <string name="subscription_results_ignored">Langganan diabaikan</string>
+    <string name="stop_sharing">Berhenti berbagi</string>
+    <string name="stop_sharing_address">Berhenti berbagi alamat?</string>
+    <string name="show_developer_options">Tampilkan opsi pengembang</string>
+    <string name="open_port_in_firewall_desc">Untuk mengizinkan aplikasi seluler terhubung ke desktop, buka port ini di firewall Anda, jika Anda mengaktifkannya</string>
+    <string name="strikethrough_text">coret</string>
+    <string name="delete_messages_after">Hapus pesan setelah</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="users_delete_profile_for">Hapus obrolan profil untuk</string>
+    <string name="connection_not_ready">Koneksi belum siap</string>
+    <string name="error_creating_chat_tags">Kesalahan pada pembuatan daftar percakapan</string>
+    <string name="error_loading_chat_tags">Kesalahan memuat daftar percakapan</string>
+    <string name="error_updating_chat_tags">Kesalahan memperbaharui daftar percakapan</string>
+    <string name="list_menu">Daftar</string>
+    <string name="chat_list_contacts">Kontak</string>
+    <string name="chat_list_favorites">Favorit</string>
+    <string name="no_chats">Tidak ada pesan</string>
+    <string name="no_chats_found">Tidak ditemukan pesan</string>
+    <string name="no_chats_in_list">Tidak ada pesan dalam daftar %s</string>
+    <string name="no_unread_chats">Tidak ada chat belum terbaca</string>
+    <string name="chat_list_add_list">Tambahkan daftar</string>
+    <string name="chat_list_businesses">Bisnis</string>
+    <string name="chat_list_groups">Grup</string>
+    <string name="open_with_app">Buka dengan %s</string>
+    <string name="add_to_list">Tambahkan dalam daftar</string>
+    <string name="create_list">Buat daftar</string>
+    <string name="list_name_field_placeholder">Daftar nama</string>
+    <string name="duplicated_list_error">Daftar nama dan emoji harus berbeda untuk semua daftar</string>
+    <string name="save_list">Simpan daftar</string>
+    <string name="delete_chat_list_warning">Semua percakapan akan dipindahkan dari daftar %s, dan daftar akan dihapus</string>
+    <string name="delete_chat_list_menu_action">Hapus</string>
+    <string name="delete_chat_list_question">Hapus daftar</string>
+    <string name="edit_chat_list_menu_action">Sunting</string>
+    <string name="chat_list_all">Semua</string>
+    <string name="group_reports_active_one">1 laporan</string>
+    <string name="archive_verb">Arsip</string>
+    <string name="report_reason_other">Alasan lain</string>
+    <string name="report_item_archived_by">laporan arsip oleh %s</string>
+    <string name="archive_report">Arsip laporan</string>
+    <string name="delete_report">Hapus laporan</string>
+    <string name="chat_list_group_reports">Laporan</string>
+    <string name="report_compose_reason_header_other">Laporkan lainnya: hanya moderator grup yang akan melihat.</string>
+    <string name="error_creating_report">Gagal membuat laporan</string>
+    <string name="connection_error_blocked">Koneksi diblokir</string>
+    <string name="connection_error_blocked_desc">Koneksi diblokir oleh operator server:\n%1$s.</string>
+    <string name="blocking_reason_content">Konten melanggar ketentuan penggunaan</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="report_reason_alert_title">Alasan laporan?</string>
+    <string name="report_verb">Laporkan</string>
+    <string name="group_reports_member_reports">Laporan Anggota</string>
+    <string name="chat_list_notes">Catatan</string>
+    <string name="report_compose_reason_header_spam">Laporkan spam: hanya moderator grup yang akan melihat.</string>
+    <string name="report_compose_reason_header_community">Laporkan pelanggaran: hanya moderator grup yang akan melihat.</string>
+    <string name="prefs_error_saving_settings">Gagal simpan pengaturan</string>
+    <string name="group_reports_active">%d laporan</string>
+    <string name="report_compose_reason_header_profile">Laporkan profil anggota: hanya moderator grup yang akan melihat.</string>
+    <string name="report_archive_alert_title">Arsip laporan?</string>
+    <string name="file_error_blocked">Berkas diblokir oleh operator server:\n\n%1$s.</string>
+    <string name="report_archive_alert_desc">Laporan akan diarsipkan untuk Anda.</string>
+    <string name="group_member_role_moderator">moderator</string>
+    <string name="report_compose_reason_header_illegal">Laporkan konten: hanya moderator grup yang akan melihat.</string>
+    <string name="change_list">Ubah daftar</string>
+    <string name="change_order_chat_list_menu_action">Ubah urutan</string>
+    <string name="report_item_archived">laporan arsip</string>
+    <string name="report_reason_community">Pelanggaran pedoman komunitas</string>
+    <string name="report_reason_illegal">Konten tidak pantas</string>
+    <string name="report_reason_profile">Profil tidak pantas</string>
+    <string name="report_item_visibility_moderators">Hanya pengirim dan moderator dapat melihat</string>
+    <string name="report_item_visibility_submitter">Hanya Anda dan moderator dapat melihat</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="text_field_set_chat_placeholder">Setel nama obrolan…</string>
+    <string name="privacy_chat_list_open_web_link_question">Buka tautan peramban?</string>
+    <string name="privacy_chat_list_open_web_link">Buka tautan</string>
+    <string name="change_automatic_deletion_question">Ubah hapus pesan otomatis?</string>
+    <string name="disable_automatic_deletion_question">Matikan hapus pesan otomatis?</string>
+    <string name="disable_automatic_deletion_message">Pesan dalam obrolan ini tidak akan pernah dihapus.</string>
+    <string name="chat_ttl_options_footer">Hapus pesan obrolan dari perangkat Anda.</string>
+    <string name="disable_automatic_deletion">Matikan hapus pesan</string>
+    <string name="change_automatic_chat_deletion_message">Tindakan tak dapat dibatalkan - pesan yang dikirim dan diterima dalam obrolan ini sebelum yang dipilih akan dihapus.</string>
+    <string name="privacy_chat_list_open_links_ask">Tanya</string>
+    <string name="privacy_chat_list_open_links_no">Tidak</string>
+    <string name="privacy_chat_list_open_links">Buka tautan dari daftar obrolan</string>
+    <string name="privacy_chat_list_open_links_yes">Ya</string>
+    <string name="chat_item_ttl_year">1 tahun</string>
+    <string name="chat_item_ttl_default">bawaan (%s)</string>
+    <string name="mute_all_chat">Bisukan semua</string>
+    <string name="unread_mentions">Sebutan belum terbaca</string>
+    <string name="network_smp_web_port_section_title">Port TCP untuk pesan</string>
+    <string name="network_smp_web_port_footer">Gunakan port TCP %1$s jika tidak ada port yang ditentukan.</string>
+    <string name="network_smp_web_port_toggle">Gunakan port peramban</string>
+    <string name="max_group_mentions_per_message_reached">Anda dapat menyebut hingga %1$s anggota per pesan!</string>
+    <string name="report_archive_alert_desc_all">Semua laporan akan diarsipkan untuk Anda.</string>
+    <string name="report_archive_alert_title_all">Arsipkan semua laporan?</string>
+    <string name="report_archive_for_all_moderators">Untuk semua moderator</string>
+    <string name="report_archive_for_me">Untuk saya</string>
+    <string name="archive_reports">Arsip laporan</string>
+    <string name="notification_group_report">Laporan: %s</string>
+    <string name="enable_sending_member_reports">Izinkan untuk laporkan pesan ke moderator.</string>
+    <string name="group_members_can_send_reports">Anggota dapat melaporkan pesan ke moderator.</string>
+    <string name="member_reports_are_prohibited">Laporkan pesan dilarang di grup ini.</string>
+    <string name="disable_sending_member_reports">Dilarang laporkan pesan ke moderator.</string>
+    <string name="report_archive_alert_title_nth">Arsipkan %d laporan?</string>
+    <string name="error_reading_passphrase">Gagal membaca frasa sandi basis data</string>
+    <string name="v6_3_better_privacy_and_security">Privasi dan keamanan lebih baik</string>
+    <string name="block_members_desc">Semua pesan baru dari anggota ini akan disembunyikan!</string>
+    <string name="block_members_for_all_question">Blokir anggota untuk semua?</string>
+    <string name="v6_3_mentions_descr">Dapat notifikasi saat disebut.</string>
+    <string name="v6_3_faster_sending_messages">Kirim pesan lebih cepat.</string>
+    <string name="v6_3_organize_chat_lists_descr">Jangan lewatkan pesan penting.</string>
+    <string name="v6_3_better_groups_performance">Kinerja grup yang lebih baik</string>
+    <string name="v6_3_faster_deletion_of_groups">Hapus grup lebih cepat.</string>
+    <string name="operator_updated_conditions">Syarat diperbarui</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Anggota akan dihapus dari obrolan - hal ini tidak dapat dibatalkan!</string>
+    <string name="button_remove_members_question">Hapus anggota?</string>
+    <string name="group_member_status_rejected">ditolak</string>
+    <string name="group_member_status_pending_approval_short">tertunda</string>
+    <string name="group_member_status_pending_approval">menunggu persetujuan</string>
+    <string name="unblock_members_for_all_question">Buka blokir anggota untuk semua?</string>
+    <string name="v6_3_reports">Kirim laporan pribadi</string>
+    <string name="v6_3_reports_descr">Bantu admin memoderasi grup.</string>
+    <string name="v6_3_set_message_expiration_in_chats">Atur pesan kedaluwarsa obrolan.</string>
+    <string name="v6_3_private_media_file_names">Nama berkas media pribadi.</string>
+    <string name="group_preview_rejected">ditolak</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Anggota akan dihapus dari grup - tindakan ini tidak dapat dibatalkan!</string>
+    <string name="feature_roles_moderators">moderator</string>
+    <string name="unblock_members_desc">Pesan dari anggota ini akan ditampilkan!</string>
+    <string name="v6_3_mentions">Sebutkan anggota 👋</string>
+    <string name="v6_3_organize_chat_lists">Atur obrolan ke dalam daftar</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Frasa sandi di Keystore tidak dapat dibaca. Hal ini mungkin terjadi setelah pembaruan sistem yang tidak kompatibel dengan aplikasi. Jika tidak demikian, silakan hubungi pengembang.</string>
+    <string name="onboarding_conditions_accept">Terima</string>
+    <string name="onboarding_conditions_by_using_you_agree">Dengan menggunakan SimpleX Chat, Anda setuju untuk:\n- hanya mengirim konten legal di grup publik.\n- hormati pengguna lain – tidak ada spam.</string>
+    <string name="onboarding_conditions_configure_server_operators">Konfigurasikan operator server</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Kebijakan privasi dan ketentuan penggunaan.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Obrolan pribadi, grup, dan kontak Anda tidak dapat diakses oleh operator server.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Frasa sandi di Keystore tidak dapat dibaca, silakan masukkan secara manual. Hal ini mungkin terjadi setelah pembaruan sistem yang tidak kompatibel dengan aplikasi. Jika tidak demikian, silakan hubungi pengembang.</string>
+    <string name="network_smp_web_port_preset_footer">Gunakan port TCP 443 hanya untuk presetel server.</string>
+    <string name="network_smp_web_port_all">Semua server</string>
+    <string name="network_smp_web_port_off">Mati</string>
+    <string name="network_smp_web_port_preset">Presetel server</string>
+    <string name="full_link_button_text">Tautan lengkap</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Tautan ini perlu versi aplikasi yang baru. Harap perbarui aplikasi atau minta kontak untuk kirim tautan kompatibel.</string>
+    <string name="simplex_link_channel">Tautan saluran SimpleX</string>
+    <string name="privacy_short_links">Gunakan tautan singkat (BETA)</string>
+    <string name="unsupported_connection_link">Tautan koneksi tidak didukung</string>
+    <string name="short_link_button_text">Tautan singkat</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
index ffdc377ceb..d15729be18 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
@@ -266,7 +266,7 @@
     <string name="group_full_name_field">Nome completo del gruppo:</string>
     <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Se non potete incontrarvi di persona, puoi <b>scansionare il codice QR nella videochiamata</b>, oppure il tuo contatto può condividere un link di invito.]]></string>
     <string name="full_backup">Backup dei dati dell\'app</string>
-    <string name="keychain_is_storing_securely">Android Keystore è usato per memorizzare in modo sicuro la password; permette il funzionamento del servizio di notifica.</string>
+    <string name="keychain_is_storing_securely">L\'archivio chiavi di Android è usato per memorizzare in modo sicuro la password; permette il funzionamento del servizio di notifica.</string>
     <string name="allow_your_contacts_to_send_voice_messages">Permetti ai tuoi contatti di inviare messaggi vocali.</string>
     <string name="chat_database_deleted">Database della chat eliminato</string>
     <string name="settings_section_title_icon">ICONA APP</string>
@@ -274,7 +274,7 @@
     <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Consuma più batteria</b>! L\'app funziona sempre in secondo piano: le notifiche vengono mostrate istantaneamente.]]></string>
     <string name="callstatus_calling">chiamata…</string>
     <string name="icon_descr_cancel_link_preview">annulla anteprima link</string>
-    <string name="cannot_access_keychain">Impossibile accedere al Keystore per salvare la password del database</string>
+    <string name="cannot_access_keychain">Impossibile accedere all\'archivio chiavi per salvare la password del database</string>
     <string name="alert_title_cant_invite_contacts">Impossibile invitare i contatti!</string>
     <string name="change_role">Cambia ruolo</string>
     <string name="snd_conn_event_switch_queue_phase_changing">cambio indirizzo…</string>
@@ -285,7 +285,7 @@
     <string name="delete_link">Elimina link</string>
     <string name="create_address">Crea indirizzo</string>
     <string name="button_create_group_link">Crea link</string>
-    <string name="database_encryption_will_be_updated">La password di crittografia del database verrà aggiornata e conservata nel Keystore.</string>
+    <string name="database_encryption_will_be_updated">La password di crittografia del database verrà aggiornata e conservata nell\'archivio chiavi.</string>
     <string name="encrypted_with_random_passphrase">Il database è crittografato con una password casuale, puoi cambiarla.</string>
     <string name="database_passphrase_is_required">La password del database è necessaria per aprire la chat.</string>
     <string name="delete_group_menu_action">Elimina</string>
@@ -399,7 +399,7 @@
     <string name="settings_section_title_help">AIUTO</string>
     <string name="chat_is_stopped_indication">Chat fermata</string>
     <string name="database_error">Errore del database</string>
-    <string name="passphrase_is_different">La password del database è diversa da quella salvata nel Keystore.</string>
+    <string name="passphrase_is_different">La password del database è diversa da quella salvata nell\'archivio chiavi.</string>
     <string name="encrypted_database">Database crittografato</string>
     <string name="enter_correct_passphrase">Inserisci la password giusta.</string>
     <string name="enter_passphrase">Inserisci la password…</string>
@@ -497,7 +497,7 @@
     <string name="v4_4_verify_connection_security_desc">Confronta i codici di sicurezza con i tuoi contatti.</string>
     <string name="v4_4_disappearing_messages">Messaggi a tempo</string>
     <string name="v4_3_improved_privacy_and_security_desc">Nascondi la schermata dell\'app nelle app recenti.</string>
-    <string name="keychain_allows_to_receive_ntfs">Android Keystore verrà usato per memorizzare in modo sicuro la password dopo il riavvio dell\'app o la modifica della password; consentirà di ricevere le notifiche.</string>
+    <string name="keychain_allows_to_receive_ntfs">L\'archivio chiavi di Android verrà usato per memorizzare in modo sicuro la password dopo il riavvio dell\'app o la modifica della password; consentirà di ricevere le notifiche.</string>
     <string name="impossible_to_recover_passphrase"><![CDATA[<b>Nota bene</b>: NON potrai recuperare o cambiare la password se la perdi.]]></string>
     <string name="change_database_passphrase_question">Cambiare password del database\?</string>
     <string name="confirm_new_passphrase">Conferma nuova password…</string>
@@ -505,7 +505,7 @@
     <string name="database_encrypted">Database crittografato!</string>
     <string name="database_passphrase_will_be_updated">La password di crittografia del database verrà aggiornata.</string>
     <string name="database_will_be_encrypted">Il database verrà crittografato.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">Il database verrà crittografato e la password conservata nel Keystore.</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">Il database verrà crittografato e la password conservata nell\'archivio chiavi.</string>
     <string name="delete_files_and_media_question">Eliminare i file e i multimediali\?</string>
     <string name="delete_messages">Elimina messaggi</string>
     <string name="delete_messages_after">Elimina messaggi dopo</string>
@@ -729,7 +729,7 @@
     <string name="leave_group_button">Esci</string>
     <string name="leave_group_question">Uscire dal gruppo\?</string>
     <string name="open_chat">Apri chat</string>
-    <string name="restore_passphrase_not_found_desc">Password non trovata nel Keystore, inseriscila a mano. Potrebbe essere successo se hai ripristinato i dati dell\'app usando uno strumento di backup. In caso contrario, contatta gli sviluppatori.</string>
+    <string name="restore_passphrase_not_found_desc">Password non trovata nell\'archivio chiavi, inseriscila a mano. Potrebbe essere successo se hai ripristinato i dati dell\'app usando uno strumento di backup. In caso contrario, contatta gli sviluppatori.</string>
     <string name="restore_database_alert_desc">Inserisci la password precedente dopo aver ripristinato il backup del database. Questa azione non può essere annullata.</string>
     <string name="store_passphrase_securely_without_recover">Conserva la password in modo sicuro, NON potrai accedere alla chat se la perdi.</string>
     <string name="restore_database_alert_confirm">Ripristina</string>
@@ -871,8 +871,8 @@
     <string name="enter_correct_current_passphrase">Inserisci la password attuale corretta.</string>
     <string name="store_passphrase_securely">Conserva la password in modo sicuro, NON potrai cambiarla se la perdi.</string>
     <string name="remove_passphrase">Rimuovi</string>
-    <string name="remove_passphrase_from_keychain">Rimuovere la password dal Keystore\?</string>
-    <string name="save_passphrase_in_keychain">Salva la password nel Keystore</string>
+    <string name="remove_passphrase_from_keychain">Rimuovere la password dall\'archivio chiavi?</string>
+    <string name="save_passphrase_in_keychain">Salva la password nell\'archivio chiavi</string>
     <string name="chat_item_ttl_seconds">%s secondo/i</string>
     <string name="delete_files_and_media_desc">Questa azione non può essere annullata: tutti i file e i media ricevuti e inviati verranno eliminati. Rimarranno le immagini a bassa risoluzione.</string>
     <string name="enable_automatic_deletion_message">Questa azione non può essere annullata: i messaggi inviati e ricevuti prima di quanto selezionato verranno eliminati. Potrebbe richiedere diversi minuti.</string>
@@ -940,7 +940,7 @@
     <string name="error_updating_link_for_group">Errore nell\'aggiornamento del link del gruppo</string>
     <string name="group_member_role_observer">osservatore</string>
     <string name="observer_cant_send_message_desc">Contatta l\'amministratore del gruppo.</string>
-    <string name="observer_cant_send_message_title">Non puoi inviare messaggi!</string>
+    <string name="observer_cant_send_message_title">sei un osservatore</string>
     <string name="language_system">Sistema</string>
     <string name="button_add_welcome_message">Aggiungi messaggio di benvenuto</string>
     <string name="button_welcome_message">Messaggio di benvenuto</string>
@@ -1586,7 +1586,7 @@
     <string name="error_deleting_note_folder">Errore di eliminazione delle note private</string>
     <string name="v5_5_message_delivery">Consegna dei messaggi migliorata</string>
     <string name="v5_5_join_group_conversation">Entra in conversazioni di gruppo</string>
-    <string name="profile_update_event_member_name_changed">membro %1$s cambiato in %2$s</string>
+    <string name="profile_update_event_member_name_changed">il membro %1$s è diventato %2$s</string>
     <string name="v5_5_simpler_connect_ui">Incolla un link per connettere!</string>
     <string name="profile_update_event_removed_address">indirizzo di contatto rimosso</string>
     <string name="profile_update_event_contact_name_changed">contatto %1$s cambiato in %2$s</string>
@@ -1947,8 +1947,7 @@
     <string name="appearance_font_size">Dimensione carattere</string>
     <string name="servers_info_detailed_statistics_sent_messages_total">Totale inviato</string>
     <string name="message_forwarded_title">Messaggio inoltrato</string>
-    <string name="servers_info_private_data_disclaimer">Inizio da %s.
-\nTutti i dati sono privati, nel tuo dispositivo.</string>
+    <string name="servers_info_private_data_disclaimer">Partendo da %s. \nTutti i dati sono privati, nel tuo dispositivo.</string>
     <string name="message_forwarded_desc">Ancora nessuna connessione diretta, il messaggio viene inoltrato dall\'amministratore.</string>
     <string name="servers_info_proxied_servers_section_footer">Non sei connesso/a a questi server. L\'instradamento privato è usato per consegnare loro i messaggi.</string>
     <string name="xftp_servers_other">Altri server XFTP</string>
@@ -2178,7 +2177,7 @@
     <string name="appearance_in_app_bars_alpha">Trasparenza</string>
     <string name="v6_2_network_decentralization">Decentralizzazione della rete</string>
     <string name="v6_2_network_decentralization_descr">Il secondo operatore preimpostato nell\'app!</string>
-    <string name="v6_2_network_decentralization_enable_flux">Attiva Flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">Attiva Flux nelle impostazioni \"Rete e server\" per una migliore privacy dei metadati.</string>
     <string name="view_updated_conditions">Vedi le condizioni aggiornate</string>
     <string name="appearance_bars_blur_radius">Sfocatura</string>
     <string name="operator_added_message_servers">Server dei messaggi aggiunti</string>
@@ -2248,5 +2247,196 @@
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Quando più di un operatore è attivato, nessuno di essi ha metadati per capire chi comunica con chi.</string>
     <string name="display_name_accepted_invitation">invito accettato</string>
     <string name="display_name_requested_to_connect">richiesto di connettersi</string>
-    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell\'app</string>
-</resources>
\ No newline at end of file
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat e Flux hanno concluso un accordo per includere server gestiti da Flux nell\'app.</string>
+    <string name="onboarding_network_about_operators">Info sugli operatori</string>
+    <string name="sync_connection_desc">La connessione richiede la rinegoziazione della crittografia.</string>
+    <string name="sync_connection_confirm">Correggi</string>
+    <string name="sync_connection_question">Correggere la connessione?</string>
+    <string name="encryption_renegotiation_in_progress">Rinegoziazione della crittografia in corso.</string>
+    <string name="debug_logs">Attiva i log</string>
+    <string name="error_saving_database">Errore di salvataggio del database</string>
+    <string name="connection_not_ready">Connessione non pronta.</string>
+    <string name="error_updating_chat_tags">Errore di aggiornamento dell\'elenco di chat</string>
+    <string name="chat_list_all">Tutte</string>
+    <string name="chat_list_favorites">Preferite</string>
+    <string name="chat_list_groups">Gruppi</string>
+    <string name="no_chats">Nessuna chat</string>
+    <string name="no_chats_found">Nessuna chat trovata</string>
+    <string name="no_unread_chats">Nessuna chat non letta</string>
+    <string name="chat_list_add_list">Aggiungi elenco</string>
+    <string name="open_with_app">Apri con %s</string>
+    <string name="add_to_list">Aggiungi ad un elenco</string>
+    <string name="list_name_field_placeholder">Nome elenco...</string>
+    <string name="save_list">Salva elenco</string>
+    <string name="delete_chat_list_menu_action">Elimina</string>
+    <string name="delete_chat_list_warning">Tutte le chat verranno rimosse dall\'elenco %s, e l\'elenco eliminato</string>
+    <string name="delete_chat_list_question">Eliminare l\'elenco?</string>
+    <string name="duplicated_list_error">Il nome dell\'elenco e l\'emoji dovrebbero essere diversi per tutte le liste.</string>
+    <string name="error_loading_chat_tags">Errore di caricamento dell\'elenco di chat</string>
+    <string name="error_creating_chat_tags">Errore di creazione dell\'elenco di chat</string>
+    <string name="list_menu">Elenco</string>
+    <string name="chat_list_contacts">Contatti</string>
+    <string name="chat_list_businesses">Lavorative</string>
+    <string name="create_list">Crea elenco</string>
+    <string name="edit_chat_list_menu_action">Modifica</string>
+    <string name="no_chats_in_list">Nessuna chat nell\'elenco %s.</string>
+    <string name="change_list">Cambia elenco</string>
+    <string name="chat_list_notes">Note</string>
+    <string name="change_order_chat_list_menu_action">Cambia ordine</string>
+    <string name="prefs_error_saving_settings">Errore di salvataggio delle impostazioni</string>
+    <string name="error_creating_report">Errore nella creazione del resoconto</string>
+    <string name="report_archive_alert_title">Archiviare la segnalazione?</string>
+    <string name="report_item_archived">segnalazione archiviata</string>
+    <string name="report_compose_reason_header_illegal">Segnala contenuto: solo i moderatori del gruppo lo vedranno.</string>
+    <string name="archive_verb">Archivia</string>
+    <string name="report_reason_other">Altro motivo</string>
+    <string name="report_compose_reason_header_other">Segnala altro: solo i moderatori del gruppo lo vedranno.</string>
+    <string name="report_reason_community">Violazione delle linee guida della comunità</string>
+    <string name="report_reason_illegal">Contenuto inappropriato</string>
+    <string name="report_reason_profile">Profilo inappropriato</string>
+    <string name="report_item_visibility_moderators">Solo il mittente e i moderatori lo vedono</string>
+    <string name="report_item_visibility_submitter">Solo tu e i moderatori lo vedete</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="report_verb">Segnala</string>
+    <string name="report_reason_alert_title">Motivo della segnalazione?</string>
+    <string name="report_archive_alert_desc">La segnalazione verrà archiviata per te.</string>
+    <string name="report_compose_reason_header_profile">Segnala profilo: solo i moderatori del gruppo lo vedranno.</string>
+    <string name="report_compose_reason_header_spam">Segnala spam: solo i moderatori del gruppo lo vedranno.</string>
+    <string name="report_compose_reason_header_community">Segnala violazione: solo i moderatori del gruppo lo vedranno.</string>
+    <string name="group_member_role_moderator">moderatore</string>
+    <string name="archive_report">Archivia la segnalazione</string>
+    <string name="delete_report">Elimina la segnalazione</string>
+    <string name="chat_list_group_reports">Segnalazioni</string>
+    <string name="group_reports_active_one">1 segnalazione</string>
+    <string name="report_item_archived_by">segnalazione archiviata da %s</string>
+    <string name="group_reports_active">%d segnalazioni</string>
+    <string name="group_reports_member_reports">Segnalazioni dei membri</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="connection_error_blocked">Connessione bloccata</string>
+    <string name="file_error_blocked">Il file è bloccato dall\'operatore del server:\n%1$s.</string>
+    <string name="connection_error_blocked_desc">La connessione è bloccata dall\'operatore del server:\n%1$s.</string>
+    <string name="blocking_reason_content">Il contenuto viola le condizioni di utilizzo</string>
+    <string name="privacy_chat_list_open_web_link_question">Aprire il link?</string>
+    <string name="privacy_chat_list_open_links_yes">Sì</string>
+    <string name="privacy_chat_list_open_links">Apri i link dall\'elenco delle chat</string>
+    <string name="privacy_chat_list_open_links_no">No</string>
+    <string name="privacy_chat_list_open_web_link">Apri link</string>
+    <string name="privacy_chat_list_open_links_ask">Chiedi</string>
+    <string name="text_field_set_chat_placeholder">Imposta il nome della chat…</string>
+    <string name="disable_automatic_deletion">Disattiva eliminazione messaggi</string>
+    <string name="chat_item_ttl_year">1 anno</string>
+    <string name="disable_automatic_deletion_question">Disattivare l\'eliminazione automatica dei messaggi?</string>
+    <string name="change_automatic_deletion_question">Cambiare l\'eliminazione automatica dei messaggi?</string>
+    <string name="change_automatic_chat_deletion_message">Questa azione non è reversibile: i messaggi inviati e ricevuti in questa chat prima della selezione verranno eliminati.</string>
+    <string name="chat_ttl_options_footer">Elimina i messaggi di chat dal tuo dispositivo.</string>
+    <string name="disable_automatic_deletion_message">I messaggi in questa chat non verranno mai eliminati.</string>
+    <string name="chat_item_ttl_default">predefinito (%s)</string>
+    <string name="network_smp_web_port_footer">Usa la porta TCP %1$s quando nessuna porta è specificata.</string>
+    <string name="network_smp_web_port_section_title">Porta TCP per i messaggi</string>
+    <string name="network_smp_web_port_toggle">Usa porta web</string>
+    <string name="mute_all_chat">Silenzia tutto</string>
+    <string name="unread_mentions">Menzioni non lette</string>
+    <string name="max_group_mentions_per_message_reached">Puoi menzionare fino a %1$s membri per messaggio!</string>
+    <string name="group_members_can_send_reports">I membri possono segnalare messaggi ai moderatori.</string>
+    <string name="report_archive_alert_title_all">Archiviare tutte le segnalazioni?</string>
+    <string name="report_archive_alert_title_nth">Archiviare %d segnalazioni?</string>
+    <string name="archive_reports">Archivia segnalazioni</string>
+    <string name="report_archive_for_all_moderators">Per tutti i moderatori</string>
+    <string name="report_archive_for_me">Per me</string>
+    <string name="notification_group_report">Segnalazione: %s</string>
+    <string name="member_reports_are_prohibited">In questo gruppo è vietato segnalare messaggi.</string>
+    <string name="enable_sending_member_reports">Consenti di segnalare messaggi ai moderatori.</string>
+    <string name="report_archive_alert_desc_all">Tutte le segnalazioni verranno archiviate per te.</string>
+    <string name="disable_sending_member_reports">Vieta di segnalare messaggi ai moderatori.</string>
+    <string name="v6_3_organize_chat_lists_descr">Non perdere messaggi importanti.</string>
+    <string name="v6_3_faster_deletion_of_groups">Eliminazione dei gruppi più veloce.</string>
+    <string name="v6_3_mentions_descr">Ricevi una notifica quando menzionato.</string>
+    <string name="v6_3_reports_descr">Aiuta gli amministratori a moderare i loro gruppi.</string>
+    <string name="v6_3_mentions">Menziona i membri 👋</string>
+    <string name="v6_3_better_privacy_and_security">Privacy e sicurezza migliori</string>
+    <string name="v6_3_faster_sending_messages">Invio dei messaggi più veloce.</string>
+    <string name="v6_3_better_groups_performance">Prestazioni dei gruppi migliorate</string>
+    <string name="v6_3_organize_chat_lists">Organizza le chat in elenchi</string>
+    <string name="v6_3_set_message_expiration_in_chats">Imposta la scadenza dei messaggi nelle chat.</string>
+    <string name="v6_3_reports">Invia segnalazioni private</string>
+    <string name="v6_3_private_media_file_names">Nomi privati dei file multimediali.</string>
+    <string name="group_member_status_rejected">rifiutato</string>
+    <string name="group_preview_rejected">rifiutato</string>
+    <string name="error_reading_passphrase">Errore di lettura della password del database</string>
+    <string name="group_member_status_pending_approval">in attesa di approvazione</string>
+    <string name="group_member_status_pending_approval_short">in attesa</string>
+    <string name="operator_updated_conditions">Condizioni aggiornate</string>
+    <string name="restore_passphrase_can_not_be_read_desc">La password nell\'archivio chiavi non può essere letta. Potrebbe essere successo dopo un aggiornamento di sistema incompatibile con l\'app. In caso contrario, contatta gli sviluppatori.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">La password nell\'archivio chiavi non può essere letta, inseriscila a mano. Potrebbe essere successo dopo un aggiornamento di sistema incompatibile con l\'app. In caso contrario, contatta gli sviluppatori.</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">I membri verranno rimossi dalla chat, non è reversibile!</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">I membri verranno rimossi dal gruppo, non è reversibile!</string>
+    <string name="button_remove_members_question">Rimuovere i membri?</string>
+    <string name="unblock_members_desc">I messaggi di questi membri verranno mostrati!</string>
+    <string name="unblock_members_for_all_question">Sbloccare i membri per tutti?</string>
+    <string name="block_members_for_all_question">Bloccare i membri per tutti?</string>
+    <string name="feature_roles_moderators">moderatori</string>
+    <string name="block_members_desc">Tutti i nuovi messaggi di questi membri verranno nascosti!</string>
+    <string name="onboarding_conditions_by_using_you_agree">Usando SimpleX Chat accetti di:\n- inviare solo contenuto legale nei gruppi pubblici.\n- rispettare gli altri utenti - niente spam.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Le chat private, i gruppi e i tuoi contatti non sono accessibili agli operatori dei server.</string>
+    <string name="onboarding_conditions_accept">Accetta</string>
+    <string name="onboarding_conditions_configure_server_operators">Configura gli operatori dei server</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Informativa sulla privacy e condizioni d\'uso.</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Questo link richiede una versione più recente dell\'app. Aggiornala o chiedi al tuo contatto di inviare un link compatibile.</string>
+    <string name="full_link_button_text">Link completo</string>
+    <string name="short_link_button_text">Link breve</string>
+    <string name="simplex_link_channel">Link del canale SimpleX</string>
+    <string name="unsupported_connection_link">Link di connessione non supportato</string>
+    <string name="privacy_short_links">Usa link brevi (BETA)</string>
+    <string name="network_smp_web_port_all">Tutti i server</string>
+    <string name="network_smp_web_port_off">Off</string>
+    <string name="network_smp_web_port_preset">Server preimpostati</string>
+    <string name="network_smp_web_port_preset_footer">Usa la porta TCP 443 solo per i server preimpostati.</string>
+    <string name="group_new_support_chat_one">1 chat con un membro</string>
+    <string name="group_new_support_chats_short">%d chat</string>
+    <string name="group_new_support_chats">%d chat con membri</string>
+    <string name="group_new_support_messages">%d messaggi</string>
+    <string name="save_admission_question">Salvare le impostazioni di ammissione?</string>
+    <string name="rcv_group_event_member_accepted">ha accettato %1$s</string>
+    <string name="rcv_group_event_user_accepted">ti ha accettato/a</string>
+    <string name="snd_group_event_user_pending_review">Attendi che i moderatori del gruppo revisionino la tua richiesta di entrare nel gruppo.</string>
+    <string name="snd_group_event_member_accepted">hai accettato questo membro</string>
+    <string name="group_member_status_pending_review_short">revisiona</string>
+    <string name="member_admission">Ammissione del membro</string>
+    <string name="no_support_chats">Nessuna chat con membri</string>
+    <string name="member_criteria_off">off</string>
+    <string name="admission_stage_review">Revisiona i membri</string>
+    <string name="admission_stage_review_descr">Revisiona i membri prima di ammetterli (bussare).</string>
+    <string name="accept_pending_member_button">Accetta</string>
+    <string name="support_chat">Chat con amministratori</string>
+    <string name="reject_pending_member_button">Rimuovi</string>
+    <string name="accept_pending_member_alert_question">Il membro entrerà nel gruppo, accettarlo?</string>
+    <string name="reviewed_by_admins">revisionato dagli amministratori</string>
+    <string name="accept_pending_member_alert_title">Accetta membro</string>
+    <string name="button_support_chat">Chatta con gli amministratori</string>
+    <string name="accept_pending_member_alert_confirmation_as_observer">Accetta come osservatore</string>
+    <string name="rcv_group_event_new_member_pending_review">Un nuovo membro vuole entrare nel gruppo.</string>
+    <string name="member_criteria_all">tutti</string>
+    <string name="button_support_chat_member">Chatta con il membro</string>
+    <string name="member_support">Chat con membri</string>
+    <string name="error_accepting_member">Errore di accettazione del membro</string>
+    <string name="accept_pending_member_alert_confirmation_as_member">Accetta come membro</string>
+    <string name="set_member_admission">Imposta l\'ammissione dei membri</string>
+    <string name="report_sent_alert_title">Segnalazione inviata ai moderatori</string>
+    <string name="group_member_status_pending_review">in attesa di revisione</string>
+    <string name="report_sent_alert_msg_view_in_support_chat">Puoi vedere le tue segnalazioni nella chat con gli amministratori.</string>
+    <string name="cant_send_message_alert_title">Non puoi inviare messaggi!</string>
+    <string name="cant_send_message_contact_not_ready">contatto non pronto</string>
+    <string name="cant_send_message_contact_deleted">contatto eliminato</string>
+    <string name="cant_send_message_contact_disabled">contatto disattivato</string>
+    <string name="cant_send_message_contact_not_synchronized">non sincronizzato</string>
+    <string name="cant_send_message_rejected">richiesta di entrare rifiutata</string>
+    <string name="cant_send_message_generic">impossibile inviare messaggi</string>
+    <string name="cant_send_message_group_deleted">il gruppo è eliminato</string>
+    <string name="cant_send_message_member_has_old_version">il membro ha una versione vecchia</string>
+    <string name="cant_send_message_mem_removed">rimosso dal gruppo</string>
+    <string name="cant_send_message_you_left">sei uscito/a</string>
+    <string name="delete_member_support_chat_alert_title">Eliminare la chat con il membro?</string>
+    <string name="reject_pending_member_alert_title">Rifiutare il membro?</string>
+    <string name="delete_member_support_chat_button">Elimina chat</string>
+    <string name="error_deleting_member_support_chat">Errore di eliminazione della chat con il membro</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
index 2bb007b6e8..1103e3a0e6 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
@@ -371,7 +371,7 @@
     <string name="feature_enabled">מופעל</string>
     <string name="feature_enabled_for_contact">מופעל עבור איש הקשר</string>
     <string name="feature_enabled_for_you">מופעל עבורך</string>
-    <string name="disappearing_messages_are_prohibited">הודעות נעלמות אסורות בקבוצה זו.</string>
+    <string name="disappearing_messages_are_prohibited">הודעות נעלמות אסורות.</string>
     <string name="ttl_min">%d דקה</string>
     <string name="ttl_s">%d שנ׳</string>
     <string name="v4_4_disappearing_messages">הודעות נעלמות</string>
@@ -489,10 +489,10 @@
     <string name="delete_group_for_self_cannot_undo_warning">הקבוצה תימחק עבורך – לא ניתן לבטל זאת!</string>
     <string name="user_hide">הסתר</string>
     <string name="group_preferences">העדפות קבוצה</string>
-    <string name="group_members_can_delete">חברי קבוצה יכולים למחוק הודעות שנשלחו באופן בלתי הפיך. (24 שעות)</string>
-    <string name="group_members_can_send_disappearing">חברי הקבוצה יכולים לשלוח הודעות נעלמות.</string>
-    <string name="group_members_can_send_dms">חברי הקבוצה יכולים לשלוח הודעות ישירות.</string>
-    <string name="group_members_can_send_voice">חברי הקבוצה יכולים לשלוח הודעות קוליות.</string>
+    <string name="group_members_can_delete">משתמשים יכולים למחוק הודעות שנשלחו באופן בלתי הפיך. (24 שעות)</string>
+    <string name="group_members_can_send_disappearing">משתמשים יכולים לשלוח הודעות נעלמות.</string>
+    <string name="group_members_can_send_dms">משתמשים יכולים לשלוח הודעות ישירות.</string>
+    <string name="group_members_can_send_voice">יכולים לשלוח הודעות קוליות.</string>
     <string name="enable_self_destruct">אפשר השמדה עצמית</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">אם תבחרו לדחות השולח לא יקבל התראה על כך.</string>
     <string name="network_disable_socks_info">אם תאשרו, שרתי העברת ההודעות יוכלו לראות את ה־IP שלכם, וספק האינטרנט שלכם – את השרתים אליהם אתם מחוברים.</string>
@@ -505,7 +505,7 @@
     <string name="ignore">התעלם</string>
     <string name="la_immediately">מיד</string>
     <string name="import_database">ייבא מסד נתונים</string>
-    <string name="immune_to_spam_and_abuse">חסין מפני ספאם ושימוש לרעה</string>
+    <string name="immune_to_spam_and_abuse">חסין מפני ספאם</string>
     <string name="import_database_question">לייבא מסד נתונים של צ׳אט\?</string>
     <string name="icon_descr_image_snd_complete">תמונה נשלחה</string>
     <string name="image_will_be_received_when_contact_completes_uploading">התמונה תתקבל כאשר איש הקשר יסיים להעלות אותה.</string>
@@ -521,10 +521,10 @@
     <string name="description_via_group_link_incognito">זהות נסתרת באמצעות קישור קבוצה</string>
     <string name="description_via_one_time_link_incognito">זהות נסתרת באמצעות קישור חד־פעמי</string>
     <string name="invalid_connection_link">קישור חיבור לא תקין</string>
-    <string name="turn_off_battery_optimization"><![CDATA[בשביל להשתמש בזה, אנא <b>אפשרו ל-SimpleX לפעול ברקע</b> בתיבת הדו-שיח הבאה. אחרת, ההתראות יושבתו.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>אפשר זאת</b> בתיבת הדו-שיח הבאה כדי לקבל התראות על הודעות חדשות באופן מיידי.]]></string>
     <string name="service_notifications_disabled">התראות מיידיות מושבתות!</string>
     <string name="icon_descr_add_members">הזמן חברי קבוצה</string>
-    <string name="group_member_status_invited">הוזמן</string>
+    <string name="group_member_status_invited">הזמין את</string>
     <string name="conn_level_desc_indirect">עקיף (%1$s)</string>
     <string name="incognito_info_protects">מצב זהות נסתרת מגן על הפרטיות שלך על ידי שימוש בפרופיל אקראי חדש עבור כל איש קשר.</string>
     <string name="incompatible_database_version">גרסת מסד נתונים לא תואמת</string>
@@ -556,14 +556,14 @@
     <string name="invite_to_group_button">הזמן לקבוצה</string>
     <string name="button_add_members">הזמן חברי קבוצה</string>
     <string name="message_deletion_prohibited">מחיקה בלתי הפיכה של הודעות אסורה בצ׳אט זה.</string>
-    <string name="message_deletion_prohibited_in_chat">מחיקה בלתי הפיכה של הודעות אסורה בקבוצה זו.</string>
+    <string name="message_deletion_prohibited_in_chat">מחיקת הודעות בלתי הפיכה אסורה.</string>
     <string name="group_preview_join_as">להצטרף בתור %s</string>
     <string name="incognito_info_allows">זה מאפשר חיבורים אנונימיים רבים ללא שום נתונים משותפים ביניהם בפרופיל צ׳אט יחיד.</string>
     <string name="alert_text_skipped_messages_it_can_happen_when">זה יכול לקרות כאשר:
 \n1. פג תוקפן של ההודעות בלקוח השולח לאחר 2 ימים או בשרת לאחר 30 ימים.
 \n2. פיענוח הצפנת הודעה נכשל, מכיוון שאתם או איש הקשר שלכם השתמשתם בגיבוי ישן של מסד הנתונים.
 \n3. החיבור נפגע.</string>
-    <string name="onboarding_notifications_mode_subtitle">ניתן לשנות זאת מאוחר יותר באמצעות ההגדרות.</string>
+    <string name="onboarding_notifications_mode_subtitle">איך זה משפיע על הסוללה</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">זה יכול לקרות כאשר אתם או איש הקשר שלכם השתמשתם בגיבוי ישן של מסד הנתונים.</string>
     <string name="join_group_question">להצטרף לקבוצה\?</string>
     <string name="join_group_button">הצטרף</string>
@@ -608,7 +608,7 @@
     <string name="add_contact">קישור הזמנה חד־פעמי</string>
     <string name="markdown_in_messages">מרקדאון בהודעות</string>
     <string name="network_and_servers">רשת ושרתים</string>
-    <string name="network_settings_title">הגדרות רשת</string>
+    <string name="network_settings_title">הגדרות מתקדמות</string>
     <string name="new_database_archive">ארכיון מסד נתונים חדש</string>
     <string name="messages_section_title">הודעות</string>
     <string name="group_member_role_member">חבר קבוצה</string>
@@ -690,7 +690,7 @@
     <string name="message_reactions_are_prohibited">תגובות אמוג׳י להודעות אסורות בקבוצה זו.</string>
     <string name="allow_your_contacts_adding_message_reactions">אפשר לאנשי הקשר להוסיף תגובות אמוג׳י להודעות.</string>
     <string name="allow_message_reactions_only_if">אפשר תגובות אמוג׳י להודעות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="group_members_can_add_message_reactions">חברי הקבוצה יכולים להוסיף תגובות אמוג׳י להודעות.</string>
+    <string name="group_members_can_add_message_reactions">משתמשים יכולים להוסיף תגובות אמוג׳י להודעות.</string>
     <string name="only_you_can_add_message_reactions">רק אתם יכולים להוסיף תגובות אמוג׳י להודעות.</string>
     <string name="only_your_contact_can_add_message_reactions">רק איש הקשר שלכם יכול להוסיף תגובות אמוג׳י להודעות.</string>
     <string name="open_verb">פתח</string>
@@ -737,7 +737,7 @@
     <string name="smp_servers_preset_server">שרת מוגדר מראש</string>
     <string name="privacy_redefined">פרטיות מוגדרת מחדש</string>
     <string name="people_can_connect_only_via_links_you_share">אנשים יכולים להתחבר אליכם רק דרך הקישורים שאתם משתפים.</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">פרוטוקול וקוד פתוחים – כל אחד יכול להריץ את השרתים.</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">כל אחד יכול לארח שרתים.</string>
     <string name="onboarding_notifications_mode_periodic">תקופתי</string>
     <string name="restore_database_alert_desc">נא להזין את הסיסמה הקודמת לאחר שחזור גיבוי מסד הנתונים, לא ניתן לבטל פעולה זו.</string>
     <string name="prohibit_message_deletion">לאסור מחיקה בלתי הפיכה של הודעות.</string>
@@ -746,7 +746,7 @@
     <string name="network_error_desc">אנא בידקו את חיבור האינטרנט שלכם עם %1$s ונסו שוב.</string>
     <string name="error_smp_test_certificate">ייתכן שטביעת האצבע של התעודה בכתובת השרת שגויה</string>
     <string name="auth_open_chat_console">פתיחת מסוף צ׳אט</string>
-    <string name="auth_open_chat_profiles">פתיחת פרופילי צ׳אט</string>
+    <string name="auth_open_chat_profiles">שנה פרופילי צ׳אט</string>
     <string name="icon_descr_server_status_pending">ממתין</string>
     <string name="smp_servers_preset_address">כתובת שרת מוגדר מראש</string>
     <string name="password_to_show">סיסמה להצגה</string>
@@ -1016,7 +1016,7 @@
     <string name="images_limit_title">יותר מדי תמונות!</string>
     <string name="thank_you_for_installing_simplex">תודה שהתקנתם את SimpleX Chat!</string>
     <string name="this_link_is_not_a_valid_connection_link">קישור זה אינו קישור חיבור תקין!</string>
-    <string name="theme_colors_section_title">צבעי ערכת נושא</string>
+    <string name="theme_colors_section_title">צבעי ממשק</string>
     <string name="member_role_will_be_changed_with_invitation">התפקיד ישתנה ל־"%s". החבר יקבל הזמנה חדשה.</string>
     <string name="smp_servers_per_user">השרתים לחיבורים חדשים של פרופיל הצ׳אט הנוכחי שלך</string>
     <string name="first_platform_without_user_ids">הפלטפורמה הראשונה ללא כל מזהי משתמש - פרטית בעיצובה.</string>
@@ -1054,7 +1054,7 @@
     <string name="upgrade_and_open_chat">שדרג ופתח צ׳אט</string>
     <string name="v4_5_private_filenames_descr">כדי להגן על אזור הזמן, קובצי תמונה/קול משתמשים ב־UTC.</string>
     <string name="smp_server_test_upload_file">העלה קובץ</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[כדי לשמור על פרטיותך, האפליקציה כוללת <b>שירות רקע SimpleX</b> – הוא משתמש בכמה אחוזים מהסוללה ביום.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[כדי לשפר את הפרטיות <b>SimpleX  רץ ברקע</b> במקום להשתמש בpush notifications.]]></string>
     <string name="enter_passphrase_notification_desc">כדי לקבל התראות, יש להזין את סיסמת מסד הנתונים</string>
     <string name="auth_unlock">בטל נעילה</string>
     <string name="icon_descr_sent_msg_status_unauthorized_send">שליחה לא מורשית</string>
@@ -1239,15 +1239,15 @@
     <string name="settings_shutdown">כיבוי</string>
     <string name="settings_section_title_app">אפליקציה</string>
     <string name="allow_to_send_files">אפשר לשלוח קבצים ומדיה.</string>
-    <string name="favorite_chat">מועדף</string>
+    <string name="favorite_chat">הוסף למועדפים</string>
     <string name="files_and_media">קבצים ומדיה</string>
     <string name="no_filtered_chats">אין צ\'אטים מסוננים</string>
     <string name="shutdown_alert_question">לכבות\?</string>
     <string name="files_and_media_prohibited">קבצים ומדיה אסורים!</string>
-    <string name="files_are_prohibited_in_group">קבצים ומדיה אסורים בקבוצה זו.</string>
-    <string name="group_members_can_send_files">חברי הקבוצה יכולים לשלוח קבצים ומדיה.</string>
+    <string name="files_are_prohibited_in_group">קבצים ומדיה אסורים.</string>
+    <string name="group_members_can_send_files">משתמשים יכולים לשלוח קבצים ומדיה.</string>
     <string name="settings_restart_app">איתחול</string>
-    <string name="unfavorite_chat">שנוא</string>
+    <string name="unfavorite_chat">הסר מהמועדפים</string>
     <string name="la_mode_off">כבוי</string>
     <string name="strikethrough_text">קו חוצה</string>
     <string name="prohibit_sending_files">לאסור שליחת קבצים ומדיה.</string>
@@ -1528,8 +1528,8 @@
     <string name="show_slow_api_calls">הצג קריאות API איטיות</string>
     <string name="developer_options_section">אפשרויות למפתח</string>
     <string name="create_another_profile_button">צור פרופיל</string>
-    <string name="rcv_group_and_other_events">ו %d שאר האירועים</string>
-    <string name="profile_update_event_set_new_address">הגדר כתובת איש קשר חדש</string>
+    <string name="rcv_group_and_other_events">בנוסף ל- %d אירועים אחרים</string>
+    <string name="profile_update_event_set_new_address">איש הקשר הגדיר כתובת חדשה</string>
     <string name="contact_tap_to_connect">לחץ לחיבור</string>
     <string name="unable_to_open_browser_desc">דפדפן האינטרנט המוגדר כברירת מחדל נדרש לשיחות. אנא הגדר דפדפן ברירת מחדל במערכת, ושתף מידע נוסף עם המפתחים.</string>
     <string name="e2ee_info_no_pq_short">השיחה הזו מוגנת באמצעות הצפנה קצה-אל-קצה.</string>
@@ -1609,7 +1609,7 @@
     <string name="remote_ctrl_was_disconnected_title">החיבור עצר</string>
     <string name="non_content_uri_alert_title">נתיב קובץ לא חוקי</string>
     <string name="non_content_uri_alert_text">שיתפת נתיב קובץ לא חוקי. דווח על הבעיה למפתחי האפליקציה.</string>
-    <string name="moderated_items_description">%1$d הודעות שנערכו על ידי %2$s</string>
+    <string name="moderated_items_description">%1$d הודעות נחסמו על ידי %2$s</string>
     <string name="marked_deleted_items_description">%d הודעות סומנו כנמחקות</string>
     <string name="connect_plan_repeat_connection_request">האם לחזור על בקשת החיבור?</string>
     <string name="blocked_item_description">חסום</string>
@@ -1632,13 +1632,13 @@
     <string name="loading_remote_file_title">טעינה של הקובץ</string>
     <string name="settings_section_title_use_from_desktop">שימוש ממחשב שולחני</string>
     <string name="rcv_group_event_member_blocked">חסומים %s</string>
-    <string name="rcv_direct_event_contact_deleted">מחק איש קשר</string>
+    <string name="rcv_direct_event_contact_deleted">איש קשר נמחק</string>
     <string name="rcv_group_events_count">%d אירועי קבוצה</string>
     <string name="group_members_n">%s, %s ו-%d חברים</string>
     <string name="profile_update_event_contact_name_changed">איש הקשר %1$s השתנה ל-%2$s</string>
     <string name="profile_update_event_removed_address">כתובת איש קשר הוסרה</string>
     <string name="profile_update_event_removed_picture">תמונת פרופיל הוסרה</string>
-    <string name="profile_update_event_set_new_picture">הגדר תמונת פרופיל חדשה</string>
+    <string name="profile_update_event_set_new_picture">הגדיר תמונת פרופיל חדשה</string>
     <string name="profile_update_event_updated_profile">עדכן פרופיל</string>
     <string name="group_member_status_unknown">מצב לא ידוע</string>
     <string name="info_row_created_at">נוצר ב</string>
@@ -1722,7 +1722,7 @@
     <string name="v5_7_shape_profile_images_descr">מרובע, עיגול, או כל דבר ביניהם</string>
     <string name="v5_7_forward">העבר ושמור הודעות</string>
     <string name="v5_7_call_sounds_descr">מתי שמתחבר שחיות קוליות ווידאו.</string>
-    <string name="cannot_share_message_alert_title">לא מצליח לשלוח הודעה</string>
+    <string name="cannot_share_message_alert_title">לא ניתן לשלוח הודעה</string>
     <string name="voice_messages_not_allowed">הודעות קוליות לא מאופשרות</string>
     <string name="temporary_file_error">שגיאת קובץ זמני</string>
     <string name="files_and_media_not_allowed">קבצים ומדיה לא מאופשרים</string>
@@ -1748,7 +1748,7 @@
     <string name="share_text_file_status">מצב הקובץ:%s</string>
     <string name="message_queue_info_none">ריק</string>
     <string name="color_mode_dark">כהה</string>
-    <string name="color_mode">מצב צבעוני</string>
+    <string name="color_mode">ערכת נושא</string>
     <string name="theme_black">שחור</string>
     <string name="color_mode_light">בהיר</string>
     <string name="reset_single_color">אפס צבע</string>
@@ -1767,8 +1767,8 @@
     <string name="chat_theme_set_default_theme">הגדר ערכת נושא ברירת מחדל</string>
     <string name="chat_theme_reset_to_user_theme">אפס ערכת נושא למשתמש</string>
     <string name="chat_theme_apply_to_mode">החל ל</string>
-    <string name="chat_theme_apply_to_all_modes">מצב כל הצבעים</string>
-    <string name="group_members_can_send_simplex_links">חברי הקבוצה יכולים לשלוח קישורי SimpleX</string>
+    <string name="chat_theme_apply_to_all_modes">ערכת נושא</string>
+    <string name="group_members_can_send_simplex_links">משתמשים יכולים לשלוח קישורי SimpleXצ</string>
     <string name="v5_8_chat_themes_descr">עשה שהצאט\'ים שלך יראו אחרת!</string>
     <string name="v5_7_network">הגדרות רשת</string>
     <string name="remote_ctrl_connection_stopped_identity_desc">הקישור הזה שומש כבר במכשיר אחר, אנא צור קישור חדש במחשב.</string>
@@ -1918,4 +1918,177 @@
     <string name="xftp_server">שרת XFTP</string>
     <string name="privacy_media_blur_radius_soft">חלש</string>
     <string name="deleted_chats">אנשי קשר בארכיון</string>
-</resources>
\ No newline at end of file
+    <string name="report_item_archived">דיווח בארכיון</string>
+    <string name="report_reason_community">הפרה של הנחיות קהילתיות</string>
+    <string name="n_file_errors">%1$d שגיאת קבצים:\n%2$s</string>
+    <string name="forward_files_in_progress_desc">%1$d הקבצים עדיין בהורדה.</string>
+    <string name="accept_conditions">הסכם לתנאים</string>
+    <string name="forward_files_not_accepted_desc">%1$d ההורדה של הקובץ/ים עדיין לא הסתיימה.</string>
+    <string name="operator_conditions_accepted">התנאים המקובלים עלי</string>
+    <string name="chat_item_ttl_year">שנה</string>
+    <string name="report_reason_other">סיבה אחרת</string>
+    <string name="business_address">כתובת עסקית</string>
+    <string name="v6_1_message_dates_descr">שיפור בסידור של הודעות לפי תאריכים.</string>
+    <string name="v6_3_better_groups_performance">שיפור ביצועים לקבוצות</string>
+    <string name="info_view_call_button">התקשר</string>
+    <string name="cant_call_member_alert_title">לא ניתן להתקשר לחבר קבוצה</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[התנאי שימוש יאושרו למפעיל/ים: <b>%s</b>.]]></string>
+    <string name="report_archive_alert_title">להעביר דיווח לארכיון?</string>
+    <string name="settings_section_title_chat_database">מסד נתונים של הצא\'טים</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">בדוק עבור הודעות חדשות כל 10 דקות</string>
+    <string name="operator_conditions_accepted_on">אישרת את תנאי השימוש ב:%s.</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">הצ\'אט יימחק עבור כל החברים - לא ניתן לבטל את זה!</string>
+    <string name="call_desktop_permission_denied_chrome">לחץ על כפתור מידע ליד שדה כתובת כדי לאפשר שימוש במיקרופון.</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[כבר הסכמת לתנאי שימוש למפעיל/ים האלו: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[התנאי שימוש יאושרו למפעיל/ים: <b>%s</b>.]]></string>
+    <string name="v6_0_your_contacts_descr">העבר אנשי קשר לארכיון לשוחח מאוחר יותר</string>
+    <string name="change_automatic_deletion_question">לשנות את מחיקת ההודעה האוטומטית?</string>
+    <string name="connect_plan_chat_already_exists">הצ\'אט כבר קיים!</string>
+    <string name="chat_list_all">הכל</string>
+    <string name="n_other_file_errors">%1$d שגיאה/ות קובץ אחר/ות.</string>
+    <string name="forward_files_failed_to_receive_desc">%1$d הקובץ/ים נכשל/ו בהורדה.</string>
+    <string name="block_members_desc">כל ההודעות החדשות מחברים אלו יוסתרו!</string>
+    <string name="block_members_for_all_question">לחסום את חברי הקבוצה לכולם?</string>
+    <string name="report_item_archived_by">הדיווח הועבר לארכיון ע\"י %s</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[ניתן להשתמש בקישור חד פעמי <i> עם איש קשר אחד בלבד</i> - שתף באופן אישי או באמצעות כל מסנג\'ר.]]></string>
+    <string name="v6_0_privacy_blur">טשטוש בשביל שיפור הפרטיות.</string>
+    <string name="group_reports_active_one">דיווח 1</string>
+    <string name="delete_chat_list_warning">כל הצ\'אטים יוסרו מהרשימת %s, והרשימה תימחק</string>
+    <string name="change_list">שנה רשימה</string>
+    <string name="allow_calls_question">לאפשר שיחות?</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">הצ\'אט יימחק עבורך - אי אפשר לבטל את זה!</string>
+    <string name="calls_prohibited_alert_title">שיחות לא מורשות!</string>
+    <string name="privacy_chat_list_open_links_ask">שאל</string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[ התנאי שימוש האלו יחולו גם על: <b>%s</b>.]]></string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>מכשירי שיואמי</b>: אנא תאפשר הפעלה אוטומטית בהגדרות הטלפון שלך כדי שההתראות על הודעות חדשות יפעלו.]]></string>
+    <string name="forward_files_messages_deleted_after_selection_title">%1$s ההודעות לא הועברו.</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[כל ההודעות והקבצים נשלחים <b>מוצפנים מקצה לקצה</b>, עם אבטחה פוסט-קוונטית בהודעות ישירות.]]></string>
+    <string name="appearance_bars_blur_radius">טישטוש</string>
+    <string name="chat_list_businesses">עסקי</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[כדי להשתמש בשרתים של <b>%s</b>, קבל את תנאי השימוש.]]></string>
+    <string name="report_archive_alert_desc_all">כל הדיווחים אצלך יועברו לארכיון.</string>
+    <string name="report_archive_alert_title_nth">להעביר לארכיון %d דיווחים?</string>
+    <string name="report_archive_alert_title_all">להעביר לארכיון את כל הדיווחים?</string>
+    <string name="archive_report">העבר דיווח לארכיון</string>
+    <string name="archive_reports">דיווחים בארכיון</string>
+    <string name="enable_sending_member_reports">אפשר לדווח על הודעות למנהלים.</string>
+    <string name="forward_files_missing_desc">%1$d הקובץ/ים נמחקו.</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[הסכמתי לתנאי שימוש למפעיל/ים: <b>%s</b>.]]></string>
+    <string name="chat_database_exported_title">המסד נתונים יוצא בהצלחה</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[יש לך את <b>%1$s</b> כבר באנשי קשר.]]></string>
+    <string name="cant_send_message_to_member_alert_title">לא ניתן לשלוח הודעה לחבר קבוצה</string>
+    <string name="display_name_accepted_invitation">קבל הזמנה</string>
+    <string name="onboarding_network_about_operators">על המפעילים</string>
+    <string name="cant_call_contact_alert_title">לא ניתן להתקשר לאיש קשר</string>
+    <string name="v6_1_better_calls">שיפור לשיחות</string>
+    <string name="change_order_chat_list_menu_action">שנה את הסדר</string>
+    <string name="archive_verb">ארכיון</string>
+    <string name="onboarding_conditions_accept">אני מסכים</string>
+    <string name="v6_3_better_privacy_and_security">שיפור בפרטיות ובאבטחה</string>
+    <string name="v6_1_better_security">אבטחה יותר טובה✅</string>
+    <string name="v6_1_better_user_experience">ממשק משתמש יותר נוח</string>
+    <string name="proxy_destination_error_broker_version">"גרסאת שרת היעד %1$s אינה  תואמת עם שרת ההעברה %2$s."</string>
+    <string name="v6_0_delete_many_messages_descr">מחק עד 20 הודעות בבת אחת.</string>
+    <string name="direct_messages_are_prohibited">הודעות ישירות בין חברים חסומות.</string>
+    <string name="disable_automatic_deletion">השבת מחיקת הודעות</string>
+    <string name="network_proxy_auth_mode_no_auth">אל תשתמש בתעודות עם פרוקסי.</string>
+    <string name="servers_info_downloaded">ירד</string>
+    <string name="group_reports_active">%d דיווחים</string>
+    <string name="app_check_for_updates_button_download">יורד %s (%s)</string>
+    <string name="disable_automatic_deletion_question">השבת מחיקת הודעות אוטומטית?</string>
+    <string name="duplicates_label">כפילויות</string>
+    <string name="operator_conditions_of_use">תנאי שימוש</string>
+    <string name="delete_without_notification">מחק בלי להתריע</string>
+    <string name="forward_files_not_accepted_receive_files">הורדה</string>
+    <string name="direct_messages_are_prohibited_in_chat">הודעות ישירות בין חברים אסורות בצ\'אט זה.</string>
+    <string name="v6_3_organize_chat_lists_descr">אל תחמיץ הודעות חשובות.</string>
+    <string name="v6_0_upgrade_app_descr">הורד גרסאות חדשות מ GitHub.</string>
+    <string name="report_reason_profile">פרופיל לא הולם</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">לפרטיות מטא דאטא טובה יותר.</string>
+    <string name="v6_2_network_decentralization_enable_flux">אפשר Flux בהגדרות רשת ושרתים בשביל לשפר את הפרטיות של המטא דאטא</string>
+    <string name="compose_forward_messages_n">מעביר %1$s הודעות</string>
+    <string name="error_reading_passphrase">שגיאה בקריאת משפט-סיסמה של מסד נתונים</string>
+    <string name="group_members_can_send_reports">משתמשים יכולים לדווח על הודעות לאחראי תוכן</string>
+    <string name="error_initializing_web_view_wrong_arch">שגיאת אתחול ב WebView, וודא שיש לך WebView מותקן והוא תותך בארכיטקטורה arm64\nשגיאה: %s</string>
+    <string name="network_proxy_incorrect_config_title">שגיאה בשמירת פרוקסי</string>
+    <string name="for_chat_profile">לפרופיל צ\'אט %s:</string>
+    <string name="operator_use_for_messages_private_routing">למסלול פרטי</string>
+    <string name="prefs_error_saving_settings">שגיאה בשמירת ההגדרות</string>
+    <string name="error_forwarding_messages">שגיאה בהעברת ההודעות</string>
+    <string name="switching_profile_error_title">שגיאה בהחלפת פרופיל</string>
+    <string name="debug_logs">אפשר לוגים</string>
+    <string name="how_it_helps_privacy">איך זה משפר את הפרטיות</string>
+    <string name="v6_2_improved_chat_navigation">שיפור בגלילה בצ\'אט</string>
+    <string name="report_reason_illegal">תוכן לא הולם</string>
+    <string name="error_accepting_operator_conditions">שגיאה בקבלת תנאי שימוש</string>
+    <string name="errors_in_servers_configuration">שגיאות בתצורת השרתים.</string>
+    <string name="proxy_destination_error_failed_to_connect">שרת ההעברות %1$s לא הצליח להתחבר לשרת היעד %2$s.נסה שוב במועד מאוחר יותר.</string>
+    <string name="group_reports_member_reports">דיווחים מחברי הקבוצה</string>
+    <string name="media_and_file_servers">שרתי קבצים ומדיה</string>
+    <string name="error_parsing_uri_title">קישור לא תקין</string>
+    <string name="error_creating_chat_tags">שגיאה ביצירת רשימת צא\'טים חדשה</string>
+    <string name="error_updating_chat_tags">שגיאת עדכון רשימת צ\'אטים</string>
+    <string name="error_loading_chat_tags">שגיאה בטעינת רשימות הצא\'טים</string>
+    <string name="edit_chat_list_menu_action">ערוך</string>
+    <string name="network_proxy_incorrect_config_desc">ודא שתצורת ה- proxy נכונה.</string>
+    <string name="action_button_add_members">הזמן</string>
+    <string name="v6_0_private_routing_descr">זה מגן על כתובת ה- IP והחיבורים שלך.</string>
+    <string name="button_leave_chat">עזוב צ\'אט</string>
+    <string name="sync_connection_confirm">תקן</string>
+    <string name="sync_connection_question">לתקן חיבור?</string>
+    <string name="v6_3_faster_deletion_of_groups">מחיקה מהירה יותר של קבוצות.</string>
+    <string name="v6_3_faster_sending_messages">שליחת הודעות מהירה יותר.</string>
+    <string name="forward_alert_forward_messages_without_files">העבר הודעות ללא קבצים?</string>
+    <string name="invite_to_chat_button">הזמן לצ\'אט</string>
+    <string name="snd_error_proxy_relay">שרת ההעברות: %1$s\nשגיאת שרת יעד: %2$s</string>
+    <string name="snd_error_proxy">שרת ההעברות: %1$s\nשגיאה: %2$s</string>
+    <string name="for_social_media">למדיה חברתית</string>
+    <string name="v6_0_increase_font_size">הגדל את גודל הגופן.</string>
+    <string name="list_menu">רשימה</string>
+    <string name="chat_list_favorites">מעודפים</string>
+    <string name="chat_list_groups">קבוצות</string>
+    <string name="list_name_field_placeholder">שם הרשימה..</string>
+    <string name="duplicated_list_error">שם הרשימה והאמוג\'י צריכים להיות שונים משאר הרשימות.</string>
+    <string name="keep_conversation">שמור שיחה</string>
+    <string name="invite_friends_short">הזמן</string>
+    <string name="v5_7_new_interface_languages">ממשק בשפה הליטאית</string>
+    <string name="file_error_blocked">הקובץ נחסם ע\"י מפעיל השרת:\n%1$s.</string>
+    <string name="report_archive_for_me">בשבילי</string>
+    <string name="report_archive_for_all_moderators">לכל האחראי תוכן</string>
+    <string name="forward_multiple">העבר הודעות…</string>
+    <string name="error_saving_database">שגיאה בשמירת המסד נתונים</string>
+    <string name="error_adding_server">שגיאה בהוספת שרת</string>
+    <string name="error_updating_server_title">שגיאת עדכון שם שרת</string>
+    <string name="forward_alert_title_messages_to_forward">להעביר %1$s הודעה/ות?</string>
+    <string name="error_creating_report">שגיאה בשליחת הדיווח</string>
+    <string name="failed_to_save_servers">שגיאה בשמירת שרתים</string>
+    <string name="leave_chat_question">לעזוב את הצ\'אט?</string>
+    <string name="v6_1_forward_many_messages_descr">העבר עד 20 הודעות בבת אחת.</string>
+    <string name="v6_3_mentions_descr">קבל התראה כאשר מתייגים אותך</string>
+    <string name="v6_3_reports_descr">עזור לאחראי תוכן בדיווחים על תוכן בעייתי בקבוצות</string>
+    <string name="chat_list_add_list">הוסף רשימה</string>
+    <string name="color_primary_variant2">הדגשה נוספת 2</string>
+    <string name="onboarding_conditions_by_using_you_agree">בשימוש שלך ב- SimpleX Chat אתה מסכים ל:\n\n- לשלוח רק תוכן חוקי בקבוצות ציבוריות.\n\n- לכבד את שאר המשתמשים - לא לשלוח ספאם.</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[תנאי שימוש אלה יחולו גם על:<b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[אותם תנאי שימוש יחולו על מפעיל/ים: <b>%s</b>.]]></string>
+    <string name="button_add_friends">הוסף חברים</string>
+    <string name="operator_added_message_servers">שרתי הודעות שנוספו</string>
+    <string name="operator_added_xftp_servers">שרתי מדיה וקבצים שנוספו</string>
+    <string name="add_to_list">הוסף לרשימה</string>
+    <string name="servers_info_subscriptions_connections_subscribed">חיבורים פעילים</string>
+    <string name="add_your_team_members_to_conversations">הוסף את חברי הצוות שלך לשיחות.</string>
+    <string name="onboarding_notifications_mode_service_desc_short">האפליקציה תמיד רצה ברקע</string>
+    <string name="address_settings">הגדרות כתובת</string>
+    <string name="appearance_app_toolbars">סרגל הכלים של האפליקציה</string>
+    <string name="network_session_mode_session">סשן לאפליקציה</string>
+    <string name="address_or_1_time_link">כתובת או קישור חד פעמי?</string>
+    <string name="button_add_team_members">הוסף חברי צוות</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[אותם תנאי שימוש יחולו על המפעיל <b>%s</b>.]]></string>
+    <string name="info_row_chat">צ\'אט</string>
+    <string name="v6_2_business_chats">צא\'טים עסקיים</string>
+    <string name="chunks_deleted">"הזבל  נמחק"</string>
+    <string name="chat_list_contacts">אנשי קשר</string>
+    <string name="delete_contact_cannot_undo_warning">איש הקשר יימחק - לא ניתן לבטל זאת!</string>
+    <string name="cant_call_contact_deleted_alert_text">איש הקשר נמחק.</string>
+    <string name="blocking_reason_spam">ספאם</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
index ff6b4e456c..21c04b8473 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
@@ -111,8 +111,8 @@
     <string name="failed_to_parse_chat_title">チャット読み込みに失敗</string>
     <string name="failed_to_parse_chats_title">チャット読み込みに失敗</string>
     <string name="contact_developers">アプリを更新し、開発者にご連絡ください。</string>
-    <string name="service_notifications">即時通知！</string>
-    <string name="service_notifications_disabled">即時通知が無効になってます！</string>
+    <string name="service_notifications">通知の常時受信！</string>
+    <string name="service_notifications_disabled">通知の常時受信が無効になってます！</string>
     <string name="enter_passphrase_notification_title">パスフレーズが必要</string>
     <string name="notification_preview_mode_hidden">プライベート</string>
     <string name="notification_preview_mode_contact">連絡先の名前</string>
@@ -150,7 +150,7 @@
     <string name="group_profile_is_stored_on_members_devices">グループのプロフィールはサーバではなく、メンバーの端末に保存されます。</string>
     <string name="snd_group_event_group_profile_updated">グループのプロフィールが更新されました。</string>
     <string name="notification_display_mode_hidden_desc">連絡先とメッセージ内容をプライベートにする。</string>
-    <string name="icon_descr_instant_notifications">即時通知</string>
+    <string name="icon_descr_instant_notifications">通知の常時受信</string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">SMPサーバのアドレスを正しく1行ずつに分けて、重複しないように、形式もご確認ください。</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">WebRTC ICEサーバのアドレスを正しく1行ずつに分けて、重複しないように、形式もご確認ください。</string>
     <string name="how_simplex_works">SimpleX の仕様</string>
@@ -480,7 +480,7 @@
     <string name="notification_new_contact_request">新しい繋がりのリクエスト</string>
     <string name="copy_verb">コピー</string>
     <string name="delete_message__question">メッセージを削除しますか？</string>
-    <string name="edit_verb">編集する</string>
+    <string name="edit_verb">編集</string>
     <string name="hide_verb">プライベートにする</string>
     <string name="delete_message_cannot_be_undone_warning">メッセージが削除されます (※元に戻せません※)！</string>
     <string name="delete_message_mark_deleted_warning">メッセージが削除対象となります。宛先にはメッセージの解読ができます。</string>
@@ -529,8 +529,8 @@
     <string name="callstate_received_answer">応答</string>
     <string name="decentralized">分散型</string>
     <string name="immune_to_spam_and_abuse">スパム耐性</string>
-    <string name="onboarding_notifications_mode_service">即時</string>
-    <string name="onboarding_notifications_mode_periodic">定期的</string>
+    <string name="onboarding_notifications_mode_service">常時受信</string>
+    <string name="onboarding_notifications_mode_periodic">定期的に受信</string>
     <string name="call_already_ended">通話は既に終了してます！</string>
     <string name="encrypted_audio_call">エンドツーエンド暗号化済みの音声通話</string>
     <string name="ignore">無視</string>
@@ -740,7 +740,7 @@
     <string name="callstate_starting">接続中…</string>
     <string name="next_generation_of_private_messaging">次世代のプライベートメッセンジャー</string>
     <string name="icon_descr_video_call">ビデオ通話</string>
-    <string name="onboarding_notifications_mode_off">アプリが稼働中に</string>
+    <string name="onboarding_notifications_mode_off">アプリがアクティブ時のみ</string>
     <string name="webrtc_ice_servers">WebRTC ICEサーバ</string>
     <string name="your_ice_servers">あなたのICEサーバ</string>
     <string name="settings_section_title_settings">設定</string>
@@ -1267,7 +1267,7 @@
     <string name="network_option_protocol_timeout_per_kb">KB あたりのプロトコル タイムアウト</string>
     <string name="group_members_can_send_files">グループメンバーはファイルやメディアを送信できます。</string>
     <string name="abort_switch_receiving_address">アドレス変更の中止</string>
-    <string name="files_are_prohibited_in_group">このグループでは、ファイルとメディアは禁止されています。</string>
+    <string name="files_are_prohibited_in_group">ファイルとメディアは禁止されています。</string>
     <string name="shutdown_alert_question">終了しますか？</string>
     <string name="shutdown_alert_desc">アプリを再起動するまで通知は機能しません。</string>
     <string name="v5_2_favourites_filter_descr">未読とお気に入りをフィルターします。</string>
@@ -1961,4 +1961,51 @@
     <string name="toolbar_settings">設定</string>
     <string name="servers_info_missing">情報がありません、リロードしてください</string>
     <string name="smp_server">SMPサーバ</string>
-</resources>
\ No newline at end of file
+    <string name="info_view_message_button">メッセージ</string>
+    <string name="operator_website">ウェブサイト</string>
+    <string name="info_view_video_button">ビデオ</string>
+    <string name="onboarding_network_operators_configure_via_settings">設定画面からサーバを構成できます。</string>
+    <string name="operator_open_changes">改定履歴を開く</string>
+    <string name="delete_chat_list_warning">全てのチャットが %s から削除され、リスト自体も削除されます</string>
+    <string name="appearance_app_toolbars">アプリのツールバー</string>
+    <string name="debug_logs">ログを有効化</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">メッセージ受信を10分毎に確認します</string>
+    <string name="onboarding_notifications_mode_service_desc_short">バックグラウンドでアプリが常時動作します</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX ChatとFluxは、Fluxが運営するサーバをアプリに組み込むことに合意しました。</string>
+    <string name="operator_review_conditions">利用条件をレビュー</string>
+    <string name="network_preset_servers_title">プリセットサーバ</string>
+    <string name="operator_conditions_accepted">利用条件を承諾</string>
+    <string name="appearance_in_app_bars_alpha">透過度</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[オペレータ <b>%s</b> の利用条件が受け入れられます。]]></string>
+    <string name="new_message">新しいメッセージ</string>
+    <string name="settings_section_title_message_shape">メッセージの形</string>
+    <string name="save_list">リストを保存</string>
+    <string name="delete_chat_list_menu_action">削除</string>
+    <string name="list_name_field_placeholder">リスト名...</string>
+    <string name="edit_chat_list_menu_action">編集</string>
+    <string name="delete_chat_list_question">リストを削除しますか？</string>
+    <string name="operator_conditions_of_use">利用条件</string>
+    <string name="onboarding_network_operators_continue">続ける</string>
+    <string name="create_list">リストを作成</string>
+    <string name="onboarding_choose_server_operators">サーバオペレータ</string>
+    <string name="operator_open_conditions">利用条件を開く</string>
+    <string name="onboarding_notifications_mode_off_desc_short">バックグラウンドサービスを使用しない</string>
+    <string name="accept_conditions">利用条件の承諾</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Conditions are already accepted for following operator(s):既にオペレータ <b>%s</b> の利用条件に承諾しています。]]></string>
+    <string name="address_creation_instruction">後で作成する場合はメニューから「SimpleXのアドレスを作成」を選択してください。</string>
+    <string name="onboarding_network_about_operators">運営者について</string>
+    <string name="chat_item_ttl_year">1年</string>
+    <string name="group_reports_active_one">1 件のレポート</string>
+    <string name="enable_sending_member_reports">モデレーターにメッセージを報告することを許可する</string>
+    <string name="block_members_desc">これらのメンバーからの新しいメッセージはすべて非表示になります!</string>
+    <string name="add_to_list">リストに追加</string>
+    <string name="address_settings">アドレス設定</string>
+    <string name="add_your_team_members_to_conversations">チームのメンバーを会話に追加する</string>
+    <string name="operator_added_message_servers">追加されたメッセージサーバー</string>
+    <string name="address_or_1_time_link">アドレスか使い捨てのリンク?</string>
+    <string name="button_add_friends">友達を追加</string>
+    <string name="button_add_team_members">チームメンバーを追加</string>
+    <string name="chat_list_add_list">リストを追加</string>
+    <string name="chat_list_all">すべて</string>
+    <string name="create_1_time_link">ワンタイムリンクを生成</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ko/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ko/strings.xml
index bf07c10a6f..651d32518f 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ko/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ko/strings.xml
@@ -281,7 +281,7 @@
     <string name="total_files_count_and_size">%d 개의 파일 총 크기 %s</string>
     <string name="conn_level_desc_direct">다이렉트</string>
     <string name="disappearing_prohibited_in_this_chat">이 채팅에서는 사라지는 메시지를 사용할 수 없습니다.</string>
-    <string name="disappearing_messages_are_prohibited">이 그룹에서는 사라지는 메시지를 사용할 수 없습니다.</string>
+    <string name="disappearing_messages_are_prohibited">사라지는 메시지를 사용할 수 없습니다.</string>
     <string name="ttl_m">%d분</string>
     <string name="ttl_months">%d 개월</string>
     <string name="ttl_min">%d 분</string>
@@ -966,7 +966,7 @@
     <string name="servers_info_subscriptions_connections_subscribed">활성 연결</string>
     <string name="all_users">모든 프로필</string>
     <string name="migrate_to_device_apply_onion">적용</string>
-    <string name="clear_note_folder_warning">모든 메시지가 삭제됩니다. 이 결정은 취소할 수 없습니다!</string>
+    <string name="clear_note_folder_warning">모든 메시지가 삭제됩니다. 이 결정은 되돌릴 수 없습니다!</string>
     <string name="allow_to_send_files">파일 및 미디어 전송을 허용합니다.</string>
     <string name="connect__a_new_random_profile_will_be_shared">새로운 무작위 프로필이 공유됩니다.</string>
     <string name="chat_theme_apply_to_all_modes">모든 색상 모드</string>
@@ -1444,10 +1444,10 @@
     <string name="operator_conditions_accepted_for_some"><![CDATA[다음 운영자(들)의 이용 약관이 이미 수락되었습니다: <b>%s</b>.]]></string>
     <string name="remote_host_error_busy"><![CDATA[모바일 <b>%s</b> 이 현재 사용 중]]></string>
     <string name="operators_conditions_will_also_apply"><![CDATA[이러한 약관은 다음에도 적용됩니다: <b>%s</b>.]]></string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[개인 정보를 보호하기 위해 앱에서는 푸시 알림 대신 <b>SimpleX 백그라운드 서비스</b>를 제공합니다. - 이 기능은 하루에 몇 퍼센트의 배터리를 소모합니다.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[To improve privacy, <b>개인 정보를 보호하기 위해 SimpleX는 푸시 알림을 사용하는 대신 백그라운드</b>에서 실행됩니다.]]></string>
     <string name="operator_in_order_to_use_accept_conditions"><![CDATA[<b>%s</b> 의 서버를 사용하려면 사용 약관에 동의하십시오.]]></string>
     <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[이미 <b>%1$s</b> 에 연결 중입니다.]]></string>
-    <string name="turn_off_battery_optimization"><![CDATA[SimpleX가 <b>SimpleX의 백그라운드에서 실행되도록</b> 허용하십시오. 그렇지 않으면 알림을 사용할 수 없습니다.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[다음 대화 상자에서 <b>허용</b>을 선택하면 알림을 즉시 받을 수 있습니다.]]></string>
     <string name="system_restricted_background_warn"><![CDATA[알림을 활성화하려면 <b>앱 설정에서 앱 배터리 사용량</b> / <b>제한 없음</b> 을 선택하십시오.]]></string>
     <string name="remote_host_error_inactive"><![CDATA[모바일 <b>%s</b> 이 현재 비활성화됨]]></string>
     <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[<font color="#0088ff">SimpleX Chat 개발자에게 연결하여 질문하고 업데이트를 받을 수 있습니다</font>.]]></string>
@@ -1457,4 +1457,69 @@
     <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[이미 <b>%1$s</b> 그룹에 가입하는 중 입니다.]]></string>
     <string name="remote_host_error_bad_version"><![CDATA[모바일 <b>%s</b> 버전이 지원되지 않습니다. 두 기기에서 동일한 버전을 사용하는지 확인하십시오.]]></string>
     <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[이미 <b>%1$s</b> 그룹에 속해 있습니다.]]></string>
-</resources>
\ No newline at end of file
+    <string name="error_accepting_operator_conditions">약관을 수락하는 중 오류 발생</string>
+    <string name="connection_security">연결 보안</string>
+    <string name="debug_logs">로그 활성화</string>
+    <string name="business_address">비즈니스 주소</string>
+    <string name="create_1_time_link">일회용 링크 생성</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">10분마다 메시지 확인</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">%s:에서 활성화된 운영자에 대한 약관이 자동으로 수락됩니다.</string>
+    <string name="operator_conditions_failed_to_load">현재 약관 텍스트를 로드할 수 없습니다, 다음 링크를 통해 약관을 검토할 수 있습니다:</string>
+    <string name="operator_conditions_of_use">사용 약관</string>
+    <string name="v6_2_network_decentralization_enable_flux">Flux 활성화</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[모든 메시지와 파일은 쪽지에서 포스트 퀀텀 보안을 사용하여 <b>종단 간 암호화</b>로 전송됩니다.]]></string>
+    <string name="onboarding_notifications_mode_service_desc_short">앱이 항상 백그라운드에서 실행</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">활성화된 운영자에 대한 약관은 30일 후에 수락됩니다.</string>
+    <string name="button_add_team_members">팀 멤버 추가하기</string>
+    <string name="button_add_friends">친구 추가</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">모든 멤버에게서 채팅이 삭제됩니다 - 이 결정은 되돌릴 수 없습니다!</string>
+    <string name="button_delete_chat">채팅 삭제</string>
+    <string name="delete_chat_question">채팅을 삭제하시겠습니까?</string>
+    <string name="info_row_chat">채팅</string>
+    <string name="error_adding_server">서버 추가 중 오류</string>
+    <string name="direct_messages_are_prohibited">멤버 간의 다이렉트 메시지는 금지됩니다.</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi 기기</b>: 알림이 작동하려면 시스템 설정에서 자동 시작을 사용하도록 설정하세요.]]></string>
+    <string name="direct_messages_are_prohibited_in_chat">이 채팅에서는 멤버 간의 다이렉트 메시지가 금지됩니다.</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">당신에게서 채팅이 삭제됩니다 - 이 결정은 되돌릴 수 없습니다!</string>
+    <string name="operator_conditions_will_be_accepted_on">%s:에서 약관이 수락됩니다.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[당신은 이미 <b>%1$s</b>에 연결되어 있습니다.]]></string>
+    <string name="connect_plan_chat_already_exists">채팅이 이미 존재합니다!</string>
+    <string name="onboarding_network_operators_continue">계속</string>
+    <string name="display_name_accepted_invitation">수락된 초대</string>
+    <string name="v6_2_business_chats">비즈니스 채팅</string>
+    <string name="onboarding_network_about_operators">운영자 소개</string>
+    <string name="sync_connection_desc">연결에 암호화 재협상이 필요합니다.</string>
+    <string name="encryption_renegotiation_in_progress">암호화 재협상이 진행 중입니다.</string>
+    <string name="add_your_team_members_to_conversations">팀 멤버를 대화에 추가하세요.</string>
+    <string name="report_reason_other">다른 이유</string>
+    <string name="archive_verb">보관</string>
+    <string name="group_reports_active_one">1 보고서</string>
+    <string name="chat_list_add_list">리스트 추가</string>
+    <string name="chat_list_all">전부</string>
+    <string name="delete_chat_list_warning">목록 %s의 모든 차트가 제거되었고, 목록도 삭제되었습니다.</string>
+    <string name="chat_item_ttl_year">1 년</string>
+    <string name="add_to_list">리스트에 추가하기</string>
+    <string name="report_item_archived">보관된 보고서</string>
+    <string name="report_item_archived_by">보관된 신고: %s</string>
+    <string name="report_reason_community">커뮤니티 가이드라인 위반</string>
+    <string name="report_archive_alert_title">신고를 보관하시겠습니까?</string>
+    <string name="archive_report">신고 보관</string>
+    <string name="chat_list_contacts">연락처</string>
+    <string name="connection_error_blocked">연결이 차단되었습니다</string>
+    <string name="connection_error_blocked_desc">연결이 서버 운영자에 의해 차단되었습니다:\n%1$s</string>
+    <string name="chat_list_businesses">비즈니스</string>
+    <string name="change_order_chat_list_menu_action">순서 변경</string>
+    <string name="privacy_chat_list_open_links_ask">문의</string>
+    <string name="connection_not_ready">연결이 준비되지 않았습니다.</string>
+    <string name="change_automatic_deletion_question">자동 메시지 삭제를 변경하시겠습니까?</string>
+    <string name="v6_3_better_groups_performance">그룹 성능 향상</string>
+    <string name="report_archive_alert_desc_all">모든 신고가 보관됩니다.</string>
+    <string name="report_archive_alert_title_all">모든 신고를 보관하시겠습니까?</string>
+    <string name="archive_reports">신고 보관</string>
+    <string name="change_list">목록 변경</string>
+    <string name="enable_sending_member_reports">메시지를 운영자에게 신고할 수 있도록 허용합니다.</string>
+    <string name="v6_3_better_privacy_and_security">더 나은 개인정보 보호 및 보안</string>
+    <string name="report_archive_alert_title_nth">신고 %d건을 보관하시겠습니까?</string>
+    <string name="failed_to_create_user_invalid_desc">이 표시 이름은 유효하지 않습니다. 다른 이름을 선택하세요.</string>
+    <string name="remote_ctrl_error_timeout">데스크톱에 연결하는 동안 시간 초과되었습니다</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/lt/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/lt/strings.xml
index fbad2dc4e9..adf66650f1 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/lt/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/lt/strings.xml
@@ -1774,4 +1774,4 @@
     <string name="forward_files_in_progress_desc">%1$d failas (-ai, -ų) vis dar atsisiunčiamas (-i, -a).</string>
     <string name="forward_files_failed_to_receive_desc">Nepavyko atsisiųsti %1$d failo (-ų).</string>
     <string name="selected_chat_items_selected_n">%d pasirinkta</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
index ced3b9a3b0..d07cb6db39 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
@@ -445,7 +445,7 @@
     <string name="messages_section_title">Berichten</string>
     <string name="new_passphrase">Nieuw wachtwoord…</string>
     <string name="keychain_error">Keychain fout</string>
-    <string name="join_group_button">Word lid van</string>
+    <string name="join_group_button">Word lid</string>
     <string name="leave_group_question">Groep verlaten\?</string>
     <string name="new_member_role">Nieuwe leden rol</string>
     <string name="no_contacts_to_add">Geen contacten om toe te voegen</string>
@@ -694,7 +694,7 @@
     <string name="smp_servers_test_server">Server test</string>
     <string name="rate_the_app">Beoordeel de app</string>
     <string name="smp_servers_use_server">Gebruik server</string>
-    <string name="using_simplex_chat_servers">Gebruik van SimpleX Chat servers.</string>
+    <string name="using_simplex_chat_servers">Gebruik SimpleX Chat servers.</string>
     <string name="smp_servers_your_server_address">Uw server adres</string>
     <string name="smp_servers_your_server">Uw server</string>
     <string name="network_session_mode_transport_isolation">Transport isolation</string>
@@ -854,7 +854,7 @@
     <string name="v4_3_irreversible_message_deletion_desc">Uw contacten kunnen volledige verwijdering van berichten toestaan.</string>
     <string name="you_have_to_enter_passphrase_every_time">U moet elke keer dat de app start het wachtwoord invoeren, deze wordt niet op het apparaat opgeslagen.</string>
     <string name="wrong_passphrase">Verkeerd wachtwoord voor de database</string>
-    <string name="save_passphrase_and_open_chat">Bewaar het wachtwoord en open je chats</string>
+    <string name="save_passphrase_and_open_chat">Wachtwoord opslaan en open je chats</string>
     <string name="database_backup_can_be_restored">De poging om het wachtwoord van de database te wijzigen is niet voltooid.</string>
     <string name="restore_database">Database back-up terugzetten</string>
     <string name="restore_database_alert_title">Database back-up terugzetten\?</string>
@@ -1047,7 +1047,7 @@
     <string name="you_can_turn_on_lock">Je kunt SimpleX Vergrendeling aanzetten via Instellingen.</string>
     <string name="enable_lock">Vergrendeling inschakelen</string>
     <string name="lock_mode">Vergrendeling modus</string>
-    <string name="submit_passcode">Indienen</string>
+    <string name="submit_passcode">Bevestigen</string>
     <string name="authentication_cancelled">Verificatie geannuleerd</string>
     <string name="change_lock_mode">Wijzig de vergrendelings modus</string>
     <string name="confirm_passcode">Bevestig toegangscode</string>
@@ -1059,7 +1059,7 @@
     <string name="passcode_set">Toegangscode ingesteld!</string>
     <string name="la_mode_system">Systeem</string>
     <string name="decryption_error">Decodering fout</string>
-    <string name="alert_text_msg_bad_hash">De hash van het vorige bericht is anders.</string>
+    <string name="alert_text_msg_bad_hash">De hash van het vorige bericht is anders.\"</string>
     <string name="alert_text_decryption_error_too_many_skipped">%1$d berichten overgeslagen.</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">Het kan gebeuren wanneer u of de ander een oude database back-up gebruikt.</string>
     <string name="alert_text_fragment_please_report_to_developers">Meld het alsjeblieft aan de ontwikkelaars.</string>
@@ -1448,7 +1448,7 @@
     <string name="linked_mobiles">Gekoppelde mobiele apparaten</string>
     <string name="desktop_device">Desktop</string>
     <string name="connected_to_desktop">Verbonden met desktop</string>
-    <string name="this_device_name">Deze apparaatnaam</string>
+    <string name="this_device_name">Naam van dit apparaat</string>
     <string name="loading_remote_file_title">Het bestand laden</string>
     <string name="connecting_to_desktop">Verbinding maken met desktop</string>
     <string name="desktop_devices">Desktop apparaten</string>
@@ -1596,14 +1596,14 @@
     <string name="profile_update_event_removed_address">contactadres verwijderd</string>
     <string name="profile_update_event_removed_picture">profielfoto verwijderd</string>
     <string name="profile_update_event_set_new_address">nieuw contactadres instellen</string>
-    <string name="profile_update_event_set_new_picture">nieuwe profielfoto instellen</string>
+    <string name="profile_update_event_set_new_picture">nieuwe profielfoto</string>
     <string name="member_blocked_by_admin">Geblokkeerd door beheerder</string>
     <string name="block_for_all">Blokkeren voor iedereen</string>
     <string name="block_for_all_question">Lid voor iedereen blokkeren?</string>
     <string name="unblock_for_all">Deblokkeer voor iedereen</string>
     <string name="member_info_member_blocked">geblokkeerd</string>
     <string name="blocked_by_admin_item_description">geblokkeerd door beheerder</string>
-    <string name="rcv_group_event_member_blocked">%s geblokkeerd</string>
+    <string name="rcv_group_event_member_blocked">blokkeerde %s</string>
     <string name="blocked_by_admin_items_description">%d berichten geblokkeerd door beheerder</string>
     <string name="rcv_group_event_member_unblocked">%s gedeblokkeerd</string>
     <string name="error_blocking_member_for_all">Fout bij blokkeren van lid voor iedereen</string>
@@ -1832,7 +1832,7 @@
     <string name="color_mode_system">Systeem</string>
     <string name="color_wallpaper_background">Wallpaper achtergrond</string>
     <string name="chat_theme_set_default_theme">Stel het standaard thema in</string>
-    <string name="chat_list_always_visible">Toon chatlijst in nieuw venster</string>
+    <string name="chat_list_always_visible">Toon chat-lijst in nieuw venster</string>
     <string name="message_queue_info_none">geen</string>
     <string name="info_row_debug_delivery">Foutopsporing bezorging</string>
     <string name="message_queue_info">Informatie over berichtenwachtrij</string>
@@ -1872,8 +1872,7 @@
     <string name="servers_info_details">Details</string>
     <string name="servers_info_messages_received">Berichten ontvangen</string>
     <string name="servers_info_subscriptions_section_header">Bericht ontvangst</string>
-    <string name="servers_info_private_data_disclaimer">Beginnend vanaf %s.
-\nAlle gegevens zijn privé op uw apparaat.</string>
+    <string name="servers_info_private_data_disclaimer">Vanaf %s.\nAlle gegevens blijven privé op uw apparaat.</string>
     <string name="servers_info_connected_servers_section_header">Verbonden servers</string>
     <string name="servers_info_subscriptions_connections_pending">In behandeling</string>
     <string name="servers_info_previously_connected_servers_section_header">Eerder verbonden servers</string>
@@ -2040,11 +2039,11 @@
     <string name="v6_0_delete_many_messages_descr">Verwijder maximaal 20 berichten tegelijk.</string>
     <string name="chat_database_exported_not_all_files">Sommige bestanden zijn niet geëxporteerd</string>
     <string name="reset_all_hints">Alle hints resetten</string>
-    <string name="one_hand_ui_card_title">Chatlijst wisselen:</string>
+    <string name="one_hand_ui_card_title">Chat-lijst wisselen:</string>
     <string name="one_hand_ui_change_instruction">U kunt dit wijzigen in de instellingen onder uiterlijk</string>
     <string name="create_address_button">Creëren</string>
     <string name="v6_0_privacy_blur">Vervagen voor betere privacy.</string>
-    <string name="v6_0_chat_list_media">Afspelen via de chatlijst.</string>
+    <string name="v6_0_chat_list_media">Afspelen via de chat-lijst.</string>
     <string name="v6_0_upgrade_app_descr">Download nieuwe versies van GitHub.</string>
     <string name="v6_0_increase_font_size">Vergroot het lettertype.</string>
     <string name="v6_0_upgrade_app">App automatisch upgraden</string>
@@ -2184,7 +2183,7 @@
     <string name="v6_2_network_decentralization">Netwerk decentralisatie</string>
     <string name="v6_2_network_decentralization_descr">De tweede vooraf ingestelde operator in de app!</string>
     <string name="onboarding_network_operators_app_will_use_for_routing">Als uw contactpersoon bijvoorbeeld berichten ontvangt via een SimpleX Chat-server, worden deze door uw app via een Flux-server verzonden.</string>
-    <string name="v6_2_network_decentralization_enable_flux">Flux inschakelen</string>
+    <string name="v6_2_network_decentralization_enable_flux">Schakel Flux in bij Netwerk- en serverinstellingen voor betere privacy van metagegevens.</string>
     <string name="message_deleted_or_not_received_error_title">Geen bericht</string>
     <string name="appearance_app_toolbars">App-werkbalken</string>
     <string name="appearance_bars_blur_radius">Vervagen</string>
@@ -2244,7 +2243,145 @@
     <string name="maximum_message_size_reached_non_text">Verklein de berichtgrootte of verwijder de media en verzend het bericht opnieuw.</string>
     <string name="display_name_accepted_invitation">geaccepteerde uitnodiging</string>
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Wanneer er meer dan één operator is ingeschakeld, beschikt geen enkele operator over metagegevens om te achterhalen wie met wie communiceert.</string>
-    <string name="display_name_requested_to_connect">gevraagd om verbinding te maken</string>
+    <string name="display_name_requested_to_connect">verzocht om verbinding te maken</string>
     <string name="onboarding_network_about_operators">Over operatoren</string>
     <string name="onboarding_network_operators_simplex_flux_agreement">Simplex-chat en flux hebben een overeenkomst gemaakt om door flux geëxploiteerde servers in de app op te nemen.</string>
-</resources>
\ No newline at end of file
+    <string name="debug_logs">Logs inschakelen</string>
+    <string name="error_saving_database">Fout bij het opslaan van de database</string>
+    <string name="sync_connection_desc">Verbinding vereist heronderhandeling over encryptie.</string>
+    <string name="encryption_renegotiation_in_progress">Er wordt opnieuw onderhandeld over de encryptie.</string>
+    <string name="sync_connection_question">Verbinding herstellen?</string>
+    <string name="sync_connection_confirm">Herstel</string>
+    <string name="connection_not_ready">Verbinding nog niet klaar</string>
+    <string name="error_updating_chat_tags">Fout bij het bijwerken van de chat-lijst</string>
+    <string name="no_chats_in_list">Geen chats in lijst %s.</string>
+    <string name="chat_list_favorites">Favorieten</string>
+    <string name="chat_list_groups">Groepen</string>
+    <string name="no_chats">Geen chats</string>
+    <string name="no_chats_found">Geen chats gevonden</string>
+    <string name="chat_list_add_list">Lijst toevoegen</string>
+    <string name="chat_list_all">alle</string>
+    <string name="open_with_app">Openen met %s</string>
+    <string name="create_list">Maak een lijst</string>
+    <string name="delete_chat_list_menu_action">Verwijderen</string>
+    <string name="delete_chat_list_question">Lijst verwijderen?</string>
+    <string name="edit_chat_list_menu_action">Bewerk</string>
+    <string name="list_name_field_placeholder">Naam van lijst...</string>
+    <string name="duplicated_list_error">De naam en emoji van de lijst moeten voor alle lijsten verschillend zijn.</string>
+    <string name="save_list">Lijst opslaan</string>
+    <string name="list_menu">Lijst</string>
+    <string name="error_loading_chat_tags">Fout bij het laden van chat-lijsten</string>
+    <string name="delete_chat_list_warning">Alle chats worden verwijderd uit de lijst %s, en de lijst wordt verwijderd</string>
+    <string name="add_to_list">Toevoegen aan lijst</string>
+    <string name="chat_list_businesses">bedrijven</string>
+    <string name="chat_list_contacts">Contacten</string>
+    <string name="error_creating_chat_tags">Fout bij het aanmaken van chat-lijst</string>
+    <string name="no_unread_chats">Geen ongelezen chats</string>
+    <string name="chat_list_notes">Notities</string>
+    <string name="change_list">Lijst wijzigen</string>
+    <string name="change_order_chat_list_menu_action">Wijzig volgorde</string>
+    <string name="prefs_error_saving_settings">‐Fout bij het opslaan van instellingen</string>
+    <string name="error_creating_report">Fout bij het rapporteren</string>
+    <string name="archive_verb">Archief</string>
+    <string name="report_reason_community">Schending van de communityrichtlijnen</string>
+    <string name="report_reason_other">Een andere reden</string>
+    <string name="report_compose_reason_header_profile">Rapporteer ledenprofiel: alleen groepsmoderators kunnen dit zien.</string>
+    <string name="group_member_role_moderator">moderator</string>
+    <string name="report_compose_reason_header_illegal">Inhoud melden: alleen groepsmoderators kunnen dit zien.</string>
+    <string name="report_item_archived">gearchiveerd rapport</string>
+    <string name="report_reason_illegal">Ongepaste inhoud</string>
+    <string name="report_reason_profile">Ongepast profiel</string>
+    <string name="report_item_visibility_moderators">Alleen de verzender en moderators zien het</string>
+    <string name="report_item_visibility_submitter">Alleen jij en moderators zien het</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="report_archive_alert_title">Rapport archiveren?</string>
+    <string name="report_verb">rapporteren</string>
+    <string name="report_reason_alert_title">Reden melding?</string>
+    <string name="report_archive_alert_desc">Het rapport wordt voor u gearchiveerd.</string>
+    <string name="report_compose_reason_header_other">Anders melden: alleen groepsmoderators kunnen het zien.</string>
+    <string name="report_compose_reason_header_spam">Spam melden: alleen groepsmoderators kunnen het zien.</string>
+    <string name="report_compose_reason_header_community">Rapporteer overtreding: alleen groepsmoderators kunnen dit zien.</string>
+    <string name="archive_report">Rapport archiveren</string>
+    <string name="delete_report">Rapport verwijderen</string>
+    <string name="report_item_archived_by">gearchiveerd rapport door %s</string>
+    <string name="group_reports_active_one">1 rapport</string>
+    <string name="group_reports_active">%d rapporten</string>
+    <string name="group_reports_member_reports">Ledenrapporten</string>
+    <string name="blocking_reason_content">Inhoud schendt de gebruiksvoorwaarden</string>
+    <string name="connection_error_blocked">Verbinding geblokkeerd</string>
+    <string name="connection_error_blocked_desc">Verbinding is geblokkeerd door serveroperator:\n%1$s.</string>
+    <string name="file_error_blocked">Bestand is geblokkeerd door server operator:\n%1$s.</string>
+    <string name="privacy_chat_list_open_links_no">Nee</string>
+    <string name="privacy_chat_list_open_web_link">Link openen</string>
+    <string name="privacy_chat_list_open_links">Open links vIn de chat-lijst</string>
+    <string name="privacy_chat_list_open_links_ask">Vragen</string>
+    <string name="chat_list_group_reports">Rapporten</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="privacy_chat_list_open_web_link_question">Weblink openen?</string>
+    <string name="privacy_chat_list_open_links_yes">Ja</string>
+    <string name="text_field_set_chat_placeholder">Stel chatnaam in</string>
+    <string name="change_automatic_deletion_question">Automatisch verwijderen van berichten wijzigen?</string>
+    <string name="chat_item_ttl_year">1 jaar</string>
+    <string name="disable_automatic_deletion_message">Berichten in deze chat zullen nooit worden verwijderd.</string>
+    <string name="change_automatic_chat_deletion_message">Deze actie kan niet ongedaan worden gemaakt. De berichten die eerder in deze chat zijn verzonden en ontvangen dan geselecteerd, worden verwijderd.</string>
+    <string name="disable_automatic_deletion_question">Automatisch verwijderen van berichten uitschakelen?</string>
+    <string name="chat_ttl_options_footer">Verwijder chatberichten van uw apparaat.</string>
+    <string name="disable_automatic_deletion">Berichten verwijderen uitschakelen</string>
+    <string name="chat_item_ttl_default">standaard (%s)</string>
+    <string name="network_smp_web_port_section_title">TCP-poort voor berichtenuitwisseling</string>
+    <string name="network_smp_web_port_toggle">Gebruik een webpoort</string>
+    <string name="network_smp_web_port_footer">Gebruik TCP-poort %1$s wanneer er geen poort is opgegeven.</string>
+    <string name="mute_all_chat">Alles dempen</string>
+    <string name="unread_mentions">Ongelezen vermeldingen</string>
+    <string name="max_group_mentions_per_message_reached">Je kunt maximaal %1$s leden per bericht vermelden!</string>
+    <string name="enable_sending_member_reports">Hiermee kunt u berichten rapporteren aan moderators.</string>
+    <string name="report_archive_alert_desc_all">Alle rapporten worden voor u gearchiveerd.</string>
+    <string name="report_archive_alert_title_all">Alle rapporten archiveren?</string>
+    <string name="report_archive_alert_title_nth">%d rapporten archiveren?</string>
+    <string name="report_archive_for_me">Voor mij</string>
+    <string name="group_members_can_send_reports">Leden kunnen berichten melden bij moderators.</string>
+    <string name="member_reports_are_prohibited">Het melden van berichten in deze groep is niet toegestaan</string>
+    <string name="notification_group_report">Rapporteer: %s</string>
+    <string name="disable_sending_member_reports">Het melden van berichten aan moderators is niet toegestaan.</string>
+    <string name="report_archive_for_all_moderators">Voor alle moderators</string>
+    <string name="archive_reports">Rapporten archiveren</string>
+    <string name="v6_3_better_groups_performance">Betere prestaties van groepen</string>
+    <string name="v6_3_set_message_expiration_in_chats">Stel de berichtvervaldatum in chats in.</string>
+    <string name="v6_3_better_privacy_and_security">Betere privacy en veiligheid</string>
+    <string name="v6_3_organize_chat_lists_descr">Mis geen belangrijke berichten.</string>
+    <string name="v6_3_faster_deletion_of_groups">Sneller verwijderen van groepen.</string>
+    <string name="v6_3_mentions_descr">Ontvang een melding als u vermeld wordt.</string>
+    <string name="v6_3_reports_descr">Help beheerders bij het modereren van hun groepen.</string>
+    <string name="v6_3_mentions">Vermeld leden 👋</string>
+    <string name="v6_3_organize_chat_lists">Organiseer chats in lijsten</string>
+    <string name="v6_3_private_media_file_names">Namen van persoonlijke mediabestanden.</string>
+    <string name="v6_3_reports">Rapporteer privé</string>
+    <string name="v6_3_faster_sending_messages">Sneller verzenden van berichten.</string>
+    <string name="group_preview_rejected">afgewezen</string>
+    <string name="group_member_status_rejected">afgewezen</string>
+    <string name="error_reading_passphrase">Fout bij het lezen van database wachtwoord</string>
+    <string name="block_members_desc">Alle nieuwe berichten van deze leden worden verborgen!</string>
+    <string name="block_members_for_all_question">Leden voor iedereen blokkeren?</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Leden worden uit de chat verwijderd. Dit kan niet ongedaan worden gemaakt!</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Leden worden uit de groep verwijderd. Dit kan niet ongedaan worden gemaakt!</string>
+    <string name="unblock_members_for_all_question">Leden voor iedereen deblokkeren?</string>
+    <string name="unblock_members_desc">Berichten van deze leden worden getoond!</string>
+    <string name="feature_roles_moderators">moderatoren</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Wachtwoord in Keystore kan niet worden gelezen, voer deze handmatig in. Dit kan zijn gebeurd na een systeemupdate die niet compatibel is met de app. Als dit niet het geval is, neem dan contact op met de ontwikkelaars.</string>
+    <string name="group_member_status_pending_approval">in afwachting van goedkeuring</string>
+    <string name="button_remove_members_question">Leden verwijderen?</string>
+    <string name="operator_updated_conditions">Bijgewerkte voorwaarden</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Wachtwoord in Keystore kan niet worden gelezen. Dit kan zijn gebeurd na een systeemupdate die niet compatibel is met de app. Als dit niet het geval is, neem dan contact op met de ontwikkelaars.</string>
+    <string name="group_member_status_pending_approval_short">in behandeling</string>
+    <string name="onboarding_conditions_accept">Accepteer</string>
+    <string name="onboarding_conditions_by_using_you_agree">Door SimpleX Chat te gebruiken, gaat u ermee akkoord:\n- alleen legale content te versturen in openbare groepen.\n- andere gebruikers te respecteren – geen spam.</string>
+    <string name="simplex_link_channel">SimpleX channel link</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Voor deze link is een nieuwere app-versie vereist. Werk de app bij of vraag je contactpersoon om een compatibele link te sturen.</string>
+    <string name="full_link_button_text">Volledige link</string>
+    <string name="unsupported_connection_link">Niet-ondersteunde verbindingslink</string>
+    <string name="privacy_short_links">Gebruik korte links (BETA)</string>
+    <string name="short_link_button_text">Korte link</string>
+    <string name="onboarding_conditions_configure_server_operators">Serveroperators configureren</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Privacybeleid en gebruiksvoorwaarden.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Privéchats, groepen en uw contacten zijn niet toegankelijk voor serverbeheerders.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml
index a748bf2741..5102c98563 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml
@@ -277,7 +277,7 @@
     <string name="scan_code_from_contacts_app">Zeskanuj kod bezpieczeństwa z aplikacji Twojego kontaktu.</string>
     <string name="security_code">Kod bezpieczeństwa</string>
     <string name="icon_descr_settings">Ustawienia</string>
-    <string name="share_invitation_link">Udostępnij 1-razowy link</string>
+    <string name="share_invitation_link">Udostępnij link jednorazowy</string>
     <string name="show_QR_code">Pokaż kod QR</string>
     <string name="is_verified">%s jest zweryfikowany</string>
     <string name="this_QR_code_is_not_a_link">Ten kod QR nie jest linkiem!</string>
@@ -418,7 +418,7 @@
     <string name="callstatus_rejected">odrzucone połączenie</string>
     <string name="secret_text">sekret</string>
     <string name="callstate_starting">uruchamianie…</string>
-    <string name="strikethrough_text">strajk</string>
+    <string name="strikethrough_text">przekreślenie</string>
     <string name="first_platform_without_user_ids">Brak identyfikatorów użytkownika.</string>
     <string name="next_generation_of_private_messaging">Następna generacja \nprywatnych wiadomości</string>
     <string name="callstate_waiting_for_answer">oczekiwanie na odpowiedź…</string>
@@ -1129,9 +1129,9 @@
     <string name="group_welcome_preview">Podgląd</string>
     <string name="opening_database">Otwieranie bazy danych…</string>
     <string name="error_setting_address">Błąd ustawiania adresu</string>
-    <string name="auth_open_chat_profiles">Otwórz profile czatu</string>
+    <string name="auth_open_chat_profiles">Zmień profile czatu</string>
     <string name="learn_more_about_address">O adresie SimpleX</string>
-    <string name="one_time_link_short">1-razowy link</string>
+    <string name="one_time_link_short">link jednorazowy</string>
     <string name="read_more_in_user_guide_with_link"><![CDATA[Przeczytaj więcej w <font color="#0088ff">Podręczniku Użytkownika</font>.]]></string>
     <string name="simplex_address">Adres SimpleX</string>
     <string name="you_can_accept_or_reject_connection">Kiedy ludzie proszą o połączenie, możesz je zaakceptować lub odrzucić.</string>
@@ -1373,9 +1373,7 @@
     <string name="v5_3_new_interface_languages_descr">Arabski, bułgarski, fiński, hebrajski, tajski i ukraiński - dzięki użytkownikom i Weblate.</string>
     <string name="v5_3_new_desktop_app_descr">Utwórz nowy profil w aplikacji desktopowej. 💻</string>
     <string name="v5_3_simpler_incognito_mode_descr">Przełącz incognito przy połączeniu.</string>
-    <string name="v5_3_discover_join_groups_descr">- połącz się z usługą katalogową (BETA)!
-\n- potwierdzenia dostaw (do 20 członków).
-\n- szybszy i stabilniejszy.</string>
+    <string name="v5_3_discover_join_groups_descr">- połącz się z usługą katalogową (BETA)!\n- potwierdzenia dostaw (do 20 członków).\n- szybszy i stabilniejszy.</string>
     <string name="rcv_group_event_open_chat">Otwórz</string>
     <string name="error_creating_member_contact">Błąd tworzenia kontaktu członka</string>
     <string name="compose_send_direct_message_to_connect">Wyślij wiadomość bezpośrednią aby połączyć</string>
@@ -1499,15 +1497,15 @@
     <string name="disconnect_desktop_question">Rozłączyć komputer?</string>
     <string name="loading_remote_file_desc">Proszę poczekać na załadowanie pliku z połączonego telefonu</string>
     <string name="verify_connection">Zweryfikuj połączenie</string>
-    <string name="refresh_qr_code">Odświerz</string>
+    <string name="refresh_qr_code">Odśwież</string>
     <string name="you_can_make_address_visible_via_settings">Możesz ustawić go jako widoczny dla swoich kontaktów SimpleX w Ustawieniach.</string>
     <string name="random_port">Losowy</string>
     <string name="error_showing_content">błąd wyświetlania zawartości</string>
     <string name="error_showing_message">błąd wyświetlania wiadomości</string>
-    <string name="open_port_in_firewall_desc">Aby umożliwić aplikacji mobilnej łączenie się z komputerem, otwórz ten port w zaporze sieciowej, jeśli jest ona włączona</string>
+    <string name="open_port_in_firewall_desc">Aby umożliwić aplikacji mobilnej połączenie z komputerem stacjonarnym, otwórz ten port w swojej zaporze sieciowej, jeśli jest włączona.</string>
     <string name="create_chat_profile">Utwórz profil czatu</string>
     <string name="app_was_crashed">Widok uległ awarii</string>
-    <string name="open_port_in_firewall_title">Otwórz port w zaporze</string>
+    <string name="open_port_in_firewall_title">Otwórz port w zaporze sieciowej</string>
     <string name="disconnect_remote_hosts">Rozłącz telefony</string>
     <string name="no_connected_mobile">Brak połączonych telefonów</string>
     <string name="recent_history_is_not_sent_to_new_members">Historia nie jest wysyłana do nowych członków.</string>
@@ -1523,7 +1521,7 @@
     <string name="enable_camera_access">Włącz dostęp do kamery</string>
     <string name="you_can_view_invitation_link_again">Możesz zobaczyć link zaproszenia ponownie w szczegółach połączenia.</string>
     <string name="keep_unused_invitation_question">Zachować nieużyte zaproszenie?</string>
-    <string name="share_this_1_time_link">Udostępnij ten jednorazowy link</string>
+    <string name="share_this_1_time_link">Udostępnij ten jednorazowy link zaproszenia</string>
     <string name="create_group_button_to_create_new_group"><![CDATA[<b>Utwórz grupę</b>: aby utworzyć nową grupę.]]></string>
     <string name="recent_history">Widoczna historia</string>
     <string name="la_app_passcode">Pin aplikacji</string>
@@ -1851,8 +1849,7 @@
     <string name="remote_ctrl_connection_stopped_identity_desc">Ten link dostał użyty z innym urządzeniem mobilnym, proszę stworzyć nowy link na komputerze.</string>
     <string name="file_error">Błąd pliku</string>
     <string name="file_error_relay">Błąd serwera plików: %1$s</string>
-    <string name="remote_ctrl_connection_stopped_desc">Sprawdź, czy telefon i komputer są podłączone do tej samej sieci lokalnej i czy zapora sieciowa komputera umożliwia połączenie.
-\nProszę podzielić się innymi problemami z deweloperami.</string>
+    <string name="remote_ctrl_connection_stopped_desc">Sprawdź, czy telefon i komputer są podłączone do tej samej sieci lokalnej i czy zapora sieciowa komputera umożliwia połączenie.\nProszę zgłoś wszystkie inne problemy deweloperom.</string>
     <string name="temporary_file_error">Tymczasowy błąd pliku</string>
     <string name="file_error_auth">Zły klucz lub nieznany adres fragmentu pliku - najprawdopodobniej plik został usunięty.</string>
     <string name="cannot_share_message_alert_title">Nie można wysłać wiadomości</string>
@@ -1932,8 +1929,7 @@
     <string name="servers_info_target">Wyświetlanie informacji dla</string>
     <string name="servers_info_statistics_section_header">Statystyki</string>
     <string name="servers_info_transport_sessions_section_header">Sesje transportowe</string>
-    <string name="servers_info_private_data_disclaimer">Zaczynanie od %s.
-\nWszystkie dane są prywatne na Twoim urządzeniu.</string>
+    <string name="servers_info_private_data_disclaimer">Zaczynanie od %s. \nWszystkie dane są prywatne na Twoim urządzeniu.</string>
     <string name="servers_info_reconnect_all_servers_button">Połącz ponownie wszystkie serwery</string>
     <string name="servers_info_reconnect_server_title">Połączyć ponownie serwer?</string>
     <string name="servers_info_proxied_servers_section_footer">Nie jesteś połączony z tymi serwerami. Prywatne trasowanie jest używane do dostarczania do nich wiadomości.</string>
@@ -2114,4 +2110,78 @@
     <string name="v6_1_delete_many_messages_descr">Usuń lub moderuj do 200 wiadomości.</string>
     <string name="v6_1_forward_many_messages_descr">Przekazywanie do 20 wiadomości jednocześnie.</string>
     <string name="v6_1_switch_chat_profile_descr">Przełącz profil czatu dla zaproszeń jednorazowych.</string>
-</resources>
\ No newline at end of file
+    <string name="create_1_time_link">Utwórz link jednorazowy</string>
+    <string name="share_1_time_link_with_a_friend">Udostępnij jednorazowy link znajomemu</string>
+    <string name="simplex_address_or_1_time_link">Adres SimpleX czy link jednorazowy?</string>
+    <string name="address_or_1_time_link">Adres lub link jednorazowy?</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Link jednorazowy może być użyty <i>tylko z jednym kontaktem</i> - udostępnij go osobiście lub przez dowolny komunikator.]]></string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Adres SimpleX i jednorazowe linki są bezpieczne do udostępniania przez dowolny komunikator.</string>
+    <string name="report_item_archived_by">raport zarchiwizowany przez %s</string>
+    <string name="report_reason_other">Inny powód</string>
+    <string name="archive_report">Zarchiwizuj raport</string>
+    <string name="address_settings">Ustawienia adresowe</string>
+    <string name="onboarding_network_about_operators">O operatorach</string>
+    <string name="business_address">Adres służbowy</string>
+    <string name="operator_conditions_accepted">Zaakceptowane warunki</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Warunki będą akceptowane dla operatora(ów): <b>%s</b>.]]></string>
+    <string name="operator_added_message_servers">Dodane serwery wiadomości</string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Te same warunki będą miały zastosowanie do operatora(ów): <b>%s</b>.]]></string>
+    <string name="report_archive_alert_title">Zarchiwizować raport?</string>
+    <string name="archive_verb">Archiwum</string>
+    <string name="chat_list_all">Wszystkie</string>
+    <string name="chat_list_businesses">Biznesy</string>
+    <string name="group_reports_active_one">raport</string>
+    <string name="privacy_chat_list_open_links_ask">Zapytaj</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Warunki są już akceptowane dla następujących operatorów: <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Te same warunki będą miały zastosowanie do operatora <b>%s</b>.]]></string>
+    <string name="appearance_bars_blur_radius">Rozmyj</string>
+    <string name="add_your_team_members_to_conversations">Dodaj członków drużyny do konwersacji</string>
+    <string name="button_add_team_members">Dodaj członków drużyny</string>
+    <string name="v6_2_business_chats">Konwersacje służbowe</string>
+    <string name="chat_list_add_list">Dodaj listę</string>
+    <string name="add_to_list">Dodaj do listy</string>
+    <string name="delete_chat_list_warning">"Wszystkie konwersacje zostaną usunięte z list %s,  oraz  listy."</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Wszystkie wiadomości i pliki wysyłane są w postaci<b>zaszyfrowanej</b>, z post-kwantowym bezpieczeństwem w bezpośrednich wiadomościach.]]></string>
+    <string name="button_add_friends">Dodaj znajomych</string>
+    <string name="operator_added_xftp_servers">Dodane serwery plików i mediów</string>
+    <string name="appearance_app_toolbars">Paski narzędziowe aplikacji</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Aplikacja działa zawsze w tle</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Warunki będą akceptowane dla operatora(ów): <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Warunki te będą również miały zastosowanie do: <b>%s</b>.]]></string>
+    <string name="operators_conditions_accepted_for"><![CDATA[Warunki są akceptowane dla operatora (operatorów): <b>%s</b>.]]></string>
+    <string name="accept_conditions">Zaakceptuj warunki</string>
+    <string name="display_name_accepted_invitation">zaproszenie zaakceptowane</string>
+    <string name="report_item_archived">zarchiwizowany raport</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Urządzenia Xiaomi</b>: Włącz Autostart w ustawieniach systemowych, aby powiadomienia działały.]]></string>
+    <string name="delete_report">Usuń raport</string>
+    <string name="chat_list_contacts">Kontakty</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Sprawdzaj wiadomości co 10 minut</string>
+    <string name="button_delete_chat">Usuń czat</string>
+    <string name="report_reason_community">Naruszenie wytycznych społeczności</string>
+    <string name="operator_conditions_accepted_on">Warunki zaakceptowane na: %s.</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Warunki zostaną automatycznie zaakceptowane dla włączonych operatorów na: %s.</string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Warunki te będą również miały zastosowanie do: <b>%s</b>.]]></string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Aby korzystać z serwerów <b>%s</b>, Zaakceptuj warunki użytkowania.]]></string>
+    <string name="operator_conditions_of_use">Warunki użytkowania</string>
+    <string name="blocking_reason_content">Treść narusza warunki użytkowania</string>
+    <string name="connection_error_blocked">Połączenie zablokowane</string>
+    <string name="connection_error_blocked_desc">Połączenie jest zablokowane przez operatora serwera:\n%1$s.</string>
+    <string name="change_list">Lista zmian</string>
+    <string name="create_list">Utwórz listę</string>
+    <string name="delete_chat_list_menu_action">Usuń</string>
+    <string name="operator_conditions_failed_to_load">Nie można załadować tekstu aktualnych warunków, możesz przejrzeć warunki za pomocą tego linku:</string>
+    <string name="onboarding_network_operators_continue">Kontynuuj</string>
+    <string name="info_row_chat">Czat</string>
+    <string name="connect_plan_chat_already_exists">Czat już istnieje!</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Jesteś już połączony z <b>%1$s</b>.]]></string>
+    <string name="delete_chat_list_question">Usunąć listę?</string>
+    <string name="connection_not_ready">Połączenie nie jest gotowe.</string>
+    <string name="delete_chat_question">Usunąć czat?</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Czat zostanie dla Ciebie usunięty - nie można tego cofnąć!</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Czat zostanie usunięty dla wszystkich członków - nie można tego cofnąć!</string>
+    <string name="operator_conditions_will_be_accepted_on">Warunki będą akceptowane w dniu: %s.</string>
+    <string name="connection_security">Bezpieczeństwo połączenia</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Warunki będą akceptowane dla operatorów włączonych po 30 dniach.</string>
+    <string name="change_order_chat_list_menu_action">Zmień kolejność</string>
+    <string name="sync_connection_desc">Połączenie wymaga renegocjacji szyfrowania.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/pt-rBR/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/pt-rBR/strings.xml
index 3b139013fc..a0cce488af 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/pt-rBR/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/pt-rBR/strings.xml
@@ -323,7 +323,7 @@
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">A autenticação do dispositivo não está habilitada. Você pode ativar o Bloqueio SimpleX em Configurações, depois de ativar a autenticação do dispositivo.</string>
     <string name="no_call_on_lock_screen">Desativar</string>
     <string name="icon_descr_server_status_disconnected">Desconectado</string>
-    <string name="disappearing_messages_are_prohibited">Mensagens que temporárias são proibidas neste grupo.</string>
+    <string name="disappearing_messages_are_prohibited">Mensagens temporárias são proibidas.</string>
     <string name="error_saving_file">Erro ao salvar arquivo</string>
     <string name="display_name_cannot_contain_whitespace">O nome de exibição não pode conter espaços em branco.</string>
     <string name="encrypted_audio_call">chamada de áudio criptografada ponta-a-ponta</string>
@@ -341,7 +341,7 @@
     <string name="hide_verb">Ocultar</string>
     <string name="from_gallery_button">Da Galeria</string>
     <string name="gallery_video_button">Vídeo</string>
-    <string name="group_members_can_send_disappearing">Os membros do grupo podem enviar mensagens temporárias.</string>
+    <string name="group_members_can_send_disappearing">Os membros podem enviar mensagens temporárias.</string>
     <string name="icon_descr_file">Arquivo</string>
     <string name="full_name__field">Nome completo:</string>
     <string name="incoming_audio_call">Chamada de áudio recebida</string>
@@ -360,7 +360,7 @@
     <string name="timed_messages">Mensagens que desaparecem</string>
     <string name="group_preferences">Preferências do grupo</string>
     <string name="disappearing_prohibited_in_this_chat">Mensagens temporárias são proibidas nesse bate-papo.</string>
-    <string name="group_members_can_send_dms">Os membros do grupo podem enviar mensagens diretas.</string>
+    <string name="group_members_can_send_dms">Os membros podem enviar mensagens diretas.</string>
     <string name="ttl_mth">%dmês</string>
     <string name="simplex_link_mode_full">Link completo</string>
     <string name="hide_notification">Ocultar</string>
@@ -377,7 +377,7 @@
     <string name="failed_to_parse_chats_title">Falha ao carregar as conversas</string>
     <string name="file_with_path">Arquivo: %s</string>
     <string name="file_saved">Arquivo salvo</string>
-    <string name="group_members_can_send_voice">Os membros do grupo podem enviar mensagens de voz.</string>
+    <string name="group_members_can_send_voice">Os membros podem enviar mensagens de voz.</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">O grupo será excluído para todos os membros - isso não pode ser desfeito!</string>
     <string name="settings_section_title_help">AJUDA</string>
     <string name="notification_display_mode_hidden_desc">Ocultar contato e mensagem</string>
@@ -391,7 +391,7 @@
     <string name="image_saved">Imagem salva na Galeria</string>
     <string name="description_via_group_link_incognito">anônimo via link do grupo</string>
     <string name="incoming_video_call">Chamada de vídeo recebida</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Para usá-lo, por favor <b>permite que o SimpleX funcione em segundo plano</b> na próxima caixa de diálogo. Caso contrário, as notificações serão desabilitadas.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Permita</b> na próxima caixa de diálogo para receber notificações instantaneamente]]></string>
     <string name="share_one_time_link">Gerar um link de convite de uso único</string>
     <string name="file_not_found">Arquivo não encontrado</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Se você optar por rejeitar o remetente NÃO será notificado.</string>
@@ -406,7 +406,7 @@
     <string name="snd_group_event_group_profile_updated">perfil do grupo atualizado</string>
     <string name="group_member_status_group_deleted">Grupo excluído</string>
     <string name="incognito_info_protects">O modo Incognito protege sua privacidade usando um novo perfil aleatório para cada contato.</string>
-    <string name="group_members_can_delete">Os membros do grupo podem excluir mensagens enviadas de forma irreversível. (24 horas)</string>
+    <string name="group_members_can_delete">Os membros grupo podem excluir mensagens enviadas de forma irreversível. (24 horas)</string>
     <string name="ttl_w">%dsemana</string>
     <string name="v4_3_improved_server_configuration">Configuração de servidor aprimorada</string>
     <string name="v4_4_french_interface">Interface francesa</string>
@@ -534,7 +534,7 @@
     <string name="your_preferences">Suas preferências</string>
     <string name="set_group_preferences">Definir preferências de grupo</string>
     <string name="only_you_can_delete_messages">Somente você pode excluir irreversivelmente as mensagens (seu contato pode marcá-las para exclusão). (24 horas)</string>
-    <string name="message_deletion_prohibited_in_chat">A exclusão irreversível de mensagens é proibida neste grupo.</string>
+    <string name="message_deletion_prohibited_in_chat">A exclusão irreversível de mensagens é proibida.</string>
     <string name="v4_4_live_messages_desc">Os destinatários vêem as atualizações conforme você as digita.</string>
     <string name="v4_5_reduced_battery_usage">Uso da bateria reduzido</string>
     <string name="v4_5_reduced_battery_usage_descr">Mais melhorias chegarão em breve!</string>
@@ -552,7 +552,7 @@
     <string name="sender_may_have_deleted_the_connection_request">O remetente pode ter excluído a solicitação de conexão.</string>
     <string name="periodic_notifications_disabled">Notificações periódicas estão desativadas!</string>
     <string name="service_notifications_disabled">As notificações instantâneas estão desativadas!</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Para preservar sua privacidade, em vez de notificações push, o aplicativo tem um<b>serviço em segundo plano SimpleX</b> - ele usa uma porcentagem da bateria por dia.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Para melhorar a privacidade, <b>SimpleX executa em segundo plano</b> em vez de usar notificações push.]]></string>
     <string name="notifications_mode_off">Executa quando o aplicativo está aberto</string>
     <string name="icon_descr_sent_msg_status_sent">enviado</string>
     <string name="icon_descr_sent_msg_status_send_failed">o envio falhou</string>
@@ -587,7 +587,7 @@
     <string name="smp_servers">Servidores SMP</string>
     <string name="smp_servers_preset_address">Endereço do servidor pré-definido</string>
     <string name="reject">Rejeitar</string>
-    <string name="integrity_msg_skipped">%1$d mensagem(s) ignorada(s)</string>
+    <string name="integrity_msg_skipped">%1$d mensagem(ens) ignorada(s)</string>
     <string name="protect_app_screen">Proteger a tela do aplicativo</string>
     <string name="send_link_previews">Enviar prévias de links</string>
     <string name="privacy_and_security">Privacidade e segurança</string>
@@ -641,7 +641,7 @@
 \nAtenção: você não será capaz de se conectar aos servidores sem um endereço .onion</string>
     <string name="core_version">Versão principal: v%s</string>
     <string name="read_more_in_github_with_link"><![CDATA[Leia mais no nosso <font color="#0088ff">repositório do GitHub</font>.]]></string>
-    <string name="onboarding_notifications_mode_subtitle">Pode ser mudado mais tarde via configurações.</string>
+    <string name="onboarding_notifications_mode_subtitle">Como isso afeta a bateria</string>
     <string name="contact_wants_to_connect_via_call">%1$s quer se conectar com você via</string>
     <string name="status_no_e2e_encryption">sem criptografia ponta-a-ponta</string>
     <string name="open_verb">Abrir</string>
@@ -849,7 +849,7 @@
     <string name="to_start_a_new_chat_help_header">Para começar um novo bate-papo</string>
     <string name="la_notice_turn_on">Ligar</string>
     <string name="welcome">Bem-vindo(a)!</string>
-    <string name="next_generation_of_private_messaging">A próxima geração \nde mensageiros privados</string>
+    <string name="next_generation_of_private_messaging">O futuro da transmissão de mensagens</string>
     <string name="settings_section_title_socks">PROXY SOCKS</string>
     <string name="database_backup_can_be_restored">A tentativa de alterar a senha do banco de dados não foi concluída.</string>
     <string name="stop_chat_to_export_import_or_delete_chat_database">Pare o bate-papo para exportar, importar ou excluir o banco de dados do chat. Você não poderá receber e enviar mensagens enquanto o chat estiver interrompido.</string>
@@ -862,7 +862,7 @@
     <string name="updating_settings_will_reconnect_client_to_all_servers">A atualização das configurações reconectará o cliente a todos os servidores.</string>
     <string name="update_network_settings_confirmation">Atualizar</string>
     <string name="language_system">Sistema</string>
-    <string name="voice_messages_are_prohibited">Mensagens de voz são proibidas neste grupo.</string>
+    <string name="voice_messages_are_prohibited">Mensagens de voz são proibidas.</string>
     <string name="v4_4_verify_connection_security">Verificar a segurança da conexão</string>
     <string name="v4_5_private_filenames_descr">Para proteger o fuso horário, os arquivos de imagem/voz usam UTC.</string>
     <string name="unknown_message_format">formato de mensagem desconhecido</string>
@@ -1061,8 +1061,8 @@
     <string name="passcode_changed">Senha alterada!</string>
     <string name="you_can_turn_on_lock">Você pode ativar o bloqueio SimpleX via configurações.</string>
     <string name="alert_title_msg_bad_hash">Hash de mensagem incorreta</string>
-    <string name="alert_text_msg_bad_hash">O hash da mensagem anterior é diferente.</string>
-    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d descriptografia das mensagens falhou</string>
+    <string name="alert_text_msg_bad_hash">O hash da mensagem anterior é diferente.\"</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d mensagens falharam em serem descriptografadas.</string>
     <string name="alert_title_msg_bad_id">ID de mensagem incorreta</string>
     <string name="alert_text_msg_bad_id">A ID da próxima mensagem está incorreta (menor ou igual à anterior).
 \nIsso pode acontecer por causa de algum bug ou quando a conexão está comprometida.</string>
@@ -1149,7 +1149,7 @@
     <string name="enter_welcome_message_optional">Digite a mensagem de boas-vindas... (opcional)</string>
     <string name="save_auto_accept_settings">Salvar configurações de aceitação automática</string>
     <string name="opening_database">Abrindo banco de dados…</string>
-    <string name="auth_open_chat_profiles">Abrir perfis de bate-papo</string>
+    <string name="auth_open_chat_profiles">Alterar perfis de conversa</string>
     <string name="share_address_with_contacts_question">Compartilhar endereço com os contatos\?</string>
     <string name="your_contacts_will_remain_connected">Seus contatos continuarão conectados.</string>
     <string name="all_app_data_will_be_cleared">Todos os dados do aplicativo serão excluídos.</string>
@@ -1171,7 +1171,7 @@
     <string name="allow_message_reactions">Permitir reações à mensagens.</string>
     <string name="only_you_can_add_message_reactions">Somente você pode adicionar reações à mensagens.</string>
     <string name="only_your_contact_can_add_message_reactions">Somente seu contato pode adicionar reações à mensagens.</string>
-    <string name="message_reactions_are_prohibited">Reações à mensagens são proibidas neste grupo.</string>
+    <string name="message_reactions_are_prohibited">Reações a mensagens são proibidas.</string>
     <string name="custom_time_unit_hours">horas</string>
     <string name="custom_time_unit_minutes">minutos</string>
     <string name="custom_time_unit_seconds">segundos</string>
@@ -1199,7 +1199,7 @@
     <string name="current_version_timestamp">%s (atual)</string>
     <string name="allow_your_contacts_adding_message_reactions">Permitir que seus contatos adicionem reações à mensagens.</string>
     <string name="both_you_and_your_contact_can_add_message_reactions">Você e seu contato podem adicionar reações à mensagens.</string>
-    <string name="group_members_can_add_message_reactions">Os membros do grupo podem adicionar reações às mensagens.</string>
+    <string name="group_members_can_add_message_reactions">Os membros podem adicionar reações.</string>
     <string name="message_reactions_prohibited_in_this_chat">Reações à mensagens são proibidas neste bate-papo.</string>
     <string name="prohibit_message_reactions">Proibir reações à mensagens.</string>
     <string name="custom_time_picker_custom">personalizado</string>
@@ -1249,7 +1249,7 @@
     <string name="rcv_conn_event_verification_code_reset">código de segurança alterado</string>
     <string name="renegotiate_encryption">Renegociar criptografia</string>
     <string name="sender_at_ts">%s em %s</string>
-    <string name="files_are_prohibited_in_group">Arquivos e mídia são proibidos neste grupo.</string>
+    <string name="files_are_prohibited_in_group">Arquivos e mídias são proibidos.</string>
     <string name="prohibit_sending_files">Proibir o envio de arquivos e mídia.</string>
     <string name="snd_conn_event_ratchet_sync_ok">criptografia OK para %s</string>
     <string name="fix_connection_not_supported_by_group_member">Correção não suportada pelo membro do grupo</string>
@@ -1265,7 +1265,7 @@
     <string name="error_synchronizing_connection">Erro ao sincronizar conexão</string>
     <string name="favorite_chat">Favorito</string>
     <string name="files_and_media_prohibited">Arquivos e mídia proibidos!</string>
-    <string name="group_members_can_send_files">Os membros do grupo podem enviar arquivos e mídia.</string>
+    <string name="group_members_can_send_files">Os membros podem enviar arquivos e mídias.</string>
     <string name="fix_connection_confirm">Corrigir</string>
     <string name="fix_connection_not_supported_by_contact">Correção não suportada pelo contato</string>
     <string name="settings_shutdown">Desligar</string>
@@ -1800,7 +1800,7 @@
     <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Aviso: iniciar conversa em múltiplos dispositivos não é suportado e pode causar falhas na entrega de mensagens</string>
     <string name="network_type_ethernet">Internet cabeada</string>
     <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Você <b>não deve</b> usar a mesma base de dados em dois dispositivos.]]></string>
-    <string name="group_members_can_send_simplex_links">Membros do grupo podem enviar link SimpleX</string>
+    <string name="group_members_can_send_simplex_links">Membros podem enviar links SimpleX.</string>
     <string name="migrate_to_device_importing_archive">Importando arquivo</string>
     <string name="chat_theme_apply_to_light_mode">Modo claro</string>
     <string name="feature_enabled_for">Ativado para</string>
@@ -1897,7 +1897,7 @@
     <string name="wallpaper_scale">Escala</string>
     <string name="wallpaper_scale_fill">Preencher</string>
     <string name="wallpaper_scale_fit">Ajustar</string>
-    <string name="simplex_links_are_prohibited_in_group">Links SimpleX são proibidos neste grupo.</string>
+    <string name="simplex_links_are_prohibited_in_group">Links SimpleX são proibidos.</string>
     <string name="v5_6_app_data_migration_descr">Migrar para outro dispositivo via QR code.</string>
     <string name="v5_6_picture_in_picture_calls">Chamadas picture-in-picture</string>
     <string name="v5_6_picture_in_picture_calls_descr">Use o aplicativo enquanto está em chamada.</string>
@@ -1982,8 +1982,7 @@
     <string name="servers_info_transport_sessions_section_header">Sessões de transporte</string>
     <string name="servers_info_subscriptions_section_header">Recepção de mensagem</string>
     <string name="servers_info_subscriptions_connections_pending">Pendente</string>
-    <string name="servers_info_private_data_disclaimer">Começando de %s.
-\nTodos os dados são privados do seu dispositivo.</string>
+    <string name="servers_info_private_data_disclaimer">Começando em %s.\nTodos os dados são mantidos privados em seu dispositivo.</string>
     <string name="servers_info_subscriptions_total">Total</string>
     <string name="servers_info_proxied_servers_section_header">Servidores proxiados</string>
     <string name="servers_info_previously_connected_servers_section_header">Servidores conectados anteriormente</string>
@@ -2056,7 +2055,7 @@
     <string name="app_check_for_updates_installed_successfully_desc">Por favor reinicie o aplicativo.</string>
     <string name="app_check_for_updates_button_remind_later">Me lembre mais tarde</string>
     <string name="app_check_for_updates_notice_desc">Para ser notificado sobre os novos lançamentos, habilite a checagem periódica de versões Estáveis e Beta.</string>
-    <string name="one_hand_ui">Barra de ferramentas de conversa acessível</string>
+    <string name="one_hand_ui">Barras de ferramentas de aplicativos acessível</string>
     <string name="forward_files_failed_to_receive_desc">Falha no baixar de %1$d arquivo(s).</string>
     <string name="forward_files_messages_deleted_after_selection_title">%1$s mensagens não encaminhadas.</string>
     <string name="settings_section_title_chat_database">DADOS DO BATE-PAPO</string>
@@ -2066,15 +2065,15 @@
     <string name="switching_profile_error_message">Sua conexão foi movida para %s, mas um erro inesperado ocorreu ao redirecioná-lo para o seu perfil.</string>
     <string name="n_file_errors">%1$d erro(s) de arquivo(s):
 \n%2$s</string>
-    <string name="n_other_file_errors">%1$d outro erro de arquivo.</string>
+    <string name="n_other_file_errors">%1$d outro(s) erro(s) de arquivo(s).</string>
     <string name="error_forwarding_messages">Erro ao encaminhar mensagens.</string>
     <string name="forward_alert_title_messages_to_forward">Encaminhar %1$s mensagens?</string>
     <string name="forward_alert_forward_messages_without_files">Encaminhar mensagens sem arquivos?</string>
     <string name="forward_files_messages_deleted_after_selection_desc">As mensagens foram excluidas após vocês selecioná-las.</string>
     <string name="forward_alert_title_nothing_to_forward">Nada para encaminhar!</string>
-    <string name="forward_files_in_progress_desc">%1$d arquivo(s) ainda estão sendo baixados.</string>
-    <string name="forward_files_missing_desc">%1$d arquivos foram excluidos.</string>
-    <string name="forward_files_not_accepted_desc">%1$d arquivos não foram baixados.</string>
+    <string name="forward_files_in_progress_desc">%1$d o(s) arquivo(s) ainda está(ão) sendo baixado(s).</string>
+    <string name="forward_files_missing_desc">%1$d arquivo(s) foi(ram) excluído(s).</string>
+    <string name="forward_files_not_accepted_desc">%1$d arquivo(s) não foi(ram) baixado(s).</string>
     <string name="forward_files_not_accepted_receive_files">Baixar</string>
     <string name="forward_multiple">Emcaminhar mensagens…</string>
     <string name="compose_forward_messages_n">Encaminhando %1$s mensagens.</string>
@@ -2094,4 +2093,293 @@
     <string name="network_proxy_password">Senha</string>
     <string name="network_proxy_username">Nome de usuário</string>
     <string name="network_session_mode_session">Sessão do aplicativo</string>
-</resources>
\ No newline at end of file
+    <string name="address_or_1_time_link">Endereço ou link de uso único?</string>
+    <string name="address_settings">Configurações de endereço</string>
+    <string name="add_your_team_members_to_conversations">Adicione membros da sua equipe às conversas.</string>
+    <string name="v6_1_better_calls">Melhores ligações</string>
+    <string name="operator_added_message_servers">Servidores de mensagem adicionados</string>
+    <string name="operator_added_xftp_servers">Adicionado servidores de mídia e arquivos</string>
+    <string name="appearance_app_toolbars">Barra de ferramentas</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Aplicativo sempre roda em segundo plano</string>
+    <string name="button_add_friends">Adicionar amigos</string>
+    <string name="operator_conditions_accepted">Condições aceitas</string>
+    <string name="display_name_accepted_invitation">Convite aceito</string>
+    <string name="button_add_team_members">Adicionar membros da equipe</string>
+    <string name="onboarding_network_about_operators">Sobre operadores</string>
+    <string name="accept_conditions">Aceite as condições</string>
+    <string name="report_item_archived_by">denúncia arquivada por %s</string>
+    <string name="report_reason_other">Outra razão</string>
+    <string name="chat_list_add_list">Adicionar lista</string>
+    <string name="delete_chat_list_warning">Todas as conversas serão removidas da lista %s, e a lista será apagada</string>
+    <string name="v6_1_better_security">Melhor segurança ✅</string>
+    <string name="report_archive_alert_title">Arquivar denúncia?</string>
+    <string name="archive_report">Arquivar denúncia</string>
+    <string name="chat_list_all">Todos</string>
+    <string name="add_to_list">Adicionar à lista</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Em dispositivos Xiaomi</b>: por favor, ative a opção Autostart nas configurações do sistema para que as notificações funcionem.]]></string>
+    <string name="v6_1_message_dates_descr">Datas de mensagens melhores.</string>
+    <string name="v6_1_better_user_experience">Melhor experiência do usuário</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Você já está conectado com <b>%1$s</b>.]]></string>
+    <string name="archive_verb">Arquivar</string>
+    <string name="privacy_chat_list_open_links_ask">Perguntar</string>
+    <string name="appearance_bars_blur_radius">Desfoque</string>
+    <string name="business_address">Endereço comercial</string>
+    <string name="report_item_archived">denúncia arquivada</string>
+    <string name="button_delete_chat">Deletar chat</string>
+    <string name="operator_conditions_failed_to_load">O texto das condições atuais não pôde ser carregado, você pode revisar as condições por meio deste link:</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[As mesmas condições serão aplicadas ao operador <b>%s</b>.]]></string>
+    <string name="v6_1_customizable_message_descr">Formato de mensagem personalizável.</string>
+    <string name="v6_3_faster_sending_messages">Envio de mensagens mais rápido.</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Checar mensagens a cada 10 minutos</string>
+    <string name="block_members_desc">Todas novas mensagens destes membros serão ocultadas</string>
+    <string name="error_updating_server_title">Erro ao atualizar servidor</string>
+    <string name="enable_sending_member_reports">Permitir denunciar mensagens aos moderadores.</string>
+    <string name="v6_3_better_privacy_and_security">Melhorias de privacidade e segurança</string>
+    <string name="v6_3_organize_chat_lists_descr">Não perca mensagens importantes.</string>
+    <string name="connect_plan_chat_already_exists">Chat já existente!</string>
+    <string name="debug_logs">Ativar logs</string>
+    <string name="block_members_for_all_question">Bloquear membros para todos?</string>
+    <string name="v6_1_delete_many_messages_descr">Deletar ou moderar até 200 mensagens.</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[As condições serão aceitas pelo(s) operador(es): <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Essas condições também serão aplicadas para: <b>%s</b>.]]></string>
+    <string name="direct_messages_are_prohibited_in_chat">Mensagens diretas entre membros são proibidas neste chat.</string>
+    <string name="v6_3_better_groups_performance">Melhor desempenho de grupos</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Todas mensagens e arquivos são enviados <b>com criptografia de ponta-a-ponta</b>, e com segurança pós-quântica em mensagens diretas.]]></string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Chat será deletado para você - essa ação não pode ser desfeita!</string>
+    <string name="operator_conditions_accepted_on">Condições aceitas em: %s.</string>
+    <string name="direct_messages_are_prohibited">Mensagens diretas entre membros são proibidas.</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Essas condições também serão aplicadas para: <b>%s</b>.]]></string>
+    <string name="change_order_chat_list_menu_action">Alterar ordem</string>
+    <string name="error_reading_passphrase">Erro ao ler a senha do banco de dados</string>
+    <string name="error_accepting_operator_conditions">Erro ao aceitar condições</string>
+    <string name="report_reason_community">Violação das diretrizes da comunidade</string>
+    <string name="failed_to_save_servers">Erro ao salvar servidores</string>
+    <string name="group_reports_active">%d denúncias</string>
+    <string name="group_reports_active_one">1 denúncia</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[1-link temporário pode ser usado <i>com apenas um contato</i> - compartilhe pessoalmente ou por qualquer aplicativo de mensagens.]]></string>
+    <string name="prefs_error_saving_settings">Erro ao salvar configurações</string>
+    <string name="create_1_time_link">Criar link único</string>
+    <string name="sync_connection_confirm">Reparar</string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Para usar os servidores de <b>%s</b>, aceite as condições de uso.]]></string>
+    <string name="blocking_reason_content">O conteúdo viola as condições de uso</string>
+    <string name="connection_error_blocked">Conexão bloqueada</string>
+    <string name="connection_error_blocked_desc">A conexão está bloqueada pelo operador do servidor:\n%1$s.</string>
+    <string name="file_error_blocked">O arquivo está bloqueado pelo operador do servidor:\n%1$s.</string>
+    <string name="delete_report">Deletar denúncia</string>
+    <string name="chat_list_businesses">Empresas</string>
+    <string name="change_list">Alterar lista</string>
+    <string name="onboarding_network_operators_continue">Continuar</string>
+    <string name="error_saving_database">Erro ao salvar banco de dados</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[As condições são aceitas pelo(s) operador(es): <b>%s</b>.]]></string>
+    <string name="error_initializing_web_view_wrong_arch">Erro ao inicializar o WebView. Certifique-se de que você tenha o WebView instalado e que sua arquitetura suportada seja arm64.\nErro: %s</string>
+    <string name="change_automatic_deletion_question">Alterar exclusão automática de mensagens?</string>
+    <string name="disable_automatic_deletion_question">Desativar exclusão automática de mensagens?</string>
+    <string name="delete_chat_list_question">Deletar lista?</string>
+    <string name="chat_item_ttl_year">1 ano</string>
+    <string name="chat_item_ttl_default">padrão (%s)</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[As condições serão aceitas pelo(s) operador(es): <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[As mesmas condições serão aplicadas ao(s) operador(es): <b>%s</b>.]]></string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">As condições serão aceitas automaticamente para operadores habilitados em: %s.</string>
+    <string name="connection_security">Segurança de conexão</string>
+    <string name="operator_conditions_will_be_accepted_on">As condições serão aceitas em: %s.</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[As condições já foram aceitas pelo(s) seguinte(s) operador(es): <b>%s</b>.]]></string>
+    <string name="operator_conditions_of_use">Condições de uso</string>
+    <string name="error_adding_server">Erro ao adicionar servidor</string>
+    <string name="v6_2_business_chats">Chats de empresas</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">para melhoria da privacidade de metadados.</string>
+    <string name="v6_3_faster_deletion_of_groups">Exclusão mais rápida de grupos.</string>
+    <string name="error_creating_chat_tags">Erro ao criar lista de chat</string>
+    <string name="error_loading_chat_tags">Erro ao carregar lista de chats</string>
+    <string name="error_updating_chat_tags">Erro ao atualizar a lista de chats</string>
+    <string name="chat_list_contacts">Contatos</string>
+    <string name="chat_list_favorites">Favoritos</string>
+    <string name="create_list">Criar lista</string>
+    <string name="edit_chat_list_menu_action">Editar</string>
+    <string name="settings_message_shape_corner">Canto</string>
+    <string name="v6_2_network_decentralization_enable_flux">Ativar o Flux nas Configurações de rede e servidores para melhor privacidade de metadados.</string>
+    <string name="report_archive_alert_desc_all">Todas denúncias serão arquivadas para você.</string>
+    <string name="report_archive_alert_title_all">Arquivar todas denúncias?</string>
+    <string name="report_archive_alert_title_nth">Arquivar %d denúncias?</string>
+    <string name="archive_reports">Arquivar denúncias</string>
+    <string name="report_archive_for_all_moderators">Para todos moderadores</string>
+    <string name="report_archive_for_me">Para mim</string>
+    <string name="chat_ttl_options_footer">Deletar mensagens de chat do seu dispositivo.</string>
+    <string name="delete_chat_question">Excluir chat?</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">O chat será deletado para todos os membros - essa ação não pode ser desfeita!</string>
+    <string name="disable_automatic_deletion">Desativar exclusão de mensagens</string>
+    <string name="encryption_renegotiation_in_progress">Renegociação de criptografia em andamento.</string>
+    <string name="delete_chat_list_menu_action">Deletar</string>
+    <string name="call_desktop_permission_denied_chrome">Clique no botão de informação perto do campo de endereço para permitir usar o microfone.</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">As condições serão aceitas para operadores habilitados após 30 dias.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Por exemplo, se o seu contato receber mensagens por meio de um servidor SimpleX Chat, seu aplicativo as entregará por meio de um servidor Flux.</string>
+    <string name="connection_not_ready">A conexão não está pronta.</string>
+    <string name="errors_in_servers_configuration">Erros nas configurações de servidores.</string>
+    <string name="for_chat_profile">Para o perfil de chat %s:</string>
+    <string name="sync_connection_desc">A conexão requer renegociação de criptografia.</string>
+    <string name="sync_connection_question">Reparar conexão?</string>
+    <string name="error_creating_report">Erro ao criar denúncia</string>
+    <string name="info_row_chat">Chat</string>
+    <string name="your_servers">Seus servidores</string>
+    <string name="group_member_status_pending_approval">aprovação pendente</string>
+    <string name="group_member_status_pending_approval_short">pendente</string>
+    <string name="group_members_can_send_reports">Os membros podem denunciar mensagens aos moderadores.</string>
+    <string name="onboarding_network_operators">Operadores da rede</string>
+    <string name="operator">Operador</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Nenhum serviço de segundo plano</string>
+    <string name="operator_open_changes">Abrir mudanças</string>
+    <string name="feature_roles_moderators">moderadores</string>
+    <string name="v6_2_network_decentralization">Descentralização da rede</string>
+    <string name="v6_2_business_chats_descr">Privacidade para seus clientes.</string>
+    <string name="v6_3_mentions">Mencione membros 👋</string>
+    <string name="v6_3_mentions_descr">Seja notificado quando mencionado.</string>
+    <string name="v6_3_reports_descr">Ajude os administradores a moderar seus grupos.</string>
+    <string name="v6_3_organize_chat_lists">Organize os chats em listas</string>
+    <string name="v6_3_private_media_file_names">Nomes de arquivos de mídia privados.</string>
+    <string name="report_reason_illegal">Conteúdo inapropriado</string>
+    <string name="report_reason_profile">Perfil inapropriado</string>
+    <string name="no_message_servers_configured">Nenhuma mensagem de servidores.</string>
+    <string name="message_deleted_or_not_received_error_title">Nenhuma mensagem</string>
+    <string name="group_reports_member_reports">Denúncias de membros</string>
+    <string name="or_to_share_privately">Ou compartilhe em particular</string>
+    <string name="no_unread_chats">Nenhum chat não lido</string>
+    <string name="no_chats">Nenhum chat</string>
+    <string name="chat_list_notes">Notas</string>
+    <string name="open_with_app">Abrir com %s</string>
+    <string name="duplicated_list_error">O nome da lista e o emoji devem ser diferentes para todas as listas.</string>
+    <string name="network_session_mode_server_description">Novas credenciais SOCKS serão usadas para cada servidor.</string>
+    <string name="onboarding_notifications_mode_battery">Notificações e bateria</string>
+    <string name="unblock_members_desc">As mensagens desses membros serão exibidas!</string>
+    <string name="mute_all_chat">Silenciar tudo</string>
+    <string name="for_social_media">Para redes sociais</string>
+    <string name="network_preset_servers_title">Servidores predefinidos</string>
+    <string name="privacy_chat_list_open_links">Abrir links da lista de bate-papo</string>
+    <string name="privacy_chat_list_open_web_link_question">Abrir web link?</string>
+    <string name="invite_to_chat_button">Convidar ao chat</string>
+    <string name="operator_open_conditions">Abrir condições</string>
+    <string name="list_name_field_placeholder">Nome da lista...</string>
+    <string name="network_session_mode_session_description">Novas credenciais SOCKS serão usadas toda vez que você iniciar o aplicativo.</string>
+    <string name="privacy_chat_list_open_web_link">Abrir link</string>
+    <string name="settings_section_title_message_shape">Forma da mensagem</string>
+    <string name="group_member_role_moderator">moderador</string>
+    <string name="maximum_message_size_title">A mensagem é muito grande!</string>
+    <string name="maximum_message_size_reached_text">Por favor, reduza o tamanho da mensagem e a envie novamente.</string>
+    <string name="operator_info_title">Operador da rede</string>
+    <string name="operator_use_for_messages_private_routing">Para roteamento privado</string>
+    <string name="v6_2_improved_chat_navigation">Aprimorada a navegação de bate-papo</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Abra o chat na primeira mensagem não lida.\n- Pule para mensagens citadas.</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Os membros serão removidos do chat. Essa ação não pode ser desfeita!</string>
+    <string name="button_leave_chat">Said do chat</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Os membros serão removidos do grupo. Essa ação não pode ser desfeita!</string>
+    <string name="smp_servers_new_server">Nove servidor</string>
+    <string name="no_chats_found">Nenhum chat encontrado</string>
+    <string name="disable_automatic_deletion_message">As mensagens neste chat nunca serão excluídas.</string>
+    <string name="restore_passphrase_can_not_be_read_desc">A frase-senha na Keystore não pôde ser lida. Isso pode ter acontecido após uma atualização do sistema incompatível com o aplicativo. Se não for o caso, entre em contato com os desenvolvedores.</string>
+    <string name="only_chat_owners_can_change_prefs">Somente os proprietários do chat podem alterar as preferências.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">A frase-senha na Keystore não pôde ser lida, insira-a manualmente. Isso pode ter acontecido após uma atualização do sistema incompatível com o aplicativo. Se não for o caso, entre em contato com os desenvolvedores.</string>
+    <string name="chat_list_groups">Grupos</string>
+    <string name="chat_archive">Ou importar arquivo compactado</string>
+    <string name="list_menu">Lista</string>
+    <string name="maximum_message_size_reached_non_text">Reduza o tamanho da mensagem ou remova a mídia e envie novamente.</string>
+    <string name="how_it_helps_privacy">Como isso ajuda na privacidade</string>
+    <string name="privacy_chat_list_open_links_no">Não</string>
+    <string name="leave_chat_question">Sair do chat?</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">O membro será removido do chat - essa ação não pode ser desfeita!</string>
+    <string name="v6_1_forward_many_messages_descr">Encaminhe até 20 mensagens de uma vez.</string>
+    <string name="no_media_servers_configured">Nenhuma mídia &amp; nenhum arquivo de servidores.</string>
+    <string name="no_media_servers_configured_for_sending">Nenhum servidor para enviar arquivos.</string>
+    <string name="no_message_servers_configured_for_private_routing">Nenhum servidor para roteamento de mensagens privadas.</string>
+    <string name="no_media_servers_configured_for_private_routing">Nenhum servidor para receber arquivos.</string>
+    <string name="no_message_servers_configured_for_receiving">Nenhum servidor para receber mensagens.</string>
+    <string name="call_desktop_permission_denied_safari">Abra Configurações do Safari / Websites / Microfone, e escolha Permitir para localhost.</string>
+    <string name="operator_server_alert_title">Servidor do operador</string>
+    <string name="no_chats_in_list">Nenhum chat na lista %s.</string>
+    <string name="report_item_visibility_moderators">Somente o remetente e os moderadores podem vê-lo.</string>
+    <string name="report_item_visibility_submitter">Somente você e os moderadores podem ver isso</string>
+    <string name="group_member_status_rejected">rejeitado</string>
+    <string name="report_verb">Denunciar</string>
+    <string name="disable_sending_member_reports">Proibir a denúncia de mensagens aos moderadores.</string>
+    <string name="report_compose_reason_header_illegal">Denunciar conteúdo: somente os moderadores do grupo poderão ver.</string>
+    <string name="report_compose_reason_header_profile">Denunciar perfil de membro: somente moderadores do grupo poderão ver.</string>
+    <string name="remote_hosts_section">Dispositivos móveis remotos</string>
+    <string name="button_remove_members_question">Remover membros?</string>
+    <string name="report_compose_reason_header_other">Denunciar outro: somente os moderadores do grupo poderão ver.</string>
+    <string name="report_reason_alert_title">Qual é a razão da denúncia?</string>
+    <string name="notification_group_report">Denúncia: %s</string>
+    <string name="group_preview_rejected">rejeitado</string>
+    <string name="member_reports_are_prohibited">É proibido denunciar mensagens neste grupo.</string>
+    <string name="chat_bottom_bar">Barra de ferramentas de chat acessível</string>
+    <string name="chat_list_group_reports">Denúncias</string>
+    <string name="error_server_operator_changed">Operador do servidor alterado.</string>
+    <string name="text_field_set_chat_placeholder">Definir nome do chat…</string>
+    <string name="share_address_publicly">Compartilhar o endereço publicamente</string>
+    <string name="report_compose_reason_header_community">Denunciar violação: somente os moderadores do grupo poderão ver.</string>
+    <string name="operator_servers_title">%s servidores</string>
+    <string name="v6_1_better_security_descr">Protocolos SimpleX analisados pela Trail of Bits.</string>
+    <string name="v6_3_reports">Enviar denúncias privadas</string>
+    <string name="v6_3_set_message_expiration_in_chats">Defina a expiração de mensagens em chats.</string>
+    <string name="report_reason_spam">Spam</string>
+    <string name="blocking_reason_spam">Spam</string>
+    <string name="save_list">Salvar lista</string>
+    <string name="share_1_time_link_with_a_friend">Compartilhe um link único com um amigo</string>
+    <string name="simplex_address_or_1_time_link">Endereço SimpleX ou link único?</string>
+    <string name="icon_descr_sound_muted">Som silenciado</string>
+    <string name="v6_1_better_calls_descr">Alterne entre áudio e vídeo durante a chamada.</string>
+    <string name="onboarding_select_network_operators_to_use">Selecione as operadoras de rede a serem utilizadas.</string>
+    <string name="operator_review_conditions">Revisar condições</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Endereços SimpleX e links únicos são seguros para compartilhar por meio de qualquer mensageiro.</string>
+    <string name="onboarding_choose_server_operators">Operadores do servidor</string>
+    <string name="server_added_to_operator__name">Servidor adicionado ao operador %s.</string>
+    <string name="strikethrough_text">riscar</string>
+    <string name="report_compose_reason_header_spam">Denunciar spam: somente os moderadores do grupo poderão ver.</string>
+    <string name="error_server_protocol_changed">Protocolo do servidor alterado.</string>
+    <string name="share_simplex_address_on_social_media">Compartilhe o endereço do SimpleX nas redes sociais.</string>
+    <string name="onboarding_network_operators_review_later">Revisar depois</string>
+    <string name="network_session_mode_server">Servidor</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">O SimpleX Chat e o Flux fizeram um acordo para incluir servidores operados pelo Flux no aplicativo.</string>
+    <string name="display_name_requested_to_connect">conexão solicitada</string>
+    <string name="member_role_will_be_changed_with_notification_chat">The role will be changed to %s. Everyone in the chat will be notified.</string>
+    <string name="appearance_in_app_bars_alpha">Transparência</string>
+    <string name="v6_1_switch_chat_profile_descr">Alterne o perfil de chat para convites únicos.</string>
+    <string name="unblock_members_for_all_question">Desbloquear membros para todos?</string>
+    <string name="operator_use_for_sending">Para enviar</string>
+    <string name="operator_updated_conditions">Condições atualizadas</string>
+    <string name="v6_2_network_decentralization_descr">O segundo operador predefinido no aplicativo!</string>
+    <string name="message_deleted_or_not_received_error_desc">Esta mensagem foi excluída ou ainda não foi recebida.</string>
+    <string name="view_updated_conditions">Ver condições atualizadas</string>
+    <string name="address_creation_instruction">Toque em Criar endereço SimpleX no menu para criá-lo mais tarde.</string>
+    <string name="network_smp_web_port_footer">Usar porta TCP %1$s quando nenhuma porta for especificada.</string>
+    <string name="report_archive_alert_desc">A denúncia será arquivado para você.</string>
+    <string name="operator_use_for_messages_receiving">Para receber</string>
+    <string name="change_automatic_chat_deletion_message">Esta ação não pode ser desfeita - as mensagens enviadas e recebidas neste chat antes da selecionada serão excluídas.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Para se proteger contra a substituição do seu link, você pode comparar os códigos de segurança dos contatos.</string>
+    <string name="unread_mentions">Menções não lidas</string>
+    <string name="network_smp_web_port_section_title">Porta TCP para mensagens</string>
+    <string name="network_smp_web_port_toggle">Usar porta web</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">O aplicativo protege sua privacidade usando diferentes operadores em cada conversa.</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Quando mais de um operador está ativado, nenhum deles têm metadados para saber quem se comunica com quem.</string>
+    <string name="privacy_chat_list_open_links_yes">Sim</string>
+    <string name="chat_main_profile_sent">Seu perfil de chat será enviado aos membros do chat</string>
+    <string name="view_conditions">Ver condições</string>
+    <string name="operator_use_for_messages">Usar para mensagens</string>
+    <string name="you_can_set_connection_name_to_remember">Você pode definir o nome da conexão para lembrar com quem o link foi compartilhado.</string>
+    <string name="onboarding_network_operators_configure_via_settings">Você pode configurar servidores nas configurações.</string>
+    <string name="use_servers_of_operator_x">Usar %s</string>
+    <string name="operator_use_operator_toggle_description">Usar servidores</string>
+    <string name="operator_website">Website</string>
+    <string name="max_group_mentions_per_message_reached">Você pode mencionar até %1$s membros por mensagem!</string>
+    <string name="settings_message_shape_tail">Final</string>
+    <string name="maximum_message_size_reached_forwarding">Você pode copiar e reduzir o tamanho da mensagem para enviá-la.</string>
+    <string name="onboarding_network_operators_update">Atualização</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Você pode configurar operadores em Configurações de rede &amp; servidores.</string>
+    <string name="operator_use_for_files">Usar para arquivos</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Você deixará de receber mensagens deste chat. O histórico do chat será preservado.</string>
+    <string name="call_desktop_permission_denied_title">Para fazer chamadas, permita usar seu microfone. Encerre a chamada e tente ligar novamente.</string>
+    <string name="xftp_servers_per_user">Os servidores para novos arquivos do seu perfil de chat atual</string>
+    <string name="connection_error_quota_desc">A conexão atingiu o limite de mensagens não entregues, seu contato pode estar offline.</string>
+    <string name="connection_error_quota">Mensagens não entregues</string>
+    <string name="onboarding_conditions_configure_server_operators">Configurar operadores de servidor</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Chats privados, grupos e seus contatos não são acessíveis aos operadores de servidor.</string>
+    <string name="onboarding_conditions_accept">Aceitar</string>
+    <string name="onboarding_conditions_by_using_you_agree">Ao usar o SimpleX Chat, você concorda em:\n- enviar apenas conteúdo legal em grupos públicos.\n- respeitar outros usuários – sem spam.</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Política de privacidade e condições de uso.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
index c9db7de2e6..544ee8af89 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
@@ -971,4 +971,4 @@
     <string name="all_users">Todos os perfis</string>
     <string name="connect_plan_already_connecting">Já conectando!</string>
     <string name="connect_plan_already_joining_the_group">Já entrando no grupo!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ro/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ro/strings.xml
index c02e17f568..92572516b9 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ro/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ro/strings.xml
@@ -6,7 +6,7 @@
     <string name="accept_contact_button">Acceptă</string>
     <string name="accept_contact_incognito_button">Acceptă incognito</string>
     <string name="smp_servers_add">Adaugă server</string>
-    <string name="network_settings">Setări de rețea avansate</string>
+    <string name="network_settings">Reglări avansate de rețea</string>
     <string name="contact_wants_to_connect_via_call">%1$s dorește să se conecteze cu tine prin</string>
     <string name="accept_call_on_lock_screen">Acceptă</string>
     <string name="alert_text_decryption_error_too_many_skipped">%1$d mesaje omise.</string>
@@ -17,7 +17,7 @@
     <string name="color_secondary_variant">Adițional secundar</string>
     <string name="accept_feature">Acceptă</string>
     <string name="v5_3_new_interface_languages">6 limbi noi pentru interfață</string>
-    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d mesaje nu au putut fi decriptate.</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d mesaje nu au putut fi descifrate.</string>
     <string name="integrity_msg_skipped">%1$d mesaj(e) omis(e)</string>
     <string name="group_info_section_title_num_members">%1$s MEMBRI</string>
     <string name="chat_item_ttl_day">1 zi</string>
@@ -39,8 +39,8 @@
     <string name="v4_3_improved_server_configuration_desc">Adaugă servere prin scanare de coduri QR.</string>
     <string name="smp_servers_add_to_another_device">Adaugă la un alt dispozitiv</string>
     <string name="button_add_welcome_message">Adaugă mesaj de întâmpinare</string>
-    <string name="conn_event_ratchet_sync_started">acceptând criptarea…</string>
-    <string name="snd_conn_event_ratchet_sync_started">acceptând criptarea pentru %s…</string>
+    <string name="conn_event_ratchet_sync_started">se acceptă cifrarea…</string>
+    <string name="snd_conn_event_ratchet_sync_started">se acceptă cifrarea pentru %s…</string>
     <string name="v4_2_group_links_desc">Administratorii pot crea linkuri de participare la grupuri.</string>
     <string name="v5_2_more_things">Câteva lucruri în plus</string>
     <string name="all_app_data_will_be_cleared">Toate datele aplicației sunt șterse.</string>
@@ -50,7 +50,7 @@
     <string name="abort_switch_receiving_address">Întrerupe schimbarea adresei</string>
     <string name="abort_switch_receiving_address_confirm">Întrerupe</string>
     <string name="users_delete_all_chats_deleted">Toate conversațiile și mesajele vor fi șterse - operațiunea este definitivă!</string>
-    <string name="clear_note_folder_warning">Toate mesajele vor fi șterse - operațiunea este definitivă!</string>
+    <string name="clear_note_folder_warning">Toate mesajele vor fi șterse - acest lucru nu poate fi anulat!</string>
     <string name="allow_message_reactions_only_if">Permite reacții la mesaje doar dacă și contactul tău le permite.</string>
     <string name="allow_to_delete_messages">Permite ștergerea ireversibilă a mesajelor trimise. (24 ore)</string>
     <string name="allow_to_send_files">Permite trimiterea de fișiere și media.</string>
@@ -122,7 +122,7 @@
     <string name="back">Înapoi</string>
     <string name="create_group">Creează grup secret</string>
     <string name="creating_link">Se creează link…</string>
-    <string name="audio_call_no_encryption">apel audio (necriptat e2e)</string>
+    <string name="audio_call_no_encryption">apel audio (necifrat e2e)</string>
     <string name="smp_server_test_create_file">Creează fișier</string>
     <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Adaugă contact</b>: pentru a crea un nou link de invitare, sau a te conecta printr-un link pe care l-ai primit.]]></string>
     <string name="authentication_cancelled">Autentificare anulată</string>
@@ -150,7 +150,7 @@
     <string name="group_member_status_creator">creator</string>
     <string name="color_background">Fundal</string>
     <string name="v5_3_new_desktop_app_descr">Creează profil nou în aplicația desktop. 💻</string>
-    <string name="v5_3_encrypt_local_files_descr">Aplicația criptează fișierele locale noi (cu excepția videoclipurilor).</string>
+    <string name="v5_3_encrypt_local_files_descr">Aplicația cifrează fișierele locale noi (cu excepția videoclipurilor).</string>
     <string name="group_member_role_author">autor</string>
     <string name="v5_3_new_interface_languages_descr">Arabă, Bulgară, Finlandeză, Ebraică, Thailandeză și Ucraineană - mulțumită utilizatorilor și Weblate.</string>
     <string name="calls_prohibited_with_this_contact">Apelurile audio/video sunt interzise.</string>
@@ -178,7 +178,7 @@
     <string name="migrate_from_device_repeat_upload">Repetă încărcarea</string>
     <string name="callstatus_rejected">apel respins</string>
     <string name="remove_passphrase_from_keychain">Elimini fraza de acces din Keystore?</string>
-    <string name="remove_passphrase_from_settings">Elimini fraza de acces din setări?</string>
+    <string name="remove_passphrase_from_settings">Elimini parola din reglări?</string>
     <string name="connect_plan_repeat_connection_request">Repetă cererea de conectare?</string>
     <string name="network_use_onion_hosts_required">Necesar</string>
     <string name="retry_verb">Reîncearcă</string>
@@ -188,10 +188,10 @@
     <string name="refresh_qr_code">Reîmprospătează</string>
     <string name="revoke_file__title">Revoci fișierul?</string>
     <string name="revoke_file__confirm">Revocă</string>
-    <string name="sync_connection_force_question">Renegociezi criptarea?</string>
+    <string name="sync_connection_force_question">Renegociezi cifrarea?</string>
     <string name="reset_verb">Resetează</string>
     <string name="reject">Respinge</string>
-    <string name="save_passphrase_in_settings">Salvează fraza de acces în setări</string>
+    <string name="save_passphrase_in_settings">Salvează parola din reglări</string>
     <string name="save_and_update_group_profile">Salvează și actualizează profilul grupului</string>
     <string name="connect_plan_repeat_join_request">Repetă cererea de alăturare?</string>
     <string name="restart_chat_button">Repornește conversația</string>
@@ -206,7 +206,7 @@
     <string name="save_profile_password">Salvează parola profilului</string>
     <string name="save_passphrase_and_open_chat">Salvează fraza de acces și deschide conversația</string>
     <string name="group_members_2">%s și %s</string>
-    <string name="renegotiate_encryption">Renegociază criptarea</string>
+    <string name="renegotiate_encryption">Renegociază cifrarea</string>
     <string name="save_and_notify_contact">Salvează și notifică contactul</string>
     <string name="save_and_notify_contacts">Salvează și notifică contactele</string>
     <string name="save_and_notify_group_members">Salvează și notifică membrii grupului</string>
@@ -214,7 +214,7 @@
     <string name="reply_verb">Răspunde</string>
     <string name="revoke_file__action">Revocă fișierul</string>
     <string name="save_servers_button">Salvează</string>
-    <string name="save_settings_question">Salvezi setările?</string>
+    <string name="save_settings_question">Salvezi reglările?</string>
     <string name="save_preferences_question">Salvezi preferințe?</string>
     <string name="settings_restart_app">Repornire</string>
     <string name="restore_database">Restabilește copia de rezervă a bazei de date</string>
@@ -241,8 +241,8 @@
     <string name="color_sent_message">Mesaj trimis</string>
     <string name="set_group_preferences">Setează preferințele grupului</string>
     <string name="icon_descr_sent_msg_status_sent">trimis</string>
-    <string name="srv_error_host">Adresa serverului este incompatibilă cu setările de rețea.</string>
-    <string name="srv_error_version">Versiunea serverului este incompatibilă cu setările de rețea.</string>
+    <string name="srv_error_host">Adresa serverului este incompatibilă cu reglările rețelei.</string>
+    <string name="srv_error_version">Versiunea serverului este incompatibilă cu reglările rețelei.</string>
     <string name="sending_via">Trimițând prin</string>
     <string name="sending_files_not_yet_supported">trimiterea de fișiere nu este acceptată încă</string>
     <string name="scan_code_from_contacts_app">Scanează codul de securitate din aplicația contactului tău</string>
@@ -293,7 +293,7 @@
     <string name="show_dev_options">Arată:</string>
     <string name="show_internal_errors">Arată erori interne</string>
     <string name="secret_text">secret</string>
-    <string name="settings_section_title_settings">SETĂRI</string>
+    <string name="settings_section_title_settings">REGLĂRI</string>
     <string name="rcv_group_event_1_member_connected">%s conectat</string>
     <string name="profile_update_event_set_new_picture">setează imagine de profil</string>
     <string name="share_text_sent_at">Trimis către: %s</string>
@@ -307,7 +307,7 @@
     <string name="custom_time_picker_select">Selectează</string>
     <string name="stop_snd_file__message">Trimiterea de fișiere va fi oprită.</string>
     <string name="send_verb">Trimite</string>
-    <string name="icon_descr_settings">Setări</string>
+    <string name="icon_descr_settings">Reglări</string>
     <string name="scan_code">Scanează cod</string>
     <string name="security_code">Cod de securitate</string>
     <string name="send_us_an_email">Trimite-ne email</string>
@@ -334,7 +334,7 @@
     <string name="icon_descr_simplex_team">Echipa SimpleX</string>
     <string name="shutdown_alert_question">Închizi?</string>
     <string name="simplex_link_contact">Adresă de contact SimpleX</string>
-    <string name="simplex_link_group">Link de grup SimpleX</string>
+    <string name="simplex_link_group">Link pentru grup SimpleX</string>
     <string name="simplex_link_mode">Link-uri SimpleX</string>
     <string name="simplex_link_invitation">Invitație unică SimpleX</string>
     <string name="image_descr_simplex_logo">Siglă SimpleX</string>
@@ -361,7 +361,7 @@
     <string name="chat_theme_apply_to_mode">Aplică pentru</string>
     <string name="add_contact_or_create_group">Începe o nouă conversație</string>
     <string name="star_on_github">Stea pe GitHub</string>
-    <string name="conn_event_disabled_pq">Criptare de la capăt la capăt standard</string>
+    <string name="conn_event_disabled_pq">Cifrare standard de la un capăt la altul</string>
     <string name="notifications_mode_periodic">Pornește periodic</string>
     <string name="network_smp_proxy_mode_always">Mereu</string>
     <string name="network_smp_proxy_mode_always_description">Folosește mereu rutare privată.</string>
@@ -369,7 +369,7 @@
     <string name="callstate_starting">pornire…</string>
     <string name="chat_item_ttl_seconds">%s secunde</string>
     <string name="start_chat_question">Începi conversația?</string>
-    <string name="wallpaper_advanced_settings">Setări avansate</string>
+    <string name="wallpaper_advanced_settings">Reglări avansate</string>
     <string name="bad_desktop_address">Adresă desktop rea</string>
     <string name="alert_title_msg_bad_id">ID de mesaj incorect</string>
     <string name="integrity_msg_bad_hash">Hash de mesaj incorect</string>
@@ -391,7 +391,7 @@
     <string name="connect_via_link_incognito">Conectare incognito</string>
     <string name="contact_already_exists">Contactul deja există</string>
     <string name="la_change_app_passcode">Schimbă codul de acces</string>
-    <string name="you_can_turn_on_lock">Poți porni Blocare SimpleX din Setări.</string>
+    <string name="you_can_turn_on_lock">Poți porni Blocare SimpleX din Reglări.</string>
     <string name="your_chats">Conversații</string>
     <string name="choose_file_title">Alege un fișier</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Contactul tău trebuie să fie online pentru a se completa conexiunea.
@@ -429,17 +429,17 @@
     <string name="create_profile_button">Crează</string>
     <string name="audio_device_bluetooth">Bluetooth</string>
     <string name="permissions_camera">Camera</string>
-    <string name="call_on_lock_screen">Apeluri pe ecranul de blocare:</string>
-    <string name="status_contact_has_e2e_encryption">contactul are criptare e2e</string>
-    <string name="status_contact_has_no_e2e_encryption">contactul nu are criptare e2e</string>
+    <string name="call_on_lock_screen">Apeluri pe ecranul blocat:</string>
+    <string name="status_contact_has_e2e_encryption">contactul are cifrare e2e</string>
+    <string name="status_contact_has_no_e2e_encryption">contactul nu are cifrare e2e</string>
     <string name="receipts_section_contacts">Contacte</string>
-    <string name="settings_section_title_chats">CONVERSAȚII</string>
+    <string name="settings_section_title_chats">DISCUȚII</string>
     <string name="chat_database_section">BAZĂ DE DATE CONVERSAȚIE</string>
     <string name="chat_database_deleted">Baza de date a conversației ștearsă</string>
     <string name="chat_is_running">Conversația rulează</string>
     <string name="your_chat_database">Baza ta de date a conversațiilor</string>
-    <string name="database_is_not_encrypted">Baza ta de date a conversațiilor nu este criptată - setează frază de acces pentru a o proteja.</string>
-    <string name="database_encryption_will_be_updated_in_settings">Fraza de acces de criptare a bazei de date va fi actualizată și stocată în setări.</string>
+    <string name="database_is_not_encrypted">Baza de date a conversațiilor tale nu este cifrată - pune o parolă pentru a o proteja.</string>
+    <string name="database_encryption_will_be_updated_in_settings">Parola de cifrare a bazei de date va fi actualizată și stocată în reglări.</string>
     <string name="snd_group_event_changed_member_role">ai schimbat rolul %s la %s</string>
     <string name="alert_title_cant_invite_contacts">Nu se pot invita contactele!</string>
     <string name="you_joined_this_group">Te-ai alăturat grupului</string>
@@ -462,7 +462,7 @@
     <string name="icon_descr_cancel_live_message">Anulează mesajul live</string>
     <string name="connect_via_link_or_qr">Conectare prin link / cod QR</string>
     <string name="your_contacts_will_remain_connected">Contactele tale vor rămâne conectate.</string>
-    <string name="database_passphrase_will_be_updated">Fraza de acces de criptare a bazei de date va fi actualizată.</string>
+    <string name="database_passphrase_will_be_updated">Parola de cifrare a bazei de date va fi actualizată.</string>
     <string name="v4_3_irreversible_message_deletion_desc">Contactele tale pot permite ștergerea totală a mesajelor.</string>
     <string name="you_need_to_allow_to_send_voice">Trebuie să permiți contactului tău să trimită mesaje vocale pentru a le putea trimite.</string>
     <string name="core_version">Versiunede bază: v%s</string>
@@ -474,7 +474,7 @@
     <string name="snd_conn_event_switch_queue_phase_changing_for_member">se schimbă adresa pentru %s…</string>
     <string name="both_you_and_your_contact_can_send_disappearing">Și tu și contactul tău puteți trimite mesaje temporare.</string>
     <string name="cannot_receive_file">Nu se pot primi fișiere</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Poate fi dezactivat în setări</b> – notificările vor fi încă afișate cât timp aplicația rulează.]]></string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Poate fi dezactivat din reglări</b> – notificările vor fi afișate dacă aplicația este în funcțiune.]]></string>
     <string name="notifications_mode_periodic_desc">Verifică mesajele noi la fiecare 10 minute timp de până la 1 minut</string>
     <string name="you_have_no_chats">Nu ai conversații</string>
     <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contactul și toate mesajele vor fi șterse - acest lucru nu poate fi anulat!</string>
@@ -487,7 +487,7 @@
     <string name="network_session_mode_user">Profil conversație</string>
     <string name="bold_text">aldin</string>
     <string name="you_can_use_markdown_to_format_messages__prompt">Poți folosi markdown pentru a formata mesaje:</string>
-    <string name="callstatus_calling">Apelând…</string>
+    <string name="callstatus_calling">se apelează…</string>
     <string name="change_self_destruct_mode">Schimbă modul de autodistrugere</string>
     <string name="chat_database_imported">Baza de date a conversației importată</string>
     <string name="you_must_use_the_most_recent_version_of_database">Trebuie să folosești cea mai recentă versiune a bazei de date a conversațiilor DOAR pe un singur dispozitiv, altfel se poate să nu mai primești mesajele de la unele contacte.</string>
@@ -500,10 +500,10 @@
     <string name="notification_preview_somebody">Contact ascuns:</string>
     <string name="notification_preview_mode_contact">Nume contact</string>
     <string name="create_address">Crează adresă</string>
-    <string name="database_encrypted">Bază de date criptată!</string>
+    <string name="database_encrypted">Bază de date cifrată!</string>
     <string name="change_database_passphrase_question">Schimbi fraza de acces a bazei de date?</string>
     <string name="chat_is_stopped_indication">Conversația este oprită</string>
-    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Poți porni conversația prin Setările aplicației / Bază de date sau repornind aplicația.</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Poți porni discuția din Reglările aplicației / Baza de date sau repornind aplicația.</string>
     <string name="snd_group_event_user_left">ai ieșit</string>
     <string name="block_member_question">Blochezi membrul?</string>
     <string name="member_blocked_by_admin">Blocat de admin</string>
@@ -523,9 +523,8 @@
     <string name="connect_plan_connect_to_yourself">Te conectezi la tine?</string>
     <string name="migrate_from_device_check_connection_and_try_again">Verifică conexiunea la internet și încearcă din nou</string>
     <string name="settings_section_title_chat_colors">Culori conversație</string>
-    <string name="settings_section_title_chat_theme">Temă conversație</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Bun pentru baterie</b>. 
-\nServiciul în fundal verifică mesaje la fiecare 10 minute. Ai putea rata apeluri sau mesaje urgente.</string>
+    <string name="settings_section_title_chat_theme">Aspectul discuției</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Bun pentru baterie</b>. Aplicația verifică mesajele la fiecare 10 minute. Pot fi pierdute apeluri sau mesaje urgente.]]></string>
     <string name="theme_black">Negru</string>
     <string name="block_for_all_question">Blochezi membrul pentru toți?</string>
     <string name="both_you_and_your_contacts_can_delete">Și tu și contactul tău puteți șterge ireversibil mesajele trimise. (24 de ore)</string>
@@ -554,7 +553,7 @@
     <string name="connecting_to_desktop">Se conectează la desktop</string>
     <string name="icon_descr_asked_to_receive">Rugat să primească imaginea</string>
     <string name="connection_request_sent">Cerere de conexiune trimisă!</string>
-    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Vă rugăm să rețineți:</b> mesajele și releurile pentru fișiere sunt conectate printr-un proxy SOCKS. Apelurile ți trimiterea de previzualizări a link-urilor folosesc o conexiune directă.]]></string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>De reținut</b>: releele de mesaje și fișiere sunt conectate prin proxy SOCKS. Apelurile și trimiterea de previzualizări ale adreselor web utilizează conexiunea directă.]]></string>
     <string name="callstate_connected">conectat</string>
     <string name="confirm_passcode">Confirmați codul de access</string>
     <string name="confirm_database_upgrades">Confirmare actualizare bază de date</string>
@@ -573,16 +572,16 @@
     <string name="remote_ctrl_error_bad_state">Conexiunea la desktop este într-o stare proastă</string>
     <string name="smp_server_test_connect">Conectare</string>
     <string name="network_session_mode_entity">Conexiune</string>
-    <string name="clear_note_folder_question">Ștergeți notițele private?</string>
+    <string name="clear_note_folder_question">Ștergi notițele private?</string>
     <string name="multicast_connect_automatically">Conectare automată</string>
     <string name="callstatus_connecting">se conectează apelul…</string>
     <string name="group_member_status_intro_invitation">se conectează (invetație la introducere)</string>
     <string name="callstate_connecting">se conectează…</string>
     <string name="remote_host_error_bad_state"><![CDATA[Conexiunea la telefonul <b>%s</b> este într-o stare proastă]]></string>
-    <string name="migrate_to_device_confirm_network_settings">Confirmați setările de rețea</string>
+    <string name="migrate_to_device_confirm_network_settings">Confirmă reglările rețelei</string>
     <string name="display_name_connecting">se conectează…</string>
     <string name="connection_error_auth">Eroare de conexiune (AUTENTIFICARE)</string>
-    <string name="turning_off_service_and_periodic">Optimizarea pentru baterie este activă, vom opri serviciile din fundal și cererile periodice pentru mesaje noi. Le puteți reactiva din setări.</string>
+    <string name="turning_off_service_and_periodic">Optimizarea bateriei este activă, dezactivând serviciul de funcționare în ascuns și solicitările periodice pentru mesaje noi. Pot fi reactivate din reglări.</string>
     <string name="icon_descr_server_status_connected">conectat</string>
     <string name="create_group_button_to_create_new_group"><![CDATA[<b>Crează un grup:</b> pentru a crea un nou grup.]]></string>
     <string name="clear_chat_question">Ștergeți conversația?</string>
@@ -592,7 +591,7 @@
     <string name="chat_console">Consolă conversație</string>
     <string name="confirm_password">Confirmați parola</string>
     <string name="colored_text">colorat</string>
-    <string name="migrate_from_device_all_data_will_be_uploaded">Toate contactele, conversațiile și fișierele dumneavoastră vor fi encriptate într-un mod sigur și încărcate pe bucăți pe releurile XFTP configurate.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Toate contactele, conversațiile și fișierele tale vor fi cifrate într-un mod sigur și încărcate pe bucăți pe releurile XFTP configurate.</string>
     <string name="icon_descr_video_asked_to_receive">Rugat să primească videoclipul</string>
     <string name="smp_server_test_compare_file">Comparați fișierul</string>
     <string name="impossible_to_recover_passphrase"><![CDATA[<b>Vă rugăm să rețineți</b>: nu veți putea recupera sau schimba parola dacă o veți pierde.]]></string>
@@ -609,7 +608,7 @@
     <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Cel mai bun pentru baterie.</b> Veți primi notificări doar când aplicația rulează (FĂRĂ servicii de fundal).]]></string>
     <string name="icon_descr_call_connecting">Se conectează apelul</string>
     <string name="group_member_status_complete">complet</string>
-    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Vă rugăm să rețineți</b>: folosind aceeași bază de date pe două dispozitive, va intrerupe decripția mesajelor de la conexiunile dumneavoastră, ca protecție de securitate.]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>De reținut</b>: folosirea aceleiași baze de date în două aparate, va intrerupe descifrarea mesajelor din conexiunile tale, ca măsură de protecție.]]></string>
     <string name="migrate_from_device_confirm_upload">Confirmați încărcarea</string>
     <string name="migrate_from_device_confirm_you_remember_passphrase">Confirmați că țineți minte parola de la baza de date pentru a o migra.</string>
     <string name="info_row_connection">Conexiune</string>
@@ -635,7 +634,7 @@
     <string name="desktop_address">Adresă desktop</string>
     <string name="desktop_devices">Dispozitive desktop</string>
     <string name="desktop_device">Desktop</string>
-    <string name="decryption_error">Eroare decriptare</string>
+    <string name="decryption_error">Eroare de decriptare</string>
     <string name="delete_image">Șterge imagine</string>
     <string name="delete_after">Șterge după</string>
     <string name="full_deletion">Șterge pentru toată lumea</string>
@@ -677,10 +676,10 @@
     <string name="profile_update_event_contact_name_changed">Contactul %1$s a schimbat la %2$s</string>
     <string name="cant_call_contact_deleted_alert_text">Contactul este șters.</string>
     <string name="v6_0_connection_servers_status">Controlează-ți rețeaua</string>
-    <string name="database_encryption_will_be_updated">Fraza de acces pentru criptarea bazei de date va fi actualizată și stocată în Keystore.</string>
+    <string name="database_encryption_will_be_updated">Parola pentru cifrarea bazei de date va fi actualizată și stocată în Keystore.</string>
     <string name="database_passphrase">Fraza de acces a bazei de date</string>
     <string name="xftp_servers_configured">Servere XFTP configurate</string>
-    <string name="set_password_to_export_desc">Baza de date este criptată folosind o expresie de acces aleatorie. Schimbați-o înainte de a exporta.</string>
+    <string name="set_password_to_export_desc">Baza de date este cifrată folosind o parolă aleatorie. Trebuie schimbată înainte de exportare.</string>
     <string name="info_view_call_button">apel</string>
     <string name="info_view_connect_button">conectare</string>
     <string name="contact_deleted">Contact șters!</string>
@@ -689,7 +688,7 @@
     <string name="app_check_for_updates_notice_title">Verifică pentru actualizări</string>
     <string name="create_address_button">Creează</string>
     <string name="privacy_media_blur_radius">Estompează media</string>
-    <string name="settings_section_title_chat_database">BAZĂ DE DATE CHAT</string>
+    <string name="settings_section_title_chat_database">BAZĂ DE DATE DISCUȚIE</string>
     <string name="v6_0_connect_faster_descr">Conectează-te cu prietenii mai ușor.</string>
     <string name="attempts_label">încercări</string>
     <string name="completed">Completat</string>
@@ -714,10 +713,96 @@
     <string name="servers_info_sessions_connected">Conectat</string>
     <string name="correct_name_to">Corectează numele la %s?</string>
     <string name="chat_database_exported_continue">Continuă</string>
-    <string name="encrypted_with_random_passphrase">Baza de date este criptată folosind o expresie de acces aleatorie, o poți schimba</string>
+    <string name="encrypted_with_random_passphrase">Baza de date este cifrată folosind o parolă aleatorie; o poți schimba.</string>
     <string name="cant_send_message_to_member_alert_title">Nu se pot trimite mesaje membrului grupului</string>
     <string name="servers_info_sessions_connecting">Se conectează</string>
     <string name="servers_info_connected_servers_section_header">Servere conectate</string>
     <string name="cant_call_contact_alert_title">Nu se poate apela contactul</string>
-    <string name="cant_call_contact_connecting_wait_alert_text">Se conectează la contact, te rog așteaptă sau verifică mai târziu!</string>
-</resources>
\ No newline at end of file
+    <string name="cant_call_contact_connecting_wait_alert_text">Se conectează la contact, așteaptă sau verifică mai târziu!</string>
+    <string name="network_settings_title">Reglări avansate</string>
+    <string name="toolbar_settings">Reglări</string>
+    <string name="your_settings">Reglările tale</string>
+    <string name="encrypted_audio_call">apel vocal cifrat e2e</string>
+    <string name="encrypted_video_call">apel video cifrat e2e</string>
+    <string name="settings_section_title_device">APARAT</string>
+    <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
+    <string name="encrypt_database">Cifrează</string>
+    <string name="decryption_errors">erori la descifrare</string>
+    <string name="settings_section_title_you">TU</string>
+    <string name="status_no_e2e_encryption">necifrat e2e</string>
+    <string name="status_e2e_encrypted">cifrat e2e</string>
+    <string name="incoming_video_call">Apel video primit</string>
+    <string name="no_call_on_lock_screen">Dezactivează</string>
+    <string name="allow_calls_question">Permiți apeluri?</string>
+    <string name="callstate_ended">terminat</string>
+    <string name="v5_7_call_sounds">Sunete la apel</string>
+    <string name="v6_1_better_calls">Apeluri îmbunătățite</string>
+    <string name="incoming_audio_call">Apel audio primit</string>
+    <string name="call_service_notification_end_call">Termină apelul</string>
+    <string name="marked_deleted_description">marcate şterse</string>
+    <string name="marked_deleted_items_description">%d mesaje marcate șterse</string>
+    <string name="moderated_item_description">moderat de %s</string>
+    <string name="n_other_file_errors">%1$d alte erori de fișier.</string>
+    <string name="forward_files_messages_deleted_after_selection_title">%1$s mesaje netransmise</string>
+    <string name="description_you_shared_one_time_link">ai distribuit un link de unică folosință</string>
+    <string name="description_you_shared_one_time_link_incognito">ai distribuit un link ascuns de unică folosință</string>
+    <string name="description_via_group_link">prin link pentru grup</string>
+    <string name="description_via_group_link_incognito">ascuns prin link pentru grup</string>
+    <string name="simplex_link_mode_browser">Prin browser</string>
+    <string name="report_reason_spam">Reclamă</string>
+    <string name="report_reason_illegal">Conținut inadecvat</string>
+    <string name="report_reason_community">Încălcă normelor comunitare</string>
+    <string name="report_reason_profile">Profil inadecvat</string>
+    <string name="report_reason_other">Alt motiv</string>
+    <string name="error_saving_smp_servers">Eroare la salvarea serverelor SMP</string>
+    <string name="ensure_xftp_server_address_are_correct_format_and_unique">Asigurați-vă că adresele serverelor XFTP sunt în format corect, pe randuri separate și nu sunt duplicate.</string>
+    <string name="error_loading_xftp_servers">Eroare la încărcarea serverlor XFTP</string>
+    <string name="error_setting_network_config">Eroare la actualizarea configurației de rețea</string>
+    <string name="failed_to_parse_chats_title">Eșec la încărcarea conversațiilor</string>
+    <string name="contact_developers">Vă rugăm să actualizați aplicația și contactați dezvoltatorii.</string>
+    <string name="failed_to_create_user_title">Eroare la crearea profilului!</string>
+    <string name="blocked_items_description">%d mesaje blocate</string>
+    <string name="encryption_renegotiation_error">Eroare de renegociere a criptării</string>
+    <string name="display_name_invited_to_connect">invitat să se conecteze</string>
+    <string name="description_via_contact_address_link_incognito">ascuns prin link pentru adresa de contact</string>
+    <string name="description_via_one_time_link">printr-un link de unică folosință</string>
+    <string name="group_reports_active_one">1 raport</string>
+    <string name="chat_item_ttl_year">1 an</string>
+    <string name="forwarded_description">înaintat</string>
+    <string name="error_showing_message">eroare de afișare a mesajului</string>
+    <string name="error_showing_content">eroare de afișat conținutul</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Mesajele, fisierele si apelurile sunt protejate prin <b>criptare cap-coadă</b> cu secretizare înaintată perfecta, repudiere si recuperare în caz de spargere.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Mesajele, fisierele si apelurile sunt protejate prin <b>criptare cap-coadă rezistentă la algoritmi cuantici</b> cu secretizare înaintată perfecta, repudiere si recuperare în caz de spargere.]]></string>
+    <string name="e2ee_info_no_pq_short">Această conversație este protejată prin criptare cap-coadă.</string>
+    <string name="simplex_link_mode_full">Link întreg</string>
+    <string name="description_via_one_time_link_incognito">ascuns printr-un link de unică folosință</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="simplex_link_connection">prin %1$s</string>
+    <string name="error_loading_smp_servers">Eroare la încărcarea serverlor SMP</string>
+    <string name="forward_files_missing_desc">%1$d fișier(e) șterse.</string>
+    <string name="report_item_archived_by">raport arhivat de %s</string>
+    <string name="display_name_accepted_invitation">invitație acceptată</string>
+    <string name="ensure_smp_server_address_are_correct_format_and_unique">Asigurați-vă că adresele serverelor SMP sunt în format corect, pe randuri separate și nu sunt duplicate.</string>
+    <string name="error_saving_xftp_servers">Eroare la salvarea serverelor XFTP</string>
+    <string name="forward_files_in_progress_desc">%1$d fișier(e) încă în descărcare.</string>
+    <string name="forward_files_failed_to_receive_desc">%1$d fișier(e) a eșuat să se descărcarce.</string>
+    <string name="forward_files_not_accepted_desc">%1$d fișier(e) nu au fost descărcate.</string>
+    <string name="description_via_contact_address_link">prin link pentru adresa de contact</string>
+    <string name="simplex_link_mode_browser_warning">Deschiderea link-ului în browser poate reduce confidențialitatea și securitatea conexiunii. Link-urile SimpleX de neîncredere vor fi roșii.</string>
+    <string name="display_name_requested_to_connect">solicitat să se conecteze</string>
+    <string name="failed_to_parse_chat_title">Eșec la încărcarea conversației</string>
+    <string name="report_item_visibility_submitter">Doar tu și moderatorii vedeți asta</string>
+    <string name="report_item_visibility_moderators">Doar expeditorul şi moderatorii văd asta</string>
+    <string name="report_item_archived">raport arhivat</string>
+    <string name="blocked_by_admin_items_description">%d mesaje blocate de admin</string>
+    <string name="receiving_files_not_yet_supported">primirea de fișiere nu este acceptată încă</string>
+    <string name="sender_you_pronoun">tu</string>
+    <string name="unknown_message_format">format mesaj necunoscut</string>
+    <string name="invalid_message_format">format mesaj invalid</string>
+    <string name="live">LIVE</string>
+    <string name="moderated_description">moderat</string>
+    <string name="invalid_chat">conversație nevalidă</string>
+    <string name="invalid_data">date nevalide</string>
+    <string name="e2ee_info_pq_short">Această conversație este protejată prin criptare cap-coadă, rezistentă la algoritmi cuantici.</string>
+    <string name="note_folder_local_display_name">Notițe private</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
index f234a2cf0a..dae44e06af 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
@@ -754,7 +754,7 @@
     <string name="invite_prohibited_description">Вы пытаетесь пригласить инкогнито контакт в группу, где Вы используете свой основной профиль</string>
     <!-- GroupChatInfoView.kt -->
     <string name="button_add_members">Пригласить членов группы</string>
-    <string name="group_info_section_title_num_members">УЧАСТНИКОВ ГРУППЫ: %1$s</string>
+    <string name="group_info_section_title_num_members">%1$s ЧЛЕНОВ ГРУППЫ</string>
     <string name="group_info_member_you">Вы: %1$s</string>
     <string name="button_delete_group">Удалить группу</string>
     <string name="delete_group_question">Удалить группу?</string>
@@ -1019,7 +1019,7 @@
     <string name="moderate_message_will_be_deleted_warning">Сообщение будет удалено для всех членов группы.</string>
     <string name="moderate_message_will_be_marked_warning">Сообщение будет помечено как удаленное для всех членов группы.</string>
     <string name="observer_cant_send_message_desc">Пожалуйста, свяжитесь с админом группы.</string>
-    <string name="observer_cant_send_message_title">Вы не можете отправлять сообщения!</string>
+    <string name="observer_cant_send_message_title">Вы \"читатель\"</string>
     <string name="you_are_observer">только чтение сообщений</string>
     <string name="group_member_role_observer">читатель</string>
     <string name="initial_member_role">Роль при вступлении</string>
@@ -2027,8 +2027,7 @@
     <string name="servers_info_connected_servers_section_header">Подключенные серверы</string>
     <string name="servers_info_previously_connected_servers_section_header">Ранее подключенные серверы</string>
     <string name="servers_info_proxied_servers_section_header">Проксированные серверы</string>
-    <string name="servers_info_private_data_disclaimer">Начиная с %s.
-\nВсе данные хранятся только на вашем устройстве.</string>
+    <string name="servers_info_private_data_disclaimer">Начиная с %s.\nВсе данные хранятся только на вашем устройстве.</string>
     <string name="servers_info_reconnect_server_message">Переподключить сервер для устранения неполадок доставки сообщений. Это использует дополнительный трафик.</string>
     <string name="servers_info_modal_error_title">Ошибка</string>
     <string name="servers_info_reconnect_server_error">Ошибка переподключения к серверу</string>
@@ -2232,7 +2231,7 @@
     <string name="appearance_in_app_bars_alpha">Прозрачность</string>
     <string name="v6_2_network_decentralization">Децентрализация сети</string>
     <string name="v6_2_network_decentralization_descr">Второй оператор серверов в приложении!</string>
-    <string name="v6_2_network_decentralization_enable_flux">Включить Flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">Включите Flux в настройках Сеть и серверы для лучшей конфиденциальности метаданных.</string>
     <string name="v6_2_network_decentralization_enable_flux_reason">для лучшей конфиденциальности метаданных.</string>
     <string name="v6_2_improved_chat_navigation">Улучшенная навигация в разговоре</string>
     <string name="view_updated_conditions">Посмотреть измененные условия</string>
@@ -2297,8 +2296,8 @@
     <string name="network_preset_servers_title">Серверы по умолчанию</string>
     <string name="member_role_will_be_changed_with_notification_chat">Роль будет изменена на %s. Все участники разговора получат уведомление.</string>
     <string name="chat_main_profile_sent">Ваш профиль будет отправлен участникам разговора.</string>
-    <string name="operator_same_conditions_will_be_applied"><![CDATA[Те же самые условия будут приняты для оператора <b>%s</b>.]]></string>
-    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Те же самые условия будут приняты для оператора(ов): <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Те же условия будут действовать для оператора <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Те же условия будут действовать для операторов: <b>%s</b>.]]></string>
     <string name="operator_conditions_of_use">Условия использования</string>
     <string name="operator_added_xftp_servers">Дополнительные серверы файлов и медиа</string>
     <string name="error_updating_server_title">Ошибка сохранения сервера</string>
@@ -2320,13 +2319,206 @@
     <string name="no_message_servers_configured_for_private_routing">Нет серверов для доставки сообщений.</string>
     <string name="onboarding_network_operators_configure_via_settings">Вы можете настроить серверы позже.</string>
     <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat и Flux заключили соглашение добавить серверы под управлением Flux в приложение.</string>
-    <string name="onboarding_network_operators_app_will_use_different_operators">Приложение улучшает конфиденциальность используя разных операторов в каждом разговоре.</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Приложение защищает вашу конфиденциальность, используя разные операторы в каждом разговоре.</string>
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Когда больше чем один оператор включен, ни один из них не видит метаданные, чтобы определить, кто соединен с кем.</string>
     <string name="failed_to_save_servers">Ошибка сохранения серверов</string>
     <string name="onboarding_network_operators_conditions_will_be_accepted">Условия будут приняты для включенных операторов через 30 дней.</string>
     <string name="error_accepting_operator_conditions">Ошибка приема условий</string>
     <string name="connection_error_quota_desc">Соединение достигло предела недоставленных сообщений. Возможно, Ваш контакт не в сети.</string>
     <string name="to_protect_against_your_link_replaced_compare_codes">Чтобы защитить Вашу ссылку от замены, Вы можете сравнить код безопасности.</string>
-    <string name="onboarding_network_operators_app_will_use_for_routing">Например, если Ваш контакт получает сообщения через сервер SimpleX Chat, Ваше приложение доставит их через сервер Flux.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Например, если ваш контакт получает сообщения через сервер SimpleX Chat, ваше приложение будет доставлять их через сервер Flux.</string>
     <string name="direct_messages_are_prohibited_in_chat">Прямые сообщения между членами запрещены в этом разговоре.</string>
-</resources>
\ No newline at end of file
+    <string name="chat_list_groups">Группы</string>
+    <string name="delete_chat_list_menu_action">Удалить</string>
+    <string name="delete_chat_list_question">Удалить список?</string>
+    <string name="chat_list_all">Все</string>
+    <string name="change_order_chat_list_menu_action">Изменить порядок</string>
+    <string name="chat_list_favorites">Избранное</string>
+    <string name="display_name_requested_to_connect">запрошено соединение</string>
+    <string name="edit_chat_list_menu_action">Редактировать</string>
+    <string name="chat_list_businesses">Предприятия</string>
+    <string name="debug_logs">Включить журналы</string>
+    <string name="onboarding_network_about_operators">О операторах</string>
+    <string name="error_saving_database">Ошибка при сохранении базы данных</string>
+    <string name="connection_not_ready">Соединение не готово.</string>
+    <string name="error_updating_chat_tags">Ошибка обновления списка чата</string>
+    <string name="error_creating_chat_tags">Ошибка создания списка чатов</string>
+    <string name="list_menu">Список</string>
+    <string name="no_chats_in_list">Никаких чатов в списке %s.</string>
+    <string name="no_unread_chats">Без непрочитанных чатов</string>
+    <string name="no_chats">Никаких чатов</string>
+    <string name="no_chats_found">Чаты не найдены</string>
+    <string name="delete_chat_list_warning">Все чаты будут удалены из списка %s, а сам список удален</string>
+    <string name="chat_list_add_list">Добавить список</string>
+    <string name="chat_list_notes">Примечания</string>
+    <string name="open_with_app">Открыто с %s</string>
+    <string name="create_list">Создать список</string>
+    <string name="add_to_list">Добавить в список</string>
+    <string name="change_list">Изменить список</string>
+    <string name="save_list">Сохранить список</string>
+    <string name="list_name_field_placeholder">Имя списка...</string>
+    <string name="sync_connection_question">Исправить соединение?</string>
+    <string name="sync_connection_desc">Соединение требует повторного согласования шифрования.</string>
+    <string name="sync_connection_confirm">Исправление</string>
+    <string name="encryption_renegotiation_in_progress">Выполняется повторное согласование шифрования.</string>
+    <string name="display_name_accepted_invitation">принятое приглашение</string>
+    <string name="error_loading_chat_tags">Ошибка при загрузке списков чатов</string>
+    <string name="chat_list_contacts">Контакты</string>
+    <string name="duplicated_list_error">Название списка и эмодзи должны быть разными для всех списков.</string>
+    <string name="report_verb">Пожаловаться</string>
+    <string name="report_reason_spam">Спам</string>
+    <string name="report_compose_reason_header_spam">Пожаловаться на спам: увидят только модераторы группы.</string>
+    <string name="change_automatic_chat_deletion_message">Это действие не может быть отмененено - сообщения, отправленные и полученные в этом чате ранее чем выбранное, будут удалены</string>
+    <string name="v6_3_mentions_descr">Получайте уведомления от упоминаний.</string>
+    <string name="member_reports_are_prohibited">Сообщения о нарушениях запрещены в этой группе.</string>
+    <string name="report_compose_reason_header_community">Пожаловаться на нарушение: увидят только модераторы группы.</string>
+    <string name="text_field_set_chat_placeholder">Установить имя чата…</string>
+    <string name="v6_3_better_groups_performance">Улучшенная производительность групп</string>
+    <string name="v6_3_private_media_file_names">Приватные названия медиафайлов.</string>
+    <string name="blocking_reason_spam">Спам</string>
+    <string name="chat_list_group_reports">Сообщения о нарушениях</string>
+    <string name="unread_mentions">Непрочитанные упоминания</string>
+    <string name="privacy_chat_list_open_links_yes">Да</string>
+    <string name="v6_3_mentions">Упоминайте участников 👋</string>
+    <string name="v6_3_better_privacy_and_security">Улучшенная приватность и безопасность</string>
+    <string name="v6_3_faster_deletion_of_groups">Ускорено удаление групп.</string>
+    <string name="v6_3_faster_sending_messages">Ускорена отправка сообщений.</string>
+    <string name="v6_3_reports_descr">Помогайте администраторам модерировать их группы.</string>
+    <string name="v6_3_organize_chat_lists">Организуйте чаты в списки</string>
+    <string name="v6_3_reports">Вы можете сообщить о нарушениях</string>
+    <string name="v6_3_set_message_expiration_in_chats">Установите время исчезания сообщений в чатах.</string>
+    <string name="max_group_mentions_per_message_reached">Вы можете упомянуть до %1$s пользователей в одном сообщении!</string>
+    <string name="report_reason_alert_title">Причина сообщения?</string>
+    <string name="report_archive_alert_desc">Эта жалоба будет архивирована для вас.</string>
+    <string name="enable_sending_member_reports">Разрешить отправлять сообщения о нарушениях модераторам.</string>
+    <string name="blocking_reason_content">Содержание нарушает условия использования</string>
+    <string name="error_reading_passphrase">Ошибка чтения пароля базы данных</string>
+    <string name="report_item_archived_by">сообщение о нарушении заархивировано %s</string>
+    <string name="report_reason_community">Нарушение правил группы</string>
+    <string name="report_reason_illegal">Неприемлемое сообщение</string>
+    <string name="report_reason_other">Другая причина</string>
+    <string name="report_reason_profile">Неприемлемый профиль</string>
+    <string name="group_reports_active">%d сообщений о нарушениях</string>
+    <string name="error_creating_report">Ошибка создания сообщения о нарушении</string>
+    <string name="connection_error_blocked">Соединение заблокировано</string>
+    <string name="connection_error_blocked_desc">Соединение заблокировано сервером оператора:\n%1$s.</string>
+    <string name="privacy_chat_list_open_links_ask">Спросить</string>
+    <string name="disable_automatic_deletion_question">Отключить автоматическое удаление сообщений?</string>
+    <string name="chat_ttl_options_footer">Удалить сообщения с вашего устройства.</string>
+    <string name="disable_automatic_deletion">Отключить удаление сообщений</string>
+    <string name="chat_item_ttl_default">по умолчанию (%s)</string>
+    <string name="report_archive_alert_desc_all">Все сообщения о нарушениях будут заархивированы для вас.</string>
+    <string name="report_archive_alert_title_all">Архивировать все сообщения о нарушениях?</string>
+    <string name="report_archive_alert_title_nth">Архивировать %d сообщений о нарушениях?</string>
+    <string name="report_archive_for_me">Для меня</string>
+    <string name="archive_report">Архивировать сообщение о нарушении</string>
+    <string name="archive_reports">Архивировать сообщения о нарушениях</string>
+    <string name="delete_report">Удалить сообщение о нарушении</string>
+    <string name="file_error_blocked">Файл заблокирован оператором сервера:\n%1$s.</string>
+    <string name="report_archive_for_all_moderators">Для всех модераторов</string>
+    <string name="group_reports_active_one">1 сообщение о нарушении</string>
+    <string name="change_automatic_deletion_question">Измененить автоматическое удаление сообщений?</string>
+    <string name="chat_item_ttl_year">1 год</string>
+    <string name="v6_3_organize_chat_lists_descr">Не пропустите важные сообщения.</string>
+    <string name="prefs_error_saving_settings">Ошибка сохранения настроек</string>
+    <string name="report_item_archived">заархивированное сообщение о нарушении</string>
+    <string name="archive_verb">архивировать</string>
+    <string name="report_archive_alert_title">Архивировать сообщение о нарушении?</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Пароль не может быть прочитан из Keystore. Это могло произойти после обновления системы, несовместимого с приложением. Если это не так, обратитесь к разработчикам.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Пароль не может быть прочитан из Keystore, пожалуйста, введите его. Это могло произойти после обновления системы, несовместимого с приложением. Если это не так, обратитесь к разработчикам.</string>
+    <string name="group_member_role_moderator">модератор</string>
+    <string name="group_member_status_pending_approval">ожидает утверждения</string>
+    <string name="group_member_status_pending_approval_short">ожидает</string>
+    <string name="operator_updated_conditions">Обновленные условия</string>
+    <string name="disable_sending_member_reports">Запретить жаловаться модераторам группы.</string>
+    <string name="group_members_can_send_reports">Члены группы могут пожаловаться модераторам.</string>
+    <string name="disable_automatic_deletion_message">Сообщения в этом чате никогда не будут удалены.</string>
+    <string name="privacy_chat_list_open_links">Открыть ссылку из списка чатов</string>
+    <string name="privacy_chat_list_open_web_link_question">Открыть веб-ссылку?</string>
+    <string name="report_compose_reason_header_profile">Пожаловаться на профиль: увидят только модераторы группы.</string>
+    <string name="group_reports_member_reports">Сообщения о нарушениях</string>
+    <string name="report_compose_reason_header_other">Пожаловаться: увидят только модераторы группы.</string>
+    <string name="mute_all_chat">Выключить уведомления для всех</string>
+    <string name="network_smp_web_port_footer">Использовать TCP-порт %1$s, когда порт не указан.</string>
+    <string name="network_smp_web_port_preset_footer">Использовать TCP-порт 443 только для серверов по умолчанию.</string>
+    <string name="network_smp_web_port_all">Все серверы</string>
+    <string name="network_smp_web_port_preset">Серверы по умолчанию</string>
+    <string name="network_smp_web_port_off">Нет</string>
+    <string name="network_smp_web_port_toggle">Использовать веб-порт</string>
+    <string name="privacy_chat_list_open_links_no">Нет</string>
+    <string name="report_compose_reason_header_illegal">Пожаловаться на сообщение: увидят только модераторы группы.</string>
+    <string name="group_preview_rejected">отклонён</string>
+    <string name="notification_group_report">Сообщение о нарушении: %s</string>
+    <string name="network_smp_web_port_section_title">TCP-порт для отправки сообщений</string>
+    <string name="privacy_chat_list_open_web_link">Открыть ссылку</string>
+    <string name="group_member_status_rejected">отклонён</string>
+    <string name="report_item_visibility_moderators">Только отправитель и модераторы видят это</string>
+    <string name="report_item_visibility_submitter">Только вы и модераторы видят это</string>
+    <string name="unblock_members_for_all_question">Разблокировать членов для всех?</string>
+    <string name="unblock_members_desc">Сообщения от этих членов группы будут показаны!</string>
+    <string name="block_members_desc">Все новые сообщения от этих членов группы будут скрыты!</string>
+    <string name="block_members_for_all_question">Заблокировать членов для всех?</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Члены группы будут удалены - это действие нельзя отменить!</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Участники будут удалены из разговора - это действие нельзя отменить!</string>
+    <string name="feature_roles_moderators">модераторы</string>
+    <string name="button_remove_members_question">Удалить членов группы?</string>
+    <string name="onboarding_conditions_accept">Принять</string>
+    <string name="onboarding_conditions_by_using_you_agree">Используя SimpleX Chat, Вы согласны:\n- отправлять только законные сообщения в публичных группах.\n- уважать других пользователей – не отправлять спам.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Частные разговоры, группы и Ваши контакты недоступны для операторов серверов.</string>
+    <string name="onboarding_conditions_configure_server_operators">Настроить операторов серверов</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Политика конфиденциальности и условия использования.</string>
+    <string name="member_criteria_all">все</string>
+    <string name="accept_pending_member_button">Принять</string>
+    <string name="accept_pending_member_alert_question">Участник хочет присоединиться к группе. Принять?</string>
+    <string name="cant_send_message_group_deleted">группа удалена</string>
+    <string name="cant_send_message_mem_removed">удален из группы</string>
+    <string name="group_new_support_chats_short">%d чата(ов)</string>
+    <string name="cant_send_message_contact_not_ready">контакт не готов</string>
+    <string name="cant_send_message_contact_deleted">контакт удален</string>
+    <string name="cant_send_message_contact_not_synchronized">не синхронизирован</string>
+    <string name="cant_send_message_rejected">запрос на вступление отклонён</string>
+    <string name="rcv_group_event_new_member_pending_review">Новый участник хочет присоединиться к группе.</string>
+    <string name="snd_group_event_user_pending_review">Пожалуйста, подождите, пока модераторы группы рассмотрят ваш запрос на вступление.</string>
+    <string name="group_member_status_pending_review">ожидает одобрения</string>
+    <string name="reject_pending_member_button">Отклонить</string>
+    <string name="reject_pending_member_alert_title">Отклонить участника?</string>
+    <string name="error_deleting_member_support_chat">Ошибка при удалении чата с членом группы</string>
+    <string name="full_link_button_text">Полная ссылка</string>
+    <string name="error_accepting_member">Ошибка вступления члена группы</string>
+    <string name="unsupported_connection_link">Ссылка не поддерживается</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Эта ссылка требует новую версию. Обновите приложение или попросите Ваш контакт прислать совместимую ссылку.</string>
+    <string name="group_new_support_messages">%d сообщений</string>
+    <string name="report_sent_alert_msg_view_in_support_chat">Вы можете найти Ваши жалобы в Чате с админами.</string>
+    <string name="button_support_chat">Чат с админами</string>
+    <string name="button_support_chat_member">Чат с членом группы</string>
+    <string name="member_criteria_off">выключено</string>
+    <string name="admission_stage_review">Одобрять членов</string>
+    <string name="member_support">Чаты с членами группы</string>
+    <string name="member_admission">Приём членов в группу</string>
+    <string name="admission_stage_review_descr">Одобрять членов для вступления в группу.</string>
+    <string name="no_support_chats">Нет чатов с членами группы</string>
+    <string name="accept_pending_member_alert_confirmation_as_observer">Принять как читателя</string>
+    <string name="accept_pending_member_alert_confirmation_as_member">Принять в группу</string>
+    <string name="accept_pending_member_alert_title">Принять члена</string>
+    <string name="reviewed_by_admins">одобрен админами</string>
+    <string name="report_sent_alert_title">Жалоба отправлена модераторам</string>
+    <string name="cant_send_message_you_left">Вы вышли</string>
+    <string name="cant_send_message_generic">нельзя отправлять</string>
+    <string name="group_new_support_chats">%d чатов с членами группы</string>
+    <string name="cant_send_message_contact_disabled">контакт выключен</string>
+    <string name="cant_send_message_member_has_old_version">член имеет старую версию</string>
+    <string name="cant_send_message_alert_title">Вы не можете отправлять сообщения!</string>
+    <string name="short_link_button_text">Короткая ссылка</string>
+    <string name="save_admission_question">Сохранить настройки вступления?</string>
+    <string name="snd_group_event_member_accepted">Вы приняли этого члена</string>
+    <string name="group_member_status_pending_review_short">рассмотрение</string>
+    <string name="set_member_admission">Установить вступление в группу</string>
+    <string name="delete_member_support_chat_alert_title">Удалить чат с членом группы?</string>
+    <string name="delete_member_support_chat_button">Удалить разговор</string>
+    <string name="rcv_group_event_member_accepted">принят %1$s</string>
+    <string name="support_chat">Чат с админами</string>
+    <string name="rcv_group_event_user_accepted">Вы приняты</string>
+    <string name="group_new_support_chat_one">1 чат с членом группы</string>
+    <string name="simplex_link_channel">SimpleX ссылка канала</string>
+    <string name="privacy_short_links">Короткие ссылки (БЕТА)</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/th/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/th/strings.xml
index ebf57836b5..b4d854c3d1 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/th/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/th/strings.xml
@@ -1328,4 +1328,4 @@
     <string name="in_reply_to">ในการตอบกลับถึง</string>
     <string name="no_history">ไม่มีประวัติ</string>
     <string name="conn_event_ratchet_sync_ok">encryptionใช้ได้</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/tr/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/tr/strings.xml
index 503d82158f..257daec596 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/tr/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/tr/strings.xml
@@ -93,7 +93,7 @@
     <string name="save_preferences_question">Tercihleri kaydet\?</string>
     <string name="save_profile_password">Profil parolasını kaydet</string>
     <string name="profile_is_only_shared_with_your_contacts">Profil sadece konuştuğun kişilerle paylaşılır.</string>
-    <string name="next_generation_of_private_messaging">Gizli iletişimin\ngelecek kuşağı</string>
+    <string name="next_generation_of_private_messaging">Mesajlaşmanın geleceği</string>
     <string name="icon_descr_audio_off">Ses kapalı</string>
     <string name="authentication_cancelled">Doğrulama iptal edildi</string>
     <string name="settings_restart_app">Yeniden başlat</string>
@@ -264,7 +264,7 @@
     <string name="v5_1_self_destruct_passcode_descr">Kullanıldığında bütün veriler silinir.</string>
     <string name="timed_messages">Kendiliğinden yok olan mesajlar</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Kişilerinin sana, kendiğinden yok olan mesajlar göndermesine izin ver.</string>
-    <string name="disappearing_messages_are_prohibited">Bu grupta kendiliğinden yok olan mesajlara izin verilmiyor.</string>
+    <string name="disappearing_messages_are_prohibited">Kendiliğinden yok olan mesajlara izin verilmiyor.</string>
     <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d mesajlar deşifrelenemedi.</string>
     <string name="group_info_section_title_num_members">%1$s ÜYELER</string>
     <string name="integrity_msg_skipped">%1$d atlanılmış mesaj(lar)</string>
@@ -605,7 +605,7 @@
     <string name="v5_2_fix_encryption_descr">Yedekleri geri yükledikten sonra şifrelemeyi onar.</string>
     <string name="v4_4_french_interface">Fransız arayüzü</string>
     <string name="v4_6_reduced_battery_usage">Daha da azaltılmış pil kullanımı</string>
-    <string name="group_members_can_add_message_reactions">Grup üyeleri, mesajlara tepki ekleyebilir.</string>
+    <string name="group_members_can_add_message_reactions">Üyeler, mesajlara tepki ekleyebilir.</string>
     <string name="group_profile_is_stored_on_members_devices">Grup profili, üyelerinin aygıtlarında barındırılmaktadır, sunucularda değil.</string>
     <string name="hide_verb">Gizle</string>
     <string name="user_hide">Gizle</string>
@@ -648,9 +648,9 @@
     <string name="group_full_name_field">Grup tam adı:</string>
     <string name="files_and_media">Dosya ve medya</string>
     <string name="group_members_can_send_dms">Grup üyeleri doğrudan mesaj gönderebilir.</string>
-    <string name="group_members_can_delete">Grup üyeleri, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)</string>
+    <string name="group_members_can_delete">Üyeler, gönderilen mesajları kalıcı olarak silebilir. (24 saat içinde)</string>
     <string name="group_members_can_send_voice">Grup üyeleri sesli mesaj gönderebilirler.</string>
-    <string name="files_are_prohibited_in_group">Bu toplu konuşmada, dosya ve medya yasaklanmıştır.</string>
+    <string name="files_are_prohibited_in_group">Dosya ve medya yasaklanmıştır.</string>
     <string name="group_members_can_send_files">Grup üyeleri dosya ve medya paylaşabilir.</string>
     <string name="v4_2_group_links">Grup bağlantıları</string>
     <string name="v5_2_disappear_one_message_descr">Konuşmada devre dışı bırakıldığında bile</string>
@@ -690,7 +690,7 @@
     <string name="keychain_is_storing_securely">Android Keystore parolayı güvenli bir şekilde saklamak için kullanılır - bildirim hizmetinin çalışmasını sağlar.</string>
     <string name="button_welcome_message">Karşılama mesajı</string>
     <string name="group_welcome_title">Karşılama mesajı</string>
-    <string name="voice_messages_are_prohibited">Bu grupta sesli mesajlar yasaktır.</string>
+    <string name="voice_messages_are_prohibited">Sesli mesajlar yasaktır.</string>
     <string name="whats_new">Neler yeni</string>
     <string name="new_in_version">%s sürümünde yeni</string>
     <string name="whats_new_read_more">Daha fazla bilgi edinin</string>
@@ -704,7 +704,7 @@
     <string name="icon_descr_instant_notifications">Anlık bildirimler</string>
     <string name="service_notifications">Anlık bildirimler</string>
     <string name="service_notifications_disabled">Anlık bildirimler devre dışı!</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Kullanmak için, lütfen bir sonraki iletişim kutusunda <b>SimpleX in arkaplanda çalışmasına izin ver</b> seçeneğini işaretleyin. Aksi takdirde, bildirimler devre dışı bırakılacaktır.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[Bildirimleri anında almak için bir sonraki iletişim kutusunda buna <b>izin verin</b>. ]]></string>
     <string name="notification_preview_mode_contact">Kişi ismi</string>
     <string name="auth_device_authentication_is_disabled_turning_off">Cihaz doğrulaması devre dışı. SimpleX Kilidi Kapatılıyor.</string>
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Cihaz doğrulaması etkin değil. Cihaz doğrulamasını etkinleştirdikten sonra SimpleX Kilidini Ayarlar üzerinden açabilirsiniz.</string>
@@ -730,7 +730,7 @@
     <string name="invite_friends">Arkadaşlarınızı davet edin</string>
     <string name="bold_text">kalın</string>
     <string name="italic_text">italik</string>
-    <string name="onboarding_notifications_mode_subtitle">Daha sonra ayarlardan değiştirebilirsiniz.</string>
+    <string name="onboarding_notifications_mode_subtitle">Pili nasıl etkiler</string>
     <string name="status_contact_has_e2e_encryption">kişi uçtan uca şifrelemeye sahiptir</string>
     <string name="status_contact_has_no_e2e_encryption">kişi uçtan uca şifrelemeye sahip değildir</string>
     <string name="chat_is_stopped">Sohbet durduruldu</string>
@@ -758,7 +758,7 @@
     <string name="v5_1_japanese_portuguese_interface">Japonca ve Portekizce kullanıcı arayüzü</string>
     <string name="alert_title_cant_invite_contacts">Kişiler davet edilemiyor!</string>
     <string name="alert_title_group_invitation_expired">Davetin süresi dolmuş!</string>
-    <string name="message_deletion_prohibited_in_chat">Geri alınamaz mesaj silme bu grupta yasaktır</string>
+    <string name="message_deletion_prohibited_in_chat">Geri alınamaz mesaj silme yasaktır</string>
     <string name="delivery_receipts_title">Mesaj gönderildi bilgisi!</string>
     <string name="joining_group">Gruba katılınıyor</string>
     <string name="description_you_shared_one_time_link_incognito">tek seferlik gizli bağlantı paylaştınız</string>
@@ -835,7 +835,7 @@
     <string name="switch_receiving_address">Alıcı adresini değiştir</string>
     <string name="message_reactions">Mesaj tepkileri</string>
     <string name="your_preferences">Tercihleriniz</string>
-    <string name="message_reactions_are_prohibited">Mesaj tepkileri bu grupta yasaklıdır</string>
+    <string name="message_reactions_are_prohibited">Mesaj tepkileri yasaklıdır.</string>
     <string name="connected_to_server_to_receive_messages_from_contact">Bu kişiden mesaj almak için kullanılan sunucuya bağlısınız.</string>
     <string name="you_are_already_connected_to_vName_via_this_link">Zaten %1$s e bağlısınız</string>
     <string name="la_could_not_be_verified">Doğrulanamadınız; lütfen tekrar deneyin.</string>
@@ -931,7 +931,7 @@
     <string name="v5_2_more_things_descr">- daha stabil mesaj iletimi.
 \n- biraz daha iyi gruplar.
 \n- ve daha fazlası!</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Sadece istemci cihazlar <b>2 katmanlı uçtan uca şifreleme</b> ile kullanıcı profillerini, kişileri, grupları ve gönderilen mesajları depolar.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Sadece istemci cihazlar kullanıcı profillerini, kişileri, grupları ve gönderilen mesajları depolar.</string>
     <string name="only_group_owners_can_change_prefs">Grup tercihlerini sadece grup sahipleri değiştirebilir.</string>
     <string name="item_info_no_text">metin yok</string>
     <string name="network_status">Ağ durumu</string>
@@ -940,7 +940,7 @@
     <string name="change_lock_mode">Kilit modunu değiştir</string>
     <string name="trying_to_connect_to_server_to_receive_messages">Bu kişiden mesaj almak için kullanılan sunucuya bağlanılmaya çalışılıyor.</string>
     <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Lütfen doğru bağlantıyı kullandığınızı kontrol edin veya irtibat kişinizden size başka bir bağlantı göndermesini isteyin.</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Gizliliğinizi korumak için, anlık bildirimler yerine <b>SimpleX arka plan hizmeti</b> kullanılır - günde pilin yüzde birkaçını kullanır.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Gizliliğinizi korumak için anlık bildirimler kullanmak yerine, <b>SimpleX arka planda çalışır</b>.]]></string>
     <string name="periodic_notifications">Periyodik bildirimler</string>
     <string name="periodic_notifications_disabled">Periyodik bildirimler devre dışı</string>
     <string name="enter_passphrase_notification_desc">Bildirimleri almak için lütfen veri tabanı parolasını girin</string>
@@ -949,7 +949,7 @@
     <string name="la_notice_turn_on">Aç</string>
     <string name="la_please_remember_to_store_password">Hatırlayın veya güvenli bir şekilde saklayın - kaybolan bir parolayı kurtarmanın bir yolu yoktur!</string>
     <string name="auth_open_chat_console">Sohbet konsolunu aç</string>
-    <string name="auth_open_chat_profiles">Sohbet profillerini aö</string>
+    <string name="auth_open_chat_profiles">Sohbet profillerini değiştir.</string>
     <string name="this_text_is_available_in_settings">Bu metin ayarlarda mevcut</string>
     <string name="no_filtered_chats">Filtrelenmiş sohbet yok</string>
     <string name="images_limit_title">Çok fazla görsel!</string>
@@ -1022,7 +1022,7 @@
     <string name="v4_5_message_draft">Mesaj taslağı</string>
     <string name="v4_6_hidden_chat_profiles_descr">Sohbet profillerini parola ile koru!</string>
     <string name="v4_5_reduced_battery_usage">Daha az pil kullanımı</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Gizliliği korumak için, diğer tüm platformlar gibi kullanıcı kimliği kullanmak yerine, SimpleX mesaj kuyrukları için kişilerinizin her biri için ayrı tanımlayıcılara sahiptir.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Gizliliği korumak için, SimpleX her bir konuşma için farklı bir ID kullanır.</string>
     <string name="trying_to_connect_to_server_to_receive_messages_with_error">Bu kişiden mesaj almak için kullanılan sunucuya bağlanılmaya çalışılıyor (hata: %1$s).</string>
     <string name="v4_4_live_messages_desc">Alıcılar güncellemeleri siz yazdıkça görürler.</string>
     <string name="auth_log_in_using_credential">Bilgilerinizi kullanarak giriş yapın</string>
@@ -1201,7 +1201,7 @@
     <string name="scan_from_mobile">Mobilden tara</string>
     <string name="verify_connections">Bağlantıları onayla</string>
     <string name="share_message">Mesaj paylaş…</string>
-    <string name="alert_text_msg_bad_hash">Önceki mesajın hash\'i farklı.</string>
+    <string name="alert_text_msg_bad_hash">Önceki mesajın hash\'i farklı.\"</string>
     <string name="lock_not_enabled">SimpleX Kilit aktif değil!</string>
     <string name="chat_lock">SimpleX Kilit</string>
     <string name="connect_via_member_address_alert_title">Doğrudan bağlanılsın mı?</string>
@@ -1713,7 +1713,7 @@
     <string name="prohibit_sending_simplex_links">SimpleX bağlantısı gönderimini yasakla</string>
     <string name="network_option_rcv_concurrency">Eşzamanlılık alınıyor</string>
     <string name="simplex_links">SimpleX bağlantıları</string>
-    <string name="simplex_links_are_prohibited_in_group">SimpleX bağlantıları bu grupta yasaklandı</string>
+    <string name="simplex_links_are_prohibited_in_group">SimpleX bağlantıları yasaklandı</string>
     <string name="audio_device_earpiece">Kulaklık</string>
     <string name="audio_device_speaker">Hoparlör</string>
     <string name="audio_device_wired_headphones">Kulaklıklar</string>
@@ -2053,14 +2053,14 @@
     <string name="icon_descr_sound_muted">Ses kapatıldı</string>
     <string name="servers_info_uploaded">Yüklendi</string>
     <string name="servers_info_reset_stats_alert_message">Sunucu istatistikleri sıfırlanacaktır - bu geri alınamaz!</string>
-    <string name="one_hand_ui">Erişilebilir sohbet araç çubuğu</string>
+    <string name="one_hand_ui">Erişilebilir uygulama araç çubukları</string>
     <string name="one_hand_ui_change_instruction">Görünüm ayarlarından değiştirebilirsiniz.</string>
     <string name="one_hand_ui_card_title">Sohbet listesini değiştir:</string>
     <string name="system_mode_toast">Sistem modu</string>
     <string name="v6_0_reachable_chat_toolbar">Erişilebilir sohbet araç çubuğu</string>
     <string name="servers_info_target">İçin bilgi gösteriliyor</string>
     <string name="servers_info_statistics_section_header">İstatistikler</string>
-    <string name="servers_info_private_data_disclaimer">%s\'den başlayarak.\nTüm veriler cihazınıza özeldir.</string>
+    <string name="servers_info_private_data_disclaimer">%s\'den başlayarak.\nTüm veriler cihazınızda gizli tutulur.</string>
     <string name="sent_via_proxy">Bir proxy aracılığıyla gönderildi</string>
     <string name="server_address">Sunucu adresi</string>
     <string name="upload_errors">Yükleme hataları</string>
@@ -2124,4 +2124,103 @@
     <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[1 kerelik bağlantı <i>sadece bir kişiyle</i> kullanılabilir - yüz yüze veya herhangi bir mesajlaşma programı aracılığıyla paylaşın]]></string>
     <string name="operator_conditions_accepted_for_some"><![CDATA[Aşağıdaki operatör(ler) için koşullar zaten kabul edilmiştir: <b>%s</b>.]]></string>
     <string name="operators_conditions_accepted_for"><![CDATA[Şart(lar) operatör(ler) için kabul edilir: <b>%s</b>.]]></string>
-</resources>
\ No newline at end of file
+    <string name="button_add_friends">Arkadaş ekle</string>
+    <string name="v6_2_business_chats">İş konuşmaları</string>
+    <string name="button_add_team_members">Takım üyesi ekle</string>
+    <string name="display_name_accepted_invitation">kabul edilmiş davet</string>
+    <string name="business_address">İş adresi</string>
+    <string name="add_your_team_members_to_conversations">Takım üyelerini konuşmalara ekle</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Uygulama her zaman arka planda çalışır</string>
+    <string name="onboarding_network_about_operators">Operatörler hakkında</string>
+    <string name="a_plus_b">a+b</string>
+    <string name="chat_list_add_list">Liste ekle</string>
+    <string name="chat_list_all">Hepsi</string>
+    <string name="add_to_list">Listeye ekle</string>
+    <string name="delete_chat_list_warning">%s listesindeki bütün sohbetler kaldırılacak ve liste silinecek</string>
+    <string name="chat_list_businesses">İşletmeler</string>
+    <string name="report_item_archived">arşivlenmiş rapor</string>
+    <string name="report_reason_other">Başka bir sebep</string>
+    <string name="archive_report">Raporu arşivle</string>
+    <string name="report_item_archived_by">%s tarafından arşivlenen rapor</string>
+    <string name="group_reports_active_one">1 rapor</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Operatör(ler) için koşullar kabul edilecektir: <b>%s</b>.]]></string>
+    <string name="privacy_chat_list_open_links_ask">Sor</string>
+    <string name="chat_item_ttl_year">1 yıl</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi cihazları</b>: Bildirimlerin çalışması için lütfen sistem ayarlarında Otomatik Başlat\'ı etkinleştirin.]]></string>
+    <string name="report_archive_alert_desc_all">Tüm raporlar sizin için arşivlenecektir.</string>
+    <string name="report_archive_alert_title_all">Tüm raporlar arşivlensin mi?</string>
+    <string name="archive_reports">Raporları arşivle</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Operatör(ler) için koşullar kabul edilecektir: <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Aynı koşullar <b>%s</b> operatörü için de geçerli olacaktır.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Aynı koşullar <b>%s</b> operatörü(leri) için de geçerli olacaktır.]]></string>
+    <string name="enable_sending_member_reports">Mesajların moderatörlere bildirilmesine izin verin.</string>
+    <string name="report_archive_alert_title_nth">%d raporu arşivleyelim mi?</string>
+    <string name="archive_verb">Arşiv</string>
+    <string name="report_archive_alert_title">Raporu arşivleyelim mi?</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Tüm mesajlar ve dosyalar <b>uçtan uca şifreli</b> olarak gönderilir ve doğrudan mesajlarda kuantum sonrası güvenlik sağlanır.]]></string>
+    <string name="error_reading_passphrase">Veritabanı şifresini okurken hata oluştu</string>
+    <string name="button_delete_chat">Sohbeti sil</string>
+    <string name="delete_chat_question">Sohbet silinsin mi?</string>
+    <string name="connection_not_ready">Bağlantı hazır değil.</string>
+    <string name="operator_conditions_of_use">Kullanım şartları</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">daha iyi üstveri gizliliği için.</string>
+    <string name="failed_to_save_servers">Sunucuları kaydederken hata oluştu</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Şartlar 30 gün sonra etkin operatörler için kabul edilecektir.</string>
+    <string name="delete_report">Raporu sil</string>
+    <string name="change_list">Listeyi değiştir</string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Bu koşullar aynı zamanda: <b>%s</b> için de geçerli olacaktır.]]></string>
+    <string name="block_members_for_all_question">Üyeler herkes için engellensin mi?</string>
+    <string name="report_reason_community">Topluluk kurallarının ihlali</string>
+    <string name="error_accepting_operator_conditions">Şartları kabul ederken hata oluştu</string>
+    <string name="delete_chat_list_menu_action">Sil</string>
+    <string name="delete_chat_list_question">Liste silinsin mi?</string>
+    <string name="connection_security">Bağlantı güvenliği</string>
+    <string name="blocking_reason_content">İçerik kullanım şartlarını ihlal ediyor</string>
+    <string name="error_creating_report">Rapor oluşturulurken hata oluştu</string>
+    <string name="connection_error_blocked">Bağlantı engellendi</string>
+    <string name="connection_error_blocked_desc">Bağlantı sunucu operatörü tarafından engellendi:\n%1$s.</string>
+    <string name="file_error_blocked">Dosya sunucu operatörü tarafından engellendi:\n%1$s.</string>
+    <string name="group_reports_active">%d rapor</string>
+    <string name="maximum_message_size_title">Mesaj çok büyük!</string>
+    <string name="change_automatic_deletion_question">Otomatik silinen mesajlar değiştirilsin mi?</string>
+    <string name="disable_automatic_deletion_question">Otomatik silinen mesajlar devre dışı bırakılsın mı?</string>
+    <string name="create_list">Liste oluştur</string>
+    <string name="change_order_chat_list_menu_action">Sırayı değiştir</string>
+    <string name="edit_chat_list_menu_action">Düzenle</string>
+    <string name="for_social_media">Sosyal medya için</string>
+    <string name="create_1_time_link">Tek kullanımlık bağlantı oluştur</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Örneğin, eğer kişiniz SimpleX Sohbet sunucusundan mesajları alıyorsa, uygulamanız bu mesajları Flux sunucusundan iletecektir.</string>
+    <string name="chat_item_ttl_default">varsayılan (%s)</string>
+    <string name="block_members_desc">Bu üyelerden gelen yeni mesajların hepsi gizlenecektir.</string>
+    <string name="v6_3_better_groups_performance">İyileştirilmiş grup performansı</string>
+    <string name="connect_plan_chat_already_exists">Sohbet zaten var!</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Zaten <b>%1$s</b> ile bağlısınız.]]></string>
+    <string name="for_chat_profile">Konuşma profili %s için:</string>
+    <string name="direct_messages_are_prohibited">Üyeler arası doğrudan mesajlaşma yasaklıdır.</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Şartlar %s tarihinde etkin operatörler için otomatik olarak kabul edilecektir.</string>
+    <string name="chat_ttl_options_footer">Sohbet mesajlarını cihazınızdan silin.</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Her 10 dakikada mesajları kontrol et</string>
+    <string name="onboarding_network_operators_continue">Devam et</string>
+    <string name="v6_3_better_privacy_and_security">İyileştirilmiş gizlilik ve güvenlik</string>
+    <string name="v6_3_faster_sending_messages">Daha hızlı mesaj gönderme.</string>
+    <string name="direct_messages_are_prohibited_in_chat">Bu sohbette üyeler arası doğrudan mesajlaşma yasaklıdır.</string>
+    <string name="error_loading_chat_tags">Sohbet listesi yüklenirken hata oluştu</string>
+    <string name="error_creating_chat_tags">Sohbet listesi oluşturulurken hata oluştu</string>
+    <string name="error_updating_chat_tags">Sohbet listesini güncellerken hata oluştu</string>
+    <string name="chat_list_favorites">Sık kullanılanlar</string>
+    <string name="chat_list_contacts">Konuşmalar</string>
+    <string name="error_saving_database">Veritabanını kaydederken hata oluştu</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Sohbet sizin için silinecek - bu geri alınamaz!</string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Bu koşullar aynı zamanda: <b>%s</b> için de geçerli olacaktır.]]></string>
+    <string name="report_archive_for_all_moderators">Bütün moderatörler için</string>
+    <string name="report_archive_for_me">Benim için</string>
+    <string name="prefs_error_saving_settings">Ayarlar kaydedilirken hata oluştu</string>
+    <string name="debug_logs">Günlükleri etkinleştir</string>
+    <string name="info_row_chat">Sohbet</string>
+    <string name="v6_3_faster_deletion_of_groups">Grupların daha hızlı silinmesi.</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Sohbet bütün üyeler için silinecek - bu geri alınamaz!</string>
+    <string name="error_adding_server">Sunucu eklerken hata oluştu</string>
+    <string name="sync_connection_confirm">Onar</string>
+    <string name="sync_connection_question">Bağlantı onarılsın mı?</string>
+    <string name="error_updating_server_title">Sunucuyu güncellerken hata oluştu</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
index eff112717e..a962298f19 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
@@ -18,8 +18,8 @@
     <string name="one_time_link_short">1-разове посилання</string>
     <string name="about_simplex_chat">Про SimpleX Chat</string>
     <string name="v4_3_improved_server_configuration_desc">Додавайте сервери, скануючи QR-коди.</string>
-    <string name="users_delete_all_chats_deleted">Всі чати і повідомлення будуть видалені - цю дію неможливо скасувати!</string>
-    <string name="allow_calls_only_if">Дозволяйте дзвінки тільки в разі дозволу вашого контакту.</string>
+    <string name="users_delete_all_chats_deleted">Усі чати та повідомлення будуть видалені - цю дію неможливо скасувати!</string>
+    <string name="allow_calls_only_if">Дозволити дзвінки тільки за умови, що ваш контакт дозволяє їх.</string>
     <string name="allow_irreversible_message_deletion_only_if">Дозволити безповоротне видалення повідомлень, тільки якщо ваш контакт дозволяє вам. (24 години)</string>
     <string name="allow_voice_messages_question">Дозволити голосові повідомлення\?</string>
     <string name="app_passcode_replaced_with_self_destruct">Пароль застосунку замінено паролем самознищення.</string>
@@ -29,41 +29,41 @@
     <string name="keychain_is_storing_securely">Сховище ключів Android використовується для безпечного збереження ключової фрази - це дозволяє службі сповіщень працювати.</string>
     <string name="v4_2_group_links_desc">Адміністратори можуть створювати посилання для приєднання до групи.</string>
     <string name="app_version_code">Збірка додатку: %s</string>
-    <string name="allow_voice_messages_only_if">Дозволяйте голосові повідомлення тільки в разі дозволу вашого контакту.</string>
-    <string name="allow_to_send_disappearing">Дозволяйте надсилати повідомлення, які зникають.</string>
+    <string name="allow_voice_messages_only_if">Дозволити голосові повідомлення тільки за умови, що ваш контакт дозволяє їх.</string>
+    <string name="allow_to_send_disappearing">Дозволити надсилати зникаючі повідомлення.</string>
     <string name="callstatus_accepted">прийнятий виклик</string>
     <string name="always_use_relay">Завжди використовувати реле</string>
     <string name="settings_section_title_app">ДОДАТОК</string>
-    <string name="allow_direct_messages">Дозволяйте надсилати прямі повідомлення учасникам.</string>
+    <string name="allow_direct_messages">Дозволити надсилання приватних повідомлень учасникам.</string>
     <string name="allow_to_delete_messages">Дозволити безповоротно видаляти надіслані повідомлення. (24 години)</string>
     <string name="allow_to_send_voice">Дозволяйте надсилати голосові повідомлення.</string>
     <string name="allow_message_reactions">Дозволити реакції на повідомлення.</string>
     <string name="v5_1_self_destruct_passcode_descr">Вся інформація стирається при його введенні.</string>
     <string name="v5_0_app_passcode">Пароль для додатка</string>
     <string name="settings_section_title_icon">ІКОНКА ДОДАТКУ</string>
-    <string name="allow_disappearing_messages_only_if">Дозволяйте повідомлення, які зникають, тільки якщо ваш контакт дозволяє їх.</string>
+    <string name="allow_disappearing_messages_only_if">Дозволити зникаючі повідомлення тільки за умови, що ваш контакт дозволяє їх.</string>
     <string name="allow_your_contacts_adding_message_reactions">Дозвольте вашим контактам додавати реакції на повідомлення.</string>
-    <string name="allow_message_reactions_only_if">Дозволяйте реакції на повідомлення тільки в разі дозволу вашого контакту.</string>
+    <string name="allow_message_reactions_only_if">Дозволити реакції на повідомлення тільки за умови, що ваш контакт дозволяє їх.</string>
     <string name="empty_chat_profile_is_created">Створений порожній профіль чату з наданим ім\'ям, і застосунок відкривається, як завжди.</string>
     <string name="color_primary_variant">Додатковий акцент</string>
     <string name="allow_your_contacts_irreversibly_delete">Дозволити вашим контактам безповоротно видаляти надіслані повідомлення. (24 години)</string>
     <string name="allow_verb">Дозволити</string>
     <string name="network_settings">Розширені налаштування мережі</string>
     <string name="network_enable_socks_info">Отримувати доступ до серверів через SOCKS-проксі на порті %d? Проксі має бути запущено до активації цієї опції.</string>
-    <string name="all_your_contacts_will_remain_connected">Всі ваші контакти залишаться підключеними.</string>
-    <string name="all_app_data_will_be_cleared">Всі дані застосунку буде видалено.</string>
+    <string name="all_your_contacts_will_remain_connected">Усі ваші контакти залишаться підключеними.</string>
+    <string name="all_app_data_will_be_cleared">Усі дані застосунку буде видалено.</string>
     <string name="keychain_allows_to_receive_ntfs">Після перезапуску додатка або зміни ключової фрази буде використано сховище ключів Android для безпечного збереження ключової фрази - це дозволить отримувати сповіщення.</string>
     <string name="allow_your_contacts_to_send_voice_messages">Дозвольте вашим контактам надсилати голосові повідомлення.</string>
     <string name="accept_contact_incognito_button">Прийняти інкогніто</string>
     <string name="smp_servers_add">Додати сервер</string>
     <string name="group_member_role_admin">адміністратор</string>
     <string name="button_add_welcome_message">Додати привітання</string>
-    <string name="all_group_members_will_remain_connected">Всі члени групи залишаться підключеними.</string>
+    <string name="all_group_members_will_remain_connected">Усі учасники групи залишаться підключеними.</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Дозвольте вашим контактам надсилати повідомлення, які зникають.</string>
-    <string name="clear_chat_warning">Всі повідомлення будуть видалені - цю дію неможливо скасувати! Повідомлення будуть видалені ЛИШЕ для вас.</string>
+    <string name="clear_chat_warning">Усі повідомлення будуть видалені - цю дію неможливо скасувати! Повідомлення будуть видалені ЛИШЕ для вас.</string>
     <string name="app_version_title">Версія додатку</string>
     <string name="add_address_to_your_profile">Додайте адресу до свого профілю, щоб ваші контакти могли поділитися нею з іншими людьми. Оновлення профілю буде відправлено вашим контактам.</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Всі ваші контакти залишаться підключеними. Оновлення профілю буде відправлено вашим контактам.</string>
+    <string name="all_your_contacts_will_remain_connected_update_sent">Усі ваші контакти залишаться підключеними. Оновлення профілю буде відправлено вашим контактам.</string>
     <string name="answer_call">Відповісти на виклик</string>
     <string name="address_section_title">Адреса</string>
     <string name="users_add">Додати профіль</string>
@@ -224,12 +224,11 @@
     <string name="unmute_chat">Скасувати приглушення</string>
     <string name="you_invited_a_contact">Ви запросили контакт</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, якому ви поділилися посиланням, НЕ зможе підключитися!</string>
-    <string name="icon_descr_profile_image_placeholder">заповнювач зображення профілю</string>
+    <string name="icon_descr_profile_image_placeholder">аватар не встановлено</string>
     <string name="image_descr_qr_code">QR-код</string>
     <string name="icon_descr_help">довідка</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Якщо ви не можете зустрітися особисто, <b>покажіть QR-код у відеовиклику</b>, або поділіться посиланням.]]></string>
-    <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профіль чату буде відправлено
-\nвашому контакту</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профіль буде відправлено \nвашому контакту</string>
     <string name="one_time_link">Одноразове запрошення</string>
     <string name="incorrect_code">Невірний код безпеки!</string>
     <string name="to_verify_compare">Для перевірки end-to-end шифрування порівняйте (або скануйте) код на своїх пристроях.</string>
@@ -271,7 +270,7 @@
     <string name="onboarding_notifications_mode_subtitle">Як це впливає на батарею</string>
     <string name="onboarding_notifications_mode_service">Миттєво</string>
     <string name="call_already_ended">Виклик вже завершено!</string>
-    <string name="your_calls">Ваші виклики</string>
+    <string name="your_calls">Виклики</string>
     <string name="your_ice_servers">Ваші сервери ICE</string>
     <string name="open_verb">Відкрити</string>
     <string name="call_connection_via_relay">через реле</string>
@@ -376,7 +375,7 @@
     <string name="chat_preferences_yes">так</string>
     <string name="contact_preferences">Налаштування контакту</string>
     <string name="v4_2_security_assessment_desc">Безпека SimpleX Chat була перевірена компанією Trail of Bits.</string>
-    <string name="v4_3_irreversible_message_deletion_desc">Ваші контакти можуть дозволити повне видалення повідомлень.</string>
+    <string name="v4_3_irreversible_message_deletion_desc">Ваші контакти можуть дозволити остаточне видалення повідомлень.</string>
     <string name="database_will_be_encrypted">База даних буде зашифрована.</string>
     <string name="keychain_error">Помилка сховища ключів</string>
     <string name="unknown_error">Невідома помилка</string>
@@ -390,7 +389,7 @@
     <string name="network_status">Стан мережі</string>
     <string name="update_network_settings_question">Оновити налаштування мережі\?</string>
     <string name="users_delete_data_only">Локальні дані профілю тільки</string>
-    <string name="incognito_random_profile">Ваш випадковий профіль</string>
+    <string name="incognito_random_profile">Випадковий профіль</string>
     <string name="feature_enabled">ввімкнено</string>
     <string name="feature_enabled_for_you">ввімкнено для вас</string>
     <string name="prohibit_direct_messages">Забороняйте надсилання прямих повідомлень учасникам.</string>
@@ -417,7 +416,7 @@
     <string name="icon_descr_call_missed">Пропущений виклик</string>
     <string name="icon_descr_call_connecting">Підключення виклику</string>
     <string name="privacy_and_security">Конфіденційність і безпека</string>
-    <string name="your_privacy">Ваша конфіденційність</string>
+    <string name="your_privacy">Конфіденційність</string>
     <string name="settings_section_title_settings">НАЛАШТУВАННЯ</string>
     <string name="settings_section_title_help">ДОПОМОГА</string>
     <string name="settings_section_title_support">ПІДТРИМАЙТЕ SIMPLEX CHAT</string>
@@ -443,7 +442,7 @@
     <string name="create_group_link">Створити посилання на групу</string>
     <string name="change_member_role_question">Змінити роль у групі\?</string>
     <string name="error_removing_member">Помилка при вилученні учасника</string>
-    <string name="group_main_profile_sent">Ваш профіль чату буде відправлений учасникам групи</string>
+    <string name="group_main_profile_sent">Ваш профіль буде відправлений учасникам групи</string>
     <string name="full_deletion">Видалення для всіх</string>
     <string name="voice_messages">Голосові повідомлення</string>
     <string name="voice_prohibited_in_this_chat">Голосові повідомлення заборонені в цьому чаті.</string>
@@ -451,20 +450,20 @@
     <string name="v5_0_app_passcode_descr">Встановіть його замість системної аутентифікації.</string>
     <string name="shutdown_alert_question">Вимкнути\?</string>
     <string name="share_with_contacts">Поділитися з контактами</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профіль зберігається на вашому пристрої і обмінюється лише з ваших контактів. Сервери SimpleX не можуть його бачити.</string>
-    <string name="save_and_notify_contacts">Зберегти і повідомити контакти</string>
-    <string name="save_and_notify_group_members">Зберегти і повідомити учасників групи</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профіль зберігається на вашому пристрої та ділиться лише з вашими контактами. Серверам SimpleX профіль недоступний.</string>
+    <string name="save_and_notify_contacts">Зберегти та сповістити контакти</string>
+    <string name="save_and_notify_group_members">Зберегти та сповістити учасників</string>
     <string name="exit_without_saving">Вийти без збереження</string>
     <string name="hide_profile">Сховати профіль</string>
     <string name="password_to_show">Пароль для відображення</string>
     <string name="create_profile_button">Створити</string>
     <string name="status_no_e2e_encryption">без зашифрування e2e</string>
     <string name="status_contact_has_e2e_encryption">контакт має зашифрування e2e</string>
-    <string name="alert_text_msg_bad_hash">Хеш попереднього повідомлення відрізняється.</string>
+    <string name="alert_text_msg_bad_hash">Хеш попереднього повідомлення інший.</string>
     <string name="confirm_passcode">Підтвердити пароль</string>
     <string name="new_passcode">Новий пароль</string>
     <string name="settings_restart_app">Перезапустити</string>
-    <string name="your_chat_database">Ваша база даних чату</string>
+    <string name="your_chat_database">База даних чату</string>
     <string name="chat_is_stopped">Чат зупинено</string>
     <string name="chat_database_section">БАЗА ДАНИХ ЧАТУ</string>
     <string name="new_database_archive">Новий архів бази даних</string>
@@ -497,7 +496,7 @@
     <string name="prohibit_sending_disappearing">Забороняйте надсилання повідомлень, які зникають.</string>
     <string name="prohibit_message_deletion">Забороняйте невідворотне видалення повідомлень.</string>
     <string name="group_members_can_send_voice">Учасники можуть надсилати голосові повідомлення.</string>
-    <string name="ttl_m">%dm</string>
+    <string name="ttl_m">%dм</string>
     <string name="new_in_version">Нове в %s</string>
     <string name="v5_1_self_destruct_passcode">Самознищуючий пароль</string>
     <string name="v4_5_italian_interface">Італійський інтерфейс</string>
@@ -516,7 +515,7 @@
     <string name="v4_5_message_draft_descr">Зберігайте останню чернетку повідомлення із вкладеннями.</string>
     <string name="disappearing_message">Зникне повідомлення</string>
     <string name="send_disappearing_message">Надіслати зникне повідомлення</string>
-    <string name="image_descr_profile_image">зображення профілю</string>
+    <string name="image_descr_profile_image">аватар</string>
     <string name="icon_descr_more_button">Більше</string>
     <string name="create_profile">Створити профіль</string>
     <string name="read_more_in_github_with_link"><![CDATA[Докладніше читайте в нашому репозиторії на <font color="#0088ff">GitHub</font>.]]></string>
@@ -529,7 +528,7 @@
     <string name="accept_feature_set_1_day">Встановити на 1 день</string>
     <string name="prohibit_message_reactions">Забороняйте реакції на повідомлення.</string>
     <string name="message_reactions_prohibited_in_this_chat">Реакції на повідомлення заборонені в цьому чаті.</string>
-    <string name="ttl_s">%ds</string>
+    <string name="ttl_s">%dс</string>
     <string name="custom_time_unit_minutes">хвилини</string>
     <string name="v4_6_chinese_spanish_interface">Китайський та іспанський інтерфейс</string>
     <string name="connection_local_display_name">підключення %1$d</string>
@@ -554,7 +553,7 @@
     <string name="la_notice_title_simplex_lock">Блокування SimpleX</string>
     <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Щоб захистити вашу інформацію, увімкніть блокування SimpleX.
 \nВам буде запропоновано завершити аутентифікацію перед увімкненням цієї функції.</string>
-    <string name="auth_log_in_using_credential">Увійти за допомогою своїх облікових даних</string>
+    <string name="auth_log_in_using_credential">Пройдіть аутентифікацію</string>
     <string name="auth_enable_simplex_lock">Увімкнути блокування SimpleX</string>
     <string name="lock_not_enabled">Блокування SimpleX не увімкнено!</string>
     <string name="share_verb">Поділитися</string>
@@ -569,8 +568,8 @@
     <string name="revoke_file__message">Файл буде видалено з серверів.</string>
     <string name="revoke_file__confirm">Відкликати</string>
     <string name="icon_descr_sent_msg_status_unauthorized_send">несанкціонована відправка</string>
-    <string name="personal_welcome">Ласкаво просимо, %1$s!</string>
-    <string name="welcome">Ласкаво просимо!</string>
+    <string name="personal_welcome">Вітаємо, %1$s!</string>
+    <string name="welcome">Вітаємо!</string>
     <string name="this_text_is_available_in_settings">Цей текст доступний у налаштуваннях</string>
     <string name="group_preview_you_are_invited">вас запрошено в групу</string>
     <string name="share_message">Поділитися повідомленням…</string>
@@ -580,7 +579,7 @@
     <string name="videos_limit_desc">Одночасно можна відправити лише 10 відео</string>
     <string name="image_decoding_exception_title">Помилка декодування зображення</string>
     <string name="image_decoding_exception_desc">Неможливо декодувати зображення. Спробуйте інше зображення або зв\'яжіться з розробниками.</string>
-    <string name="image_descr">Зображення</string>
+    <string name="image_descr">Фото</string>
     <string name="image_will_be_received_when_contact_completes_uploading">Зображення буде отримано, коли ваш контакт завершить його вивантаження.</string>
     <string name="image_will_be_received_when_contact_is_online">Зображення буде отримано, коли ваш контакт буде в мережі, будь ласка, зачекайте або перевірте пізніше!</string>
     <string name="image_saved">Зображення збережено в галереї</string>
@@ -609,8 +608,8 @@
     <string name="image_descr_simplex_logo">Логотип SimpleX</string>
     <string name="icon_descr_email">Електронна пошта</string>
     <string name="this_QR_code_is_not_a_link">Цей QR-код не є посиланням!</string>
-    <string name="you_will_be_connected_when_group_host_device_is_online">Ви будете підключені до групи, коли пристрій господаря групи буде в мережі, зачекайте або перевірте пізніше!</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Вас підключать, коли ваш запит на з\'єднання буде прийнятий, зачекайте або перевірте пізніше!</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">Ви будете підключені до групи, коли пристрій власник групи буде в мережі, зачекайте або перевірте пізніше!</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Підключення відбудеться, коли ваш запит на підключення буде прийнято. Будь ласка, зачекайте або спробуйте пізніше!</string>
     <string name="share_invitation_link">Поділитися 1-разовим посиланням</string>
     <string name="learn_more">Дізнатися більше</string>
     <string name="scan_qr_to_connect_to_contact">Щоб підключитися, ваш контакт може сканувати QR-код або використовувати посилання у додатку.</string>
@@ -639,8 +638,8 @@
     <string name="you_can_create_it_later">Ви можете створити його пізніше</string>
     <string name="your_current_profile">Ваш поточний профіль</string>
     <string name="delete_image">Видалити зображення</string>
-    <string name="save_preferences_question">Зберегти уподобання?</string>
-    <string name="save_and_notify_contact">Зберегти і повідомити контакт</string>
+    <string name="save_preferences_question">Зберегти налаштування?</string>
+    <string name="save_and_notify_contact">Зберегти та сповістити контакт</string>
     <string name="save_profile_password">Зберегти пароль профілю</string>
     <string name="hidden_profile_password">Пароль схованого профілю</string>
     <string name="profile_is_only_shared_with_your_contacts">Профіль обмінюється лише з вашими контактами.</string>
@@ -718,10 +717,10 @@
     <string name="share_text_disappears_at">Зникає о: %s</string>
     <string name="item_info_current">(поточне)</string>
     <string name="button_remove_member">Вилучити учасника</string>
-    <string name="member_role_will_be_changed_with_notification">Роль буде змінено на "%s". Всі учасники групи будуть сповіщені.</string>
+    <string name="member_role_will_be_changed_with_notification">Роль буде змінено на %s. Усі учасники групи будуть сповіщені.</string>
     <string name="member_role_will_be_changed_with_invitation">Роль буде змінено на "%s". Учасник отримає нове запрошення.</string>
     <string name="info_row_group">Група</string>
-    <string name="group_welcome_title">Ласкаво просимо</string>
+    <string name="group_welcome_title">Привітальне повідомлення</string>
     <string name="group_profile_is_stored_on_members_devices">Профіль групи зберігається на пристроях учасників, а не на серверах.</string>
     <string name="save_group_profile">Зберегти профіль групи</string>
     <string name="users_delete_with_connections">Профіль і підключення до серверів</string>
@@ -733,7 +732,7 @@
     <string name="theme_light">Світлий</string>
     <string name="import_theme_error">Помилка імпорту теми</string>
     <string name="group_preferences">Налаштування групи</string>
-    <string name="timed_messages">Повідомлення зникнення</string>
+    <string name="timed_messages">Зникаючі повідомлення</string>
     <string name="feature_enabled_for_contact">ввімкнено для контакту</string>
     <string name="feature_off">вимкнено</string>
     <string name="feature_received_prohibited">отримано, заборонено</string>
@@ -757,7 +756,7 @@
     <string name="ttl_hour">%d година</string>
     <string name="ttl_week">%d тиждень</string>
     <string name="ttl_weeks">%d тижні</string>
-    <string name="ttl_w">%dw</string>
+    <string name="ttl_w">%dтиж</string>
     <string name="feature_offered_item_with_param">запропоновано %s: %2s</string>
     <string name="v4_2_auto_accept_contact_requests_desc">З опційним вітанням.</string>
     <string name="v4_3_improved_privacy_and_security_desc">Приховуйте екран додатка в останніх програмах.</string>
@@ -785,7 +784,7 @@
     <string name="you_are_already_connected_to_vName_via_this_link">Ви вже підключені до %1$s через це посилання.</string>
     <string name="settings_section_title_incognito">Режим інкогніто</string>
     <string name="conn_stats_section_title_servers">СЕРВЕРИ</string>
-    <string name="save_welcome_message_question">Зберегти ласкаво просимо?</string>
+    <string name="save_welcome_message_question">Зберегти вітальне повідомлення?</string>
     <string name="receiving_via">Отримання через</string>
     <string name="muted_when_inactive">Приглушено, коли неактивно!</string>
     <string name="delete_profile">Видалити профіль</string>
@@ -827,11 +826,11 @@
     <string name="send_disappearing_message_custom_time">Інший час</string>
     <string name="share_one_time_link">Створити одноразове запрошення</string>
     <string name="scan_QR_code">Сканувати QR-код</string>
-    <string name="gallery_image_button">Зображення</string>
+    <string name="gallery_image_button">Фото</string>
     <string name="gallery_video_button">Відео</string>
     <string name="connection_you_accepted_will_be_cancelled">Прийняте вами з\'єднання буде скасоване!</string>
     <string name="alert_title_contact_connection_pending">Контакт ще не підключений!</string>
-    <string name="smp_servers_test_servers">Тестування серверів</string>
+    <string name="smp_servers_test_servers">Тестувати сервери</string>
     <string name="smp_servers_save">Зберегти сервери</string>
     <string name="smp_servers_your_server">Ваш сервер</string>
     <string name="smp_servers_test_failed">Тест сервера не вдався!</string>
@@ -877,7 +876,7 @@
     <string name="share_text_sent_at">Надіслано о: %s</string>
     <string name="share_text_deleted_at">Видалено о: %s</string>
     <string name="current_version_timestamp">%s (поточне)</string>
-    <string name="ttl_h">%dh</string>
+    <string name="ttl_h">%dч</string>
     <string name="ttl_day">%d день</string>
     <string name="ttl_days">%d днів</string>
     <string name="feature_cancelled_item">скасовано %s</string>
@@ -938,7 +937,7 @@
     <string name="only_group_owners_can_enable_voice">Тільки власники груп можуть увімкнути голосові повідомлення.</string>
     <string name="reject_contact_button">Відхилити</string>
     <string name="clear_chat_question">Очистити чат\?</string>
-    <string name="image_descr_link_preview">зображення попереднього перегляду посилання</string>
+    <string name="image_descr_link_preview">зображення прев’ю посилання</string>
     <string name="icon_descr_cancel_link_preview">скасувати попередній перегляд посилання</string>
     <string name="icon_descr_settings">Налаштування</string>
     <string name="icon_descr_call_progress">Виклик у процесі</string>
@@ -986,7 +985,7 @@
     <string name="change_role">Змінити роль</string>
     <string name="you_will_still_receive_calls_and_ntfs">Ви все ще отримуватимете дзвінки та сповіщення від приглушених профілів, коли вони активні.</string>
     <string name="ttl_months">%d місяці</string>
-    <string name="ttl_mth">%dmth</string>
+    <string name="ttl_mth">%dміс</string>
     <string name="v4_4_disappearing_messages_desc">Надіслані повідомлення будуть видалені після встановленого часу.</string>
     <string name="opening_database">Відкриття бази даних…</string>
     <string name="error_setting_address">Помилка встановлення адреси</string>
@@ -1004,12 +1003,12 @@
     <string name="connect_via_link_or_qr">Підключитися за посиланням / QR-кодом</string>
     <string name="clear_verb">Очистити</string>
     <string name="invalid_QR_code">Неправильний QR-код</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Вас підключать, коли пристрій вашого контакту буде в мережі, зачекайте або перевірте пізніше!</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Підключення відбудеться, коли пристрій вашого контакту буде онлайн. Будь ласка, зачекайте або спробуйте пізніше!</string>
     <string name="you_wont_lose_your_contacts_if_delete_address">Ви не втратите свої контакти, якщо ви пізніше видалите свою адресу.</string>
     <string name="you_can_accept_or_reject_connection">Коли люди просять про з\'єднання, ви можете його прийняти чи відхилити.</string>
     <string name="read_more_in_user_guide_with_link"><![CDATA[Докладніше читайте в <font color="#0088ff">Посібнику користувача</font>.]]></string>
     <string name="simplex_address">SimpleX-адреса</string>
-    <string name="clear_verification">Очистити перевірку</string>
+    <string name="clear_verification">Скинути підтвердження</string>
     <string name="is_verified">%s перевірено</string>
     <string name="is_not_verified">%s не перевірено</string>
     <string name="send_us_an_email">Написати нам ел. листа</string>
@@ -1025,7 +1024,7 @@
     <string name="network_use_onion_hosts_required">Обов\'язково</string>
     <string name="theme_colors_section_title">КОЛЬОРИ ІНТЕРФЕЙСУ</string>
     <string name="create_address_and_let_people_connect">Створіть адресу, щоб дозволити людям підключатися до вас.</string>
-    <string name="your_contacts_will_remain_connected">Ваші контакти залишаться підключеними.</string>
+    <string name="your_contacts_will_remain_connected">Контакти залишатимуться підключеними.</string>
     <string name="create_simplex_address">Створити SimpleX-адресу</string>
     <string name="profile_update_will_be_sent_to_contacts">Оновлення профілю буде відправлено вашим контактам.</string>
     <string name="stop_sharing_address">Зупинити поділ адреси?</string>
@@ -1069,12 +1068,12 @@
     <string name="button_welcome_message">Привітання</string>
     <string name="select_contacts">Вибрати контакти</string>
     <string name="share_address">Поділитися адресою</string>
-    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Ви можете поділитися посиланням або QR-кодом - будь-хто зможе приєднатися до групи. Ви не втратите членів групи, якщо потім видалите її.</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Ви можете поділитися посиланням або QR-кодом - будь-хто зможе приєднатися до групи. Ви не втратите учасників групи, якщо потім видалите її.</string>
     <string name="you_can_share_this_address_with_your_contacts">Ви можете поділитися цією адресою зі своїми контактами, щоб вони могли підключитися до %s.</string>
     <string name="info_row_local_name">Локальна назва</string>
     <string name="info_row_database_id">Ідентифікатор бази даних</string>
     <string name="group_welcome_preview">Попередній перегляд</string>
-    <string name="enter_welcome_message">Введіть ласкаво просимо…</string>
+    <string name="enter_welcome_message">Введіть привітальне повідомлення…</string>
     <string name="switch_receiving_address">Змінити адресу отримання</string>
     <string name="create_secret_group_title">Створити секретну групу</string>
     <string name="group_is_decentralized">Повністю децентралізовано - видимо тільки для учасників.</string>
@@ -1088,7 +1087,7 @@
     <string name="chat_preferences_you_allow">Ви дозволяєте</string>
     <string name="chat_preferences_no">ні</string>
     <string name="chat_preferences_off">вимк</string>
-    <string name="set_group_preferences">Встановити налаштування групи</string>
+    <string name="set_group_preferences">Налаштування групи</string>
     <string name="your_preferences">Налаштування</string>
     <string name="direct_messages">Прямі повідомлення</string>
     <string name="icon_descr_server_status_error">Помилка</string>
@@ -1109,7 +1108,7 @@
     <string name="button_delete_contact">Видалити контакт</string>
     <string name="text_field_set_contact_placeholder">Встановити ім\'я контакту…</string>
     <string name="choose_file">Файл</string>
-    <string name="from_gallery_button">З галереї</string>
+    <string name="from_gallery_button">Галерея</string>
     <string name="icon_descr_simplex_team">Команда SimpleX</string>
     <string name="contact_wants_to_connect_with_you">хоче підключитися до вас!</string>
     <string name="settings_section_title_experimenta">ЕКСПЕРИМЕНТАЛЬНІ ФУНКЦІЇ</string>
@@ -1134,7 +1133,7 @@
     <string name="connect_button">Підключитися</string>
     <string name="to_reveal_profile_enter_password">Щоб показати ваш схований профіль, введіть повний пароль у поле пошуку на сторінці Ваші профілі.</string>
     <string name="confirm_password">Підтвердити пароль</string>
-    <string name="ttl_d">%dd</string>
+    <string name="ttl_d">%dд</string>
     <string name="v4_6_hidden_chat_profiles_descr">Захистіть свої чат-профілі паролем!</string>
     <string name="decryption_error">Помилка дешифрування</string>
     <string name="error_xftp_test_server_auth">Сервер вимагає авторизації для завантаження, перевірте пароль</string>
@@ -1146,7 +1145,7 @@
     <string name="ntf_channel_calls">Дзвінки чату SimpleX</string>
     <string name="settings_notifications_mode_title">Служба сповіщень</string>
     <string name="settings_notification_preview_mode_title">Показати попередній перегляд</string>
-    <string name="settings_notification_preview_title">Попередній перегляд сповіщень</string>
+    <string name="settings_notification_preview_title">Перегляд сповіщень</string>
     <string name="notifications_mode_off">Запускається, коли додаток відкритий</string>
     <string name="notifications_mode_periodic">Запускається періодично</string>
     <string name="notification_preview_mode_message">Текст повідомлення</string>
@@ -1200,16 +1199,14 @@
     <string name="export_theme">Експортувати тему</string>
     <string name="import_theme_error_desc">Переконайтеся, що файл має правильний синтаксис YAML. Експортуйте тему, щоб мати приклад структури файлу теми.</string>
     <string name="reset_color">Скинути кольори</string>
-    <string name="chat_preferences_default">за замовчуванням (%s)</string>
+    <string name="chat_preferences_default">типово (%s)</string>
     <string name="only_you_can_make_calls">Тільки ви можете здійснювати дзвінки.</string>
     <string name="only_your_contact_can_make_calls">Тільки ваш контакт може здійснювати дзвінки.</string>
     <string name="whats_new">Що нового</string>
     <string name="v4_3_voice_messages">Голосові повідомлення</string>
     <string name="v4_5_transport_isolation_descr">За профілем чату (типово) або за підключенням (BETA).</string>
     <string name="v5_1_custom_themes">Власні теми</string>
-    <string name="v5_1_better_messages_descr">- голосові повідомлення до 5 хвилин.
-\n- власний час на зникнення.
-\n- історія редагування.</string>
+    <string name="v5_1_better_messages_descr">- голосові повідомлення до 5 хвилин.\n- налаштування часу для зникнення повідомлень.\n- історія змін.</string>
     <string name="v5_1_japanese_portuguese_interface">Японський та португальський інтерфейс</string>
     <string name="group_invitation_tap_to_join">Натисніть, щоб приєднатися</string>
     <string name="group_invitation_tap_to_join_incognito">Натисніть, щоб приєднатися анонімно</string>
@@ -1229,7 +1226,7 @@
     <string name="change_database_passphrase_question">Змінити ключову фразу бази даних?</string>
     <string name="cannot_access_keychain">Не вдається отримати доступ до сховища ключів для збереження пароля бази даних</string>
     <string name="save_passphrase_and_open_chat">Зберегти ключову фразу і відкрити чат</string>
-    <string name="restore_passphrase_not_found_desc">Ключова фраза не знайдена в сховищі ключів, будь ласка, введіть її вручну. Це може трапитися, якщо ви відновили дані додатка за допомогою інструменту резервного копіювання. Якщо це не так, зверніться до розробників.</string>
+    <string name="restore_passphrase_not_found_desc">Пароль не знайдено в сховищі ключів, введіть його вручну. Це могло статися, якщо ви відновили дані додатка за допомогою інструмента резервного копіювання. Якщо це не так, зверніться до розробників.</string>
     <string name="delete_chat_profile">Видалити профіль чату</string>
     <string name="ttl_sec">%d сек</string>
     <string name="search_verb">Пошук</string>
@@ -1431,7 +1428,7 @@
     <string name="connect_plan_you_have_already_requested_connection_via_this_address">Ви вже подали запит на підключення за цією адресою!</string>
     <string name="member_contact_send_direct_message">надіслати приватне повідомлення</string>
     <string name="terminal_always_visible">Показувати консоль в новому вікні</string>
-    <string name="block_member_desc">Всі нові повідомлення від %s будуть приховані!</string>
+    <string name="block_member_desc">Усі нові повідомлення від %s будуть приховані!</string>
     <string name="rcv_group_event_member_created_contact">підключив(лась) безпосередньо</string>
     <string name="blocked_item_description">заблоковано</string>
     <string name="v5_4_block_group_members">Блокувати учасників групи</string>
@@ -1439,32 +1436,32 @@
     <string name="connected_desktop">Підключений робочий стіл</string>
     <string name="new_mobile_device">Новий мобільний пристрій</string>
     <string name="multicast_connect_automatically">Підключати автоматично</string>
-    <string name="desktop_address">Адреса робочого столу</string>
+    <string name="desktop_address">Адреса комп\'ютера</string>
     <string name="only_one_device_can_work_at_the_same_time">Одночасно може працювати лише один пристрій</string>
     <string name="v5_4_link_mobile_desktop">Підключіть мобільний і десктопний додатки! 🔗</string>
     <string name="v5_4_link_mobile_desktop_descr">Через безпечний квантовостійкий протокол.</string>
-    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Відкрийте <i>Використовувати з робочого столу</i> у мобільному додатку і скануйте QR-код.]]></string>
+    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Відкрийте <i>Використовувати з комп\'ютера</i> в мобільному додатку та відскануйте QR-код.]]></string>
     <string name="v5_4_block_group_members_descr">Щоб приховати небажані повідомлення.</string>
     <string name="desktop_incompatible_version">Несумісна версія</string>
     <string name="new_desktop"><![CDATA[<i>(новий)</i>]]></string>
-    <string name="unlink_desktop_question">Відсунути відсилання до робочого столу?</string>
+    <string name="unlink_desktop_question">Відключити комп\'ютер?</string>
     <string name="v5_4_better_groups">Кращі групи</string>
-    <string name="linked_desktop_options">Параметри пов\'язаних робочих столів</string>
-    <string name="linked_desktops">Пов\'язані робочі столи</string>
+    <string name="linked_desktop_options">Параметри пов\'язаних комп\'ютерів</string>
+    <string name="linked_desktops">Підключені комп\'ютери</string>
     <string name="discover_on_network">Виявити через локальну мережу</string>
     <string name="v5_4_incognito_groups">Інкогніто групи</string>
     <string name="this_device">Цей пристрій</string>
     <string name="remote_host_was_disconnected_toast"><![CDATA[Мобільний <b>%s</b> був відключений]]></string>
-    <string name="waiting_for_desktop">Очікування робочого столу…</string>
+    <string name="waiting_for_desktop">Очікування комп\'ютера…</string>
     <string name="v5_4_better_groups_descr">Швидше приєднуйтесь та надійшовні повідомлення.</string>
-    <string name="linked_mobiles">Пов\'язані мобільні</string>
+    <string name="linked_mobiles">Під’єднані мобільні</string>
     <string name="desktop_device">Робочий стіл</string>
-    <string name="connected_to_desktop">Підключено до робочого столу</string>
+    <string name="connected_to_desktop">Підключено до комп\'ютера</string>
     <string name="this_device_name">Назва цього пристрою</string>
     <string name="loading_remote_file_title">Завантаження файлу</string>
-    <string name="connecting_to_desktop">Підключення до робочого столу</string>
+    <string name="connecting_to_desktop">Підключення до комп\'ютера</string>
     <string name="found_desktop">Знайдено робочий стіл</string>
-    <string name="desktop_devices">Пристрої робочого столу</string>
+    <string name="desktop_devices">Комп\'ютери</string>
     <string name="not_compatible">Не сумісно!</string>
     <string name="link_a_mobile">Зв\'язати з мобільним</string>
     <string name="settings_section_title_use_from_desktop">Використовувати з комп\'ютера</string>
@@ -1477,13 +1474,13 @@
     <string name="verify_code_on_mobile">Перевірте код на мобільному</string>
     <string name="enter_this_device_name">Введіть назву цього пристрою…</string>
     <string name="error">Помилка</string>
-    <string name="connect_to_desktop">Підключитися до робочого столу</string>
+    <string name="connect_to_desktop">Підключитися до комп\'ютера</string>
     <string name="disconnect_remote_host">Відключити</string>
     <string name="group_member_role_author">автор</string>
     <string name="connected_to_mobile">Підключено до мобільного</string>
-    <string name="bad_desktop_address">Некоректна адреса робочого столу</string>
-    <string name="paste_desktop_address">Вставити адресу робочого столу</string>
-    <string name="verify_code_with_desktop">Перевірити код з робочим столом</string>
+    <string name="bad_desktop_address">Некоректна адреса комп\'ютера</string>
+    <string name="paste_desktop_address">Вставити адресу комп\'ютера</string>
+    <string name="verify_code_with_desktop">Перевірити код з комп\'ютером</string>
     <string name="scan_qr_code_from_desktop">Сканувати QR-код з комп\'ютера</string>
     <string name="devices">Пристрої</string>
     <string name="multicast_discoverable_via_local_network">Виявлено через локальну мережу</string>
@@ -1494,7 +1491,7 @@
     <string name="verify_connections">Перевірити підключення</string>
     <string name="disconnect_desktop_question">Відключити робочий стіл?</string>
     <string name="loading_remote_file_desc">Будь ласка, зачекайте, поки файл завантажується з підключеного мобільного</string>
-    <string name="desktop_app_version_is_incompatible">Версія робочого столу %s не сумісна з цим додатком.</string>
+    <string name="desktop_app_version_is_incompatible">Версія комп\'ютерного додатка %s несумісна з цим додатком.</string>
     <string name="verify_connection">Перевірити підключення</string>
     <string name="chat_is_stopped_you_should_transfer_database">Чат зупинено. Якщо ви вже використовували цю базу даних на іншому пристрої, перенесіть її назад перед запуском чату.</string>
     <string name="v5_5_private_notes_descr">З зашифрованими файлами та медіа.</string>
@@ -1556,7 +1553,7 @@
 \n
 \nРекомендується перезапустити додаток.</string>
     <string name="enable_sending_recent_history">Надсилати до 100 останніх повідомлень новим користувачам.</string>
-    <string name="recent_history_is_sent_to_new_members">До 100 останніх повідомлень надсилаються новим членам.</string>
+    <string name="recent_history_is_sent_to_new_members">До 100 останніх повідомлень надсилаються новим учасникам.</string>
     <string name="remote_host_was_disconnected_title">З\'єднання перервано</string>
     <string name="share_text_created_at">Створено: %s</string>
     <string name="show_internal_errors">Показати внутрішні помилки</string>
@@ -1611,7 +1608,7 @@
     <string name="profile_update_event_member_name_changed">учасник %1$s змінений на %2$s</string>
     <string name="profile_update_event_removed_picture">вилучено зображення профілю</string>
     <string name="profile_update_event_set_new_address">Установлено нову адресу контакту</string>
-    <string name="profile_update_event_set_new_picture">Установлено нове зображення профілю</string>
+    <string name="profile_update_event_set_new_picture">встановити новий аватар</string>
     <string name="profile_update_event_updated_profile">оновлений профіль</string>
     <string name="profile_update_event_removed_address">вилучено адресу контакту</string>
     <string name="past_member_vName">Колишній учасник %1$s</string>
@@ -1620,7 +1617,7 @@
     <string name="call_service_notification_audio_call">Аудіодзвінок</string>
     <string name="unable_to_open_browser_title">Помилка відкриття браузера</string>
     <string name="unable_to_open_browser_desc">Для використання дзвінків потрібен браузер за замовчуванням. Будь ласка, налаштуйте браузер за замовчуванням в системі та надайте більше інформації розробникам.</string>
-    <string name="migrate_from_another_device">Перехід з іншого пристрою</string>
+    <string name="migrate_from_another_device">Перенести з іншого пристрою</string>
     <string name="conn_event_enabled_pq">квантово-стійке шифрування e2e</string>
     <string name="conn_event_disabled_pq">стандартне наскрізне шифрування</string>
     <string name="e2ee_info_no_pq_short">Цей чат захищений наскрізним шифруванням.</string>
@@ -1648,8 +1645,8 @@
     <string name="migrate_to_device_repeat_import">Повторний імпорт</string>
     <string name="migrate_to_device_finalize_migration">Завершіть міграцію на іншому пристрої.</string>
     <string name="migrate_to_device_apply_onion">Застосувати</string>
-    <string name="migrate_from_device_title">Перенести пристрій</string>
-    <string name="migrate_from_device_to_another_device">Перехід на інший пристрій</string>
+    <string name="migrate_from_device_title">Міграція пристрою</string>
+    <string name="migrate_from_device_to_another_device">Перенести на інший пристрій</string>
     <string name="migrate_from_device_error_exporting_archive">Помилка експорту бази даних чату</string>
     <string name="migrate_from_device_error_saving_settings">Налаштування збереження помилок</string>
     <string name="migrate_from_device_error_uploading_archive">Помилка завантаження архіву</string>
@@ -1660,7 +1657,7 @@
     <string name="migrate_from_device_error_deleting_database">Помилка видалення бази даних</string>
     <string name="migrate_from_device_chat_should_be_stopped">Для того, щоб продовжити, чат слід зупинити.</string>
     <string name="migrate_from_device_stopping_chat">Зупинка чату</string>
-    <string name="migrate_from_device_bytes_uploaded">%s завантажено</string>
+    <string name="migrate_from_device_bytes_uploaded">%s вивантажено</string>
     <string name="migrate_from_device_uploading_archive">Завантаження архіву</string>
     <string name="migrate_from_device_creating_archive_link">Створення архівного посилання</string>
     <string name="migrate_from_device_delete_database_from_device">Видалити базу даних з цього пристрою</string>
@@ -1677,7 +1674,7 @@
     <string name="migrate_from_device_check_connection_and_try_again">Перевірте підключення до Інтернету та спробуйте ще раз</string>
     <string name="migrate_from_device_confirm_you_remember_passphrase">Переконайтеся, що ви пам\'ятаєте пароль до бази даних для її перенесення.</string>
     <string name="migrate_from_device_error_verifying_passphrase">Помилка при перевірці парольної фрази:</string>
-    <string name="migrate_from_device_all_data_will_be_uploaded">Всі ваші контакти, розмови та файли будуть надійно зашифровані та завантажені частинами на налаштовані XFTP-реле.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Усі ваші контакти, розмови та файли будуть надійно зашифровані та завантажені частинами на налаштовані XFTP-реле.</string>
     <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Please note</b>: використання однієї і тієї ж бази даних на двох пристроях порушить розшифровку повідомлень з ваших з\'єднань, як захист безпеки.]]></string>
     <string name="migrate_from_device_cancel_migration">Скасувати міграцію</string>
     <string name="migrate_to_device_chat_migrated">Чат перемістився!</string>
@@ -1751,10 +1748,10 @@
     <string name="permissions_grant">Надайте дозвіл(и) на здійснення дзвінків</string>
     <string name="permissions_open_settings">Відкрити налаштування</string>
     <string name="settings_section_title_files">ФАЙЛИ</string>
-    <string name="settings_section_title_profile_images">Зображення профілю</string>
+    <string name="settings_section_title_profile_images">Зображення профілів</string>
     <string name="settings_section_title_network_connection">Підключення до мережі</string>
     <string name="feature_roles_admins">адміністратори</string>
-    <string name="feature_roles_all_members">всі учасники</string>
+    <string name="feature_roles_all_members">всіх учасників</string>
     <string name="v5_7_new_interface_languages">Литовський інтерфейс</string>
     <string name="permissions_required">Надавати дозволи</string>
     <string name="settings_section_title_chat_colors">Кольори чату</string>
@@ -1829,7 +1826,7 @@
     <string name="network_smp_proxy_fallback_allow">Так</string>
     <string name="network_option_rcv_concurrency">Отримання паралелізму</string>
     <string name="simplex_links_are_prohibited_in_group">Посилання SimpleX заборонені.</string>
-    <string name="v5_7_shape_profile_images">Сформуйте зображення профілю</string>
+    <string name="v5_7_shape_profile_images">Форма зображень профілю</string>
     <string name="v5_7_call_sounds_descr">При підключенні аудіо та відеодзвінків.</string>
     <string name="reset_single_color">Скинути колір</string>
     <string name="color_mode_system">Система</string>
@@ -1846,7 +1843,7 @@
     <string name="xftp_servers_configured">Налаштовані XFTP сервери</string>
     <string name="app_check_for_updates_beta">Бета</string>
     <string name="info_row_file_status">Статус файлу</string>
-    <string name="servers_info_messages_sent">Повідомлення надіслано</string>
+    <string name="servers_info_messages_sent">Надіслано повідомлень</string>
     <string name="servers_info_statistics_section_header">Статистика</string>
     <string name="servers_info_previously_connected_servers_section_header">Попередньо підключені сервери</string>
     <string name="file_error_auth">Помилковий ключ або невідома адреса чанка файлу - найбільш імовірно, що файл було видалено.</string>
@@ -1948,13 +1945,12 @@
     <string name="current_user">Поточний профіль</string>
     <string name="servers_info_details">Деталі</string>
     <string name="servers_info_sessions_errors">Помилки</string>
-    <string name="servers_info_subscriptions_section_header">Отримання повідомлення</string>
-    <string name="servers_info_messages_received">Повідомлення отримано</string>
+    <string name="servers_info_subscriptions_section_header">Отримання повідомлень</string>
+    <string name="servers_info_messages_received">Отримані повідомлення</string>
     <string name="servers_info_subscriptions_connections_pending">В очікуванні</string>
     <string name="servers_info_proxied_servers_section_header">Проксіровані сервери</string>
     <string name="servers_info_target">Показувати інформацію для</string>
-    <string name="servers_info_private_data_disclaimer">Починаючи з %s.
-\nВсі дані зберігаються лише на вашому пристрою.</string>
+    <string name="servers_info_private_data_disclaimer">Починаючи з %s.\nУсі дані зберігаються приватно на вашому пристрої.</string>
     <string name="servers_info_reconnect_server_message">Перепідключити сервер для примусової доставки повідомлень. Це використовує додатковий трафік.</string>
     <string name="servers_info_reset_stats">Скинути всю статистику</string>
     <string name="servers_info_reset_stats_alert_title">Скинути всю статистику?</string>
@@ -1981,8 +1977,8 @@
     <string name="downloaded_files">Завантажені файли</string>
     <string name="upload_errors">Помилки завантаження</string>
     <string name="chunks_deleted">Частини видалені</string>
-    <string name="chunks_downloaded">Частини завантажено</string>
-    <string name="chunks_uploaded">Частини завантажено</string>
+    <string name="chunks_downloaded">Частин завантажено</string>
+    <string name="chunks_uploaded">Частин вивантажено</string>
     <string name="remote_ctrl_connection_stopped_identity_desc">Ця посилання було використано на іншому мобільному пристрої, створіть нове посилання на комп\'ютері.</string>
     <string name="copy_error">Помилка копіювання</string>
     <string name="remote_ctrl_connection_stopped_desc">Будь ласка, перевірте, що мобільний пристрій і комп\'ютер підключені до однієї локальної мережі, і що брандмауер комп\'ютера дозволяє з\'єднання.
@@ -2029,9 +2025,9 @@
     <string name="proxied">Проксірований</string>
     <string name="send_errors">Надіслати помилки</string>
     <string name="completed">Завершено</string>
-    <string name="all_users">Всі профілі</string>
+    <string name="all_users">Усі профілі</string>
     <string name="servers_info_reset_stats_alert_confirm">Скинути</string>
-    <string name="servers_info_uploaded">Завантажено</string>
+    <string name="servers_info_uploaded">Вивантажено</string>
     <string name="delete_members_messages__question">Видалити %d повідомлень учасників?</string>
     <string name="delete_messages_mark_deleted_warning">Повідомлення будуть позначені для видалення. Одержувач(і) зможуть розкрити ці повідомлення.</string>
     <string name="select_verb">Вибрати</string>
@@ -2062,7 +2058,7 @@
     <string name="migrate_from_device_remove_archive_question">Видалити архів?</string>
     <string name="new_chat_share_profile">Поділитися профілем</string>
     <string name="migrate_from_device_uploaded_archive_will_be_removed">Завантажений архів бази даних буде остаточно видалено з серверів.</string>
-    <string name="switching_profile_error_message">Ваше з\'єднання було перенесено на %s, але виникла несподівана помилка під час перенаправлення на профіль.</string>
+    <string name="switching_profile_error_message">Підключення було перенесено до %s, але під час перенаправлення на профіль сталася непередбачена помилка.</string>
     <string name="system_mode_toast">Режим системи</string>
     <string name="network_proxy_auth_mode_no_auth">Не використовуйте облікові дані з проксі.</string>
     <string name="network_proxy_auth">Аутентифікація проксі</string>
@@ -2140,24 +2136,24 @@
     <string name="operator_conditions_accepted">Прийняті умови</string>
     <string name="operator_conditions_accepted_for_enabled_operators_on">Умови будуть автоматично прийняті для увімкнених операторів: %s.</string>
     <string name="operator_info_title">Оператор мережі</string>
-    <string name="operator_servers_title">%s серверів</string>
+    <string name="operator_servers_title">%s сервери</string>
     <string name="operator_website">Вебсайт</string>
     <string name="your_servers">Ваші сервери</string>
-    <string name="use_servers_of_operator_x">Використовуйте %s</string>
-    <string name="operator_use_operator_toggle_description">Використовуйте сервери</string>
+    <string name="use_servers_of_operator_x">Використовувати %s</string>
+    <string name="operator_use_operator_toggle_description">Використовувати сервери</string>
     <string name="operator_same_conditions_will_be_applied"><![CDATA[Ті ж умови будуть застосовуватись до оператора <b>%s</b>.]]></string>
     <string name="operator_conditions_will_be_applied"><![CDATA[Ці умови також застосовуватимуться для: <b>%s</b>.]]></string>
     <string name="accept_conditions">Прийняти умови</string>
-    <string name="view_conditions">Умови перегляду</string>
+    <string name="view_conditions">Переглянути умови</string>
     <string name="operator_added_message_servers">Додано сервери повідомлень</string>
     <string name="operator_use_for_messages_private_routing">Для приватної маршрутизації</string>
-    <string name="operator_use_for_messages_receiving">Щоб отримати</string>
-    <string name="operator_use_for_files">Використовуйте для файлів</string>
+    <string name="operator_use_for_messages_receiving">Для отримання повідомлень</string>
+    <string name="operator_use_for_files">Використовувати для файлів</string>
     <string name="operator_added_xftp_servers">Додано медіа та файлові сервери</string>
-    <string name="operator_open_changes">Відкриті зміни</string>
+    <string name="operator_open_changes">Відкрити зміни</string>
     <string name="operator_open_conditions">Відкриті умови</string>
     <string name="xftp_servers_per_user">Сервери для нових файлів вашого поточного профілю чату</string>
-    <string name="operator_use_for_sending">Щоб відправити</string>
+    <string name="operator_use_for_sending">Для відправки</string>
     <string name="error_adding_server">Помилка додавання сервера</string>
     <string name="operator_server_alert_title">Сервер оператора</string>
     <string name="server_added_to_operator__name">Сервер додано до оператора %s.</string>
@@ -2183,7 +2179,7 @@
     <string name="operator_conditions_failed_to_load">Текст поточних умов не вдалося завантажити, ви можете переглянути умови за цим посиланням:</string>
     <string name="errors_in_servers_configuration">Помилки в конфігурації серверів.</string>
     <string name="operator_conditions_accepted_on">Умови приймаються з: %s.</string>
-    <string name="v6_2_network_decentralization_enable_flux">Увімкнути flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">Увімкніть Flux у налаштуваннях мережі та серверів для кращої конфіденційності метаданих</string>
     <string name="operator_conditions_will_be_accepted_on">Умови приймаються до: %s.</string>
     <string name="onboarding_network_operators_continue">Продовжити</string>
     <string name="create_1_time_link">Створити одноразове посилання</string>
@@ -2195,7 +2191,7 @@
     <string name="simplex_address_or_1_time_link">SimpleX адреса або одноразове посилання?</string>
     <string name="smp_servers_new_server">Новий сервер</string>
     <string name="no_media_servers_configured_for_private_routing">Немає серверів для отримання файлів.</string>
-    <string name="operator_review_conditions">Умови перегляду</string>
+    <string name="operator_review_conditions">Переглянути умови</string>
     <string name="no_media_servers_configured_for_sending">Немає серверів для надсилання файлів.</string>
     <string name="network_preset_servers_title">Попередньо встановлені сервери</string>
     <string name="error_server_protocol_changed">Протокол сервера змінено.</string>
@@ -2204,14 +2200,14 @@
     <string name="connection_error_quota_desc">З\'єднання досягло ліміту недоставлених повідомлень, ваш контакт може бути офлайн.</string>
     <string name="address_creation_instruction">Натисніть Створити адресу SimpleX у меню, щоб створити її пізніше.</string>
     <string name="onboarding_network_operators_app_will_use_different_operators">Додаток захищає вашу конфіденційність, використовуючи різних операторів у кожній розмові.</string>
-    <string name="operator_use_for_messages">Використовуйте для повідомлень</string>
+    <string name="operator_use_for_messages">Використовувати для повідомлень</string>
     <string name="onboarding_network_operators_conditions_you_can_configure">Ви можете налаштувати операторів у налаштуваннях Мережі та серверів.</string>
     <string name="chat_archive">Або імпортуйте архівний файл</string>
     <string name="remote_hosts_section">Віддалені мобільні</string>
     <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Пристрої Xiaomi</b>: будь ласка, увімкніть Автозапуск у налаштуваннях системи, щоб сповіщення працювали.]]></string>
     <string name="maximum_message_size_title">Повідомлення занадто велике!</string>
     <string name="maximum_message_size_reached_non_text">Будь ласка, зменшіть розмір повідомлення або видаліть медіа та надішліть знову.</string>
-    <string name="add_your_team_members_to_conversations">Додайте учасників команди до розмов.</string>
+    <string name="add_your_team_members_to_conversations">Додайте учасників команди до розмови.</string>
     <string name="business_address">Бізнес адреса</string>
     <string name="onboarding_notifications_mode_periodic_desc_short">Перевіряти повідомлення кожні 10 хвилин.</string>
     <string name="onboarding_notifications_mode_off_desc_short">Без фонової служби</string>
@@ -2242,9 +2238,154 @@
     <string name="maximum_message_size_reached_text">Будь ласка, зменшіть розмір повідомлення та надішліть знову.</string>
     <string name="maximum_message_size_reached_forwarding">Скопіюйте та зменшіть розмір повідомлення для відправки.</string>
     <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Ви припините отримувати повідомлення з цього чату. Історія чату буде збережена.</string>
-    <string name="chat_main_profile_sent">Ваш профіль чату буде надіслано учасникам чату.</string>
+    <string name="chat_main_profile_sent">Ваш профіль буде надіслано учасникам чату.</string>
     <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Коли увімкнено більше ніж одного оператора, жоден з них не має метаданих, щоб дізнатися, хто спілкується з ким.</string>
     <string name="display_name_accepted_invitation">прийнято запрошення</string>
     <string name="display_name_requested_to_connect">запит на підключення</string>
     <string name="onboarding_network_about_operators">Про операторів</string>
-</resources>
\ No newline at end of file
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat та Flux уклали угоду про включення серверів, що працюють на Flux, до додатку.</string>
+    <string name="sync_connection_desc">Підключення вимагає повторного узгодження шифрування.</string>
+    <string name="encryption_renegotiation_in_progress">Виконується повторне узгодження шифрування.</string>
+    <string name="sync_connection_confirm">Виправити</string>
+    <string name="sync_connection_question">Виправити підключення?</string>
+    <string name="debug_logs">Увімкнути журнали</string>
+    <string name="error_saving_database">Помилка збереження бази даних</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="strikethrough_text">закреслити</string>
+    <string name="connection_not_ready">Підключення не готове.</string>
+    <string name="open_with_app">Відкрити за допомогою %s</string>
+    <string name="no_chats_in_list">Немає чатів у списку %s.</string>
+    <string name="no_unread_chats">Немає непрочитаних чатів</string>
+    <string name="chat_list_all">всі</string>
+    <string name="save_list">Зберегти список</string>
+    <string name="delete_chat_list_menu_action">Видалити</string>
+    <string name="delete_chat_list_question">Видалити список?</string>
+    <string name="list_name_field_placeholder">Назва списку...</string>
+    <string name="delete_chat_list_warning">Усі чати буде видалено зі списку %s, а сам список видалено</string>
+    <string name="chat_list_contacts">Контакти</string>
+    <string name="error_creating_chat_tags">Помилка створення списку чату</string>
+    <string name="no_chats_found">Чати не знайдено</string>
+    <string name="create_list">Створити список</string>
+    <string name="chat_list_favorites">Вибране</string>
+    <string name="no_chats">Без чатів</string>
+    <string name="edit_chat_list_menu_action">Редагувати</string>
+    <string name="error_loading_chat_tags">Помилка завантаження списків чату</string>
+    <string name="error_updating_chat_tags">Помилка оновлення списку чату</string>
+    <string name="chat_list_groups">Групи</string>
+    <string name="chat_list_businesses">Компанії</string>
+    <string name="add_to_list">Додати до списку</string>
+    <string name="chat_list_add_list">Додати список</string>
+    <string name="list_menu">Список</string>
+    <string name="duplicated_list_error">Назва списку та емодзі мають відрізнятися для всіх списків.</string>
+    <string name="chat_list_notes">Нотатки</string>
+    <string name="change_list">Список змін</string>
+    <string name="change_order_chat_list_menu_action">Змінити порядок</string>
+    <string name="prefs_error_saving_settings">Помилка збереження налаштувань</string>
+    <string name="error_creating_report">Помилка при створенні звіту</string>
+    <string name="report_item_visibility_submitter">Тільки ви та модератори бачать це</string>
+    <string name="report_compose_reason_header_spam">Повідомити про спам: тільки модератори групи побачать це.</string>
+    <string name="report_reason_community">Порушення правил спільноти</string>
+    <string name="group_member_role_moderator">модератор</string>
+    <string name="report_reason_alert_title">Причина повідомлення?</string>
+    <string name="report_item_visibility_moderators">Тільки відправник і модератори бачать це</string>
+    <string name="report_verb">Повідомити</string>
+    <string name="report_compose_reason_header_community">Повідомити про порушення: тільки модератори групи побачать це.</string>
+    <string name="report_archive_alert_desc">Повідомлення буде архівоване для вас.</string>
+    <string name="report_reason_other">Інша причина</string>
+    <string name="report_item_archived">архівование повідомлення</string>
+    <string name="archive_verb">Архів</string>
+    <string name="report_reason_illegal">Неприпустимий контент</string>
+    <string name="report_compose_reason_header_illegal">Повідомити про контент: тільки модератори групи побачать це.</string>
+    <string name="report_archive_alert_title">Архівувати повідомлення?</string>
+    <string name="report_compose_reason_header_profile">Повідомити про профіль учасника: тільки модератори групи побачать це.</string>
+    <string name="report_reason_profile">Неприпустимий профіль</string>
+    <string name="report_reason_spam">Спам</string>
+    <string name="report_compose_reason_header_other">Повідомити інше: тільки модератори групи побачать це.</string>
+    <string name="archive_report">Архівувати повідомлення</string>
+    <string name="report_item_archived_by">архівоване повідомлення від %s</string>
+    <string name="delete_report">Видалити повідомлення</string>
+    <string name="group_reports_active_one">1 повідомлення</string>
+    <string name="group_reports_active">%d повідомлень</string>
+    <string name="group_reports_member_reports">Повідомлення учасників</string>
+    <string name="chat_list_group_reports">Повідомлення</string>
+    <string name="blocking_reason_content">Вміст порушує умови використання</string>
+    <string name="blocking_reason_spam">Спам</string>
+    <string name="file_error_blocked">Файл заблоковано оператором сервера:  \n%1$s.</string>
+    <string name="privacy_chat_list_open_links_yes">Так</string>
+    <string name="privacy_chat_list_open_web_link">Відкрити посилання</string>
+    <string name="privacy_chat_list_open_web_link_question">Відкрити вебпосилання?</string>
+    <string name="connection_error_blocked">Підключення заблоковано</string>
+    <string name="privacy_chat_list_open_links_ask">Запитати</string>
+    <string name="privacy_chat_list_open_links">Відкрити посилання зі списку чату</string>
+    <string name="connection_error_blocked_desc">Підключення заблоковано оператором сервера:  \n%1$s.</string>
+    <string name="privacy_chat_list_open_links_no">Ні</string>
+    <string name="text_field_set_chat_placeholder">Назвати чат…</string>
+    <string name="disable_automatic_deletion_message">Повідомлення в цьому чаті ніколи не будуть видалені.</string>
+    <string name="chat_ttl_options_footer">Видалити повідомлення чату з вашого пристрою.</string>
+    <string name="disable_automatic_deletion_question">Вимкнути автоматичне видалення повідомлень?</string>
+    <string name="disable_automatic_deletion">Вимкнути видалення повідомлень</string>
+    <string name="chat_item_ttl_year">1 рік</string>
+    <string name="chat_item_ttl_default">типово (%s)</string>
+    <string name="change_automatic_deletion_question">Змінити автоматичне видалення повідомлень?</string>
+    <string name="change_automatic_chat_deletion_message">Цю дію не можна скасувати — повідомлення, надіслані та отримані в цьому чаті раніше за обраний час, будуть видалені.</string>
+    <string name="network_smp_web_port_section_title">TCP-порт для повідомлень</string>
+    <string name="network_smp_web_port_footer">Використовувати TCP-порт %1$s, якщо порт не вказано.</string>
+    <string name="network_smp_web_port_toggle">Використовувати веб-порт</string>
+    <string name="mute_all_chat">Вимкнути звук</string>
+    <string name="unread_mentions">Непрочитані згадки</string>
+    <string name="max_group_mentions_per_message_reached">Ви можете згадувати до %1$s учасників у кожному повідомленні!</string>
+    <string name="report_archive_alert_desc_all">Усі звіти будуть архівовані для вас.</string>
+    <string name="report_archive_alert_title_all">Архівувати всі звіти?</string>
+    <string name="report_archive_alert_title_nth">Архівувати %d звітів?</string>
+    <string name="archive_reports">Архівувати звіти</string>
+    <string name="report_archive_for_all_moderators">Для всіх модераторів</string>
+    <string name="report_archive_for_me">Для мене</string>
+    <string name="notification_group_report">Звіт: %s</string>
+    <string name="disable_sending_member_reports">Заборонити повідомлення модераторам.</string>
+    <string name="member_reports_are_prohibited">Повідомлення модераторам заборонено в цій групі.</string>
+    <string name="group_members_can_send_reports">Учасники можуть повідомляти повідомлення модераторам.</string>
+    <string name="enable_sending_member_reports">Дозволити повідомляти повідомлення модераторам.</string>
+    <string name="group_preview_rejected">відхилено</string>
+    <string name="group_member_status_rejected">відхилено</string>
+    <string name="v6_3_better_groups_performance">Краща продуктивність груп</string>
+    <string name="v6_3_organize_chat_lists_descr">Не пропускайте важливі повідомлення.</string>
+    <string name="v6_3_mentions_descr">Отримуйте сповіщення, коли вас згадують.</string>
+    <string name="v6_3_reports_descr">Допоможіть адміністраторам модерувати їхні групи.</string>
+    <string name="v6_3_organize_chat_lists">Організовуйте чати в списки</string>
+    <string name="v6_3_private_media_file_names">Приватні імена медіа-файлів.</string>
+    <string name="v6_3_reports">Надсилати приватні звіти</string>
+    <string name="v6_3_better_privacy_and_security">Краща конфіденційність та безпека</string>
+    <string name="v6_3_faster_sending_messages">Швидша відправка повідомлень.</string>
+    <string name="v6_3_mentions">Згадуйте учасників 👋</string>
+    <string name="v6_3_set_message_expiration_in_chats">Встановлюйте термін придатності повідомлень у чатах.</string>
+    <string name="v6_3_faster_deletion_of_groups">Швидше видалення груп.</string>
+    <string name="error_reading_passphrase">Помилка зчитування пароля бази даних</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Пароль у сховищі ключів не можна зчитати. Це могло статися після оновлення системи, несумісного з додатком. Якщо це не так, зверніться до розробників.</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Пароль у сховищі ключів не можна зчитати, введіть його вручну. Це могло статися після оновлення системи, несумісного з додатком. Якщо це не так, зверніться до розробників.</string>
+    <string name="group_member_status_pending_approval_short">очікує</string>
+    <string name="group_member_status_pending_approval">очікує на схвалення</string>
+    <string name="button_remove_members_question">Видалити учасників?</string>
+    <string name="block_members_desc">Усі нові повідомлення від цих учасників будуть приховані!</string>
+    <string name="block_members_for_all_question">Заблокувати учасників для всіх?</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Учасників буде видалено з групи – це неможливо скасувати!</string>
+    <string name="feature_roles_moderators">модератори</string>
+    <string name="unblock_members_desc">Повідомлення від цих учасників буде показано!</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Учасників буде видалено з чату – це неможливо скасувати!</string>
+    <string name="unblock_members_for_all_question">Розблокувати учасників для всіх?</string>
+    <string name="operator_updated_conditions">Оновлені умови</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Приватні чати, групи та ваші контакти недоступні для операторів сервера.</string>
+    <string name="onboarding_conditions_accept">Прийняти</string>
+    <string name="onboarding_conditions_by_using_you_agree">Використовуючи SimpleX Chat, ви погоджуєтесь на:\n- надсилати тільки легальний контент у публічних групах.\n- поважати інших користувачів – без спаму.</string>
+    <string name="onboarding_conditions_configure_server_operators">Налаштувати операторів сервера</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Політика конфіденційності та умови використання</string>
+    <string name="privacy_short_links">Використовувати короткі посилання (BETA)</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Це посилання вимагає новішої версії додатку. Будь ласка, оновіть додаток або попросіть вашого контакту надіслати сумісне посилання.</string>
+    <string name="full_link_button_text">Повне посилання</string>
+    <string name="short_link_button_text">Коротке посилання</string>
+    <string name="simplex_link_channel">Посилання на канал SimpleX</string>
+    <string name="unsupported_connection_link">Несумісне посилання для підключення</string>
+    <string name="network_smp_web_port_all">Усі сервери</string>
+    <string name="network_smp_web_port_off">Ні</string>
+    <string name="network_smp_web_port_preset">Типові сервери</string>
+    <string name="network_smp_web_port_preset_footer">Використовуйте TCP порт 443 лише для попередньо налаштованих серверів.</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
index c9b30c652a..3cbc54f652 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
@@ -7,7 +7,7 @@
     <string name="address_section_title">Địa chỉ</string>
     <string name="abort_switch_receiving_address_confirm">Hủy bỏ</string>
     <string name="accept_contact_button">Chấp nhận</string>
-    <string name="one_time_link_short">liên kết dùng một lần</string>
+    <string name="one_time_link_short">đường dẫn dùng 1 lần</string>
     <string name="add_contact_tab">Thêm liên hệ</string>
     <string name="about_simplex_chat">Thông tin về SimpleX Chat</string>
     <string name="smp_servers_add">Thêm máy chủ</string>
@@ -41,7 +41,7 @@
     <string name="chat_item_ttl_month">1 tháng</string>
     <string name="chat_item_ttl_week">1 tuần</string>
     <string name="abort_switch_receiving_address">Hủy bỏ việc đổi địa chỉ</string>
-    <string name="v4_2_group_links_desc">Các quản trị viên có thể tạo liên kết để tham gia nhóm.</string>
+    <string name="v4_2_group_links_desc">Các quản trị viên có thể tạo đường dẫn để tham gia nhóm.</string>
     <string name="chat_item_ttl_day">Một ngày</string>
     <string name="color_secondary_variant">Biến thể của màu thứ cấp</string>
     <string name="all_group_members_will_remain_connected">Tất cả các thành viên trong nhóm vẫn sẽ được giữ kết nối.</string>
@@ -74,7 +74,7 @@
     <string name="allow_to_send_disappearing">Cho phép gửi tin nhắn tự xóa.</string>
     <string name="allow_to_send_voice">Cho phép gửi tin nhắn thoại.</string>
     <string name="allow_message_reactions">Cho phép thả biểu tượng cảm xúc.</string>
-    <string name="allow_to_send_files">Cho phép gửi các tập tin, ảnh và video.</string>
+    <string name="allow_to_send_files">Cho phép gửi các tệp và đa phương tiện.</string>
     <string name="notifications_mode_service">Luôn luôn bật</string>
     <string name="all_your_contacts_will_remain_connected">Tất cả liên hệ của bạn vẫn sẽ được giữ kết nối.</string>
     <string name="all_your_contacts_will_remain_connected_update_sent">Tất cả liên hệ của bạn vẫn sẽ được giữ kết nối. Bản cập nhật hồ sơ sẽ được gửi tới các liên hệ của bạn.</string>
@@ -122,7 +122,7 @@
     <string name="audio_video_calls">Các cuộc gọi thoại/video</string>
     <string name="feature_roles_all_members">tất cả các thành viên</string>
     <string name="calls_prohibited_with_this_contact">Các cuộc gọi thoại/video bị cấm.</string>
-    <string name="allow_to_send_simplex_links">Cho phép gửi liên kết SimpleX.</string>
+    <string name="allow_to_send_simplex_links">Cho phép gửi đường dẫn SimpleX.</string>
     <string name="feature_roles_admins">quản trị viên</string>
     <string name="group_member_role_author">tác giả</string>
     <string name="authentication_cancelled">Quá trình xác thực đã bị hủy bỏ</string>
@@ -136,7 +136,7 @@
     <string name="notifications_mode_service_desc">Dịch vụ nền luôn luôn chạy - thông báo sẽ được hiển thị ngay khi nhận được tin nhắn.</string>
     <string name="v4_2_auto_accept_contact_requests">Tự động chấp nhận yêu cầu liên hệ</string>
     <string name="bad_desktop_address">Địa chỉ máy tính xấu</string>
-    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Thêm liên hệ</b>: để tạo liên kết mời mới, hoặc kết nối qua liên kết bạn nhận được.]]></string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Thêm liên hệ</b>: để tạo đường dẫn mời mới, hoặc kết nối qua đường dẫn bạn nhận được.]]></string>
     <string name="integrity_msg_bad_hash">hàm băm tin nhắn xấu</string>
     <string name="available_in_v51">"
 \nCó sẵn ở v5.1"</string>
@@ -169,7 +169,7 @@
     <string name="bold_text">in đậm</string>
     <string name="both_you_and_your_contact_can_send_disappearing">Cả bạn và liên hệ của bạn đều có thể gửi tin nhắn tự xóa.</string>
     <string name="both_you_and_your_contact_can_add_message_reactions">Cả bạn và liên hệ của bạn đều có thể thả cảm xúc tin nhắn.</string>
-    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Xin lưu ý</b>: relay tin nhắn và tệp được kết nối thông qua SOCKS proxy. Các cuộc gọi và bản xem trước liên kết sử dụng kết nối trực tiếp.]]></string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Xin lưu ý</b>: relay tin nhắn và tệp được kết nối thông qua SOCKS proxy. Các cuộc gọi và bản xem trước đường dẫn sử dụng kết nối trực tiếp.]]></string>
     <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Tốt cho pin</b>. Ứng dụng kiểm tra tin nhắn 10 phút một lần. Bạn có thể bỏ lỡ các cuộc gọi hoặc tin nhắn khẩn cấp.]]></string>
     <string name="network_smp_proxy_mode_always">Luôn luôn</string>
     <string name="callstatus_calling">đang gọi…</string>
@@ -200,7 +200,7 @@
     <string name="permissions_camera_and_record_audio">Camera và mic</string>
     <string name="alert_title_cant_invite_contacts">Không thể mời liên hệ!</string>
     <string name="cannot_access_keychain">Không thể truy cập Keystore để lưu mật khẩu cơ sở dữ liệu</string>
-    <string name="icon_descr_cancel_link_preview">hủy bỏ xem trước liên kết</string>
+    <string name="icon_descr_cancel_link_preview">hủy bỏ xem trước đường dẫn</string>
     <string name="migrate_from_device_cancel_migration">Hủy bỏ di chuyển</string>
     <string name="theme_destination_app_theme">Chủ đề ứng dụng</string>
     <string name="cannot_receive_file">Không thể nhận tệp</string>
@@ -208,34 +208,34 @@
     <string name="feature_cancelled_item">đã hủy bỏ %s</string>
     <string name="invite_prohibited">Không thể mời liên hệ!</string>
     <string name="icon_descr_cancel_live_message">Hủy bỏ tin nhắn động</string>
-    <string name="rcv_group_event_changed_member_role">đã thay đổi quyền hạn của %s thành %s</string>
+    <string name="rcv_group_event_changed_member_role">đã thay đổi chức vụ của %s thành %s</string>
     <string name="snd_error_quota">Dung lượng lưu trữ vượt quá giới hạn - người nhận không thể nhận được tin nhắn vừa gửi trước đó.</string>
     <string name="rcv_conn_event_switch_queue_phase_completed">đã thay đổi địa chỉ cho bạn</string>
     <string name="change_database_passphrase_question">Thay đổi mật khẩu cơ sở dữ liệu?</string>
-    <string name="rcv_group_event_changed_your_role">đã thay đổi quyền hạn của bạn thành %s</string>
+    <string name="rcv_group_event_changed_your_role">đã thay đổi chức vụ của bạn thành %s</string>
     <string name="change_lock_mode">Thay đổi chế độ khóa</string>
     <string name="network_type_cellular">Di động</string>
     <string name="la_change_app_passcode">Đổi mật khẩu</string>
-    <string name="change_member_role_question">Thay đổi quyền hạn của nhóm?</string>
+    <string name="change_member_role_question">Thay đổi chức vụ nhóm?</string>
     <string name="change_verb">Thay đổi</string>
     <string name="switch_receiving_address_question">Thay đổi địa chỉ nhận?</string>
     <string name="switch_receiving_address">Thay đổi địa chỉ nhận</string>
     <string name="change_self_destruct_mode">Thay đổi chế độ tự hủy</string>
     <string name="change_self_destruct_passcode">Thay đổi mã tự hủy</string>
-    <string name="change_role">Thay đổi quyền hạn</string>
+    <string name="change_role">Thay đổi chức vụ</string>
     <string name="snd_conn_event_switch_queue_phase_changing">đang thay đổi địa chỉ…</string>
     <string name="rcv_conn_event_switch_queue_phase_changing">đang thay đổi địa chỉ…</string>
     <string name="chat_console">Bảng điều khiển trò chuyện</string>
-    <string name="chat_is_running">Ứng dụng SimpleX Chat đang hoạt động</string>
-    <string name="chat_database_deleted">Cơ sở dữ liệu SimpleX Chat đã bị xóa</string>
-    <string name="chat_is_stopped_you_should_transfer_database">Ứng dụng SimpleX Chat đã được dừng lại. Nếu bạn đã sử dụng cơ sở dữ liệu này trên một thiết bị khác, bạn nên chuyển nó trở lại trước khi bắt đầu ứng dụng.</string>
-    <string name="chat_database_imported">Cơ sở dữ liệu SimpleX Chat đã được nhập</string>
-    <string name="chat_is_stopped_indication">Ứng dụng SimpleX Chat đã được dừng lại</string>
+    <string name="chat_is_running">Kết nối trò chuyện đang hoạt động</string>
+    <string name="chat_database_deleted">Cơ sở dữ liệu trò chuyện đã bị xóa</string>
+    <string name="chat_is_stopped_you_should_transfer_database">Kết nối trò chuyện đã được dừng lại. Nếu bạn đã sử dụng cơ sở dữ liệu này trên một thiết bị khác, bạn nên chuyển nó trở lại trước khi khởi động kết nối.</string>
+    <string name="chat_database_imported">Cơ sở dữ liệu trò chuyện đã được nhập</string>
+    <string name="chat_is_stopped_indication">Kết nối trò chuyện đã được dừng lại</string>
     <string name="snd_conn_event_switch_queue_phase_changing_for_member">đang thay đổi địa chỉ cho %s…</string>
     <string name="chat_preferences">Tùy chọn trò chuyện</string>
     <string name="settings_section_title_chat_colors">Màu trò chuyện</string>
-    <string name="chat_database_section">CƠ SỞ DỮ LIỆU SIMPLEX CHAT</string>
-    <string name="chat_is_stopped">Ứng dụng SimpleX Chat đã được dừng lại</string>
+    <string name="chat_database_section">CƠ SỞ DỮ LIỆU TRÒ CHUYỆN</string>
+    <string name="chat_is_stopped">Kết nối trò chuyện đã được dừng lại</string>
     <string name="migrate_to_device_chat_migrated">Cơ sở dữ liệu đã được di chuyển!</string>
     <string name="your_chats">Các cuộc trò chuyện</string>
     <string name="settings_section_title_chats">CÁC CUỘC TRÒ CHUYỆN</string>
@@ -248,17 +248,17 @@
     <string name="migrate_from_device_check_connection_and_try_again">Kiểm tra kết nối internet của bạn và thử lại</string>
     <string name="settings_section_title_chat_theme">Chủ đề trò chuyện</string>
     <string name="color_mode">Chế độ màu</string>
-    <string name="clear_verification">Xác minh xóa</string>
-    <string name="clear_contacts_selection_button">Xóa</string>
+    <string name="clear_verification">Xác minh dọn dẹp</string>
+    <string name="clear_contacts_selection_button">Dọn dẹp</string>
     <string name="icon_descr_close_button">Nút đóng</string>
-    <string name="clear_note_folder_question">Xóa ghi chú riêng tư?</string>
+    <string name="clear_note_folder_question">Dọn dẹp ghi chú riêng tư?</string>
     <string name="colored_text">có màu</string>
-    <string name="clear_chat_button">Xóa cuộc trò chuyện</string>
-    <string name="clear_chat_menu_action">Xóa</string>
+    <string name="clear_chat_button">Dọn dẹp cuộc trò chuyện</string>
+    <string name="clear_chat_menu_action">Dọn dẹp</string>
     <string name="in_developing_title">Sắp ra mắt!</string>
     <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Chọn <i>Di chuyển từ một thiết bị khác</i>trên thiết bị mới và quét mã QR.]]></string>
-    <string name="clear_verb">Xóa</string>
-    <string name="clear_chat_question">Xóa cuộc trò chuyện?</string>
+    <string name="clear_verb">Dọn dẹp</string>
+    <string name="clear_chat_question">Dọn dẹp cuộc trò chuyện?</string>
     <string name="configure_ICE_servers">Cài đặt cấu hình cho các máy chủ ICE</string>
     <string name="migrate_to_device_confirm_network_settings">Xác nhận các cài đặt mạng</string>
     <string name="confirm_passcode">Xác nhận mã truy cập</string>
@@ -302,10 +302,10 @@
     <string name="group_member_status_intro_invitation">đang kết nối (lời mời giới thiệu)</string>
     <string name="remote_ctrl_error_bad_state">Kết nối tới máy tính đang ở trong tình trạng không tốt</string>
     <string name="remote_host_was_disconnected_title">Kết nối đã bị ngắt</string>
-    <string name="connect_via_link_or_qr">Kết nối thông qua liên kết / mã QR</string>
+    <string name="connect_via_link_or_qr">Kết nối qua đường dẫn / mã QR</string>
     <string name="connect_plan_connect_to_yourself">Kết nối tới chính bạn?</string>
     <string name="connection_request_sent">Yêu cầu kết nối đã được gửi!</string>
-    <string name="connect_via_link">Kết nối thông qua liên kết</string>
+    <string name="connect_via_link">Kết nối qua đường dẫn</string>
     <string name="icon_descr_call_connecting">Đang kết nối cuộc gọi</string>
     <string name="desktop_connection_terminated">Kết nối đã bị ngắt</string>
     <string name="connecting_to_desktop">Đang kết nối tới máy tính</string>
@@ -315,21 +315,21 @@
     <string name="remote_ctrl_was_disconnected_title">Kết nối đã bị ngắt</string>
     <string name="remote_host_error_bad_state"><![CDATA[Kết nối tới điện thoại <b>%s</b> đang ở trong tình trạng không tốt]]></string>
     <string name="connect_to_desktop">Kết nối tới máy tính</string>
-    <string name="connection_timeout">Hết thời gian chờ kết nối</string>
+    <string name="connection_timeout">Thời gian chờ kết nối</string>
     <string name="connection_error">Lỗi kết nối</string>
     <string name="info_row_connection">Kết nối</string>
-    <string name="connect_plan_connect_via_link">Kết nối thông qua liên kết?</string>
+    <string name="connect_plan_connect_via_link">Kết nối qua đường dẫn?</string>
     <string name="connection_local_display_name">kết nối %1$d</string>
     <string name="display_name_connection_established">kết nối đã được tạo lập</string>
     <string name="connect_with_contact_name_question">Kết nối với %1$s?</string>
     <string name="connection_error_auth">Lỗi kết nối (AUTH)</string>
     <string name="network_session_mode_entity">Kết nối</string>
     <string name="callstatus_connecting">đang kết nối cuộc gọi…</string>
-    <string name="connect_via_contact_link">Kết nối thông qua địa chỉ liên lạc?</string>
-    <string name="connect_via_invitation_link">Kết nối thông qua liên kết dùng một lần?</string>
+    <string name="connect_via_contact_link">Kết nối qua địa chỉ liên lạc?</string>
+    <string name="connect_via_invitation_link">Kết nối qua đường dẫn dùng một lần?</string>
     <string name="icon_descr_contact_checked">Liên hệ đã được kiểm tra</string>
     <string name="receipts_section_contacts">Các liên hệ</string>
-    <string name="chat_preferences_contact_allows">Liên hệ có cho phép</string>
+    <string name="chat_preferences_contact_allows">Liên hệ cho phép</string>
     <string name="contact_already_exists">Liên hệ đã tồn tại</string>
     <string name="profile_update_event_contact_name_changed">liện hệ %1$s đã thay đổi thành %2$s</string>
     <string name="alert_title_contact_connection_pending">Liên hệ này vẫn chưa được kết nối!</string>
@@ -354,8 +354,8 @@
     <string name="cannot_share_message_alert_title">Không thể gửi tin nhắn</string>
     <string name="smp_server_test_create_file">Tạo tệp</string>
     <string name="create_address_and_let_people_connect">Tạo một địa chỉ để cho mọi người kết nối với bạn.</string>
-    <string name="create_group_link">Tạo liên kết nhóm</string>
-    <string name="button_create_group_link">Tạo liên kết</string>
+    <string name="create_group_link">Tạo đường dẫn nhóm</string>
+    <string name="button_create_group_link">Tạo đường dẫn</string>
     <string name="info_row_created_at">Được tạo ra tại</string>
     <string name="create_address">Tạo địa chỉ</string>
     <string name="share_text_created_at">Được tạo ra tại: %s</string>
@@ -370,8 +370,8 @@
     <string name="dark_mode_colors">Các màu chế độ tối</string>
     <string name="theme_dark">Tối</string>
     <string name="agent_critical_error_title">Lỗi nghiêm trọng</string>
-    <string name="share_one_time_link">Tạo liên kết lời mời dùng một lần</string>
-    <string name="creating_link">Đang tạo liên kết…</string>
+    <string name="share_one_time_link">Tạo đường dẫn lời mời dùng một lần</string>
+    <string name="creating_link">Đang tạo đường dẫn…</string>
     <string name="create_profile">Tạo hồ sơ</string>
     <string name="v5_1_custom_themes_descr">Tùy chỉnh và chia sẻ các chủ đề màu sắc.</string>
     <string name="v5_1_custom_themes">Các chủ đề tùy chỉnh</string>
@@ -388,7 +388,7 @@
     <string name="create_simplex_address">Tạo địa chỉ SimpleX</string>
     <string name="create_another_profile_button">Tạo hồ sơ</string>
     <string name="smp_server_test_create_queue">Tạo hàng đợi</string>
-    <string name="migrate_from_device_creating_archive_link">Tạo liên kết lưu trữ</string>
+    <string name="migrate_from_device_creating_archive_link">Tạo đường dẫn lưu trữ</string>
     <string name="custom_time_picker_custom">tùy chỉnh</string>
     <string name="dark_theme">Chủ đề tối</string>
     <string name="database_downgrade">Hạ cấp cơ sở dữ liệu</string>
@@ -412,7 +412,7 @@
 \nQuá trình này có thể mất một vài phút.</string>
     <string name="database_passphrase_and_export">Mật khẩu cơ sở dữ liệu và xuất dữ liệu</string>
     <string name="passphrase_is_different">Mật khẩu cơ sở dữ liệu khác với mật khẩu được lưu trong Keystore.</string>
-    <string name="database_passphrase_is_required">Mật khẩu cơ sở dữ liệu là cần thiết để mở ứng dụng SimpleX Chat.</string>
+    <string name="database_passphrase_is_required">Mật khẩu cơ sở dữ liệu là cần thiết để mở kết nối trò chuyện.</string>
     <string name="database_error">Lỗi cơ sở dữ liệu</string>
     <string name="delete_contact_menu_action">Xóa</string>
     <string name="delete_address__question">Xóa địa chỉ?</string>
@@ -447,10 +447,10 @@
     <string name="button_delete_group">Xóa nhóm</string>
     <string name="delete_pending_connection__question">Xóa kết nối đang chờ?</string>
     <string name="delete_files_and_media_for_all_users">Xóa tệp cho tất cả các hồ sơ trò chuyện</string>
-    <string name="delete_link_question">Xóa liên kết?</string>
+    <string name="delete_link_question">Xóa đường dẫn?</string>
     <string name="delete_profile">Xóa hồ sơ</string>
     <string name="full_deletion">Xóa cho mọi người</string>
-    <string name="delete_link">Xóa liên kết</string>
+    <string name="delete_link">Xóa đường dẫn</string>
     <string name="delete_image">Xóa ảnh</string>
     <string name="delete_messages">Xóa các tin nhắn</string>
     <string name="delete_group_question">Xóa nhóm?</string>
@@ -464,7 +464,7 @@
     <string name="smp_server_test_delete_queue">Xóa hàng đợi</string>
     <string name="settings_developer_tools">Công cụ nhà phát triển</string>
     <string name="settings_section_title_device">THIẾT BỊ</string>
-    <string name="developer_options_section">Tùy chọn nhà phát triển</string>
+    <string name="developer_options_section">Tùy chọn cho nhà phát triển</string>
     <string name="auth_device_authentication_is_disabled_turning_off">Xác thực thiết bị đã bị vô hiệu hóa. Tắt Khóa SimpleX.</string>
     <string name="snd_error_relay">Lỗi máy chủ đích: %1$s</string>
     <string name="delivery_receipts_title">Chỉ báo đã nhận!</string>
@@ -491,9 +491,9 @@
     <string name="servers_info_connected_servers_section_header">Các máy chủ đã kết nối</string>
     <string name="acknowledgement_errors">Lỗi xác nhận</string>
     <string name="completed">Đã hoàn thành</string>
-    <string name="chunks_deleted">Các khúc đã bị xóa</string>
-    <string name="chunks_downloaded">Các khúc đã được tải xuống</string>
-    <string name="chunks_uploaded">Các khúc đã được tải lên</string>
+    <string name="chunks_deleted">Các khối đã bị xóa</string>
+    <string name="chunks_downloaded">Các khối đã được tải xuống</string>
+    <string name="chunks_uploaded">Các khối đã được tải lên</string>
     <string name="current_user">Hồ sơ hiện tại</string>
     <string name="decryption_errors">lỗi giải mã</string>
     <string name="servers_info_detailed_statistics">Thống kê chi tiết</string>
@@ -535,12 +535,12 @@
     <string name="app_check_for_updates_disabled">Đã bị tắt</string>
     <string name="app_check_for_updates_notice_disable">Tắt</string>
     <string name="member_info_member_disabled">đã bị tắt</string>
-    <string name="disappearing_messages_are_prohibited">Tin nhắn tự xóa bị cấm trong nhóm này.</string>
+    <string name="disappearing_messages_are_prohibited">Tin nhắn tự xóa bị cấm.</string>
     <string name="info_view_call_button">gọi</string>
     <string name="info_view_connect_button">kết nối</string>
     <string name="delete_contact_cannot_undo_warning">Liên hệ sẽ bị xóa - điều này không thể hoàn tác!</string>
     <string name="conversation_deleted">Cuộc trò chuyện đã bị xóa!</string>
-    <string name="privacy_media_blur_radius">Làm mờ phương tiện truyền thông</string>
+    <string name="privacy_media_blur_radius">Làm mờ đa phương tiện</string>
     <string name="cant_call_contact_alert_title">Không thể gọi liên hệ</string>
     <string name="allow_calls_question">Cho phép thực hiện cuộc gọi?</string>
     <string name="calls_prohibited_alert_title">Cuộc gọi bị cấm!</string>
@@ -550,7 +550,7 @@
     <string name="cant_call_member_alert_title">Không thể gọi thành viên nhóm</string>
     <string name="confirm_delete_contact_question">Xác nhận xóa liên hệ?</string>
     <string name="contact_deleted">Liên hệ đã bị xóa!</string>
-    <string name="deleted_chats">Các liên hệ đã lưu trữ</string>
+    <string name="deleted_chats">Các liên hệ được lưu trữ</string>
     <string name="create_address_button">Tạo</string>
     <string name="v6_0_privacy_blur">Mờ hình ảnh để riêng tư hơn.</string>
     <string name="v6_0_connection_servers_status">Kiểm soát mạng của bạn</string>
@@ -559,7 +559,7 @@
     <string name="opensource_protocol_and_code_anybody_can_run_servers">Bất kỳ ai cũng có thể tạo máy chủ.</string>
     <string name="chat_database_exported_continue">Tiếp tục</string>
     <string name="v6_0_connect_faster_descr">Kết nối nhanh hơn với bạn bè.</string>
-    <string name="chat_database_exported_title">Cơ sở dữ liệu SimpleX Chat đã được xuất</string>
+    <string name="chat_database_exported_title">Cơ sở dữ liệu trò chuyện đã được xuất</string>
     <string name="v6_0_your_contacts_descr">Lưu trữ các liên hệ để trò chuyện sau.</string>
     <string name="disconnect_desktop_question">Ngắt kết nối máy tính?</string>
     <string name="v6_0_delete_many_messages_descr">Xóa tối đa 20 tin nhắn cùng một lúc.</string>
@@ -592,18 +592,18 @@
     <string name="dont_show_again">Không hiển thị lại</string>
     <string name="smp_server_test_download_file">Tải về tệp tin</string>
     <string name="migrate_to_device_downloading_archive">Đang tải về kho lưu trữ</string>
-    <string name="downgrade_and_open_chat">Hạ cấp và mở SimpleX Chat</string>
+    <string name="downgrade_and_open_chat">Hạ cấp và mở kết nối trò chuyện</string>
     <string name="download_file">Tải về</string>
     <string name="dont_enable_receipts">Không bật</string>
     <string name="servers_info_downloaded">Đã tải về</string>
     <string name="app_check_for_updates_download_started">Đang tải về bản cập nhật ứng dụng, đừng đóng ứng dụng</string>
-    <string name="downloaded_files">Các tập tin đã tải về</string>
+    <string name="downloaded_files">Các tệp đã tải về</string>
     <string name="download_errors">Lỗi tải về</string>
     <string name="status_e2e_encrypted">mã hóa đầu cuối</string>
     <string name="v6_0_upgrade_app_descr">Tải xuống các phiên bản mới từ GitHub.</string>
     <string name="ttl_sec">%d giây</string>
     <string name="ttl_s">%ds</string>
-    <string name="migrate_to_device_downloading_details">Đang tải xuống chi tiết liên kết</string>
+    <string name="migrate_to_device_downloading_details">Đang tải xuống chi tiết đường dẫn</string>
     <string name="failed_to_create_user_duplicate_title">Tên hiển thị trùng lặp!</string>
     <string name="ttl_week">%d tuần</string>
     <string name="ttl_weeks">%d tuần</string>
@@ -637,7 +637,7 @@
     <string name="snd_conn_event_ratchet_sync_allowed">cho phép tái đàm phán mã hóa với %s</string>
     <string name="snd_conn_event_ratchet_sync_required">cần tái đàm phán mã hóa cho %s</string>
     <string name="receipts_contacts_title_enable">Bật chỉ báo đã nhận?</string>
-    <string name="v5_3_encrypt_local_files">Mã hóa các tệp và phương tiện được lưu trữ</string>
+    <string name="v5_3_encrypt_local_files">Mã hóa các tệp và đa phương tiện được lưu trữ</string>
     <string name="error_alert_title">Lỗi</string>
     <string name="call_service_notification_end_call">Kết thúc cuộc gọi</string>
     <string name="v5_6_quantum_resistant_encryption_descr">Bật trong cuộc trò chuyện trực tiếp (BETA)!</string>
@@ -682,25 +682,25 @@
     <string name="error_creating_address">Lỗi tạo địa chỉ</string>
     <string name="error_accepting_contact_request">Lỗi chấp nhận yêu cầu liên hệ</string>
     <string name="error_changing_address">Lỗi thay đổi địa chỉ</string>
-    <string name="error_deleting_database">Lỗi xóa cơ sở dữ liệu SimpleX Chat</string>
+    <string name="error_deleting_database">Lỗi xóa cơ sở dữ liệu trò chuyện</string>
     <string name="error_creating_member_contact">Lỗi tạo liên hệ thành viên</string>
     <string name="error_aborting_address_change">Lỗi hủy bỏ thay đổi địa chỉ</string>
-    <string name="error_creating_link_for_group">Lỗi tạo liên kết nhóm</string>
-    <string name="error_changing_role">Lỗi thay đổi quyền hạn</string>
+    <string name="error_creating_link_for_group">Lỗi tạo đường dẫn nhóm</string>
+    <string name="error_changing_role">Lỗi thay đổi chức vụ</string>
     <string name="smp_proxy_error_connecting">Lỗi kết nối đến máy chủ chuyển tiếp %1$s. Vui lòng thử lại sau.</string>
     <string name="error_deleting_contact">Lỗi xóa liên hệ</string>
     <string name="error_deleting_group">Lỗi xóa nhóm</string>
-    <string name="error_deleting_link_for_group">Lỗi xóa liên kết nhóm</string>
+    <string name="error_deleting_link_for_group">Lỗi xóa đường dẫn nhóm</string>
     <string name="error_deleting_contact_request">Lỗi xóa yêu cầu liên hệ</string>
     <string name="migrate_from_device_error_deleting_database">Lỗi xóa cơ sở dữ liệu</string>
     <string name="error_deleting_pending_contact_connection">Lỗi xóa kết nối liên hệ đang chờ xử lý</string>
-    <string name="migrate_from_device_error_exporting_archive">Lỗi xuất cơ sở dữ liệu SimpleX Chat</string>
+    <string name="migrate_from_device_error_exporting_archive">Lỗi xuất cơ sở dữ liệu trò chuyện</string>
     <string name="error_encrypting_database">Lỗi mã hóa cơ sở dữ liệu</string>
     <string name="error_enabling_delivery_receipts">Lỗi bật chỉ báo đã nhận!</string>
     <string name="error_deleting_note_folder">Lỗi xóa ghi chú riêng tư</string>
     <string name="error_deleting_user">Lỗi xóa hồ sơ người dùng</string>
-    <string name="error_importing_database">Lỗi nhập cơ sở dữ liệu SimpleX Chat</string>
-    <string name="error_exporting_chat_database">Lỗi xuất cơ sở dữ liệu SimpleX Chat</string>
+    <string name="error_importing_database">Lỗi nhập cơ sở dữ liệu trò chuyện</string>
+    <string name="error_exporting_chat_database">Lỗi xuất cơ sở dữ liệu trò chuyện</string>
     <string name="migrate_to_device_error_downloading_archive">Lỗi tải xuống kho lưu trữ</string>
     <string name="error_initializing_web_view">Lỗi khởi tạo WebView. Cập nhật hệ điều hành của bạn lên phiên bản mới. Vui lòng liên hệ với nhà phát triển.
 \nLỗi: %s</string>
@@ -718,15 +718,15 @@
     <string name="servers_info_reconnect_servers_error">Lỗi kết nối lại máy chủ</string>
     <string name="servers_info_sessions_errors">Lỗi</string>
     <string name="servers_info_reset_stats_alert_error_title">Lỗi khôi phục thống kê</string>
-    <string name="error_updating_link_for_group">Lỗi cập nhật liên kết nhóm</string>
+    <string name="error_updating_link_for_group">Lỗi cập nhật đường dẫn nhóm</string>
     <string name="error_showing_message">lỗi hiển thị tin nhắn</string>
     <string name="error_showing_content">lỗi hiển thị nội dung</string>
     <string name="error_saving_ICE_servers">Lỗi lưu máy chủ ICE</string>
     <string name="error_saving_xftp_servers">Lỗi lưu máy chủ XFTP</string>
     <string name="error_saving_smp_servers">Lỗi lưu máy chủ SMP</string>
     <string name="error_sending_message">Lỗi gửi tin nhắn</string>
-    <string name="error_starting_chat">Lỗi khởi động ứng dụng</string>
-    <string name="error_stopping_chat">Lỗi dừng ứng dụng</string>
+    <string name="error_starting_chat">Lỗi khởi động kết nối trò chuyện</string>
+    <string name="error_stopping_chat">Lỗi dừng kết nối trò chuyện</string>
     <string name="error_showing_desktop_notification">Lỗi hiển thị thông báo, liên hệ với nhà phát triển.</string>
     <string name="error_saving_user_password">Lỗi lưu mật khẩu người dùng</string>
     <string name="migrate_from_device_error_saving_settings">Lỗi lưu cài đặt</string>
@@ -737,7 +737,7 @@
     <string name="v5_2_disappear_one_message_descr">Dù đã tắt trong cuộc trò chuyện.</string>
     <string name="error_setting_network_config">Lỗi cập nhật cấu hình mạng</string>
     <string name="error_updating_user_privacy">Lỗi cập nhật quyền riêng tư người dùng</string>
-    <string name="icon_descr_expand_role">Mở rộng chọn quyền hạn</string>
+    <string name="icon_descr_expand_role">Mở rộng chọn chức vụ</string>
     <string name="settings_section_title_experimenta">THỬ NGHIỆM</string>
     <string name="expand_verb">Mở rộng</string>
     <string name="exit_without_saving">Thoát mà không lưu</string>
@@ -749,14 +749,14 @@
     <string name="migrate_from_device_error_uploading_archive">Lỗi tải lên kho lưu trữ</string>
     <string name="migrate_from_device_exported_file_doesnt_exist">Tập tin đã xuất không tồn tại</string>
     <string name="settings_section_title_files">TẬP TIN</string>
-    <string name="failed_to_parse_chats_title">Không thể tải tin nhắn</string>
-    <string name="file_error_no_file">Không tìm thấy tập tin - có thể tập tin đã bị xóa và hủy bỏ.</string>
-    <string name="file_error">Lỗi tập tin</string>
+    <string name="failed_to_parse_chats_title">Không thể tải các cuộc trò chuyện</string>
+    <string name="file_error_no_file">Không tìm thấy tệp - có thể tập tin đã bị xóa và hủy bỏ.</string>
+    <string name="file_error">Lỗi tệp</string>
     <string name="export_theme">Xuất chủ đề</string>
-    <string name="failed_to_parse_chat_title">Không thể tải tin nhắn</string>
+    <string name="failed_to_parse_chat_title">Không thể tải cuộc trò chuyện</string>
     <string name="choose_file">Tập tin</string>
     <string name="v5_0_large_files_support_descr">Nhanh chóng và không cần phải đợi người gửi hoạt động!</string>
-    <string name="file_not_found">Không tìm thấy tập tin</string>
+    <string name="file_not_found">Không tìm thấy tệp</string>
     <string name="file_with_path">Tập tin: %s</string>
     <string name="v5_4_better_groups_descr">Tham gia nhanh chóng hơn và xử lý tin nhắn ổn định hơn.</string>
     <string name="servers_info_files_tab">Tập tin</string>
@@ -764,19 +764,19 @@
     <string name="icon_descr_file">Tập tin</string>
     <string name="file_error_relay">Lỗi máy chủ tệp: %1$s</string>
     <string name="info_row_file_status">Trạng thái tệp</string>
-    <string name="files_and_media_not_allowed">Tệp và phương tiện truyền thông không được cho phép</string>
-    <string name="files_are_prohibited_in_group">Tệp và phương tiện truyền thông bị cấm trong nhóm này.</string>
+    <string name="files_and_media_not_allowed">Tệp và đa phương tiện không được cho phép</string>
+    <string name="files_are_prohibited_in_group">Tệp và đa phương tiện bị cấm.</string>
     <string name="revoke_file__message">Tệp sẽ bị xóa khỏi máy chủ.</string>
-    <string name="files_and_media_section">Tệp &amp; phương tiện truyền thông</string>
-    <string name="files_and_media_prohibited">Tệp và phương tiện truyền thông bị cấm!</string>
+    <string name="files_and_media_section">Tệp &amp; đa phương tiện</string>
+    <string name="files_and_media_prohibited">Tệp và đa phương tiện bị cấm!</string>
     <string name="file_will_be_received_when_contact_completes_uploading">Tệp sẽ được nhận khi liên hệ của bạn hoàn tất quá trình tải lên.</string>
-    <string name="files_and_media">Tệp và phương tiện truyền thông</string>
-    <string name="migrate_to_device_file_delete_or_link_invalid">Tệp đã bị xóa hoặc liên kết không hợp lệ</string>
+    <string name="files_and_media">Tệp và đa phương tiện</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">Tệp đã bị xóa hoặc đường dẫn không hợp lệ</string>
     <string name="file_saved">Tệp đã được lưu</string>
     <string name="file_will_be_received_when_contact_is_online">Tệp sẽ được nhận khi liên hệ của bạn hoạt động, vui lòng chờ hoặc kiểm tra lại sau!</string>
     <string name="share_text_file_status">Trạng thái tệp: %s</string>
     <string name="wallpaper_scale_fill">Lấp đầy</string>
-    <string name="settings_section_title_chat_database">CƠ SỞ DỮ LIỆU SIMPLEX CHAT</string>
+    <string name="settings_section_title_chat_database">CƠ SỞ DỮ LIỆU TRÒ CHUYỆN</string>
     <string name="switching_profile_error_title">Lỗi chuyển đổi hồ sơ</string>
     <string name="v5_2_favourites_filter_descr">Lọc các cuộc hội thoại chưa đọc và các cuộc hội thoại yêu thích.</string>
     <string name="v5_1_message_reactions_descr">Cuối cùng, chúng ta đã có chúng! 🚀</string>
@@ -828,26 +828,26 @@
     <string name="wallpaper_preview_hello_alice">Chào buổi chiều!</string>
     <string name="v4_4_french_interface">Giao diện tiếng Pháp</string>
     <string name="found_desktop">Đã tìm thấy máy tính</string>
-    <string name="simplex_link_mode_full">Liên kết đầy đủ</string>
+    <string name="simplex_link_mode_full">Toàn bộ đường dẫn</string>
     <string name="from_gallery_button">Từ Thư viện</string>
     <string name="full_name__field">Tên đầy đủ:</string>
     <string name="group_is_decentralized">Tuyệt đối phi tập trung - chỉ hiển thị cho thành viên.</string>
     <string name="wallpaper_preview_hello_bob">Chào buổi sáng!</string>
     <string name="group_member_status_group_deleted">nhóm đã bị xóa</string>
-    <string name="group_members_can_add_message_reactions">Các thành viên nhóm có thể thả cảm xúc tin nhắn.</string>
-    <string name="group_members_can_delete">Các thành viên nhóm có thể xóa theo cách không thể hồi phục các tin nhắn đã gửi. (24 giờ)</string>
-    <string name="group_members_can_send_voice">Các thành viên trong nhóm có thể gửi tin nhắn thoại.</string>
+    <string name="group_members_can_add_message_reactions">Các thành viên có thể thả cảm xúc tin nhắn.</string>
+    <string name="group_members_can_delete">Các thành viên có thể xóa các tin nhắn đã gửi mà không thể phục hồi lại. (24 giờ)</string>
+    <string name="group_members_can_send_voice">Các thành viên có thể gửi tin nhắn thoại.</string>
     <string name="permissions_required">Cấp quyền</string>
-    <string name="group_link">Liên kết nhóm</string>
+    <string name="group_link">Đường dẫn nhóm</string>
     <string name="info_row_group">Nhóm</string>
     <string name="group_full_name_field">Tên đầy đủ nhóm:</string>
-    <string name="group_members_can_send_disappearing">Các thành viên trong nhóm có thể gửi tin nhắn tự xóa.</string>
-    <string name="group_members_can_send_files">Các thành viên trong nhóm có thể gửi tệp và phương tiện truyền thông.</string>
-    <string name="group_members_can_send_simplex_links">Các thành viên trong nhóm có thể gửi liên kết SimpleX.</string>
+    <string name="group_members_can_send_disappearing">Các thành viên có thể gửi tin nhắn tự xóa.</string>
+    <string name="group_members_can_send_files">Các thành viên có thể gửi tệp và đa phương tiện.</string>
+    <string name="group_members_can_send_simplex_links">Các thành viên có thể gửi đường dẫn SimpleX.</string>
     <string name="icon_descr_group_inactive">Nhóm không hoạt động</string>
     <string name="connect_plan_group_already_exists">Nhóm đã tồn tại rồi!</string>
-    <string name="group_members_can_send_dms">Các thành viên trong nhóm có thể gửi tin nhắn trực tiếp.</string>
-    <string name="v4_2_group_links">Liên kết nhóm</string>
+    <string name="group_members_can_send_dms">Các thành viên có thể gửi tin nhắn trực tiếp.</string>
+    <string name="v4_2_group_links">Đường dẫn nhóm</string>
     <string name="group_invitation_expired">Lời mời nhóm đã hết hạn</string>
     <string name="alert_message_group_invitation_expired">Lời mới nhóm không còn có hiệu lực, nó đã bị xóa bởi người gửi.</string>
     <string name="permissions_grant">Cho phép thực hiện cuộc gọi</string>
@@ -907,15 +907,15 @@
     <string name="la_immediately">Ngay lập tức</string>
     <string name="image_will_be_received_when_contact_completes_uploading">Hình ảnh sẽ được nhận khi liên hệ của bạn hoàn thành việc tải lên.</string>
     <string name="gallery_image_button">Hình ảnh</string>
-    <string name="if_you_cant_meet_in_person">Nếu bạn không thể gặp mặt trực tiếp, cho liên hệ của bạn xem mã QR trong một cuộc gọi video, hoặc chia sẻ liên kết.</string>
+    <string name="if_you_cant_meet_in_person">Nếu bạn không thể gặp mặt trực tiếp, cho liên hệ của bạn xem mã QR trong một cuộc gọi video, hoặc chia sẻ đường dẫn.</string>
     <string name="icon_descr_image_snd_complete">Hình ảnh đã được gửi</string>
     <string name="image_descr">Hình ảnh</string>
     <string name="image_saved">Hình ảnh đã được lưu vào Thư viện</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Nếu bạn nhận được liên kết mời SimpleX Chat, bạn có thể mở nó trong trình duyệt của mình:</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Nếu bạn không thể gặp mặt trực tiếp, bạn có thể <b>quét mã QR trong cuộc gọi video</b>, hoặc liên hệ của bạn có thể chia sẻ một liên kết mời.]]></string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Nếu bạn nhận được đường dẫn mời SimpleX Chat, bạn có thể mở nó trong trình duyệt của mình:</string>
+    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[Nếu bạn không thể gặp mặt trực tiếp, bạn có thể <b>quét mã QR trong cuộc gọi video</b>, hoặc liên hệ của bạn có thể chia sẻ một đường dẫn mời.]]></string>
     <string name="network_disable_socks_info">Nếu bạn xác nhận, các máy chủ truyền tin nhắn sẽ có thể biết địa chỉ IP, và nhà cung cấp của bạn - máy chủ nào mà bạn đang kết nối.</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Nếu bạn chọn từ chối người gửi sẽ KHÔNG được thông báo.</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Nếu bạn không thể gặp mặt trực tiếp, <b>cho liên hệ của bạn xem mã QR trong cuộc gọi video</b>, hoặc chia sẻ liên kết.]]></string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Nếu bạn không thể gặp mặt trực tiếp, <b>cho liên hệ của bạn xem mã QR trong cuộc gọi video</b>, hoặc chia sẻ đường dẫn.]]></string>
     <string name="import_database_confirmation">Nhập</string>
     <string name="ignore">Bỏ qua</string>
     <string name="member_info_member_inactive">không hoạt động</string>
@@ -933,15 +933,15 @@
     <string name="import_database">Nhập cơ sở dữ liệu</string>
     <string name="v5_7_call_sounds">Âm thanh trong cuộc gọi</string>
     <string name="v4_3_improved_privacy_and_security">Nâng cao bảo mật và sự riêng tư</string>
-    <string name="description_via_one_time_link_incognito">ẩn danh qua liên kết dùng một lần</string>
+    <string name="description_via_one_time_link_incognito">ẩn danh qua đường dẫn dùng một lần</string>
     <string name="info_menu">Thông tin</string>
     <string name="conn_level_desc_indirect">gián tiếp (%1$s)</string>
-    <string name="migrate_from_device_chat_should_be_stopped">Để tiếp tục, hãy ngắt kết nối tới các máy chủ dùng để truyền dẫn tin nhắn.</string>
+    <string name="migrate_from_device_chat_should_be_stopped">Để tiếp tục, hãy ngắt kết nối trò chuyện.</string>
     <string name="install_simplex_chat_for_terminal">Cài đặt SimpleX Chat cho cửa sổ câu lệnh</string>
-    <string name="description_via_contact_address_link_incognito">ẩn danh qua liên kết địa chỉ liên lạc</string>
+    <string name="description_via_contact_address_link_incognito">ẩn danh qua đường dẫn địa chỉ liên lạc</string>
     <string name="incoming_audio_call">Cuộc gọi thoại đến</string>
-    <string name="initial_member_role">Quyền hạn ban đầu</string>
-    <string name="description_via_group_link_incognito">ẩn danh qua liên kết nhóm</string>
+    <string name="initial_member_role">Chức vụ ban đầu</string>
+    <string name="description_via_group_link_incognito">ẩn danh qua đường dẫn nhóm</string>
     <string name="incorrect_code">Mã bảo mật không đúng!</string>
     <string name="in_reply_to">Trả lời đến</string>
     <string name="incompatible_database_version">Phiên bản cơ sở dữ liệu không tương thích</string>
@@ -955,16 +955,16 @@
     <string name="desktop_incompatible_version">Phiên bản không tương thích</string>
     <string name="theme_colors_section_title">MÀU SẮC GIAO DIỆN</string>
     <string name="group_member_status_invited">đã được mời</string>
-    <string name="error_parsing_uri_title">Liên kết không hợp lệ</string>
-    <string name="invalid_chat">tác vụ trò chuyện không hợp lệ</string>
+    <string name="error_parsing_uri_title">Đường dẫn không hợp lệ</string>
+    <string name="invalid_chat">cuộc trò chuyện không hợp lệ</string>
     <string name="invalid_data">dữ liệu không hợp lệ</string>
     <string name="invalid_message_format">định dạng tin nhắn không hợp lệ</string>
     <string name="action_button_add_members">Mời</string>
     <string name="alert_title_group_invitation_expired">Lời mời đã hết hạn!</string>
-    <string name="invalid_contact_link">Liên kết không hợp lệ!</string>
-    <string name="invalid_file_link">Liên kết không hợp lệ</string>
+    <string name="invalid_contact_link">Đường dẫn không hợp lệ!</string>
+    <string name="invalid_file_link">Đường dẫn không hợp lệ</string>
     <string name="failed_to_create_user_invalid_title">Tên hiển thị không hợp lệ!</string>
-    <string name="invalid_connection_link">Liên kết kết nối không hợp lệ</string>
+    <string name="invalid_connection_link">Đường dẫn kết nối không hợp lệ</string>
     <string name="service_notifications">Thông báo tức thời!</string>
     <string name="invalid_QR_code">Mã QR không hợp lệ</string>
     <string name="icon_descr_instant_notifications">Thông báo tức thời</string>
@@ -1023,7 +1023,7 @@
     <string name="lock_mode">Chế độ khóa</string>
     <string name="v4_5_italian_interface">Giao diện tiếng Ý</string>
     <string name="this_device_version"><![CDATA[<i>thiết bị này v%s)</i>]]></string>
-    <string name="message_reactions_are_prohibited">Biểu đạt cảm xúc tin nhắn bị cấm trong nhóm này.</string>
+    <string name="message_reactions_are_prohibited">Thả biểu tượng cảm xúc tin nhắn bị cấm.</string>
     <string name="display_name_invited_to_connect">đã được mời để kết nối</string>
     <string name="learn_more">Tìm hiểu thêm</string>
     <string name="keep_invitation_link">Giữ</string>
@@ -1047,17 +1047,17 @@
     <string name="privacy_media_blur_radius_medium">Trung bình</string>
     <string name="v4_4_live_messages">Tin nhắn động</string>
     <string name="keep_conversation">Giữ lại cuộc trò chuyện</string>
-    <string name="image_descr_link_preview">Hình ảnh xem trước của liên kết</string>
+    <string name="image_descr_link_preview">Hình ảnh xem trước của đường dẫn</string>
     <string name="member_will_be_removed_from_group_cannot_be_undone">Thành viên sẽ bị xóa khỏi nhóm - việc này không thể được hoàn tác!</string>
     <string name="chat_theme_apply_to_light_mode">Chế độ sáng</string>
     <string name="v5_7_new_interface_languages">UI tiếng Litva</string>
     <string name="settings_section_title_messages">TIN NHẮN VÀ TỆP</string>
-    <string name="message_deletion_prohibited_in_chat">Việc xóa tin nhắn mà không thể phục hồi bị cấm trong nhóm này.</string>
+    <string name="message_deletion_prohibited_in_chat">Việc xóa tin nhắn mà không thể phục hồi là bị cấm.</string>
     <string name="v5_5_join_group_conversation">Tham gia vào các cuộc trò chuyện nhóm</string>
     <string name="update_network_smp_proxy_mode_question">Chế độ định tuyến tin nhắn</string>
     <string name="email_invite_subject">Hãy trò chuyện trên SimpleX Chat</string>
     <string name="italic_text">in nghiêng</string>
-    <string name="onboarding_notifications_mode_subtitle">Nó có thể được thay đổi sau trong phần cài đặt.</string>
+    <string name="onboarding_notifications_mode_subtitle">Nó ảnh hưởng đến pin như thế nào</string>
     <string name="message_deletion_prohibited">Việc xóa tin nhắn mà không thể phục hồi bị cấm trong cuộc trò chuyện này.</string>
     <string name="message_reactions_prohibited_in_this_chat">Biểu đạt cảm xúc tin nhắn bị cấm trong cuộc trò chuyện này.</string>
     <string name="v4_5_message_draft">Bản nháp tin nhắn</string>
@@ -1066,7 +1066,7 @@
     <string name="messages_section_title">Tin nhắn</string>
     <string name="keychain_error">Lỗi keychain</string>
     <string name="rcv_group_event_member_left">đã rời</string>
-    <string name="rcv_group_event_invited_via_your_group_link">đã được mời thông qua liên kết nhóm của bạn</string>
+    <string name="rcv_group_event_invited_via_your_group_link">đã được mời qua đường dẫn nhóm của bạn</string>
     <string name="group_member_role_member">thành viên</string>
     <string name="group_member_status_left">đã rời</string>
     <string name="incognito_info_allows">Nó cho phép việc có các kết nối ẩn danh mà không có bất kỳ dữ liệu chung nào giữa chúng trong một hồ sơ trò chuyện</string>
@@ -1081,7 +1081,7 @@
     <string name="v4_3_irreversible_message_deletion">Xóa tin nhắn mà không thể phục hồi</string>
     <string name="compose_message_placeholder">Tin nhắn</string>
     <string name="message_servers">Máy chủ tin nhắn</string>
-    <string name="media_and_file_servers">Máy chủ tệp và phương tiện</string>
+    <string name="media_and_file_servers">Máy chủ tệp và đa phương tiện</string>
     <string name="notification_preview_mode_message">Nội dung tin nhắn</string>
     <string name="forward_files_messages_deleted_after_selection_desc">Tin nhắn đã bị xóa sau khi bạn chọn chúng.</string>
     <string name="unblock_member_desc">Tin nhắn từ %s sẽ được hiển thị!</string>
@@ -1144,10 +1144,10 @@
     <string name="new_chat">Cuộc trò chuyện mới</string>
     <string name="custom_time_unit_minutes">phút</string>
     <string name="new_database_archive">Kho lưu trữ cơ sở dữ liệu mới</string>
-    <string name="new_member_role">Quyền hạn thành viên mới</string>
+    <string name="new_member_role">Chức vụ thành viên mới</string>
     <string name="v4_6_reduced_battery_usage_descr">Nhiều cải tiến hơn nữa sắp ra mắt!</string>
     <string name="remote_host_error_bad_version"><![CDATA[Thiết bị di động <b>%s</b> có một phiên bản không được hỗ trợ. Xin vui lòng đảm bảo rằng bạn dùng cùng một phiên bản trên cả hai thiết bị.]]></string>
-    <string name="v6_0_new_media_options">Các tùy chọn phương tiện mới</string>
+    <string name="v6_0_new_media_options">Các tùy chọn đa phương tiện mới</string>
     <string name="icon_descr_call_missed">Cuộc gọi nhỡ</string>
     <string name="v4_5_reduced_battery_usage_descr">Nhiều cải tiến hơn nữa sắp ra mắt!</string>
     <string name="v5_6_app_data_migration_descr">Di chuyển sang một thiết bị khác qua mã QR.</string>
@@ -1178,13 +1178,13 @@
     <string name="forward_alert_title_nothing_to_forward">Không có gì để chuyển tiếp!</string>
     <string name="shutdown_alert_desc">Thông báo sẽ dừng hoạt động cho đến khi bạn khởi động lại ứng dụng</string>
     <string name="first_platform_without_user_ids">Không có thông tin định danh người dùng.</string>
-    <string name="item_info_no_text">không có nội dung</string>
+    <string name="item_info_no_text">không có văn bản</string>
     <string name="feature_off">tắt</string>
     <string name="chat_preferences_off">tắt</string>`
   <string name="only_you_can_make_calls">Chỉ bạn mới có thể thực hiện cuộc gọi.</string>
     <string name="only_your_contact_can_add_message_reactions">Chỉ liên hệ của bạn mới có thể thả cảm xúc tin nhắn.</string>
     <string name="videos_limit_desc">Chỉ có thể gửi 10 video cùng một lúc</string>
-    <string name="add_contact">Liên kết lời mời dùng một lần</string>
+    <string name="add_contact">Đường dẫn lời mời dùng một lần</string>
     <string name="only_stored_on_members_devices">(chỉ được lưu trữ bởi thành viên nhóm)</string>
     <string name="settings_notification_preview_title">Xem trước thông báo</string>
     <string name="settings_notifications_mode_title">Dịch vụ thông báo</string>
@@ -1192,7 +1192,7 @@
     <string name="no_received_app_files">Không có tệp nào được gửi hay được nhận</string>
     <string name="group_member_role_observer">quan sát viên</string>
     <string name="network_type_no_network_connection">Không có kết nối mạng</string>
-    <string name="only_owners_can_enable_files_and_media">Chỉ chủ nhóm mới có thể bật tính năng cho phép gửi tệp và phương tiện.</string>
+    <string name="only_owners_can_enable_files_and_media">Chỉ chủ nhóm mới có thể bật tính năng cho phép gửi tệp và đa phương tiện.</string>
     <string name="images_limit_desc">Chỉ có thể gửi 10 hình ảnh cùng một lúc</string>
     <string name="only_one_device_can_work_at_the_same_time">Chỉ một thiết bị mới có thể hoạt động cùng một lúc</string>
     <string name="not_compatible">Không tương thích!</string>
@@ -1200,10 +1200,10 @@
     <string name="ok">OK</string>
     <string name="only_delete_conversation">Chỉ xóa cuộc trò chuyện</string>
     <string name="only_you_can_send_voice">Chỉ bạn mới có thể gửi tin nhắn thoại.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Chỉ thiết bị cuối mới lưu trữ hồ sơ người dùng, liên hệ, nhóm, và các tin nhắn được gửi với <b>bảo mật đầu cuối 2 lớp</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Chỉ thiết bị cuối mới lưu trữ các hồ sơ người dùng, liên hệ, nhóm, và tin nhắn</string>
     <string name="only_group_owners_can_enable_voice">Chỉ chủ nhóm mới có thể bật tính năng tin nhắn thoại.</string>
     <string name="only_you_can_send_disappearing">Chỉ bạn mới có thể gửi tin nhắn tự xóa.</string>
-    <string name="one_time_link">Liên kết lời mời dùng một lần</string>
+    <string name="one_time_link">Đường dẫn lời mời dùng một lần</string>
     <string name="only_you_can_add_message_reactions">Chỉ có bạn mới có thể thả cảm xúc tin nhắn.</string>
     <string name="notifications_will_be_hidden">Thông báo sẽ chỉ được gửi cho đến khi ứng dụng dừng!</string>
     <string name="only_you_can_delete_messages">Chỉ bạn mới có thể xóa tin nhắn mà không thể phục hồi (liên hệ của bạn có thể đánh dấu chúng để xóa). (24 giờ)</string>
@@ -1212,12 +1212,12 @@
     <string name="feature_offered_item_with_param">được đề nghị %s: %2s</string>
     <string name="la_mode_off">Tắt</string>
     <string name="only_group_owners_can_change_prefs">Chỉ chủ nhóm mới có thể điều chỉnh các tùy chọn nhóm.</string>
-    <string name="v4_6_group_moderation_descr">Giờ thì quản trị viên có thể:\n- xóa tin nhắn của thành viên\n- vô hiệu hóa thành viên (quyền hạn quan sát viên)</string>
+    <string name="v4_6_group_moderation_descr">Giờ thì quản trị viên có thể:\n- xóa tin nhắn của thành viên\n- vô hiệu hóa thành viên (chức vụ quan sát viên)</string>
     <string name="no_selected_chat">Không có cuộc trò chuyện nào được chọn</string>
     <string name="selected_chat_items_nothing_selected">Không có gì được chọn</string>
     <string name="open_verb">Mở</string>
     <string name="auth_open_chat_console">Mở bảng điều khiển trò chuyện</string>
-    <string name="auth_open_chat_profiles">Mở hồ sơ trò chuyện</string>
+    <string name="auth_open_chat_profiles">Thay đổi hồ sơ trò chuyện</string>
     <string name="network_use_onion_hosts_required_desc">Dịch vụ onion sẽ được yêu cầu để kết nối.\nXin lưu ý: bạn sẽ không thể kết nối tới các máy chủ mà không có địa chỉ .onion.</string>
     <string name="rcv_group_event_open_chat">Mở</string>
     <string name="open_database_folder">Mở thư mục cơ sở dữ liệu</string>
@@ -1228,7 +1228,7 @@
     <string name="only_your_contact_can_send_voice">Chỉ liên hệ của bạn mới có thể gửi tin nhắn thoại.</string>
     <string name="group_member_role_owner">chủ sở hữu</string>
     <string name="open_server_settings_button">Mở cài đặt máy chủ</string>
-    <string name="simplex_link_mode_browser_warning">Mở liên kết trong trình duyệt có thể làm giảm sự riêng tư và bảo mật của kết nối. Liên kết SimpleX không đáng tin cậy sẽ được đánh dấu màu đỏ.</string>
+    <string name="simplex_link_mode_browser_warning">Mở đường dẫn trong trình duyệt có thể làm giảm sự riêng tư và bảo mật của kết nối. Đường dẫn SimpleX không đáng tin cậy sẽ được đánh dấu màu đỏ.</string>
     <string name="only_your_contact_can_delete">Chỉ liên hệ của bạn mới có thể xóa tin nhắn mà không thể phục hồi (bạn có thể đánh dấu chúng để xóa). (24 giờ)</string>
     <string name="turn_off_system_restriction_button">Mở cài đặt ứng dụng</string>
     <string name="la_lock_mode_passcode">Mục mã truy cập</string>
@@ -1244,7 +1244,7 @@
     <string name="open_simplex_chat_to_accept_call">Mở SimpleX Chat để chấp nhận cuộc gọi</string>
     <string name="call_desktop_permission_denied_safari">Mở Cài đặt Safari / Trang Web / Mic, rồi chọn Cho phép với localhost.</string>
     <string name="la_mode_passcode">Mã truy cập</string>
-    <string name="open_chat">Mở cuộc hội thoại</string>
+    <string name="open_chat">Mở cuộc trò chuyện</string>
     <string name="app_check_for_updates_button_open">Mở vị trí tệp</string>
     <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Mở <i>Sử dụng từ máy tính</i> trong ứng dụng di động và quét mã QR.]]></string>
     <string name="or_paste_archive_link">Hoặc dán đường dẫn lưu trữ</string>
@@ -1256,14 +1256,14 @@
     <string name="other_errors">các lỗi khác</string>
     <string name="smp_servers_other">Các máy chủ SMP khác</string>
     <string name="xftp_servers_other">Các máy chủ XFTP khác</string>
-    <string name="paste_the_link_you_received_to_connect_with_your_contact">Dán đường dẫn mà bạn nhận được để kết nối với liên hệ hệ của bạn…</string>
+    <string name="paste_the_link_you_received_to_connect_with_your_contact">Dán đường dẫn mà bạn nhận được để kết nối với liên hệ của bạn…</string>
     <string name="paste_link">Dán đường dẫn</string>
     <string name="network_proxy_password">Mật khẩu</string>
     <string name="onboarding_notifications_mode_periodic">Định kỳ</string>
     <string name="servers_info_subscriptions_connections_pending">Đang chờ xử lý</string>
     <string name="icon_descr_server_status_pending">Đang chờ xử lý</string>
     <string name="restore_passphrase_not_found_desc">Không tìm thấy mật khẩu trong Keystore, vui lòng nhập thủ công. Điều này có thể xảy ra nếu bạn khôi phục dữ liệu ứng dụng bằng một công cụ sao lưu. Nếu không phải như vậy, xin vui lòng liên hệ với nhà phát triển.</string>
-    <string name="past_member_vName">Thành viên cũ %1$s</string>
+    <string name="past_member_vName">Thành viên trước đây %1$s</string>
     <string name="v5_5_simpler_connect_ui">Dán đường dẫn để kết nối!</string>
     <string name="periodic_notifications">Thông báo định kỳ</string>
     <string name="paste_the_link_you_received">Dán đường dẫn mà bạn nhận được</string>
@@ -1285,7 +1285,7 @@
     <string name="enter_correct_current_passphrase">Xin vui lòng nhập đúng mật khẩu hiện tại.</string>
     <string name="v6_0_chat_list_media">Mở từ danh sách cuộc trò chuyện.</string>
     <string name="v5_6_picture_in_picture_calls">Cuộc gọi hình trong hình</string>
-    <string name="agent_internal_error_desc">Xin vui lòng báo cáo với các nhà phát triển:\n%s</string>
+    <string name="agent_internal_error_desc">Xin vui lòng báo cáo với các nhà phát triển: \n%s</string>
     <string name="periodic_notifications_disabled">Thông báo định kỳ đã bị tắt!</string>
     <string name="remote_ctrl_connection_stopped_desc">Xin vui lòng kiểm tra rằng thiết bị di động và máy tính kết nối tới cùng một mạng cục bộ, và tường lửa của máy tính cho phép kết nối.\nHãy chia sẻ bất kỳ vấn đề nào khác với nhà phát triển.</string>
     <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Xin vui lòng kiểm tra rằng bạn đã dùng đúng đường dẫn hoặc yêu cầu liên hệ của bạn gửi cho bạn một đường dẫn khác.</string>
@@ -1296,12 +1296,12 @@
     <string name="restore_database_alert_desc">Xin vui lòng nhập mật khẩu trước đó sau khi khôi phục bản sao lưu cơ sở dữ liệu. Việc này không thể được hoàn tác.</string>
     <string name="observer_cant_send_message_desc">Xin vui lòng liên lạc với quản trị viên nhóm.</string>
     <string name="alert_text_fragment_please_report_to_developers">Xin vui lòng báo cáo với các nhà phát triển.</string>
-    <string name="agent_critical_error_desc">Xin vui lòng báo cáo tới các nhà phát triển:\n%s\n\nGợi ý rằng bạn nên khởi động lại ứng dụng.</string>
+    <string name="agent_critical_error_desc">Xin vui lòng báo cáo với các nhà phát triển: \n%s\n\nGợi ý rằng bạn nên khởi động lại ứng dụng.</string>
     <string name="error_smp_test_certificate">Có lẽ vân tay chứng chỉ trong địa chỉ máy chủ là không chính xác</string>
     <string name="migrate_from_device_database_init">Đang chuẩn bị tải lên</string>
     <string name="port_verb">Cổng</string>
     <string name="network_proxy_port">cổng %d</string>
-    <string name="store_passphrase_securely_without_recover">Xin vui lòng lưu trữ mật khẩu một cách an toàn, bạn sẽ KHÔNG thể trò chuyện nếu bạn làm mất nó.</string>
+    <string name="store_passphrase_securely_without_recover">Xin vui lòng lưu trữ mật khẩu một cách an toàn, bạn sẽ KHÔNG thể try cập kết nối trò chuyện nếu bạn làm mất nó.</string>
     <string name="loading_remote_file_desc">Xin vui lòng chờ trong khi tệp đang được tải từ thiết bị được liên kết</string>
     <string name="smp_servers_preset_address">Địa chỉ máy chủ cài sẵn</string>
     <string name="v4_5_message_draft_descr">Lưu lại bản nháp tin nhắn cuối cùng, với các tệp đính kèm.</string>
@@ -1345,12 +1345,12 @@
     <string name="network_option_protocol_timeout">Thời gian chờ giao thức</string>
     <string name="prohibit_sending_disappearing">Cấm gửi tin nhắn tự xóa.</string>
     <string name="protect_app_screen">Bảo vệ màn hình ứng dụng</string>
-    <string name="prohibit_sending_files">Cấm gửi tệp và phương tiện truyền thông.</string>
+    <string name="prohibit_sending_files">Cấm gửi tệp và đa phương tiện.</string>
     <string name="prohibit_sending_voice">Cấm gửi tin nhắn thoại.</string>
     <string name="prohibit_sending_disappearing_messages">Cấm gửi tin nhắn tự xóa.</string>
     <string name="prohibit_sending_simplex_links">Cấm gửi đường dẫn SimpleX</string>
     <string name="proxied">Được proxy</string>
-    <string name="address_or_1_time_link">Địa chỉ hay đường dẫn dùng một lần?</string>
+    <string name="address_or_1_time_link">Địa chỉ hay đường dẫn dùng 1 lần?</string>
     <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[đường dẫn dùng một lần có thể được dùng <i>với chỉ một liên hệ</i> - chia sẻ trực tiếp hoặc thông qua bất kỳ ứng dụng tin nhắn nào.]]></string>
     <string name="disable_onion_hosts_when_not_supported"><![CDATA[Set <i>Cài đặt máy chủ .onion</i> thành Không nếu proxy SOCKS không hỗ trợ chúng.]]></string>
     <string name="operators_conditions_will_be_accepted_for"><![CDATA[Các điều kiện sẽ được chấp nhận với (các) nhà cung cấp: <b>%s</b>.]]></string>
@@ -1360,7 +1360,7 @@
     <string name="appearance_app_toolbars">Thanh công cụ ứng dụng</string>
     <string name="appearance_bars_blur_radius">Làm mờ</string>
     <string name="accept_conditions">Chấp nhận điều kiện</string>
-    <string name="operator_added_xftp_servers">Đã thêm các máy chủ truyền tệp &amp; phương tiện</string>
+    <string name="operator_added_xftp_servers">Đã thêm các máy chủ truyền tệp &amp; đa phương tiện</string>
     <string name="operator_conditions_accepted">Đã chấp nhận điều kiện</string>
     <string name="address_settings">Cài đặt địa chỉ</string>
     <string name="operators_conditions_accepted_for"><![CDATA[Các điều kiện được chấp nhận với (các) nhà cung cấp: <b>%s</b>.]]></string>
@@ -1373,15 +1373,15 @@
     <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[Bạn đã kết nối tới <b>%1$s</b> rồi.]]></string>
     <string name="system_restricted_background_in_call_warn"><![CDATA[Để thực hiện cuộc gọi trong nền, vui lòng chọn <b>Mức sử dụng pin ứng dụng</b> / <b>Không hạn chế</b> trong phần cài đặt ứng dụng.]]></string>
     <string name="remote_host_error_timeout"><![CDATA[Đã hết thời gian chờ khi kết nối tới thiết bị di động <b>%s</b>]]></string>
-    <string name="turn_off_battery_optimization"><![CDATA[Để sử dụng, xin vui lòng <b>cho phép SimpleX chạy trong nền</b> trong hộp thoại tiếp theo. Nếu không, thông báo sẽ bị vô hiệu hóa.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Chọn cho phép</b> trong hộp thoại tiếp theo để nhận thông báo ngay lập tức.]]></string>
     <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Để sử dụng các máy chủ của <b>%s</b>, vui lòng chấp nhận điều kiện sử dụng.]]></string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Để bảo vệ sự riêng tư của bạn, thay vì sử dụng thông báo đẩy thì ứng dụng dùng <b>Dịch vụ nền SimpleX</b> – nó tiêu tốn một vài phần trăm pin mỗi ngày.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Để tăng cường sự riêng tư, <b>SimpleX chạy trong nền</b> thay vì dùng thông báo đẩy.]]></string>
     <string name="system_restricted_background_warn"><![CDATA[Để bật thông báo, vui lòng chọn <b>Mức sử dụng pin ứng dụng</b> / <b>Không hạn chế</b> trong phần cài đặt ứng dụng.]]></string>
     <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[Bạn đã ở trong nhóm <b>%1$s</b> rồi.]]></string>
     <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[Đây là đường dẫn của bạn cho nhóm <b>%1$s</b>!]]></string>
     <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[Bạn đã tham gia nhóm <b>%1$s</b> rồi.]]></string>
     <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[Bạn cũng có thể kết nối bằng cách nhấp vào đường dẫn. Nếu nó mở trong trình duyệt, nhấp vào nút<b>Mở trong ứng dụng di động</b>.]]></string>
-    <string name="onboarding_choose_server_operators">Chọn nhà cung cấp</string>
+    <string name="onboarding_choose_server_operators">Các bên vận hành máy chủ</string>
     <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Bạn có thể <font color="#0088ff">kết nối với các nhà phát triển SimpleX Chat để hỏi bất kỳ câu hỏi nào và nhận thông tin cập nhật</font>.]]></string>
     <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Bạn <b>không được</b> sử dụng cùng một cơ sở dữ liệu trên hai thiết .]]></string>
     <string name="error_accepting_operator_conditions">Lỗi chấp nhận điều kiện</string>
@@ -1393,10 +1393,973 @@
     <string name="onboarding_network_operators_continue">Tiếp tục</string>
     <string name="operator_conditions_failed_to_load">Không thể tải văn bản về các điều kiện hiện tại, bạn có thể xem xét các điều kiện thông qua đường dẫn này:</string>
     <string name="operator_conditions_of_use">Các điều kiện sử dụng</string>
-    <string name="v6_2_network_decentralization_enable_flux">Cho phép flux</string>
+    <string name="v6_2_network_decentralization_enable_flux">Sử dụng Flux trong cài đặt Mạng &amp; máy chủ để bảo mật siêu dữ liệu tốt hơn.</string>
     <string name="operator_conditions_will_be_accepted_on">Các điều kiện sẽ được chấp nhận vào: %s.</string>
     <string name="error_adding_server">Lỗi thêm máy chủ</string>
     <string name="error_updating_server_title">Lỗi cập nhật máy chủ</string>
     <string name="operator_conditions_accepted_on">Các điều kiện đã được chấp nhận vào: %s.</string>
     <string name="operator_conditions_accepted_for_enabled_operators_on">Các điều kiện sẽ được tự động chấp nhận với các nhà cung cấp được cho phép vào: %s.</string>
-</resources>
\ No newline at end of file
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Thiết bị Xiaomi</b>: vui lòng bật Tự động khởi động trong phần cài đặt hệ thống để thông báo có thể hoạt động bình thường.]]></string>
+    <string name="onboarding_notifications_mode_service_desc_short">Ứng dụng luôn chạy dưới nền</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Cuộc trò chuyện sẽ bị xóa cho tất cả các thành viên - việc này không thể được hoàn tác!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Cuộc trò chuyện sẽ bị xóa cho bạn - việc này không thể được hoàn tác!</string>
+    <string name="v6_2_business_chats">Các cuộc trò chuyện công việc</string>
+    <string name="button_add_team_members">Thêm các thành viên nhóm</string>
+    <string name="info_row_chat">Cuộc trò chuyện</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Bạn đã kết nối với <b>%1$s</b> rồi.]]></string>
+    <string name="connect_plan_chat_already_exists">Cuộc trò chuyện đã tồn tại!</string>
+    <string name="button_add_friends">Thêm bạn bè</string>
+    <string name="display_name_accepted_invitation">đã chấp nhận lời mời</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Tất cả các tin nhắn và tệp gửi đi đều được <b>mã hóa đầu cuối</b>, với bảo mật sau ượng tử trong các tin nhắn trực tiếp.]]></string>
+    <string name="onboarding_network_about_operators">Giới thiệu về các nhà cung cấp</string>
+    <string name="add_your_team_members_to_conversations">Thêm các thành viên nhóm của bạn vào các cuộc trò chuyện.</string>
+    <string name="business_address">Địa chỉ doanh nghiệp</string>
+    <string name="error_saving_database">Lỗi lưu cơ sở dữ liệu</string>
+    <string name="direct_messages_are_prohibited_in_chat">Tin nhắn trực tiếp giữa các thành viên bị cấm trong cuộc trò chuyện này.</string>
+    <string name="for_chat_profile">Dành cho hồ sơ trò chuyện %s:</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Kiểm tra tin nhắn mỗi 10 phút.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Ví dụ, nếu liên hệ của bạn nhận tin nhắn thông qua một máy chủ SimpleX Chat, ứng dụng của bạn sẽ gửi chúng qua một máy chủ Flux.</string>
+    <string name="how_it_helps_privacy">Cách nó cải thiện sự riêng tư</string>
+    <string name="invite_to_chat_button">Mời để trò chuyện</string>
+    <string name="button_leave_chat">Rời cuộc trò chuyện</string>
+    <string name="operator_use_for_messages_private_routing">Cho định tuyến riêng tư</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">để bảo mật siêu dữ liệu tốt hơn.</string>
+    <string name="v6_2_improved_chat_navigation">Đã cải thiện điều hướng trò chuyện</string>
+    <string name="button_delete_chat">Xóa cuộc trò chuyện</string>
+    <string name="for_social_media">Cho mạng xã hội</string>
+    <string name="leave_chat_question">Rời cuộc trò chuyện?</string>
+    <string name="sync_connection_desc">Kết nối yêu cầu thiết lập lại mã hóa.</string>
+    <string name="encryption_renegotiation_in_progress">Đang trong quá trình thiết lập lại mã hóa.</string>
+    <string name="sync_connection_confirm">Sửa</string>
+    <string name="sync_connection_question">Sửa kết nối?</string>
+    <string name="delete_chat_question">Xóa cuộc trò chuyện?</string>
+    <string name="direct_messages_are_prohibited">Tin nhắn trực tiếp giữa các thành viên bị cấm.</string>
+    <string name="debug_logs">Bật logs</string>
+    <string name="a_plus_b">a + b</string>
+    <string name="connection_not_ready">Kết nối chưa sẵn sàng.</string>
+    <string name="error_updating_chat_tags">Lỗi cập nhật danh sách trò chuyện</string>
+    <string name="error_creating_chat_tags">Lỗi tạo danh sách trò chuyện</string>
+    <string name="error_loading_chat_tags">Lỗi tải các danh sách trò chuyện</string>
+    <string name="chat_list_contacts">Các liên hệ</string>
+    <string name="chat_list_groups">Nhóm</string>
+    <string name="chat_list_add_list">Thêm danh sách</string>
+    <string name="chat_list_all">Tất cả</string>
+    <string name="delete_chat_list_menu_action">Xóa</string>
+    <string name="delete_chat_list_question">Xóa danh sách?</string>
+    <string name="edit_chat_list_menu_action">Chỉnh sửa</string>
+    <string name="list_name_field_placeholder">Tên danh sách...</string>
+    <string name="users_delete_profile_for">Xóa hồ sơ trò chuyện cho</string>
+    <string name="create_list">Tạo danh sách</string>
+    <string name="add_to_list">Thêm vào danh sách</string>
+    <string name="chat_list_businesses">Các doanh nghiệp</string>
+    <string name="delete_chat_list_warning">Tất cả các cuộc trò chuyện sẽ bị xóa khỏi danh sách %s, và danh sách cũng sẽ bị xóa</string>
+    <string name="chat_list_favorites">Ưa thích</string>
+    <string name="list_menu">Danh sách</string>
+    <string name="delete_messages_after">Xóa tin nhắn sau</string>
+    <string name="no_message_servers_configured">Không có máy chủ tin nhắn.</string>
+    <string name="no_message_servers_configured_for_private_routing">Không có máy chủ để định tuyến tin nhắn riêng tư.</string>
+    <string name="no_message_servers_configured_for_receiving">Không có máy chủ để nhận tin nhắn.</string>
+    <string name="maximum_message_size_title">Tin nhắn quá lớn!</string>
+    <string name="onboarding_network_operators">Các nhà cung cấp mạng</string>
+    <string name="onboarding_notifications_mode_battery">Thông báo và pin</string>
+    <string name="only_chat_owners_can_change_prefs">Chỉ có các chủ cuộc trò chuyện mới có thể thay đổi các tùy chọn.</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Thành viên sẽ bị xóa khỏi cuộc trò chuyện - việc này không thể được hoàn tác!</string>
+    <string name="operator_info_title">Nhà cung cấp mạng</string>
+    <string name="v6_2_network_decentralization">Phi tập trung hóa mạng lưới</string>
+    <string name="message_deleted_or_not_received_error_title">Không có tin nhắn</string>
+    <string name="no_chats">Không có cuộc trò chuyện nào</string>
+    <string name="no_chats_found">Không tìm thấy cuộc trò chuyện nào</string>
+    <string name="no_chats_in_list">Không có cuộc trò chuyện nào trong dánh sách %s.</string>
+    <string name="no_unread_chats">Không có cuộc trò chuyện nào chưa được đọc</string>
+    <string name="duplicated_list_error">Tên danh sách và biểu tượng cảm xúc phải khác nhau đối với tất cả các danh sách.</string>
+    <string name="no_media_servers_configured_for_private_routing">Không có máy chủ để nhận tệp.</string>
+    <string name="no_media_servers_configured_for_sending">Không có máy chủ để gửi tệp.</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Không có dịch vụ nền</string>
+    <string name="smp_servers_new_server">Máy chủ mới</string>
+    <string name="no_media_servers_configured">Không có máy chủ tệp và đa phương tiện.</string>
+    <string name="v6_0_reachable_chat_toolbar">Thanh công cụ trò chuyện trong tầm</string>
+    <string name="random_port">Ngẫu nhiên</string>
+    <string name="network_preset_servers_title">Các máy chủ cài sẵn</string>
+    <string name="operator_open_changes">Xem thay đổi</string>
+    <string name="operator_open_conditions">Xem điều kiện</string>
+    <string name="operator_server_alert_title">Bên vận hành máy chủ</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Mở cuộc trò chuyện từ tin nhắn chưa đọc đầu tiên.\n- Nhảy tới tin nhắn được trích dẫn.</string>
+    <string name="chat_archive">Hoặc nhập tệp lưu trữ</string>
+    <string name="v5_6_quantum_resistant_encryption">Mã hóa kháng lượng tử</string>
+    <string name="v6_2_business_chats_descr">Sự riêng tư cho các khách hàng của bạn.</string>
+    <string name="maximum_message_size_reached_text">Xin vui lòng giảm kích thước tin nhắn và gửi lại.</string>
+    <string name="maximum_message_size_reached_non_text">Xin vui lòng giảm kích thước tin nhắn hoặc xóa đa phương tiện và gửi lại.</string>
+    <string name="network_proxy_auth">Xác thực proxy</string>
+    <string name="image_descr_qr_code">Mã QR</string>
+    <string name="open_with_app">Mở bằng %s</string>
+    <string name="chat_bottom_bar">Thanh công cụ trò chuyện trong tầm</string>
+    <string name="rate_the_app">Đánh giá ứng dụng</string>
+    <string name="you_can_change_it_later">Mật khẩu ngẫu nhiên được lưu trong cài đặt dưới dạng văn bản thuần túy.\nBạn có thể thay đổi nó sau.</string>
+    <string name="servers_info_proxied_servers_section_header">Các máy chủ được proxy</string>
+    <string name="whats_new_read_more">Đọc thêm</string>
+    <string name="one_hand_ui">Thanh công cụ ứng dụng trong tầm</string>
+    <string name="or_to_share_privately">Hoặc chia sẻ một cách riêng tư</string>
+    <string name="operator">Bên vận hành</string>
+    <string name="conn_event_enabled_pq">mã hóa đầu cuối kháng lượng tử</string>
+    <string name="callstate_received_answer">đã nhận lời đáp…</string>
+    <string name="color_received_message">Đã nhận tin nhắn</string>
+    <string name="receiving_via">Đang nhận qua</string>
+    <string name="feature_received_prohibited">đã nhận, bị cấm</string>
+    <string name="v5_5_join_group_conversation_descr">Lịch sử gần đây và đã cải thiện bot thư mục.</string>
+    <string name="receiving_files_not_yet_supported">Việc nhận tệp vẫn chưa được hỗ trợ</string>
+    <string name="color_received_quote">Đã nhận lời đáp</string>
+    <string name="switch_receiving_address_desc">Địa chỉ nhận sẽ được đổi sang một máy chủ khác. Việc thay đổi địa chỉ sẽ hoàn thành sau khi người gửi hoạt động.</string>
+    <string name="callstate_received_confirmation">đã nhận lời xác nhận…</string>
+    <string name="servers_info_reconnect_servers_message">Kết nối lại tất cả các máy chủ đã được kết nối để buộc gửi tin nhắn. Việc này tiêu tốn thêm lưu lượng.</string>
+    <string name="servers_info_reconnect_all_servers_button">Kết nối lại tất cả các máy chủ</string>
+    <string name="servers_info_detailed_statistics_received_total">Đã nhận tổng số</string>
+    <string name="servers_info_detailed_statistics_receive_errors">Nhận được lỗi</string>
+    <string name="v4_4_live_messages_desc">Người nhận có thể thấy các bản cập nhật tin nhắn khi bạn gõ chúng.</string>
+    <string name="servers_info_reconnect_server_message">Kết nối lại máy chủ để buộc gửi tin nhắn. Việc này tiêu tốn thêm lưu lượng.</string>
+    <string name="servers_info_detailed_statistics_received_messages_header">Đã nhận tin nhắn</string>
+    <string name="stop_rcv_file__message">Việc nhận tệp sẽ bị dừng lại</string>
+    <string name="simplex_service_notification_text">Đang nhận tin nhắn…</string>
+    <string name="received_message">Đã nhận tin nhắn</string>
+    <string name="servers_info_reconnect_server_title">Kết nối lại máy chủ?</string>
+    <string name="send_receipts_disabled_alert_title">Chỉ báo đã nhận bị tắt</string>
+    <string name="servers_info_reconnect_servers_title">Kết nối lại các máy chủ?</string>
+    <string name="recipients_can_not_see_who_message_from">Người nhận không thể xem tin nhắn này đến từ ai.</string>
+    <string name="reconnect">Kết nối lại</string>
+    <string name="network_option_rcv_concurrency">Đang nhận đồng thời</string>
+    <string name="info_row_received_at">Đã nhận vào</string>
+    <string name="share_text_received_at">Đã nhận vào: %s</string>
+    <string name="theme_remove_image">Xóa ảnh</string>
+    <string name="icon_descr_call_rejected">Đã từ chối cuộc gọi</string>
+    <string name="app_check_for_updates_button_remind_later">Nhắc lại sau</string>
+    <string name="refresh_qr_code">Làm mới</string>
+    <string name="v4_5_reduced_battery_usage">Đã giảm mức sử dụng pin</string>
+    <string name="reject_contact_button">Từ chối</string>
+    <string name="remote_hosts_section">Các thiết bị di động từ xa</string>
+    <string name="remove_passphrase">Xóa</string>
+    <string name="remove_member_confirmation">Xóa</string>
+    <string name="button_remove_member">Xóa thành viên</string>
+    <string name="remove_member_button">Xóa thành viên</string>
+    <string name="button_remove_member_question">Xóa thành viên?</string>
+    <string name="reject">Từ chối</string>
+    <string name="group_member_status_removed">đã xóa</string>
+    <string name="info_row_updated_at">Bản ghi được cập nhật vào</string>
+    <string name="icon_descr_record_voice_message">Ghi lại tin nhắn thoại</string>
+    <string name="remove_passphrase_from_settings">Xóa mật khẩu khỏi cài đặt?</string>
+    <string name="remove_passphrase_from_keychain">Xóa mật khẩu khỏi Keystore?</string>
+    <string name="share_text_updated_at">Bản ghi được cập nhật vào: %s</string>
+    <string name="migrate_from_device_remove_archive_question">Xóa kho lưu trữ?</string>
+    <string name="profile_update_event_removed_address">đã xóa địa chỉ liên lạc</string>
+    <string name="profile_update_event_removed_picture">đã xóa ảnh đại diện hồ sơ</string>
+    <string name="relay_server_if_necessary">Máy chủ relay chỉ được sử dụng khi cần thiết. Bên khác có thể quan sát địa chỉ IP của bạn.</string>
+    <string name="rcv_group_event_member_deleted">đã xóa %1$s</string>
+    <string name="rcv_group_event_user_deleted">đã xóa bạn</string>
+    <string name="callstatus_rejected">đã từ chối cuộc gọi</string>
+    <string name="relay_server_protects_ip">Máy chủ relay bảo vệ địa chỉ IP của bạn, nhưng nó có thể quan sát thời lượng của cuộc gọi.</string>
+    <string name="reset_color">Đặt lại các màu</string>
+    <string name="connect_plan_repeat_connection_request">Lặp lại yêu cầu kết nối?</string>
+    <string name="reset_single_color">Đặt lại màu</string>
+    <string name="network_options_reset_to_defaults">Đặt lại về mặc định</string>
+    <string name="servers_info_reset_stats_alert_confirm">Đặt lại</string>
+    <string name="wallpaper_scale_repeat">Lặp lại</string>
+    <string name="display_name_requested_to_connect">đã yêu cầu kết nối</string>
+    <string name="migrate_from_device_repeat_upload">Tải lên lại lần nữa</string>
+    <string name="sync_connection_force_question">Thiết lập lại mã hóa?</string>
+    <string name="migrate_to_device_repeat_import">Nhập lại</string>
+    <string name="network_use_onion_hosts_required">Bắt buộc</string>
+    <string name="migrate_to_device_repeat_download">Tải xuống lại lần nữa</string>
+    <string name="sync_connection_force_confirm">Thiết lập lại</string>
+    <string name="reset_verb">Đặt lại</string>
+    <string name="reply_verb">Trả lời</string>
+    <string name="chat_theme_reset_to_user_theme">Đặt lại về chủ đề người dùng</string>
+    <string name="renegotiate_encryption">Thiết lập lại mã hóa</string>
+    <string name="settings_restart_app">Khởi động lại</string>
+    <string name="restart_the_app_to_use_imported_chat_database">Khởi động lại ứng dụng để sử dụng cơ sở dữ liệu trò chuyện đã được nhập.</string>
+    <string name="connect_plan_repeat_join_request">Lặp lại yêu cầu tham gia?</string>
+    <string name="reset_all_hints">Đặt lại tất cả gợi ý</string>
+    <string name="chat_theme_reset_to_app_theme">Đặt lại trở về chủ đề ứng dụng</string>
+    <string name="restart_the_app_to_create_a_new_chat_profile">Khởi động lại ứng dụng để tạo một hồ sơ trò chuyện mới.</string>
+    <string name="servers_info_reset_stats">Đặt lại tất cả số liệu thống kê</string>
+    <string name="servers_info_reset_stats_alert_title">Đặt lại tất cả số liệu thống kê?</string>
+    <string name="save_passphrase_and_open_chat">Lưu mật khẩu và mở kết nối trò chuyện</string>
+    <string name="send_verb">Gửi</string>
+    <string name="run_chat_section">KHỞI CHẠY KẾT NỐI TRÒ CHUYỆN</string>
+    <string name="save_verb">Lưu</string>
+    <string name="scan_paste_link">Quét / Dán đường dẫn</string>
+    <string name="smp_servers_scan_qr">Quét mã QR máy chủ</string>
+    <string name="database_restore_error">Lỗi khôi phục cơ sở dữ liệu</string>
+    <string name="current_version_timestamp">%s (hiện tại)</string>
+    <string name="sender_at_ts">%s vào %s</string>
+    <string name="select_contacts">Chọn các liên hệ</string>
+    <string name="secret_text">bí mật</string>
+    <string name="sending_files_not_yet_supported">gửi tệp chưa được hỗ trợ</string>
+    <string name="send_disappearing_message">Gửi tin nhắn tự xóa</string>
+    <string name="cannot_share_message_alert_text">Các tùy chọn của cuộc trò chuyện được chọn không cho phép tin nhắn này.</string>
+    <string name="scan_QR_code">Quét mã QR</string>
+    <string name="saved_description">đã lưu</string>
+    <string name="saved_from_description">đã lưu từ %s</string>
+    <string name="saved_from_chat_item_info_title">Đã lưu từ</string>
+    <string name="scan_qr_code_from_desktop">Quét mã QR từ máy tính</string>
+    <string name="secured">Đã được bảo mật</string>
+    <string name="v5_5_simpler_connect_ui_descr">Thanh tìm kiếm chấp nhận đường dẫn lời mời.</string>
+    <string name="smp_server_test_secure_queue">Rào hàng đợi</string>
+    <string name="send_errors">Gửi lỗi</string>
+    <string name="save_servers_button">Lưu</string>
+    <string name="custom_time_picker_select">Chọn</string>
+    <string name="self_destruct_passcode">Mã truy cập tự hủy</string>
+    <string name="restore_database_alert_confirm">Khôi phục</string>
+    <string name="rcv_group_event_2_members_connected">%s và %s đã được kết nối</string>
+    <string name="migrate_to_device_bytes_downloaded">%s đã được tải xuống</string>
+    <string name="restore_database">Khôi phục bản sao lưu cơ sở dữ liệu</string>
+    <string name="notifications_mode_off">Chạy khi sử dụng ứng dụng</string>
+    <string name="revoke_file__action">Thu hồi tệp</string>
+    <string name="revoke_file__title">Thu hồi tệp?</string>
+    <string name="revoke_file__confirm">Thu hồi</string>
+    <string name="member_contact_send_direct_message">gửi tin nhắn trực tiếp</string>
+    <string name="selected_chat_items_selected_n">Đã chọn %d</string>
+    <string name="compose_send_direct_message_to_connect">Gửi tin nhắn trực tiếp để kết nối</string>
+    <string name="compose_save_messages_n">Đang lưu %1$s tin nhắn</string>
+    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(quét hoặc dán từ bảng nháp)</string>
+    <string name="onboarding_select_network_operators_to_use">Chọn các bên vận hành mạng lưới để sử dụng.</string>
+    <string name="button_send_direct_message">Gửi tin nhắn trực tiếp</string>
+    <string name="save_welcome_message_question">Lưu lời chào?</string>
+    <string name="icon_descr_sent_msg_status_send_failed">gửi thất bại</string>
+    <string name="scan_code_from_contacts_app">Quét mã bảo mật từ ứng dụng của liên hệ bạn.</string>
+    <string name="settings_section_title_delivery_receipts">GỬI CHỈ BÁO ĐÃ NHẬN TỚI</string>
+    <string name="search_verb">Tìm kiếm</string>
+    <string name="search_or_paste_simplex_link">Tìm kiếm hoặc dán đường dẫn SimpleX</string>
+    <string name="save_list">Lưu danh sách</string>
+    <string name="retry_verb">Thử lại</string>
+    <string name="save_and_notify_contact">Lưu và thông báo tới liên hệ</string>
+    <string name="onboarding_network_operators_review_later">Xem xét lại sau</string>
+    <string name="rcv_conn_event_verification_code_reset">mã bảo mật đã thay đổi</string>
+    <string name="save_group_profile">Lưu hồ sơ nhóm</string>
+    <string name="network_options_save_and_reconnect">Lưu và kết nối lại</string>
+    <string name="sending_delivery_receipts_will_be_enabled">Tính năng gửi chỉ báo đã nhận sẽ được bật cho tất cả liên hệ.</string>
+    <string name="operator_review_conditions">Xem xét lại các điều kiện</string>
+    <string name="wallpaper_scale">Tỷ lệ</string>
+    <string name="send_disappearing_message_send">Gửi</string>
+    <string name="select_chat_profile">Chọn hồ sơ trò chuyện</string>
+    <string name="scan_code">Quét mã</string>
+    <string name="security_code">Mã bảo mật</string>
+    <string name="smp_save_servers_question">Lưu các máy chủ?</string>
+    <string name="rcv_group_event_1_member_connected">%s đã được kết nối</string>
+    <string name="saved_message_title">Đã lưu tin nhắn</string>
+    <string name="network_option_seconds_label">giây</string>
+    <string name="send_live_message_desc">Gửi một tin nhắn động - nó sẽ cập nhật cho (các) người nhận ngay khi bạn gõ</string>
+    <string name="sender_cancelled_file_transfer">Người gửi đã hủy quá trình truyền tệp.</string>
+    <string name="v5_1_self_destruct_passcode">Mã truy cập tự hủy</string>
+    <string name="saved_ICE_servers_will_be_removed">Các máy chủ WebRTC ICE đã được lưu sẽ bị xóa.</string>
+    <string name="restart_chat_button">Khởi động lại kết nối trò chuyện</string>
+    <string name="network_options_save">Lưu</string>
+    <string name="sending_delivery_receipts_will_be_enabled_all_profiles">Tính năng gửi chỉ báo đã nhận sẽ được bật cho tất cả các liên hệ trong tất cả các hồ sơ trò chuyện có thể thấy được.</string>
+    <string name="reveal_verb">Tiết lộ</string>
+    <string name="save_and_notify_contacts">Lưu và thông báo tới các liên hệ</string>
+    <string name="save_and_notify_group_members">Lưu vào thông báo tới các thành viên nhóm</string>
+    <string name="save_profile_password">Lưu mật khẩu hồ sơ</string>
+    <string name="v4_2_security_assessment">Thẩm định bảo mật</string>
+    <string name="v5_8_safe_files">Nhận tệp một cách an toàn</string>
+    <string name="save_and_update_group_profile">Lưu và cập nhật hồ sơ nhóm</string>
+    <string name="custom_time_unit_seconds">giây</string>
+    <string name="saved_chat_item_info_tab">Đã lưu</string>
+    <string name="self_destruct">Tự hủy</string>
+    <string name="select_verb">Chọn</string>
+    <string name="self_destruct_passcode_enabled">Mã truy cập tự hủy đã được kích hoạt!</string>
+    <string name="save_passphrase_in_keychain">Lưu mật khẩu trong Keystore</string>
+    <string name="group_members_2">%s và %s</string>
+    <string name="role_in_group">Chức vụ</string>
+    <string name="v5_6_safer_groups">Các nhóm trở nên an toàn hơn</string>
+    <string name="scan_from_mobile">Quét từ di động</string>
+    <string name="chat_list_notes">Ghi chú</string>
+    <string name="info_view_search_button">tìm kiếm</string>
+    <string name="change_list">Thay đổi danh sách</string>
+    <string name="change_order_chat_list_menu_action">Thay đổi thứ tự</string>
+    <string name="smp_servers_save">Lưu các máy chủ</string>
+    <string name="save_auto_accept_settings">Lưu cài đặt tự động chấp nhận</string>
+    <string name="save_preferences_question">Lưu tùy chọn?</string>
+    <string name="save_settings_question">Lưu cài đặt?</string>
+    <string name="restore_database_alert_title">Khôi phục bản sao lưu cơ sở dữ liệu?</string>
+    <string name="save_passphrase_in_settings">Lưu mật khẩu trong cài đặt</string>
+    <string name="self_destruct_passcode_changed">Mã truy cập tự hủy đã được đổi!</string>
+    <string name="sender_may_have_deleted_the_connection_request">Người gửi có thể đã xóa yêu cầu kết nối.</string>
+    <string name="network_error_broker_version_desc">Phiên bản máy chủ không tương thích với ứng dụng của bạn: %1$s.</string>
+    <string name="accept_feature_set_1_day">Đặt 1 ngày</string>
+    <string name="profile_update_event_set_new_picture">đặt ảnh đại diện mới</string>
+    <string name="v4_4_disappearing_messages_desc">Các tin nhắn đã gửi sẽ bị xóa sau thời gian đã cài.</string>
+    <string name="message_queue_info_server_info">thông tin hàng đợi máy chủ: %1$s\n\ntin nhắn được nhận cuối cùng: %2$s</string>
+    <string name="settings_section_title_settings">CÀI ĐẶT</string>
+    <string name="info_row_sent_at">Đã gửi vào</string>
+    <string name="server_address">Địa chỉ máy chủ</string>
+    <string name="session_code">Mã phiên</string>
+    <string name="color_sent_quote">Lời đáp đã gửi</string>
+    <string name="text_field_set_contact_placeholder">Đặt tên liên hệ…</string>
+    <string name="send_live_message">Gửi tin nhắn động</string>
+    <string name="set_contact_name">Đặt tên liên hệ</string>
+    <string name="error_server_operator_changed">Bên vận hành máy chủ đã được đổi.</string>
+    <string name="error_server_protocol_changed">Giao thức máy chủ đã được đổi.</string>
+    <string name="network_smp_proxy_fallback_allow_description">Gửi tin nhắn trực tiếp khi địa chỉ của bạn hoặc địa chỉ đích không hỗ trợ định tuyến riêng tư.</string>
+    <string name="send_link_previews">Gửi xem trước đường dẫn</string>
+    <string name="servers_info_detailed_statistics_sent_messages_header">Các tin nhắn đã gửi</string>
+    <string name="servers_info">Thông tin các máy chủ</string>
+    <string name="error_smp_test_server_auth">Máy chủ yêu cầu xác thực để tạo hàng đợi, kiểm tra mật khẩu</string>
+    <string name="stop_snd_file__message">Việc gửi tệp sẽ bị dừng lại.</string>
+    <string name="send_us_an_email">Gửi thư điện tử cho chúng tôi</string>
+    <string name="share_text_sent_at">Đã gửi vào: %s</string>
+    <string name="server_added_to_operator__name">Máy chủ đã được thêm cho bên vận hành %s.</string>
+    <string name="srv_error_host">Địa chỉ máy chủ không tương thích với cài đặt mạng.</string>
+    <string name="srv_error_version">Phiên bản máy chủ không tương thích với cài đặt mạng.</string>
+    <string name="icon_descr_sent_msg_status_sent">đã gửi</string>
+    <string name="icon_descr_settings">Cài đặt</string>
+    <string name="chat_with_the_founder">Gửi các câu hỏi và ý tưởng</string>
+    <string name="v5_0_app_passcode_descr">Đặt nó thay vì sử dụng xác thực hệ thống.</string>
+    <string name="sent_message">Đã gửi tin nhắn</string>
+    <string name="set_password_to_export">Đặt mật khẩu để xuất</string>
+    <string name="sending_via">Đang gửi qua</string>
+    <string name="set_passphrase">Đặt mật khẩu</string>
+    <string name="toolbar_settings">Cài đặt</string>
+    <string name="network_error_broker_host_desc">Địa chỉ máy chủ không tương thích với cài đặt mạng: %1$s.</string>
+    <string name="conn_stats_section_title_servers">CÁC MÁY CHỦ</string>
+    <string name="error_xftp_test_server_auth">Máy chủ yêu cầu xác thực để tải lên, kiểm tra mật khẩu</string>
+    <string name="network_session_mode_server">Máy chủ</string>
+    <string name="set_passcode">Đặt mã truy cập</string>
+    <string name="receipts_contacts_override_disabled">Gửi chỉ báo đã nhận bị tắt cho %d liên hệ</string>
+    <string name="set_group_preferences">Đặt tùy chọn nhóm</string>
+    <string name="servers_info_reset_stats_alert_message">Số liệu thống kê các máy chủ sẽ được đặt lại - việc này không thể được hoàn tác!</string>
+    <string name="cant_call_member_send_message_alert_text">Gửi tin nhắn để cho phép gọi điện.</string>
+    <string name="sent_via_proxy">Đã gửi qua proxy</string>
+    <string name="receipts_contacts_override_enabled">Gửi chỉ báo đã nhận được bật cho %d liên hệ</string>
+    <string name="set_database_passphrase">Đặt mật khẩu cơ sở dữ liệu</string>
+    <string name="send_receipts">Gửi chỉ báo đã nhận</string>
+    <string name="profile_update_event_set_new_address">đặt địa chỉ liên lạc mới</string>
+    <string name="color_sent_message">Tin nhắn đã gửi</string>
+    <string name="chat_theme_set_default_theme">Đặt chủ đề mặc định</string>
+    <string name="enable_sending_recent_history">Gửi tối đa 100 tin nhắn cuối cùng tới các thành viên mới.</string>
+    <string name="servers_info_detailed_statistics_sent_messages_total">Tổng số đã gửi</string>
+    <string name="icon_descr_send_message">Gửi Tin nhắn</string>
+    <string name="smp_servers_test_failed">Kiểm tra máy chủ thất bại!</string>
+    <string name="network_smp_proxy_fallback_allow_protected_description">Gửi tin nhắn trực tiếp khi địa chỉ IP được bảo vệ và máy chủ của bạn hoặc máy chủ đích không hõ trợ định tuyến riêng tư.</string>
+    <string name="receipts_groups_override_disabled">Gửi chỉ báo đã nhận bị tắt cho %d nhóm</string>
+    <string name="receipts_groups_override_enabled">Gửi chỉ báo đã nhận được bật cho %d nhóm</string>
+    <string name="sent_directly">Đã gửi trực tiếp</string>
+    <string name="v4_6_group_welcome_message_descr">Hiển thị thông điệp tới các thành viên mới!</string>
+    <string name="share_simplex_address_on_social_media">Chia sẻ địa chỉ SimpleX trên mạng xã hội.</string>
+    <string name="notification_preview_mode_message_desc">Hiển thị liên hệ và tin nhắn</string>
+    <string name="private_routing_show_message_status">Hiển thị trạng thái tin nhắn</string>
+    <string name="show_dev_options">Hiển thị:</string>
+    <string name="share_address_publicly">Chia sẻ địa chỉ một cách công khai</string>
+    <string name="show_call_on_lock_screen">Hiển thị</string>
+    <string name="privacy_show_last_messages">Hiển thị các tin nhắn cuối cùng</string>
+    <string name="share_verb">Chia sẻ</string>
+    <string name="terminal_always_visible">Hiển thị bảng điều khiển trong cửa sổ mới</string>
+    <string name="error_creating_report">Lỗi tạo báo cáo</string>
+    <string name="share_message">Chia sẻ tin nhắn…</string>
+    <string name="chat_list_always_visible">Hiển thị danh sách trò chuyện trong cửa sổ mới</string>
+    <string name="notification_preview_mode_contact_desc">Chỉ hiển thị liên hệ</string>
+    <string name="share_this_1_time_link">Chia sẻ đường dẫn dùng 1 lần này</string>
+    <string name="share_with_contacts">Chia sẻ với các liên hệ</string>
+    <string name="share_file">Chia sẻ tệp…</string>
+    <string name="share_address">Chia sẻ địa chỉ</string>
+    <string name="share_image">Chia sẻ đa phương tiện…</string>
+    <string name="new_chat_share_profile">Chia sẻ hồ sơ</string>
+    <string name="show_developer_options">Hiển thị tùy chọn cho nhà phát triển</string>
+    <string name="v5_7_shape_profile_images">Tạo khuôn ảnh đại diện</string>
+    <string name="setup_database_passphrase">Thiết lập mật khẩu cơ sở dữ liệu</string>
+    <string name="servers_info_target">Đang hiển thị thông tin cho</string>
+    <string name="share_invitation_link">Chia sẻ đường dẫn dùng 1 lần</string>
+    <string name="share_address_with_contacts_question">Chia sẻ địa chỉ với các liên hệ?</string>
+    <string name="subscription_percentage">Hiển thị tỷ lệ phần trăm</string>
+    <string name="show_internal_errors">Hiển thị lỗi nội bộ</string>
+    <string name="share_link">Chia sẻ đường dẫn</string>
+    <string name="share_1_time_link_with_a_friend">Chia sẻ đường dẫn dùng 1 lần với một người bạn</string>
+    <string name="prefs_error_saving_settings">Lỗi lưu cài đặt</string>
+    <string name="settings_notification_preview_mode_title">Hiển thị bản xem trước</string>
+    <string name="ntf_channel_calls">Các cuộc gọi SimpleX Chat</string>
+    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="simplex_links_not_allowed">Các đường dẫn SimpleX là không được phép</string>
+    <string name="chat_lock">Khóa SimpleX</string>
+    <string name="simplex_links">Các đường dẫn SimpleX</string>
+    <string name="ntf_channel_messages">Các tin nhắn SimpleX Chat</string>
+    <string name="icon_descr_address">Địa chỉ SimpleX</string>
+    <string name="system_restricted_background_desc">SimpleX không thể chạy trong nền. Bạn sẽ chỉ nhận được thông báo khi ứng dụng đang chạy.</string>
+    <string name="la_lock_mode">Chế độ Khóa SimpleX</string>
+    <string name="simplex_link_contact">Địa chỉ liên lạc SimpleX Chat</string>
+    <string name="simplex_link_group">Đường dẫn nhóm SimpleX</string>
+    <string name="simplex_link_mode">Các đường dẫn SimpleX</string>
+    <string name="simplex_link_invitation">Lời mời SimpleX dùng một lần</string>
+    <string name="la_notice_title_simplex_lock">Khóa SimpleX</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat và Flux đã đi đến một thỏa thuận để đưa các máy chủ do Flux vận hành vào ứng dụng.</string>
+    <string name="theme_simplex">SimpleX</string>
+    <string name="simplex_address">Địa chỉ SimpleX</string>
+    <string name="shutdown_alert_question">Tắt?</string>
+    <string name="settings_shutdown">Tắt</string>
+    <string name="v4_2_security_assessment_desc">Sự an toàn của SimpleX Chat đã được kiểm định bởi Trail of Bits.</string>
+    <string name="simplex_service_notification_title">Dịch vụ SimpleX Chat</string>
+    <string name="auth_simplex_lock_turned_on">Khóa SimpleX đã được bật</string>
+    <string name="show_QR_code">Hiển thị mã QR</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Địa chỉ SimpleX và các đường dẫn dùng một lần đều an toàn để chia sẻ thông qua bất kỳ ứng dụng nhắn tin nào.</string>
+    <string name="image_descr_simplex_logo">Logo SimpleX</string>
+    <string name="show_slow_api_calls">Hiển thị các lượt yêu cầu API chậm</string>
+    <string name="simplex_address_or_1_time_link">Địa chỉ SimpleX hay đường dẫn dùng 1 lần?</string>
+    <string name="lock_not_enabled">Khóa SimpleX không được bật!</string>
+    <string name="simplex_links_are_prohibited_in_group">Các đường dẫn SimpleX là bị cấm.</string>
+    <string name="report_item_visibility_moderators">Chỉ người gửi và các kiểm duyệt mới xem được</string>
+    <string name="report_archive_alert_title">Lưu trữ bản báo cáo?</string>
+    <string name="report_item_archived">đã lưu trữ bản báo cáo</string>
+    <string name="report_compose_reason_header_illegal">Báo cáo nội dụng: sẽ chỉ có các kiểm duyệt viên trong nhóm là xem được.</string>
+    <string name="archive_verb">Lưu trữ</string>
+    <string name="report_reason_other">Một lý do khác</string>
+    <string name="group_member_role_moderator">kiểm duyệt viên</string>
+    <string name="report_compose_reason_header_profile">Báo cáo hồ sơ thành viên: sẽ chỉ có các kiểm duyệt viên trong nhóm là xem được.</string>
+    <string name="icon_descr_simplex_team">Đội ngũ SimpleX</string>
+    <string name="v6_1_better_security_descr">Các giao thức SimpleX đã được xem xét bởi Trail of Bits.</string>
+    <string name="v5_3_simpler_incognito_mode">Đã đơn giản hóa chế độ ẩn danh</string>
+    <string name="report_reason_community">Vi phạm các nguyên tắc cộng động</string>
+    <string name="report_reason_illegal">Nội dung không phù hợp</string>
+    <string name="report_reason_profile">Hồ sơ không phù hợp</string>
+    <string name="report_item_visibility_submitter">Chỉ bạn và các kiểm duyệt viên mới xem được</string>
+    <string name="report_verb">Báo cáo</string>
+    <string name="report_reason_alert_title">Lý do báo cáo?</string>
+    <string name="report_compose_reason_header_other">Báo cáo khác: sẽ chỉ có các kiểm duyệt viên trong nhóm là xem được.</string>
+    <string name="report_compose_reason_header_spam">Báo cáo tin nhắn rác: chỉ có các kiểm duyệt viên trong nhóm là xem được.</string>
+    <string name="report_compose_reason_header_community">Báo cáo vi phạm: sẽ chỉ có các kiểm duyệt viên trong nhóm là xem được.</string>
+    <string name="size">Kích thước</string>
+    <string name="is_verified">%s đã được xác minh</string>
+    <string name="is_not_verified">%s chưa được xác minh</string>
+    <string name="alert_title_skipped_messages">Các tin nhắn bị bỏ qua</string>
+    <string name="skip_inviting_button">Bỏ qua việc mời các thành viên</string>
+    <string name="icon_descr_speaker_on">Loa ngoài bật</string>
+    <string name="icon_descr_sound_muted">Âm thanh đã bị tắt</string>
+    <string name="app_check_for_updates_stable">Ổn định</string>
+    <string name="settings_section_title_socks">PROXY SOCKS</string>
+    <string name="receipts_section_groups">Các nhóm nhỏ (tối đa 20 thành viên)</string>
+    <string name="non_fatal_errors_occured_during_import">Một vài lỗi không nghiêm trọng đã xảy ra trong lúc nhập:</string>
+    <string name="icon_descr_speaker_off">Loa ngoài tắt</string>
+    <string name="archive_report">Lưu trữ báo cáo</string>
+    <string name="delete_report">Xóa báo cáo</string>
+    <string name="operator_servers_title">Các máy chủ %s</string>
+    <string name="possible_slow_function_title">Hàm chạy chậm</string>
+    <string name="privacy_media_blur_radius_soft">Nhẹ</string>
+    <string name="chat_item_ttl_seconds">%s giây</string>
+    <string name="smp_servers_test_some_failed">Một vài máy chủ không vượt qua bài kiểm tra:</string>
+    <string name="star_on_github">Thả sao trên Github</string>
+    <string name="rcv_group_event_3_members_connected">%s, %s và %s đã được kết nối</string>
+    <string name="smp_server">Máy chủ SMP</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s và %d thành viên khác đã được kết nối</string>
+    <string name="conn_event_disabled_pq">mã hóa đầu cuối tiêu chuẩn</string>
+    <string name="v5_7_shape_profile_images_descr">Hình vuông, hình tròn, hoặc bất kỳ hình thù gì ở giữa.</string>
+    <string name="network_socks_proxy">proxy SOCKS</string>
+    <string name="network_socks_proxy_settings">Cài đặt proxy SOCKS</string>
+    <string name="callstate_starting">đang bắt đầu…</string>
+    <string name="group_members_n">%s, %s và %d thành viên</string>
+    <string name="recipient_colon_delivery_status">%s: %s</string>
+    <string name="app_check_for_updates_button_skip">Bỏ qua phiên bản này</string>
+    <string name="chat_database_exported_not_all_files">Một số tệp đã không được xuất</string>
+    <string name="audio_device_speaker">Loa ngoài</string>
+    <string name="start_chat_question">Bắt đầu kết nối trò chuyện?</string>
+    <string name="smp_servers">Các máy chủ SMP</string>
+    <string name="migrate_from_device_start_chat">Bắt đầu kết nối trò chuyện</string>
+    <string name="report_reason_spam">Tin nhắn rác</string>
+    <string name="privacy_media_blur_radius_strong">Mạnh</string>
+    <string name="servers_info_starting_from">Bắt đầu từ %s.</string>
+    <string name="stop_file__confirm">Dừng</string>
+    <string name="stop_chat_question">Dừng kết nối trò chuyện?</string>
+    <string name="migrate_from_device_bytes_uploaded">%s đã được tải lên</string>
+    <string name="subscribed">Đã đăng ký</string>
+    <string name="report_item_archived_by">đã lưu trữ báo cáo bởi %s</string>
+    <string name="stop_file__action">Dừng tệp</string>
+    <string name="group_reports_active_one">1 báo cáo</string>
+    <string name="group_reports_active">%d báo cáo</string>
+    <string name="group_reports_member_reports">Các báo cáo của thành viên</string>
+    <string name="subscription_errors">Lỗi đăng ký dài hạn</string>
+    <string name="chat_list_group_reports">Các báo cáo</string>
+    <string name="servers_info_private_data_disclaimer">Bắt đầu từ %s.\nTất cả dữ liệu được lưu trữ một cách riêng tư trên thiết bị của bạn.</string>
+    <string name="v4_6_audio_video_calls_descr">Hỗ trợ bluetooth và nhiều cải tiến khác.</string>
+    <string name="subscription_results_ignored">Các đăng ký dài hạn bị bỏ qua</string>
+    <string name="stop_rcv_file__title">Dừng nhận tệp?</string>
+    <string name="stop_snd_file__title">Dừng gửi tệp?</string>
+    <string name="add_contact_or_create_group">Tạo cuộc trò chuyện mới</string>
+    <string name="servers_info_statistics_section_header">Số liệu thống kê</string>
+    <string name="notifications_mode_periodic">Bắt đầu định kỳ</string>
+    <string name="stop_chat_confirmation">Dừng</string>
+    <string name="stop_sharing_address">Dừng chia sẻ địa chỉ?</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Dừng kết nối trò chuyện để xuất, nhập hoặc xóa cơ sở dữ liệu trò chuyện. Bạn sẽ không thể nhận hay gửi tin nhắn trong khi kết nối trò chuyện bị dừng lại.</string>
+    <string name="submit_passcode">Nhập</string>
+    <string name="migrate_from_device_stopping_chat">Đang dừng kết nối trò chuyện</string>
+    <string name="stop_sharing">Dừng chia sẻ</string>
+    <string name="strikethrough_text">gạch ngang</string>
+    <string name="auth_stop_chat">Dừng kết nối trò chuyện</string>
+    <string name="v4_5_italian_interface_descr">Xin gửi lời cảm ơn tới các người dùng đã góp công qua Weblate!</string>
+    <string name="color_mode_system">Hệ thống</string>
+    <string name="group_invitation_tap_to_join">Nhấn để tham gia</string>
+    <string name="network_option_tcp_connection_timeout">Thời gian chờ kết nối TCP</string>
+    <string name="tap_to_activate_profile">Nhấn để kích hoạt hồ sơ.</string>
+    <string name="language_system">Hệ thống</string>
+    <string name="v4_4_french_interface_descr">Xin gửi lời cảm ơn tới các người dùng đã góp công qua Weblate!</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Xin gửi lời cảm ơn tới các người dùng đã góp công qua Weblate!</string>
+    <string name="v5_0_polish_interface_descr">Xin gửi lời cảm ơn tới các người dùng đã góp công qua Weblate!</string>
+    <string name="system_mode_toast">Chế độ hệ thống</string>
+    <string name="settings_section_title_support">HỖ TRỢ SIMPLEX CHAT</string>
+    <string name="temporary_file_error">Lỗi tệp tạm thời</string>
+    <string name="chat_help_tap_button">Nhấn nút</string>
+    <string name="network_option_tcp_connection">Kết nối TCP</string>
+    <string name="la_mode_system">Hệ thống</string>
+    <string name="whats_new_thanks_to_users_contribute_weblate">Xin gửi lời cảm ơn tới các người dùng đã góp công qua Weblate!</string>
+    <string name="contact_tap_to_connect">Nhấn để Kết nối</string>
+    <string name="address_creation_instruction">Nhấn Tạo địa chỉ SimpleX ở menu để tạo sau.</string>
+    <string name="group_invitation_tap_to_join_incognito">Nhấn để tham gia một cách ẩn danh</string>
+    <string name="theme_system">Hệ thống</string>
+    <string name="v6_1_better_calls_descr">Chuyển đổi âm thanh và video trong lúc gọi.</string>
+    <string name="v6_1_switch_chat_profile_descr">Chuyển đổi hồ sơ trò chuyện cho các lời mời dùng 1 lần.</string>
+    <string name="error_smp_test_failed_at_step">Kiểm tra thất bại tại bước %s.</string>
+    <string name="la_lock_mode_system">Xác thực hệ thống</string>
+    <string name="tap_to_scan">Nhấn để quét</string>
+    <string name="thank_you_for_installing_simplex">Cảm ơn bạn đã cài đặt SimpleX Chat!</string>
+    <string name="smp_servers_test_server">Kiểm tra máy chủ</string>
+    <string name="smp_servers_test_servers">Kiểm tra các máy chủ</string>
+    <string name="tap_to_start_new_chat">Nhấn để bắt đầu một cuộc trò chuyện mới</string>
+    <string name="tap_to_paste_link">Nhấn để dán đường dẫn</string>
+    <string name="settings_message_shape_tail">Đuôi</string>
+    <string name="switch_verb">Chuyển đổi</string>
+    <string name="connection_error_quota_desc">Kết nối đã chạm giới hạn của các tin nhắn chưa được gửi đi, liên hệ của bạn có thể đang ngoại tuyến.</string>
+    <string name="next_generation_of_private_messaging">Tương lai của nhắn tin</string>
+    <string name="image_decoding_exception_desc">Hình ảnh không thể được giải mã. Xin vui lòng thử lại với một hình ảnh khác hoặc liên lạc với các nhà phát triển.</string>
+    <string name="moderate_messages_will_be_deleted_warning">Các tin nhắn sẽ bị xóa cho tất cả các thành viên.</string>
+    <string name="sync_connection_force_desc">Mã hóa đang hoạt động và thỏa thuận mã hóa mới là không bắt buộc. Nó có thể dẫn đến các lỗi kết nối!</string>
+    <string name="app_will_ask_to_confirm_unknown_file_servers">Ứng dụng sẽ yêu cầu bạn xác nhận các lượt tải xuống từ các máy chủ truyền tệp không xác định (ngoại trừ .onion hoặc khi proxy SOCKS được sử dụng).</string>
+    <string name="connection_error_blocked">Kết nối đã bị chặn</string>
+    <string name="connection_error_blocked_desc">Kết nối đã bị chặn bởi bên vận hành máy chủ:\n%1$s.</string>
+    <string name="blocking_reason_content">Nội dung vi phạm các điều kiện sử dụng</string>
+    <string name="blocking_reason_spam">Tin nhắn rác</string>
+    <string name="file_error_blocked">Tệp đã bị chặn bởi bên vận hành máy chủ:\n%1$s.</string>
+    <string name="database_initialization_error_desc">Cơ sở dữ liệu đang không hoạt động như bình thường. Nhấn để tìm hiểu thêm</string>
+    <string name="privacy_chat_list_open_links_no">Không</string>
+    <string name="privacy_chat_list_open_web_link">Mở đường dẫn</string>
+    <string name="privacy_chat_list_open_links_ask">Yêu cầu</string>
+    <string name="privacy_chat_list_open_web_link_question">Mở đường dẫn web?</string>
+    <string name="privacy_chat_list_open_links">Mở các đường dẫn từ danh sách trò chuyện</string>
+    <string name="connection_you_accepted_will_be_cancelled">Kết nối bạn đã chấp nhận sẽ bị hủy bỏ!</string>
+    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Liên hệ mà bạn đã chia sẻ đường dẫn này sẽ không thể kết nối!</string>
+    <string name="unable_to_open_browser_desc">Trình duyệt web mặc định là cần thiết cho các cuộc gọi. Xin vui lòng thiết lập trình duyệt mặc định trong hệ thống, và chia sẻ thêm thông tin với các nhà phát triển.</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Ứng dụng bảo vệ sự riêng tư của bạn bằng cách sử dụng các bên vận hành khác nhau trong mỗi cuộc trò chuyện.</string>
+    <string name="system_restricted_background_in_call_desc">Ứng dụng có thể bị đóng sau 1 phút chạy trong nền.</string>
+    <string name="periodic_notifications_desc">Ứng dụng tìm nhận tin nhắn mới một cách định kỳ - nó tiêu tốn một vài phần trăm pin mỗi ngày. Ứng dụng không sử dụng thông báo đẩy - dữ liệu ở thiết bị của bạn không được gửi đi tới máy chủ nào.</string>
+    <string name="code_you_scanned_is_not_simplex_link_qr_code">Mã mà bạn đã quét không phải là một mã QR dẫn SimpleX.</string>
+    <string name="theme">Chủ đề</string>
+    <string name="alert_text_msg_bad_hash">Mã băm của tin nhắn trước có sự khác biệt.\"</string>
+    <string name="alert_text_msg_bad_id">ID của tin nhắn tiếp theo là không chính xác (nhỏ hơn hoặc bằng với cái trước).\nViệc này có thể xảy ra do một vài lỗi hoặc khi kết nối bị xâm phạm.</string>
+    <string name="database_backup_can_be_restored">Nỗ lực đổi mật khẩu cơ sở dữ liệu đã không được hoàn thành.</string>
+    <string name="this_device_name_shared_with_mobile">Tên thiết bị sẽ được chia sẻ với thiết bị di động đã được kết nối.</string>
+    <string name="settings_section_title_themes">CÁC CHỦ ĐỀ</string>
+    <string name="failed_to_create_user_invalid_desc">Tên hiển thị này không hợp lệ. Xin vui lòng chọn một cái tên khác.</string>
+    <string name="profile_is_only_shared_with_your_contacts">Hồ sơ chỉ được chia sẻ với các liên hệ của bạn.</string>
+    <string name="e2ee_info_pq_short">Cuộc trò chuyện này được bảo vệ bằng mã hóa đầu cuối có kháng lượng tử.</string>
+    <string name="settings_is_storing_in_clear_text">Mật khẩu được lưu trữ trong cài đặt dưới dạng thuần văn bản.</string>
+    <string name="this_device">Thiết bị này</string>
+    <string name="video_decoding_exception_desc">Video không thể được giải mã. Xin vui lòng thử với một video khác hoặc liên lạc với các nhà phát triển.</string>
+    <string name="moderate_message_will_be_marked_warning">Tin nhắn sẽ bị đánh dấu là đã được kiểm duyệt cho tất cả các thành viên.</string>
+    <string name="moderate_message_will_be_deleted_warning">Tin nhắn sẽ bị xóa cho tất cả các thành viên.</string>
+    <string name="delete_files_and_media_desc">Việc này không thể được hoàn tác - tất cả các đa phương tiện và tệp đã được gửi và nhận sẽ bị xóa. Những hình ảnh chất lượng thấp sẽ được giữ lại.</string>
+    <string name="enable_automatic_deletion_message">Việc này không thể được hoàn tác - các tin nhắn đã được gửi và nhận sớm hơn so với thời gian được chọn sẽ bị xóa. Có thể mất vài phút để hoàn thành.</string>
+    <string name="alert_message_no_group">Nhóm này không còn tồn tại.</string>
+    <string name="send_receipts_disabled_alert_msg">Nhóm này có trên %1$d thành viên, chỉ báo đã nhận không được gửi.</string>
+    <string name="moderate_messages_will_be_marked_warning">Các tin nhắn sẽ bị đánh dấu là đã được kiểm duyệt cho tất cả thành viên.</string>
+    <string name="this_device_name">Tên thiết bị này</string>
+    <string name="receipts_section_description_1">Chúng có thể bị ghi đề trong cài đặt liên hệ và nhóm.</string>
+    <string name="e2ee_info_no_pq_short">Cuộc trò chuyện này được bởi vệ bằng mã hóa đầu cuối.</string>
+    <string name="in_developing_desc">Tính năng này chưa được hỗ trợ. Hãy thử bản phát hành tiếp theo.</string>
+    <string name="v5_2_message_delivery_receipts_descr">Dấu tick thứ hai mà chúng ta từng thiếu! ✅</string>
+    <string name="xftp_servers_per_user">Những máy chủ cho tệp mới của hồ sơ trò chuyện hiện tại của bạn</string>
+    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Nền tảng ứng dụng và nhắn tin bảo vệ sự riêng tư và bảo mật của bạn.</string>
+    <string name="v6_2_network_decentralization_descr">Bên vận hành được cài sẵn thứ hai trong ứng dụng!</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Chức vụ sẽ được đổi thành %s. Tất cả mọi người trong cuộc trò chuyện sẽ được thông báo.</string>
+    <string name="the_text_you_pasted_is_not_a_link">Văn bản bạn vừa dán không phải là một đường dẫn SimpleX.</string>
+    <string name="member_role_will_be_changed_with_invitation">Chức vụ sẽ được đổi thành %s. Thành viên sẽ nhận được một lời mời mới.</string>
+    <string name="passphrase_will_be_saved_in_settings">Mật khẩu sẽ được lưu trữ trong cài đặt dưới dạng thuần văn bản sau khi bản đổi nó hoặc khởi động lại ứng dụng.</string>
+    <string name="receipts_section_description">Các cài đặt này là cho hồ sơ trò chuyện hiện tại của bạn</string>
+    <string name="member_role_will_be_changed_with_notification">Chức vụ sẽ được đổi thành %s. Tất cả mọi người trong nhóm sẽ được thông báo.</string>
+    <string name="migrate_from_device_uploaded_archive_will_be_removed">Bản lưu trữ cơ sở dữ liệu đã được tải lên sẽ bị xóa vĩnh viễn khỏi các máy chủ.</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Việc này không thể được hoàn tác - hồ sơ, các liên hệ, tin nhắn và tệp của bạn sẽ biến mất mà không thể khôi phục.</string>
+    <string name="smp_servers_per_user">Những máy chủ cho các kết nối mới của hồ sơ trò chuyện hiện tại của bạn</string>
+    <string name="report_archive_alert_desc">Báo cáo sẽ được lưu trữ cho bạn.</string>
+    <string name="message_deleted_or_not_received_error_desc">Tin nhắn này đã bị xóa hoặc vẫn chưa được nhận.</string>
+    <string name="this_QR_code_is_not_a_link">Mã QR này không phải là một đường dẫn!</string>
+    <string name="this_link_is_not_a_valid_connection_link">Đường dẫn này không phải là một đường dẫn kết nối hợp lệ!</string>
+    <string name="one_hand_ui_card_title">Chuyển đổi danh sách trò chuyện:</string>
+    <string name="remote_ctrl_error_timeout">Thời gian chờ đã hết trong khi kết nối tới máy tính</string>
+    <string name="open_port_in_firewall_desc">Để cho phép một ứng dụng di động kết nối tới máy tính, mở cổng này trong tường lửa của bạn, nếu bạn có bật nó lên</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Để bảo vệ sự riêng tư của bạn, SimpleX sử dụng các ID riêng biệt cho mỗi liên hệ bạn có.</string>
+    <string name="enter_passphrase_notification_desc">Để nhận thông báo, xin vui lòng nhập mật khẩu cơ sở dữ liệu</string>
+    <string name="images_limit_title">Quá nhiều ảnh!</string>
+    <string name="videos_limit_title">Quá nhiều video!</string>
+    <string name="operator_use_for_sending">Để gửi</string>
+    <string name="remote_ctrl_connection_stopped_identity_desc">Đường dẫn này đã được sử dụng với một thiết bị di động khác, xin vui lòng tạo một đường dẫn mới trên máy tính.</string>
+    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Để bảo vệ thông tin của bạn, bật Khóa SimpleX.\nBạn sẽ được nhắc để hoàn thành xác thực trước khi tính năng này được bật.</string>
+    <string name="this_string_is_not_a_connection_link">Chuỗi ký tự này không phải là một đường dẫn kết nối!</string>
+    <string name="call_desktop_permission_denied_title">Để thực hiện các cuộc gọi, cho phép sử dụng mic của bạn. Kết thúc cuộc gọi và thử gọi lại.</string>
+    <string name="operator_use_for_messages_receiving">Để nhận</string>
+    <string name="scan_qr_to_connect_to_contact">Để kết nối, liên hệ của bạn có thể quét mã QR hoặc dùng đường dẫn trong ứng dụng.</string>
+    <string name="color_title">Tiêu đề</string>
+    <string name="v5_3_simpler_incognito_mode_descr">Chuyển đổi ẩn danh khi kết nối.</string>
+    <string name="v4_5_private_filenames_descr">Để bảo vệ múi giờ, các tệp hình ảnh/âm thanh sử dụng UTC.</string>
+    <string name="this_text_is_available_in_settings">Văn bản này có sẵn trong cài đặt</string>
+    <string name="app_check_for_updates_notice_desc">Để được thông báo về các bản phát hành mới, bật kiểm tra định kỳ cho các phiên bản Ổn định hoặc Beta.</string>
+    <string name="v5_4_block_group_members_descr">Để ẩn các tin nhắn không mong muốn.</string>
+    <string name="to_reveal_profile_enter_password">Để tiết lộ hồ sơ ẩn của bạn, nhập đầy đủ mật khẩu vào trường tìm kiếm trong trang Các hồ sơ trò chuyện của bạn.</string>
+    <string name="connect_plan_this_is_your_own_one_time_link">Đây là đường dẫn dùng một lần của riêng bạn!</string>
+    <string name="messages_section_description">Cài đặt này áp dụng cho các tin nhắn trong hồ sơ trò chuyện hiện tại của bạn</string>
+    <string name="connect_plan_this_is_your_own_simplex_address">Đây là địa chỉ SimpleX của riêng bạn!</string>
+    <string name="to_connect_via_link_title">Để kết nối qua đường dẫn</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Để bảo vệ đường dẫn của bạn khỏi bị thay thế, bạn có thể so sánh các mã bảo mật liên lạc.</string>
+    <string name="private_routing_explanation">Để bảo vệ địa chỉ IP của bạn, định tuyến riêng tư sử dụng các máy chủ SMP của bạn để gửi tin nhắn.</string>
+    <string name="v4_5_transport_isolation">Cách ly truyền tải</string>
+    <string name="network_smp_proxy_mode_unknown">Các máy chủ không xác định</string>
+    <string name="group_member_status_unknown">trạng thái không xác định</string>
+    <string name="unknown_error">Lỗi không xác định</string>
+    <string name="connection_error_quota">Các tin nhắn không được gửi đi</string>
+    <string name="unfavorite_chat">Bỏ yêu thích</string>
+    <string name="unblock_for_all">Bỏ chặn cho tất cả</string>
+    <string name="unblock_for_all_question">Bỏ chặn thành viên cho tất cả?</string>
+    <string name="to_start_a_new_chat_help_header">Để bắt đầu một cuộc trò chuyện mới</string>
+    <string name="unhide_chat_profile">Bỏ ẩn hồ sơ trò chuyện</string>
+    <string name="unhide_profile">Bỏ ẩn hồ sơ</string>
+    <string name="rcv_group_event_member_unblocked">đã bỏ chặn %s</string>
+    <string name="unblock_member_confirmation">Bỏ chặn</string>
+    <string name="unblock_member_button">Bỏ chặn thành viên</string>
+    <string name="unblock_member_question">Bỏ chặn thành viên?</string>
+    <string name="appearance_in_app_bars_alpha">Độ trong suốt</string>
+    <string name="servers_info_transport_sessions_section_header">Các phiên truyền tải</string>
+    <string name="file_not_approved_title">Các máy chủ không xác định!</string>
+    <string name="icon_descr_sent_msg_status_unauthorized_send">gửi mà không được cho phép</string>
+    <string name="to_share_with_your_contact">(để chia sẻ với liên hệ của bạn)</string>
+    <string name="user_unhide">Bỏ ẩn</string>
+    <string name="la_notice_turn_on">Bật</string>
+    <string name="servers_info_subscriptions_total">Tổng</string>
+    <string name="group_member_status_unknown_short">không xác định</string>
+    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Đang cố gắng kết nối tới máy chủ dùng để nhận tin nhắn từ liên hệ này (lỗi: %1$s).</string>
+    <string name="trying_to_connect_to_server_to_receive_messages">Đang cố gắng kết nối tới máy chủ dùng để nhận tin nhắn từ liên hệ này.</string>
+    <string name="to_verify_compare">Để xác minh mã hóa đầu cuối với liên hệ của bạn, so sánh (hoặc quét) mã trên các thiết bị của các bạn.</string>
+    <string name="network_session_mode_transport_isolation">Cách ly truyền tải</string>
+    <string name="unknown_message_format">định dạng tin nhắn không xác định</string>
+    <string name="unknown_database_error_with_info">Lỗi cơ sở dữ liệu không xác định: %s</string>
+    <string name="recent_history_is_sent_to_new_members">Tối đa tới 100 tin nhắn cuối cùng là được gửi tới các thành viên mới.</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_entity">Sử dụng các thông tin đăng nhập proxy khác cho mỗi kết nối.</string>
+    <string name="network_proxy_auth_mode_isolate_by_auth_user">Sử dụng các thông tin đăng nhập proxy khác nhau cho mỗi hồ sơ.</string>
+    <string name="update_network_session_mode_question">Cập nhật chế độ cách ly truyền tải?</string>
+    <string name="unlink_desktop_question">Hủy liên kết máy tính?</string>
+    <string name="smp_server_test_upload_file">Tải lên tệp</string>
+    <string name="app_check_for_updates_update_available">Có bản cập nhật: %s</string>
+    <string name="updating_settings_will_reconnect_client_to_all_servers">Việc cập nhật cài đặt sẽ kết nối lại thiết bị với tất cả các máy chủ.</string>
+    <string name="uploaded_files">Đã tải lên các tệp</string>
+    <string name="icon_descr_received_msg_status_unread">chưa đọc</string>
+    <string name="update_database">Cập nhật</string>
+    <string name="update_database_passphrase">Cập nhật mật khẩu cơ sở dữ liệu</string>
+    <string name="unlink_desktop">Hủy liên kết</string>
+    <string name="update_network_settings_question">Cập nhật cài đặt mạng?</string>
+    <string name="migrate_from_device_upload_failed">Tải lên đã thất bại</string>
+    <string name="migrate_from_device_uploading_archive">Đang tải lên bản lưu trữ</string>
+    <string name="app_check_for_updates_canceled">Tải xuống bản cập nhật đã bị hủy</string>
+    <string name="user_unmute">Bật thông báo</string>
+    <string name="upgrade_and_open_chat">Nâng cấp và mở kết nối trò chuyện</string>
+    <string name="unmute_chat">Bật thông báo</string>
+    <string name="rcv_group_event_updated_group_profile">đã cập nhật hồ sơ nhóm</string>
+    <string name="profile_update_event_updated_profile">đã cập nhật hồ sơ</string>
+    <string name="connect_use_current_profile">Sử dụng hồ sơ hiện tại</string>
+    <string name="network_disable_socks">Sử dụng kết nối Internet trực tiếp?</string>
+    <string name="network_smp_proxy_mode_unprotected">Không được bảo vệ</string>
+    <string name="connection_error_auth_desc">Trừ khi liên hệ của bạn đã xóa kết nối hoặc đường dẫn này đã được sử dụng, có thể đã có lỗi - xin vui lòng báo cáo.\nĐể kết nối, xin vui lòng yêu cầu liên hệ của bạn tạo một đường dẫn kết nối khác và chắc chắn rằng bạn có kết nối mạng ổn định.</string>
+    <string name="upload_errors">Lỗi tải lên</string>
+    <string name="v6_0_upgrade_app">Nâng cấp ứng dụng một cách tự động</string>
+    <string name="servers_info_uploaded">Đã tải lên</string>
+    <string name="update_network_settings_confirmation">Cập nhật</string>
+    <string name="onboarding_network_operators_update">Cập nhật</string>
+    <string name="auth_unlock">Mở khóa</string>
+    <string name="v4_4_verify_connection_security">Xác minh bảo mật kết nối</string>
+    <string name="operator_use_for_files">Sử dụng cho các tệp</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Dùng ứng dụng với một tay.</string>
+    <string name="verify_code_on_mobile">Xác minh mã trên di động</string>
+    <string name="migrate_from_device_verify_database_passphrase">Xác minh mật khẩu cơ sở dữ liệu</string>
+    <string name="network_smp_proxy_mode_unknown_description">Sử dụng định tuyến riêng tư với các máy chủ không xác định.</string>
+    <string name="use_servers_of_operator_x">Sử dụng %s</string>
+    <string name="operator_use_operator_toggle_description">Sử dụng các máy chủ</string>
+    <string name="v5_6_picture_in_picture_calls_descr">Dùng ứng dụng khi đang trong cuộc gọi.</string>
+    <string name="verify_connection">Xác minh kết nối</string>
+    <string name="using_simplex_chat_servers">Đang sử dụng các máy chủ SimpleX Chat.</string>
+    <string name="verify_connections">Xác minh các kết nối</string>
+    <string name="operator_use_for_messages">Sử dụng cho các tin nhắn</string>
+    <string name="network_proxy_username">Tên người dùng</string>
+    <string name="network_proxy_random_credentials">Sử dụng các thông tin đăng nhập ngẫu nhiên</string>
+    <string name="network_use_onion_hosts">Sử dụng các dịch vụ .onion</string>
+    <string name="verify_security_code">Xác minh mã bảo mật</string>
+    <string name="connect_use_new_incognito_profile">Sử dụng hồ sơ ẩn danh mới</string>
+    <string name="simplex_link_connection">qua %1$s</string>
+    <string name="network_socks_toggle_use_socks_proxy">Sử dụng proxy SOCKS</string>
+    <string name="use_chat">Sử dụng SimpleX Chat</string>
+    <string name="smp_servers_use_server_for_new_conn">Sử dụng cho các kết nối mới</string>
+    <string name="smp_servers_use_server">Sử dụng máy chủ</string>
+    <string name="network_enable_socks">Sử dụng proxy SOCKS?</string>
+    <string name="use_simplex_chat_servers__question">Sử dụng các máy chủ SimpleX Chat?</string>
+    <string name="migrate_from_device_verify_passphrase">Xác minh mật khẩu</string>
+    <string name="verify_code_with_desktop">Xác minh mã với máy tính</string>
+    <string name="use_random_passphrase">Sử dụng mật khẩu ngẫu nhiên</string>
+    <string name="settings_section_title_use_from_desktop">Sử dụng từ máy tính</string>
+    <string name="network_smp_proxy_mode_unprotected_description">Sử dụng định tuyến riêng tư với các máy chủ không xác định khi địa chỉ IP không được bảo vệ.</string>
+    <string name="view_conditions">Xem các điều kiện</string>
+    <string name="description_via_one_time_link">qua đường dẫn dùng một lần</string>
+    <string name="voice_messages_are_prohibited">Các tin nhắn thoại bị cấm.</string>
+    <string name="recent_history">Lịch sử hữu hình</string>
+    <string name="call_service_notification_video_call">Cuộc gọi video</string>
+    <string name="icon_descr_video_snd_complete">Video đã được gửi</string>
+    <string name="voice_message_send_text">Tin nhắn thoại…</string>
+    <string name="voice_messages_not_allowed">Các tin nhắn thoại là không được cho phép</string>
+    <string name="voice_message">Tin nhắn thoại</string>
+    <string name="gallery_video_button">Video</string>
+    <string name="voice_message_with_duration">Tin nhắn thoại (%1$s)</string>
+    <string name="icon_descr_video_on">Video bật</string>
+    <string name="voice_prohibited_in_this_chat">Các tin nhắn thoại bị cấm trong cuộc trò chuyện này.</string>
+    <string name="voice_messages">Tin nhắn thoại</string>
+    <string name="v5_4_link_mobile_desktop_descr">Qua giao thức kháng lượng tử an toàn.</string>
+    <string name="description_via_group_link">qua đường dẫn nhóm</string>
+    <string name="simplex_link_mode_browser">Qua trình duyệt</string>
+    <string name="info_view_video_button">video</string>
+    <string name="view_updated_conditions">Xem các điều kiện đã được cập nhật</string>
+    <string name="app_was_crashed">Xem sự cố</string>
+    <string name="icon_descr_video_off">Video tắt</string>
+    <string name="video_will_be_received_when_contact_completes_uploading">Video sẽ được nhận khi liên hệ của bạn hoàn thành việc tải nó lên.</string>
+    <string name="video_will_be_received_when_contact_is_online">Video sẽ được nhận khi liên hệ của bạn trực tuyến, xin vui lòng chờ hoặc kiểm tra lại sau!</string>
+    <string name="view_security_code">Xem mã bảo mật</string>
+    <string name="v5_0_large_files_support">Các tệp và video với kích thước tối đa lên tới 1gb</string>
+    <string name="icon_descr_video_call">cuộc gọi video</string>
+    <string name="call_connection_via_relay">thông qua relay</string>
+    <string name="v4_3_voice_messages">Tin nhắn thoại</string>
+    <string name="video_call_no_encryption">cuộc gọi video (không được mã hóa đầu cuối)</string>
+    <string name="description_via_contact_address_link">qua đường dẫn địa chỉ liên lạc</string>
+    <string name="video_descr">Video</string>
+    <string name="we_do_not_store_contacts_or_messages_on_servers">Chúng tôi không lưu bất kỳ liên hệ hay tin nhắn nào của bạn (một khi đã được gửi) trên các máy chủ.</string>
+    <string name="operator_website">Website</string>
+    <string name="personal_welcome">Xin chào %1$s!</string>
+    <string name="network_use_onion_hosts_prefer">Khi có sẵn</string>
+    <string name="voice_messages_prohibited">Các tin nhắn thoại bị cấm!</string>
+    <string name="group_welcome_title">Lời chào</string>
+    <string name="color_wallpaper_tint">Màu sơ cấp hình nền</string>
+    <string name="icon_descr_waiting_for_image">Đang chờ hình ảnh</string>
+    <string name="waiting_for_image">Đang chờ hình ảnh</string>
+    <string name="callstate_waiting_for_confirmation">đang chờ xác nhận…</string>
+    <string name="whats_new">Có gì mới</string>
+    <string name="custom_time_unit_weeks">tuần</string>
+    <string name="button_welcome_message">Lời chào</string>
+    <string name="color_wallpaper_background">Màu nền hình nền</string>
+    <string name="waiting_for_desktop">Đang chờ máy tính…</string>
+    <string name="waiting_for_mobile_to_connect">Đang chờ di động để kết nối:</string>
+    <string name="welcome">Xin chào!</string>
+    <string name="waiting_for_video">Đang chờ video</string>
+    <string name="contact_wants_to_connect_with_you">muốn kết nối với bạn!</string>
+    <string name="waiting_for_file">Đang chờ tệp</string>
+    <string name="callstate_waiting_for_answer">đang chờ trả lời…</string>
+    <string name="welcome_message_is_too_long">Lời chào quá dài</string>
+    <string name="v5_1_better_messages_descr">- tin nhắn thoại với thời lượng tối đa lên tới 5 phút.\n- tùy chỉnh thời gian để tự xóa.\n- lịch sử chỉnh sử.</string>
+    <string name="database_downgrade_warning">Cảnh báo: bạn có thể mất một số dữ liệu!</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Cảnh báo: khởi động kết nối trò chuyện trên nhiều thiết bị không được hỗ trợ và sẽ gây ra các lỗi gửi tin nhắn</string>
+    <string name="webrtc_ice_servers">Các máy chủ ICE WebRTC</string>
+    <string name="onboarding_notifications_mode_off">Khi ứng dụng đang chạy</string>
+    <string name="v5_7_call_sounds_descr">Khi kết nối các cuộc gọi video và âm thanh.</string>
+    <string name="network_smp_proxy_fallback_allow_protected">Khi IP bị ẩn</string>
+    <string name="icon_descr_waiting_for_video">Đang chờ video</string>
+    <string name="network_smp_proxy_fallback_allow">Có</string>
+    <string name="change_automatic_deletion_question">Thay đổi xóa tin nhắn tự động?</string>
+    <string name="disable_automatic_deletion_message">Các tin nhắn trong cuộc trò chuyện này sẽ không bao giờ bị xóa.</string>
+    <string name="xftp_server">Máy chủ XFTP</string>
+    <string name="without_tor_or_vpn_ip_address_will_be_visible_to_file_servers">Không có Tor hoặc VPN, địa chỉ IP của bạn sẽ bị lộ ra cho các máy chủ truyền tệp.</string>
+    <string name="v5_7_quantum_resistant_encryption_descr">Sẽ được kích hoạt trong các cuộc trò chuyện trực tiếp!</string>
+    <string name="network_type_ethernet">Mạng ethernet có dây</string>
+    <string name="snd_error_auth">Khóa sai hoặc kết nối không xác định - khả năng cao kết nối này đã bị xóa.</string>
+    <string name="wrong_passphrase_title">Mật khẩu sai rồi!</string>
+    <string name="network_type_network_wifi">WiFi</string>
+    <string name="privacy_chat_list_open_links_yes">Có</string>
+    <string name="wrong_passphrase">Mật khẩu cơ sở dữ liệu sai</string>
+    <string name="incognito_info_share">Khi bạn chia sẻ một hồ sơ ẩn danh với ai đó, hồ sơ này sẽ được sử dụng cho các nhóm mà họ mời bạn tham gia.</string>
+    <string name="chat_item_ttl_default">mặc định (%s)</string>
+    <string name="chat_ttl_options_footer">Xóa tin nhắn trò chuyện khỏi thiết bị của bạn.</string>
+    <string name="disable_automatic_deletion_question">Tắt xóa tin nhắn tự động?</string>
+    <string name="disable_automatic_deletion">Tắt tính năng xóa tin nhắn</string>
+    <string name="text_field_set_chat_placeholder">Đặt tên cuộc trò chuyện…</string>
+    <string name="file_not_approved_descr">Không có Tor hoặc VPN, địa chỉ IP của bạn sẽ bị lộ ra cho các relay XFTP sau đây:\n%1$s.</string>
+    <string name="xftp_servers">Các máy chủ XFTP</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Khi có nhiều hơn một bên vận hành được kích hoạt, không ai trong số họ có siêu dữ liệu để biết được ai trò chuyện với ai.</string>
+    <string name="v5_5_private_notes_descr">Với các tệp và đa phương tiện được mã hóa.</string>
+    <string name="v5_5_message_delivery_descr">Mức sử dụng pin đã được giảm xuống.</string>
+    <string name="v5_8_message_delivery_descr">Mức sử dụng pin đã được giảm xuống.</string>
+    <string name="v4_2_auto_accept_contact_requests_desc">Với lời chào tùy chọn.</string>
+    <string name="you_can_accept_or_reject_connection">Khi mọi người gửi yêu cầu kết nối, bạn có thể chấp nhận hoặc từ chối nó.</string>
+    <string name="file_error_auth">Khóa sai hoặc địa chỉ khối tệp không xác định - khả năng cao tệp đã bị xóa.</string>
+    <string name="chat_item_ttl_year">1 năm</string>
+    <string name="change_automatic_chat_deletion_message">Việc này không thể được hoàn tác - các tin nhắn đã được gửi và nhận trong cuộc trò chuyện này sớm hơn thời gian được chọn sẽ bị xóa.</string>
+    <string name="chat_preferences_yes">có</string>
+    <string name="you_can_make_address_visible_via_settings">Bạn có thể hiển thị nó cho các liên hệ SimpleX của mình thông qua Cài đặt.</string>
+    <string name="you_can_create_it_later">Bạn có thể tạo nó sau</string>
+    <string name="one_hand_ui_change_instruction">Bạn có thể thay đổi nói trong cài đặt Giao diện.</string>
+    <string name="connect_plan_you_are_already_joining_the_group_via_this_link">Bạn đang tham gia nhóm thông qua đường dẫn này.</string>
+    <string name="you_can_enable_delivery_receipts_later">Bạn có thể bật vào lúc sau thông qua Cài đặt</string>
+    <string name="settings_section_title_you">BẠN</string>
+    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Bạn có thể chia sẻ một đường dẫn hoặc mã QR - bất kỳ ai cũng sẽ có thể tham gia nhóm. Bạn sẽ không mất các thành viên của nhóm nếu sau này bạn xóa nó đi.</string>
+    <string name="migrate_to_device_try_again">Bạn có thể thử một lần nữa.</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">Bạn đã kết nối tới máy chủ dùng để nhận tin nhắn từ liên hệ này.</string>
+    <string name="failed_to_create_user_duplicate_desc">Bạn đã có một hồ sơ trò chuyện với cùng một tên hiển thị. Xin vui lòng chọn một cái tên khác.</string>
+    <string name="you_can_still_send_messages_to_contact">Bạn có thể gửi tin nhắn tới %1$s từ Các liên hệ được lưu trữ.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Bạn đã kết nối với %1$s rồi.</string>
+    <string name="chat_preferences_you_allow">Bạn cho phép</string>
+    <string name="servers_info_proxied_servers_section_footer">Bạn không được kết nối với các máy chủ này. Định tuyến riêng tư được sử dụng để gửi tin nhắn tới chúng.</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Bạn có thể định cấu hình các bên vận hành trong cài đặt Mạng &amp; máy chủ.</string>
+    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">Bạn đang kết nối thông qua đường dẫn dùng một lần này!</string>
+    <string name="migrate_from_device_try_again">Bạn có thể thử một lần nữa.</string>
+    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Bạn được mời vào nhóm. Tham gia để kết nối với các thành viên nhóm.</string>
+    <string name="you_are_invited_to_group">Bạn được mời vào nhóm</string>
+    <string name="group_info_member_you">bạn: %1$s</string>
+    <string name="onboarding_network_operators_configure_via_settings">Bạn có thể tùy chỉnh các máy chủ thông qua cài đặt.</string>
+    <string name="you_can_set_connection_name_to_remember">Bạn có thể đặt tên kết nối, để nhớ xem đường dẫn đã được chia sẻ với ai.</string>
+    <string name="you_are_observer">bạn là quan sát viên</string>
+    <string name="maximum_message_size_reached_forwarding">Bạn có thể sao chép và giảm kích thước tin nhắn để gửi nó đi.</string>
+    <string name="you_can_enable_delivery_receipts_later_alert">Bạn có thể bật chúng vào lúc sau thông qua cài đặt Quyền riêng tư &amp; Bảo mật của ứng dụng.</string>
+    <string name="you_can_hide_or_mute_user_profile">Bạn có thể ẩn hoặc tắt thông báo một hồ sơ người dùng - giữ nó trong phần menu.</string>
+    <string name="snd_group_event_member_blocked">bạn đã chặn %s</string>
+    <string name="you_accepted_connection">Bạn đã chấp nhận kết nối</string>
+    <string name="sender_you_pronoun">bạn</string>
+    <string name="group_preview_you_are_invited">bạn được mời vào nhóm</string>
+    <string name="your_calls">Các cuộc gọi của bạn</string>
+    <string name="you_can_turn_on_lock">Bạn có thể bật Khóa SimpleX thông qua Cài đặt.</string>
+    <string name="you_have_no_chats">Bạn không có cuộc trò chuyện nào</string>
+    <string name="you_can_still_view_conversation_with_contact">Bạn vẫn có thể xem cuộc hội thoại với %1$s trong danh sách các cuộc trò chuyện.</string>
+    <string name="you_joined_this_group">Bạn đã tham gia nhóm này</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Bạn đã tham gia nhóm này. Đang kết nối tới thành viên nhóm đi mời.</string>
+    <string name="la_could_not_be_verified">Bạn đã không thể được xác minh; xin vui lòng thử lại.</string>
+    <string name="snd_group_event_changed_role_for_yourself">bạn đã thay đổi chức vụ của mình thành %s</string>
+    <string name="chat_database_exported_save">Bạn có thể lưu bản lưu trữ đã được xuất.</string>
+    <string name="database_is_not_encrypted">Cơ sở dữ liệu trò chuyện của bạn không được mã hóa - đặt mật khẩu để bảo vệ nó.</string>
+    <string name="you_have_to_enter_passphrase_every_time">Bạn phải nhập mật khẩu mỗi lần ứng dụng khởi chạy - nó không được lưu trên thiết bị của bạn.</string>
+    <string name="snd_group_event_user_left">bạn đã rời</string>
+    <string name="you_need_to_allow_calls">Bạn cần cho phép liên hệ của mình thực hiện cuộc gọi để có thể gọi cho họ.</string>
+    <string name="snd_group_event_changed_member_role">bạn đã thay đổi chức vụ của %s thành %s</string>
+    <string name="snd_conn_event_switch_queue_phase_completed">bạn đã thay đổi địa chỉ</string>
+    <string name="connect_plan_you_have_already_requested_connection_via_this_address">Bạn đã yêu cầu kết nối thông qua địa chỉ này rồi!</string>
+    <string name="you_invited_a_contact">Bạn đã mời một liên hệ</string>
+    <string name="you_can_share_your_address">Bạn có thể chia sẻ địa chỉ của mình dưới dạng một đường dẫn hoặc mã QR - bất kỳ ai cũng có thể kết nối với bạn.</string>
+    <string name="you_can_view_invitation_link_again">Bạn có thể xem đường dẫn mời lần nữa trong chi tiết kết nối.</string>
+    <string name="you_control_your_chat">Bạn kiểm soát cuộc trò chuyện của mình!</string>
+    <string name="observer_cant_send_message_title">Bạn không thể gửi tin nhắn!</string>
+    <string name="you_can_share_this_address_with_your_contacts">Bạn có thể chia sẻ địa chỉ này với các liên hệ của mình để họ kết nối với %s.</string>
+    <string name="you_need_to_allow_to_send_voice">Bạn cần cho phép liên hệ của mình gửi tin nhắn thoại để có thể gửi cho họ.</string>
+    <string name="chat_database_exported_migrate">Bạn có thể di chuyển cơ sở dữ liệu đã được xuất.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">Bạn CHỈ nên sử dụng phiên bản gần nhất của cơ sở dữ liệu trò chuyện của mình trên một thiết bị mà thôi, nếu không thì bạn có thể dừng nhận tin nhắn từ một vài liên hệ.</string>
+    <string name="snd_conn_event_switch_queue_phase_completed_for_member">bạn đã thay đổi địa chỉ cho %s</string>
+    <string name="you_can_use_markdown_to_format_messages__prompt">Bạn có thể sử dụng markdown để định dạng tin nhắn:</string>
+    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Bạn có thể bắt đầu kết nối trò chuyện thông qua phần Cài đặt / Cơ sở dữ liệu ở trên ứng dụng hoặc bằng cách khởi động lại ứng dụng.</string>
+    <string name="people_can_connect_only_via_links_you_share">Bạn quyết định ai có thể kết nối tới.</string>
+    <string name="your_chat_database">Cơ sở dữ liệu trò chuyện của bạn</string>
+    <string name="your_privacy">Sự riêng tư của bạn</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Cơ sở dữ liệu trò chuyện hiện tại của bạn sẽ bị XÓA và THAY THẾ bằng cái được nhập vào.\nViệc này không thể được hoàn tác - hồ sơ, các liên hệ, tin nhắn và tệp của bạn sẽ biến mất mà không thể khôi phục.</string>
+    <string name="snd_group_event_member_deleted">bạn đã xóa %1$s</string>
+    <string name="your_contacts_will_remain_connected">Các liên hệ của bạn vẫn sẽ được kết nối.</string>
+    <string name="your_profile_is_stored_on_your_device">Hồ sơ, các liên hệ và những tin nhắn đã được gửi của bạn được lưu trữ trên thiết bị bạn dùng.</string>
+    <string name="v4_3_irreversible_message_deletion_desc">Các liên hệ của bạn có thể cho phép xóa tin nhắn hoàn toàn.</string>
+    <string name="appearance_zoom">Thu phóng</string>
+    <string name="your_SMP_servers">Các máy chủ SMP của bạn</string>
+    <string name="description_you_shared_one_time_link">Bạn đã chia sẻ đường dẫn dùng một lần</string>
+    <string name="group_main_profile_sent">Hồ sơ trò chuyện của bạn sẽ được gửi tới các thành viên nhóm</string>
+    <string name="your_current_profile">Hồ sơ hiện tại của bạn</string>
+    <string name="alert_title_cant_invite_contacts_descr">Bạn đang dùng một hồ sơ ẩn danh cho nhóm này - để tránh khỏi chia sẻ hồ sơ chính của mình với các liên hệ đi mời mà không được cho phép</string>
+    <string name="your_preferences">Các tùy chọn của bạn</string>
+    <string name="incognito_random_profile">Hồ sơ ngẫu nhiên của bạn</string>
+    <string name="you_sent_group_invitation">Bạn đã gửi lời mời nhóm</string>
+    <string name="you_rejected_group_invitation">Bạn đã từ chối lời mời nhóm</string>
+    <string name="snd_group_event_member_unblocked">bạn đã bỏ chặn %s</string>
+    <string name="your_chat_profile_will_be_sent_to_your_contact">Hồ sơ trò chuyện của bạn sẽ được gửi\ntới liên hệ của bạn</string>
+    <string name="description_you_shared_one_time_link_incognito">bạn đã chia sẻ đường dẫn ẩn danh dùng một lần</string>
+    <string name="your_simplex_contact_address">Địa chỉ SimpleX của bạn</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Liên hệ của bạn cần phải trực tuyến để cho kết nối hoàn thành.\nBạn có thể hủy kết nối này và xóa liên hệ (và thử lại sau với một đường dẫn mới).</string>
+    <string name="your_ICE_servers">Các máy chủ ICE của bạn</string>
+    <string name="invite_prohibited_description">Bạn đang cố mời liên hệ mà bạn đã chia sẻ một hồ sơ ẩn danh với để tham gia nhóm mà bạn đang dùng hồ sơ chính của mình</string>
+    <string name="chat_main_profile_sent">Hồ sơ trò chuyện của bạn sẽ được gửi tới các thành viên có liên lạc</string>
+    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Bạn sẽ được kết nối khi yêu cầu kết nối của bạn được chấp nhận, xin vui lòng đợi hoặc kiểm tra sau!</string>
+    <string name="connect__your_profile_will_be_shared">Hồ sơ %1$s sẽ được chia sẻ.</string>
+    <string name="your_XFTP_servers">Các máy chủ XFTP của bạn</string>
+    <string name="profile_will_be_sent_to_contact_sending_link">Hồ sơ của bạn sẽ được gửi tới liên hệ mà bạn đã nhận từ người đó đường dẫn này.</string>
+    <string name="you_will_join_group">Bạn sẽ kết nối với tất cả các thành viên nhóm.</string>
+    <string name="non_content_uri_alert_text">Bạn đã chia sẻ một đường dẫn tệp không hợp lệ. Báo cáo vấn đề tới các nhà phát triển ứng dụng.</string>
+    <string name="your_servers">Các máy chủ của bạn</string>
+    <string name="you_will_still_receive_calls_and_ntfs">Bạn vẫn sẽ nhận các cuộc gọi và thông báo từ các hồ sơ đã bị tắt thông báo khi chúng hoạt động.</string>
+    <string name="connect_via_member_address_alert_desc">Yêu cầu kết nối sẽ được gửi tới thành viên nhóm này.</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Bạn sẽ dừng nhận tin nhắn từ cuộc hội thoại này. Lịch sử trò chuyện sẽ được giữ lại.</string>
+    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Bạn sẽ dừng nhận tin nhắn từ nhóm này. Lịch sử trò chuyện sẽ được giữ lại.</string>
+    <string name="contact_sent_large_file">Liên hệ của bạn đã gửi một tệp có kích thước lớn hơn so với kích thước tối đa hiện đang được hỗ trợ (%1$s).</string>
+    <string name="you_wont_lose_your_contacts_if_delete_address">Bạn sẽ không mất các liên hệ của mình nếu bạn sau đó xóa địa chỉ của mình đi.</string>
+    <string name="contact_list_header_title">Các liên hệ của bạn</string>
+    <string name="your_chat_profiles">Các hồ sơ trò chuyện của bạn</string>
+    <string name="your_settings">Cài đặt của bạn</string>
+    <string name="smp_servers_your_server">Máy chủ của bạn</string>
+    <string name="smp_servers_your_server_address">Địa chỉ máy chủ của bạn</string>
+    <string name="your_ice_servers">Các máy chủ ICE của bạn</string>
+    <string name="network_proxy_auth_mode_username_password">Thông tin định danh của bạn có thể bị gửi mà không được mã hóa.</string>
+    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Hồ sơ của bạn được lưu trên thiết bị bạn dùng và chỉ được chia sẻ với các liên hệ bạn có. Các máy chủ SimpleX không thể xem hồ sơ của bạn.</string>
+    <string name="switching_profile_error_message">Kết nối của bạn đã bị chuyển tới %s nhưng một lỗi không mong muốn đã xảy ra trong khi chuyển hướng bạn đến hồ sơ.</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">Bạn sẽ được kết nối tới nhóm khi thiết bị của chủ nhóm trực tuyến, xin vui lòng đợi hoặc kiểm tra sau!</string>
+    <string name="you_will_be_connected_when_your_contacts_device_is_online">Bạn sẽ được kết nối khi thiết bị của liên hệ bạn trực tuyến, xin vui lòng đợi hoặc kiểm tra sau!</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Bạn sẽ được yêu cầu xác thực khi bạn khởi động hoặc tiếp tục ứng dụng sau 30 giây trong nền.</string>
+    <string name="network_smp_web_port_section_title">Cổng TCP để nhắn tin</string>
+    <string name="network_smp_web_port_footer">Sử dụng cổng TCP %1$s khi không có cổng nào được chỉ định.</string>
+    <string name="network_smp_web_port_toggle">Sử dụng cổng web</string>
+    <string name="max_group_mentions_per_message_reached">Bạn có thể nhắc đến tối đa là %1$s thành viên trong một tin nhắn!</string>
+    <string name="mute_all_chat">Tắt thông báo tất cả</string>
+    <string name="unread_mentions">Những lời nhắc chưa đọc</string>
+    <string name="group_members_can_send_reports">Các thành viên có thể báo cáo tin nhắn tới các kiểm duyệt viên.</string>
+    <string name="report_archive_alert_desc_all">Tất cả các báo cáo sẽ được lưu trữ cho bạn.</string>
+    <string name="report_archive_alert_title_all">Lưu trữ tất cả báo cáo?</string>
+    <string name="report_archive_alert_title_nth">Lưu trữ %d báo cáo?</string>
+    <string name="archive_reports">Lưu trữ các báo cáo</string>
+    <string name="report_archive_for_all_moderators">Cho tất cả các kiểm duyệt viên</string>
+    <string name="report_archive_for_me">Cho tôi</string>
+    <string name="notification_group_report">Báo cáo: %s</string>
+    <string name="enable_sending_member_reports">Cho phép báo cáo tin nhắn tới các kiểm duyệt viên.</string>
+    <string name="disable_sending_member_reports">Cấm báo cáo tin nhắn tới các kiểm duyệt viên.</string>
+    <string name="member_reports_are_prohibited">Báo cáo tin nhắn bị cấm trong nhóm này.</string>
+    <string name="v6_3_mentions_descr">Nhận thông báo khi được nhắc đến.</string>
+    <string name="v6_3_reports_descr">Giúp các quản trị viên quản lý các nhóm của họ.</string>
+    <string name="v6_3_mentions">Nhắc đến các thành viên 👋</string>
+    <string name="v6_3_organize_chat_lists">Sắp xếp các cuộc trò chuyện thành danh sách</string>
+    <string name="v6_3_faster_deletion_of_groups">Xóa nhóm nhanh hơn.</string>
+    <string name="v6_3_faster_sending_messages">Gửi tin nhắn nhanh hơn.</string>
+    <string name="v6_3_organize_chat_lists_descr">Không còn bỏ lỡ các tin nhắn quan trọng nữa.</string>
+    <string name="v6_3_better_privacy_and_security">Bảo mật và riêng tư hơn</string>
+    <string name="v6_3_better_groups_performance">Nhóm hoạt động hiệu quả hơn</string>
+    <string name="v6_3_reports">Gửi các báo cáo riêng tư</string>
+    <string name="group_preview_rejected">đã từ chối</string>
+    <string name="group_member_status_rejected">đã từ chối</string>
+    <string name="v6_3_set_message_expiration_in_chats">Thiết lập giờ hết hạn cho tin nhắn trong các cuộc trò chuyện.</string>
+    <string name="v6_3_private_media_file_names">Tên các tệp tin đa phương tiện riêng tư.</string>
+    <string name="error_reading_passphrase">Lỗi đọc mật khẩu cơ sở dữ liệu</string>
+    <string name="block_members_desc">Tất cả các tin nhắn mới từ những thành viên này sẽ bị ẩn!</string>
+    <string name="block_members_for_all_question">Chặn các thành viên cho tất cả?</string>
+    <string name="feature_roles_moderators">các kiểm duyệt viên</string>
+    <string name="unblock_members_desc">Các tin nhắn từ những thành viên này sẽ được hiển thị!</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">Các thành viên sẽ bị xóa khỏi nhóm - việc này không thể được hoàn tác!</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">Các thành viên sẽ bị xóa khỏi cuộc trò chuyện - việc này không thể được hoàn tác!</string>
+    <string name="restore_passphrase_can_not_be_read_desc">Không thể đọc mật khẩu trong Keystore. Điều này có thể xảy ra sau bản cập nhật hệ thống không tương thích với ứng dụng. Nếu không phải như vậy, xin vui lòng liên hệ với các nhà phát triển.</string>
+    <string name="group_member_status_pending_approval_short">đang chờ xử lý</string>
+    <string name="operator_updated_conditions">Các điều kiện đã được cập nhật</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">Không thể đọc mật khẩu trong Keystore, xin vui lòng nhập thủ công. Điều này có thể xảy ra sau khi bản cập nhật hệ thống không tương thích với ứng dụng. Nếu không phải như vậy, vui lòng liên hệ với các nhà phát triển.</string>
+    <string name="group_member_status_pending_approval">đang chờ phê duyệt</string>
+    <string name="unblock_members_for_all_question">Bỏ chặn các thành viên cho tất cả?</string>
+    <string name="button_remove_members_question">Xóa các thành viên?</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">Chính sách quyền riêng tư và các điều kiện sử dụng.</string>
+    <string name="onboarding_conditions_by_using_you_agree">Bằng việc sử dụng SimpleX Chat, bạn đồng ý:\n- chỉ gửi nội dung hợp pháp trong các nhóm công khai.\n- tôn trọng những người dùng khác - không gửi tin rác.</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">Các cuộc trò chuyện riêng tư, nhóm và liên hệ của bạn không thể truy cập được đối với các bên vận hành máy chủ.</string>
+    <string name="onboarding_conditions_accept">Chấp nhận</string>
+    <string name="onboarding_conditions_configure_server_operators">Định cấu hình các bên vận hành máy chủ</string>
+    <string name="link_requires_newer_app_version_please_upgrade">Đường dẫn này yêu cầu một phiên bản ứng dụng mới hơn. Vui lòng nâng cấp ứng dụng hoặc yêu cầu liên hệ của một gửi cho một đường dẫn tương thích.</string>
+    <string name="simplex_link_channel">Đường dẫn kênh SimpleX</string>
+    <string name="unsupported_connection_link">Đường dẫn kết nối không được hỗ trợ</string>
+    <string name="privacy_short_links">Sử dụng đường dẫn ngắn (BETA)</string>
+    <string name="full_link_button_text">Toàn bộ đường dẫn</string>
+    <string name="short_link_button_text">Đường dẫn ngắn</string>
+    <string name="network_smp_web_port_off">Tắt</string>
+    <string name="network_smp_web_port_preset">Các máy chủ cài sẵn</string>
+    <string name="network_smp_web_port_preset_footer">Chỉ sử dụng cổng TCP 443 cho các máy chủ cài sẵn.</string>
+    <string name="network_smp_web_port_all">Tất cả máy chủ</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml
index 0477307343..e78878000c 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml
@@ -229,7 +229,7 @@
     <string name="v4_5_transport_isolation_descr">按聊天资料（默认）或按连接（BETA）。</string>
     <string name="smp_servers_check_address">检查服务器地址并重试。</string>
     <string name="clear_verification">清除验证</string>
-    <string name="icon_descr_close_button">关闭按键</string>
+    <string name="icon_descr_close_button">关闭</string>
     <string name="configure_ICE_servers">配置 ICE 服务器</string>
     <string name="confirm_verb">确认</string>
     <string name="auth_confirm_credential">确认你的证书</string>
@@ -929,7 +929,7 @@
     <string name="group_member_role_observer">观察员</string>
     <string name="you_are_observer">你是观察者</string>
     <string name="error_updating_link_for_group">更新群链接错误</string>
-    <string name="observer_cant_send_message_title">你无法发送消息！</string>
+    <string name="observer_cant_send_message_title">你是观察员</string>
     <string name="initial_member_role">初始角色</string>
     <string name="observer_cant_send_message_desc">请联系群管理员。</string>
     <string name="language_system">系统</string>
@@ -1059,7 +1059,7 @@
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">当你或你的连接使用旧数据库备份时，可能会发生这种情况。</string>
     <string name="decryption_error">解密错误</string>
     <string name="alert_text_fragment_please_report_to_developers">请向开发者报告。</string>
-    <string name="alert_text_msg_bad_hash">上一条消息的散列不同。</string>
+    <string name="alert_text_msg_bad_hash">上条消息的哈希值不同。</string>
     <string name="alert_text_msg_bad_id">下一条消息的 ID 不正确（小于或等于上一条）。
 \n它可能是由于某些错误或连接被破坏才发生。</string>
     <string name="stop_file__action">停止文件</string>
@@ -1068,10 +1068,10 @@
     <string name="stop_rcv_file__title">停止接收文件？</string>
     <string name="stop_rcv_file__message">即将停止接收文件。</string>
     <string name="stop_file__confirm">停止</string>
-    <string name="revoke_file__action">撤销文件</string>
-    <string name="revoke_file__title">撤销文件？</string>
+    <string name="revoke_file__action">吊销文件</string>
+    <string name="revoke_file__title">吊销文件？</string>
     <string name="revoke_file__message">文件将从服务器中删除。</string>
-    <string name="revoke_file__confirm">撤销</string>
+    <string name="revoke_file__confirm">吊销</string>
     <string name="audio_video_calls">音频/视频通话</string>
     <string name="available_in_v51">"
 \n在 v5.1 版本中可用"</string>
@@ -1232,7 +1232,7 @@
     <string name="abort_switch_receiving_address">中止地址更改</string>
     <string name="allow_to_send_files">允许发送文件和媒体。</string>
     <string name="files_and_media">文件和媒体</string>
-    <string name="only_owners_can_enable_files_and_media">只有组主可以启用文件和媒体。</string>
+    <string name="only_owners_can_enable_files_and_media">只有群主可以启用文件和媒体。</string>
     <string name="files_are_prohibited_in_group">文件和媒体被禁止。</string>
     <string name="group_members_can_send_files">成员可以发送文件和媒体。</string>
     <string name="prohibit_sending_files">禁止发送文件和媒体。</string>
@@ -1330,7 +1330,7 @@
     <string name="passphrase_will_be_saved_in_settings">更改密码或重启应用后，密码将以明文形式保存在设置中。</string>
     <string name="paste_the_link_you_received_to_connect_with_your_contact">粘贴你收到的链接以与你的联系人联系…</string>
     <string name="send_receipts">送达回执</string>
-    <string name="no_selected_chat">没有选择聊天</string>
+    <string name="no_selected_chat">没有选中的聊天</string>
     <string name="conn_event_ratchet_sync_ok">可以加密</string>
     <string name="renegotiate_encryption">重新协商加密</string>
     <string name="receipts_groups_disable_keep_overrides">禁用（保留组覆盖）</string>
@@ -1917,8 +1917,7 @@
     <string name="servers_info_reset_stats_alert_confirm">重置</string>
     <string name="network_error_broker_host_desc">服务器地址不兼容网络设置：%1$s。</string>
     <string name="servers_info_starting_from">起始自 %s。</string>
-    <string name="servers_info_private_data_disclaimer">起始自 %s.
-\n所有数据都是设备的私有数据。</string>
+    <string name="servers_info_private_data_disclaimer">自 %s 起 \n所有数据均私密地保存在你的设备上.</string>
     <string name="subscribed">已订阅</string>
     <string name="acknowledged">已认可</string>
     <string name="network_error_broker_version_desc">服务器版本不兼容你的应用：%1$s.</string>
@@ -1962,7 +1961,7 @@
     <string name="proxy_destination_error_failed_to_connect">转发服务器 %1$s 连接目的地服务器 %2$s 失败。请稍后尝试。</string>
     <string name="smp_proxy_error_broker_host">转发服务器地址不兼容网络设置：%1$s。</string>
     <string name="smp_proxy_error_broker_version">转发服务器版本不兼容网络设置：%1$s。</string>
-    <string name="proxy_destination_error_broker_host">%1$s 的目的地服务器地址不兼容转发服务器 %2$s 的设置</string>
+    <string name="proxy_destination_error_broker_host">%1$s 的目的地服务器地址不兼容转发服务器 %2$s 的设置。</string>
     <string name="smp_proxy_error_connecting">连接转发服务器 %1$s 出错。请稍后尝试。</string>
     <string name="privacy_media_blur_radius">模糊媒体文件</string>
     <string name="privacy_media_blur_radius_medium">中度</string>
@@ -2062,7 +2061,7 @@
     <string name="network_proxy_username">用户名</string>
     <string name="new_chat_share_profile">分享配置文件</string>
     <string name="error_forwarding_messages">转发消息出错</string>
-    <string name="forward_files_messages_deleted_after_selection_desc">在你选中消息后这些消息被删除。</string>
+    <string name="forward_files_messages_deleted_after_selection_desc">在你选中消息后这些消息已被删除。</string>
     <string name="n_file_errors">%1$d 个文件错误：\n%2$s</string>
     <string name="n_other_file_errors">其他 %1$d 个文件错误。</string>
     <string name="forward_files_not_accepted_desc">%1$d 个文件未被下载。</string>
@@ -2071,29 +2070,29 @@
     <string name="forward_alert_title_nothing_to_forward">没什么可转发的！</string>
     <string name="forward_files_in_progress_desc">仍有 %1$d 个文件在下载中。</string>
     <string name="forward_files_failed_to_receive_desc">%1$d 个文件下载失败。</string>
-    <string name="forward_files_missing_desc">%1$d 个文件被删除了。</string>
+    <string name="forward_files_missing_desc">删除了 %1$d 个文件。</string>
     <string name="forward_files_not_accepted_receive_files">下载</string>
     <string name="forward_files_messages_deleted_after_selection_title">%1$s 条消息未被转发</string>
     <string name="forward_multiple">转发消息…</string>
     <string name="compose_forward_messages_n">转发 %1$s 条消息</string>
     <string name="compose_save_messages_n">保存 %1$s 条消息</string>
     <string name="icon_descr_sound_muted">已静音</string>
-    <string name="settings_section_title_message_shape">管理形状</string>
+    <string name="settings_section_title_message_shape">消息形状</string>
     <string name="settings_message_shape_corner">拐角</string>
     <string name="settings_message_shape_tail">尾部</string>
     <string name="error_initializing_web_view_wrong_arch">初始化 WebView 出错。确保你安装了 WebView 且其支持的架构为 arm64。\n错误：%s</string>
     <string name="network_session_mode_session">应用会话</string>
-    <string name="network_session_mode_session_description">每次启动应用都会使用新的 SOCKS5 凭据。</string>
+    <string name="network_session_mode_session_description">每次启动应用都会使用新的 SOCKS 凭据。</string>
     <string name="network_session_mode_server">服务器</string>
     <string name="call_desktop_permission_denied_safari">打开 Safari 设置/网站/麦克风，接着在 localhost 选择“允许”。</string>
     <string name="call_desktop_permission_denied_title">要进行通话，请允许使用设备麦克风。结束通话并尝试再次呼叫。</string>
-    <string name="call_desktop_permission_denied_chrome">单击地址附近的\"信息\"按钮允许使用麦克风。</string>
-    <string name="network_session_mode_server_description">每个服务器都会使用新的 SOCKS5 凭据。</string>
+    <string name="call_desktop_permission_denied_chrome">单击地址栏附近的“信息”按钮允许使用麦克风。</string>
+    <string name="network_session_mode_server_description">每个服务器都会使用新的 SOCKS 凭据。</string>
     <string name="v6_1_message_dates_descr">更好的消息日期。</string>
     <string name="v6_1_better_security">更佳的安全性✅</string>
     <string name="v6_1_better_user_experience">更佳的使用体验</string>
     <string name="v6_1_customizable_message_descr">可自定义消息形状。</string>
-    <string name="v6_1_forward_many_messages_descr">一次性转发最多20条消息。</string>
+    <string name="v6_1_forward_many_messages_descr">一次转发最多20条消息。</string>
     <string name="v6_1_better_security_descr">Trail of Bits 审核了 SimpleX 协议。</string>
     <string name="v6_1_better_calls_descr">通话期间切换音频和视频。</string>
     <string name="v6_1_switch_chat_profile_descr">对一次性邀请切换聊天配置文件。</string>
@@ -2117,21 +2116,21 @@
     <string name="create_1_time_link">创建一次性链接</string>
     <string name="for_social_media">用于社交媒体</string>
     <string name="or_to_share_privately">或者私下分享</string>
-    <string name="onboarding_choose_server_operators">服务器运营者</string>
-    <string name="onboarding_network_operators">网络运营者</string>
-    <string name="onboarding_network_operators_conditions_will_be_accepted">30 天后将接受已启用的运营者的条款。</string>
+    <string name="onboarding_choose_server_operators">服务器运营方</string>
+    <string name="onboarding_network_operators">网络运营方</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">30 天后将接受已启用的运营方的条款。</string>
     <string name="onboarding_network_operators_continue">继续</string>
     <string name="onboarding_network_operators_review_later">稍后审阅</string>
-    <string name="onboarding_select_network_operators_to_use">选择要使用的网络运营者。</string>
+    <string name="onboarding_select_network_operators_to_use">选择要使用的网络运营方。</string>
     <string name="onboarding_network_operators_update">更新</string>
     <string name="onboarding_network_operators_configure_via_settings">你可以通过设置配置服务器。</string>
-    <string name="operators_conditions_will_be_accepted_for"><![CDATA[将接受运营者的条款: <b>%s</b>.]]></string>
-    <string name="operator_conditions_accepted_for_enabled_operators_on">将于下列日期自动接受已启用的运营者的条款：%s。</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[将接受运营方的条款: <b>%s</b>.]]></string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">将于下列日期自动接受已启用的运营方的条款：%s。</string>
     <string name="network_preset_servers_title">预设服务器</string>
     <string name="your_servers">你的服务器</string>
     <string name="operator_conditions_will_be_accepted_on">接受条款的将来日期为：%s。</string>
-    <string name="operator_info_title">网络运营者</string>
-    <string name="operator">运营者</string>
+    <string name="operator_info_title">网络运营方</string>
+    <string name="operator">运营方</string>
     <string name="operator_servers_title">%s 台服务器</string>
     <string name="operator_website">网站</string>
     <string name="operator_conditions_failed_to_load">无法加载当前条款文本，你可以通过此链接审阅条款：</string>
@@ -2148,33 +2147,33 @@
     <string name="operator_use_for_messages">用于消息</string>
     <string name="operator_open_changes">打开更改</string>
     <string name="operator_open_conditions">打开条款</string>
-    <string name="operator_server_alert_title">运营者服务器</string>
-    <string name="server_added_to_operator__name">已添加服务器到运营者 %s</string>
-    <string name="error_server_operator_changed">服务器运营者已更改。</string>
+    <string name="operator_server_alert_title">运营方服务器</string>
+    <string name="server_added_to_operator__name">已添加服务器到运营方 %s</string>
+    <string name="error_server_operator_changed">服务器运营方已更改。</string>
     <string name="error_server_protocol_changed">服务器协议已更改。</string>
     <string name="appearance_in_app_bars_alpha">透明度</string>
     <string name="v6_2_network_decentralization">网络去中心化</string>
-    <string name="v6_2_network_decentralization_descr">应用中的第二个预设运营者！</string>
+    <string name="v6_2_network_decentralization_descr">应用中的第二个预设运营方！</string>
     <string name="v6_2_improved_chat_navigation">改进了聊天导航</string>
     <string name="view_updated_conditions">查看更新后的条款</string>
     <string name="onboarding_network_operators_app_will_use_for_routing">比如，如果你通过 SimpleX 服务器收到消息，应用会通过 Flux 服务器传送它们。</string>
-    <string name="onboarding_network_operators_app_will_use_different_operators">应用通过在每个对话中使用不同运营者保护你的隐私。</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">应用通过在每个对话中使用不同运营方保护你的隐私。</string>
     <string name="accept_conditions">接受条款</string>
     <string name="appearance_bars_blur_radius">模糊</string>
-    <string name="address_or_1_time_link">地址或一次性链接？</string>
+    <string name="address_or_1_time_link">地址还是一次性链接？</string>
     <string name="operator_added_message_servers">已添加消息服务器</string>
     <string name="operator_added_xftp_servers">已添加媒体和文件服务器</string>
     <string name="address_settings">地址设置</string>
-    <string name="operator_conditions_accepted">已接受条款</string>
+    <string name="operator_conditions_accepted">已接受的条款</string>
     <string name="appearance_app_toolbars">应用工具栏</string>
     <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[1-time link can be used <i>仅用于一名联系人</i> - 面对面或通过任何消息应用分享.]]></string>
-    <string name="operator_conditions_accepted_for_some"><![CDATA[已经接受了下列运营者的条款: <b>%s</b>.]]></string>
-    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[将接受运营者的条款:<b>%s</b>.]]></string>
-    <string name="operator_same_conditions_will_be_applied"><![CDATA[相同条款将应用于运营者 <b>%s</b>.]]></string>
-    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[相同条款将应用于运营者: <b>%s</b>.]]></string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[已经接受了下列运营方的条款: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[将接受运营方的条款:<b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[相同条款将应用于运营方 <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[相同条款将应用于运营方: <b>%s</b>.]]></string>
     <string name="operator_in_order_to_use_accept_conditions"><![CDATA[要使用 <b>%s</b>的服务器，请接受使用条款。]]></string>
-    <string name="operators_conditions_accepted_for"><![CDATA[接受了运营者的条款: <b>%s</b>.]]></string>
-    <string name="v6_2_network_decentralization_enable_flux">开启 flux</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[接受了运营方的条款: <b>%s</b>.]]></string>
+    <string name="v6_2_network_decentralization_enable_flux">在“网络&amp;服务器”设置中启用 Flux，更好地保护元数据隐私。</string>
     <string name="error_accepting_operator_conditions">接受条款出错</string>
     <string name="v6_2_network_decentralization_enable_flux_reason">为了更好的元数据隐私。</string>
     <string name="error_adding_server">添加服务器出错</string>
@@ -2190,10 +2189,10 @@
     <string name="message_deleted_or_not_received_error_desc">此消息被删除或尚未收到。</string>
     <string name="connection_error_quota_desc">连接达到了未送达消息上限，你的联系人可能处于离线状态。</string>
     <string name="to_protect_against_your_link_replaced_compare_codes">为了防止链接被替换，你可以比较联系人安全代码。</string>
-    <string name="onboarding_network_operators_conditions_you_can_configure">你可以在“网络和服务器”设置中配置运营者。</string>
-    <string name="operator_conditions_accepted_on">接受运营者条款的日期：%s</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">你可以在“网络和服务器”设置中配置运营方。</string>
+    <string name="operator_conditions_accepted_on">接受运营方条款的日期：%s</string>
     <string name="remote_hosts_section">远程移动设备</string>
-    <string name="chat_archive">或者导入压缩文件</string>
+    <string name="chat_archive">或者导入存档文件</string>
     <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>小米设备</b>：请在系统设置中开启“自动启动”让通知正常工作。]]></string>
     <string name="maximum_message_size_title">消息太大！</string>
     <string name="maximum_message_size_reached_forwarding">你可以复制并减小消息大小来发送它。</string>
@@ -2229,8 +2228,199 @@
     <string name="info_row_chat">聊天</string>
     <string name="member_will_be_removed_from_chat_cannot_be_undone">将从聊天中删除成员 - 此操作无法撤销！</string>
     <string name="maximum_message_size_reached_text">请减小消息尺寸并再次发送。</string>
-    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">当启用了超过一个运营者时，没有一个运营者拥有了解谁和谁联络的元数据。</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">当启用了超过一个运营方时，没有一个运营方拥有了解谁和谁联络的元数据。</string>
     <string name="display_name_accepted_invitation">已接受邀请</string>
     <string name="display_name_requested_to_connect">被请求连接</string>
-    <string name="onboarding_network_about_operators">关于运营者</string>
-</resources>
\ No newline at end of file
+    <string name="onboarding_network_about_operators">关于运营方</string>
+    <string name="onboarding_network_operators_simplex_flux_agreement">SimpleX Chat 和 Flux 达成协议将 Flux 运营的服务器包括在应用中。</string>
+    <string name="sync_connection_confirm">修复</string>
+    <string name="sync_connection_question">修复连接？</string>
+    <string name="encryption_renegotiation_in_progress">正进行加密重协商。</string>
+    <string name="sync_connection_desc">连接需要加密重协商。</string>
+    <string name="error_saving_database">保存数据库出错</string>
+    <string name="debug_logs">启用日志</string>
+    <string name="connection_not_ready">连接未就绪。</string>
+    <string name="error_creating_chat_tags">创建聊天列表出错</string>
+    <string name="error_updating_chat_tags">更新聊天列表出错</string>
+    <string name="error_loading_chat_tags">加载聊天列表出错</string>
+    <string name="list_menu">列表</string>
+    <string name="no_chats">无聊天</string>
+    <string name="no_chats_found">找不到聊天</string>
+    <string name="no_chats_in_list">%s列表中没有聊天。</string>
+    <string name="chat_list_favorites">收藏</string>
+    <string name="chat_list_groups">群</string>
+    <string name="list_name_field_placeholder">列表名…</string>
+    <string name="duplicated_list_error">所有列表的名称和表情符号都应不同。</string>
+    <string name="save_list">保存列表</string>
+    <string name="delete_chat_list_menu_action">删除</string>
+    <string name="open_with_app">用%s打开</string>
+    <string name="delete_chat_list_warning">将从%s列表删除所有聊天，列表本身也将被删除</string>
+    <string name="chat_list_businesses">企业</string>
+    <string name="edit_chat_list_menu_action">编辑</string>
+    <string name="add_to_list">添加到列表</string>
+    <string name="chat_list_contacts">联系人</string>
+    <string name="create_list">创建列表</string>
+    <string name="chat_list_add_list">添加列表</string>
+    <string name="chat_list_all">全部</string>
+    <string name="delete_chat_list_question">删除列表？</string>
+    <string name="no_unread_chats">没有未读聊天</string>
+    <string name="chat_list_notes">附注</string>
+    <string name="change_list">更改列表</string>
+    <string name="change_order_chat_list_menu_action">更改顺序</string>
+    <string name="error_creating_report">创建报告出错</string>
+    <string name="prefs_error_saving_settings">保存设置出错</string>
+    <string name="archive_verb">存档</string>
+    <string name="delete_report">删除举报</string>
+    <string name="report_verb">举报</string>
+    <string name="report_compose_reason_header_other">举报其他：仅moderators会看到。</string>
+    <string name="report_compose_reason_header_profile">举报成员个人资料：仅moderators会看到。</string>
+    <string name="report_compose_reason_header_community">举报违规：仅moderators会看到。</string>
+    <string name="archive_report">存档举报</string>
+    <string name="report_compose_reason_header_illegal">举报内容：仅moderators会看到。</string>
+    <string name="report_compose_reason_header_spam">举报垃圾信息：仅moderators会看到。</string>
+    <string name="group_member_role_moderator">moderators</string>
+    <string name="report_reason_other">另一个理由</string>
+    <string name="report_item_archived">已存档的举报</string>
+    <string name="report_reason_community">违反社区指导方针</string>
+    <string name="report_reason_illegal">不当内容</string>
+    <string name="report_reason_profile">不当个人资料</string>
+    <string name="report_item_visibility_moderators">仅发送人和moderators能看到</string>
+    <string name="report_item_visibility_submitter">只有你和moderators能看到</string>
+    <string name="report_reason_spam">垃圾信息</string>
+    <string name="report_archive_alert_title">存档举报？</string>
+    <string name="report_reason_alert_title">举报理由？</string>
+    <string name="report_archive_alert_desc">将为你存档该举报。</string>
+    <string name="report_item_archived_by">存档了 %s 的举报</string>
+    <string name="chat_list_group_reports">举报</string>
+    <string name="group_reports_active_one">1 个举报</string>
+    <string name="group_reports_member_reports">成员举报</string>
+    <string name="group_reports_active">%d 个举报</string>
+    <string name="blocking_reason_spam">垃圾信息</string>
+    <string name="connection_error_blocked">连接被阻止</string>
+    <string name="connection_error_blocked_desc">连接被服务器运营方阻止：\n%1$s.</string>
+    <string name="blocking_reason_content">内容违反使用条款</string>
+    <string name="file_error_blocked">文件被服务器运营方阻止：\n%1$s.</string>
+    <string name="privacy_chat_list_open_links_ask">询问</string>
+    <string name="privacy_chat_list_open_links_no">否</string>
+    <string name="privacy_chat_list_open_links_yes">是</string>
+    <string name="privacy_chat_list_open_web_link_question">打开 web 链接？</string>
+    <string name="privacy_chat_list_open_web_link">打开链接</string>
+    <string name="privacy_chat_list_open_links">打开来自聊天列表的链接</string>
+    <string name="text_field_set_chat_placeholder">设置聊天名称…</string>
+    <string name="disable_automatic_deletion_question">停用消息自动删除？</string>
+    <string name="disable_automatic_deletion">停用消息删除</string>
+    <string name="chat_item_ttl_year">1 年</string>
+    <string name="chat_item_ttl_default">默认（%s）</string>
+    <string name="chat_ttl_options_footer">从你的设备删除聊天消息。</string>
+    <string name="change_automatic_chat_deletion_message">此操作无法撤销 —— 比此聊天中所选消息更早发出并收到的消息将被删除。</string>
+    <string name="disable_automatic_deletion_message">此聊天中的消息永远不会被删除。</string>
+    <string name="change_automatic_deletion_question">更改消息自动删除设置？</string>
+    <string name="network_smp_web_port_section_title">用于消息收发的 TCP 端口</string>
+    <string name="network_smp_web_port_footer">未指定端口时，使用 TCP 端口 %1$s。</string>
+    <string name="network_smp_web_port_toggle">使用 web 端口</string>
+    <string name="mute_all_chat">全部静音</string>
+    <string name="unread_mentions">取消提及的已读状态</string>
+    <string name="max_group_mentions_per_message_reached">每条消息最多提及 %1$s 名成员！</string>
+    <string name="report_archive_alert_desc_all">将为你存档所有举报。</string>
+    <string name="report_archive_alert_title_all">存档所有举报？</string>
+    <string name="report_archive_alert_title_nth">存档 %d 份举报？</string>
+    <string name="archive_reports">存档举报</string>
+    <string name="report_archive_for_all_moderators">所有 moderators</string>
+    <string name="report_archive_for_me">仅自己</string>
+    <string name="notification_group_report">举报：%s</string>
+    <string name="disable_sending_member_reports">禁止向 moderators 举报消息。</string>
+    <string name="member_reports_are_prohibited">此群禁止消息举报。</string>
+    <string name="group_members_can_send_reports">成员可以向 moderators 举报消息。</string>
+    <string name="enable_sending_member_reports">允许向 moderators 举报消息。</string>
+    <string name="v6_3_mentions">提及成员👋</string>
+    <string name="v6_3_better_groups_performance">更好的群性能</string>
+    <string name="v6_3_better_privacy_and_security">更好的隐私和安全</string>
+    <string name="v6_3_organize_chat_lists_descr">不错过重要消息。</string>
+    <string name="v6_3_faster_deletion_of_groups">更快地删除群。</string>
+    <string name="v6_3_faster_sending_messages">更快发送消息。</string>
+    <string name="v6_3_mentions_descr">被提及时收到通知。</string>
+    <string name="v6_3_reports_descr">帮助管理员管理群组。</string>
+    <string name="v6_3_organize_chat_lists">将聊天组织到列表</string>
+    <string name="v6_3_private_media_file_names">私密媒体文件名。</string>
+    <string name="v6_3_reports">发送私下举报</string>
+    <string name="v6_3_set_message_expiration_in_chats">在聊天中设置消息过期时间。</string>
+    <string name="group_preview_rejected">被拒绝</string>
+    <string name="group_member_status_rejected">被拒绝</string>
+    <string name="error_reading_passphrase">数据库密码短语读取出错</string>
+    <string name="restore_passphrase_can_not_be_read_desc">无法读取 Keystore 中的密码短语，请手动输入它。这可能在不兼容本应用的系统更新后出现。如果不是这种情况，请联系开发者。</string>
+    <string name="restore_passphrase_can_not_be_read_enter_manually_desc">无法读取 Keystore 中的密码短语，请手动输入它。这可能在不兼容本应用的系统更新后出现。如果不是这种情况，请联系开发者。</string>
+    <string name="group_member_status_pending_approval_short">待批准</string>
+    <string name="group_member_status_pending_approval">待批准</string>
+    <string name="operator_updated_conditions">条款已更新</string>
+    <string name="block_members_desc">所有来自这些成员的新消息都将被隐藏！</string>
+    <string name="block_members_for_all_question">为所有其他成员封禁这些成员？</string>
+    <string name="members_will_be_removed_from_group_cannot_be_undone">将从群中移除这些成员 — 此操作无法撤销！</string>
+    <string name="unblock_members_desc">将显示来自这些成员的消息！</string>
+    <string name="button_remove_members_question">删除成员吗？</string>
+    <string name="unblock_members_for_all_question">为所有其他成员解封这些成员吗？</string>
+    <string name="feature_roles_moderators">moderators</string>
+    <string name="members_will_be_removed_from_chat_cannot_be_undone">将从聊天中移除这些成员 — 此操作无法撤销！</string>
+    <string name="onboarding_conditions_privacy_policy_and_conditions_of_use">隐私政策和使用条款。</string>
+    <string name="onboarding_conditions_accept">接受</string>
+    <string name="onboarding_conditions_by_using_you_agree">使用 SimpleX Chat 代表您同意：\n- 在公开群中只发送合法内容\n- 尊重其他用户 – 没有垃圾信息。</string>
+    <string name="onboarding_conditions_private_chats_not_accessible">服务器运营方无法访问私密聊天、群组和你的联系人。</string>
+    <string name="onboarding_conditions_configure_server_operators">配置服务器运营方</string>
+    <string name="unsupported_connection_link">不支持的连接链接</string>
+    <string name="privacy_short_links">使用短链接（测试）</string>
+    <string name="simplex_link_channel">SimpleX 频道链接</string>
+    <string name="short_link_button_text">短链接</string>
+    <string name="link_requires_newer_app_version_please_upgrade">此链接需要更新的应用版本。请升级应用或请求你的联系人发送相容的链接。</string>
+    <string name="full_link_button_text">完整链接</string>
+    <string name="network_smp_web_port_all">全部服务器</string>
+    <string name="network_smp_web_port_off">关闭</string>
+    <string name="network_smp_web_port_preset">预设服务器</string>
+    <string name="network_smp_web_port_preset_footer">仅预设服务器使用 TCP 协议 443 端口。</string>
+    <string name="error_accepting_member">接受成员出错</string>
+    <string name="report_sent_alert_title">举报已发送至 moderators</string>
+    <string name="group_new_support_chats_short">%d 个聊天</string>
+    <string name="group_new_support_chats">和成员的 %d 个聊天</string>
+    <string name="group_new_support_messages">%d 条消息</string>
+    <string name="rcv_group_event_member_accepted">接受了 %1$s</string>
+    <string name="rcv_group_event_user_accepted">接受了你</string>
+    <string name="snd_group_event_member_accepted">你接受了该成员</string>
+    <string name="rcv_group_event_new_member_pending_review">新成员要加入本群。</string>
+    <string name="group_member_status_pending_review_short">审核</string>
+    <string name="group_member_status_pending_review">待审核</string>
+    <string name="member_criteria_all">全部</string>
+    <string name="member_admission">成员准入</string>
+    <string name="member_criteria_off">关闭</string>
+    <string name="reject_pending_member_button">删除</string>
+    <string name="accept_pending_member_button">接受</string>
+    <string name="member_support">和成员聊天</string>
+    <string name="support_chat">和管理员聊天</string>
+    <string name="no_support_chats">没有和成员的聊天</string>
+    <string name="accept_pending_member_alert_confirmation_as_member">接受为成员</string>
+    <string name="accept_pending_member_alert_title">接受成员</string>
+    <string name="accept_pending_member_alert_question">成员将加入本群，接受成员吗？</string>
+    <string name="reviewed_by_admins">由管理员审核</string>
+    <string name="set_member_admission">设置成员入群准许</string>
+    <string name="button_support_chat_member">和成员聊天</string>
+    <string name="button_support_chat">和管理员聊天</string>
+    <string name="admission_stage_review_descr">准许入群前审核成员（knocking）。</string>
+    <string name="snd_group_event_user_pending_review">请等待群的 moderator 审核你加入该群的请求。</string>
+    <string name="admission_stage_review">审核成员</string>
+    <string name="save_admission_question">保存入群设置？</string>
+    <string name="report_sent_alert_msg_view_in_support_chat">你可以在和管理员和聊天中查看你的举报。</string>
+    <string name="accept_pending_member_alert_confirmation_as_observer">接受为观察员</string>
+    <string name="group_new_support_chat_one">和一名成员的一个聊天</string>
+    <string name="cant_send_message_generic">无法发送消息</string>
+    <string name="cant_send_message_you_left">你离开了</string>
+    <string name="error_deleting_member_support_chat">删除和成员的聊天出错</string>
+    <string name="cant_send_message_alert_title">你无法发送消息！</string>
+    <string name="cant_send_message_contact_disabled">禁用了联系人</string>
+    <string name="cant_send_message_group_deleted">群被删除了</string>
+    <string name="cant_send_message_mem_removed">从群被删除了</string>
+    <string name="cant_send_message_rejected">加入请求被拒绝</string>
+    <string name="delete_member_support_chat_button">删除聊天</string>
+    <string name="delete_member_support_chat_alert_title">删除和成员的聊天吗？</string>
+    <string name="cant_send_message_contact_not_synchronized">未同步</string>
+    <string name="cant_send_message_member_has_old_version">成员有旧版本</string>
+    <string name="cant_send_message_contact_deleted">删除了联系人</string>
+    <string name="cant_send_message_contact_not_ready">联系人未就绪</string>
+    <string name="reject_pending_member_alert_title">拒绝成员?</string>
+</resources>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/zh-rTW/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/zh-rTW/strings.xml
index fd58811439..8ae414de00 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/zh-rTW/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/zh-rTW/strings.xml
@@ -1495,7 +1495,7 @@
     <string name="remote_host_error_bad_version"><![CDATA[不支援行動裝置 <b>%s</b> 的版本。請檢察兩台裝置安裝的是否版本相同]]></string>
     <string name="v5_7_network_descr">更可靠的網路連接</string>
     <string name="v5_3_discover_join_groups">發現和加入群組</string>
-    <string name="devices">裝置</string>
+    <string name="devices">設備</string>
     <string name="new_mobile_device">新行動裝置</string>
     <string name="migrate_from_device_error_saving_settings">保存設定出錯</string>
     <string name="migrate_from_device_exported_file_doesnt_exist">導出的檔案不存在</string>
@@ -1628,7 +1628,7 @@
     <string name="found_desktop">找到桌面</string>
     <string name="multicast_connect_automatically">自動連接</string>
     <string name="remote_ctrl_error_bad_state">與PC版的連接不穩定</string>
-    <string name="desktop_device">桌面</string>
+    <string name="desktop_device">桌上電腦</string>
     <string name="remote_ctrl_error_bad_version">已安裝的PC版本不支援。請確認兩台裝置所安裝的版本相同</string>
     <string name="remote_ctrl_error_bad_invitation">PC版邀請碼錯誤</string>
     <string name="connect_plan_connect_via_link">通過連結連接？</string>
@@ -1790,4 +1790,4 @@
     <string name="refresh_qr_code">更新</string>
     <string name="servers_info_detailed_statistics_received_total">接收總計</string>
     <string name="app_check_for_updates_button_remind_later">稍後提醒</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
index 9d747206ab..dfffb826f5 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
@@ -14,8 +14,6 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.withChats
-import chat.simplex.common.model.ChatModel.withReportsChatsIfOpen
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
 import chat.simplex.common.ui.theme.SimpleXTheme
@@ -58,12 +56,12 @@ fun showApp() {
             } else {
               // The last possible cause that can be closed
               withApi {
-                withChats {
+                withContext(Dispatchers.Main) {
                   chatModel.chatId.value = null
-                  chatItems.clearAndNotify()
+                  chatModel.chatsContext.chatItems.clearAndNotify()
                 }
-                withReportsChatsIfOpen {
-                  chatItems.clearAndNotify()
+                withContext(Dispatchers.Main) {
+                  chatModel.secondaryChatsContext.value = null
                 }
               }
             }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt
index 53f3301507..d0ba082adf 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt
@@ -133,9 +133,9 @@ actual fun ImageBitmap.hasAlpha(): Boolean {
   return false
 }
 
-actual fun ImageBitmap.addLogo(): ImageBitmap {
-  val radius = (width * 0.16f).toInt()
-  val logoSize = (width * 0.24).toInt()
+actual fun ImageBitmap.addLogo(size: Float): ImageBitmap {
+  val radius = (width * size).toInt()
+  val logoSize = (width * size * 1.5).toInt()
   val logo: BufferedImage = MR.images.icon_foreground_common.image
   val original = toAwtImage()
   val withLogo = BufferedImage(width, height, original.type)
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/PlatformTextField.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/PlatformTextField.desktop.kt
index e7bcf4802a..41964b7d18 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/PlatformTextField.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/PlatformTextField.desktop.kt
@@ -10,8 +10,7 @@ import androidx.compose.material.TextFieldDefaults.textFieldWithLabelPadding
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.input.key.*
@@ -45,25 +44,27 @@ import kotlin.text.substring
 actual fun PlatformTextField(
   composeState: MutableState<ComposeState>,
   sendMsgEnabled: Boolean,
+  disabledText: String?,
   sendMsgButtonDisabled: Boolean,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
-  userIsObserver: Boolean,
   placeholder: String,
   showVoiceButton: Boolean,
-  onMessageChange: (String) -> Unit,
+  onMessageChange: (ComposeMessage) -> Unit,
   onUpArrow: () -> Unit,
   onFilesPasted: (List<URI>) -> Unit,
+  focusRequester: FocusRequester?,
   onDone: () -> Unit,
 ) {
+
   val cs = composeState.value
-  val focusRequester = remember { FocusRequester() }
   val focusManager = LocalFocusManager.current
   val keyboard = LocalSoftwareKeyboardController.current
+  val focusReq = focusRequester ?: remember { FocusRequester() }
   LaunchedEffect(cs.contextItem) {
     if (cs.contextItem !is ComposeContextItem.QuotedItem) return@LaunchedEffect
     // In replying state
-    focusRequester.requestFocus()
+    focusReq.requestFocus()
     delay(50)
     keyboard?.show()
   }
@@ -74,9 +75,9 @@ actual fun PlatformTextField(
       keyboard?.hide()
     }
   }
-  val lastTimeWasRtlByCharacters = remember { mutableStateOf(isRtl(cs.message.subSequence(0, min(50, cs.message.length)))) }
+  val lastTimeWasRtlByCharacters = remember { mutableStateOf(isRtl(cs.message.text.subSequence(0, min(50, cs.message.text.length)))) }
   val isRtlByCharacters = remember(cs.message) {
-    if (cs.message.isNotEmpty()) isRtl(cs.message.subSequence(0, min(50, cs.message.length))) else lastTimeWasRtlByCharacters.value
+    if (cs.message.text.isNotEmpty()) isRtl(cs.message.text.subSequence(0, min(50, cs.message.text.length))) else lastTimeWasRtlByCharacters.value
   }
   LaunchedEffect(isRtlByCharacters) {
     lastTimeWasRtlByCharacters.value = isRtlByCharacters
@@ -84,12 +85,12 @@ actual fun PlatformTextField(
   val isLtrGlobally = LocalLayoutDirection.current == LayoutDirection.Ltr
   // Different padding here is for a text that is considered RTL with non-RTL locale set globally.
   // In this case padding from right side should be bigger
-  val startEndPadding = if (cs.message.isEmpty() && showVoiceButton && isRtlByCharacters && isLtrGlobally) 95.dp else 50.dp
+  val startEndPadding = if (cs.message.text.isEmpty() && showVoiceButton && isRtlByCharacters && isLtrGlobally) 95.dp else 50.dp
   val startPadding = if (isRtlByCharacters && isLtrGlobally) startEndPadding else 0.dp
   val endPadding = if (isRtlByCharacters && isLtrGlobally) 0.dp else startEndPadding
   val padding = PaddingValues(startPadding, 12.dp, endPadding, 0.dp)
-  var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = cs.message)) }
-  val textFieldValue = textFieldValueState.copy(text = cs.message)
+  var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = cs.message.text, selection = cs.message.selection)) }
+  val textFieldValue = textFieldValueState.copy(text = cs.message.text, selection = cs.message.selection)
   val clipboard = LocalClipboardManager.current
   BasicTextField(
     value = textFieldValue,
@@ -105,7 +106,7 @@ actual fun PlatformTextField(
           }
         }
         textFieldValueState = it
-        onMessageChange(it.text)
+        onMessageChange(ComposeMessage(it.text, it.selection))
       }
     },
     textStyle = textStyle.value,
@@ -118,7 +119,7 @@ actual fun PlatformTextField(
       .padding(start = startPadding, end = endPadding)
       .offset(y = (-5).dp)
       .fillMaxWidth()
-      .focusRequester(focusRequester)
+      .focusRequester(focusReq)
       .onPreviewKeyEvent {
         if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyDown) {
           if (it.isShiftPressed) {
@@ -129,12 +130,12 @@ actual fun PlatformTextField(
               text = newText,
               selection = TextRange(textFieldValue.selection.min + 1)
             )
-            onMessageChange(newText)
+            onMessageChange(ComposeMessage(newText, textFieldValueState.selection))
           } else if (!sendMsgButtonDisabled) {
             onDone()
           }
           true
-        } else if (it.key == Key.DirectionUp && it.type == KeyEventType.KeyDown && cs.message.isEmpty()) {
+        } else if (it.key == Key.DirectionUp && it.type == KeyEventType.KeyDown && cs.message.text.isEmpty()) {
           onUpArrow()
           true
         } else if (it.key == Key.V &&
@@ -166,7 +167,7 @@ actual fun PlatformTextField(
                     chatModel.filesToDelete.add(tempFile)
 
                     tempFile.writeBytes(bytes)
-                    composeState.processPickedMedia(listOf(tempFile.toURI()), composeState.value.message)
+                    composeState.processPickedMedia(listOf(tempFile.toURI()), composeState.value.message.text)
                   }
                 } catch (e: Exception) {
                   Log.e(TAG, "Pasting image exception: ${e.stackTraceToString()}")
@@ -200,18 +201,18 @@ actual fun PlatformTextField(
         }
     }
   )
-  showDeleteTextButton.value = cs.message.split("\n").size >= 4 && !cs.inProgress
+  showDeleteTextButton.value = cs.message.text.split("\n").size >= 4 && !cs.inProgress
   if (composeState.value.preview is ComposePreview.VoicePreview) {
-    ComposeOverlay(MR.strings.voice_message_send_text, textStyle, padding)
-  } else if (userIsObserver) {
-    ComposeOverlay(MR.strings.you_are_observer, textStyle, padding)
+    ComposeOverlay(generalGetString(MR.strings.voice_message_send_text), textStyle, padding)
+  } else if (disabledText != null) {
+    ComposeOverlay(disabledText, textStyle, padding)
   }
 }
 
 @Composable
-private fun ComposeOverlay(textId: StringResource, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
+private fun ComposeOverlay(text: String, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
   Text(
-    generalGetString(textId),
+    text,
     Modifier.padding(padding),
     color = MaterialTheme.colors.secondary,
     style = textStyle.value.copy(fontStyle = FontStyle.Italic)
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/ScrollableColumn.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/ScrollableColumn.desktop.kt
index 3f5703365d..7a2a1dff0a 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/ScrollableColumn.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/ScrollableColumn.desktop.kt
@@ -111,7 +111,9 @@ actual fun LazyColumnWithScrollBarNoAppBar(
   additionalBarOffset: State<Dp>?,
   additionalTopBar: State<Boolean>,
   chatBottomBar: State<Boolean>,
-  content: LazyListScope.() -> Unit
+  maxHeight: State<Dp>?,
+  containerAlignment: Alignment,
+  content: LazyListScope.() -> Unit,
 ) {
   val scope = rememberCoroutineScope()
   val scrollBarAlpha = remember { Animatable(0f) }
@@ -135,9 +137,11 @@ actual fun LazyColumnWithScrollBarNoAppBar(
   // When scroll bar is dragging, there is no scroll event in nested scroll modifier. So, listen for changes on lazy column state
   // (only first visible row is useful because LazyColumn doesn't have absolute scroll position, only relative to row)
   val scrollBarDraggingState = remember { mutableStateOf(false) }
-  Box {
+  Box(contentAlignment = containerAlignment) {
     LazyColumn(modifier.then(scrollModifier), state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
-    ScrollBar(reverseLayout, state, scrollBarAlpha, scrollJob, scrollBarDraggingState, additionalBarOffset, additionalTopBar, chatBottomBar)
+    Box(if (maxHeight?.value != null) Modifier.height(maxHeight.value).fillMaxWidth() else Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) {
+      DesktopScrollBar(rememberScrollbarAdapter(state), Modifier.fillMaxHeight(), scrollBarAlpha, scrollJob, reverseLayout, scrollBarDraggingState)
+    }
   }
 }
 
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt
index e295144191..9fd65ec995 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt
@@ -51,7 +51,7 @@ private fun ActiveCallInteractiveAreaOneHand(call: Call, showMenu: MutableState<
         val chat = chatModel.getChat(call.contact.id)
         if (chat != null) {
           withBGApi {
-            openChat(chat.remoteHostId, chat.chatInfo)
+            openChat(secondaryChatsCtx = null, chat.remoteHostId, chat.chatInfo)
           }
         }
       },
@@ -116,7 +116,7 @@ private fun ActiveCallInteractiveAreaNonOneHand(call: Call, showMenu: MutableSta
           val chat = chatModel.getChat(call.contact.id)
           if (chat != null) {
             withBGApi {
-              openChat(chat.remoteHostId, chat.chatInfo)
+              openChat(secondaryChatsCtx = null, chat.remoteHostId, chat.chatInfo)
             }
           }
         },
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
index 3855835ab6..52e845b422 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
@@ -63,7 +63,7 @@ actual fun UserPickerUsersSection(
                   ProfileImage(size = 55.dp, image = user.profile.image, color = iconColor)
 
                   if (u.unreadCount > 0 && !user.activeUser) {
-                    unreadBadge(u.unreadCount, user.showNtfs, true)
+                    userUnreadBadge(u.unreadCount, user.showNtfs, true)
                   }
                 }
 
diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties
index 6c04bf65d7..db12d47dbd 100644
--- a/apps/multiplatform/gradle.properties
+++ b/apps/multiplatform/gradle.properties
@@ -24,12 +24,15 @@ android.nonTransitiveRClass=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11
 
-android.version_name=6.3-beta.1
-android.version_code=270
+android.version_name=6.4-beta.1
+android.version_code=291
 
-desktop.version_name=6.3-beta.1
-desktop.version_code=88
+desktop.version_name=6.4-beta.1
+desktop.version_code=103
 
 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0
 compose.version=1.7.0
+
+# Choose sqlite or postgres backend
+database.backend=sqlite
diff --git a/apps/simplex-bot-advanced/Main.hs b/apps/simplex-bot-advanced/Main.hs
index 6c3d8240e4..40e6686065 100644
--- a/apps/simplex-bot-advanced/Main.hs
+++ b/apps/simplex-bot-advanced/Main.hs
@@ -43,12 +43,12 @@ mySquaringBot :: User -> ChatController -> IO ()
 mySquaringBot _user cc = do
   initializeBotAddress cc
   race_ (forever $ void getLine) . forever $ do
-    (_, _, resp) <- atomically . readTBQueue $ outputQ cc
-    case resp of
-      CRContactConnected _ contact _ -> do
+    (_, evt) <- atomically . readTBQueue $ outputQ cc
+    case evt of
+      Right (CEvtContactConnected _ contact _) -> do
         contactConnected contact
         sendMessage cc contact welcomeMessage
-      CRNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat contact) ChatItem {content = mc@CIRcvMsgContent {}}) : _} -> do
+      Right CEvtNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat contact) ChatItem {content = mc@CIRcvMsgContent {}}) : _} -> do
         let msg = ciContentToText mc
             number_ = readMaybe (T.unpack msg) :: Maybe Integer
         sendMessage cc contact $ case number_ of
diff --git a/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs b/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
index 9dc927af9e..86f89f86e8 100644
--- a/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
+++ b/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Broadcast.Bot where
@@ -36,38 +37,31 @@ broadcastBot :: BroadcastBotOpts -> User -> ChatController -> IO ()
 broadcastBot BroadcastBotOpts {publishers, welcomeMessage, prohibitedMessage} _user cc = do
   initializeBotAddress cc
   race_ (forever $ void getLine) . forever $ do
-    (_, _, resp) <- atomically . readTBQueue $ outputQ cc
-    case resp of
-      CRContactConnected _ ct _ -> do
+    (_, evt) <- atomically . readTBQueue $ outputQ cc
+    case evt of
+      Right (CEvtContactConnected _ ct _) -> do
         contactConnected ct
         sendMessage cc ct welcomeMessage
-      CRNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat ct) ci@ChatItem {content = CIRcvMsgContent mc}) : _}
-        | publisher `elem` publishers ->
-          if allowContent mc
-            then do
-              sendChatCmd cc ListContacts >>= \case
-                CRContactsList _ cts -> void . forkIO $ do
-                  let cts' = filter broadcastTo cts
-                  forM_ cts' $ \ct' -> sendComposedMessage cc ct' Nothing mc
-                  sendReply $ "Forwarded to " <> tshow (length cts') <> " contact(s)"
-                r -> putStrLn $ "Error getting contacts list: " <> show r
-            else sendReply "!1 Message is not supported!"
-        | otherwise -> do
-          sendReply prohibitedMessage
-          deleteMessage cc ct $ chatItemId' ci
+      Right CEvtNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat ct) ci@ChatItem {content = CIRcvMsgContent mc}) : _}
+        | sender `notElem` publishers -> do
+            sendReply prohibitedMessage
+            deleteMessage cc ct $ chatItemId' ci
+        | allowContent mc ->
+            void $ forkIO $
+              sendChatCmd cc (SendMessageBroadcast mc) >>= \case
+                Right CRBroadcastSent {successes, failures} ->
+                  sendReply $ "Forwarded to " <> tshow successes <> " contact(s), " <> tshow failures <> " errors"
+                r -> putStrLn $ "Error broadcasting message: " <> show r
+        | otherwise ->
+            sendReply "!1 Message is not supported!"
         where
           sendReply = sendComposedMessage cc ct (Just $ chatItemId' ci) . MCText
-          publisher = KnownContact {contactId = contactId' ct, localDisplayName = localDisplayName' ct}
+          sender = KnownContact {contactId = contactId' ct, localDisplayName = localDisplayName' ct}
           allowContent = \case
             MCText _ -> True
             MCLink {} -> True
             MCImage {} -> True
             _ -> False
-          broadcastTo Contact {activeConn = Nothing} = False
-          broadcastTo ct'@Contact {activeConn = Just conn@Connection {connStatus}} =
-            (connStatus == ConnSndReady || connStatus == ConnReady)
-              && not (connDisabled conn)
-              && contactId' ct' /= contactId' ct
       _ -> pure ()
   where
     contactConnected ct = putStrLn $ T.unpack (localDisplayName' ct) <> " connected"
diff --git a/apps/simplex-broadcast-bot/src/Broadcast/Options.hs b/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
index e695b5069d..8107b664c4 100644
--- a/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
+++ b/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
@@ -75,7 +75,6 @@ mkChatOpts :: BroadcastBotOpts -> ChatOpts
 mkChatOpts BroadcastBotOpts {coreOptions} =
   ChatOpts
     { coreOptions,
-      deviceName = Nothing,
       chatCmd = "",
       chatCmdDelay = 3,
       chatCmdLog = CCLNone,
diff --git a/apps/simplex-chat/Server.hs b/apps/simplex-chat/Server.hs
index fddad1cf2c..0906d14536 100644
--- a/apps/simplex-chat/Server.hs
+++ b/apps/simplex-chat/Server.hs
@@ -2,17 +2,23 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Server where
 
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
-import Data.Aeson (FromJSON, ToJSON)
+import Data.Aeson (FromJSON, ToJSON (..))
 import qualified Data.Aeson as J
+import qualified Data.Aeson.TH as JQ
+import Data.Bifunctor (first)
 import Data.Text (Text)
 import Data.Text.Encoding (encodeUtf8)
 import GHC.Generics (Generic)
@@ -23,11 +29,44 @@ import Simplex.Chat.Controller
 import Simplex.Chat.Core
 import Simplex.Chat.Library.Commands
 import Simplex.Chat.Options
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, taggedObjectJSON)
 import Simplex.Messaging.Transport.Server (runLocalTCPServer)
 import Simplex.Messaging.Util (raceAny_)
 import UnliftIO.Exception
 import UnliftIO.STM
 
+data ChatSrvRequest = ChatSrvRequest {corrId :: Text, cmd :: Text}
+  deriving (Generic, FromJSON)
+
+data ChatSrvResponse r = ChatSrvResponse {corrId :: Maybe Text, resp :: CSRBody r}
+
+data CSRBody r = CSRBody {csrBody :: Either ChatError r}
+
+-- backwards compatible encoding, to avoid breaking any chat bots
+data ObjChatCmdError = ObjChatCmdError {chatError :: ChatError}
+
+data ObjChatError = ObjChatError {chatError :: ChatError}
+
+$(JQ.deriveToJSON (taggedObjectJSON $ dropPrefix "Obj") ''ObjChatCmdError)
+
+$(JQ.deriveToJSON (taggedObjectJSON $ dropPrefix "Obj") ''ObjChatError)
+
+instance ToJSON (CSRBody ChatResponse) where
+  toJSON = toJSON . first ObjChatCmdError . csrBody
+  toEncoding = toEncoding . first ObjChatCmdError . csrBody
+
+instance ToJSON (CSRBody ChatEvent) where
+  toJSON = toJSON . first ObjChatError . csrBody
+  toEncoding = toEncoding . first ObjChatError . csrBody
+
+data AChatSrvResponse = forall r. ToJSON (ChatSrvResponse r) => ACR (ChatSrvResponse r)
+
+$(pure [])
+
+instance ToJSON (CSRBody r) => ToJSON (ChatSrvResponse r) where
+  toEncoding = $(JQ.mkToEncoding defaultJSON ''ChatSrvResponse)
+  toJSON = $(JQ.mkToJSON defaultJSON ''ChatSrvResponse)
+
 simplexChatServer :: ServiceName -> ChatConfig -> ChatOpts -> IO ()
 simplexChatServer chatPort cfg opts =
   simplexChatCore cfg opts . const $ runChatServer defaultChatServerConfig {chatPort}
@@ -44,19 +83,9 @@ defaultChatServerConfig =
       clientQSize = 1
     }
 
-data ChatSrvRequest = ChatSrvRequest {corrId :: Text, cmd :: Text}
-  deriving (Generic, FromJSON)
-
-data ChatSrvResponse = ChatSrvResponse {corrId :: Maybe Text, resp :: ChatResponse}
-  deriving (Generic)
-
-instance ToJSON ChatSrvResponse where
-  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
-  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
-
 data ChatClient = ChatClient
   { rcvQ :: TBQueue (Text, ChatCommand),
-    sndQ :: TBQueue ChatSrvResponse
+    sndQ :: TBQueue AChatSrvResponse
   }
 
 newChatServerClient :: Natural -> STM ChatClient
@@ -78,14 +107,14 @@ runChatServer ChatServerConfig {chatPort, clientQSize} cc = do
     getConnection sock = WS.makePendingConnection sock WS.defaultConnectionOptions >>= WS.acceptRequest
     send ws ChatClient {sndQ} =
       forever $
-        atomically (readTBQueue sndQ) >>= WS.sendTextData ws . J.encode
+        atomically (readTBQueue sndQ) >>= \(ACR r) -> WS.sendTextData ws (J.encode r)
     client ChatClient {rcvQ, sndQ} = forever $ do
       atomically (readTBQueue rcvQ)
         >>= processCommand
-        >>= atomically . writeTBQueue sndQ
+        >>= atomically . writeTBQueue sndQ . ACR
     output ChatClient {sndQ} = forever $ do
-      (_, _, resp) <- atomically . readTBQueue $ outputQ cc
-      atomically $ writeTBQueue sndQ ChatSrvResponse {corrId = Nothing, resp}
+      (_, r) <- atomically . readTBQueue $ outputQ cc
+      atomically $ writeTBQueue sndQ $ ACR ChatSrvResponse {corrId = Nothing, resp = CSRBody r}
     receive ws ChatClient {rcvQ, sndQ} = forever $ do
       s <- WS.receiveData ws
       case J.decodeStrict' s of
@@ -96,11 +125,9 @@ runChatServer ChatServerConfig {chatPort, clientQSize} cc = do
             Left e -> sendError (Just corrId) e
         Nothing -> sendError Nothing "invalid request"
       where
-        sendError corrId e = atomically $ writeTBQueue sndQ ChatSrvResponse {corrId, resp = chatCmdError Nothing e}
+        sendError corrId e = atomically $ writeTBQueue sndQ $ ACR ChatSrvResponse {corrId, resp = CSRBody $ chatCmdError e}
     processCommand (corrId, cmd) =
-      runReaderT (runExceptT $ processChatCommand cmd) cc >>= \case
-        Right resp -> response resp
-        Left e -> response $ CRChatCmdError Nothing e
+      response <$> runReaderT (runExceptT $ processChatCommand cmd) cc
       where
-        response resp = pure ChatSrvResponse {corrId = Just corrId, resp}
+        response r = ChatSrvResponse {corrId = Just corrId, resp = CSRBody r}
     clientDisconnected _ = pure ()
diff --git a/apps/simplex-directory-service/Main.hs b/apps/simplex-directory-service/Main.hs
index 0c6464dbfe..2091ab444b 100644
--- a/apps/simplex-directory-service/Main.hs
+++ b/apps/simplex-directory-service/Main.hs
@@ -5,6 +5,7 @@ module Main where
 import Directory.Options
 import Directory.Service
 import Directory.Store
+import Simplex.Chat.Controller (ChatConfig (..), ChatHooks (..), defaultChatHooks)
 import Simplex.Chat.Core
 import Simplex.Chat.Terminal (terminalChatConfig)
 
@@ -14,4 +15,7 @@ main = do
   st <- restoreDirectoryStore directoryLog
   if runCLI
     then directoryServiceCLI st opts
-    else simplexChatCore terminalChatConfig (mkChatOpts opts) $ directoryService st opts
+    else do
+      env <- newServiceState opts
+      let cfg = terminalChatConfig {chatHooks = defaultChatHooks {acceptMember = Just $ acceptMemberHook opts env}}
+      simplexChatCore cfg (mkChatOpts opts) $ directoryService st opts env
diff --git a/apps/simplex-directory-service/src/Directory/BlockedWords.hs b/apps/simplex-directory-service/src/Directory/BlockedWords.hs
new file mode 100644
index 0000000000..a29e2c99e0
--- /dev/null
+++ b/apps/simplex-directory-service/src/Directory/BlockedWords.hs
@@ -0,0 +1,77 @@
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Directory.BlockedWords where
+
+import Data.Char (isMark, isPunctuation, isSpace)
+import Data.List (isPrefixOf)
+import Data.Maybe (fromMaybe)
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as M
+import Data.Set (Set)
+import qualified Data.Set as S
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Text.Normalize as TN
+
+data BlockedWordsConfig = BlockedWordsConfig
+  { blockedWords :: Set Text,
+    blockedFragments :: Set Text,
+    extensionRules :: [(String, [String])],
+    spelling :: Map Char [Char]
+  }
+
+hasBlockedFragments :: BlockedWordsConfig -> Text -> Bool
+hasBlockedFragments BlockedWordsConfig {spelling, blockedFragments} s =
+  any (\w -> any (`T.isInfixOf` w) blockedFragments) ws
+  where
+    ws = S.fromList $ filter (not . T.null) $ normalizeText spelling s
+
+hasBlockedWords :: BlockedWordsConfig -> Text -> Bool
+hasBlockedWords BlockedWordsConfig {spelling, blockedWords} s =
+  not $ ws1 `S.disjoint` blockedWords && (length ws <= 1 || ws2 `S.disjoint` blockedWords)
+  where
+    ws = T.words s
+    ws1 = normalizeWords ws
+    ws2 = normalizeWords $ T.splitOn "  " s
+    normalizeWords = S.fromList . filter (not . T.null) . concatMap (normalizeText spelling)
+
+normalizeText :: Map Char [Char] -> Text -> [Text]
+normalizeText spelling' =
+  map (T.pack . filter (\c -> not $ isSpace c || isPunctuation c || isMark c))
+    . allSubstitutions spelling'
+    . removeTriples
+    . T.unpack
+    . T.toLower
+    . TN.normalize TN.NFKD
+
+-- replaces triple and larger occurences with doubles
+removeTriples :: String -> String
+removeTriples xs = go xs '\0' False
+  where
+    go [] _ _ = []
+    go (c : cs) prev samePrev
+      | prev /= c = c : go cs c False
+      | samePrev = go cs c True
+      | otherwise = c : go cs c True
+
+-- Generate all possible strings by substituting each character
+allSubstitutions :: Map Char [Char] -> String -> [String]
+allSubstitutions spelling' = sequence . map substs
+  where
+    substs c = fromMaybe [c] $ M.lookup c spelling'
+
+wordVariants :: [(String, [String])] -> String -> [Text]
+wordVariants [] s = [T.pack s]
+wordVariants (sub : subs) s = concatMap (wordVariants subs) (replace sub)
+  where
+    replace (pat, tos) = go s
+      where
+        go [] = [""]
+        go s'@(c : rest)
+          | pat `isPrefixOf` s' =
+              let s'' = drop (length pat) s'
+                  restVariants = go s''
+              in map (pat <>) restVariants
+                   <> concatMap (\to -> map (to <>) restVariants) tos
+          | otherwise = map (c :) (go rest)
diff --git a/apps/simplex-directory-service/src/Directory/Captcha.hs b/apps/simplex-directory-service/src/Directory/Captcha.hs
new file mode 100644
index 0000000000..d60b09df83
--- /dev/null
+++ b/apps/simplex-directory-service/src/Directory/Captcha.hs
@@ -0,0 +1,37 @@
+module Directory.Captcha (getCaptchaStr, matchCaptchaStr) where
+
+import qualified Data.Map.Strict as M
+import Data.Maybe (fromMaybe)
+import qualified Data.Text as T
+import System.Random (randomRIO)
+
+getCaptchaStr :: Int -> String -> IO String
+getCaptchaStr 0 s = pure s
+getCaptchaStr n s = do
+  i <- randomRIO (0, length captchaChars - 1)
+  let c = captchaChars !! i
+  getCaptchaStr (n - 1) (c : s)
+  where
+    captchaChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
+matchCaptchaStr :: T.Text -> T.Text -> Bool
+matchCaptchaStr captcha guess = T.length captcha == T.length guess && matchChars (T.zip captcha guess)
+  where
+    matchChars [] = True
+    matchChars ((c, g) : cs) = matchChar c == matchChar g && matchChars cs
+    matchChar c = fromMaybe c $ M.lookup c captchaMatches
+    captchaMatches =
+      M.fromList
+        [ ('0', 'O'),
+          ('1', 'I'),
+          ('c', 'C'),
+          ('l', 'I'),
+          ('o', 'O'),
+          ('p', 'P'),
+          ('s', 'S'),
+          ('u', 'U'),
+          ('v', 'V'),
+          ('w', 'W'),
+          ('x', 'X'),
+          ('z', 'Z')
+        ]
diff --git a/apps/simplex-directory-service/src/Directory/Events.hs b/apps/simplex-directory-service/src/Directory/Events.hs
index 19c9405358..aa2374f919 100644
--- a/apps/simplex-directory-service/src/Directory/Events.hs
+++ b/apps/simplex-directory-service/src/Directory/Events.hs
@@ -11,25 +11,27 @@ module Directory.Events
   ( DirectoryEvent (..),
     DirectoryCmd (..),
     ADirectoryCmd (..),
+    DirectoryHelpSection (..),
     DirectoryRole (..),
     SDirectoryRole (..),
     crDirectoryEvent,
     directoryCmdTag,
-    viewName,
   )
 where
 
-import Control.Applicative ((<|>))
+import Control.Applicative (optional, (<|>))
 import Data.Attoparsec.Text (Parser)
 import qualified Data.Attoparsec.Text as A
 import Data.Char (isSpace)
 import Data.Either (fromRight)
 import Data.Functor (($>))
+import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import Directory.Store
 import Simplex.Chat.Controller
+import Simplex.Chat.Markdown (displayNameTextP)
 import Simplex.Chat.Messages
 import Simplex.Chat.Messages.CIContent
 import Simplex.Chat.Protocol (MsgContent (..))
@@ -44,7 +46,9 @@ data DirectoryEvent
   = DEContactConnected Contact
   | DEGroupInvitation {contact :: Contact, groupInfo :: GroupInfo, fromMemberRole :: GroupMemberRole, memberRole :: GroupMemberRole}
   | DEServiceJoinedGroup {contactId :: ContactId, groupInfo :: GroupInfo, hostMember :: GroupMember}
-  | DEGroupUpdated {contactId :: ContactId, fromGroup :: GroupInfo, toGroup :: GroupInfo}
+  | DEGroupUpdated {member :: GroupMember, fromGroup :: GroupInfo, toGroup :: GroupInfo}
+  | DEPendingMember GroupInfo GroupMember
+  | DEPendingMemberMsg GroupInfo GroupMember ChatItemId Text
   | DEContactRoleChanged GroupInfo ContactId GroupMemberRole -- contactId here is the contact whose role changed
   | DEServiceRoleChanged GroupInfo GroupMemberRole
   | DEContactRemovedFromGroup ContactId GroupInfo
@@ -58,36 +62,47 @@ data DirectoryEvent
   | DELogChatResponse Text
   deriving (Show)
 
-crDirectoryEvent :: ChatResponse -> Maybe DirectoryEvent
+crDirectoryEvent :: Either ChatError ChatEvent -> Maybe DirectoryEvent
 crDirectoryEvent = \case
-  CRContactConnected {contact} -> Just $ DEContactConnected contact
-  CRReceivedGroupInvitation {contact, groupInfo, fromMemberRole, memberRole} -> Just $ DEGroupInvitation {contact, groupInfo, fromMemberRole, memberRole}
-  CRUserJoinedGroup {groupInfo, hostMember} -> (\contactId -> DEServiceJoinedGroup {contactId, groupInfo, hostMember}) <$> memberContactId hostMember
-  CRGroupUpdated {fromGroup, toGroup, member_} -> (\contactId -> DEGroupUpdated {contactId, fromGroup, toGroup}) <$> (memberContactId =<< member_)
-  CRMemberRole {groupInfo, member, toRole}
+  Right evt -> crDirectoryEvent_ evt
+  Left e -> case e of
+    ChatErrorAgent {agentError = BROKER _ NETWORK} -> Nothing
+    ChatErrorAgent {agentError = BROKER _ TIMEOUT} -> Nothing
+    _ -> Just $ DELogChatResponse $ "chat error: " <> tshow e
+
+crDirectoryEvent_ :: ChatEvent -> Maybe DirectoryEvent
+crDirectoryEvent_ = \case
+  CEvtContactConnected {contact} -> Just $ DEContactConnected contact
+  CEvtReceivedGroupInvitation {contact, groupInfo, fromMemberRole, memberRole} -> Just $ DEGroupInvitation {contact, groupInfo, fromMemberRole, memberRole}
+  CEvtUserJoinedGroup {groupInfo, hostMember} -> (\contactId -> DEServiceJoinedGroup {contactId, groupInfo, hostMember}) <$> memberContactId hostMember
+  CEvtGroupUpdated {fromGroup, toGroup, member_} -> (\member -> DEGroupUpdated {member, fromGroup, toGroup}) <$> member_
+  CEvtJoinedGroupMember {groupInfo, member = m}
+    | pending m -> Just $ DEPendingMember groupInfo m
+    | otherwise -> Nothing
+  CEvtNewChatItems {chatItems = AChatItem _ _ (GroupChat g _scopeInfo) ci : _} -> case ci of
+    ChatItem {chatDir = CIGroupRcv m, content = CIRcvMsgContent (MCText t)} | pending m -> Just $ DEPendingMemberMsg g m (chatItemId' ci) t
+    _ -> Nothing
+  CEvtMemberRole {groupInfo, member, toRole}
     | groupMemberId' member == groupMemberId' (membership groupInfo) -> Just $ DEServiceRoleChanged groupInfo toRole
     | otherwise -> (\ctId -> DEContactRoleChanged groupInfo ctId toRole) <$> memberContactId member
-  CRDeletedMember {groupInfo, deletedMember} -> (`DEContactRemovedFromGroup` groupInfo) <$> memberContactId deletedMember
-  CRLeftMember {groupInfo, member} -> (`DEContactLeftGroup` groupInfo) <$> memberContactId member
-  CRDeletedMemberUser {groupInfo} -> Just $ DEServiceRemovedFromGroup groupInfo
-  CRGroupDeleted {groupInfo} -> Just $ DEGroupDeleted groupInfo
-  CRChatItemUpdated {chatItem = AChatItem _ SMDRcv (DirectChat ct) _} -> Just $ DEItemEditIgnored ct
-  CRChatItemsDeleted {chatItemDeletions = ((ChatItemDeletion (AChatItem _ SMDRcv (DirectChat ct) _) _) : _), byUser = False} -> Just $ DEItemDeleteIgnored ct
-  CRNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat ct) ci@ChatItem {content = CIRcvMsgContent mc, meta = CIMeta {itemLive}}) : _} ->
+  CEvtDeletedMember {groupInfo, deletedMember} -> (`DEContactRemovedFromGroup` groupInfo) <$> memberContactId deletedMember
+  CEvtLeftMember {groupInfo, member} -> (`DEContactLeftGroup` groupInfo) <$> memberContactId member
+  CEvtDeletedMemberUser {groupInfo} -> Just $ DEServiceRemovedFromGroup groupInfo
+  CEvtGroupDeleted {groupInfo} -> Just $ DEGroupDeleted groupInfo
+  CEvtChatItemUpdated {chatItem = AChatItem _ SMDRcv (DirectChat ct) _} -> Just $ DEItemEditIgnored ct
+  CEvtChatItemsDeleted {chatItemDeletions = ((ChatItemDeletion (AChatItem _ SMDRcv (DirectChat ct) _) _) : _), byUser = False} -> Just $ DEItemDeleteIgnored ct
+  CEvtNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat ct) ci@ChatItem {content = CIRcvMsgContent mc, meta = CIMeta {itemLive}}) : _} ->
     Just $ case (mc, itemLive) of
       (MCText t, Nothing) -> DEContactCommand ct ciId $ fromRight err $ A.parseOnly (directoryCmdP <* A.endOfInput) $ T.dropWhileEnd isSpace t
       _ -> DEUnsupportedMessage ct ciId
     where
       ciId = chatItemId' ci
       err = ADC SDRUser DCUnknownCommand
-  CRMessageError {severity, errorMessage} -> Just $ DELogChatResponse $ "message error: " <> severity <> ", " <> errorMessage
-  CRChatCmdError {chatError} -> Just $ DELogChatResponse $ "chat cmd error: " <> tshow chatError
-  CRChatError {chatError} -> case chatError of
-    ChatErrorAgent {agentError = BROKER _ NETWORK} -> Nothing
-    ChatErrorAgent {agentError = BROKER _ TIMEOUT} -> Nothing
-    _ -> Just $ DELogChatResponse $ "chat error: " <> tshow chatError
-  CRChatErrors {chatErrors} -> Just $ DELogChatResponse $ "chat errors: " <> T.intercalate ", " (map tshow chatErrors)
+  CEvtMessageError {severity, errorMessage} -> Just $ DELogChatResponse $ "message error: " <> severity <> ", " <> errorMessage
+  CEvtChatErrors {chatErrors} -> Just $ DELogChatResponse $ "chat errors: " <> T.intercalate ", " (map tshow chatErrors)
   _ -> Nothing
+  where
+    pending m = memberStatus m == GSMemPendingApproval
 
 data DirectoryRole = DRUser | DRAdmin | DRSuperUser
 
@@ -107,7 +122,8 @@ data DirectoryCmdTag (r :: DirectoryRole) where
   DCConfirmDuplicateGroup_ :: DirectoryCmdTag 'DRUser
   DCListUserGroups_ :: DirectoryCmdTag 'DRUser
   DCDeleteGroup_ :: DirectoryCmdTag 'DRUser
-  DCSetRole_ :: DirectoryCmdTag 'DRUser
+  DCMemberRole_ :: DirectoryCmdTag 'DRUser
+  DCGroupFilter_ :: DirectoryCmdTag 'DRUser
   DCApproveGroup_ :: DirectoryCmdTag 'DRAdmin
   DCRejectGroup_ :: DirectoryCmdTag 'DRAdmin
   DCSuspendGroup_ :: DirectoryCmdTag 'DRAdmin
@@ -117,14 +133,19 @@ data DirectoryCmdTag (r :: DirectoryRole) where
   DCShowGroupLink_ :: DirectoryCmdTag 'DRAdmin
   DCSendToGroupOwner_ :: DirectoryCmdTag 'DRAdmin
   DCInviteOwnerToGroup_ :: DirectoryCmdTag 'DRAdmin
+  -- DCAddBlockedWord_ :: DirectoryCmdTag 'DRAdmin
+  -- DCRemoveBlockedWord_ :: DirectoryCmdTag 'DRAdmin
   DCExecuteCommand_ :: DirectoryCmdTag 'DRSuperUser
 
 deriving instance Show (DirectoryCmdTag r)
 
 data ADirectoryCmdTag = forall r. ADCT (SDirectoryRole r) (DirectoryCmdTag r)
 
+data DirectoryHelpSection = DHSRegistration | DHSCommands
+  deriving (Show)
+
 data DirectoryCmd (r :: DirectoryRole) where
-  DCHelp :: DirectoryCmd 'DRUser
+  DCHelp :: DirectoryHelpSection -> DirectoryCmd 'DRUser
   DCSearchGroup :: Text -> DirectoryCmd 'DRUser
   DCSearchNext :: DirectoryCmd 'DRUser
   DCAllGroups :: DirectoryCmd 'DRUser
@@ -133,7 +154,8 @@ data DirectoryCmd (r :: DirectoryRole) where
   DCConfirmDuplicateGroup :: UserGroupRegId -> GroupName -> DirectoryCmd 'DRUser
   DCListUserGroups :: DirectoryCmd 'DRUser
   DCDeleteGroup :: UserGroupRegId -> GroupName -> DirectoryCmd 'DRUser
-  DCSetRole :: GroupId -> GroupName -> GroupMemberRole -> DirectoryCmd 'DRUser
+  DCMemberRole :: UserGroupRegId -> Maybe GroupName -> Maybe GroupMemberRole -> DirectoryCmd 'DRUser
+  DCGroupFilter :: UserGroupRegId -> Maybe GroupName -> Maybe DirectoryMemberAcceptance -> DirectoryCmd 'DRUser
   DCApproveGroup :: {groupId :: GroupId, displayName :: GroupName, groupApprovalId :: GroupApprovalId} -> DirectoryCmd 'DRAdmin
   DCRejectGroup :: GroupId -> GroupName -> DirectoryCmd 'DRAdmin
   DCSuspendGroup :: GroupId -> GroupName -> DirectoryCmd 'DRAdmin
@@ -143,6 +165,8 @@ data DirectoryCmd (r :: DirectoryRole) where
   DCShowGroupLink :: GroupId -> GroupName -> DirectoryCmd 'DRAdmin
   DCSendToGroupOwner :: GroupId -> GroupName -> Text -> DirectoryCmd 'DRAdmin
   DCInviteOwnerToGroup :: GroupId -> GroupName -> DirectoryCmd 'DRAdmin
+  -- DCAddBlockedWord :: Text -> DirectoryCmd 'DRAdmin
+  -- DCRemoveBlockedWord :: Text -> DirectoryCmd 'DRAdmin
   DCExecuteCommand :: String -> DirectoryCmd 'DRSuperUser
   DCUnknownCommand :: DirectoryCmd 'DRUser
   DCCommandError :: DirectoryCmdTag r -> DirectoryCmd r
@@ -163,7 +187,7 @@ directoryCmdP =
       (tagP >>= \(ADCT u t) -> ADC u <$> (cmdP t <|> pure (DCCommandError t)))
         <|> pure (ADC SDRUser DCUnknownCommand)
     tagP =
-      A.takeTill (== ' ') >>= \case
+      A.takeTill isSpace >>= \case
         "help" -> u DCHelp_
         "h" -> u DCHelp_
         "next" -> u DCSearchNext_
@@ -174,7 +198,8 @@ directoryCmdP =
         "list" -> u DCListUserGroups_
         "ls" -> u DCListUserGroups_
         "delete" -> u DCDeleteGroup_
-        "role" -> u DCSetRole_
+        "role" -> u DCMemberRole_
+        "filter" -> u DCGroupFilter_
         "approve" -> au DCApproveGroup_
         "reject" -> au DCRejectGroup_
         "suspend" -> au DCSuspendGroup_
@@ -184,6 +209,8 @@ directoryCmdP =
         "link" -> au DCShowGroupLink_
         "owner" -> au DCSendToGroupOwner_
         "invite" -> au DCInviteOwnerToGroup_
+        -- "block_word" -> au DCAddBlockedWord_
+        -- "unblock_word" -> au DCRemoveBlockedWord_
         "exec" -> su DCExecuteCommand_
         "x" -> su DCExecuteCommand_
         _ -> fail "bad command tag"
@@ -193,18 +220,52 @@ directoryCmdP =
         su = pure . ADCT SDRSuperUser
     cmdP :: DirectoryCmdTag r -> Parser (DirectoryCmd r)
     cmdP = \case
-      DCHelp_ -> pure DCHelp
+      DCHelp_ -> DCHelp . fromMaybe DHSRegistration <$> optional (A.takeWhile isSpace *> helpSectionP)
+        where
+          helpSectionP =
+            A.takeText >>= \case
+              "registration" -> pure DHSRegistration
+              "r" -> pure DHSRegistration
+              "commands" -> pure DHSCommands
+              "c" -> pure DHSCommands
+              _ -> fail "bad help section"
       DCSearchNext_ -> pure DCSearchNext
       DCAllGroups_ -> pure DCAllGroups
       DCRecentGroups_ -> pure DCRecentGroups
-      DCSubmitGroup_ -> fmap DCSubmitGroup . strDecode . encodeUtf8 <$?> (A.takeWhile1 isSpace *> A.takeText)
+      DCSubmitGroup_ -> fmap DCSubmitGroup . strDecode . encodeUtf8 <$?> (spacesP *> A.takeText)
       DCConfirmDuplicateGroup_ -> gc DCConfirmDuplicateGroup
       DCListUserGroups_ -> pure DCListUserGroups
       DCDeleteGroup_ -> gc DCDeleteGroup
-      DCSetRole_ -> do
-        (groupId, displayName) <- gc (,)
-        memberRole <- A.space *> ("member" $> GRMember <|> "observer" $> GRObserver)
-        pure $ DCSetRole groupId displayName memberRole
+      DCMemberRole_ -> do
+        (groupId, displayName_) <- gc_ (,)
+        memberRole_ <- optional $ spacesP *> ("member" $> GRMember <|> "observer" $> GRObserver)
+        pure $ DCMemberRole groupId displayName_ memberRole_
+      DCGroupFilter_ -> do
+        (groupId, displayName_) <- gc_ (,)
+        acceptance_ <-
+          (A.takeWhile isSpace >> A.endOfInput) $> Nothing
+            <|> Just <$> (acceptancePresetsP <|> acceptanceFiltersP)
+        pure $ DCGroupFilter groupId displayName_ acceptance_
+        where
+          acceptancePresetsP =
+            spacesP
+              *> A.choice
+                [ "off" $> noJoinFilter,
+                  "basic" $> basicJoinFilter,
+                  ("moderate" <|> "mod") $> moderateJoinFilter,
+                  "strong" $> strongJoinFilter
+                ]
+          acceptanceFiltersP = do
+            rejectNames <- filterP "name"
+            passCaptcha <- filterP "captcha"
+            makeObserver <- filterP "observer"
+            pure DirectoryMemberAcceptance {rejectNames, passCaptcha, makeObserver}
+          filterP :: Text -> Parser (Maybe ProfileCondition)
+          filterP s = Just <$> (spacesP *> A.string s *> conditionP) <|> pure Nothing
+          conditionP =
+            "=all" $> PCAll
+              <|> ("=noimage" <|> "=no_image" <|> "=no-image") $> PCNoImage
+              <|> pure PCAll
       DCApproveGroup_ -> do
         (groupId, displayName) <- gc (,)
         groupApprovalId <- A.space *> A.decimal
@@ -220,22 +281,18 @@ directoryCmdP =
         msg <- A.space *> A.takeText
         pure $ DCSendToGroupOwner groupId displayName msg
       DCInviteOwnerToGroup_ -> gc DCInviteOwnerToGroup
-      DCExecuteCommand_ -> DCExecuteCommand . T.unpack <$> (A.space *> A.takeText)
+      -- DCAddBlockedWord_ -> DCAddBlockedWord <$> wordP
+      -- DCRemoveBlockedWord_ -> DCRemoveBlockedWord <$> wordP
+      DCExecuteCommand_ -> DCExecuteCommand . T.unpack <$> (spacesP *> A.takeText)
       where
-        gc f = f <$> (A.space *> A.decimal <* A.char ':') <*> displayNameP
-        displayNameP = quoted '\'' <|> takeNameTill (== ' ')
-        takeNameTill p =
-          A.peekChar' >>= \c ->
-            if refChar c then A.takeTill p else fail "invalid first character in display name"
-        quoted c = A.char c *> takeNameTill (== c) <* A.char c
-        refChar c = c > ' ' && c /= '#' && c /= '@'
-
-viewName :: Text -> Text
-viewName n = if any (== ' ') (T.unpack n) then "'" <> n <> "'" else n
+        gc f = f <$> (spacesP *> A.decimal) <*> (A.char ':' *> displayNameTextP)
+        gc_ f = f <$> (spacesP *> A.decimal) <*> optional (A.char ':' *> displayNameTextP)
+        -- wordP = spacesP *> A.takeTill isSpace
+        spacesP = A.takeWhile1 isSpace
 
 directoryCmdTag :: DirectoryCmd r -> Text
 directoryCmdTag = \case
-  DCHelp -> "help"
+  DCHelp _ -> "help"
   DCSearchGroup _ -> "search"
   DCSearchNext -> "next"
   DCAllGroups -> "all"
@@ -245,7 +302,8 @@ directoryCmdTag = \case
   DCListUserGroups -> "list" 
   DCDeleteGroup {} -> "delete"
   DCApproveGroup {} -> "approve"
-  DCSetRole {} -> "role"
+  DCMemberRole {} -> "role"
+  DCGroupFilter {} -> "filter"
   DCRejectGroup {} -> "reject"
   DCSuspendGroup {} -> "suspend"
   DCResumeGroup {} -> "resume"
@@ -254,6 +312,8 @@ directoryCmdTag = \case
   DCShowGroupLink {} -> "link"
   DCSendToGroupOwner {} -> "owner"
   DCInviteOwnerToGroup {} -> "invite"
+  -- DCAddBlockedWord _ -> "block_word"
+  -- DCRemoveBlockedWord _ -> "unblock_word"
   DCExecuteCommand _ -> "exec"
   DCUnknownCommand -> "unknown"
   DCCommandError _ -> "error"
diff --git a/apps/simplex-directory-service/src/Directory/Options.hs b/apps/simplex-directory-service/src/Directory/Options.hs
index a62939b6ac..2c26905e79 100644
--- a/apps/simplex-directory-service/src/Directory/Options.hs
+++ b/apps/simplex-directory-service/src/Directory/Options.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE ApplicativeDo #-}
 {-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -22,6 +23,12 @@ data DirectoryOpts = DirectoryOpts
     adminUsers :: [KnownContact],
     superUsers :: [KnownContact],
     ownersGroup :: Maybe KnownGroup,
+    blockedWordsFile :: Maybe FilePath,
+    blockedFragmentsFile :: Maybe FilePath,
+    blockedExtensionRules :: Maybe FilePath,
+    nameSpellingFile :: Maybe FilePath,
+    profileNameLimit :: Int,
+    captchaGenerator :: Maybe FilePath,
     directoryLog :: Maybe FilePath,
     serviceName :: T.Text,
     runCLI :: Bool,
@@ -55,6 +62,49 @@ directoryOpts appDir defaultDbName = do
             <> metavar "OWNERS_GROUP"
             <> help "The group of group owners in the format GROUP_ID:DISPLAY_NAME - owners of listed groups will be invited automatically"
         )
+  blockedWordsFile <-
+    optional $
+      strOption
+        ( long "blocked-words-file"
+            <> metavar "BLOCKED_WORDS_FILE"
+            <> help "File with the basic forms of words not allowed in profiles"
+        )
+  blockedFragmentsFile <-
+    optional $
+      strOption
+        ( long "blocked-fragments-file"
+            <> metavar "BLOCKED_WORDS_FILE"
+            <> help "File with the basic forms of word fragments not allowed in profiles"
+        )
+  blockedExtensionRules <-
+    optional $
+      strOption
+        ( long "blocked-extenstion-rules"
+            <> metavar "BLOCKED_EXTENSION_RULES"
+            <> help "Substitions to extend the list of blocked words"
+        )
+  nameSpellingFile <-
+    optional $
+      strOption
+        ( long "name-spelling-file"
+            <> metavar "NAME_SPELLING_FILE"
+            <> help "File with the character substitions to match in profile names"
+        )
+  profileNameLimit <-
+    option
+      auto
+      ( long "profile-name-limit"
+          <> metavar "PROFILE_NAME_LIMIT"
+          <> help "Max length of profile name that will be allowed to connect and to join groups"
+          <> value maxBound
+      )
+  captchaGenerator <-
+    optional $
+      strOption
+        ( long "captcha-generator"
+            <> metavar "CAPTCHA_GENERATOR"
+            <> help "Executable to generate captcha files, must accept text as parameter and save file to stdout as base64 up to 12500 bytes"
+        )
   directoryLog <-
     Just
       <$> strOption
@@ -80,6 +130,12 @@ directoryOpts appDir defaultDbName = do
         adminUsers,
         superUsers,
         ownersGroup,
+        blockedWordsFile,
+        blockedFragmentsFile,
+        blockedExtensionRules,
+        nameSpellingFile,
+        profileNameLimit,
+        captchaGenerator,
         directoryLog,
         serviceName = T.pack serviceName,
         runCLI,
@@ -102,7 +158,6 @@ mkChatOpts :: DirectoryOpts -> ChatOpts
 mkChatOpts DirectoryOpts {coreOptions} =
   ChatOpts
     { coreOptions,
-      deviceName = Nothing,
       chatCmd = "",
       chatCmdDelay = 3,
       chatCmdLog = CCLNone,
diff --git a/apps/simplex-directory-service/src/Directory/Service.hs b/apps/simplex-directory-service/src/Directory/Service.hs
index ed51371be3..13510b4d2b 100644
--- a/apps/simplex-directory-service/src/Directory/Service.hs
+++ b/apps/simplex-directory-service/src/Directory/Service.hs
@@ -1,31 +1,45 @@
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Directory.Service
   ( welcomeGetOpts,
     directoryService,
     directoryServiceCLI,
+    newServiceState,
+    acceptMemberHook
   )
 where
 
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
+import qualified Control.Exception as E
 import Control.Logger.Simple
 import Control.Monad
+import Control.Monad.Except
+import Control.Monad.IO.Class
+import Data.Int (Int64)
 import Data.List (find, intercalate)
+import Data.List.NonEmpty (NonEmpty (..))
+import qualified Data.Map.Strict as M
 import Data.Maybe (fromMaybe, isJust, maybeToList)
 import Data.Set (Set)
 import qualified Data.Set as S
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Time.Clock (diffUTCTime, getCurrentTime)
+import qualified Data.Text.IO as T
+import Data.Time.Clock (NominalDiffTime, UTCTime, diffUTCTime, getCurrentTime)
 import Data.Time.LocalTime (getCurrentTimeZone)
+import Directory.BlockedWords
+import Directory.Captcha
 import Directory.Events
 import Directory.Options
 import Directory.Search
@@ -34,20 +48,29 @@ import Simplex.Chat.Bot
 import Simplex.Chat.Bot.KnownContacts
 import Simplex.Chat.Controller
 import Simplex.Chat.Core
+import Simplex.Chat.Markdown (FormattedText (..), Format (..), parseMaybeMarkdownList, viewName)
 import Simplex.Chat.Messages
 import Simplex.Chat.Options
 import Simplex.Chat.Protocol (MsgContent (..))
+import Simplex.Chat.Store.Direct (getContact)
+import Simplex.Chat.Store.Groups (getGroupInfo, getGroupLink, getGroupSummary, setGroupCustomData)
+import Simplex.Chat.Store.Profiles (GroupLinkInfo (..), getGroupLinkInfo)
 import Simplex.Chat.Store.Shared (StoreError (..))
 import Simplex.Chat.Terminal (terminalChatConfig)
 import Simplex.Chat.Terminal.Main (simplexChatCLI')
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Shared
-import Simplex.Chat.View (serializeChatResponse, simplexChatContact, viewContactName, viewGroupName)
+import Simplex.Chat.View (serializeChatError, serializeChatResponse, simplexChatContact, viewContactName, viewGroupName)
+import Simplex.Messaging.Agent.Protocol (AConnectionLink (..), ConnectionLink (..), CreatedConnLink (..))
+import Simplex.Messaging.Agent.Store.Common (withTransaction)
+import Simplex.Messaging.Agent.Protocol (SConnectionMode (..), sameConnReqContact, sameShortLinkContact)
+import qualified Simplex.Messaging.Agent.Store.DB as DB
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Util (safeDecodeUtf8, tshow, ($>>=), (<$$>))
 import System.Directory (getAppUserDataDirectory)
+import System.Process (readProcess)
 
 data GroupProfileUpdate = GPNoServiceLink | GPServiceLinkAdded | GPServiceLinkRemoved | GPHasServiceLink | GPServiceLinkError
 
@@ -64,13 +87,32 @@ data GroupRolesStatus
   deriving (Eq)
 
 data ServiceState = ServiceState
-  { searchRequests :: TMap ContactId SearchRequest
+  { searchRequests :: TMap ContactId SearchRequest,
+    blockedWordsCfg :: BlockedWordsConfig,
+    pendingCaptchas :: TMap GroupMemberId PendingCaptcha
   }
 
-newServiceState :: IO ServiceState
-newServiceState = do
+data PendingCaptcha = PendingCaptcha
+  { captchaText :: Text,
+    sentAt :: UTCTime,
+    attempts :: Int
+  }
+
+captchaLength :: Int
+captchaLength = 7
+
+maxCaptchaAttempts :: Int
+maxCaptchaAttempts = 5
+
+captchaTTL :: NominalDiffTime
+captchaTTL = 600 -- 10 minutes
+
+newServiceState :: DirectoryOpts -> IO ServiceState
+newServiceState opts = do
   searchRequests <- TM.emptyIO
-  pure ServiceState {searchRequests}
+  blockedWordsCfg <- readBlockedWordsConfig opts
+  pendingCaptchas <- TM.emptyIO
+  pure ServiceState {searchRequests, blockedWordsCfg, pendingCaptchas}
 
 welcomeGetOpts :: IO DirectoryOpts
 welcomeGetOpts = do
@@ -94,11 +136,12 @@ welcomeGetOpts = do
 
 directoryServiceCLI :: DirectoryStore -> DirectoryOpts -> IO ()
 directoryServiceCLI st opts = do
-  env <- newServiceState
+  env <- newServiceState opts
   eventQ <- newTQueueIO
   let eventHook cc resp = atomically $ resp <$ writeTQueue eventQ (cc, resp)
+      chatHooks = defaultChatHooks {eventHook = Just eventHook, acceptMember = Just $ acceptMemberHook opts env}
   race_
-    (simplexChatCLI' terminalChatConfig {chatHooks = defaultChatHooks {eventHook}} (mkChatOpts opts) Nothing)
+    (simplexChatCLI' terminalChatConfig {chatHooks} (mkChatOpts opts) Nothing)
     (processEvents eventQ env)
   where
     processEvents eventQ env = forever $ do
@@ -106,21 +149,63 @@ directoryServiceCLI st opts = do
       u_ <- readTVarIO (currentUser cc)
       forM_ u_ $ \user -> directoryServiceEvent st opts env user cc resp
 
-directoryService :: DirectoryStore -> DirectoryOpts -> User -> ChatController -> IO ()
-directoryService st opts@DirectoryOpts {testing} user cc = do
+directoryService :: DirectoryStore -> DirectoryOpts -> ServiceState -> User -> ChatController -> IO ()
+directoryService st opts@DirectoryOpts {testing} env user cc = do
   initializeBotAddress' (not testing) cc
-  env <- newServiceState
   race_ (forever $ void getLine) . forever $ do
-    (_, _, resp) <- atomically . readTBQueue $ outputQ cc
+    (_, resp) <- atomically . readTBQueue $ outputQ cc
     directoryServiceEvent st opts env user cc resp
 
-directoryServiceEvent :: DirectoryStore -> DirectoryOpts -> ServiceState -> User -> ChatController -> ChatResponse -> IO ()
-directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, ownersGroup, searchResults} ServiceState {searchRequests} user@User {userId} cc event =
+acceptMemberHook :: DirectoryOpts -> ServiceState -> GroupInfo -> GroupLinkInfo -> Profile -> IO (Either GroupRejectionReason (GroupAcceptance, GroupMemberRole))
+acceptMemberHook
+  DirectoryOpts {profileNameLimit}
+  ServiceState {blockedWordsCfg}
+  g
+  GroupLinkInfo {memberRole}
+  Profile {displayName, image = img} = runExceptT $ do
+    let a = groupMemberAcceptance g
+    when (useMemberFilter img $ rejectNames a) checkName
+    pure $
+      if
+        | useMemberFilter img (passCaptcha a) -> (GAPendingApproval, GRMember)
+        | useMemberFilter img (makeObserver a) -> (GAAccepted, GRObserver)
+        | otherwise -> (GAAccepted, memberRole)
+    where
+      checkName :: ExceptT GroupRejectionReason IO ()
+      checkName
+        | T.length displayName > profileNameLimit = throwError GRRLongName
+        | otherwise = do
+            when (hasBlockedFragments blockedWordsCfg displayName) $ throwError GRRBlockedName
+            when (hasBlockedWords blockedWordsCfg displayName) $ throwError GRRBlockedName
+
+groupMemberAcceptance :: GroupInfo -> DirectoryMemberAcceptance
+groupMemberAcceptance GroupInfo {customData} = memberAcceptance $ fromCustomData customData
+
+useMemberFilter :: Maybe ImageData -> Maybe ProfileCondition -> Bool
+useMemberFilter img_ = \case
+  Just PCAll -> True
+  Just PCNoImage -> maybe True (\(ImageData i) -> i == "") img_
+  Nothing -> False
+
+readBlockedWordsConfig :: DirectoryOpts -> IO BlockedWordsConfig
+readBlockedWordsConfig DirectoryOpts {blockedFragmentsFile, blockedWordsFile, nameSpellingFile, blockedExtensionRules, testing} = do
+  extensionRules <- maybe (pure []) (fmap read . readFile) blockedExtensionRules  
+  spelling <- maybe (pure M.empty) (fmap (M.fromList . read) . readFile) nameSpellingFile
+  blockedFragments <- S.fromList <$> maybe (pure []) (fmap T.lines . T.readFile) blockedFragmentsFile
+  bws <- maybe (pure []) (fmap lines . readFile) blockedWordsFile
+  let blockedWords = S.fromList $ concatMap (wordVariants extensionRules) bws
+  unless testing $ putStrLn $ "Blocked fragments: " <> show (length blockedFragments) <> ", blocked words: " <> show (length blockedWords) <> ", spelling rules: " <> show (M.size spelling)
+  pure BlockedWordsConfig {blockedFragments, blockedWords, extensionRules, spelling}
+
+directoryServiceEvent :: DirectoryStore -> DirectoryOpts -> ServiceState -> User -> ChatController -> Either ChatError ChatEvent -> IO ()
+directoryServiceEvent st opts@DirectoryOpts {adminUsers, superUsers, serviceName, ownersGroup, searchResults} env@ServiceState {searchRequests} user@User {userId} cc event =
   forM_ (crDirectoryEvent event) $ \case
     DEContactConnected ct -> deContactConnected ct
     DEGroupInvitation {contact = ct, groupInfo = g, fromMemberRole, memberRole} -> deGroupInvitation ct g fromMemberRole memberRole
     DEServiceJoinedGroup ctId g owner -> deServiceJoinedGroup ctId g owner
-    DEGroupUpdated {contactId, fromGroup, toGroup} -> deGroupUpdated contactId fromGroup toGroup
+    DEGroupUpdated {member, fromGroup, toGroup} -> deGroupUpdated member fromGroup toGroup
+    DEPendingMember g m -> dePendingMember g m
+    DEPendingMemberMsg g m ciId t -> dePendingMemberMsg g m ciId t
     DEContactRoleChanged g ctId role -> deContactRoleChanged g ctId role
     DEServiceRoleChanged g role -> deServiceRoleChanged g role
     DEContactRemovedFromGroup ctId g -> deContactRemovedFromGroup ctId g
@@ -146,7 +231,7 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
     notifyOwner GroupReg {dbContactId} = sendMessage' cc dbContactId
     ctId `isOwner` GroupReg {dbContactId} = ctId == dbContactId
     withGroupReg GroupInfo {groupId, localDisplayName} err action = do
-      atomically (getGroupReg st groupId) >>= \case
+      getGroupReg st groupId >>= \case
         Just gr -> action gr
         Nothing -> logError $ "Error: " <> err <> ", group: " <> localDisplayName <> ", can't find group registration ID " <> tshow groupId
     groupInfoText GroupProfile {displayName = n, fullName = fn, description = d} =
@@ -164,31 +249,39 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
     getGroups_ :: Maybe Text -> IO (Maybe [(GroupInfo, GroupSummary)])
     getGroups_ search_ =
       sendChatCmd cc (APIListGroups userId Nothing $ T.unpack <$> search_) >>= \case
-        CRGroupsList {groups} -> pure $ Just groups
+        Right CRGroupsList {groups} -> pure $ Just groups
         _ -> pure Nothing
 
     getDuplicateGroup :: GroupInfo -> IO (Maybe DuplicateGroup)
     getDuplicateGroup GroupInfo {groupId, groupProfile = GroupProfile {displayName, fullName}} =
       getGroups fullName >>= mapM duplicateGroup
       where
-        sameGroup (GroupInfo {groupId = gId, groupProfile = GroupProfile {displayName = n, fullName = fn}}, _) =
-          gId /= groupId && n == displayName && fn == fullName
+        sameGroupNotRemoved (g@GroupInfo {groupId = gId, groupProfile = GroupProfile {displayName = n, fullName = fn}}, _) =
+          gId /= groupId && n == displayName && fn == fullName && not (memberRemoved $ membership g)
         duplicateGroup [] = pure DGUnique
         duplicateGroup groups = do
-          let gs = filter sameGroup groups
+          let gs = filter sameGroupNotRemoved groups
           if null gs
             then pure DGUnique
             else do
               (lgs, rgs) <- atomically $ (,) <$> readTVar (listedGroups st) <*> readTVar (reservedGroups st)
               let reserved = any (\(GroupInfo {groupId = gId}, _) -> gId `S.member` lgs || gId `S.member` rgs) gs
-              pure $ if reserved then DGReserved else DGRegistered
+              if reserved
+                then pure DGReserved
+                else do
+                  removed <- foldM (\r -> fmap (r &&) . isGroupRemoved) True gs
+                  pure $ if removed then DGUnique else DGRegistered
+        isGroupRemoved (GroupInfo {groupId = gId}, _) =
+          getGroupReg st gId >>= \case
+            Just GroupReg {groupRegStatus} -> groupRemoved <$> readTVarIO groupRegStatus
+            Nothing -> pure True
 
     processInvitation :: Contact -> GroupInfo -> IO ()
     processInvitation ct g@GroupInfo {groupId, groupProfile = GroupProfile {displayName}} = do
       void $ addGroupReg st ct g GRSProposed
       r <- sendChatCmd cc $ APIJoinGroup groupId MFNone
       sendMessage cc ct $ case r of
-        CRUserAcceptedGroupSent {} -> "Joining the group " <> displayName <> "…"
+        Right  CRUserAcceptedGroupSent {} -> "Joining the group " <> displayName <> "…"
         _ -> "Error joining group " <> displayName <> ", please re-send the invitation!"
 
     deContactConnected :: Contact -> IO ()
@@ -244,7 +337,7 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
         $>>= \mId -> resp <$> sendChatCmd cc (APIGroupMemberInfo dbGroupId mId)
       where
         resp = \case
-          CRGroupMemberInfo {member} -> Just member
+          Right CRGroupMemberInfo {member} -> Just member
           _ -> Nothing
 
     deServiceJoinedGroup :: ContactId -> GroupInfo -> GroupMember -> IO ()
@@ -255,16 +348,16 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
           setGroupRegOwner st gr owner
           let GroupInfo {groupId, groupProfile = GroupProfile {displayName}} = g
           notifyOwner gr $ "Joined the group " <> displayName <> ", creating the link…"
-          sendChatCmd cc (APICreateGroupLink groupId GRMember) >>= \case
-            CRGroupLinkCreated {connReqContact} -> do
+          sendChatCmd cc (APICreateGroupLink groupId GRMember False) >>= \case
+            Right CRGroupLinkCreated {connLinkContact = CCLink gLink _} -> do
               setGroupStatus st gr GRSPendingUpdate
               notifyOwner
                 gr
                 "Created the public link to join the group via this directory service that is always online.\n\n\
                 \Please add it to the group welcome message.\n\
                 \For example, add:"
-              notifyOwner gr $ "Link to join the group " <> displayName <> ": " <> strEncodeTxt (simplexChatContact connReqContact)
-            CRChatCmdError _ (ChatError e) -> case e of
+              notifyOwner gr $ "Link to join the group " <> displayName <> ": " <> strEncodeTxt (simplexChatContact gLink)
+            Left (ChatError e) -> case e of
               CEGroupUserRole {} -> notifyOwner gr "Failed creating group link, as service is no longer an admin."
               CEGroupMemberUserRemoved -> notifyOwner gr "Failed creating group link, as service is removed from the group."
               CEGroupNotJoined _ -> notifyOwner gr $ unexpectedError "group not joined"
@@ -272,78 +365,97 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
               _ -> notifyOwner gr $ unexpectedError "can't create group link"
             _ -> notifyOwner gr $ unexpectedError "can't create group link"
 
-    deGroupUpdated :: ContactId -> GroupInfo -> GroupInfo -> IO ()
-    deGroupUpdated ctId fromGroup toGroup = do
+    deGroupUpdated :: GroupMember -> GroupInfo -> GroupInfo -> IO ()
+    deGroupUpdated m@GroupMember {memberProfile = LocalProfile {displayName = mName}} fromGroup toGroup = do
       logInfo $ "group updated " <> viewGroupName toGroup
       unless (sameProfile p p') $ do
         withGroupReg toGroup "group updated" $ \gr -> do
           let userGroupRef = userGroupReference gr toGroup
+              byMember = case memberContactId m of
+                Just ctId | ctId `isOwner` gr -> "" -- group registration owner, not any group owner.
+                _ -> " by " <> mName -- owner notification from directory will include the name.
           readTVarIO (groupRegStatus gr) >>= \case
             GRSPendingConfirmation -> pure ()
             GRSProposed -> pure ()
             GRSPendingUpdate ->
               groupProfileUpdate >>= \case
                 GPNoServiceLink ->
-                  when (ctId `isOwner` gr) $ notifyOwner gr $ "The profile updated for " <> userGroupRef <> ", but the group link is not added to the welcome message."
-                GPServiceLinkAdded
-                  | ctId `isOwner` gr -> groupLinkAdded gr
-                  | otherwise -> notifyOwner gr "The group link is added by another group member, your registration will not be processed.\n\nPlease update the group profile yourself."
-                GPServiceLinkRemoved -> when (ctId `isOwner` gr) $ notifyOwner gr $ "The group link of " <> userGroupRef <> " is removed from the welcome message, please add it."
-                GPHasServiceLink -> when (ctId `isOwner` gr) $ groupLinkAdded gr
+                  notifyOwner gr $ "The profile updated for " <> userGroupRef <> byMember <> ", but the group link is not added to the welcome message."
+                GPServiceLinkAdded -> groupLinkAdded gr byMember
+                GPServiceLinkRemoved ->
+                  notifyOwner gr $
+                    "The group link of " <> userGroupRef <> " is removed from the welcome message" <> byMember <> ", please add it."
+                GPHasServiceLink -> groupLinkAdded gr byMember
                 GPServiceLinkError -> do
-                  when (ctId `isOwner` gr) $ notifyOwner gr $ "Error: " <> serviceName <> " has no group link for " <> userGroupRef <> ". Please report the error to the developers."
+                  notifyOwner gr $
+                    ("Error: " <> serviceName <> " has no group link for " <> userGroupRef)
+                      <> " after profile was updated" <> byMember <> ". Please report the error to the developers."
                   logError $ "Error: no group link for " <> userGroupRef
-            GRSPendingApproval n -> processProfileChange gr $ n + 1
-            GRSActive -> processProfileChange gr 1
-            GRSSuspended -> processProfileChange gr 1
-            GRSSuspendedBadRoles -> processProfileChange gr 1
+            GRSPendingApproval n -> processProfileChange gr byMember $ n + 1
+            GRSActive -> processProfileChange gr byMember 1
+            GRSSuspended -> processProfileChange gr byMember 1
+            GRSSuspendedBadRoles -> processProfileChange gr byMember 1
             GRSRemoved -> pure ()
       where
-        isInfix l d_ = l `T.isInfixOf` fromMaybe "" d_
         GroupInfo {groupId, groupProfile = p} = fromGroup
         GroupInfo {groupProfile = p'} = toGroup
         sameProfile
           GroupProfile {displayName = n, fullName = fn, image = i, description = d}
           GroupProfile {displayName = n', fullName = fn', image = i', description = d'} =
             n == n' && fn == fn' && i == i' && d == d'
-        groupLinkAdded gr = do
+        groupLinkAdded gr byMember = do
           getDuplicateGroup toGroup >>= \case
             Nothing -> notifyOwner gr "Error: getDuplicateGroup. Please notify the developers."
             Just DGReserved -> notifyOwner gr $ groupAlreadyListed toGroup
             _ -> do
               let gaId = 1
               setGroupStatus st gr $ GRSPendingApproval gaId
-              notifyOwner gr $ "Thank you! The group link for " <> userGroupReference gr toGroup <> " is added to the welcome message.\nYou will be notified once the group is added to the directory - it may take up to 48 hours."
+              notifyOwner gr $
+                ("Thank you! The group link for " <> userGroupReference gr toGroup <> " is added to the welcome message" <> byMember)
+                  <> ".\nYou will be notified once the group is added to the directory - it may take up to 48 hours."
               checkRolesSendToApprove gr gaId
-        processProfileChange gr n' = do
+        processProfileChange gr byMember n' = do
           setGroupStatus st gr GRSPendingUpdate
           let userGroupRef = userGroupReference gr toGroup
               groupRef = groupReference toGroup
           groupProfileUpdate >>= \case
             GPNoServiceLink -> do
-              notifyOwner gr $ "The group profile is updated " <> userGroupRef <> ", but no link is added to the welcome message.\n\nThe group will remain hidden from the directory until the group link is added and the group is re-approved."
+              notifyOwner gr $
+                ("The group profile is updated for " <> userGroupRef <> byMember <> ", but no link is added to the welcome message.\n\n")
+                  <> "The group will remain hidden from the directory until the group link is added and the group is re-approved."
             GPServiceLinkRemoved -> do
-              notifyOwner gr $ "The group link for " <> userGroupRef <> " is removed from the welcome message.\n\nThe group is hidden from the directory until the group link is added and the group is re-approved."
+              notifyOwner gr $
+                ("The group link for " <> userGroupRef <> " is removed from the welcome message" <> byMember)
+                  <> ".\n\nThe group is hidden from the directory until the group link is added and the group is re-approved."
               notifyAdminUsers $ "The group link is removed from " <> groupRef <> ", de-listed."
             GPServiceLinkAdded -> do
               setGroupStatus st gr $ GRSPendingApproval n'
-              notifyOwner gr $ "The group link is added to " <> userGroupRef <> "!\nIt is hidden from the directory until approved."
-              notifyAdminUsers $ "The group link is added to " <> groupRef <> "."
+              notifyOwner gr $
+                ("The group link is added to " <> userGroupRef <> byMember)
+                  <> "!\nIt is hidden from the directory until approved."
+              notifyAdminUsers $ "The group link is added to " <> groupRef <> byMember <> "."
               checkRolesSendToApprove gr n'
             GPHasServiceLink -> do
               setGroupStatus st gr $ GRSPendingApproval n'
-              notifyOwner gr $ "The group " <> userGroupRef <> " is updated!\nIt is hidden from the directory until approved."
-              notifyAdminUsers $ "The group " <> groupRef <> " is updated."
+              notifyOwner gr $
+                ("The group " <> userGroupRef <> " is updated" <> byMember)
+                  <> "!\nIt is hidden from the directory until approved."
+              notifyAdminUsers $ "The group " <> groupRef <> " is updated" <> byMember <> "."
               checkRolesSendToApprove gr n'
             GPServiceLinkError -> logError $ "Error: no group link for " <> groupRef <> " pending approval."
         groupProfileUpdate = profileUpdate <$> sendChatCmd cc (APIGetGroupLink groupId)
           where
             profileUpdate = \case
-              CRGroupLink {connReqContact} ->
-                let groupLink1 = strEncodeTxt connReqContact
-                    groupLink2 = strEncodeTxt $ simplexChatContact connReqContact
-                    hadLinkBefore = groupLink1 `isInfix` description p || groupLink2 `isInfix` description p
-                    hasLinkNow = groupLink1 `isInfix` description p' || groupLink2 `isInfix` description p'
+              Right CRGroupLink {connLinkContact = CCLink cr sl_} ->
+                let hadLinkBefore = profileHasGroupLink fromGroup
+                    hasLinkNow = profileHasGroupLink toGroup
+                    profileHasGroupLink GroupInfo {groupProfile = gp} =
+                      maybe False (any ftHasLink) $ parseMaybeMarkdownList =<< description gp
+                    ftHasLink = \case
+                      FormattedText (Just SimplexLink {simplexUri = ACL SCMContact cLink}) _ -> case cLink of
+                        CLFull cr' -> sameConnReqContact cr' cr
+                        CLShort sl' -> maybe False (sameShortLinkContact sl') sl_
+                      _ -> False
                  in if
                       | hadLinkBefore && hasLinkNow -> GPHasServiceLink
                       | hadLinkBefore -> GPServiceLinkRemoved
@@ -356,10 +468,87 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
             Just (Just msg) -> notifyOwner gr msg
             Just Nothing -> sendToApprove toGroup gr gaId
 
+    dePendingMember :: GroupInfo -> GroupMember -> IO ()
+    dePendingMember g@GroupInfo {groupProfile = GroupProfile {displayName}}  m
+      | memberRequiresCaptcha a m = sendMemberCaptcha g m Nothing captchaNotice 0
+      | otherwise = approvePendingMember a g m
+      where
+        a = groupMemberAcceptance g
+        captchaNotice = "Captcha is generated by SimpleX Directory service.\n\n*Send captcha text* to join the group " <> displayName <> "."
+
+    sendMemberCaptcha :: GroupInfo -> GroupMember -> Maybe ChatItemId -> Text -> Int -> IO ()
+    sendMemberCaptcha GroupInfo {groupId} m quotedId noticeText prevAttempts = do
+      s <- getCaptchaStr captchaLength ""
+      mc <- getCaptcha s
+      sentAt <- getCurrentTime
+      let captcha = PendingCaptcha {captchaText = T.pack s, sentAt, attempts = prevAttempts + 1}
+      atomically $ TM.insert gmId captcha $ pendingCaptchas env
+      sendCaptcha mc
+      where
+        getCaptcha s = case captchaGenerator opts of
+          Nothing -> pure textMsg
+          Just script -> content <$> readProcess script [s] ""
+          where
+            textMsg = MCText $ T.pack s 
+            content r = case T.lines $ T.pack r of
+              [] -> textMsg
+              "" : _ -> textMsg
+              img : _ -> MCImage "" $ ImageData img
+        sendCaptcha mc = sendComposedMessages_ cc (SRGroup groupId $ Just $ GCSMemberSupport (Just gmId)) [(quotedId, MCText noticeText), (Nothing, mc)]
+        gmId = groupMemberId' m
+
+    approvePendingMember :: DirectoryMemberAcceptance -> GroupInfo -> GroupMember -> IO ()
+    approvePendingMember a g@GroupInfo {groupId} m@GroupMember {memberProfile = LocalProfile {displayName, image}} = do
+      gli_ <- join <$> withDB' "getGroupLinkInfo" cc (\db -> getGroupLinkInfo db userId groupId)
+      let role = if useMemberFilter image (makeObserver a) then GRObserver else maybe GRMember (\GroupLinkInfo {memberRole} -> memberRole) gli_
+          gmId = groupMemberId' m
+      sendChatCmd cc (APIAcceptMember groupId gmId role) >>= \case
+        Right CRMemberAccepted {member} -> do
+          atomically $ TM.delete gmId $ pendingCaptchas env
+          if memberStatus member == GSMemPendingReview
+            then logInfo $ "Member " <> viewName displayName <> " accepted and pending review, group " <> tshow groupId <> ":" <> viewGroupName g
+            else logInfo $ "Member " <> viewName displayName <> " accepted, group " <> tshow groupId <> ":" <> viewGroupName g
+        r -> logError $ "unexpected accept member response: " <> tshow r
+
+    dePendingMemberMsg :: GroupInfo -> GroupMember -> ChatItemId -> Text -> IO ()
+    dePendingMemberMsg g@GroupInfo {groupId, groupProfile = GroupProfile {displayName = n}} m@GroupMember {memberProfile = LocalProfile {displayName}} ciId msgText
+      | memberRequiresCaptcha a m = do
+          ts <- getCurrentTime
+          atomically (TM.lookup (groupMemberId' m) $ pendingCaptchas env) >>= \case
+            Just PendingCaptcha {captchaText, sentAt, attempts}
+              | ts `diffUTCTime` sentAt > captchaTTL -> sendMemberCaptcha g m (Just ciId) captchaExpired $ attempts - 1
+              | matchCaptchaStr captchaText msgText -> do
+                  sendComposedMessages_ cc (SRGroup groupId $ Just $ GCSMemberSupport (Just $ groupMemberId' m)) [(Just ciId, MCText $ "Correct, you joined the group " <> n)]
+                  approvePendingMember a g m
+              | attempts >= maxCaptchaAttempts -> rejectPendingMember tooManyAttempts
+              | otherwise -> sendMemberCaptcha g m (Just ciId) (wrongCaptcha attempts) attempts
+            Nothing -> sendMemberCaptcha g m (Just ciId) noCaptcha 0
+      | otherwise = approvePendingMember a g m
+      where
+        a = groupMemberAcceptance g
+        rejectPendingMember rjctNotice = do
+          let gmId = groupMemberId' m
+          sendComposedMessages cc (SRGroup groupId $ Just $ GCSMemberSupport (Just gmId)) [MCText rjctNotice]
+          sendChatCmd cc (APIRemoveMembers groupId [gmId] False) >>= \case
+            Right (CRUserDeletedMembers _ _ (_ : _) _) -> do
+              atomically $ TM.delete gmId $ pendingCaptchas env
+              logInfo $ "Member " <> viewName displayName <> " rejected, group " <> tshow groupId <> ":" <> viewGroupName g
+            r -> logError $ "unexpected remove member response: " <> tshow r
+        captchaExpired = "Captcha expired, please try again."
+        wrongCaptcha attempts
+          | attempts == maxCaptchaAttempts - 1 = "Incorrect text, please try again - this is your last attempt."
+          | otherwise = "Incorrect text, please try again."
+        noCaptcha = "Unexpected message, please try again."
+        tooManyAttempts = "Too many failed attempts, you can't join group."
+
+    memberRequiresCaptcha :: DirectoryMemberAcceptance -> GroupMember -> Bool
+    memberRequiresCaptcha a GroupMember {memberProfile = LocalProfile {image}} =
+      useMemberFilter image $ passCaptcha a
+
     sendToApprove :: GroupInfo -> GroupReg -> GroupApprovalId -> IO ()
     sendToApprove GroupInfo {groupProfile = p@GroupProfile {displayName, image = image'}} GroupReg {dbGroupId, dbContactId} gaId = do
-      ct_ <- getContact cc dbContactId
-      gr_ <- getGroupAndSummary cc dbGroupId
+      ct_ <- getContact' cc user dbContactId
+      gr_ <- getGroupAndSummary cc user dbGroupId
       let membersStr = maybe "" (\(_, s) -> "_" <> tshow (currentMembers s) <> " members_\n") gr_
           text =
             maybe ("The group ID " <> tshow dbGroupId <> " submitted: ") (\c -> localDisplayName' c <> " submitted the group ID " <> tshow dbGroupId <> ": ") ct_
@@ -460,7 +649,7 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
 
     deUserCommand :: Contact -> ChatItemId -> DirectoryCmd 'DRUser -> IO ()
     deUserCommand ct ciId = \case
-      DCHelp ->
+      DCHelp DHSRegistration ->
         sendMessage cc ct $
           "You must be the owner to add the group to the directory:\n\
           \1. Invite "
@@ -471,7 +660,16 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
             <> " bot will create a public group link for the new members to join even when you are offline.\n\
                \3. You will then need to add this link to the group welcome message.\n\
                \4. Once the link is added, service admins will approve the group (it can take up to 48 hours), and everybody will be able to find it in directory.\n\n\
-               \Start from inviting the bot to your group as admin - it will guide you through the process"
+               \Start from inviting the bot to your group as admin - it will guide you through the process."
+      DCHelp DHSCommands ->
+        sendMessage cc ct $
+          "*/help commands* - receive this help message.\n\
+          \*/help* - how to register your group to be added to directory.\n\
+          \*/list* - list the groups you registered.\n\
+          \*/delete <ID>:<NAME>* - remove the group you submitted from directory, with _ID_ and _name_ as shown by */list* command.\n\
+          \*/role <ID>* - view and set default member role for your group.\n\
+          \*/filter <ID>* - view and set spam filter settings for group.\n\n\
+          \To search for groups, send the search text."
       DCSearchGroup s -> withFoundListedGroups (Just s) $ sendSearchResults s
       DCSearchNext ->
         atomically (TM.lookup (contactId' ct) searchRequests) >>= \case
@@ -501,41 +699,81 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
                 _ -> processInvitation ct g
             _ -> sendReply $ "Error: the group ID " <> tshow ugrId <> " (" <> displayName <> ") is not pending confirmation."
       DCListUserGroups ->
-        atomically (getUserGroupRegs st $ contactId' ct) >>= \grs -> do
+        getUserGroupRegs st (contactId' ct) >>= \grs -> do
           sendReply $ tshow (length grs) <> " registered group(s)"
           void . forkIO $ forM_ (reverse grs) $ \gr@GroupReg {userGroupRegId} ->
             sendGroupInfo ct gr userGroupRegId Nothing
-      DCDeleteGroup ugrId gName ->
-        withUserGroupReg ugrId gName $ \GroupInfo {groupProfile = GroupProfile {displayName}} gr -> do
+      DCDeleteGroup gId gName ->
+        (if isAdmin then withGroupAndReg sendReply else withUserGroupReg) gId gName $ \GroupInfo {groupProfile = GroupProfile {displayName}} gr -> do
           delGroupReg st gr
-          sendReply $ "Your group " <> displayName <> " is deleted from the directory"
-      DCSetRole gId gName mRole ->
-        (if isAdmin then withGroupAndReg sendReply else withUserGroupReg) gId gName $
-          \GroupInfo {groupId, groupProfile = GroupProfile {displayName}} _gr -> do
-            gLink_ <- setGroupLinkRole cc groupId mRole
-            sendReply $ case gLink_ of
-              Nothing -> "Error: the initial member role for the group " <> displayName <> " was NOT upgated"
-              Just gLink ->
-                ("The initial member role for the group " <> displayName <> " is set to *" <> strEncodeTxt mRole <> "*\n\n")
-                  <> ("*Please note*: it applies only to members joining via this link: " <> strEncodeTxt (simplexChatContact gLink))
+          sendReply $ (if isAdmin then "The group " else "Your group ") <> displayName <> " is deleted from the directory"
+      DCMemberRole gId gName_ mRole_ ->
+        (if isAdmin then withGroupAndReg_ sendReply else withUserGroupReg_) gId gName_ $ \g _gr -> do
+          let GroupInfo {groupProfile = GroupProfile {displayName = n}} = g
+          case mRole_ of
+            Nothing ->
+              getGroupLinkRole cc user g >>= \case
+                Just (_, CCLink gLink _, _, mRole) -> do
+                  let anotherRole = case mRole of GRObserver -> GRMember; _ -> GRObserver
+                  sendReply $
+                    initialRole n mRole
+                      <> ("Send */role " <> tshow gId <> " " <> strEncodeTxt anotherRole <> "* to change it.\n\n")
+                      <> onlyViaLink gLink
+                Nothing -> sendReply $ "Error: failed reading the initial member role for the group " <> n
+            Just mRole -> do
+              setGroupLinkRole cc g mRole >>= \case
+                Just gLink -> sendReply $ initialRole n mRole <> "\n" <> onlyViaLink gLink
+                Nothing -> sendReply $ "Error: the initial member role for the group " <> n <> " was NOT upgated."
+        where
+          initialRole n mRole = "The initial member role for the group " <> n <> " is set to *" <> strEncodeTxt mRole <> "*\n"
+          onlyViaLink gLink = "*Please note*: it applies only to members joining via this link: " <> strEncodeTxt (simplexChatContact gLink)
+      DCGroupFilter gId gName_ acceptance_ ->
+        (if isAdmin then withGroupAndReg_ sendReply else withUserGroupReg_) gId gName_ $ \g _gr -> do
+          let GroupInfo {groupProfile = GroupProfile {displayName = n}} = g
+              a = groupMemberAcceptance g
+          case acceptance_ of
+            Just a' | a /= a' -> do
+              let d = toCustomData $ DirectoryGroupData a'
+              withDB' "setGroupCustomData" cc (\db -> setGroupCustomData db user g $ Just d) >>= \case
+                Just () -> sendSettigns n a' " set to"
+                Nothing -> sendReply $ "Error changing spam filter settings for group " <> n
+            _ -> sendSettigns n a ""
+        where
+          sendSettigns n a setTo =
+            sendReply $
+              T.unlines
+                [ "Spam filter settings for group " <> n <> setTo <> ":",
+                  "- reject long/inappropriate names: " <> showCondition (rejectNames a),
+                  "- pass captcha to join: " <> showCondition (passCaptcha a),
+                  -- "- make observer: " <> showCondition (makeObserver a) <> (if isJust (makeObserver a) then "" else " (use default set with /role command)"),
+                  "",
+                  -- "Use */filter " <> tshow gId <> " <level>* to change spam filter level: no (disable), basic, moderate, strong.",
+                  -- "Or use */filter " <> tshow gId <> " [name[=noimage]] [captcha[=noimage]] [observer[=noimage]]* for advanced filter configuration."
+                  "Use */filter " <> tshow gId <> " [name] [captcha]* to enable and */filter " <> tshow gId <> " off* to disable filter."
+                ]
+          showCondition = \case
+            Nothing -> "_disabled_"
+            Just PCAll -> "_enabled_"
+            Just PCNoImage -> "_enabled for profiles without image_"
       DCUnknownCommand -> sendReply "Unknown command"
       DCCommandError tag -> sendReply $ "Command error: " <> tshow tag
       where
         knownCt = knownContact ct
         isAdmin = knownCt `elem` adminUsers || knownCt `elem` superUsers
-        withUserGroupReg ugrId gName action =
-          atomically (getUserGroupReg st (contactId' ct) ugrId) >>= \case
+        withUserGroupReg ugrId = withUserGroupReg_ ugrId . Just
+        withUserGroupReg_ ugrId gName_ action =
+          getUserGroupReg st (contactId' ct) ugrId >>= \case
             Nothing -> sendReply $ "Group ID " <> tshow ugrId <> " not found"
             Just gr@GroupReg {dbGroupId} -> do
-              getGroup cc dbGroupId >>= \case
+              getGroup cc user dbGroupId >>= \case
                 Nothing -> sendReply $ "Group ID " <> tshow ugrId <> " not found"
                 Just g@GroupInfo {groupProfile = GroupProfile {displayName}}
-                  | displayName == gName -> action g gr
+                  | maybe True (displayName ==) gName_ -> action g gr
                   | otherwise -> sendReply $ "Group ID " <> tshow ugrId <> " has the display name " <> displayName
         sendReply = mkSendReply ct ciId
         withFoundListedGroups s_ action =
           getGroups_ s_ >>= \case
-            Just groups -> atomically (filterListedGroups st groups) >>= action
+            Just groups -> filterListedGroups st groups >>= action
             Nothing -> sendReply "Error: getGroups. Please notify the developers."
         sendSearchResults s = \case
           [] -> sendReply "No groups found"
@@ -543,18 +781,18 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
             let gs' = takeTop searchResults gs
                 moreGroups = length gs - length gs'
                 more = if moreGroups > 0 then ", sending top " <> tshow (length gs') else ""
-            sendReply $ "Found " <> tshow (length gs) <> " group(s)" <> more <> "."
+                reply = "Found " <> tshow (length gs) <> " group(s)" <> more <> "."
             updateSearchRequest (STSearch s) $ groupIds gs'
-            sendFoundGroups gs' moreGroups
+            sendFoundGroups reply gs' moreGroups
         sendAllGroups takeFirst sortName searchType = \case
           [] -> sendReply "No groups listed"
           gs -> do
             let gs' = takeFirst searchResults gs
                 moreGroups = length gs - length gs'
                 more = if moreGroups > 0 then ", sending " <> sortName <> " " <> tshow (length gs') else ""
-            sendReply $ tshow (length gs) <> " group(s) listed" <> more <> "."
+                reply = tshow (length gs) <> " group(s) listed" <> more <> "."
             updateSearchRequest searchType $ groupIds gs'
-            sendFoundGroups gs' moreGroups
+            sendFoundGroups reply gs' moreGroups
         sendNextSearchResults takeFirst SearchRequest {searchType, sentGroups} = \case
           [] -> do
             sendReply "Sorry, no more groups"
@@ -563,33 +801,31 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
             let gs' = takeFirst searchResults $ filterNotSent sentGroups gs
                 sentGroups' = sentGroups <> groupIds gs'
                 moreGroups = length gs - S.size sentGroups'
-            sendReply $ "Sending " <> tshow (length gs') <> " more group(s)."
+                reply = "Sending " <> tshow (length gs') <> " more group(s)."
             updateSearchRequest searchType sentGroups'
-            sendFoundGroups gs' moreGroups
+            sendFoundGroups reply gs' moreGroups
         updateSearchRequest :: SearchType -> Set GroupId -> IO ()
         updateSearchRequest searchType sentGroups = do
           searchTime <- getCurrentTime
           let search = SearchRequest {searchType, searchTime, sentGroups}
           atomically $ TM.insert (contactId' ct) search searchRequests
-        sendFoundGroups gs moreGroups =
-          void . forkIO $ do
-            forM_ gs $
-              \(GroupInfo {groupId, groupProfile = p@GroupProfile {image = image_}}, GroupSummary {currentMembers}) -> do
-                let membersStr = "_" <> tshow currentMembers <> " members_"
-                    showId = if isAdmin then tshow groupId <> ". " else ""
-                    text = showId <> groupInfoText p <> "\n" <> membersStr
-                    msg = maybe (MCText text) (\image -> MCImage {text, image}) image_
-                sendComposedMessage cc ct Nothing msg
-            when (moreGroups > 0) $
-              sendComposedMessage cc ct Nothing $
-                MCText $
-                  "Send */next* or just *.* for " <> tshow moreGroups <> " more result(s)."
+        sendFoundGroups reply gs moreGroups =
+          void . forkIO $ sendComposedMessages_ cc (SRDirect $ contactId' ct) msgs
+          where
+            msgs = replyMsg :| map foundGroup gs <> [moreMsg | moreGroups > 0]
+            replyMsg = (Just ciId, MCText reply)
+            foundGroup (GroupInfo {groupId, groupProfile = p@GroupProfile {image = image_}}, GroupSummary {currentMembers}) =
+              let membersStr = "_" <> tshow currentMembers <> " members_"
+                  showId = if isAdmin then tshow groupId <> ". " else ""
+                  text = showId <> groupInfoText p <> "\n" <> membersStr
+               in (Nothing, maybe (MCText text) (\image -> MCImage {text, image}) image_)
+            moreMsg = (Nothing, MCText $ "Send */next* or just *.* for " <> tshow moreGroups <> " more result(s).")
 
     deAdminCommand :: Contact -> ChatItemId -> DirectoryCmd 'DRAdmin -> IO ()
     deAdminCommand ct ciId cmd
       | knownCt `elem` adminUsers || knownCt `elem` superUsers = case cmd of
           DCApproveGroup {groupId, displayName = n, groupApprovalId} ->
-            withGroupAndReg sendReply groupId n $ \g gr ->
+            withGroupAndReg sendReply groupId n $ \g gr@GroupReg {userGroupRegId = ugrId} ->
               readTVarIO (groupRegStatus gr) >>= \case
                 GRSPendingApproval gaId
                   | gaId == groupApprovalId -> do
@@ -601,7 +837,13 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
                             Just GRSOk -> do
                               setGroupStatus st gr GRSActive
                               let approved = "The group " <> userGroupReference' gr n <> " is approved"
-                              notifyOwner gr $ approved <> " and listed in directory!\nPlease note: if you change the group profile it will be hidden from directory until it is re-approved."
+                              notifyOwner gr $
+                                (approved <> " and listed in directory - please moderate it!\n")
+                                  <> "Please note: if you change the group profile it will be hidden from directory until it is re-approved.\n\n"
+                                  <> "Supported commands:\n"
+                                  <> ("- */filter " <> tshow ugrId <> "* - to configure anti-spam filter.\n")
+                                  <> ("- */role " <> tshow ugrId <> "* - to set default member role.\n")
+                                  <> "- */help commands* - other commands."
                               invited <-
                                 forM ownersGroup $ \og@KnownGroup {localDisplayName = ogName} -> do
                                   inviteToOwnersGroup og gr $ \case
@@ -651,18 +893,21 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
             let groupRef = groupReference' groupId gName
             withGroupAndReg sendReply groupId gName $ \_ _ ->
               sendChatCmd cc (APIGetGroupLink groupId) >>= \case
-                CRGroupLink {connReqContact, memberRole} ->
+                Right CRGroupLink {connLinkContact = CCLink cReq _, memberRole} ->
                   sendReply $ T.unlines
                     [ "The link to join the group " <> groupRef <> ":",
-                      strEncodeTxt $ simplexChatContact connReqContact,
+                      strEncodeTxt $ simplexChatContact cReq,
                       "New member role: " <> strEncodeTxt memberRole
                     ]
-                CRChatCmdError _ (ChatErrorStore (SEGroupLinkNotFound _)) ->
+                Left (ChatErrorStore (SEGroupLinkNotFound _)) ->
                   sendReply $ "The group " <> groupRef <> " has no public link."
-                r -> do
+                Right r -> do
                   ts <- getCurrentTime
                   tz <- getCurrentTimeZone
-                  let resp = T.pack $ serializeChatResponse (Nothing, Just user) ts tz Nothing r
+                  let resp = T.pack $ serializeChatResponse (Nothing, Just user) (config cc) ts tz Nothing r
+                  sendReply $ "Unexpected error:\n" <> resp
+                Left e -> do
+                  let resp = T.pack $ serializeChatError True (config cc) e
                   sendReply $ "Unexpected error:\n" <> resp
           DCSendToGroupOwner groupId gName msg -> do
             let groupRef = groupReference' groupId gName
@@ -682,6 +927,8 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
                     sendReply $ "you" <> invited
                   Left err -> sendReply err
             Nothing -> sendReply "owners' group is not specified"
+          -- DCAddBlockedWord _word -> pure ()
+          -- DCRemoveBlockedWord _word -> pure ()
           DCCommandError tag -> sendReply $ "Command error: " <> tshow tag
       | otherwise = sendReply "You are not allowed to use this command"
       where
@@ -696,17 +943,17 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
                 else pure groups
             sendReply $ tshow (length grs) <> " registered group(s)" <> (if length grs > count then ", showing the last " <> tshow count else "")
             void . forkIO $ forM_ (reverse $ take count grs) $ \gr@GroupReg {dbGroupId, dbContactId} -> do
-              ct_ <- getContact cc dbContactId
+              ct_ <- getContact' cc user dbContactId
               let ownerStr = "Owner: " <> maybe "getContact error" localDisplayName' ct_
               sendGroupInfo ct gr dbGroupId $ Just ownerStr
         inviteToOwnersGroup :: KnownGroup -> GroupReg -> (Either Text () -> IO a) -> IO a
         inviteToOwnersGroup KnownGroup {groupId = ogId} GroupReg {dbContactId = ctId} cont =
           sendChatCmd cc (APIListMembers ogId) >>= \case
-            CRGroupMembers _ (Group _ ms)
+            Right (CRGroupMembers _ (Group _ ms))
               | alreadyMember ms -> cont $ Left "Owner is already a member of owners' group"
               | otherwise -> do
                   sendChatCmd cc (APIAddMember ogId ctId GRMember) >>= \case
-                    CRSentGroupInvitation {} -> do
+                    Right CRSentGroupInvitation {} -> do
                       printLog cc CLLInfo $ "invited contact ID " <> show ctId <> " to owners' group"
                       cont $ Right ()
                     r -> contErr r
@@ -718,7 +965,7 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
               putStrLn $ T.unpack err
               cont $ Left err
         groupOwnerInfo groupRef dbContactId = do
-          owner_ <- getContact cc dbContactId
+          owner_ <- getContact' cc user dbContactId
           let ownerInfo = "the owner of the group " <> groupRef
               ownerName ct' = "@" <> viewName (localDisplayName' ct') <> ", "
           pure $ maybe "" ownerName owner_ <> ownerInfo
@@ -727,10 +974,13 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
     deSuperUserCommand ct ciId cmd
       | knownContact ct `elem` superUsers = case cmd of
           DCExecuteCommand cmdStr ->
-            sendChatCmdStr cc cmdStr >>= \r -> do
-              ts <- getCurrentTime
-              tz <- getCurrentTimeZone
-              sendReply $ T.pack $ serializeChatResponse (Nothing, Just user) ts tz Nothing r
+            sendChatCmdStr cc cmdStr >>= \case
+              Right r -> do
+                ts <- getCurrentTime
+                tz <- getCurrentTimeZone
+                sendReply $ T.pack $ serializeChatResponse (Nothing, Just user) (config cc) ts tz Nothing r
+              Left e ->
+                sendReply $ T.pack $ serializeChatError True (config cc) e
           DCCommandError tag -> sendReply $ "Command error: " <> tshow tag
       | otherwise = sendReply "You are not allowed to use this command"
       where
@@ -743,12 +993,15 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
     mkSendReply ct ciId = sendComposedMessage cc ct (Just ciId) . MCText
 
     withGroupAndReg :: (Text -> IO ()) -> GroupId -> GroupName -> (GroupInfo -> GroupReg -> IO ()) -> IO ()
-    withGroupAndReg sendReply gId gName action =
-      getGroup cc gId >>= \case
+    withGroupAndReg sendReply gId = withGroupAndReg_ sendReply gId . Just
+
+    withGroupAndReg_ :: (Text -> IO ()) -> GroupId -> Maybe GroupName -> (GroupInfo -> GroupReg -> IO ()) -> IO ()
+    withGroupAndReg_ sendReply gId gName_ action =
+      getGroup cc user gId >>= \case
         Nothing -> sendReply $ "Group ID " <> tshow gId <> " not found (getGroup)"
         Just g@GroupInfo {groupProfile = GroupProfile {displayName}}
-          | displayName == gName ->
-              atomically (getGroupReg st gId) >>= \case
+          | maybe False (displayName ==) gName_ ->
+              getGroupReg st gId >>= \case
                 Nothing -> sendReply $ "Registration for group ID " <> tshow gId <> " not found (getGroupReg)"
                 Just gr -> action g gr
           | otherwise ->
@@ -758,7 +1011,7 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
     sendGroupInfo ct gr@GroupReg {dbGroupId} useGroupId ownerStr_ = do
       grStatus <- readTVarIO $ groupRegStatus gr
       let statusStr = "Status: " <> groupRegStatusText grStatus
-      getGroupAndSummary cc dbGroupId >>= \case
+      getGroupAndSummary cc user dbGroupId >>= \case
         Just (GroupInfo {groupProfile = p@GroupProfile {image = image_}}, GroupSummary {currentMembers}) -> do
           let membersStr = "_" <> tshow currentMembers <> " members_"
               text = T.unlines $ [tshow useGroupId <> ". " <> groupInfoText p] <> maybeToList ownerStr_ <> [membersStr, statusStr]
@@ -768,34 +1021,39 @@ directoryServiceEvent st DirectoryOpts {adminUsers, superUsers, serviceName, own
           let text = T.unlines $ [tshow useGroupId <> ". Error: getGroup. Please notify the developers."] <> maybeToList ownerStr_ <> [statusStr]
           sendComposedMessage cc ct Nothing $ MCText text
 
-getContact :: ChatController -> ContactId -> IO (Maybe Contact)
-getContact cc ctId = resp <$> sendChatCmd cc (APIGetChat (ChatRef CTDirect ctId) Nothing (CPLast 0) Nothing)
-  where
-    resp :: ChatResponse -> Maybe Contact
-    resp = \case
-      CRApiChat _ (AChat SCTDirect Chat {chatInfo = DirectChat ct}) _ -> Just ct
-      _ -> Nothing
+getContact' :: ChatController -> User -> ContactId -> IO (Maybe Contact)
+getContact' cc user ctId = withDB "getContact" cc $ \db -> getContact db (vr cc) user ctId
 
-getGroup :: ChatController -> GroupId -> IO (Maybe GroupInfo)
-getGroup cc gId = resp <$> sendChatCmd cc (APIGroupInfo gId)
-  where
-    resp :: ChatResponse -> Maybe GroupInfo
-    resp = \case
-      CRGroupInfo {groupInfo} -> Just groupInfo
-      _ -> Nothing
+getGroup :: ChatController -> User -> GroupId -> IO (Maybe GroupInfo)
+getGroup cc user gId = withDB "getGroupInfo" cc $ \db -> getGroupInfo db (vr cc) user gId
 
-getGroupAndSummary :: ChatController -> GroupId -> IO (Maybe (GroupInfo, GroupSummary))
-getGroupAndSummary cc gId = resp <$> sendChatCmd cc (APIGroupInfo gId)
-  where
-    resp = \case
-      CRGroupInfo {groupInfo, groupSummary} -> Just (groupInfo, groupSummary)
-      _ -> Nothing
+withDB' :: Text -> ChatController -> (DB.Connection -> IO a) -> IO (Maybe a)
+withDB' cxt cc a = withDB cxt cc $ ExceptT . fmap Right . a
 
-setGroupLinkRole :: ChatController -> GroupId -> GroupMemberRole -> IO (Maybe ConnReqContact)
-setGroupLinkRole cc gId mRole = resp <$> sendChatCmd cc (APIGroupLinkMemberRole gId mRole)
+withDB :: Text -> ChatController -> (DB.Connection -> ExceptT StoreError IO a) -> IO (Maybe a)
+withDB cxt ChatController {chatStore} action = do
+  r_ :: Either ChatError a <- withTransaction chatStore (runExceptT . withExceptT ChatErrorStore . action) `E.catches` handleDBErrors
+  case r_ of
+    Right r -> pure $ Just r
+    Left e -> Nothing <$ logError ("Database error: " <> cxt <> " " <> tshow e)
+
+getGroupAndSummary :: ChatController -> User -> GroupId -> IO (Maybe (GroupInfo, GroupSummary))
+getGroupAndSummary cc user gId =
+  withDB "getGroupAndSummary" cc $ \db -> (,) <$> getGroupInfo db (vr cc) user gId <*> liftIO (getGroupSummary db user gId)
+
+vr :: ChatController -> VersionRangeChat
+vr ChatController {config = ChatConfig {chatVRange}} = chatVRange
+{-# INLINE vr #-}
+
+getGroupLinkRole :: ChatController -> User -> GroupInfo -> IO (Maybe (Int64, CreatedLinkContact, GroupLinkId, GroupMemberRole))
+getGroupLinkRole cc user gInfo =
+  withDB "getGroupLink" cc $ \db -> getGroupLink db user gInfo
+
+setGroupLinkRole :: ChatController -> GroupInfo -> GroupMemberRole -> IO (Maybe ConnReqContact)
+setGroupLinkRole cc GroupInfo {groupId} mRole = resp <$> sendChatCmd cc (APIGroupLinkMemberRole groupId mRole)
   where
     resp = \case
-      CRGroupLink _ _ gLink _ -> Just gLink
+      Right (CRGroupLink _ _ (CCLink gLink _) _) -> Just gLink
       _ -> Nothing
 
 unexpectedError :: Text -> Text
diff --git a/apps/simplex-directory-service/src/Directory/Store.hs b/apps/simplex-directory-service/src/Directory/Store.hs
index cecb253e8d..628419ea1d 100644
--- a/apps/simplex-directory-service/src/Directory/Store.hs
+++ b/apps/simplex-directory-service/src/Directory/Store.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module Directory.Store
   ( DirectoryStore (..),
@@ -10,6 +11,9 @@ module Directory.Store
     GroupRegStatus (..),
     UserGroupRegId,
     GroupApprovalId,
+    DirectoryGroupData (..),
+    DirectoryMemberAcceptance (..),
+    ProfileCondition (..),
     restoreDirectoryStore,
     addGroupReg,
     delGroupReg,
@@ -21,25 +25,36 @@ module Directory.Store
     filterListedGroups,
     groupRegStatusText,
     pendingApproval,
+    groupRemoved,
+    fromCustomData,
+    toCustomData,
+    noJoinFilter,
+    basicJoinFilter,
+    moderateJoinFilter,
+    strongJoinFilter
   )
 where
 
 import Control.Concurrent.STM
 import Control.Monad
+import Data.Aeson ((.=), (.:))
+import qualified Data.Aeson.KeyMap as JM
+import qualified Data.Aeson.TH as JQ
+import qualified Data.Aeson.Types as JT
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
-import Data.Composition ((.:))
 import Data.Int (Int64)
 import Data.List (find, foldl', sortOn)
 import Data.Map (Map)
 import qualified Data.Map.Strict as M
-import Data.Maybe (isJust)
+import Data.Maybe (fromMaybe, isJust)
 import Data.Set (Set)
 import qualified Data.Set as S
 import Data.Text (Text)
 import Simplex.Chat.Types
 import Simplex.Messaging.Encoding.String
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON)
 import Simplex.Messaging.Util (ifM)
 import System.Directory (doesFileExist, renameFile)
 import System.IO (BufferMode (..), Handle, IOMode (..), hSetBuffering, openFile)
@@ -67,6 +82,51 @@ data GroupRegData = GroupRegData
     groupRegStatus_ :: GroupRegStatus
   }
 
+data DirectoryGroupData = DirectoryGroupData
+  { memberAcceptance :: DirectoryMemberAcceptance
+  }
+
+-- these filters are applied in the order of fields, depending on ProfileCondition:
+-- Nothing - do not apply
+-- Just
+--   PCAll - apply to all profiles
+--   PCNoImage - apply to profiles without images
+data DirectoryMemberAcceptance = DirectoryMemberAcceptance
+  { rejectNames :: Maybe ProfileCondition, -- reject long names and names with profanity
+    passCaptcha :: Maybe ProfileCondition, -- run captcha challenge with joining members
+    makeObserver :: Maybe ProfileCondition -- the role assigned in the end, after captcha challenge
+  }
+  deriving (Eq, Show)
+
+data ProfileCondition = PCAll | PCNoImage deriving (Eq, Show)
+
+noJoinFilter :: DirectoryMemberAcceptance
+noJoinFilter = DirectoryMemberAcceptance Nothing Nothing Nothing
+
+basicJoinFilter :: DirectoryMemberAcceptance
+basicJoinFilter =
+  DirectoryMemberAcceptance
+    { rejectNames = Just PCNoImage,
+      passCaptcha = Nothing,
+      makeObserver = Nothing
+    }
+
+moderateJoinFilter :: DirectoryMemberAcceptance
+moderateJoinFilter =
+  DirectoryMemberAcceptance
+    { rejectNames = Just PCAll,
+      passCaptcha = Just PCNoImage,
+      makeObserver = Nothing
+    }
+
+strongJoinFilter :: DirectoryMemberAcceptance
+strongJoinFilter =
+  DirectoryMemberAcceptance
+    { rejectNames = Just PCAll,
+      passCaptcha = Just PCAll,
+      makeObserver = Nothing
+    }
+
 type UserGroupRegId = Int64
 
 type GroupApprovalId = Int64
@@ -80,13 +140,19 @@ data GroupRegStatus
   | GRSSuspended
   | GRSSuspendedBadRoles
   | GRSRemoved
+  deriving (Show)
 
 pendingApproval :: GroupRegStatus -> Bool
 pendingApproval = \case
   GRSPendingApproval _ -> True
   _ -> False
 
-data DirectoryStatus = DSListed | DSReserved | DSRegistered
+groupRemoved :: GroupRegStatus -> Bool
+groupRemoved = \case
+  GRSRemoved -> True
+  _ -> False
+
+data DirectoryStatus = DSListed | DSReserved | DSRegistered | DSRemoved
 
 groupRegStatusText :: GroupRegStatus -> Text
 groupRegStatusText = \case
@@ -104,18 +170,34 @@ grDirectoryStatus = \case
   GRSActive -> DSListed
   GRSSuspended -> DSReserved
   GRSSuspendedBadRoles -> DSReserved
+  GRSRemoved -> DSRemoved
   _ -> DSRegistered
 
+$(JQ.deriveJSON (enumJSON $ dropPrefix "PC") ''ProfileCondition)
+
+$(JQ.deriveJSON defaultJSON ''DirectoryMemberAcceptance)
+
+$(JQ.deriveJSON defaultJSON ''DirectoryGroupData)
+
+fromCustomData :: Maybe CustomData -> DirectoryGroupData
+fromCustomData cd_ =
+  let memberAcceptance = fromMaybe noJoinFilter $ cd_ >>= \(CustomData o) -> JT.parseMaybe (.: "memberAcceptance") o
+   in DirectoryGroupData {memberAcceptance}
+
+toCustomData :: DirectoryGroupData -> CustomData
+toCustomData DirectoryGroupData {memberAcceptance} =
+  CustomData $ JM.fromList ["memberAcceptance" .= memberAcceptance]
+
 addGroupReg :: DirectoryStore -> Contact -> GroupInfo -> GroupRegStatus -> IO UserGroupRegId
 addGroupReg st ct GroupInfo {groupId} grStatus = do
-  grData <- atomically addGroupReg_
+  grData <- addGroupReg_
   logGCreate st grData
   pure $ userGroupRegId_ grData
   where
     addGroupReg_ = do
       let grData = GroupRegData {dbGroupId_ = groupId, userGroupRegId_ = 1, dbContactId_ = ctId, dbOwnerMemberId_ = Nothing, groupRegStatus_ = grStatus}
       gr <- dataToGroupReg grData
-      stateTVar (groupRegs st) $ \grs ->
+      atomically $ stateTVar (groupRegs st) $ \grs ->
         let ugrId = 1 + foldl' maxUgrId 0 grs
             grData' = grData {userGroupRegId_ = ugrId}
             gr' = gr {userGroupRegId = ugrId}
@@ -126,10 +208,11 @@ addGroupReg st ct GroupInfo {groupId} grStatus = do
       | otherwise = mx
 
 delGroupReg :: DirectoryStore -> GroupReg -> IO ()
-delGroupReg st GroupReg {dbGroupId = gId} = do
+delGroupReg st GroupReg {dbGroupId = gId, groupRegStatus} = do
   logGDelete st gId
+  atomically $ writeTVar groupRegStatus GRSRemoved
   atomically $ unlistGroup st gId
-  atomically $ modifyTVar' (groupRegs st) $ filter ((gId ==) . dbGroupId)
+  atomically $ modifyTVar' (groupRegs st) $ filter ((gId /=) . dbGroupId)
 
 setGroupStatus :: DirectoryStore -> GroupReg -> GroupRegStatus -> IO ()
 setGroupStatus st gr grStatus = do
@@ -142,6 +225,7 @@ setGroupStatus st gr grStatus = do
       DSListed -> listGroup
       DSReserved -> reserveGroup
       DSRegistered -> unlistGroup
+      DSRemoved -> unlistGroup
 
 setGroupRegOwner :: DirectoryStore -> GroupReg -> GroupMember -> IO ()
 setGroupRegOwner st gr owner = do
@@ -149,18 +233,18 @@ setGroupRegOwner st gr owner = do
   logGUpdateOwner st (dbGroupId gr) memberId
   atomically $ writeTVar (dbOwnerMemberId gr) (Just memberId)
 
-getGroupReg :: DirectoryStore -> GroupId -> STM (Maybe GroupReg)
-getGroupReg st gId = find ((gId ==) . dbGroupId) <$> readTVar (groupRegs st)
+getGroupReg :: DirectoryStore -> GroupId -> IO (Maybe GroupReg)
+getGroupReg st gId = find ((gId ==) . dbGroupId) <$> readTVarIO (groupRegs st)
 
-getUserGroupReg :: DirectoryStore -> ContactId -> UserGroupRegId -> STM (Maybe GroupReg)
-getUserGroupReg st ctId ugrId = find (\r -> ctId == dbContactId r && ugrId == userGroupRegId r) <$> readTVar (groupRegs st)
+getUserGroupReg :: DirectoryStore -> ContactId -> UserGroupRegId -> IO (Maybe GroupReg)
+getUserGroupReg st ctId ugrId = find (\r -> ctId == dbContactId r && ugrId == userGroupRegId r) <$> readTVarIO (groupRegs st)
 
-getUserGroupRegs :: DirectoryStore -> ContactId -> STM [GroupReg]
-getUserGroupRegs st ctId = filter ((ctId ==) . dbContactId) <$> readTVar (groupRegs st)
+getUserGroupRegs :: DirectoryStore -> ContactId -> IO [GroupReg]
+getUserGroupRegs st ctId = filter ((ctId ==) . dbContactId) <$> readTVarIO (groupRegs st)
 
-filterListedGroups :: DirectoryStore -> [(GroupInfo, GroupSummary)] -> STM [(GroupInfo, GroupSummary)]
+filterListedGroups :: DirectoryStore -> [(GroupInfo, GroupSummary)] -> IO [(GroupInfo, GroupSummary)]
 filterListedGroups st gs = do
-  lgs <- readTVar $ listedGroups st
+  lgs <- readTVarIO $ listedGroups st
   pure $ filter (\(GroupInfo {groupId}, _) -> groupId `S.member` lgs) gs
 
 listGroup :: DirectoryStore -> GroupId -> STM ()
@@ -200,10 +284,10 @@ logGDelete :: DirectoryStore -> GroupId -> IO ()
 logGDelete st = logDLR st . GRDelete
 
 logGUpdateStatus :: DirectoryStore -> GroupId -> GroupRegStatus -> IO ()
-logGUpdateStatus st = logDLR st .: GRUpdateStatus
+logGUpdateStatus st gId = logDLR st . GRUpdateStatus gId
 
 logGUpdateOwner :: DirectoryStore -> GroupId -> GroupMemberId -> IO ()
-logGUpdateOwner st = logDLR st .: GRUpdateOwner
+logGUpdateOwner st gId = logDLR st . GRUpdateOwner gId
 
 instance StrEncoding DLRTag where
   strEncode = \case
@@ -271,10 +355,10 @@ instance StrEncoding GroupRegStatus where
       "removed" -> pure GRSRemoved
       _ -> fail "invalid GroupRegStatus"
 
-dataToGroupReg :: GroupRegData -> STM GroupReg
+dataToGroupReg :: GroupRegData -> IO GroupReg
 dataToGroupReg GroupRegData {dbGroupId_, userGroupRegId_, dbContactId_, dbOwnerMemberId_, groupRegStatus_} = do
-  dbOwnerMemberId <- newTVar dbOwnerMemberId_
-  groupRegStatus <- newTVar groupRegStatus_
+  dbOwnerMemberId <- newTVarIO dbOwnerMemberId_
+  groupRegStatus <- newTVarIO groupRegStatus_
   pure
     GroupReg
       { dbGroupId = dbGroupId_,
@@ -286,10 +370,9 @@ dataToGroupReg GroupRegData {dbGroupId_, userGroupRegId_, dbContactId_, dbOwnerM
 
 restoreDirectoryStore :: Maybe FilePath -> IO DirectoryStore
 restoreDirectoryStore = \case
-  Just f -> ifM (doesFileExist f) (restore f) (newFile f >>= new . Just)
-  Nothing -> new Nothing
+  Just f -> ifM (doesFileExist f) (restore f) (newFile f >>= newDirectoryStore . Just)
+  Nothing -> newDirectoryStore Nothing
   where
-    new = atomically . newDirectoryStore
     newFile f = do
       h <- openFile f WriteMode
       hSetBuffering h LineBuffering
@@ -298,15 +381,15 @@ restoreDirectoryStore = \case
       grs <- readDirectoryData f
       renameFile f (f <> ".bak")
       h <- writeDirectoryData f grs -- compact
-      atomically $ mkDirectoryStore h grs
+      mkDirectoryStore h grs
 
 emptyStoreData :: ([GroupReg], Set GroupId, Set GroupId)
 emptyStoreData = ([], S.empty, S.empty)
 
-newDirectoryStore :: Maybe Handle -> STM DirectoryStore
+newDirectoryStore :: Maybe Handle -> IO DirectoryStore
 newDirectoryStore = (`mkDirectoryStore_` emptyStoreData)
 
-mkDirectoryStore :: Handle -> [GroupRegData] -> STM DirectoryStore
+mkDirectoryStore :: Handle -> [GroupRegData] -> IO DirectoryStore
 mkDirectoryStore h groups =
   foldM addGroupRegData emptyStoreData groups >>= mkDirectoryStore_ (Just h)
   where
@@ -317,12 +400,13 @@ mkDirectoryStore h groups =
         DSListed -> (grs', S.insert gId listed, reserved)
         DSReserved -> (grs', listed, S.insert gId reserved)
         DSRegistered -> (grs', listed, reserved)
+        DSRemoved -> (grs, listed, reserved)
 
-mkDirectoryStore_ :: Maybe Handle -> ([GroupReg], Set GroupId, Set GroupId) -> STM DirectoryStore
+mkDirectoryStore_ :: Maybe Handle -> ([GroupReg], Set GroupId, Set GroupId) -> IO DirectoryStore
 mkDirectoryStore_ h (grs, listed, reserved) = do
-  groupRegs <- newTVar grs
-  listedGroups <- newTVar listed
-  reservedGroups <- newTVar reserved
+  groupRegs <- newTVarIO grs
+  listedGroups <- newTVarIO listed
+  reservedGroups <- newTVarIO reserved
   pure DirectoryStore {groupRegs, listedGroups, reservedGroups, directoryLogFile = h}
 
 readDirectoryData :: FilePath -> IO [GroupRegData]
diff --git a/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md b/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
index 13a514c175..55158130f8 100644
--- a/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
+++ b/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
@@ -164,7 +164,7 @@ The main objective here is to establish the framework for comparing the security
 <sup>2</sup> Post-quantum cryptography is available in beta version, as opt-in only for direct conversations. See below how it will be rolled-out further.
 
 Some columns are marked with a yellow checkmark:
-- when messages are padded, but not to a fixed size.
+- when messages are padded, but not to a fixed size (Briar pads messages to the size rounded up to 1024 bytes, Signal - to 160 bytes).
 - when repudiation does not include client-server connection. In case of Cwtch it appears that the presence of cryptographic signatures compromises repudiation (deniability), but it needs to be clarified.
 - when 2-factor key exchange is optional (via security code verification).
 - when post-quantum cryptography is only added to the initial key agreement and does not protect break-in recovery.
diff --git a/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.md b/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.md
new file mode 100644
index 0000000000..f1aa3a243f
--- /dev/null
+++ b/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.md
@@ -0,0 +1,188 @@
+---
+layout: layouts/article.html
+title: "SimpleX Chat v6.3: new user experience and safety in public groups"
+date: 2025-03-08
+previewBody: blog_previews/20250308.html
+image: images/20250308-captcha.png
+imageBottom: true
+permalink: "/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html"
+---
+
+# SimpleX Chat v6.3: new user experience and safety in public groups
+
+**Published:** Mar 8, 2025
+
+**What's new in v6.3**:
+- [preventing spam and abuse in public groups](#preventing-spam-and-abuse-in-public-groups).
+- [group improvements](#group-improvements): [mention other members](#mention-other-members-and-get-notified-when-mentioned), [improved performance](#better-group-performance).
+- [better chat navigation](#better-chat-navigation): [organize chats into lists](#organize-chats-into-lists) and [jump to found and forwarded messages](#jump-to-found-and-forwarded-messages).
+- [privacy and security improvements](#privacy-and-security-improvements): [chat retention period](#set-message-retention-period-in-chats) and [private media file names](#private-media-file-names).
+
+Also, we added Catalan interface language to Android and desktop apps, thanks to [our users and Weblate](https://github.com/simplex-chat/simplex-chat#help-translating-simplex-chat).
+
+The last but not the least - [server builds are now reproducible](#reproducible-server-builds).
+
+## What's new in v6.3
+
+## Preventing spam and abuse in public groups
+
+[We wrote before](./20250114-simplex-network-large-groups-privacy-preserving-content-moderation.md): as the network grows, it becomes more attractive to attackers. This release adds several features that reduce the possibility of attacks and abuse.
+
+### Spam in groups that are listed in our group directory
+
+There is no built-in group discovery in SimpleX Chat apps. Instead, we offer an experimental chat bot that allows to submit and to discover public groups. Not so long ago, spammers started sending messages via bots attempting to disrupt these groups.
+
+We released several changes to the groups directory to protect from spam attacks.
+
+**Optional captcha verification**
+
+<img src="./images/20250308-captcha.png" width="288" class="float-to-right">
+
+Group owners can enable the requirement to pass captcha challenge before joining the group. Captcha is generated in the directory bot itself, without any 3rd party servers, and is sent to the joining member. The new member must reply with the text in the image to be accepted to the group. While not a perfect protection, this basic measure complicates programming automatic bots to join public groups. It also provides a foundation to implement "knocking" - a conversation with dedicated group admins prior to joining the group. We plan to release support for knocking in March.
+
+**Profanity filter for member names**
+
+While group settings support giving all joining member an "observer" role - that is, without the right to send messages - the attackers tried spaming groups by joining and leaving. We added an optional filter for member names that group owners can enable for groups listed in directory - if a member name contains profanity, they will be rejected. Further improvements will be released in March as well.
+
+The current SimpleX directory chatbot is a hybrid of [future chat relays](./20250114-simplex-network-large-groups-privacy-preserving-content-moderation.md#can-large-groups-scale) (a.k.a. super-peers) we are now developing to support large groups, and of a directory service that will be embedded in the app UI later this year, allowing to search and to discover public groups. Anybody is able to run their own directory bots now, and there will be possibility to use third party directories via the app UI in the future too.
+
+Read more about [SimpleX group directory](../docs/DIRECTORY.md), how to submit your groups, and which groups we now accept. Currently we accept groups related to a limited list of topics that will be expanded once we have better moderation functionality for the groups.
+
+### More power to group owners and moderators
+
+This release includes two new features to help group moderators.
+
+<img src="./images/20250308-reports.png" width="288" class="float-to-right">
+
+**Private reports**
+
+Group members can privately bring to group moderators attention specific messages and members, even if the group does not allow direct messages. The simply need to choose report in the message context menu and choose the report reason. This report will be visible to all group owners and moderators, but not to other members.
+
+Group moderators can see all member reports in a separate view, and quickly find the problematic messages, making moderation much easier in public groups. These reports are private to groups, they are not sent to server operators.
+
+Please note: in the groups listed in our directory, the directory bot acts as admin, so it will receive all reports as well.
+
+**Acting on multiple members at once**
+
+When attackers come, they often use multiple profiles. This version allows selecting multiple members at once and perform these actions on all selected members:
+- switch members role between "observer" and "member".
+- block and unblock members - this is a "shadow" block, so when you block multiple members who you believe are attackers, their messages will be blocked for all other members but not for them.
+- remove members from the group.
+
+The next version will also allow to remove members together with all messages they sent - for example, if a spam bot joined and sent a lot of spam, but nothing of value.
+
+## Group improvements
+
+### Mention other members and get notified when mentioned
+
+<img src="./images/20250308-mentions.png" width="288" class="float-to-right">
+
+This feature allows you to mention other members in the group in the usual way - type `@` character, and choose the member you want to mention from the menu. Even that there is no user accounts and persistent identities we made it work by referencing members by their random group ID that is also used for replies and all other interactions in the group.
+
+You can also now switch message notifications in the group to "mentions only" mode. You will be notified only when you are mentioned in a message, or when somebody replies to your message. Simply choose "Mute" in the context menu of the group in the list of chats to switch group notifications to "mentions only" mode. After that you can choose "Mute all" to disable all notifications, including mentions.
+
+### Better group performance
+
+**Send messages faster**
+
+We didn't reduce the required network traffic to send messages to large groups yet - your client still has to send message to each member individually. But we redesigned the process of sending a message, reducing temporary storage required to schedule the message for delivery by about 100x. This creates a significant storage saving - e.g, to send one message to a group of 1,000 members previously required ~20Mb, and now it is reduced to ~200kb. It also reduces the time and battery used to send a message.
+
+**Faster group deletion**
+
+When you leave the group, the app preserves a copy of all your communications in the group. You can choose to keep it or to delete it completely. This final group deletion was very slow prior to this release - depending on the number of groups on your device it could sometimes take several minutes.
+
+This release solved this problem – the time it takes to delete the group is reduced to seconds, and even in cases when the app is terminated half-way, it either rolls back or completes, but it cannot leave the group in a partially deleted state. It improves both user experience and privacy, as gives you better control over your data.
+
+## Better chat navigation
+
+### Organize chats into lists
+
+<img src="./images/20250308-lists.png" width="288" class="float-to-right">
+
+It is a common feature in many messengers – it helps organizing your conversations.
+
+The lists also show a blue mark when any chat in the list has new messages.
+
+There are several preset lists: contacts, groups, private notes, business chats, favourite chats and also groups with member reports - the last list is automatically shown if members of any groups where you are the moderator or the owner sent private reports, until these reports are acted on or archived.
+
+### Jump to found and forwarded messages
+
+This version allows to quickly navigate from message in the search results to the point in the conversation when it was sent.
+
+You can also navigate from the forwarded message (or from the message saved to private notes) to the original message in the chat where it was forwarded or saved from.
+
+## Privacy and security improvements
+
+### Set message retention period in chats
+
+Before this version, you could enable message retention period for all chats in your profile. While helpful in some cases, many of us have conversations that we want to keep for a long time, and some other conversations that we want to remove quicker.
+
+This version allows it - you can set different retention periods in different conversations. It can be 1 day, 1 week, 1 month or 1 year. We may allow custom retention time in the future.
+
+### Private media file names
+
+Previously there were scenarios when original media file names were preserved - e.g., when sending a video file or when forwarding any media file. The latter problem was worse, as media file name is generated automatically, and includes timestamp. So the same name could have been used to correlate files between conversations, as one of our users pointed out.
+
+This version fixes this problem - media file name is now changed when forwarding it to match the time of forwarding, so no additional metadata is revealed.
+
+Please also note:
+- the apps remove metadata from all static images,
+- iOS app removes metadata from videos, but android and desktop apps do not do it yet,
+- animated images are sent as is,
+- other file types are sent as is, and their names are left unchanged - we believe that for ordinary files their name is part of their content.
+
+We plan further improvements to reduce metadata in files in the near future – please let us know what you believe is the most important to reduce first.
+
+## Reproducible server builds
+
+Starting from v6.3 server releases are reproducible!
+
+**Why it is important**
+
+With reproducible builds anybody can build servers from our code following the same process, and the build would produce identical binaries.
+
+This also allows us to sign releases, as we reproduce GitHub builds ourselves and by signing them we attest that our builds resulted in identical binaries.
+
+**How to reproduce builds**
+
+You can reproduce our builds on Linux with x86 CPU in docker container - please follow the instructions [here](../docs/SERVER.md#reproduce-builds).
+
+We are looking for support from open-source contributors or security researchers who would also reproduce and sign our releases.
+
+**How to verify release signature**
+
+Please see the instructions [here](../docs/SERVER.md#verifying-server-binaries).
+
+## SimpleX network
+
+Some links to answer the most common questions:
+
+[How can SimpleX deliver messages without user identifiers](./20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers).
+
+[What are the risks to have identifiers assigned to the users](./20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.md#why-having-users-identifiers-is-bad-for-the-users).
+
+[Technical details and limitations](https://github.com/simplex-chat/simplex-chat#privacy-and-security-technical-details-and-limitations).
+
+[Frequently asked questions](../docs/FAQ.md).
+
+Please also see our [website](https://simplex.chat).
+
+## Please support us with your donations
+
+Huge *thank you* to everybody who donated to SimpleX Chat!
+
+Prioritizing users privacy and security, and also raising the investment, would have been impossible without your support and donations.
+
+Also, funding the work to transition the protocols to non-profit governance model would not have been possible without the donations we received from the users.
+
+Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
+
+Your donations help us raise more funds &mdash; any amount, even the price of the cup of coffee, makes a big difference for us.
+
+See [this section](https://github.com/simplex-chat/simplex-chat/#please-support-us-with-your-donations) for the ways to donate.
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder
diff --git a/blog/README.md b/blog/README.md
index 1432d95de5..00a84eca6c 100644
--- a/blog/README.md
+++ b/blog/README.md
@@ -1,5 +1,25 @@
 # Blog
 
+Mar 3, 2025 [SimpleX Chat v6.3: new user experience and safety in public groups](./20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
+
+What's new in v6.3:
+- preventing spam and abuse in public groups.
+- group improvements: mention other members and improved performance.
+- better chat navigation: organize chats into lists and jump to found and forwarded messages.
+- privacy and security improvements: chat retention period and private media file names.
+
+Also, we added Catalan interface language to Android and desktop apps, thanks to our users and Weblate.
+
+The last but not the least - server builds are now reproducible!
+
+--
+
+Jan 14, 2025 [SimpleX network: large groups and privacy-preserving content moderation](./20250114-simplex-network-large-groups-privacy-preserving-content-moderation.md)
+
+This post explains how server operators can moderate end-to-end encrypted conversations without compromising user privacy or end-to-end encryption.
+
+--
+
 Dec 10, 2024 [SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
 
 - SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app to improve metadata privacy in SimpleX network.
@@ -19,7 +39,7 @@ Nov 25, 2024 [Servers operated by Flux - true privacy and decentralization for a
 
 ---
 
-Oct 14, 2024 [SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
+Oct 14, 2024 [SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience](./20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
 
 New security audit: Trail of Bits reviewed the cryptographic design of protocols used in SimpleX network and apps.
 
diff --git a/blog/images/20240314-comparison.jpg b/blog/images/20240314-comparison.jpg
index 5ff22be005..815922aa7a 100644
Binary files a/blog/images/20240314-comparison.jpg and b/blog/images/20240314-comparison.jpg differ
diff --git a/blog/images/20250308-captcha.png b/blog/images/20250308-captcha.png
new file mode 100644
index 0000000000..7f43b47bd1
Binary files /dev/null and b/blog/images/20250308-captcha.png differ
diff --git a/blog/images/20250308-lists.png b/blog/images/20250308-lists.png
new file mode 100644
index 0000000000..cd15adbcbc
Binary files /dev/null and b/blog/images/20250308-lists.png differ
diff --git a/blog/images/20250308-mentions.png b/blog/images/20250308-mentions.png
new file mode 100644
index 0000000000..658c7e0011
Binary files /dev/null and b/blog/images/20250308-mentions.png differ
diff --git a/blog/images/20250308-reports.png b/blog/images/20250308-reports.png
new file mode 100644
index 0000000000..def06bf83e
Binary files /dev/null and b/blog/images/20250308-reports.png differ
diff --git a/cabal.project b/cabal.project
index 9a7346c4d0..012eb62618 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 23189753751dc52046865ce2d992335495020e91
+    tag: 56ea2fdd56af5f5a5da41642486aa086d7371823
 
 source-repository-package
     type: git
diff --git a/docs/SERVER.md b/docs/SERVER.md
index 9c3f2f619e..f45403be8a 100644
--- a/docs/SERVER.md
+++ b/docs/SERVER.md
@@ -7,35 +7,53 @@ revision: 12.10.2024
 
 | Updated 12.10.2024 | Languages: EN, [FR](/docs/lang/fr/SERVER.md), [CZ](/docs/lang/cs/SERVER.md), [PL](/docs/lang/pl/SERVER.md) |
 
-### Table of Contents
+## Table of Contents
 
-- [Quick start](#quick-start)
-- [Detailed guide](#detailed-guide)
-  - [Overview](#overview)
-  - [Installation](#installation)
-  - [Configuration](#configuration)
-    - [Interactively](#interactively)
-    - [Via command line options](#via-command-line-options)
-  - [Further configuration](#further-configuration)
-  - [Server security](#server-security)
-    - [Initialization](#initialization)
-    - [Private keys](#private-keys)
-    - [Online certificate rotation](#online-certificate-rotation)
-  - [Tor: installation and configuration](#tor-installation-and-configuration)
-    - [Installation for onion address](#installation-for-onion-address)
-    - [SOCKS port for SMP PROXY](#socks-port-for-smp-proxy)
-  - [Server information page](#server-information-page)
-  - [Documentation](#documentation)
-    - [SMP server address](#smp-server-address)
-    - [Systemd commands](#systemd-commands)
-    - [Control port](#control-port)
-    - [Daily statistics](#daily-statistics)
-  - [Updating your SMP server](#updating-your-smp-server)
-  - [Configuring the app to use the server](#configuring-the-app-to-use-the-server)
+- [Overview](#overview)
+- [Quick start](#quick-start) with systemd service
+- [Installation options](#installation-options)
+   - [systemd service](#systemd-service) with [installation script](#installation-script) or [manually](#manual-deployment)
+   - [docker container](#docker-container)
+   - [Linode marketplace](#linode-marketplace)
+- [Verifying server binaries](#verifying-server-binaries)
+- [Configuration](#configuration)
+   - [Interactively](#interactively)
+   - [Via command line options](#via-command-line-options)
+- [Further configuration](#further-configuration)
+- [Server security](#server-security)
+   - [Initialization](#initialization)
+   - [Private keys](#private-keys)
+   - [Online certificate rotation](#online-certificate-rotation)
+- [Tor: installation and configuration](#tor-installation-and-configuration)
+   - [Installation for onion address](#installation-for-onion-address)
+   - [SOCKS port for SMP PROXY](#socks-port-for-smp-proxy)
+- [Server information page](#server-information-page)
+- [Documentation](#documentation)
+   - [SMP server address](#smp-server-address)
+   - [Systemd commands](#systemd-commands)
+   - [Control port](#control-port)
+   - [Daily statistics](#daily-statistics)
+- [Reproduce builds](#reproduce-builds)
+- [Updating your SMP server](#updating-your-smp-server)
+- [Configuring the app to use the server](#configuring-the-app-to-use-the-server)
+
+## Overview
+
+SMP server is the relay server used to pass messages in SimpleX network. SimpleX Chat apps have preset servers (for mobile apps these are smp11, smp12 and smp14.simplex.im), but you can easily change app configuration to use other servers.
+
+SimpleX clients only determine which server is used to receive the messages, separately for each contact (or group connection with a group member), and these servers are only temporary, as the delivery address can change.
+
+To create SMP server, you'll need:
+
+1. VPS or any other server.
+2. Your own domain, pointed at the server (`smp.example.com`)
+3. A basic Linux knowledge.
+
+_Please note_: when you change the servers in the app configuration, it only affects which servers will be used for the new contacts, the existing contacts will not automatically move to the new servers, but you can move them manually using ["Change receiving address"](../blog/20221108-simplex-chat-v4.2-security-audit-new-website.md#change-your-delivery-address-beta) button in contact/member information pages – it will be automated in the future.
 
 ## Quick start
 
-To create SMP server, you'll need:
+To create SMP server as a systemd service, you'll need:
 
 - VPS or any other server.
 - Your server domain, with A and AAAA records specifying server IPv4 and IPv6 addresses (`smp1.example.com`)
@@ -228,34 +246,43 @@ To create SMP server, you'll need:
     echo "$smp,$tor"
     ```
 
-## Detailed guide
+## Installation options
 
-### Overview
+You can install SMP server in one of the following ways:
 
-SMP server is the relay server used to pass messages in SimpleX network. SimpleX Chat apps have preset servers (for mobile apps these are smp11, smp12 and smp14.simplex.im), but you can easily change app configuration to use other servers.
+- [systemd service](#systemd-service)
+   - using [installation script](#installation-script) - **recommended**
+   - or [manually](#manual-deployment)
+- [Docker container](#docker-container) from DockerHub
+- [Linode marketplace](#linode-marketplace)
 
-SimpleX clients only determine which server is used to receive the messages, separately for each contact (or group connection with a group member), and these servers are only temporary, as the delivery address can change.
+### systemd service
 
-To create SMP server, you'll need:
+#### Installation script
 
-1. VPS or any other server.
-2. Your own domain, pointed at the server (`smp.example.com`)
-3. A basic Linux knowledge.
+This installation script will automatically install binaries, systemd services and additional scripts that will manage backups, updates and uninstallation. This is the recommended option due to its flexibility, easy updating, and being battle tested on our servers.
 
-_Please note_: when you change the servers in the app configuration, it only affects which servers will be used for the new contacts, the existing contacts will not automatically move to the new servers, but you can move them manually using ["Change receiving address"](../blog/20221108-simplex-chat-v4.2-security-audit-new-website.md#change-your-delivery-address-beta) button in contact/member information pages – it will be automated in the future.
+**Please note** that currently only Ubuntu distribution is supported.
 
-### Installation
+Run the following script on the server:
 
-1. First, install `smp-server`:
+```sh
+curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/simplex-chat/simplexmq/stable/install.sh -o simplex-server-install.sh &&\
+if echo '53fcdb4ceab324316e2c4cda7e84dbbb344f32550a65975a7895425e5a1be757 simplex-server-install.sh' | sha256sum -c; then
+  chmod +x ./simplex-server-install.sh
+  ./simplex-server-install.sh
+  rm ./simplex-server-install.sh
+else
+  echo "SHA-256 checksum is incorrect!"
+  rm ./simplex-server-install.sh
+fi
+```
 
-   - Manual deployment (see below)
+Type `1` and hit enter to install `smp-server`.
 
-   - Semi-automatic deployment:
-     - [Installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
-     - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
+#### Manual deployment
 
-Manual installation requires some preliminary actions:
+Manual installation is the most advanced deployment that provides the most flexibility. Generally recommended only for advanced users.
 
 1. Install binary:
 
@@ -317,7 +344,202 @@ Manual installation requires some preliminary actions:
 
    And execute `sudo systemctl daemon-reload`.
 
-### Configuration
+### Docker container
+
+You can deploy smp-server using Docker Compose. This is second recommended option due to its popularity and relatively easy deployment.
+
+This deployment provides two Docker Compose files: the **automatic** one and **manual**. If you're not sure, choose **automatic**.
+
+This will download images from [Docker Hub](https://hub.docker.com/r/simplexchat).
+
+#### Docker: Automatic setup
+
+This configuration provides quick and easy way to setup your SMP server: Caddy will automatically manage Let's Encrypt certificates and redirect HTTP to HTTPS, while smp-server will serve both [server information page](#server-information-page) and SMP Protocol by 443 port. 5223 port is used as fallback.
+
+**Please note** that you _must_ have `80` and `443` ports unallocated by other servers.
+
+1. Create `smp-server` directory and switch to it:
+
+  ```sh
+  mkdir smp-server && cd smp-server
+  ```
+
+2. Create `docker-compose.yml` file with the following content:
+
+  You can also grab it from here - [docker-compose-smp-complete.yml](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-smp-complete.yml). Don't forget to rename it to `docker-compose.yml`.
+
+  ```yaml
+  name: SimpleX Chat - smp-server
+
+  services:
+    oneshot:
+      image: ubuntu:latest
+      environment:
+        CADDYCONF: |
+          ${CADDY_OPTS:-}
+
+          http://{$$ADDR} {
+              redir https://{$$ADDR}{uri} permanent
+          }
+
+          {$$ADDR}:8443 {
+              tls {
+                  key_type rsa4096
+              }
+          }
+      command: sh -c 'if [ ! -f /etc/caddy/Caddyfile ]; then printf "$${CADDYCONF}" > /etc/caddy/Caddyfile; fi'
+      volumes:
+        - ./caddy_conf:/etc/caddy
+
+    caddy:
+      image: caddy:latest
+      depends_on:
+        oneshot:
+          condition: service_completed_successfully
+      cap_add:
+        - NET_ADMIN
+      environment:
+        ADDR: ${ADDR?"Please specify the domain."}
+      volumes:
+        - ./caddy_conf:/etc/caddy
+        - caddy_data:/data
+        - caddy_config:/config
+      ports:
+        - 80:80
+      restart: unless-stopped
+      healthcheck:
+        test: "test -d /data/caddy/certificates/${CERT_PATH:-acme-v02.api.letsencrypt.org-directory}/${ADDR} || exit 1"
+        interval: 1s
+        retries: 60
+
+    smp-server:
+      image: ${SIMPLEX_IMAGE:-simplexchat/smp-server:latest}
+      depends_on:
+        caddy:
+          condition: service_healthy
+      environment:
+        ADDR: ${ADDR?"Please specify the domain."}
+        PASS: ${PASS:-}
+      volumes:
+        - ./smp_configs:/etc/opt/simplex
+        - ./smp_state:/var/opt/simplex
+        - type: volume
+          source: caddy_data
+          target: /certificates
+          volume:
+            subpath: "caddy/certificates/${CERT_PATH:-acme-v02.api.letsencrypt.org-directory}/${ADDR}"
+      ports:
+        - 443:443
+        - 5223:5223
+      restart: unless-stopped
+
+  volumes:
+    caddy_data:
+    caddy_config:
+  ```
+
+3. In the same directory, create `.env` file with the following content:
+
+  You can also grab it from here - [docker-compose-smp-complete.env](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-smp-complete.env). Don't forget to rename it to `.env`.
+
+  Change variables according to your preferences.
+
+  ```env
+  # Mandatory
+  ADDR=your_ip_or_addr
+
+  # Optional
+  #PASS='123123'
+  ```
+
+4. Start your containers:
+
+  ```sh
+  docker compose up
+  ```
+
+#### Docker: Manual setup
+
+If you know what you are doing, this configuration provides bare SMP server setup without automatically managed Let's Encrypt certificates by Caddy to serve [server information page](#server-information-page) with 5223 port set as primary.
+
+This configuration allows you to retain the ability to manage 80 and 443 ports yourself. As a downside, SMP server **can not* be served to 443 port.
+
+1. Create `smp-server` directory and switch to it:
+
+  ```sh
+  mkdir smp-server && cd smp-server
+  ```
+
+2. Create `docker-compose.yml` file with the following content:
+
+  You can also grab it from here - [docker-compose-smp-manual.yml](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-smp-manual.yml). Don't forget to rename it to `docker-compose.yml`.
+
+  ```yaml
+  name: SimpleX Chat - smp-server
+
+  services:
+    smp-server:
+      image: ${SIMPLEX_IMAGE:-simplexchat/smp-server:latest}
+      environment:
+        WEB_MANUAL: ${WEB_MANUAL:-1}
+        ADDR: ${ADDR?"Please specify the domain."}
+        PASS: ${PASS:-}
+      volumes:
+        - ./smp_configs:/etc/opt/simplex
+        - ./smp_state:/var/opt/simplex
+      ports:
+        - 5223:5223
+      restart: unless-stopped
+  ```
+
+3. In the same directory, create `.env` file with the following content:
+
+  You can also grab it from here - [docker-compose-smp-manual.env](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-smp-manual.env). Don't forget to rename it to `.env`.
+
+  Change variables according to your preferences.
+
+  ```env
+  # Mandatory
+  ADDR=your_ip_or_addr
+
+  # Optional
+  #PASS='123123'
+  WEB_MANUAL=1
+  ```
+
+4. Start your containers:
+
+  ```sh
+  docker compose up
+  ```
+
+### Linode marketplace
+
+You can deploy smp-server upon creating new Linode VM. Please refer to: [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
+
+## Verifying server binaries
+
+Starting from v6.3 server builds are [reproducible](#reproduce-builds).
+
+That also allows us to sign server releases, confirming the integrity of GitHub builds.
+
+To verify server binaries after you downloaded them:
+
+1. Download `_sha256sums` (hashes of all server binaries) and `_sha256sums.asc` (signature).
+
+2. Download our key FB44AF81A45BDE327319797C85107E357D4A17FC from [openpgp.org](https://keys.openpgp.org/search?q=chat%40simplex.chat)
+
+3. Import the key with `gpg --import FB44AF81A45BDE327319797C85107E357D4A17FC`. Key filename should be the same as its fingerprint, but please change it if necessary.
+
+4. Run `gpg --verify _sha256sums.asc _sha256sums`. It should print:
+
+> Good signature from "SimpleX Chat <chat@simplex.chat>"
+
+5. Compute the hashes of the binaries you plan to use with `shu256sum <file>` or with `openssl sha256 <file>` and compare them with the hashes in the file `_sha256sums` - they must be the same.
+
+That is it - you now verified authenticity of our GitHub server binaries.
+
+## Configuration
 
 To see which options are available, execute `smp-server` without flags:
 
@@ -337,7 +559,7 @@ You can get further help by executing `sudo su smp -c "smp-server <command> -h"`
 
 After that, we need to configure `smp-server`:
 
-#### Interactively
+### Interactively
 
 Execute the following command:
 
@@ -367,7 +589,7 @@ These statistics include daily counts of created, secured and deleted queues, se
 
   Enter your domain or ip address that your smp-server is running on - it will be included in server certificates and also printed as part of server address.
 
-#### Via command line options
+### Via command line options
 
 Execute the following command:
 
@@ -431,7 +653,7 @@ Server address: smp://d5fcsc7hhtPpexYUbI2XPxDbyU2d3WsVmROimcL90ss=:V8ONoJ6ICwnrZ
 
 The server address above should be used in your client configuration, and if you added server password it should only be shared with the other people who you want to allow using your server to receive the messages (all your contacts will be able to send messages - it does not require a password). If you passed IP address or hostnames during the initialisation, they will be printed as part of server address, otherwise replace `<hostnames>` with the actual server hostnames.
 
-### Further configuration
+## Further configuration
 
 All generated configuration, along with a description for each parameter, is available inside configuration file in `/etc/opt/simplex/smp-server.ini` for further customization. Depending on the smp-server version, the configuration file looks something like this:
 
@@ -560,9 +782,9 @@ cert: /etc/opt/simplex/web.crt
 key: /etc/opt/simplex/web.key
 ```
 
-### Server security
+## Server security
 
-#### Initialization
+### Initialization
 
 Although it's convenient to initialize smp-server configuration directly on the server, operators **ARE ADVISED** to initialize smp-server fully offline to protect your SMP server CA private key.
 
@@ -582,7 +804,7 @@ Follow the steps to quickly initialize the server offline:
    rsync -hzasP $HOME/simplex/smp/config/ <server_user>@<server_address>:/etc/opt/simplex/
    ```
 
-#### Private keys
+### Private keys
 
 Connection to the smp server occurs via a TLS connection. During the TLS handshake, the client verifies smp-server CA and server certificates by comparing its fingerprint with the one included in server address. If server TLS credential is compromised, this key can be used to sign a new one, keeping the same server identity and established connections. In order to protect your smp-server from bad actors, operators **ARE ADVISED** to move CA private key to a safe place. That could be:
 
@@ -607,7 +829,7 @@ Follow the steps to secure your CA keys:
    rm /etc/opt/simplex/ca.key
    ```
 
-#### Online certificate rotation
+### Online certificate rotation
 
 Operators of smp servers **ARE ADVISED** to rotate online certificate regularly (e.g., every 3 months). In order to do this, follow the steps:
 
@@ -683,9 +905,9 @@ Operators of smp servers **ARE ADVISED** to rotate online certificate regularly
 
 10. Done!
 
-### Tor: installation and configuration
+## Tor: installation and configuration
 
-#### Installation for onion address
+### Installation for onion address
 
 SMP-server can also be deployed to be available via [Tor](https://www.torproject.org) network. Run the following commands as `root` user.
 
@@ -766,7 +988,7 @@ SMP-server can also be deployed to be available via [Tor](https://www.torproject
    cat /var/lib/tor/simplex-smp/hostname
    ```
 
-#### SOCKS port for SMP PROXY
+### SOCKS port for SMP PROXY
 
 SMP-server versions starting from `v5.8.0-beta.0` can be configured to PROXY smp servers available exclusively through [Tor](https://www.torproject.org) network to be accessible to the clients that do not use Tor. Run the following commands as `root` user.
 
@@ -813,7 +1035,7 @@ SMP-server versions starting from `v5.8.0-beta.0` can be configured to PROXY smp
    ...
    ```
 
-### Server information page
+## Server information page
 
 SMP server **SHOULD** be configured to serve Web page with server information that can include admin info, server info, provider info, etc. It will also serve connection links, generated using the mobile/desktop apps. Run the following commands as `root` user.
 
@@ -995,13 +1217,13 @@ _Please note:_ this configuration is supported since `v6.1.0-beta.2`.
 
 10. Access the webpage you've deployed from your browser (`https://smp.example.org`). You should see the smp-server information that you've provided in your ini file.
 
-### Documentation
+## Documentation
 
 All necessary files for `smp-server` are located in `/etc/opt/simplex/` folder.
 
 Stored messages, connections, statistics and server log are located in `/var/opt/simplex/` folder.
 
-#### SMP server address
+### SMP server address
 
 SMP server address has the following format:
 
@@ -1021,7 +1243,7 @@ smp://<fingerprint>[:<password>]@<public_hostname>[,<onion_hostname>]
 
   Your configured hostname(s) of `smp-server`. You can check your configured hosts in `/etc/opt/simplex/smp-server.ini`, under `[TRANSPORT]` section in `host:` field.
 
-#### Systemd commands
+### Systemd commands
 
 To start `smp-server` on host boot, run:
 
@@ -1080,7 +1302,7 @@ Nov 23 19:23:21 5588ab759e80 smp-server[30878]: not expiring inactive clients
 Nov 23 19:23:21 5588ab759e80 smp-server[30878]: creating new queues requires password
 ```
 
-#### Control port
+### Control port
 
 Enabling control port in the configuration allows administrator to see information about the smp-server in real-time. Additionally, it allows to delete queues for content moderation and see the debug info about the clients, sockets, etc. Enabling the control port requires setting the `admin` and `user` passwords.
 
@@ -1154,7 +1376,7 @@ Here's the full list of commands, their descriptions and who can access them.
 | `help`           | Help menu.                                                                      | -                          |
 | `quit`           | Exit the control port.                                                          | -                          |
 
-#### Daily statistics
+### Daily statistics
 
 You can enable `smp-server` statistics for `Grafana` dashboard by setting value `on` in `/etc/opt/simplex/smp-server.ini`, under `[STORE_LOG]` section in `log_stats:` field.
 
@@ -1280,7 +1502,7 @@ To import `csv` to `Grafana` one should:
 
 For further documentation, see: [CSV Data Source for Grafana - Documentation](https://grafana.github.io/grafana-csv-datasource/)
 
-### Updating your SMP server
+## Updating your SMP server
 
 To update your smp-server to latest version, choose your installation method and follow the steps:
 
@@ -1366,7 +1588,57 @@ To update your smp-server to latest version, choose your installation method and
         docker image prune
         ```
 
-### Configuring the app to use the server
+## Reproduce builds
+
+You can locally reproduce server binaries, following these instructions.
+
+If you are a security expert or researcher, you can help SimpleX network and users community by signing the release checksums – we will [publish your signature](https://github.com/simplex-chat/simplexmq/releases/tag/v6.3.1). Please reach out to us!
+
+To reproduce the build you must have:
+
+- Linux machine
+- `x86-64` architecture
+- Installed `docker`, `curl` and `git`
+
+1. Download script:
+
+   ```sh
+   curl -LO 'https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/master/scripts/simplexmq-reproduce-builds.sh'
+   ```
+
+2. Make it executable:
+
+   ```sh
+   chmod +x simplexmq-reproduce-builds.sh
+   ```
+
+3. Execute the script with the required tag:
+
+   ```sh
+   ./simplexmq-reproduce-builds.sh 'v6.3.1'
+   ```
+
+   The script executes these steps (please review the script to confirm):
+
+   1) builds all server binaries for the release in docker container.
+   2) downloads binaries from the same GitHub release and compares them with the built binaries.
+   3) if they all match, generates _sha256sums file with their checksums.
+
+   This will take a while.
+
+4. After compilation, you should see the folder named as the tag (e.g., `v6.3.1`) with two subfolders:
+
+   ```sh
+   ls v6.3.1
+   ```
+
+   ```sh
+   from-source  prebuilt  _sha256sums
+   ```
+
+   The file _sha256sums contains the hashes of all builds - you can compare it with the same file in GitHub release.
+
+## Configuring the app to use the server
 
 To configure the app to use your messaging server copy it's full address, including password, and add it to the app. You have an option to use your server together with preset servers or without them - you can remove or disable them.
 
diff --git a/docs/XFTP-SERVER.md b/docs/XFTP-SERVER.md
index 88428a0dc3..ba4770644e 100644
--- a/docs/XFTP-SERVER.md
+++ b/docs/XFTP-SERVER.md
@@ -4,6 +4,23 @@ revision: 31.07.2023
 ---
 # Hosting your own XFTP Server
 
+## Table of Contents
+
+- [Overview](#overview)
+- [Installation options](#installation-options)
+   - [systemd service](#systemd-service) with [installation script](#installation-script) or [manually](#manual-deployment)
+   - [docker container](#docker-сontainer)
+   - [Linode marketplace](#linode-marketplace)
+- [Tor installation](#tor-installation)
+- [Configuration](#configuration)
+- [Documentation](#documentation)
+   - [XFTP server address](#xftp-server-address)
+   - [Systemd commands](#systemd-commands)
+   - [Control port](#control-port)
+   - [Daily statistics](#daily-statistics)
+- [Updating your XFTP server](#updating-your-xftp-server)
+- [Configuring the app to use the server](#configuring-the-app-to-use-the-server)
+
 ## Overview
 
 XFTP is a new file transfer protocol focussed on meta-data protection - it is based on the same principles as SimpleX Messaging Protocol used in SimpleX Chat messenger:
@@ -15,20 +32,45 @@ XFTP is a new file transfer protocol focussed on meta-data protection - it is ba
    - no identifiers or ciphertext in common between sent and received relay traffic, same as for messages delivered by SMP relays.
    - protection of sender IP address from the recipients.
 
-## Installation
+## Installation options
 
-0. First, install `xftp-server`:
+You can install XFTP server in one of the following ways:
 
-   - Manual deployment (see below)
+- [systemd service](#systemd-service)
+   - using [installation script](#installation-script) - **recommended**
+   - or [manually](#manual-deployment)
+- [Docker container](#docker-container) from DockerHub
+- [Linode marketplace](#linode-marketplace)
 
-   - Semi-automatic deployment:
-     - [Offical installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
-     - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
+### systemd service
 
-Manual installation requires some preliminary actions:
+#### Installation script
 
-0. Install binary:
+This installation script will automatically install binaries, systemd services and additional scripts that will manage backups, updates and uninstallation. This is the recommended option due to its flexibility, easy updating, and being battle tested on our servers.
+
+**Please note** that currently only Ubuntu distribution is supported.
+
+Run the following script on the server:
+
+```sh
+curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/simplex-chat/simplexmq/stable/install.sh -o simplex-server-install.sh &&\
+if echo '53fcdb4ceab324316e2c4cda7e84dbbb344f32550a65975a7895425e5a1be757 simplex-server-install.sh' | sha256sum -c; then
+  chmod +x ./simplex-server-install.sh
+  ./simplex-server-install.sh
+  rm ./simplex-server-install.sh
+else
+  echo "SHA-256 checksum is incorrect!"
+  rm ./simplex-server-install.sh
+fi
+```
+
+Type `2` and hit enter to install `xftp-server`.
+
+#### Manual deployment
+
+Manual installation is the most advanced deployment that provides the most flexibility. Generally recommended only for advanced users.
+
+1. Install binary:
 
    - Using offical binaries:
 
@@ -41,20 +83,20 @@ Manual installation requires some preliminary actions:
      Please refer to [Build from source: Using your distribution](https://github.com/simplex-chat/simplexmq#using-your-distribution)
 
 
-1. Create user and group for `xftp-server`:
+2. Create user and group for `xftp-server`:
 
    ```sh
    sudo useradd -m xftp
    ```
 
-2. Create necessary directories and assign permissions:
+3. Create necessary directories and assign permissions:
 
    ```sh
    sudo mkdir -p /var/opt/simplex-xftp /etc/opt/simplex-xftp /srv/xftp
    sudo chown xftp:xftp /var/opt/simplex-xftp /etc/opt/simplex-xftp /srv/xftp
    ```
 
-3. Allow xftp-server port in firewall:
+4. Allow xftp-server port in firewall:
 
    ```sh
    # For Ubuntu
@@ -64,7 +106,7 @@ Manual installation requires some preliminary actions:
    sudo firewall-cmd --reload
    ```
 
-4. **Optional** — If you're using distribution with `systemd`, create `/etc/systemd/system/xftp-server.service` file with the following content:
+5. **Optional** — If you're using distribution with `systemd`, create `/etc/systemd/system/xftp-server.service` file with the following content:
 
    ```sh
    [Unit]
@@ -87,6 +129,68 @@ Manual installation requires some preliminary actions:
 
    And execute `sudo systemctl daemon-reload`.
 
+### Docker сontainer
+
+You can deploy smp-server using Docker Compose. This is second recommended option due to its popularity and relatively easy deployment.
+
+This deployment provides two Docker Compose files: the **automatic** one and **manual**. If you're not sure, choose **automatic**.
+
+This will download images from [Docker Hub](https://hub.docker.com/r/simplexchat).
+
+1. Create `xftp-server` directory and switch to it:
+
+  ```sh
+  mkdir xftp-server && cd xftp-server
+  ```
+
+2. Create `docker-compose.yml` file with the following content:
+
+  You can also grab it from here - [docker-compose-xftp.yml](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-xftp.yml). Don't forget to rename it to `docker-compose.yml`.
+
+  ```yaml
+  name: SimpleX Chat - xftp-server
+
+  services:
+    xftp-server:
+      image: ${SIMPLEX_XFTP_IMAGE:-simplexchat/xftp-server:latest}
+      environment:
+        ADDR: ${ADDR?"Please specify the domain."}
+        QUOTA: ${QUOTA?"Please specify disk quota."}
+        PASS: ${PASS:-}
+      volumes:
+        - ./xftp_configs:/etc/opt/simplex-xftp
+        - ./xftp_state:/var/opt/simplex-xftp
+        - ./xftp_files:/srv/xftp
+      ports:
+        - 443:443
+      restart: unless-stopped
+  ```
+
+3. In the same directory, create `.env` file with the following content:
+
+  You can also grab it from here - [docker-compose-xftp.env](https://raw.githubusercontent.com/simplex-chat/simplexmq/refs/heads/stable/scripts/docker/docker-compose-xftp.yml). Don't forget to rename it to `.env`.
+
+  Change variables according to your preferences.
+
+  ```env
+  # Mandatory
+  ADDR=your_ip_or_addr
+  QUOTA=120gb
+
+  # Optional
+  #PASS='123123'
+  ```
+
+4. Start your containers:
+
+  ```sh
+  docker compose up
+  ```
+
+### Linode marketplace
+
+You can deploy xftp-server upon creating new Linode VM. Please refer to: [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
+
 ## Tor installation
 
 xftp-server can also be deployed to serve from [tor](https://www.torproject.org) network. Run the following commands as `root` user.
@@ -359,11 +463,11 @@ Feb 27 19:21:11 localhost xftp-server[2350]: Store log: /var/opt/simplex-xftp/fi
 Feb 27 19:21:11 localhost xftp-server[2350]: Uploading new files allowed.
 Feb 27 19:21:11 localhost xftp-server[2350]: Listening on port 443...
 Feb 27 19:21:11 localhost xftp-server[2350]: [INFO 2023-02-27 19:21:11 +0000 src/Simplex/FileTransfer/Server/Env.hs:85] Total / available storage: 64424509440 / 64424509440
-````
+```
 
 ### Control port
 
-Enabling control port in the configuration allows administrator to see information about the smp-server in real-time. Additionally, it allows to delete file chunks for content moderation and see the debug info about the clients, sockets, etc. Enabling the control port requires setting the `admin` and `user` passwords.
+Enabling control port in the configuration allows administrator to see information about the xftp-server in real-time. Additionally, it allows to delete file chunks for content moderation and see the debug info about the clients, sockets, etc. Enabling the control port requires setting the `admin` and `user` passwords.
 
 1. Generate two passwords for each user:
 
@@ -487,7 +591,7 @@ To import `csv` to `Grafana` one should:
 For further documentation, see: [CSV Data Source for Grafana - Documentation](https://grafana.github.io/grafana-csv-datasource/)
 
 
-# Updating your XFTP server
+## Updating your XFTP server
 
 To update your XFTP server to latest version, choose your installation method and follow the steps:
 
@@ -545,6 +649,6 @@ To update your XFTP server to latest version, choose your installation method an
         docker image prune
         ```
 
-### Configuring the app to use the server
+## Configuring the app to use the server
 
 Please see: [SMP Server: Configuring the app to use the server](./SERVER.md#configuring-the-app-to-use-the-server).
diff --git a/docs/dependencies/HASKELL.md b/docs/dependencies/HASKELL.md
new file mode 100644
index 0000000000..e6b180e33b
--- /dev/null
+++ b/docs/dependencies/HASKELL.md
@@ -0,0 +1,177 @@
+# Dependency License Report
+
+Bold-faced **`package-name`**s denote standard libraries bundled with `ghc-9.6.3`.
+
+## Direct dependencies of `simplex-chat:exe:simplex-chat`
+
+| Name | Version | [SPDX](https://spdx.org/licenses/) License Id | Description | Also depended upon by |
+| --- | --- | --- | --- | --- |
+| **`base`** | [`4.18.1.0`](http://hackage.haskell.org/package/base-4.18.1.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/base-4.18.1.0/src/LICENSE) | Basic libraries | *(core library)* |
+| `base64-bytestring` | [`1.2.1.0`](http://hackage.haskell.org/package/base64-bytestring-1.2.1.0) | [`BSD-3-Clause`](./licences/haskell/base64-bytestring-1.2.1.0/LICENSE) | Fast base64 encoding and decoding for ByteStrings | `simplexmq`, `websockets` |
+| **`bytestring`** | [`0.11.5.2`](http://hackage.haskell.org/package/bytestring-0.11.5.2) | [`BSD-3-Clause`](http://hackage.haskell.org/package/bytestring-0.11.5.2/src/LICENSE) | Fast, compact, strict and lazy byte strings with a list interface | `SHA`, `aeson`, `appar`, `asn1-encoding`, `asn1-parse`, `asn1-types`, `attoparsec`, `base64-bytestring`, `binary`, `bitvec`, `blaze-builder`, `blaze-textual`, `bytestring-builder`, `case-insensitive`, `cereal`, `conduit`, `conduit-extra`, `cryptohash-md5`, `cryptohash-sha1`, `crypton`, `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `cryptostore`, `digest`, `direct-sqlcipher`, `email-validate`, `entropy`, `fast-logger`, `file-embed`, `filepath`, `hashable`, `http-types`, `http2`, `integer-conversion`, `iproute`, `libyaml`, `memory`, `monad-logger`, `mono-traversable`, `network`, `network-byte-order`, `network-transport`, `network-udp`, `parsec`, `pem`, `random`, `scientific`, `simplexmq`, `socks`, `sqlcipher-simple`, `streaming-commons`, `strict`, `terminal`, `text`, `text-short`, `tls`, `typed-process`, `unix`, `unix-time`, `unliftio`, `uuid`, `uuid-types`, `vector-algorithms`, `websockets`, `yaml`, `zip`, `zlib`, `zstd` |
+| `composition` | [`1.0.2.2`](http://hackage.haskell.org/package/composition-1.0.2.2) | [`BSD-3-Clause`](./licences/haskell/composition-1.0.2.2/LICENSE) | Combinators for unorthodox function composition | `simplexmq` |
+| `constraints` | [`0.14`](http://hackage.haskell.org/package/constraints-0.14) | [`BSD-2-Clause`](./licences/haskell/constraints-0.14/LICENSE) | Constraint manipulation | `simplexmq` |
+| **`containers`** | [`0.6.7`](http://hackage.haskell.org/package/containers-0.6.7) | [`BSD-3-Clause`](http://hackage.haskell.org/package/containers-0.6.7/src/LICENSE) | Assorted concrete container types | `QuickCheck`, `aeson`, `attoparsec`, `bifunctors`, `binary`, `cereal`, `comonad`, `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `data-default-instances-containers`, `hashable`, `http2`, `indexed-traversable`, `iproute`, `mono-traversable`, `network-udp`, `resourcet`, `scientific`, `semialign`, `semigroupoids`, `simplexmq`, `sqlcipher-simple`, `th-abstraction`, `websockets`, `witherable`, `yaml`, `zip` |
+| `crypton` | [`0.34`](http://hackage.haskell.org/package/crypton-0.34) | [`BSD-3-Clause`](./licences/haskell/crypton-0.34/LICENSE) | Cryptography Primitives sink | `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `cryptostore`, `simplexmq`, `tls` |
+| `uuid` | [`1.3.15`](http://hackage.haskell.org/package/uuid-1.3.15) | [`BSD-3-Clause`](./licences/haskell/uuid-1.3.15/LICENSE) | For creating, comparing, parsing and printing Universally Unique Identifiers |  |
+| **`directory`** | [`1.3.8.1`](http://hackage.haskell.org/package/directory-1.3.8.1) | [`BSD-3-Clause`](http://hackage.haskell.org/package/directory-1.3.8.1/src/LICENSE) | Platform-agnostic library for filesystem operations | `conduit`, `conduit-extra`, `crypton-x509-store`, `easy-file`, `fast-logger`, `file-embed`, `network`, `process`, `simplexmq`, `streaming-commons`, `temporary`, `unliftio`, `yaml`, `zip` |
+| `direct-sqlcipher` | [`2.3.28`](http://hackage.haskell.org/package/direct-sqlcipher-2.3.28) |  *MISSING* | *MISSING* | `simplexmq`, `sqlcipher-simple` |
+| `data-default` | [`0.7.1.1`](http://hackage.haskell.org/package/data-default-0.7.1.1) | [`BSD-3-Clause`](./licences/haskell/data-default-0.7.1.1/LICENSE) | A class for types with a default value | `simplexmq` |
+| **`exceptions`** | [`0.10.7`](http://hackage.haskell.org/package/exceptions-0.10.7) | [`BSD-3-Clause`](http://hackage.haskell.org/package/exceptions-0.10.7/src/LICENSE) | Extensible optionally-pure exceptions | `aeson`, `conduit`, `filepath`, `monad-logger`, `resourcet`, `safe-exceptions`, `sqlcipher-simple`, `temporary`, `terminal`, `zip` |
+| **`filepath`** | [`1.4.100.4`](http://hackage.haskell.org/package/filepath-1.4.100.4) | [`BSD-3-Clause`](http://hackage.haskell.org/package/filepath-1.4.100.4/src/LICENSE) | Library for manipulating FilePaths in a cross platform way. | `conduit`, `conduit-extra`, `crypton-x509-store`, `directory`, `easy-file`, `fast-logger`, `file-embed`, `hashable`, `process`, `simplexmq`, `temporary`, `unix`, `unliftio`, `yaml`, `zip` |
+| `file-embed` | [`0.0.15.0`](http://hackage.haskell.org/package/file-embed-0.0.15.0) | [`BSD-2-Clause`](./licences/haskell/file-embed-0.0.15.0/LICENSE) | Use Template Haskell to embed file contents directly. |  |
+| `http-types` | [`0.12.4`](http://hackage.haskell.org/package/http-types-0.12.4) | [`BSD-3-Clause`](./licences/haskell/http-types-0.12.4/LICENSE) | Generic HTTP types for Haskell (for both client and server code). | `http2`, `simplexmq` |
+| `http2` | [`5.0.0`](http://hackage.haskell.org/package/http2-5.0.0) | [`BSD-3-Clause`](./licences/haskell/http2-5.0.0/LICENSE) | HTTP/2 library | `simplexmq` |
+| `email-validate` | [`2.3.2.19`](http://hackage.haskell.org/package/email-validate-2.3.2.19) | [`BSD-3-Clause`](./licences/haskell/email-validate-2.3.2.19/LICENSE) | Email address validation |  |
+| `memory` | [`0.18.0`](http://hackage.haskell.org/package/memory-0.18.0) | [`BSD-3-Clause`](./licences/haskell/memory-0.18.0/LICENSE) | memory and related abstraction stuff | `asn1-types`, `crypton`, `crypton-x509`, `crypton-x509-validation`, `cryptostore`, `pem`, `simplexmq`, `tls` |
+| **`mtl`** | [`2.3.1`](http://hackage.haskell.org/package/mtl-2.3.1) | [`BSD-3-Clause`](http://hackage.haskell.org/package/mtl-2.3.1/src/LICENSE) | Monad classes for transformers, using functional dependencies | `conduit`, `constraints`, `crypton-x509-store`, `crypton-x509-validation`, `exceptions`, `monad-logger`, `parsec`, `random`, `resourcet`, `simple-logger`, `simplexmq`, `tls`, `yaml`, `zip` |
+| `unliftio` | [`0.2.25.0`](http://hackage.haskell.org/package/unliftio-0.2.25.0) | [`MIT`](./licences/haskell/unliftio-0.2.25.0/LICENSE) | The MonadUnliftIO typeclass for unlifting monads to IO (batteries included) | `http2`, `simplexmq`, `time-manager` |
+| `unliftio-core` | [`0.2.1.0`](http://hackage.haskell.org/package/unliftio-core-0.2.1.0) | [`MIT`](./licences/haskell/unliftio-core-0.2.1.0/LICENSE) | The MonadUnliftIO typeclass for unlifting monads to IO | `conduit`, `conduit-extra`, `monad-logger`, `resourcet`, `simplexmq`, `typed-process`, `unliftio` |
+| `ansi-terminal` | [`1.0`](http://hackage.haskell.org/package/ansi-terminal-1.0) | [`BSD-3-Clause`](./licences/haskell/ansi-terminal-1.0/LICENSE) | Simple ANSI terminal support | `prettyprinter-ansi-terminal` |
+| `network` | [`3.1.4.0`](http://hackage.haskell.org/package/network-3.1.4.0) | [`BSD-3-Clause`](./licences/haskell/network-3.1.4.0/LICENSE) | Low-level networking interface | `conduit-extra`, `http2`, `iproute`, `network-udp`, `simplexmq`, `socks`, `streaming-commons`, `tls`, `websockets` |
+| `network-transport` | [`0.5.6`](http://hackage.haskell.org/package/network-transport-0.5.6) | [`BSD-3-Clause`](./licences/haskell/network-transport-0.5.6/LICENSE) | Network abstraction layer | `simplexmq` |
+| **`process`** | [`1.6.17.0`](http://hackage.haskell.org/package/process-1.6.17.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/process-1.6.17.0/src/LICENSE) | Process libraries | `conduit-extra`, `optparse-applicative`, `simplexmq`, `streaming-commons`, `typed-process`, `unliftio` |
+| `optparse-applicative` | [`0.18.1.0`](http://hackage.haskell.org/package/optparse-applicative-0.18.1.0) | [`BSD-3-Clause`](./licences/haskell/optparse-applicative-0.18.1.0/LICENSE) | Utilities and combinators for parsing command line options | `simplexmq` |
+| `record-hasfield` | [`1.0`](http://hackage.haskell.org/package/record-hasfield-1.0) | [`BSD-3-Clause`](./licences/haskell/record-hasfield-1.0/LICENSE) | A version of GHC.Records as available in future GHCs. |  |
+| `random` | [`1.2.1.1`](http://hackage.haskell.org/package/random-1.2.1.1) | [`BSD-3-Clause`](./licences/haskell/random-1.2.1.1/LICENSE) | Pseudo-random number generation | `QuickCheck`, `simplexmq`, `streaming-commons`, `temporary`, `uuid`, `uuid-types`, `websockets` |
+| `socks` | [`0.6.1`](http://hackage.haskell.org/package/socks-0.6.1) | [`BSD-3-Clause`](./licences/haskell/socks-0.6.1/LICENSE) | Socks proxy (ver 5) | `simplexmq` |
+| `scientific` | [`0.3.7.0`](http://hackage.haskell.org/package/scientific-0.3.7.0) | [`BSD-3-Clause`](./licences/haskell/scientific-0.3.7.0/LICENSE) | Numbers represented using scientific notation | `aeson`, `attoparsec`, `yaml` |
+| `simple-logger` | [`0.1.1`](http://hackage.haskell.org/package/simple-logger-0.1.1) | [`MIT`](./licences/haskell/simple-logger-0.1.1/LICENSE) | A very simple but efficient logging framework | `simplexmq` |
+| `simplexmq` | [`6.4.0.1`](http://hackage.haskell.org/package/simplexmq-6.4.0.1) |  *MISSING* | *MISSING* |  |
+| `aeson` | [`2.2.1.0`](http://hackage.haskell.org/package/aeson-2.2.1.0) | [`BSD-3-Clause`](./licences/haskell/aeson-2.2.1.0/LICENSE) | Fast JSON parsing and encoding | `simplexmq`, `yaml` |
+| `sqlcipher-simple` | [`0.4.18.1`](http://hackage.haskell.org/package/sqlcipher-simple-0.4.18.1) |  *MISSING* | *MISSING* | `simplexmq` |
+| **`stm`** | [`2.5.1.0`](http://hackage.haskell.org/package/stm-2.5.1.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/stm-2.5.1.0/src/LICENSE) | Software Transactional Memory | `StateVar`, `async`, `conduit-extra`, `exceptions`, `fast-logger`, `http2`, `monad-control`, `monad-logger`, `simplexmq`, `stm-chans`, `streaming-commons`, `terminal`, `transformers-base`, `typed-process`, `unliftio` |
+| `async` | [`2.2.5`](http://hackage.haskell.org/package/async-2.2.5) | [`BSD-3-Clause`](./licences/haskell/async-2.2.5/LICENSE) | Run IO operations asynchronously and wait for their results | `conduit-extra`, `http2`, `simplexmq`, `streaming-commons`, `terminal`, `tls`, `typed-process`, `unliftio`, `websockets` |
+| **`template-haskell`** | [`2.20.0.0`](http://hackage.haskell.org/package/template-haskell-2.20.0.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/template-haskell-2.20.0.0/src/LICENSE) | Support library for Template Haskell | `OneTuple`, `QuickCheck`, `aeson`, `bifunctors`, `bytestring`, `containers`, `email-validate`, `exceptions`, `file-embed`, `filepath`, `monad-logger`, `network-uri`, `primitive`, `scientific`, `semigroupoids`, `sqlcipher-simple`, `tagged`, `text`, `text-short`, `th-abstraction`, `th-compat`, `unordered-containers`, `uuid-types`, `yaml` |
+| **`text`** | [`2.0.2`](http://hackage.haskell.org/package/text-2.0.2) | [`BSD-2-Clause`](http://hackage.haskell.org/package/text-2.0.2/src/LICENSE) | An efficient packed Unicode text type. | `aeson`, `attoparsec`, `blaze-builder`, `blaze-textual`, `case-insensitive`, `conduit`, `conduit-extra`, `direct-sqlcipher`, `fast-logger`, `hashable`, `http-types`, `ini`, `integer-conversion`, `monad-logger`, `mono-traversable`, `optparse-applicative`, `parsec`, `prettyprinter`, `prettyprinter-ansi-terminal`, `scientific`, `simple-logger`, `simplexmq`, `sqlcipher-simple`, `streaming-commons`, `strict`, `terminal`, `text-iso8601`, `text-short`, `uuid`, `uuid-types`, `websockets`, `yaml`, `zip` |
+| **`time`** | [`1.12.2`](http://hackage.haskell.org/package/time-1.12.2) | [`BSD-2-Clause`](http://hackage.haskell.org/package/time-1.12.2/src/LICENSE) | A time library | `aeson`, `directory`, `easy-file`, `iso8601-time`, `simplexmq`, `sqlcipher-simple`, `text-iso8601`, `time-compat`, `unix`, `unliftio`, `uuid`, `zip` |
+| `tls` | [`1.9.0`](http://hackage.haskell.org/package/tls-1.9.0) | [`BSD-3-Clause`](./licences/haskell/tls-1.9.0/LICENSE) | TLS/SSL protocol native implementation (Server and Client) | `simplexmq` |
+| `terminal` | [`0.2.0.0`](http://hackage.haskell.org/package/terminal-0.2.0.0) | [`BSD-3-Clause`](./licences/haskell/terminal-0.2.0.0/LICENSE) | Portable terminal interaction library |  |
+| `attoparsec` | [`0.14.4`](http://hackage.haskell.org/package/attoparsec-0.14.4) | [`BSD-3-Clause`](./licences/haskell/attoparsec-0.14.4/LICENSE) | Fast combinator parsing for bytestrings and text | `conduit-extra`, `email-validate`, `ini`, `simplexmq`, `sqlcipher-simple`, `websockets`, `yaml` |
+| `websockets` | [`0.12.7.3`](http://hackage.haskell.org/package/websockets-0.12.7.3) | [`BSD-3-Clause`](./licences/haskell/websockets-0.12.7.3/LICENCE) | A sensible and clean way to write WebSocket-capable servers in Haskell. | `simplexmq` |
+| `zip` | [`2.0.0`](http://hackage.haskell.org/package/zip-2.0.0) | [`BSD-3-Clause`](./licences/haskell/zip-2.0.0/LICENSE.md) | Operations on zip archives |  |
+
+## Indirect transitive dependencies
+
+| Name | Version | [SPDX](https://spdx.org/licenses/) License Id | Description | Depended upon by |
+| --- | --- | --- | --- | --- |
+| `OneTuple` | [`0.4.1.1`](http://hackage.haskell.org/package/OneTuple-0.4.1.1) | [`BSD-3-Clause`](./licences/haskell/OneTuple-0.4.1.1/LICENSE) | Singleton Tuple | `aeson`, `indexed-traversable-instances` |
+| `Only` | [`0.1`](http://hackage.haskell.org/package/Only-0.1) | [`BSD-3-Clause`](./licences/haskell/Only-0.1/LICENSE) | The 1-tuple type or single-value "collection" | `sqlcipher-simple` |
+| `QuickCheck` | [`2.14.3`](http://hackage.haskell.org/package/QuickCheck-2.14.3) | [`BSD-3-Clause`](./licences/haskell/QuickCheck-2.14.3/LICENSE) | Automatic testing of Haskell programs | `aeson` |
+| `SHA` | [`1.6.4.4`](http://hackage.haskell.org/package/SHA-1.6.4.4) | [`BSD-3-Clause`](./licences/haskell/SHA-1.6.4.4/LICENSE) | Implementations of the SHA suite of message digest functions | `websockets` |
+| `StateVar` | [`1.2.2`](http://hackage.haskell.org/package/StateVar-1.2.2) | [`BSD-3-Clause`](./licences/haskell/StateVar-1.2.2/LICENSE) | State variables | `contravariant` |
+| **`array`** | [`0.5.5.0`](http://hackage.haskell.org/package/array-0.5.5.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/array-0.5.5.0/src/LICENSE) | Mutable and immutable arrays | `SHA`, `attoparsec`, `binary`, `cereal`, `containers`, `deepseq`, `fast-logger`, `http-types`, `http2`, `indexed-traversable`, `integer-logarithms`, `stm`, `streaming-commons`, `text` |
+| `bifunctors` | [`5.6.1`](http://hackage.haskell.org/package/bifunctors-5.6.1) | [`BSD-3-Clause`](./licences/haskell/bifunctors-5.6.1/LICENSE) | Bifunctors | `semigroupoids` |
+| **`binary`** | [`0.8.9.1`](http://hackage.haskell.org/package/binary-0.8.9.1) | [`BSD-3-Clause`](http://hackage.haskell.org/package/binary-0.8.9.1/src/LICENSE) | Binary serialisation for Haskell values using lazy ByteStrings | `SHA`, `constraints`, `network-transport`, `scientific`, `strict`, `text`, `text-short`, `these`, `unix-time`, `uuid`, `uuid-types`, `websockets` |
+| `blaze-builder` | [`0.4.2.3`](http://hackage.haskell.org/package/blaze-builder-0.4.2.3) | [`BSD-3-Clause`](./licences/haskell/blaze-builder-0.4.2.3/LICENSE) | Efficient buffered output. | `blaze-textual`, `sqlcipher-simple` |
+| `blaze-textual` | [`0.2.3.1`](http://hackage.haskell.org/package/blaze-textual-0.2.3.1) | [`BSD-3-Clause`](./licences/haskell/blaze-textual-0.2.3.1/LICENSE) | Fast rendering of common datatypes | `sqlcipher-simple` |
+| `boring` | [`0.2.1`](http://hackage.haskell.org/package/boring-0.2.1) | [`BSD-3-Clause`](./licences/haskell/boring-0.2.1/LICENSE) | Boring and Absurd types | `constraints` |
+| `base-orphans` | [`0.9.1`](http://hackage.haskell.org/package/base-orphans-0.9.1) | [`MIT`](./licences/haskell/base-orphans-0.9.1/LICENSE) | Backwards-compatible orphan instances for base | `distributive`, `semigroupoids`, `time-compat`, `transformers-base`, `witherable` |
+| `basement` | [`0.0.16`](http://hackage.haskell.org/package/basement-0.0.16) | [`BSD-3-Clause`](./licences/haskell/basement-0.0.16/LICENSE) | Foundation scrap box of array & string | `crypton`, `cryptostore`, `memory`, `pem`, `socks` |
+| `bitvec` | [`1.1.5.0`](http://hackage.haskell.org/package/bitvec-1.1.5.0) | [`BSD-3-Clause`](./licences/haskell/bitvec-1.1.5.0/LICENSE) | Space-efficient bit vectors | `vector-algorithms` |
+| `byteorder` | [`1.0.4`](http://hackage.haskell.org/package/byteorder-1.0.4) | [`BSD-3-Clause`](./licences/haskell/byteorder-1.0.4/LICENSE) | Exposes the native endianness or byte ordering of the system. | `iproute` |
+| `bytestring-builder` | [`0.10.8.2.0`](http://hackage.haskell.org/package/bytestring-builder-0.10.8.2.0) | [`BSD-3-Clause`](./licences/haskell/bytestring-builder-0.10.8.2.0/LICENSE) | The new bytestring builder, packaged outside of GHC | `websockets` |
+| `clock` | [`0.8.4`](http://hackage.haskell.org/package/clock-0.8.4) | [`BSD-3-Clause`](./licences/haskell/clock-0.8.4/LICENSE) | High-resolution clock functions: monotonic, realtime, cputime. | `websockets` |
+| `colour` | [`2.3.6`](http://hackage.haskell.org/package/colour-2.3.6) | [`MIT`](./licences/haskell/colour-2.3.6/LICENSE) | A model for human colour/color perception | `ansi-terminal`, `ansi-terminal-types` |
+| `comonad` | [`5.0.8`](http://hackage.haskell.org/package/comonad-5.0.8) | [`BSD-3-Clause`](./licences/haskell/comonad-5.0.8/LICENSE) | Comonads | `bifunctors`, `semigroupoids` |
+| `conduit` | [`1.3.5`](http://hackage.haskell.org/package/conduit-1.3.5) | [`MIT`](./licences/haskell/conduit-1.3.5/LICENSE) | Streaming data processing library. | `conduit-extra`, `libyaml`, `monad-logger`, `yaml`, `zip` |
+| `conduit-extra` | [`1.3.6`](http://hackage.haskell.org/package/conduit-extra-1.3.6) | [`MIT`](./licences/haskell/conduit-extra-1.3.6/LICENSE) | Batteries included conduit: adapters for common libraries. | `monad-logger`, `zip` |
+| `contravariant` | [`1.5.5`](http://hackage.haskell.org/package/contravariant-1.5.5) | [`BSD-3-Clause`](./licences/haskell/contravariant-1.5.5/LICENSE) | Contravariant functors | `semigroupoids` |
+| `cereal` | [`0.5.8.3`](http://hackage.haskell.org/package/cereal-0.5.8.3) | [`BSD-3-Clause`](./licences/haskell/cereal-0.5.8.3/LICENSE) | A binary serialization library | `socks`, `tls`, `zip` |
+| `cryptohash-md5` | [`0.11.101.0`](http://hackage.haskell.org/package/cryptohash-md5-0.11.101.0) | [`BSD-3-Clause`](./licences/haskell/cryptohash-md5-0.11.101.0/LICENSE) | Fast, pure and practical MD5 implementation | `uuid` |
+| `cryptohash-sha1` | [`0.11.101.0`](http://hackage.haskell.org/package/cryptohash-sha1-0.11.101.0) | [`BSD-3-Clause`](./licences/haskell/cryptohash-sha1-0.11.101.0/LICENSE) | Fast, pure and practical SHA-1 implementation | `uuid` |
+| `crypton-x509` | [`1.7.6`](http://hackage.haskell.org/package/crypton-x509-1.7.6) | [`BSD-3-Clause`](./licences/haskell/crypton-x509-1.7.6/LICENSE) | X509 reader and writer | `crypton-x509-store`, `crypton-x509-validation`, `cryptostore`, `simplexmq`, `tls` |
+| `crypton-x509-store` | [`1.6.9`](http://hackage.haskell.org/package/crypton-x509-store-1.6.9) | [`BSD-3-Clause`](./licences/haskell/crypton-x509-store-1.6.9/LICENSE) | X.509 collection accessing and storing methods | `crypton-x509-validation`, `simplexmq`, `tls` |
+| `crypton-x509-validation` | [`1.6.12`](http://hackage.haskell.org/package/crypton-x509-validation-1.6.12) | [`BSD-3-Clause`](./licences/haskell/crypton-x509-validation-1.6.12/LICENSE) | X.509 Certificate and CRL validation | `cryptostore`, `simplexmq`, `tls` |
+| `cryptostore` | [`0.3.0.1`](http://hackage.haskell.org/package/cryptostore-0.3.0.1) | [`BSD-3-Clause`](./licences/haskell/cryptostore-0.3.0.1/LICENSE) | Serialization of cryptographic data types | `simplexmq` |
+| `case-insensitive` | [`1.2.1.0`](http://hackage.haskell.org/package/case-insensitive-1.2.1.0) | [`BSD-3-Clause`](./licences/haskell/case-insensitive-1.2.1.0/LICENSE) | Case insensitive string comparison | `http-types`, `http2`, `simplexmq`, `websockets`, `zip` |
+| `uuid-types` | [`1.0.5.1`](http://hackage.haskell.org/package/uuid-types-1.0.5.1) | [`BSD-3-Clause`](./licences/haskell/uuid-types-1.0.5.1/LICENSE) | Type definitions for Universally Unique Identifiers | `aeson`, `uuid` |
+| **`deepseq`** | [`1.4.8.1`](http://hackage.haskell.org/package/deepseq-1.4.8.1) | [`BSD-3-Clause`](http://hackage.haskell.org/package/deepseq-1.4.8.1/src/LICENSE) | Deep evaluation of data structures | `Only`, `QuickCheck`, `aeson`, `attoparsec`, `bitvec`, `blaze-builder`, `bytestring`, `bytestring-builder`, `case-insensitive`, `constraints`, `containers`, `crypton`, `data-fix`, `dlist`, `filepath`, `hashable`, `hourglass`, `memory`, `network`, `network-transport`, `network-uri`, `pretty`, `primitive`, `process`, `psqueues`, `random`, `safe-exceptions`, `scientific`, `splitmix`, `strict`, `tagged`, `text`, `text-short`, `these`, `time`, `time-compat`, `unliftio`, `unordered-containers`, `uuid-types`, `vector`, `zstd` |
+| `digest` | [`0.0.1.7`](http://hackage.haskell.org/package/digest-0.0.1.7) | [`BSD-2-Clause`](./licences/haskell/digest-0.0.1.7/LICENSE) | Various hashes for bytestrings; CRC32 and Adler32 for now. | `zip` |
+| `dlist` | [`1.0`](http://hackage.haskell.org/package/dlist-1.0) | [`BSD-3-Clause`](./licences/haskell/dlist-1.0/license.md) | Difference lists | `aeson`, `data-default-instances-dlist`, `zip` |
+| `distributive` | [`0.6.2.1`](http://hackage.haskell.org/package/distributive-0.6.2.1) | [`BSD-3-Clause`](./licences/haskell/distributive-0.6.2.1/LICENSE) | Distributive functors -- Dual to Traversable | `comonad`, `semigroupoids` |
+| `data-default-class` | [`0.1.2.0`](http://hackage.haskell.org/package/data-default-class-0.1.2.0) | [`BSD-3-Clause`](./licences/haskell/data-default-class-0.1.2.0/LICENSE) | A class for types with a default value | `crypton-x509-validation`, `data-default`, `data-default-instances-containers`, `data-default-instances-dlist`, `data-default-instances-old-locale`, `tls` |
+| `data-default-instances-containers` | [`0.0.1`](http://hackage.haskell.org/package/data-default-instances-containers-0.0.1) | [`BSD-3-Clause`](./licences/haskell/data-default-instances-containers-0.0.1/LICENSE) | Default instances for types in containers | `data-default` |
+| `data-default-instances-dlist` | [`0.0.1`](http://hackage.haskell.org/package/data-default-instances-dlist-0.0.1) | [`BSD-3-Clause`](./licences/haskell/data-default-instances-dlist-0.0.1/LICENSE) | Default instances for types in dlist | `data-default` |
+| `data-default-instances-old-locale` | [`0.0.1`](http://hackage.haskell.org/package/data-default-instances-old-locale-0.0.1) | [`BSD-3-Clause`](./licences/haskell/data-default-instances-old-locale-0.0.1/LICENSE) | Default instances for types in old-locale | `data-default` |
+| `data-fix` | [`0.3.2`](http://hackage.haskell.org/package/data-fix-0.3.2) | [`BSD-3-Clause`](./licences/haskell/data-fix-0.3.2/LICENSE) | Fixpoint data types | `aeson` |
+| `fast-logger` | [`3.2.2`](http://hackage.haskell.org/package/fast-logger-3.2.2) | [`BSD-3-Clause`](./licences/haskell/fast-logger-3.2.2/LICENSE) | A fast logging system | `monad-logger`, `simple-logger` |
+| **`ghc-bignum`** | [`1.3`](http://hackage.haskell.org/package/ghc-bignum-1.3) | [`BSD-3-Clause`](http://hackage.haskell.org/package/ghc-bignum-1.3/src/LICENSE) | GHC BigNum library | `base`, `bitvec`, `hashable`, `integer-gmp`, `integer-logarithms` |
+| **`ghc-boot-th`** | [`9.6.3`](http://hackage.haskell.org/package/ghc-boot-th-9.6.3) | [`BSD-3-Clause`](http://hackage.haskell.org/package/ghc-boot-th-9.6.3/src/LICENSE) | Shared functionality between GHC and the @template-haskell@ library | `template-haskell` |
+| **`ghc-prim`** | [`0.10.0`](http://hackage.haskell.org/package/ghc-prim-0.10.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/ghc-prim-0.10.0/src/LICENSE) | GHC primitives | *(core library)* |
+| `generically` | [`0.1.1`](http://hackage.haskell.org/package/generically-0.1.1) | [`BSD-3-Clause`](./licences/haskell/generically-0.1.1/LICENSE) | Generically newtype to use with DerivingVia | `aeson` |
+| `hourglass` | [`0.2.12`](http://hackage.haskell.org/package/hourglass-0.2.12) | [`BSD-3-Clause`](./licences/haskell/hourglass-0.2.12/LICENSE) | simple performant time related library | `asn1-encoding`, `asn1-types`, `crypton-x509`, `crypton-x509-validation`, `cryptostore`, `simplexmq` |
+| `hashable` | [`1.4.3.0`](http://hackage.haskell.org/package/hashable-1.4.3.0) | [`BSD-3-Clause`](./licences/haskell/hashable-1.4.3.0/LICENSE) | A class for types that can be converted to a hash value | `aeson`, `async`, `case-insensitive`, `constraints`, `data-fix`, `mono-traversable`, `network-transport`, `psqueues`, `scientific`, `semialign`, `semigroupoids`, `simplexmq`, `strict`, `text-short`, `these`, `time-compat`, `unordered-containers`, `uuid-types`, `witherable` |
+| **`integer-gmp`** | [`1.1`](http://hackage.haskell.org/package/integer-gmp-1.1) | [`BSD-3-Clause`](http://hackage.haskell.org/package/integer-gmp-1.1/src/LICENSE) | Integer library based on GMP | *(core library)* |
+| `libyaml` | [`0.1.2`](http://hackage.haskell.org/package/libyaml-0.1.2) | [`BSD-3-Clause`](./licences/haskell/libyaml-0.1.2/LICENSE) | Low-level, streaming YAML interface. | `yaml` |
+| `old-locale` | [`1.0.0.7`](http://hackage.haskell.org/package/old-locale-1.0.0.7) | [`BSD-3-Clause`](./licences/haskell/old-locale-1.0.0.7/LICENSE) | locale library | `blaze-textual`, `data-default-instances-old-locale`, `old-time` |
+| `old-time` | [`1.1.0.4`](http://hackage.haskell.org/package/old-time-1.1.0.4) | [`BSD-3-Clause`](./licences/haskell/old-time-1.1.0.4/LICENSE) | Time library | `unix-time` |
+| `lifted-base` | [`0.2.3.12`](http://hackage.haskell.org/package/lifted-base-0.2.3.12) | [`BSD-3-Clause`](./licences/haskell/lifted-base-0.2.3.12/LICENSE) | lifted IO operations from the base library | `monad-logger` |
+| `mono-traversable` | [`1.0.15.3`](http://hackage.haskell.org/package/mono-traversable-1.0.15.3) | [`MIT`](./licences/haskell/mono-traversable-1.0.15.3/LICENSE) | Type classes for mapping, folding, and traversing monomorphic containers | `conduit` |
+| `monad-control` | [`1.0.3.1`](http://hackage.haskell.org/package/monad-control-1.0.3.1) | [`BSD-3-Clause`](./licences/haskell/monad-control-1.0.3.1/LICENSE) | Lift control operations, like exception catching, through monad transformers | `lifted-base`, `monad-logger`, `zip` |
+| `monad-logger` | [`0.3.40`](http://hackage.haskell.org/package/monad-logger-0.3.40) | [`MIT`](./licences/haskell/monad-logger-0.3.40/LICENSE) | A class of monads which can log messages. | `simple-logger` |
+| `monad-loops` | [`0.4.3`](http://hackage.haskell.org/package/monad-loops-0.4.3) | [`LicenseRef-PublicDomain`](http://hackage.haskell.org/package/monad-loops-0.4.3) | Monadic loops | `monad-logger` |
+| `ini` | [`0.4.2`](http://hackage.haskell.org/package/ini-0.4.2) | [`BSD-3-Clause`](./licences/haskell/ini-0.4.2/LICENSE) | Configuration files in the INI format. | `simplexmq` |
+| `indexed-traversable` | [`0.1.3`](http://hackage.haskell.org/package/indexed-traversable-0.1.3) | [`BSD-2-Clause`](./licences/haskell/indexed-traversable-0.1.3/LICENSE) | FunctorWithIndex, FoldableWithIndex, TraversableWithIndex | `aeson`, `comonad`, `indexed-traversable-instances`, `semialign`, `witherable` |
+| `indexed-traversable-instances` | [`0.1.1.2`](http://hackage.haskell.org/package/indexed-traversable-instances-0.1.1.2) | [`BSD-2-Clause`](./licences/haskell/indexed-traversable-instances-0.1.1.2/LICENSE) | More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex | `semialign`, `witherable` |
+| `unordered-containers` | [`0.2.19.1`](http://hackage.haskell.org/package/unordered-containers-0.2.19.1) | [`BSD-3-Clause`](./licences/haskell/unordered-containers-0.2.19.1/LICENSE) | Efficient hashing-based container types | `aeson`, `indexed-traversable-instances`, `ini`, `mono-traversable`, `semialign`, `semigroupoids`, `witherable`, `yaml` |
+| `ansi-terminal-types` | [`0.11.5`](http://hackage.haskell.org/package/ansi-terminal-types-0.11.5) | [`BSD-3-Clause`](./licences/haskell/ansi-terminal-types-0.11.5/LICENSE) | Types and functions used to represent SGR aspects | `ansi-terminal` |
+| `integer-conversion` | [`0.1.0.1`](http://hackage.haskell.org/package/integer-conversion-0.1.0.1) | [`BSD-3-Clause`](./licences/haskell/integer-conversion-0.1.0.1/LICENSE) | Conversion from strings to Integer | `aeson`, `text-iso8601` |
+| `integer-logarithms` | [`1.0.3.1`](http://hackage.haskell.org/package/integer-logarithms-1.0.3.1) | [`MIT`](./licences/haskell/integer-logarithms-1.0.3.1/LICENSE) | Integer logarithms. | `aeson`, `scientific` |
+| `entropy` | [`0.4.1.10`](http://hackage.haskell.org/package/entropy-0.4.1.10) | [`BSD-3-Clause`](./licences/haskell/entropy-0.4.1.10/LICENSE) | A platform independent entropy source | `uuid`, `websockets` |
+| `network-byte-order` | [`0.1.7`](http://hackage.haskell.org/package/network-byte-order-0.1.7) | [`BSD-3-Clause`](./licences/haskell/network-byte-order-0.1.7/LICENSE) | Network byte order utilities | `http2` |
+| `network-control` | [`0.0.2`](http://hackage.haskell.org/package/network-control-0.0.2) | [`BSD-3-Clause`](./licences/haskell/network-control-0.0.2/LICENSE) | Library to control network protocols | `http2` |
+| `network-udp` | [`0.0.0`](http://hackage.haskell.org/package/network-udp-0.0.0) | [`BSD-3-Clause`](./licences/haskell/network-udp-0.0.0/LICENSE) | UDP library | `simplexmq` |
+| `network-info` | [`0.2.1`](http://hackage.haskell.org/package/network-info-0.2.1) | [`BSD-3-Clause`](./licences/haskell/network-info-0.2.1/LICENSE) | Access the local computer's basic network configuration | `simplexmq`, `uuid` |
+| `network-uri` | [`2.6.4.2`](http://hackage.haskell.org/package/network-uri-2.6.4.2) | [`BSD-3-Clause`](./licences/haskell/network-uri-2.6.4.2/LICENSE) | URI manipulation | `aeson` |
+| `unix-compat` | [`0.7.1`](http://hackage.haskell.org/package/unix-compat-0.7.1) | [`BSD-3-Clause`](./licences/haskell/unix-compat-0.7.1/LICENSE) | Portable POSIX-compatibility layer. | `fast-logger` |
+| `unix-time` | [`0.4.11`](http://hackage.haskell.org/package/unix-time-0.4.11) | [`BSD-3-Clause`](./licences/haskell/unix-time-0.4.11/LICENSE) | Unix time parser/formatter and utilities | `fast-logger`, `http2`, `network-control`, `tls` |
+| **`parsec`** | [`3.1.16.1`](http://hackage.haskell.org/package/parsec-3.1.16.1) | [`BSD-2-Clause`](http://hackage.haskell.org/package/parsec-3.1.16.1/src/LICENSE) | Monadic parser combinators | `network-uri` |
+| `pem` | [`0.2.4`](http://hackage.haskell.org/package/pem-0.2.4) | [`BSD-3-Clause`](./licences/haskell/pem-0.2.4/LICENSE) | Privacy Enhanced Mail (PEM) format reader and writer. | `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `cryptostore` |
+| `appar` | [`0.1.8`](http://hackage.haskell.org/package/appar-0.1.8) | [`BSD-3-Clause`](./licences/haskell/appar-0.1.8/LICENSE) | A simple applicative parser | `iproute` |
+| **`pretty`** | [`1.1.3.6`](http://hackage.haskell.org/package/pretty-1.1.3.6) | [`BSD-3-Clause`](http://hackage.haskell.org/package/pretty-1.1.3.6/src/LICENSE) | Pretty-printing library | `template-haskell` |
+| `primitive` | [`0.9.0.0`](http://hackage.haskell.org/package/primitive-0.9.0.0) | [`BSD-3-Clause`](./licences/haskell/primitive-0.9.0.0/LICENSE) | Primitive memory-related operations | `aeson`, `bitvec`, `conduit`, `conduit-extra`, `integer-conversion`, `resourcet`, `scientific`, `vector`, `vector-algorithms` |
+| `iproute` | [`1.7.12`](http://hackage.haskell.org/package/iproute-1.7.12) | [`BSD-3-Clause`](./licences/haskell/iproute-1.7.12/LICENSE) | IP Routing Table | `network-udp`, `simplexmq` |
+| `prettyprinter` | [`1.7.1`](http://hackage.haskell.org/package/prettyprinter-1.7.1) | [`BSD-2-Clause`](./licences/haskell/prettyprinter-1.7.1/LICENSE.md) | A modern, easy to use, well-documented, extensible pretty-printer. | `optparse-applicative`, `prettyprinter-ansi-terminal`, `terminal` |
+| `prettyprinter-ansi-terminal` | [`1.1.3`](http://hackage.haskell.org/package/prettyprinter-ansi-terminal-1.1.3) | [`BSD-2-Clause`](./licences/haskell/prettyprinter-ansi-terminal-1.1.3/LICENSE.md) | ANSI terminal backend for the »prettyprinter« package. | `optparse-applicative` |
+| `psqueues` | [`0.2.8.0`](http://hackage.haskell.org/package/psqueues-0.2.8.0) | [`BSD-3-Clause`](./licences/haskell/psqueues-0.2.8.0/LICENSE) | Pure priority search queues | `network-control` |
+| `resourcet` | [`1.3.0`](http://hackage.haskell.org/package/resourcet-1.3.0) | [`BSD-3-Clause`](./licences/haskell/resourcet-1.3.0/LICENSE) | Deterministic allocation and freeing of scarce resources. | `conduit`, `conduit-extra`, `libyaml`, `monad-logger`, `yaml`, `zip` |
+| `iso8601-time` | [`0.1.5`](http://hackage.haskell.org/package/iso8601-time-0.1.5) | [`MIT`](http://hackage.haskell.org/package/iso8601-time-0.1.5) | Convert to/from the ISO 8601 time format | `simplexmq` |
+| `safe-exceptions` | [`0.1.7.4`](http://hackage.haskell.org/package/safe-exceptions-0.1.7.4) | [`MIT`](./licences/haskell/safe-exceptions-0.1.7.4/LICENSE) | Safe, consistent, and easy exception handling | `unliftio` |
+| `semigroupoids` | [`6.0.0.1`](http://hackage.haskell.org/package/semigroupoids-6.0.0.1) | [`BSD-2-Clause`](./licences/haskell/semigroupoids-6.0.0.1/LICENSE) | Semigroupoids: Category sans id | `semialign` |
+| `semialign` | [`1.3`](http://hackage.haskell.org/package/semialign-1.3) | [`BSD-3-Clause`](./licences/haskell/semialign-1.3/LICENSE) | Align and Zip type-classes from the common Semialign ancestor. | `aeson` |
+| `asn1-encoding` | [`0.9.6`](http://hackage.haskell.org/package/asn1-encoding-0.9.6) | [`BSD-3-Clause`](./licences/haskell/asn1-encoding-0.9.6/LICENSE) | ASN1 data reader and writer in RAW, BER and DER forms | `asn1-parse`, `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `cryptostore`, `simplexmq`, `tls` |
+| `asn1-parse` | [`0.9.5`](http://hackage.haskell.org/package/asn1-parse-0.9.5) | [`BSD-3-Clause`](./licences/haskell/asn1-parse-0.9.5/LICENSE) | Simple monadic parser for ASN1 stream types. | `crypton-x509` |
+| `asn1-types` | [`0.3.4`](http://hackage.haskell.org/package/asn1-types-0.3.4) | [`BSD-3-Clause`](./licences/haskell/asn1-types-0.3.4/LICENSE) | ASN.1 types | `asn1-encoding`, `asn1-parse`, `crypton-x509`, `crypton-x509-store`, `crypton-x509-validation`, `cryptostore`, `simplexmq`, `tls` |
+| `split` | [`0.2.4`](http://hackage.haskell.org/package/split-0.2.4) | [`BSD-3-Clause`](./licences/haskell/split-0.2.4/LICENSE) | Combinator library for splitting lists. | `mono-traversable` |
+| `splitmix` | [`0.1.0.5`](http://hackage.haskell.org/package/splitmix-0.1.0.5) | [`BSD-3-Clause`](./licences/haskell/splitmix-0.1.0.5/LICENSE) | Fast Splittable PRNG | `QuickCheck`, `random` |
+| `assoc` | [`1.1`](http://hackage.haskell.org/package/assoc-1.1) | [`BSD-3-Clause`](./licences/haskell/assoc-1.1/LICENSE) | swap and assoc: Symmetric and Semigroupy Bifunctors | `bifunctors`, `strict`, `these` |
+| `stm-chans` | [`3.0.0.9`](http://hackage.haskell.org/package/stm-chans-3.0.0.9) | [`BSD-3-Clause`](./licences/haskell/stm-chans-3.0.0.9/LICENSE) | Additional types of channels for STM. | `monad-logger` |
+| `strict` | [`0.5`](http://hackage.haskell.org/package/strict-0.5) | [`BSD-3-Clause`](./licences/haskell/strict-0.5/LICENSE) | Strict data types and String IO. | `aeson` |
+| `streaming-commons` | [`0.2.2.6`](http://hackage.haskell.org/package/streaming-commons-0.2.2.6) | [`MIT`](./licences/haskell/streaming-commons-0.2.2.6/LICENSE) | Common lower-level functions needed by various streaming data libraries | `conduit-extra`, `websockets` |
+| `easy-file` | [`0.2.5`](http://hackage.haskell.org/package/easy-file-0.2.5) | [`BSD-3-Clause`](./licences/haskell/easy-file-0.2.5/LICENSE) | Cross-platform File handling | `fast-logger` |
+| `auto-update` | [`0.1.6`](http://hackage.haskell.org/package/auto-update-0.1.6) | [`MIT`](./licences/haskell/auto-update-0.1.6/LICENSE) | Efficiently run periodic, on-demand actions | `fast-logger`, `time-manager` |
+| `tagged` | [`0.8.8`](http://hackage.haskell.org/package/tagged-0.8.8) | [`BSD-3-Clause`](./licences/haskell/tagged-0.8.8/LICENSE) | Haskell 98 phantom types to avoid unsafely passing dummy arguments | `aeson`, `assoc`, `bifunctors`, `boring`, `comonad`, `distributive`, `indexed-traversable-instances`, `semialign`, `semigroupoids` |
+| `th-abstraction` | [`0.6.0.0`](http://hackage.haskell.org/package/th-abstraction-0.6.0.0) | [`ISC`](./licences/haskell/th-abstraction-0.6.0.0/LICENSE) | Nicer interface for reified information about data types | `aeson`, `bifunctors` |
+| `th-compat` | [`0.1.4`](http://hackage.haskell.org/package/th-compat-0.1.4) | [`BSD-3-Clause`](./licences/haskell/th-compat-0.1.4/LICENSE) | Backward- (and forward-)compatible Quote and Code types | `network-uri` |
+| `these` | [`1.2`](http://hackage.haskell.org/package/these-1.2) | [`BSD-3-Clause`](./licences/haskell/these-1.2/LICENSE) | An either-or-both data type. | `aeson`, `semialign`, `strict` |
+| `time-compat` | [`1.9.6.1`](http://hackage.haskell.org/package/time-compat-1.9.6.1) | [`BSD-3-Clause`](./licences/haskell/time-compat-1.9.6.1/LICENSE) | Compatibility package for time | `aeson`, `text-iso8601` |
+| `time-manager` | [`0.0.1`](http://hackage.haskell.org/package/time-manager-0.0.1) | [`MIT`](./licences/haskell/time-manager-0.0.1/LICENSE) | Scalable timer | `http2`, `simplexmq` |
+| `temporary` | [`1.3`](http://hackage.haskell.org/package/temporary-1.3) | [`BSD-3-Clause`](./licences/haskell/temporary-1.3/LICENSE) | Portable temporary file and directory support | `simplexmq` |
+| **`transformers`** | [`0.6.1.0`](http://hackage.haskell.org/package/transformers-0.6.1.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/transformers-0.6.1.0/src/LICENSE) | Concrete functor and monad transformers | `QuickCheck`, `StateVar`, `attoparsec`, `bifunctors`, `boring`, `comonad`, `conduit`, `conduit-extra`, `constraints`, `contravariant`, `crypton-x509`, `distributive`, `exceptions`, `indexed-traversable`, `monad-control`, `monad-logger`, `mono-traversable`, `mtl`, `network-transport`, `optparse-applicative`, `primitive`, `resourcet`, `safe-exceptions`, `semialign`, `semigroupoids`, `simplexmq`, `sqlcipher-simple`, `streaming-commons`, `strict`, `tagged`, `temporary`, `terminal`, `tls`, `transformers-base`, `transformers-compat`, `typed-process`, `unliftio`, `unliftio-core`, `witherable`, `yaml`, `zip` |
+| `transformers-base` | [`0.4.6`](http://hackage.haskell.org/package/transformers-base-0.4.6) | [`BSD-3-Clause`](./licences/haskell/transformers-base-0.4.6/LICENSE) | Lift computations from the bottom of a transformer stack | `lifted-base`, `monad-control`, `monad-logger`, `zip` |
+| `transformers-compat` | [`0.7.2`](http://hackage.haskell.org/package/transformers-compat-0.7.2) | [`BSD-3-Clause`](./licences/haskell/transformers-compat-0.7.2/LICENSE) | A small compatibility shim for the transformers library | `comonad`, `monad-control`, `monad-logger`, `optparse-applicative`, `semigroupoids`, `transformers-base` |
+| `attoparsec` | [`0.14.4`](http://hackage.haskell.org/package/attoparsec-0.14.4) | [`BSD-3-Clause`](./licences/haskell/attoparsec-0.14.4/LICENSE) | Fast combinator parsing for bytestrings and text | `attoparsec` |
+| `text-iso8601` | [`0.1`](http://hackage.haskell.org/package/text-iso8601-0.1) | [`BSD-3-Clause`](./licences/haskell/text-iso8601-0.1/LICENSE) | Converting time to and from ISO 8601 text. | `aeson` |
+| `text-short` | [`0.1.5`](http://hackage.haskell.org/package/text-short-0.1.5) | [`BSD-3-Clause`](./licences/haskell/text-short-0.1.5/LICENSE) | Memory-efficient representation of Unicode text strings | `aeson` |
+| `type-equality` | [`1`](http://hackage.haskell.org/package/type-equality-1) | [`BSD-3-Clause`](./licences/haskell/type-equality-1/LICENSE) | Data.Type.Equality compat package | `constraints` |
+| `typed-process` | [`0.2.11.1`](http://hackage.haskell.org/package/typed-process-0.2.11.1) | [`MIT`](./licences/haskell/typed-process-0.2.11.1/LICENSE) | Run external processes, with strong typing of streams | `conduit-extra` |
+| **`unix`** | [`2.8.1.0`](http://hackage.haskell.org/package/unix-2.8.1.0) | [`BSD-3-Clause`](http://hackage.haskell.org/package/unix-2.8.1.0/src/LICENSE) | POSIX functionality | `conduit`, `directory`, `easy-file`, `entropy`, `process`, `streaming-commons`, `temporary`, `unix-compat`, `unliftio`, `zip` |
+| `vector` | [`0.13.1.0`](http://hackage.haskell.org/package/vector-0.13.1.0) | [`BSD-3-Clause`](./licences/haskell/vector-0.13.1.0/LICENSE) | Efficient Arrays | `aeson`, `bitvec`, `blaze-textual`, `conduit`, `indexed-traversable-instances`, `mono-traversable`, `semialign`, `vector-algorithms`, `witherable`, `yaml` |
+| `vector-algorithms` | [`0.9.0.1`](http://hackage.haskell.org/package/vector-algorithms-0.9.0.1) | [`BSD-3-Clause`](./licences/haskell/vector-algorithms-0.9.0.1/LICENSE) | Efficient algorithms for vector arrays | `mono-traversable` |
+| `vector-stream` | [`0.1.0.0`](http://hackage.haskell.org/package/vector-stream-0.1.0.0) | [`BSD-3-Clause`](./licences/haskell/vector-stream-0.1.0.0/LICENSE) | Efficient Streams | `vector` |
+| `witherable` | [`0.4.2`](http://hackage.haskell.org/package/witherable-0.4.2) | [`BSD-3-Clause`](./licences/haskell/witherable-0.4.2/LICENSE) | filterable traversable | `aeson` |
+| `yaml` | [`0.11.11.2`](http://hackage.haskell.org/package/yaml-0.11.11.2) | [`BSD-3-Clause`](./licences/haskell/yaml-0.11.11.2/LICENSE) | Support for parsing and rendering YAML documents. | `simplexmq` |
+| `zlib` | [`0.6.3.0`](http://hackage.haskell.org/package/zlib-0.6.3.0) | [`BSD-3-Clause`](./licences/haskell/zlib-0.6.3.0/LICENSE) | Compression and decompression in the gzip and zlib formats | `streaming-commons` |
+| `zstd` | [`0.1.3.0`](http://hackage.haskell.org/package/zstd-0.1.3.0) | [`BSD-3-Clause`](./licences/haskell/zstd-0.1.3.0/LICENSE) | Haskell bindings to the Zstandard compression algorithm | `simplexmq` |
+
diff --git a/docs/dependencies/README.md b/docs/dependencies/README.md
new file mode 100644
index 0000000000..bec369c126
--- /dev/null
+++ b/docs/dependencies/README.md
@@ -0,0 +1,9 @@
+# SimpleX Chat and SimpleX servers dependencies
+
+[SQLCipher](https://github.com/sqlcipher/sqlcipher): Extension of [SQLite](https://sqlite.org) with encryption ([BSD-style](./licences/apps/sqlcipher/LICENSE.md))
+
+[vlc](https://github.com/videolan/vlc): VLC media player library ([LGPLv2](./licences/apps/vlc/COPYING.LIB))
+
+[WebRTC](https://webrtc.googlesource.com/src/): RTC for calls ([BSD-3-clause](./licences/apps/webrtc/LICENSE))
+
+[Haskell dependencies](./HASKELL.md).
diff --git a/docs/dependencies/licences/apps/sqlcipher/LICENSE.md b/docs/dependencies/licences/apps/sqlcipher/LICENSE.md
new file mode 100644
index 0000000000..3f71443161
--- /dev/null
+++ b/docs/dependencies/licences/apps/sqlcipher/LICENSE.md
@@ -0,0 +1,24 @@
+Copyright (c) 2025, ZETETIC LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the ZETETIC LLC nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/apps/vlc/COPYING.LIB b/docs/dependencies/licences/apps/vlc/COPYING.LIB
new file mode 100644
index 0000000000..4362b49151
--- /dev/null
+++ b/docs/dependencies/licences/apps/vlc/COPYING.LIB
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/docs/dependencies/licences/apps/webrtc/LICENSE b/docs/dependencies/licences/apps/webrtc/LICENSE
new file mode 100644
index 0000000000..8868dcdf45
--- /dev/null
+++ b/docs/dependencies/licences/apps/webrtc/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2011, The WebRTC project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/OneTuple-0.4.1.1/LICENSE b/docs/dependencies/licences/haskell/OneTuple-0.4.1.1/LICENSE
new file mode 100644
index 0000000000..405f9161e9
--- /dev/null
+++ b/docs/dependencies/licences/haskell/OneTuple-0.4.1.1/LICENSE
@@ -0,0 +1,34 @@
+
+Copyright (c) 2008, John A. Dorsey.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of John Dorsey nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/docs/dependencies/licences/haskell/Only-0.1/LICENSE b/docs/dependencies/licences/haskell/Only-0.1/LICENSE
new file mode 100644
index 0000000000..98d4b1ad78
--- /dev/null
+++ b/docs/dependencies/licences/haskell/Only-0.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Herbert Valerio Riedel
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Herbert Valerio Riedel nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/QuickCheck-2.14.3/LICENSE b/docs/dependencies/licences/haskell/QuickCheck-2.14.3/LICENSE
new file mode 100644
index 0000000000..8b0fdbfe4e
--- /dev/null
+++ b/docs/dependencies/licences/haskell/QuickCheck-2.14.3/LICENSE
@@ -0,0 +1,29 @@
+(The following is the 3-clause BSD license.)
+
+Copyright (c) 2000-2019, Koen Claessen
+Copyright (c) 2006-2008, Björn Bringert
+Copyright (c) 2009-2019, Nick Smallbone
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+- Neither the names of the copyright owners nor the names of the
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/SHA-1.6.4.4/LICENSE b/docs/dependencies/licences/haskell/SHA-1.6.4.4/LICENSE
new file mode 100644
index 0000000000..8e49100207
--- /dev/null
+++ b/docs/dependencies/licences/haskell/SHA-1.6.4.4/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2008, Galois, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in 
+    the documentation and/or other materials provided with the 
+    distribution.
+  * Neither the name of the Galois, Inc. nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.  
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/StateVar-1.2.2/LICENSE b/docs/dependencies/licences/haskell/StateVar-1.2.2/LICENSE
new file mode 100644
index 0000000000..e71299ba0e
--- /dev/null
+++ b/docs/dependencies/licences/haskell/StateVar-1.2.2/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2014-2015, Edward Kmett
+Copyright (c) 2009-2021, Sven Panne
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/aeson-2.2.1.0/LICENSE b/docs/dependencies/licences/haskell/aeson-2.2.1.0/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/ansi-terminal-1.0/LICENSE b/docs/dependencies/licences/haskell/ansi-terminal-1.0/LICENSE
new file mode 100644
index 0000000000..814a83d4fc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/ansi-terminal-1.0/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2008, Maximilian Bolingbroke
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of
+      conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+    * Neither the name of Maximilian Bolingbroke nor the names of other contributors may be used to
+      endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/ansi-terminal-types-0.11.5/LICENSE b/docs/dependencies/licences/haskell/ansi-terminal-types-0.11.5/LICENSE
new file mode 100644
index 0000000000..413047009d
--- /dev/null
+++ b/docs/dependencies/licences/haskell/ansi-terminal-types-0.11.5/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2008, Maximilian Bolingbroke
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Maximilian Bolingbroke nor the names of other contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/appar-0.1.8/LICENSE b/docs/dependencies/licences/haskell/appar-0.1.8/LICENSE
new file mode 100644
index 0000000000..5422193088
--- /dev/null
+++ b/docs/dependencies/licences/haskell/appar-0.1.8/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/asn1-encoding-0.9.6/LICENSE b/docs/dependencies/licences/haskell/asn1-encoding-0.9.6/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/asn1-encoding-0.9.6/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/asn1-parse-0.9.5/LICENSE b/docs/dependencies/licences/haskell/asn1-parse-0.9.5/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/asn1-parse-0.9.5/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/asn1-types-0.3.4/LICENSE b/docs/dependencies/licences/haskell/asn1-types-0.3.4/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/asn1-types-0.3.4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/assoc-1.1/LICENSE b/docs/dependencies/licences/haskell/assoc-1.1/LICENSE
new file mode 100644
index 0000000000..96445e5484
--- /dev/null
+++ b/docs/dependencies/licences/haskell/assoc-1.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Oleg Grenrus nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/async-2.2.5/LICENSE b/docs/dependencies/licences/haskell/async-2.2.5/LICENSE
new file mode 100644
index 0000000000..0acbb121f4
--- /dev/null
+++ b/docs/dependencies/licences/haskell/async-2.2.5/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2012, Simon Marlow
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Simon Marlow nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/attoparsec-0.14.4/LICENSE b/docs/dependencies/licences/haskell/attoparsec-0.14.4/LICENSE
new file mode 100644
index 0000000000..97392a6264
--- /dev/null
+++ b/docs/dependencies/licences/haskell/attoparsec-0.14.4/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) Lennart Kolmodin
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/auto-update-0.1.6/LICENSE b/docs/dependencies/licences/haskell/auto-update-0.1.6/LICENSE
new file mode 100644
index 0000000000..d2a7d05797
--- /dev/null
+++ b/docs/dependencies/licences/haskell/auto-update-0.1.6/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2014 Michael Snoyman
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/base-orphans-0.9.1/LICENSE b/docs/dependencies/licences/haskell/base-orphans-0.9.1/LICENSE
new file mode 100644
index 0000000000..4751ca3f63
--- /dev/null
+++ b/docs/dependencies/licences/haskell/base-orphans-0.9.1/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2015-2017 Simon Hengel <sol@typeful.net>, João Cristóvão <jmacristovao@gmail.com>, Ryan Scott <ryan.gl.scott@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/base64-bytestring-1.2.1.0/LICENSE b/docs/dependencies/licences/haskell/base64-bytestring-1.2.1.0/LICENSE
new file mode 100644
index 0000000000..89d2a1b35f
--- /dev/null
+++ b/docs/dependencies/licences/haskell/base64-bytestring-1.2.1.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2010 Bryan O'Sullivan <bos@serpentine.com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/basement-0.0.16/LICENSE b/docs/dependencies/licences/haskell/basement-0.0.16/LICENSE
new file mode 100644
index 0000000000..75e0288c26
--- /dev/null
+++ b/docs/dependencies/licences/haskell/basement-0.0.16/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2015-2017 Vincent Hanquez <vincent@snarc.org>
+Copyright (c) 2017-2019 Foundation Maintainers
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/bifunctors-5.6.1/LICENSE b/docs/dependencies/licences/haskell/bifunctors-5.6.1/LICENSE
new file mode 100644
index 0000000000..531684e87f
--- /dev/null
+++ b/docs/dependencies/licences/haskell/bifunctors-5.6.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright 2008-2016 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/bitvec-1.1.5.0/LICENSE b/docs/dependencies/licences/haskell/bitvec-1.1.5.0/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/blaze-builder-0.4.2.3/LICENSE b/docs/dependencies/licences/haskell/blaze-builder-0.4.2.3/LICENSE
new file mode 100644
index 0000000000..a8bcabfd42
--- /dev/null
+++ b/docs/dependencies/licences/haskell/blaze-builder-0.4.2.3/LICENSE
@@ -0,0 +1,30 @@
+Copyright Jasper Van der Jeugt 2010, Simon Meier 2010 & 2011
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Jasper Van der Jeugt nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/blaze-textual-0.2.3.1/LICENSE b/docs/dependencies/licences/haskell/blaze-textual-0.2.3.1/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/boring-0.2.1/LICENSE b/docs/dependencies/licences/haskell/boring-0.2.1/LICENSE
new file mode 100644
index 0000000000..96445e5484
--- /dev/null
+++ b/docs/dependencies/licences/haskell/boring-0.2.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Oleg Grenrus nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/byteorder-1.0.4/LICENSE b/docs/dependencies/licences/haskell/byteorder-1.0.4/LICENSE
new file mode 100644
index 0000000000..81b771a3b8
--- /dev/null
+++ b/docs/dependencies/licences/haskell/byteorder-1.0.4/LICENSE
@@ -0,0 +1,30 @@
+Copyright 2009, Antoine Latter
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the author nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/bytestring-builder-0.10.8.2.0/LICENSE b/docs/dependencies/licences/haskell/bytestring-builder-0.10.8.2.0/LICENSE
new file mode 100644
index 0000000000..5106f1309a
--- /dev/null
+++ b/docs/dependencies/licences/haskell/bytestring-builder-0.10.8.2.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright Jasper Van der Jeugt 2010, Simon Meier 2010-2013
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Jasper Van der Jeugt nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/case-insensitive-1.2.1.0/LICENSE b/docs/dependencies/licences/haskell/case-insensitive-1.2.1.0/LICENSE
new file mode 100644
index 0000000000..c81fb8bf9d
--- /dev/null
+++ b/docs/dependencies/licences/haskell/case-insensitive-1.2.1.0/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 2011-2013 Bas van Dijk
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The name of Bas van Dijk and the names of contributors may NOT
+      be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/cereal-0.5.8.3/LICENSE b/docs/dependencies/licences/haskell/cereal-0.5.8.3/LICENSE
new file mode 100644
index 0000000000..6dfb133efb
--- /dev/null
+++ b/docs/dependencies/licences/haskell/cereal-0.5.8.3/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) Lennart Kolmodin, Galois, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/clock-0.8.4/LICENSE b/docs/dependencies/licences/haskell/clock-0.8.4/LICENSE
new file mode 100644
index 0000000000..c2451c8c0a
--- /dev/null
+++ b/docs/dependencies/licences/haskell/clock-0.8.4/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 2009-2022, Clock Contributors
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of contributors may not be used to endorse or promote
+      products derived from this software without specific prior
+      written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/colour-2.3.6/LICENSE b/docs/dependencies/licences/haskell/colour-2.3.6/LICENSE
new file mode 100644
index 0000000000..61aede888a
--- /dev/null
+++ b/docs/dependencies/licences/haskell/colour-2.3.6/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2008, 2009
+Russell O'Connor
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/comonad-5.0.8/LICENSE b/docs/dependencies/licences/haskell/comonad-5.0.8/LICENSE
new file mode 100644
index 0000000000..f8e92e04df
--- /dev/null
+++ b/docs/dependencies/licences/haskell/comonad-5.0.8/LICENSE
@@ -0,0 +1,27 @@
+Copyright 2008-2014 Edward Kmett
+Copyright 2004-2008 Dave Menendez
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/composition-1.0.2.2/LICENSE b/docs/dependencies/licences/haskell/composition-1.0.2.2/LICENSE
new file mode 100644
index 0000000000..e191e7ab64
--- /dev/null
+++ b/docs/dependencies/licences/haskell/composition-1.0.2.2/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2011-2012, Dan Burton
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Dan Burton nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/conduit-1.3.5/LICENSE b/docs/dependencies/licences/haskell/conduit-1.3.5/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/conduit-extra-1.3.6/LICENSE b/docs/dependencies/licences/haskell/conduit-extra-1.3.6/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/constraints-0.14/LICENSE b/docs/dependencies/licences/haskell/constraints-0.14/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/contravariant-1.5.5/LICENSE b/docs/dependencies/licences/haskell/contravariant-1.5.5/LICENSE
new file mode 100644
index 0000000000..f357c7c429
--- /dev/null
+++ b/docs/dependencies/licences/haskell/contravariant-1.5.5/LICENSE
@@ -0,0 +1,30 @@
+Copyright 2007-2015 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/cryptohash-md5-0.11.101.0/LICENSE b/docs/dependencies/licences/haskell/cryptohash-md5-0.11.101.0/LICENSE
new file mode 100644
index 0000000000..467bf18f27
--- /dev/null
+++ b/docs/dependencies/licences/haskell/cryptohash-md5-0.11.101.0/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2010-2014 Vincent Hanquez <vincent@snarc.org>
+              2016      Herbert Valerio Riedel <hvr@gnu.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/cryptohash-sha1-0.11.101.0/LICENSE b/docs/dependencies/licences/haskell/cryptohash-sha1-0.11.101.0/LICENSE
new file mode 100644
index 0000000000..467bf18f27
--- /dev/null
+++ b/docs/dependencies/licences/haskell/cryptohash-sha1-0.11.101.0/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2010-2014 Vincent Hanquez <vincent@snarc.org>
+              2016      Herbert Valerio Riedel <hvr@gnu.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/crypton-0.34/LICENSE b/docs/dependencies/licences/haskell/crypton-0.34/LICENSE
new file mode 100644
index 0000000000..a61c84945b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/crypton-0.34/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2006-2015 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/crypton-x509-1.7.6/LICENSE b/docs/dependencies/licences/haskell/crypton-x509-1.7.6/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/crypton-x509-1.7.6/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/crypton-x509-store-1.6.9/LICENSE b/docs/dependencies/licences/haskell/crypton-x509-store-1.6.9/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/crypton-x509-store-1.6.9/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/crypton-x509-validation-1.6.12/LICENSE b/docs/dependencies/licences/haskell/crypton-x509-validation-1.6.12/LICENSE
new file mode 100644
index 0000000000..e68cc61f14
--- /dev/null
+++ b/docs/dependencies/licences/haskell/crypton-x509-validation-1.6.12/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2013 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/cryptostore-0.3.0.1/LICENSE b/docs/dependencies/licences/haskell/cryptostore-0.3.0.1/LICENSE
new file mode 100644
index 0000000000..b85926a265
--- /dev/null
+++ b/docs/dependencies/licences/haskell/cryptostore-0.3.0.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2018-2023, Olivier Chéron
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Olivier Chéron nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-default-0.7.1.1/LICENSE b/docs/dependencies/licences/haskell/data-default-0.7.1.1/LICENSE
new file mode 100644
index 0000000000..cd44640be9
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-default-0.7.1.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-default-class-0.1.2.0/LICENSE b/docs/dependencies/licences/haskell/data-default-class-0.1.2.0/LICENSE
new file mode 100644
index 0000000000..cd44640be9
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-default-class-0.1.2.0/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-default-instances-containers-0.0.1/LICENSE b/docs/dependencies/licences/haskell/data-default-instances-containers-0.0.1/LICENSE
new file mode 100644
index 0000000000..4f9075d76b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-default-instances-containers-0.0.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY LUKAS MAI AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-default-instances-dlist-0.0.1/LICENSE b/docs/dependencies/licences/haskell/data-default-instances-dlist-0.0.1/LICENSE
new file mode 100644
index 0000000000..4f9075d76b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-default-instances-dlist-0.0.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY LUKAS MAI AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-default-instances-old-locale-0.0.1/LICENSE b/docs/dependencies/licences/haskell/data-default-instances-old-locale-0.0.1/LICENSE
new file mode 100644
index 0000000000..4f9075d76b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-default-instances-old-locale-0.0.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY LUKAS MAI AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/data-fix-0.3.2/LICENSE b/docs/dependencies/licences/haskell/data-fix-0.3.2/LICENSE
new file mode 100644
index 0000000000..0576170924
--- /dev/null
+++ b/docs/dependencies/licences/haskell/data-fix-0.3.2/LICENSE
@@ -0,0 +1,30 @@
+Copyright Anton Kholomiov 2010
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Anton Kholomiov nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/digest-0.0.1.7/LICENSE b/docs/dependencies/licences/haskell/digest-0.0.1.7/LICENSE
new file mode 100644
index 0000000000..48326b0815
--- /dev/null
+++ b/docs/dependencies/licences/haskell/digest-0.0.1.7/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2008-2009, Eugene Kirpichov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/distributive-0.6.2.1/LICENSE b/docs/dependencies/licences/haskell/distributive-0.6.2.1/LICENSE
new file mode 100644
index 0000000000..d6c9cbe4a4
--- /dev/null
+++ b/docs/dependencies/licences/haskell/distributive-0.6.2.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright 2011-2016 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/dlist-1.0/license.md b/docs/dependencies/licences/haskell/dlist-1.0/license.md
new file mode 100644
index 0000000000..32ac978e90
--- /dev/null
+++ b/docs/dependencies/licences/haskell/dlist-1.0/license.md
@@ -0,0 +1,28 @@
+Copyright © 2006-2009 Don Stewart, 2013-2020 Sean Leather, contributors
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of other contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/easy-file-0.2.5/LICENSE b/docs/dependencies/licences/haskell/easy-file-0.2.5/LICENSE
new file mode 100644
index 0000000000..5422193088
--- /dev/null
+++ b/docs/dependencies/licences/haskell/easy-file-0.2.5/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/email-validate-2.3.2.19/LICENSE b/docs/dependencies/licences/haskell/email-validate-2.3.2.19/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/entropy-0.4.1.10/LICENSE b/docs/dependencies/licences/haskell/entropy-0.4.1.10/LICENSE
new file mode 100644
index 0000000000..6d24e89d0b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/entropy-0.4.1.10/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) Thomas DuBuisson
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/fast-logger-3.2.2/LICENSE b/docs/dependencies/licences/haskell/fast-logger-3.2.2/LICENSE
new file mode 100644
index 0000000000..5422193088
--- /dev/null
+++ b/docs/dependencies/licences/haskell/fast-logger-3.2.2/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/file-embed-0.0.15.0/LICENSE b/docs/dependencies/licences/haskell/file-embed-0.0.15.0/LICENSE
new file mode 100644
index 0000000000..11dc17a16c
--- /dev/null
+++ b/docs/dependencies/licences/haskell/file-embed-0.0.15.0/LICENSE
@@ -0,0 +1,25 @@
+The following license covers this documentation, and the source code, except
+where otherwise indicated.
+
+Copyright 2008, Michael Snoyman. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/generically-0.1.1/LICENSE b/docs/dependencies/licences/haskell/generically-0.1.1/LICENSE
new file mode 100644
index 0000000000..58c573a1e2
--- /dev/null
+++ b/docs/dependencies/licences/haskell/generically-0.1.1/LICENSE
@@ -0,0 +1,28 @@
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Herbert Valerio Riedel nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/hashable-1.4.3.0/LICENSE b/docs/dependencies/licences/haskell/hashable-1.4.3.0/LICENSE
new file mode 100644
index 0000000000..7130957b4d
--- /dev/null
+++ b/docs/dependencies/licences/haskell/hashable-1.4.3.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright Milan Straka 2010
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Milan Straka nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/hourglass-0.2.12/LICENSE b/docs/dependencies/licences/haskell/hourglass-0.2.12/LICENSE
new file mode 100644
index 0000000000..36c942d4a8
--- /dev/null
+++ b/docs/dependencies/licences/haskell/hourglass-0.2.12/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/http-types-0.12.4/LICENSE b/docs/dependencies/licences/haskell/http-types-0.12.4/LICENSE
new file mode 100644
index 0000000000..f77a7b24dd
--- /dev/null
+++ b/docs/dependencies/licences/haskell/http-types-0.12.4/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 2011, Aristid Breitkreuz
+Copyright (c) 2011, Michael Snoyman
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Aristid Breitkreuz nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/http2-5.0.0/LICENSE b/docs/dependencies/licences/haskell/http2-5.0.0/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/indexed-traversable-0.1.3/LICENSE b/docs/dependencies/licences/haskell/indexed-traversable-0.1.3/LICENSE
new file mode 100644
index 0000000000..476166addc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/indexed-traversable-0.1.3/LICENSE
@@ -0,0 +1,26 @@
+Copyright 2012-2016 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/indexed-traversable-instances-0.1.1.2/LICENSE b/docs/dependencies/licences/haskell/indexed-traversable-instances-0.1.1.2/LICENSE
new file mode 100644
index 0000000000..476166addc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/indexed-traversable-instances-0.1.1.2/LICENSE
@@ -0,0 +1,26 @@
+Copyright 2012-2016 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/ini-0.4.2/LICENSE b/docs/dependencies/licences/haskell/ini-0.4.2/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/integer-conversion-0.1.0.1/LICENSE b/docs/dependencies/licences/haskell/integer-conversion-0.1.0.1/LICENSE
new file mode 100644
index 0000000000..3f74492595
--- /dev/null
+++ b/docs/dependencies/licences/haskell/integer-conversion-0.1.0.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2023, Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Oleg Grenrus nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/integer-logarithms-1.0.3.1/LICENSE b/docs/dependencies/licences/haskell/integer-logarithms-1.0.3.1/LICENSE
new file mode 100644
index 0000000000..9430f484d0
--- /dev/null
+++ b/docs/dependencies/licences/haskell/integer-logarithms-1.0.3.1/LICENSE
@@ -0,0 +1,16 @@
+Copyright (c) 2011 Daniel Fischer, 2017 Oleg Grenrus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/iproute-1.7.12/LICENSE b/docs/dependencies/licences/haskell/iproute-1.7.12/LICENSE
new file mode 100644
index 0000000000..5422193088
--- /dev/null
+++ b/docs/dependencies/licences/haskell/iproute-1.7.12/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/libyaml-0.1.2/LICENSE b/docs/dependencies/licences/haskell/libyaml-0.1.2/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/lifted-base-0.2.3.12/LICENSE b/docs/dependencies/licences/haskell/lifted-base-0.2.3.12/LICENSE
new file mode 100644
index 0000000000..b8b5ed95c0
--- /dev/null
+++ b/docs/dependencies/licences/haskell/lifted-base-0.2.3.12/LICENSE
@@ -0,0 +1,29 @@
+Copyright © 2010-2012, Bas van Dijk, Anders Kaseorg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+• Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+• Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+• Neither the name of the author nor the names of other contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+“AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/memory-0.18.0/LICENSE b/docs/dependencies/licences/haskell/memory-0.18.0/LICENSE
new file mode 100644
index 0000000000..8eafd52555
--- /dev/null
+++ b/docs/dependencies/licences/haskell/memory-0.18.0/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2015-2018 Vincent Hanquez <vincent@snarc.org>
+Copyright (c) 2017-2018 Nicolas Di Prima <nicolas@primetype.co.uk>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/monad-control-1.0.3.1/LICENSE b/docs/dependencies/licences/haskell/monad-control-1.0.3.1/LICENSE
new file mode 100644
index 0000000000..f4e1bfab44
--- /dev/null
+++ b/docs/dependencies/licences/haskell/monad-control-1.0.3.1/LICENSE
@@ -0,0 +1,29 @@
+Copyright © 2010, Bas van Dijk, Anders Kaseorg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+• Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+• Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+• Neither the name of the author nor the names of other contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+“AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/monad-logger-0.3.40/LICENSE b/docs/dependencies/licences/haskell/monad-logger-0.3.40/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/mono-traversable-1.0.15.3/LICENSE b/docs/dependencies/licences/haskell/mono-traversable-1.0.15.3/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/network-3.1.4.0/LICENSE b/docs/dependencies/licences/haskell/network-3.1.4.0/LICENSE
new file mode 100644
index 0000000000..40bba626f8
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-3.1.4.0/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2002-2010, The University Court of the University of Glasgow.
+Copyright (c) 2007-2010, Johan Tibell
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/docs/dependencies/licences/haskell/network-byte-order-0.1.7/LICENSE b/docs/dependencies/licences/haskell/network-byte-order-0.1.7/LICENSE
new file mode 100644
index 0000000000..ed342e54a0
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-byte-order-0.1.7/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Kazu Yamamoto
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Kazu Yamamoto nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/network-control-0.0.2/LICENSE b/docs/dependencies/licences/haskell/network-control-0.0.2/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/network-info-0.2.1/LICENSE b/docs/dependencies/licences/haskell/network-info-0.2.1/LICENSE
new file mode 100644
index 0000000000..be005bd412
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-info-0.2.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2010, Jacob Stanley
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Jacob Stanley nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/network-transport-0.5.6/LICENSE b/docs/dependencies/licences/haskell/network-transport-0.5.6/LICENSE
new file mode 100644
index 0000000000..f3459e449d
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-transport-0.5.6/LICENSE
@@ -0,0 +1,31 @@
+Copyright Well-Typed LLP, 2011-2012
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the owner nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/docs/dependencies/licences/haskell/network-udp-0.0.0/LICENSE b/docs/dependencies/licences/haskell/network-udp-0.0.0/LICENSE
new file mode 100644
index 0000000000..73957a7a32
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-udp-0.0.0/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2022, Internet Initiative Japan Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/network-uri-2.6.4.2/LICENSE b/docs/dependencies/licences/haskell/network-uri-2.6.4.2/LICENSE
new file mode 100644
index 0000000000..40bba626f8
--- /dev/null
+++ b/docs/dependencies/licences/haskell/network-uri-2.6.4.2/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2002-2010, The University Court of the University of Glasgow.
+Copyright (c) 2007-2010, Johan Tibell
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/docs/dependencies/licences/haskell/old-locale-1.0.0.7/LICENSE b/docs/dependencies/licences/haskell/old-locale-1.0.0.7/LICENSE
new file mode 100644
index 0000000000..06bb641487
--- /dev/null
+++ b/docs/dependencies/licences/haskell/old-locale-1.0.0.7/LICENSE
@@ -0,0 +1,63 @@
+This library (libraries/base) is derived from code from two
+sources: 
+
+  * Code from the GHC project which is largely (c) The University of
+    Glasgow, and distributable under a BSD-style license (see below),
+
+  * Code from the Haskell 98 Report which is (c) Simon Peyton Jones
+    and freely redistributable (but see the full license for
+    restrictions).
+
+The full text of these licenses is reproduced below.  Both of the
+licenses are BSD-style or compatible.
+
+-----------------------------------------------------------------------------
+
+The Glasgow Haskell Compiler License
+
+Copyright 2004, The University Court of the University of Glasgow. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+-----------------------------------------------------------------------------
+
+Code derived from the document "Report on the Programming Language
+Haskell 98", is distributed under the following license:
+
+  Copyright (c) 2002 Simon Peyton Jones
+
+  The authors intend this Report to belong to the entire Haskell
+  community, and so we grant permission to copy and distribute it for
+  any purpose, provided that it is reproduced in its entirety,
+  including this Notice.  Modified versions of this Report may also be
+  copied and distributed for any purpose, provided that the modified
+  version is clearly presented as such, and that it does not claim to
+  be a definition of the Haskell 98 Language.
+
+-----------------------------------------------------------------------------
diff --git a/docs/dependencies/licences/haskell/old-time-1.1.0.4/LICENSE b/docs/dependencies/licences/haskell/old-time-1.1.0.4/LICENSE
new file mode 100644
index 0000000000..06bb641487
--- /dev/null
+++ b/docs/dependencies/licences/haskell/old-time-1.1.0.4/LICENSE
@@ -0,0 +1,63 @@
+This library (libraries/base) is derived from code from two
+sources: 
+
+  * Code from the GHC project which is largely (c) The University of
+    Glasgow, and distributable under a BSD-style license (see below),
+
+  * Code from the Haskell 98 Report which is (c) Simon Peyton Jones
+    and freely redistributable (but see the full license for
+    restrictions).
+
+The full text of these licenses is reproduced below.  Both of the
+licenses are BSD-style or compatible.
+
+-----------------------------------------------------------------------------
+
+The Glasgow Haskell Compiler License
+
+Copyright 2004, The University Court of the University of Glasgow. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+-----------------------------------------------------------------------------
+
+Code derived from the document "Report on the Programming Language
+Haskell 98", is distributed under the following license:
+
+  Copyright (c) 2002 Simon Peyton Jones
+
+  The authors intend this Report to belong to the entire Haskell
+  community, and so we grant permission to copy and distribute it for
+  any purpose, provided that it is reproduced in its entirety,
+  including this Notice.  Modified versions of this Report may also be
+  copied and distributed for any purpose, provided that the modified
+  version is clearly presented as such, and that it does not claim to
+  be a definition of the Haskell 98 Language.
+
+-----------------------------------------------------------------------------
diff --git a/docs/dependencies/licences/haskell/optparse-applicative-0.18.1.0/LICENSE b/docs/dependencies/licences/haskell/optparse-applicative-0.18.1.0/LICENSE
new file mode 100644
index 0000000000..0507cc2a81
--- /dev/null
+++ b/docs/dependencies/licences/haskell/optparse-applicative-0.18.1.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2012, Paolo Capriotti
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Paolo Capriotti nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/pem-0.2.4/LICENSE b/docs/dependencies/licences/haskell/pem-0.2.4/LICENSE
new file mode 100644
index 0000000000..15c41788af
--- /dev/null
+++ b/docs/dependencies/licences/haskell/pem-0.2.4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2018 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/prettyprinter-1.7.1/LICENSE.md b/docs/dependencies/licences/haskell/prettyprinter-1.7.1/LICENSE.md
new file mode 100644
index 0000000000..39592102dc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/prettyprinter-1.7.1/LICENSE.md
@@ -0,0 +1,23 @@
+Copyright 2008, Daan Leijen and Max Bolingbroke, 2016 David Luposchainsky. All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders "as is" and any express or
+implied warranties, including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose are disclaimed. In no event
+shall the copyright holders be liable for any direct, indirect, incidental,
+special, exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or profits; or
+business interruption) however caused and on any theory of liability, whether in
+contract, strict liability, or tort (including negligence or otherwise) arising
+in any way out of the use of this software, even if advised of the possibility
+of such damage.
diff --git a/docs/dependencies/licences/haskell/prettyprinter-ansi-terminal-1.1.3/LICENSE.md b/docs/dependencies/licences/haskell/prettyprinter-ansi-terminal-1.1.3/LICENSE.md
new file mode 100644
index 0000000000..39592102dc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/prettyprinter-ansi-terminal-1.1.3/LICENSE.md
@@ -0,0 +1,23 @@
+Copyright 2008, Daan Leijen and Max Bolingbroke, 2016 David Luposchainsky. All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders "as is" and any express or
+implied warranties, including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose are disclaimed. In no event
+shall the copyright holders be liable for any direct, indirect, incidental,
+special, exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or profits; or
+business interruption) however caused and on any theory of liability, whether in
+contract, strict liability, or tort (including negligence or otherwise) arising
+in any way out of the use of this software, even if advised of the possibility
+of such damage.
diff --git a/docs/dependencies/licences/haskell/primitive-0.9.0.0/LICENSE b/docs/dependencies/licences/haskell/primitive-0.9.0.0/LICENSE
new file mode 100644
index 0000000000..fc213a6ffb
--- /dev/null
+++ b/docs/dependencies/licences/haskell/primitive-0.9.0.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2008-2009, Roman Leshchinskiy
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
diff --git a/docs/dependencies/licences/haskell/psqueues-0.2.8.0/LICENSE b/docs/dependencies/licences/haskell/psqueues-0.2.8.0/LICENSE
new file mode 100644
index 0000000000..92337b951e
--- /dev/null
+++ b/docs/dependencies/licences/haskell/psqueues-0.2.8.0/LICENSE
@@ -0,0 +1,31 @@
+The Glasgow Haskell Compiler License
+
+Copyright 2004, The University Court of the University of Glasgow.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/docs/dependencies/licences/haskell/random-1.2.1.1/LICENSE b/docs/dependencies/licences/haskell/random-1.2.1.1/LICENSE
new file mode 100644
index 0000000000..06bb641487
--- /dev/null
+++ b/docs/dependencies/licences/haskell/random-1.2.1.1/LICENSE
@@ -0,0 +1,63 @@
+This library (libraries/base) is derived from code from two
+sources: 
+
+  * Code from the GHC project which is largely (c) The University of
+    Glasgow, and distributable under a BSD-style license (see below),
+
+  * Code from the Haskell 98 Report which is (c) Simon Peyton Jones
+    and freely redistributable (but see the full license for
+    restrictions).
+
+The full text of these licenses is reproduced below.  Both of the
+licenses are BSD-style or compatible.
+
+-----------------------------------------------------------------------------
+
+The Glasgow Haskell Compiler License
+
+Copyright 2004, The University Court of the University of Glasgow. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+-----------------------------------------------------------------------------
+
+Code derived from the document "Report on the Programming Language
+Haskell 98", is distributed under the following license:
+
+  Copyright (c) 2002 Simon Peyton Jones
+
+  The authors intend this Report to belong to the entire Haskell
+  community, and so we grant permission to copy and distribute it for
+  any purpose, provided that it is reproduced in its entirety,
+  including this Notice.  Modified versions of this Report may also be
+  copied and distributed for any purpose, provided that the modified
+  version is clearly presented as such, and that it does not claim to
+  be a definition of the Haskell 98 Language.
+
+-----------------------------------------------------------------------------
diff --git a/docs/dependencies/licences/haskell/record-hasfield-1.0/LICENSE b/docs/dependencies/licences/haskell/record-hasfield-1.0/LICENSE
new file mode 100644
index 0000000000..f6a9dc60f7
--- /dev/null
+++ b/docs/dependencies/licences/haskell/record-hasfield-1.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright Adam Gundry and Neil Mitchell 2018-2019.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Neil Mitchell nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/resourcet-1.3.0/LICENSE b/docs/dependencies/licences/haskell/resourcet-1.3.0/LICENSE
new file mode 100644
index 0000000000..fe6d4e9b3f
--- /dev/null
+++ b/docs/dependencies/licences/haskell/resourcet-1.3.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c)2011, Michael Snoyman
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Michael Snoyman nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/safe-exceptions-0.1.7.4/LICENSE b/docs/dependencies/licences/haskell/safe-exceptions-0.1.7.4/LICENSE
new file mode 100644
index 0000000000..9a69c0901b
--- /dev/null
+++ b/docs/dependencies/licences/haskell/safe-exceptions-0.1.7.4/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2016 FP Complete
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/scientific-0.3.7.0/LICENSE b/docs/dependencies/licences/haskell/scientific-0.3.7.0/LICENSE
new file mode 100644
index 0000000000..c1015843aa
--- /dev/null
+++ b/docs/dependencies/licences/haskell/scientific-0.3.7.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2013, Bas van Dijk
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Bas van Dijk nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/semialign-1.3/LICENSE b/docs/dependencies/licences/haskell/semialign-1.3/LICENSE
new file mode 100644
index 0000000000..9d6d650165
--- /dev/null
+++ b/docs/dependencies/licences/haskell/semialign-1.3/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2012, C. McCann, 2015-2019 Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of C. McCann nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/semigroupoids-6.0.0.1/LICENSE b/docs/dependencies/licences/haskell/semigroupoids-6.0.0.1/LICENSE
new file mode 100644
index 0000000000..1812ac961c
--- /dev/null
+++ b/docs/dependencies/licences/haskell/semigroupoids-6.0.0.1/LICENSE
@@ -0,0 +1,26 @@
+Copyright 2011-2015 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/simple-logger-0.1.1/LICENSE b/docs/dependencies/licences/haskell/simple-logger-0.1.1/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/socks-0.6.1/LICENSE b/docs/dependencies/licences/haskell/socks-0.6.1/LICENSE
new file mode 100644
index 0000000000..ed6f548a98
--- /dev/null
+++ b/docs/dependencies/licences/haskell/socks-0.6.1/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2019 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/split-0.2.4/LICENSE b/docs/dependencies/licences/haskell/split-0.2.4/LICENSE
new file mode 100644
index 0000000000..648167ba61
--- /dev/null
+++ b/docs/dependencies/licences/haskell/split-0.2.4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2008 Brent Yorgey, Louis Wasserman
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of other contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/splitmix-0.1.0.5/LICENSE b/docs/dependencies/licences/haskell/splitmix-0.1.0.5/LICENSE
new file mode 100644
index 0000000000..96445e5484
--- /dev/null
+++ b/docs/dependencies/licences/haskell/splitmix-0.1.0.5/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Oleg Grenrus nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/stm-chans-3.0.0.9/LICENSE b/docs/dependencies/licences/haskell/stm-chans-3.0.0.9/LICENSE
new file mode 100644
index 0000000000..55157e8352
--- /dev/null
+++ b/docs/dependencies/licences/haskell/stm-chans-3.0.0.9/LICENSE
@@ -0,0 +1,35 @@
+=== stm-chans license ===
+
+Copyright (c) 2011--2013, wren gayle romano.
+ALL RIGHTS RESERVED.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the copyright holders nor the names of
+      other contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/docs/dependencies/licences/haskell/streaming-commons-0.2.2.6/LICENSE b/docs/dependencies/licences/haskell/streaming-commons-0.2.2.6/LICENSE
new file mode 100644
index 0000000000..7198785aaf
--- /dev/null
+++ b/docs/dependencies/licences/haskell/streaming-commons-0.2.2.6/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 FP Complete
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/docs/dependencies/licences/haskell/strict-0.5/LICENSE b/docs/dependencies/licences/haskell/strict-0.5/LICENSE
new file mode 100644
index 0000000000..4782550806
--- /dev/null
+++ b/docs/dependencies/licences/haskell/strict-0.5/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) Roman Leshchinskiy 2006-2007
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/tagged-0.8.8/LICENSE b/docs/dependencies/licences/haskell/tagged-0.8.8/LICENSE
new file mode 100644
index 0000000000..db046152dc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/tagged-0.8.8/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2009-2015 Edward Kmett
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Edward Kmett nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/temporary-1.3/LICENSE b/docs/dependencies/licences/haskell/temporary-1.3/LICENSE
new file mode 100644
index 0000000000..db55f34db3
--- /dev/null
+++ b/docs/dependencies/licences/haskell/temporary-1.3/LICENSE
@@ -0,0 +1,27 @@
+Copyright
+  (c) 2003-2006, Isaac Jones
+  (c) 2005-2009, Duncan Coutts
+  (c) 2008, Maximilian Bolingbroke
+  ... and other contributors
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of
+      conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+    * Neither the name of Maximilian Bolingbroke nor the names of other contributors may be used to
+      endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/terminal-0.2.0.0/LICENSE b/docs/dependencies/licences/haskell/terminal-0.2.0.0/LICENSE
new file mode 100644
index 0000000000..d45361ccf6
--- /dev/null
+++ b/docs/dependencies/licences/haskell/terminal-0.2.0.0/LICENSE
@@ -0,0 +1,30 @@
+Copyright Lars Petersen (c) 2018
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Lars Petersen nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/text-iso8601-0.1/LICENSE b/docs/dependencies/licences/haskell/text-iso8601-0.1/LICENSE
new file mode 100644
index 0000000000..fc90c466c7
--- /dev/null
+++ b/docs/dependencies/licences/haskell/text-iso8601-0.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2023 Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/text-short-0.1.5/LICENSE b/docs/dependencies/licences/haskell/text-short-0.1.5/LICENSE
new file mode 100644
index 0000000000..98d4b1ad78
--- /dev/null
+++ b/docs/dependencies/licences/haskell/text-short-0.1.5/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2017, Herbert Valerio Riedel
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Herbert Valerio Riedel nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/th-abstraction-0.6.0.0/LICENSE b/docs/dependencies/licences/haskell/th-abstraction-0.6.0.0/LICENSE
new file mode 100644
index 0000000000..70f6077c10
--- /dev/null
+++ b/docs/dependencies/licences/haskell/th-abstraction-0.6.0.0/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2017-2020 Eric Mertens
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/th-compat-0.1.4/LICENSE b/docs/dependencies/licences/haskell/th-compat-0.1.4/LICENSE
new file mode 100644
index 0000000000..879f215afc
--- /dev/null
+++ b/docs/dependencies/licences/haskell/th-compat-0.1.4/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2020, Ryan Scott
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Ryan Scott nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/these-1.2/LICENSE b/docs/dependencies/licences/haskell/these-1.2/LICENSE
new file mode 100644
index 0000000000..9d6d650165
--- /dev/null
+++ b/docs/dependencies/licences/haskell/these-1.2/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2012, C. McCann, 2015-2019 Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of C. McCann nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/time-compat-1.9.6.1/LICENSE b/docs/dependencies/licences/haskell/time-compat-1.9.6.1/LICENSE
new file mode 100644
index 0000000000..910ef51bb4
--- /dev/null
+++ b/docs/dependencies/licences/haskell/time-compat-1.9.6.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019 time contibutors, Oleg Grenrus
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Oleg Grenrus nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/time-manager-0.0.1/LICENSE b/docs/dependencies/licences/haskell/time-manager-0.0.1/LICENSE
new file mode 100644
index 0000000000..d9f041796e
--- /dev/null
+++ b/docs/dependencies/licences/haskell/time-manager-0.0.1/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/tls-1.9.0/LICENSE b/docs/dependencies/licences/haskell/tls-1.9.0/LICENSE
new file mode 100644
index 0000000000..96ec822eb9
--- /dev/null
+++ b/docs/dependencies/licences/haskell/tls-1.9.0/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010-2015 Vincent Hanquez <vincent@snarc.org>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/transformers-base-0.4.6/LICENSE b/docs/dependencies/licences/haskell/transformers-base-0.4.6/LICENSE
new file mode 100644
index 0000000000..9d51261b52
--- /dev/null
+++ b/docs/dependencies/licences/haskell/transformers-base-0.4.6/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011, Mikhail Vorozhtsov, Bas van Dijk
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright 
+  notice, this list of conditions and the following disclaimer in the 
+  documentation and/or other materials provided with the distribution.
+- Neither the names of the copyright owners nor the names of the 
+  contributors may be used to endorse or promote products derived 
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/docs/dependencies/licences/haskell/transformers-compat-0.7.2/LICENSE b/docs/dependencies/licences/haskell/transformers-compat-0.7.2/LICENSE
new file mode 100644
index 0000000000..50586d197c
--- /dev/null
+++ b/docs/dependencies/licences/haskell/transformers-compat-0.7.2/LICENSE
@@ -0,0 +1,30 @@
+Copyright 2012-2015 Edward Kmett
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/type-equality-1/LICENSE b/docs/dependencies/licences/haskell/type-equality-1/LICENSE
new file mode 100644
index 0000000000..c30f3e7d31
--- /dev/null
+++ b/docs/dependencies/licences/haskell/type-equality-1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2009 Erik Hesselink, 2019 Oleg Grenrus, Ryan Scott
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of authors nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/typed-process-0.2.11.1/LICENSE b/docs/dependencies/licences/haskell/typed-process-0.2.11.1/LICENSE
new file mode 100644
index 0000000000..50bb8ea0cf
--- /dev/null
+++ b/docs/dependencies/licences/haskell/typed-process-0.2.11.1/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2016 FP Complete, https://www.fpcomplete.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/unix-compat-0.7.1/LICENSE b/docs/dependencies/licences/haskell/unix-compat-0.7.1/LICENSE
new file mode 100644
index 0000000000..cc3be3e947
--- /dev/null
+++ b/docs/dependencies/licences/haskell/unix-compat-0.7.1/LICENSE
@@ -0,0 +1,31 @@
+BSD 3-Clause License
+
+Copyright (c) 2007-2008, Björn Bringert
+Copyright (c) 2007-2009, Duncan Coutts
+Copyright (c) 2010-2011, Jacob Stanley
+Copyright (c)      2011, Bryan O'Sullivan
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright 
+  notice, this list of conditions and the following disclaimer in the 
+  documentation and/or other materials provided with the distribution.
+- Neither the names of the copyright owners nor the names of the 
+  contributors may be used to endorse or promote products derived 
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/unix-time-0.4.11/LICENSE b/docs/dependencies/licences/haskell/unix-time-0.4.11/LICENSE
new file mode 100644
index 0000000000..5422193088
--- /dev/null
+++ b/docs/dependencies/licences/haskell/unix-time-0.4.11/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/unliftio-0.2.25.0/LICENSE b/docs/dependencies/licences/haskell/unliftio-0.2.25.0/LICENSE
new file mode 100644
index 0000000000..1349134e01
--- /dev/null
+++ b/docs/dependencies/licences/haskell/unliftio-0.2.25.0/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2017 FP Complete
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/unliftio-core-0.2.1.0/LICENSE b/docs/dependencies/licences/haskell/unliftio-core-0.2.1.0/LICENSE
new file mode 100644
index 0000000000..1349134e01
--- /dev/null
+++ b/docs/dependencies/licences/haskell/unliftio-core-0.2.1.0/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2017 FP Complete
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/dependencies/licences/haskell/unordered-containers-0.2.19.1/LICENSE b/docs/dependencies/licences/haskell/unordered-containers-0.2.19.1/LICENSE
new file mode 100644
index 0000000000..5eb7e1bdda
--- /dev/null
+++ b/docs/dependencies/licences/haskell/unordered-containers-0.2.19.1/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2010, Johan Tibell
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Johan Tibell nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/uuid-1.3.15/LICENSE b/docs/dependencies/licences/haskell/uuid-1.3.15/LICENSE
new file mode 100644
index 0000000000..dc46bca24c
--- /dev/null
+++ b/docs/dependencies/licences/haskell/uuid-1.3.15/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2008, Antoine Latter
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are 
+met:
+
+    * Redistributions of source code must retain the above copyright 
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright 
+notice, this list of conditions and the following disclaimer in the 
+documentation and/or other materials provided with the distribution.
+    * The names of the authors may not be used to endorse or promote 
+products derived from this software without specific prior written 
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/uuid-types-1.0.5.1/LICENSE b/docs/dependencies/licences/haskell/uuid-types-1.0.5.1/LICENSE
new file mode 100644
index 0000000000..dc46bca24c
--- /dev/null
+++ b/docs/dependencies/licences/haskell/uuid-types-1.0.5.1/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2008, Antoine Latter
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are 
+met:
+
+    * Redistributions of source code must retain the above copyright 
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright 
+notice, this list of conditions and the following disclaimer in the 
+documentation and/or other materials provided with the distribution.
+    * The names of the authors may not be used to endorse or promote 
+products derived from this software without specific prior written 
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/vector-0.13.1.0/LICENSE b/docs/dependencies/licences/haskell/vector-0.13.1.0/LICENSE
new file mode 100644
index 0000000000..ef2a5268d6
--- /dev/null
+++ b/docs/dependencies/licences/haskell/vector-0.13.1.0/LICENSE
@@ -0,0 +1,32 @@
+Copyright (c) 2008-2012, Roman Leshchinskiy
+              2020-2022, Alexey Kuleshevich
+              2020-2022, Aleksey Khudyakov
+              2020-2022, Andrew Lelechenko
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/docs/dependencies/licences/haskell/vector-algorithms-0.9.0.1/LICENSE b/docs/dependencies/licences/haskell/vector-algorithms-0.9.0.1/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/vector-stream-0.1.0.0/LICENSE b/docs/dependencies/licences/haskell/vector-stream-0.1.0.0/LICENSE
new file mode 100644
index 0000000000..ef2a5268d6
--- /dev/null
+++ b/docs/dependencies/licences/haskell/vector-stream-0.1.0.0/LICENSE
@@ -0,0 +1,32 @@
+Copyright (c) 2008-2012, Roman Leshchinskiy
+              2020-2022, Alexey Kuleshevich
+              2020-2022, Aleksey Khudyakov
+              2020-2022, Andrew Lelechenko
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/docs/dependencies/licences/haskell/websockets-0.12.7.3/LICENCE b/docs/dependencies/licences/haskell/websockets-0.12.7.3/LICENCE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/witherable-0.4.2/LICENSE b/docs/dependencies/licences/haskell/witherable-0.4.2/LICENSE
new file mode 100644
index 0000000000..1994a4c649
--- /dev/null
+++ b/docs/dependencies/licences/haskell/witherable-0.4.2/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2014, Fumiaki Kinoshita
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Fumiaki Kinoshita nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/yaml-0.11.11.2/LICENSE b/docs/dependencies/licences/haskell/yaml-0.11.11.2/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/zip-2.0.0/LICENSE.md b/docs/dependencies/licences/haskell/zip-2.0.0/LICENSE.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/dependencies/licences/haskell/zlib-0.6.3.0/LICENSE b/docs/dependencies/licences/haskell/zlib-0.6.3.0/LICENSE
new file mode 100644
index 0000000000..e4d25e0e0a
--- /dev/null
+++ b/docs/dependencies/licences/haskell/zlib-0.6.3.0/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2006-2016, Duncan Coutts
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. This clause is intentionally left blank.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dependencies/licences/haskell/zstd-0.1.3.0/LICENSE b/docs/dependencies/licences/haskell/zstd-0.1.3.0/LICENSE
new file mode 100644
index 0000000000..a793a80289
--- /dev/null
+++ b/docs/dependencies/licences/haskell/zstd-0.1.3.0/LICENSE
@@ -0,0 +1,30 @@
+BSD License
+
+For Zstandard software
+
+Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/rfcs/2025-01-20-member-mentions.md b/docs/rfcs/2025-01-20-member-mentions.md
new file mode 100644
index 0000000000..fdb35c608b
--- /dev/null
+++ b/docs/rfcs/2025-01-20-member-mentions.md
@@ -0,0 +1,60 @@
+# Member mentions
+
+## Problem
+
+Mention members in the messages.
+
+There are several UX objectives that mentions must deliver:
+- to notify the user about the messages that mention the user or to reply to user's messages - groups must have this notification mode (already present in the API),
+- to allow the user to navigate to unread mentions and replies,
+- to highlight mentions and allow all users to open mentioned member profile - this is the least important objective.
+
+## Solution
+
+Message text should include the reference to the shared member display name:
+
+```
+Hello @name
+```
+
+or
+
+```
+Hello @'member name'
+```
+
+This is the same format that people already use and that is currently supported in the API. The name in the message should use the display name at the time of mention, both for backwards compatibility and for better view in compose field, and the message should additionally include the mapping from used display names to shared group member IDs, and the UI would show the current display name (at the time of loading the message to the view).
+
+For this mapping the message JSON will include the array of mentions, as objects with properties `displayName` and `memberId`. This is to ensure the intent and that the fragments of text are treated as mentions.
+
+Using an immutable `memberId` would prevent any race conditions and duplicate display names. The receiving client would show a local view name (display name or an alias), and might open a correct member card when mention is tapped.
+
+As display names are not unique in the group, we should convert them to locally-unique names (per message), by appending _1, _2, as necessary, and the same locally unique names should be used in the mapping to member IDs. These locally unique names must NOT use local user aliases, and must NOT use localDisplayName, as otherwise it may leak information that is known only to the user's client.
+
+There should be a reasonable limit on the number of mentions per message, e.g. 3. This is to prevent abuse, expensive processing both in the client and in super-peers that would have to forward member profiles if they were not forwarded before. This limit has to be enforced both on sending and receiving ends.
+
+## UX for sending mentions
+
+When a member types '@' character in the entry field, the app would show the paginated list of most recently active members, with search. This requires a separate API, and the same API can be used to show a paginated member list - loading the full list is already quite expensive with groups over 1-2k members.
+
+## UX for navigating to mentions
+
+The current circles with unread messages should indicate the number of unread mentions (including replies) above and below the view. Tapping the circle should navigate to the next unread mention, and not to the bottom/top of the conversation. Long-pressing the circle should offer the option to navigate to the top/bottom. In the absense of mentions, tapping circles would navigate to top/bottom.
+
+## Message UI
+
+Item text will include markdown elements for mentioned members. This will be used when rendering to show member display names or local aliases.
+
+Chat items data will include the list of members used in the chat item, including view names and member IDs.
+
+## Forwarding and saving to local items
+
+When forwarding to another conversation or saving to notes a message with mentions the app should use:
+- current display names instead of display names used in the message.
+- remove mentions mapping from the message data.
+
+## Schema
+
+Two new columns for chat_items table:
+- user_mention - 0 or 1 to indicate whether a message is a reply to user's message or mentions user.
+- member_mentions - the object mapping display names to member IDs, either as JSON, or in a more economical comma-separated list of "ID:name" strings (or "ID:'member name'). This field can be processed to load mention information, with the limit of 3 mentions per message it's sufficient.
diff --git a/docs/rfcs/2025-02-17-member-send-limits.md b/docs/rfcs/2025-02-17-member-send-limits.md
new file mode 100644
index 0000000000..cc98d63e46
--- /dev/null
+++ b/docs/rfcs/2025-02-17-member-send-limits.md
@@ -0,0 +1,97 @@
+# Member sending limits
+
+## Problem
+
+Rate limiting member sending to prevent abuse in groups.
+
+## Solution
+
+Each member record to have `rateLimit :: Maybe MemberRateLimit`, Nothing by default. Nothing means default rate limit for regular members (`MRLWindow`), and no limit for owners/admins/moderators (`MRLNone`). Default rate limit is defined in configuration, e.g. limit of 15 messages in 60 second window, or could be defined in group profile.
+
+Rate limit can be overridden per member by sending `XGrpMemRestrict` with updated `rateLimit` by member of same role or higher, similar to changing roles. `APIRateLimitMember` allows to enable or disable rate limiting for member, we could also provide more granular control in it (pass `WindowLimit`), but it seems unnecessary complex for UI.
+
+```haskell
+data MemberRateLimit
+  = MRLNone -- default for owners, admins, moderators
+  | MRLWindow WindowLimit
+  deriving (Eq, Show)
+
+data WindowLimit = WindowLimit
+  { window :: Int, -- seconds
+    limit :: Int
+  }
+  deriving (Eq, Show)
+
+-- sent in XGrpMemRestrict
+data MemberRestrictions = MemberRestrictions
+  { restriction :: MemberRestrictionStatus,
+    rateLimit :: Maybe MemberRateLimit -- Nothing means use default
+  }
+  deriving (Eq, Show)
+
+-- new api in ChatCommand
+| APIRateLimitMember GroupId GroupMemberId
+
+-- new response in ChatResponse
+| CRMemberRateLimit {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+
+-- new field in GroupMember
+data GroupMember = GroupMember {
+  ...
+  rateLimit :: Maybe MemberRateLimit,
+  ...
+}
+```
+
+Rate limit overrides to be persisted on group member records.
+
+```sql
+ALTER TABLE group_members ADD COLUMN rate_limit TEXT; -- MemberRateLimit JSON encoded
+```
+
+Limits can be tracked inside fixed windows both for receiving and sending.
+
+```haskell
+data ChatController = ChatController {
+  ...
+  memberLimits :: TMap (GroupId, MemberId) (TVar MemberRateLimitWindow),
+  ownLimits :: TMap GroupId (TVar MemberRateLimitWindow),
+  ...
+}
+
+data MemberRateLimitWindow = MemberRateLimitWindow {
+  startedAt :: UTCTime,
+  windowLimit :: WindowLimit,
+  messages :: Int
+}
+```
+
+Client to track limit for each writing member in state - `memberLimits`. If current window's interval has passed, checked against `startedAt` of `MemberRateLimitWindow`, reset `messages` counter.
+
+Track own limits per group - `ownLimits`. When limit in group is reached, `CRGroupSendingLimited blocked = True` event is sent to UI to block sending in group. Unblock group sending in UI by scheduling background process to send `CRGroupSendingLimited blocked = False` after interval?
+
+```haskell
+-- new event in ChatResponse
+| CRGroupSendingLimited {user :: User, groupInfo :: GroupInfo, blocked :: Bool}
+```
+
+### Receiving messages from limited members
+
+Receiving message from member that exceeded their limit would fail it as prohibited. We can limit content messages, updates, reactions, etc. Practically only regular members would be limited, so there's no need for limiting service messages. Should we limit deletes?
+
+Problems:
+
+- Inconsistencies in window tracking on sending and receiving sides -> track based on item_ts?;
+- Subscription produces message surges;
+- Server downtime (or network outage) leads to accumulation of scheduled messages on sending side -> item_ts tracking wouldn't help. Issue is similar to subscription, where many messages can be received in short span legitimately.
+- This approach doesn't reduce load of retrieving message and of all machinery passing from agent to chat.
+
+Subscription issue could be solved by not tracking limits during subscription (client "knows" when it has subscribed) and for some time after it. For how long - 30 seconds / 1 minute? - arbitrary, longer absence periods lead to more not yet retrieved messages, freed quotas resulting in more sent pending messages.
+
+Better solution would be to not drop (prohibit) messages at all, but stop reception per connection for periods of time. Possible approaches:
+
+- Don't send (delay) ACK - bad idea as it would lead to repeated processing on client restart, and other possible failures in delivery.
+- ACK with parameter `wait` for server - server would wait before sending next message.
+- Unsubscribe (kill client?)/resubscribe after some time - more expensive.
+- Signal agent to hold on next message - similar to delayed ACK but at least we don't process message. (for example, also via ACK but parameter to wait is for agent)
+- Rework chat-to-agent communication to communicate via per connection queue (currently it's single `subQ`) - complex - but we get less expensive "unsubscribe"? Essentially agent still holds on to message like in previous approach.
diff --git a/docs/rfcs/2025-03-07-group-knocking.md b/docs/rfcs/2025-03-07-group-knocking.md
new file mode 100644
index 0000000000..fedbbfaf72
--- /dev/null
+++ b/docs/rfcs/2025-03-07-group-knocking.md
@@ -0,0 +1,38 @@
+# Group knocking
+
+## Problem
+
+In v6.3 release we added an option to "manually" approve members before introducing to group, based on decision made via `acceptMember` chat hook. Currently it's not supported in UI clients, and only used for directory service bot captcha challenge.
+
+The goal of next improvement is to let:
+- admins screen members before admitting to group, while not limiting communication with joining member to a single admin (and also removing the need for admin to be a highly available host of the group link);
+- and group owners set up other arbitrary automated challenges or entry rules, while still being able to advertise groups in directory service.
+
+## Solution
+
+Group link host (further host), knowing group requires admin approval, would initially only introduce member pending approval to admins. Admins can connect with member for screening, meanwhile host would be forwarding messages as usual between connecting members. As a result of screening, pending member can either be removed, or approved by admins.
+
+Upon acceptance, for further member connections to not depend on availability of admins, host should not only forward acceptance message, but also introduce remaining members to now accepted joining member. Respectively, admins' clients should not introduce members for approved members who are not their invitees.
+
+For group owners to be able to set up alternative automated challenges, these are some possible alternatives:
+- We could add a new role `Approver`, so that instead of adding all \[possibly human\] admins, host would initially introduce only approvers.
+- It could be an orthogonal to role member setting (would require protocol extension).
+- List of "approver" member IDs could be communicated to host client.
+
+### Implementation details draft
+
+Host needs to have knowledge whether to automatically accept, or only introduce admins/approvers.
+
+```sql
+ALTER TABLE group_profiles ADD COLUMN approval TEXT; -- comma separated member IDs; null - automatic introduction
+
+-- or
+
+ALTER TABLE group_profiles ADD COLUMN approval INTEGER; -- if based on `Approver` role
+```
+
+Alternatively, a different extension of protocol could be done in order to communicate group approval rule from owner to host outside of group profile (special messages).
+
+Admins/approvers need to have separate conversation per pending member, requires adding scope to chat items.
+
+Host to have specific processing of forwarded `XGrpLinkAcpt` - continue introduction of remaining members.
diff --git a/flake.nix b/flake.nix
index 1a1043c5f2..9ee0c52020 100644
--- a/flake.nix
+++ b/flake.nix
@@ -198,6 +198,7 @@
                   packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                     pkgs.pkgsCross.mingwW64.openssl
                   ];
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     pkgs.pkgsCross.mingwW64.openssl
@@ -336,6 +337,7 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
@@ -445,6 +447,7 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (androidPkgs.openssl.override { static = true; })
@@ -550,6 +553,7 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     # TODO: have a cross override for iOS, that sets this.
@@ -565,6 +569,7 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
@@ -583,6 +588,7 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })
@@ -597,6 +603,7 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
+                  packages.simplex-chat.flags.client_library = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })
diff --git a/media-logos/README.md b/media-logos/README.md
new file mode 100644
index 0000000000..3780029331
--- /dev/null
+++ b/media-logos/README.md
@@ -0,0 +1,5 @@
+# SimpleX logos
+
+Please use these logos in your publications about SimpleX Chat.
+
+You can also use app screenshots and diagrams from our [blog posts](../blog/README.md) – please reference them.
diff --git a/media-logos/simplex-app-icon-dark.png b/media-logos/simplex-app-icon-dark.png
new file mode 100644
index 0000000000..aba97be8ae
Binary files /dev/null and b/media-logos/simplex-app-icon-dark.png differ
diff --git a/media-logos/simplex-app-icon-light.png b/media-logos/simplex-app-icon-light.png
new file mode 100644
index 0000000000..9a44d45b1f
Binary files /dev/null and b/media-logos/simplex-app-icon-light.png differ
diff --git a/media-logos/simplex-logo-dark.png b/media-logos/simplex-logo-dark.png
new file mode 100644
index 0000000000..98c1f500e9
Binary files /dev/null and b/media-logos/simplex-logo-dark.png differ
diff --git a/media-logos/simplex-logo-light.png b/media-logos/simplex-logo-light.png
new file mode 100644
index 0000000000..6edecb0dd9
Binary files /dev/null and b/media-logos/simplex-logo-light.png differ
diff --git a/media-logos/simplex-symbol-dark.png b/media-logos/simplex-symbol-dark.png
new file mode 100644
index 0000000000..c561422bdb
Binary files /dev/null and b/media-logos/simplex-symbol-dark.png differ
diff --git a/media-logos/simplex-symbol-dark.svg b/media-logos/simplex-symbol-dark.svg
new file mode 100644
index 0000000000..fa598acf3d
--- /dev/null
+++ b/media-logos/simplex-symbol-dark.svg
@@ -0,0 +1,10 @@
+<svg width="34" height="35" viewBox="0 0 34 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.02958 8.60922L8.622 14.2013L14.3705 8.45375L17.1669 11.2498L11.4183 16.9972L17.0114 22.5895L14.1373 25.4633L8.54422 19.871L2.79636 25.6187L0 22.8227L5.74794 17.075L0.155484 11.483L3.02958 8.60922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0923 25.5156L16.944 22.6642L16.9429 22.6634L22.6467 16.9612L17.0513 11.3675L17.0523 11.367L14.2548 8.56979L8.65972 2.97535L11.5114 0.123963L17.1061 5.71849L22.8099 0.015625L25.6074 2.81285L19.9035 8.51562L25.4984 14.1099L31.2025 8.40729L34 11.2045L28.2958 16.907L33.8917 22.5017L31.0399 25.3531L25.4442 19.7584L19.7409 25.4611L25.3365 31.0559L22.4848 33.9073L16.8892 28.3124L11.1864 34.0156L8.38885 31.2184L14.0923 25.5156Z" fill="url(#paint0_linear_656_10815)"/>
+<defs>
+<linearGradient id="paint0_linear_656_10815" x1="12.8381" y1="-0.678252" x2="9.54355" y2="31.4493" gradientUnits="userSpaceOnUse">
+<stop stop-color="#01F1FF"/>
+<stop offset="1" stop-color="#0197FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/media-logos/simplex-symbol-light.png b/media-logos/simplex-symbol-light.png
new file mode 100644
index 0000000000..865f37bfc8
Binary files /dev/null and b/media-logos/simplex-symbol-light.png differ
diff --git a/media-logos/simplex-symbol-light.svg b/media-logos/simplex-symbol-light.svg
new file mode 100644
index 0000000000..d8b5951a0b
--- /dev/null
+++ b/media-logos/simplex-symbol-light.svg
@@ -0,0 +1,15 @@
+<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_14_10)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.02972 8.59396L8.62219 14.186L14.3703 8.43848L17.1668 11.2346L11.4182 16.982L17.0112 22.5742L14.1371 25.448L8.5441 19.8557L2.79651 25.6035L0 22.8074L5.74813 17.0597L0.155656 11.4678L3.02972 8.59396Z" fill="#023789"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0922 25.5L16.9434 22.6486L16.9423 22.6478L22.6464 16.9456L17.0512 11.3519L17.0518 11.3514L14.2542 8.55418L8.65961 2.95973L11.5114 0.108337L17.106 5.70288L22.8095 0L25.607 2.79722L19.903 8.5L25.4981 14.0943L31.2022 8.39169L33.9997 11.1889L28.2957 16.8914L33.8914 22.4861L31.0396 25.3375L25.4439 19.7428L19.7404 25.4454L25.3361 31.0403L22.4843 33.8917L16.8887 28.2968L11.1862 34L8.38867 31.2028L14.0922 25.5Z" fill="url(#paint0_linear_14_10)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_14_10" x1="12.8379" y1="-0.693875" x2="9.54344" y2="31.4337" gradientUnits="userSpaceOnUse">
+<stop stop-color="#01F1FF"/>
+<stop offset="1" stop-color="#0197FF"/>
+</linearGradient>
+<clipPath id="clip0_14_10">
+<rect width="34" height="34" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/simplex-chat-client/typescript/src/command.ts b/packages/simplex-chat-client/typescript/src/command.ts
index e512e06672..135dc41ba7 100644
--- a/packages/simplex-chat-client/typescript/src/command.ts
+++ b/packages/simplex-chat-client/typescript/src/command.ts
@@ -29,7 +29,6 @@ export type ChatCommand =
   | APIRejectContact
   | APIUpdateProfile
   | APISetContactAlias
-  | APIParseMarkdown
   | NewGroup
   | APIAddMember
   | APIJoinGroup
@@ -128,7 +127,6 @@ type ChatCommandTag =
   | "apiRejectContact"
   | "apiUpdateProfile"
   | "apiSetContactAlias"
-  | "apiParseMarkdown"
   | "newGroup"
   | "apiAddMember"
   | "apiJoinGroup"
@@ -355,11 +353,6 @@ export interface APISetContactAlias extends IChatCommand {
   localAlias: string
 }
 
-export interface APIParseMarkdown extends IChatCommand {
-  type: "apiParseMarkdown"
-  text: string
-}
-
 export interface NewGroup extends IChatCommand {
   type: "newGroup"
   groupProfile: GroupProfile
@@ -732,8 +725,6 @@ export function cmdString(cmd: ChatCommand): string {
       return `/_profile ${cmd.userId} ${JSON.stringify(cmd.profile)}`
     case "apiSetContactAlias":
       return `/_set alias @${cmd.contactId} ${cmd.localAlias.trim()}`
-    case "apiParseMarkdown":
-      return `/_parse ${cmd.text}`
     case "newGroup":
       return `/_group ${JSON.stringify(cmd.groupProfile)}`
     case "apiAddMember":
diff --git a/packages/simplex-chat-client/typescript/src/response.ts b/packages/simplex-chat-client/typescript/src/response.ts
index 2e92e335df..5f91baa7db 100644
--- a/packages/simplex-chat-client/typescript/src/response.ts
+++ b/packages/simplex-chat-client/typescript/src/response.ts
@@ -84,7 +84,6 @@ export type ChatResponse =
   | CRGroupRemoved
   | CRGroupDeleted
   | CRGroupUpdated
-  | CRUserContactLinkSubscribed
   | CRUserContactLinkSubError
   | CRContactConnectionDeleted
   | CRMessageError
@@ -182,7 +181,6 @@ type ChatResponseTag =
   | "groupRemoved"
   | "groupDeleted"
   | "groupUpdated"
-  | "userContactLinkSubscribed"
   | "userContactLinkSubError"
   | "newContactConnection"
   | "contactConnectionDeleted"
@@ -721,10 +719,6 @@ export interface CRGroupUpdated extends CR {
   member_?: GroupMember
 }
 
-export interface CRUserContactLinkSubscribed extends CR {
-  type: "userContactLinkSubscribed"
-}
-
 export interface CRUserContactLinkSubError extends CR {
   type: "userContactLinkSubError"
   chatError: ChatError
diff --git a/scripts/ci/linux_util_free_space.sh b/scripts/ci/linux_util_free_space.sh
new file mode 100755
index 0000000000..ef00eb886e
--- /dev/null
+++ b/scripts/ci/linux_util_free_space.sh
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Taken from: https://github.com/apache/arrow/blob/main/ci/scripts/util_free_space.sh
+
+set -eux
+
+df -h
+echo "::group::/usr/local/*"
+du -hsc /usr/local/*
+echo "::endgroup::"
+# ~1GB
+sudo rm -rf \
+  /usr/local/aws-sam-cil \
+  /usr/local/julia* || :
+echo "::group::/usr/local/bin/*"
+du -hsc /usr/local/bin/*
+echo "::endgroup::"
+# ~1GB (From 1.2GB to 214MB)
+sudo rm -rf \
+  /usr/local/bin/aliyun \
+  /usr/local/bin/azcopy \
+  /usr/local/bin/bicep \
+  /usr/local/bin/cmake-gui \
+  /usr/local/bin/cpack \
+  /usr/local/bin/helm \
+  /usr/local/bin/hub \
+  /usr/local/bin/kubectl \
+  /usr/local/bin/minikube \
+  /usr/local/bin/node \
+  /usr/local/bin/packer \
+  /usr/local/bin/pulumi* \
+  /usr/local/bin/sam \
+  /usr/local/bin/stack \
+  /usr/local/bin/terraform || :
+# 142M
+sudo rm -rf /usr/local/bin/oc || : \
+echo "::group::/usr/local/share/*"
+du -hsc /usr/local/share/*
+echo "::endgroup::"
+# 506MB
+sudo rm -rf /usr/local/share/chromium || :
+# 1.3GB
+sudo rm -rf /usr/local/share/powershell || :
+echo "::group::/usr/local/lib/*"
+du -hsc /usr/local/lib/*
+echo "::endgroup::"
+# 15GB
+sudo rm -rf /usr/local/lib/android || :
+# 341MB
+sudo rm -rf /usr/local/lib/heroku || :
+# 1.2GB
+sudo rm -rf /usr/local/lib/node_modules || :
+echo "::group::/opt/*"
+du -hsc /opt/*
+echo "::endgroup::"
+# 679MB
+sudo rm -rf /opt/az || :
+echo "::group::/opt/microsoft/*"
+du -hsc /opt/microsoft/*
+echo "::endgroup::"
+# 197MB
+sudo rm -rf /opt/microsoft/powershell || :
+echo "::group::/opt/hostedtoolcache/*"
+du -hsc /opt/hostedtoolcache/*
+echo "::endgroup::"
+# 5.3GB
+sudo rm -rf /opt/hostedtoolcache/CodeQL || :
+# 1.4GB
+sudo rm -rf /opt/hostedtoolcache/go || :
+# 489MB
+sudo rm -rf /opt/hostedtoolcache/PyPy || :
+# 376MB
+sudo rm -rf /opt/hostedtoolcache/node || :
+# Remove Web browser packages
+sudo apt purge -y \
+  firefox \
+  google-chrome-stable \
+  microsoft-edge-stable
+df -h
diff --git a/scripts/db/README.md b/scripts/db/README.md
new file mode 100644
index 0000000000..68d4f74ac7
--- /dev/null
+++ b/scripts/db/README.md
@@ -0,0 +1,105 @@
+# Transfer data from SQLite to Postgres database
+
+1. \* Decrypt SQLite database if it is encrypted.
+
+   ```sh
+   sqlcipher encrypted_simplex_v1_agent.db
+   ```
+
+   ```sql
+   PRAGMA key = 'password';
+   ATTACH DATABASE 'simplex_v1_agent.db' AS plaintext KEY '';
+   SELECT sqlcipher_export('plaintext');
+   DETACH DATABASE plaintext;
+   ```
+
+   Repeat for `simplex_v1_chat.db`.
+
+2. Prepare Postgres database.
+
+   - Create Postgres database. In shell:
+
+      ```sh
+      createdb -O simplex simplex_v1
+      ```
+
+      Or via query.
+
+   - Build `simplex-chat` executable with `client_postgres` flag and run it to initialize new chat database.
+
+      This should create `simplex_v1_agent_schema` and `simplex_v1_chat_schema` schemas in `simplex_v1` database, with `migrations` tables populated. Some tables would have initialization data - it will be truncated via pgloader command in next step.
+
+3. Load data from decrypted SQLite databases to Postgres database via pgloader.
+
+   Install pgloader and add it to PATH. Run in shell (substitute paths):
+
+   ```sh
+   SQLITE_DBPATH='simplex_v1_agent.db' POSTGRES_CONN='postgres://simplex@/simplex_v1' POSTGRES_SCHEMA='simplex_v1_agent_schema' pgloader --on-error-stop sqlite.load
+
+   SQLITE_DBPATH='simplex_v1_chat.db' POSTGRES_CONN='postgres://simplex@/simplex_v1' POSTGRES_SCHEMA='simplex_v1_chat_schema' pgloader --on-error-stop sqlite.load
+   ```
+
+4. Update sequences for Postgres tables.
+
+   ```sql
+   DO $$
+   DECLARE
+      rec RECORD;
+   BEGIN
+      EXECUTE 'SET SEARCH_PATH TO simplex_v1_agent_schema';
+
+      FOR rec IN
+         SELECT
+            table_name,
+            column_name,
+            pg_get_serial_sequence(table_name, column_name) AS seq_name
+         FROM
+            information_schema.columns
+         WHERE
+            table_schema = 'simplex_v1_agent_schema'
+            AND identity_generation = 'ALWAYS'
+      LOOP
+         EXECUTE format(
+            'SELECT setval(%L, (SELECT MAX(%I) FROM %I))',
+            rec.seq_name, rec.column_name, rec.table_name
+         );
+      END LOOP;
+   END $$;
+   ```
+
+   Repeat for `simplex_v1_chat_schema`.
+
+5. \* Compare number of rows between Postgres and SQLite tables.
+
+   To check number of rows for all tables in Postgres database schema run:
+
+   ```sql
+   WITH tbl AS (
+      SELECT table_schema, table_name
+      FROM information_schema.Tables
+      WHERE table_name NOT LIKE 'pg_%'
+        AND table_schema IN ('simplex_v1_agent_schema')
+   )
+   SELECT
+      table_schema AS schema_name,
+      table_name,
+      (xpath('/row/c/text()', query_to_xml(
+         format('SELECT count(*) AS c FROM %I.%I', table_schema, table_name), false, true, ''
+      )))[1]::text::int AS records_count
+   FROM tbl
+   ORDER BY records_count DESC;
+   ```
+
+   Repeat for `simplex_v1_chat_schema`.
+
+6. Build and run desktop app with Postgres backend.
+
+   Run in shell (paths are from project root):
+
+   ```sh
+   ./scripts/desktop/build-lib-mac.sh arm64 postgres
+
+   ./gradlew runDistributable -Pdatabase.backend=postgres
+   # or
+   ./gradlew packageDmg -Pdatabase.backend=postgres
+   ```
diff --git a/scripts/db/sqlite.load b/scripts/db/sqlite.load
new file mode 100644
index 0000000000..105e8c39d2
--- /dev/null
+++ b/scripts/db/sqlite.load
@@ -0,0 +1,20 @@
+LOAD DATABASE
+     FROM {{SQLITE_DBPATH}}
+     INTO {{POSTGRES_CONN}}
+
+ WITH include no drop,
+      truncate,
+      disable triggers,
+      create no tables,
+      create no indexes,
+      -- pgloader implementation doesn't find "GENERATED ALWAYS AS IDENTITY" sequences,
+      -- instead we reset sequences manually via custom query after load
+      reset no sequences,
+      data only
+
+ EXCLUDING TABLE NAMES LIKE 'migrations', 'sqlite_sequence'
+
+ SET work_mem to '16MB',
+     maintenance_work_mem to '512 MB',
+     search_path to '{{POSTGRES_SCHEMA}}'
+;
diff --git a/scripts/desktop/build-lib-linux.sh b/scripts/desktop/build-lib-linux.sh
index bdd46afcd2..fa2ed52b36 100755
--- a/scripts/desktop/build-lib-linux.sh
+++ b/scripts/desktop/build-lib-linux.sh
@@ -25,7 +25,7 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
 
 #rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -optl-Wl,-soname,libsimplex.so -flink-rts -threaded' --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -optl-Wl,-soname,libsimplex.so -flink-rts -threaded' --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
 cd $BUILD_DIR/build
 mv libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so libsimplex.so 2> /dev/null || true
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libsimplex.so
diff --git a/scripts/desktop/build-lib-mac.sh b/scripts/desktop/build-lib-mac.sh
index 282f4c11af..b5960cfa2d 100755
--- a/scripts/desktop/build-lib-mac.sh
+++ b/scripts/desktop/build-lib-mac.sh
@@ -6,6 +6,7 @@ OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
 GHC_VERSION=9.6.3
+DATABASE_BACKEND="${2:-sqlite}"
 
 if [ "$ARCH" == "arm64" ]; then
     ARCH=aarch64
@@ -24,7 +25,14 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-install_name,@rpath/$LIB -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi" --constraint 'simplexmq +client_library'
+
+if [[ "$DATABASE_BACKEND" == "postgres" ]]; then
+    echo "Building with postgres backend..."
+    cabal build -f client_postgres lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-install_name,@rpath/$LIB -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi" --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
+else
+    echo "Building with sqlite backend..."
+    cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-install_name,@rpath/$LIB -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi" --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
+fi
 
 cd $BUILD_DIR/build
 mv libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT libsimplex.dylib 2> /dev/null || true
@@ -100,8 +108,8 @@ cp $BUILD_DIR/build/$LIB apps/multiplatform/common/src/commonMain/cpp/desktop/li
 
 cd apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 
-LIBCRYPTO_PATH=$(otool -l libHSdrct-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSdrct-*.$LIB_EXT
+LIBCRYPTO_PATH=$(otool -l libHSsmplxmq-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
+install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsmplxmq-*.$LIB_EXT
 cp $LIBCRYPTO_PATH libcrypto.3.0.$LIB_EXT
 chmod 755 libcrypto.3.0.$LIB_EXT
 install_name_tool -id "libcrypto.3.0.$LIB_EXT" libcrypto.3.0.$LIB_EXT
@@ -112,14 +120,18 @@ if [ -n "$LIBCRYPTO_PATH" ]; then
     install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT $LIB
 fi
 
-LIBCRYPTO_PATH=$(otool -l libHSsmplxmq*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-if [ -n "$LIBCRYPTO_PATH" ]; then
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsmplxmq*.$LIB_EXT
-fi
+# We could change libpq and libHSpstgrsql for postgres (?), remove sqlite condition for exit below.
+# Unnecessary for now as app with postgres backend is not for distribution.
+if [[ "$DATABASE_BACKEND" == "sqlite" ]]; then
+    LIBCRYPTO_PATH=$(otool -l libHSdrct-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
+    if [ -n "$LIBCRYPTO_PATH" ]; then
+        install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSdrct-*.$LIB_EXT
+    fi
 
-LIBCRYPTO_PATH=$(otool -l libHSsqlcphr-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-if [ -n "$LIBCRYPTO_PATH" ]; then
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsqlcphr-*.$LIB_EXT
+    LIBCRYPTO_PATH=$(otool -l libHSsqlcphr-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
+    if [ -n "$LIBCRYPTO_PATH" ]; then
+        install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsqlcphr-*.$LIB_EXT
+    fi
 fi
 
 for lib in $(find . -type f -name "*.$LIB_EXT"); do
@@ -133,7 +145,9 @@ LOCAL_DIRS=`for lib in $(find . -type f -name "*.$LIB_EXT"); do otool -l $lib |
 if [ -n "$LOCAL_DIRS" ]; then
     echo These libs still point to local directories:
     echo $LOCAL_DIRS
-    exit 1
+    if [[ "$DATABASE_BACKEND" == "sqlite" ]]; then
+        exit 1
+    fi
 fi
 
 cd -
diff --git a/scripts/desktop/build-lib-windows.sh b/scripts/desktop/build-lib-windows.sh
index cbb886ccb3..af408d4054 100755
--- a/scripts/desktop/build-lib-windows.sh
+++ b/scripts/desktop/build-lib-windows.sh
@@ -51,7 +51,7 @@ echo "    ghc-options: -shared -threaded -optl-L$openssl_windows_style_path -opt
 # Very important! Without it the build fails on linking step since the linker can't find exported symbols.
 # It looks like GHC bug because with such random path the build ends successfully
 sed -i "s/ld.lld.exe/abracadabra.exe/" `ghc --print-libdir`/settings
-cabal build lib:simplex-chat --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
 
 rm -rf apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 rm -rf apps/multiplatform/desktop/build/cmake
diff --git a/scripts/desktop/prepare-vlc-linux.sh b/scripts/desktop/prepare-vlc-linux.sh
index dae1c9255d..a798fd6fc9 100755
--- a/scripts/desktop/prepare-vlc-linux.sh
+++ b/scripts/desktop/prepare-vlc-linux.sh
@@ -10,11 +10,13 @@ vlc_dir=$root_dir/apps/multiplatform/common/src/commonMain/cpp/desktop/libs/linu
 
 mkdir $vlc_dir || exit 0
 
+vlc_tag='v3.0.21-1'
+vlc_url="https://github.com/simplex-chat/vlc/releases/download/${vlc_tag}/vlc-linux-x86_64.appimage"
 
 cd /tmp
 mkdir tmp 2>/dev/null || true
 cd tmp
-curl --tlsv1.2 https://github.com/cmatomic/VLCplayer-AppImage/releases/download/3.0.11.1/VLC_media_player-3.0.11.1-x86_64.AppImage -L -o appimage
+curl --tlsv1.2 "${vlc_url}" -L -o appimage
 chmod +x appimage
 ./appimage --appimage-extract
 cp -r squashfs-root/usr/lib/* $vlc_dir
diff --git a/scripts/desktop/prepare-vlc-mac.sh b/scripts/desktop/prepare-vlc-mac.sh
index 288b5a1a7d..4db2983f67 100755
--- a/scripts/desktop/prepare-vlc-mac.sh
+++ b/scripts/desktop/prepare-vlc-mac.sh
@@ -9,7 +9,9 @@ if [ "$ARCH" == "arm64" ]; then
 else
     vlc_arch=intel64
 fi
-vlc_version=3.0.19
+
+vlc_tag='v3.0.21-1'
+vlc_url="https://github.com/simplex-chat/vlc/releases/download/${vlc_tag}/vlc-macos-${ARCH}.zip"
 
 function readlink() {
   echo "$(cd "$(dirname "$1")"; pwd -P)"
@@ -23,7 +25,7 @@ mkdir -p $vlc_dir/vlc || exit 0
 cd /tmp
 mkdir tmp 2>/dev/null || true
 cd tmp
-curl --tlsv1.2 https://github.com/simplex-chat/vlc/releases/download/v$vlc_version/vlc-macos-$ARCH.zip -L -o vlc
+curl --tlsv1.2 "${vlc_url}" -L -o vlc
 unzip -oqq vlc
 install_name_tool -add_rpath "@loader_path/VLC.app/Contents/MacOS/lib" vlc-cache-gen
 cd VLC.app/Contents/MacOS/lib
diff --git a/scripts/desktop/prepare-vlc-windows.sh b/scripts/desktop/prepare-vlc-windows.sh
index 7d2a71a952..4e65528ca0 100644
--- a/scripts/desktop/prepare-vlc-windows.sh
+++ b/scripts/desktop/prepare-vlc-windows.sh
@@ -10,10 +10,13 @@ vlc_dir=$root_dir/apps/multiplatform/common/src/commonMain/cpp/desktop/libs/wind
 rm -rf $vlc_dir
 mkdir -p $vlc_dir/vlc || exit 0
 
+vlc_tag='v3.0.21-1'
+vlc_url="https://github.com/simplex-chat/vlc/releases/download/${vlc_tag}/vlc-win-x86_64.zip"
+
 cd /tmp
 mkdir tmp 2>/dev/null || true
 cd tmp
-curl --tlsv1.2 https://irltoolkit.mm.fcix.net/videolan-ftp/vlc/3.0.18/win64/vlc-3.0.18-win64.zip -L -o vlc
+curl --tlsv1.2 "${vlc_url}" -L -o vlc
 $WINDIR\\System32\\tar.exe -xf vlc
 cd vlc-*
 # Setting the same date as the date that will be on the file after extraction from JAR to make VLC cache checker happy
diff --git a/scripts/flatpak/chat.simplex.simplex.metainfo.xml b/scripts/flatpak/chat.simplex.simplex.metainfo.xml
index 8141046d8a..b15e382207 100644
--- a/scripts/flatpak/chat.simplex.simplex.metainfo.xml
+++ b/scripts/flatpak/chat.simplex.simplex.metainfo.xml
@@ -38,6 +38,135 @@
   </description>
 
   <releases>
+    <release version="6.3.4" date="2025-05-12">
+      <url type="details">https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html</url>
+      <description>
+        <p>New in v6.3.1-4:</p>
+        <ul>
+          <li>fixes mentions with trailing punctuation (e.g., hello @name!).</li>
+          <li>recognizes domain names as links (e.g., simplex.chat).</li>
+          <li>forward compatibility with "knocking" (a feature for group admins to review and to chat with the new members prior to admitting them to groups, it will be released in 6.4)</li>
+          <li>support for connecting via short connection links.</li>
+          <li>fix related to backward/forward compatibility of the app in some rare cases.</li>
+          <li>scrolling/navigation improvements.</li>
+          <li>faster onboarding (conditions and operators are combined to one screen).</li>
+        </ul>
+        <p>New in v6.3.0:</p>
+        <ul>
+          <li>Mention members and get notified when mentioned.</li>
+          <li>Send private reports to moderators.</li>
+          <li>Delete, block and change role for multiple members at once</li>
+          <li>Faster sending messages and faster deletion.</li>
+          <li>Organize chats into lists to keep track of what's important.</li>
+          <li>Jump to found and forwarded messages.</li>
+          <li>Private media file names.</li>
+          <li>Message expiration in chats.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="6.3.3" date="2025-04-24">
+      <url type="details">https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html</url>
+      <description>
+        <p>New in v6.3.1-3:</p>
+        <ul>
+          <li>support for connecting via short connection links.</li>
+          <li>fix related to backward/forward compatibility of the app in some rare cases.</li>
+          <li>scrolling/navigation improvements.</li>
+          <li>faster onboarding (conditions and operators are combined to one screen).</li>
+        </ul>
+        <p>New in v6.3.0:</p>
+        <ul>
+          <li>Mention members and get notified when mentioned.</li>
+          <li>Send private reports to moderators.</li>
+          <li>Delete, block and change role for multiple members at once</li>
+          <li>Faster sending messages and faster deletion.</li>
+          <li>Organize chats into lists to keep track of what's important.</li>
+          <li>Jump to found and forwarded messages.</li>
+          <li>Private media file names.</li>
+          <li>Message expiration in chats.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="6.3.2" date="2025-04-13">
+      <url type="details">https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html</url>
+      <description>
+        <p>New in v6.3.1-2:</p>
+        <ul>
+          <li>fix related to backward/forward compatibility of the app in some rare cases.</li>
+          <li>scrolling/navigation improvements.</li>
+          <li>faster onboarding (conditions and operators are combined to one screen).</li>
+        </ul>
+        <p>New in v6.3.0:</p>
+        <ul>
+          <li>Mention members and get notified when mentioned.</li>
+          <li>Send private reports to moderators.</li>
+          <li>Delete, block and change role for multiple members at once</li>
+          <li>Faster sending messages and faster deletion.</li>
+          <li>Organize chats into lists to keep track of what's important.</li>
+          <li>Jump to found and forwarded messages.</li>
+          <li>Private media file names.</li>
+          <li>Message expiration in chats.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="6.3.1" date="2025-03-31">
+      <url type="details">https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html</url>
+      <description>
+        <p>New in v6.3.1:</p>
+        <ul>
+          <li>scrolling/navigation improvements.</li>
+          <li>faster onboarding (conditions and operators are combined to one screen).</li>
+        </ul>
+        <p>New in v6.3.0:</p>
+        <ul>
+          <li>Mention members and get notified when mentioned.</li>
+          <li>Send private reports to moderators.</li>
+          <li>Delete, block and change role for multiple members at once</li>
+          <li>Faster sending messages and faster deletion.</li>
+          <li>Organize chats into lists to keep track of what's important.</li>
+          <li>Jump to found and forwarded messages.</li>
+          <li>Private media file names.</li>
+          <li>Message expiration in chats.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="6.3.0" date="2025-03-08">
+      <url type="details">https://simplex.chat/blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.html</url>
+      <description>
+        <p>New in v6.3.0:</p>
+        <ul>
+          <li>Mention members and get notified when mentioned.</li>
+          <li>Send private reports to moderators.</li>
+          <li>Delete, block and change role for multiple members at once</li>
+          <li>Faster sending messages and faster deletion.</li>
+          <li>Organize chats into lists to keep track of what's important.</li>
+          <li>Jump to found and forwarded messages.</li>
+          <li>Private media file names.</li>
+          <li>Message expiration in chats.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="6.2.5" date="2025-02-16">
+      <url type="details">https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html</url>
+      <description>
+        <p>New in v6.2.1-5:</p>
+        <ul>
+          <li>change media filenames when forwarding.</li>
+          <li>fully delete wallpapers when deleting user or chat.</li>
+          <li>important fixes</li>
+          <li>offer to "fix" encryption when calling or making direct connection with member.</li>
+          <li>broken layout.</li>
+          <li>option to enable debug logs (disabled by default).</li>
+          <li>show who reacted in direct chats.</li>
+        </ul>
+        <p>New in v6.2:</p>
+        <ul>
+          <li>SimpleX Chat and Flux made an agreement to include servers operated by Flux into the app – to improve metadata privacy.</li>
+          <li>Business chats – your customers privacy.</li>
+          <li>Improved user experience in chats: open on the first unread, jump to quoted messages, see who reacted.</li>
+        </ul>
+      </description>
+    </release>
     <release version="6.2.4" date="2025-01-14">
       <url type="details">https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html</url>
       <description>
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 95b8215de8..fa637db5bc 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."23189753751dc52046865ce2d992335495020e91" = "0f1c0bfjqwycsb2nkphhbdiv77zx6q47jdigk7bjal1c4rfla8gy";
+  "https://github.com/simplex-chat/simplexmq.git"."56ea2fdd56af5f5a5da41642486aa086d7371823" = "1ninimiccsk0ba4wls2i9rqxj6g057m2k30zw19jvzma4xbalzg8";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/scripts/simplex-chat-reproduce-builds.sh b/scripts/simplex-chat-reproduce-builds.sh
new file mode 100755
index 0000000000..408d1d4a53
--- /dev/null
+++ b/scripts/simplex-chat-reproduce-builds.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env sh
+set -eu
+
+TAG="$1"
+
+tempdir="$(mktemp -d)"
+init_dir="$PWD"
+
+repo_name="simplex-chat"
+repo="https://github.com/simplex-chat/${repo_name}"
+
+cabal_local='ignore-project: False
+package direct-sqlcipher
+    flags: +openssl'
+
+export DOCKER_BUILDKIT=1
+
+cleanup() {
+	docker exec -t builder sh -c 'rm -rf ./dist-newstyle' 2>/dev/null || :
+	rm -rf -- "$tempdir"
+	docker rm --force builder 2>/dev/null || :
+	docker image rm local 2>/dev/null || :
+	cd "$init_dir"
+}
+trap 'cleanup' EXIT INT
+
+mkdir -p "$init_dir/$TAG-$repo_name/from-source" "$init_dir/$TAG-$repo_name/prebuilt"
+
+git -C "$tempdir" clone "$repo.git" &&\
+	cd "$tempdir/${repo_name}" &&\
+	git checkout "$TAG"
+
+for os in 22.04 24.04; do
+	os_url="$(printf '%s' "$os" | tr '.' '_')"
+
+	# Build image
+	docker build \
+		--no-cache \
+		--build-arg TAG=${os} \
+		--build-arg GHC=9.6.3 \
+		-f "$tempdir/${repo_name}/Dockerfile.build" \
+		-t local \
+		.
+
+	printf '%s' "$cabal_local" > "$tempdir/${repo_name}/cabal.project.local"
+
+	# Run container in background
+	docker run -t -d \
+		--name builder \
+		-v "$tempdir/${repo_name}:/project" \
+		local
+
+	docker exec \
+		-t \
+		builder \
+		sh -c 'cabal clean && cabal update && cabal build -j --enable-tests && mkdir -p /out && for i in simplex-chat; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable) && chmod +x "$bin" && mv "$bin" /out/; done && strip /out/simplex-chat'
+
+	docker cp \
+		builder:/out/simplex-chat \
+		"$init_dir/$TAG-$repo_name/from-source/simplex-chat-ubuntu-${os_url}-x86-64"
+
+	# Download prebuilt postgresql binary
+	curl -L \
+		--output-dir "$init_dir/$TAG-$repo_name/prebuilt/" \
+		-O \
+		"$repo/releases/download/${TAG}/simplex-chat-ubuntu-${os_url}-x86-64"
+	
+	# Important! Remove dist-newstyle for the next interation
+	docker exec \
+		-t \
+		builder \
+		sh -c 'rm -rf ./dist-newstyle'
+
+	# Also restore git to previous state 
+	git reset --hard && git clean -dfx
+
+	# Stop containers, delete images
+	docker stop builder
+	docker rm --force builder
+	docker image rm local
+done
+
+# Cleanup
+rm -rf -- "$tempdir"
+cd "$init_dir"
+
+# Final stage: compare hashes
+
+# Path to binaries
+path_bin="$init_dir/$TAG-$repo_name"
+
+# Assume everything is okay for now
+bad=0
+
+# Check hashes for all binaries
+for file in "$path_bin"/from-source/*; do
+	# Extract binary name
+	app="$(basename $file)"
+
+	# Compute hash for compiled binary
+	compiled=$(sha256sum "$path_bin/from-source/$app" | awk '{print $1}')
+	# Compute hash for prebuilt binary
+	prebuilt=$(sha256sum "$path_bin/prebuilt/$app" | awk '{print $1}')
+
+	# Compare
+	if [ "$compiled" != "$prebuilt" ]; then
+		# If hashes doesn't match, set bad...
+		bad=1
+
+		# ... and print affected binary
+		printf "%s - sha256sum hash doesn't match\n" "$app"
+	fi
+done
+
+# If everything is still okay, compute checksums file
+if [ "$bad" = 0 ]; then
+	sha256sum "$path_bin"/from-source/* | sed -e "s|$PWD/||g" -e 's|from-source/||g' -e "s|-$repo_name||g" > "$path_bin/_sha256sums"
+
+	printf 'Checksums computed - %s\n' "$path_bin/_sha256sums"
+fi
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 6b0b8bdd82..d35e76f344 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        6.3.0.1
+version:        6.4.0.2
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -24,6 +24,11 @@ flag swift
   manual: True
   default: False
 
+flag client_library
+  description: Don't build server- and CLI-related code.
+  manual: True
+  default: False
+
 flag client_postgres
   description: Build with PostgreSQL instead of SQLite.
   manual: True
@@ -33,13 +38,9 @@ library
   exposed-modules:
       Simplex.Chat
       Simplex.Chat.AppSettings
-      Simplex.Chat.Bot
-      Simplex.Chat.Bot.KnownContacts
       Simplex.Chat.Call
       Simplex.Chat.Controller
-      Simplex.Chat.Core
       Simplex.Chat.Files
-      Simplex.Chat.Help
       Simplex.Chat.Library.Commands
       Simplex.Chat.Library.Internal
       Simplex.Chat.Library.Subscriber
@@ -54,6 +55,7 @@ library
       Simplex.Chat.Mobile.WebRTC
       Simplex.Chat.Operators
       Simplex.Chat.Operators.Conditions
+      Simplex.Chat.Operators.Presets
       Simplex.Chat.Options
       Simplex.Chat.Options.DB
       Simplex.Chat.ProfileGenerator
@@ -78,23 +80,32 @@ library
       Simplex.Chat.Store.Remote
       Simplex.Chat.Store.Shared
       Simplex.Chat.Styled
-      Simplex.Chat.Terminal
-      Simplex.Chat.Terminal.Input
-      Simplex.Chat.Terminal.Main
-      Simplex.Chat.Terminal.Notification
-      Simplex.Chat.Terminal.Output
       Simplex.Chat.Types
       Simplex.Chat.Types.Preferences
       Simplex.Chat.Types.Shared
       Simplex.Chat.Types.UITheme
       Simplex.Chat.Types.Util
       Simplex.Chat.Util
-      Simplex.Chat.View
+  if !flag(client_library)
+      exposed-modules:
+          Simplex.Chat.Bot
+          Simplex.Chat.Bot.KnownContacts
+          Simplex.Chat.Core
+          Simplex.Chat.Help
+          Simplex.Chat.Terminal
+          Simplex.Chat.Terminal.Input
+          Simplex.Chat.Terminal.Main
+          Simplex.Chat.Terminal.Notification
+          Simplex.Chat.Terminal.Output
+          Simplex.Chat.View
   if flag(client_postgres)
       exposed-modules:
           Simplex.Chat.Options.Postgres
           Simplex.Chat.Store.Postgres.Migrations
           Simplex.Chat.Store.Postgres.Migrations.M20241220_initial
+          Simplex.Chat.Store.Postgres.Migrations.M20250402_short_links
+          Simplex.Chat.Store.Postgres.Migrations.M20250512_member_admission
+          Simplex.Chat.Store.Postgres.Migrations.M20250513_group_scope
   else
       exposed-modules:
           Simplex.Chat.Archive
@@ -220,6 +231,13 @@ library
           Simplex.Chat.Store.SQLite.Migrations.M20241230_reports
           Simplex.Chat.Store.SQLite.Migrations.M20250105_indexes
           Simplex.Chat.Store.SQLite.Migrations.M20250115_chat_ttl
+          Simplex.Chat.Store.SQLite.Migrations.M20250122_chat_items_include_in_history
+          Simplex.Chat.Store.SQLite.Migrations.M20250126_mentions
+          Simplex.Chat.Store.SQLite.Migrations.M20250129_delete_unused_contacts
+          Simplex.Chat.Store.SQLite.Migrations.M20250130_indexes
+          Simplex.Chat.Store.SQLite.Migrations.M20250402_short_links
+          Simplex.Chat.Store.SQLite.Migrations.M20250512_member_admission
+          Simplex.Chat.Store.SQLite.Migrations.M20250513_group_scope
   other-modules:
       Paths_simplex_chat
   hs-source-dirs:
@@ -238,6 +256,7 @@ library
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
     , crypton ==0.34.*
+    , crypton-x509 ==1.7.*
     , data-default ==0.7.*
     , directory ==1.3.*
     , email-validate ==2.3.*
@@ -253,7 +272,6 @@ library
     , optparse-applicative >=0.15 && <0.17
     , random >=1.1 && <1.3
     , record-hasfield ==1.0.*
-    , scientific ==0.3.7.*
     , simple-logger ==0.1.*
     , simplexmq >=6.3
     , socks ==0.6.*
@@ -292,6 +310,8 @@ library
       , text >=1.2.4.0 && <1.3
 
 executable simplex-bot
+  if flag(client_library)
+      buildable: False
   main-is: Main.hs
   other-modules:
       Paths_simplex_chat
@@ -309,6 +329,8 @@ executable simplex-bot
     cpp-options: -DdbPostgres
 
 executable simplex-bot-advanced
+  if flag(client_library)
+      buildable: False
   main-is: Main.hs
   other-modules:
       Paths_simplex_chat
@@ -335,6 +357,8 @@ executable simplex-bot-advanced
         text >=1.2.4.0 && <1.3
 
 executable simplex-broadcast-bot
+  if flag(client_library)
+      buildable: False
   main-is: Main.hs
   hs-source-dirs:
       apps/simplex-broadcast-bot
@@ -365,6 +389,8 @@ executable simplex-broadcast-bot
         text >=1.2.4.0 && <1.3
 
 executable simplex-chat
+  if flag(client_library)
+      buildable: False
   main-is: Main.hs
   other-modules:
       Server
@@ -396,6 +422,8 @@ executable simplex-chat
         text >=1.2.4.0 && <1.3
 
 executable simplex-directory-service
+  if flag(client_library)
+      buildable: False
   main-is: Main.hs
   hs-source-dirs:
       apps/simplex-directory-service
@@ -403,6 +431,8 @@ executable simplex-directory-service
   default-extensions:
       StrictData
   other-modules:
+      Directory.BlockedWords
+      Directory.Captcha
       Directory.Events
       Directory.Options
       Directory.Search
@@ -411,18 +441,23 @@ executable simplex-directory-service
       Paths_simplex_chat
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      async ==2.2.*
+      aeson ==2.2.*
+    , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , composition ==1.0.*
     , containers ==0.6.*
     , directory ==1.3.*
+    , mtl >=2.3.1 && <3.0
     , optparse-applicative >=0.15 && <0.17
+    , process >=1.6 && <1.6.18
+    , random >=1.1 && <1.3
     , simple-logger ==0.1.*
     , simplex-chat
     , simplexmq >=6.3
     , stm ==2.5.*
     , time ==1.12.*
+    , unicode-transforms ==0.4.*
   default-language: Haskell2010
   if flag(client_postgres)
     cpp-options: -DdbPostgres
@@ -436,6 +471,10 @@ executable simplex-directory-service
       , text >=1.2.4.0 && <1.3
 
 test-suite simplex-chat-test
+  if flag(swift)
+    cpp-options: -DswiftJSON
+  if flag(client_library)
+      buildable: False
   type: exitcode-stdio-1.0
   main-is: Test.hs
   other-modules:
@@ -445,6 +484,7 @@ test-suite simplex-chat-test
       ChatTests
       ChatTests.ChatList
       ChatTests.Direct
+      ChatTests.DBUtils
       ChatTests.Files
       ChatTests.Forward
       ChatTests.Groups
@@ -463,14 +503,20 @@ test-suite simplex-chat-test
       ViewTests
       Broadcast.Bot
       Broadcast.Options
+      Directory.BlockedWords
+      Directory.Captcha
       Directory.Events
       Directory.Options
       Directory.Search
       Directory.Service
       Directory.Store
       Paths_simplex_chat
-  if !flag(client_postgres)
+  if flag(client_postgres)
       other-modules:
+          ChatTests.DBUtils.Postgres
+  else
+      other-modules:
+          ChatTests.DBUtils.SQLite
           MobileTests
           SchemaDump
           WebRTCTests
@@ -501,6 +547,7 @@ test-suite simplex-chat-test
     , mtl >=2.3.1 && <3.0
     , network ==3.1.*
     , optparse-applicative >=0.15 && <0.17
+    , random >=1.1 && <1.3
     , silently ==1.2.*
     , simple-logger ==0.1.*
     , simplex-chat
@@ -508,6 +555,7 @@ test-suite simplex-chat-test
     , stm ==2.5.*
     , terminal ==0.2.*
     , time ==1.12.*
+    , unicode-transforms ==0.4.*
     , unliftio ==0.2.*
   default-language: Haskell2010
   if flag(client_postgres)
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index bf07e4ae51..e14275b75c 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -30,6 +30,7 @@ import Data.Time.Clock (getCurrentTime)
 import Simplex.Chat.Controller
 import Simplex.Chat.Library.Commands
 import Simplex.Chat.Operators
+import Simplex.Chat.Operators.Presets
 import Simplex.Chat.Options
 import Simplex.Chat.Options.DB
 import Simplex.Chat.Protocol
@@ -39,10 +40,11 @@ import Simplex.Chat.Types
 import Simplex.Chat.Util (shuffle)
 import Simplex.FileTransfer.Client.Presets (defaultXFTPServers)
 import Simplex.Messaging.Agent as Agent
-import Simplex.Messaging.Agent.Env.SQLite (AgentConfig (..), InitialAgentServers (..), ServerCfg (..), ServerRoles (..), allRoles, createAgentStore, defaultAgentConfig, presetServerCfg)
+import Simplex.Messaging.Agent.Env.SQLite (AgentConfig (..), InitialAgentServers (..), ServerCfg (..), allRoles, createAgentStore, defaultAgentConfig, presetServerCfg)
 import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Agent.Store.Common (DBStore (dbNew))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation (..), MigrationError)
 import Simplex.Messaging.Client (defaultNetworkConfig)
 import qualified Simplex.Messaging.Crypto as C
@@ -51,34 +53,6 @@ import qualified Simplex.Messaging.TMap as TM
 import qualified UnliftIO.Exception as E
 import UnliftIO.STM
 
-operatorSimpleXChat :: NewServerOperator
-operatorSimpleXChat =
-  ServerOperator
-    { operatorId = DBNewEntity,
-      operatorTag = Just OTSimplex,
-      tradeName = "SimpleX Chat",
-      legalName = Just "SimpleX Chat Ltd",
-      serverDomains = ["simplex.im"],
-      conditionsAcceptance = CARequired Nothing,
-      enabled = True,
-      smpRoles = allRoles,
-      xftpRoles = allRoles
-    }
-
-operatorFlux :: NewServerOperator
-operatorFlux =
-  ServerOperator
-    { operatorId = DBNewEntity,
-      operatorTag = Just OTFlux,
-      tradeName = "Flux",
-      legalName = Just "InFlux Technologies Limited",
-      serverDomains = ["simplexonflux.com"],
-      conditionsAcceptance = CARequired Nothing,
-      enabled = False,
-      smpRoles = ServerRoles {storage = False, proxy = True},
-      xftpRoles = ServerRoles {storage = False, proxy = True}
-    }
-
 defaultChatConfig :: ChatConfig
 defaultChatConfig =
   ChatConfig
@@ -112,6 +86,11 @@ defaultChatConfig =
             ntf = _defaultNtfServers,
             netCfg = defaultNetworkConfig
           },
+      -- please note: if these servers are changed, this option needs to be split to two,
+      -- to have a different set of servers on the receiving end and on the sending end.
+      -- To preserve backward compatibility receiving end should update before the sending.
+      shortLinkPresetServers = allPresetServers,
+      presetDomains = [".simplex.im", ".simplexonflux.com"],
       tbqSize = 1024,
       fileChunkSize = 15780, -- do not change
       xftpDescrPartSize = 14000,
@@ -133,53 +112,6 @@ defaultChatConfig =
       chatHooks = defaultChatHooks
     }
 
-simplexChatSMPServers :: [NewUserServer 'PSMP]
-simplexChatSMPServers =
-  map
-    (presetServer True)
-    [ "smp://0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU=@smp8.simplex.im,beccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion",
-      "smp://SkIkI6EPd2D63F4xFKfHk7I1UGZVNn6k1QWZ5rcyr6w=@smp9.simplex.im,jssqzccmrcws6bhmn77vgmhfjmhwlyr3u7puw4erkyoosywgl67slqqd.onion",
-      "smp://6iIcWT_dF2zN_w5xzZEY7HI2Prbh3ldP07YTyDexPjE=@smp10.simplex.im,rb2pbttocvnbrngnwziclp2f4ckjq65kebafws6g4hy22cdaiv5dwjqd.onion",
-      "smp://1OwYGt-yqOfe2IyVHhxz3ohqo3aCCMjtB-8wn4X_aoY=@smp11.simplex.im,6ioorbm6i3yxmuoezrhjk6f6qgkc4syabh7m3so74xunb5nzr4pwgfqd.onion",
-      "smp://UkMFNAXLXeAAe0beCa4w6X_zp18PwxSaSjY17BKUGXQ=@smp12.simplex.im,ie42b5weq7zdkghocs3mgxdjeuycheeqqmksntj57rmejagmg4eor5yd.onion",
-      "smp://enEkec4hlR3UtKx2NMpOUK_K4ZuDxjWBO1d9Y4YXVaA=@smp14.simplex.im,aspkyu2sopsnizbyfabtsicikr2s4r3ti35jogbcekhm3fsoeyjvgrid.onion",
-      "smp://h--vW7ZSkXPeOUpfxlFGgauQmXNFOzGoizak7Ult7cw=@smp15.simplex.im,oauu4bgijybyhczbnxtlggo6hiubahmeutaqineuyy23aojpih3dajad.onion",
-      "smp://hejn2gVIqNU6xjtGM3OwQeuk8ZEbDXVJXAlnSBJBWUA=@smp16.simplex.im,p3ktngodzi6qrf7w64mmde3syuzrv57y55hxabqcq3l5p6oi7yzze6qd.onion",
-      "smp://ZKe4uxF4Z_aLJJOEsC-Y6hSkXgQS5-oc442JQGkyP8M=@smp17.simplex.im,ogtwfxyi3h2h5weftjjpjmxclhb5ugufa5rcyrmg7j4xlch7qsr5nuqd.onion",
-      "smp://PtsqghzQKU83kYTlQ1VKg996dW4Cw4x_bvpKmiv8uns=@smp18.simplex.im,lyqpnwbs2zqfr45jqkncwpywpbtq7jrhxnib5qddtr6npjyezuwd3nqd.onion",
-      "smp://N_McQS3F9TGoh4ER0QstUf55kGnNSd-wXfNPZ7HukcM=@smp19.simplex.im,i53bbtoqhlc365k6kxzwdp5w3cdt433s7bwh3y32rcbml2vztiyyz5id.onion"
-    ]
-    <> map
-      (presetServer False)
-      [ "smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im,o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion",
-        "smp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im,jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion",
-        "smp://PQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo=@smp6.simplex.im,bylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion"
-      ]
-
-fluxSMPServers :: [NewUserServer 'PSMP]
-fluxSMPServers =
-  map
-    (presetServer True)
-    [ "smp://xQW_ufMkGE20UrTlBl8QqceG1tbuylXhr9VOLPyRJmw=@smp1.simplexonflux.com,qb4yoanyl4p7o33yrknv4rs6qo7ugeb2tu2zo66sbebezs4cpyosarid.onion",
-      "smp://LDnWZVlAUInmjmdpQQoIo6FUinRXGe0q3zi5okXDE4s=@smp2.simplexonflux.com,yiqtuh3q4x7hgovkomafsod52wvfjucdljqbbipg5sdssnklgongxbqd.onion",
-      "smp://1jne379u7IDJSxAvXbWb_JgoE7iabcslX0LBF22Rej0=@smp3.simplexonflux.com,a5lm4k7ufei66cdck6fy63r4lmkqy3dekmmb7jkfdm5ivi6kfaojshad.onion",
-      "smp://xmAmqj75I9mWrUihLUlI0ZuNLXlIwFIlHRq5Pb6cHAU=@smp4.simplexonflux.com,qpcz2axyy66u26hfdd2e23uohcf3y6c36mn7dcuilcgnwjasnrvnxjqd.onion",
-      "smp://rWvBYyTamuRCBYb_KAn-nsejg879ndhiTg5Sq3k0xWA=@smp5.simplexonflux.com,4ao347qwiuluyd45xunmii4skjigzuuox53hpdsgbwxqafd4yrticead.onion",
-      "smp://PN7-uqLBToqlf1NxHEaiL35lV2vBpXq8Nj8BW11bU48=@smp6.simplexonflux.com,hury6ot3ymebbr2535mlp7gcxzrjpc6oujhtfxcfh2m4fal4xw5fq6qd.onion"
-    ]
-
-fluxXFTPServers :: [NewUserServer 'PXFTP]
-fluxXFTPServers =
-  map
-    (presetServer True)
-    [ "xftp://92Sctlc09vHl_nAqF2min88zKyjdYJ9mgxRCJns5K2U=@xftp1.simplexonflux.com,apl3pumq3emwqtrztykyyoomdx4dg6ysql5zek2bi3rgznz7ai3odkid.onion",
-      "xftp://YBXy4f5zU1CEhnbbCzVWTNVNsaETcAGmYqGNxHntiE8=@xftp2.simplexonflux.com,c5jjecisncnngysah3cz2mppediutfelco4asx65mi75d44njvua3xid.onion",
-      "xftp://ARQO74ZSvv2OrulRF3CdgwPz_AMy27r0phtLSq5b664=@xftp3.simplexonflux.com,dc4mohiubvbnsdfqqn7xhlhpqs5u4tjzp7xpz6v6corwvzvqjtaqqiqd.onion",
-      "xftp://ub2jmAa9U0uQCy90O-fSUNaYCj6sdhl49Jh3VpNXP58=@xftp4.simplexonflux.com,4qq5pzier3i4yhpuhcrhfbl6j25udc4czoyascrj4yswhodhfwev3nyd.onion",
-      "xftp://Rh19D5e4Eez37DEE9hAlXDB3gZa1BdFYJTPgJWPO9OI=@xftp5.simplexonflux.com,q7itltdn32hjmgcqwhow4tay5ijetng3ur32bolssw32fvc5jrwvozad.onion",
-      "xftp://0AznwoyfX8Od9T_acp1QeeKtxUi676IBIiQjXVwbdyU=@xftp6.simplexonflux.com,upvzf23ou6nrmaf3qgnhd6cn3d74tvivlmz3p7wdfwq6fhthjrjiiqid.onion"
-    ]
-
 logCfg :: LogConfig
 logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
 
@@ -194,7 +126,7 @@ newChatController
   ChatDatabase {chatStore, agentStore}
   user
   cfg@ChatConfig {agentConfig = aCfg, presetServers, inlineFiles, deviceNameForRemote, confirmMigrations}
-  ChatOpts {coreOptions = CoreChatOpts {smpServers, xftpServers, simpleNetCfg, logLevel, logConnections, logServerHosts, logFile, tbqSize, highlyAvailable, yesToUpMigrations}, deviceName, optFilesFolder, optTempDirectory, showReactions, allowInstantFiles, autoAcceptFileSize}
+  ChatOpts {coreOptions = CoreChatOpts {smpServers, xftpServers, simpleNetCfg, logLevel, logConnections, logServerHosts, logFile, tbqSize, deviceName, highlyAvailable, yesToUpMigrations}, optFilesFolder, optTempDirectory, showReactions, allowInstantFiles, autoAcceptFileSize}
   backgroundMode = do
     let inlineFiles' = if allowInstantFiles || autoAcceptFileSize > 0 then inlineFiles else inlineFiles {sendChunks = 0, receiveInstant = False}
         confirmMigrations' = if confirmMigrations == MCConsole && yesToUpMigrations then MCYesUp else confirmMigrations
@@ -310,12 +242,12 @@ newChatController
       randomServerCfgs name p opDomains rndSrvs =
         toJustOrError name $ L.nonEmpty $ agentServerCfgs p opDomains $ concatMap (pServers p) rndSrvs
       agentServers :: DB.Connection -> ChatConfig -> NonEmpty PresetOperator -> RandomAgentServers -> IO InitialAgentServers
-      agentServers db ChatConfig {presetServers = PresetServers {ntf, netCfg}} presetOps as = do
+      agentServers db ChatConfig {presetServers = PresetServers {ntf, netCfg}, presetDomains} presetOps as = do
         users <- getUsers db
         ops <- getUpdateServerOperators db presetOps (null users)
         let opDomains = operatorDomains $ mapMaybe snd ops
         (smp', xftp') <- unzip <$> mapM (getServers ops opDomains) users
-        pure InitialAgentServers {smp = M.fromList (optServers smp' smpServers), xftp = M.fromList (optServers xftp' xftpServers), ntf, netCfg}
+        pure InitialAgentServers {smp = M.fromList (optServers smp' smpServers), xftp = M.fromList (optServers xftp' xftpServers), ntf, netCfg, presetDomains}
         where
           optServers :: [(UserId, NonEmpty (ServerCfg p))] -> [ProtoServerWithAuth p] -> [(UserId, NonEmpty (ServerCfg p))]
           optServers srvs overrides_ = case L.nonEmpty overrides_ of
diff --git a/src/Simplex/Chat/AppSettings.hs b/src/Simplex/Chat/AppSettings.hs
index 23b5f2ddad..1efa69fad4 100644
--- a/src/Simplex/Chat/AppSettings.hs
+++ b/src/Simplex/Chat/AppSettings.hs
@@ -25,8 +25,6 @@ data NotificationPreviewMode = NPMHidden | NPMContact | NPMMessage deriving (Sho
 
 data LockScreenCalls = LSCDisable | LSCShow | LSCAccept deriving (Show)
 
-data OpenLinksSetting = OLSYes | OLSNo | OLSAsk deriving (Show)
-
 data AppSettings = AppSettings
   { appPlatform :: Maybe AppPlatform,
     networkConfig :: Maybe NetworkConfig,
@@ -35,7 +33,6 @@ data AppSettings = AppSettings
     privacyAskToApproveRelays :: Maybe Bool,
     privacyAcceptImages :: Maybe Bool,
     privacyLinkPreviews :: Maybe Bool,
-    privacyChatListOpenLinks :: Maybe OpenLinksSetting,
     privacyShowChatPreviews :: Maybe Bool,
     privacySaveLastDraft :: Maybe Bool,
     privacyProtectScreen :: Maybe Bool,
@@ -86,7 +83,6 @@ defaultAppSettings =
       privacyAskToApproveRelays = Just True,
       privacyAcceptImages = Just True,
       privacyLinkPreviews = Just True,
-      privacyChatListOpenLinks = Just OLSAsk,
       privacyShowChatPreviews = Just True,
       privacySaveLastDraft = Just True,
       privacyProtectScreen = Just False,
@@ -124,7 +120,6 @@ defaultParseAppSettings =
       privacyAskToApproveRelays = Nothing,
       privacyAcceptImages = Nothing,
       privacyLinkPreviews = Nothing,
-      privacyChatListOpenLinks = Nothing,
       privacyShowChatPreviews = Nothing,
       privacySaveLastDraft = Nothing,
       privacyProtectScreen = Nothing,
@@ -162,7 +157,6 @@ combineAppSettings platformDefaults storedSettings =
       privacyAskToApproveRelays = p privacyAskToApproveRelays,
       privacyAcceptImages = p privacyAcceptImages,
       privacyLinkPreviews = p privacyLinkPreviews,
-      privacyChatListOpenLinks = p privacyChatListOpenLinks,
       privacyShowChatPreviews = p privacyShowChatPreviews,
       privacySaveLastDraft = p privacySaveLastDraft,
       privacyProtectScreen = p privacyProtectScreen,
@@ -203,8 +197,6 @@ $(JQ.deriveJSON (enumJSON $ dropPrefix "LSC") ''LockScreenCalls)
 
 $(JQ.deriveJSON (enumJSON $ dropPrefix "NPA") ''NetworkProxyAuth)
 
-$(JQ.deriveJSON (enumJSON $ dropPrefix "OLS") ''OpenLinksSetting)
-
 $(JQ.deriveJSON defaultJSON ''NetworkProxy)
 
 $(JQ.deriveToJSON defaultJSON ''AppSettings)
@@ -218,7 +210,6 @@ instance FromJSON AppSettings where
     privacyAskToApproveRelays <- p "privacyAskToApproveRelays"
     privacyAcceptImages <- p "privacyAcceptImages"
     privacyLinkPreviews <- p "privacyLinkPreviews"
-    privacyChatListOpenLinks <- p "privacyChatListOpenLinks"
     privacyShowChatPreviews <- p "privacyShowChatPreviews"
     privacySaveLastDraft <- p "privacySaveLastDraft"
     privacyProtectScreen <- p "privacyProtectScreen"
@@ -253,7 +244,6 @@ instance FromJSON AppSettings where
           privacyAskToApproveRelays,
           privacyAcceptImages,
           privacyLinkPreviews,
-          privacyChatListOpenLinks,
           privacyShowChatPreviews,
           privacySaveLastDraft,
           privacyProtectScreen,
diff --git a/src/Simplex/Chat/Bot.hs b/src/Simplex/Chat/Bot.hs
index 2f7e2f2abd..9b92c8b800 100644
--- a/src/Simplex/Chat/Bot.hs
+++ b/src/Simplex/Chat/Bot.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE TupleSections #-}
 
 module Simplex.Chat.Bot where
 
@@ -11,7 +12,10 @@ import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Monad
 import qualified Data.ByteString.Char8 as B
-import Data.List.NonEmpty (NonEmpty (..))
+import Data.List.NonEmpty (NonEmpty)
+import qualified Data.List.NonEmpty as L
+import qualified Data.Map.Strict as M
+import Data.Maybe (isJust)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Simplex.Chat.Controller
@@ -21,6 +25,7 @@ import Simplex.Chat.Messages.CIContent
 import Simplex.Chat.Protocol (MsgContent (..))
 import Simplex.Chat.Store
 import Simplex.Chat.Types (Contact (..), ContactId, IsContact (..), User (..))
+import Simplex.Messaging.Agent.Protocol (CreatedConnLink (..))
 import Simplex.Messaging.Encoding.String (strEncode)
 import System.Exit (exitFailure)
 
@@ -28,12 +33,12 @@ chatBotRepl :: String -> (Contact -> String -> IO String) -> User -> ChatControl
 chatBotRepl welcome answer _user cc = do
   initializeBotAddress cc
   race_ (forever $ void getLine) . forever $ do
-    (_, _, resp) <- atomically . readTBQueue $ outputQ cc
-    case resp of
-      CRContactConnected _ contact _ -> do
+    (_, event) <- atomically . readTBQueue $ outputQ cc
+    case event of
+      Right (CEvtContactConnected _ contact _) -> do
         contactConnected contact
         void $ sendMessage cc contact $ T.pack welcome
-      CRNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat contact) ChatItem {content = mc@CIRcvMsgContent {}}) : _} -> do
+      Right CEvtNewChatItems {chatItems = (AChatItem _ SMDRcv (DirectChat contact) ChatItem {content = mc@CIRcvMsgContent {}}) : _} -> do
         let msg = T.unpack $ ciContentToText mc
         void $ sendMessage cc contact . T.pack =<< answer contact msg
       _ -> pure ()
@@ -46,16 +51,18 @@ initializeBotAddress = initializeBotAddress' True
 initializeBotAddress' :: Bool -> ChatController -> IO ()
 initializeBotAddress' logAddress cc = do
   sendChatCmd cc ShowMyAddress >>= \case
-    CRUserContactLink _ UserContactLink {connReqContact} -> showBotAddress connReqContact
-    CRChatCmdError _ (ChatErrorStore SEUserContactLinkNotFound) -> do
+    Right (CRUserContactLink _ UserContactLink {connLinkContact}) -> showBotAddress connLinkContact
+    Left (ChatErrorStore SEUserContactLinkNotFound) -> do
       when logAddress $ putStrLn "No bot address, creating..."
-      sendChatCmd cc CreateMyAddress >>= \case
-        CRUserContactLinkCreated _ uri -> showBotAddress uri
+      -- TODO [short links] create short link by default
+      sendChatCmd cc (CreateMyAddress False) >>= \case
+        Right (CRUserContactLinkCreated _ ccLink) -> showBotAddress ccLink
         _ -> putStrLn "can't create bot address" >> exitFailure
     _ -> putStrLn "unexpected response" >> exitFailure
   where
-    showBotAddress uri = do
-      when logAddress $ putStrLn $ "Bot's contact address is: " <> B.unpack (strEncode uri)
+    showBotAddress (CCLink uri shortUri) = do
+      when logAddress $ putStrLn $ "Bot's contact address is: " <> B.unpack (maybe (strEncode uri) strEncode shortUri)
+      when (isJust shortUri) $ putStrLn $ "Full contact address for old clients: " <> B.unpack (strEncode uri)
       void $ sendChatCmd cc $ AddressAutoAccept $ Just AutoAccept {businessAddress = False, acceptIncognito = False, autoReply = Nothing}
 
 sendMessage :: ChatController -> Contact -> Text -> IO ()
@@ -68,21 +75,27 @@ sendComposedMessage :: ChatController -> Contact -> Maybe ChatItemId -> MsgConte
 sendComposedMessage cc = sendComposedMessage' cc . contactId'
 
 sendComposedMessage' :: ChatController -> ContactId -> Maybe ChatItemId -> MsgContent -> IO ()
-sendComposedMessage' cc ctId quotedItemId msgContent = do
-  let cm = ComposedMessage {fileSource = Nothing, quotedItemId, msgContent}
-  sendChatCmd cc (APISendMessages (ChatRef CTDirect ctId) False Nothing (cm :| [])) >>= \case
-    CRNewChatItems {} -> printLog cc CLLInfo $ "sent message to contact ID " <> show ctId
+sendComposedMessage' cc ctId qiId mc = sendComposedMessages_ cc (SRDirect ctId) [(qiId, mc)]
+
+sendComposedMessages :: ChatController -> SendRef -> NonEmpty MsgContent -> IO ()
+sendComposedMessages cc sendRef = sendComposedMessages_ cc sendRef . L.map (Nothing,)
+
+sendComposedMessages_ :: ChatController -> SendRef -> NonEmpty (Maybe ChatItemId, MsgContent) -> IO ()
+sendComposedMessages_ cc sendRef qmcs = do
+  let cms = L.map (\(qiId, mc) -> ComposedMessage {fileSource = Nothing, quotedItemId = qiId, msgContent = mc, mentions = M.empty}) qmcs
+  sendChatCmd cc (APISendMessages sendRef False Nothing cms) >>= \case
+    Right (CRNewChatItems {}) -> printLog cc CLLInfo $ "sent " <> show (length cms) <> " messages to " <> show sendRef
     r -> putStrLn $ "unexpected send message response: " <> show r
 
 deleteMessage :: ChatController -> Contact -> ChatItemId -> IO ()
 deleteMessage cc ct chatItemId = do
   let cmd = APIDeleteChatItem (contactRef ct) [chatItemId] CIDMInternal
   sendChatCmd cc cmd >>= \case
-    CRChatItemsDeleted {} -> printLog cc CLLInfo $ "deleted message(s) from " <> contactInfo ct
+    Right (CRChatItemsDeleted {}) -> printLog cc CLLInfo $ "deleted message(s) from " <> contactInfo ct
     r -> putStrLn $ "unexpected delete message response: " <> show r
 
 contactRef :: Contact -> ChatRef
-contactRef = ChatRef CTDirect . contactId'
+contactRef ct = ChatRef CTDirect (contactId' ct) Nothing
 
 printLog :: ChatController -> ChatLogLevel -> String -> IO ()
 printLog cc level s
diff --git a/src/Simplex/Chat/Call.hs b/src/Simplex/Chat/Call.hs
index 3b1f28dd27..18398ecb3e 100644
--- a/src/Simplex/Chat/Call.hs
+++ b/src/Simplex/Chat/Call.hs
@@ -23,10 +23,10 @@ import Data.Text (Text)
 import Data.Time.Clock (UTCTime)
 import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types (Contact, ContactId, User)
-import Simplex.Messaging.Agent.Store.DB (Binary (..))
+import Simplex.Messaging.Agent.Store.DB (Binary (..), fromTextField_)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fromTextField_, fstToLower, singleFieldJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fstToLower, singleFieldJSON)
 import Simplex.Messaging.Util (decodeJSON, encodeJSON)
 
 data Call = Call
diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs
index bf91e5ed23..016a7f3dd2 100644
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -19,7 +19,8 @@ module Simplex.Chat.Controller where
 
 import Control.Concurrent (ThreadId)
 import Control.Concurrent.Async (Async)
-import Control.Exception
+import Control.Exception (Exception, SomeException)
+import qualified Control.Exception as E
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
@@ -39,6 +40,8 @@ import Data.Int (Int64)
 import Data.List.NonEmpty (NonEmpty)
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
+import Data.Maybe (fromMaybe)
+import Data.Set (Set)
 import Data.String
 import Data.Text (Text)
 import Data.Text.Encoding (decodeLatin1)
@@ -47,11 +50,11 @@ import Data.Time.Clock.System (SystemTime (..), systemToUTCTime)
 import Data.Version (showVersion)
 import Data.Word (Word16)
 import Language.Haskell.TH (Exp, Q, runIO)
+import Network.Socket (HostName)
 import Numeric.Natural
 import qualified Paths_simplex_chat as SC
 import Simplex.Chat.AppSettings
 import Simplex.Chat.Call
-import Simplex.Chat.Markdown (MarkdownList)
 import Simplex.Chat.Messages
 import Simplex.Chat.Messages.CIContent
 import Simplex.Chat.Operators
@@ -59,7 +62,7 @@ import Simplex.Chat.Protocol
 import Simplex.Chat.Remote.AppVersion
 import Simplex.Chat.Remote.Types
 import Simplex.Chat.Stats (PresentedServersSummary)
-import Simplex.Chat.Store (AutoAccept, ChatLockEntity, StoreError (..), UserContactLink, UserMsgReceiptSettings)
+import Simplex.Chat.Store (AutoAccept, ChatLockEntity, StoreError (..), UserContactLink, GroupLinkInfo, UserMsgReceiptSettings)
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
@@ -74,7 +77,7 @@ import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Agent.Store.Common (DBStore, withTransaction, withTransactionPriority)
 import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation, UpMigration)
 import qualified Simplex.Messaging.Agent.Store.DB as DB
-import Simplex.Messaging.Client (HostMode (..), SMPProxyFallback (..), SMPProxyMode (..), SocksMode (..))
+import Simplex.Messaging.Client (HostMode (..), SMPProxyFallback (..), SMPProxyMode (..), SMPWebPortServers (..), SocksMode (..))
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile (..))
 import qualified Simplex.Messaging.Crypto.File as CF
@@ -82,9 +85,9 @@ import Simplex.Messaging.Crypto.Ratchet (PQEncryption)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Notifications.Protocol (DeviceToken (..), NtfTknStatus)
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, parseAll, parseString, sumTypeJSON)
-import Simplex.Messaging.Protocol (AProtoServerWithAuth, AProtocolType (..), CorrId, MsgId, NMsgMeta (..), NtfServer, ProtocolType (..), QueueId, SMPMsgMeta (..), SubscriptionMode (..), XFTPServer)
+import Simplex.Messaging.Protocol (AProtoServerWithAuth, AProtocolType (..), MsgId, NMsgMeta (..), NtfServer, ProtocolType (..), QueueId, SMPMsgMeta (..), SubscriptionMode (..), XFTPServer)
 import Simplex.Messaging.TMap (TMap)
-import Simplex.Messaging.Transport (TLS, simplexMQVersion)
+import Simplex.Messaging.Transport (TLS, TransportPeer (..), simplexMQVersion)
 import Simplex.Messaging.Transport.Client (SocksProxyWithAuth, TransportHost)
 import Simplex.Messaging.Util (allFinally, catchAllErrors, catchAllErrors', tryAllErrors, tryAllErrors', (<$$>))
 import Simplex.RemoteControl.Client
@@ -92,7 +95,6 @@ import Simplex.RemoteControl.Invitation (RCSignedInvitation, RCVerifiedInvitatio
 import Simplex.RemoteControl.Types
 import System.IO (Handle)
 import System.Mem.Weak (Weak)
-import qualified UnliftIO.Exception as E
 import UnliftIO.STM
 #if !defined(dbPostgres)
 import Database.SQLite.Simple (SQLError)
@@ -136,6 +138,8 @@ data ChatConfig = ChatConfig
     chatVRange :: VersionRangeChat,
     confirmMigrations :: MigrationConfirmation,
     presetServers :: PresetServers,
+    shortLinkPresetServers :: NonEmpty SMPServer,
+    presetDomains :: [HostName],
     tbqSize :: Natural,
     fileChunkSize :: Integer,
     xftpDescrPartSize :: Int,
@@ -168,18 +172,16 @@ data ChatHooks = ChatHooks
   { -- preCmdHook can be used to process or modify the commands before they are processed.
     -- This hook should be used to process CustomChatCommand.
     -- if this hook returns ChatResponse, the command processing will be skipped.
-    preCmdHook :: ChatController -> ChatCommand -> IO (Either ChatResponse ChatCommand),
+    preCmdHook :: Maybe (ChatController -> ChatCommand -> IO (Either (Either ChatError ChatResponse) ChatCommand)),
     -- eventHook can be used to additionally process or modify events,
     -- it is called before the event is sent to the user (or to the UI).
-    eventHook :: ChatController -> ChatResponse -> IO ChatResponse
+    eventHook :: Maybe (ChatController -> Either ChatError ChatEvent -> IO (Either ChatError ChatEvent)),
+    -- acceptMember hook can be used to accept or reject member connecting via group link without API calls
+    acceptMember :: Maybe (GroupInfo -> GroupLinkInfo -> Profile -> IO (Either GroupRejectionReason (GroupAcceptance, GroupMemberRole)))
   }
 
 defaultChatHooks :: ChatHooks
-defaultChatHooks =
-  ChatHooks
-    { preCmdHook = \_ -> pure . Right,
-      eventHook = \_ -> pure
-    }
+defaultChatHooks = ChatHooks Nothing Nothing Nothing
 
 data PresetServers = PresetServers
   { operators :: NonEmpty PresetOperator,
@@ -221,7 +223,7 @@ data ChatController = ChatController
     random :: TVar ChaChaDRG,
     eventSeq :: TVar Int,
     inputQ :: TBQueue String,
-    outputQ :: TBQueue (Maybe CorrId, Maybe RemoteHostId, ChatResponse),
+    outputQ :: TBQueue (Maybe RemoteHostId, Either ChatError ChatEvent),
     connNetworkStatuses :: TMap AgentConnId NetworkStatus,
     subscriptionMode :: TVar SubscriptionMode,
     chatLock :: Lock,
@@ -304,7 +306,7 @@ data ChatCommand
   | APIGetChat ChatRef (Maybe MsgContentTag) ChatPagination (Maybe String)
   | APIGetChatItems ChatPagination (Maybe String)
   | APIGetChatItemInfo ChatRef ChatItemId
-  | APISendMessages {chatRef :: ChatRef, liveMessage :: Bool, ttl :: Maybe Int, composedMessages :: NonEmpty ComposedMessage}
+  | APISendMessages {sendRef :: SendRef, liveMessage :: Bool, ttl :: Maybe Int, composedMessages :: NonEmpty ComposedMessage}
   | APICreateChatTag ChatTagData
   | APISetChatTags ChatRef (Maybe (NonEmpty ChatTagId))
   | APIDeleteChatTag ChatTagId
@@ -313,9 +315,11 @@ data ChatCommand
   | APICreateChatItems {noteFolderId :: NoteFolderId, composedMessages :: NonEmpty ComposedMessage}
   | APIReportMessage {groupId :: GroupId, chatItemId :: ChatItemId, reportReason :: ReportReason, reportText :: Text}
   | ReportMessage {groupName :: GroupName, contactName_ :: Maybe ContactName, reportReason :: ReportReason, reportedMessage :: Text}
-  | APIUpdateChatItem {chatRef :: ChatRef, chatItemId :: ChatItemId, liveMessage :: Bool, msgContent :: MsgContent}
+  | APIUpdateChatItem {chatRef :: ChatRef, chatItemId :: ChatItemId, liveMessage :: Bool, updatedMessage :: UpdatedMessage}
   | APIDeleteChatItem ChatRef (NonEmpty ChatItemId) CIDeleteMode
   | APIDeleteMemberChatItem GroupId (NonEmpty ChatItemId)
+  | APIArchiveReceivedReports GroupId
+  | APIDeleteReceivedReports GroupId (NonEmpty ChatItemId) CIDeleteMode
   | APIChatItemReaction {chatRef :: ChatRef, chatItemId :: ChatItemId, add :: Bool, reaction :: MsgReaction}
   | APIGetReactionMembers UserId GroupId ChatItemId MsgReaction
   | APIPlanForwardChatItems {fromChatRef :: ChatRef, chatItemIds :: NonEmpty ChatItemId}
@@ -346,25 +350,30 @@ data ChatCommand
   | APISetConnectionAlias Int64 LocalAlias
   | APISetUserUIThemes UserId (Maybe UIThemeEntityOverrides)
   | APISetChatUIThemes ChatRef (Maybe UIThemeEntityOverrides)
-  | APIParseMarkdown Text
   | APIGetNtfToken
   | APIRegisterToken DeviceToken NotificationsMode
   | APIVerifyToken DeviceToken C.CbNonce ByteString
+  | APICheckToken DeviceToken
   | APIDeleteToken DeviceToken
   | APIGetNtfConns {nonce :: C.CbNonce, encNtfInfo :: ByteString}
-  | ApiGetConnNtfMessages {connIds :: NonEmpty AgentConnId}
+  | APIGetConnNtfMessages (NonEmpty ConnMsgReq)
   | APIAddMember GroupId ContactId GroupMemberRole
   | APIJoinGroup {groupId :: GroupId, enableNtfs :: MsgFilter}
-  | APIMemberRole GroupId GroupMemberId GroupMemberRole
-  | APIBlockMemberForAll GroupId GroupMemberId Bool
-  | APIRemoveMember GroupId GroupMemberId
+  | APIAcceptMember GroupId GroupMemberId GroupMemberRole
+  | APIDeleteMemberSupportChat GroupId GroupMemberId
+  | APIMembersRole GroupId (NonEmpty GroupMemberId) GroupMemberRole
+  | APIBlockMembersForAll GroupId (NonEmpty GroupMemberId) Bool
+  | APIRemoveMembers {groupId :: GroupId, groupMemberIds :: Set GroupMemberId, withMessages :: Bool}
   | APILeaveGroup GroupId
   | APIListMembers GroupId
+  -- | APIDeleteGroupConversations GroupId (NonEmpty GroupConversationId)
+  -- | APIArchiveGroupConversations GroupId (NonEmpty GroupConversationId)
   | APIUpdateGroupProfile GroupId GroupProfile
-  | APICreateGroupLink GroupId GroupMemberRole
+  | APICreateGroupLink GroupId GroupMemberRole CreateShortLink
   | APIGroupLinkMemberRole GroupId GroupMemberRole
   | APIDeleteGroupLink GroupId
   | APIGetGroupLink GroupId
+  | APIAddGroupShortLink GroupId
   | APICreateMemberContact GroupId GroupMemberId
   | APISendMemberContactInvitation {contactId :: ContactId, msgContent_ :: Maybe MsgContent}
   | GetUserProtoServers AProtocolType
@@ -434,25 +443,26 @@ data ChatCommand
   | EnableGroupMember GroupName ContactName
   | ChatHelp HelpSection
   | Welcome
-  | APIAddContact UserId IncognitoEnabled
-  | AddContact IncognitoEnabled
+  | APIAddContact UserId CreateShortLink IncognitoEnabled
+  | AddContact CreateShortLink IncognitoEnabled
   | APISetConnectionIncognito Int64 IncognitoEnabled
   | APIChangeConnectionUser Int64 UserId -- new user id to switch connection to
-  | APIConnectPlan UserId AConnectionRequestUri
-  | APIConnect UserId IncognitoEnabled (Maybe AConnectionRequestUri)
-  | Connect IncognitoEnabled (Maybe AConnectionRequestUri)
+  | APIConnectPlan UserId AConnectionLink
+  | APIConnect UserId IncognitoEnabled (Maybe ACreatedConnLink)
+  | Connect IncognitoEnabled (Maybe AConnectionLink)
   | APIConnectContactViaAddress UserId IncognitoEnabled ContactId
   | ConnectSimplex IncognitoEnabled -- UserId (not used in UI)
   | DeleteContact ContactName ChatDeleteMode
   | ClearContact ContactName
   | APIListContacts UserId
   | ListContacts
-  | APICreateMyAddress UserId
-  | CreateMyAddress
+  | APICreateMyAddress UserId CreateShortLink
+  | CreateMyAddress CreateShortLink
   | APIDeleteMyAddress UserId
   | DeleteMyAddress
   | APIShowMyAddress UserId
   | ShowMyAddress
+  | APIAddMyAddressShortLink UserId
   | APISetProfileAddress UserId Bool
   | SetProfileAddress Bool
   | APIAddressAutoAccept UserId (Maybe AutoAccept)
@@ -462,11 +472,11 @@ data ChatCommand
   | ForwardMessage {toChatName :: ChatName, fromContactName :: ContactName, forwardedMsg :: Text}
   | ForwardGroupMessage {toChatName :: ChatName, fromGroupName :: GroupName, fromMemberName_ :: Maybe ContactName, forwardedMsg :: Text}
   | ForwardLocalMessage {toChatName :: ChatName, forwardedMsg :: Text}
-  | SendMessage ChatName Text
+  | SendMessage SendName Text
   | SendMemberContactMessage GroupName ContactName Text
   | SendLiveMessage ChatName Text
   | SendMessageQuote {contactName :: ContactName, msgDir :: AMsgDirection, quotedMsg :: Text, message :: Text}
-  | SendMessageBroadcast Text -- UserId (not used in UI)
+  | SendMessageBroadcast MsgContent -- UserId (not used in UI)
   | DeleteMessage ChatName Text
   | DeleteMemberMessage GroupName ContactName Text
   | EditMessage {chatName :: ChatName, editedMsg :: Text, message :: Text}
@@ -476,20 +486,22 @@ data ChatCommand
   | NewGroup IncognitoEnabled GroupProfile
   | AddMember GroupName ContactName GroupMemberRole
   | JoinGroup {groupName :: GroupName, enableNtfs :: MsgFilter}
+  | AcceptMember GroupName ContactName GroupMemberRole
   | MemberRole GroupName ContactName GroupMemberRole
   | BlockForAll GroupName ContactName Bool
-  | RemoveMember GroupName ContactName
+  | RemoveMembers {groupName :: GroupName, members :: Set ContactName, withMessages :: Bool}
   | LeaveGroup GroupName
   | DeleteGroup GroupName
   | ClearGroup GroupName
   | ListMembers GroupName
+  | ListMemberSupportChats GroupName
   | APIListGroups UserId (Maybe ContactId) (Maybe String)
   | ListGroups (Maybe ContactName) (Maybe String)
   | UpdateGroupNames GroupName GroupProfile
   | ShowGroupProfile GroupName
   | UpdateGroupDescription GroupName (Maybe Text)
   | ShowGroupDescription GroupName
-  | CreateGroupLink GroupName GroupMemberRole
+  | CreateGroupLink GroupName GroupMemberRole CreateShortLink
   | GroupLinkMemberRole GroupName GroupMemberRole
   | DeleteGroupLink GroupName
   | ShowGroupLink GroupName
@@ -518,6 +530,7 @@ data ChatCommand
   | SetContactFeature AChatFeature ContactName (Maybe FeatureAllowed)
   | SetGroupFeature AGroupFeatureNoRole GroupName GroupFeatureEnabled
   | SetGroupFeatureRole AGroupFeatureRole GroupName GroupFeatureEnabled (Maybe GroupMemberRole)
+  | SetGroupMemberAdmissionReview GroupName (Maybe MemberCriteria)
   | SetUserTimedMessages Bool -- UserId (not used in UI)
   | SetContactTimedMessages ContactName (Maybe TimedMessagesEnabled)
   | SetGroupTimedMessages GroupName (Maybe Int)
@@ -542,7 +555,7 @@ data ChatCommand
   | QuitChat
   | ShowVersion
   | DebugLocks
-  | DebugEvent ChatResponse
+  | DebugEvent ChatEvent
   | GetAgentSubsTotal UserId
   | GetAgentServersSummary UserId
   | ResetAgentServersStats
@@ -602,7 +615,6 @@ data ChatResponse
   | CRChatStarted
   | CRChatRunning
   | CRChatStopped
-  | CRChatSuspended
   | CRApiChats {user :: User, chats :: [AChat]}
   | CRChats {chats :: [AChat]}
   | CRApiChat {user :: User, chat :: AChat, navInfo :: Maybe NavigationInfo}
@@ -610,7 +622,6 @@ data ChatResponse
   | CRChatItems {user :: User, chatName_ :: Maybe ChatName, chatItems :: [AChatItem]}
   | CRChatItemInfo {user :: User, chatItem :: AChatItem, chatItemInfo :: ChatItemInfo}
   | CRChatItemId User (Maybe ChatItemId)
-  | CRApiParsedMarkdown {formattedText :: Maybe MarkdownList}
   | CRServerTestResult {user :: User, testServer :: AProtoServerWithAuth, testFailure :: Maybe ProtocolTestFailure}
   | CRServerOperatorConditions {conditions :: ServerOperatorConditions}
   | CRUserServers {user :: User, userServers :: [UserOperatorServers]}
@@ -623,46 +634,37 @@ data ChatResponse
   | CRGroupMemberInfo {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats_ :: Maybe ConnectionStats}
   | CRQueueInfo {user :: User, rcvMsgInfo :: Maybe RcvMsgInfo, queueInfo :: ServerQueueInfo}
   | CRContactSwitchStarted {user :: User, contact :: Contact, connectionStats :: ConnectionStats}
-  | CRGroupMemberSwitchStarted {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats :: ConnectionStats}
+  | CEvtGroupMemberSwitchStarted {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats :: ConnectionStats}
   | CRContactSwitchAborted {user :: User, contact :: Contact, connectionStats :: ConnectionStats}
-  | CRGroupMemberSwitchAborted {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats :: ConnectionStats}
-  | CRContactSwitch {user :: User, contact :: Contact, switchProgress :: SwitchProgress}
-  | CRGroupMemberSwitch {user :: User, groupInfo :: GroupInfo, member :: GroupMember, switchProgress :: SwitchProgress}
+  | CEvtGroupMemberSwitchAborted {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats :: ConnectionStats}
   | CRContactRatchetSyncStarted {user :: User, contact :: Contact, connectionStats :: ConnectionStats}
   | CRGroupMemberRatchetSyncStarted {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats :: ConnectionStats}
-  | CRContactRatchetSync {user :: User, contact :: Contact, ratchetSyncProgress :: RatchetSyncProgress}
-  | CRGroupMemberRatchetSync {user :: User, groupInfo :: GroupInfo, member :: GroupMember, ratchetSyncProgress :: RatchetSyncProgress}
-  | CRContactVerificationReset {user :: User, contact :: Contact}
-  | CRGroupMemberVerificationReset {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
   | CRContactCode {user :: User, contact :: Contact, connectionCode :: Text}
   | CRGroupMemberCode {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionCode :: Text}
   | CRConnectionVerified {user :: User, verified :: Bool, expectedCode :: Text}
   | CRTagsUpdated {user :: User, userTags :: [ChatTag], chatTags :: [ChatTagId]}
   | CRNewChatItems {user :: User, chatItems :: [AChatItem]}
-  | CRChatItemsStatusesUpdated {user :: User, chatItems :: [AChatItem]}
   | CRChatItemUpdated {user :: User, chatItem :: AChatItem}
   | CRChatItemNotChanged {user :: User, chatItem :: AChatItem}
   | CRChatItemReaction {user :: User, added :: Bool, reaction :: ACIReaction}
   | CRReactionMembers {user :: User, memberReactions :: [MemberReaction]}
   | CRChatItemsDeleted {user :: User, chatItemDeletions :: [ChatItemDeletion], byUser :: Bool, timed :: Bool}
   | CRGroupChatItemsDeleted {user :: User, groupInfo :: GroupInfo, chatItemIDs :: [ChatItemId], byUser :: Bool, member_ :: Maybe GroupMember}
-  | CRChatItemDeletedNotFound {user :: User, contact :: Contact, sharedMsgId :: SharedMsgId}
   | CRBroadcastSent {user :: User, msgContent :: MsgContent, successes :: Int, failures :: Int, timestamp :: UTCTime}
-  | CRMsgIntegrityError {user :: User, msgError :: MsgErrorType}
-  | CRCmdAccepted {corr :: CorrId}
   | CRCmdOk {user_ :: Maybe User}
   | CRChatHelp {helpSection :: HelpSection}
   | CRWelcome {user :: User}
   | CRGroupCreated {user :: User, groupInfo :: GroupInfo}
   | CRGroupMembers {user :: User, group :: Group}
+  | CRMemberSupportChats {user :: User, groupInfo :: GroupInfo, members :: [GroupMember]}
+  -- | CRGroupConversationsArchived {user :: User, groupInfo :: GroupInfo, archivedGroupConversations :: [GroupConversation]}
+  -- | CRGroupConversationsDeleted {user :: User, groupInfo :: GroupInfo, deletedGroupConversations :: [GroupConversation]}
   | CRContactsList {user :: User, contacts :: [Contact]}
   | CRUserContactLink {user :: User, contactLink :: UserContactLink}
   | CRUserContactLinkUpdated {user :: User, contactLink :: UserContactLink}
   | CRContactRequestRejected {user :: User, contactRequest :: UserContactRequest}
   | CRUserAcceptedGroupSent {user :: User, groupInfo :: GroupInfo, hostContact :: Maybe Contact}
-  | CRGroupLinkConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember}
-  | CRBusinessLinkConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember, fromContact :: Contact}
-  | CRUserDeletedMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CRUserDeletedMembers {user :: User, groupInfo :: GroupInfo, members :: [GroupMember], withMessages :: Bool}
   | CRGroupsList {user :: User, groups :: [(GroupInfo, GroupSummary)]}
   | CRSentGroupInvitation {user :: User, groupInfo :: GroupInfo, contact :: Contact, member :: GroupMember}
   | CRFileTransferStatus User (FileTransfer, [Integer]) -- TODO refactor this type to FileTransferStatus
@@ -671,143 +673,64 @@ data ChatResponse
   | CRUserProfileNoChange {user :: User}
   | CRUserPrivacy {user :: User, updatedUser :: User}
   | CRVersionInfo {versionInfo :: CoreVersionInfo, chatMigrations :: [UpMigration], agentMigrations :: [UpMigration]}
-  | CRInvitation {user :: User, connReqInvitation :: ConnReqInvitation, connection :: PendingContactConnection}
+  | CRInvitation {user :: User, connLinkInvitation :: CreatedLinkInvitation, connection :: PendingContactConnection}
   | CRConnectionIncognitoUpdated {user :: User, toConnection :: PendingContactConnection}
   | CRConnectionUserChanged {user :: User, fromConnection :: PendingContactConnection, toConnection :: PendingContactConnection, newUser :: User}
-  | CRConnectionPlan {user :: User, connectionPlan :: ConnectionPlan}
+  | CRConnectionPlan {user :: User, connLink :: ACreatedConnLink, connectionPlan :: ConnectionPlan}
   | CRSentConfirmation {user :: User, connection :: PendingContactConnection}
   | CRSentInvitation {user :: User, connection :: PendingContactConnection, customUserProfile :: Maybe Profile}
   | CRSentInvitationToContact {user :: User, contact :: Contact, customUserProfile :: Maybe Profile}
-  | CRContactUpdated {user :: User, fromContact :: Contact, toContact :: Contact}
-  | CRGroupMemberUpdated {user :: User, groupInfo :: GroupInfo, fromMember :: GroupMember, toMember :: GroupMember}
-  | CRContactsMerged {user :: User, intoContact :: Contact, mergedContact :: Contact, updatedContact :: Contact}
+  | CRItemsReadForChat {user :: User, chatInfo :: AChatInfo}
   | CRContactDeleted {user :: User, contact :: Contact}
-  | CRContactDeletedByContact {user :: User, contact :: Contact}
   | CRChatCleared {user :: User, chatInfo :: AChatInfo}
-  | CRUserContactLinkCreated {user :: User, connReqContact :: ConnReqContact}
+  | CRUserContactLinkCreated {user :: User, connLinkContact :: CreatedLinkContact}
   | CRUserContactLinkDeleted {user :: User}
-  | CRReceivedContactRequest {user :: User, contactRequest :: UserContactRequest}
   | CRAcceptingContactRequest {user :: User, contact :: Contact}
-  | CRAcceptingBusinessRequest {user :: User, groupInfo :: GroupInfo}
   | CRContactAlreadyExists {user :: User, contact :: Contact}
-  | CRContactRequestAlreadyAccepted {user :: User, contact :: Contact}
-  | CRBusinessRequestAlreadyAccepted {user :: User, groupInfo :: GroupInfo}
   | CRLeftMemberUser {user :: User, groupInfo :: GroupInfo}
   | CRGroupDeletedUser {user :: User, groupInfo :: GroupInfo}
   | CRForwardPlan {user :: User, itemsCount :: Int, chatItemIds :: [ChatItemId], forwardConfirmation :: Maybe ForwardConfirmation}
-  | CRRcvFileDescrReady {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer, rcvFileDescr :: RcvFileDescr}
   | CRRcvFileAccepted {user :: User, chatItem :: AChatItem}
+  -- TODO add chatItem :: AChatItem
   | CRRcvFileAcceptedSndCancelled {user :: User, rcvFileTransfer :: RcvFileTransfer}
   | CRStandaloneFileInfo {fileMeta :: Maybe J.Value}
   | CRRcvStandaloneFileCreated {user :: User, rcvFileTransfer :: RcvFileTransfer} -- returned by _download
-  | CRRcvFileStart {user :: User, chatItem :: AChatItem} -- sent by chats
-  | CRRcvFileProgressXFTP {user :: User, chatItem_ :: Maybe AChatItem, receivedSize :: Int64, totalSize :: Int64, rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileComplete {user :: User, chatItem :: AChatItem}
-  | CRRcvStandaloneFileComplete {user :: User, targetPath :: FilePath, rcvFileTransfer :: RcvFileTransfer}
   | CRRcvFileCancelled {user :: User, chatItem_ :: Maybe AChatItem, rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileSndCancelled {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileError {user :: User, chatItem_ :: Maybe AChatItem, agentError :: AgentErrorType, rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileWarning {user :: User, chatItem_ :: Maybe AChatItem, agentError :: AgentErrorType, rcvFileTransfer :: RcvFileTransfer}
-  | CRSndFileStart {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer}
-  | CRSndFileComplete {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer}
-  | CRSndFileRcvCancelled {user :: User, chatItem_ :: Maybe AChatItem, sndFileTransfer :: SndFileTransfer}
   | CRSndFileCancelled {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, sndFileTransfers :: [SndFileTransfer]}
   | CRSndStandaloneFileCreated {user :: User, fileTransferMeta :: FileTransferMeta} -- returned by _upload
-  | CRSndFileStartXFTP {user :: User, chatItem :: AChatItem, fileTransferMeta :: FileTransferMeta} -- not used
-  | CRSndFileProgressXFTP {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, sentSize :: Int64, totalSize :: Int64}
-  | CRSndFileRedirectStartXFTP {user :: User, fileTransferMeta :: FileTransferMeta, redirectMeta :: FileTransferMeta}
-  | CRSndFileCompleteXFTP {user :: User, chatItem :: AChatItem, fileTransferMeta :: FileTransferMeta}
-  | CRSndStandaloneFileComplete {user :: User, fileTransferMeta :: FileTransferMeta, rcvURIs :: [Text]}
-  | CRSndFileCancelledXFTP {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta}
-  | CRSndFileError {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, errorMessage :: Text}
-  | CRSndFileWarning {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, errorMessage :: Text}
   | CRUserProfileUpdated {user :: User, fromProfile :: Profile, toProfile :: Profile, updateSummary :: UserProfileUpdateSummary}
   | CRUserProfileImage {user :: User, profile :: Profile}
   | CRContactAliasUpdated {user :: User, toContact :: Contact}
   | CRGroupAliasUpdated {user :: User, toGroup :: GroupInfo}
   | CRConnectionAliasUpdated {user :: User, toConnection :: PendingContactConnection}
   | CRContactPrefsUpdated {user :: User, fromContact :: Contact, toContact :: Contact}
-  | CRContactConnecting {user :: User, contact :: Contact}
-  | CRContactConnected {user :: User, contact :: Contact, userCustomProfile :: Maybe Profile}
-  | CRContactSndReady {user :: User, contact :: Contact}
-  | CRContactAnotherClient {user :: User, contact :: Contact}
-  | CRSubscriptionEnd {user :: User, connectionEntity :: ConnectionEntity}
-  | CRContactsDisconnected {server :: SMPServer, contactRefs :: [ContactRef]}
-  | CRContactsSubscribed {server :: SMPServer, contactRefs :: [ContactRef]}
-  | CRContactSubError {user :: User, contact :: Contact, chatError :: ChatError}
-  | CRContactSubSummary {user :: User, contactSubscriptions :: [ContactSubStatus]}
-  | CRUserContactSubSummary {user :: User, userContactSubscriptions :: [UserContactSubStatus]}
-  | CRNetworkStatus {networkStatus :: NetworkStatus, connections :: [AgentConnId]}
   | CRNetworkStatuses {user_ :: Maybe User, networkStatuses :: [ConnNetworkStatus]}
-  | CRHostConnected {protocol :: AProtocolType, transportHost :: TransportHost}
-  | CRHostDisconnected {protocol :: AProtocolType, transportHost :: TransportHost}
-  | CRGroupInvitation {user :: User, groupInfo :: GroupInfo}
-  | CRReceivedGroupInvitation {user :: User, groupInfo :: GroupInfo, contact :: Contact, fromMemberRole :: GroupMemberRole, memberRole :: GroupMemberRole}
-  | CRUserJoinedGroup {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember}
   | CRJoinedGroupMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRJoinedGroupMemberConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember, member :: GroupMember}
-  | CRMemberRole {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, member :: GroupMember, fromRole :: GroupMemberRole, toRole :: GroupMemberRole}
-  | CRMemberRoleUser {user :: User, groupInfo :: GroupInfo, member :: GroupMember, fromRole :: GroupMemberRole, toRole :: GroupMemberRole}
-  | CRMemberBlockedForAll {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, member :: GroupMember, blocked :: Bool}
-  | CRMemberBlockedForAllUser {user :: User, groupInfo :: GroupInfo, member :: GroupMember, blocked :: Bool}
-  | CRConnectedToGroupMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember, memberContact :: Maybe Contact}
-  | CRDeletedMember {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, deletedMember :: GroupMember}
-  | CRDeletedMemberUser {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRLeftMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRUnknownMemberCreated {user :: User, groupInfo :: GroupInfo, forwardedByMember :: GroupMember, member :: GroupMember}
-  | CRUnknownMemberBlocked {user :: User, groupInfo :: GroupInfo, blockedByMember :: GroupMember, member :: GroupMember}
-  | CRUnknownMemberAnnounced {user :: User, groupInfo :: GroupInfo, announcingMember :: GroupMember, unknownMember :: GroupMember, announcedMember :: GroupMember}
-  | CRGroupEmpty {user :: User, groupInfo :: GroupInfo}
-  | CRGroupRemoved {user :: User, groupInfo :: GroupInfo}
-  | CRGroupDeleted {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CRMemberAccepted {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CRMemberSupportChatDeleted {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CRMembersRoleUser {user :: User, groupInfo :: GroupInfo, members :: [GroupMember], toRole :: GroupMemberRole}
+  | CRMembersBlockedForAllUser {user :: User, groupInfo :: GroupInfo, members :: [GroupMember], blocked :: Bool}
   | CRGroupUpdated {user :: User, fromGroup :: GroupInfo, toGroup :: GroupInfo, member_ :: Maybe GroupMember}
   | CRGroupProfile {user :: User, groupInfo :: GroupInfo}
   | CRGroupDescription {user :: User, groupInfo :: GroupInfo} -- only used in CLI
-  | CRGroupLinkCreated {user :: User, groupInfo :: GroupInfo, connReqContact :: ConnReqContact, memberRole :: GroupMemberRole}
-  | CRGroupLink {user :: User, groupInfo :: GroupInfo, connReqContact :: ConnReqContact, memberRole :: GroupMemberRole}
+  | CRGroupLinkCreated {user :: User, groupInfo :: GroupInfo, connLinkContact :: CreatedLinkContact, memberRole :: GroupMemberRole}
+  | CRGroupLink {user :: User, groupInfo :: GroupInfo, connLinkContact :: CreatedLinkContact, memberRole :: GroupMemberRole}
   | CRGroupLinkDeleted {user :: User, groupInfo :: GroupInfo}
-  | CRAcceptingGroupJoinRequest {user :: User, groupInfo :: GroupInfo, contact :: Contact}
-  | CRAcceptingGroupJoinRequestMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRNoMemberContactCreating {user :: User, groupInfo :: GroupInfo, member :: GroupMember} -- only used in CLI
   | CRNewMemberContact {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember}
   | CRNewMemberContactSentInv {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRNewMemberContactReceivedInv {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember}
-  | CRContactAndMemberAssociated {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember, updatedContact :: Contact}
-  | CRMemberSubError {user :: User, groupInfo :: GroupInfo, member :: GroupMember, chatError :: ChatError}
-  | CRMemberSubSummary {user :: User, memberSubscriptions :: [MemberSubStatus]}
-  | CRGroupSubscribed {user :: User, groupInfo :: GroupInfo}
-  | CRPendingSubSummary {user :: User, pendingSubscriptions :: [PendingSubStatus]}
-  | CRSndFileSubError {user :: User, sndFileTransfer :: SndFileTransfer, chatError :: ChatError}
-  | CRRcvFileSubError {user :: User, rcvFileTransfer :: RcvFileTransfer, chatError :: ChatError}
-  | CRCallInvitation {callInvitation :: RcvCallInvitation}
-  | CRCallOffer {user :: User, contact :: Contact, callType :: CallType, offer :: WebRTCSession, sharedKey :: Maybe C.Key, askConfirmation :: Bool}
-  | CRCallAnswer {user :: User, contact :: Contact, answer :: WebRTCSession}
-  | CRCallExtraInfo {user :: User, contact :: Contact, extraInfo :: WebRTCExtraInfo}
-  | CRCallEnded {user :: User, contact :: Contact}
   | CRCallInvitations {callInvitations :: [RcvCallInvitation]}
-  | CRUserContactLinkSubscribed -- TODO delete
-  | CRUserContactLinkSubError {chatError :: ChatError} -- TODO delete
   | CRNtfTokenStatus {status :: NtfTknStatus}
   | CRNtfToken {token :: DeviceToken, status :: NtfTknStatus, ntfMode :: NotificationsMode, ntfServer :: NtfServer}
   | CRNtfConns {ntfConns :: [NtfConn]}
-  | CRConnNtfMessages {receivedMsgs :: NonEmpty (Maybe NtfMsgInfo)}
-  | CRNtfMessage {user :: User, connEntity :: ConnectionEntity, ntfMessage :: NtfMsgAckInfo}
+  | CRConnNtfMessages {receivedMsgs :: NonEmpty RcvNtfMsgInfo}
   | CRContactConnectionDeleted {user :: User, connection :: PendingContactConnection}
   | CRRemoteHostList {remoteHosts :: [RemoteHostInfo]}
   | CRCurrentRemoteHost {remoteHost_ :: Maybe RemoteHostInfo}
   | CRRemoteHostStarted {remoteHost_ :: Maybe RemoteHostInfo, invitation :: Text, ctrlPort :: String, localAddrs :: NonEmpty RCCtrlAddress}
-  | CRRemoteHostSessionCode {remoteHost_ :: Maybe RemoteHostInfo, sessionCode :: Text}
-  | CRNewRemoteHost {remoteHost :: RemoteHostInfo}
-  | CRRemoteHostConnected {remoteHost :: RemoteHostInfo}
-  | CRRemoteHostStopped {remoteHostId_ :: Maybe RemoteHostId, rhsState :: RemoteHostSessionState, rhStopReason :: RemoteHostStopReason}
   | CRRemoteFileStored {remoteHostId :: RemoteHostId, remoteFileSource :: CryptoFile}
   | CRRemoteCtrlList {remoteCtrls :: [RemoteCtrlInfo]}
-  | CRRemoteCtrlFound {remoteCtrl :: RemoteCtrlInfo, ctrlAppInfo_ :: Maybe CtrlAppInfo, appVersion :: AppVersion, compatible :: Bool}
   | CRRemoteCtrlConnecting {remoteCtrl_ :: Maybe RemoteCtrlInfo, ctrlAppInfo :: CtrlAppInfo, appVersion :: AppVersion}
-  | CRRemoteCtrlSessionCode {remoteCtrl_ :: Maybe RemoteCtrlInfo, sessionCode :: Text}
   | CRRemoteCtrlConnected {remoteCtrl :: RemoteCtrlInfo}
-  | CRRemoteCtrlStopped {rcsState :: RemoteCtrlSessionState, rcStopReason :: RemoteCtrlStopReason}
-  | CRContactPQEnabled {user :: User, contact :: Contact, pqEnabled :: PQEncryption}
   | CRSQLResult {rows :: [Text]}
 #if !defined(dbPostgres)
   | CRArchiveExported {archiveErrors :: [ArchiveError]}
@@ -822,67 +745,186 @@ data ChatResponse
   | CRAgentSubs {activeSubs :: Map Text Int, pendingSubs :: Map Text Int, removedSubs :: Map Text [String]}
   | CRAgentSubsDetails {agentSubs :: SubscriptionsInfo}
   | CRAgentQueuesInfo {agentQueuesInfo :: AgentQueuesInfo}
-  | CRContactDisabled {user :: User, contact :: Contact}
-  | CRConnectionDisabled {connectionEntity :: ConnectionEntity}
-  | CRConnectionInactive {connectionEntity :: ConnectionEntity, inactive :: Bool}
-  | CRAgentRcvQueueDeleted {agentConnId :: AgentConnId, server :: SMPServer, agentQueueId :: AgentQueueId, agentError_ :: Maybe AgentErrorType}
-  | CRAgentConnDeleted {agentConnId :: AgentConnId}
-  | CRAgentUserDeleted {agentUserId :: Int64}
-  | CRMessageError {user :: User, severity :: Text, errorMessage :: Text}
-  | CRChatCmdError {user_ :: Maybe User, chatError :: ChatError}
-  | CRChatError {user_ :: Maybe User, chatError :: ChatError}
-  | CRChatErrors {user_ :: Maybe User, chatErrors :: [ChatError]}
   | CRAppSettings {appSettings :: AppSettings}
-  | CRTimedAction {action :: String, durationMilliseconds :: Int64}
   | CRCustomChatResponse {user_ :: Maybe User, response :: Text}
   deriving (Show)
 
--- some of these can only be used as command responses
-allowRemoteEvent :: ChatResponse -> Bool
+data ChatEvent
+  = CEvtChatSuspended
+  | CEvtContactSwitch {user :: User, contact :: Contact, switchProgress :: SwitchProgress}
+  | CEvtGroupMemberSwitch {user :: User, groupInfo :: GroupInfo, member :: GroupMember, switchProgress :: SwitchProgress}
+  | CEvtContactRatchetSync {user :: User, contact :: Contact, ratchetSyncProgress :: RatchetSyncProgress}
+  | CEvtGroupMemberRatchetSync {user :: User, groupInfo :: GroupInfo, member :: GroupMember, ratchetSyncProgress :: RatchetSyncProgress}
+  | CEvtNewChatItems {user :: User, chatItems :: [AChatItem]} -- there is the same command response
+  | CEvtChatItemsStatusesUpdated {user :: User, chatItems :: [AChatItem]}
+  | CEvtChatItemUpdated {user :: User, chatItem :: AChatItem} -- there is the same command response
+  | CEvtChatItemNotChanged {user :: User, chatItem :: AChatItem} -- there is the same command response
+  | CEvtChatItemReaction {user :: User, added :: Bool, reaction :: ACIReaction} -- there is the same command response
+  | CEvtGroupChatItemsDeleted {user :: User, groupInfo :: GroupInfo, chatItemIDs :: [ChatItemId], byUser :: Bool, member_ :: Maybe GroupMember} -- there is the same command response
+  | CEvtChatItemsDeleted {user :: User, chatItemDeletions :: [ChatItemDeletion], byUser :: Bool, timed :: Bool} -- there is the same command response
+  | CEvtChatItemDeletedNotFound {user :: User, contact :: Contact, sharedMsgId :: SharedMsgId}
+  | CEvtUserAcceptedGroupSent {user :: User, groupInfo :: GroupInfo, hostContact :: Maybe Contact} -- there is the same command response
+  | CEvtGroupLinkConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember}
+  | CEvtBusinessLinkConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember, fromContact :: Contact}
+  | CEvtSentGroupInvitation {user :: User, groupInfo :: GroupInfo, contact :: Contact, member :: GroupMember} -- there is the same command response
+  | CEvtContactUpdated {user :: User, fromContact :: Contact, toContact :: Contact}
+  | CEvtGroupMemberUpdated {user :: User, groupInfo :: GroupInfo, fromMember :: GroupMember, toMember :: GroupMember}
+  | CEvtContactsMerged {user :: User, intoContact :: Contact, mergedContact :: Contact, updatedContact :: Contact}
+  | CEvtContactDeletedByContact {user :: User, contact :: Contact}
+  | CEvtReceivedContactRequest {user :: User, contactRequest :: UserContactRequest}
+  | CEvtAcceptingContactRequest {user :: User, contact :: Contact} -- there is the same command response
+  | CEvtAcceptingBusinessRequest {user :: User, groupInfo :: GroupInfo}
+  | CEvtContactRequestAlreadyAccepted {user :: User, contact :: Contact}
+  | CEvtBusinessRequestAlreadyAccepted {user :: User, groupInfo :: GroupInfo}
+  | CEvtRcvFileDescrReady {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer, rcvFileDescr :: RcvFileDescr}
+  | CEvtRcvFileAccepted {user :: User, chatItem :: AChatItem} -- there is the same command response
+  -- TODO add chatItem :: AChatItem
+  | CEvtRcvFileAcceptedSndCancelled {user :: User, rcvFileTransfer :: RcvFileTransfer} -- there is the same command response
+  | CEvtRcvFileStart {user :: User, chatItem :: AChatItem} -- sent by chats
+  | CEvtRcvFileProgressXFTP {user :: User, chatItem_ :: Maybe AChatItem, receivedSize :: Int64, totalSize :: Int64, rcvFileTransfer :: RcvFileTransfer}
+  | CEvtRcvFileComplete {user :: User, chatItem :: AChatItem}
+  | CEvtRcvStandaloneFileComplete {user :: User, targetPath :: FilePath, rcvFileTransfer :: RcvFileTransfer}
+  | CEvtRcvFileSndCancelled {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer}
+  | CEvtRcvFileError {user :: User, chatItem_ :: Maybe AChatItem, agentError :: AgentErrorType, rcvFileTransfer :: RcvFileTransfer}
+  | CEvtRcvFileWarning {user :: User, chatItem_ :: Maybe AChatItem, agentError :: AgentErrorType, rcvFileTransfer :: RcvFileTransfer}
+  | CEvtSndFileStart {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer}
+  | CEvtSndFileComplete {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer}
+  | CEvtSndFileRcvCancelled {user :: User, chatItem_ :: Maybe AChatItem, sndFileTransfer :: SndFileTransfer}
+  | CEvtSndFileStartXFTP {user :: User, chatItem :: AChatItem, fileTransferMeta :: FileTransferMeta} -- not used
+  | CEvtSndFileProgressXFTP {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, sentSize :: Int64, totalSize :: Int64}
+  | CEvtSndFileRedirectStartXFTP {user :: User, fileTransferMeta :: FileTransferMeta, redirectMeta :: FileTransferMeta}
+  | CEvtSndFileCompleteXFTP {user :: User, chatItem :: AChatItem, fileTransferMeta :: FileTransferMeta}
+  | CEvtSndStandaloneFileComplete {user :: User, fileTransferMeta :: FileTransferMeta, rcvURIs :: [Text]}
+  | CEvtSndFileCancelledXFTP {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta}
+  | CEvtSndFileError {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, errorMessage :: Text}
+  | CEvtSndFileWarning {user :: User, chatItem_ :: Maybe AChatItem, fileTransferMeta :: FileTransferMeta, errorMessage :: Text}
+  | CEvtContactConnecting {user :: User, contact :: Contact}
+  | CEvtContactConnected {user :: User, contact :: Contact, userCustomProfile :: Maybe Profile}
+  | CEvtContactSndReady {user :: User, contact :: Contact}
+  | CEvtContactAnotherClient {user :: User, contact :: Contact}
+  | CEvtSubscriptionEnd {user :: User, connectionEntity :: ConnectionEntity}
+  | CEvtContactsDisconnected {server :: SMPServer, contactRefs :: [ContactRef]}
+  | CEvtContactsSubscribed {server :: SMPServer, contactRefs :: [ContactRef]}
+  | CEvtContactSubError {user :: User, contact :: Contact, chatError :: ChatError}
+  | CEvtContactSubSummary {user :: User, contactSubscriptions :: [ContactSubStatus]}
+  | CEvtUserContactSubSummary {user :: User, userContactSubscriptions :: [UserContactSubStatus]}
+  | CEvtNetworkStatus {networkStatus :: NetworkStatus, connections :: [AgentConnId]}
+  | CEvtNetworkStatuses {user_ :: Maybe User, networkStatuses :: [ConnNetworkStatus]} -- there is the same command response
+  | CEvtHostConnected {protocol :: AProtocolType, transportHost :: TransportHost}
+  | CEvtHostDisconnected {protocol :: AProtocolType, transportHost :: TransportHost}
+  | CEvtReceivedGroupInvitation {user :: User, groupInfo :: GroupInfo, contact :: Contact, fromMemberRole :: GroupMemberRole, memberRole :: GroupMemberRole}
+  | CEvtUserJoinedGroup {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember}
+  | CEvtJoinedGroupMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember} -- there is the same command response
+  | CEvtJoinedGroupMemberConnecting {user :: User, groupInfo :: GroupInfo, hostMember :: GroupMember, member :: GroupMember}
+  | CEvtMemberAcceptedByOther {user :: User, groupInfo :: GroupInfo, acceptingMember :: GroupMember, member :: GroupMember}
+  | CEvtMemberRole {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, member :: GroupMember, fromRole :: GroupMemberRole, toRole :: GroupMemberRole}
+  | CEvtMemberBlockedForAll {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, member :: GroupMember, blocked :: Bool}
+  | CEvtConnectedToGroupMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember, memberContact :: Maybe Contact}
+  | CEvtDeletedMember {user :: User, groupInfo :: GroupInfo, byMember :: GroupMember, deletedMember :: GroupMember, withMessages :: Bool}
+  | CEvtDeletedMemberUser {user :: User, groupInfo :: GroupInfo, member :: GroupMember, withMessages :: Bool}
+  | CEvtLeftMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CEvtUnknownMemberCreated {user :: User, groupInfo :: GroupInfo, forwardedByMember :: GroupMember, member :: GroupMember}
+  | CEvtUnknownMemberBlocked {user :: User, groupInfo :: GroupInfo, blockedByMember :: GroupMember, member :: GroupMember}
+  | CEvtUnknownMemberAnnounced {user :: User, groupInfo :: GroupInfo, announcingMember :: GroupMember, unknownMember :: GroupMember, announcedMember :: GroupMember}
+  | CEvtGroupDeleted {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CEvtGroupUpdated {user :: User, fromGroup :: GroupInfo, toGroup :: GroupInfo, member_ :: Maybe GroupMember} -- there is the same command response
+  | CEvtAcceptingGroupJoinRequestMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | CEvtNoMemberContactCreating {user :: User, groupInfo :: GroupInfo, member :: GroupMember} -- only used in CLI
+  | CEvtNewMemberContactReceivedInv {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember}
+  | CEvtContactAndMemberAssociated {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember, updatedContact :: Contact}
+  | CEvtCallInvitation {callInvitation :: RcvCallInvitation}
+  | CEvtCallOffer {user :: User, contact :: Contact, callType :: CallType, offer :: WebRTCSession, sharedKey :: Maybe C.Key, askConfirmation :: Bool}
+  | CEvtCallAnswer {user :: User, contact :: Contact, answer :: WebRTCSession}
+  | CEvtCallExtraInfo {user :: User, contact :: Contact, extraInfo :: WebRTCExtraInfo}
+  | CEvtCallEnded {user :: User, contact :: Contact}
+  | CEvtNtfMessage {user :: User, connEntity :: ConnectionEntity, ntfMessage :: NtfMsgAckInfo}
+  | CEvtRemoteHostSessionCode {remoteHost_ :: Maybe RemoteHostInfo, sessionCode :: Text}
+  | CEvtNewRemoteHost {remoteHost :: RemoteHostInfo}
+  | CEvtRemoteHostConnected {remoteHost :: RemoteHostInfo}
+  | CEvtRemoteHostStopped {remoteHostId_ :: Maybe RemoteHostId, rhsState :: RemoteHostSessionState, rhStopReason :: RemoteHostStopReason}
+  | CEvtRemoteCtrlFound {remoteCtrl :: RemoteCtrlInfo, ctrlAppInfo_ :: Maybe CtrlAppInfo, appVersion :: AppVersion, compatible :: Bool}
+  | CEvtRemoteCtrlSessionCode {remoteCtrl_ :: Maybe RemoteCtrlInfo, sessionCode :: Text}
+  | CEvtRemoteCtrlStopped {rcsState :: RemoteCtrlSessionState, rcStopReason :: RemoteCtrlStopReason}
+  | CEvtContactPQEnabled {user :: User, contact :: Contact, pqEnabled :: PQEncryption}
+  | CEvtContactDisabled {user :: User, contact :: Contact}
+  | CEvtConnectionDisabled {connectionEntity :: ConnectionEntity}
+  | CEvtConnectionInactive {connectionEntity :: ConnectionEntity, inactive :: Bool}
+  | CEvtAgentRcvQueuesDeleted {deletedRcvQueues :: NonEmpty DeletedRcvQueue}
+  | CEvtAgentConnsDeleted {agentConnIds :: NonEmpty AgentConnId}
+  | CEvtAgentUserDeleted {agentUserId :: Int64}
+  | CEvtMessageError {user :: User, severity :: Text, errorMessage :: Text}
+  | CEvtChatErrors {chatErrors :: [ChatError]}
+  | CEvtTimedAction {action :: String, durationMilliseconds :: Int64}
+  | CEvtTerminalEvent TerminalEvent
+  | CEvtCustomChatEvent {user_ :: Maybe User, response :: Text}
+  deriving (Show)
+
+data TerminalEvent
+  = TEGroupLinkRejected {user :: User, groupInfo :: GroupInfo, groupRejectionReason :: GroupRejectionReason}
+  | TERejectingGroupJoinRequestMember {user :: User, groupInfo :: GroupInfo, member :: GroupMember, groupRejectionReason :: GroupRejectionReason}
+  | TENewMemberContact {user :: User, contact :: Contact, groupInfo :: GroupInfo, member :: GroupMember}
+  | TEContactVerificationReset {user :: User, contact :: Contact}
+  | TEGroupMemberVerificationReset {user :: User, groupInfo :: GroupInfo, member :: GroupMember}
+  | TEGroupEmpty {user :: User, shortGroupInfo :: ShortGroupInfo}
+  | TEGroupSubscribed {user :: User, shortGroupInfo :: ShortGroupInfo}
+  | TEGroupInvitation {user :: User, shortGroupInfo :: ShortGroupInfo}
+  | TEMemberSubError {user :: User, shortGroupInfo :: ShortGroupInfo, memberToSubscribe :: ShortGroupMember, chatError :: ChatError}
+  | TEMemberSubSummary {user :: User, memberSubscriptions :: [MemberSubStatus]}
+  | TEPendingSubSummary {user :: User, pendingSubscriptions :: [PendingSubStatus]}
+  | TESndFileSubError {user :: User, sndFileTransfer :: SndFileTransfer, chatError :: ChatError}
+  | TERcvFileSubError {user :: User, rcvFileTransfer :: RcvFileTransfer, chatError :: ChatError}
+  deriving (Show)
+
+data DeletedRcvQueue = DeletedRcvQueue
+  { agentConnId :: AgentConnId,
+    server :: SMPServer,
+    agentQueueId :: AgentQueueId,
+    agentError_ :: Maybe AgentErrorType
+  }
+  deriving (Show)
+
+allowRemoteEvent :: ChatEvent -> Bool
 allowRemoteEvent = \case
-  CRChatStarted -> False
-  CRChatRunning -> False
-  CRChatStopped -> False
-  CRChatSuspended -> False
-  CRRemoteHostList _ -> False
-  CRCurrentRemoteHost _ -> False
-  CRRemoteHostStarted {} -> False
-  CRRemoteHostSessionCode {} -> False
-  CRNewRemoteHost _ -> False
-  CRRemoteHostConnected _ -> False
-  CRRemoteHostStopped {} -> False
-  CRRemoteFileStored {} -> False
-  CRRemoteCtrlList _ -> False
-  CRRemoteCtrlFound {} -> False
-  CRRemoteCtrlConnecting {} -> False
-  CRRemoteCtrlSessionCode {} -> False
-  CRRemoteCtrlConnected _ -> False
-  CRRemoteCtrlStopped {} -> False
-  CRSQLResult _ -> False
-#if !defined(dbPostgres)
-  CRSlowSQLQueries {} -> False
-#endif
+  CEvtChatSuspended -> False
+  CEvtRemoteHostSessionCode {} -> False
+  CEvtNewRemoteHost _ -> False
+  CEvtRemoteHostConnected _ -> False
+  CEvtRemoteHostStopped {} -> False
+  CEvtRemoteCtrlFound {} -> False
+  CEvtRemoteCtrlSessionCode {} -> False
+  CEvtRemoteCtrlStopped {} -> False
   _ -> True
 
-logResponseToFile :: ChatResponse -> Bool
-logResponseToFile = \case
-  CRContactsDisconnected {} -> True
-  CRContactsSubscribed {} -> True
-  CRContactSubError {} -> True
-  CRMemberSubError {} -> True
-  CRSndFileSubError {} -> True
-  CRRcvFileSubError {} -> True
-  CRHostConnected {} -> True
-  CRHostDisconnected {} -> True
-  CRConnectionDisabled {} -> True
-  CRAgentRcvQueueDeleted {} -> True
-  CRAgentConnDeleted {} -> True
-  CRAgentUserDeleted {} -> True
-  CRChatCmdError {} -> True
-  CRChatError {} -> True
-  CRMessageError {} -> True
+logEventToFile :: ChatEvent -> Bool
+logEventToFile = \case
+  CEvtContactsDisconnected {} -> True
+  CEvtContactsSubscribed {} -> True
+  CEvtContactSubError {} -> True
+  CEvtHostConnected {} -> True
+  CEvtHostDisconnected {} -> True
+  CEvtConnectionDisabled {} -> True
+  CEvtAgentRcvQueuesDeleted {} -> True
+  CEvtAgentConnsDeleted {} -> True
+  CEvtAgentUserDeleted {} -> True
+  -- CRChatCmdError {} -> True -- TODO this should be separately logged to file as command error
+  CEvtMessageError {} -> True
+  CEvtTerminalEvent te -> case te of
+    TEMemberSubError {} -> True
+    TESndFileSubError {} -> True
+    TERcvFileSubError {} -> True
+    _ -> False
   _ -> False
 
+data SendRef
+  = SRDirect ContactId
+  | SRGroup GroupId (Maybe GroupChatScope)
+  deriving (Eq, Show)
+
+sendToChatRef :: SendRef -> ChatRef
+sendToChatRef = \case
+  SRDirect cId -> ChatRef CTDirect cId Nothing
+  SRGroup gId scope -> ChatRef CTGroup gId scope
+
 data ChatPagination
   = CPLast Int
   | CPAfter ChatItemId Int
@@ -915,6 +957,7 @@ data ConnectionPlan
   = CPInvitationLink {invitationLinkPlan :: InvitationLinkPlan}
   | CPContactAddress {contactAddressPlan :: ContactAddressPlan}
   | CPGroupLink {groupLinkPlan :: GroupLinkPlan}
+  | CPError {chatError :: ChatError}
   deriving (Show)
 
 data InvitationLinkPlan
@@ -958,6 +1001,7 @@ connectionPlanProceed = \case
     GLPOwnLink _ -> True
     GLPConnectingConfirmReconnect -> True
     _ -> False
+  CPError _ -> True
 
 data ForwardConfirmation
   = FCFilesNotAccepted {fileIds :: [FileTransferId]}
@@ -1024,7 +1068,7 @@ data SimpleNetCfg = SimpleNetCfg
     requiredHostMode :: Bool,
     smpProxyMode_ :: Maybe SMPProxyMode,
     smpProxyFallback_ :: Maybe SMPProxyFallback,
-    smpWebPort :: Bool,
+    smpWebPortServers :: SMPWebPortServers,
     tcpTimeout_ :: Maybe Int,
     logTLSErrors :: Bool
   }
@@ -1039,7 +1083,7 @@ defaultSimpleNetCfg =
       requiredHostMode = False,
       smpProxyMode_ = Nothing,
       smpProxyFallback_ = Nothing,
-      smpWebPort = False,
+      smpWebPortServers = SWPPreset,
       tcpTimeout_ = Nothing,
       logTLSErrors = False
     }
@@ -1051,7 +1095,7 @@ data ContactSubStatus = ContactSubStatus
   deriving (Show)
 
 data MemberSubStatus = MemberSubStatus
-  { member :: GroupMember,
+  { member :: ShortGroupMember,
     memberError :: Maybe ChatError
   }
   deriving (Show)
@@ -1078,22 +1122,16 @@ data UserProfileUpdateSummary = UserProfileUpdateSummary
 data ComposedMessage = ComposedMessage
   { fileSource :: Maybe CryptoFile,
     quotedItemId :: Maybe ChatItemId,
-    msgContent :: MsgContent
+    msgContent :: MsgContent,
+    mentions :: Map MemberName GroupMemberId
   }
   deriving (Show)
 
--- This instance is needed for backward compatibility, can be removed in v6.0
-instance FromJSON ComposedMessage where
-  parseJSON (J.Object v) = do
-    fileSource <-
-      (v .:? "fileSource") >>= \case
-        Nothing -> CF.plain <$$> (v .:? "filePath")
-        f -> pure f
-    quotedItemId <- v .:? "quotedItemId"
-    msgContent <- v .: "msgContent"
-    pure ComposedMessage {fileSource, quotedItemId, msgContent}
-  parseJSON invalid =
-    JT.prependFailure "bad ComposedMessage, " (JT.typeMismatch "Object" invalid)
+data UpdatedMessage = UpdatedMessage
+  { msgContent :: MsgContent,
+    mentions :: Map MemberName GroupMemberId
+  }
+  deriving (Show)
 
 data ChatTagData = ChatTagData
   { emoji :: Maybe Text,
@@ -1106,17 +1144,30 @@ instance FromJSON ChatTagData where
   parseJSON invalid = JT.prependFailure "bad ChatTagData, " (JT.typeMismatch "Object" invalid)
 
 data NtfConn = NtfConn
-  { user_ :: Maybe User,
-    connEntity_ :: Maybe ConnectionEntity,
+  { user :: User,
+    agentConnId :: AgentConnId,
+    agentDbQueueId :: Int64,
+    connEntity :: ConnectionEntity,
+    -- Decrypted ntf meta of the expected message (the one notification was sent for).
+    -- Nothing means it failed to decrypt or to decode, we can still show event for entity
     expectedMsg_ :: Maybe NtfMsgInfo
   }
   deriving (Show)
 
+-- msgTs is broker message timestamp, it is used in ConnMsgReq / APIGetConnNtfMessages
+-- to set it as last connection message in case queue is empty
 data NtfMsgInfo = NtfMsgInfo {msgId :: Text, msgTs :: UTCTime}
   deriving (Show)
 
-receivedMsgInfo :: SMPMsgMeta -> NtfMsgInfo
-receivedMsgInfo SMPMsgMeta {msgId, msgTs} = ntfMsgInfo_ msgId msgTs
+data RcvNtfMsgInfo
+  = RNMInfo {ntfMsgInfo :: Maybe NtfMsgInfo}
+  | RNMError {ntfMsgError :: AgentErrorType}
+  deriving (Show)
+
+receivedMsgInfo :: Either AgentErrorType (Maybe SMPMsgMeta) -> RcvNtfMsgInfo
+receivedMsgInfo = \case
+  Right msgMeta_ -> RNMInfo $ (\SMPMsgMeta {msgId, msgTs} -> ntfMsgInfo_ msgId msgTs) <$> msgMeta_
+  Left e -> RNMError e
 
 expectedMsgInfo :: NMsgMeta -> NtfMsgInfo
 expectedMsgInfo NMsgMeta {msgId, msgTs} = ntfMsgInfo_ msgId msgTs
@@ -1227,8 +1278,8 @@ data ChatErrorType
   | CEChatNotStarted
   | CEChatNotStopped
   | CEChatStoreChanged
-  | CEConnectionPlan {connectionPlan :: ConnectionPlan}
   | CEInvalidConnReq
+  | CEUnsupportedConnReq
   | CEInvalidChatMessage {connection :: Connection, msgMeta :: Maybe MsgMetaJSON, messageData :: Text, message :: String}
   | CEContactNotFound {contactName :: ContactName, suspectedMember :: Maybe (GroupInfo, GroupMember)}
   | CEContactNotReady {contact :: Contact}
@@ -1266,7 +1317,6 @@ data ChatErrorType
   | CEFileNotApproved {fileId :: FileTransferId, unknownServers :: [XFTPServer]}
   | CEFallbackToSMPProhibited {fileId :: FileTransferId}
   | CEInlineFileProhibited {fileId :: FileTransferId}
-  | CEInvalidQuote
   | CEInvalidForward
   | CEInvalidChatItemUpdate
   | CEInvalidChatItemDelete
@@ -1365,7 +1415,7 @@ data RemoteCtrlSession
       { remoteCtrlId_ :: Maybe RemoteCtrlId,
         ctrlDeviceName :: Text,
         rcsClient :: RCCtrlClient,
-        tls :: TLS,
+        tls :: TLS 'TClient,
         sessionCode :: Text,
         rcsWaitSession :: Async (),
         rcsWaitConfirmation :: TMVar (Either RCErrorType (RCCtrlSession, RCCtrlPairing))
@@ -1373,10 +1423,10 @@ data RemoteCtrlSession
   | RCSessionConnected
       { remoteCtrlId :: RemoteCtrlId,
         rcsClient :: RCCtrlClient,
-        tls :: TLS,
+        tls :: TLS 'TClient,
         rcsSession :: RCCtrlSession,
         http2Server :: Async (),
-        remoteOutputQ :: TBQueue ChatResponse
+        remoteOutputQ :: TBQueue (Either ChatError ChatEvent)
       }
 
 data RemoteCtrlSessionState
@@ -1475,27 +1525,51 @@ mkStoreError :: SomeException -> StoreError
 mkStoreError = SEInternalError . show
 {-# INLINE mkStoreError #-}
 
-chatCmdError :: Maybe User -> String -> ChatResponse
-chatCmdError user = CRChatCmdError user . ChatError . CECommandError
+throwCmdError :: String -> CM a
+throwCmdError = throwError . ChatError . CECommandError
+{-# INLINE throwCmdError #-}
+
+chatCmdError :: String -> Either ChatError ChatResponse
+chatCmdError = Left . ChatError . CECommandError
+{-# INLINE chatCmdError #-}
 
 throwChatError :: ChatErrorType -> CM a
 throwChatError = throwError . ChatError
+{-# INLINE throwChatError #-}
+
+toViewTE :: TerminalEvent -> CM ()
+toViewTE = toView . CEvtTerminalEvent
+{-# INLINE toViewTE #-}
 
 -- | Emit local events.
-toView :: ChatResponse -> CM ()
+toView :: ChatEvent -> CM ()
 toView = lift . toView'
 {-# INLINE toView #-}
 
-toView' :: ChatResponse -> CM' ()
-toView' ev = do
+toView' :: ChatEvent -> CM' ()
+toView' = toView_ . Right
+{-# INLINE toView' #-}
+
+eToView :: ChatError -> CM ()
+eToView = lift . eToView'
+{-# INLINE eToView #-}
+
+eToView' :: ChatError -> CM' ()
+eToView' = toView_ . Left
+{-# INLINE eToView' #-}
+
+toView_ :: Either ChatError ChatEvent -> CM' ()
+toView_ ev = do
   cc@ChatController {outputQ = localQ, remoteCtrlSession = session, config = ChatConfig {chatHooks}} <- ask
-  event <- liftIO $ eventHook chatHooks cc ev
+  event <- case eventHook chatHooks of
+    Just hook -> liftIO $ hook cc ev
+    Nothing -> pure ev
   atomically $
     readTVar session >>= \case
       Just (_, RCSessionConnected {remoteOutputQ})
-        | allowRemoteEvent event -> writeTBQueue remoteOutputQ event
+        | either (const True) allowRemoteEvent event -> writeTBQueue remoteOutputQ event
       -- TODO potentially, it should hold some events while connecting
-      _ -> writeTBQueue localQ (Nothing, Nothing, event)
+      _ -> writeTBQueue localQ (Nothing, event)
 
 withStore' :: (DB.Connection -> IO a) -> CM a
 withStore' action = withStore $ liftIO . action
@@ -1524,7 +1598,7 @@ withStoreBatch actions = do
   liftIO $ withTransaction chatStore $ mapM (`E.catches` handleDBErrors) . actions
 
 -- TODO [postgres] postgres specific error handling
-handleDBErrors :: [E.Handler IO (Either ChatError a)]
+handleDBErrors :: [E.Handler (Either ChatError a)]
 handleDBErrors =
 #if !defined(dbPostgres)
   ( E.Handler $ \(e :: SQLError) ->
@@ -1558,8 +1632,6 @@ $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CAP") ''ContactAddressPlan)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "GLP") ''GroupLinkPlan)
 
-$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CP") ''ConnectionPlan)
-
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "FC") ''ForwardConfirmation)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CE") ''ChatErrorType)
@@ -1574,6 +1646,8 @@ $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "DB") ''DatabaseError)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "Chat") ''ChatError)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CP") ''ConnectionPlan)
+
 $(JQ.deriveJSON defaultJSON ''AppFilePathsConfig)
 
 $(JQ.deriveJSON defaultJSON ''ContactSubStatus)
@@ -1590,6 +1664,8 @@ $(JQ.deriveJSON defaultJSON ''UserProfileUpdateSummary)
 
 $(JQ.deriveJSON defaultJSON ''NtfMsgInfo)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "RNM") ''RcvNtfMsgInfo)
+
 $(JQ.deriveJSON defaultJSON ''NtfConn)
 
 $(JQ.deriveJSON defaultJSON ''NtfMsgAckInfo)
@@ -1598,6 +1674,8 @@ $(JQ.deriveJSON defaultJSON ''SwitchProgress)
 
 $(JQ.deriveJSON defaultJSON ''RatchetSyncProgress)
 
+$(JQ.deriveJSON defaultJSON ''DeletedRcvQueue)
+
 $(JQ.deriveJSON defaultJSON ''ServerAddress)
 
 $(JQ.deriveJSON defaultJSON ''ParsedServerAddress)
@@ -1610,29 +1688,6 @@ $(JQ.deriveJSON defaultJSON ''CoreVersionInfo)
 $(JQ.deriveJSON defaultJSON ''SlowSQLQuery)
 #endif
 
--- instance ProtocolTypeI p => FromJSON (ProtoServersConfig p) where
---   parseJSON = $(JQ.mkParseJSON defaultJSON ''ProtoServersConfig)
-
--- instance ProtocolTypeI p => FromJSON (UserProtoServers p) where
---   parseJSON = $(JQ.mkParseJSON defaultJSON ''UserProtoServers)
-
--- instance ProtocolTypeI p => ToJSON (UserProtoServers p) where
---   toJSON = $(JQ.mkToJSON defaultJSON ''UserProtoServers)
---   toEncoding = $(JQ.mkToEncoding defaultJSON ''UserProtoServers)
-
--- instance FromJSON AUserProtoServers where
---   parseJSON v = J.withObject "AUserProtoServers" parse v
---     where
---       parse o = do
---         AProtocolType (p :: SProtocolType p) <- o .: "serverProtocol"
---         case userProtocol p of
---           Just Dict -> AUPS <$> J.parseJSON @(UserProtoServers p) v
---           Nothing -> fail $ "AUserProtoServers: unsupported protocol " <> show p
-
--- instance ToJSON AUserProtoServers where
---   toJSON (AUPS s) = $(JQ.mkToJSON defaultJSON ''UserProtoServers) s
---   toEncoding (AUPS s) = $(JQ.mkToEncoding defaultJSON ''UserProtoServers) s
-
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "RCS") ''RemoteCtrlSessionState)
 
 $(JQ.deriveJSON defaultJSON ''RemoteCtrlInfo)
@@ -1641,12 +1696,31 @@ $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "RCSR") ''RemoteCtrlStopReason)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "RHSR") ''RemoteHostStopReason)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "TE") ''TerminalEvent)
+
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CR") ''ChatResponse)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CEvt") ''ChatEvent)
+
 $(JQ.deriveFromJSON defaultJSON ''ArchiveConfig)
 
 $(JQ.deriveFromJSON defaultJSON ''DBEncryptionConfig)
 
 $(JQ.deriveToJSON defaultJSON ''ComposedMessage)
 
+instance FromJSON ComposedMessage where
+  parseJSON (J.Object v) = do
+    fileSource <-
+      (v .:? "fileSource") >>= \case
+        Nothing -> CF.plain <$$> (v .:? "filePath")
+        f -> pure f
+    quotedItemId <- v .:? "quotedItemId"
+    msgContent <- v .: "msgContent"
+    mentions <- fromMaybe M.empty <$> v .:? "mentions"
+    pure ComposedMessage {fileSource, quotedItemId, msgContent, mentions}
+  parseJSON invalid =
+    JT.prependFailure "bad ComposedMessage, " (JT.typeMismatch "Object" invalid)
+
+$(JQ.deriveJSON defaultJSON ''UpdatedMessage)
+
 $(JQ.deriveToJSON defaultJSON ''ChatTagData)
diff --git a/src/Simplex/Chat/Core.hs b/src/Simplex/Chat/Core.hs
index 0dbee1542e..865eb6a760 100644
--- a/src/Simplex/Chat/Core.hs
+++ b/src/Simplex/Chat/Core.hs
@@ -8,6 +8,7 @@ module Simplex.Chat.Core
     runSimplexChat,
     sendChatCmdStr,
     sendChatCmd,
+    printResponseEvent,
   )
 where
 
@@ -23,9 +24,10 @@ import Simplex.Chat
 import Simplex.Chat.Controller
 import Simplex.Chat.Library.Commands
 import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..))
+import Simplex.Chat.Remote.Types (RemoteHostId)
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
-import Simplex.Chat.View (serializeChatResponse)
+import Simplex.Chat.View (ChatResponseEvent, serializeChatError, serializeChatResponse)
 import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation (..))
 import Simplex.Messaging.Agent.Store.Common (DBStore, withTransaction)
 import System.Exit (exitFailure)
@@ -34,7 +36,7 @@ import Text.Read (readMaybe)
 import UnliftIO.Async
 
 simplexChatCore :: ChatConfig -> ChatOpts -> (User -> ChatController -> IO ()) -> IO ()
-simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {coreOptions = CoreChatOpts {dbOptions, logAgent, yesToUpMigrations}} chat =
+simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {coreOptions = CoreChatOpts {dbOptions, logAgent, yesToUpMigrations}, maintenance} chat =
   case logAgent of
     Just level -> do
       setLogLevel level
@@ -48,7 +50,8 @@ simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {core
       exitFailure
     run db@ChatDatabase {chatStore} = do
       u_ <- getSelectActiveUser chatStore
-      cc <- newChatController db u_ cfg opts False
+      let backgroundMode = not maintenance
+      cc <- newChatController db u_ cfg opts backgroundMode
       u <- maybe (createActiveUser cc) pure u_
       unless testView $ putStrLn $ "Current user: " <> userStr u
       runSimplexChat opts u cc chat
@@ -61,10 +64,10 @@ runSimplexChat ChatOpts {maintenance} u cc chat
       a2 <- async $ chat u cc
       waitEither_ a1 a2
 
-sendChatCmdStr :: ChatController -> String -> IO ChatResponse
+sendChatCmdStr :: ChatController -> String -> IO (Either ChatError ChatResponse)
 sendChatCmdStr cc s = runReaderT (execChatCommand Nothing . encodeUtf8 $ T.pack s) cc
 
-sendChatCmd :: ChatController -> ChatCommand -> IO ChatResponse
+sendChatCmd :: ChatController -> ChatCommand -> IO (Either ChatError ChatResponse)
 sendChatCmd cc cmd = runReaderT (execChatCommand' cmd) cc
 
 getSelectActiveUser :: DBStore -> IO (Maybe User)
@@ -106,12 +109,17 @@ createActiveUser cc = do
       displayName <- T.pack <$> getWithPrompt "display name"
       let profile = Just Profile {displayName, fullName = "", image = Nothing, contactLink = Nothing, preferences = Nothing}
       execChatCommand' (CreateActiveUser NewUser {profile, pastTimestamp = False}) `runReaderT` cc >>= \case
-        CRActiveUser user -> pure user
-        r -> do
-          ts <- getCurrentTime
-          tz <- getCurrentTimeZone
-          putStrLn $ serializeChatResponse (Nothing, Nothing) ts tz Nothing r
-          loop
+        Right (CRActiveUser user) -> pure user
+        r -> printResponseEvent (Nothing, Nothing) (config cc) r >> loop
+
+printResponseEvent :: ChatResponseEvent r => (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Either ChatError r -> IO ()
+printResponseEvent hu cfg = \case
+  Right r -> do
+    ts <- getCurrentTime
+    tz <- getCurrentTimeZone
+    putStrLn $ serializeChatResponse hu cfg ts tz (fst hu) r
+  Left e -> do
+    putStrLn $ serializeChatError True cfg e
 
 getWithPrompt :: String -> IO String
 getWithPrompt s = putStr (s <> ": ") >> hFlush stdout >> getLine
diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index b8bf879caa..1653c33aaa 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -27,6 +27,7 @@ import Control.Monad.Reader
 import qualified Data.Aeson as J
 import Data.Attoparsec.ByteString.Char8 (Parser)
 import qualified Data.Attoparsec.ByteString.Char8 as A
+import qualified Data.Attoparsec.Combinator as A
 import qualified Data.ByteString.Base64 as B64
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -37,12 +38,13 @@ import Data.Either (fromRight, partitionEithers, rights)
 import Data.Foldable (foldr')
 import Data.Functor (($>))
 import Data.Int (Int64)
-import Data.List (find, foldl', isSuffixOf, partition, sortOn, zipWith4)
+import Data.List (dropWhileEnd, find, foldl', isSuffixOf, partition, sortOn, zipWith4)
 import Data.List.NonEmpty (NonEmpty (..))
 import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, listToMaybe, mapMaybe, maybeToList)
+import qualified Data.Set as S
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
@@ -80,17 +82,18 @@ import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
-import Simplex.Chat.Util (liftIOEither)
+import Simplex.Chat.Util (liftIOEither, zipWith3')
 import qualified Simplex.Chat.Util as U
 import Simplex.FileTransfer.Description (FileDescriptionURI (..), maxFileSize, maxFileSizeHard)
 import Simplex.Messaging.Agent as Agent
 import Simplex.Messaging.Agent.Env.SQLite (ServerCfg (..), ServerRoles (..), allRoles)
 import Simplex.Messaging.Agent.Protocol
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Agent.Store.Interface (execSQL)
 import Simplex.Messaging.Agent.Store.Shared (upMigration)
 import qualified Simplex.Messaging.Agent.Store.DB as DB
-import qualified Simplex.Messaging.Agent.Store.Migrations as Migrations
-import Simplex.Messaging.Client (NetworkConfig (..), SocksMode (SMAlways), textToHostMode)
+import Simplex.Messaging.Agent.Store.Interface (getCurrentMigrations)
+import Simplex.Messaging.Client (NetworkConfig (..), SMPWebPortServers (..), SocksMode (SMAlways), textToHostMode)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..))
 import qualified Simplex.Messaging.Crypto.File as CF
@@ -131,9 +134,9 @@ import Simplex.Messaging.Agent.Store.SQLite.DB (SlowQueryStats (..))
 
 _defaultNtfServers :: [NtfServer]
 _defaultNtfServers =
-  [ "ntf://FB-Uop7RTaZZEG0ZLD2CIaTjsPh-Fw0zFAnb7QyA8Ks=@ntf2.simplex.im,5ex3mupcazy3zlky64ab27phjhijpemsiby33qzq3pliejipbtx5xgad.onion"
-  -- "ntf://KmpZNNXiVZJx_G2T7jRUmDFxWXM3OAnunz3uLT0tqAA=@ntf3.simplex.im,pxculznuryunjdvtvh6s6szmanyadumpbmvevgdpe4wk5c65unyt4yid.onion",
-  -- "ntf://CJ5o7X6fCxj2FFYRU2KuCo70y4jSqz7td2HYhLnXWbU=@ntf4.simplex.im,wtvuhdj26jwprmomnyfu5wfuq2hjkzfcc72u44vi6gdhrwxldt6xauad.onion"
+  [ -- "ntf://FB-Uop7RTaZZEG0ZLD2CIaTjsPh-Fw0zFAnb7QyA8Ks=@ntf2.simplex.im,5ex3mupcazy3zlky64ab27phjhijpemsiby33qzq3pliejipbtx5xgad.onion"
+    "ntf://KmpZNNXiVZJx_G2T7jRUmDFxWXM3OAnunz3uLT0tqAA=@ntf3.simplex.im,pxculznuryunjdvtvh6s6szmanyadumpbmvevgdpe4wk5c65unyt4yid.onion",
+    "ntf://CJ5o7X6fCxj2FFYRU2KuCo70y4jSqz7td2HYhLnXWbU=@ntf4.simplex.im,wtvuhdj26jwprmomnyfu5wfuq2hjkzfcc72u44vi6gdhrwxldt6xauad.onion"
   ]
 
 maxImageSize :: Integer
@@ -195,7 +198,7 @@ startChatController mainApp enableSndFiles = do
       startExpireCIThread user
       setExpireCIFlag user True
       where
-        shouldExpireChats = 
+        shouldExpireChats =
           fmap (fromRight False) $ runExceptT $ withStore' $ \db -> do
             ttl <- getChatItemTTL db user
             ttlCount <- getChatTTLCount db user
@@ -224,8 +227,8 @@ startReceiveUserFiles :: User -> CM ()
 startReceiveUserFiles user = do
   filesToReceive <- withStore' (`getRcvFilesToReceive` user)
   forM_ filesToReceive $ \ft ->
-    flip catchChatError (toView . CRChatError (Just user)) $
-      toView =<< receiveFile' user ft False Nothing Nothing
+    flip catchChatError eToView $
+      toView =<< receiveFileEvt' user ft False Nothing Nothing
 
 restoreCalls :: CM' ()
 restoreCalls = do
@@ -254,11 +257,11 @@ stopChatController ChatController {smpAgent, agentAsync = s, sndFiles, rcvFiles,
       atomically $ writeTVar files M.empty
 
 updateNetworkConfig :: NetworkConfig -> SimpleNetCfg -> NetworkConfig
-updateNetworkConfig cfg SimpleNetCfg {socksProxy, socksMode, hostMode, requiredHostMode, smpProxyMode_, smpProxyFallback_, smpWebPort, tcpTimeout_, logTLSErrors} =
+updateNetworkConfig cfg SimpleNetCfg {socksProxy, socksMode, hostMode, requiredHostMode, smpProxyMode_, smpProxyFallback_, smpWebPortServers, tcpTimeout_, logTLSErrors} =
   let cfg1 = maybe cfg (\smpProxyMode -> cfg {smpProxyMode}) smpProxyMode_
       cfg2 = maybe cfg1 (\smpProxyFallback -> cfg1 {smpProxyFallback}) smpProxyFallback_
       cfg3 = maybe cfg2 (\tcpTimeout -> cfg2 {tcpTimeout, tcpConnectTimeout = (tcpTimeout * 3) `div` 2}) tcpTimeout_
-   in cfg3 {socksProxy, socksMode, hostMode, requiredHostMode, smpWebPort, logTLSErrors}
+   in cfg3 {socksProxy, socksMode, hostMode, requiredHostMode, smpWebPortServers, logTLSErrors}
 
 useServers :: Foldable f => RandomAgentServers -> [(Text, ServerOperator)] -> f UserOperatorServers -> (NonEmpty (ServerCfg 'PSMP), NonEmpty (ServerCfg 'PXFTP))
 useServers as opDomains uss =
@@ -266,30 +269,28 @@ useServers as opDomains uss =
       xftp' = useServerCfgs SPXFTP as opDomains $ concatMap (servers' SPXFTP) uss
    in (smp', xftp')
 
-execChatCommand :: Maybe RemoteHostId -> ByteString -> CM' ChatResponse
-execChatCommand rh s = do
-  u <- readTVarIO =<< asks currentUser
+execChatCommand :: Maybe RemoteHostId -> ByteString -> CM' (Either ChatError ChatResponse)
+execChatCommand rh s =
   case parseChatCommand s of
-    Left e -> pure $ chatCmdError u e
+    Left e -> pure $ chatCmdError e
     Right cmd -> case rh of
       Just rhId
-        | allowRemoteCommand cmd -> execRemoteCommand u rhId cmd s
-        | otherwise -> pure $ CRChatCmdError u $ ChatErrorRemoteHost (RHId rhId) $ RHELocalCommand
+        | allowRemoteCommand cmd -> execRemoteCommand rhId cmd s
+        | otherwise -> pure $ Left $ ChatErrorRemoteHost (RHId rhId) $ RHELocalCommand
       _ -> do
         cc@ChatController {config = ChatConfig {chatHooks}} <- ask
-        liftIO (preCmdHook chatHooks cc cmd) >>= either pure (execChatCommand_ u)
+        case preCmdHook chatHooks of
+          Just hook -> liftIO (hook cc cmd) >>= either pure execChatCommand'
+          Nothing -> execChatCommand' cmd
 
-execChatCommand' :: ChatCommand -> CM' ChatResponse
-execChatCommand' cmd = asks currentUser >>= readTVarIO >>= (`execChatCommand_` cmd)
+execChatCommand' :: ChatCommand -> CM' (Either ChatError ChatResponse)
+execChatCommand' cmd = handleCommandError $ processChatCommand cmd
 
-execChatCommand_ :: Maybe User -> ChatCommand -> CM' ChatResponse
-execChatCommand_ u cmd = handleCommandError u $ processChatCommand cmd
+execRemoteCommand :: RemoteHostId -> ChatCommand -> ByteString -> CM' (Either ChatError ChatResponse)
+execRemoteCommand rhId cmd s = handleCommandError $ getRemoteHostClient rhId >>= \rh -> processRemoteCommand rhId rh cmd s
 
-execRemoteCommand :: Maybe User -> RemoteHostId -> ChatCommand -> ByteString -> CM' ChatResponse
-execRemoteCommand u rhId cmd s = handleCommandError u $ getRemoteHostClient rhId >>= \rh -> processRemoteCommand rhId rh cmd s
-
-handleCommandError :: Maybe User -> CM ChatResponse -> CM' ChatResponse
-handleCommandError u a = either (CRChatCmdError u) id <$> (runExceptT a `E.catches` ioErrors)
+handleCommandError :: CM ChatResponse -> CM' (Either ChatError ChatResponse)
+handleCommandError a = runExceptT a `E.catches` ioErrors
   where
     ioErrors =
       [ E.Handler $ \(e :: ExitCode) -> E.throwIO e,
@@ -499,23 +500,23 @@ processChatCommand' vr = \case
     pure $ CRChatTags user tags
   APIGetChats {userId, pendingConnections, pagination, query} -> withUserId' userId $ \user -> do
     (errs, previews) <- partitionEithers <$> withFastStore' (\db -> getChatPreviews db vr user pendingConnections pagination query)
-    unless (null errs) $ toView $ CRChatErrors (Just user) (map ChatErrorStore errs)
+    unless (null errs) $ toView $ CEvtChatErrors (map ChatErrorStore errs)
     pure $ CRApiChats user previews
-  APIGetChat (ChatRef cType cId) contentFilter pagination search -> withUser $ \user -> case cType of
+  APIGetChat (ChatRef cType cId scope_) contentFilter pagination search -> withUser $ \user -> case cType of
     -- TODO optimize queries calculating ChatStats, currently they're disabled
     CTDirect -> do
-      when (isJust contentFilter) $ throwChatError $ CECommandError "content filter not supported"
+      when (isJust contentFilter) $ throwCmdError "content filter not supported"
       (directChat, navInfo) <- withFastStore (\db -> getDirectChat db vr user cId pagination search)
       pure $ CRApiChat user (AChat SCTDirect directChat) navInfo
     CTGroup -> do
-      (groupChat, navInfo) <- withFastStore (\db -> getGroupChat db vr user cId contentFilter pagination search)
+      (groupChat, navInfo) <- withFastStore (\db -> getGroupChat db vr user cId scope_ contentFilter pagination search)
       pure $ CRApiChat user (AChat SCTGroup groupChat) navInfo
     CTLocal -> do
-      when (isJust contentFilter) $ throwChatError $ CECommandError "content filter not supported"
+      when (isJust contentFilter) $ throwCmdError "content filter not supported"
       (localChat, navInfo) <- withFastStore (\db -> getLocalChat db user cId pagination search)
       pure $ CRApiChat user (AChat SCTLocal localChat) navInfo
-    CTContactRequest -> pure $ chatCmdError (Just user) "not implemented"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+    CTContactRequest -> throwCmdError "not implemented"
+    CTContactConnection -> throwCmdError "not supported"
   APIGetChatItems pagination search -> withUser $ \user -> do
     chatItems <- withFastStore $ \db -> getAllChatItems db vr user pagination search
     pure $ CRChatItems user Nothing chatItems
@@ -532,31 +533,33 @@ processChatCommand' vr = \case
       getForwardedFromItem :: User -> ChatItem c d -> CM (Maybe AChatItem)
       getForwardedFromItem user ChatItem {meta = CIMeta {itemForwarded}} = case itemForwarded of
         Just (CIFFContact _ _ (Just ctId) (Just fwdItemId)) ->
-          Just <$> withFastStore (\db -> getAChatItem db vr user (ChatRef CTDirect ctId) fwdItemId)
+          Just <$> withFastStore (\db -> getAChatItem db vr user (ChatRef CTDirect ctId Nothing) fwdItemId)
         Just (CIFFGroup _ _ (Just gId) (Just fwdItemId)) ->
-          Just <$> withFastStore (\db -> getAChatItem db vr user (ChatRef CTGroup gId) fwdItemId)
+          -- TODO [knocking] getAChatItem doesn't differentiate how to read based on scope - it should, instead of using group filter
+          Just <$> withFastStore (\db -> getAChatItem db vr user (ChatRef CTGroup gId Nothing) fwdItemId)
         _ -> pure Nothing
-  APISendMessages (ChatRef cType chatId) live itemTTL cms -> withUser $ \user -> mapM_ assertAllowedContent' cms >> case cType of
-    CTDirect ->
+  APISendMessages sendRef live itemTTL cms -> withUser $ \user -> mapM_ assertAllowedContent' cms >> case sendRef of
+    SRDirect chatId -> do
+      mapM_ assertNoMentions cms
       withContactLock "sendMessage" chatId $
-        sendContactContentMessages user chatId live itemTTL (L.map (,Nothing) cms)
-    CTGroup ->
-      withGroupLock "sendMessage" chatId $
-        sendGroupContentMessages user chatId live itemTTL (L.map (,Nothing) cms)
-    CTLocal -> pure $ chatCmdError (Just user) "not supported"
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+        sendContactContentMessages user chatId live itemTTL (L.map composedMessageReq cms)
+    SRGroup chatId gsScope ->
+      withGroupLock "sendMessage" chatId $ do
+        (gInfo, cmrs) <- withFastStore $ \db -> do
+          g <- getGroupInfo db vr user chatId
+          (g,) <$> mapM (composedMessageReqMentions db user g) cms
+        sendGroupContentMessages user gInfo gsScope live itemTTL cmrs
   APICreateChatTag (ChatTagData emoji text) -> withUser $ \user -> withFastStore' $ \db -> do
     _ <- createChatTag db user emoji text
     CRChatTags user <$> getUserChatTags db user
-  APISetChatTags (ChatRef cType chatId) tagIds -> withUser $ \user -> withFastStore' $ \db -> case cType of
-    CTDirect -> do
+  APISetChatTags (ChatRef cType chatId scope) tagIds -> withUser $ \user -> case cType of
+    CTDirect -> withFastStore' $ \db -> do
       updateDirectChatTags db chatId (maybe [] L.toList tagIds)
       CRTagsUpdated user <$> getUserChatTags db user <*> getDirectChatTags db chatId
-    CTGroup -> do
+    CTGroup | isNothing scope -> withFastStore' $ \db -> do
       updateGroupChatTags db chatId (maybe [] L.toList tagIds)
       CRTagsUpdated user <$> getUserChatTags db user <*> getGroupChatTags db chatId
-    _ -> pure $ chatCmdError (Just user) "not supported"
+    _ -> throwCmdError "not supported"
   APIDeleteChatTag tagId -> withUser $ \user -> do
     withFastStore' $ \db -> deleteChatTag db user tagId
     ok user
@@ -567,28 +570,22 @@ processChatCommand' vr = \case
     withFastStore' $ \db -> reorderChatTags db user $ L.toList tagIds
     ok user
   APICreateChatItems folderId cms -> withUser $ \user -> do
-    mapM_ assertAllowedContent' cms
-    createNoteFolderContentItems user folderId (L.map (,Nothing) cms)
+    forM_ cms $ \cm -> assertAllowedContent' cm >> assertNoMentions cm
+    createNoteFolderContentItems user folderId (L.map composedMessageReq cms)
   APIReportMessage gId reportedItemId reportReason reportText -> withUser $ \user ->
     withGroupLock "reportMessage" gId $ do
-      (gInfo, ms) <-
-        withFastStore $ \db -> do
-          gInfo <- getGroupInfo db vr user gId
-          (gInfo,) <$> liftIO (getGroupModerators db vr user gInfo)
-      let ms' = filter compatibleModerator ms
-          mc = MCReport reportText reportReason
-          cm = ComposedMessage {fileSource = Nothing, quotedItemId = Just reportedItemId, msgContent = mc}
-      when (null ms') $ throwChatError $ CECommandError "no moderators support receiving reports"
-      sendGroupContentMessages_ user gInfo ms' False Nothing [(cm, Nothing)]
-    where
-      compatibleModerator GroupMember {activeConn, memberChatVRange} =
-        maxVersion (maybe memberChatVRange peerChatVRange activeConn) >= contentReportsVersion
+      gInfo <- withFastStore $ \db -> getGroupInfo db vr user gId
+      let mc = MCReport reportText reportReason
+          cm = ComposedMessage {fileSource = Nothing, quotedItemId = Just reportedItemId, msgContent = mc, mentions = M.empty}
+      -- TODO [knocking] reports sent to support scope may be wrong
+      sendGroupContentMessages user gInfo (Just $ GCSMemberSupport Nothing) False Nothing [composedMessageReq cm]
   ReportMessage {groupName, contactName_, reportReason, reportedMessage} -> withUser $ \user -> do
     gId <- withFastStore $ \db -> getGroupIdByName db user groupName
     reportedItemId <- withFastStore $ \db -> getGroupChatItemIdByText db user gId contactName_ reportedMessage
     processChatCommand $ APIReportMessage gId reportedItemId reportReason ""
-  APIUpdateChatItem (ChatRef cType chatId) itemId live mc -> withUser $ \user -> assertAllowedContent mc >> case cType of
+  APIUpdateChatItem (ChatRef cType chatId scope) itemId live (UpdatedMessage mc mentions) -> withUser $ \user -> assertAllowedContent mc >> case cType of
     CTDirect -> withContactLock "updateChatItem" chatId $ do
+      unless (null mentions) $ throwCmdError "mentions are not supported in this chat"
       ct@Contact {contactId} <- withFastStore $ \db -> getContact db vr user chatId
       assertDirectAllowed user MDSnd ct XMsgUpdate_
       cci <- withFastStore $ \db -> getDirectCIWithReactions db user ct itemId
@@ -599,45 +596,55 @@ processChatCommand' vr = \case
               let changed = mc /= oldMC
               if changed || fromMaybe False itemLive
                 then do
-                  (SndMessage {msgId}, _) <- sendDirectContactMessage user ct (XMsgUpdate itemSharedMId mc (ttl' <$> itemTimed) (justTrue . (live &&) =<< itemLive))
+                  let event = XMsgUpdate itemSharedMId mc M.empty (ttl' <$> itemTimed) (justTrue . (live &&) =<< itemLive) Nothing
+                  (SndMessage {msgId}, _) <- sendDirectContactMessage user ct event
                   ci' <- withFastStore' $ \db -> do
                     currentTs <- liftIO getCurrentTime
                     when changed $
                       addInitialAndNewCIVersions db itemId (chatItemTs' ci, oldMC) (currentTs, mc)
                     let edited = itemLive /= Just True
                     updateDirectChatItem' db user contactId ci (CISndMsgContent mc) edited live Nothing $ Just msgId
-                  startUpdatedTimedItemThread user (ChatRef CTDirect contactId) ci ci'
+                  startUpdatedTimedItemThread user (ChatRef CTDirect contactId Nothing) ci ci'
                   pure $ CRChatItemUpdated user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci')
                 else pure $ CRChatItemNotChanged user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
             _ -> throwChatError CEInvalidChatItemUpdate
         CChatItem SMDRcv _ -> throwChatError CEInvalidChatItemUpdate
     CTGroup -> withGroupLock "updateChatItem" chatId $ do
-      Group gInfo@GroupInfo {groupId, membership} ms <- withFastStore $ \db -> getGroup db vr user chatId
-      assertUserGroupRole gInfo GRAuthor
-      if prohibitedSimplexLinks gInfo membership mc
-        then pure $ chatCmdError (Just user) ("feature not allowed " <> T.unpack (groupFeatureNameText GFSimplexLinks))
+      gInfo@GroupInfo {groupId, membership} <- withFastStore $ \db -> getGroupInfo db vr user chatId
+      when (isNothing scope) $ assertUserGroupRole gInfo GRAuthor
+      let (_, ft_) = msgContentTexts mc
+      if prohibitedSimplexLinks gInfo membership ft_
+        then throwCmdError ("feature not allowed " <> T.unpack (groupFeatureNameText GFSimplexLinks))
         else do
+          -- TODO [knocking] check chat item scope?
           cci <- withFastStore $ \db -> getGroupCIWithReactions db user gInfo itemId
           case cci of
             CChatItem SMDSnd ci@ChatItem {meta = CIMeta {itemSharedMsgId, itemTimed, itemLive, editable}, content = ciContent} -> do
               case (ciContent, itemSharedMsgId, editable) of
                 (CISndMsgContent oldMC, Just itemSharedMId, True) -> do
+                  (chatScopeInfo, recipients) <- getGroupRecipients vr user gInfo scope groupKnockingVersion
                   let changed = mc /= oldMC
                   if changed || fromMaybe False itemLive
                     then do
-                      SndMessage {msgId} <- sendGroupMessage user gInfo ms (XMsgUpdate itemSharedMId mc (ttl' <$> itemTimed) (justTrue . (live &&) =<< itemLive))
+                      ciMentions <- withFastStore $ \db -> getCIMentions db user gInfo ft_ mentions
+                      let msgScope = toMsgScope gInfo <$> chatScopeInfo
+                          mentions' = M.map (\CIMention {memberId} -> MsgMention {memberId}) ciMentions
+                          event = XMsgUpdate itemSharedMId mc mentions' (ttl' <$> itemTimed) (justTrue . (live &&) =<< itemLive) msgScope
+                      SndMessage {msgId} <- sendGroupMessage user gInfo scope recipients event
                       ci' <- withFastStore' $ \db -> do
                         currentTs <- liftIO getCurrentTime
                         when changed $
                           addInitialAndNewCIVersions db itemId (chatItemTs' ci, oldMC) (currentTs, mc)
                         let edited = itemLive /= Just True
-                        updateGroupChatItem db user groupId ci (CISndMsgContent mc) edited live $ Just msgId
-                      startUpdatedTimedItemThread user (ChatRef CTGroup groupId) ci ci'
-                      pure $ CRChatItemUpdated user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci')
-                    else pure $ CRChatItemNotChanged user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci)
+                        ci' <- updateGroupChatItem db user groupId ci (CISndMsgContent mc) edited live $ Just msgId
+                        updateGroupCIMentions db gInfo ci' ciMentions
+                      startUpdatedTimedItemThread user (ChatRef CTGroup groupId scope) ci ci'
+                      pure $ CRChatItemUpdated user (AChatItem SCTGroup SMDSnd (GroupChat gInfo chatScopeInfo) ci')
+                    else pure $ CRChatItemNotChanged user (AChatItem SCTGroup SMDSnd (GroupChat gInfo chatScopeInfo) ci)
                 _ -> throwChatError CEInvalidChatItemUpdate
             CChatItem SMDRcv _ -> throwChatError CEInvalidChatItemUpdate
     CTLocal -> do
+      unless (null mentions) $ throwCmdError "mentions are not supported in this chat"
       (nf@NoteFolder {noteFolderId}, cci) <- withFastStore $ \db -> (,) <$> getNoteFolder db user chatId <*> getLocalChatItem db user chatId itemId
       case cci of
         CChatItem SMDSnd ci@ChatItem {content = CISndMsgContent oldMC}
@@ -648,14 +655,14 @@ processChatCommand' vr = \case
               ci' <- updateLocalChatItem' db user noteFolderId ci (CISndMsgContent mc) True
               pure $ CRChatItemUpdated user (AChatItem SCTLocal SMDSnd (LocalChat nf) ci')
         _ -> throwChatError CEInvalidChatItemUpdate
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
-  APIDeleteChatItem (ChatRef cType chatId) itemIds mode -> withUser $ \user -> case cType of
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
+  APIDeleteChatItem (ChatRef cType chatId scope) itemIds mode -> withUser $ \user -> case cType of
     CTDirect -> withContactLock "deleteChatItem" chatId $ do
       (ct, items) <- getCommandDirectChatItems user chatId itemIds
-      case mode of
-        CIDMInternal -> deleteDirectCIs user ct items True False
-        CIDMInternalMark -> markDirectCIsDeleted user ct items True =<< liftIO getCurrentTime
+      deletions <- case mode of
+        CIDMInternal -> deleteDirectCIs user ct items
+        CIDMInternalMark -> markDirectCIsDeleted user ct items =<< liftIO getCurrentTime
         CIDMBroadcast -> do
           assertDeletable items
           assertDirectAllowed user MDSnd ct XMsgDel_
@@ -664,26 +671,33 @@ processChatCommand' vr = \case
           forM_ (L.nonEmpty events) $ \events' ->
             sendDirectContactMessages user ct events'
           if featureAllowed SCFFullDelete forUser ct
-            then deleteDirectCIs user ct items True False
-            else markDirectCIsDeleted user ct items True =<< liftIO getCurrentTime
+            then deleteDirectCIs user ct items
+            else markDirectCIsDeleted user ct items =<< liftIO getCurrentTime
+      pure $ CRChatItemsDeleted user deletions True False
     CTGroup -> withGroupLock "deleteChatItem" chatId $ do
       (gInfo, items) <- getCommandGroupChatItems user chatId itemIds
-      ms <- withFastStore' $ \db -> getGroupMembers db vr user gInfo
-      case mode of
-        CIDMInternal -> deleteGroupCIs user gInfo items True False Nothing =<< liftIO getCurrentTime
-        CIDMInternalMark -> markGroupCIsDeleted user gInfo items True Nothing =<< liftIO getCurrentTime
+      -- TODO [knocking] check scope for all items?
+      deletions <- case mode of
+        CIDMInternal -> do
+          chatScopeInfo <- mapM (getChatScopeInfo vr user) scope
+          deleteGroupCIs user gInfo chatScopeInfo items Nothing =<< liftIO getCurrentTime
+        CIDMInternalMark -> do
+          chatScopeInfo <- mapM (getChatScopeInfo vr user) scope
+          markGroupCIsDeleted user gInfo chatScopeInfo items Nothing =<< liftIO getCurrentTime
         CIDMBroadcast -> do
+          (chatScopeInfo, recipients) <- getGroupRecipients vr user gInfo scope groupKnockingVersion
           assertDeletable items
           assertUserGroupRole gInfo GRObserver -- can still delete messages sent earlier
           let msgIds = itemsMsgIds items
               events = L.nonEmpty $ map (`XMsgDel` Nothing) msgIds
-          mapM_ (sendGroupMessages user gInfo ms) events
-          delGroupChatItems user gInfo items Nothing
+          mapM_ (sendGroupMessages user gInfo Nothing recipients) events
+          delGroupChatItems user gInfo chatScopeInfo items False
+      pure $ CRChatItemsDeleted user deletions True False
     CTLocal -> do
       (nf, items) <- getCommandLocalChatItems user chatId itemIds
       deleteLocalCIs user nf items True False
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
     where
       assertDeletable :: forall c. ChatTypeI c => [CChatItem c] -> CM ()
       assertDeletable items = do
@@ -699,41 +713,43 @@ processChatCommand' vr = \case
       itemsMsgIds :: [CChatItem c] -> [SharedMsgId]
       itemsMsgIds = mapMaybe (\(CChatItem _ ChatItem {meta = CIMeta {itemSharedMsgId}}) -> itemSharedMsgId)
   APIDeleteMemberChatItem gId itemIds -> withUser $ \user -> withGroupLock "deleteChatItem" gId $ do
-    (gInfo@GroupInfo {membership}, items) <- getCommandGroupChatItems user gId itemIds
+    (gInfo, items) <- getCommandGroupChatItems user gId itemIds
+    -- TODO [knocking] check scope is Nothing for all items? (prohibit moderation in support chats?)
     ms <- withFastStore' $ \db -> getGroupMembers db vr user gInfo
-    assertDeletable gInfo items
-    assertUserGroupRole gInfo GRAdmin -- TODO GRModerator when most users migrate
-    let msgMemIds = itemsMsgMemIds gInfo items
-        events = L.nonEmpty $ map (\(msgId, memId) -> XMsgDel msgId (Just memId)) msgMemIds
-    mapM_ (sendGroupMessages user gInfo ms) events
-    delGroupChatItems user gInfo items (Just membership)
+    let recipients = filter memberCurrent ms
+    deletions <- delGroupChatItemsForMembers user gInfo Nothing recipients items
+    pure $ CRChatItemsDeleted user deletions True False
+  APIArchiveReceivedReports gId -> withUser $ \user -> withFastStore $ \db -> do
+    g <- getGroupInfo db vr user gId
+    deleteTs <- liftIO getCurrentTime
+    ciIds <- liftIO $ markReceivedGroupReportsDeleted db user g deleteTs
+    pure $ CRGroupChatItemsDeleted user g ciIds True (Just $ membership g)
+  APIDeleteReceivedReports gId itemIds mode -> withUser $ \user -> withGroupLock "deleteReports" gId $ do
+    (gInfo, items) <- getCommandGroupChatItems user gId itemIds
+    unless (all isRcvReport items) $ throwCmdError "some items are not received reports"
+    -- TODO [knocking] scope can be different for each item if reports are from different members
+    -- TODO            (currently we pass Nothing as scope which is wrong)
+    deletions <- case mode of
+      CIDMInternal -> deleteGroupCIs user gInfo Nothing items Nothing =<< liftIO getCurrentTime
+      CIDMInternalMark -> markGroupCIsDeleted user gInfo Nothing items Nothing =<< liftIO getCurrentTime
+      CIDMBroadcast -> do
+        ms <- withFastStore' $ \db -> getGroupModerators db vr user gInfo
+        let recipients = filter memberCurrent ms
+        delGroupChatItemsForMembers user gInfo Nothing recipients items
+    pure $ CRChatItemsDeleted user deletions True False
     where
-      assertDeletable :: GroupInfo -> [CChatItem 'CTGroup] -> CM ()
-      assertDeletable GroupInfo {membership = GroupMember {memberRole = membershipMemRole}} items =
-        unless (all itemDeletable items) $ throwChatError CEInvalidChatItemDelete
-        where
-          itemDeletable :: CChatItem 'CTGroup -> Bool
-          itemDeletable (CChatItem _ ChatItem {chatDir, meta = CIMeta {itemSharedMsgId}}) =
-            case chatDir of
-              CIGroupRcv GroupMember {memberRole} -> membershipMemRole >= memberRole && isJust itemSharedMsgId
-              CIGroupSnd -> isJust itemSharedMsgId
-      itemsMsgMemIds :: GroupInfo -> [CChatItem 'CTGroup] -> [(SharedMsgId, MemberId)]
-      itemsMsgMemIds GroupInfo {membership = GroupMember {memberId = membershipMemId}} = mapMaybe itemMsgMemIds
-        where
-          itemMsgMemIds :: CChatItem 'CTGroup -> Maybe (SharedMsgId, MemberId)
-          itemMsgMemIds (CChatItem _ ChatItem {chatDir, meta = CIMeta {itemSharedMsgId}}) =
-            join <$> forM itemSharedMsgId $ \msgId -> Just $ case chatDir of
-              CIGroupRcv GroupMember {memberId} -> (msgId, memberId)
-              CIGroupSnd -> (msgId, membershipMemId)
-  APIChatItemReaction (ChatRef cType chatId) itemId add reaction -> withUser $ \user -> case cType of
+      isRcvReport = \case
+        CChatItem _ ChatItem {content = CIRcvMsgContent (MCReport {})} -> True
+        _ -> False
+  APIChatItemReaction (ChatRef cType chatId scope) itemId add reaction -> withUser $ \user -> case cType of
     CTDirect ->
       withContactLock "chatItemReaction" chatId $
         withFastStore (\db -> (,) <$> getContact db vr user chatId <*> getDirectChatItem db user chatId itemId) >>= \case
           (ct, CChatItem md ci@ChatItem {meta = CIMeta {itemSharedMsgId = Just itemSharedMId}}) -> do
             unless (featureAllowed SCFReactions forUser ct) $
-              throwChatError (CECommandError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFReactions))
+              throwCmdError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFReactions)
             unless (ciReactionAllowed ci) $
-              throwChatError (CECommandError "reaction not allowed - chat item has no content")
+              throwCmdError "reaction not allowed - chat item has no content"
             rs <- withFastStore' $ \db -> getDirectReactions db ct itemSharedMId True
             checkReactionAllowed rs
             (SndMessage {msgId}, _) <- sendDirectContactMessage user ct $ XMsgReact itemSharedMId Nothing reaction add
@@ -744,47 +760,53 @@ processChatCommand' vr = \case
             let ci' = CChatItem md ci {reactions}
                 r = ACIReaction SCTDirect SMDSnd (DirectChat ct) $ CIReaction CIDirectSnd ci' createdAt reaction
             pure $ CRChatItemReaction user add r
-          _ -> throwChatError $ CECommandError "reaction not possible - no shared item ID"
+          _ -> throwCmdError "reaction not possible - no shared item ID"
     CTGroup ->
-      withGroupLock "chatItemReaction" chatId $
-        withFastStore (\db -> (,) <$> getGroup db vr user chatId <*> getGroupChatItem db user chatId itemId) >>= \case
-          (Group g@GroupInfo {membership} ms, CChatItem md ci@ChatItem {meta = CIMeta {itemSharedMsgId = Just itemSharedMId}}) -> do
+      withGroupLock "chatItemReaction" chatId $ do
+        -- TODO [knocking] check chat item scope?
+        (g@GroupInfo {membership}, CChatItem md ci) <- withFastStore $ \db -> do
+          g <- getGroupInfo db vr user chatId
+          (g,) <$> getGroupCIWithReactions db user g itemId
+        (chatScopeInfo, recipients) <- getGroupRecipients vr user g scope groupKnockingVersion
+        case ci of
+          ChatItem {meta = CIMeta {itemSharedMsgId = Just itemSharedMId}} -> do
             unless (groupFeatureAllowed SGFReactions g) $
-              throwChatError (CECommandError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFReactions))
+              throwCmdError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFReactions)
             unless (ciReactionAllowed ci) $
-              throwChatError (CECommandError "reaction not allowed - chat item has no content")
+              throwCmdError "reaction not allowed - chat item has no content"
             let GroupMember {memberId = itemMemberId} = chatItemMember g ci
             rs <- withFastStore' $ \db -> getGroupReactions db g membership itemMemberId itemSharedMId True
             checkReactionAllowed rs
-            SndMessage {msgId} <- sendGroupMessage user g ms (XMsgReact itemSharedMId (Just itemMemberId) reaction add)
+            SndMessage {msgId} <- sendGroupMessage user g scope recipients (XMsgReact itemSharedMId (Just itemMemberId) reaction add)
             createdAt <- liftIO getCurrentTime
             reactions <- withFastStore' $ \db -> do
               setGroupReaction db g membership itemMemberId itemSharedMId True reaction add msgId createdAt
               liftIO $ getGroupCIReactions db g itemMemberId itemSharedMId
             let ci' = CChatItem md ci {reactions}
-                r = ACIReaction SCTGroup SMDSnd (GroupChat g) $ CIReaction CIGroupSnd ci' createdAt reaction
+                r = ACIReaction SCTGroup SMDSnd (GroupChat g chatScopeInfo) $ CIReaction CIGroupSnd ci' createdAt reaction
             pure $ CRChatItemReaction user add r
-          _ -> throwChatError $ CECommandError "reaction not possible - no shared item ID"
-    CTLocal -> pure $ chatCmdError (Just user) "not supported"
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+          _ -> throwCmdError "invalid reaction"
+    CTLocal -> throwCmdError "not supported"
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
     where
       checkReactionAllowed rs = do
         when ((reaction `elem` rs) == add) $
-          throwChatError (CECommandError $ "reaction already " <> if add then "added" else "removed")
+          throwCmdError $ "reaction already " <> if add then "added" else "removed"
         when (add && length rs >= maxMsgReactions) $
-          throwChatError (CECommandError "too many reactions")
+          throwCmdError "too many reactions"
   APIGetReactionMembers userId groupId itemId reaction -> withUserId userId $ \user -> do
     memberReactions <- withStore $ \db -> do
       CChatItem _ ChatItem {meta = CIMeta {itemSharedMsgId = Just itemSharedMId}} <- getGroupChatItem db user groupId itemId
       liftIO $ getReactionMembers db vr user groupId itemSharedMId reaction
     pure $ CRReactionMembers user memberReactions
-  APIPlanForwardChatItems (ChatRef fromCType fromChatId) itemIds -> withUser $ \user -> case fromCType of
+  -- TODO [knocking] forward from scope?
+  APIPlanForwardChatItems (ChatRef fromCType fromChatId _scope) itemIds -> withUser $ \user -> case fromCType of
     CTDirect -> planForward user . snd =<< getCommandDirectChatItems user fromChatId itemIds
     CTGroup -> planForward user . snd =<< getCommandGroupChatItems user fromChatId itemIds
     CTLocal -> planForward user . snd =<< getCommandLocalChatItems user fromChatId itemIds
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
     where
       planForward :: User -> [CChatItem c] -> CM ChatResponse
       planForward user items = do
@@ -825,7 +847,8 @@ processChatCommand' vr = \case
                 MCFile t -> t /= ""
                 MCReport {} -> True
                 MCUnknown {} -> True
-  APIForwardChatItems (ChatRef toCType toChatId) (ChatRef fromCType fromChatId) itemIds itemTTL -> withUser $ \user -> case toCType of
+  -- TODO [knocking] forward from / to scope
+  APIForwardChatItems toChat@(ChatRef toCType toChatId toScope) fromChat@(ChatRef fromCType fromChatId _fromScope) itemIds itemTTL -> withUser $ \user -> case toCType of
     CTDirect -> do
       cmrs <- prepareForward user
       case L.nonEmpty cmrs of
@@ -837,8 +860,9 @@ processChatCommand' vr = \case
       cmrs <- prepareForward user
       case L.nonEmpty cmrs of
         Just cmrs' ->
-          withGroupLock "forwardChatItem, to group" toChatId $
-            sendGroupContentMessages user toChatId False itemTTL cmrs'
+          withGroupLock "forwardChatItem, to group" toChatId $ do
+            gInfo <- withFastStore $ \db -> getGroupInfo db vr user toChatId
+            sendGroupContentMessages user gInfo toScope False itemTTL cmrs'
         Nothing -> pure $ CRNewChatItems user []
     CTLocal -> do
       cmrs <- prepareForward user
@@ -846,34 +870,40 @@ processChatCommand' vr = \case
         Just cmrs' ->
           createNoteFolderContentItems user toChatId cmrs'
         Nothing -> pure $ CRNewChatItems user []
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
     where
-      prepareForward :: User -> CM [ComposeMessageReq]
+      prepareForward :: User -> CM [ComposedMessageReq]
       prepareForward user = case fromCType of
         CTDirect -> withContactLock "forwardChatItem, from contact" fromChatId $ do
           (ct, items) <- getCommandDirectChatItems user fromChatId itemIds
           catMaybes <$> mapM (\ci -> ciComposeMsgReq ct ci <$$> prepareMsgReq ci) items
           where
-            ciComposeMsgReq :: Contact -> CChatItem 'CTDirect -> (MsgContent, Maybe CryptoFile) -> ComposeMessageReq
+            ciComposeMsgReq :: Contact -> CChatItem 'CTDirect -> (MsgContent, Maybe CryptoFile) -> ComposedMessageReq
             ciComposeMsgReq ct (CChatItem md ci) (mc', file) =
               let itemId = chatItemId' ci
                   ciff = forwardCIFF ci $ Just (CIFFContact (forwardName ct) (toMsgDirection md) (Just fromChatId) (Just itemId))
-               in (ComposedMessage file Nothing mc', ciff)
+               in (composedMessage file mc', ciff, msgContentTexts mc', M.empty)
               where
                 forwardName :: Contact -> ContactName
                 forwardName Contact {profile = LocalProfile {displayName, localAlias}}
                   | localAlias /= "" = localAlias
                   | otherwise = displayName
+        -- TODO [knocking] from scope?
         CTGroup -> withGroupLock "forwardChatItem, from group" fromChatId $ do
           (gInfo, items) <- getCommandGroupChatItems user fromChatId itemIds
           catMaybes <$> mapM (\ci -> ciComposeMsgReq gInfo ci <$$> prepareMsgReq ci) items
           where
-            ciComposeMsgReq :: GroupInfo -> CChatItem 'CTGroup -> (MsgContent, Maybe CryptoFile) -> ComposeMessageReq
-            ciComposeMsgReq gInfo (CChatItem md ci) (mc', file) = do
+            ciComposeMsgReq :: GroupInfo -> CChatItem 'CTGroup -> (MsgContent, Maybe CryptoFile) -> ComposedMessageReq
+            ciComposeMsgReq gInfo (CChatItem md ci@ChatItem {mentions, formattedText}) (mc, file) = do
               let itemId = chatItemId' ci
                   ciff = forwardCIFF ci $ Just (CIFFGroup (forwardName gInfo) (toMsgDirection md) (Just fromChatId) (Just itemId))
-               in (ComposedMessage file Nothing mc', ciff)
+                  -- updates text to reflect current mentioned member names
+                  (mc', _, mentions') = updatedMentionNames mc formattedText mentions
+                  -- only includes mentions when forwarding to the same group
+                  ciMentions = if toChat == fromChat then mentions' else M.empty
+                  -- no need to have mentions in ComposedMessage, they are in ciMentions
+               in (ComposedMessage file Nothing mc' M.empty, ciff, msgContentTexts mc', ciMentions)
               where
                 forwardName :: GroupInfo -> ContactName
                 forwardName GroupInfo {groupProfile = GroupProfile {displayName}} = displayName
@@ -881,12 +911,12 @@ processChatCommand' vr = \case
           (_, items) <- getCommandLocalChatItems user fromChatId itemIds
           catMaybes <$> mapM (\ci -> ciComposeMsgReq ci <$$> prepareMsgReq ci) items
           where
-            ciComposeMsgReq :: CChatItem 'CTLocal -> (MsgContent, Maybe CryptoFile) -> ComposeMessageReq
+            ciComposeMsgReq :: CChatItem 'CTLocal -> (MsgContent, Maybe CryptoFile) -> ComposedMessageReq
             ciComposeMsgReq (CChatItem _ ci) (mc', file) =
               let ciff = forwardCIFF ci Nothing
-               in (ComposedMessage file Nothing mc', ciff)
-        CTContactRequest -> throwChatError $ CECommandError "not supported"
-        CTContactConnection -> throwChatError $ CECommandError "not supported"
+               in (composedMessage file mc', ciff, msgContentTexts mc', M.empty)
+        CTContactRequest -> throwCmdError "not supported"
+        CTContactConnection -> throwCmdError "not supported"
         where
           prepareMsgReq :: CChatItem c -> CM (Maybe (MsgContent, Maybe CryptoFile))
           prepareMsgReq (CChatItem _ ci) = forwardMsgContent ci $>>= forwardContent ci
@@ -959,7 +989,7 @@ processChatCommand' vr = \case
             pure $ prefix <> formattedDate <> ext
   APIUserRead userId -> withUserId userId $ \user -> withFastStore' (`setUserChatsRead` user) >> ok user
   UserRead -> withUser $ \User {userId} -> processChatCommand $ APIUserRead userId
-  APIChatRead chatRef@(ChatRef cType chatId) -> withUser $ \_ -> case cType of
+  APIChatRead chatRef@(ChatRef cType chatId scope) -> withUser $ \_ -> case cType of
     CTDirect -> do
       user <- withFastStore $ \db -> getUserByContactId db chatId
       ts <- liftIO getCurrentTime
@@ -970,11 +1000,14 @@ processChatCommand' vr = \case
       forM_ timedItems $ \(itemId, deleteAt) -> startProximateTimedItemThread user (chatRef, itemId) deleteAt
       ok user
     CTGroup -> do
-      user <- withFastStore $ \db -> getUserByGroupId db chatId
+      (user, gInfo) <- withFastStore $ \db -> do
+        user <- getUserByGroupId db chatId
+        gInfo <- getGroupInfo db vr user chatId
+        pure (user, gInfo)
       ts <- liftIO getCurrentTime
       timedItems <- withFastStore' $ \db -> do
         timedItems <- getGroupUnreadTimedItems db user chatId
-        updateGroupChatItemsRead db user chatId
+        updateGroupChatItemsRead db user gInfo scope
         setGroupChatItemsDeleteAt db user chatId timedItems ts
       forM_ timedItems $ \(itemId, deleteAt) -> startProximateTimedItemThread user (chatRef, itemId) deleteAt
       ok user
@@ -982,33 +1015,42 @@ processChatCommand' vr = \case
       user <- withFastStore $ \db -> getUserByNoteFolderId db chatId
       withFastStore' $ \db -> updateLocalChatItemsRead db user chatId
       ok user
-    CTContactRequest -> pure $ chatCmdError Nothing "not supported"
-    CTContactConnection -> pure $ chatCmdError Nothing "not supported"
-  APIChatItemsRead chatRef@(ChatRef cType chatId) itemIds -> withUser $ \_ -> case cType of
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
+  APIChatItemsRead chatRef@(ChatRef cType chatId scope) itemIds -> withUser $ \_ -> case cType of
     CTDirect -> do
-      user <- withFastStore $ \db -> getUserByContactId db chatId
+      (user, ct) <- withFastStore $ \db -> do
+        user <- getUserByContactId db chatId
+        ct <- getContact db vr user chatId
+        pure (user, ct)
       timedItems <- withFastStore' $ \db -> do
         timedItems <- updateDirectChatItemsReadList db user chatId itemIds
         setDirectChatItemsDeleteAt db user chatId timedItems =<< getCurrentTime
       forM_ timedItems $ \(itemId, deleteAt) -> startProximateTimedItemThread user (chatRef, itemId) deleteAt
-      ok user
+      pure $ CRItemsReadForChat user (AChatInfo SCTDirect $ DirectChat ct)
     CTGroup -> do
-      user <- withFastStore $ \db -> getUserByGroupId db chatId
-      timedItems <- withFastStore' $ \db -> do
-        timedItems <- updateGroupChatItemsReadList db user chatId itemIds
-        setGroupChatItemsDeleteAt db user chatId timedItems =<< getCurrentTime
+      (user, gInfo) <- withFastStore $ \db -> do
+        user <- getUserByGroupId db chatId
+        gInfo <- getGroupInfo db vr user chatId
+        pure (user, gInfo)
+      chatScopeInfo <- mapM (getChatScopeInfo vr user) scope
+      (timedItems, gInfo') <- withFastStore $ \db -> do
+        (timedItems, gInfo') <- updateGroupChatItemsReadList db vr user gInfo chatScopeInfo itemIds
+        timedItems' <- liftIO $ setGroupChatItemsDeleteAt db user chatId timedItems =<< getCurrentTime
+        pure (timedItems', gInfo')
       forM_ timedItems $ \(itemId, deleteAt) -> startProximateTimedItemThread user (chatRef, itemId) deleteAt
-      ok user
-    CTLocal -> pure $ chatCmdError Nothing "not supported"
-    CTContactRequest -> pure $ chatCmdError Nothing "not supported"
-    CTContactConnection -> pure $ chatCmdError Nothing "not supported"
-  APIChatUnread (ChatRef cType chatId) unreadChat -> withUser $ \user -> case cType of
+      pure $ CRItemsReadForChat user (AChatInfo SCTGroup $ GroupChat gInfo' Nothing)
+    CTLocal -> throwCmdError "not supported"
+    CTContactRequest -> throwCmdError "not supported"
+    CTContactConnection -> throwCmdError "not supported"
+  APIChatUnread (ChatRef cType chatId scope) unreadChat -> withUser $ \user -> case cType of
     CTDirect -> do
       withFastStore $ \db -> do
         ct <- getContact db vr user chatId
         liftIO $ updateContactUnreadChat db user ct unreadChat
       ok user
-    CTGroup -> do
+    -- TODO [knocking] set support chat as unread?
+    CTGroup | isNothing scope -> do
       withFastStore $ \db -> do
         Group {groupInfo} <- getGroup db vr user chatId
         liftIO $ updateGroupUnreadChat db user groupInfo unreadChat
@@ -1018,16 +1060,15 @@ processChatCommand' vr = \case
         nf <- getNoteFolder db user chatId
         liftIO $ updateNoteFolderUnreadChat db user nf unreadChat
       ok user
-    _ -> pure $ chatCmdError (Just user) "not supported"
-  APIDeleteChat cRef@(ChatRef cType chatId) cdm -> withUser $ \user@User {userId} -> case cType of
+    _ -> throwCmdError "not supported"
+  APIDeleteChat cRef@(ChatRef cType chatId scope) cdm -> withUser $ \user@User {userId} -> case cType of
     CTDirect -> do
       ct <- withFastStore $ \db -> getContact db vr user chatId
       filesInfo <- withFastStore' $ \db -> getContactFileInfo db user ct
       withContactLock "deleteChat direct" chatId . procCmd $
         case cdm of
           CDMFull notify -> do
-            cancelFilesInProgress user filesInfo
-            deleteFilesLocally filesInfo
+            deleteCIFiles user filesInfo
             sendDelDeleteConns ct notify
             -- functions below are called in separate transactions to prevent crashes on android
             -- (possibly, race condition on integrity check?)
@@ -1053,71 +1094,48 @@ processChatCommand' vr = \case
           let doSendDel = contactReady ct && contactActive ct && notify
           when doSendDel $ void (sendDirectContactMessage user ct XDirectDel) `catchChatError` const (pure ())
           contactConnIds <- map aConnId <$> withFastStore' (\db -> getContactConnections db vr userId ct)
-          deleteAgentConnectionsAsync' user contactConnIds doSendDel
+          deleteAgentConnectionsAsync' contactConnIds doSendDel
     CTContactConnection -> withConnectionLock "deleteChat contactConnection" chatId . procCmd $ do
       conn@PendingContactConnection {pccAgentConnId = AgentConnId acId} <- withFastStore $ \db -> getPendingContactConnection db userId chatId
-      deleteAgentConnectionAsync user acId
+      deleteAgentConnectionAsync acId
       withFastStore' $ \db -> deletePendingContactConnection db userId chatId
       pure $ CRContactConnectionDeleted user conn
-    CTGroup -> do
-      Group gInfo@GroupInfo {membership} members <- withStore $ \db -> getGroup db vr user chatId
+    CTGroup | isNothing scope -> do
+      Group gInfo@GroupInfo {membership} members <- withFastStore $ \db -> getGroup db vr user chatId
       let GroupMember {memberRole = membershipMemRole} = membership
       let isOwner = membershipMemRole == GROwner
           canDelete = isOwner || not (memberCurrent membership)
       unless canDelete $ throwChatError $ CEGroupUserRole gInfo GROwner
-      filesInfo <- withStore' $ \db -> getGroupFileInfo db user gInfo
+      filesInfo <- withFastStore' $ \db -> getGroupFileInfo db user gInfo
       withGroupLock "deleteChat group" chatId . procCmd $ do
-        cancelFilesInProgress user filesInfo
-        deleteFilesLocally filesInfo
+        deleteCIFiles user filesInfo
         let doSendDel = memberActive membership && isOwner
-        when doSendDel . void $ sendGroupMessage' user gInfo members XGrpDel
+            recipients = filter memberCurrentOrPending members
+        when doSendDel . void $ sendGroupMessage' user gInfo recipients XGrpDel
         deleteGroupLinkIfExists user gInfo
         deleteMembersConnections' user members doSendDel
         updateCIGroupInvitationStatus user gInfo CIGISRejected `catchChatError` \_ -> pure ()
-        -- functions below are called in separate transactions to prevent crashes on android
-        -- (possibly, race condition on integrity check?)
-        withStore' $ \db -> deleteGroupConnectionsAndFiles db user gInfo members
-        withStore' $ \db -> deleteGroupItemsAndMembers db user gInfo members
-        withStore' $ \db -> deleteGroup db user gInfo
-        let contactIds = mapMaybe memberContactId members
-        (errs1, (errs2, connIds)) <- lift $ second unzip . partitionEithers <$> withStoreBatch (\db -> map (deleteUnusedContact db) contactIds)
-        let errs = errs1 <> mapMaybe (fmap ChatErrorStore) errs2
-        unless (null errs) $ toView $ CRChatErrors (Just user) errs
-        deleteAgentConnectionsAsync user $ concat connIds
+        withFastStore' $ \db -> deleteGroupChatItems db user gInfo
+        withFastStore' $ \db -> cleanupHostGroupLinkConn db user gInfo
+        withFastStore' $ \db -> deleteGroupMembers db user gInfo
+        withFastStore' $ \db -> deleteGroup db user gInfo
         pure $ CRGroupDeletedUser user gInfo
-      where
-        deleteUnusedContact :: DB.Connection -> ContactId -> IO (Either ChatError (Maybe StoreError, [ConnId]))
-        deleteUnusedContact db contactId = runExceptT . withExceptT ChatErrorStore $ do
-          ct <- getContact db vr user contactId
-          ifM
-            ((directOrUsed ct ||) . isJust <$> liftIO (checkContactHasGroups db user ct))
-            (pure (Nothing, []))
-            (getConnections ct)
-          where
-            getConnections :: Contact -> ExceptT StoreError IO (Maybe StoreError, [ConnId])
-            getConnections ct = do
-              conns <- liftIO $ getContactConnections db vr userId ct
-              e_ <- (setContactDeleted db user ct $> Nothing) `catchStoreError` (pure . Just)
-              pure (e_, map aConnId conns)
-    CTLocal -> pure $ chatCmdError (Just user) "not supported"
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
-  APIClearChat (ChatRef cType chatId) -> withUser $ \user@User {userId} -> case cType of
+    _ -> throwCmdError "not supported"
+  APIClearChat (ChatRef cType chatId scope) -> withUser $ \user@User {userId} -> case cType of
     CTDirect -> do
       ct <- withFastStore $ \db -> getContact db vr user chatId
       filesInfo <- withFastStore' $ \db -> getContactFileInfo db user ct
-      cancelFilesInProgress user filesInfo
-      deleteFilesLocally filesInfo
+      deleteCIFiles user filesInfo
       withFastStore' $ \db -> deleteContactCIs db user ct
       pure $ CRChatCleared user (AChatInfo SCTDirect $ DirectChat ct)
-    CTGroup -> do
+    CTGroup | isNothing scope -> do
       gInfo <- withFastStore $ \db -> getGroupInfo db vr user chatId
       filesInfo <- withFastStore' $ \db -> getGroupFileInfo db user gInfo
-      cancelFilesInProgress user filesInfo
-      deleteFilesLocally filesInfo
+      deleteCIFiles user filesInfo
       withFastStore' $ \db -> deleteGroupChatItemsMessages db user gInfo
       membersToDelete <- withFastStore' $ \db -> getGroupMembersForExpiration db vr user gInfo
       forM_ membersToDelete $ \m -> withFastStore' $ \db -> deleteGroupMember db user m
-      pure $ CRChatCleared user (AChatInfo SCTGroup $ GroupChat gInfo)
+      pure $ CRChatCleared user (AChatInfo SCTGroup $ GroupChat gInfo Nothing)
     CTLocal -> do
       nf <- withFastStore $ \db -> getNoteFolder db user chatId
       filesInfo <- withFastStore' $ \db -> getNoteFolderFileInfo db user nf
@@ -1125,15 +1143,14 @@ processChatCommand' vr = \case
       withFastStore' $ \db -> deleteNoteFolderFiles db userId nf
       withFastStore' $ \db -> deleteNoteFolderCIs db user nf
       pure $ CRChatCleared user (AChatInfo SCTLocal $ LocalChat nf)
-    CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
-    CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
+    _ -> throwCmdError "not supported"
   APIAcceptContact incognito connReqId -> withUser $ \_ -> do
     userContactLinkId <- withFastStore $ \db -> getUserContactLinkIdByCReq db connReqId
     withUserContactLock "acceptContact" userContactLinkId $ do
       (user@User {userId}, cReq) <- withFastStore $ \db -> getContactRequest' db connReqId
       (ct, conn@Connection {connId}, sqSecured) <- acceptContactRequest user cReq incognito
       ucl <- withFastStore $ \db -> getUserContactLinkById db userId userContactLinkId
-      let contactUsed = (\(_, groupId_, _) -> isNothing groupId_) ucl
+      let contactUsed = (\(_, gLinkInfo_) -> isNothing gLinkInfo_) ucl
       ct' <- withStore' $ \db -> do
         deleteContactRequestRec db user cReq
         updateContactAccepted db user ct contactUsed
@@ -1171,9 +1188,9 @@ processChatCommand' vr = \case
           let call' = Call {contactId, callId, callUUID, chatItemId = chatItemId' ci, callState, callTs = chatItemTs' ci}
           call_ <- atomically $ TM.lookupInsert contactId call' calls
           forM_ call_ $ \call -> updateCallItemStatus user ct call WCSDisconnected Nothing
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
           ok user
-      else pure $ chatCmdError (Just user) ("feature not allowed " <> T.unpack (chatFeatureNameText CFCalls))
+      else throwCmdError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFCalls)
   SendCallInvitation cName callType -> withUser $ \user -> do
     contactId <- withFastStore $ \db -> getContactIdByName db user cName
     processChatCommand $ APISendCallInvitation contactId callType
@@ -1186,7 +1203,7 @@ processChatCommand' vr = \case
         timed_ <- contactCITimed ct
         updateDirectChatItemView user ct chatItemId aciContent False False timed_ Nothing
         forM_ (timed_ >>= timedDeleteAt') $
-          startProximateTimedItemThread user (ChatRef CTDirect contactId, chatItemId)
+          startProximateTimedItemThread user (ChatRef CTDirect contactId Nothing, chatItemId)
         pure Nothing
       _ -> throwChatError . CECallState $ callStateTag callState
   APISendCallOffer contactId WebRTCCallOffer {callType, rtcSession} ->
@@ -1276,48 +1293,40 @@ processChatCommand' vr = \case
       pure user'
     when (userId == uId') $ chatWriteVar currentUser $ Just (user :: User) {uiThemes}
     ok user'
-  APISetChatUIThemes (ChatRef cType chatId) uiThemes -> withUser $ \user -> case cType of
+  APISetChatUIThemes (ChatRef cType chatId scope) uiThemes -> withUser $ \user -> case cType of
     CTDirect -> do
       withFastStore $ \db -> do
         ct <- getContact db vr user chatId
         liftIO $ setContactUIThemes db user ct uiThemes
       ok user
-    CTGroup -> do
+    CTGroup | isNothing scope -> do
       withFastStore $ \db -> do
         g <- getGroupInfo db vr user chatId
         liftIO $ setGroupUIThemes db user g uiThemes
       ok user
-    _ -> pure $ chatCmdError (Just user) "not supported"
-  APIParseMarkdown text -> pure . CRApiParsedMarkdown $ parseMaybeMarkdownList text
+    _ -> throwCmdError "not supported"
   APIGetNtfToken -> withUser' $ \_ -> crNtfToken <$> withAgent getNtfToken
   APIRegisterToken token mode -> withUser $ \_ ->
     CRNtfTokenStatus <$> withAgent (\a -> registerNtfToken a token mode)
   APIVerifyToken token nonce code -> withUser $ \_ -> withAgent (\a -> verifyNtfToken a token nonce code) >> ok_
+  APICheckToken token -> withUser $ \_ ->
+    CRNtfTokenStatus <$> withAgent (`checkNtfToken` token)
   APIDeleteToken token -> withUser $ \_ -> withAgent (`deleteNtfToken` token) >> ok_
-  APIGetNtfConns nonce encNtfInfo -> withUser $ \user -> do
+  APIGetNtfConns nonce encNtfInfo -> withUser $ \_ -> do
     ntfInfos <- withAgent $ \a -> getNotificationConns a nonce encNtfInfo
     (errs, ntfMsgs) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (getMsgConn db) (L.toList ntfInfos))
-    unless (null errs) $ toView $ CRChatErrors (Just user) errs
-    pure $ CRNtfConns ntfMsgs
+    unless (null errs) $ toView $ CEvtChatErrors errs
+    pure $ CRNtfConns $ catMaybes ntfMsgs
     where
-      getMsgConn :: DB.Connection -> NotificationInfo -> IO NtfConn
-      getMsgConn db NotificationInfo {ntfConnId, ntfMsgMeta = nMsgMeta} = do
+      getMsgConn :: DB.Connection -> NotificationInfo -> IO (Maybe NtfConn)
+      getMsgConn db NotificationInfo {ntfConnId, ntfDbQueueId, ntfMsgMeta = nMsgMeta} = do
         let agentConnId = AgentConnId ntfConnId
-        user_ <- getUserByAConnId db agentConnId
-        connEntity_ <-
-          pure user_ $>>= \user ->
-            eitherToMaybe <$> runExceptT (getConnectionEntity db vr user agentConnId)
-        pure $
-          NtfConn
-            { user_,
-              connEntity_,
-              -- Decrypted ntf meta of the expected message (the one notification was sent for)
-              expectedMsg_ = expectedMsgInfo <$> nMsgMeta
-            }
-  ApiGetConnNtfMessages connIds -> withUser $ \_ -> do
-    let acIds = L.map (\(AgentConnId acId) -> acId) connIds
-    msgs <- lift $ withAgent' $ \a -> getConnectionMessages a acIds
-    let ntfMsgs = L.map (\msg -> receivedMsgInfo <$> msg) msgs
+            mkNtfConn user connEntity = NtfConn {user, agentConnId, agentDbQueueId = ntfDbQueueId, connEntity, expectedMsg_ = expectedMsgInfo <$> nMsgMeta}
+        getUserByAConnId db agentConnId
+          $>>= \user -> fmap (mkNtfConn user) . eitherToMaybe <$> runExceptT (getConnectionEntity db vr user agentConnId)
+  APIGetConnNtfMessages connMsgs -> withUser $ \_ -> do
+    msgs <- lift $ withAgent' (`getConnectionMessages` connMsgs)
+    let ntfMsgs = L.map receivedMsgInfo msgs
     pure $ CRConnNtfMessages ntfMsgs
   GetUserProtoServers (AProtocolType p) -> withUser $ \user -> withServerProtocol p $ do
     srvs <- withFastStore (`getUserServers` user)
@@ -1325,9 +1334,9 @@ processChatCommand' vr = \case
   SetUserProtoServers (AProtocolType (p :: SProtocolType p)) srvs -> withUser $ \user@User {userId} -> withServerProtocol p $ do
     userServers_ <- liftIO . groupByOperator =<< withFastStore (`getUserServers` user)
     case L.nonEmpty userServers_ of
-      Nothing -> throwChatError $ CECommandError "no servers"
+      Nothing -> throwCmdError "no servers"
       Just userServers -> case srvs of
-        [] -> throwChatError $ CECommandError "no servers"
+        [] -> throwCmdError "no servers"
         _ -> do
           srvs' <- mapM aUserServer srvs
           processChatCommand $ APISetUserServers userId $ L.map (updatedServers p srvs') userServers
@@ -1335,7 +1344,7 @@ processChatCommand' vr = \case
       aUserServer :: AProtoServerWithAuth -> CM (AUserServer p)
       aUserServer (AProtoServerWithAuth p' srv) = case testEquality p p' of
         Just Refl -> pure $ AUS SDBNew $ newUserServer srv
-        Nothing -> throwChatError $ CECommandError $ "incorrect server protocol: " <> B.unpack (strEncode srv)
+        Nothing -> throwCmdError $ "incorrect server protocol: " <> B.unpack (strEncode srv)
   APITestProtoServer userId srv@(AProtoServerWithAuth _ server) -> withUserId userId $ \user ->
     lift $ CRServerTestResult user srv <$> withAgent' (\a -> testProtocolServer a (aUserId user) server)
   TestProtoServer srv -> withUser $ \User {userId} ->
@@ -1375,7 +1384,7 @@ processChatCommand' vr = \case
     CRUserServers user <$> (liftIO . groupByOperator =<< getUserServers db user)
   APISetUserServers userId userServers -> withUserId userId $ \user -> do
     errors <- validateAllUsersServers userId $ L.toList userServers
-    unless (null errors) $ throwChatError (CECommandError $ "user servers validation error(s): " <> show errors)
+    unless (null errors) $ throwCmdError $ "user servers validation error(s): " <> show errors
     uss <- withFastStore $ \db -> do
       ts <- liftIO getCurrentTime
       mapM (setUserServers db user ts) userServers
@@ -1409,7 +1418,7 @@ processChatCommand' vr = \case
     currentTs <- liftIO getCurrentTime
     acceptConditions db condId opIds currentTs
     CRServerOperatorConditions <$> getServerOperators db
-  APISetChatTTL userId (ChatRef cType chatId) newTTL_ ->
+  APISetChatTTL userId (ChatRef cType chatId scope) newTTL_ ->
     withUserId userId $ \user -> checkStoreNotChanged $ withChatLock "setChatTTL" $ do
       (oldTTL_, globalTTL, ttlCount) <- withStore' $ \db ->
         (,,) <$> getSetChatTTL db <*> getChatItemTTL db user <*> getChatTTLCount db user
@@ -1417,31 +1426,32 @@ processChatCommand' vr = \case
           oldTTL = fromMaybe globalTTL oldTTL_
       when (newTTL > 0 && (newTTL < oldTTL || oldTTL == 0)) $ do
         lift $ setExpireCIFlag user False
-        expireChat user globalTTL `catchChatError` (toView . CRChatError (Just user))
+        expireChat user globalTTL `catchChatError` eToView
       lift $ setChatItemsExpiration user globalTTL ttlCount
       ok user
     where
       getSetChatTTL db = case cType of
         CTDirect -> getDirectChatTTL db chatId <* setDirectChatTTL db chatId newTTL_
-        CTGroup -> getGroupChatTTL db chatId <* setGroupChatTTL db chatId newTTL_
+        CTGroup | isNothing scope -> getGroupChatTTL db chatId <* setGroupChatTTL db chatId newTTL_
         _ -> pure Nothing
       expireChat user globalTTL = do
         currentTs <- liftIO getCurrentTime
         case cType of
           CTDirect -> expireContactChatItems user vr globalTTL chatId
-          CTGroup ->
+          CTGroup | isNothing scope ->
             let createdAtCutoff = addUTCTime (-43200 :: NominalDiffTime) currentTs
               in expireGroupChatItems user vr globalTTL createdAtCutoff chatId
-          _ -> throwChatError $ CECommandError "not supported"
+          _ -> throwCmdError "not supported"
   SetChatTTL chatName newTTL -> withUser' $ \user@User {userId} -> do
     chatRef <- getChatRef user chatName
     processChatCommand $ APISetChatTTL userId chatRef newTTL
   GetChatTTL chatName -> withUser' $ \user -> do
-    ChatRef cType chatId <- getChatRef user chatName
+    -- TODO [knocking] support scope in CLI apis
+    ChatRef cType chatId _ <- getChatRef user chatName
     ttl <- case cType of
       CTDirect -> withFastStore' (`getDirectChatTTL` chatId)
       CTGroup -> withFastStore' (`getGroupChatTTL` chatId)
-      _ -> throwChatError $ CECommandError "not supported"
+      _ -> throwCmdError "not supported"
     pure $ CRChatItemTTL user ttl
   APISetChatItemTTL userId newTTL -> withUserId userId $ \user ->
     checkStoreNotChanged $
@@ -1472,7 +1482,7 @@ processChatCommand' vr = \case
   ReconnectServer userId srv -> withUserId userId $ \user -> do
     lift (withAgent' $ \a -> reconnectSMPServer a (aUserId user) srv)
     ok_
-  APISetChatSettings (ChatRef cType chatId) chatSettings -> withUser $ \user -> case cType of
+  APISetChatSettings (ChatRef cType chatId scope) chatSettings -> withUser $ \user -> case cType of
     CTDirect -> do
       ct <- withFastStore $ \db -> do
         ct <- getContact db vr user chatId
@@ -1481,21 +1491,21 @@ processChatCommand' vr = \case
       forM_ (contactConnId ct) $ \connId ->
         withAgent $ \a -> toggleConnectionNtfs a connId (chatHasNtfs chatSettings)
       ok user
-    CTGroup -> do
+    CTGroup | isNothing scope -> do
       ms <- withFastStore $ \db -> do
         Group _ ms <- getGroup db vr user chatId
         liftIO $ updateGroupSettings db user chatId chatSettings
         pure ms
       forM_ (filter memberActive ms) $ \m -> forM_ (memberConnId m) $ \connId ->
-        withAgent (\a -> toggleConnectionNtfs a connId $ chatHasNtfs chatSettings) `catchChatError` (toView . CRChatError (Just user))
+        withAgent (\a -> toggleConnectionNtfs a connId $ chatHasNtfs chatSettings) `catchChatError` eToView
       ok user
-    _ -> pure $ chatCmdError (Just user) "not supported"
+    _ -> throwCmdError "not supported"
   APISetMemberSettings gId gMemberId settings -> withUser $ \user -> do
     m <- withFastStore $ \db -> do
       liftIO $ updateGroupMemberSettings db user gId gMemberId settings
       getGroupMember db vr user gId gMemberId
     let ntfOn = showMessages $ memberSettings m
-    toggleNtf user m ntfOn
+    toggleNtf m ntfOn
     ok user
   APIContactInfo contactId -> withUser $ \user@User {userId} -> do
     -- [incognito] print user's incognito profile for this contact
@@ -1535,7 +1545,7 @@ processChatCommand' vr = \case
     case memberConnId m of
       Just connId -> do
         connectionStats <- withAgent (\a -> switchConnectionAsync a "" connId)
-        pure $ CRGroupMemberSwitchStarted user g m connectionStats
+        pure $ CEvtGroupMemberSwitchStarted user g m connectionStats
       _ -> throwChatError CEGroupMemberNotActive
   APIAbortSwitchContact contactId -> withUser $ \user -> do
     ct <- withFastStore $ \db -> getContact db vr user contactId
@@ -1549,7 +1559,7 @@ processChatCommand' vr = \case
     case memberConnId m of
       Just connId -> do
         connectionStats <- withAgent $ \a -> abortConnectionSwitch a connId
-        pure $ CRGroupMemberSwitchAborted user g m connectionStats
+        pure $ CEvtGroupMemberSwitchAborted user g m connectionStats
       _ -> throwChatError CEGroupMemberNotActive
   APISyncContactRatchet contactId force -> withUser $ \user -> withContactLock "syncContactRatchet" contactId $ do
     ct <- withFastStore $ \db -> getContact db vr user contactId
@@ -1564,8 +1574,9 @@ processChatCommand' vr = \case
     case memberConnId m of
       Just connId -> do
         cStats@ConnectionStats {ratchetSyncState = rss} <- withAgent $ \a -> synchronizeRatchet a connId PQSupportOff force
-        createInternalChatItem user (CDGroupSnd g) (CISndConnEvent . SCERatchetSync rss . Just $ groupMemberRef m) Nothing
-        pure $ CRGroupMemberRatchetSyncStarted user g m cStats
+        (g', m', scopeInfo) <- mkGroupChatScope g m
+        createInternalChatItem user (CDGroupSnd g' scopeInfo) (CISndConnEvent . SCERatchetSync rss . Just $ groupMemberRef m') Nothing
+        pure $ CRGroupMemberRatchetSyncStarted user g' m' cStats
       _ -> throwChatError CEGroupMemberNotActive
   APIGetContactCode contactId -> withUser $ \user -> do
     ct@Contact {activeConn} <- withFastStore $ \db -> getContact db vr user contactId
@@ -1651,16 +1662,18 @@ processChatCommand' vr = \case
   EnableGroupMember gName mName -> withMemberName gName mName $ \gId mId -> APIEnableGroupMember gId mId
   ChatHelp section -> pure $ CRChatHelp section
   Welcome -> withUser $ pure . CRWelcome
-  APIAddContact userId incognito -> withUserId userId $ \user -> procCmd $ do
+  APIAddContact userId short incognito -> withUserId userId $ \user -> procCmd $ do
     -- [incognito] generate profile for connection
     incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
     subMode <- chatReadVar subscriptionMode
-    (connId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing IKPQOn subMode
+    let userData = shortLinkUserData short
+    (connId, ccLink) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation userData Nothing IKPQOn subMode
+    ccLink' <- shortenCreatedLink ccLink
     -- TODO PQ pass minVersion from the current range
-    conn <- withFastStore' $ \db -> createDirectConnection db user connId cReq ConnNew incognitoProfile subMode initialChatVersion PQSupportOn
-    pure $ CRInvitation user cReq conn
-  AddContact incognito -> withUser $ \User {userId} ->
-    processChatCommand $ APIAddContact userId incognito
+    conn <- withFastStore' $ \db -> createDirectConnection db user connId ccLink' ConnNew incognitoProfile subMode initialChatVersion PQSupportOn
+    pure $ CRInvitation user ccLink' conn
+  AddContact short incognito -> withUser $ \User {userId} ->
+    processChatCommand $ APIAddContact userId short incognito
   APISetConnectionIncognito connId incognito -> withUser $ \user@User {userId} -> do
     conn'_ <- withFastStore $ \db -> do
       conn@PendingContactConnection {pccConnStatus, customUserProfileId} <- getPendingContactConnection db userId connId
@@ -1678,9 +1691,9 @@ processChatCommand' vr = \case
       Nothing -> throwChatError CEConnectionIncognitoChangeProhibited
   APIChangeConnectionUser connId newUserId -> withUser $ \user@User {userId} -> do
     conn <- withFastStore $ \db -> getPendingContactConnection db userId connId
-    let PendingContactConnection {pccConnStatus, connReqInv} = conn
-    case (pccConnStatus, connReqInv) of
-      (ConnNew, Just cReqInv) -> do
+    let PendingContactConnection {pccConnStatus, connLinkInv} = conn
+    case (pccConnStatus, connLinkInv) of
+      (ConnNew, Just (CCLink cReqInv _)) -> do
         newUser <- privateGetUser newUserId
         conn' <- ifM (canKeepLink cReqInv newUser) (updateConnRecord user conn newUser) (recreateConn user conn newUser)
         pure $ CRConnectionUserChanged user conn conn' newUser
@@ -1701,19 +1714,21 @@ processChatCommand' vr = \case
           forM_ customUserProfileId $ \profileId ->
             deletePCCIncognitoProfile db user profileId
           pure conn'
-      recreateConn user conn@PendingContactConnection {customUserProfileId} newUser = do
+      recreateConn user conn@PendingContactConnection {customUserProfileId, connLinkInv} newUser = do
         subMode <- chatReadVar subscriptionMode
-        (agConnId, cReq) <- withAgent $ \a -> createConnection a (aUserId newUser) True SCMInvitation Nothing IKPQOn subMode
+        let userData = shortLinkUserData $ isJust $ connShortLink =<< connLinkInv
+        (agConnId, ccLink) <- withAgent $ \a -> createConnection a (aUserId newUser) True SCMInvitation userData Nothing IKPQOn subMode
+        ccLink' <- shortenCreatedLink ccLink
         conn' <- withFastStore' $ \db -> do
           deleteConnectionRecord db user connId
           forM_ customUserProfileId $ \profileId ->
             deletePCCIncognitoProfile db user profileId
-          createDirectConnection db newUser agConnId cReq ConnNew Nothing subMode initialChatVersion PQSupportOn
-        deleteAgentConnectionAsync user (aConnId' conn)
+          createDirectConnection db newUser agConnId ccLink' ConnNew Nothing subMode initialChatVersion PQSupportOn
+        deleteAgentConnectionAsync (aConnId' conn)
         pure conn'
-  APIConnectPlan userId cReqUri -> withUserId userId $ \user ->
-    CRConnectionPlan user <$> connectPlan user cReqUri
-  APIConnect userId incognito (Just (ACR SCMInvitation cReq@(CRInvitationUri crData e2e))) -> withUserId userId $ \user -> withInvitationLock "connect" (strEncode cReq) . procCmd $ do
+  APIConnectPlan userId cLink -> withUserId userId $ \user ->
+    uncurry (CRConnectionPlan user) <$> connectPlan user cLink
+  APIConnect userId incognito (Just (ACCL SCMInvitation (CCLink cReq@(CRInvitationUri crData e2e) sLnk_))) -> withUserId userId $ \user -> withInvitationLock "connect" (strEncode cReq) . procCmd $ do
     subMode <- chatReadVar subscriptionMode
     -- [incognito] generate profile to send
     incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
@@ -1732,11 +1747,12 @@ processChatCommand' vr = \case
                 -- retrying join after error
                 pcc <- withFastStore $ \db -> getPendingContactConnection db userId connId
                 joinPreparedConn (aConnId conn) pcc dm
-          Just ent -> throwChatError $ CECommandError $ "connection exists: " <> show (connEntityInfo ent)
+          Just ent -> throwCmdError $ "connection exists: " <> show (connEntityInfo ent)
         where
           joinNewConn chatV dm = do
             connId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq pqSup'
-            pcc <- withFastStore' $ \db -> createDirectConnection db user connId cReq ConnPrepared (incognitoProfile $> profileToSend) subMode chatV pqSup'
+            let ccLink = CCLink cReq $ serverShortLink <$> sLnk_
+            pcc <- withFastStore' $ \db -> createDirectConnection db user connId ccLink ConnPrepared (incognitoProfile $> profileToSend) subMode chatV pqSup'
             joinPreparedConn connId pcc dm
           joinPreparedConn connId pcc@PendingContactConnection {pccConnId} dm = do
             void $ withAgent $ \a -> joinConnection a (aUserId user) connId True cReq dm pqSup' subMode
@@ -1746,47 +1762,44 @@ processChatCommand' vr = \case
             ( CRInvitationUri crData {crScheme = SSSimplex} e2e,
               CRInvitationUri crData {crScheme = simplexChat} e2e
             )
-  APIConnect userId incognito (Just (ACR SCMContact cReq)) -> withUserId userId $ \user -> connectViaContact user incognito cReq
+  APIConnect userId incognito (Just (ACCL SCMContact ccLink)) -> withUserId userId $ \user -> connectViaContact user incognito ccLink
   APIConnect _ _ Nothing -> throwChatError CEInvalidConnReq
-  Connect incognito aCReqUri@(Just cReqUri) -> withUser $ \user@User {userId} -> do
-    plan <- connectPlan user cReqUri `catchChatError` const (pure $ CPInvitationLink ILPOk)
-    unless (connectionPlanProceed plan) $ throwChatError (CEConnectionPlan plan)
-    case plan of
-      CPContactAddress (CAPContactViaAddress Contact {contactId}) ->
-        processChatCommand $ APIConnectContactViaAddress userId incognito contactId
-      _ -> processChatCommand $ APIConnect userId incognito aCReqUri
+  Connect incognito (Just cLink@(ACL m cLink')) -> withUser $ \user -> do
+    (ccLink, plan) <- connectPlan user cLink `catchChatError` \e -> case cLink' of CLFull cReq -> pure (ACCL m (CCLink cReq Nothing), CPInvitationLink ILPOk); _ -> throwError e
+    connectWithPlan user incognito ccLink plan
   Connect _ Nothing -> throwChatError CEInvalidConnReq
   APIConnectContactViaAddress userId incognito contactId -> withUserId userId $ \user -> do
     ct@Contact {activeConn, profile = LocalProfile {contactLink}} <- withFastStore $ \db -> getContact db vr user contactId
-    when (isJust activeConn) $ throwChatError (CECommandError "contact already has connection")
-    case contactLink of
-      Just cReq -> connectContactViaAddress user incognito ct cReq
-      Nothing -> throwChatError (CECommandError "no address in contact profile")
-  ConnectSimplex incognito -> withUser $ \user@User {userId} -> do
-    let cReqUri = ACR SCMContact adminContactReq
-    plan <- connectPlan user cReqUri `catchChatError` const (pure $ CPInvitationLink ILPOk)
-    unless (connectionPlanProceed plan) $ throwChatError (CEConnectionPlan plan)
-    case plan of
-      CPContactAddress (CAPContactViaAddress Contact {contactId}) ->
-        processChatCommand $ APIConnectContactViaAddress userId incognito contactId
-      _ -> processChatCommand $ APIConnect userId incognito (Just cReqUri)
-  DeleteContact cName cdm -> withContactName cName $ \ctId -> APIDeleteChat (ChatRef CTDirect ctId) cdm
-  ClearContact cName -> withContactName cName $ APIClearChat . ChatRef CTDirect
+    when (isJust activeConn) $ throwCmdError "contact already has connection"
+    ccLink <- case contactLink of
+      Just (CLFull cReq) -> pure $ CCLink cReq Nothing
+      Just (CLShort sLnk) -> do
+        cReq <- getShortLinkConnReq user sLnk
+        pure $ CCLink cReq $ Just sLnk
+      Nothing -> throwCmdError "no address in contact profile"
+    connectContactViaAddress user incognito ct ccLink
+  ConnectSimplex incognito -> withUser $ \user -> do
+    plan <- contactRequestPlan user adminContactReq `catchChatError` const (pure $ CPContactAddress CAPOk)
+    connectWithPlan user incognito (ACCL SCMContact (CCLink adminContactReq Nothing)) plan
+  DeleteContact cName cdm -> withContactName cName $ \ctId -> APIDeleteChat (ChatRef CTDirect ctId Nothing) cdm
+  ClearContact cName -> withContactName cName $ \chatId -> APIClearChat $ ChatRef CTDirect chatId Nothing
   APIListContacts userId -> withUserId userId $ \user ->
     CRContactsList user <$> withFastStore' (\db -> getUserContacts db vr user)
   ListContacts -> withUser $ \User {userId} ->
     processChatCommand $ APIListContacts userId
-  APICreateMyAddress userId -> withUserId userId $ \user -> procCmd $ do
+  APICreateMyAddress userId short -> withUserId userId $ \user -> procCmd $ do
     subMode <- chatReadVar subscriptionMode
-    (connId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMContact Nothing IKPQOn subMode
-    withFastStore $ \db -> createUserContactLink db user connId cReq subMode
-    pure $ CRUserContactLinkCreated user cReq
-  CreateMyAddress -> withUser $ \User {userId} ->
-    processChatCommand $ APICreateMyAddress userId
+    let userData = shortLinkUserData short
+    (connId, ccLink) <- withAgent $ \a -> createConnection a (aUserId user) True SCMContact userData Nothing IKPQOn subMode
+    ccLink' <- shortenCreatedLink ccLink
+    withFastStore $ \db -> createUserContactLink db user connId ccLink' subMode
+    pure $ CRUserContactLinkCreated user ccLink'
+  CreateMyAddress short -> withUser $ \User {userId} ->
+    processChatCommand $ APICreateMyAddress userId short
   APIDeleteMyAddress userId -> withUserId userId $ \user@User {profile = p} -> do
-    conns <- withFastStore $ \db -> getUserAddressConnections db vr user
+    conn <- withFastStore $ \db -> getUserAddressConnection db vr user
     withChatLock "deleteMyAddress" $ do
-      deleteAgentConnectionsAsync user $ map aConnId conns
+      deleteAgentConnectionAsync $ aConnId conn
       withFastStore' (`deleteUserAddress` user)
     let p' = (fromLocalProfile p :: Profile) {contactLink = Nothing}
     r <- updateProfile_ user p' $ withFastStore' $ \db -> setUserProfileContactLink db user Nothing
@@ -1800,18 +1813,30 @@ processChatCommand' vr = \case
     CRUserContactLink user <$> withFastStore (`getUserAddress` user)
   ShowMyAddress -> withUser' $ \User {userId} ->
     processChatCommand $ APIShowMyAddress userId
+  APIAddMyAddressShortLink userId -> withUserId' userId $ \user -> do
+    (ucl@UserContactLink {connLinkContact = CCLink connFullLink sLnk_}, conn) <-
+      withFastStore $ \db -> (,) <$> getUserAddress db user <*> getUserAddressConnection db vr user
+    when (isJust sLnk_) $ throwCmdError "address already has short link"
+    sLnk <- shortenShortLink' =<< withAgent (\a -> setContactShortLink a (aConnId conn) "" Nothing)
+    case entityId conn of
+      Just uclId -> do
+        withFastStore' $ \db -> setUserContactLinkShortLink db uclId sLnk
+        let ucl' = (ucl :: UserContactLink) {connLinkContact = CCLink connFullLink (Just sLnk)}
+        pure $ CRUserContactLink user ucl'
+      Nothing -> throwChatError $ CEException "no user contact link id"
   APISetProfileAddress userId False -> withUserId userId $ \user@User {profile = p} -> do
     let p' = (fromLocalProfile p :: Profile) {contactLink = Nothing}
     updateProfile_ user p' $ withFastStore' $ \db -> setUserProfileContactLink db user Nothing
   APISetProfileAddress userId True -> withUserId userId $ \user@User {profile = p} -> do
-    ucl@UserContactLink {connReqContact} <- withFastStore (`getUserAddress` user)
-    let p' = (fromLocalProfile p :: Profile) {contactLink = Just connReqContact}
+    ucl@UserContactLink {connLinkContact = CCLink cReq _} <- withFastStore (`getUserAddress` user)
+    -- TODO [short links] replace with short links
+    let p' = (fromLocalProfile p :: Profile) {contactLink = Just $ CLFull cReq}
     updateProfile_ user p' $ withFastStore' $ \db -> setUserProfileContactLink db user $ Just ucl
   SetProfileAddress onOff -> withUser $ \User {userId} ->
     processChatCommand $ APISetProfileAddress userId onOff
   APIAddressAutoAccept userId autoAccept_ -> withUserId userId $ \user -> do
     forM_ autoAccept_ $ \AutoAccept {businessAddress, acceptIncognito} ->
-      when (businessAddress && acceptIncognito) $ throwChatError $ CECommandError "requests to business address cannot be accepted incognito"
+      when (businessAddress && acceptIncognito) $ throwCmdError "requests to business address cannot be accepted incognito"
     contactLink <- withFastStore (\db -> updateUserAddressAutoAccept db user autoAccept_)
     pure $ CRUserContactLinkUpdated user contactLink
   AddressAutoAccept autoAccept_ -> withUser $ \User {userId} ->
@@ -1826,25 +1851,25 @@ processChatCommand' vr = \case
     contactId <- withFastStore $ \db -> getContactIdByName db user fromContactName
     forwardedItemId <- withFastStore $ \db -> getDirectChatItemIdByText' db user contactId forwardedMsg
     toChatRef <- getChatRef user toChatName
-    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTDirect contactId) (forwardedItemId :| []) Nothing
+    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTDirect contactId Nothing) (forwardedItemId :| []) Nothing
   ForwardGroupMessage toChatName fromGroupName fromMemberName_ forwardedMsg -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user fromGroupName
     forwardedItemId <- withFastStore $ \db -> getGroupChatItemIdByText db user groupId fromMemberName_ forwardedMsg
     toChatRef <- getChatRef user toChatName
-    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTGroup groupId) (forwardedItemId :| []) Nothing
+    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTGroup groupId Nothing) (forwardedItemId :| []) Nothing
   ForwardLocalMessage toChatName forwardedMsg -> withUser $ \user -> do
     folderId <- withFastStore (`getUserNoteFolderId` user)
     forwardedItemId <- withFastStore $ \db -> getLocalChatItemIdByText' db user folderId forwardedMsg
     toChatRef <- getChatRef user toChatName
-    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTLocal folderId) (forwardedItemId :| []) Nothing
-  SendMessage (ChatName cType name) msg -> withUser $ \user -> do
+    processChatCommand $ APIForwardChatItems toChatRef (ChatRef CTLocal folderId Nothing) (forwardedItemId :| []) Nothing
+  SendMessage sendName msg -> withUser $ \user -> do
     let mc = MCText msg
-    case cType of
-      CTDirect ->
+    case sendName of
+      SNDirect name ->
         withFastStore' (\db -> runExceptT $ getContactIdByName db user name) >>= \case
           Right ctId -> do
-            let chatRef = ChatRef CTDirect ctId
-            processChatCommand $ APISendMessages chatRef False Nothing (ComposedMessage Nothing Nothing mc :| [])
+            let sendRef = SRDirect ctId
+            processChatCommand $ APISendMessages sendRef False Nothing [composedMessage Nothing mc]
           Left _ ->
             withFastStore' (\db -> runExceptT $ getActiveMembersByName db vr user name) >>= \case
               Right [(gInfo, member)] -> do
@@ -1855,16 +1880,18 @@ processChatCommand' vr = \case
                 throwChatError $ CEContactNotFound name (Just suspectedMember)
               _ ->
                 throwChatError $ CEContactNotFound name Nothing
-      CTGroup -> do
-        gId <- withFastStore $ \db -> getGroupIdByName db user name
-        let chatRef = ChatRef CTGroup gId
-        processChatCommand $ APISendMessages chatRef False Nothing (ComposedMessage Nothing Nothing mc :| [])
-      CTLocal
-        | name == "" -> do
-            folderId <- withFastStore (`getUserNoteFolderId` user)
-            processChatCommand $ APICreateChatItems folderId (ComposedMessage Nothing Nothing mc :| [])
-        | otherwise -> throwChatError $ CECommandError "not supported"
-      _ -> throwChatError $ CECommandError "not supported"
+      SNGroup name scope_ -> do
+        (gId, cScope_, mentions) <- withFastStore $ \db -> do
+          gId <- getGroupIdByName db user name
+          cScope_ <-
+            forM scope_ $ \(GSNMemberSupport mName_) ->
+              GCSMemberSupport <$> mapM (getGroupMemberIdByName db user gId) mName_
+          (gId,cScope_,) <$> liftIO (getMessageMentions db user gId msg)
+        let sendRef = SRGroup gId cScope_
+        processChatCommand $ APISendMessages sendRef False Nothing [ComposedMessage Nothing Nothing mc mentions]
+      SNLocal -> do
+        folderId <- withFastStore (`getUserNoteFolderId` user)
+        processChatCommand $ APICreateChatItems folderId [composedMessage Nothing mc]
   SendMemberContactMessage gName mName msg -> withUser $ \user -> do
     (gId, mId) <- getGroupAndMemberId user gName mName
     m <- withFastStore $ \db -> getGroupMember db vr user gId mId
@@ -1872,21 +1899,22 @@ processChatCommand' vr = \case
     case memberContactId m of
       Nothing -> do
         g <- withFastStore $ \db -> getGroupInfo db vr user gId
-        unless (groupFeatureMemberAllowed SGFDirectMessages (membership g) g) $ throwChatError $ CECommandError "direct messages not allowed"
-        toView $ CRNoMemberContactCreating user g m
+        unless (groupFeatureMemberAllowed SGFDirectMessages (membership g) g) $ throwCmdError "direct messages not allowed"
+        toView $ CEvtNoMemberContactCreating user g m
         processChatCommand (APICreateMemberContact gId mId) >>= \case
-          cr@(CRNewMemberContact _ Contact {contactId} _ _) -> do
-            toView cr
+          CRNewMemberContact _ ct@Contact {contactId} _ _ -> do
+            toViewTE $ TENewMemberContact user ct g m
             processChatCommand $ APISendMemberContactInvitation contactId (Just mc)
           cr -> pure cr
       Just ctId -> do
-        let chatRef = ChatRef CTDirect ctId
-        processChatCommand $ APISendMessages chatRef False Nothing (ComposedMessage Nothing Nothing mc :| [])
+        let sendRef = SRDirect ctId
+        processChatCommand $ APISendMessages sendRef False Nothing [composedMessage Nothing mc]
   SendLiveMessage chatName msg -> withUser $ \user -> do
-    chatRef <- getChatRef user chatName
-    let mc = MCText msg
-    processChatCommand $ APISendMessages chatRef True Nothing (ComposedMessage Nothing Nothing mc :| [])
-  SendMessageBroadcast msg -> withUser $ \user -> do
+    (chatRef, mentions) <- getChatRefAndMentions user chatName msg
+    withSendRef chatRef $ \sendRef -> do
+      let mc = MCText msg
+      processChatCommand $ APISendMessages sendRef True Nothing [ComposedMessage Nothing Nothing mc mentions]
+  SendMessageBroadcast mc -> withUser $ \user -> do
     contacts <- withFastStore' $ \db -> getUserContacts db vr user
     withChatLock "sendMessageBroadcast" . procCmd $ do
       let ctConns_ = L.nonEmpty $ foldr addContactConn [] contacts
@@ -1896,6 +1924,12 @@ processChatCommand' vr = \case
           pure CRBroadcastSent {user, msgContent = mc, successes = 0, failures = 0, timestamp}
         Just (ctConns :: NonEmpty (Contact, Connection)) -> do
           let idsEvts = L.map ctSndEvent ctConns
+          -- TODO Broadcast rework
+          -- In createNewSndMessage and encodeChatMessage we could use Nothing for sharedMsgId,
+          -- then we could reuse message body across broadcast.
+          -- Encoding different sharedMsgId and reusing body is meaningless as referencing will not work anyway.
+          -- As an improvement, single message record with its sharedMsgId could be created for new "broadcast" entity.
+          -- Then all recipients could refer to broadcast message using same sharedMsgId.
           sndMsgs <- lift $ createSndMessages idsEvts
           let msgReqs_ :: NonEmpty (Either ChatError ChatMsgReq) = L.zipWith (fmap . ctMsgReq) ctConns sndMsgs
           (errs, ctSndMsgs :: [(Contact, SndMessage)]) <-
@@ -1904,7 +1938,6 @@ processChatCommand' vr = \case
           lift . void $ withStoreBatch' $ \db -> map (createCI db user timestamp) ctSndMsgs
           pure CRBroadcastSent {user, msgContent = mc, successes = length ctSndMsgs, failures = length errs, timestamp}
     where
-      mc = MCText msg
       addContactConn :: Contact -> [(Contact, Connection)] -> [(Contact, Connection)]
       addContactConn ct ctConns = case contactSendConn_ ct of
         Right conn | directOrUsed ct -> (ct, conn) : ctConns
@@ -1912,9 +1945,7 @@ processChatCommand' vr = \case
       ctSndEvent :: (Contact, Connection) -> (ConnOrGroupId, ChatMsgEvent 'Json)
       ctSndEvent (_, Connection {connId}) = (ConnectionId connId, XMsgNew $ MCSimple (extMsgContent mc Nothing))
       ctMsgReq :: (Contact, Connection) -> SndMessage -> ChatMsgReq
-      ctMsgReq (_, conn) SndMessage {msgId, msgBody} = (conn, MsgFlags {notification = hasNotification XMsgNew_}, msgBody, [msgId])
-      zipWith3' :: (a -> b -> c -> d) -> NonEmpty a -> NonEmpty b -> NonEmpty c -> NonEmpty d
-      zipWith3' f ~(x :| xs) ~(y :| ys) ~(z :| zs) = f x y z :| zipWith3 f xs ys zs
+      ctMsgReq (_, conn) SndMessage {msgId, msgBody} = (conn, MsgFlags {notification = hasNotification XMsgNew_}, (vrValue msgBody, [msgId]))
       combineResults :: (Contact, Connection) -> Either ChatError SndMessage -> Either ChatError ([Int64], PQEncryption) -> Either ChatError (Contact, SndMessage)
       combineResults (ct, _) (Right msg') (Right _) = Right (ct, msg')
       combineResults _ (Left e) _ = Left e
@@ -1926,7 +1957,7 @@ processChatCommand' vr = \case
     contactId <- withFastStore $ \db -> getContactIdByName db user cName
     quotedItemId <- withFastStore $ \db -> getDirectChatItemIdByText db userId contactId msgDir quotedMsg
     let mc = MCText msg
-    processChatCommand $ APISendMessages (ChatRef CTDirect contactId) False Nothing (ComposedMessage Nothing (Just quotedItemId) mc :| [])
+    processChatCommand $ APISendMessages (SRDirect contactId) False Nothing [ComposedMessage Nothing (Just quotedItemId) mc M.empty]
   DeleteMessage chatName deletedMsg -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
     deletedItemId <- getSentChatItemIdByText user chatRef deletedMsg
@@ -1936,14 +1967,14 @@ processChatCommand' vr = \case
     deletedItemId <- withFastStore $ \db -> getGroupChatItemIdByText db user gId (Just mName) deletedMsg
     processChatCommand $ APIDeleteMemberChatItem gId (deletedItemId :| [])
   EditMessage chatName editedMsg msg -> withUser $ \user -> do
-    chatRef <- getChatRef user chatName
+    (chatRef, mentions) <- getChatRefAndMentions user chatName msg
     editedItemId <- getSentChatItemIdByText user chatRef editedMsg
     let mc = MCText msg
-    processChatCommand $ APIUpdateChatItem chatRef editedItemId False mc
+    processChatCommand $ APIUpdateChatItem chatRef editedItemId False $ UpdatedMessage mc mentions
   UpdateLiveMessage chatName chatItemId live msg -> withUser $ \user -> do
-    chatRef <- getChatRef user chatName
+    (chatRef, mentions) <- getChatRefAndMentions user chatName msg
     let mc = MCText msg
-    processChatCommand $ APIUpdateChatItem chatRef chatItemId live mc
+    processChatCommand $ APIUpdateChatItem chatRef chatItemId live $ UpdatedMessage mc mentions
   ReactToMessage add reaction chatName msg -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
     chatItemId <- getChatItemIdByText user chatRef msg
@@ -1954,7 +1985,7 @@ processChatCommand' vr = \case
     -- [incognito] generate incognito profile for group membership
     incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
     gInfo <- withFastStore $ \db -> createNewGroup db vr gVar user gProfile incognitoProfile
-    let cd = CDGroupSnd gInfo
+    let cd = CDGroupSnd gInfo Nothing
     createInternalChatItem user cd (CISndGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing
     createGroupFeatureItems user cd CISndGroupFeature gInfo
     pure $ CRGroupCreated user gInfo
@@ -1976,7 +2007,7 @@ processChatCommand' vr = \case
       Nothing -> do
         gVar <- asks random
         subMode <- chatReadVar subscriptionMode
-        (agentConnId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing IKPQOff subMode
+        (agentConnId, CCLink cReq _) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing Nothing IKPQOff subMode
         member <- withFastStore $ \db -> createNewContactMember db gVar user gInfo contact memRole agentConnId cReq subMode
         sendInvitation member cReq
         pure $ CRSentGroupInvitation user gInfo contact member
@@ -2019,115 +2050,328 @@ processChatCommand' vr = \case
                 updateGroupMemberStatus db userId fromMember GSMemInvited
                 updateGroupMemberStatus db userId membership GSMemInvited
               throwError e
-          updateCIGroupInvitationStatus user g CIGISAccepted `catchChatError` (toView . CRChatError (Just user))
+          updateCIGroupInvitationStatus user g CIGISAccepted `catchChatError` eToView
           pure $ CRUserAcceptedGroupSent user g {membership = membership {memberStatus = GSMemAccepted}} Nothing
         Nothing -> throwChatError $ CEContactNotActive ct
-  APIMemberRole groupId memberId memRole -> withUser $ \user -> do
-    Group gInfo@GroupInfo {membership} members <- withFastStore $ \db -> getGroup db vr user groupId
-    if memberId == groupMemberId' membership
-      then changeMemberRole user gInfo members membership $ SGEUserRole memRole
-      else case find ((== memberId) . groupMemberId') members of
-        Just m -> changeMemberRole user gInfo members m $ SGEMemberRole memberId (fromLocalProfile $ memberProfile m) memRole
-        _ -> throwChatError CEGroupMemberNotFound
+  APIAcceptMember groupId gmId role -> withUser $ \user@User {userId} -> do
+    (gInfo, m) <- withFastStore $ \db -> (,) <$> getGroupInfo db vr user groupId <*> getGroupMemberById db vr user gmId
+    assertUserGroupRole gInfo GRModerator
+    case memberStatus m of
+      GSMemPendingApproval | memberCategory m == GCInviteeMember -> do -- only host can approve
+        let GroupInfo {groupProfile = GroupProfile {memberAdmission}} = gInfo
+        case memberConn m of
+          Just mConn ->
+            case memberAdmission >>= review of
+              Just MCAll -> do
+                introduceToModerators vr user gInfo m
+                withFastStore' $ \db -> updateGroupMemberStatus db userId m GSMemPendingReview
+                let m' = m {memberStatus = GSMemPendingReview}
+                pure $ CRMemberAccepted user gInfo m'
+              Nothing -> do
+                let msg = XGrpLinkAcpt GAAccepted role (memberId' m)
+                void $ sendDirectMemberMessage mConn msg groupId
+                introduceToRemaining vr user gInfo m {memberRole = role}
+                when (groupFeatureAllowed SGFHistory gInfo) $ sendHistory user gInfo m
+                (m', gInfo') <- withFastStore' $ \db -> do
+                  m' <- updateGroupMemberAccepted db user m GSMemConnected role
+                  gInfo' <- updateGroupMembersRequireAttention db user gInfo m m'
+                  pure (m', gInfo')
+                -- create item in both scopes
+                createInternalChatItem user (CDGroupRcv gInfo' Nothing m') (CIRcvGroupEvent RGEMemberConnected) Nothing
+                let scopeInfo = Just GCSIMemberSupport {groupMember_ = Just m'}
+                    gEvent = SGEMemberAccepted gmId (fromLocalProfile $ memberProfile m')
+                createInternalChatItem user (CDGroupSnd gInfo' scopeInfo) (CISndGroupEvent gEvent) Nothing
+                pure $ CRMemberAccepted user gInfo' m'
+          Nothing -> throwChatError CEGroupMemberNotActive
+      GSMemPendingReview -> do
+        let scope = Just $ GCSMemberSupport $ Just (groupMemberId' m)
+        modMs <- withFastStore' $ \db -> getGroupModerators db vr user gInfo
+        let rcpModMs' = filter memberCurrent modMs
+            msg = XGrpLinkAcpt GAAccepted role (memberId' m)
+        void $ sendGroupMessage user gInfo scope ([m] <> rcpModMs') msg
+        when (maxVersion (memberChatVRange m) < groupKnockingVersion) $
+          forM_ (memberConn m) $ \mConn -> do
+            let msg2 = XMsgNew $ MCSimple $ extMsgContent (MCText acceptedToGroupMessage) Nothing
+            void $ sendDirectMemberMessage mConn msg2 groupId
+        when (memberCategory m == GCInviteeMember) $ do
+          introduceToRemaining vr user gInfo m {memberRole = role}
+          when (groupFeatureAllowed SGFHistory gInfo) $ sendHistory user gInfo m
+        (m', gInfo') <- withFastStore' $ \db -> do
+          m' <- updateGroupMemberAccepted db user m newMemberStatus role
+          gInfo' <- updateGroupMembersRequireAttention db user gInfo m m'
+          pure (m', gInfo')
+        -- create item in both scopes
+        createInternalChatItem user (CDGroupRcv gInfo' Nothing m') (CIRcvGroupEvent RGEMemberConnected) Nothing
+        let scopeInfo = Just GCSIMemberSupport {groupMember_ = Just m'}
+            gEvent = SGEMemberAccepted gmId (fromLocalProfile $ memberProfile m')
+        createInternalChatItem user (CDGroupSnd gInfo' scopeInfo) (CISndGroupEvent gEvent) Nothing
+        pure $ CRMemberAccepted user gInfo' m'
+        where
+          newMemberStatus = case memberConn m of
+            Just c | connReady c -> GSMemConnected
+            _ -> GSMemAnnounced
+      _ -> throwCmdError "member should be pending approval and invitee, or pending review and not invitee"
+  APIDeleteMemberSupportChat groupId gmId -> withUser $ \user -> do
+    (gInfo, m) <- withFastStore $ \db -> (,) <$> getGroupInfo db vr user groupId <*> getGroupMemberById db vr user gmId
+    when (isNothing $ supportChat m) $ throwCmdError "member has no support chat"
+    when (memberPending m) $ throwCmdError "member is pending"
+    (gInfo', m') <- withFastStore' $ \db -> deleteGroupMemberSupportChat db user gInfo m
+    pure $ CRMemberSupportChatDeleted user gInfo' m'
+  APIMembersRole groupId memberIds newRole -> withUser $ \user ->
+    withGroupLock "memberRole" groupId . procCmd $ do
+      g@(Group gInfo members) <- withFastStore $ \db -> getGroup db vr user groupId
+      when (selfSelected gInfo) $ throwCmdError "can't change role for self"
+      let (invitedMems, currentMems, unchangedMems, maxRole, anyAdmin, anyPending) = selectMembers members
+      when (length invitedMems + length currentMems + length unchangedMems /= length memberIds) $ throwChatError CEGroupMemberNotFound
+      when (length memberIds > 1 && (anyAdmin || newRole >= GRAdmin)) $
+        throwCmdError "can't change role of multiple members when admins selected, or new role is admin"
+      when anyPending $ throwCmdError "can't change role of members pending approval"
+      assertUserGroupRole gInfo $ maximum ([GRAdmin, maxRole, newRole] :: [GroupMemberRole])
+      (errs1, changed1) <- changeRoleInvitedMems user gInfo invitedMems
+      (errs2, changed2, acis) <- changeRoleCurrentMems user g currentMems
+      unless (null acis) $ toView $ CEvtNewChatItems user acis
+      let errs = errs1 <> errs2
+      unless (null errs) $ toView $ CEvtChatErrors errs
+      pure $ CRMembersRoleUser {user, groupInfo = gInfo, members = changed1 <> changed2, toRole = newRole} -- same order is not guaranteed
     where
-      changeMemberRole user gInfo members m gEvent = do
-        let GroupMember {memberId = mId, memberRole = mRole, memberStatus = mStatus, memberContactId, localDisplayName = cName} = m
-        assertUserGroupRole gInfo $ maximum ([GRAdmin, mRole, memRole] :: [GroupMemberRole])
-        withGroupLock "memberRole" groupId . procCmd $ do
-          unless (mRole == memRole) $ do
-            withFastStore' $ \db -> updateGroupMemberRole db user m memRole
-            case mStatus of
-              GSMemInvited -> do
-                withFastStore (\db -> (,) <$> mapM (getContact db vr user) memberContactId <*> liftIO (getMemberInvitation db user $ groupMemberId' m)) >>= \case
-                  (Just ct, Just cReq) -> sendGrpInvitation user ct gInfo (m :: GroupMember) {memberRole = memRole} cReq
-                  _ -> throwChatError $ CEGroupCantResendInvitation gInfo cName
-              _ -> do
-                msg <- sendGroupMessage user gInfo members $ XGrpMemRole mId memRole
-                ci <- saveSndChatItem user (CDGroupSnd gInfo) msg (CISndGroupEvent gEvent)
-                toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci]
-          pure CRMemberRoleUser {user, groupInfo = gInfo, member = m {memberRole = memRole}, fromRole = mRole, toRole = memRole}
-  APIBlockMemberForAll groupId memberId blocked -> withUser $ \user -> do
-    Group gInfo@GroupInfo {membership} members <- withFastStore $ \db -> getGroup db vr user groupId
-    when (memberId == groupMemberId' membership) $ throwChatError $ CECommandError "can't block/unblock self"
-    case splitMember memberId members of
-      Nothing -> throwChatError $ CEException "expected to find a single blocked member"
-      Just (bm, remainingMembers) -> do
-        let GroupMember {memberId = bmMemberId, memberRole = bmRole, memberProfile = bmp} = bm
-        -- TODO GRModerator when most users migrate
-        assertUserGroupRole gInfo $ max GRAdmin bmRole
-        when (blocked == blockedByAdmin bm) $ throwChatError $ CECommandError $ if blocked then "already blocked" else "already unblocked"
-        withGroupLock "blockForAll" groupId . procCmd $ do
-          let mrs = if blocked then MRSBlocked else MRSUnrestricted
-              event = XGrpMemRestrict bmMemberId MemberRestrictions {restriction = mrs}
-          msg <- sendGroupMessage' user gInfo remainingMembers event
-          let ciContent = CISndGroupEvent $ SGEMemberBlocked memberId (fromLocalProfile bmp) blocked
-          ci <- saveSndChatItem user (CDGroupSnd gInfo) msg ciContent
-          toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci]
-          bm' <- withFastStore $ \db -> do
-            liftIO $ updateGroupMemberBlocked db user groupId memberId mrs
-            getGroupMember db vr user groupId memberId
-          toggleNtf user bm' (not blocked)
-          pure CRMemberBlockedForAllUser {user, groupInfo = gInfo, member = bm', blocked}
+      selfSelected GroupInfo {membership} = elem (groupMemberId' membership) memberIds
+      selectMembers :: [GroupMember] -> ([GroupMember], [GroupMember], [GroupMember], GroupMemberRole, Bool, Bool)
+      selectMembers = foldr' addMember ([], [], [], GRObserver, False, False)
+        where
+          addMember m@GroupMember {groupMemberId, memberStatus, memberRole} (invited, current, unchanged, maxRole, anyAdmin, anyPending)
+            | groupMemberId `elem` memberIds =
+                let maxRole' = max maxRole memberRole
+                    anyAdmin' = anyAdmin || memberRole >= GRAdmin
+                    anyPending' = anyPending || memberPending m
+                 in
+                  if
+                    | memberRole == newRole -> (invited, current, m : unchanged, maxRole', anyAdmin', anyPending')
+                    | memberStatus == GSMemInvited -> (m : invited, current, unchanged, maxRole', anyAdmin', anyPending')
+                    | otherwise -> (invited, m : current, unchanged, maxRole', anyAdmin', anyPending')
+            | otherwise = (invited, current, unchanged, maxRole, anyAdmin, anyPending)
+      changeRoleInvitedMems :: User -> GroupInfo -> [GroupMember] -> CM ([ChatError], [GroupMember])
+      changeRoleInvitedMems user gInfo memsToChange = do
+        -- not batched, as we need to send different invitations to different connections anyway
+        mems_ <- forM memsToChange $ \m -> (Right <$> changeRole m) `catchChatError` (pure . Left)
+        pure $ partitionEithers mems_
+        where
+          changeRole :: GroupMember -> CM GroupMember
+          changeRole m@GroupMember {groupMemberId, memberContactId, localDisplayName = cName} = do
+            withFastStore (\db -> (,) <$> mapM (getContact db vr user) memberContactId <*> liftIO (getMemberInvitation db user groupMemberId)) >>= \case
+              (Just ct, Just cReq) -> do
+                sendGrpInvitation user ct gInfo (m :: GroupMember) {memberRole = newRole} cReq
+                withFastStore' $ \db -> updateGroupMemberRole db user m newRole
+                pure (m :: GroupMember) {memberRole = newRole}
+              _ -> throwChatError $ CEGroupCantResendInvitation gInfo cName
+      changeRoleCurrentMems :: User -> Group -> [GroupMember] -> CM ([ChatError], [GroupMember], [AChatItem])
+      changeRoleCurrentMems user (Group gInfo members) memsToChange = case L.nonEmpty memsToChange of
+        Nothing -> pure ([], [], [])
+        Just memsToChange' -> do
+          let events = L.map (\GroupMember {memberId} -> XGrpMemRole memberId newRole) memsToChange'
+              recipients = filter memberCurrent members
+          (msgs_, _gsr) <- sendGroupMessages user gInfo Nothing recipients events
+          let itemsData = zipWith (fmap . sndItemData) memsToChange (L.toList msgs_)
+          cis_ <- saveSndChatItems user (CDGroupSnd gInfo Nothing) itemsData Nothing False
+          when (length cis_ /= length memsToChange) $ logError "changeRoleCurrentMems: memsToChange and cis_ length mismatch"
+          (errs, changed) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (updMember db) memsToChange)
+          let acis = map (AChatItem SCTGroup SMDSnd (GroupChat gInfo Nothing)) $ rights cis_
+          pure (errs, changed, acis)
+          where
+            sndItemData :: GroupMember -> SndMessage -> NewSndChatItemData c
+            sndItemData GroupMember {groupMemberId, memberProfile} msg =
+              let content = CISndGroupEvent $ SGEMemberRole groupMemberId (fromLocalProfile memberProfile) newRole
+                  ts = ciContentTexts content
+               in NewSndChatItemData msg content ts M.empty Nothing Nothing Nothing
+            updMember db m = do
+              updateGroupMemberRole db user m newRole
+              pure (m :: GroupMember) {memberRole = newRole}
+  APIBlockMembersForAll groupId memberIds blockFlag -> withUser $ \user ->
+    withGroupLock "blockForAll" groupId . procCmd $ do
+      Group gInfo members <- withFastStore $ \db -> getGroup db vr user groupId
+      when (selfSelected gInfo) $ throwCmdError "can't block/unblock self"
+      let (blockMems, remainingMems, maxRole, anyAdmin, anyPending) = selectMembers members
+      when (length blockMems /= length memberIds) $ throwChatError CEGroupMemberNotFound
+      when (length memberIds > 1 && anyAdmin) $ throwCmdError "can't block/unblock multiple members when admins selected"
+      when anyPending $ throwCmdError "can't block/unblock members pending approval"
+      assertUserGroupRole gInfo $ max GRModerator maxRole
+      blockMembers user gInfo blockMems remainingMems
     where
-      splitMember mId ms = case break ((== mId) . groupMemberId') ms of
-        (_, []) -> Nothing
-        (ms1, bm : ms2) -> Just (bm, ms1 <> ms2)
-  APIRemoveMember groupId memberId -> withUser $ \user -> do
-    Group gInfo members <- withFastStore $ \db -> getGroup db vr user groupId
-    case find ((== memberId) . groupMemberId') members of
-      Nothing -> throwChatError CEGroupMemberNotFound
-      Just m@GroupMember {memberId = mId, memberRole = mRole, memberStatus = mStatus, memberProfile} -> do
-        assertUserGroupRole gInfo $ max GRAdmin mRole
-        withGroupLock "removeMember" groupId . procCmd $ do
-          case mStatus of
-            GSMemInvited -> do
-              deleteMemberConnection user m
-              withFastStore' $ \db -> deleteGroupMember db user m
-            _ -> do
-              msg <- sendGroupMessage user gInfo members $ XGrpMemDel mId
-              ci <- saveSndChatItem user (CDGroupSnd gInfo) msg (CISndGroupEvent $ SGEMemberDeleted memberId (fromLocalProfile memberProfile))
-              toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci]
-              deleteMemberConnection' user m True
-              -- undeleted "member connected" chat item will prevent deletion of member record
-              deleteOrUpdateMemberRecord user m
-          pure $ CRUserDeletedMember user gInfo m {memberStatus = GSMemRemoved}
+      selfSelected GroupInfo {membership} = elem (groupMemberId' membership) memberIds
+      selectMembers :: [GroupMember] -> ([GroupMember], [GroupMember], GroupMemberRole, Bool, Bool)
+      selectMembers = foldr' addMember ([], [], GRObserver, False, False)
+        where
+          addMember m@GroupMember {groupMemberId, memberRole} (block, remaining, maxRole, anyAdmin, anyPending)
+            | groupMemberId `elem` memberIds =
+                let maxRole' = max maxRole memberRole
+                    anyAdmin' = anyAdmin || memberRole >= GRAdmin
+                    anyPending' = anyPending || memberPending m
+                 in (m : block, remaining, maxRole', anyAdmin', anyPending')
+            | otherwise = (block, m : remaining, maxRole, anyAdmin, anyPending)
+      blockMembers :: User -> GroupInfo -> [GroupMember] -> [GroupMember] -> CM ChatResponse
+      blockMembers user gInfo blockMems remainingMems = case L.nonEmpty blockMems of
+        Nothing -> throwCmdError "no members to block/unblock"
+        Just blockMems' -> do
+          let mrs = if blockFlag then MRSBlocked else MRSUnrestricted
+              events = L.map (\GroupMember {memberId} -> XGrpMemRestrict memberId MemberRestrictions {restriction = mrs}) blockMems'
+              recipients = filter memberCurrent remainingMems
+          (msgs_, _gsr) <- sendGroupMessages_ user gInfo recipients events
+          let itemsData = zipWith (fmap . sndItemData) blockMems (L.toList msgs_)
+          cis_ <- saveSndChatItems user (CDGroupSnd gInfo Nothing) itemsData Nothing False
+          when (length cis_ /= length blockMems) $ logError "blockMembers: blockMems and cis_ length mismatch"
+          let acis = map (AChatItem SCTGroup SMDSnd (GroupChat gInfo Nothing)) $ rights cis_
+          unless (null acis) $ toView $ CEvtNewChatItems user acis
+          (errs, blocked) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (updateGroupMemberBlocked db user gInfo mrs) blockMems)
+          unless (null errs) $ toView $ CEvtChatErrors errs
+          -- TODO not batched - requires agent batch api
+          forM_ blocked $ \m -> toggleNtf m (not blockFlag)
+          pure CRMembersBlockedForAllUser {user, groupInfo = gInfo, members = blocked, blocked = blockFlag}
+        where
+          sndItemData :: GroupMember -> SndMessage -> NewSndChatItemData c
+          sndItemData GroupMember {groupMemberId, memberProfile} msg =
+            let content = CISndGroupEvent $ SGEMemberBlocked groupMemberId (fromLocalProfile memberProfile) blockFlag
+                ts = ciContentTexts content
+             in NewSndChatItemData msg content ts M.empty Nothing Nothing Nothing
+  APIRemoveMembers {groupId, groupMemberIds, withMessages} -> withUser $ \user ->
+    withGroupLock "removeMembers" groupId . procCmd $ do
+      Group gInfo members <- withFastStore $ \db -> getGroup db vr user groupId
+      let (count, invitedMems, pendingApprvMems, pendingRvwMems, currentMems, maxRole, anyAdmin) = selectMembers members
+          memCount = S.size groupMemberIds
+      when (count /= memCount) $ throwChatError CEGroupMemberNotFound
+      when (memCount > 1 && anyAdmin) $ throwCmdError "can't remove multiple members when admins selected"
+      assertUserGroupRole gInfo $ max GRAdmin maxRole
+      (errs1, deleted1) <- deleteInvitedMems user invitedMems
+      let recipients = filter memberCurrent members
+      (errs2, deleted2, acis2) <- deleteMemsSend user gInfo Nothing recipients currentMems
+      (errs3, deleted3, acis3) <-
+        foldM (\acc m -> deletePendingMember acc user gInfo [m] m) ([], [], []) pendingApprvMems
+      let moderators = filter (\GroupMember {memberRole} -> memberRole >= GRModerator) members
+      (errs4, deleted4, acis4) <-
+        foldM (\acc m -> deletePendingMember acc user gInfo (m : moderators) m) ([], [], []) pendingRvwMems
+      let acis = acis2 <> acis3 <> acis4
+          errs = errs1 <> errs2 <> errs3 <> errs4
+          deleted = deleted1 <> deleted2 <> deleted3 <> deleted4
+      -- Read group info with updated membersRequireAttention
+      gInfo' <- withFastStore $ \db -> getGroupInfo db vr user groupId
+      let acis' = map (updateACIGroupInfo gInfo') acis
+      unless (null acis') $ toView $ CEvtNewChatItems user acis'
+      unless (null errs) $ toView $ CEvtChatErrors errs
+      when withMessages $ deleteMessages user gInfo' deleted
+      pure $ CRUserDeletedMembers user gInfo' deleted withMessages -- same order is not guaranteed
+    where
+      selectMembers :: [GroupMember] -> (Int, [GroupMember], [GroupMember], [GroupMember], [GroupMember], GroupMemberRole, Bool)
+      selectMembers = foldl' addMember (0, [], [], [], [], GRObserver, False)
+        where
+          addMember acc@(n, invited, pendingApprv, pendingRvw, current, maxRole, anyAdmin) m@GroupMember {groupMemberId, memberStatus, memberRole}
+            | groupMemberId `S.member` groupMemberIds =
+                let maxRole' = max maxRole memberRole
+                    anyAdmin' = anyAdmin || memberRole >= GRAdmin
+                    n' = n + 1
+                 in case memberStatus of
+                      GSMemInvited -> (n', m : invited, pendingApprv, pendingRvw, current, maxRole', anyAdmin')
+                      GSMemPendingApproval -> (n', invited, m : pendingApprv, pendingRvw, current, maxRole', anyAdmin')
+                      GSMemPendingReview -> (n', invited, pendingApprv, m : pendingRvw, current, maxRole', anyAdmin')
+                      _ -> (n', invited, pendingApprv, pendingRvw, m : current, maxRole', anyAdmin')
+            | otherwise = acc
+      deleteInvitedMems :: User -> [GroupMember] -> CM ([ChatError], [GroupMember])
+      deleteInvitedMems user memsToDelete = do
+        deleteMembersConnections user memsToDelete
+        lift $ partitionEithers <$> withStoreBatch' (\db -> map (delMember db) memsToDelete)
+        where
+          delMember db m = do
+            deleteGroupMember db user m
+            pure m {memberStatus = GSMemRemoved}
+      deletePendingMember :: ([ChatError], [GroupMember], [AChatItem]) -> User -> GroupInfo -> [GroupMember] -> GroupMember -> CM ([ChatError], [GroupMember], [AChatItem])
+      deletePendingMember (accErrs, accDeleted, accACIs) user gInfo recipients m = do
+        (m', scopeInfo) <- mkMemberSupportChatInfo m
+        (errs, deleted, acis) <- deleteMemsSend user gInfo (Just scopeInfo) recipients [m']
+        pure (errs <> accErrs, deleted <> accDeleted, acis <> accACIs)
+      deleteMemsSend :: User -> GroupInfo -> Maybe GroupChatScopeInfo -> [GroupMember] -> [GroupMember] -> CM ([ChatError], [GroupMember], [AChatItem])
+      deleteMemsSend user gInfo chatScopeInfo recipients memsToDelete = case L.nonEmpty memsToDelete of
+        Nothing -> pure ([], [], [])
+        Just memsToDelete' -> do
+          let chatScope = toChatScope <$> chatScopeInfo
+              events = L.map (\GroupMember {memberId} -> XGrpMemDel memberId withMessages) memsToDelete'
+          (msgs_, _gsr) <- sendGroupMessages user gInfo chatScope recipients events
+          let itemsData = zipWith (fmap . sndItemData) memsToDelete (L.toList msgs_)
+          cis_ <- saveSndChatItems user (CDGroupSnd gInfo chatScopeInfo) itemsData Nothing False
+          when (length cis_ /= length memsToDelete) $ logError "deleteCurrentMems: memsToDelete and cis_ length mismatch"
+          deleteMembersConnections' user memsToDelete True
+          (errs, deleted) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (delMember db) memsToDelete)
+          let acis = map (AChatItem SCTGroup SMDSnd (GroupChat gInfo chatScopeInfo)) $ rights cis_
+          pure (errs, deleted, acis)
+          where
+            sndItemData :: GroupMember -> SndMessage -> NewSndChatItemData c
+            sndItemData GroupMember {groupMemberId, memberProfile} msg =
+              let content = CISndGroupEvent $ SGEMemberDeleted groupMemberId (fromLocalProfile memberProfile)
+                  ts = ciContentTexts content
+               in NewSndChatItemData msg content ts M.empty Nothing Nothing Nothing
+            delMember db m = do
+              -- We're in a function used in batch member deletion, and since we're passing same gInfo for each member,
+              -- voided result (updated group info) may have incorrect state of membersRequireAttention.
+              -- To avoid complicating code by chaining group info updates,
+              -- instead we re-read it once after deleting all members before response.
+              void $ deleteOrUpdateMemberRecordIO db user gInfo m
+              pure m {memberStatus = GSMemRemoved}
+      deleteMessages user gInfo@GroupInfo {membership} ms
+        | groupFeatureMemberAllowed SGFFullDelete membership gInfo = deleteGroupMembersCIs user gInfo ms membership
+        | otherwise = markGroupMembersCIsDeleted user gInfo ms membership
   APILeaveGroup groupId -> withUser $ \user@User {userId} -> do
     Group gInfo@GroupInfo {membership} members <- withFastStore $ \db -> getGroup db vr user groupId
     filesInfo <- withFastStore' $ \db -> getGroupFileInfo db user gInfo
     withGroupLock "leaveGroup" groupId . procCmd $ do
       cancelFilesInProgress user filesInfo
-      msg <- sendGroupMessage' user gInfo members XGrpLeave
-      ci <- saveSndChatItem user (CDGroupSnd gInfo) msg (CISndGroupEvent SGEUserLeft)
-      toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci]
+      let recipients = filter memberCurrentOrPending members
+      msg <- sendGroupMessage' user gInfo recipients XGrpLeave
+      (gInfo', scopeInfo) <- mkLocalGroupChatScope gInfo
+      ci <- saveSndChatItem user (CDGroupSnd gInfo' scopeInfo) msg (CISndGroupEvent SGEUserLeft)
+      toView $ CEvtNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo' scopeInfo) ci]
       -- TODO delete direct connections that were unused
-      deleteGroupLinkIfExists user gInfo
+      deleteGroupLinkIfExists user gInfo'
       -- member records are not deleted to keep history
       deleteMembersConnections' user members True
       withFastStore' $ \db -> updateGroupMemberStatus db userId membership GSMemLeft
-      pure $ CRLeftMemberUser user gInfo {membership = membership {memberStatus = GSMemLeft}}
+      pure $ CRLeftMemberUser user gInfo' {membership = membership {memberStatus = GSMemLeft}}
   APIListMembers groupId -> withUser $ \user ->
     CRGroupMembers user <$> withFastStore (\db -> getGroup db vr user groupId)
+  -- -- validate: prohibit to delete/archive if member is pending (has to communicate approval or rejection)
+  -- APIDeleteGroupConversations groupId _gcId -> withUser $ \user -> do
+  --   _gInfo <- withFastStore $ \db -> getGroupInfo db vr user groupId
+  --   ok_ -- CRGroupConversationsArchived
+  -- APIArchiveGroupConversations groupId _gcId -> withUser $ \user -> do
+  --   _gInfo <- withFastStore $ \db -> getGroupInfo db vr user groupId
+  --   ok_ -- CRGroupConversationsDeleted
   AddMember gName cName memRole -> withUser $ \user -> do
     (groupId, contactId) <- withFastStore $ \db -> (,) <$> getGroupIdByName db user gName <*> getContactIdByName db user cName
     processChatCommand $ APIAddMember groupId contactId memRole
   JoinGroup gName enableNtfs -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
     processChatCommand $ APIJoinGroup groupId enableNtfs
-  MemberRole gName gMemberName memRole -> withMemberName gName gMemberName $ \gId gMemberId -> APIMemberRole gId gMemberId memRole
-  BlockForAll gName gMemberName blocked -> withMemberName gName gMemberName $ \gId gMemberId -> APIBlockMemberForAll gId gMemberId blocked
-  RemoveMember gName gMemberName -> withMemberName gName gMemberName APIRemoveMember
+  AcceptMember gName gMemberName memRole -> withMemberName gName gMemberName $ \gId gMemberId -> APIAcceptMember gId gMemberId memRole
+  MemberRole gName gMemberName memRole -> withMemberName gName gMemberName $ \gId gMemberId -> APIMembersRole gId [gMemberId] memRole
+  BlockForAll gName gMemberName blocked -> withMemberName gName gMemberName $ \gId gMemberId -> APIBlockMembersForAll gId [gMemberId] blocked
+  RemoveMembers gName gMemberNames withMessages -> withUser $ \user -> do
+    (gId, gMemberIds) <- withStore $ \db -> do
+      gId <- getGroupIdByName db user gName
+      gMemberIds <- S.fromList <$> mapM (getGroupMemberIdByName db user gId) (S.toList gMemberNames)
+      pure (gId, gMemberIds)
+    processChatCommand $ APIRemoveMembers gId gMemberIds withMessages
   LeaveGroup gName -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
     processChatCommand $ APILeaveGroup groupId
   DeleteGroup gName -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
-    processChatCommand $ APIDeleteChat (ChatRef CTGroup groupId) (CDMFull True)
+    processChatCommand $ APIDeleteChat (ChatRef CTGroup groupId Nothing) (CDMFull True)
   ClearGroup gName -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
-    processChatCommand $ APIClearChat (ChatRef CTGroup groupId)
+    processChatCommand $ APIClearChat (ChatRef CTGroup groupId Nothing)
   ListMembers gName -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
     processChatCommand $ APIListMembers groupId
+  ListMemberSupportChats gName -> withUser $ \user -> do
+    groupId <- withFastStore $ \db -> getGroupIdByName db user gName
+    (Group gInfo members) <- withFastStore $ \db -> getGroup db vr user groupId
+    let memberSupportChats = filter (isJust . supportChat) members
+    pure $ CRMemberSupportChats user gInfo memberSupportChats
   APIListGroups userId contactId_ search_ -> withUserId userId $ \user ->
     CRGroupsList user <$> withFastStore' (\db -> getUserGroupsWithSummary db vr user contactId_ search_)
   ListGroups cName_ search_ -> withUser $ \user@User {userId} -> do
@@ -2144,19 +2388,21 @@ processChatCommand' vr = \case
     updateGroupProfileByName gName $ \p -> p {description}
   ShowGroupDescription gName -> withUser $ \user ->
     CRGroupDescription user <$> withFastStore (\db -> getGroupInfoByName db vr user gName)
-  APICreateGroupLink groupId mRole -> withUser $ \user -> withGroupLock "createGroupLink" groupId $ do
+  APICreateGroupLink groupId mRole short -> withUser $ \user -> withGroupLock "createGroupLink" groupId $ do
     gInfo <- withFastStore $ \db -> getGroupInfo db vr user groupId
     assertUserGroupRole gInfo GRAdmin
     when (mRole > GRMember) $ throwChatError $ CEGroupMemberInitialRole gInfo mRole
     groupLinkId <- GroupLinkId <$> drgRandomBytes 16
     subMode <- chatReadVar subscriptionMode
     let crClientData = encodeJSON $ CRDataGroup groupLinkId
-    (connId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMContact (Just crClientData) IKPQOff subMode
-    withFastStore $ \db -> createGroupLink db user gInfo connId cReq groupLinkId mRole subMode
-    pure $ CRGroupLinkCreated user gInfo cReq mRole
+        userData = shortLinkUserData short
+    (connId, ccLink) <- withAgent $ \a -> createConnection a (aUserId user) True SCMContact userData (Just crClientData) IKPQOff subMode
+    ccLink' <- createdGroupLink <$> shortenCreatedLink ccLink
+    withFastStore $ \db -> createGroupLink db user gInfo connId ccLink' groupLinkId mRole subMode
+    pure $ CRGroupLinkCreated user gInfo ccLink' mRole
   APIGroupLinkMemberRole groupId mRole' -> withUser $ \user -> withGroupLock "groupLinkMemberRole" groupId $ do
     gInfo <- withFastStore $ \db -> getGroupInfo db vr user groupId
-    (groupLinkId, groupLink, mRole) <- withFastStore $ \db -> getGroupLink db user gInfo
+    (groupLinkId, groupLink, _, mRole) <- withFastStore $ \db -> getGroupLink db user gInfo
     assertUserGroupRole gInfo GRAdmin
     when (mRole' > GRMember) $ throwChatError $ CEGroupMemberInitialRole gInfo mRole'
     when (mRole' /= mRole) $ withFastStore' $ \db -> setGroupLinkMemberRole db user groupLinkId mRole'
@@ -2167,19 +2413,31 @@ processChatCommand' vr = \case
     pure $ CRGroupLinkDeleted user gInfo
   APIGetGroupLink groupId -> withUser $ \user -> do
     gInfo <- withFastStore $ \db -> getGroupInfo db vr user groupId
-    (_, groupLink, mRole) <- withFastStore $ \db -> getGroupLink db user gInfo
+    (_, groupLink, _, mRole) <- withFastStore $ \db -> getGroupLink db user gInfo
     pure $ CRGroupLink user gInfo groupLink mRole
+  APIAddGroupShortLink groupId -> withUser $ \user -> do
+    (gInfo, (uclId, _gLink@(CCLink connFullLink sLnk_), gLinkId, mRole), conn) <- withFastStore $ \db -> do
+      gInfo <- getGroupInfo db vr user groupId
+      gLink <- getGroupLink db user gInfo
+      conn <- getGroupLinkConnection db vr user gInfo
+      pure (gInfo, gLink, conn)
+    when (isJust sLnk_) $ throwCmdError "group link already has short link"
+    let crClientData = encodeJSON $ CRDataGroup gLinkId
+    sLnk <- shortenShortLink' =<< toShortGroupLink <$> withAgent (\a -> setContactShortLink a (aConnId conn) "" (Just crClientData))
+    withFastStore' $ \db -> setUserContactLinkShortLink db uclId sLnk
+    let groupLink' = CCLink connFullLink (Just sLnk)
+    pure $ CRGroupLink user gInfo groupLink' mRole
   APICreateMemberContact gId gMemberId -> withUser $ \user -> do
     (g, m) <- withFastStore $ \db -> (,) <$> getGroupInfo db vr user gId <*> getGroupMember db vr user gId gMemberId
     assertUserGroupRole g GRAuthor
-    unless (groupFeatureMemberAllowed SGFDirectMessages (membership g) g) $ throwChatError $ CECommandError "direct messages not allowed"
+    unless (groupFeatureMemberAllowed SGFDirectMessages (membership g) g) $ throwCmdError "direct messages not allowed"
     case memberConn m of
       Just mConn@Connection {peerChatVRange} -> do
         unless (maxVersion peerChatVRange >= groupDirectInvVersion) $ throwChatError CEPeerChatVRangeIncompatible
-        when (isJust $ memberContactId m) $ throwChatError $ CECommandError "member contact already exists"
+        when (isJust $ memberContactId m) $ throwCmdError "member contact already exists"
         subMode <- chatReadVar subscriptionMode
         -- TODO PQ should negotitate contact connection with PQSupportOn?
-        (connId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing IKPQOff subMode
+        (connId, CCLink cReq _) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing Nothing IKPQOff subMode
         -- [incognito] reuse membership incognito profile
         ct <- withFastStore' $ \db -> createMemberContact db user connId cReq g m mConn subMode
         -- TODO not sure it is correct to set connections status here?
@@ -2188,21 +2446,22 @@ processChatCommand' vr = \case
       _ -> throwChatError CEGroupMemberNotActive
   APISendMemberContactInvitation contactId msgContent_ -> withUser $ \user -> do
     (g@GroupInfo {groupId}, m, ct, cReq) <- withFastStore $ \db -> getMemberContact db vr user contactId
-    when (contactGrpInvSent ct) $ throwChatError $ CECommandError "x.grp.direct.inv already sent"
+    when (contactGrpInvSent ct) $ throwCmdError "x.grp.direct.inv already sent"
     case memberConn m of
       Just mConn -> do
-        let msg = XGrpDirectInv cReq msgContent_
+        -- TODO [knocking] send in correct scope - modiy API
+        let msg = XGrpDirectInv cReq msgContent_ Nothing
         (sndMsg, _, _) <- sendDirectMemberMessage mConn msg groupId
         withFastStore' $ \db -> setContactGrpInvSent db ct True
         let ct' = ct {contactGrpInvSent = True}
         forM_ msgContent_ $ \mc -> do
           ci <- saveSndChatItem user (CDDirectSnd ct') sndMsg (CISndMsgContent mc)
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct') ci]
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct') ci]
         pure $ CRNewMemberContactSentInv user ct' g m
       _ -> throwChatError CEGroupMemberNotActive
-  CreateGroupLink gName mRole -> withUser $ \user -> do
+  CreateGroupLink gName mRole short -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
-    processChatCommand $ APICreateGroupLink groupId mRole
+    processChatCommand $ APICreateGroupLink groupId mRole short
   GroupLinkMemberRole gName mRole -> withUser $ \user -> do
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
     processChatCommand $ APIGroupLinkMemberRole groupId mRole
@@ -2213,17 +2472,20 @@ processChatCommand' vr = \case
     groupId <- withFastStore $ \db -> getGroupIdByName db user gName
     processChatCommand $ APIGetGroupLink groupId
   SendGroupMessageQuote gName cName quotedMsg msg -> withUser $ \user -> do
-    groupId <- withFastStore $ \db -> getGroupIdByName db user gName
-    quotedItemId <- withFastStore $ \db -> getGroupChatItemIdByText db user groupId cName quotedMsg
+    (groupId, quotedItemId, mentions) <-
+      withFastStore $ \db -> do
+        gId <- getGroupIdByName db user gName
+        qiId <- getGroupChatItemIdByText db user gId cName quotedMsg
+        (gId, qiId,) <$> liftIO (getMessageMentions db user gId msg)
     let mc = MCText msg
-    processChatCommand $ APISendMessages (ChatRef CTGroup groupId) False Nothing (ComposedMessage Nothing (Just quotedItemId) mc :| [])
+    processChatCommand $ APISendMessages (SRGroup groupId Nothing) False Nothing [ComposedMessage Nothing (Just quotedItemId) mc mentions]
   ClearNoteFolder -> withUser $ \user -> do
     folderId <- withFastStore (`getUserNoteFolderId` user)
-    processChatCommand $ APIClearChat (ChatRef CTLocal folderId)
+    processChatCommand $ APIClearChat (ChatRef CTLocal folderId Nothing)
   LastChats count_ -> withUser' $ \user -> do
     let count = fromMaybe 5000 count_
     (errs, previews) <- partitionEithers <$> withFastStore' (\db -> getChatPreviews db vr user False (PTLast count) clqNoFilters)
-    unless (null errs) $ toView $ CRChatErrors (Just user) (map ChatErrorStore errs)
+    unless (null errs) $ toView $ CEvtChatErrors (map ChatErrorStore errs)
     pure $ CRChats previews
   LastMessages (Just chatName) count search -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
@@ -2256,19 +2518,20 @@ processChatCommand' vr = \case
   SendFile chatName f -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
     case chatRef of
-      ChatRef CTLocal folderId -> processChatCommand $ APICreateChatItems folderId (ComposedMessage (Just f) Nothing (MCFile "") :| [])
-      _ -> processChatCommand $ APISendMessages chatRef False Nothing (ComposedMessage (Just f) Nothing (MCFile "") :| [])
+      ChatRef CTLocal folderId _ -> processChatCommand $ APICreateChatItems folderId [composedMessage (Just f) (MCFile "")]
+      _ -> withSendRef chatRef $ \sendRef -> processChatCommand $ APISendMessages sendRef False Nothing [composedMessage (Just f) (MCFile "")]
   SendImage chatName f@(CryptoFile fPath _) -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
-    filePath <- lift $ toFSFilePath fPath
-    unless (any (`isSuffixOf` map toLower fPath) imageExtensions) $ throwChatError CEFileImageType {filePath}
-    fileSize <- getFileSize filePath
-    unless (fileSize <= maxImageSize) $ throwChatError CEFileImageSize {filePath}
-    -- TODO include file description for preview
-    processChatCommand $ APISendMessages chatRef False Nothing (ComposedMessage (Just f) Nothing (MCImage "" fixedImagePreview) :| [])
+    withSendRef chatRef $ \sendRef -> do
+      filePath <- lift $ toFSFilePath fPath
+      unless (any (`isSuffixOf` map toLower fPath) imageExtensions) $ throwChatError CEFileImageType {filePath}
+      fileSize <- getFileSize filePath
+      unless (fileSize <= maxImageSize) $ throwChatError CEFileImageSize {filePath}
+      -- TODO include file description for preview
+      processChatCommand $ APISendMessages sendRef False Nothing [composedMessage (Just f) (MCImage "" fixedImagePreview)]
   ForwardFile chatName fileId -> forwardFile chatName fileId SendFile
   ForwardImage chatName fileId -> forwardFile chatName fileId SendImage
-  SendFileDescription _chatName _f -> pure $ chatCmdError Nothing "TODO"
+  SendFileDescription _chatName _f -> throwCmdError "TODO"
   -- TODO to use priority transactions we need a parameter that differentiates manual and automatic acceptance
   ReceiveFile fileId userApprovedRelays encrypted_ rcvInline_ filePath_ -> withUser $ \_ ->
     withFileLock "receiveFile" fileId . procCmd $ do
@@ -2291,18 +2554,22 @@ processChatCommand' vr = \case
               throwChatError $ CEFileCancel fileId "file transfer is complete"
           | otherwise -> do
               fileAgentConnIds <- cancelSndFile user ftm fts True
-              deleteAgentConnectionsAsync user fileAgentConnIds
-              withFastStore (\db -> liftIO $ lookupChatRefByFileId db user fileId) >>= \case
-                Nothing -> pure ()
-                Just (ChatRef CTDirect contactId) -> do
+              deleteAgentConnectionsAsync fileAgentConnIds
+              cref_ <- withFastStore' $ \db -> lookupChatRefByFileId db user fileId
+              aci_ <- withFastStore $ \db -> lookupChatItemByFileId db vr user fileId
+              case (cref_, aci_) of
+                (Nothing, _) ->
+                  pure $ CRSndFileCancelled user Nothing ftm fts
+                (Just (ChatRef CTDirect contactId _), Just aci) -> do
                   (contact, sharedMsgId) <- withFastStore $ \db -> (,) <$> getContact db vr user contactId <*> getSharedMsgIdByFileId db userId fileId
                   void . sendDirectContactMessage user contact $ XFileCancel sharedMsgId
-                Just (ChatRef CTGroup groupId) -> do
-                  (Group gInfo ms, sharedMsgId) <- withFastStore $ \db -> (,) <$> getGroup db vr user groupId <*> getSharedMsgIdByFileId db userId fileId
-                  void . sendGroupMessage user gInfo ms $ XFileCancel sharedMsgId
-                Just _ -> throwChatError $ CEFileInternal "invalid chat ref for file transfer"
-              ci <- withFastStore $ \db -> lookupChatItemByFileId db vr user fileId
-              pure $ CRSndFileCancelled user ci ftm fts
+                  pure $ CRSndFileCancelled user (Just aci) ftm fts
+                (Just (ChatRef CTGroup groupId scope), Just aci) -> do
+                  (gInfo, sharedMsgId) <- withFastStore $ \db -> (,) <$> getGroupInfo db vr user groupId <*> getSharedMsgIdByFileId db userId fileId
+                  (_chatScopeInfo, recipients) <- getGroupRecipients vr user gInfo scope groupKnockingVersion
+                  void . sendGroupMessage user gInfo scope recipients $ XFileCancel sharedMsgId
+                  pure $ CRSndFileCancelled user (Just aci) ftm fts
+                (Just _, _) -> throwChatError $ CEFileInternal "invalid chat ref for file transfer"
           where
             fileCancelledOrCompleteSMP SndFileTransfer {fileStatus = s} =
               s == FSCancelled || (s == FSComplete && isNothing xftpSndFile)
@@ -2311,7 +2578,7 @@ processChatCommand' vr = \case
           | rcvFileComplete fileStatus -> throwChatError $ CEFileCancel fileId "file transfer is complete"
           | otherwise -> case xftpRcvFile of
               Nothing -> do
-                cancelRcvFileTransfer user ftr >>= mapM_ (deleteAgentConnectionAsync user)
+                cancelRcvFileTransfer user ftr >>= mapM_ deleteAgentConnectionAsync
                 ci <- withFastStore $ \db -> lookupChatItemByFileId db vr user fileId
                 pure $ CRRcvFileCancelled user ci ftr
               Just XFTPRcvFile {agentRcvFileId} -> do
@@ -2329,7 +2596,7 @@ processChatCommand' vr = \case
         pure $ CRFileTransferStatus user fileStatus
       Just ci@(AChatItem _ _ _ ChatItem {file}) -> case file of
         Just CIFile {fileProtocol = FPLocal} ->
-          throwChatError $ CECommandError "not supported for local files"
+          throwCmdError "not supported for local files"
         Just CIFile {fileProtocol = FPXFTP} ->
           pure $ CRFileTransferStatusXFTP user ci
         _ -> do
@@ -2356,6 +2623,11 @@ processChatCommand' vr = \case
   SetGroupFeatureRole (AGFR f) gName enabled role ->
     updateGroupProfileByName gName $ \p ->
       p {groupPreferences = Just . setGroupPreferenceRole f enabled role $ groupPreferences p}
+  SetGroupMemberAdmissionReview gName reviewAdmissionApplication ->
+    updateGroupProfileByName gName $ \p@GroupProfile {memberAdmission} ->
+      case memberAdmission of
+        Nothing -> p {memberAdmission = Just (emptyGroupMemberAdmission :: GroupMemberAdmission) {review = reviewAdmissionApplication}}
+        Just ma -> p {memberAdmission = Just (ma :: GroupMemberAdmission) {review = reviewAdmissionApplication}}
   SetUserTimedMessages onOff -> withUser $ \user@User {profile} -> do
     let allowed = if onOff then FAYes else FANo
         pref = TimedMessagesPreference allowed Nothing
@@ -2406,7 +2678,7 @@ processChatCommand' vr = \case
   ShowVersion -> do
     -- simplexmqCommitQ makes iOS builds crash m(
     let versionInfo = coreVersionInfo ""
-    chatMigrations <- map upMigration <$> withFastStore' Migrations.getCurrent
+    chatMigrations <- map upMigration <$> withFastStore' getCurrentMigrations
     agentMigrations <- withAgent getAgentMigrations
     pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations}
   DebugLocks -> lift $ do
@@ -2459,33 +2731,31 @@ processChatCommand' vr = \case
   GetAgentSubsDetails -> lift $ CRAgentSubsDetails <$> withAgent' getAgentSubscriptions
   GetAgentQueuesInfo -> lift $ CRAgentQueuesInfo <$> withAgent' getAgentQueuesInfo
   -- CustomChatCommand is unsupported, it can be processed in preCmdHook
-  -- in a modified CLI app or core - the hook should return Either ChatResponse ChatCommand
-  CustomChatCommand _cmd -> withUser $ \user -> pure $ chatCmdError (Just user) "not supported"
+  -- in a modified CLI app or core - the hook should return Either (Either ChatError ChatResponse) ChatCommand,
+  -- where Left means command result, and Right – some other command to be processed by this function.
+  CustomChatCommand _cmd -> withUser $ \_ -> throwCmdError "not supported"
   where
-    -- below code would make command responses asynchronous where they can be slow
-    -- in View.hs `r'` should be defined as `id` in this case
-    -- procCmd :: m ChatResponse -> m ChatResponse
-    -- procCmd action = do
-    --   ChatController {chatLock = l, smpAgent = a, outputQ = q, random = gVar} <- ask
-    --   corrId <- liftIO $ SMP.CorrId <$> randomBytes gVar 8
-    --   void . forkIO $
-    --     withAgentLock a . withLock l name $
-    --       (atomically . writeTBQueue q) . (Just corrId,) =<< (action `catchChatError` (pure . CRChatError))
-    --   pure $ CRCmdAccepted corrId
-    -- use function below to make commands "synchronous"
     procCmd :: CM ChatResponse -> CM ChatResponse
     procCmd = id
+    {-# INLINE procCmd #-}
     ok_ = pure $ CRCmdOk Nothing
     ok = pure . CRCmdOk . Just
     getChatRef :: User -> ChatName -> CM ChatRef
-    getChatRef user (ChatName cType name) =
-      ChatRef cType <$> case cType of
+    getChatRef user (ChatName cType name) = do
+      chatId <- case cType of
         CTDirect -> withFastStore $ \db -> getContactIdByName db user name
         CTGroup -> withFastStore $ \db -> getGroupIdByName db user name
         CTLocal
           | name == "" -> withFastStore (`getUserNoteFolderId` user)
-          | otherwise -> throwChatError $ CECommandError "not supported"
-        _ -> throwChatError $ CECommandError "not supported"
+          | otherwise -> throwCmdError "not supported"
+        _ -> throwCmdError "not supported"
+      pure $ ChatRef cType chatId Nothing
+    getChatRefAndMentions :: User -> ChatName -> Text -> CM (ChatRef, Map MemberName GroupMemberId)
+    getChatRefAndMentions user cName msg = do
+      chatRef@(ChatRef cType chatId _) <- getChatRef user cName
+      (chatRef,) <$> case cType of
+        CTGroup -> withFastStore' $ \db -> getMessageMentions db user chatId msg
+        _ -> pure []
 #if !defined(dbPostgres)
     checkChatStopped :: CM ChatResponse -> CM ChatResponse
     checkChatStopped a = asks agentAsync >>= readTVarIO >>= maybe a (const $ throwChatError CEChatNotStopped)
@@ -2517,19 +2787,19 @@ processChatCommand' vr = \case
       withFastStore' $ \db -> setConnectionVerified db user connId Nothing
       pure $ CRConnectionVerified user False code'
     getSentChatItemIdByText :: User -> ChatRef -> Text -> CM Int64
-    getSentChatItemIdByText user@User {userId, localDisplayName} (ChatRef cType cId) msg = case cType of
+    getSentChatItemIdByText user@User {userId, localDisplayName} (ChatRef cType cId _scope) msg = case cType of
       CTDirect -> withFastStore $ \db -> getDirectChatItemIdByText db userId cId SMDSnd msg
       CTGroup -> withFastStore $ \db -> getGroupChatItemIdByText db user cId (Just localDisplayName) msg
       CTLocal -> withFastStore $ \db -> getLocalChatItemIdByText db user cId SMDSnd msg
-      _ -> throwChatError $ CECommandError "not supported"
+      _ -> throwCmdError "not supported"
     getChatItemIdByText :: User -> ChatRef -> Text -> CM Int64
-    getChatItemIdByText user (ChatRef cType cId) msg = case cType of
+    getChatItemIdByText user (ChatRef cType cId _scope) msg = case cType of
       CTDirect -> withFastStore $ \db -> getDirectChatItemIdByText' db user cId msg
       CTGroup -> withFastStore $ \db -> getGroupChatItemIdByText' db user cId msg
       CTLocal -> withFastStore $ \db -> getLocalChatItemIdByText' db user cId msg
-      _ -> throwChatError $ CECommandError "not supported"
-    connectViaContact :: User -> IncognitoEnabled -> ConnectionRequestUri 'CMContact -> CM ChatResponse
-    connectViaContact user@User {userId} incognito cReq@(CRContactUri ConnReqUriData {crClientData}) = withInvitationLock "connectViaContact" (strEncode cReq) $ do
+      _ -> throwCmdError "not supported"
+    connectViaContact :: User -> IncognitoEnabled -> CreatedLinkContact -> CM ChatResponse
+    connectViaContact user@User {userId} incognito (CCLink cReq@(CRContactUri ConnReqUriData {crClientData}) sLnk) = withInvitationLock "connectViaContact" (strEncode cReq) $ do
       let groupLinkId = crClientData >>= decodeJSON >>= \(CRDataGroup gli) -> Just gli
           cReqHash = ConnReqUriHash . C.sha256Hash $ strEncode cReq
       case groupLinkId of
@@ -2559,11 +2829,12 @@ processChatCommand' vr = \case
           -- [incognito] generate profile to send
           incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
           subMode <- chatReadVar subscriptionMode
-          conn@PendingContactConnection {pccConnId} <- withFastStore' $ \db -> createConnReqConnection db userId connId cReqHash xContactId incognitoProfile groupLinkId subMode chatV pqSup
+          let sLnk' = serverShortLink <$> sLnk
+          conn@PendingContactConnection {pccConnId} <- withFastStore' $ \db -> createConnReqConnection db userId connId cReqHash sLnk' xContactId incognitoProfile groupLinkId subMode chatV pqSup
           joinContact user pccConnId connId cReq incognitoProfile xContactId inGroup pqSup chatV
           pure $ CRSentInvitation user conn incognitoProfile
-    connectContactViaAddress :: User -> IncognitoEnabled -> Contact -> ConnectionRequestUri 'CMContact -> CM ChatResponse
-    connectContactViaAddress user incognito ct cReq =
+    connectContactViaAddress :: User -> IncognitoEnabled -> Contact -> CreatedLinkContact -> CM ChatResponse
+    connectContactViaAddress user incognito ct (CCLink cReq shortLink) =
       withInvitationLock "connectContactViaAddress" (strEncode cReq) $ do
         newXContactId <- XContactId <$> drgRandomBytes 16
         let pqSup = PQSupportOn
@@ -2572,10 +2843,10 @@ processChatCommand' vr = \case
         -- [incognito] generate profile to send
         incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
         subMode <- chatReadVar subscriptionMode
-        (pccConnId, ct') <- withFastStore $ \db -> createAddressContactConnection db vr user ct connId cReqHash newXContactId incognitoProfile subMode chatV pqSup
+        (pccConnId, ct') <- withFastStore $ \db -> createAddressContactConnection db vr user ct connId cReqHash shortLink newXContactId incognitoProfile subMode chatV pqSup
         joinContact user pccConnId connId cReq incognitoProfile newXContactId False pqSup chatV
         pure $ CRSentInvitationToContact user ct' incognitoProfile
-    prepareContact :: User -> ConnectionRequestUri 'CMContact -> PQSupport -> CM (ConnId, VersionChat)
+    prepareContact :: User -> ConnReqContact -> PQSupport -> CM (ConnId, VersionChat)
     prepareContact user cReq pqSup = do
       -- 0) toggle disabled - PQSupportOff
       -- 1) toggle enabled, address supports PQ (connRequestPQSupport returns Just True) - PQSupportOn, enable support with compression
@@ -2586,7 +2857,7 @@ processChatCommand' vr = \case
           let chatV = agentToChatVersion agentV
           connId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq pqSup
           pure (connId, chatV)
-    joinContact :: User -> Int64 -> ConnId -> ConnectionRequestUri 'CMContact -> Maybe Profile -> XContactId -> Bool -> PQSupport -> VersionChat -> CM ()
+    joinContact :: User -> Int64 -> ConnId -> ConnReqContact -> Maybe Profile -> XContactId -> Bool -> PQSupport -> VersionChat -> CM ()
     joinContact user pccConnId connId cReq incognitoProfile xContactId inGroup pqSup chatV = do
       let profileToSend = userProfileToSend user incognitoProfile Nothing inGroup
       dm <- encodeConnInfoPQ pqSup chatV (XContact profileToSend $ Just xContactId)
@@ -2602,7 +2873,7 @@ processChatCommand' vr = \case
     contactMember :: Contact -> [GroupMember] -> Maybe GroupMember
     contactMember Contact {contactId} =
       find $ \GroupMember {memberContactId = cId, memberStatus = s} ->
-        cId == Just contactId && s /= GSMemRemoved && s /= GSMemLeft
+        cId == Just contactId && s /= GSMemRejected && s /= GSMemRemoved && s /= GSMemLeft
     checkSndFile :: CryptoFile -> CM Integer
     checkSndFile (CryptoFile f cfArgs) = do
       fsFilePath <- lift $ toFSFilePath f
@@ -2629,7 +2900,7 @@ processChatCommand' vr = \case
                 let idsEvts = L.map ctSndEvent changedCts
                 msgReqs_ <- lift $ L.zipWith ctMsgReq changedCts <$> createSndMessages idsEvts
                 (errs, cts) <- partitionEithers . L.toList . L.zipWith (second . const) changedCts <$> deliverMessagesB msgReqs_
-                unless (null errs) $ toView $ CRChatErrors (Just user) errs
+                unless (null errs) $ toView $ CEvtChatErrors errs
                 let changedCts' = filter (\ChangedProfileContact {ct, ct'} -> directOrUsed ct' && mergedPreferences ct' /= mergedPreferences ct) cts
                 lift $ createContactsSndFeatureItems user' changedCts'
                 pure
@@ -2656,7 +2927,7 @@ processChatCommand' vr = \case
         ctMsgReq :: ChangedProfileContact -> Either ChatError SndMessage -> Either ChatError ChatMsgReq
         ctMsgReq ChangedProfileContact {conn} =
           fmap $ \SndMessage {msgId, msgBody} ->
-            (conn, MsgFlags {notification = hasNotification XInfo_}, msgBody, [msgId])
+            (conn, MsgFlags {notification = hasNotification XInfo_}, (vrValue msgBody, [msgId]))
     updateContactPrefs :: User -> Contact -> Preferences -> CM ChatResponse
     updateContactPrefs _ ct@Contact {activeConn = Nothing} _ = throwChatError $ CEContactNotActive ct
     updateContactPrefs user@User {userId} ct@Contact {activeConn = Just Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
@@ -2669,7 +2940,7 @@ processChatCommand' vr = \case
               mergedProfile' = userProfileToSend user (fromLocalProfile <$> incognitoProfile) (Just ct') False
           when (mergedProfile' /= mergedProfile) $
             withContactLock "updateProfile" (contactId' ct) $ do
-              void (sendDirectContactMessage user ct' $ XInfo mergedProfile') `catchChatError` (toView . CRChatError (Just user))
+              void (sendDirectContactMessage user ct' $ XInfo mergedProfile') `catchChatError` eToView
               lift . when (directOrUsed ct') $ createSndFeatureItems user ct ct'
           pure $ CRContactPrefsUpdated user ct ct'
     runUpdateGroupProfile :: User -> Group -> GroupProfile -> CM ChatResponse
@@ -2685,14 +2956,18 @@ processChatCommand' vr = \case
             GroupMember {memberProfile = LocalProfile {displayName, fullName, image}} <-
               withStore $ \db -> getGroupMemberByMemberId db vr user g businessId
             let p'' = p' {displayName, fullName, image} :: GroupProfile
-            void $ sendGroupMessage user g' oldMs (XGrpInfo p'')
+                recipients = filter memberCurrentOrPending oldMs
+            void $ sendGroupMessage user g' Nothing recipients (XGrpInfo p'')
           let ps' = fromMaybe defaultBusinessGroupPrefs $ groupPreferences p'
-          sendGroupMessage user g' newMs $ XGrpPrefs ps'
-        Nothing -> sendGroupMessage user g' ms (XGrpInfo p')
-      let cd = CDGroupSnd g'
+              recipients = filter memberCurrentOrPending newMs
+          sendGroupMessage user g' Nothing recipients $ XGrpPrefs ps'
+        Nothing -> do
+          let recipients = filter memberCurrentOrPending ms
+          sendGroupMessage user g' Nothing recipients (XGrpInfo p')
+      let cd = CDGroupSnd g' Nothing
       unless (sameGroupProfileInfo p p') $ do
         ci <- saveSndChatItem user cd msg (CISndGroupEvent $ SGEGroupUpdated p')
-        toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat g') ci]
+        toView $ CEvtNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat g' Nothing) ci]
       createGroupFeatureChangedItems user cd CISndGroupFeature g g'
       pure $ CRGroupUpdated user g g' Nothing
     checkValidName :: GroupName -> CM ()
@@ -2707,15 +2982,43 @@ processChatCommand' vr = \case
       when (memberStatus membership == GSMemInvited) $ throwChatError (CEGroupNotJoined g)
       when (memberRemoved membership) $ throwChatError CEGroupMemberUserRemoved
       unless (memberActive membership) $ throwChatError CEGroupMemberNotActive
-    delGroupChatItems :: User -> GroupInfo -> [CChatItem 'CTGroup] -> Maybe GroupMember -> CM ChatResponse
-    delGroupChatItems user gInfo items byGroupMember = do
+    delGroupChatItemsForMembers :: User -> GroupInfo -> Maybe GroupChatScopeInfo -> [GroupMember] -> [CChatItem 'CTGroup] -> CM [ChatItemDeletion]
+    delGroupChatItemsForMembers user gInfo chatScopeInfo ms items = do
+      assertDeletable gInfo items
+      assertUserGroupRole gInfo GRAdmin -- TODO GRModerator when most users migrate
+      let msgMemIds = itemsMsgMemIds gInfo items
+          events = L.nonEmpty $ map (\(msgId, memId) -> XMsgDel msgId (Just memId)) msgMemIds
+      mapM_ (sendGroupMessages_ user gInfo ms) events
+      delGroupChatItems user gInfo chatScopeInfo items True
+      where
+        assertDeletable :: GroupInfo -> [CChatItem 'CTGroup] -> CM ()
+        assertDeletable GroupInfo {membership = GroupMember {memberRole = membershipMemRole}} items' =
+          unless (all itemDeletable items') $ throwChatError CEInvalidChatItemDelete
+          where
+            itemDeletable :: CChatItem 'CTGroup -> Bool
+            itemDeletable (CChatItem _ ChatItem {chatDir, meta = CIMeta {itemSharedMsgId}}) =
+              case chatDir of
+                CIGroupRcv GroupMember {memberRole} -> membershipMemRole >= memberRole && isJust itemSharedMsgId
+                CIGroupSnd -> isJust itemSharedMsgId
+        itemsMsgMemIds :: GroupInfo -> [CChatItem 'CTGroup] -> [(SharedMsgId, MemberId)]
+        itemsMsgMemIds GroupInfo {membership = GroupMember {memberId = membershipMemId}} = mapMaybe itemMsgMemIds
+          where
+            itemMsgMemIds :: CChatItem 'CTGroup -> Maybe (SharedMsgId, MemberId)
+            itemMsgMemIds (CChatItem _ ChatItem {chatDir, meta = CIMeta {itemSharedMsgId}}) =
+              join <$> forM itemSharedMsgId $ \msgId -> Just $ case chatDir of
+                CIGroupRcv GroupMember {memberId} -> (msgId, memberId)
+                CIGroupSnd -> (msgId, membershipMemId)
+
+    delGroupChatItems :: User -> GroupInfo -> Maybe GroupChatScopeInfo -> [CChatItem 'CTGroup] -> Bool -> CM [ChatItemDeletion]
+    delGroupChatItems user gInfo@GroupInfo {membership} chatScopeInfo items moderation = do
       deletedTs <- liftIO getCurrentTime
-      forM_ byGroupMember $ \byMember -> do
-        ciIds <- concat <$> withStore' (\db -> forM items $ \(CChatItem _ ci) -> markMessageReportsDeleted db user gInfo ci byMember deletedTs)
-        unless (null ciIds) $ toView $ CRGroupChatItemsDeleted user gInfo ciIds False (Just byMember)
-      if groupFeatureAllowed SGFFullDelete gInfo
-        then deleteGroupCIs user gInfo items True False byGroupMember deletedTs
-        else markGroupCIsDeleted user gInfo items True byGroupMember deletedTs
+      when moderation $ do
+        ciIds <- concat <$> withStore' (\db -> forM items $ \(CChatItem _ ci) -> markMessageReportsDeleted db user gInfo ci membership deletedTs)
+        unless (null ciIds) $ toView $ CEvtGroupChatItemsDeleted user gInfo ciIds True (Just membership)
+      let m = if moderation then Just membership else Nothing
+      if groupFeatureMemberAllowed SGFFullDelete membership gInfo
+        then deleteGroupCIs user gInfo chatScopeInfo items m deletedTs
+        else markGroupCIsDeleted user gInfo chatScopeInfo items m deletedTs
     updateGroupProfileByName :: GroupName -> (GroupProfile -> GroupProfile) -> CM ChatResponse
     updateGroupProfileByName gName update = withUser $ \user -> do
       g@(Group GroupInfo {groupProfile = p} _) <- withStore $ \db ->
@@ -2792,9 +3095,9 @@ processChatCommand' vr = \case
       let content = CISndGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
       timed_ <- contactCITimed ct
       ci <- saveSndChatItem' user (CDDirectSnd ct) msg content Nothing Nothing Nothing timed_ False
-      toView $ CRNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
+      toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
       forM_ (timed_ >>= timedDeleteAt') $
-        startProximateTimedItemThread user (ChatRef CTDirect contactId, chatItemId' ci)
+        startProximateTimedItemThread user (ChatRef CTDirect contactId Nothing, chatItemId' ci)
     drgRandomBytes :: Int -> CM ByteString
     drgRandomBytes n = asks random >>= atomically . C.randomBytes n
     privateGetUser :: UserId -> CM User
@@ -2838,11 +3141,10 @@ processChatCommand' vr = \case
     deleteChatUser :: User -> Bool -> CM ChatResponse
     deleteChatUser user delSMPQueues = do
       filesInfo <- withFastStore' (`getUserFileInfo` user)
-      cancelFilesInProgress user filesInfo
-      deleteFilesLocally filesInfo
+      deleteCIFiles user filesInfo
       withAgent (\a -> deleteUser a (aUserId user) delSMPQueues)
         `catchChatError` \case
-          e@(ChatErrorAgent NO_USER _) -> toView $ CRChatError (Just user) e
+          e@(ChatErrorAgent NO_USER _) -> eToView e
           e -> throwError e
       withFastStore' (`deleteUserRecord` user)
       when (activeUser user) $ chatWriteVar currentUser Nothing
@@ -2859,34 +3161,79 @@ processChatCommand' vr = \case
             gId <- getGroupIdByName db user name
             GroupInfo {chatSettings} <- getGroupInfo db vr user gId
             pure (gId, chatSettings)
-        _ -> throwChatError $ CECommandError "not supported"
-      processChatCommand $ APISetChatSettings (ChatRef cType chatId) $ updateSettings chatSettings
-    connectPlan :: User -> AConnectionRequestUri -> CM ConnectionPlan
-    connectPlan user (ACR SCMInvitation (CRInvitationUri crData e2e)) = do
-      withFastStore' (\db -> getConnectionEntityByConnReq db vr user cReqSchemas) >>= \case
-        Nothing -> pure $ CPInvitationLink ILPOk
-        Just (RcvDirectMsgConnection Connection {connStatus = ConnPrepared} Nothing) ->
-          pure $ CPInvitationLink ILPOk
-        Just (RcvDirectMsgConnection conn ct_) -> do
-          let Connection {connStatus, contactConnInitiated} = conn
-          if
-            | connStatus == ConnNew && contactConnInitiated ->
-                pure $ CPInvitationLink ILPOwnLink
-            | not (connReady conn) ->
-                pure $ CPInvitationLink (ILPConnecting ct_)
-            | otherwise -> case ct_ of
-                Just ct -> pure $ CPInvitationLink (ILPKnown ct)
-                Nothing -> throwChatError $ CEInternalError "ready RcvDirectMsgConnection connection should have associated contact"
-        Just _ -> throwChatError $ CECommandError "found connection entity is not RcvDirectMsgConnection"
+        _ -> throwCmdError "not supported"
+      processChatCommand $ APISetChatSettings (ChatRef cType chatId Nothing) $ updateSettings chatSettings
+    connectPlan :: User -> AConnectionLink -> CM (ACreatedConnLink, ConnectionPlan)
+    connectPlan user (ACL SCMInvitation cLink) = case cLink of
+      CLFull cReq -> invitationReqAndPlan cReq Nothing
+      CLShort l -> do
+        let l' = serverShortLink l
+        withFastStore' (\db -> getConnectionEntityViaShortLink db vr user l') >>= \case
+          Just (cReq, ent) ->
+            (ACCL SCMInvitation (CCLink cReq (Just l')),) <$> (invitationEntityPlan ent `catchChatError` (pure . CPError))
+          Nothing -> getShortLinkConnReq user l' >>= (`invitationReqAndPlan` Just l')
       where
-        cReqSchemas :: (ConnReqInvitation, ConnReqInvitation)
-        cReqSchemas =
+        invitationReqAndPlan cReq sLnk_ = do
+          plan <- inviationRequestPlan user cReq `catchChatError` (pure . CPError)
+          pure (ACCL SCMInvitation (CCLink cReq sLnk_), plan)
+    connectPlan user (ACL SCMContact cLink) = case cLink of
+      CLFull cReq -> contactReqAndPlan cReq Nothing
+      CLShort l@(CSLContact _ ct _ _) -> do
+        let l' = serverShortLink l
+        case ct of
+          CCTContact ->
+            withFastStore' (\db -> getUserContactLinkViaShortLink db user l') >>= \case
+              Just (UserContactLink (CCLink cReq _) _) -> pure (ACCL SCMContact $ CCLink cReq (Just l'), CPContactAddress CAPOwnLink)
+              Nothing -> getShortLinkConnReq user l' >>= (`contactReqAndPlan` Just l')
+          CCTGroup ->
+            withFastStore' (\db -> getGroupInfoViaUserShortLink db vr user l') >>= \case
+              Just (cReq, g) -> pure (ACCL SCMContact $ CCLink cReq (Just l'), CPGroupLink (GLPOwnLink g))
+              Nothing -> getShortLinkConnReq user l' >>= (`contactReqAndPlan` Just l')
+          CCTChannel -> throwCmdError "channel links are not supported in this version"
+      where
+        contactReqAndPlan cReq sLnk_ = do
+          plan <- contactRequestPlan user cReq `catchChatError` (pure . CPError)
+          pure (ACCL SCMContact $ CCLink cReq sLnk_, plan)
+    connectWithPlan :: User -> IncognitoEnabled -> ACreatedConnLink -> ConnectionPlan -> CM ChatResponse
+    connectWithPlan user@User {userId} incognito ccLink plan
+      | connectionPlanProceed plan = do
+          case plan of CPError e -> eToView e; _ -> pure ()
+          case plan of
+            CPContactAddress (CAPContactViaAddress Contact {contactId}) ->
+              processChatCommand $ APIConnectContactViaAddress userId incognito contactId
+            _ -> processChatCommand $ APIConnect userId incognito (Just ccLink)
+      | otherwise = pure $ CRConnectionPlan user ccLink plan
+    inviationRequestPlan :: User -> ConnReqInvitation -> CM ConnectionPlan
+    inviationRequestPlan user cReq = do
+      withFastStore' (\db -> getConnectionEntityByConnReq db vr user $ cReqSchemas cReq) >>= \case
+        Nothing -> pure $ CPInvitationLink ILPOk
+        Just ent -> invitationEntityPlan ent
+      where
+        cReqSchemas :: ConnReqInvitation -> (ConnReqInvitation, ConnReqInvitation)
+        cReqSchemas (CRInvitationUri crData e2e) =
           ( CRInvitationUri crData {crScheme = SSSimplex} e2e,
             CRInvitationUri crData {crScheme = simplexChat} e2e
           )
-    connectPlan user (ACR SCMContact (CRContactUri crData)) = do
+    invitationEntityPlan :: ConnectionEntity -> CM ConnectionPlan
+    invitationEntityPlan = \case
+      RcvDirectMsgConnection Connection {connStatus = ConnPrepared} Nothing ->
+        pure $ CPInvitationLink ILPOk
+      RcvDirectMsgConnection conn ct_ -> do
+        let Connection {connStatus, contactConnInitiated} = conn
+        if
+          | connStatus == ConnNew && contactConnInitiated ->
+              pure $ CPInvitationLink ILPOwnLink
+          | not (connReady conn) ->
+              pure $ CPInvitationLink (ILPConnecting ct_)
+          | otherwise -> case ct_ of
+              Just ct -> pure $ CPInvitationLink (ILPKnown ct)
+              Nothing -> throwChatError $ CEInternalError "ready RcvDirectMsgConnection connection should have associated contact"
+      _ -> throwCmdError "found connection entity is not RcvDirectMsgConnection"
+    contactRequestPlan :: User -> ConnReqContact -> CM ConnectionPlan
+    contactRequestPlan user (CRContactUri crData) = do
       let ConnReqUriData {crClientData} = crData
           groupLinkId = crClientData >>= decodeJSON >>= \(CRDataGroup gli) -> Just gli
+          cReqHashes = bimap hash hash cReqSchemas
       case groupLinkId of
         -- contact address
         Nothing ->
@@ -2904,7 +3251,7 @@ processChatCommand' vr = \case
                   | contactDeleted ct -> pure $ CPContactAddress CAPOk
                   | otherwise -> pure $ CPContactAddress (CAPKnown ct)
                 Just (RcvGroupMsgConnection _ gInfo _) -> groupPlan gInfo
-                Just _ -> throwChatError $ CECommandError "found connection entity is not RcvDirectMsgConnection or RcvGroupMsgConnection"
+                Just _ -> throwCmdError "found connection entity is not RcvDirectMsgConnection or RcvGroupMsgConnection"
         -- group link
         Just _ ->
           withFastStore' (\db -> getGroupInfoByUserContactLinkConnReq db vr user cReqSchemas) >>= \case
@@ -2918,10 +3265,11 @@ processChatCommand' vr = \case
                 (Nothing, Just (RcvDirectMsgConnection _ (Just ct)))
                   | not (contactReady ct) && contactActive ct -> pure $ CPGroupLink (GLPConnectingProhibit gInfo_)
                   | otherwise -> pure $ CPGroupLink GLPOk
-                (Nothing, Just _) -> throwChatError $ CECommandError "found connection entity is not RcvDirectMsgConnection"
+                (Nothing, Just _) -> throwCmdError "found connection entity is not RcvDirectMsgConnection"
                 (Just gInfo, _) -> groupPlan gInfo
       where
         groupPlan gInfo@GroupInfo {membership}
+          | memberStatus membership == GSMemRejected = pure $ CPGroupLink (GLPKnown gInfo)
           | not (memberActive membership) && not (memberRemoved membership) =
               pure $ CPGroupLink (GLPConnectingProhibit $ Just gInfo)
           | memberActive membership = pure $ CPGroupLink (GLPKnown gInfo)
@@ -2931,134 +3279,173 @@ processChatCommand' vr = \case
           ( CRContactUri crData {crScheme = SSSimplex},
             CRContactUri crData {crScheme = simplexChat}
           )
-        cReqHashes :: (ConnReqUriHash, ConnReqUriHash)
-        cReqHashes = bimap hash hash cReqSchemas
+        hash :: ConnReqContact -> ConnReqUriHash
         hash = ConnReqUriHash . C.sha256Hash . strEncode
+    getShortLinkConnReq :: User -> ConnShortLink m -> CM (ConnectionRequestUri m)
+    getShortLinkConnReq user l = do
+      l' <- restoreShortLink' l
+      (cReq, cData) <- withAgent (\a -> getConnShortLink a (aUserId user) l')
+      case cData of
+        ContactLinkData {direct} | not direct -> throwChatError CEUnsupportedConnReq
+        _ -> pure ()
+      pure cReq
+    -- This function is needed, as UI uses simplex:/ schema in message view, so that the links can be handled without browser,
+    -- and short links are stored with server hostname schema, so they wouldn't match without it.
+    serverShortLink :: ConnShortLink m -> ConnShortLink m
+    serverShortLink = \case
+      CSLInvitation _ srv lnkId linkKey -> CSLInvitation SLSServer srv lnkId linkKey
+      CSLContact _ ct srv linkKey -> CSLContact SLSServer ct srv linkKey
+    restoreShortLink' l = (`restoreShortLink` l) <$> asks (shortLinkPresetServers . config)
+    shortLinkUserData short = if short then Just "" else Nothing
+    shortenShortLink' :: ConnShortLink m -> CM (ConnShortLink m)
+    shortenShortLink' l = (`shortenShortLink` l) <$> asks (shortLinkPresetServers . config)
+    shortenCreatedLink :: CreatedConnLink m -> CM (CreatedConnLink m)
+    shortenCreatedLink (CCLink cReq sLnk) = CCLink cReq <$> mapM shortenShortLink' sLnk
+    createdGroupLink :: CreatedLinkContact -> CreatedLinkContact
+    createdGroupLink (CCLink cReq shortLink) = CCLink cReq (toShortGroupLink <$> shortLink)
+    toShortGroupLink :: ShortLinkContact -> ShortLinkContact
+    toShortGroupLink (CSLContact sch _ srv k) = CSLContact sch CCTGroup srv k
+    updateCIGroupInvitationStatus :: User -> GroupInfo -> CIGroupInvitationStatus -> CM ()
     updateCIGroupInvitationStatus user GroupInfo {groupId} newStatus = do
       AChatItem _ _ cInfo ChatItem {content, meta = CIMeta {itemId}} <- withFastStore $ \db -> getChatItemByGroupId db vr user groupId
       case (cInfo, content) of
         (DirectChat ct@Contact {contactId}, CIRcvGroupInvitation ciGroupInv@CIGroupInvitation {status} memRole)
           | status == CIGISPending -> do
-              let aciContent = ACIContent SMDRcv $ CIRcvGroupInvitation ciGroupInv {status = newStatus} memRole
+              let aciContent = ACIContent SMDRcv $ CIRcvGroupInvitation (ciGroupInv {status = newStatus} :: CIGroupInvitation) memRole
               timed_ <- contactCITimed ct
               updateDirectChatItemView user ct itemId aciContent False False timed_ Nothing
               forM_ (timed_ >>= timedDeleteAt') $
-                startProximateTimedItemThread user (ChatRef CTDirect contactId, itemId)
+                startProximateTimedItemThread user (ChatRef CTDirect contactId Nothing, itemId)
         _ -> pure () -- prohibited
     assertAllowedContent :: MsgContent -> CM ()
     assertAllowedContent = \case
-      MCReport {} -> throwChatError $ CECommandError "sending reports via this API is not supported"
+      MCReport {} -> throwCmdError "sending reports via this API is not supported"
       _ -> pure ()
     assertAllowedContent' :: ComposedMessage -> CM ()
-    assertAllowedContent' ComposedMessage {msgContent} = assertAllowedContent msgContent        
-    sendContactContentMessages :: User -> ContactId -> Bool -> Maybe Int -> NonEmpty ComposeMessageReq -> CM ChatResponse
+    assertAllowedContent' ComposedMessage {msgContent} = assertAllowedContent msgContent
+    assertNoMentions :: ComposedMessage -> CM ()
+    assertNoMentions ComposedMessage {mentions}
+      | null mentions = pure ()
+      | otherwise = throwCmdError "mentions are not supported in this chat"
+    sendContactContentMessages :: User -> ContactId -> Bool -> Maybe Int -> NonEmpty ComposedMessageReq -> CM ChatResponse
     sendContactContentMessages user contactId live itemTTL cmrs = do
       assertMultiSendable live cmrs
-      ct@Contact {contactUsed} <- withFastStore $ \db -> getContact db vr user contactId
+      ct <- withFastStore $ \db -> getContact db vr user contactId
       assertDirectAllowed user MDSnd ct XMsgNew_
       assertVoiceAllowed ct
-      unless contactUsed $ withFastStore' $ \db -> updateContactUsed db user ct
       processComposedMessages ct
       where
         assertVoiceAllowed :: Contact -> CM ()
         assertVoiceAllowed ct =
-          when (not (featureAllowed SCFVoice forUser ct) && any (\(ComposedMessage {msgContent}, _) -> isVoice msgContent) cmrs) $
-            throwChatError (CECommandError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFVoice))
+          when (not (featureAllowed SCFVoice forUser ct) && any (\(ComposedMessage {msgContent}, _, _, _) -> isVoice msgContent) cmrs) $
+            throwCmdError $ "feature not allowed " <> T.unpack (chatFeatureNameText CFVoice)
         processComposedMessages :: Contact -> CM ChatResponse
         processComposedMessages ct = do
           (fInvs_, ciFiles_) <- L.unzip <$> setupSndFileTransfers
           timed_ <- sndContactCITimed live ct itemTTL
           (msgContainers, quotedItems_) <- L.unzip <$> prepareMsgs (L.zip cmrs fInvs_) timed_
           msgs_ <- sendDirectContactMessages user ct $ L.map XMsgNew msgContainers
-          let itemsData = prepareSndItemsData msgs_ cmrs ciFiles_ quotedItems_
+          let itemsData = prepareSndItemsData (L.toList cmrs) (L.toList ciFiles_) (L.toList quotedItems_) msgs_
           when (length itemsData /= length cmrs) $ logError "sendContactContentMessages: cmrs and itemsData length mismatch"
           r@(_, cis) <- partitionEithers <$> saveSndChatItems user (CDDirectSnd ct) itemsData timed_ live
-          processSendErrs user r
+          processSendErrs r
           forM_ (timed_ >>= timedDeleteAt') $ \deleteAt ->
             forM_ cis $ \ci ->
-              startProximateTimedItemThread user (ChatRef CTDirect contactId, chatItemId' ci) deleteAt
+              startProximateTimedItemThread user (ChatRef CTDirect contactId Nothing, chatItemId' ci) deleteAt
           pure $ CRNewChatItems user (map (AChatItem SCTDirect SMDSnd (DirectChat ct)) cis)
           where
             setupSndFileTransfers :: CM (NonEmpty (Maybe FileInvitation, Maybe (CIFile 'MDSnd)))
             setupSndFileTransfers =
-              forM cmrs $ \(ComposedMessage {fileSource = file_}, _) -> case file_ of
+              forM cmrs $ \(ComposedMessage {fileSource = file_}, _, _, _) -> case file_ of
                 Just file -> do
                   fileSize <- checkSndFile file
                   (fInv, ciFile) <- xftpSndFileTransfer user file fileSize 1 $ CGContact ct
                   pure (Just fInv, Just ciFile)
                 Nothing -> pure (Nothing, Nothing)
-            prepareMsgs :: NonEmpty (ComposeMessageReq, Maybe FileInvitation) -> Maybe CITimed -> CM (NonEmpty (MsgContainer, Maybe (CIQuote 'CTDirect)))
-            prepareMsgs cmsFileInvs timed_ =
-              forM cmsFileInvs $ \((ComposedMessage {quotedItemId, msgContent = mc}, itemForwarded), fInv_) ->
+            prepareMsgs :: NonEmpty (ComposedMessageReq, Maybe FileInvitation) -> Maybe CITimed -> CM (NonEmpty (MsgContainer, Maybe (CIQuote 'CTDirect)))
+            prepareMsgs cmsFileInvs timed_ = withFastStore $ \db ->
+              forM cmsFileInvs $ \((ComposedMessage {quotedItemId, msgContent = mc}, itemForwarded, _, _), fInv_) -> do
                 case (quotedItemId, itemForwarded) of
-                  (Nothing, Nothing) -> pure (MCSimple (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
-                  (Nothing, Just _) -> pure (MCForward (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
+                  (Nothing, Nothing) -> pure (MCSimple (ExtMsgContent mc M.empty fInv_ (ttl' <$> timed_) (justTrue live) Nothing), Nothing)
+                  (Nothing, Just _) -> pure (MCForward (ExtMsgContent mc M.empty fInv_ (ttl' <$> timed_) (justTrue live) Nothing), Nothing)
                   (Just qiId, Nothing) -> do
                     CChatItem _ qci@ChatItem {meta = CIMeta {itemTs, itemSharedMsgId}, formattedText, file} <-
-                      withFastStore $ \db -> getDirectChatItem db user contactId qiId
+                      getDirectChatItem db user contactId qiId
                     (origQmc, qd, sent) <- quoteData qci
                     let msgRef = MsgRef {msgId = itemSharedMsgId, sentAt = itemTs, sent, memberId = Nothing}
                         qmc = quoteContent mc origQmc file
                         quotedItem = CIQuote {chatDir = qd, itemId = Just qiId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc, formattedText}
-                    pure (MCQuote QuotedMsg {msgRef, content = qmc} (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Just quotedItem)
-                  (Just _, Just _) -> throwChatError CEInvalidQuote
+                    pure (MCQuote QuotedMsg {msgRef, content = qmc} (ExtMsgContent mc M.empty fInv_ (ttl' <$> timed_) (justTrue live) Nothing), Just quotedItem)
+                  (Just _, Just _) -> throwError SEInvalidQuote
               where
-                quoteData :: ChatItem c d -> CM (MsgContent, CIQDirection 'CTDirect, Bool)
-                quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} = throwChatError CEInvalidQuote
+                quoteData :: ChatItem c d -> ExceptT StoreError IO (MsgContent, CIQDirection 'CTDirect, Bool)
+                quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} = throwError SEInvalidQuote
                 quoteData ChatItem {content = CISndMsgContent qmc} = pure (qmc, CIQDirectSnd, True)
                 quoteData ChatItem {content = CIRcvMsgContent qmc} = pure (qmc, CIQDirectRcv, False)
-                quoteData _ = throwChatError CEInvalidQuote
-    sendGroupContentMessages :: User -> GroupId -> Bool -> Maybe Int -> NonEmpty ComposeMessageReq -> CM ChatResponse
-    sendGroupContentMessages user groupId live itemTTL cmrs = do
+                quoteData _ = throwError SEInvalidQuote
+    sendGroupContentMessages :: User -> GroupInfo -> Maybe GroupChatScope -> Bool -> Maybe Int -> NonEmpty ComposedMessageReq -> CM ChatResponse
+    sendGroupContentMessages user gInfo scope live itemTTL cmrs = do
       assertMultiSendable live cmrs
-      Group gInfo ms <- withFastStore $ \db -> getGroup db vr user groupId
-      sendGroupContentMessages_ user gInfo ms live itemTTL cmrs
-    sendGroupContentMessages_ :: User -> GroupInfo -> [GroupMember] -> Bool -> Maybe Int -> NonEmpty ComposeMessageReq -> CM ChatResponse
-    sendGroupContentMessages_ user gInfo@GroupInfo {groupId, membership} ms live itemTTL cmrs = do
-      assertUserGroupRole gInfo GRAuthor
+      (chatScopeInfo, recipients) <- getGroupRecipients vr user gInfo scope modsCompatVersion
+      sendGroupContentMessages_ user gInfo scope chatScopeInfo recipients live itemTTL cmrs
+        where
+          hasReport = any (\(ComposedMessage {msgContent}, _, _, _) -> isReport msgContent) cmrs
+          modsCompatVersion = if hasReport then contentReportsVersion else groupKnockingVersion
+    sendGroupContentMessages_ :: User -> GroupInfo -> Maybe GroupChatScope -> Maybe GroupChatScopeInfo -> [GroupMember] -> Bool -> Maybe Int -> NonEmpty ComposedMessageReq -> CM ChatResponse
+    sendGroupContentMessages_ user gInfo@GroupInfo {groupId, membership} scope chatScopeInfo recipients live itemTTL cmrs = do
+      forM_ allowedRole $ assertUserGroupRole gInfo
       assertGroupContentAllowed
       processComposedMessages
       where
+        allowedRole :: Maybe GroupMemberRole
+        allowedRole = case scope of
+          Nothing -> Just GRAuthor
+          Just (GCSMemberSupport Nothing)
+            | memberPending membership -> Nothing
+            | otherwise -> Just GRObserver
+          Just (GCSMemberSupport (Just _gmId)) -> Just GRModerator
         assertGroupContentAllowed :: CM ()
         assertGroupContentAllowed =
           case findProhibited (L.toList cmrs) of
-            Just f -> throwChatError (CECommandError $ "feature not allowed " <> T.unpack (groupFeatureNameText f))
+            Just f -> throwCmdError $ "feature not allowed " <> T.unpack (groupFeatureNameText f)
             Nothing -> pure ()
           where
-            findProhibited :: [ComposeMessageReq] -> Maybe GroupFeature
+            findProhibited :: [ComposedMessageReq] -> Maybe GroupFeature
             findProhibited =
               foldr'
-                (\(ComposedMessage {fileSource, msgContent = mc}, _) acc -> prohibitedGroupContent gInfo membership mc fileSource <|> acc)
+                (\(ComposedMessage {fileSource, msgContent = mc}, _, (_, ft), _) acc -> prohibitedGroupContent gInfo membership chatScopeInfo mc ft fileSource True <|> acc)
                 Nothing
-        processComposedMessages :: CM ChatResponse
+        processComposedMessages ::  CM ChatResponse
         processComposedMessages = do
-          (fInvs_, ciFiles_) <- L.unzip <$> setupSndFileTransfers (length $ filter memberCurrent ms)
+          (fInvs_, ciFiles_) <- L.unzip <$> setupSndFileTransfers (length recipients)
           timed_ <- sndGroupCITimed live gInfo itemTTL
-          (msgContainers, quotedItems_) <- L.unzip <$> prepareMsgs (L.zip cmrs fInvs_) timed_
-          (msgs_, gsr) <- sendGroupMessages user gInfo ms $ L.map XMsgNew msgContainers
-          let itemsData = prepareSndItemsData (L.toList msgs_) cmrs ciFiles_ quotedItems_
-          cis_ <- saveSndChatItems user (CDGroupSnd gInfo) itemsData timed_ live
-          when (length itemsData /= length cmrs) $ logError "sendGroupContentMessages: cmrs and cis_ length mismatch"
+          (chatMsgEvents, quotedItems_) <- L.unzip <$> prepareMsgs (L.zip cmrs fInvs_) timed_
+          (msgs_, gsr) <- sendGroupMessages user gInfo Nothing recipients chatMsgEvents
+          let itemsData = prepareSndItemsData (L.toList cmrs) (L.toList ciFiles_) (L.toList quotedItems_) (L.toList msgs_)
+          cis_ <- saveSndChatItems user (CDGroupSnd gInfo chatScopeInfo) itemsData timed_ live
+          when (length cis_ /= length cmrs) $ logError "sendGroupContentMessages: cmrs and cis_ length mismatch"
           createMemberSndStatuses cis_ msgs_ gsr
           let r@(_, cis) = partitionEithers cis_
-          processSendErrs user r
+          processSendErrs r
           forM_ (timed_ >>= timedDeleteAt') $ \deleteAt ->
             forM_ cis $ \ci ->
-              startProximateTimedItemThread user (ChatRef CTGroup groupId, chatItemId' ci) deleteAt
-          pure $ CRNewChatItems user (map (AChatItem SCTGroup SMDSnd (GroupChat gInfo)) cis)
+              startProximateTimedItemThread user (ChatRef CTGroup groupId scope, chatItemId' ci) deleteAt
+          pure $ CRNewChatItems user (map (AChatItem SCTGroup SMDSnd (GroupChat gInfo chatScopeInfo)) cis)
           where
             setupSndFileTransfers :: Int -> CM (NonEmpty (Maybe FileInvitation, Maybe (CIFile 'MDSnd)))
             setupSndFileTransfers n =
-              forM cmrs $ \(ComposedMessage {fileSource = file_}, _) -> case file_ of
+              forM cmrs $ \(ComposedMessage {fileSource = file_}, _, _, _) -> case file_ of
                 Just file -> do
                   fileSize <- checkSndFile file
-                  (fInv, ciFile) <- xftpSndFileTransfer user file fileSize n $ CGGroup gInfo ms
+                  (fInv, ciFile) <- xftpSndFileTransfer user file fileSize n $ CGGroup gInfo recipients
                   pure (Just fInv, Just ciFile)
                 Nothing -> pure (Nothing, Nothing)
-            prepareMsgs :: NonEmpty (ComposeMessageReq, Maybe FileInvitation) -> Maybe CITimed -> CM (NonEmpty (MsgContainer, Maybe (CIQuote 'CTGroup)))
-            prepareMsgs cmsFileInvs timed_ =
-              forM cmsFileInvs $ \((ComposedMessage {quotedItemId, msgContent = mc}, itemForwarded), fInv_) ->
-                prepareGroupMsg user gInfo mc quotedItemId itemForwarded fInv_ timed_ live
+            prepareMsgs :: NonEmpty (ComposedMessageReq, Maybe FileInvitation) -> Maybe CITimed -> CM (NonEmpty (ChatMsgEvent 'Json, Maybe (CIQuote 'CTGroup)))
+            prepareMsgs cmsFileInvs timed_ = withFastStore $ \db ->
+              forM cmsFileInvs $ \((ComposedMessage {quotedItemId, msgContent = mc}, itemForwarded, _, ciMentions), fInv_) ->
+                let msgScope = toMsgScope gInfo <$> chatScopeInfo
+                    mentions = M.map (\CIMention {memberId} -> MsgMention {memberId}) ciMentions
+                 in prepareGroupMsg db user gInfo msgScope mc mentions quotedItemId itemForwarded fInv_ timed_ live
             createMemberSndStatuses ::
               [Either ChatError (ChatItem 'CTGroup 'MDSnd)] ->
               NonEmpty (Either ChatError SndMessage) ->
@@ -3094,7 +3481,7 @@ processChatCommand' vr = \case
                         Right _ -> GSSInactive
                         Left e -> GSSError $ SndErrOther $ tshow e
                   forM_ ciId_ $ \ciId -> createGroupSndStatus db ciId mId status
-    assertMultiSendable :: Bool -> NonEmpty ComposeMessageReq -> CM ()
+    assertMultiSendable :: Bool -> NonEmpty ComposedMessageReq -> CM ()
     assertMultiSendable live cmrs
       | length cmrs == 1 = pure ()
       | otherwise =
@@ -3102,15 +3489,15 @@ processChatCommand' vr = \case
           -- This is to support case of sending multiple attachments while also quoting another message.
           -- UI doesn't allow composing with multiple quotes, so api prohibits it as well, and doesn't bother
           -- batching retrieval of quoted messages (prepareMsgs).
-          when (live || length (L.filter (\(ComposedMessage {quotedItemId}, _) -> isJust quotedItemId) cmrs) > 1) $
-            throwChatError (CECommandError "invalid multi send: live and more than one quote not supported")
+          when (live || length (L.filter (\(ComposedMessage {quotedItemId}, _, _, _) -> isJust quotedItemId) cmrs) > 1) $
+            throwCmdError "invalid multi send: live and more than one quote not supported"
     xftpSndFileTransfer :: User -> CryptoFile -> Integer -> Int -> ContactOrGroup -> CM (FileInvitation, CIFile 'MDSnd)
     xftpSndFileTransfer user file fileSize n contactOrGroup = do
       (fInv, ciFile, ft) <- xftpSndFileTransfer_ user file fileSize n $ Just contactOrGroup
       case contactOrGroup of
         CGContact Contact {activeConn} -> forM_ activeConn $ \conn ->
           withFastStore' $ \db -> createSndFTDescrXFTP db user Nothing conn ft dummyFileDescr
-        CGGroup _ ms -> forM_ ms $ \m -> saveMemberFD m `catchChatError` (toView . CRChatError (Just user))
+        CGGroup _ ms -> forM_ ms $ \m -> saveMemberFD m `catchChatError` eToView
           where
             -- we are not sending files to pending members, same as with inline files
             saveMemberFD m@GroupMember {activeConn = Just conn@Connection {connStatus}} =
@@ -3120,36 +3507,32 @@ processChatCommand' vr = \case
             saveMemberFD _ = pure ()
       pure (fInv, ciFile)
     prepareSndItemsData ::
+      [ComposedMessageReq] ->
+      [Maybe (CIFile 'MDSnd)] ->
+      [Maybe (CIQuote c)] ->
       [Either ChatError SndMessage] ->
-      NonEmpty ComposeMessageReq ->
-      NonEmpty (Maybe (CIFile 'MDSnd)) ->
-      NonEmpty (Maybe (CIQuote c)) ->
       [Either ChatError (NewSndChatItemData c)]
-    prepareSndItemsData msgs_ cmrs' ciFiles_ quotedItems_ =
-      [ ( case msg_ of
-            Right msg -> Right $ NewSndChatItemData msg (CISndMsgContent msgContent) f q itemForwarded
-            Left e -> Left e -- step over original error
-        )
-        | (msg_, (ComposedMessage {msgContent}, itemForwarded), f, q) <-
-            zipWith4 (,,,) msgs_ (L.toList cmrs') (L.toList ciFiles_) (L.toList quotedItems_)
-      ]
-    processSendErrs :: User -> ([ChatError], [ChatItem c d]) -> CM ()
-    processSendErrs user = \case
+    prepareSndItemsData =
+      zipWith4 $ \(ComposedMessage {msgContent}, itemForwarded, ts, mm) f q -> \case
+        Right msg -> Right $ NewSndChatItemData msg (CISndMsgContent msgContent) ts mm f q itemForwarded
+        Left e -> Left e -- step over original error
+    processSendErrs :: ([ChatError], [ChatItem c d]) -> CM ()
+    processSendErrs = \case
       -- no errors
       ([], _) -> pure ()
       -- at least one item is successfully created
-      (errs, _ci : _) -> toView $ CRChatErrors (Just user) errs
+      (errs, _ci : _) -> toView $ CEvtChatErrors errs
       -- single error
       ([err], []) -> throwError err
       -- multiple errors
       (errs@(err : _), []) -> do
-        toView $ CRChatErrors (Just user) errs
+        toView $ CEvtChatErrors errs
         throwError err
     getCommandDirectChatItems :: User -> Int64 -> NonEmpty ChatItemId -> CM (Contact, [CChatItem 'CTDirect])
     getCommandDirectChatItems user ctId itemIds = do
       ct <- withFastStore $ \db -> getContact db vr user ctId
       (errs, items) <- lift $ partitionEithers <$> withStoreBatch (\db -> map (getDirectCI db) (L.toList itemIds))
-      unless (null errs) $ toView $ CRChatErrors (Just user) errs
+      unless (null errs) $ toView $ CEvtChatErrors errs
       pure (ct, items)
       where
         getDirectCI :: DB.Connection -> ChatItemId -> IO (Either ChatError (CChatItem 'CTDirect))
@@ -3157,17 +3540,17 @@ processChatCommand' vr = \case
     getCommandGroupChatItems :: User -> Int64 -> NonEmpty ChatItemId -> CM (GroupInfo, [CChatItem 'CTGroup])
     getCommandGroupChatItems user gId itemIds = do
       gInfo <- withFastStore $ \db -> getGroupInfo db vr user gId
-      (errs, items) <- lift $ partitionEithers <$> withStoreBatch (\db -> map (getGroupCI db) (L.toList itemIds))
-      unless (null errs) $ toView $ CRChatErrors (Just user) errs
+      (errs, items) <- lift $ partitionEithers <$> withStoreBatch (\db -> map (getGroupCI db gInfo) (L.toList itemIds))
+      unless (null errs) $ toView $ CEvtChatErrors errs
       pure (gInfo, items)
       where
-        getGroupCI :: DB.Connection -> ChatItemId -> IO (Either ChatError (CChatItem 'CTGroup))
-        getGroupCI db itemId = runExceptT . withExceptT ChatErrorStore $ getGroupChatItem db user gId itemId
+        getGroupCI :: DB.Connection -> GroupInfo -> ChatItemId -> IO (Either ChatError (CChatItem 'CTGroup))
+        getGroupCI db gInfo itemId = runExceptT . withExceptT ChatErrorStore $ getGroupCIWithReactions db user gInfo itemId
     getCommandLocalChatItems :: User -> Int64 -> NonEmpty ChatItemId -> CM (NoteFolder, [CChatItem 'CTLocal])
     getCommandLocalChatItems user nfId itemIds = do
       nf <- withStore $ \db -> getNoteFolder db user nfId
       (errs, items) <- lift $ partitionEithers <$> withStoreBatch (\db -> map (getLocalCI db) (L.toList itemIds))
-      unless (null errs) $ toView $ CRChatErrors (Just user) errs
+      unless (null errs) $ toView $ CEvtChatErrors errs
       pure (nf, items)
       where
         getLocalCI :: DB.Connection -> ChatItemId -> IO (Either ChatError (CChatItem 'CTLocal))
@@ -3177,7 +3560,7 @@ processChatCommand' vr = \case
     forwardMsgContent ChatItem {content = CISndMsgContent fmc} = pure $ Just fmc
     forwardMsgContent ChatItem {content = CIRcvMsgContent fmc} = pure $ Just fmc
     forwardMsgContent _ = throwChatError CEInvalidForward
-    createNoteFolderContentItems :: User -> NoteFolderId -> NonEmpty ComposeMessageReq -> CM ChatResponse
+    createNoteFolderContentItems :: User -> NoteFolderId -> NonEmpty ComposedMessageReq -> CM ChatResponse
     createNoteFolderContentItems user folderId cmrs = do
       assertNoQuotes
       nf <- withFastStore $ \db -> getNoteFolder db user folderId
@@ -3189,11 +3572,11 @@ processChatCommand' vr = \case
       where
         assertNoQuotes :: CM ()
         assertNoQuotes =
-          when (any (\(ComposedMessage {quotedItemId}, _) -> isJust quotedItemId) cmrs) $
-            throwChatError (CECommandError "createNoteFolderContentItems: quotes not supported")
+          when (any (\(ComposedMessage {quotedItemId}, _, _, _) -> isJust quotedItemId) cmrs) $
+            throwCmdError "createNoteFolderContentItems: quotes not supported"
         createLocalFiles :: NoteFolder -> UTCTime -> CM (NonEmpty (Maybe (CIFile 'MDSnd)))
         createLocalFiles nf createdAt =
-          forM cmrs $ \(ComposedMessage {fileSource = file_}, _) ->
+          forM cmrs $ \(ComposedMessage {fileSource = file_}, _, _, _) ->
             forM file_ $ \cf@CryptoFile {filePath, cryptoArgs} -> do
               fsFilePath <- lift $ toFSFilePath filePath
               fileSize <- liftIO $ CF.getFileContentsSize $ CryptoFile fsFilePath cryptoArgs
@@ -3202,16 +3585,20 @@ processChatCommand' vr = \case
                 fileId <- createLocalFile CIFSSndStored db user nf createdAt cf fileSize chunkSize
                 pure CIFile {fileId, fileName = takeFileName filePath, fileSize, fileSource = Just cf, fileStatus = CIFSSndStored, fileProtocol = FPLocal}
         prepareLocalItemsData ::
-          NonEmpty ComposeMessageReq ->
+          NonEmpty ComposedMessageReq ->
           NonEmpty (Maybe (CIFile 'MDSnd)) ->
-          [(CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom)]
-        prepareLocalItemsData cmrs' ciFiles_ =
-          [ (CISndMsgContent mc, f, itemForwarded)
-            | ((ComposedMessage {msgContent = mc}, itemForwarded), f) <- zip (L.toList cmrs') (L.toList ciFiles_)
-          ]
+          NonEmpty (CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom, (Text, Maybe MarkdownList))
+        prepareLocalItemsData =
+          L.zipWith $ \(ComposedMessage {msgContent = mc}, itemForwarded, ts, _) f ->
+            (CISndMsgContent mc, f, itemForwarded, ts)
     getConnQueueInfo user Connection {connId, agentConnId = AgentConnId acId} = do
       msgInfo <- withFastStore' (`getLastRcvMsgInfo` connId)
       CRQueueInfo user msgInfo <$> withAgent (`getConnectionQueueInfo` acId)
+    withSendRef :: ChatRef -> (SendRef -> CM ChatResponse) -> CM ChatResponse
+    withSendRef chatRef a = case chatRef of
+      ChatRef CTDirect cId _ -> a $ SRDirect cId
+      ChatRef CTGroup gId scope -> a $ SRGroup gId scope
+      _ -> throwCmdError "not supported"
 
 protocolServers :: UserProtocol p => SProtocolType p -> ([Maybe ServerOperator], [UserServer 'PSMP], [UserServer 'PXFTP]) -> ([Maybe ServerOperator], [UserServer 'PSMP], [UserServer 'PXFTP])
 protocolServers p (operators, smpServers, xftpServers) = case p of
@@ -3230,7 +3617,18 @@ updatedServers p' srvs UserOperatorServers {operator, smpServers, xftpServers} =
     disableSrv srv@UserServer {preset} =
       AUS SDBStored $ if preset then srv {enabled = False} else srv {deleted = True}
 
-type ComposeMessageReq = (ComposedMessage, Maybe CIForwardedFrom)
+type ComposedMessageReq = (ComposedMessage, Maybe CIForwardedFrom, (Text, Maybe MarkdownList), Map MemberName CIMention)
+
+composedMessage :: Maybe CryptoFile -> MsgContent -> ComposedMessage
+composedMessage f mc = ComposedMessage {fileSource = f, quotedItemId = Nothing, msgContent = mc, mentions = M.empty}
+
+composedMessageReq :: ComposedMessage -> ComposedMessageReq
+composedMessageReq cm@ComposedMessage {msgContent = mc} = (cm, Nothing, msgContentTexts mc, M.empty)
+
+composedMessageReqMentions :: DB.Connection -> User -> GroupInfo -> ComposedMessage -> ExceptT StoreError IO ComposedMessageReq
+composedMessageReqMentions db user g cm@ComposedMessage {msgContent = mc, mentions} = do
+  let ts@(_, ft_) = msgContentTexts mc
+  (cm,Nothing,ts,) <$> getCIMentions db user g ft_ mentions
 
 data ChangedProfileContact = ChangedProfileContact
   { ct :: Contact,
@@ -3277,7 +3675,7 @@ startExpireCIThread user@User {userId} = do
       liftIO $ threadDelay' delay
       interval <- asks $ ciExpirationInterval . config
       forever $ do
-        flip catchChatError' (toView' . CRChatError (Just user)) $ do
+        flip catchChatError' (eToView') $ do
           expireFlags <- asks expireCIFlags
           atomically $ TM.lookup userId expireFlags >>= \b -> unless (b == Just True) retry
           lift waitChatStartedAndActivated
@@ -3286,7 +3684,7 @@ startExpireCIThread user@User {userId} = do
         liftIO $ threadDelay' interval
 
 setChatItemsExpiration :: User -> Int64 -> Int -> CM' ()
-setChatItemsExpiration user newTTL ttlCount 
+setChatItemsExpiration user newTTL ttlCount
   | newTTL > 0 || ttlCount > 0 = do
       startExpireCIThread user
       whenM chatStarted $ setExpireCIFlag user True
@@ -3309,7 +3707,7 @@ agentSubscriber = do
   q <- asks $ subQ . smpAgent
   forever (atomically (readTBQueue q) >>= process)
     `E.catchAny` \e -> do
-      toView' $ CRChatError Nothing $ ChatErrorAgent (CRITICAL True $ "Message reception stopped: " <> show e) Nothing
+      eToView' $ ChatErrorAgent (CRITICAL True $ "Message reception stopped: " <> show e) Nothing
       E.throwIO e
   where
     process :: (ACorrId, AEntityId, AEvt) -> CM' ()
@@ -3319,7 +3717,7 @@ agentSubscriber = do
       SAERcvFile -> processAgentMsgRcvFile corrId entId msg
       SAESndFile -> processAgentMsgSndFile corrId entId msg
       where
-        run action = action `catchChatError'` (toView' . CRChatError Nothing)
+        run action = action `catchChatError'` (eToView')
 
 type AgentBatchSubscribe = AgentClient -> [ConnId] -> ExceptT AgentErrorType IO (Map ConnId (Either AgentErrorType ()))
 
@@ -3347,17 +3745,17 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
   rs <- withAgent $ \a -> agentBatchSubscribe a conns
   -- send connection events to view
   contactSubsToView rs cts ce
-  -- TODO possibly, we could either disable these events or replace with less noisy for API
-  contactLinkSubsToView rs ucs
-  groupSubsToView rs gs ms ce
-  sndFileSubsToView rs sfts
-  rcvFileSubsToView rs rfts
-  pendingConnSubsToView rs pcs
+  unlessM (asks $ coreApi . config) $ do
+    contactLinkSubsToView rs ucs
+    groupSubsToView rs gs ms ce
+    sndFileSubsToView rs sfts
+    rcvFileSubsToView rs rfts
+    pendingConnSubsToView rs pcs
   where
     addEntity (cts, ucs, ms, sfts, rfts, pcs) = \case
       RcvDirectMsgConnection c (Just ct) -> let cts' = addConn c ct cts in (cts', ucs, ms, sfts, rfts, pcs)
       RcvDirectMsgConnection c Nothing -> let pcs' = addConn c (toPCC c) pcs in (cts, ucs, ms, sfts, rfts, pcs')
-      RcvGroupMsgConnection c _g m -> let ms' = addConn c m ms in (cts, ucs, ms', sfts, rfts, pcs)
+      RcvGroupMsgConnection c _g m -> let ms' = addConn c (toShortMember m c) ms in (cts, ucs, ms', sfts, rfts, pcs)
       SndFileConnection c sft -> let sfts' = addConn c sft sfts in (cts, ucs, ms, sfts', rfts, pcs)
       RcvFileConnection c rft -> let rfts' = addConn c rft rfts in (cts, ucs, ms, sfts, rfts', pcs)
       UserContactConnection c uc -> let ucs' = addConn c uc ucs in (cts, ucs', ms, sfts, rfts, pcs)
@@ -3372,11 +3770,18 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
           viaUserContactLink,
           groupLinkId,
           customUserProfileId,
-          connReqInv = Nothing,
+          connLinkInv = Nothing,
           localAlias,
           createdAt,
           updatedAt = createdAt
         }
+    toShortMember GroupMember {groupMemberId, groupId, localDisplayName} Connection {agentConnId} =
+      ShortGroupMember
+        { groupMemberId,
+          groupId,
+          memberName = localDisplayName,
+          connId = agentConnId
+        }
     getContactConns :: CM ([ConnId], Map ConnId Contact)
     getContactConns = do
       cts <- withStore_ (`getUserContacts` vr)
@@ -3387,11 +3792,13 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
       (cs, ucs) <- unzip <$> withStore_ (`getUserContactLinks` vr)
       let connIds = map aConnId cs
       pure (connIds, M.fromList $ zip connIds ucs)
-    getGroupMemberConns :: CM ([Group], [ConnId], Map ConnId GroupMember)
+    getGroupMemberConns :: CM ([ShortGroup], [ConnId], Map ConnId ShortGroupMember)
     getGroupMemberConns = do
-      gs <- withStore_ (`getUserGroups` vr)
-      let mPairs = concatMap (\(Group _ ms) -> mapMaybe (\m -> (,m) <$> memberConnId m) (filter (not . memberRemoved) ms)) gs
+      gs <- withStore_ getUserGroupsToSubscribe
+      let mPairs = concatMap (\(ShortGroup _ ms) -> map (\m -> (shortMemConnId m, m)) ms) gs
       pure (gs, map fst mPairs, M.fromList mPairs)
+      where
+        shortMemConnId ShortGroupMember{connId = AgentConnId acId} = acId
     getSndFileTransferConns :: CM ([ConnId], Map ConnId SndFileTransfer)
     getSndFileTransferConns = do
       sfts <- withStore_ getLiveSndFileTransfers
@@ -3415,9 +3822,9 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
         notifyCLI = do
           let cRs = resultsFor rs cts
               cErrors = sortOn (\(Contact {localDisplayName = n}, _) -> n) $ filterErrors cRs
-          toView . CRContactSubSummary user $ map (uncurry ContactSubStatus) cRs
-          when ce $ mapM_ (toView . uncurry (CRContactSubError user)) cErrors
-        notifyAPI = toView . CRNetworkStatuses (Just user) . map (uncurry ConnNetworkStatus)
+          toView . CEvtContactSubSummary user $ map (uncurry ContactSubStatus) cRs
+          when ce $ mapM_ (toView . uncurry (CEvtContactSubError user)) cErrors
+        notifyAPI = toView . CEvtNetworkStatuses (Just user) . map (uncurry ConnNetworkStatus)
         statuses = M.foldrWithKey' addStatus [] cts
           where
             addStatus :: ConnId -> Contact -> [(AgentConnId, NetworkStatus)] -> [(AgentConnId, NetworkStatus)]
@@ -3434,47 +3841,44 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
               e -> show e
     -- TODO possibly below could be replaced with less noisy events for API
     contactLinkSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId UserContact -> CM ()
-    contactLinkSubsToView rs = toView . CRUserContactSubSummary user . map (uncurry UserContactSubStatus) . resultsFor rs
-    groupSubsToView :: Map ConnId (Either AgentErrorType ()) -> [Group] -> Map ConnId GroupMember -> Bool -> CM ()
+    contactLinkSubsToView rs = toView . CEvtUserContactSubSummary user . map (uncurry UserContactSubStatus) . resultsFor rs
+    groupSubsToView :: Map ConnId (Either AgentErrorType ()) -> [ShortGroup] -> Map ConnId ShortGroupMember -> Bool -> CM ()
     groupSubsToView rs gs ms ce = do
       mapM_ groupSub $
-        sortOn (\(Group GroupInfo {localDisplayName = g} _) -> g) gs
-      toView . CRMemberSubSummary user $ map (uncurry MemberSubStatus) mRs
+        sortOn (\(ShortGroup ShortGroupInfo {groupName = g} _) -> g) gs
+      toViewTE . TEMemberSubSummary user $ map (uncurry MemberSubStatus) mRs
       where
         mRs = resultsFor rs ms
-        groupSub :: Group -> CM ()
-        groupSub (Group g@GroupInfo {membership, groupId = gId} members) = do
-          when ce $ mapM_ (toView . uncurry (CRMemberSubError user g)) mErrors
-          toView groupEvent
+        groupSub :: ShortGroup -> CM ()
+        groupSub (ShortGroup g@ShortGroupInfo {groupId = gId, membershipStatus} members) = do
+          when ce $ mapM_ (toViewTE . uncurry (TEMemberSubError user g)) mErrors
+          toViewTE groupEvent
           where
-            mErrors :: [(GroupMember, ChatError)]
+            mErrors :: [(ShortGroupMember, ChatError)]
             mErrors =
-              sortOn (\(GroupMember {localDisplayName = n}, _) -> n)
+              sortOn (\(ShortGroupMember {memberName = n}, _) -> n)
                 . filterErrors
-                $ filter (\(GroupMember {groupId}, _) -> groupId == gId) mRs
-            groupEvent :: ChatResponse
+                $ filter (\(ShortGroupMember {groupId}, _) -> groupId == gId) mRs
+            groupEvent :: TerminalEvent
             groupEvent
-              | memberStatus membership == GSMemInvited = CRGroupInvitation user g
-              | all (\GroupMember {activeConn} -> isNothing activeConn) members =
-                  if memberActive membership
-                    then CRGroupEmpty user g
-                    else CRGroupRemoved user g
-              | otherwise = CRGroupSubscribed user g
+              | membershipStatus == GSMemInvited = TEGroupInvitation user g
+              | null members = TEGroupEmpty user g
+              | otherwise = TEGroupSubscribed user g
     sndFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId SndFileTransfer -> CM ()
     sndFileSubsToView rs sfts = do
       let sftRs = resultsFor rs sfts
       forM_ sftRs $ \(ft@SndFileTransfer {fileId, fileStatus}, err_) -> do
-        forM_ err_ $ toView . CRSndFileSubError user ft
+        forM_ err_ $ toViewTE . TESndFileSubError user ft
         void . forkIO $ do
           threadDelay 1000000
           when (fileStatus == FSConnected) . unlessM (isFileActive fileId sndFiles) . withChatLock "subscribe sendFileChunk" $
             sendFileChunk user ft
     rcvFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId RcvFileTransfer -> CM ()
-    rcvFileSubsToView rs = mapM_ (toView . uncurry (CRRcvFileSubError user)) . filterErrors . resultsFor rs
+    rcvFileSubsToView rs = mapM_ (toViewTE . uncurry (TERcvFileSubError user)) . filterErrors . resultsFor rs
     pendingConnSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId PendingContactConnection -> CM ()
-    pendingConnSubsToView rs = toView . CRPendingSubSummary user . map (uncurry PendingSubStatus) . resultsFor rs
+    pendingConnSubsToView rs = toViewTE . TEPendingSubSummary user . map (uncurry PendingSubStatus) . resultsFor rs
     withStore_ :: (DB.Connection -> User -> IO [a]) -> CM [a]
-    withStore_ a = withStore' (`a` user) `catchChatError` \e -> toView (CRChatError (Just user) e) $> []
+    withStore_ a = withStore' (`a` user) `catchChatError` \e -> eToView e $> []
     filterErrors :: [(a, Maybe ChatError)] -> [(a, ChatError)]
     filterErrors = mapMaybe (\(a, e_) -> (a,) <$> e_)
     resultsFor :: Map ConnId (Either AgentErrorType ()) -> Map ConnId a -> [(a, Maybe ChatError)]
@@ -3496,27 +3900,28 @@ cleanupManager = do
   liftIO $ threadDelay' initialDelay
   stepDelay <- asks (cleanupManagerStepDelay . config)
   forever $ do
-    flip catchChatError (toView . CRChatError Nothing) $ do
+    flip catchChatError eToView $ do
       lift waitChatStartedAndActivated
       users <- withStore' getUsers
       let (us, us') = partition activeUser users
       forM_ us $ cleanupUser interval stepDelay
       forM_ us' $ cleanupUser interval stepDelay
-      cleanupMessages `catchChatError` (toView . CRChatError Nothing)
+      cleanupMessages `catchChatError` eToView
       -- TODO possibly, also cleanup async commands
-      cleanupProbes `catchChatError` (toView . CRChatError Nothing)
+      cleanupProbes `catchChatError` eToView
     liftIO $ threadDelay' $ diffToMicroseconds interval
   where
-    runWithoutInitialDelay cleanupInterval = flip catchChatError (toView . CRChatError Nothing) $ do
+    runWithoutInitialDelay cleanupInterval = flip catchChatError eToView $ do
       lift waitChatStartedAndActivated
       users <- withStore' getUsers
       let (us, us') = partition activeUser users
-      forM_ us $ \u -> cleanupTimedItems cleanupInterval u `catchChatError` (toView . CRChatError (Just u))
-      forM_ us' $ \u -> cleanupTimedItems cleanupInterval u `catchChatError` (toView . CRChatError (Just u))
+      forM_ us $ \u -> cleanupTimedItems cleanupInterval u `catchChatError` eToView
+      forM_ us' $ \u -> cleanupTimedItems cleanupInterval u `catchChatError` eToView
     cleanupUser cleanupInterval stepDelay user = do
-      cleanupTimedItems cleanupInterval user `catchChatError` (toView . CRChatError (Just user))
+      cleanupTimedItems cleanupInterval user `catchChatError` eToView
       liftIO $ threadDelay' stepDelay
-      cleanupDeletedContacts user `catchChatError` (toView . CRChatError (Just user))
+      -- TODO remove in future versions: legacy step - contacts are no longer marked as deleted
+      cleanupDeletedContacts user `catchChatError` eToView
       liftIO $ threadDelay' stepDelay
     cleanupTimedItems cleanupInterval user = do
       ts <- liftIO getCurrentTime
@@ -3528,7 +3933,7 @@ cleanupManager = do
       contacts <- withStore' $ \db -> getDeletedContacts db vr user
       forM_ contacts $ \ct ->
         withStore (\db -> deleteContactWithoutGroups db user ct)
-          `catchChatError` (toView . CRChatError (Just user))
+          `catchChatError` eToView
     cleanupMessages = do
       ts <- liftIO getCurrentTime
       let cutoffTs = addUTCTime (-(30 * nominalDay)) ts
@@ -3554,7 +3959,7 @@ expireChatItems user@User {userId} globalTTL sync = do
     loop :: [Int64] -> (Int64 -> CM ()) -> CM ()
     loop [] _ = pure ()
     loop (a : as) process = continue $ do
-      process a `catchChatError` (toView . CRChatError (Just user))
+      process a `catchChatError` eToView
       loop as process
     continue :: CM () -> CM ()
     continue a =
@@ -3575,8 +3980,7 @@ expireContactChatItems user vr globalTTL ctId =
       withExpirationDate globalTTL chatItemTTL $ \expirationDate -> do
         lift waitChatStartedAndActivated
         filesInfo <- withStore' $ \db -> getContactExpiredFileInfo db user ct expirationDate
-        cancelFilesInProgress user filesInfo
-        deleteFilesLocally filesInfo
+        deleteCIFiles user filesInfo
         withStore' $ \db -> deleteContactExpiredCIs db user ct expirationDate
 
 expireGroupChatItems :: User -> VersionRangeChat -> Int64 -> UTCTime -> GroupId -> CM ()
@@ -3587,8 +3991,7 @@ expireGroupChatItems user vr globalTTL createdAtCutoff groupId =
       withExpirationDate globalTTL chatItemTTL $ \expirationDate -> do
         lift waitChatStartedAndActivated
         filesInfo <- withStore' $ \db -> getGroupExpiredFileInfo db user gInfo expirationDate createdAtCutoff
-        cancelFilesInProgress user filesInfo
-        deleteFilesLocally filesInfo
+        deleteCIFiles user filesInfo
         withStore' $ \db -> deleteGroupExpiredCIs db user gInfo expirationDate createdAtCutoff
         membersToDelete <- withStore' $ \db -> getGroupMembersForExpiration db vr user gInfo
         forM_ membersToDelete $ \m -> withStore' $ \db -> deleteGroupMember db user m
@@ -3676,7 +4079,7 @@ chatCommandP =
       "/_get chat " *> (APIGetChat <$> chatRefP <*> optional (" content=" *> strP) <* A.space <*> chatPaginationP <*> optional (" search=" *> stringP)),
       "/_get items " *> (APIGetChatItems <$> chatPaginationP <*> optional (" search=" *> stringP)),
       "/_get item info " *> (APIGetChatItemInfo <$> chatRefP <* A.space <*> A.decimal),
-      "/_send " *> (APISendMessages <$> chatRefP <*> liveMessageP <*> sendMessageTTLP <*> (" json " *> jsonP <|> " text " *> composedMessagesTextP)),
+      "/_send " *> (APISendMessages <$> sendRefP <*> liveMessageP <*> sendMessageTTLP <*> (" json " *> jsonP <|> " text " *> composedMessagesTextP)),
       "/_create tag " *> (APICreateChatTag <$> jsonP),
       "/_tags " *> (APISetChatTags <$> chatRefP <*> optional _strP),
       "/_delete tag " *> (APIDeleteChatTag <$> A.decimal),
@@ -3685,11 +4088,13 @@ chatCommandP =
       "/_create *" *> (APICreateChatItems <$> A.decimal <*> (" json " *> jsonP <|> " text " *> composedMessagesTextP)),
       "/_report #" *> (APIReportMessage <$> A.decimal <* A.space <*> A.decimal <*> (" reason=" *> strP) <*> (A.space *> textP <|> pure "")),
       "/report #" *> (ReportMessage <$> displayNameP <*> optional (" @" *> displayNameP) <*> _strP <* A.space <*> msgTextP),
-      "/_update item " *> (APIUpdateChatItem <$> chatRefP <* A.space <*> A.decimal <*> liveMessageP <* A.space <*> msgContentP),
+      "/_update item " *> (APIUpdateChatItem <$> chatRefP <* A.space <*> A.decimal <*> liveMessageP <*> (" json" *> jsonP <|> " text " *> updatedMessagesTextP)),
       "/_delete item " *> (APIDeleteChatItem <$> chatRefP <*> _strP <*> _strP),
       "/_delete member item #" *> (APIDeleteMemberChatItem <$> A.decimal <*> _strP),
-      "/_reaction " *> (APIChatItemReaction <$> chatRefP <* A.space <*> A.decimal <* A.space <*> onOffP <* A.space <*> jsonP),
-      "/_reaction members " *> (APIGetReactionMembers <$> A.decimal <* " #" <*> A.decimal <* A.space <*> A.decimal <* A.space <*> jsonP),
+      "/_archive reports #" *> (APIArchiveReceivedReports <$> A.decimal),
+      "/_delete reports #" *> (APIDeleteReceivedReports <$> A.decimal <*> _strP <*> _strP),
+      "/_reaction " *> (APIChatItemReaction <$> chatRefP <* A.space <*> A.decimal <* A.space <*> onOffP <* A.space <*> (knownReaction <$?> jsonP)),
+      "/_reaction members " *> (APIGetReactionMembers <$> A.decimal <* " #" <*> A.decimal <* A.space <*> A.decimal <* A.space <*> (knownReaction <$?> jsonP)),
       "/_forward plan " *> (APIPlanForwardChatItems <$> chatRefP <*> _strP),
       "/_forward " *> (APIForwardChatItems <$> chatRefP <* A.space <*> chatRefP <*> _strP <*> sendMessageTTLP),
       "/_read user " *> (APIUserRead <$> A.decimal),
@@ -3718,20 +4123,24 @@ chatCommandP =
       "/_set prefs @" *> (APISetContactPrefs <$> A.decimal <* A.space <*> jsonP),
       "/_set theme user " *> (APISetUserUIThemes <$> A.decimal <*> optional (A.space *> jsonP)),
       "/_set theme " *> (APISetChatUIThemes <$> chatRefP <*> optional (A.space *> jsonP)),
-      "/_parse " *> (APIParseMarkdown . safeDecodeUtf8 <$> A.takeByteString),
       "/_ntf get" $> APIGetNtfToken,
       "/_ntf register " *> (APIRegisterToken <$> strP_ <*> strP),
       "/_ntf verify " *> (APIVerifyToken <$> strP <* A.space <*> strP <* A.space <*> strP),
+      "/_ntf check " *> (APICheckToken <$> strP),
       "/_ntf delete " *> (APIDeleteToken <$> strP),
       "/_ntf conns " *> (APIGetNtfConns <$> strP <* A.space <*> strP),
-      "/_ntf conn messages " *> (ApiGetConnNtfMessages <$> strP),
+      "/_ntf conn messages " *> (APIGetConnNtfMessages <$> connMsgsP),
       "/_add #" *> (APIAddMember <$> A.decimal <* A.space <*> A.decimal <*> memberRole),
       "/_join #" *> (APIJoinGroup <$> A.decimal <*> pure MFAll), -- needs to be changed to support in UI
-      "/_member role #" *> (APIMemberRole <$> A.decimal <* A.space <*> A.decimal <*> memberRole),
-      "/_block #" *> (APIBlockMemberForAll <$> A.decimal <* A.space <*> A.decimal <* A.space <* "blocked=" <*> onOffP),
-      "/_remove #" *> (APIRemoveMember <$> A.decimal <* A.space <*> A.decimal),
+      "/_accept member #" *> (APIAcceptMember <$> A.decimal <* A.space <*> A.decimal <*> memberRole),
+      "/_delete member chat #" *> (APIDeleteMemberSupportChat <$> A.decimal <* A.space <*> A.decimal),
+      "/_member role #" *> (APIMembersRole <$> A.decimal <*> _strP <*> memberRole),
+      "/_block #" *> (APIBlockMembersForAll <$> A.decimal <*> _strP <* " blocked=" <*> onOffP),
+      "/_remove #" *> (APIRemoveMembers <$> A.decimal <*> _strP <*> (" messages=" *> onOffP <|> pure False)),
       "/_leave #" *> (APILeaveGroup <$> A.decimal),
       "/_members #" *> (APIListMembers <$> A.decimal),
+      -- "/_archive conversations #" *> (APIArchiveGroupConversations <$> A.decimal <*> _strP),
+      -- "/_delete conversations #" *> (APIDeleteGroupConversations <$> A.decimal <*> _strP),
       "/_server test " *> (APITestProtoServer <$> A.decimal <* A.space <*> strP),
       "/smp test " *> (TestProtoServer . AProtoServerWithAuth SPSMP <$> strP),
       "/xftp test " *> (TestProtoServer . AProtoServerWithAuth SPXFTP <$> strP),
@@ -3812,10 +4221,11 @@ chatCommandP =
       "/_group " *> (APINewGroup <$> A.decimal <*> incognitoOnOffP <* A.space <*> jsonP),
       ("/add " <|> "/a ") *> char_ '#' *> (AddMember <$> displayNameP <* A.space <* char_ '@' <*> displayNameP <*> (memberRole <|> pure GRMember)),
       ("/join " <|> "/j ") *> char_ '#' *> (JoinGroup <$> displayNameP <*> (" mute" $> MFNone <|> pure MFAll)),
+      "/accept member " *> char_ '#' *> (AcceptMember <$> displayNameP <* A.space <* char_ '@' <*> displayNameP <*> (memberRole <|> pure GRMember)),
       ("/member role " <|> "/mr ") *> char_ '#' *> (MemberRole <$> displayNameP <* A.space <* char_ '@' <*> displayNameP <*> memberRole),
       "/block for all #" *> (BlockForAll <$> displayNameP <* A.space <*> (char_ '@' *> displayNameP) <*> pure True),
       "/unblock for all #" *> (BlockForAll <$> displayNameP <* A.space <*> (char_ '@' *> displayNameP) <*> pure False),
-      ("/remove " <|> "/rm ") *> char_ '#' *> (RemoveMember <$> displayNameP <* A.space <* char_ '@' <*> displayNameP),
+      ("/remove " <|> "/rm ") *> char_ '#' *> (RemoveMembers <$> displayNameP <* A.space <*> (S.fromList <$> (char_ '@' *> displayNameP) `A.sepBy1'` A.char ',') <*> (" messages=" *> onOffP <|> pure False)),
       ("/leave " <|> "/l ") *> char_ '#' *> (LeaveGroup <$> displayNameP),
       ("/delete #" <|> "/d #") *> (DeleteGroup <$> displayNameP),
       ("/delete " <|> "/d ") *> char_ '@' *> (DeleteContact <$> displayNameP <*> chatDeleteMode),
@@ -3823,6 +4233,7 @@ chatCommandP =
       "/clear #" *> (ClearGroup <$> displayNameP),
       "/clear " *> char_ '@' *> (ClearContact <$> displayNameP),
       ("/members " <|> "/ms ") *> char_ '#' *> (ListMembers <$> displayNameP),
+      "/member support chats #" *> (ListMemberSupportChats <$> displayNameP),
       "/_groups" *> (APIListGroups <$> A.decimal <*> optional (" @" *> A.decimal) <*> optional (A.space *> stringP)),
       ("/groups" <|> "/gs") *> (ListGroups <$> optional (" @" *> displayNameP) <*> optional (A.space *> stringP)),
       "/_group_profile #" *> (APIUpdateGroupProfile <$> A.decimal <* A.space <*> jsonP),
@@ -3832,11 +4243,12 @@ chatCommandP =
       "/set welcome " *> char_ '#' *> (UpdateGroupDescription <$> displayNameP <* A.space <*> (Just <$> msgTextP)),
       "/delete welcome " *> char_ '#' *> (UpdateGroupDescription <$> displayNameP <*> pure Nothing),
       "/show welcome " *> char_ '#' *> (ShowGroupDescription <$> displayNameP),
-      "/_create link #" *> (APICreateGroupLink <$> A.decimal <*> (memberRole <|> pure GRMember)),
+      "/_create link #" *> (APICreateGroupLink <$> A.decimal <*> (memberRole <|> pure GRMember) <*> shortOnOffP),
       "/_set link role #" *> (APIGroupLinkMemberRole <$> A.decimal <*> memberRole),
       "/_delete link #" *> (APIDeleteGroupLink <$> A.decimal),
       "/_get link #" *> (APIGetGroupLink <$> A.decimal),
-      "/create link #" *> (CreateGroupLink <$> displayNameP <*> (memberRole <|> pure GRMember)),
+      "/_short link #" *> (APIAddGroupShortLink <$> A.decimal),
+      "/create link #" *> (CreateGroupLink <$> displayNameP <*> (memberRole <|> pure GRMember) <*> shortP),
       "/set link role #" *> (GroupLinkMemberRole <$> displayNameP <*> memberRole),
       "/delete link #" *> (DeleteGroupLink <$> displayNameP),
       "/show link #" *> (ShowGroupLink <$> displayNameP),
@@ -3847,18 +4259,17 @@ chatCommandP =
       "/_contacts " *> (APIListContacts <$> A.decimal),
       "/contacts" $> ListContacts,
       "/_connect plan " *> (APIConnectPlan <$> A.decimal <* A.space <*> strP),
-      "/_connect " *> (APIConnect <$> A.decimal <*> incognitoOnOffP <* A.space <*> ((Just <$> strP) <|> A.takeByteString $> Nothing)),
-      "/_connect " *> (APIAddContact <$> A.decimal <*> incognitoOnOffP),
+      "/_connect " *> (APIAddContact <$> A.decimal <*> shortOnOffP <*> incognitoOnOffP),
+      "/_connect " *> (APIConnect <$> A.decimal <*> incognitoOnOffP <* A.space <*> connLinkP),
       "/_set incognito :" *> (APISetConnectionIncognito <$> A.decimal <* A.space <*> onOffP),
       "/_set conn user :" *> (APIChangeConnectionUser <$> A.decimal <* A.space <*> A.decimal),
+      ("/connect" <|> "/c") *> (AddContact <$> shortP <*> incognitoP),
       ("/connect" <|> "/c") *> (Connect <$> incognitoP <* A.space <*> ((Just <$> strP) <|> A.takeTill isSpace $> Nothing)),
-      ("/connect" <|> "/c") *> (AddContact <$> incognitoP),
       ForwardMessage <$> chatNameP <* " <- @" <*> displayNameP <* A.space <*> msgTextP,
       ForwardGroupMessage <$> chatNameP <* " <- #" <*> displayNameP <* A.space <* A.char '@' <*> (Just <$> displayNameP) <* A.space <*> msgTextP,
       ForwardGroupMessage <$> chatNameP <* " <- #" <*> displayNameP <*> pure Nothing <* A.space <*> msgTextP,
       ForwardLocalMessage <$> chatNameP <* " <- * " <*> msgTextP,
-      SendMessage <$> chatNameP <* A.space <*> msgTextP,
-      "/* " *> (SendMessage (ChatName CTLocal "") <$> msgTextP),
+      SendMessage <$> sendNameP <* A.space <*> msgTextP,
       "@#" *> (SendMemberContactMessage <$> displayNameP <* A.space <* char_ '@' <*> displayNameP <* A.space <*> msgTextP),
       "/live " *> (SendLiveMessage <$> chatNameP <*> (A.space *> msgTextP <|> pure "")),
       (">@" <|> "> @") *> sendMsgQuote (AMsgDirection SMDRcv),
@@ -3867,7 +4278,7 @@ chatCommandP =
       ("\\\\ #" <|> "\\\\#") *> (DeleteMemberMessage <$> displayNameP <* A.space <* char_ '@' <*> displayNameP <* A.space <*> textP),
       ("! " <|> "!") *> (EditMessage <$> chatNameP <* A.space <*> (quotedMsg <|> pure "") <*> msgTextP),
       ReactToMessage <$> (("+" $> True) <|> ("-" $> False)) <*> reactionP <* A.space <*> chatNameP' <* A.space <*> textP,
-      "/feed " *> (SendMessageBroadcast <$> msgTextP),
+      "/feed " *> (SendMessageBroadcast . MCText <$> msgTextP),
       ("/chats" <|> "/cs") *> (LastChats <$> (" all" $> Nothing <|> Just <$> (A.space *> A.decimal <|> pure 20))),
       ("/tail" <|> "/t") *> (LastMessages <$> optional (A.space *> chatNameP) <*> msgCountP <*> pure Nothing),
       ("/search" <|> "/?") *> (LastMessages <$> optional (A.space *> chatNameP) <*> msgCountP <*> (Just <$> (A.space *> stringP))),
@@ -3886,12 +4297,13 @@ chatCommandP =
       ("/fstatus " <|> "/fs ") *> (FileStatus <$> A.decimal),
       "/_connect contact " *> (APIConnectContactViaAddress <$> A.decimal <*> incognitoOnOffP <* A.space <*> A.decimal),
       "/simplex" *> (ConnectSimplex <$> incognitoP),
-      "/_address " *> (APICreateMyAddress <$> A.decimal),
-      ("/address" <|> "/ad") $> CreateMyAddress,
+      "/_address " *> (APICreateMyAddress <$> A.decimal <*> shortOnOffP),
+      ("/address" <|> "/ad") *> (CreateMyAddress <$> shortP),
       "/_delete_address " *> (APIDeleteMyAddress <$> A.decimal),
       ("/delete_address" <|> "/da") $> DeleteMyAddress,
       "/_show_address " *> (APIShowMyAddress <$> A.decimal),
       ("/show_address" <|> "/sa") $> ShowMyAddress,
+      "/_short_link_address " *> (APIAddMyAddressShortLink <$> A.decimal),
       "/_profile_address " *> (APISetProfileAddress <$> A.decimal <* A.space <*> onOffP),
       ("/profile_address " <|> "/pa ") *> (SetProfileAddress <$> onOffP),
       "/_auto_accept " *> (APIAddressAutoAccept <$> A.decimal <* A.space <*> autoAcceptP),
@@ -3913,14 +4325,16 @@ chatCommandP =
       "/set reactions #" *> (SetGroupFeature (AGFNR SGFReactions) <$> displayNameP <*> (A.space *> strP)),
       "/set calls @" *> (SetContactFeature (ACF SCFCalls) <$> displayNameP <*> optional (A.space *> strP)),
       "/set calls " *> (SetUserFeature (ACF SCFCalls) <$> strP),
-      "/set delete #" *> (SetGroupFeature (AGFNR SGFFullDelete) <$> displayNameP <*> (A.space *> strP)),
+      "/set delete #" *> (SetGroupFeatureRole (AGFR SGFFullDelete) <$> displayNameP <*> _strP <*> optional memberRole),
       "/set delete @" *> (SetContactFeature (ACF SCFFullDelete) <$> displayNameP <*> optional (A.space *> strP)),
       "/set delete " *> (SetUserFeature (ACF SCFFullDelete) <$> strP),
       "/set direct #" *> (SetGroupFeatureRole (AGFR SGFDirectMessages) <$> displayNameP <*> _strP <*> optional memberRole),
       "/set disappear #" *> (SetGroupTimedMessages <$> displayNameP <*> (A.space *> timedTTLOnOffP)),
       "/set disappear @" *> (SetContactTimedMessages <$> displayNameP <*> optional (A.space *> timedMessagesEnabledP)),
       "/set disappear " *> (SetUserTimedMessages <$> (("yes" $> True) <|> ("no" $> False))),
+      "/set reports #" *> (SetGroupFeature (AGFNR SGFReports) <$> displayNameP <*> _strP),
       "/set links #" *> (SetGroupFeatureRole (AGFR SGFSimplexLinks) <$> displayNameP <*> _strP <*> optional memberRole),
+      "/set admission review #" *> (SetGroupMemberAdmissionReview <$> displayNameP <*> (A.space *> memberCriteriaP)),
       ("/incognito" <* optional (A.space *> onOffP)) $> ChatHelp HSIncognito,
       "/set device name " *> (SetLocalDeviceName <$> textP),
       "/list remote hosts" $> ListRemoteHosts,
@@ -3956,7 +4370,12 @@ chatCommandP =
     ]
   where
     choice = A.choice . map (\p -> p <* A.takeWhile (== ' ') <* A.endOfInput)
+    connLinkP = do
+      ((Just <$> strP) <|> A.takeTill (== ' ') $> Nothing)
+        >>= mapM (\(ACR m cReq) -> ACCL m . CCLink cReq <$> optional (A.space *> strP))
+    shortP = (A.space *> ("short" <|> "s")) $> True <|> pure False
     incognitoP = (A.space *> ("incognito" <|> "i")) $> True <|> pure False
+    shortOnOffP = (A.space *> "short=" *> onOffP) <|> pure False
     incognitoOnOffP = (A.space *> "incognito=" *> onOffP) <|> pure False
     imagePrefix = (<>) <$> "data:" <*> ("image/png;base64," <|> "image/jpg;base64,")
     imageP = safeDecodeUtf8 <$> ((<>) <$> imagePrefix <*> (B64.encode <$> base64P))
@@ -3996,7 +4415,8 @@ chatCommandP =
       c -> c
     composedMessagesTextP = do
       text <- mcTextP
-      pure $ (ComposedMessage Nothing Nothing text) :| []
+      pure [composedMessage Nothing text]
+    updatedMessagesTextP = (`UpdatedMessage` []) <$> mcTextP
     liveMessageP = " live=" *> onOffP <|> pure False
     sendMessageTTLP = " ttl=" *> ((Just <$> A.decimal) <|> ("default" $> Nothing)) <|> pure Nothing
     receiptSettings = do
@@ -4019,7 +4439,8 @@ chatCommandP =
                 { directMessages = Just DirectMessagesGroupPreference {enable = FEOn, role = Nothing},
                   history = Just HistoryGroupPreference {enable = FEOn}
                 }
-      pure GroupProfile {displayName = gName, fullName, description = Nothing, image = Nothing, groupPreferences}
+      pure GroupProfile {displayName = gName, fullName, description = Nothing, image = Nothing, groupPreferences, memberAdmission = Nothing}
+    memberCriteriaP = ("all" $> Just MCAll) <|> ("off" $> Nothing)
     fullNameP = A.space *> textP <|> pure ""
     textP = safeDecodeUtf8 <$> A.takeByteString
     pwdP = jsonP <|> (UserPwd . safeDecodeUtf8 <$> A.takeTill (== ' '))
@@ -4031,6 +4452,12 @@ chatCommandP =
       cfArgs <- optional $ CFArgs <$> (" key=" *> strP <* A.space) <*> (" nonce=" *> strP)
       path <- filePath
       pure $ CryptoFile path cfArgs
+    connMsgsP = L.fromList <$> connMsgP `A.sepBy1'` A.char ','
+    connMsgP = do
+      AgentConnId msgConnId <- strP <* A.char ':'
+      msgDbQueueId <- strP <* A.char ':'
+      ts <- strP
+      pure ConnMsgReq {msgConnId, msgDbQueueId, msgTs = Just ts}
     memberRole =
       A.choice
         [ " owner" $> GROwner,
@@ -4044,7 +4471,29 @@ chatCommandP =
         CTLocal -> pure $ ChatName CTLocal ""
         ct -> ChatName ct <$> displayNameP
     chatNameP' = ChatName <$> (chatTypeP <|> pure CTDirect) <*> displayNameP
-    chatRefP = ChatRef <$> chatTypeP <*> A.decimal
+    chatRefP = do
+      chatTypeP >>= \case
+        CTGroup -> ChatRef CTGroup <$> A.decimal <*> optional gcScopeP
+        cType -> (\chatId -> ChatRef cType chatId Nothing) <$> A.decimal
+    sendRefP =
+      (A.char '@' $> SRDirect <*> A.decimal)
+        <|> (A.char '#' $> SRGroup <*> A.decimal <*> optional gcScopeP)
+    gcScopeP = "(_support" *> (GCSMemberSupport <$> optional (A.char ':' *> A.decimal)) <* A.char ')'
+    sendNameP =
+      (A.char '@' $> SNDirect <*> displayNameP)
+        <|> (A.char '#' $> SNGroup <*> displayNameP <*> gScopeNameP)
+        <|> ("/*" $> SNLocal)
+    gScopeNameP =
+      (supportPfx *> (Just . GSNMemberSupport <$> optional supportMember) <* A.char ')')
+        -- this branch fails on "(support" followed by incorrect syntax,
+        -- to avoid sending message to the whole group as `optional gScopeNameP` would do
+        <|> (optional supportPfx >>= mapM (\_ -> fail "bad chat scope"))
+      where
+        supportPfx = A.takeWhile isSpace *> "(support"
+        supportMember = safeDecodeUtf8 <$> (A.char ':' *> A.takeWhile isSpace *> (A.take . lengthTillLastParen =<< A.lookAhead displayNameP_))
+        lengthTillLastParen s = case B.unsnoc s of
+          Just (_, ')') -> B.length s - 1
+          _ -> B.length s
     msgCountP = A.space *> A.decimal <|> pure 10
     ciTTLDecimal = ("default" $> Nothing) <|> (Just <$> A.decimal)
     ciTTL =
@@ -4090,11 +4539,11 @@ chatCommandP =
       requiredHostMode <- (" required-host-mode" $> True) <|> pure False
       smpProxyMode_ <- optional $ " smp-proxy=" *> strP
       smpProxyFallback_ <- optional $ " smp-proxy-fallback=" *> strP
-      smpWebPort <- (" smp-web-port" $> True) <|> pure False
+      smpWebPortServers <- (" smp-web-port-servers=" *> strP) <|> (" smp-web-port" $> SWPAll) <|> pure SWPPreset
       t_ <- optional $ " timeout=" *> A.decimal
       logTLSErrors <- " log=" *> onOffP <|> pure False
       let tcpTimeout_ = (1000000 *) <$> t_
-      pure $ SimpleNetCfg {socksProxy, socksMode, hostMode, requiredHostMode, smpProxyMode_, smpProxyFallback_, smpWebPort, tcpTimeout_, logTLSErrors}
+      pure $ SimpleNetCfg {socksProxy, socksMode, hostMode, requiredHostMode, smpProxyMode_, smpProxyFallback_, smpWebPortServers, tcpTimeout_, logTLSErrors}
 #if !defined(dbPostgres)
     dbKeyP = nonEmptyKey <$?> strP
     nonEmptyKey k@(DBEncryptionKey s) = if BA.null s then Left "empty key" else Right k
@@ -4110,16 +4559,20 @@ chatCommandP =
     char_ = optional . A.char
 
 displayNameP :: Parser Text
-displayNameP = safeDecodeUtf8 <$> (quoted '\'' <|> takeNameTill (\c -> isSpace c || c == ','))
+displayNameP = safeDecodeUtf8 <$> displayNameP_
+{-# INLINE displayNameP #-}
+
+displayNameP_ :: Parser ByteString
+displayNameP_ = quoted '\'' <|> takeNameTill (\c -> isSpace c || c == ',')
   where
     takeNameTill p =
       A.peekChar' >>= \c ->
         if refChar c then A.takeTill p else fail "invalid first character in display name"
     quoted c = A.char c *> takeNameTill (== c) <* A.char c
-    refChar c = c > ' ' && c /= '#' && c /= '@'
+    refChar c = c > ' ' && c /= '#' && c /= '@' && c /= '\''
 
 mkValidName :: String -> String
-mkValidName = reverse . dropWhile isSpace . fst3 . foldl' addChar ("", '\NUL', 0 :: Int)
+mkValidName = dropWhileEnd isSpace . take 50 . reverse . fst3 . foldl' addChar ("", '\NUL', 0 :: Int)
   where
     fst3 (x, _, _) = x
     addChar (r, prev, punct) c = if validChar then (c' : r, c', punct') else (r, prev, punct)
diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs
index 1bcbf9f20d..bdc5e4b920 100644
--- a/src/Simplex/Chat/Library/Internal.hs
+++ b/src/Simplex/Chat/Library/Internal.hs
@@ -29,14 +29,16 @@ import Crypto.Random (ChaChaDRG)
 import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
+import Data.Char (isDigit)
+import Data.Containers.ListUtils (nubOrd)
 import Data.Either (partitionEithers, rights)
 import Data.Fixed (div')
 import Data.Foldable (foldr')
 import Data.Functor (($>))
 import Data.Functor.Identity
 import Data.Int (Int64)
-import Data.List (find, mapAccumL, partition)
-import Data.List.NonEmpty (NonEmpty (..))
+import Data.List (find, foldl', mapAccumL, partition)
+import Data.List.NonEmpty (NonEmpty (..), (<|))
 import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
@@ -59,6 +61,7 @@ import Simplex.Chat.Operators
 import Simplex.Chat.ProfileGenerator (generateRandomProfile)
 import Simplex.Chat.Protocol
 import Simplex.Chat.Store
+import Simplex.Chat.Store.Connections
 import Simplex.Chat.Store.Direct
 import Simplex.Chat.Store.Files
 import Simplex.Chat.Store.Groups
@@ -75,7 +78,7 @@ import Simplex.FileTransfer.Protocol (FileParty (..), FilePartyI)
 import Simplex.FileTransfer.Types (RcvFileId, SndFileId)
 import Simplex.Messaging.Agent as Agent
 import Simplex.Messaging.Agent.Client (getFastNetworkConfig, ipAddressProtected, withLockMap)
-import Simplex.Messaging.Agent.Env.SQLite (ServerCfg (..))
+import Simplex.Messaging.Agent.Env.SQLite (AgentConfig (..), ServerCfg (..))
 import Simplex.Messaging.Agent.Lock (withLock)
 import Simplex.Messaging.Agent.Protocol
 import qualified Simplex.Messaging.Agent.Protocol as AP (AgentErrorType (..))
@@ -102,6 +105,12 @@ import UnliftIO.STM
 maxMsgReactions :: Int
 maxMsgReactions = 3
 
+maxRcvMentions :: Int
+maxRcvMentions = 5
+
+maxSndMentions :: Int
+maxSndMentions = 3
+
 withChatLock :: String -> CM a -> CM a
 withChatLock name action = asks chatLock >>= \l -> withLock l name action
 
@@ -175,31 +184,117 @@ callTimed ct aciContent =
     aciContentCallStatus (ACIContent _ (CIRcvCall st _)) = Just st
     aciContentCallStatus _ = Nothing
 
-toggleNtf :: User -> GroupMember -> Bool -> CM ()
-toggleNtf user m ntfOn =
+toggleNtf :: GroupMember -> Bool -> CM ()
+toggleNtf m ntfOn =
   when (memberActive m) $
     forM_ (memberConnId m) $ \connId ->
-      withAgent (\a -> toggleConnectionNtfs a connId ntfOn) `catchChatError` (toView . CRChatError (Just user))
+      withAgent (\a -> toggleConnectionNtfs a connId ntfOn) `catchChatError` eToView
 
-prepareGroupMsg :: User -> GroupInfo -> MsgContent -> Maybe ChatItemId -> Maybe CIForwardedFrom -> Maybe FileInvitation -> Maybe CITimed -> Bool -> CM (MsgContainer, Maybe (CIQuote 'CTGroup))
-prepareGroupMsg user GroupInfo {groupId, membership} mc quotedItemId_ itemForwarded fInv_ timed_ live = case (quotedItemId_, itemForwarded) of
-  (Nothing, Nothing) -> pure (MCSimple (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
-  (Nothing, Just _) -> pure (MCForward (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
+prepareGroupMsg :: DB.Connection -> User -> GroupInfo -> Maybe MsgScope -> MsgContent -> Map MemberName MsgMention -> Maybe ChatItemId -> Maybe CIForwardedFrom -> Maybe FileInvitation -> Maybe CITimed -> Bool -> ExceptT StoreError IO (ChatMsgEvent 'Json, Maybe (CIQuote 'CTGroup))
+prepareGroupMsg db user g@GroupInfo {membership} msgScope mc mentions quotedItemId_ itemForwarded fInv_ timed_ live = case (quotedItemId_, itemForwarded) of
+  (Nothing, Nothing) ->
+    let mc' = MCSimple $ ExtMsgContent mc mentions fInv_ (ttl' <$> timed_) (justTrue live) msgScope
+     in pure (XMsgNew mc', Nothing)
+  (Nothing, Just _) ->
+    let mc' = MCForward $ ExtMsgContent mc mentions fInv_ (ttl' <$> timed_) (justTrue live) msgScope
+     in pure (XMsgNew mc', Nothing)
   (Just quotedItemId, Nothing) -> do
-    CChatItem _ qci@ChatItem {meta = CIMeta {itemTs, itemSharedMsgId}, formattedText, file} <-
-      withStore $ \db -> getGroupChatItem db user groupId quotedItemId
+    CChatItem _ qci@ChatItem {meta = CIMeta {itemTs, itemSharedMsgId}, formattedText, mentions = quoteMentions, file} <-
+      getGroupCIWithReactions db user g quotedItemId
     (origQmc, qd, sent, GroupMember {memberId}) <- quoteData qci membership
     let msgRef = MsgRef {msgId = itemSharedMsgId, sentAt = itemTs, sent, memberId = Just memberId}
         qmc = quoteContent mc origQmc file
-        quotedItem = CIQuote {chatDir = qd, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc, formattedText}
-    pure (MCQuote QuotedMsg {msgRef, content = qmc} (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Just quotedItem)
-  (Just _, Just _) -> throwChatError CEInvalidQuote
+        (qmc', ft', _) = updatedMentionNames qmc formattedText quoteMentions
+        quotedItem = CIQuote {chatDir = qd, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc', formattedText = ft'}
+        mc' = MCQuote QuotedMsg {msgRef, content = qmc'} (ExtMsgContent mc mentions fInv_ (ttl' <$> timed_) (justTrue live) msgScope)
+    pure (XMsgNew mc', Just quotedItem)
+  (Just _, Just _) -> throwError SEInvalidQuote
   where
-    quoteData :: ChatItem c d -> GroupMember -> CM (MsgContent, CIQDirection 'CTGroup, Bool, GroupMember)
-    quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} _ = throwChatError CEInvalidQuote
+    quoteData :: ChatItem c d -> GroupMember -> ExceptT StoreError IO (MsgContent, CIQDirection 'CTGroup, Bool, GroupMember)
+    quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} _ = throwError SEInvalidQuote
     quoteData ChatItem {chatDir = CIGroupSnd, content = CISndMsgContent qmc} membership' = pure (qmc, CIQGroupSnd, True, membership')
     quoteData ChatItem {chatDir = CIGroupRcv m, content = CIRcvMsgContent qmc} _ = pure (qmc, CIQGroupRcv $ Just m, False, m)
-    quoteData _ _ = throwChatError CEInvalidQuote
+    quoteData _ _ = throwError SEInvalidQuote
+
+updatedMentionNames :: MsgContent -> Maybe MarkdownList -> Map MemberName CIMention -> (MsgContent, Maybe MarkdownList, Map MemberName CIMention)
+updatedMentionNames mc ft_ mentions = case ft_ of
+  Just ft
+    | not (null ft) && not (null mentions) && not (all sameName $ M.assocs mentions) ->
+        let (mentions', ft') = mapAccumL update M.empty ft
+            text = T.concat $ map markdownText ft'
+         in (mc {text} :: MsgContent, Just ft', mentions')
+  _ -> (mc, ft_, mentions)
+  where
+    sameName (name, CIMention {memberRef}) = case memberRef of
+      Just CIMentionMember {displayName} -> case T.stripPrefix displayName name of
+        Just rest
+          | T.null rest -> True
+          | otherwise -> case T.uncons rest of
+              Just ('_', suffix) -> T.all isDigit suffix
+              _ -> False
+        Nothing -> False
+      Nothing -> True
+    update mentions' ft@(FormattedText f _) = case f of
+      Just (Mention name) -> case M.lookup name mentions of
+        Just mm@CIMention {memberRef} ->
+          let name' = uniqueMentionName 0 $ case memberRef of
+                Just CIMentionMember {displayName} -> displayName
+                Nothing -> name
+           in (M.insert name' mm mentions', FormattedText (Just $ Mention name') ('@' `T.cons` viewName name'))
+        Nothing -> (mentions', ft)
+      _ -> (mentions', ft)
+      where
+        uniqueMentionName :: Int -> Text -> Text
+        uniqueMentionName pfx name =
+          let prefixed = if pfx == 0 then name else (name `T.snoc` '_') <> tshow pfx
+           in if prefixed `M.member` mentions' then uniqueMentionName (pfx + 1) name else prefixed
+
+getCIMentions :: DB.Connection -> User -> GroupInfo -> Maybe MarkdownList -> Map MemberName GroupMemberId -> ExceptT StoreError IO (Map MemberName CIMention)
+getCIMentions db user GroupInfo {groupId} ft_ mentions = case ft_ of
+  Just ft | not (null ft) && not (null mentions) -> do
+    let msgMentions = S.fromList $ mentionedNames ft
+        n = M.size mentions
+    -- prevent "invisible" and repeated-with-different-name mentions (when the same member is mentioned via another name)
+    unless (n <= maxSndMentions && all (`S.member` msgMentions) (M.keys mentions) && S.size (S.fromList $ M.elems mentions) == n) $
+      throwError SEInvalidMention
+    mapM (getMentionedGroupMember db user groupId) mentions
+  _ -> pure M.empty
+
+getRcvCIMentions :: DB.Connection -> User -> GroupInfo -> Maybe MarkdownList -> Map MemberName MsgMention -> IO (Map MemberName CIMention)
+getRcvCIMentions db user GroupInfo {groupId} ft_ mentions = case ft_ of
+  Just ft
+    | not (null ft) && not (null mentions) ->
+        let mentions' = uniqueMsgMentions maxRcvMentions mentions $ mentionedNames ft
+         in mapM (getMentionedMemberByMemberId db user groupId) mentions'
+  _ -> pure M.empty
+
+-- prevent "invisible" and repeated-with-different-name mentions
+uniqueMsgMentions :: Int -> Map MemberName MsgMention -> [ContactName] -> Map MemberName MsgMention
+uniqueMsgMentions maxMentions mentions = go M.empty S.empty 0
+  where
+    go acc _ _ [] = acc
+    go acc seen n (name : rest)
+      | n >= maxMentions = acc
+      | otherwise = case M.lookup name mentions of
+          Just mm@MsgMention {memberId}
+            | S.notMember memberId seen ->
+                go (M.insert name mm acc) (S.insert memberId seen) (n + 1) rest
+          _ -> go acc seen n rest
+
+getMessageMentions :: DB.Connection -> User -> GroupId -> Text -> IO (Map MemberName GroupMemberId)
+getMessageMentions db user gId msg = case parseMaybeMarkdownList msg of
+  Just ft | not (null ft) -> M.fromList . catMaybes <$> mapM get (nubOrd $ mentionedNames ft)
+  _ -> pure M.empty
+  where
+    get name =
+      fmap (name,) . eitherToMaybe
+        <$> runExceptT (getGroupMemberIdByName db user gId name)
+
+msgContentTexts :: MsgContent -> (Text, Maybe MarkdownList)
+msgContentTexts mc = let t = msgContentText mc in (t, parseMaybeMarkdownList t)
+
+ciContentTexts :: CIContent d -> (Text, Maybe MarkdownList)
+ciContentTexts content = let t = ciContentToText content in (t, parseMaybeMarkdownList t)
 
 quoteContent :: forall d. MsgContent -> MsgContent -> Maybe (CIFile d) -> MsgContent
 quoteContent mc qmc ciFile_
@@ -228,17 +323,23 @@ quoteContent mc qmc ciFile_
     qFileName = maybe qText (T.pack . getFileName) ciFile_
     qTextOrFile = if T.null qText then qFileName else qText
 
-prohibitedGroupContent :: GroupInfo -> GroupMember -> MsgContent -> Maybe f -> Maybe GroupFeature
-prohibitedGroupContent gInfo m mc file_
+prohibitedGroupContent :: GroupInfo -> GroupMember -> Maybe GroupChatScopeInfo -> MsgContent -> Maybe MarkdownList -> Maybe f -> Bool -> Maybe GroupFeature
+prohibitedGroupContent gInfo@GroupInfo {membership = GroupMember {memberRole = userRole}} m scopeInfo mc ft file_ sent
   | isVoice mc && not (groupFeatureMemberAllowed SGFVoice m gInfo) = Just GFVoice
-  | not (isVoice mc) && isJust file_ && not (groupFeatureMemberAllowed SGFFiles m gInfo) = Just GFFiles
-  | prohibitedSimplexLinks gInfo m mc = Just GFSimplexLinks
+  | isNothing scopeInfo && not (isVoice mc) && isJust file_ && not (groupFeatureMemberAllowed SGFFiles m gInfo) = Just GFFiles
+  | isNothing scopeInfo && isReport mc && (badReportUser || not (groupFeatureAllowed SGFReports gInfo)) = Just GFReports
+  | isNothing scopeInfo && prohibitedSimplexLinks gInfo m ft = Just GFSimplexLinks
   | otherwise = Nothing
+  where
+    -- admins cannot send reports, non-admins cannot receive reports
+    badReportUser
+      | sent = userRole >= GRModerator
+      | otherwise = userRole < GRModerator
 
-prohibitedSimplexLinks :: GroupInfo -> GroupMember -> MsgContent -> Bool
-prohibitedSimplexLinks gInfo m mc =
+prohibitedSimplexLinks :: GroupInfo -> GroupMember -> Maybe MarkdownList -> Bool
+prohibitedSimplexLinks gInfo m ft =
   not (groupFeatureMemberAllowed SGFSimplexLinks m gInfo)
-    && maybe False (any ftIsSimplexLink) (parseMaybeMarkdownList $ msgContentText mc)
+    && maybe False (any ftIsSimplexLink) ft
   where
     ftIsSimplexLink :: FormattedText -> Bool
     ftIsSimplexLink FormattedText {format} = maybe False isSimplexLink format
@@ -287,8 +388,8 @@ cancelFilesInProgress user filesInfo = do
   lift $ agentXFTPDeleteRcvFiles xrfIds
   let smpSFConnIds = concatMap (\(ft, sfts) -> mapMaybe (smpSndFileConnId ft) sfts) sfs
       smpRFConnIds = mapMaybe smpRcvFileConnId rfs
-  deleteAgentConnectionsAsync user smpSFConnIds
-  deleteAgentConnectionsAsync user smpRFConnIds
+  deleteAgentConnectionsAsync smpSFConnIds
+  deleteAgentConnectionsAsync smpRFConnIds
   where
     fileEnded CIFileInfo {fileStatus} = case fileStatus of
       Just (AFS _ status) -> ciFileEnded status
@@ -340,39 +441,90 @@ deleteFilesLocally files =
     withFilesFolder :: (FilePath -> CM ()) -> CM ()
     withFilesFolder action = asks filesFolder >>= readTVarIO >>= mapM_ action
 
-deleteDirectCIs :: User -> Contact -> [CChatItem 'CTDirect] -> Bool -> Bool -> CM ChatResponse
-deleteDirectCIs user ct items byUser timed = do
+deleteDirectCIs :: User -> Contact -> [CChatItem 'CTDirect] -> CM [ChatItemDeletion]
+deleteDirectCIs user ct items = do
   let ciFilesInfo = mapMaybe (\(CChatItem _ ChatItem {file}) -> mkCIFileInfo <$> file) items
   deleteCIFiles user ciFilesInfo
   (errs, deletions) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (deleteItem db) items)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
-  pure $ CRChatItemsDeleted user deletions byUser timed
+  unless (null errs) $ toView $ CEvtChatErrors errs
+  pure deletions
   where
     deleteItem db (CChatItem md ci) = do
       deleteDirectChatItem db user ct ci
       pure $ contactDeletion md ct ci Nothing
 
-deleteGroupCIs :: User -> GroupInfo -> [CChatItem 'CTGroup] -> Bool -> Bool -> Maybe GroupMember -> UTCTime -> CM ChatResponse
-deleteGroupCIs user gInfo items byUser timed byGroupMember_ deletedTs = do
+deleteGroupCIs :: User -> GroupInfo -> Maybe GroupChatScopeInfo -> [CChatItem 'CTGroup] -> Maybe GroupMember -> UTCTime -> CM [ChatItemDeletion]
+deleteGroupCIs user gInfo chatScopeInfo items byGroupMember_ deletedTs = do
   let ciFilesInfo = mapMaybe (\(CChatItem _ ChatItem {file}) -> mkCIFileInfo <$> file) items
   deleteCIFiles user ciFilesInfo
   (errs, deletions) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (deleteItem db) items)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
-  pure $ CRChatItemsDeleted user deletions byUser timed
+  unless (null errs) $ toView $ CEvtChatErrors errs
+  vr <- chatVersionRange
+  deletions' <- case chatScopeInfo of
+    Nothing -> pure deletions
+    Just scopeInfo@GCSIMemberSupport {groupMember_} -> do
+      let decStats = countDeletedUnreadItems groupMember_ deletions
+      gInfo' <- withFastStore' $ \db -> updateGroupScopeUnreadStats db vr user gInfo scopeInfo decStats
+      pure $ map (updateDeletionGroupInfo gInfo') deletions
+  pure deletions'
   where
     deleteItem :: DB.Connection -> CChatItem 'CTGroup -> IO ChatItemDeletion
     deleteItem db (CChatItem md ci) = do
       ci' <- case byGroupMember_ of
         Just m -> Just <$> updateGroupChatItemModerated db user gInfo ci m deletedTs
         Nothing -> Nothing <$ deleteGroupChatItem db user gInfo ci
-      pure $ groupDeletion md gInfo ci ci'
+      pure $ groupDeletion md gInfo chatScopeInfo ci ci'
+    countDeletedUnreadItems :: Maybe GroupMember -> [ChatItemDeletion] -> (Int, Int, Int)
+    countDeletedUnreadItems scopeMember_ = foldl' countItem (0, 0, 0)
+      where
+        countItem :: (Int, Int, Int) -> ChatItemDeletion -> (Int, Int, Int)
+        countItem (!unread, !unanswered, !mentions) ChatItemDeletion {deletedChatItem}
+          | aChatItemIsRcvNew deletedChatItem =
+              let unread' = unread + 1
+                  unanswered' = case (scopeMember_, aChatItemRcvFromMember deletedChatItem) of
+                    (Just scopeMember, Just rcvFromMember)
+                      | groupMemberId' rcvFromMember == groupMemberId' scopeMember -> unanswered + 1
+                    _ -> unanswered
+                  mentions' = if isACIUserMention deletedChatItem then mentions + 1 else mentions
+               in (unread', unanswered', mentions')
+          | otherwise = (unread, unanswered, mentions)
+    updateDeletionGroupInfo :: GroupInfo -> ChatItemDeletion -> ChatItemDeletion
+    updateDeletionGroupInfo gInfo' ChatItemDeletion {deletedChatItem, toChatItem} =
+      ChatItemDeletion
+        { deletedChatItem = updateACIGroupInfo gInfo' deletedChatItem,
+          toChatItem = updateACIGroupInfo gInfo' <$> toChatItem
+        }
+
+updateACIGroupInfo :: GroupInfo -> AChatItem -> AChatItem
+updateACIGroupInfo gInfo' = \case
+  AChatItem SCTGroup dir (GroupChat _gInfo chatScopeInfo) ci ->
+    AChatItem SCTGroup dir (GroupChat gInfo' chatScopeInfo) ci
+  aci -> aci
+
+deleteGroupMemberCIs :: MsgDirectionI d => User -> GroupInfo -> GroupMember -> GroupMember -> SMsgDirection d -> CM ()
+deleteGroupMemberCIs user gInfo member byGroupMember msgDir = do
+  deletedTs <- liftIO getCurrentTime
+  filesInfo <- withStore' $ \db -> deleteGroupMemberCIs_ db user gInfo member byGroupMember msgDir deletedTs
+  deleteCIFiles user filesInfo
+
+deleteGroupMembersCIs :: User -> GroupInfo -> [GroupMember] -> GroupMember -> CM ()
+deleteGroupMembersCIs user gInfo members byGroupMember = do
+  deletedTs <- liftIO getCurrentTime
+  filesInfo <- withStore' $ \db -> fmap concat $ forM members $ \m -> deleteGroupMemberCIs_ db user gInfo m byGroupMember SMDRcv deletedTs
+  deleteCIFiles user filesInfo
+
+deleteGroupMemberCIs_ :: MsgDirectionI d => DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> SMsgDirection d -> UTCTime -> IO [CIFileInfo]
+deleteGroupMemberCIs_ db user gInfo member byGroupMember msgDir deletedTs = do
+  fs <- getGroupMemberFileInfo db user gInfo member
+  updateMemberCIsModerated db user gInfo member byGroupMember msgDir deletedTs
+  pure fs
 
 deleteLocalCIs :: User -> NoteFolder -> [CChatItem 'CTLocal] -> Bool -> Bool -> CM ChatResponse
 deleteLocalCIs user nf items byUser timed = do
   let ciFilesInfo = mapMaybe (\(CChatItem _ ChatItem {file}) -> mkCIFileInfo <$> file) items
   deleteFilesLocally ciFilesInfo
   (errs, deletions) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (deleteItem db) items)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
+  unless (null errs) $ toView $ CEvtChatErrors errs
   pure $ CRChatItemsDeleted user deletions byUser timed
   where
     deleteItem db (CChatItem md ci) = do
@@ -386,34 +538,53 @@ deleteCIFiles user filesInfo = do
   cancelFilesInProgress user filesInfo
   deleteFilesLocally filesInfo
 
-markDirectCIsDeleted :: User -> Contact -> [CChatItem 'CTDirect] -> Bool -> UTCTime -> CM ChatResponse
-markDirectCIsDeleted user ct items byUser deletedTs = do
+markDirectCIsDeleted :: User -> Contact -> [CChatItem 'CTDirect] -> UTCTime -> CM [ChatItemDeletion]
+markDirectCIsDeleted user ct items deletedTs = do
   let ciFilesInfo = mapMaybe (\(CChatItem _ ChatItem {file}) -> mkCIFileInfo <$> file) items
   cancelFilesInProgress user ciFilesInfo
   (errs, deletions) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (markDeleted db) items)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
-  pure $ CRChatItemsDeleted user deletions byUser False
+  unless (null errs) $ toView $ CEvtChatErrors errs
+  pure deletions
   where
     markDeleted db (CChatItem md ci) = do
       ci' <- markDirectChatItemDeleted db user ct ci deletedTs
       pure $ contactDeletion md ct ci (Just ci')
 
-markGroupCIsDeleted :: User -> GroupInfo -> [CChatItem 'CTGroup] -> Bool -> Maybe GroupMember -> UTCTime -> CM ChatResponse
-markGroupCIsDeleted user gInfo items byUser byGroupMember_ deletedTs = do
+markGroupCIsDeleted :: User -> GroupInfo -> Maybe GroupChatScopeInfo -> [CChatItem 'CTGroup] -> Maybe GroupMember -> UTCTime -> CM [ChatItemDeletion]
+markGroupCIsDeleted user gInfo chatScopeInfo items byGroupMember_ deletedTs = do
   let ciFilesInfo = mapMaybe (\(CChatItem _ ChatItem {file}) -> mkCIFileInfo <$> file) items
   cancelFilesInProgress user ciFilesInfo
   (errs, deletions) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (markDeleted db) items)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
-  pure $ CRChatItemsDeleted user deletions byUser False
+  unless (null errs) $ toView $ CEvtChatErrors errs
+  pure deletions
+  -- pure $ CRChatItemsDeleted user deletions byUser False
   where
     markDeleted db (CChatItem md ci) = do
       ci' <- markGroupChatItemDeleted db user gInfo ci byGroupMember_ deletedTs
-      pure $ groupDeletion md gInfo ci (Just ci')
+      pure $ groupDeletion md gInfo chatScopeInfo ci (Just ci')
 
-groupDeletion :: MsgDirectionI d => SMsgDirection d -> GroupInfo -> ChatItem 'CTGroup d -> Maybe (ChatItem 'CTGroup d) -> ChatItemDeletion
-groupDeletion md g ci ci' = ChatItemDeletion (gItem ci) (gItem <$> ci')
+markGroupMemberCIsDeleted :: User -> GroupInfo -> GroupMember -> GroupMember -> CM ()
+markGroupMemberCIsDeleted user gInfo member byGroupMember = do
+  deletedTs <- liftIO getCurrentTime
+  filesInfo <- withStore' $ \db -> markGroupMemberCIsDeleted_ db user gInfo member byGroupMember deletedTs
+  cancelFilesInProgress user filesInfo
+
+markGroupMembersCIsDeleted :: User -> GroupInfo -> [GroupMember] -> GroupMember -> CM ()
+markGroupMembersCIsDeleted user gInfo members byGroupMember = do
+  deletedTs <- liftIO getCurrentTime
+  filesInfo <- withStore' $ \db -> fmap concat $ forM members $ \m -> markGroupMemberCIsDeleted_ db user gInfo m byGroupMember deletedTs
+  cancelFilesInProgress user filesInfo
+
+markGroupMemberCIsDeleted_ :: DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> UTCTime -> IO [CIFileInfo]
+markGroupMemberCIsDeleted_ db user gInfo member byGroupMember deletedTs = do
+  fs <- getGroupMemberFileInfo db user gInfo member
+  markMemberCIsDeleted db user gInfo member byGroupMember deletedTs
+  pure fs
+
+groupDeletion :: MsgDirectionI d => SMsgDirection d -> GroupInfo -> Maybe GroupChatScopeInfo -> ChatItem 'CTGroup d -> Maybe (ChatItem 'CTGroup d) -> ChatItemDeletion
+groupDeletion md g chatScopeInfo ci ci' = ChatItemDeletion (gItem ci) (gItem <$> ci')
   where
-    gItem = AChatItem SCTGroup md (GroupChat g)
+    gItem = AChatItem SCTGroup md (GroupChat g chatScopeInfo)
 
 contactDeletion :: MsgDirectionI d => SMsgDirection d -> Contact -> ChatItem 'CTDirect d -> Maybe (ChatItem 'CTDirect d) -> ChatItemDeletion
 contactDeletion md ct ci ci' = ChatItemDeletion (ctItem ci) (ctItem <$> ci')
@@ -427,12 +598,12 @@ updateCallItemStatus user ct@Contact {contactId} Call {chatItemId} receivedStatu
     timed_ <- callTimed ct aciContent
     updateDirectChatItemView user ct chatItemId aciContent False False timed_ msgId_
     forM_ (timed_ >>= timedDeleteAt') $
-      startProximateTimedItemThread user (ChatRef CTDirect contactId, chatItemId)
+      startProximateTimedItemThread user (ChatRef CTDirect contactId Nothing, chatItemId)
 
 updateDirectChatItemView :: User -> Contact -> ChatItemId -> ACIContent -> Bool -> Bool -> Maybe CITimed -> Maybe MessageId -> CM ()
 updateDirectChatItemView user ct chatItemId (ACIContent msgDir ciContent) edited live timed_ msgId_ = do
   ci' <- withStore $ \db -> updateDirectChatItem db user ct chatItemId ciContent edited live timed_ msgId_
-  toView $ CRChatItemUpdated user (AChatItem SCTDirect msgDir (DirectChat ct) ci')
+  toView $ CEvtChatItemUpdated user (AChatItem SCTDirect msgDir (DirectChat ct) ci')
 
 callStatusItemContent :: User -> Contact -> ChatItemId -> WebRTCCallStatus -> CM (Maybe ACIContent)
 callStatusItemContent user Contact {contactId} chatItemId receivedStatus = do
@@ -480,11 +651,25 @@ receiveFile' :: User -> RcvFileTransfer -> Bool -> Maybe Bool -> Maybe FilePath
 receiveFile' user ft userApprovedRelays rcvInline_ filePath_ = do
   (CRRcvFileAccepted user <$> acceptFileReceive user ft userApprovedRelays rcvInline_ filePath_) `catchChatError` processError
   where
-    processError = \case
-      -- TODO AChatItem in Cancelled events
-      ChatErrorAgent (SMP _ SMP.AUTH) _ -> pure $ CRRcvFileAcceptedSndCancelled user ft
-      ChatErrorAgent (CONN DUPLICATE) _ -> pure $ CRRcvFileAcceptedSndCancelled user ft
-      e -> throwError e
+    -- TODO AChatItem in Cancelled events
+    processError e
+      | rctFileCancelled e = pure $ CRRcvFileAcceptedSndCancelled user ft
+      | otherwise = throwError e
+
+receiveFileEvt' :: User -> RcvFileTransfer -> Bool -> Maybe Bool -> Maybe FilePath -> CM ChatEvent
+receiveFileEvt' user ft userApprovedRelays rcvInline_ filePath_ = do
+  (CEvtRcvFileAccepted user <$> acceptFileReceive user ft userApprovedRelays rcvInline_ filePath_) `catchChatError` processError
+  where
+    -- TODO AChatItem in Cancelled events
+    processError e
+      | rctFileCancelled e = pure $ CEvtRcvFileAcceptedSndCancelled user ft
+      | otherwise = throwError e
+
+rctFileCancelled :: ChatError -> Bool
+rctFileCancelled = \case
+  ChatErrorAgent (SMP _ SMP.AUTH) _ -> True
+  ChatErrorAgent (CONN DUPLICATE) _ -> True
+  _ -> False
 
 acceptFileReceive :: User -> RcvFileTransfer -> Bool -> Maybe Bool -> Maybe FilePath -> CM AChatItem
 acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileInvitation = FileInvitation {fileName = fName, fileConnReq, fileInline, fileSize}, fileStatus, grpMemberId, cryptoArgs} userApprovedRelays rcvInline_ filePath_ = do
@@ -516,10 +701,10 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
     _ -> do
       chatRef <- withStore $ \db -> getChatRefByFileId db user fileId
       case (chatRef, grpMemberId) of
-        (ChatRef CTDirect contactId, Nothing) -> do
+        (ChatRef CTDirect contactId _, Nothing) -> do
           ct <- withStore $ \db -> getContact db vr user contactId
           acceptFile CFCreateConnFileInvDirect $ \msg -> void $ sendDirectContactMessage user ct msg
-        (ChatRef CTGroup groupId, Just memId) -> do
+        (ChatRef CTGroup groupId _, Just memId) -> do
           GroupMember {activeConn} <- withStore $ \db -> getGroupMember db vr user groupId memId
           case activeConn of
             Just conn -> do
@@ -591,7 +776,7 @@ receiveViaCompleteFD user fileId RcvFileDescr {fileDescrText, fileDescrComplete}
       aci_ <- resetRcvCIFileStatus user fileId CIFSRcvInvitation
       forM_ aci_ $ \aci -> do
         cleanupACIFile aci
-        toView $ CRChatItemUpdated user aci
+        toView $ CEvtChatItemUpdated user aci
       throwChatError $ CEFileNotApproved fileId unknownSrvs
 
 cleanupACIFile :: AChatItem -> CM ()
@@ -645,7 +830,7 @@ startReceivingFile user fileId = do
     liftIO $ updateRcvFileStatus db fileId FSConnected
     liftIO $ updateCIFileStatus db user fileId $ CIFSRcvTransfer 0 1
     getChatItemByFileId db vr user fileId
-  toView $ CRRcvFileStart user ci
+  toView $ CEvtRcvFileStart user ci
 
 getRcvFilePath :: FileTransferId -> Maybe FilePath -> String -> Bool -> CM FilePath
 getRcvFilePath fileId fPath_ fn keepHandle = case fPath_ of
@@ -706,30 +891,32 @@ acceptContactRequest user@User {userId} UserContactRequest {agentInvitationId =
   dm <- encodeConnInfoPQ pqSup' chatV $ XInfo profileToSend
   (ct,conn,) <$> withAgent (\a -> acceptContact a (aConnId conn) True invId dm pqSup' subMode)
 
-acceptContactRequestAsync :: User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> PQSupport -> CM Contact
-acceptContactRequestAsync user cReq@UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile contactUsed pqSup = do
+acceptContactRequestAsync :: User -> UserContactRequest -> Maybe IncognitoProfile -> PQSupport -> CM Contact
+acceptContactRequestAsync user cReq@UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile pqSup = do
   subMode <- chatReadVar subscriptionMode
   let profileToSend = profileToSendOnAccept user incognitoProfile False
   vr <- chatVersionRange
   let chatV = vr `peerConnChatVersion` cReqChatVRange
   (cmdId, acId) <- agentAcceptContactAsync user True invId (XInfo profileToSend) subMode pqSup chatV
   withStore' $ \db -> do
-    (ct, Connection {connId}) <- createAcceptedContact db user acId chatV cReqChatVRange cName profileId p userContactLinkId xContactId incognitoProfile subMode pqSup contactUsed
+    (ct, Connection {connId}) <- createAcceptedContact db user acId chatV cReqChatVRange cName profileId p userContactLinkId xContactId incognitoProfile subMode pqSup True
     deleteContactRequestRec db user cReq
     setCommandConnId db user cmdId connId
     pure ct
 
-acceptGroupJoinRequestAsync :: User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> Maybe IncognitoProfile -> CM GroupMember
+acceptGroupJoinRequestAsync :: User -> GroupInfo -> UserContactRequest -> GroupAcceptance -> GroupMemberRole -> Maybe IncognitoProfile -> CM GroupMember
 acceptGroupJoinRequestAsync
   user
   gInfo@GroupInfo {groupProfile, membership, businessChat}
   ucr@UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange}
+  gAccepted
   gLinkMemRole
   incognitoProfile = do
     gVar <- asks random
+    let initialStatus = acceptanceToStatus (memberAdmission groupProfile) gAccepted
     (groupMemberId, memberId) <- withStore $ \db -> do
       liftIO $ deleteContactRequestRec db user ucr
-      createAcceptedMember db gVar user gInfo ucr gLinkMemRole
+      createJoiningMember db gVar user gInfo ucr gLinkMemRole initialStatus
     currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
     let Profile {displayName} = profileToSendOnAccept user incognitoProfile True
         GroupMember {memberRole = userRole, memberId = userMemberId} = membership
@@ -740,6 +927,7 @@ acceptGroupJoinRequestAsync
                 fromMemberName = displayName,
                 invitedMember = MemberIdRole memberId gLinkMemRole,
                 groupProfile,
+                accepted = Just gAccepted,
                 business = businessChat,
                 groupSize = Just currentMemCount
               }
@@ -748,7 +936,34 @@ acceptGroupJoinRequestAsync
     let chatV = vr `peerConnChatVersion` cReqChatVRange
     connIds <- agentAcceptContactAsync user True invId msg subMode PQSupportOff chatV
     withStore $ \db -> do
-      liftIO $ createAcceptedMemberConnection db user connIds chatV ucr groupMemberId subMode
+      liftIO $ createJoiningMemberConnection db user connIds chatV ucr groupMemberId subMode
+      getGroupMemberById db vr user groupMemberId
+
+acceptGroupJoinSendRejectAsync :: User -> GroupInfo -> UserContactRequest -> GroupRejectionReason -> CM GroupMember
+acceptGroupJoinSendRejectAsync
+  user
+  gInfo@GroupInfo {groupProfile, membership}
+  ucr@UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange}
+  rejectionReason = do
+    gVar <- asks random
+    (groupMemberId, memberId) <- withStore $ \db -> do
+      liftIO $ deleteContactRequestRec db user ucr
+      createJoiningMember db gVar user gInfo ucr GRObserver GSMemRejected
+    let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
+        msg =
+          XGrpLinkReject $
+            GroupLinkRejection
+              { fromMember = MemberIdRole userMemberId userRole,
+                invitedMember = MemberIdRole memberId GRObserver,
+                groupProfile,
+                rejectionReason
+              }
+    subMode <- chatReadVar subscriptionMode
+    vr <- chatVersionRange
+    let chatV = vr `peerConnChatVersion` cReqChatVRange
+    connIds <- agentAcceptContactAsync user False invId msg subMode PQSupportOff chatV
+    withStore $ \db -> do
+      liftIO $ createJoiningMemberConnection db user connIds chatV ucr groupMemberId subMode
       getGroupMemberById db vr user groupMemberId
 
 acceptBusinessJoinRequestAsync :: User -> UserContactRequest -> CM GroupInfo
@@ -772,6 +987,7 @@ acceptBusinessJoinRequestAsync
                 fromMemberName = displayName,
                 invitedMember = MemberIdRole memberId GRMember,
                 groupProfile = businessGroupProfile userProfile groupPreferences,
+                accepted = Just GAAccepted,
                 -- This refers to the "title member" that defines the group name and profile.
                 -- This coincides with fromMember to be current user when accepting the connecting user,
                 -- but it will be different when inviting somebody else.
@@ -781,15 +997,15 @@ acceptBusinessJoinRequestAsync
     subMode <- chatReadVar subscriptionMode
     let chatV = vr `peerConnChatVersion` cReqChatVRange
     connIds <- agentAcceptContactAsync user True invId msg subMode PQSupportOff chatV
-    withStore' $ \db -> createAcceptedMemberConnection db user connIds chatV ucr groupMemberId subMode
-    let cd = CDGroupSnd gInfo
+    withStore' $ \db -> createJoiningMemberConnection db user connIds chatV ucr groupMemberId subMode
+    let cd = CDGroupSnd gInfo Nothing
     createInternalChatItem user cd (CISndGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing
     createGroupFeatureItems user cd CISndGroupFeature gInfo
     pure gInfo
     where
       businessGroupProfile :: Profile -> GroupPreferences -> GroupProfile
       businessGroupProfile Profile {displayName, fullName, image} groupPreferences =
-        GroupProfile {displayName, fullName, description = Nothing, image, groupPreferences = Just groupPreferences}
+        GroupProfile {displayName, fullName, description = Nothing, image, groupPreferences = Just groupPreferences, memberAdmission = Nothing}
 
 profileToSendOnAccept :: User -> Maybe IncognitoProfile -> Bool -> Profile
 profileToSendOnAccept user ip = userProfileToSend user (getIncognitoProfile <$> ip) Nothing
@@ -798,6 +1014,165 @@ profileToSendOnAccept user ip = userProfileToSend user (getIncognitoProfile <$>
       NewIncognito p -> p
       ExistingIncognito lp -> fromLocalProfile lp
 
+introduceToModerators :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM ()
+introduceToModerators vr user gInfo@GroupInfo {groupId} m@GroupMember {memberRole, memberId} = do
+  forM_ (memberConn m) $ \mConn -> do
+    let msg =
+          if (maxVersion (memberChatVRange m) >= groupKnockingVersion)
+            then XGrpLinkAcpt GAPendingReview memberRole memberId
+            else XMsgNew $ MCSimple $ extMsgContent (MCText pendingReviewMessage) Nothing
+    void $ sendDirectMemberMessage mConn msg groupId
+  modMs <- withStore' $ \db -> getGroupModerators db vr user gInfo
+  let rcpModMs = filter (\mem -> memberCurrent mem && maxVersion (memberChatVRange mem) >= groupKnockingVersion) modMs
+  introduceMember vr user gInfo m rcpModMs (Just $ MSMember $ memberId' m)
+
+introduceToAll :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM ()
+introduceToAll vr user gInfo m = do
+  members <- withStore' $ \db -> getGroupMembers db vr user gInfo
+  let recipients = filter memberCurrent members
+  introduceMember vr user gInfo m recipients Nothing
+
+introduceToRemaining :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM ()
+introduceToRemaining vr user gInfo m = do
+  (members, introducedGMIds) <-
+    withStore' $ \db -> (,) <$> getGroupMembers db vr user gInfo <*> getIntroducedGroupMemberIds db m
+  let recipients = filter (introduceMemP introducedGMIds) members
+  introduceMember vr user gInfo m recipients Nothing
+  where
+    introduceMemP introducedGMIds mem =
+      memberCurrent mem
+        && groupMemberId' mem `notElem` introducedGMIds
+        && groupMemberId' mem /= groupMemberId' m
+
+introduceMember :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> [GroupMember] -> Maybe MsgScope -> CM ()
+introduceMember _ _ _ GroupMember {activeConn = Nothing} _ _ = throwChatError $ CEInternalError "member connection not active"
+introduceMember vr user gInfo@GroupInfo {groupId} m@GroupMember {activeConn = Just conn} introduceToMembers msgScope = do
+  void . sendGroupMessage' user gInfo introduceToMembers $ XGrpMemNew (memberInfo m) msgScope
+  sendIntroductions introduceToMembers
+  where
+    sendIntroductions members = do
+      intros <- withStore' $ \db -> createIntroductions db (maxVersion vr) members m
+      shuffledIntros <- liftIO $ shuffleIntros intros
+      if m `supportsVersion` batchSendVersion
+        then do
+          let events = map (memberIntro . reMember) shuffledIntros
+          forM_ (L.nonEmpty events) $ \events' ->
+            sendGroupMemberMessages user conn events' groupId
+        else forM_ shuffledIntros $ \intro ->
+          processIntro intro `catchChatError` eToView
+    memberIntro :: GroupMember -> ChatMsgEvent 'Json
+    memberIntro reMember =
+      let mInfo = memberInfo reMember
+          mRestrictions = memberRestrictions reMember
+       in XGrpMemIntro mInfo mRestrictions
+    shuffleIntros :: [GroupMemberIntro] -> IO [GroupMemberIntro]
+    shuffleIntros intros = do
+      let (admins, others) = partition isAdmin intros
+          (admPics, admNoPics) = partition hasPicture admins
+          (othPics, othNoPics) = partition hasPicture others
+      mconcat <$> mapM shuffle [admPics, admNoPics, othPics, othNoPics]
+      where
+        isAdmin GroupMemberIntro {reMember = GroupMember {memberRole}} = memberRole >= GRAdmin
+        hasPicture GroupMemberIntro {reMember = GroupMember {memberProfile = LocalProfile {image}}} = isJust image
+    processIntro intro@GroupMemberIntro {introId} = do
+      void $ sendDirectMemberMessage conn (memberIntro $ reMember intro) groupId
+      withStore' $ \db -> updateIntroStatus db introId GMIntroSent
+
+sendHistory :: User -> GroupInfo -> GroupMember -> CM ()
+sendHistory _ _ GroupMember {activeConn = Nothing} = throwChatError $ CEInternalError "member connection not active"
+sendHistory user gInfo@GroupInfo {groupId, membership} m@GroupMember {activeConn = Just conn} =
+  when (m `supportsVersion` batchSendVersion) $ do
+    (errs, items) <- partitionEithers <$> withStore' (\db -> getGroupHistoryItems db user gInfo m 100)
+    (errs', events) <- partitionEithers <$> mapM (tryChatError . itemForwardEvents) items
+    let errors = map ChatErrorStore errs <> errs'
+    unless (null errors) $ toView $ CEvtChatErrors errors
+    let events' = maybe (concat events) (\x -> concat events <> [x]) descrEvent_
+    forM_ (L.nonEmpty events') $ \events'' ->
+      sendGroupMemberMessages user conn events'' groupId
+  where
+    descrEvent_ :: Maybe (ChatMsgEvent 'Json)
+    descrEvent_
+      | m `supportsVersion` groupHistoryIncludeWelcomeVersion = do
+          let GroupInfo {groupProfile = GroupProfile {description}} = gInfo
+          fmap (\descr -> XMsgNew $ MCSimple $ extMsgContent (MCText descr) Nothing) description
+      | otherwise = Nothing
+    itemForwardEvents :: CChatItem 'CTGroup -> CM [ChatMsgEvent 'Json]
+    itemForwardEvents cci = case cci of
+      (CChatItem SMDRcv ci@ChatItem {chatDir = CIGroupRcv sender, content = CIRcvMsgContent mc, file})
+        | not (blockedByAdmin sender) -> do
+            fInvDescr_ <- join <$> forM file getRcvFileInvDescr
+            processContentItem sender ci mc fInvDescr_
+      (CChatItem SMDSnd ci@ChatItem {content = CISndMsgContent mc, file}) -> do
+        fInvDescr_ <- join <$> forM file getSndFileInvDescr
+        processContentItem membership ci mc fInvDescr_
+      _ -> pure []
+      where
+        getRcvFileInvDescr :: CIFile 'MDRcv -> CM (Maybe (FileInvitation, RcvFileDescrText))
+        getRcvFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
+          expired <- fileExpired
+          if fileProtocol /= FPXFTP || fileStatus == CIFSRcvCancelled || expired
+            then pure Nothing
+            else do
+              rfd <- withStore $ \db -> getRcvFileDescrByRcvFileId db fileId
+              pure $ invCompleteDescr ciFile rfd
+        getSndFileInvDescr :: CIFile 'MDSnd -> CM (Maybe (FileInvitation, RcvFileDescrText))
+        getSndFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
+          expired <- fileExpired
+          if fileProtocol /= FPXFTP || fileStatus == CIFSSndCancelled || expired
+            then pure Nothing
+            else do
+              -- can also lookup in extra_xftp_file_descriptions, though it can be empty;
+              -- would be best if snd file had a single rcv description for all members saved in files table
+              rfd <- withStore $ \db -> getRcvFileDescrBySndFileId db fileId
+              pure $ invCompleteDescr ciFile rfd
+        fileExpired :: CM Bool
+        fileExpired = do
+          ttl <- asks $ rcvFilesTTL . agentConfig . config
+          cutoffTs <- addUTCTime (-ttl) <$> liftIO getCurrentTime
+          pure $ chatItemTs cci < cutoffTs
+        invCompleteDescr :: CIFile d -> RcvFileDescr -> Maybe (FileInvitation, RcvFileDescrText)
+        invCompleteDescr CIFile {fileName, fileSize} RcvFileDescr {fileDescrText, fileDescrComplete}
+          | fileDescrComplete =
+              let fInvDescr = FileDescr {fileDescrText = "", fileDescrPartNo = 0, fileDescrComplete = False}
+                  fInv = xftpFileInvitation fileName fileSize fInvDescr
+               in Just (fInv, fileDescrText)
+          | otherwise = Nothing
+        processContentItem :: GroupMember -> ChatItem 'CTGroup d -> MsgContent -> Maybe (FileInvitation, RcvFileDescrText) -> CM [ChatMsgEvent 'Json]
+        processContentItem sender ChatItem {formattedText, meta, quotedItem, mentions} mc fInvDescr_ =
+          if isNothing fInvDescr_ && not (msgContentHasText mc)
+            then pure []
+            else do
+              let CIMeta {itemTs, itemSharedMsgId, itemTimed} = meta
+                  quotedItemId_ = quoteItemId =<< quotedItem
+                  fInv_ = fst <$> fInvDescr_
+                  (mc', _, mentions') = updatedMentionNames mc formattedText mentions
+                  mentions'' = M.map (\CIMention {memberId} -> MsgMention {memberId}) mentions'
+              -- TODO [knocking] send history to other scopes too?
+              (chatMsgEvent, _) <- withStore $ \db -> prepareGroupMsg db user gInfo Nothing mc' mentions'' quotedItemId_ Nothing fInv_ itemTimed False
+              let senderVRange = memberChatVRange' sender
+                  xMsgNewChatMsg = ChatMessage {chatVRange = senderVRange, msgId = itemSharedMsgId, chatMsgEvent}
+              fileDescrEvents <- case (snd <$> fInvDescr_, itemSharedMsgId) of
+                (Just fileDescrText, Just msgId) -> do
+                  partSize <- asks $ xftpDescrPartSize . config
+                  let parts = splitFileDescr partSize fileDescrText
+                  pure . L.toList $ L.map (XMsgFileDescr msgId) parts
+                _ -> pure []
+              let fileDescrChatMsgs = map (ChatMessage senderVRange Nothing) fileDescrEvents
+                  GroupMember {memberId} = sender
+                  msgForwardEvents = map (\cm -> XGrpMsgForward memberId cm itemTs) (xMsgNewChatMsg : fileDescrChatMsgs)
+              pure msgForwardEvents
+
+splitFileDescr :: Int -> RcvFileDescrText -> NonEmpty FileDescr
+splitFileDescr partSize rfdText = splitParts 1 rfdText
+  where
+    splitParts partNo remText =
+      let (part, rest) = T.splitAt partSize remText
+          complete = T.null rest
+          fileDescr = FileDescr {fileDescrText = part, fileDescrPartNo = partNo, fileDescrComplete = complete}
+       in if complete
+            then fileDescr :| []
+            else fileDescr <| splitParts (partNo + 1) rest
+
 deleteGroupLink' :: User -> GroupInfo -> CM ()
 deleteGroupLink' user gInfo = do
   vr <- chatVersionRange
@@ -812,7 +1187,7 @@ deleteGroupLinkIfExists user gInfo = do
 
 deleteGroupLink_ :: User -> GroupInfo -> Connection -> CM ()
 deleteGroupLink_ user gInfo conn = do
-  deleteAgentConnectionAsync user $ aConnId conn
+  deleteAgentConnectionAsync $ aConnId conn
   withStore' $ \db -> deleteGroupLink db user gInfo
 
 startProximateTimedItemThread :: User -> (ChatRef, ChatItemId) -> UTCTime -> CM ()
@@ -838,7 +1213,7 @@ startTimedItemThread user itemRef deleteAt = do
     atomically $ writeTVar threadTVar (Just tId)
 
 deleteTimedItem :: User -> (ChatRef, ChatItemId) -> UTCTime -> CM ()
-deleteTimedItem user (ChatRef cType chatId, itemId) deleteAt = do
+deleteTimedItem user (ChatRef cType chatId scope, itemId) deleteAt = do
   ts <- liftIO getCurrentTime
   liftIO $ threadDelay' $ diffToMicroseconds $ diffUTCTime deleteAt ts
   lift waitChatStartedAndActivated
@@ -846,12 +1221,15 @@ deleteTimedItem user (ChatRef cType chatId, itemId) deleteAt = do
   case cType of
     CTDirect -> do
       (ct, ci) <- withStore $ \db -> (,) <$> getContact db vr user chatId <*> getDirectChatItem db user chatId itemId
-      deleteDirectCIs user ct [ci] True True >>= toView
+      deletions <- deleteDirectCIs user ct [ci]
+      toView $ CEvtChatItemsDeleted user deletions True True
     CTGroup -> do
       (gInfo, ci) <- withStore $ \db -> (,) <$> getGroupInfo db vr user chatId <*> getGroupChatItem db user chatId itemId
       deletedTs <- liftIO getCurrentTime
-      deleteGroupCIs user gInfo [ci] True True Nothing deletedTs >>= toView
-    _ -> toView . CRChatError (Just user) . ChatError $ CEInternalError "bad deleteTimedItem cType"
+      chatScopeInfo <- mapM (getChatScopeInfo vr user) scope
+      deletions <- deleteGroupCIs user gInfo chatScopeInfo [ci] Nothing deletedTs
+      toView $ CEvtChatItemsDeleted user deletions True True
+    _ -> eToView $ ChatError $ CEInternalError "bad deleteTimedItem cType"
 
 startUpdatedTimedItemThread :: User -> ChatRef -> ChatItem c d -> ChatItem c d -> CM ()
 startUpdatedTimedItemThread user chatRef ci ci' =
@@ -863,9 +1241,6 @@ startUpdatedTimedItemThread user chatRef ci ci' =
 metaBrokerTs :: MsgMeta -> UTCTime
 metaBrokerTs MsgMeta {broker = (_, brokerTs)} = brokerTs
 
-sameMemberId :: MemberId -> GroupMember -> Bool
-sameMemberId memId GroupMember {memberId} = memId == memberId
-
 createContactPQSndItem :: User -> Contact -> Connection -> PQEncryption -> CM (Contact, Connection)
 createContactPQSndItem user ct conn@Connection {pqSndEnabled} pqSndEnabled' =
   flip catchChatError (const $ pure (ct, conn)) $ case (pqSndEnabled, pqSndEnabled') of
@@ -878,7 +1253,7 @@ createContactPQSndItem user ct conn@Connection {pqSndEnabled} pqSndEnabled' =
           ct' = ct {activeConn = Just conn'} :: Contact
       when (contactPQEnabled ct /= contactPQEnabled ct') $ do
         createInternalChatItem user (CDDirectSnd ct') ciContent Nothing
-        toView $ CRContactPQEnabled user ct' pqSndEnabled'
+        toView $ CEvtContactPQEnabled user ct' pqSndEnabled'
       pure (ct', conn')
 
 updateContactPQRcv :: User -> Contact -> Connection -> PQEncryption -> CM (Contact, Connection)
@@ -894,7 +1269,7 @@ updateContactPQRcv user ct conn@Connection {connId, pqRcvEnabled} pqRcvEnabled'
           ct' = ct {activeConn = Just conn'} :: Contact
       when (contactPQEnabled ct /= contactPQEnabled ct') $ do
         createInternalChatItem user (CDDirectRcv ct') ciContent Nothing
-        toView $ CRContactPQEnabled user ct' pqRcvEnabled'
+        toView $ CEvtContactPQEnabled user ct' pqRcvEnabled'
       pure (ct', conn')
 
 updatePeerChatVRange :: Connection -> VersionRangeChat -> CM Connection
@@ -968,6 +1343,103 @@ parseChatMessage conn s = do
     errType = CEInvalidChatMessage conn Nothing (safeDecodeUtf8 s)
 {-# INLINE parseChatMessage #-}
 
+getChatScopeInfo :: VersionRangeChat -> User -> GroupChatScope -> CM GroupChatScopeInfo
+getChatScopeInfo vr user = \case
+  GCSMemberSupport Nothing -> pure $ GCSIMemberSupport Nothing
+  GCSMemberSupport (Just gmId) -> do
+    supportMem <- withFastStore $ \db -> getGroupMemberById db vr user gmId
+    pure $ GCSIMemberSupport (Just supportMem)
+
+-- TODO [knocking] refactor to GroupChatScope -> "a" function, "a" is some new type? Or possibly split to get scope/get recipients steps
+getGroupRecipients :: VersionRangeChat -> User -> GroupInfo -> Maybe GroupChatScope -> VersionChat -> CM (Maybe GroupChatScopeInfo, [GroupMember])
+getGroupRecipients vr user gInfo@GroupInfo {membership} scope modsCompatVersion = case scope of
+  Nothing -> do
+    unless (memberCurrent membership && memberActive membership) $ throwChatError $ CECommandError "not current member"
+    ms <- withFastStore' $ \db -> getGroupMembers db vr user gInfo
+    let recipients = filter memberCurrent ms
+    pure (Nothing, recipients)
+  Just (GCSMemberSupport Nothing) -> do
+    modMs <- withFastStore' $ \db -> getGroupModerators db vr user gInfo
+    let rcpModMs' = filter (\m -> compatible m && memberCurrent m) modMs
+    when (null rcpModMs') $ throwChatError $ CECommandError "no admins support this message"
+    let scopeInfo = GCSIMemberSupport Nothing
+    pure (Just scopeInfo, rcpModMs')
+  Just (GCSMemberSupport (Just gmId)) -> do
+    unless (memberCurrent membership && memberActive membership) $ throwChatError $ CECommandError "not current member"
+    supportMem <- withFastStore $ \db -> getGroupMemberById db vr user gmId
+    unless (memberCurrentOrPending supportMem) $ throwChatError $ CECommandError "support member not current or pending"
+    let scopeInfo = GCSIMemberSupport (Just supportMem)
+    if memberStatus supportMem == GSMemPendingApproval
+      then pure (Just scopeInfo, [supportMem])
+      else do
+        modMs <- withFastStore' $ \db -> getGroupModerators db vr user gInfo
+        let rcpModMs' = filter (\m -> compatible m && memberCurrent m) modMs
+        pure (Just scopeInfo, [supportMem] <> rcpModMs')
+  where
+    compatible GroupMember {activeConn, memberChatVRange} =
+      maxVersion (maybe memberChatVRange peerChatVRange activeConn) >= modsCompatVersion
+
+mkLocalGroupChatScope :: GroupInfo -> CM (GroupInfo, Maybe GroupChatScopeInfo)
+mkLocalGroupChatScope gInfo@GroupInfo {membership}
+  | memberPending membership = do
+      (gInfo', scopeInfo) <- mkGroupSupportChatInfo gInfo
+      pure (gInfo', Just scopeInfo)
+  | otherwise =
+      pure (gInfo, Nothing)
+
+mkGroupChatScope :: GroupInfo -> GroupMember -> CM (GroupInfo, GroupMember, Maybe GroupChatScopeInfo)
+mkGroupChatScope gInfo@GroupInfo {membership} m
+  | memberPending membership = do
+      (gInfo', scopeInfo) <- mkGroupSupportChatInfo gInfo
+      pure (gInfo', m, Just scopeInfo)
+  | memberPending m = do
+      (m', scopeInfo) <- mkMemberSupportChatInfo m
+      pure (gInfo, m', Just scopeInfo)
+  | otherwise =
+      pure (gInfo, m, Nothing)
+
+mkGetMessageChatScope :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> Maybe MsgScope -> CM (GroupInfo, GroupMember, Maybe GroupChatScopeInfo)
+mkGetMessageChatScope vr user gInfo@GroupInfo {membership} m msgScope_ =
+  mkGroupChatScope gInfo m >>= \case
+    groupScope@(_gInfo', _m', Just _scopeInfo) -> pure groupScope
+    (_, _, Nothing) -> case msgScope_ of
+      Nothing -> pure (gInfo, m, Nothing)
+      Just (MSMember mId)
+        | sameMemberId mId membership -> do
+            (gInfo', scopeInfo) <- mkGroupSupportChatInfo gInfo
+            pure (gInfo', m, Just scopeInfo)
+        | otherwise -> do
+            referredMember <- withStore $ \db -> getGroupMemberByMemberId db vr user gInfo mId
+            -- TODO [knocking] return patched _referredMember' too?
+            (_referredMember', scopeInfo) <- mkMemberSupportChatInfo referredMember
+            pure (gInfo, m, Just scopeInfo)
+
+mkGroupSupportChatInfo :: GroupInfo -> CM (GroupInfo, GroupChatScopeInfo)
+mkGroupSupportChatInfo gInfo@GroupInfo {membership} =
+  case supportChat membership of
+    Nothing -> do
+      chatTs <- liftIO getCurrentTime
+      withStore' $ \db -> setSupportChatTs db (groupMemberId' membership) chatTs
+      let gInfo' = gInfo {membership = membership {supportChat = Just $ GroupSupportChat chatTs 0 0 0 Nothing}}
+          scopeInfo = GCSIMemberSupport {groupMember_ = Nothing}
+      pure (gInfo', scopeInfo)
+    Just _supportChat ->
+      let scopeInfo = GCSIMemberSupport {groupMember_ = Nothing}
+       in pure (gInfo, scopeInfo)
+
+mkMemberSupportChatInfo :: GroupMember -> CM (GroupMember, GroupChatScopeInfo)
+mkMemberSupportChatInfo m@GroupMember {groupMemberId, supportChat} =
+  case supportChat of
+    Nothing -> do
+      chatTs <- liftIO getCurrentTime
+      withStore' $ \db -> setSupportChatTs db groupMemberId chatTs
+      let m' = m {supportChat = Just $ GroupSupportChat chatTs 0 0 0 Nothing}
+          scopeInfo = GCSIMemberSupport {groupMember_ = Just m'}
+      pure (m', scopeInfo)
+    Just _supportChat ->
+      let scopeInfo = GCSIMemberSupport {groupMember_ = Just m}
+       in pure (m, scopeInfo)
+
 sendFileChunk :: User -> SndFileTransfer -> CM ()
 sendFileChunk user ft@SndFileTransfer {fileId, fileStatus, agentConnId = AgentConnId acId} =
   unless (fileStatus == FSComplete || fileStatus == FSCancelled) $ do
@@ -979,9 +1451,9 @@ sendFileChunk user ft@SndFileTransfer {fileId, fileStatus, agentConnId = AgentCo
           liftIO $ updateSndFileStatus db ft FSComplete
           liftIO $ deleteSndFileChunks db ft
           updateDirectCIFileStatus db vr user fileId CIFSSndComplete
-        toView $ CRSndFileComplete user ci ft
+        toView $ CEvtSndFileComplete user ci ft
         lift $ closeFileHandle fileId sndFiles
-        deleteAgentConnectionAsync user acId
+        deleteAgentConnectionAsync acId
 
 sendFileChunkNo :: SndFileTransfer -> Integer -> CM ()
 sendFileChunkNo ft@SndFileTransfer {agentConnId = AgentConnId acId} chunkNo = do
@@ -1029,7 +1501,7 @@ appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs, fileInvitati
               removeFile fsFilePath `catchChatError` \_ -> pure ()
               renameFile tmpFile fsFilePath
             Left e -> do
-              toView $ CRChatError Nothing e
+              eToView e
               removeFile tmpFile `catchChatError` \_ -> pure ()
               withStore' (`removeFileCryptoArgs` fileId)
       where
@@ -1054,7 +1526,7 @@ isFileActive fileId files = do
 
 cancelRcvFileTransfer :: User -> RcvFileTransfer -> CM (Maybe ConnId)
 cancelRcvFileTransfer user ft@RcvFileTransfer {fileId, xftpRcvFile, rcvFileInline} =
-  cancel' `catchChatError` (\e -> toView (CRChatError (Just user) e) $> fileConnId)
+  cancel' `catchChatError` (\e -> eToView e $> fileConnId)
   where
     cancel' = do
       lift $ closeFileHandle fileId rcvFiles
@@ -1072,13 +1544,13 @@ cancelRcvFileTransfer user ft@RcvFileTransfer {fileId, xftpRcvFile, rcvFileInlin
 cancelSndFile :: User -> FileTransferMeta -> [SndFileTransfer] -> Bool -> CM [ConnId]
 cancelSndFile user FileTransferMeta {fileId, xftpSndFile} fts sendCancel = do
   withStore' (\db -> updateFileCancelled db user fileId CIFSSndCancelled)
-    `catchChatError` (toView . CRChatError (Just user))
+    `catchChatError` eToView
   case xftpSndFile of
     Nothing ->
       catMaybes <$> forM fts (\ft -> cancelSndFileTransfer user ft sendCancel)
     Just xsf -> do
       forM_ fts (\ft -> cancelSndFileTransfer user ft False)
-      lift (agentXFTPDeleteSndFileRemote user xsf fileId) `catchChatError` (toView . CRChatError (Just user))
+      lift (agentXFTPDeleteSndFileRemote user xsf fileId) `catchChatError` eToView
       pure []
 
 -- TODO v6.0 remove
@@ -1086,7 +1558,7 @@ cancelSndFileTransfer :: User -> SndFileTransfer -> Bool -> CM (Maybe ConnId)
 cancelSndFileTransfer user@User {userId} ft@SndFileTransfer {fileId, connId, agentConnId = AgentConnId acId, fileStatus, fileInline} sendCancel =
   if fileStatus == FSCancelled || fileStatus == FSComplete
     then pure Nothing
-    else cancel' `catchChatError` (\e -> toView (CRChatError (Just user) e) $> fileConnId)
+    else cancel' `catchChatError` (\e -> eToView e $> fileConnId)
   where
     cancel' = do
       withStore' $ \db -> do
@@ -1112,27 +1584,33 @@ deleteMembersConnections user members = deleteMembersConnections' user members F
 
 deleteMembersConnections' :: User -> [GroupMember] -> Bool -> CM ()
 deleteMembersConnections' user members waitDelivery = do
-  let memberConns =
-        filter (\Connection {connStatus} -> connStatus /= ConnDeleted) $
-          mapMaybe (\GroupMember {activeConn} -> activeConn) members
-  deleteAgentConnectionsAsync' user (map aConnId memberConns) waitDelivery
-  lift . void . withStoreBatch' $ \db -> map (\conn -> updateConnectionStatus db conn ConnDeleted) memberConns
+  let memberConns = mapMaybe (\GroupMember {activeConn} -> activeConn) members
+  deleteAgentConnectionsAsync' (map aConnId memberConns) waitDelivery
+  lift . void . withStoreBatch' $ \db -> map (\Connection {connId} -> deleteConnectionRecord db user connId) memberConns
 
-deleteMemberConnection :: User -> GroupMember -> CM ()
-deleteMemberConnection user mem = deleteMemberConnection' user mem False
+deleteMemberConnection :: GroupMember -> CM ()
+deleteMemberConnection mem = deleteMemberConnection' mem False
 
-deleteMemberConnection' :: User -> GroupMember -> Bool -> CM ()
-deleteMemberConnection' user GroupMember {activeConn} waitDelivery = do
+deleteMemberConnection' :: GroupMember -> Bool -> CM ()
+deleteMemberConnection' GroupMember {activeConn} waitDelivery = do
   forM_ activeConn $ \conn -> do
-    deleteAgentConnectionAsync' user (aConnId conn) waitDelivery
+    deleteAgentConnectionAsync' (aConnId conn) waitDelivery
     withStore' $ \db -> updateConnectionStatus db conn ConnDeleted
 
-deleteOrUpdateMemberRecord :: User -> GroupMember -> CM ()
-deleteOrUpdateMemberRecord user@User {userId} member =
-  withStore' $ \db ->
-    checkGroupMemberHasItems db user member >>= \case
-      Just _ -> updateGroupMemberStatus db userId member GSMemRemoved
-      Nothing -> deleteGroupMember db user member
+deleteOrUpdateMemberRecord :: User -> GroupInfo -> GroupMember -> CM GroupInfo
+deleteOrUpdateMemberRecord user gInfo member =
+  withStore' $ \db -> deleteOrUpdateMemberRecordIO db user gInfo member
+
+deleteOrUpdateMemberRecordIO :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO GroupInfo
+deleteOrUpdateMemberRecordIO db user@User {userId} gInfo member = do
+  gInfo' <-
+    if gmRequiresAttention member
+      then decreaseGroupMembersRequireAttention db user gInfo
+      else pure gInfo
+  checkGroupMemberHasItems db user member >>= \case
+    Just _ -> updateGroupMemberStatus db userId member GSMemRemoved
+    Nothing -> deleteGroupMember db user member
+  pure gInfo'
 
 sendDirectContactMessages :: MsgEncodingI e => User -> Contact -> NonEmpty (ChatMsgEvent e) -> CM [Either ChatError SndMessage]
 sendDirectContactMessages user ct events = do
@@ -1206,7 +1684,7 @@ sendGroupMemberMessages user conn events groupId = do
   when (connDisabled conn) $ throwChatError (CEConnectionDisabled conn)
   let idsEvts = L.map (GroupId groupId,) events
   (errs, msgs) <- lift $ partitionEithers . L.toList <$> createSndMessages idsEvts
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
+  unless (null errs) $ toView $ CEvtChatErrors errs
   forM_ (L.nonEmpty msgs) $ \msgs' ->
     batchSendConnMessages user conn MsgFlags {notification = True} msgs'
 
@@ -1219,7 +1697,7 @@ batchSendConnMessagesB _user conn msgFlags msgs_ = do
   let batched_ = batchSndMessagesJSON msgs_
   case L.nonEmpty batched_ of
     Just batched' -> do
-      let msgReqs = L.map (fmap (msgBatchReq conn msgFlags)) batched'
+      let msgReqs = L.map (fmap msgBatchReq_) batched'
       delivered <- deliverMessagesB msgReqs
       let msgs' = concat $ L.zipWith flattenMsgs batched' delivered
           pqEnc = findLastPQEnc delivered
@@ -1227,6 +1705,9 @@ batchSendConnMessagesB _user conn msgFlags msgs_ = do
       pure (msgs', pqEnc)
     Nothing -> pure ([], Nothing)
   where
+    msgBatchReq_ :: MsgBatch -> ChatMsgReq
+    msgBatchReq_ (MsgBatch batchBody sndMsgs) =
+      (conn, msgFlags, (vrValue batchBody, map (\SndMessage {msgId} -> msgId) sndMsgs))
     flattenMsgs :: Either ChatError MsgBatch -> Either ChatError ([Int64], PQEncryption) -> [Either ChatError SndMessage]
     flattenMsgs (Right (MsgBatch _ sndMsgs)) (Right _) = map Right sndMsgs
     flattenMsgs (Right (MsgBatch _ sndMsgs)) (Left ce) = replicate (length sndMsgs) (Left ce)
@@ -1237,9 +1718,6 @@ batchSendConnMessagesB _user conn msgFlags msgs_ = do
 batchSndMessagesJSON :: NonEmpty (Either ChatError SndMessage) -> [Either ChatError MsgBatch]
 batchSndMessagesJSON = batchMessages maxEncodedMsgLength . L.toList
 
-msgBatchReq :: Connection -> MsgFlags -> MsgBatch -> ChatMsgReq
-msgBatchReq conn msgFlags (MsgBatch batchBody sndMsgs) = (conn, msgFlags, batchBody, map (\SndMessage {msgId} -> msgId) sndMsgs)
-
 encodeConnInfo :: MsgEncodingI e => ChatMsgEvent e -> CM ByteString
 encodeConnInfo chatMsgEvent = do
   vr <- chatVersionRange
@@ -1265,7 +1743,7 @@ deliverMessage conn cmEventTag msgBody msgId = do
 
 deliverMessage' :: Connection -> MsgFlags -> MsgBody -> MessageId -> CM (Int64, PQEncryption)
 deliverMessage' conn msgFlags msgBody msgId =
-  deliverMessages ((conn, msgFlags, msgBody, [msgId]) :| []) >>= \case
+  deliverMessages ((conn, msgFlags, (vrValue msgBody, [msgId])) :| []) >>= \case
     r :| [] -> case r of
       Right ([deliveryId], pqEnc) -> pure (deliveryId, pqEnc)
       Right (deliveryIds, _) -> throwChatError $ CEInternalError $ "deliverMessage: expected 1 delivery id, got " <> show (length deliveryIds)
@@ -1273,45 +1751,45 @@ deliverMessage' conn msgFlags msgBody msgId =
     rs -> throwChatError $ CEInternalError $ "deliverMessage: expected 1 result, got " <> show (length rs)
 
 -- [MessageId] - SndMessage ids inside MsgBatch, or single message id
-type ChatMsgReq = (Connection, MsgFlags, MsgBody, [MessageId])
+type ChatMsgReq = (Connection, MsgFlags, (ValueOrRef MsgBody, [MessageId]))
 
 deliverMessages :: NonEmpty ChatMsgReq -> CM (NonEmpty (Either ChatError ([Int64], PQEncryption)))
 deliverMessages msgs = deliverMessagesB $ L.map Right msgs
 
 deliverMessagesB :: NonEmpty (Either ChatError ChatMsgReq) -> CM (NonEmpty (Either ChatError ([Int64], PQEncryption)))
 deliverMessagesB msgReqs = do
-  msgReqs' <- liftIO compressBodies
+  msgReqs' <- if any connSupportsPQ msgReqs then liftIO compressBodies else pure msgReqs
   sent <- L.zipWith prepareBatch msgReqs' <$> withAgent (`sendMessagesB` snd (mapAccumL toAgent Nothing msgReqs'))
   lift . void $ withStoreBatch' $ \db -> map (updatePQSndEnabled db) (rights . L.toList $ sent)
   lift . withStoreBatch $ \db -> L.map (bindRight $ createDelivery db) sent
   where
+    connSupportsPQ = \case
+      Right (Connection {pqSupport = PQSupportOn, connChatVersion = v}, _, _) -> v >= pqEncryptionCompressionVersion
+      _ -> False
     compressBodies =
-      forME msgReqs $ \mr@(conn@Connection {pqSupport, connChatVersion = v}, msgFlags, msgBody, msgIds) ->
-        runExceptT $ case pqSupport of
-          -- we only compress messages when:
-          -- 1) PQ support is enabled
-          -- 2) version is compatible with compression
-          -- 3) message is longer than max compressed size (as this function is not used for batched messages anyway)
-          PQSupportOn | v >= pqEncryptionCompressionVersion && B.length msgBody > maxCompressedMsgLength -> do
+      forME msgReqs $ \(conn, msgFlags, (mbr, msgIds)) -> runExceptT $ do
+        mbr' <- case mbr of
+          VRValue i msgBody | B.length msgBody > maxCompressedMsgLength -> do
             let msgBody' = compressedBatchMsgBody_ msgBody
             when (B.length msgBody' > maxCompressedMsgLength) $ throwError $ ChatError $ CEException "large compressed message"
-            pure (conn, msgFlags, msgBody', msgIds)
-          _ -> pure mr
+            pure $ VRValue i msgBody'
+          v -> pure v
+        pure (conn, msgFlags, (mbr', msgIds))
     toAgent prev = \case
-      Right (conn@Connection {connId, pqEncryption}, msgFlags, msgBody, _msgIds) ->
+      Right (conn@Connection {connId, pqEncryption}, msgFlags, (mbr, _msgIds)) ->
         let cId = case prev of
               Just prevId | prevId == connId -> ""
               _ -> aConnId conn
-         in (Just connId, Right (cId, pqEncryption, msgFlags, msgBody))
+         in (Just connId, Right (cId, pqEncryption, msgFlags, mbr))
       Left _ce -> (prev, Left (AP.INTERNAL "ChatError, skip")) -- as long as it is Left, the agent batchers should just step over it
     prepareBatch (Right req) (Right ar) = Right (req, ar)
     prepareBatch (Left ce) _ = Left ce -- restore original ChatError
     prepareBatch _ (Left ae) = Left $ ChatErrorAgent ae Nothing
     createDelivery :: DB.Connection -> (ChatMsgReq, (AgentMsgId, PQEncryption)) -> IO (Either ChatError ([Int64], PQEncryption))
-    createDelivery db ((Connection {connId}, _, _, msgIds), (agentMsgId, pqEnc')) = do
+    createDelivery db ((Connection {connId}, _, (_, msgIds)), (agentMsgId, pqEnc')) = do
       Right . (,pqEnc') <$> mapM (createSndMsgDelivery db (SndMsgDelivery {connId, agentMsgId})) msgIds
     updatePQSndEnabled :: DB.Connection -> (ChatMsgReq, (AgentMsgId, PQEncryption)) -> IO ()
-    updatePQSndEnabled db ((Connection {connId, pqSndEnabled}, _, _, _), (_, pqSndEnabled')) =
+    updatePQSndEnabled db ((Connection {connId, pqSndEnabled}, _, _), (_, pqSndEnabled')) =
       case (pqSndEnabled, pqSndEnabled') of
         (Just b, b') | b' /= b -> updatePQ
         (Nothing, PQEncOn) -> updatePQ
@@ -1319,9 +1797,9 @@ deliverMessagesB msgReqs = do
       where
         updatePQ = updateConnPQSndEnabled db connId pqSndEnabled'
 
-sendGroupMessage :: MsgEncodingI e => User -> GroupInfo -> [GroupMember] -> ChatMsgEvent e -> CM SndMessage
-sendGroupMessage user gInfo members chatMsgEvent = do
-  sendGroupMessages user gInfo members (chatMsgEvent :| []) >>= \case
+sendGroupMessage :: MsgEncodingI e => User -> GroupInfo -> Maybe GroupChatScope -> [GroupMember] -> ChatMsgEvent e -> CM SndMessage
+sendGroupMessage user gInfo gcScope members chatMsgEvent = do
+  sendGroupMessages user gInfo gcScope members (chatMsgEvent :| []) >>= \case
     ((Right msg) :| [], _) -> pure msg
     _ -> throwChatError $ CEInternalError "sendGroupMessage: expected 1 message"
 
@@ -1331,15 +1809,17 @@ sendGroupMessage' user gInfo members chatMsgEvent =
     ((Right msg) :| [], _) -> pure msg
     _ -> throwChatError $ CEInternalError "sendGroupMessage': expected 1 message"
 
-sendGroupMessages :: MsgEncodingI e => User -> GroupInfo -> [GroupMember] -> NonEmpty (ChatMsgEvent e) -> CM (NonEmpty (Either ChatError SndMessage), GroupSndResult)
-sendGroupMessages user gInfo members events = do
+sendGroupMessages :: MsgEncodingI e => User -> GroupInfo -> Maybe GroupChatScope -> [GroupMember] -> NonEmpty (ChatMsgEvent e) -> CM (NonEmpty (Either ChatError SndMessage), GroupSndResult)
+sendGroupMessages user gInfo scope members events = do
+  -- TODO [knocking] send current profile to pending member after approval?
   when shouldSendProfileUpdate $
-    sendProfileUpdate `catchChatError` (toView . CRChatError (Just user))
+    sendProfileUpdate `catchChatError` eToView
   sendGroupMessages_ user gInfo members events
   where
     User {profile = p, userMemberProfileUpdatedAt} = user
     GroupInfo {userMemberProfileSentAt} = gInfo
     shouldSendProfileUpdate
+      | isJust scope = False -- why not sending profile updates to scopes?
       | incognitoMembership gInfo = False
       | otherwise =
           case (userMemberProfileSentAt, userMemberProfileUpdatedAt) of
@@ -1360,13 +1840,13 @@ data GroupSndResult = GroupSndResult
   }
 
 sendGroupMessages_ :: MsgEncodingI e => User -> GroupInfo -> [GroupMember] -> NonEmpty (ChatMsgEvent e) -> CM (NonEmpty (Either ChatError SndMessage), GroupSndResult)
-sendGroupMessages_ _user gInfo@GroupInfo {groupId} members events = do
+sendGroupMessages_ _user gInfo@GroupInfo {groupId} recipientMembers events = do
   let idsEvts = L.map (GroupId groupId,) events
   sndMsgs_ <- lift $ createSndMessages idsEvts
-  recipientMembers <- liftIO $ shuffleMembers (filter memberCurrent members)
+  recipientMembers' <- liftIO $ shuffleMembers recipientMembers
   let msgFlags = MsgFlags {notification = any (hasNotification . toCMEventTag) events}
       (toSendSeparate, toSendBatched, toPending, forwarded, _, dups) =
-        foldr' addMember ([], [], [], [], S.empty, 0 :: Int) recipientMembers
+        foldr' (addMember recipientMembers') ([], [], [], [], S.empty, 0 :: Int) recipientMembers'
   when (dups /= 0) $ logError $ "sendGroupMessages_: " <> tshow dups <> " duplicate members"
   -- TODO PQ either somehow ensure that group members connections cannot have pqSupport/pqEncryption or pass Off's here
   -- Deliver to toSend members
@@ -1378,7 +1858,7 @@ sendGroupMessages_ _user gInfo@GroupInfo {groupId} members events = do
   stored <- lift $ withStoreBatch (\db -> map (bindRight $ createPendingMsg db) pendingReqs)
   when (length stored /= length pendingMemIds) $ logError "sendGroupMessages_: pendingMemIds and stored length mismatch"
   -- Zip for easier access to results
-  let sentTo = zipWith3 (\mId mReq r -> (mId, fmap (\(_, _, _, msgIds) -> msgIds) mReq, r)) sendToMemIds msgReqs delivered
+  let sentTo = zipWith3 (\mId mReq r -> (mId, fmap (\(_, _, (_, msgIds)) -> msgIds) mReq, r)) sendToMemIds msgReqs delivered
       pending = zipWith3 (\mId pReq r -> (mId, fmap snd pReq, r)) pendingMemIds pendingReqs stored
   pure (sndMsgs_, GroupSndResult {sentTo, pending, forwarded})
   where
@@ -1388,7 +1868,7 @@ sendGroupMessages_ _user gInfo@GroupInfo {groupId} members events = do
       liftM2 (<>) (shuffle adminMs) (shuffle otherMs)
       where
         isAdmin GroupMember {memberRole} = memberRole >= GRAdmin
-    addMember m acc@(toSendSeparate, toSendBatched, pending, forwarded, !mIds, !dups) =
+    addMember members m acc@(toSendSeparate, toSendBatched, pending, forwarded, !mIds, !dups) =
       case memberSendAction gInfo events members m of
         Just a
           | mId `S.member` mIds -> (toSendSeparate, toSendBatched, pending, forwarded, mIds, dups + 1)
@@ -1402,24 +1882,36 @@ sendGroupMessages_ _user gInfo@GroupInfo {groupId} members events = do
         mId = groupMemberId' m
         mIds' = S.insert mId mIds
     prepareMsgReqs :: MsgFlags -> NonEmpty (Either ChatError SndMessage) -> [(GroupMember, Connection)] -> [(GroupMember, Connection)] -> ([GroupMemberId], [Either ChatError ChatMsgReq])
-    prepareMsgReqs msgFlags msgs_ toSendSeparate toSendBatched = do
-      let batched_ = batchSndMessagesJSON msgs_
+    prepareMsgReqs msgFlags msgs toSendSeparate toSendBatched = do
+      let batched_ = batchSndMessagesJSON msgs
       case L.nonEmpty batched_ of
         Just batched' -> do
-          let (memsSep, mreqsSep) = foldr' foldMsgs ([], []) toSendSeparate
-              (memsBtch, mreqsBtch) = foldr' (foldBatches batched') ([], []) toSendBatched
+          let lenMsgs = length msgs
+              (memsSep, mreqsSep) = foldMembers lenMsgs sndMessageMBR msgs toSendSeparate
+              (memsBtch, mreqsBtch) = foldMembers (length batched' + lenMsgs) msgBatchMBR batched' toSendBatched
           (memsSep <> memsBtch, mreqsSep <> mreqsBtch)
         Nothing -> ([], [])
       where
-        foldMsgs :: (GroupMember, Connection) -> ([GroupMemberId], [Either ChatError ChatMsgReq]) -> ([GroupMemberId], [Either ChatError ChatMsgReq])
-        foldMsgs (GroupMember {groupMemberId}, conn) memIdsReqs =
-          foldr' (\msg_ (memIds, reqs) -> (groupMemberId : memIds, fmap sndMessageReq msg_ : reqs)) memIdsReqs msgs_
+        foldMembers :: forall a. Int -> (Maybe Int -> Int -> a -> (ValueOrRef MsgBody, [MessageId])) -> NonEmpty (Either ChatError a) -> [(GroupMember, Connection)] -> ([GroupMemberId], [Either ChatError ChatMsgReq])
+        foldMembers lastRef mkMb mbs mems = snd $ foldr' foldMsgBodies (lastMemIdx_, ([], [])) mems
           where
-            sndMessageReq :: SndMessage -> ChatMsgReq
-            sndMessageReq SndMessage {msgId, msgBody} = (conn, msgFlags, msgBody, [msgId])
-        foldBatches :: NonEmpty (Either ChatError MsgBatch) -> (GroupMember, Connection) -> ([GroupMemberId], [Either ChatError ChatMsgReq]) -> ([GroupMemberId], [Either ChatError ChatMsgReq])
-        foldBatches batched' (GroupMember {groupMemberId}, conn) memIdsReqs =
-          foldr' (\batch_ (memIds, reqs) -> (groupMemberId : memIds, fmap (msgBatchReq conn msgFlags) batch_ : reqs)) memIdsReqs batched'
+            lastMemIdx_ = let len = length mems in if len > 1 then Just len else Nothing
+            foldMsgBodies :: (GroupMember, Connection) -> (Maybe Int, ([GroupMemberId], [Either ChatError ChatMsgReq])) -> (Maybe Int, ([GroupMemberId], [Either ChatError ChatMsgReq]))
+            foldMsgBodies (GroupMember {groupMemberId}, conn) (memIdx_, memIdsReqs) =
+              (subtract 1 <$> memIdx_,) $ snd $ foldr' addBody (lastRef, memIdsReqs) mbs
+              where
+                addBody :: Either ChatError a -> (Int, ([GroupMemberId], [Either ChatError ChatMsgReq])) -> (Int, ([GroupMemberId], [Either ChatError ChatMsgReq]))
+                addBody mb (i, (memIds, reqs)) =
+                  let req = (conn,msgFlags,) . mkMb memIdx_ i <$> mb
+                   in (i - 1, (groupMemberId : memIds, req : reqs))
+        sndMessageMBR :: Maybe Int -> Int -> SndMessage -> (ValueOrRef MsgBody, [MessageId])
+        sndMessageMBR memIdx_ i SndMessage {msgId, msgBody} = (vrValue_ memIdx_ i msgBody, [msgId])
+        msgBatchMBR :: Maybe Int -> Int -> MsgBatch -> (ValueOrRef MsgBody, [MessageId])
+        msgBatchMBR memIdx_ i (MsgBatch batchBody sndMsgs) = (vrValue_ memIdx_ i batchBody, map (\SndMessage {msgId} -> msgId) sndMsgs)
+        vrValue_ memIdx_ i v = case memIdx_ of
+          Nothing -> VRValue Nothing v -- sending to one member, do not reference bodies
+          Just 1 -> VRValue (Just i) v
+          Just _ -> VRRef i
     preparePending :: NonEmpty (Either ChatError SndMessage) -> [GroupMember] -> ([GroupMemberId], [Either ChatError (GroupMemberId, MessageId)])
     preparePending msgs_ =
       foldr' foldMsgs ([], [])
@@ -1437,10 +1929,10 @@ sendGroupMessages_ _user gInfo@GroupInfo {groupId} members events = do
 data MemberSendAction = MSASend Connection | MSASendBatched Connection | MSAPending | MSAForwarded
 
 memberSendAction :: GroupInfo -> NonEmpty (ChatMsgEvent e) -> [GroupMember] -> GroupMember -> Maybe MemberSendAction
-memberSendAction gInfo events members m@GroupMember {memberRole} = case memberConn m of
+memberSendAction gInfo events members m@GroupMember {memberRole, memberStatus} = case memberConn m of
   Nothing -> pendingOrForwarded
   Just conn@Connection {connStatus}
-    | connDisabled conn || connStatus == ConnDeleted -> Nothing
+    | connDisabled conn || connStatus == ConnDeleted || memberStatus == GSMemRejected -> Nothing
     | connInactive conn -> Just MSAPending
     | connStatus == ConnSndReady || connStatus == ConnReady -> sendBatchedOrSeparate conn
     | otherwise -> pendingOrForwarded
@@ -1475,10 +1967,10 @@ memberSendAction gInfo events members m@GroupMember {memberRole} = case memberCo
               XGrpMsgForward {} -> True
               _ -> False
 
-sendGroupMemberMessage :: MsgEncodingI e => User -> GroupInfo -> GroupMember -> ChatMsgEvent e -> Maybe Int64 -> CM () -> CM ()
-sendGroupMemberMessage user gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId} chatMsgEvent introId_ postDeliver = do
+sendGroupMemberMessage :: MsgEncodingI e => GroupInfo -> GroupMember -> ChatMsgEvent e -> Maybe Int64 -> CM () -> CM ()
+sendGroupMemberMessage gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId} chatMsgEvent introId_ postDeliver = do
   msg <- createSndMessage chatMsgEvent (GroupId groupId)
-  messageMember msg `catchChatError` (toView . CRChatError (Just user))
+  messageMember msg `catchChatError` eToView
   where
     messageMember :: SndMessage -> CM ()
     messageMember SndMessage {msgId, msgBody} = forM_ (memberSendAction gInfo (chatMsgEvent :| []) [m] m) $ \case
@@ -1542,22 +2034,26 @@ saveGroupFwdRcvMsg user groupId forwardingMember refAuthorMember@GroupMember {me
         if sameMemberId refMemberId am
           then forM_ (memberConn forwardingMember) $ \fmConn ->
             void $ sendDirectMemberMessage fmConn (XGrpMemCon amMemberId) groupId
-          else toView $ CRMessageError user "error" "saveGroupFwdRcvMsg: referenced author member id doesn't match message member id"
+          else toView $ CEvtMessageError user "error" "saveGroupFwdRcvMsg: referenced author member id doesn't match message member id"
         throwError e
       _ -> throwError e
 
 saveSndChatItem :: ChatTypeI c => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> CM (ChatItem c 'MDSnd)
 saveSndChatItem user cd msg content = saveSndChatItem' user cd msg content Nothing Nothing Nothing Nothing False
 
+-- TODO [mentions] optimize by avoiding unnecesary parsing of control messages
 saveSndChatItem' :: ChatTypeI c => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> Maybe (CIFile 'MDSnd) -> Maybe (CIQuote c) -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> CM (ChatItem c 'MDSnd)
-saveSndChatItem' user cd msg content ciFile quotedItem itemForwarded itemTimed live =
-  saveSndChatItems user cd [Right NewSndChatItemData {msg, content, ciFile, quotedItem, itemForwarded}] itemTimed live >>= \case
+saveSndChatItem' user cd msg content ciFile quotedItem itemForwarded itemTimed live = do
+  let itemTexts = ciContentTexts content
+  saveSndChatItems user cd [Right NewSndChatItemData {msg, content, itemTexts, itemMentions = M.empty, ciFile, quotedItem, itemForwarded}] itemTimed live >>= \case
     [Right ci] -> pure ci
     _ -> throwChatError $ CEInternalError "saveSndChatItem': expected 1 item"
 
 data NewSndChatItemData c = NewSndChatItemData
   { msg :: SndMessage,
     content :: CIContent 'MDSnd,
+    itemTexts :: (Text, Maybe MarkdownList),
+    itemMentions :: Map MemberName CIMention,
     ciFile :: Maybe (CIFile 'MDSnd),
     quotedItem :: Maybe (CIQuote c),
     itemForwarded :: Maybe CIForwardedFrom
@@ -1574,36 +2070,73 @@ saveSndChatItems ::
   CM [Either ChatError (ChatItem c 'MDSnd)]
 saveSndChatItems user cd itemsData itemTimed live = do
   createdAt <- liftIO getCurrentTime
+  vr <- chatVersionRange
   when (contactChatDeleted cd || any (\NewSndChatItemData {content} -> ciRequiresAttention content) (rights itemsData)) $
-    withStore' (\db -> updateChatTs db user cd createdAt)
+    void $ withStore' (\db -> updateChatTsStats db vr user cd createdAt Nothing)
   lift $ withStoreBatch (\db -> map (bindRight $ createItem db createdAt) itemsData)
   where
     createItem :: DB.Connection -> UTCTime -> NewSndChatItemData c -> IO (Either ChatError (ChatItem c 'MDSnd))
-    createItem db createdAt NewSndChatItemData {msg = msg@SndMessage {sharedMsgId}, content, ciFile, quotedItem, itemForwarded} = do
+    createItem db createdAt NewSndChatItemData {msg = msg@SndMessage {sharedMsgId}, content, itemTexts, itemMentions, ciFile, quotedItem, itemForwarded} = do
       ciId <- createNewSndChatItem db user cd msg content quotedItem itemForwarded itemTimed live createdAt
       forM_ ciFile $ \CIFile {fileId} -> updateFileTransferChatItemId db fileId ciId createdAt
-      pure $ Right $ mkChatItem cd ciId content ciFile quotedItem (Just sharedMsgId) itemForwarded itemTimed live createdAt Nothing createdAt
+      let ci = mkChatItem_ cd ciId content itemTexts ciFile quotedItem (Just sharedMsgId) itemForwarded itemTimed live False createdAt Nothing createdAt
+      Right <$> case cd of
+        CDGroupSnd g _scope | not (null itemMentions) -> createGroupCIMentions db g ci itemMentions
+        _ -> pure ci
 
-saveRcvChatItem :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> UTCTime -> CIContent 'MDRcv -> CM (ChatItem c 'MDRcv)
+saveRcvChatItemNoParse :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> UTCTime -> CIContent 'MDRcv -> CM (ChatItem c 'MDRcv, ChatInfo c)
+saveRcvChatItemNoParse user cd msg brokerTs = saveRcvChatItem user cd msg brokerTs . ciContentNoParse
+
+saveRcvChatItem :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> UTCTime -> (CIContent 'MDRcv, (Text, Maybe MarkdownList)) -> CM (ChatItem c 'MDRcv, ChatInfo c)
 saveRcvChatItem user cd msg@RcvMessage {sharedMsgId_} brokerTs content =
-  saveRcvChatItem' user cd msg sharedMsgId_ brokerTs content Nothing Nothing False
+  saveRcvChatItem' user cd msg sharedMsgId_ brokerTs content Nothing Nothing False M.empty
 
-saveRcvChatItem' :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> UTCTime -> CIContent 'MDRcv -> Maybe (CIFile 'MDRcv) -> Maybe CITimed -> Bool -> CM (ChatItem c 'MDRcv)
-saveRcvChatItem' user cd msg@RcvMessage {forwardedByMember} sharedMsgId_ brokerTs content ciFile itemTimed live = do
+ciContentNoParse :: CIContent 'MDRcv -> (CIContent 'MDRcv, (Text, Maybe MarkdownList))
+ciContentNoParse content = (content, (ciContentToText content, Nothing))
+
+saveRcvChatItem' :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> UTCTime -> (CIContent 'MDRcv, (Text, Maybe MarkdownList)) -> Maybe (CIFile 'MDRcv) -> Maybe CITimed -> Bool -> Map MemberName MsgMention -> CM (ChatItem c 'MDRcv, ChatInfo c)
+saveRcvChatItem' user cd msg@RcvMessage {chatMsgEvent, forwardedByMember} sharedMsgId_ brokerTs (content, (t, ft_)) ciFile itemTimed live mentions = do
   createdAt <- liftIO getCurrentTime
-  (ciId, quotedItem, itemForwarded) <- withStore' $ \db -> do
-    when (ciRequiresAttention content || contactChatDeleted cd) $ updateChatTs db user cd createdAt
-    r@(ciId, _, _) <- createNewRcvChatItem db user cd msg sharedMsgId_ content itemTimed live brokerTs createdAt
+  vr <- chatVersionRange
+  withStore' $ \db -> do
+    (mentions' :: Map MemberName CIMention, userMention) <- case cd of
+      CDGroupRcv g@GroupInfo {membership} _scope _m -> do
+        mentions' <- getRcvCIMentions db user g ft_ mentions
+        let userReply = case cmToQuotedMsg chatMsgEvent of
+              Just QuotedMsg {msgRef = MsgRef {memberId = Just mId}} -> sameMemberId mId membership
+              _ -> False
+            userMention' = userReply || any (\CIMention {memberId} -> sameMemberId memberId membership) mentions'
+         in pure (mentions', userMention')
+      CDDirectRcv _ -> pure (M.empty, False)
+    cInfo' <- if (ciRequiresAttention content || contactChatDeleted cd)
+      then updateChatTsStats db vr user cd createdAt (memberChatStats userMention)
+      else pure $ toChatInfo cd
+    (ciId, quotedItem, itemForwarded) <- createNewRcvChatItem db user cd msg sharedMsgId_ content itemTimed live userMention brokerTs createdAt
     forM_ ciFile $ \CIFile {fileId} -> updateFileTransferChatItemId db fileId ciId createdAt
-    pure r
-  pure $ mkChatItem cd ciId content ciFile quotedItem sharedMsgId_ itemForwarded itemTimed live brokerTs forwardedByMember createdAt
+    let ci = mkChatItem_ cd ciId content (t, ft_) ciFile quotedItem sharedMsgId_ itemForwarded itemTimed live userMention brokerTs forwardedByMember createdAt
+    ci' <- case cd of
+      CDGroupRcv g _scope _m | not (null mentions') -> createGroupCIMentions db g ci mentions'
+      _ -> pure ci
+    pure (ci', cInfo')
+  where
+    memberChatStats :: Bool -> Maybe (Int, MemberAttention, Int)
+    memberChatStats userMention = case cd of
+      CDGroupRcv _g (Just scope) m -> do
+        let unread = fromEnum $ ciCreateStatus content == CISRcvNew
+         in Just (unread, memberAttentionChange unread (Just brokerTs) m scope, fromEnum userMention)
+      _ -> Nothing
 
-mkChatItem :: (ChatTypeI c, MsgDirectionI d) => ChatDirection c d -> ChatItemId -> CIContent d -> Maybe (CIFile d) -> Maybe (CIQuote c) -> Maybe SharedMsgId -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> ChatItem c d
-mkChatItem cd ciId content file quotedItem sharedMsgId itemForwarded itemTimed live itemTs forwardedByMember currentTs =
-  let itemText = ciContentToText content
-      itemStatus = ciCreateStatus content
-      meta = mkCIMeta ciId content itemText itemStatus Nothing sharedMsgId itemForwarded Nothing False itemTimed (justTrue live) currentTs itemTs forwardedByMember currentTs currentTs
-   in ChatItem {chatDir = toCIDirection cd, meta, content, formattedText = parseMaybeMarkdownList itemText, quotedItem, reactions = [], file}
+-- TODO [mentions] optimize by avoiding unnecessary parsing
+mkChatItem :: (ChatTypeI c, MsgDirectionI d) => ChatDirection c d -> ChatItemId -> CIContent d -> Maybe (CIFile d) -> Maybe (CIQuote c) -> Maybe SharedMsgId -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> Bool -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> ChatItem c d
+mkChatItem cd ciId content file quotedItem sharedMsgId itemForwarded itemTimed live userMention itemTs forwardedByMember currentTs =
+  let ts = ciContentTexts content
+   in mkChatItem_ cd ciId content ts file quotedItem sharedMsgId itemForwarded itemTimed live userMention itemTs forwardedByMember currentTs
+
+mkChatItem_ :: (ChatTypeI c, MsgDirectionI d) => ChatDirection c d -> ChatItemId -> CIContent d -> (Text, Maybe MarkdownList) -> Maybe (CIFile d) -> Maybe (CIQuote c) -> Maybe SharedMsgId -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> Bool -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> ChatItem c d
+mkChatItem_ cd ciId content (itemText, formattedText) file quotedItem sharedMsgId itemForwarded itemTimed live userMention itemTs forwardedByMember currentTs =
+  let itemStatus = ciCreateStatus content
+      meta = mkCIMeta ciId content itemText itemStatus Nothing sharedMsgId itemForwarded Nothing False itemTimed (justTrue live) userMention currentTs itemTs forwardedByMember currentTs currentTs
+   in ChatItem {chatDir = toCIDirection cd, meta, content, mentions = M.empty, formattedText, quotedItem, reactions = [], file}
 
 createAgentConnectionAsync :: ConnectionModeI c => User -> CommandFunction -> Bool -> SConnectionMode c -> SubscriptionMode -> CM (CommandId, ConnId)
 createAgentConnectionAsync user cmdFunction enableNtfs cMode subMode = do
@@ -1631,20 +2164,22 @@ agentAcceptContactAsync user enableNtfs invId msg subMode pqSup chatV = do
   connId <- withAgent $ \a -> acceptContactAsync a (aCorrId cmdId) enableNtfs invId dm pqSup subMode
   pure (cmdId, connId)
 
-deleteAgentConnectionAsync :: User -> ConnId -> CM ()
-deleteAgentConnectionAsync user acId = deleteAgentConnectionAsync' user acId False
+deleteAgentConnectionAsync :: ConnId -> CM ()
+deleteAgentConnectionAsync acId = deleteAgentConnectionAsync' acId False
+{-# INLINE deleteAgentConnectionAsync #-}
 
-deleteAgentConnectionAsync' :: User -> ConnId -> Bool -> CM ()
-deleteAgentConnectionAsync' user acId waitDelivery = do
-  withAgent (\a -> deleteConnectionAsync a waitDelivery acId) `catchChatError` (toView . CRChatError (Just user))
+deleteAgentConnectionAsync' :: ConnId -> Bool -> CM ()
+deleteAgentConnectionAsync' acId waitDelivery = do
+  withAgent (\a -> deleteConnectionAsync a waitDelivery acId) `catchChatError` eToView
 
-deleteAgentConnectionsAsync :: User -> [ConnId] -> CM ()
-deleteAgentConnectionsAsync user acIds = deleteAgentConnectionsAsync' user acIds False
+deleteAgentConnectionsAsync :: [ConnId] -> CM ()
+deleteAgentConnectionsAsync acIds = deleteAgentConnectionsAsync' acIds False
+{-# INLINE deleteAgentConnectionsAsync #-}
 
-deleteAgentConnectionsAsync' :: User -> [ConnId] -> Bool -> CM ()
-deleteAgentConnectionsAsync' _ [] _ = pure ()
-deleteAgentConnectionsAsync' user acIds waitDelivery = do
-  withAgent (\a -> deleteConnectionsAsync a waitDelivery acIds) `catchChatError` (toView . CRChatError (Just user))
+deleteAgentConnectionsAsync' :: [ConnId] -> Bool -> CM ()
+deleteAgentConnectionsAsync' [] _ = pure ()
+deleteAgentConnectionsAsync' acIds waitDelivery = do
+  withAgent (\a -> deleteConnectionsAsync a waitDelivery acIds) `catchChatError` eToView
 
 agentXFTPDeleteRcvFile :: RcvFileId -> FileTransferId -> CM ()
 agentXFTPDeleteRcvFile aFileId fileId = do
@@ -1745,8 +2280,8 @@ createContactsFeatureItems ::
 createContactsFeatureItems user cts chatDir ciFeature ciOffer getPref = do
   let dirsCIContents = map contactChangedFeatures cts
   (errs, acis) <- partitionEithers <$> createInternalItemsForChats user Nothing dirsCIContents
-  unless (null errs) $ toView' $ CRChatErrors (Just user) errs
-  toView' $ CRNewChatItems user acis
+  unless (null errs) $ toView' $ CEvtChatErrors errs
+  toView' $ CEvtNewChatItems user acis
   where
     contactChangedFeatures :: (Contact, Contact) -> (ChatDirection 'CTDirect d, [CIContent d])
     contactChangedFeatures (Contact {mergedPreferences = cups}, ct'@Contact {mergedPreferences = cups'}) = do
@@ -1791,7 +2326,7 @@ createGroupFeatureItems user cd ciContent GroupInfo {fullGroupPreferences} =
 createInternalChatItem :: (ChatTypeI c, MsgDirectionI d) => User -> ChatDirection c d -> CIContent d -> Maybe UTCTime -> CM ()
 createInternalChatItem user cd content itemTs_ =
   lift (createInternalItemsForChats user itemTs_ [(cd, [content])]) >>= \case
-    [Right aci] -> toView $ CRNewChatItems user [aci]
+    [Right aci] -> toView $ CEvtNewChatItems user [aci]
     [Left e] -> throwError e
     rs -> throwChatError $ CEInternalError $ "createInternalChatItem: expected 1 result, got " <> show (length rs)
 
@@ -1805,44 +2340,63 @@ createInternalItemsForChats ::
 createInternalItemsForChats user itemTs_ dirsCIContents = do
   createdAt <- liftIO getCurrentTime
   let itemTs = fromMaybe createdAt itemTs_
-  void . withStoreBatch' $ \db -> map (uncurry $ updateChat db createdAt) dirsCIContents
+  vr <- chatVersionRange'
+  void . withStoreBatch' $ \db -> map (uncurry $ updateChat db vr createdAt) dirsCIContents
   withStoreBatch' $ \db -> concatMap (uncurry $ createACIs db itemTs createdAt) dirsCIContents
   where
-    updateChat :: DB.Connection -> UTCTime -> ChatDirection c d -> [CIContent d] -> IO ()
-    updateChat db createdAt cd contents
-      | any ciRequiresAttention contents || contactChatDeleted cd = updateChatTs db user cd createdAt
+    updateChat :: DB.Connection -> VersionRangeChat -> UTCTime -> ChatDirection c d -> [CIContent d] -> IO ()
+    updateChat db vr createdAt cd contents
+      | any ciRequiresAttention contents || contactChatDeleted cd = void $ updateChatTsStats db vr user cd createdAt memberChatStats
       | otherwise = pure ()
+      where
+        memberChatStats :: Maybe (Int, MemberAttention, Int)
+        memberChatStats = case cd of
+          CDGroupRcv _g (Just scope) m -> do
+            let unread = length $ filter ciRequiresAttention contents
+             in Just (unread, memberAttentionChange unread itemTs_ m scope, 0)
+          _ -> Nothing
     createACIs :: DB.Connection -> UTCTime -> UTCTime -> ChatDirection c d -> [CIContent d] -> [IO AChatItem]
     createACIs db itemTs createdAt cd = map $ \content -> do
       ciId <- createNewChatItemNoMsg db user cd content itemTs createdAt
-      let ci = mkChatItem cd ciId content Nothing Nothing Nothing Nothing Nothing False itemTs Nothing createdAt
+      let ci = mkChatItem cd ciId content Nothing Nothing Nothing Nothing Nothing False False itemTs Nothing createdAt
       pure $ AChatItem (chatTypeI @c) (msgDirection @d) (toChatInfo cd) ci
 
+memberAttentionChange :: Int -> (Maybe UTCTime) -> GroupMember -> GroupChatScopeInfo -> MemberAttention
+memberAttentionChange unread brokerTs_ rcvMem = \case
+  GCSIMemberSupport (Just suppMem)
+    | groupMemberId' suppMem == groupMemberId' rcvMem -> MAInc unread brokerTs_
+    | msgIsNewerThanLastUnanswered -> MAReset
+    | otherwise -> MAInc 0 Nothing
+    where
+      msgIsNewerThanLastUnanswered = case (supportChat suppMem >>= lastMsgFromMemberTs, brokerTs_) of
+        (Just lastMsgTs, Just brokerTs) -> lastMsgTs < brokerTs
+        _ -> False
+  GCSIMemberSupport Nothing -> MAInc 0 Nothing
+
 createLocalChatItems ::
   User ->
   ChatDirection 'CTLocal 'MDSnd ->
-  [(CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom)] ->
+  NonEmpty (CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom, (Text, Maybe MarkdownList)) ->
   UTCTime ->
   CM [ChatItem 'CTLocal 'MDSnd]
 createLocalChatItems user cd itemsData createdAt = do
-  withStore' $ \db -> updateChatTs db user cd createdAt
-  (errs, items) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (createItem db) itemsData)
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
+  vr <- chatVersionRange
+  void $ withStore' $ \db -> updateChatTsStats db vr user cd createdAt Nothing
+  (errs, items) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (createItem db) $ L.toList itemsData)
+  unless (null errs) $ toView $ CEvtChatErrors errs
   pure items
   where
-    createItem :: DB.Connection -> (CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom) -> IO (ChatItem 'CTLocal 'MDSnd)
-    createItem db (content, ciFile, itemForwarded) = do
-      ciId <- createNewChatItem_ db user cd Nothing Nothing content (Nothing, Nothing, Nothing, Nothing, Nothing) itemForwarded Nothing False createdAt Nothing createdAt
+    createItem :: DB.Connection -> (CIContent 'MDSnd, Maybe (CIFile 'MDSnd), Maybe CIForwardedFrom, (Text, Maybe MarkdownList)) -> IO (ChatItem 'CTLocal 'MDSnd)
+    createItem db (content, ciFile, itemForwarded, ts) = do
+      ciId <- createNewChatItem_ db user cd Nothing Nothing content (Nothing, Nothing, Nothing, Nothing, Nothing) itemForwarded Nothing False False createdAt Nothing createdAt
       forM_ ciFile $ \CIFile {fileId} -> updateFileTransferChatItemId db fileId ciId createdAt
-      pure $ mkChatItem cd ciId content ciFile Nothing Nothing itemForwarded Nothing False createdAt Nothing createdAt
+      pure $ mkChatItem_ cd ciId content ts ciFile Nothing Nothing itemForwarded Nothing False False createdAt Nothing createdAt
 
 withUser' :: (User -> CM ChatResponse) -> CM ChatResponse
 withUser' action =
   asks currentUser
     >>= readTVarIO
-    >>= maybe (throwChatError CENoActiveUser) run
-  where
-    run u = action u `catchChatError` (pure . CRChatCmdError (Just u))
+    >>= maybe (throwChatError CENoActiveUser) action
 
 withUser :: (User -> CM ChatResponse) -> CM ChatResponse
 withUser action = withUser' $ \user ->
@@ -1896,7 +2450,7 @@ simplexTeamContactProfile =
     { displayName = "SimpleX Chat team",
       fullName = "",
       image = Just (ImageData "data:image/jpg;base64,/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8KCwkMEQ8SEhEPERATFhwXExQaFRARGCEYGhwdHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAETARMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD7LooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiivP/iF4yFvv0rSpAZek0yn7v+yPeunC4WpiqihBf8A8rOc5w2UYZ4jEPTourfZDvH3jL7MW03SpR53SWUfw+w96veA/F0erRLY3zKl6owD2k/8Ar15EWLEljknqadDK8MqyxMUdTlWB5Br66WS0Hh/ZLfv1ufiNLj7Mo5m8ZJ3g9OTpy+Xn5/pofRdFcd4B8XR6tEthfMEvVHyk9JB/jXY18fiMPUw9R06i1P3PK80w2aYaOIw8rxf3p9n5hRRRWB6AUUVDe3UFlavc3MixxIMsxppNuyJnOMIuUnZIL26gsrV7m5kWOJBlmNeU+I/Gd9e6sk1hI8FvA2Y1z973NVPGnimfXLoxRFo7JD8if3vc1zefevr8syiNKPtKyvJ9Ox+F8Ycb1cdU+rYCTjTi/iWjk1+nbue3eEPEdtrtoMER3SD95Hn9R7Vu18+6bf3On3kd1aSmOVDkEd/Y17J4P8SW2vWY6R3aD97F/Ue1eVmmVPDP2lP4fyPtODeMoZrBYXFO1Zf+Tf8AB7r5o3qKKK8Q/QgooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAqavbTXmmz20Fw1vJIhVZB1FeDa3p15pWoSWl6hWQHr2YeoNfQlY3izw9Z6/YGGZQky8xSgcqf8K9jKcyWEnyzXuv8D4njLhZ51RVSi7VYLRdGu3k+z+88HzRuq1rWmXmkX8lnexFHU8Hsw9RVLNfcxlGcVKLumfgFahUozdOorSWjT6E0M0kMqyxOyOpyrKcEGvXPAPjCPVolsb9wl6owGPAkH+NeO5p8M0kMqyxOyOpyrA4INcWPy+njKfLLfoz2+HuIMTkmI9pT1i/ij0a/wA+zPpGiuM+H/jCPV4lsL91S+QfKTwJR/jXW3t1BZWslzcyLHFGMsxNfB4jC1aFX2U1r+fof0Rl2bYXMMKsVRl7vXy7p9rBfXVvZWr3NzKscSDLMTXjnjbxVPrtyYoiY7JD8if3vc0zxv4ruNeujFEWjsoz8if3vc1zOa+synKFh0qtVe9+X/BPxvjLjKWZSeEwjtSW7/m/4H5kmaM1HmlB54r3bH51YkzXo3wz8MXMc0es3ZeED/VR5wW9z7VB8O/BpnMerarEREDuhhb+L3Pt7V6cAAAAAAOgFfL5xmqs6FH5v9D9a4H4MlzQzHGq1tYR/KT/AEXzCiiivlj9hCiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAxfFvh208QWBhmASdRmKUdVP+FeH63pl5pGoSWV5EUdTwezD1HtX0VWL4t8O2fiHTzBONk6g+TKByp/wr28pzZ4WXs6msH+B8NxdwhTzeDxGHVqy/8m8n59n954FmjNW9b0y80fUHsr2MpIp4PZh6iqWfevuYyjOKlF3TPwetQnRm6dRWktGmSwzSQyrLE7I6nKsDgg1teIPFOqa3a29vdy4jiUAheN7f3jWBmjNROhTnJTkrtbGtLF4ijSnRpzajPddHbuP3e9Lmo80ua0scth+a9E+HXgw3Hl6tqsZEX3oYmH3vc+1J8OPBZnKavq0eIhzDCw+9/tH29q9SAAAAGAOgr5bOM35b0KD16v8ARH6twXwXz8uPx0dN4xfXzf6IFAUAAAAdBRRRXyZ+wBRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFB4GTXyj+1p+0ONJjufA3ga6DX7qU1DUY24gB4McZH8Xqe38tqFCdefLETaSufQ3h/4geEde8Uah4a0rWra51Ow/wBfCrD8ceuO+OldRX5I+GfEWseG/ENvr2j30ttqFvJ5iSqxyT3z6g96/RH9nD41aT8U9AWGcx2fiK1QC7tC33/+mieqn07V14zL3QXNHVEQnc9dooorzjQKKKKACiis7xHrel+HdGudY1m8is7K2QvLLI2AAP600m3ZAYfxUg8Pr4VutT1+7isYbSMuLp/4Pb3z6V8++HNd0zxDpq6hpVys8DHGRwVPoR2NeIftJ/G7VPifrbWVk8lp4btZD9mtwcGU/wDPR/c9h2rgfh34z1LwdrAurV2ktZCBcW5PyyD/AB9DX2WTyqYWny1Ho+nY+C4t4Wp5tF16CtVX/k3k/Ps/vPr/ADRmsjwx4g07xFpMWpaZOJInHI/iQ9wR61qbq+mVmro/D6tCdGbp1FZrdEma6/4XafpWoa7jUpV3oA0MLdJD/ntXG5p8E0kMqyxOyOhyrKcEGsMTRlWpShGVm+p1ZbiYYPFQr1IKai72fU+nFAUAKAAOABRXEfDnxpFrMK6fqDhL9BhSeko9frXb1+a4rDVMNUdOotT+k8szLD5lh44jDu8X968n5hRRRXOegFFFFABUGoXlvYWkl1dSrHFGMliaL+7t7C0kuruVYoYxlmNeI+OvFtx4huzHFuisYz+7jz97/aNenluW1MbU00it2fM8S8SUMkoXetR/DH9X5fmeteF/E+m+IFkFoxSWMnMb9cev0rbr5t0vULrTb6K8s5TFNGcgj+R9q9w8E+KbXxDYjlY7xB+9i/qPaurNsneE/eUtYfkeTwlxjHNV9XxVo1V90vTz8vmjoqKKK8I+8CiiigAooooAKKKKACiiigD5V/a8+P0mgvdeAvCUskepFdl9eDjyQR9xPfHeviiR3lkaSR2d2OWZjkk+tfoj+058CtP+Jektq2jxRWnie2T91KMKLlR/yzf+h7V+fOuaVqGiarcaXqtpLaXls5jlikXDKRX0mWSpOlaG/U56l76lKtPwtr+reGNetdb0S8ls761cPHJG2D9D6g9MVmUV6TSasyD9Jf2cfjXpPxR0MW9w0dp4gtkAubYnHmf7aeo/lXr1fkh4W1/V/DGuW2taHey2d9bOHjkjP6H1HtX6Jfs5fGvR/inoQgmeOz8RWqD7XaE439vMT1U+navnMfgHRfPD4fyN4Tvoz12iis7xJremeHdEutZ1i7jtLK1jLyyucAAf1rzUm3ZGgeJNb0vw7otzrOs3kVpZWyF5ZZDgAD+Z9q/PL9pP436r8UNZaxs2ks/Dlq5+z24ODMf77+p9B2o/aU+N2p/FDXDZ2LS2fhy1ci3t84Mx/wCej+/oO1eNV9DgMAqS55/F+RhOd9EFFFABJwBkmvUMzqPh34y1Lwjq63FszSWshAntyeHHt719Z2EstzpVlqD2txbR3kCzxLPGUbawyODXK/slfs8nUpbXx144tGFkhElhp8q4849pHB/h9B3r608X+GLDxBpX2WRFiljX9xIowUPYfT2rGnnkMPWVJ6x6vt/XU+P4o4SjmtN4igrVV/5N5Pz7P7z56zRmrmvaVe6LqMljexMkiHg9mHqKoZr6uEozipRd0z8Rq0J0ZunUVmtGmTwTSQTJNC7JIhyrKcEGvZvhz41j1mJdP1GRUv0GFY8CX/69eJZqSCaWCVZYXZHU5VlOCDXDmGXU8bT5ZaPo+x7WQZ9iMlxHtKesX8UejX+fZn1FRXDfDbxtHrUKadqDqmoIuAx4EoHf613NfnWKwtTC1HTqKzR/QGW5lh8yw8cRh3eL+9Ps/MKr6heW1hZyXd3KsUUYyzGjUby20+zku7yZYoY13MzGvDPHvi+48RXpjiZorCM/u4/73+0feuvLMsqY6pZaRW7/AK6nlcScR0MloXetR/DH9X5D/Hni648Q3nlxlo7GM/u48/e9zXL7qZmjNfodDDwoU1TpqyR+AY7G18dXlXryvJ/19w/dVvSdRutMvo7yzlaOVDkY7+xqkDmvTPhn4HMxj1jV4v3Y+aCFh97/AGjWGPxNHDUXKrt27+R15JlWLzHFxp4XSS1v/L53PQ/C+oXGqaJb3t1bNbyyLkoe/v8AQ1p0AAAAAADoBRX5nUkpSbirLsf0lh6c6dKMJy5mkrvv5hRRRUGwUUUUAFFFFABRRRQAV4d+038CdO+JWkyavo8cdp4mtkzHIBhbkD+B/f0Ne40VpSqypSUovUTV9GfkTruk6joer3Ok6taS2d7ayGOaGVdrKRVKv0T/AGnfgXp/xK0h9Y0iOO18TWqZikAwLkD+B/6Gvz51zStQ0TVbjS9UtZbW8tnKSxSLgqRX1GExccRG636o55RcSlWp4V1/VvDGvWut6JeSWl9bOGjkQ4/A+oPpWXRXU0mrMk/RP4LftDeFvF3ge41HxDfW+lappkG+/idsBwP40HfJ7V8o/tJ/G/VPifrbWVk8tn4btn/0e2zgykfxv6n0HavGwSM4JGeuO9JXFRwFKlUc18vIpzbVgoooAJIAGSa7SQr6x/ZM/Z4k1J7Xxz44tClkMSWFhIuDL3Ejg/w+g70fsmfs8NqMtt448c2eLJCJLCwlX/WnqHcH+H0HevtFFVECIoVVGAAMACvFx+PtenTfqzWEOrEjRI41jjUIigBVAwAPSnUUV4ZsYXjLwzZeJNOaCcBLhQfJmA5U/wCFeBa/pV7ompSWF9GUkToccMOxHtX01WF4z8M2XiXTTBOAk6AmGYDlD/hXvZPnEsHL2dTWD/A+K4r4UhmsHXoK1Zf+TeT8+z+8+c80Zq5r2k3ui6jJY30ZSRTwezD1FUM1+gQlGcVKLumfiFWjOjN06is1umTwTSQTJNE7JIh3KynBBr2PwL8QrO701odbnSC5t0yZCcCUD+teK5pd1cWPy2ljoctTdbPqetkme4rJ6rqUHdPdPZ/8Mdb4/wDGFz4ivDFGxisIz+7j/ve5rls1HuozXTQw1PD01TpqyR5+OxlfHV5V68ryf9fcSZozTAa9P+GHgQzmPWdZhIjHzQQMPvf7R9qxxuMpYOk6lR/8E6MpyfEZriFQoL1fRLux/wAMvApmMesazFiP70EDfxf7R9vavWFAUAAAAcACgAAAAAAdBRX5xjsdVxtXnn8l2P3/ACXJcNlGHVGivV9W/wCugUUUVxHrhRRRQAUUUUAFFFFABRRRQAUUUUAFeH/tOfArT/iXpUmsaSsVp4mto/3UuMLcgDhH/oe1e4Vn+I9a0zw7otzrGsXkVpZWyF5ZZGwAB/WtaNSdOalDcTSa1PyZ1zStQ0TVrnStVtZLS8tnMcsUgwVIqlXp/wC0l8S7T4nePn1aw0q3srO3XyYJBGBNOoPDSHv7DtXmFfXU5SlBOSszlYUUUVYAAScDk19Zfsmfs7vqLW3jjx1ZFLMESafYSjmXuJHHZfQd6+VtLvJtO1K2v7cRtLbyrKgkQOpKnIyp4I46Gv0b/Zv+NOjfFDw+lrIIrDX7RAtzZ8AMMffj9V9u1efmVSrCn7m3Vl00m9T16NEjjWONVRFGFUDAA9KWiivmToCiiigAooooAwfGnhiy8S6cYJwEuEH7mYDlT/hXz7r+k32h6lJYahFskQ8Hsw9QfSvpjUr2106ykvLyZYYYxlmY18+/EXxa/ijU1aOMRWkGRCCBuPuT/Svr+GK2KcnTSvT/ACfl/kfmPiBhMvUI1m7Vn0XVefp0fy9Oa3UbqZmjNfa2PynlJM+9AOajzTo5GjkV0YqynIPoaVg5T1P4XeA/P8vWdaiIj+9BAw+9/tH29q9dAAAAAAHQVwPwx8dQ63Ammai6R6hGuFJ4Ew9vf2rvq/Ms5qYmeJaxGjWy6W8j+gOFcPl9LAReBd0931b8+3oFFFFeSfSBRRRQAUUUUAFFFFABRRRQAUUUUAFFFZ3iTW9L8OaJdazrN5HaWNqheWWQ4AH+NNJt2QB4l1vTPDmiXWs6xdx2llaxl5ZHOAAO3ufavzx/aT+N2qfFDWzZWbSWfhy2ci3tg2DKf77+p9B2pf2lfjdqfxQ1trGxeW08N2z/AOj2+cGYj/lo/v6DtXjVfQ4DAKkuefxfkYTnfRBRRQAScAZNeoZhRXv3w2/Zh8V+Lfh7deJprgadcvHv02zlT5rgdcsf4Qe1eHa5pWoaJq1zpWq2ktpeW0hjlikXDKwrOFanUk4xd2htNFKtTwrr+reGNdtta0S8ltL22cPHIhx07H1HtWXRWjSasxH6S/s4/GrSfijoYtp3jtfENqg+1WpON4/vp6j27V69X5IeFfEGr+F9etdc0O9ks7+1cPHKh/QjuD3Ffoj+zl8bNI+KWhLbztFZ+IraMfa7TON+Osieqn07V85j8A6L54fD+RvCd9GevUUUV5hoFVtTvrXTbGW9vJligiXczNRqd9aabYy3t7MsMEQyzMa+ffiN42uvE96YoS0OmxH91F3b/ab3r1spympmFSy0it3+i8z57iDiCjlFG71qPZfq/Id8RPGl14lvTFEzRafGf3cf97/aNclmmZozX6Xh8NTw1NU6askfheNxdbG1pV68ryY/NGTTM16R4J+GVxrGkSX+pSSWfmJ/oq45J7MR6Vni8ZRwkOes7I1y7K8TmNX2WHjd7/0zzvJozV3xDpF7oepyWF/EUkQ8HHDD1FZ+feuiEozipRd0zjq0Z0puE1ZrdE0E8sEyTQu0ciHKspwQa9z+GHjuLXIU0zUpFTUEXCseBKB/WvBs1JBPLBMk0LmORCGVlOCDXn5lllLH0uWWjWz7HsZFnlfJ6/tKesXuu6/z7M+tKK4D4X+PItdhTTNSdY9SQYVicCYDuPf2rv6/M8XhKuEqulVVmj92y7MaGYUFXoO6f4Ps/MKKKK5juCiiigAooooAKKKKACiig9KAM7xLrmleG9EudZ1q8jtLG2QvLK5wAPQep9q/PH9pP43ap8T9beyspJbTw3bSH7NbZx5pH8b+p9u1bH7YPxL8XeJPG114V1G0udH0jT5SIrNuDOR0kbs2e3pXgdfRZfgVTSqT3/IwnO+iCiigAkgAZJr1DMK+s/2TP2d31Brbxz46tNtmMSafp8i8y9/MkB6L0wO9J+yb+zwdSe28b+ObLFmpEljYSr/rT1DuP7voO9faCKqIERQqqMAAYAFeLj8fa9Om/VmsIdWEaJGixooVFGFUDAA9K8Q/ac+BWnfErSZNY0mOO08T2yZilAwtyAPuP/Q9q9worx6VWVKSlF6mrSasfkTrmlahomrXOlaray2l7bSGOaKRcMrCqVfon+098C7D4l6U+s6Skdr4mtY/3UmMC5UdI29/Q1+fOt6XqGi6rcaVqlrJa3ls5SWKQYKkV9RhMXHERut+qOeUeUpVqeFfEGreGNdttb0W7ktb22cNG6HH4H1FZdFdTSasyT9Jf2cPjVpXxR0Fbe4eK18Q2qD7Va7sbx/z0T1H8q9V1O+tdNsZb29mWGCJdzMxr8ovAOoeIdK8W2GoeF5podVhlDQtEefcH2PevsbxP4417xTp1jDq3lQGKFPOigJ2NLj5m59849K4KHD0sTX9x2h18vJHj55xDSyqhd61Hsv1fkaXxG8bXXie9MURaLTo2/dR5+9/tH3rkM1HmjNffYfC08NTVOmrJH4ljMXWxtaVau7yZJmgHmmAmvWfhN8PTceVrmuQkRDDW9uw+9/tN7Vjj8dSwNJ1ar9F3OjK8pr5nXVGivV9Eu7H/Cf4emcx63rkJEfDW9u4+9/tMPT2r2RQFAVQABwAKAAAAAAB0Aor8uzDMKuOq+0qfJdj9zyjKMPlVBUaK9X1bOf8b+FbHxRppt7gCO4UfuZwOUP9R7V86+IdHv8AQtTk0/UIikqHg9mHqD6V9VVz3jnwrY+KNMNvcKEuEBME2OUP+FenkmdywUvZVdab/A8PijheGZw9vQVqq/8AJvJ+fZnzLuo3Ve8Q6Pf6FqclhqERjkQ8Hsw9Qazs1+jwlGpFSi7pn4xVozpTcJqzW6J7eeSCZJoZGjkQhlZTgg17t8LvHsWuQppmpOseooMKxPEw/wAa8DzV3Q7fULvVIIdLWQ3ZcGMx8EH1z2rzs1y2jjaLVTRrZ9v+AezkGcYnK8SpUVzKWjj3/wCD2PrCiqOgx38Oj20eqTJNeLGBK6jAJq9X5VOPLJq9z98pyc4KTVr9H0CiiipLCiiigAooooAKKKKAPK/2hfg3o/xT8PFdsVprlupNnebec/3W9VNfnR4y8Naz4R8RXWg69ZvaXts5V1YcEdmB7g9jX6115V+0P8GtF+Knh05SO0161UmzvQuD/uP6qf0r08DjnRfJP4fyM5wvqj80RycCvrP9kz9ndtRNr458dWTLaAiTT9PlXBl9JJB/d7gd+tXv2bv2Y7yz19vEHxFs1VbKYi1sCQwlZTw7f7PcDvX2CiLGioihVUYAAwAK6cfmGns6T9WTCHVhGiRoqRqFRRgKBgAUtFFeGbBRRRQAV4h+038CtP8AiZpTatpCQ2fia2jPlS4wtyo52P8A0Pavb6K0pVZUpKUXqJq+jPyJ1zStQ0TVrnStVtJbS9tnMcsUgwVIqPS7C61O+isrKFpZ5W2qor9AP2r/AIM6J448OzeJLV7fTtesoyRO3yrcqP4H9/Q14F8OvBlp4XsvMkCTajKP3suM7f8AZX0H86+1yiDzFcy0S3Pms+zqllNLXWb2X6vyH/DnwZaeF7EPIEm1CUDzZcfd/wBke1dfmo80ua+0pUY0oqMVofjWLxNXF1XWrO8mSZozUea9N+B/hTTdau5NUv5opvsrjbak8k9mYelc+OxcMHQlWqbI1y3LqmYYmOHpbvuafwj+HhnMWva5DiMENb27D73ozD09q9oAAAAAAHQCkUBVCqAAOABS1+U5jmNXH1XUqfJdj9yyjKKGV0FRor1fVsKKKK4D1AooooA57xz4UsPFOmG3uFEdwgJgnA5Q/wBR7V84eI9Gv9A1SXT9RhMcqHg/wuOxB7ivrCud8d+E7DxTpZt51CXKDMEwHKn/AAr6LI88lgpeyq603+Hmv1Pj+J+GIZnB16KtVX/k3k/Psz5p0uxu9Tv4rGxheaeVtqIoyTX0T8OPBNp4XsRJKFm1GQfvZf7v+yvtR8OfBFn4UtDIxW41CUfvJsdB/dX0FdfWue568W3RoP3Pz/4BhwvwtHL0sTiVeq9l/L/wQooor5g+3CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKrarf2ml2E19fTpBbwrud2OAKTVdQtNLsJb6+mWGCJcszGvm34nePLzxXfmGEtDpkTfuos/f/wBpvevZyfJ6uZVbLSC3f6LzPBz3PaOVUbvWb2X6vyH/ABM8d3fiq/MULPDpsR/dRdN3+03vXF5pm6jdX6phsLTw1JUqSskfjGLxVbGVnWrO8mSZ96M0wGnSq8UhjkRkdeCrDBFb2OXlFzWn4b1y/wBA1SPUNPmMciHkdmHoR6Vk7hS596ipTjUi4zV0y6c50pqcHZrZn1X4C8W2HizShc27BLmMATwZ5Q/4V0dfIfhvXL/w/qseo6dMY5U6js47gj0r6Y8BeLtP8WaUtzbER3KAefATyh/qPevzPPshlgJe1pa03+Hk/wBGfr/DfEkcygqNbSqv/JvNefdHSUUUV80fWhRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFVtVv7TS7CW+vp1ht4l3O7HpSatqNnpWny319OsMES7mZjXzP8UfH154tv8AyYWeDS4WPlQ5xvP95vU/yr2smyarmVWy0gt3+i8zws8zylldK71m9l+r8h/xP8eXfiy/MUJaHTIm/cxZ5b/ab3ris0zNGa/V8NhaWFpKlSVkj8bxeKrYuq61Z3kx+aX2pmTXsnwc+GrXBh8Qa/CViB3W9sw5b0Zh6e1YZhj6OAourVfourfY3y3LK+Y11Ror1fRLux3wc+GxuPK1/X4SIgQ1tbuPvf7TD09BXT/Fv4dQ6/bPqukxpFqca5KgYE4Hb6+9ekKAqhVAAHAApa/L62fYupi1ilKzWy6W7f5n63R4bwVPBPBuN0931v3/AMj4wuIZred4J42jlQlWVhgg0zNfRHxc+HUXiCB9W0mNI9TRcso4EwH9a+eLiKW2neCeNo5UO1kYYIPpX6TlOa0cypc8NJLddv8AgH5XnOS1srrck9YvZ9/+CJmtPw1rl/4f1WLUdPmMcqHkZ4Yeh9qys0Zr0qlONSLhNXTPKpznSmpwdmtmfWHgDxfp/i3SVubZhHcoAJ4CfmQ/1HvXSV8feGdd1Dw9q0WpabMY5UPIz8rr3UjuK+nPAHjDT/FulLcW7CO6QYngJ5Q/1FfmGfZBLAS9rS1pv8PJ/oz9c4c4jjmMFRraVV/5N5rz7o6WiiivmT6wKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAOY+JXhRfFvh5rAXDwTod8LA/KW9GHcV8s65pV/oupzadqNu0FxC2GVu/uPUV9m1x/xM8DWHi/TD8qw6jEP3E4HP+6fUV9Tw7n7wEvY1v4b/AAf+Xc+S4k4eWYR9vR/iL8V29ex8q5o+gq9ruk32i6nLp2oQNFPG2CCOvuPUV6v8Gvhk1w0PiDxDBiH71tbOPvejMPT2r9Cx2Z4fB4f283o9rdfQ/OMBlWIxuI+rwjZre/T1F+DPw0NwYfEPiCDEQ+a2tnH3vRmHp6Cvc1AVQqgADgAUKoVQqgAAYAHalr8lzPMq2Y1nVqv0XRI/YsryuhltBUqS9X1bCiiivOPSCvNfi98OYvEVu+raTEseqRrllHAnHoff3r0qiuvBY2tgqyq0nZr8fJnHjsDRx1F0ayun+Hmj4ruIZbad4J42ilQlWRhgg1Hmvoz4vfDiLxDA+raRGseqRjLIOBOP8a8AsdI1K91hdIgtJDetJ5ZiK4Knvn0xX6zleb0Mwoe1Ts1uu3/A8z8dzbJK+XYj2TV0/hff/g+Q3SbC81XUIbCwgee4mYKiKOpr6a+F3ga28IaaWkYTajOo8+Tsv+yvtTPhd4DtPCWnCWULNqcq/vZcfd/2V9q7avh+IeIHjG6FB/u1u+//AAD73hrhuOBSxGIV6j2X8v8AwQooor5M+xCiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAxdd8LaHrd/a32pWKTT2rbo2Pf2PqK2VAVQqgAAYAHalorSVWc4qMm2lt5GcKNOEnKMUm9/MKKKKzNAooooAKKKKACs+HRdLh1iXV4rKFb6VQrzBfmIrQoqozlG/K7XJlCMrOSvYKKKKkoKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA//2Q=="),
-      contactLink = Just adminContactReq,
+      contactLink = Just $ CLFull adminContactReq,
       preferences = Nothing
     }
 
@@ -1906,7 +2460,7 @@ simplexStatusContactProfile =
     { displayName = "SimpleX-Status",
       fullName = "",
       image = Just (ImageData "data:image/jpg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAr6ADAAQAAAABAAAArwAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgArwCvAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAgEBAgMCAgIDBAMDAwMEBgQEBAQEBgcGBgYGBgYHBwcHBwcHBwgICAgICAkJCQkJCwsLCwsLCwsLC//bAEMBAgICAwMDBQMDBQsIBggLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC//dAAQAC//aAAwDAQACEQMRAD8A/v4ooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/Q/v4ooooAKKKKACiiigAoorE8R+ItF8J6Jc+IvEVwlrZ2iGSWWQ4CgVUISlJRirtmdatTo05VaslGMU223ZJLVtvokbdFfl3of/BRbS734rtpup2Ig8LSsIYrjnzkOcea3bafTqBX6cafqFjq1jFqemSrPbzqHjkQ5VlPIINetm2Q43LXD65T5eZXX+XquqPiuC/Efh/itYh5HiVUdGTjJWaflJJ6uEvsy2fqXKKKK8c+5Ciq17e2mnWkl/fyLDDCpd3c4VVHJJJr8c/2kf8Ago34q8M3mpTfByG3fT7CGSJZrlC3nStwJF5GFU8gd69LA5VicXTrVaMfdpxcpPokk397toj4LjvxKyLhGjRqZxValVkowhFc05O9m0tPdjfV7dN2kfq346+J3w9+GWlPrXxA1m00i1QZL3Uqxj8Mnn8K/Mj4tf8ABYD4DeEJ5dM+Gmn3niq4TIE0YEFtn/ffBI+imv51vHfxA8b/ABR1+bxT8RNUuNXvp3LtJcOWCk84VeigdgBXI18LXzupLSkrL72fzrxH9IXNsTKVPKKMaMOkpe/P8fdXpaXqfqvrf/BYH9p6+1w3+iafo1jZA8WrRPKSPeTcpz9BX1l8J/8Ags34PvxDp/xn8M3OmSnAe709hcQfUoSHA/A1/PtSE4/GuKGZ4mLvz39T4TL/ABe4swlZ1ljpTvvGaUo/dbT/ALdsf2rfCX9pT4HfHGzF18M/EdnqTYBaFXCzJn+9G2GH5V7nX8IOm6hqGkX8eraLcy2d3EcpPbuY5FPsykGv6gf+CWf7QPxB+OPwX1Ky+JF22pX3h69+yJdyf62WJlDrvPdlzjPevdwGae3l7OcbP8D+i/DTxm/1ixkcqx2H5K7TalF3jLlV2rPWLtqtWvM/T2iiivYP3c//0f7+KKKKACiiigAooooAK/Fv/goX8Qvi2fFcXgfWrRtP8NDEls0bZS7YfxORxlT0Xt1r9pK8u+L/AMI/Cfxp8F3HgvxbFujlGYpgB5kMg6Op9R+tfR8K5vQy3MYYnE01KK0843+0vNf8NZn5f4wcFZhxTwziMpy3FOjVeqSdo1Lf8u5u11GXk97Xuro/mBFyDX3t+yL+2Be/CW+h8B+OHafw7cyALIxJa0Ldx6p6jt1FfMvx/wDgR4w/Z+8YN4d8RoZrSbLWd4owk6D+TDuK8KF0K/pLFYHA51geWVp0pq6a/Brs1/wH2P8ALvJsz4h4D4h9tR5qGLoS5ZRls11jJbSjJferSi9mf1uafqFlqtlFqWmyrPBOoeORDlWU8gg069vrPTbSS/v5FhghUu7ucKqjqSa/CH9j79sm++EuoQ/D/wAeSNceHbmRVjlZstZk9x6p6jt2q3+15+2fffFS8n8AfD2V7bw9CxWWZThrwj+Se3evxB+G2Zf2n9TX8Lf2nTl/+S/u/PbU/v2P0nuGv9Vf7cf+9/D9Xv73tLd/+ffXn7afF7pqftbfth3nxUu5vAXgGR7fw/A5WWUHDXZX19E9B361+Z/xKm3eCL9R3UfzFbQul6Cn+I/A3ivxR8LPEXivSbVn07RoVkurg8Iu5gAue7HPSv1HOsrwmVcN4uhRSjBUp6vq3Fq7fVt/5I/gTNeI884x4kjmeYOVWtKSdop2hCPvWjFbQjFNv5ybbuz4Toqa0ge9uoLOIhWnkSNSxwAXIUEnsBnmv0+/aK/4Jg+O/gj8Hoviz4b1n/hJFt40l1G2ig2NDG4yZEIJ3KvfgHHNfxVTw9SpGUoK6W5+xZVw1mWZYfEYrA0XOFBKU2raJ31te72b0T0R+XRIAyegr+gr/glx+yZoHhjwBc/tKfFywiafUY2OmpeIGS3sVGWmIbgF+TkjhR71+YP7DX7Lt9+1H8ZLfR75WTw5pBS61ScDKsoIKwg+snf0Ffqd/wAFSv2o4Phf4Ltv2WvhmVtrjUbRBfvA2Ps1kOFhAHQyAc9ML9a9HL6UacHi6q0W3mz9Q8M8owuV4KvxpnEL0aN40Yv/AJeVXpp5LZPo7v7J+M/7U/jX4e/EL4/+JfFXwrsI9P0Ke5K26RKESTZw0oUcAOeQBX7J/wDBFU5+HPjYf9RWH/0SK/nqACgKOgr+hT/giouPh143b11SH/0SKWVzc8YpPrf8jHwexk8XxzSxVRJSn7WTSVknKMnoui7H7a0UUV9cf3Mf/9L+/iiiigAoorzX4wfGD4afAP4bav8AF74v6xbaD4d0K3e6vb26cJHHGgyevUnoAOSeBTjFyajFXYHpVFf55Xxt/wCDu34nj9vzS/G3wX0Qz/ArQ2ksLnSp1CXurQyMA15uPMTqBmJD2+914/uU/Y//AGxfgH+3P8ENL+P37OutxazoWpoNwHyzW02PmhmjPKSKeCD9RxXqY/JcXg4QqV4WUvw8n2ZnCrGTaTPqGiiivKNDy/4u/CLwd8afBtx4N8ZW4kilBMUoH7yGTs6HsR+tfzjftA/AXxl+z54yfw34jQzWkuXs7xF/dzR/0YdxX9OPiDxBofhPQ7vxN4mu4rDT7CF57m4ncJHFFGMszMcAAAZJNf53n/Bav/g5W1H4ufGjTvg5+xB5F14E8JX4l1HVriIE6xNE2GjhLDKQdRuGC55HHX9L8Os+x2ExP1eKcsO/iX8vmvPy6/ifg3jZ4NYDjDBPFUEqeYU17k/50vsT8n0lvF+V0fq0LhTUgnA4r4y/ZG/bJ+FX7YXw9HjDwBP5N/ahV1LTZeJrSUjoR3U/wsOK+sRdL/n/APXX9G0nCrBTpu6Z/mVmuSYvLcXUwOPpOnWg7SjJWaf9ap7NarQ+pf2dP2evGH7Q3i4aLogNvp1uQ15esMpEnoPVj2Ffrd+1V8GvDnw5/YU8X+APh/Z7IrewEjYGXlZGUs7nqSQM18C/sO/ti6b8F7o/Dnx6qpoN9LvS6RRvglbjL45ZT69vpX7wX1poHjjwxNYzbL3TdUt2jbaQySRSrg4PoQa/nnxXxGaTxLwmIjy4e3uW2lpu33Xbp87v+7Po58I8L4nhfFVMuqKeY1oTp1nJe9S5k0oxWtoPfmXxve1uVfwqKA0YHYiv6Ev+CZ37bVv490eP9mb4zXAn1GKJo9Murg5F3bgYMLk9XUcD+8tflR+1/wDsn+Nv2XfiNdadqFs8vh28md9Mv1GY3iJyEY9nXoQa+UrC/v8ASr+DVdJnktbq2dZYZomKvG6nIZSOhFfztQrVMJW1Xqu5+Z8PZ5mvBWeSc4NSg+WrTeinHqv1jL56ptP+s7xHZ/A//gnR8EfE/jTwra+RHqF5JdxWpbLTXcwwkSnrsGPwXNfyrfEDx54l+J/jXU/iB4wna51LVZ3nmdj3Y8KPQKOAPQV2vxX/AGhvjT8corC3+K2vz6vFpq7beNgERT3YqvBY92NeNVeOxirNRpq0Fsju8RePKWfTo4TLqPscFRXuU9F7z+KTSuvJK7srvqwr+ir/AIIuaVd2/wAH/FesSIRDd6uFjb+8Y41Dfka/BX4YfCzx78ZfGVr4C+G+nyajqV22Aqj5I17u7dFUdya/r+/ZV+Aenfs2fBLSPhbZyC4ntVaW7nAx5tzKd0jfTJwPYV1ZLQk63tbaI+w8AOHcXiM8ebcjVClGS5ujlJWUV3sm27baX3R9FUUUV9Uf2gf/0/7+KKKKACv4If8Ag8QT9vN9W8IsVk/4Z+WJedOL7f7Xyd32/HGNu3yc/LnPev73q84+Lnwj+G/x3+HGr/CT4uaRba74d123e1vbK6QPHJG4weD0I6gjkHkV6WUY9YLFQxDgpJdP8vMipDmi0f4W1frt/wAEhP8Agrt8af8AglD8b38V+Fo21zwPr7xp4i0B3KpcRoeJoTyEnjBO04+boeK+m/8AguZ/wQz+I3/BMD4kyfEn4Ww3fiD4Oa5KzWWolC76XKx4tbphwOuI3PDAc81/PdX7LCeFzHC3VpU5f18mjympU5eZ/t9fsk/tb/Av9tv4G6N+0F+z3rUWs6BrEQYFCPNt5cfPDMnVJEPDKf5V794h8Q6F4T0O78TeJ7uGw06wiae4uZ3EcUUaDLMzHAAA6k1/j9f8EiP+Cunxv/4JTfHAeKPCZfWfAuuyRx+IvD8jkRTxg486Lsk8YJ2n+Loa/V7/AILy/wDBxZd/t2eHl/Zc/Y6mu9I+Gl1DDNrWoSBoLvUpGAY2+OqQoeH/AL5GOlfneI4OxCxio0taT+12Xn59u53xxMeW73ND/g4M/wCDgzVP2yNV1H9jz9j3UZrD4ZWE7waxrEDlH110ONiEYItgQe/7z6V/I6AAMDgCgAKNo6Cv0j/4Jkf8Ex/j/wD8FOvj/Y/Cj4UWE9voFvNGdf18xk2um2pPzEt0MhGdiZyTX6FhsNhctwvLH3YR1bfXzfn/AEjhlKVSR77/AMEMf2Rf2v8A9qr9tPRrb9mNpdL0fSp438UaxKjNYW+nk/PHKOA7uoIjTrnniv7Lfj98CvG37PPjiXwj4uiLxNl7S7UYjuIuzD39R1Ffvt+wn+wd+z5/wTy+A+n/AAF/Z70pbKyt1V728cA3V/c4w0079WYnoOijgV7V8cPgb4G+Pngqfwb41twwYEwXCgebBJ2ZT/MdDXi5N4mTwmYWqRvhXpb7S/vL9V28z8c8YfBXC8XYL61hbQx9Ne7LpNfyT8v5ZfZfkfyXi5r9Lf2Jv24bn4S3UHwz+JkzT+HZ5AsNy5LNZlu3vHn8q+KPj38CPHf7PPjabwn4yt2ELMxtLsD91cRg8Mp6Z9R2rxAXAPANfuePyzL89y/2c7TpTV1JdOzT6Nf8Bn8C5FnGfcEZ79Yw96OJpPlnCS0a6xkusX/k4u9mf2IeK/B/w++Mngt9C8U2ltrWi6lEGCuA6OrDhlPY+hHNfztftw/8E4tN+AGlTfE34ba3HJo0koVdMvGC3CFv4Ym/5aAenBArvf2PP2+9R+CGmv4B+JSy6joEUbtaOp3TQOBkRj1Rjx7V8uftEftH+Nf2i/G7+KPEzmG0hyllZqT5cEef1Y9zX4LT8GMTisynhsY7UI6qot5J7Jefe+i87o/prxI8YuEM/wCF6WM+rc2ZSXKo6qVJrdykvih/Ktebsmnb4DkilicxyqVYdQRzXUaN4R1HVMSzjyIf7zDk/QV6dIlpJIJ5Y1Z16MRk1+qf7DX7Ed58ULmH4p/Fe2kt/D8Dq9paSDabwjncf+mf/oX0rKXg3lOR+0zDPMW6lCL92EVyufZN3vfyjbvdI/AeFsJnHFOPp5TktD97L4pP4YLrJu2iXnq3ok20es/8Erv2f/G/gf8AtD4ozj7Bo2pwiFIpY/3t2VOQ4J5VFzx659q/aKq9paWthax2VlGsUMShERBtVVHAAA6AVYr4LNcdTxWIdSjRjSpqyjGKslFber7t6tn+k3APB1LhjJaOUUqsqjjdylJ/FKTvJpfZV9orbzd2yiiivNPsj//U/v4ooooAKKKKAPO/iz8Jvh18c/h1q/wm+LGk2+ueHtdt3tb2yukDxyxuMEEHoR1B6g81/lm/8Fy/+CFfxG/4Jh/ENvid8J4bzxF8Htdmke1vliaRtHctxbXTAEBecRyHAbGDzX+q54j8R6B4Q0C88U+KbyHT9N0+F7i5ubhxHFFFGMszMcAADqa/zM/+Dhb/AIL06p+3f4rvP2Tf2Xr6S0+Eui3DR397GcHXriM8N7W6EfIP4jz6V9fwfPGLFctD+H9q+3/D9jmxKjy+9ufyq0UAY4or9ZPMP0v/AOCX3/BLf9oT/gqP8d4Phf8ACa0lsvDtjLG3iDxDJGTa6bbse56NKwB8uPOSfav9ZX9hD9hT4Df8E8v2fdK/Z7+AenLbWNkoe8vHUfab+6I+eeZhyWY9B0UcCv8AKC/4JUf8FV/j1/wSu+PCfEf4aSHUvC+rPHH4i0CViIL63U43D+7MgJKN+B4r/Wd/Yy/bM+BH7eHwH0j9oL9n7Vo9S0fU4182LI8+0nx88MydVdTxz16ivzbjZ43nipfwOlu/n59uh6GE5Labn1ZRRRXwB2Hi3x3+BPgj9oHwJceCPGcIIYFre4UfvYJezKf5jvX8vH7QvwB8d/s4eOZfB/jKEtDIS9neKP3VxFngqfX1Hav6gvj58e/An7PHgK48ceN7gLtBW2twf3txL2RR/M9hX8rX7Qn7Rnjz9o3x5L418ZyhUXKWlqh/dW8WeFUevqe5r988G4Zu3Ut/ueu/839z/wBu6fM/jj6UdPhlwo8y/wCFTS3Lb+H/ANPf/bPtf9unlQuAec077SPWueFznrTxc1+/eyP4udE/XX9g79h24+K8tv8AF74qQvD4fgkDWdo64N4V53H/AKZg/wDfX0r+ge0tLWwtY7KyjWKGJQiIgwqqOAAOwFfzc/sIft2XnwO1KH4ZfEeVp/Ct5L8k7Es9k7YHH/TMnkjt1r+kDTNT07WtOg1fSJ0ubW5QSRSxncjowyCCOoNfyr4q0s3jmreYfwtfZW+Hl/8Akv5r6/Kx/or9HSXDX+rqhkqtidPb81vac/d/3P5Lab/auXqKKK/Lz+gwooooA//V/v4ooooAKxfEniTQPB2gXnirxVew6dpunQvcXV1cOI4oYoxlndjgAADJJrar/PV/4Ozf+CiX7Xlr8Yrf9hCx0u98GfDaS0iv5L1GZT4iZs5HmKceTERgx9d3LcYr08py2eOxMaEXbu/L9SKk1CN2fIX/AAcD/wDBfrXv27vFF1+yx+ylqFzpnwl0id476+icxSa/MhwGOMEWykHYv8fU9hX8qoAAwOAKUAAYFfqj/wAEnf8AglH8cv8Agqp8ek+Hvw/R9M8I6NJFJ4k19lzHZW7k/ImeGmcAhF/E8V+xUKGFyzC2Xuwju/1fds8tuVSXmM/4JQ/8Epfjr/wVU+Pcfw5+HiPpXhPSXjl8ReIZEJhsoGP3E7PO4B2J+J4r7o/4Li/8EC/H3/BL/UYPjH8Hp7vxV8JNQMcL3sy7rnTLkgDbcFRjZI3KPwATg9q/0rP2MP2MPgL+wZ8BdI/Z5/Z60hNM0bS4x5kpANxeTn7887gAvI55JPToOK9y+J/ww8AfGfwBqvwu+KOlW+t6Brdu9re2V0gkilicYIIP6HqDXwVbjSu8YqlNfulpy9139e3Y7VhY8tnuf4VdfqD/AMErP+Cpvx1/4Jb/ALQNn8S/h7cS6j4VvpUj8QeH2kIt723zgsB0WVRyjetffn/BeH/ghJ4x/wCCZvjlvjP8EYbvXPg5rk7GKcqZJdGmc5FvOwH+rOcRyH0wea/nCr9ApVcNmOGuvehL+vk0cLUqcvM/24v2Mf20PgH+3l8CdK/aA/Z61iPVNI1FF86LI+0Wc+PnhnTqjqeOevUcV3nx/wD2gfh/+zp4CuPHHjq5CBQVtrZT+9uJeyIP5noBX+Ud/wAEL/25f2t/2NP2u7A/s7xPrPhzW5Yk8T6LOzCyls1PzTE9I5UXJRupPHIr+p39o79pXx/+0v8AEGbxv42l2RrlLO0QnyreLPCqPX1PUmvM4b8KauYZg5VJWwkdW/tP+6vPu+i8z8r8VvF3D8L4P6vhbTx017sekF/PL/21fafkjV/aF/aN8e/tHePZ/GvjOc+XuK2lopPlW8WeFUevqe9eFfasDmsL7UB1r9kv+Cen/BPuX4mPa/Gv41Wrw6HE4k0/T5FwbsjkO4PPl56D+L6V/QWbZjlnDmW+1q2hSgrRit2+kYrq/wDh2fw9kXDmdcZ526NK9SvUfNOctorrKT6JdF6JIh/Yq/4JyXXxq8MSfEn4wtPpukXkLLp1vH8s0hYcTHPRR1Ud6+KP2nP2bvHX7MXj+Twl4pUz2U+Xsb5QRHcRZ/Rh/Etf2D2trbWNtHZ2caxRRKEREGFVRwAAOgFeSfHL4G+Af2gvAVz4A8f2wmt5huimUDzYJB0dD2I/Wv5/yrxgx0c3niMcr4abtyL7C6OPdrr/ADeWlv604g+jdlFTh6ngsrfLjaauqj/5eS6xn2i/s2+Hz1v/ABi+d3r9O/2DP28r/wCBGpRfDT4lSvdeFL2UBJmYs9izcZX1j7kduor48/ah/Zr8bfsu/EWTwZ4pHn2c4MtheqMJcQ5IB9mHRhXzd9oAFf0Djsuy3iHLeSdqlGorpr8Gn0a/4DW6P5DyrMc74Mzz2tG9LE0XaUXs11jJdYv/ACaezP7pdK1bTNd02DWdGnS6tLlBJFLEwZHRuQQR1FaFfix/wSG1n47X3hPVLHXUL+BoT/oEtxneLjPzLD6pjr2B6d6/aev424nyP+yMyrZf7RT5Huvv17NdV0Z/pTwPxP8A6w5Lh82dGVJ1FrGXdaNp9YveL6oKKKK8A+sP/9b+/iiiigAr4E/4KI/8E4f2b/8AgpZ8DLr4M/H7SklljV5NJ1aJQLzTblhxLC/Uc43L0YcGvvuitKNadKaqU3aS2Ymk1Zn+Vt8Nf+DZH9vDxJ/wUEn/AGQfGti+m+DdMkF5eeNlTNjLpRb5Xgz964cfL5XVWyTx1/0lv2L/ANif9nv9gn4H6b8Bv2dNDh0jSrFF8+YKDcXs4GGmuJOskjHPJ6dBxX1lgZz3pa9bNc+xWPjGFV2iui6vu/60M6dKMNgooorxTU4T4m/DHwB8ZfAeqfDH4paRba7oGtQPbXtjeRiWGaJxghlII/wr/M//AOCw/wDwbq/En9kb9o7Ttc/ZhQ6h8KvGl4VgknkUyaJIxy0UmTueMDmNgCexr/SN/aA/aA+Hf7N3w6u/iL8RbtYYIFIggBHm3Ev8Mca9yfyA5NfyB/tTftZfEX9qv4gSeL/GEv2exgLJYWEZPlW8WeOO7H+Ju9fsXhRwnmOZYl4hNwwi+Jv7T/lj5930Xnofj3iv4nYThrCPD0bTxs17kekV/PPy7L7T8rn58fs1fs1/Df8AZg8Dp4U8CwB7qYK19fuAZrmQDkseyjsvQV9GfaWrAWcjvUnnt6mv62w+Cp0KapUo2itkfwFmOLxWPxNTGYyo51Zu8pN6t/1stktEftx/wTa/YHsfi6sHx2+L8aT6BFJnT7DcGFy6dWlAzhQf4T171/SBaWltY20dlZRrFDEoREQYVVHAAA6AV/Hv+xJ+3N4y/ZO8Wi0ui+oeE9QkX7dYk5KdjLFzw49Ohr+tj4c/Efwb8WPB1l498A30eoaZqEYkiljOevVWHZh0IPIr+TPGXLs6p5p9Zxz5sO9KbXwxX8rXSXd/a3Wmi/t76P8AmHD08l+qZZDkxUdaydueT/mT0vDsl8Oz1d33FFFFfjR/QB4x8dPgN8O/2hvA1x4F+Idms8MgJhmAxLbydnjbqCP1r8RPg3/wSV8Z/wDC9r7T/izMreDNIlEkM8TYfUVPKpgcoAPv+/Ar+iKivrsh43zbKMLWweCq2hUXXXlf80eza0/HdJnwPFHhpkHEGOw+YZlQ5qlJ7rTnXSM/5op6/hs2jD8NeGdA8HaHbeGvC9nFYWFmgjhghUIiKOwArcoor5Oc5Tk5Sd292fd06cacVCCtFaJLZLsgoooqSz//1/7+KKKKACiiigAooooAK8J/aK/aG+H37M/wzvPiX8QrgRwwDbb26kebczH7saDuSep7DmvdW3bTt69s1/Hj/wAFS9c/acu/2hbiw+Psf2fTYWf+w47bd9ha2zw0ZPWQj7+eQfav0Dw44PpcRZssLXqqFOK5pK9pSS6RXfu+i1PzvxN4zrcN5PLF4ei51JPli7XjFv7U327Lq9Dwr9qv9rn4lftZ+Pv+Ev8AG8i29na7ksNPiJ8m2iJ7Ak5Y/wATHrXy/wDacDJNYfn45PFftR/wTX/4Ju6j8aryz+OXxttpLXwtbSrJY2Mi7W1Bl53MD0hB/wC+vpX9jZpmGU8LZT7WolTo01aMVu30jFdW/wDNvqz+HcryTOeLs4dODdSvUd5Tlsl1lJ9Eui9Elsix/wAE8/8Agmpc/Hq3HxZ+OcFxY+F8f6Daj93Jen++eMiMdum76V88ft4fsM+LP2RvGH9p6MJtS8G6gxNnfMMmFj/yxmIAAYfwnuPev7DbGxs9Ms4tP0+JYIIFCRxoNqqq8AADoBXL+P8AwB4R+KHhG+8C+OrGPUNM1CMxTQyjIIPcehHUEdDX8x4PxqzWOdvH11fDS0dJbKPRp/zrdvrtta39V47wCyWeQRy7D6YqOqrPeUuqkv5Hsl9ndXd7/wACwuGHevvT9iL9u7x1+yP4n+wMDqXhPUJVN/YMTlOxlh/uuB+BqH9vD9hXxl+yD4v/ALS03zNT8HajIfsV8VyYSf8AljNjgMOx/iHvX59C6bHav6fjDKeJsqurVcPVX9ecZRfzTP5LdLOeE850vRxNJ/15SjJfJo/v3+GnxJ8HfF3wRp/xC8BXiX2l6lEJYZEPr1Vh2YdCDyDXd1/PD/wRa8KftJW8moeKfPNp8N7kMBBdKT9ouR/Hbgn5QP4m6Gv6Hq/iHjXh6lkmb1svoVlUjF6Nbq/2ZdOZdbfhsf6AcC8SVs9yahmWIoOlOS1T2dvtR68r3V/x3ZRRRXyh9eFFFFABRRRQB//Q/v4ooooAKKKKACiiigAr5u/aj/Zg+HX7VvwyuPh14+i2N/rLO8jA861mHR0Pp2YdCOK+kaK6sDjq+DxEMVhZuFSDumt00cmOwOHxuHnhcVBTpzVpJ7NM/nF/ZW/4I2eINL+MV9rH7Rk0Vz4d0G5H2GCA8anjlXfuiDjcvJJ46V/RfY2FlpdlFpumxJBbwII444wFVEUYAAHAAFW6K9/injHM+Ia8a+Y1L8qsorSK7tLu3q3+iSPn+E+C8q4dw86GW07czvJvWT7Jvstkv1bYUUUV8sfVnEfEb4c+Dvix4Mv/AAB49sY9Q0vUYjFNDIMjB7j0YdQRyDX4HeH/APgiNJB+0LKNe1vzvhzARcxBeLyUEn/R27ADu46jtmv6KKK+r4d42zjI6Vajl1ZxjUVmt7P+aN9pW0uv0R8lxJwNk2e1aFfMqCnKk7p7XX8srbxvrZ/qzn/CnhXw/wCCPDll4R8K2sdlp2nQrBbwRDCoiDAAFdBRRXy05ynJzm7t6tvqfVwhGEVCCsloktkgoooqSgooooAKKKKAP//R/v4ooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/Z"),
-      contactLink = Just (either error id $ strDecode "simplex:/contact/#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FShQuD-rPokbDvkyotKx5NwM8P3oUXHxA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA6fSx1k9zrOmF0BJpCaTarZvnZpMTAVQhd3RkDQ35KT0%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"),
+      contactLink = Just (either error CLFull $ strDecode "simplex:/contact/#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FShQuD-rPokbDvkyotKx5NwM8P3oUXHxA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA6fSx1k9zrOmF0BJpCaTarZvnZpMTAVQhd3RkDQ35KT0%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"),
       preferences = Nothing
     }
 
@@ -1916,5 +2470,5 @@ timeItToView s action = do
   a <- action
   t2 <- liftIO getCurrentTime
   let diff = diffToMilliseconds $ diffUTCTime t2 t1
-  toView' $ CRTimedAction s diff
+  toView' $ CEvtTimedAction s diff
   pure a
diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs
index 4c95375f73..80e287f414 100644
--- a/src/Simplex/Chat/Library/Subscriber.hs
+++ b/src/Simplex/Chat/Library/Subscriber.hs
@@ -22,22 +22,21 @@ import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import qualified Data.Aeson as J
-import qualified Data.ByteString.Base64 as B64
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
 import Data.Either (lefts, partitionEithers, rights)
 import Data.Functor (($>))
 import Data.Int (Int64)
-import Data.List (foldl', partition)
-import Data.List.NonEmpty (NonEmpty (..), (<|))
+import Data.List (foldl')
+import Data.List.NonEmpty (NonEmpty (..))
 import qualified Data.List.NonEmpty as L
+import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, mapMaybe)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeLatin1)
-import Data.Time (addUTCTime)
-import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime)
+import Data.Time.Clock (UTCTime, diffUTCTime)
 import qualified Data.UUID as UUID
 import qualified Data.UUID.V4 as V4
 import Data.Word (Word32)
@@ -60,14 +59,12 @@ import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
-import Simplex.Chat.Util (shuffle)
 import Simplex.FileTransfer.Description (ValidFileDescription)
 import qualified Simplex.FileTransfer.Description as FD
 import Simplex.FileTransfer.Protocol (FilePartyI)
 import qualified Simplex.FileTransfer.Transport as XFTP
 import Simplex.FileTransfer.Types (FileErrorType (..), RcvFileId, SndFileId)
 import Simplex.Messaging.Agent as Agent
-import Simplex.Messaging.Agent.Env.SQLite (AgentConfig (..))
 import Simplex.Messaging.Agent.Protocol
 import qualified Simplex.Messaging.Agent.Protocol as AP (AgentErrorType (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -92,19 +89,21 @@ smallGroupsRcptsMemLimit :: Int
 smallGroupsRcptsMemLimit = 20
 
 processAgentMessage :: ACorrId -> ConnId -> AEvent 'AEConn -> CM ()
-processAgentMessage _ connId (DEL_RCVQ srv qId err_) =
-  toView $ CRAgentRcvQueueDeleted (AgentConnId connId) srv (AgentQueueId qId) err_
-processAgentMessage _ connId DEL_CONN =
-  toView $ CRAgentConnDeleted (AgentConnId connId)
+processAgentMessage _ _ (DEL_RCVQS delQs) =
+  toView $ CEvtAgentRcvQueuesDeleted $ L.map rcvQ delQs
+  where
+    rcvQ (connId, server, rcvId, err_) = DeletedRcvQueue (AgentConnId connId) server (AgentQueueId rcvId) err_
+processAgentMessage _ _ (DEL_CONNS connIds) =
+  toView $ CEvtAgentConnsDeleted $ L.map AgentConnId connIds
 processAgentMessage _ "" (ERR e) =
-  toView $ CRChatError Nothing $ ChatErrorAgent e Nothing
+  eToView $ ChatErrorAgent e Nothing
 processAgentMessage corrId connId msg = do
   lockEntity <- critical (withStore (`getChatLockEntity` AgentConnId connId))
   withEntityLock "processAgentMessage" lockEntity $ do
     vr <- chatVersionRange
     -- getUserByAConnId never throws logical errors, only SEDBBusyError can be thrown here
     critical (withStore' (`getUserByAConnId` AgentConnId connId)) >>= \case
-      Just user -> processAgentMessageConn vr user corrId connId msg `catchChatError` (toView . CRChatError (Just user))
+      Just user -> processAgentMessageConn vr user corrId connId msg `catchChatError` eToView
       _ -> throwChatError $ CENoConnectionUser (AgentConnId connId)
 
 -- CRITICAL error will be shown to the user as alert with restart button in Android/desktop apps.
@@ -122,22 +121,22 @@ critical a =
 
 processAgentMessageNoConn :: AEvent 'AENone -> CM ()
 processAgentMessageNoConn = \case
-  CONNECT p h -> hostEvent $ CRHostConnected p h
-  DISCONNECT p h -> hostEvent $ CRHostDisconnected p h
-  DOWN srv conns -> serverEvent srv conns NSDisconnected CRContactsDisconnected
-  UP srv conns -> serverEvent srv conns NSConnected CRContactsSubscribed
-  SUSPENDED -> toView CRChatSuspended
-  DEL_USER agentUserId -> toView $ CRAgentUserDeleted agentUserId
+  CONNECT p h -> hostEvent $ CEvtHostConnected p h
+  DISCONNECT p h -> hostEvent $ CEvtHostDisconnected p h
+  DOWN srv conns -> serverEvent srv conns NSDisconnected CEvtContactsDisconnected
+  UP srv conns -> serverEvent srv conns NSConnected CEvtContactsSubscribed
+  SUSPENDED -> toView CEvtChatSuspended
+  DEL_USER agentUserId -> toView $ CEvtAgentUserDeleted agentUserId
   ERRS cErrs -> errsEvent cErrs
   where
-    hostEvent :: ChatResponse -> CM ()
+    hostEvent :: ChatEvent -> CM ()
     hostEvent = whenM (asks $ hostEvents . config) . toView
     serverEvent srv conns nsStatus event = do
       chatModifyVar connNetworkStatuses $ \m -> foldl' (\m' cId -> M.insert cId nsStatus m') m connIds
       ifM (asks $ coreApi . config) (notifyAPI connIds) notifyCLI
       where
         connIds = map AgentConnId conns
-        notifyAPI = toView . CRNetworkStatus nsStatus
+        notifyAPI = toView . CEvtNetworkStatus nsStatus
         notifyCLI = do
           cs <- withStore' (`getConnectionsContacts` conns)
           toView $ event srv cs
@@ -145,7 +144,7 @@ processAgentMessageNoConn = \case
     errsEvent cErrs = do
       vr <- chatVersionRange
       errs <- lift $ rights <$> withStoreBatch' (\db -> map (getChatErr vr db) cErrs)
-      toView $ CRChatErrors Nothing errs
+      toView $ CEvtChatErrors errs
       where
         getChatErr :: VersionRangeChat -> DB.Connection -> (ConnId, AgentErrorType) -> IO ChatError
         getChatErr vr db (connId, err) =
@@ -157,15 +156,15 @@ processAgentMsgSndFile _corrId aFileId msg = do
   (cRef_, fileId) <- withStore (`getXFTPSndFileDBIds` AgentSndFileId aFileId)
   withEntityLock_ cRef_ . withFileLock "processAgentMsgSndFile" fileId $
     withStore' (`getUserByASndFileId` AgentSndFileId aFileId) >>= \case
-      Just user -> process user fileId `catchChatError` (toView . CRChatError (Just user))
+      Just user -> process user fileId `catchChatError` eToView
       _ -> do
         lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
         throwChatError $ CENoSndFileUser $ AgentSndFileId aFileId
   where
     withEntityLock_ :: Maybe ChatRef -> CM a -> CM a
-    withEntityLock_ cRef_ = case cRef_ of
-      Just (ChatRef CTDirect contactId) -> withContactLock "processAgentMsgSndFile" contactId
-      Just (ChatRef CTGroup groupId) -> withGroupLock "processAgentMsgSndFile" groupId
+    withEntityLock_ = \case
+      Just (ChatRef CTDirect contactId _) -> withContactLock "processAgentMsgSndFile" contactId
+      Just (ChatRef CTGroup groupId _scope) -> withGroupLock "processAgentMsgSndFile" groupId
       _ -> id
     process :: User -> FileTransferId -> CM ()
     process user fileId = do
@@ -177,7 +176,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
           ci <- withStore $ \db -> do
             liftIO $ updateCIFileStatus db user fileId status
             lookupChatItemByFileId db vr user fileId
-          toView $ CRSndFileProgressXFTP user ci ft sndProgress sndTotal
+          toView $ CEvtSndFileProgressXFTP user ci ft sndProgress sndTotal
         SFDONE sndDescr rfds -> do
           withStore' $ \db -> setSndFTPrivateSndDescr db user fileId (fileDescrText sndDescr)
           ci <- withStore $ \db -> lookupChatItemByFileId db vr user fileId
@@ -189,18 +188,18 @@ processAgentMsgSndFile _corrId aFileId msg = do
                 [] -> sendFileError (FileErrOther "no receiver descriptions") "no receiver descriptions" vr ft
                 rfd : _ -> case [fd | fd@(FD.ValidFileDescription FD.FileDescription {chunks = [_]}) <- rfds] of
                   [] -> case xftpRedirectFor of
-                    Nothing -> xftpSndFileRedirect user fileId rfd >>= toView . CRSndFileRedirectStartXFTP user ft
+                    Nothing -> xftpSndFileRedirect user fileId rfd >>= toView . CEvtSndFileRedirectStartXFTP user ft
                     Just _ -> sendFileError (FileErrOther "chaining redirects") "Prohibit chaining redirects" vr ft
                   rfds' -> do
                     -- we have 1 chunk - use it as URI whether it is redirect or not
                     ft' <- maybe (pure ft) (\fId -> withStore $ \db -> getFileTransferMeta db user fId) xftpRedirectFor
-                    toView $ CRSndStandaloneFileComplete user ft' $ map (decodeLatin1 . strEncode . FD.fileDescriptionURI) rfds'
+                    toView $ CEvtSndStandaloneFileComplete user ft' $ map (decodeLatin1 . strEncode . FD.fileDescriptionURI) rfds'
             Just (AChatItem _ d cInfo _ci@ChatItem {meta = CIMeta {itemSharedMsgId = msgId_, itemDeleted}}) ->
               case (msgId_, itemDeleted) of
                 (Just sharedMsgId, Nothing) -> do
                   when (length rfds < length sfts) $ throwChatError $ CEInternalError "not enough XFTP file descriptions to send"
                   -- TODO either update database status or move to SFPROG
-                  toView $ CRSndFileProgressXFTP user ci ft 1 1
+                  toView $ CEvtSndFileProgressXFTP user ci ft 1 1
                   case (rfds, sfts, d, cInfo) of
                     (rfd : extraRFDs, sft : _, SMDSnd, DirectChat ct) -> do
                       withStore' $ \db -> createExtraSndFTDescrs db user fileId (map fileDescrText extraRFDs)
@@ -209,11 +208,11 @@ processAgentMsgSndFile _corrId aFileId msg = do
                         Just rs -> case L.last rs of
                           Right ([msgDeliveryId], _) ->
                             withStore' $ \db -> updateSndFTDeliveryXFTP db sft msgDeliveryId
-                          Right (deliveryIds, _) -> toView $ CRChatError (Just user) $ ChatError $ CEInternalError $ "SFDONE, sendFileDescriptions: expected 1 delivery id, got " <> show (length deliveryIds)
-                          Left e -> toView $ CRChatError (Just user) e
-                        Nothing -> toView $ CRChatError (Just user) $ ChatError $ CEInternalError "SFDONE, sendFileDescriptions: expected at least 1 result"
+                          Right (deliveryIds, _) -> eToView $ ChatError $ CEInternalError $ "SFDONE, sendFileDescriptions: expected 1 delivery id, got " <> show (length deliveryIds)
+                          Left e -> eToView e
+                        Nothing -> eToView $ ChatError $ CEInternalError "SFDONE, sendFileDescriptions: expected at least 1 result"
                       lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
-                    (_, _, SMDSnd, GroupChat g@GroupInfo {groupId}) -> do
+                    (_, _, SMDSnd, GroupChat g@GroupInfo {groupId} _scope) -> do
                       ms <- withStore' $ \db -> getGroupMembers db vr user g
                       let rfdsMemberFTs = zipWith (\rfd (conn, sft) -> (conn, sft, fileDescrText rfd)) rfds (memberFTs ms)
                           extraRFDs = drop (length rfdsMemberFTs) rfds
@@ -224,7 +223,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
                         liftIO $ updateCIFileStatus db user fileId CIFSSndComplete
                         getChatItemByFileId db vr user fileId
                       lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
-                      toView $ CRSndFileCompleteXFTP user ci' ft
+                      toView $ CEvtSndFileCompleteXFTP user ci' ft
                       where
                         memberFTs :: [GroupMember] -> [(Connection, SndFileTransfer)]
                         memberFTs ms = M.elems $ M.intersectionWith (,) (M.fromList mConns') (M.fromList sfts')
@@ -245,7 +244,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
           ci <- withStore $ \db -> do
             liftIO $ updateCIFileStatus db user fileId (CIFSSndWarning $ agentFileError e)
             lookupChatItemByFileId db vr user fileId
-          toView $ CRSndFileWarning user ci ft err
+          toView $ CEvtSndFileWarning user ci ft err
         SFERR e ->
           sendFileError (agentFileError e) (tshow e) vr ft
       where
@@ -260,7 +259,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
           let (errs, msgReqs) = partitionEithers . L.toList $ L.zipWith (fmap . toMsgReq) connsIdsEvts sndMsgs_
           delivered <- mapM deliverMessages (L.nonEmpty msgReqs)
           let errs' = errs <> maybe [] (lefts . L.toList) delivered
-          unless (null errs') $ toView $ CRChatErrors (Just user) errs'
+          unless (null errs') $ toView $ CEvtChatErrors errs'
           pure delivered
           where
             connDescrEvents :: Int -> NonEmpty (Connection, (ConnOrGroupId, ChatMsgEvent 'Json))
@@ -271,7 +270,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
                   map (\fileDescr -> (conn, (connOrGroupId, XMsgFileDescr {msgId = sharedMsgId, fileDescr}))) (L.toList $ splitFileDescr partSize rfdText)
             toMsgReq :: (Connection, (ConnOrGroupId, ChatMsgEvent 'Json)) -> SndMessage -> ChatMsgReq
             toMsgReq (conn, _) SndMessage {msgId, msgBody} =
-              (conn, MsgFlags {notification = hasNotification XMsgFileDescr_}, msgBody, [msgId])
+              (conn, MsgFlags {notification = hasNotification XMsgFileDescr_}, (vrValue msgBody, [msgId]))
         sendFileError :: FileError -> Text -> VersionRangeChat -> FileTransferMeta -> CM ()
         sendFileError ferr err vr ft = do
           logError $ "Sent file error: " <> err
@@ -279,7 +278,7 @@ processAgentMsgSndFile _corrId aFileId msg = do
             liftIO $ updateFileCancelled db user fileId (CIFSSndError ferr)
             lookupChatItemByFileId db vr user fileId
           lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
-          toView $ CRSndFileError user ci ft err
+          toView $ CEvtSndFileError user ci ft err
 
 agentFileError :: AgentErrorType -> FileError
 agentFileError = \case
@@ -294,31 +293,20 @@ agentFileError = \case
       SMP.TRANSPORT TEVersion -> srvErr SrvErrVersion
       e -> srvErr . SrvErrOther $ tshow e
 
-splitFileDescr :: Int -> RcvFileDescrText -> NonEmpty FileDescr
-splitFileDescr partSize rfdText = splitParts 1 rfdText
-  where
-    splitParts partNo remText =
-      let (part, rest) = T.splitAt partSize remText
-          complete = T.null rest
-          fileDescr = FileDescr {fileDescrText = part, fileDescrPartNo = partNo, fileDescrComplete = complete}
-       in if complete
-            then fileDescr :| []
-            else fileDescr <| splitParts (partNo + 1) rest
-
 processAgentMsgRcvFile :: ACorrId -> RcvFileId -> AEvent 'AERcvFile -> CM ()
 processAgentMsgRcvFile _corrId aFileId msg = do
   (cRef_, fileId) <- withStore (`getXFTPRcvFileDBIds` AgentRcvFileId aFileId)
   withEntityLock_ cRef_ . withFileLock "processAgentMsgRcvFile" fileId $
     withStore' (`getUserByARcvFileId` AgentRcvFileId aFileId) >>= \case
-      Just user -> process user fileId `catchChatError` (toView . CRChatError (Just user))
+      Just user -> process user fileId `catchChatError` eToView
       _ -> do
         lift $ withAgent' (`xftpDeleteRcvFile` aFileId)
         throwChatError $ CENoRcvFileUser $ AgentRcvFileId aFileId
   where
     withEntityLock_ :: Maybe ChatRef -> CM a -> CM a
-    withEntityLock_ cRef_ = case cRef_ of
-      Just (ChatRef CTDirect contactId) -> withContactLock "processAgentMsgRcvFile" contactId
-      Just (ChatRef CTGroup groupId) -> withGroupLock "processAgentMsgRcvFile" groupId
+    withEntityLock_ = \case
+      Just (ChatRef CTDirect contactId _) -> withContactLock "processAgentMsgRcvFile" contactId
+      Just (ChatRef CTGroup groupId _scope) -> withGroupLock "processAgentMsgRcvFile" groupId
       _ -> id
     process :: User -> FileTransferId -> CM ()
     process user fileId = do
@@ -330,7 +318,7 @@ processAgentMsgRcvFile _corrId aFileId msg = do
           ci <- withStore $ \db -> do
             liftIO $ updateCIFileStatus db user fileId status
             lookupChatItemByFileId db vr user fileId
-          toView $ CRRcvFileProgressXFTP user ci rcvProgress rcvTotal ft
+          toView $ CEvtRcvFileProgressXFTP user ci rcvProgress rcvTotal ft
         RFDONE xftpPath ->
           case liveRcvFileTransferPath ft of
             Nothing -> throwChatError $ CEInternalError "no target path for received XFTP file"
@@ -343,25 +331,25 @@ processAgentMsgRcvFile _corrId aFileId msg = do
                   updateCIFileStatus db user fileId CIFSRcvComplete
                 lookupChatItemByFileId db vr user fileId
               agentXFTPDeleteRcvFile aFileId fileId
-              toView $ maybe (CRRcvStandaloneFileComplete user fsTargetPath ft) (CRRcvFileComplete user) ci_
+              toView $ maybe (CEvtRcvStandaloneFileComplete user fsTargetPath ft) (CEvtRcvFileComplete user) ci_
         RFWARN e -> do
           ci <- withStore $ \db -> do
             liftIO $ updateCIFileStatus db user fileId (CIFSRcvWarning $ agentFileError e)
             lookupChatItemByFileId db vr user fileId
-          toView $ CRRcvFileWarning user ci e ft
+          toView $ CEvtRcvFileWarning user ci e ft
         RFERR e
           | e == FILE NOT_APPROVED -> do
               aci_ <- resetRcvCIFileStatus user fileId CIFSRcvAborted
               forM_ aci_ cleanupACIFile
               agentXFTPDeleteRcvFile aFileId fileId
-              forM_ aci_ $ \aci -> toView $ CRChatItemUpdated user aci
+              forM_ aci_ $ \aci -> toView $ CEvtChatItemUpdated user aci
           | otherwise -> do
               aci_ <- withStore $ \db -> do
                 liftIO $ updateFileCancelled db user fileId (CIFSRcvError $ agentFileError e)
                 lookupChatItemByFileId db vr user fileId
               forM_ aci_ cleanupACIFile
               agentXFTPDeleteRcvFile aFileId fileId
-              toView $ CRRcvFileError user aci_ e ft
+              toView $ CEvtRcvFileError user aci_ e ft
 
 processAgentMessageConn :: VersionRangeChat -> User -> ACorrId -> ConnId -> AEvent 'AEConn -> CM ()
 processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = do
@@ -372,9 +360,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
   entity <- critical $ withStore (\db -> getConnectionEntity db vr user $ AgentConnId agentConnId) >>= updateConnStatus
   case agentMessage of
     END -> case entity of
-      RcvDirectMsgConnection _ (Just ct) -> toView $ CRContactAnotherClient user ct
-      _ -> toView $ CRSubscriptionEnd user entity
-    MSGNTF msgId msgTs_ -> toView $ CRNtfMessage user entity $ ntfMsgAckInfo msgId msgTs_
+      RcvDirectMsgConnection _ (Just ct) -> toView $ CEvtContactAnotherClient user ct
+      _ -> toView $ CEvtSubscriptionEnd user entity
+    MSGNTF msgId msgTs_ -> toView $ CEvtNtfMessage user entity $ ntfMsgAckInfo msgId msgTs_
     _ -> case entity of
       RcvDirectMsgConnection conn contact_ ->
         processDirectMessage agentMessage entity conn contact_
@@ -450,13 +438,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         MWARN _ err ->
           processConnMWARN connEntity conn err
         MERR _ err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           processConnMERR connEntity conn err
         MERRS _ err -> do
           -- error cannot be AUTH error here
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
         ERR err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         -- TODO add debugging output
         _ -> pure ()
@@ -480,11 +468,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             checkIntegrityCreateItem (CDDirectRcv ct') msgMeta `catchChatError` \_ -> pure ()
             forM_ aChatMsgs $ \case
               Right (ACMsg _ chatMsg) ->
-                processEvent ct' conn' tags eInfo chatMsg `catchChatError` \e -> toView $ CRChatError (Just user) e
+                processEvent ct' conn' tags eInfo chatMsg `catchChatError` \e -> eToView e
               Left e -> do
                 atomically $ modifyTVar' tags ("error" :)
                 logInfo $ "contact msg=error " <> eInfo <> " " <> tshow e
-                toView $ CRChatError (Just user) (ChatError . CEException $ "error parsing chat message: " <> e)
+                eToView (ChatError . CEException $ "error parsing chat message: " <> e)
             checkSendRcpt ct' $ rights aChatMsgs -- not crucial to use ct'' from processEvent
           where
             aChatMsgs = parseChatMessages msgBody
@@ -498,7 +486,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               case event of
                 XMsgNew mc -> newContentMessage ct'' mc msg msgMeta
                 XMsgFileDescr sharedMsgId fileDescr -> messageFileDescription ct'' sharedMsgId fileDescr
-                XMsgUpdate sharedMsgId mContent ttl live -> messageUpdate ct'' sharedMsgId mContent msg msgMeta ttl live
+                XMsgUpdate sharedMsgId mContent _ ttl live _msgScope -> messageUpdate ct'' sharedMsgId mContent msg msgMeta ttl live
                 XMsgDel sharedMsgId _ -> messageDelete ct'' sharedMsgId msg msgMeta
                 XMsgReact sharedMsgId _ reaction add -> directMsgReaction ct'' sharedMsgId reaction add msg msgMeta
                 -- TODO discontinue XFile
@@ -555,7 +543,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               incognitoProfile <- forM customUserProfileId $ \pId -> withStore (\db -> getProfileById db userId pId)
               let profileToSend = userProfileToSend user (fromLocalProfile <$> incognitoProfile) Nothing True
               allowAgentConnectionAsync user conn'' confId $ XInfo profileToSend
-              toView $ CRBusinessLinkConnecting user gInfo host ct
+              toView $ CEvtBusinessLinkConnecting user gInfo host ct
             _ -> messageError "CONF for existing contact must have x.grp.mem.info or x.info"
         INFO pqSupport connInfo -> do
           processINFOpqSupport conn pqSupport
@@ -579,9 +567,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               -- [incognito] print incognito profile used for this contact
               incognitoProfile <- forM customUserProfileId $ \profileId -> withStore (\db -> getProfileById db userId profileId)
               lift $ setContactNetworkStatus ct' NSConnected
-              toView $ CRContactConnected user ct' (fmap fromLocalProfile incognitoProfile)
+              toView $ CEvtContactConnected user ct' (fmap fromLocalProfile incognitoProfile)
               when (directOrUsed ct') $ do
-                unless (contactUsed ct') $ withFastStore' $ \db -> updateContactUsed db user ct'
                 createInternalChatItem user (CDDirectRcv ct') (CIRcvDirectE2EEInfo $ E2EInfo pqEnc) Nothing
                 createFeatureEnabledItems ct'
               when (contactConnInitiated conn') $ do
@@ -591,14 +578,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 withStore' $ \db -> resetContactConnInitiated db user conn'
               forM_ viaUserContactLink $ \userContactLinkId -> do
                 ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
-                let (UserContactLink {autoAccept}, groupId_, gLinkMemRole) = ucl
+                let (UserContactLink {autoAccept}, gli_) = ucl
                 when (connChatVersion < batchSend2Version) $ sendAutoReply ct' autoAccept
-                forM_ groupId_ $ \groupId -> do
+                -- TODO REMOVE LEGACY vvv
+                forM_ gli_ $ \GroupLinkInfo {groupId, memberRole = gLinkMemRole} -> do
                   groupInfo <- withStore $ \db -> getGroupInfo db vr user groupId
                   subMode <- chatReadVar subscriptionMode
                   groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation subMode
                   gVar <- asks random
                   withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct' gLinkMemRole groupConnIds connChatVersion peerChatVRange subMode
+            -- TODO REMOVE LEGACY ^^^
             Just (gInfo, m@GroupMember {activeConn}) ->
               when (maybe False ((== ConnReady) . connStatus) activeConn) $ do
                 notifyMemberConnected gInfo m $ Just ct
@@ -612,11 +601,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             cis <- updateDirectItemsStatus' db ct conn msgId (CISSndSent SSPComplete)
             liftIO $ forM cis $ \ci -> setDirectSndChatItemViaProxy db user ct ci (isJust proxy)
           let acis = map ctItem cis
-          unless (null acis) $ toView $ CRChatItemsStatusesUpdated user acis
+          unless (null acis) $ toView $ CEvtChatItemsStatusesUpdated user acis
           where
             ctItem = AChatItem SCTDirect SMDSnd (DirectChat ct)
         SWITCH qd phase cStats -> do
-          toView $ CRContactSwitch user ct (SwitchProgress qd phase cStats)
+          toView $ CEvtContactSwitch user ct (SwitchProgress qd phase cStats)
           when (phase == SPStarted || phase == SPCompleted) $ case qd of
             QDRcv -> createInternalChatItem user (CDDirectSnd ct) (CISndConnEvent $ SCESwitchQueue phase Nothing) Nothing
             QDSnd -> createInternalChatItem user (CDDirectRcv ct) (CIRcvConnEvent $ RCESwitchQueue phase) Nothing
@@ -639,12 +628,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                     . mapM (\(ci, content') -> updateDirectChatItem' db user contactId ci content' False False Nothing Nothing)
                     . mdeUpdatedCI e
               case ci_ of
-                Just ci -> toView $ CRChatItemUpdated user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
+                Just ci -> toView $ CEvtChatItemUpdated user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
                 _ -> do
-                  toView $ CRContactRatchetSync user ct (RatchetSyncProgress rss cStats)
+                  toView $ CEvtContactRatchetSync user ct (RatchetSyncProgress rss cStats)
                   createInternalChatItem user (CDDirectRcv ct) (CIRcvDecryptionError mde n) Nothing
             ratchetSyncEventItem ct' = do
-              toView $ CRContactRatchetSync user ct' (RatchetSyncProgress rss cStats)
+              toView $ CEvtContactRatchetSync user ct' (RatchetSyncProgress rss cStats)
               createInternalChatItem user (CDDirectRcv ct') (CIRcvConnEvent $ RCERatchetSync rss) Nothing
         OK ->
           -- [async agent commands] continuation on receiving OK
@@ -654,10 +643,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData ->
             when (directOrUsed ct && sqSecured) $ do
               lift $ setContactNetworkStatus ct NSConnected
-              toView $ CRContactSndReady user ct
+              toView $ CEvtContactSndReady user ct
               forM_ viaUserContactLink $ \userContactLinkId -> do
                 ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
-                let (UserContactLink {autoAccept}, _, _) = ucl
+                let (UserContactLink {autoAccept}, _) = ucl
                 when (connChatVersion >= batchSend2Version) $ sendAutoReply ct autoAccept
         QCONT ->
           void $ continueSending connEntity conn
@@ -666,14 +655,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           processConnMWARN connEntity conn err
         MERR msgId err -> do
           updateDirectItemStatus ct conn msgId (CISSndError $ agentSndError err)
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           processConnMERR connEntity conn err
         MERRS msgIds err -> do
           -- error cannot be AUTH error here
           updateDirectItemsStatusMsgs ct conn (L.toList msgIds) (CISSndError $ agentSndError err)
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
         ERR err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         -- TODO add debugging output
         _ -> pure ()
@@ -682,7 +671,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           Just AutoAccept {autoReply = Just mc} -> do
             (msg, _) <- sendDirectContactMessage user ct (XMsgNew $ MCSimple (extMsgContent mc Nothing))
             ci <- saveSndChatItem user (CDDirectSnd ct) msg (CISndMsgContent mc)
-            toView $ CRNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
+            toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDSnd (DirectChat ct) ci]
           _ -> pure ()
 
     processGroupMessage :: AEvent e -> ConnectionEntity -> Connection -> GroupInfo -> GroupMember -> CM ()
@@ -694,7 +683,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               -- [async agent commands] XGrpMemIntro continuation on receiving INV
               CFCreateConnGrpMemInv
                 | maxVersion (peerChatVRange conn) >= groupDirectInvVersion -> sendWithoutDirectCReq
-                | otherwise -> sendWithDirectCReq
+                | otherwise -> messageError "processGroupMessage INV: member chat version range incompatible"
                 where
                   sendWithoutDirectCReq = do
                     let GroupMember {groupMemberId, memberId} = m
@@ -702,20 +691,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                       liftIO $ setConnConnReqInv db user connId cReq
                       getHostConnId db user groupId
                     sendXGrpMemInv hostConnId Nothing XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq}
-                  sendWithDirectCReq = do
-                    let GroupMember {groupMemberId, memberId} = m
-                    contData <- withStore' $ \db -> do
-                      setConnConnReqInv db user connId cReq
-                      getXGrpMemIntroContGroup db user m
-                    forM_ contData $ \(hostConnId, directConnReq) ->
-                      sendXGrpMemInv hostConnId (Just directConnReq) XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq}
+              -- TODO REMOVE LEGACY vvv
               -- [async agent commands] group link auto-accept continuation on receiving INV
               CFCreateConnGrpInv -> do
                 ct <- withStore $ \db -> getContactViaMember db vr user m
                 withStore' $ \db -> setNewContactMemberConnRequest db user m cReq
                 groupLinkId <- withStore' $ \db -> getGroupLinkId db user gInfo
                 sendGrpInvitation ct m groupLinkId
-                toView $ CRSentGroupInvitation user gInfo ct m
+                toView $ CEvtSentGroupInvitation user gInfo ct m
                 where
                   sendGrpInvitation :: Contact -> GroupMember -> Maybe GroupLinkId -> CM ()
                   sendGrpInvitation ct GroupMember {memberId, memberRole = memRole} groupLinkId = do
@@ -733,7 +716,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                             }
                     (_msg, _) <- sendDirectContactMessage user ct $ XGrpInv groupInv
                     -- we could link chat item with sent group invitation message (_msg)
-                    createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
+                    createInternalChatItem user (CDGroupRcv gInfo Nothing m) (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
+              -- TODO REMOVE LEGACY ^^^
               _ -> throwChatError $ CECommandError "unexpected cmdFunction"
             CRContactUri _ -> throwChatError $ CECommandError "unexpected ConnectionRequestUri type"
       CONF confId _pqSupport _ connInfo -> do
@@ -769,161 +753,84 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 -- TODO update member profile
                 pure ()
             | otherwise -> messageError "x.grp.mem.info: memberId is different from expected"
-          XInfo _ -> pure () -- sent when connecting via group link
+          -- sent when connecting via group link
+          XInfo _ ->
+            -- TODO Keep rejected member to allow them to appeal against rejection.
+            when (memberStatus m == GSMemRejected) $ do
+              deleteMemberConnection' m True
+              withStore' $ \db -> deleteGroupMember db user m
           XOk -> pure ()
           _ -> messageError "INFO from member must have x.grp.mem.info, x.info or x.ok"
         pure ()
-      CON _pqEnc -> do
-        withStore' $ \db -> do
-          updateGroupMemberStatus db userId m GSMemConnected
-          unless (memberActive membership) $
-            updateGroupMemberStatus db userId membership GSMemConnected
+      CON _pqEnc -> unless (memberStatus m == GSMemRejected || memberStatus membership == GSMemRejected) $ do
+        -- TODO [knocking] send pending messages after accepting?
         -- possible improvement: check for each pending message, requires keeping track of connection state
         unless (connDisabled conn) $ sendPendingGroupMessages user m conn
         withAgent $ \a -> toggleConnectionNtfs a (aConnId conn) $ chatHasNtfs chatSettings
         case memberCategory m of
           GCHostMember -> do
-            toView $ CRUserJoinedGroup user gInfo {membership = membership {memberStatus = GSMemConnected}} m {memberStatus = GSMemConnected}
-            let cd = CDGroupRcv gInfo m
+            (m', gInfo') <- withStore' $ \db -> do
+              updateGroupMemberStatus db userId m GSMemConnected
+              gInfo' <-
+                if not (memberPending membership)
+                  then do
+                    updateGroupMemberStatus db userId membership GSMemConnected
+                    pure gInfo {membership = membership {memberStatus = GSMemConnected}}
+                  else pure gInfo
+              pure (m {memberStatus = GSMemConnected}, gInfo')
+            toView $ CEvtUserJoinedGroup user gInfo' m'
+            (gInfo'', m'', scopeInfo) <- mkGroupChatScope gInfo' m'
+            let cd = CDGroupRcv gInfo'' scopeInfo m''
             createInternalChatItem user cd (CIRcvGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing
-            createGroupFeatureItems user cd CIRcvGroupFeature gInfo
-            let GroupInfo {groupProfile = GroupProfile {description}} = gInfo
-            memberConnectedChatItem gInfo m
-            unless expectHistory $ forM_ description $ groupDescriptionChatItem gInfo m
-            where
-              expectHistory = groupFeatureAllowed SGFHistory gInfo && m `supportsVersion` groupHistoryIncludeWelcomeVersion
+            createGroupFeatureItems user cd CIRcvGroupFeature gInfo''
+            memberConnectedChatItem gInfo'' scopeInfo m''
+            unless (memberPending membership) $ maybeCreateGroupDescrLocal gInfo'' m''
           GCInviteeMember -> do
-            memberConnectedChatItem gInfo m
-            toView $ CRJoinedGroupMember user gInfo m {memberStatus = GSMemConnected}
+            (gInfo', mStatus) <-
+              if not (memberPending m)
+                then do
+                  mStatus <- withStore' $ \db -> updateGroupMemberStatus db userId m GSMemConnected $> GSMemConnected
+                  pure (gInfo, mStatus)
+                else do
+                  gInfo' <- withStore' $ \db -> increaseGroupMembersRequireAttention db user gInfo
+                  pure (gInfo', memberStatus m)
+            (gInfo'', m', scopeInfo) <- mkGroupChatScope gInfo' m
+            memberConnectedChatItem gInfo'' scopeInfo m'
+            case scopeInfo of
+              Just (GCSIMemberSupport _) -> do
+                createInternalChatItem user (CDGroupRcv gInfo'' scopeInfo m') (CIRcvGroupEvent RGENewMemberPendingReview) Nothing
+              _ -> pure ()
+            toView $ CEvtJoinedGroupMember user gInfo'' m' {memberStatus = mStatus}
             let Connection {viaUserContactLink} = conn
-            when (isJust viaUserContactLink && isNothing (memberContactId m)) sendXGrpLinkMem
-            members <- withStore' $ \db -> getGroupMembers db vr user gInfo
-            void . sendGroupMessage user gInfo members . XGrpMemNew $ memberInfo m
-            sendIntroductions members
-            when (groupFeatureAllowed SGFHistory gInfo) sendHistory
+            when (isJust viaUserContactLink && isNothing (memberContactId m')) $ sendXGrpLinkMem gInfo''
             when (connChatVersion < batchSend2Version) sendGroupAutoReply
+            case mStatus of
+              GSMemPendingApproval -> pure ()
+              GSMemPendingReview -> introduceToModerators vr user gInfo'' m'
+              _ -> do
+                introduceToAll vr user gInfo'' m'
+                when (groupFeatureAllowed SGFHistory gInfo'') $ sendHistory user gInfo'' m'
             where
-              sendXGrpLinkMem = do
-                let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
+              sendXGrpLinkMem gInfo'' = do
+                let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo''
                     profileToSend = profileToSendOnAccept user profileMode True
                 void $ sendDirectMemberMessage conn (XGrpLinkMem profileToSend) groupId
-              sendIntroductions members = do
-                intros <- withStore' $ \db -> createIntroductions db (maxVersion vr) members m
-                shuffledIntros <- liftIO $ shuffleIntros intros
-                if m `supportsVersion` batchSendVersion
-                  then do
-                    let events = map (memberIntro . reMember) shuffledIntros
-                    forM_ (L.nonEmpty events) $ \events' ->
-                      sendGroupMemberMessages user conn events' groupId
-                  else forM_ shuffledIntros $ \intro ->
-                    processIntro intro `catchChatError` (toView . CRChatError (Just user))
-              memberIntro :: GroupMember -> ChatMsgEvent 'Json
-              memberIntro reMember =
-                let mInfo = memberInfo reMember
-                    mRestrictions = memberRestrictions reMember
-                 in XGrpMemIntro mInfo mRestrictions
-              shuffleIntros :: [GroupMemberIntro] -> IO [GroupMemberIntro]
-              shuffleIntros intros = do
-                let (admins, others) = partition isAdmin intros
-                    (admPics, admNoPics) = partition hasPicture admins
-                    (othPics, othNoPics) = partition hasPicture others
-                mconcat <$> mapM shuffle [admPics, admNoPics, othPics, othNoPics]
-                where
-                  isAdmin GroupMemberIntro {reMember = GroupMember {memberRole}} = memberRole >= GRAdmin
-                  hasPicture GroupMemberIntro {reMember = GroupMember {memberProfile = LocalProfile {image}}} = isJust image
-              processIntro intro@GroupMemberIntro {introId} = do
-                void $ sendDirectMemberMessage conn (memberIntro $ reMember intro) groupId
-                withStore' $ \db -> updateIntroStatus db introId GMIntroSent
-              sendHistory =
-                when (m `supportsVersion` batchSendVersion) $ do
-                  (errs, items) <- partitionEithers <$> withStore' (\db -> getGroupHistoryItems db user gInfo m 100)
-                  (errs', events) <- partitionEithers <$> mapM (tryChatError . itemForwardEvents) items
-                  let errors = map ChatErrorStore errs <> errs'
-                  unless (null errors) $ toView $ CRChatErrors (Just user) errors
-                  let events' = maybe (concat events) (\x -> concat events <> [x]) descrEvent_
-                  forM_ (L.nonEmpty events') $ \events'' ->
-                    sendGroupMemberMessages user conn events'' groupId
-              descrEvent_ :: Maybe (ChatMsgEvent 'Json)
-              descrEvent_
-                | m `supportsVersion` groupHistoryIncludeWelcomeVersion = do
-                    let GroupInfo {groupProfile = GroupProfile {description}} = gInfo
-                    fmap (\descr -> XMsgNew $ MCSimple $ extMsgContent (MCText descr) Nothing) description
-                | otherwise = Nothing
-              itemForwardEvents :: CChatItem 'CTGroup -> CM [ChatMsgEvent 'Json]
-              itemForwardEvents cci = case cci of
-                (CChatItem SMDRcv ci@ChatItem {chatDir = CIGroupRcv sender, content = CIRcvMsgContent mc, file})
-                  | not (blockedByAdmin sender) -> do
-                      fInvDescr_ <- join <$> forM file getRcvFileInvDescr
-                      processContentItem sender ci mc fInvDescr_
-                (CChatItem SMDSnd ci@ChatItem {content = CISndMsgContent mc, file}) -> do
-                  fInvDescr_ <- join <$> forM file getSndFileInvDescr
-                  processContentItem membership ci mc fInvDescr_
-                _ -> pure []
-                where
-                  getRcvFileInvDescr :: CIFile 'MDRcv -> CM (Maybe (FileInvitation, RcvFileDescrText))
-                  getRcvFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
-                    expired <- fileExpired
-                    if fileProtocol /= FPXFTP || fileStatus == CIFSRcvCancelled || expired
-                      then pure Nothing
-                      else do
-                        rfd <- withStore $ \db -> getRcvFileDescrByRcvFileId db fileId
-                        pure $ invCompleteDescr ciFile rfd
-                  getSndFileInvDescr :: CIFile 'MDSnd -> CM (Maybe (FileInvitation, RcvFileDescrText))
-                  getSndFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
-                    expired <- fileExpired
-                    if fileProtocol /= FPXFTP || fileStatus == CIFSSndCancelled || expired
-                      then pure Nothing
-                      else do
-                        -- can also lookup in extra_xftp_file_descriptions, though it can be empty;
-                        -- would be best if snd file had a single rcv description for all members saved in files table
-                        rfd <- withStore $ \db -> getRcvFileDescrBySndFileId db fileId
-                        pure $ invCompleteDescr ciFile rfd
-                  fileExpired :: CM Bool
-                  fileExpired = do
-                    ttl <- asks $ rcvFilesTTL . agentConfig . config
-                    cutoffTs <- addUTCTime (-ttl) <$> liftIO getCurrentTime
-                    pure $ chatItemTs cci < cutoffTs
-                  invCompleteDescr :: CIFile d -> RcvFileDescr -> Maybe (FileInvitation, RcvFileDescrText)
-                  invCompleteDescr CIFile {fileName, fileSize} RcvFileDescr {fileDescrText, fileDescrComplete}
-                    | fileDescrComplete =
-                        let fInvDescr = FileDescr {fileDescrText = "", fileDescrPartNo = 0, fileDescrComplete = False}
-                            fInv = xftpFileInvitation fileName fileSize fInvDescr
-                         in Just (fInv, fileDescrText)
-                    | otherwise = Nothing
-                  processContentItem :: GroupMember -> ChatItem 'CTGroup d -> MsgContent -> Maybe (FileInvitation, RcvFileDescrText) -> CM [ChatMsgEvent 'Json]
-                  processContentItem sender ChatItem {meta, quotedItem} mc fInvDescr_ =
-                    if isNothing fInvDescr_ && not (msgContentHasText mc)
-                      then pure []
-                      else do
-                        let CIMeta {itemTs, itemSharedMsgId, itemTimed} = meta
-                            quotedItemId_ = quoteItemId =<< quotedItem
-                            fInv_ = fst <$> fInvDescr_
-                        (msgContainer, _) <- prepareGroupMsg user gInfo mc quotedItemId_ Nothing fInv_ itemTimed False
-                        let senderVRange = memberChatVRange' sender
-                            xMsgNewChatMsg = ChatMessage {chatVRange = senderVRange, msgId = itemSharedMsgId, chatMsgEvent = XMsgNew msgContainer}
-                        fileDescrEvents <- case (snd <$> fInvDescr_, itemSharedMsgId) of
-                          (Just fileDescrText, Just msgId) -> do
-                            partSize <- asks $ xftpDescrPartSize . config
-                            let parts = splitFileDescr partSize fileDescrText
-                            pure . L.toList $ L.map (XMsgFileDescr msgId) parts
-                          _ -> pure []
-                        let fileDescrChatMsgs = map (ChatMessage senderVRange Nothing) fileDescrEvents
-                            GroupMember {memberId} = sender
-                            msgForwardEvents = map (\cm -> XGrpMsgForward memberId cm itemTs) (xMsgNewChatMsg : fileDescrChatMsgs)
-                        pure msgForwardEvents
           _ -> do
+            unless (memberPending m) $ withStore' $ \db -> updateGroupMemberStatus db userId m GSMemConnected
             let memCategory = memberCategory m
             withStore' (\db -> getViaGroupContact db vr user m) >>= \case
               Nothing -> do
                 notifyMemberConnected gInfo m Nothing
                 let connectedIncognito = memberIncognito membership
-                when (memCategory == GCPreMember) $ probeMatchingMemberContact m connectedIncognito
+                when (memCategory == GCPreMember) $
+                  probeMatchingMemberContact m connectedIncognito
               Just ct@Contact {activeConn} ->
                 forM_ activeConn $ \Connection {connStatus} ->
                   when (connStatus == ConnReady) $ do
                     notifyMemberConnected gInfo m $ Just ct
                     let connectedIncognito = contactConnIncognito ct || incognitoMembership gInfo
-                    when (memCategory == GCPreMember) $ probeMatchingContactsAndMembers ct connectedIncognito True
+                    when (memCategory == GCPreMember && not (memberPending membership)) $
+                      probeMatchingContactsAndMembers ct connectedIncognito True
             sendXGrpMemCon memCategory
             where
               GroupMember {memberId} = m
@@ -942,55 +849,61 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       MSG msgMeta _msgFlags msgBody -> do
         tags <- newTVarIO []
         withAckMessage "group msg" agentConnId msgMeta True (Just tags) $ \eInfo -> do
-          checkIntegrityCreateItem (CDGroupRcv gInfo m) msgMeta `catchChatError` \_ -> pure ()
+          -- possible improvement is to choose scope based on event (some events specify scope)
+          (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
+          checkIntegrityCreateItem (CDGroupRcv gInfo' scopeInfo m') msgMeta `catchChatError` \_ -> pure ()
           forM_ aChatMsgs $ \case
             Right (ACMsg _ chatMsg) ->
-              processEvent tags eInfo chatMsg `catchChatError` \e -> toView $ CRChatError (Just user) e
+              processEvent gInfo' m' tags eInfo chatMsg `catchChatError` \e -> eToView e
             Left e -> do
               atomically $ modifyTVar' tags ("error" :)
               logInfo $ "group msg=error " <> eInfo <> " " <> tshow e
-              toView $ CRChatError (Just user) (ChatError . CEException $ "error parsing chat message: " <> e)
-          forwardMsgs (rights aChatMsgs) `catchChatError` (toView . CRChatError (Just user))
+              eToView (ChatError . CEException $ "error parsing chat message: " <> e)
+          forwardMsgs (rights aChatMsgs) `catchChatError` eToView
           checkSendRcpt $ rights aChatMsgs
         where
           aChatMsgs = parseChatMessages msgBody
           brokerTs = metaBrokerTs msgMeta
-          processEvent :: TVar [Text] -> Text -> MsgEncodingI e => ChatMessage e -> CM ()
-          processEvent tags eInfo chatMsg@ChatMessage {chatMsgEvent} = do
+          processEvent :: GroupInfo -> GroupMember -> TVar [Text] -> Text -> MsgEncodingI e => ChatMessage e -> CM ()
+          processEvent gInfo' m' tags eInfo chatMsg@ChatMessage {chatMsgEvent} = do
             let tag = toCMEventTag chatMsgEvent
             atomically $ modifyTVar' tags (tshow tag :)
             logInfo $ "group msg=" <> tshow tag <> " " <> eInfo
-            (m', conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveGroupRcvMsg user groupId m conn msgMeta msgBody chatMsg
+            (m'', conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveGroupRcvMsg user groupId m' conn msgMeta msgBody chatMsg
             case event of
-              XMsgNew mc -> memberCanSend m' $ newGroupContentMessage gInfo m' mc msg brokerTs False
-              XMsgFileDescr sharedMsgId fileDescr -> memberCanSend m' $ groupMessageFileDescription gInfo m' sharedMsgId fileDescr
-              XMsgUpdate sharedMsgId mContent ttl live -> memberCanSend m' $ groupMessageUpdate gInfo m' sharedMsgId mContent msg brokerTs ttl live
-              XMsgDel sharedMsgId memberId -> groupMessageDelete gInfo m' sharedMsgId memberId msg brokerTs
-              XMsgReact sharedMsgId (Just memberId) reaction add -> groupMsgReaction gInfo m' sharedMsgId memberId reaction add msg brokerTs
+              XMsgNew mc -> memberCanSend m'' scope $ newGroupContentMessage gInfo' m'' mc msg brokerTs False
+                where ExtMsgContent {scope} = mcExtMsgContent mc
+              -- file description is always allowed, to allow sending files to support scope
+              XMsgFileDescr sharedMsgId fileDescr -> groupMessageFileDescription gInfo' m'' sharedMsgId fileDescr
+              XMsgUpdate sharedMsgId mContent mentions ttl live msgScope -> memberCanSend m'' msgScope $ groupMessageUpdate gInfo' m'' sharedMsgId mContent mentions msgScope msg brokerTs ttl live
+              XMsgDel sharedMsgId memberId -> groupMessageDelete gInfo' m'' sharedMsgId memberId msg brokerTs
+              XMsgReact sharedMsgId (Just memberId) reaction add -> groupMsgReaction gInfo' m'' sharedMsgId memberId reaction add msg brokerTs
               -- TODO discontinue XFile
-              XFile fInv -> processGroupFileInvitation' gInfo m' fInv msg brokerTs
-              XFileCancel sharedMsgId -> xFileCancelGroup gInfo m' sharedMsgId
-              XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInvGroup gInfo m' sharedMsgId fileConnReq_ fName
-              XInfo p -> xInfoMember gInfo m' p brokerTs
-              XGrpLinkMem p -> xGrpLinkMem gInfo m' conn' p
-              XGrpMemNew memInfo -> xGrpMemNew gInfo m' memInfo msg brokerTs
-              XGrpMemIntro memInfo memRestrictions_ -> xGrpMemIntro gInfo m' memInfo memRestrictions_
-              XGrpMemInv memId introInv -> xGrpMemInv gInfo m' memId introInv
-              XGrpMemFwd memInfo introInv -> xGrpMemFwd gInfo m' memInfo introInv
-              XGrpMemRole memId memRole -> xGrpMemRole gInfo m' memId memRole msg brokerTs
-              XGrpMemRestrict memId memRestrictions -> xGrpMemRestrict gInfo m' memId memRestrictions msg brokerTs
-              XGrpMemCon memId -> xGrpMemCon gInfo m' memId
-              XGrpMemDel memId -> xGrpMemDel gInfo m' memId msg brokerTs
-              XGrpLeave -> xGrpLeave gInfo m' msg brokerTs
-              XGrpDel -> xGrpDel gInfo m' msg brokerTs
-              XGrpInfo p' -> xGrpInfo gInfo m' p' msg brokerTs
-              XGrpPrefs ps' -> xGrpPrefs gInfo m' ps'
-              XGrpDirectInv connReq mContent_ -> memberCanSend m' $ xGrpDirectInv gInfo m' conn' connReq mContent_ msg brokerTs
-              XGrpMsgForward memberId msg' msgTs -> xGrpMsgForward gInfo m' memberId msg' msgTs
-              XInfoProbe probe -> xInfoProbe (COMGroupMember m') probe
-              XInfoProbeCheck probeHash -> xInfoProbeCheck (COMGroupMember m') probeHash
-              XInfoProbeOk probe -> xInfoProbeOk (COMGroupMember m') probe
-              BFileChunk sharedMsgId chunk -> bFileChunkGroup gInfo sharedMsgId chunk msgMeta
+              XFile fInv -> processGroupFileInvitation' gInfo' m'' fInv msg brokerTs
+              XFileCancel sharedMsgId -> xFileCancelGroup gInfo' m'' sharedMsgId
+              XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInvGroup gInfo' m'' sharedMsgId fileConnReq_ fName
+              XInfo p -> xInfoMember gInfo' m'' p brokerTs
+              XGrpLinkMem p -> xGrpLinkMem gInfo' m'' conn' p
+              XGrpLinkAcpt acceptance role memberId -> xGrpLinkAcpt gInfo' m'' acceptance role memberId msg brokerTs
+              XGrpMemNew memInfo msgScope -> xGrpMemNew gInfo' m'' memInfo msgScope msg brokerTs
+              XGrpMemIntro memInfo memRestrictions_ -> xGrpMemIntro gInfo' m'' memInfo memRestrictions_
+              XGrpMemInv memId introInv -> xGrpMemInv gInfo' m'' memId introInv
+              XGrpMemFwd memInfo introInv -> xGrpMemFwd gInfo' m'' memInfo introInv
+              XGrpMemRole memId memRole -> xGrpMemRole gInfo' m'' memId memRole msg brokerTs
+              XGrpMemRestrict memId memRestrictions -> xGrpMemRestrict gInfo' m'' memId memRestrictions msg brokerTs
+              XGrpMemCon memId -> xGrpMemCon gInfo' m'' memId
+              XGrpMemDel memId withMessages -> xGrpMemDel gInfo' m'' memId withMessages msg brokerTs
+              XGrpLeave -> xGrpLeave gInfo' m'' msg brokerTs
+              XGrpDel -> xGrpDel gInfo' m'' msg brokerTs
+              XGrpInfo p' -> xGrpInfo gInfo' m'' p' msg brokerTs
+              XGrpPrefs ps' -> xGrpPrefs gInfo' m'' ps'
+              -- TODO [knocking] why don't we forward these messages?
+              XGrpDirectInv connReq mContent_ msgScope -> memberCanSend m'' msgScope $ xGrpDirectInv gInfo' m'' conn' connReq mContent_ msg brokerTs
+              XGrpMsgForward memberId msg' msgTs -> xGrpMsgForward gInfo' m'' memberId msg' msgTs
+              XInfoProbe probe -> xInfoProbe (COMGroupMember m'') probe
+              XInfoProbeCheck probeHash -> xInfoProbeCheck (COMGroupMember m'') probeHash
+              XInfoProbeOk probe -> xInfoProbeOk (COMGroupMember m'') probe
+              BFileChunk sharedMsgId chunk -> bFileChunkGroup gInfo' sharedMsgId chunk msgMeta
               _ -> messageError $ "unsupported message: " <> tshow event
           checkSendRcpt :: [AChatMessage] -> CM Bool
           checkSendRcpt aMsgs = do
@@ -1005,6 +918,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 hasDeliveryReceipt (toCMEventTag chatMsgEvent)
           forwardMsgs :: [AChatMessage] -> CM ()
           forwardMsgs aMsgs = do
+            -- TODO [knocking] forward to/from GSMemPendingReview members
             let GroupMember {memberRole = membershipMemRole} = membership
             when (membershipMemRole >= GRAdmin && not (blockedByAdmin m)) $ do
               let forwardedMsgs = mapMaybe (\(ACMsg _ chatMsg) -> forwardedGroupMsg chatMsg) aMsgs
@@ -1020,7 +934,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 let GroupMember {memberId} = m
                     ms = forwardedToGroupMembers (introducedMembers <> invitedMembers) forwardedMsgs'
                     events = L.map (\cm -> XGrpMsgForward memberId cm brokerTs) forwardedMsgs'
-                unless (null ms) $ void $ sendGroupMessages user gInfo ms events
+                unless (null ms) $ void $ sendGroupMessages_ user gInfo ms events
       RCVD msgMeta msgRcpt ->
         withAckMessage' "group rcvd" agentConnId msgMeta $
           groupMsgReceived gInfo m conn msgMeta msgRcpt
@@ -1031,37 +945,39 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         updateGroupItemsStatus gInfo m conn msgId GSSSent (Just $ isJust proxy)
         when continued $ sendPendingGroupMessages user m conn
       SWITCH qd phase cStats -> do
-        toView $ CRGroupMemberSwitch user gInfo m (SwitchProgress qd phase cStats)
+        toView $ CEvtGroupMemberSwitch user gInfo m (SwitchProgress qd phase cStats)
+        (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
         when (phase == SPStarted || phase == SPCompleted) $ case qd of
-          QDRcv -> createInternalChatItem user (CDGroupSnd gInfo) (CISndConnEvent . SCESwitchQueue phase . Just $ groupMemberRef m) Nothing
-          QDSnd -> createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvConnEvent $ RCESwitchQueue phase) Nothing
-      RSYNC rss cryptoErr_ cStats ->
+          QDRcv -> createInternalChatItem user (CDGroupSnd gInfo' scopeInfo) (CISndConnEvent . SCESwitchQueue phase . Just $ groupMemberRef m') Nothing
+          QDSnd -> createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m') (CIRcvConnEvent $ RCESwitchQueue phase) Nothing
+      RSYNC rss cryptoErr_ cStats -> do
+        (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
         case (rss, connectionCode, cryptoErr_) of
-          (RSRequired, _, Just cryptoErr) -> processErr cryptoErr
-          (RSAllowed, _, Just cryptoErr) -> processErr cryptoErr
+          (RSRequired, _, Just cryptoErr) -> processErr gInfo' scopeInfo m' cryptoErr
+          (RSAllowed, _, Just cryptoErr) -> processErr gInfo' scopeInfo m' cryptoErr
           (RSAgreed, Just _, _) -> do
             withStore' $ \db -> setConnectionVerified db user connId Nothing
-            let m' = m {activeConn = Just (conn {connectionCode = Nothing} :: Connection)} :: GroupMember
-            ratchetSyncEventItem m'
-            toView $ CRGroupMemberVerificationReset user gInfo m'
-            createInternalChatItem user (CDGroupRcv gInfo m') (CIRcvConnEvent RCEVerificationCodeReset) Nothing
-          _ -> ratchetSyncEventItem m
+            let m'' = m' {activeConn = Just (conn {connectionCode = Nothing} :: Connection)} :: GroupMember
+            ratchetSyncEventItem gInfo' scopeInfo m''
+            toViewTE $ TEGroupMemberVerificationReset user gInfo' m''
+            createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m'') (CIRcvConnEvent RCEVerificationCodeReset) Nothing
+          _ -> ratchetSyncEventItem gInfo' scopeInfo m'
         where
-          processErr cryptoErr = do
+          processErr gInfo' scopeInfo m' cryptoErr = do
             let e@(mde, n) = agentMsgDecryptError cryptoErr
             ci_ <- withStore $ \db ->
-              getGroupMemberChatItemLast db user groupId (groupMemberId' m)
+              getGroupMemberChatItemLast db user groupId (groupMemberId' m')
                 >>= liftIO
                   . mapM (\(ci, content') -> updateGroupChatItem db user groupId ci content' False False Nothing)
                   . mdeUpdatedCI e
             case ci_ of
-              Just ci -> toView $ CRChatItemUpdated user (AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci)
+              Just ci -> toView $ CEvtChatItemUpdated user (AChatItem SCTGroup SMDRcv (GroupChat gInfo' scopeInfo) ci)
               _ -> do
-                toView $ CRGroupMemberRatchetSync user gInfo m (RatchetSyncProgress rss cStats)
-                createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvDecryptionError mde n) Nothing
-          ratchetSyncEventItem m' = do
-            toView $ CRGroupMemberRatchetSync user gInfo m' (RatchetSyncProgress rss cStats)
-            createInternalChatItem user (CDGroupRcv gInfo m') (CIRcvConnEvent $ RCERatchetSync rss) Nothing
+                toView $ CEvtGroupMemberRatchetSync user gInfo' m' (RatchetSyncProgress rss cStats)
+                createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m') (CIRcvDecryptionError mde n) Nothing
+          ratchetSyncEventItem gInfo' scopeInfo m' = do
+            toView $ CEvtGroupMemberRatchetSync user gInfo' m' (RatchetSyncProgress rss cStats)
+            createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m') (CIRcvConnEvent $ RCERatchetSync rss) Nothing
       OK ->
         -- [async agent commands] continuation on receiving OK
         when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
@@ -1078,16 +994,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       MERR msgId err -> do
         withStore' $ \db -> updateGroupItemsErrorStatus db msgId (groupMemberId' m) (GSSError $ agentSndError err)
         -- group errors are silenced to reduce load on UI event log
-        -- toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+        -- eToView (ChatErrorAgent err $ Just connEntity)
         processConnMERR connEntity conn err
       MERRS msgIds err -> do
         let newStatus = GSSError $ agentSndError err
         -- error cannot be AUTH error here
         withStore' $ \db -> forM_ msgIds $ \msgId ->
           updateGroupItemsErrorStatus db msgId (groupMemberId' m) newStatus `catchAll_` pure ()
-        toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+        eToView (ChatErrorAgent err $ Just connEntity)
       ERR err -> do
-        toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+        eToView (ChatErrorAgent err $ Just connEntity)
         when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
       -- TODO add debugging output
       _ -> pure ()
@@ -1111,9 +1027,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 _ -> pure Nothing
             send mc = do
               msg <- sendGroupMessage' user gInfo [m] (XMsgNew $ MCSimple (extMsgContent mc Nothing))
-              ci <- saveSndChatItem user (CDGroupSnd gInfo) msg (CISndMsgContent mc)
+              ci <- saveSndChatItem user (CDGroupSnd gInfo Nothing) msg (CISndMsgContent mc)
               withStore' $ \db -> createGroupSndStatus db (chatItemId' ci) (groupMemberId' m) GSSNew
-              toView $ CRNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci]
+              toView $ CEvtNewChatItems user [AChatItem SCTGroup SMDSnd (GroupChat gInfo Nothing) ci]
 
     agentMsgDecryptError :: AgentCryptoError -> (MsgDecryptError, Word32)
     agentMsgDecryptError = \case
@@ -1158,21 +1074,21 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           ci <- withStore $ \db -> do
             liftIO $ updateSndFileStatus db ft FSConnected
             updateDirectCIFileStatus db vr user fileId $ CIFSSndTransfer 0 1
-          toView $ CRSndFileStart user ci ft
+          toView $ CEvtSndFileStart user ci ft
           sendFileChunk user ft
         SENT msgId _proxy -> do
           withStore' $ \db -> updateSndFileChunkSent db ft msgId
           unless (fileStatus == FSCancelled) $ sendFileChunk user ft
         MERR _ err -> do
-          cancelSndFileTransfer user ft True >>= mapM_ (deleteAgentConnectionAsync user)
+          cancelSndFileTransfer user ft True >>= mapM_ deleteAgentConnectionAsync
           case err of
             SMP _ SMP.AUTH -> unless (fileStatus == FSCancelled) $ do
               ci <- withStore $ \db -> do
                 liftIO (lookupChatRefByFileId db user fileId) >>= \case
-                  Just (ChatRef CTDirect _) -> liftIO $ updateFileCancelled db user fileId CIFSSndCancelled
+                  Just (ChatRef CTDirect _ _) -> liftIO $ updateFileCancelled db user fileId CIFSSndCancelled
                   _ -> pure ()
                 lookupChatItemByFileId db vr user fileId
-              toView $ CRSndFileRcvCancelled user ci ft
+              toView $ CEvtSndFileRcvCancelled user ci ft
             _ -> throwChatError $ CEFileSend fileId err
         MSG meta _ _ ->
           withAckMessage' "file msg" agentConnId meta $ pure ()
@@ -1183,7 +1099,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           -- [async agent commands] continuation on receiving JOINED
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         ERR err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         -- TODO add debugging output
         _ -> pure ()
@@ -1232,10 +1148,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           -- [async agent commands] continuation on receiving JOINED
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         MERR _ err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           processConnMERR connEntity conn err
         ERR err -> do
-          toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+          eToView (ChatErrorAgent err $ Just connEntity)
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         -- TODO add debugging output
         _ -> pure ()
@@ -1244,9 +1160,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     receiveFileChunk ft@RcvFileTransfer {fileId, chunkSize} conn_ meta@MsgMeta {recipient = (msgId, _), integrity} = \case
       FileChunkCancel ->
         unless (rcvFileCompleteOrCancelled ft) $ do
-          cancelRcvFileTransfer user ft >>= mapM_ (deleteAgentConnectionAsync user)
+          cancelRcvFileTransfer user ft >>= mapM_ deleteAgentConnectionAsync
           ci <- withStore $ \db -> getChatItemByFileId db vr user fileId
-          toView $ CRRcvFileSndCancelled user ci ft
+          toView $ CEvtRcvFileSndCancelled user ci ft
       FileChunk {chunkNo, chunkBytes = chunk} -> do
         case integrity of
           MsgOk -> pure ()
@@ -1269,8 +1185,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                     updateCIFileStatus db user fileId CIFSRcvComplete
                     deleteRcvFileChunks db ft
                   getChatItemByFileId db vr user fileId
-                toView $ CRRcvFileComplete user ci
-                forM_ conn_ $ \conn -> deleteAgentConnectionAsync user (aConnId conn)
+                toView $ CEvtRcvFileComplete user ci
+                mapM_ (deleteAgentConnectionAsync . aConnId) conn_
           RcvChunkDuplicate -> withAckMessage' "file msg" agentConnId meta $ pure ()
           RcvChunkError -> badRcvFileChunk ft $ "incorrect chunk number " <> show chunkNo
 
@@ -1284,58 +1200,67 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           -- TODO show/log error, other events in contact request
           _ -> pure ()
       MERR _ err -> do
-        toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+        eToView (ChatErrorAgent err $ Just connEntity)
         processConnMERR connEntity conn err
       ERR err -> do
-        toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
+        eToView (ChatErrorAgent err $ Just connEntity)
         when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
       -- TODO add debugging output
       _ -> pure ()
       where
         profileContactRequest :: InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> PQSupport -> CM ()
-        profileContactRequest invId chatVRange p xContactId_ reqPQSup = do
+        profileContactRequest invId chatVRange p@Profile {displayName} xContactId_ reqPQSup = do
           withStore (\db -> createOrUpdateContactRequest db vr user userContactLinkId invId chatVRange p xContactId_ reqPQSup) >>= \case
-            CORContact contact -> toView $ CRContactRequestAlreadyAccepted user contact
-            CORGroup gInfo -> toView $ CRBusinessRequestAlreadyAccepted user gInfo
+            CORContact contact -> toView $ CEvtContactRequestAlreadyAccepted user contact
+            CORGroup gInfo -> toView $ CEvtBusinessRequestAlreadyAccepted user gInfo
             CORRequest cReq -> do
               ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
-              let (UserContactLink {connReqContact, autoAccept}, groupId_, gLinkMemRole) = ucl
-                  isSimplexTeam = sameConnReqContact connReqContact adminContactReq
+              let (UserContactLink {connLinkContact = CCLink connReq _, autoAccept}, gLinkInfo_) = ucl
+                  isSimplexTeam = sameConnReqContact connReq adminContactReq
                   v = maxVersion chatVRange
               case autoAccept of
                 Just AutoAccept {acceptIncognito, businessAddress}
                   | businessAddress ->
-                      if v < groupFastLinkJoinVersion || (isSimplexTeam && v < businessChatsVersion)
+                      if isSimplexTeam && v < businessChatsVersion
                         then do
-                          ct <- acceptContactRequestAsync user cReq Nothing True reqPQSup
-                          toView $ CRAcceptingContactRequest user ct
+                          ct <- acceptContactRequestAsync user cReq Nothing reqPQSup
+                          toView $ CEvtAcceptingContactRequest user ct
                         else do
                           gInfo <- acceptBusinessJoinRequestAsync user cReq
-                          toView $ CRAcceptingBusinessRequest user gInfo
-                  | otherwise -> case groupId_ of
+                          toView $ CEvtAcceptingBusinessRequest user gInfo
+                  | otherwise -> case gLinkInfo_ of
                       Nothing -> do
                         -- [incognito] generate profile to send, create connection with incognito profile
                         incognitoProfile <- if acceptIncognito then Just . NewIncognito <$> liftIO generateRandomProfile else pure Nothing
-                        ct <- acceptContactRequestAsync user cReq incognitoProfile True reqPQSup
-                        toView $ CRAcceptingContactRequest user ct
-                      Just groupId -> do
+                        ct <- acceptContactRequestAsync user cReq incognitoProfile reqPQSup
+                        toView $ CEvtAcceptingContactRequest user ct
+                      Just gli@GroupLinkInfo {groupId, memberRole = gLinkMemRole} -> do
                         gInfo <- withStore $ \db -> getGroupInfo db vr user groupId
-                        let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
-                        if v >= groupFastLinkJoinVersion
-                          then do
-                            mem <- acceptGroupJoinRequestAsync user gInfo cReq gLinkMemRole profileMode
-                            createInternalChatItem user (CDGroupRcv gInfo mem) (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
-                            toView $ CRAcceptingGroupJoinRequestMember user gInfo mem
-                          else do
-                            -- TODO v5.7 remove old API (or v6.0?)
-                            ct <- acceptContactRequestAsync user cReq profileMode False PQSupportOff
-                            toView $ CRAcceptingGroupJoinRequest user gInfo ct
-                _ -> toView $ CRReceivedContactRequest user cReq
+                        acceptMember_ <- asks $ acceptMember . chatHooks . config
+                        maybe (pure $ Right (GAAccepted, gLinkMemRole)) (\am -> liftIO $ am gInfo gli p) acceptMember_ >>= \case
+                          Right (acceptance, useRole)
+                            | v < groupFastLinkJoinVersion ->
+                                messageError "processUserContactRequest: chat version range incompatible for accepting group join request"
+                            | otherwise -> do
+                                let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
+                                mem <- acceptGroupJoinRequestAsync user gInfo cReq acceptance useRole profileMode
+                                (gInfo', mem', scopeInfo) <- mkGroupChatScope gInfo mem
+                                createInternalChatItem user (CDGroupRcv gInfo' scopeInfo mem') (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
+                                toView $ CEvtAcceptingGroupJoinRequestMember user gInfo' mem'
+                          Left rjctReason
+                            | v < groupJoinRejectVersion ->
+                                messageWarning $ "processUserContactRequest (group " <> groupName' gInfo <> "): joining of " <> displayName <> " is blocked"
+                            | otherwise -> do
+                                mem <- acceptGroupJoinSendRejectAsync user gInfo cReq rjctReason
+                                toViewTE $ TERejectingGroupJoinRequestMember user gInfo mem rjctReason
+                _ -> toView $ CEvtReceivedContactRequest user cReq
 
-    memberCanSend :: GroupMember -> CM () -> CM ()
-    memberCanSend GroupMember {memberRole} a
-      | memberRole <= GRObserver = messageError "member is not allowed to send messages"
-      | otherwise = a
+    memberCanSend :: GroupMember -> Maybe MsgScope -> CM () -> CM ()
+    memberCanSend m@GroupMember {memberRole} msgScope a = case msgScope of
+      Just MSMember {} -> a
+      Nothing
+        | memberRole > GRObserver || memberPending m -> a
+        | otherwise -> messageError "member is not allowed to send messages"
 
     processConnMERR :: ConnectionEntity -> Connection -> AgentErrorType -> CM ()
     processConnMERR connEntity conn err = do
@@ -1344,12 +1269,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           authErrCounter' <- withStore' $ \db -> incAuthErrCounter db user conn
           when (authErrCounter' >= authErrDisableCount) $ case connEntity of
             RcvDirectMsgConnection ctConn (Just ct) -> do
-              toView $ CRContactDisabled user ct {activeConn = Just ctConn {authErrCounter = authErrCounter'}}
-            _ -> toView $ CRConnectionDisabled connEntity
+              toView $ CEvtContactDisabled user ct {activeConn = Just ctConn {authErrCounter = authErrCounter'}}
+            _ -> toView $ CEvtConnectionDisabled connEntity
         SMP _ SMP.QUOTA ->
           unless (connInactive conn) $ do
             withStore' $ \db -> setQuotaErrCounter db user conn quotaErrSetOnMERR
-            toView $ CRConnectionInactive connEntity True
+            toView $ CEvtConnectionInactive connEntity True
         _ -> pure ()
 
     processConnMWARN :: ConnectionEntity -> Connection -> AgentErrorType -> CM ()
@@ -1359,8 +1284,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           unless (connInactive conn) $ do
             quotaErrCounter' <- withStore' $ \db -> incQuotaErrCounter db user conn
             when (quotaErrCounter' >= quotaErrInactiveCount) $
-              toView $
-                CRConnectionInactive connEntity True
+              toView $ CEvtConnectionInactive connEntity True
         _ -> pure ()
 
     continueSending :: ConnectionEntity -> Connection -> CM Bool
@@ -1368,7 +1292,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       if connInactive conn
         then do
           withStore' $ \db -> setQuotaErrCounter db user conn 0
-          toView $ CRConnectionInactive connEntity False
+          toView $ CEvtConnectionInactive connEntity False
           pure True
         else pure False
 
@@ -1456,23 +1380,20 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     badRcvFileChunk :: RcvFileTransfer -> String -> CM ()
     badRcvFileChunk ft err =
       unless (rcvFileCompleteOrCancelled ft) $ do
-        cancelRcvFileTransfer user ft >>= mapM_ (deleteAgentConnectionAsync user)
+        cancelRcvFileTransfer user ft >>= mapM_ deleteAgentConnectionAsync
         throwChatError $ CEFileRcvChunk err
 
-    memberConnectedChatItem :: GroupInfo -> GroupMember -> CM ()
-    memberConnectedChatItem gInfo m =
+    memberConnectedChatItem :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> CM ()
+    memberConnectedChatItem gInfo scopeInfo m =
       -- ts should be broker ts but we don't have it for CON
-      createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvGroupEvent RGEMemberConnected) Nothing
-
-    groupDescriptionChatItem :: GroupInfo -> GroupMember -> Text -> CM ()
-    groupDescriptionChatItem gInfo m descr =
-      createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvMsgContent $ MCText descr) Nothing
+      createInternalChatItem user (CDGroupRcv gInfo scopeInfo m) (CIRcvGroupEvent RGEMemberConnected) Nothing
 
     notifyMemberConnected :: GroupInfo -> GroupMember -> Maybe Contact -> CM ()
     notifyMemberConnected gInfo m ct_ = do
-      memberConnectedChatItem gInfo m
+      (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
+      memberConnectedChatItem gInfo' scopeInfo m'
       lift $ mapM_ (`setContactNetworkStatus` NSConnected) ct_
-      toView $ CRConnectedToGroupMember user gInfo m ct_
+      toView $ CEvtConnectedToGroupMember user gInfo' m' ct_
 
     probeMatchingContactsAndMembers :: Contact -> IncognitoEnabled -> Bool -> CM ()
     probeMatchingContactsAndMembers ct connectedIncognito doProbeContacts = do
@@ -1529,15 +1450,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             withStore' $ \db -> createSentProbeHash db userId probeId cgm
 
     messageWarning :: Text -> CM ()
-    messageWarning = toView . CRMessageError user "warning"
+    messageWarning = toView . CEvtMessageError user "warning"
 
     messageError :: Text -> CM ()
-    messageError = toView . CRMessageError user "error"
+    messageError = toView . CEvtMessageError user "error"
 
     newContentMessage :: Contact -> MsgContainer -> RcvMessage -> MsgMeta -> CM ()
-    newContentMessage ct@Contact {contactUsed} mc msg@RcvMessage {sharedMsgId_} msgMeta = do
-      unless contactUsed $ withStore' $ \db -> updateContactUsed db user ct
-      let ExtMsgContent content fInv_ _ _ = mcExtMsgContent mc
+    newContentMessage ct mc msg@RcvMessage {sharedMsgId_} msgMeta = do
+      let ExtMsgContent content _ fInv_ _ _ _ = mcExtMsgContent mc
       -- Uncomment to test stuck delivery on errors - see test testDirectMessageDelete
       -- case content of
       --   MCText "hello 111" ->
@@ -1546,26 +1466,26 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       --   _ -> pure ()
       if isVoice content && not (featureAllowed SCFVoice forContact ct)
         then do
-          void $ newChatItem (CIRcvChatFeatureRejected CFVoice) Nothing Nothing False
+          void $ newChatItem (ciContentNoParse $ CIRcvChatFeatureRejected CFVoice) Nothing Nothing False
         else do
-          let ExtMsgContent _ _ itemTTL live_ = mcExtMsgContent mc
+          let ExtMsgContent _ _ _ itemTTL live_ _ = mcExtMsgContent mc
               timed_ = rcvContactCITimed ct itemTTL
               live = fromMaybe False live_
           file_ <- processFileInvitation fInv_ content $ \db -> createRcvFileTransfer db userId ct
-          newChatItem (CIRcvMsgContent content) (snd <$> file_) timed_ live
+          newChatItem (CIRcvMsgContent content, msgContentTexts content) (snd <$> file_) timed_ live
           autoAcceptFile file_
       where
         brokerTs = metaBrokerTs msgMeta
-        newChatItem ciContent ciFile_ timed_ live = do
-          ci <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs ciContent ciFile_ timed_ live
+        newChatItem content ciFile_ timed_ live = do
+          (ci, cInfo) <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs content ciFile_ timed_ live M.empty
           reactions <- maybe (pure []) (\sharedMsgId -> withStore' $ \db -> getDirectCIReactions db ct sharedMsgId) sharedMsgId_
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct) ci {reactions}]
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci {reactions}]
 
     autoAcceptFile :: Maybe (RcvFileTransfer, CIFile 'MDRcv) -> CM ()
     autoAcceptFile = mapM_ $ \(ft, CIFile {fileSize}) -> do
       -- ! autoAcceptFileSize is only used in tests
       ChatConfig {autoAcceptFileSize = sz} <- asks config
-      when (sz > fileSize) $ receiveFile' user ft False Nothing Nothing >>= toView
+      when (sz > fileSize) $ receiveFileEvt' user ft False Nothing Nothing >>= toView
 
     messageFileDescription :: Contact -> SharedMsgId -> FileDescr -> CM ()
     messageFileDescription ct@Contact {contactId} sharedMsgId fileDescr = do
@@ -1575,7 +1495,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     groupMessageFileDescription :: GroupInfo -> GroupMember -> SharedMsgId -> FileDescr -> CM ()
     groupMessageFileDescription g@GroupInfo {groupId} m sharedMsgId fileDescr = do
       fileId <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId
-      processFDMessage (CDGroupRcv g m) sharedMsgId fileId fileDescr
+      -- here scope we pass only affects how chat item is searched in getAChatItemBySharedMsgId, and it ignores scope
+      processFDMessage (CDGroupRcv g Nothing m) sharedMsgId fileId fileDescr
 
     processFDMessage :: ChatTypeQuotable c => ChatDirection c 'MDRcv -> SharedMsgId -> FileTransferId -> FileDescr -> CM ()
     processFDMessage cd sharedMsgId fileId fileDescr = do
@@ -1589,7 +1510,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           pure (rfd, ft')
         when fileDescrComplete $ do
           ci <- withStore $ \db -> getAChatItemBySharedMsgId db user cd sharedMsgId
-          toView $ CRRcvFileDescrReady user ci ft' rfd
+          toView $ CEvtRcvFileDescrReady user ci ft' rfd
         case (fileStatus, xftpRcvFile) of
           (RFSAccepted _, Just XFTPRcvFile {userApprovedRelays}) -> receiveViaCompleteFD user fileId rfd userApprovedRelays cryptoArgs
           _ -> pure ()
@@ -1623,11 +1544,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         -- received an update from the sender, so that it can be referenced later (e.g. by broadcast delete).
         -- Chat item and update message which created it will have different sharedMsgId in this case...
         let timed_ = rcvContactCITimed ct ttl
-        ci <- saveRcvChatItem' user (CDDirectRcv ct) msg (Just sharedMsgId) brokerTs content Nothing timed_ live
+            ts = ciContentTexts content
+        (ci, cInfo) <- saveRcvChatItem' user (CDDirectRcv ct) msg (Just sharedMsgId) brokerTs (content, ts) Nothing timed_ live M.empty
         ci' <- withStore' $ \db -> do
           createChatItemVersion db (chatItemId' ci) brokerTs mc
           updateDirectChatItem' db user contactId ci content True live Nothing Nothing
-        toView $ CRChatItemUpdated user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci')
+        toView $ CEvtChatItemUpdated user (AChatItem SCTDirect SMDRcv cInfo ci')
       where
         brokerTs = metaBrokerTs msgMeta
         content = CIRcvMsgContent mc
@@ -1646,24 +1568,25 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                         reactions <- getDirectCIReactions db ct sharedMsgId
                         let edited = itemLive /= Just True
                         updateDirectChatItem' db user contactId ci {reactions} content edited live Nothing $ Just msgId
-                      toView $ CRChatItemUpdated user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci')
-                      startUpdatedTimedItemThread user (ChatRef CTDirect contactId) ci ci'
-                    else toView $ CRChatItemNotChanged user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
+                      toView $ CEvtChatItemUpdated user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci')
+                      startUpdatedTimedItemThread user (ChatRef CTDirect contactId Nothing) ci ci'
+                    else toView $ CEvtChatItemNotChanged user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
             _ -> messageError "x.msg.update: contact attempted invalid message update"
 
     messageDelete :: Contact -> SharedMsgId -> RcvMessage -> MsgMeta -> CM ()
     messageDelete ct@Contact {contactId} sharedMsgId _rcvMessage msgMeta = do
-      deleteRcvChatItem `catchCINotFound` (toView . CRChatItemDeletedNotFound user ct)
+      deleteRcvChatItem `catchCINotFound` (toView . CEvtChatItemDeletedNotFound user ct)
       where
         brokerTs = metaBrokerTs msgMeta
         deleteRcvChatItem = do
           cci@(CChatItem msgDir ci) <- withStore $ \db -> getDirectChatItemBySharedMsgId db user contactId sharedMsgId
           case msgDir of
             SMDRcv
-              | rcvItemDeletable ci brokerTs ->
-                  if featureAllowed SCFFullDelete forContact ct
-                    then deleteDirectCIs user ct [cci] False False >>= toView
-                    else markDirectCIsDeleted user ct [cci] False brokerTs >>= toView
+              | rcvItemDeletable ci brokerTs -> do
+                  deletions <- if featureAllowed SCFFullDelete forContact ct
+                    then deleteDirectCIs user ct [cci]
+                    else markDirectCIsDeleted user ct [cci] brokerTs
+                  toView $ CEvtChatItemsDeleted user deletions False False
               | otherwise -> messageError "x.msg.del: contact attempted invalid message delete"
             SMDSnd -> messageError "x.msg.del: contact attempted invalid message delete"
 
@@ -1681,7 +1604,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             withStore' $ \db -> setDirectReaction db ct sharedMsgId False reaction add msgId brokerTs
       where
         updateChatItemReaction = do
-          cr_ <- withStore $ \db -> do
+          cEvt_ <- withStore $ \db -> do
             CChatItem md ci <- getDirectChatItemBySharedMsgId db user (contactId' ct) sharedMsgId
             if ciReactionAllowed ci
               then liftIO $ do
@@ -1689,12 +1612,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 reactions <- getDirectCIReactions db ct sharedMsgId
                 let ci' = CChatItem md ci {reactions}
                     r = ACIReaction SCTDirect SMDRcv (DirectChat ct) $ CIReaction CIDirectRcv ci' brokerTs reaction
-                pure $ Just $ CRChatItemReaction user add r
+                pure $ Just $ CEvtChatItemReaction user add r
               else pure Nothing
-          mapM_ toView cr_
+          mapM_ toView cEvt_
 
     groupMsgReaction :: GroupInfo -> GroupMember -> SharedMsgId -> MemberId -> MsgReaction -> Bool -> RcvMessage -> UTCTime -> CM ()
-    groupMsgReaction g@GroupInfo {groupId} m sharedMsgId itemMemberId reaction add RcvMessage {msgId} brokerTs = do
+    groupMsgReaction g m sharedMsgId itemMemberId reaction add RcvMessage {msgId} brokerTs = do
       when (groupFeatureAllowed SGFReactions g) $ do
         rs <- withStore' $ \db -> getGroupReactions db g m itemMemberId sharedMsgId False
         when (reactionAllowed add reaction rs) $ do
@@ -1702,17 +1625,18 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             withStore' $ \db -> setGroupReaction db g m itemMemberId sharedMsgId False reaction add msgId brokerTs
       where
         updateChatItemReaction = do
-          cr_ <- withStore $ \db -> do
-            CChatItem md ci <- getGroupMemberCIBySharedMsgId db user groupId itemMemberId sharedMsgId
+          cEvt_ <- withStore $ \db -> do
+            CChatItem md ci <- getGroupMemberCIBySharedMsgId db user g itemMemberId sharedMsgId
+            scopeInfo <- getGroupChatScopeInfoForItem db vr user g (chatItemId' ci)
             if ciReactionAllowed ci
               then liftIO $ do
                 setGroupReaction db g m itemMemberId sharedMsgId False reaction add msgId brokerTs
                 reactions <- getGroupCIReactions db g itemMemberId sharedMsgId
                 let ci' = CChatItem md ci {reactions}
-                    r = ACIReaction SCTGroup SMDRcv (GroupChat g) $ CIReaction (CIGroupRcv m) ci' brokerTs reaction
-                pure $ Just $ CRChatItemReaction user add r
+                    r = ACIReaction SCTGroup SMDRcv (GroupChat g scopeInfo) $ CIReaction (CIGroupRcv m) ci' brokerTs reaction
+                pure $ Just $ CEvtChatItemReaction user add r
               else pure Nothing
-          mapM_ toView cr_
+          mapM_ toView cEvt_
 
     reactionAllowed :: Bool -> MsgReaction -> [MsgReaction] -> Bool
     reactionAllowed add reaction rs = (reaction `elem` rs) /= add && not (add && length rs >= maxMsgReactions)
@@ -1724,59 +1648,67 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         e -> throwError e
 
     newGroupContentMessage :: GroupInfo -> GroupMember -> MsgContainer -> RcvMessage -> UTCTime -> Bool -> CM ()
-    newGroupContentMessage gInfo m@GroupMember {memberId, memberRole} mc msg@RcvMessage {sharedMsgId_} brokerTs forwarded
-      | blockedByAdmin m = createBlockedByAdmin
-      | otherwise = case prohibitedGroupContent gInfo m content fInv_ of
-          Just f -> rejected f
-          Nothing ->
-            withStore' (\db -> getCIModeration db vr user gInfo memberId sharedMsgId_) >>= \case
-              Just ciModeration -> do
-                applyModeration ciModeration
-                withStore' $ \db -> deleteCIModeration db gInfo memberId sharedMsgId_
-              Nothing -> createContentItem
+    newGroupContentMessage gInfo m@GroupMember {memberId, memberRole} mc msg@RcvMessage {sharedMsgId_} brokerTs forwarded = do
+      (gInfo', m', scopeInfo) <- mkGetMessageChatScope vr user gInfo m msgScope_
+      if blockedByAdmin m'
+        then createBlockedByAdmin gInfo' m' scopeInfo
+        else
+          case prohibitedGroupContent gInfo' m' scopeInfo content ft_ fInv_ False of
+            Just f -> rejected gInfo' m' scopeInfo f
+            Nothing ->
+              withStore' (\db -> getCIModeration db vr user gInfo' memberId sharedMsgId_) >>= \case
+                Just ciModeration -> do
+                  applyModeration gInfo' m' scopeInfo ciModeration
+                  withStore' $ \db -> deleteCIModeration db gInfo' memberId sharedMsgId_
+                Nothing -> createContentItem gInfo' m' scopeInfo
       where
-        rejected f = void $ newChatItem (CIRcvGroupFeatureRejected f) Nothing Nothing False
-        timed' = if forwarded then rcvCITimed_ (Just Nothing) itemTTL else rcvGroupCITimed gInfo itemTTL
+        rejected gInfo' m' scopeInfo f = newChatItem gInfo' m' scopeInfo (ciContentNoParse $ CIRcvGroupFeatureRejected f) Nothing Nothing False
+        timed' gInfo' = if forwarded then rcvCITimed_ (Just Nothing) itemTTL else rcvGroupCITimed gInfo' itemTTL
         live' = fromMaybe False live_
-        ExtMsgContent content fInv_ itemTTL live_ = mcExtMsgContent mc
-        createBlockedByAdmin
-          | groupFeatureAllowed SGFFullDelete gInfo = do
-              ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs CIRcvBlocked Nothing timed' False
-              ci' <- withStore' $ \db -> updateGroupCIBlockedByAdmin db user gInfo ci brokerTs
-              groupMsgToView gInfo ci'
+        ExtMsgContent content mentions fInv_ itemTTL live_ msgScope_ = mcExtMsgContent mc
+        ts@(_, ft_) = msgContentTexts content
+        saveRcvCI gInfo' m' scopeInfo = saveRcvChatItem' user (CDGroupRcv gInfo' scopeInfo m') msg sharedMsgId_ brokerTs
+        createBlockedByAdmin gInfo' m' scopeInfo
+          | groupFeatureAllowed SGFFullDelete gInfo' = do
+              -- ignores member role when blocked by admin
+              (ci, cInfo) <- saveRcvCI gInfo' m' scopeInfo (ciContentNoParse CIRcvBlocked) Nothing (timed' gInfo') False M.empty
+              ci' <- withStore' $ \db -> updateGroupCIBlockedByAdmin db user gInfo' ci brokerTs
+              groupMsgToView cInfo ci'
           | otherwise = do
-              file_ <- processFileInv
-              ci <- createNonLive file_
-              ci' <- withStore' $ \db -> markGroupCIBlockedByAdmin db user gInfo ci
-              groupMsgToView gInfo ci'
-        applyModeration CIModeration {moderatorMember = moderator@GroupMember {memberRole = moderatorRole}, moderatedAt}
+              file_ <- processFileInv m'
+              (ci, cInfo) <- createNonLive gInfo' m' scopeInfo file_
+              ci' <- withStore' $ \db -> markGroupCIBlockedByAdmin db user gInfo' ci
+              groupMsgToView cInfo ci'
+        applyModeration gInfo' m' scopeInfo CIModeration {moderatorMember = moderator@GroupMember {memberRole = moderatorRole}, moderatedAt}
           | moderatorRole < GRModerator || moderatorRole < memberRole =
-              createContentItem
-          | groupFeatureAllowed SGFFullDelete gInfo = do
-              ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs CIRcvModerated Nothing timed' False
-              ci' <- withStore' $ \db -> updateGroupChatItemModerated db user gInfo ci moderator moderatedAt
-              groupMsgToView gInfo ci'
+              createContentItem gInfo' m' scopeInfo
+          | groupFeatureMemberAllowed SGFFullDelete moderator gInfo' = do
+              (ci, cInfo) <- saveRcvCI gInfo' m' scopeInfo (ciContentNoParse CIRcvModerated) Nothing (timed' gInfo') False M.empty
+              ci' <- withStore' $ \db -> updateGroupChatItemModerated db user gInfo' ci moderator moderatedAt
+              groupMsgToView cInfo ci'
           | otherwise = do
-              file_ <- processFileInv
-              ci <- createNonLive file_
-              toView =<< markGroupCIsDeleted user gInfo [CChatItem SMDRcv ci] False (Just moderator) moderatedAt
-        createNonLive file_ =
-          saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs (CIRcvMsgContent content) (snd <$> file_) timed' False
-        createContentItem = do
-          file_ <- processFileInv
-          newChatItem (CIRcvMsgContent content) (snd <$> file_) timed' live'
-          when (showMessages $ memberSettings m) $ autoAcceptFile file_
-        processFileInv =
-          processFileInvitation fInv_ content $ \db -> createRcvGroupFileTransfer db userId m
-        newChatItem ciContent ciFile_ timed_ live = do
-          ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs ciContent ciFile_ timed_ live
-          ci' <- blockedMember m ci $ withStore' $ \db -> markGroupChatItemBlocked db user gInfo ci
-          reactions <- maybe (pure []) (\sharedMsgId -> withStore' $ \db -> getGroupCIReactions db gInfo memberId sharedMsgId) sharedMsgId_
-          groupMsgToView gInfo ci' {reactions}
+              file_ <- processFileInv m'
+              (ci, _cInfo) <- createNonLive gInfo' m' scopeInfo file_
+              deletions <- markGroupCIsDeleted user gInfo' scopeInfo [CChatItem SMDRcv ci] (Just moderator) moderatedAt
+              toView $ CEvtChatItemsDeleted user deletions False False
+        createNonLive gInfo' m' scopeInfo file_ = do
+          saveRcvCI gInfo' m' scopeInfo (CIRcvMsgContent content, ts) (snd <$> file_) (timed' gInfo') False mentions
+        createContentItem gInfo' m' scopeInfo = do
+          file_ <- processFileInv m'
+          newChatItem gInfo' m' scopeInfo (CIRcvMsgContent content, ts) (snd <$> file_) (timed' gInfo') live'
+          when (showMessages $ memberSettings m') $ autoAcceptFile file_
+        processFileInv m' =
+          processFileInvitation fInv_ content $ \db -> createRcvGroupFileTransfer db userId m'
+        newChatItem gInfo' m' scopeInfo ciContent ciFile_ timed_ live = do
+          let mentions' = if showMessages (memberSettings m') then mentions else []
+          (ci, cInfo) <- saveRcvCI gInfo' m' scopeInfo ciContent ciFile_ timed_ live mentions'
+          ci' <- blockedMember m' ci $ withStore' $ \db -> markGroupChatItemBlocked db user gInfo' ci
+          reactions <- maybe (pure []) (\sharedMsgId -> withStore' $ \db -> getGroupCIReactions db gInfo' memberId sharedMsgId) sharedMsgId_
+          groupMsgToView cInfo ci' {reactions}
 
-    groupMessageUpdate :: GroupInfo -> GroupMember -> SharedMsgId -> MsgContent -> RcvMessage -> UTCTime -> Maybe Int -> Maybe Bool -> CM ()
-    groupMessageUpdate gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId, memberId} sharedMsgId mc msg@RcvMessage {msgId} brokerTs ttl_ live_
-      | prohibitedSimplexLinks gInfo m mc =
+    groupMessageUpdate :: GroupInfo -> GroupMember -> SharedMsgId -> MsgContent -> Map MemberName MsgMention -> Maybe MsgScope -> RcvMessage -> UTCTime -> Maybe Int -> Maybe Bool -> CM ()
+    groupMessageUpdate gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId, memberId} sharedMsgId mc mentions msgScope_ msg@RcvMessage {msgId} brokerTs ttl_ live_
+      | prohibitedSimplexLinks gInfo m ft_ =
           messageWarning $ "x.msg.update ignored: feature not allowed " <> groupFeatureNameText GFSimplexLinks
       | otherwise = do
           updateRcvChatItem `catchCINotFound` \_ -> do
@@ -1784,17 +1716,21 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             -- received an update from the sender, so that it can be referenced later (e.g. by broadcast delete).
             -- Chat item and update message which created it will have different sharedMsgId in this case...
             let timed_ = rcvGroupCITimed gInfo ttl_
-            ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg (Just sharedMsgId) brokerTs content Nothing timed_ live
+                mentions' = if showMessages (memberSettings m) then mentions else []
+            (gInfo', m', scopeInfo) <- mkGetMessageChatScope vr user gInfo m msgScope_
+            (ci, cInfo) <- saveRcvChatItem' user (CDGroupRcv gInfo' scopeInfo m') msg (Just sharedMsgId) brokerTs (content, ts) Nothing timed_ live mentions'
             ci' <- withStore' $ \db -> do
               createChatItemVersion db (chatItemId' ci) brokerTs mc
               ci' <- updateGroupChatItem db user groupId ci content True live Nothing
-              blockedMember m ci' $ markGroupChatItemBlocked db user gInfo ci'
-            toView $ CRChatItemUpdated user (AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci')
+              blockedMember m' ci' $ markGroupChatItemBlocked db user gInfo' ci'
+            toView $ CEvtChatItemUpdated user (AChatItem SCTGroup SMDRcv cInfo ci')
       where
         content = CIRcvMsgContent mc
+        ts@(_, ft_) = msgContentTexts mc
         live = fromMaybe False live_
         updateRcvChatItem = do
-          cci <- withStore $ \db -> getGroupChatItemBySharedMsgId db user groupId groupMemberId sharedMsgId
+          cci <- withStore $ \db -> getGroupChatItemBySharedMsgId db user gInfo groupMemberId sharedMsgId
+          scopeInfo <- withStore $ \db -> getGroupChatScopeInfoForItem db vr user gInfo (cChatItemId cci)
           case cci of
             CChatItem SMDRcv ci@ChatItem {chatDir = CIGroupRcv m', meta = CIMeta {itemLive}, content = CIRcvMsgContent oldMC} ->
               if sameMemberId memberId m'
@@ -1807,29 +1743,31 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                           addInitialAndNewCIVersions db (chatItemId' ci) (chatItemTs' ci, oldMC) (brokerTs, mc)
                         reactions <- getGroupCIReactions db gInfo memberId sharedMsgId
                         let edited = itemLive /= Just True
-                        updateGroupChatItem db user groupId ci {reactions} content edited live $ Just msgId
-                      toView $ CRChatItemUpdated user (AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci')
-                      startUpdatedTimedItemThread user (ChatRef CTGroup groupId) ci ci'
-                    else toView $ CRChatItemNotChanged user (AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci)
+                        ciMentions <- getRcvCIMentions db user gInfo ft_ mentions
+                        ci' <- updateGroupChatItem db user groupId ci {reactions} content edited live $ Just msgId
+                        updateGroupCIMentions db gInfo ci' ciMentions
+                      toView $ CEvtChatItemUpdated user (AChatItem SCTGroup SMDRcv (GroupChat gInfo scopeInfo) ci')
+                      startUpdatedTimedItemThread user (ChatRef CTGroup groupId $ toChatScope <$> scopeInfo) ci ci'
+                    else toView $ CEvtChatItemNotChanged user (AChatItem SCTGroup SMDRcv (GroupChat gInfo scopeInfo) ci)
                 else messageError "x.msg.update: group member attempted to update a message of another member"
             _ -> messageError "x.msg.update: group member attempted invalid message update"
 
     groupMessageDelete :: GroupInfo -> GroupMember -> SharedMsgId -> Maybe MemberId -> RcvMessage -> UTCTime -> CM ()
-    groupMessageDelete gInfo@GroupInfo {groupId, membership} m@GroupMember {memberId, memberRole = senderRole} sharedMsgId sndMemberId_ RcvMessage {msgId} brokerTs = do
+    groupMessageDelete gInfo@GroupInfo {membership} m@GroupMember {memberId, memberRole = senderRole} sharedMsgId sndMemberId_ RcvMessage {msgId} brokerTs = do
       let msgMemberId = fromMaybe memberId sndMemberId_
-      withStore' (\db -> runExceptT $ getGroupMemberCIBySharedMsgId db user groupId msgMemberId sharedMsgId) >>= \case
+      withStore' (\db -> runExceptT $ getGroupMemberCIBySharedMsgId db user gInfo msgMemberId sharedMsgId) >>= \case
         Right cci@(CChatItem _ ci@ChatItem {chatDir}) -> case chatDir of
           CIGroupRcv mem -> case sndMemberId_ of
             -- regular deletion
             Nothing
               | sameMemberId memberId mem && msgMemberId == memberId && rcvItemDeletable ci brokerTs ->
-                  delete cci Nothing >>= toView
+                  delete cci Nothing
               | otherwise ->
                   messageError "x.msg.del: member attempted invalid message delete"
             -- moderation (not limited by time)
             Just _
               | sameMemberId memberId mem && msgMemberId == memberId ->
-                  delete cci (Just m) >>= toView
+                  delete cci (Just m)
               | otherwise ->
                   moderate mem cci
           CIGroupSnd -> moderate membership cci
@@ -1842,7 +1780,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         moderate mem cci = case sndMemberId_ of
           Just sndMemberId
             | sameMemberId sndMemberId mem -> checkRole mem $ do
-                delete cci (Just m) >>= toView
+                delete cci (Just m)
                 archiveMessageReports cci m
             | otherwise -> messageError "x.msg.del: message of another member with incorrect memberId"
           _ -> messageError "x.msg.del: message of another member without memberId"
@@ -1850,14 +1788,17 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | senderRole < GRModerator || senderRole < memberRole =
               messageError "x.msg.del: message of another member with insufficient member permissions"
           | otherwise = a
-        delete :: CChatItem 'CTGroup -> Maybe GroupMember -> CM ChatResponse
-        delete cci byGroupMember
-          | groupFeatureAllowed SGFFullDelete gInfo = deleteGroupCIs user gInfo [cci] False False byGroupMember brokerTs
-          | otherwise = markGroupCIsDeleted user gInfo [cci] False byGroupMember brokerTs
+        delete :: CChatItem 'CTGroup -> Maybe GroupMember -> CM ()
+        delete cci byGroupMember = do
+          scopeInfo <- withStore $ \db -> getGroupChatScopeInfoForItem db vr user gInfo (cChatItemId cci)
+          deletions <- if groupFeatureMemberAllowed SGFFullDelete m gInfo
+            then deleteGroupCIs user gInfo scopeInfo [cci] byGroupMember brokerTs
+            else markGroupCIsDeleted user gInfo scopeInfo [cci] byGroupMember brokerTs
+          toView $ CEvtChatItemsDeleted user deletions False False
         archiveMessageReports :: CChatItem 'CTGroup -> GroupMember -> CM ()
         archiveMessageReports (CChatItem _ ci) byMember = do
           ciIds <- withStore' $ \db -> markMessageReportsDeleted db user gInfo ci byMember brokerTs
-          unless (null ciIds) $ toView $ CRGroupChatItemsDeleted user gInfo ciIds False (Just byMember)
+          unless (null ciIds) $ toView $ CEvtGroupChatItemsDeleted user gInfo ciIds False (Just byMember)
 
     -- TODO remove once XFile is discontinued
     processFileInvitation' :: Contact -> FileInvitation -> RcvMessage -> MsgMeta -> CM ()
@@ -1868,8 +1809,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       RcvFileTransfer {fileId, xftpRcvFile} <- withStore $ \db -> createRcvFileTransfer db userId ct fInv inline fileChunkSize
       let fileProtocol = if isJust xftpRcvFile then FPXFTP else FPSMP
           ciFile = Just $ CIFile {fileId, fileName, fileSize, fileSource = Nothing, fileStatus = CIFSRcvInvitation, fileProtocol}
-      ci <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs (CIRcvMsgContent $ MCFile "") ciFile Nothing False
-      toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct) ci]
+          content = ciContentNoParse $ CIRcvMsgContent $ MCFile ""
+      (ci, cInfo) <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs content ciFile Nothing False M.empty
+      toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
       where
         brokerTs = metaBrokerTs msgMeta
 
@@ -1881,9 +1823,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       RcvFileTransfer {fileId, xftpRcvFile} <- withStore $ \db -> createRcvGroupFileTransfer db userId m fInv inline fileChunkSize
       let fileProtocol = if isJust xftpRcvFile then FPXFTP else FPSMP
           ciFile = Just $ CIFile {fileId, fileName, fileSize, fileSource = Nothing, fileStatus = CIFSRcvInvitation, fileProtocol}
-      ci <- saveRcvChatItem' user (CDGroupRcv gInfo m) msg sharedMsgId_ brokerTs (CIRcvMsgContent $ MCFile "") ciFile Nothing False
+          content = ciContentNoParse $ CIRcvMsgContent $ MCFile ""
+      (ci, cInfo) <- saveRcvChatItem' user (CDGroupRcv gInfo Nothing m) msg sharedMsgId_ brokerTs content ciFile Nothing False M.empty
       ci' <- blockedMember m ci $ withStore' $ \db -> markGroupChatItemBlocked db user gInfo ci
-      groupMsgToView gInfo ci'
+      groupMsgToView cInfo ci'
 
     blockedMember :: Monad m' => GroupMember -> ChatItem c d -> m' (ChatItem c d) -> m' (ChatItem c d)
     blockedMember m ci blockedCI
@@ -1904,9 +1847,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       fileId <- withStore $ \db -> getFileIdBySharedMsgId db userId contactId sharedMsgId
       ft <- withStore (\db -> getRcvFileTransfer db user fileId)
       unless (rcvFileCompleteOrCancelled ft) $ do
-        cancelRcvFileTransfer user ft >>= mapM_ (deleteAgentConnectionAsync user)
+        cancelRcvFileTransfer user ft >>= mapM_ deleteAgentConnectionAsync
         ci <- withStore $ \db -> getChatItemByFileId db vr user fileId
-        toView $ CRRcvFileSndCancelled user ci ft
+        toView $ CEvtRcvFileSndCancelled user ci ft
 
     xFileAcptInv :: Contact -> SharedMsgId -> Maybe ConnReqInvitation -> String -> CM ()
     xFileAcptInv ct sharedMsgId fileConnReq_ fName = do
@@ -1928,7 +1871,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             event <- withStore $ \db -> do
               ci' <- updateDirectCIFileStatus db vr user fileId $ CIFSSndTransfer 0 1
               sft <- createSndDirectInlineFT db ct ft
-              pure $ CRSndFileStart user ci' sft
+              pure $ CEvtSndFileStart user ci' sft
             toView event
             ifM
               (allowSendInline fileSize fileInline)
@@ -1958,8 +1901,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         case file of
           Just CIFile {fileProtocol = FPXFTP} -> do
             ft <- withStore $ \db -> getFileTransferMeta db user fileId
-            toView $ CRSndFileCompleteXFTP user ci ft
-          _ -> toView $ CRSndFileComplete user ci sft
+            toView $ CEvtSndFileCompleteXFTP user ci ft
+          _ -> toView $ CEvtSndFileComplete user ci sft
 
     allowSendInline :: Integer -> Maybe InlineFileMode -> CM Bool
     allowSendInline fileSize = \case
@@ -1989,18 +1932,18 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       receiveFileChunk ft Nothing meta chunk
 
     xFileCancelGroup :: GroupInfo -> GroupMember -> SharedMsgId -> CM ()
-    xFileCancelGroup GroupInfo {groupId} GroupMember {groupMemberId, memberId} sharedMsgId = do
+    xFileCancelGroup g@GroupInfo {groupId} GroupMember {groupMemberId, memberId} sharedMsgId = do
       fileId <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId
-      CChatItem msgDir ChatItem {chatDir} <- withStore $ \db -> getGroupChatItemBySharedMsgId db user groupId groupMemberId sharedMsgId
+      CChatItem msgDir ChatItem {chatDir} <- withStore $ \db -> getGroupChatItemBySharedMsgId db user g groupMemberId sharedMsgId
       case (msgDir, chatDir) of
         (SMDRcv, CIGroupRcv m) -> do
           if sameMemberId memberId m
             then do
               ft <- withStore (\db -> getRcvFileTransfer db user fileId)
               unless (rcvFileCompleteOrCancelled ft) $ do
-                cancelRcvFileTransfer user ft >>= mapM_ (deleteAgentConnectionAsync user)
+                cancelRcvFileTransfer user ft >>= mapM_ deleteAgentConnectionAsync
                 ci <- withStore $ \db -> getChatItemByFileId db vr user fileId
-                toView $ CRRcvFileSndCancelled user ci ft
+                toView $ CEvtRcvFileSndCancelled user ci ft
             else messageError "x.file.cancel: group member attempted to cancel file of another member" -- shouldn't happen now that query includes group member id
         (SMDSnd, _) -> messageError "x.file.cancel: group member attempted invalid file cancel"
 
@@ -2025,7 +1968,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             event <- withStore $ \db -> do
               ci' <- updateDirectCIFileStatus db vr user fileId $ CIFSSndTransfer 0 1
               sft <- liftIO $ createSndGroupInlineFT db m conn ft
-              pure $ CRSndFileStart user ci' sft
+              pure $ CEvtSndFileStart user ci' sft
             toView event
             ifM
               (allowSendInline fileSize fileInline)
@@ -2034,9 +1977,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           _ -> messageError "x.file.acpt.inv: member connection is not active"
         else messageError "x.file.acpt.inv: fileName is different from expected"
 
-    groupMsgToView :: forall d. MsgDirectionI d => GroupInfo -> ChatItem 'CTGroup d -> CM ()
-    groupMsgToView gInfo ci =
-      toView $ CRNewChatItems user [AChatItem SCTGroup (msgDirection @d) (GroupChat gInfo) ci]
+    groupMsgToView :: forall d. MsgDirectionI d => ChatInfo 'CTGroup -> ChatItem 'CTGroup d -> CM ()
+    groupMsgToView cInfo ci = do
+      toView $ CEvtNewChatItems user [AChatItem SCTGroup (msgDirection @d) cInfo ci]
 
     processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> CM ()
     processGroupInvitation ct inv msg msgMeta = do
@@ -2058,13 +2001,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               createMemberConnectionAsync db user hostId connIds connChatVersion peerChatVRange subMode
               updateGroupMemberStatusById db userId hostId GSMemAccepted
               updateGroupMemberStatus db userId membership GSMemAccepted
-            toView $ CRUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
+            toView $ CEvtUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
           else do
             let content = CIRcvGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
-            ci <- saveRcvChatItem user (CDDirectRcv ct) msg brokerTs content
+            (ci, cInfo) <- saveRcvChatItemNoParse user (CDDirectRcv ct) msg brokerTs content
             withStore' $ \db -> setGroupInvitationChatItemId db user groupId (chatItemId' ci)
-            toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct) ci]
-            toView $ CRReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
+            toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
+            toView $ CEvtReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
       where
         brokerTs = metaBrokerTs msgMeta
         sameGroupLinkId :: Maybe GroupLinkId -> Maybe GroupLinkId -> Bool
@@ -2085,16 +2028,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         then do
           ct' <- withStore' $ \db -> updateContactStatus db user c CSDeleted
           contactConns <- withStore' $ \db -> getContactConnections db vr userId ct'
-          deleteAgentConnectionsAsync user $ map aConnId contactConns
+          deleteAgentConnectionsAsync $ map aConnId contactConns
           forM_ contactConns $ \conn -> withStore' $ \db -> updateConnectionStatus db conn ConnDeleted
           activeConn' <- forM (contactConn ct') $ \conn -> pure conn {connStatus = ConnDeleted}
           let ct'' = ct' {activeConn = activeConn'} :: Contact
-          ci <- saveRcvChatItem user (CDDirectRcv ct'') msg brokerTs (CIRcvDirectEvent RDEContactDeleted)
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct'') ci]
-          toView $ CRContactDeletedByContact user ct''
+          (ci, cInfo) <- saveRcvChatItemNoParse user (CDDirectRcv ct'') msg brokerTs (CIRcvDirectEvent RDEContactDeleted)
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
+          toView $ CEvtContactDeletedByContact user ct''
         else do
           contactConns <- withStore' $ \db -> getContactConnections db vr userId c
-          deleteAgentConnectionsAsync user $ map aConnId contactConns
+          deleteAgentConnectionsAsync $ map aConnId contactConns
           withStore $ \db -> deleteContact db user c
       where
         brokerTs = metaBrokerTs msgMeta
@@ -2111,7 +2054,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           when (directOrUsed c' && createItems) $ do
             createProfileUpdatedItem c'
             lift $ createRcvFeatureItems user c c'
-          toView $ CRContactUpdated user c c'
+          toView $ CEvtContactUpdated user c c'
           pure c'
       | otherwise =
           pure c
@@ -2154,6 +2097,62 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           probeMatchingMemberContact m' connectedIncognito
         else messageError "x.grp.link.mem error: invalid group link host profile update"
 
+    xGrpLinkAcpt :: GroupInfo -> GroupMember -> GroupAcceptance -> GroupMemberRole -> MemberId -> RcvMessage -> UTCTime -> CM ()
+    xGrpLinkAcpt gInfo@GroupInfo {membership} m acceptance role memberId msg brokerTs
+      | sameMemberId memberId membership = processUserAccepted
+      | otherwise =
+          withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memberId) >>= \case
+            Left _ -> messageError "x.grp.link.acpt error: referenced member does not exist"
+            Right referencedMember -> do
+              (referencedMember', gInfo') <- withFastStore' $ \db -> do
+                referencedMember' <- updateGroupMemberAccepted db user referencedMember (newMemberStatus referencedMember) role
+                gInfo' <- updateGroupMembersRequireAttention db user gInfo referencedMember referencedMember'
+                pure (referencedMember', gInfo')
+              when (memberCategory referencedMember == GCInviteeMember) $ introduceToRemainingMembers referencedMember'
+              -- create item in both scopes
+              memberConnectedChatItem gInfo' Nothing referencedMember'
+              let scopeInfo = Just $ GCSIMemberSupport {groupMember_ = Just referencedMember'}
+                  gEvent = RGEMemberAccepted (groupMemberId' referencedMember') (fromLocalProfile $ memberProfile referencedMember')
+              (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
+              groupMsgToView cInfo ci
+              toView $ CEvtMemberAcceptedByOther user gInfo' m referencedMember'
+              where
+                newMemberStatus refMem = case memberConn refMem of
+                  Just c | connReady c -> GSMemConnected
+                  _ -> GSMemAnnounced
+      where
+        processUserAccepted = case acceptance of
+          GAAccepted -> do
+            membership' <- withStore' $ \db -> updateGroupMemberAccepted db user membership GSMemConnected role
+            -- create item in both scopes
+            let gInfo' = gInfo {membership = membership'}
+                cd = CDGroupRcv gInfo' Nothing m
+            createInternalChatItem user cd (CIRcvGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing
+            createGroupFeatureItems user cd CIRcvGroupFeature gInfo'
+            maybeCreateGroupDescrLocal gInfo' m
+            createInternalChatItem user cd (CIRcvGroupEvent RGEUserAccepted) Nothing
+            let scopeInfo = Just $ GCSIMemberSupport {groupMember_ = Nothing}
+            createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m) (CIRcvGroupEvent RGEUserAccepted) Nothing
+            toView $ CEvtUserJoinedGroup user gInfo' m
+          GAPendingReview -> do
+            membership' <- withStore' $ \db -> updateGroupMemberAccepted db user membership GSMemPendingReview role
+            let gInfo' = gInfo {membership = membership'}
+                scopeInfo = Just $ GCSIMemberSupport {groupMember_ = Nothing}
+            createInternalChatItem user (CDGroupSnd gInfo' scopeInfo) (CISndGroupEvent SGEUserPendingReview) Nothing
+            toView $ CEvtMemberAcceptedByOther user gInfo' m membership'
+          GAPendingApproval ->
+            messageWarning "x.grp.link.acpt: unexpected group acceptance - pending approval"
+        introduceToRemainingMembers acceptedMember = do
+          introduceToRemaining vr user gInfo acceptedMember
+          when (groupFeatureAllowed SGFHistory gInfo) $ sendHistory user gInfo acceptedMember
+
+    maybeCreateGroupDescrLocal :: GroupInfo -> GroupMember -> CM ()
+    maybeCreateGroupDescrLocal gInfo@GroupInfo {groupProfile = GroupProfile {description}} m =
+      unless expectHistory $ forM_ description $ \descr ->
+        createInternalChatItem user (CDGroupRcv gInfo Nothing m) (CIRcvMsgContent $ MCText descr) Nothing
+      where
+        expectHistory = groupFeatureAllowed SGFHistory gInfo && m `supportsVersion` groupHistoryIncludeWelcomeVersion
+
     processMemberProfileUpdate :: GroupInfo -> GroupMember -> Profile -> Bool -> Maybe UTCTime -> CM GroupMember
     processMemberProfileUpdate gInfo m@GroupMember {memberProfile = p, memberContactId} p' createItems itemTs_
       | redactedMemberProfile (fromLocalProfile p) /= redactedMemberProfile p' = do
@@ -2162,7 +2161,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             Nothing -> do
               m' <- withStore $ \db -> updateMemberProfile db user m p'
               createProfileUpdatedItem m'
-              toView $ CRGroupMemberUpdated user gInfo m m'
+              toView $ CEvtGroupMemberUpdated user gInfo m m'
               pure m'
             Just mContactId -> do
               mCt <- withStore $ \db -> getContact db vr user mContactId
@@ -2170,8 +2169,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 then do
                   (m', ct') <- withStore $ \db -> updateContactMemberProfile db user m mCt p'
                   createProfileUpdatedItem m'
-                  toView $ CRGroupMemberUpdated user gInfo m m'
-                  toView $ CRContactUpdated user mCt ct'
+                  toView $ CEvtGroupMemberUpdated user gInfo m m'
+                  toView $ CEvtContactUpdated user mCt ct'
                   pure m'
                 else pure m
               where
@@ -2186,15 +2185,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         updateBusinessChatProfile g@GroupInfo {businessChat} = case businessChat of
           Just bc | isMainBusinessMember bc m -> do
             g' <- withStore $ \db -> updateGroupProfileFromMember db user g p'
-            toView $ CRGroupUpdated user g g' (Just m)
+            toView $ CEvtGroupUpdated user g g' (Just m)
           _ -> pure ()
         isMainBusinessMember BusinessChatInfo {chatType, businessId, customerId} GroupMember {memberId} = case chatType of
           BCBusiness -> businessId == memberId
           BCCustomer -> customerId == memberId
         createProfileUpdatedItem m' =
           when createItems $ do
+            (gInfo', m'', scopeInfo) <- mkGroupChatScope gInfo m'
             let ciContent = CIRcvGroupEvent $ RGEMemberProfileUpdated (fromLocalProfile p) p'
-            createInternalChatItem user (CDGroupRcv gInfo m') ciContent itemTs_
+            createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m'') ciContent itemTs_
 
     createFeatureEnabledItems :: Contact -> CM ()
     createFeatureEnabledItems ct@Contact {mergedPreferences} =
@@ -2281,7 +2281,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         then do
           g <- asks random
           dhKeyPair <- atomically $ if encryptedCall callType then Just <$> C.generateKeyPair g else pure Nothing
-          ci <- saveCallItem CISCallPending
+          (ci, cInfo) <- saveCallItem CISCallPending
           callUUID <- UUID.toText <$> liftIO V4.nextRandom
           let sharedKey = C.Key . C.dhBytes' <$> (C.dh' <$> callDhPubKey <*> (snd <$> dhKeyPair))
               callState = CallInvitationReceived {peerCallType = callType, localDhPubKey = fst <$> dhKeyPair, sharedKey}
@@ -2293,15 +2293,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           withStore' $ \db -> createCall db user call' $ chatItemTs' ci
           call_ <- atomically (TM.lookupInsert contactId call' calls)
           forM_ call_ $ \call -> updateCallItemStatus user ct call WCSDisconnected Nothing
-          toView $ CRCallInvitation RcvCallInvitation {user, contact = ct, callType, sharedKey, callUUID, callTs = chatItemTs' ci}
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct) ci]
+          toView $ CEvtCallInvitation RcvCallInvitation {user, contact = ct, callType, sharedKey, callUUID, callTs = chatItemTs' ci}
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
         else featureRejected CFCalls
       where
         brokerTs = metaBrokerTs msgMeta
-        saveCallItem status = saveRcvChatItem user (CDDirectRcv ct) msg brokerTs (CIRcvCall status 0)
+        saveCallItem status = saveRcvChatItemNoParse user (CDDirectRcv ct) msg brokerTs (CIRcvCall status 0)
         featureRejected f = do
-          ci <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs (CIRcvChatFeatureRejected f) Nothing Nothing False
-          toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat ct) ci]
+          let content = ciContentNoParse $ CIRcvChatFeatureRejected f
+          (ci, cInfo) <- saveRcvChatItem' user (CDDirectRcv ct) msg sharedMsgId_ brokerTs content Nothing Nothing False M.empty
+          toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
 
     -- to party initiating call
     xCallOffer :: Contact -> CallId -> CallOffer -> RcvMessage -> CM ()
@@ -2312,7 +2313,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             let sharedKey = C.Key . C.dhBytes' <$> (C.dh' <$> callDhPubKey <*> localDhPrivKey)
                 callState' = CallOfferReceived {localCallType, peerCallType = callType, peerCallSession = rtcSession, sharedKey}
                 askConfirmation = encryptedCall localCallType && not (encryptedCall callType)
-            toView CRCallOffer {user, contact = ct, callType, offer = rtcSession, sharedKey, askConfirmation}
+            toView CEvtCallOffer {user, contact = ct, callType, offer = rtcSession, sharedKey, askConfirmation}
             pure (Just call {callState = callState'}, Just . ACIContent SMDSnd $ CISndCall CISCallAccepted 0)
           _ -> do
             msgCallStateError "x.call.offer" call
@@ -2325,7 +2326,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         \call -> case callState call of
           CallOfferSent {localCallType, peerCallType, localCallSession, sharedKey} -> do
             let callState' = CallNegotiated {localCallType, peerCallType, localCallSession, peerCallSession = rtcSession, sharedKey}
-            toView $ CRCallAnswer user ct rtcSession
+            toView $ CEvtCallAnswer user ct rtcSession
             pure (Just call {callState = callState'}, Just . ACIContent SMDRcv $ CIRcvCall CISCallNegotiated 0)
           _ -> do
             msgCallStateError "x.call.answer" call
@@ -2339,12 +2340,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           CallOfferReceived {localCallType, peerCallType, peerCallSession, sharedKey} -> do
             -- TODO update the list of ice servers in peerCallSession
             let callState' = CallOfferReceived {localCallType, peerCallType, peerCallSession, sharedKey}
-            toView $ CRCallExtraInfo user ct rtcExtraInfo
+            toView $ CEvtCallExtraInfo user ct rtcExtraInfo
             pure (Just call {callState = callState'}, Nothing)
           CallNegotiated {localCallType, peerCallType, localCallSession, peerCallSession, sharedKey} -> do
             -- TODO update the list of ice servers in peerCallSession
             let callState' = CallNegotiated {localCallType, peerCallType, localCallSession, peerCallSession, sharedKey}
-            toView $ CRCallExtraInfo user ct rtcExtraInfo
+            toView $ CEvtCallExtraInfo user ct rtcExtraInfo
             pure (Just call {callState = callState'}, Nothing)
           _ -> do
             msgCallStateError "x.call.extra" call
@@ -2354,7 +2355,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     xCallEnd :: Contact -> CallId -> RcvMessage -> CM ()
     xCallEnd ct callId msg =
       msgCurrentCall ct callId "x.call.end" msg $ \Call {chatItemId} -> do
-        toView $ CRCallEnded user ct
+        toView $ CEvtCallEnded user ct
         (Nothing,) <$> callStatusItemContent user ct chatItemId WCSDisconnected
 
     msgCurrentCall :: Contact -> CallId -> Text -> RcvMessage -> (Call -> CM (Maybe Call, Maybe ACIContent)) -> CM ()
@@ -2377,7 +2378,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 timed_ <- callTimed ct aciContent
                 updateDirectChatItemView user ct chatItemId aciContent False False timed_ $ Just msgId
                 forM_ (timed_ >>= timedDeleteAt') $
-                  startProximateTimedItemThread user (ChatRef CTDirect ctId', chatItemId)
+                  startProximateTimedItemThread user (ChatRef CTDirect ctId' Nothing, chatItemId)
 
     msgCallStateError :: Text -> Call -> CM ()
     msgCallStateError eventName Call {callState} =
@@ -2396,7 +2397,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       where
         merge c1' c2' = do
           c2'' <- withStore $ \db -> mergeContactRecords db vr user c1' c2'
-          toView $ CRContactsMerged user c1' c2' c2''
+          toView $ CEvtContactsMerged user c1' c2' c2''
           when (directOrUsed c2'') $ showSecurityCodeChanged c2''
           pure $ Just c2''
           where
@@ -2435,14 +2436,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     associateMemberWithContact c1 m2@GroupMember {groupId} = do
       withStore' $ \db -> associateMemberWithContactRecord db user c1 m2
       g <- withStore $ \db -> getGroupInfo db vr user groupId
-      toView $ CRContactAndMemberAssociated user c1 g m2 c1
+      toView $ CEvtContactAndMemberAssociated user c1 g m2 c1
       pure c1
 
     associateContactWithMember :: GroupMember -> Contact -> CM Contact
     associateContactWithMember m1@GroupMember {groupId} c2 = do
       c2' <- withStore $ \db -> associateContactWithMemberRecord db vr user m1 c2
       g <- withStore $ \db -> getGroupInfo db vr user groupId
-      toView $ CRContactAndMemberAssociated user c2 g m1 c2'
+      toView $ CEvtContactAndMemberAssociated user c2 g m1 c2'
       pure c2'
 
     saveConnInfo :: Connection -> ConnInfo -> CM (Connection, Bool)
@@ -2451,36 +2452,63 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       conn' <- updatePeerChatVRange activeConn chatVRange
       case chatMsgEvent of
         XInfo p -> do
-          let contactUsed = connDirect activeConn
-          ct <- withStore $ \db -> createDirectContact db user conn' p contactUsed
-          toView $ CRContactConnecting user ct
+          ct <- withStore $ \db -> createDirectContact db user conn' p
+          toView $ CEvtContactConnecting user ct
           pure (conn', False)
         XGrpLinkInv glInv -> do
           (gInfo, host) <- withStore $ \db -> createGroupInvitedViaLink db vr user conn' glInv
-          toView $ CRGroupLinkConnecting user gInfo host
+          toView $ CEvtGroupLinkConnecting user gInfo host
+          pure (conn', True)
+        XGrpLinkReject glRjct@GroupLinkRejection {rejectionReason} -> do
+          (gInfo, host) <- withStore $ \db -> createGroupRejectedViaLink db vr user conn' glRjct
+          toView $ CEvtGroupLinkConnecting user gInfo host
+          toViewTE $ TEGroupLinkRejected user gInfo rejectionReason
           pure (conn', True)
         -- TODO show/log error, other events in SMP confirmation
         _ -> pure (conn', False)
 
-    xGrpMemNew :: GroupInfo -> GroupMember -> MemberInfo -> RcvMessage -> UTCTime -> CM ()
-    xGrpMemNew gInfo m memInfo@(MemberInfo memId memRole _ _) msg brokerTs = do
+    xGrpMemNew :: GroupInfo -> GroupMember -> MemberInfo -> Maybe MsgScope -> RcvMessage -> UTCTime -> CM ()
+    xGrpMemNew gInfo m memInfo@(MemberInfo memId memRole _ _) msgScope_ msg brokerTs = do
       checkHostRole m memRole
       unless (sameMemberId memId $ membership gInfo) $
         withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memId) >>= \case
           Right unknownMember@GroupMember {memberStatus = GSMemUnknown} -> do
-            updatedMember <- withStore $ \db -> updateUnknownMemberAnnounced db vr user m unknownMember memInfo
-            toView $ CRUnknownMemberAnnounced user gInfo m unknownMember updatedMember
-            memberAnnouncedToView updatedMember
+            (updatedMember, gInfo') <- withStore $ \db -> do
+              updatedMember <- updateUnknownMemberAnnounced db vr user m unknownMember memInfo initialStatus
+              gInfo' <- if memberPending updatedMember
+                then liftIO $ increaseGroupMembersRequireAttention db user gInfo
+                else pure gInfo
+              pure (updatedMember, gInfo')
+            toView $ CEvtUnknownMemberAnnounced user gInfo' m unknownMember updatedMember
+            memberAnnouncedToView updatedMember gInfo'
           Right _ -> messageError "x.grp.mem.new error: member already exists"
           Left _ -> do
-            newMember <- withStore $ \db -> createNewGroupMember db user gInfo m memInfo GCPostMember GSMemAnnounced
-            memberAnnouncedToView newMember
+            (newMember, gInfo') <- withStore $ \db -> do
+              newMember <- createNewGroupMember db user gInfo m memInfo GCPostMember initialStatus
+              gInfo' <- if memberPending newMember
+                then liftIO $ increaseGroupMembersRequireAttention db user gInfo
+                else pure gInfo
+              pure (newMember, gInfo')
+            memberAnnouncedToView newMember gInfo'
       where
-        memberAnnouncedToView announcedMember@GroupMember {groupMemberId, memberProfile} = do
+        initialStatus = case msgScope_ of
+          Just (MSMember _) -> GSMemPendingReview
+          _ -> GSMemAnnounced
+        memberAnnouncedToView announcedMember@GroupMember {groupMemberId, memberProfile} gInfo' = do
+          (announcedMember', scopeInfo) <- getMemNewChatScope announcedMember
           let event = RGEMemberAdded groupMemberId (fromLocalProfile memberProfile)
-          ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent event)
-          groupMsgToView gInfo ci
-          toView $ CRJoinedGroupMemberConnecting user gInfo m announcedMember
+          (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m) msg brokerTs (CIRcvGroupEvent event)
+          groupMsgToView cInfo ci
+          case scopeInfo of
+            Just (GCSIMemberSupport _) -> do
+              createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m) (CIRcvGroupEvent RGENewMemberPendingReview) (Just brokerTs)
+            _ -> pure ()
+          toView $ CEvtJoinedGroupMemberConnecting user gInfo' m announcedMember'
+        getMemNewChatScope announcedMember = case msgScope_ of
+          Nothing -> pure (announcedMember, Nothing)
+          Just (MSMember _) -> do
+            (announcedMember', scopeInfo) <- mkMemberSupportChatInfo announcedMember
+            pure (announcedMember', Just scopeInfo)
 
     xGrpMemIntro :: GroupInfo -> GroupMember -> MemberInfo -> Maybe MemberRestrictions -> CM ()
     xGrpMemIntro gInfo@GroupInfo {chatSettings} m@GroupMember {memberRole, localDisplayName = c} memInfo@(MemberInfo memId _ memChatVRange _) memRestrictions = do
@@ -2490,17 +2518,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             Right _ -> messageError "x.grp.mem.intro ignored: member already exists"
             Left _ -> do
               when (memberRole < GRAdmin) $ throwChatError (CEGroupContactRole c)
-              subMode <- chatReadVar subscriptionMode
-              -- [async agent commands] commands should be asynchronous, continuation is to send XGrpMemInv - have to remember one has completed and process on second
-              groupConnIds <- createConn subMode
-              directConnIds <- case memChatVRange of
-                Nothing -> Just <$> createConn subMode
+              case memChatVRange of
+                Nothing -> messageError "x.grp.mem.intro: member chat version range incompatible"
                 Just (ChatVersionRange mcvr)
-                  | maxVersion mcvr >= groupDirectInvVersion -> pure Nothing
-                  | otherwise -> Just <$> createConn subMode
-              let customUserProfileId = localProfileId <$> incognitoMembershipProfile gInfo
-                  chatV = maybe (minVersion vr) (\peerVR -> vr `peerConnChatVersion` fromChatVRange peerVR) memChatVRange
-              void $ withStore $ \db -> createIntroReMember db user gInfo m chatV memInfo memRestrictions groupConnIds directConnIds customUserProfileId subMode
+                  | maxVersion mcvr >= groupDirectInvVersion -> do
+                      subMode <- chatReadVar subscriptionMode
+                      -- [async agent commands] commands should be asynchronous, continuation is to send XGrpMemInv - have to remember one has completed and process on second
+                      groupConnIds <- createConn subMode
+                      let chatV = maybe (minVersion vr) (\peerVR -> vr `peerConnChatVersion` fromChatVRange peerVR) memChatVRange
+                      void $ withStore $ \db -> createIntroReMember db user gInfo m chatV memInfo memRestrictions groupConnIds subMode
+                  | otherwise -> messageError "x.grp.mem.intro: member chat version range incompatible"
         _ -> messageError "x.grp.mem.intro can be only sent by host member"
       where
         createConn subMode = createAgentConnectionAsync user CFCreateConnGrpMemInv (chatHasNtfs chatSettings) SCMInvitation subMode
@@ -2520,7 +2547,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             Left _ -> messageError "x.grp.mem.inv error: referenced member does not exist"
             Right reMember -> do
               GroupMemberIntro {introId} <- withStore $ \db -> saveIntroInvitation db reMember m introInv
-              sendGroupMemberMessage user gInfo reMember (XGrpMemFwd (memberInfo m) introInv) (Just introId) $
+              sendGroupMemberMessage gInfo reMember (XGrpMemFwd (memberInfo m) introInv) (Just introId) $
                 withStore' $
                   \db -> updateIntroStatus db introId GMIntroInvForwarded
         _ -> messageError "x.grp.mem.inv can be only sent by invitee member"
@@ -2537,7 +2564,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           -- For now, this branch compensates for the lack of delayed message delivery.
           Left _ -> withStore $ \db -> createNewGroupMember db user gInfo m memInfo GCPostMember GSMemAnnounced
           Right m' -> pure m'
-      withStore' $ \db -> saveMemberInvitation db toMember introInv
+      -- TODO [knocking] separate pending statuses from GroupMemberStatus?
+      -- TODO            add GSMemIntroInvitedPending, GSMemConnectedPending, etc.?
+      -- TODO            keep as is? (GSMemIntroInvited has no purpose)
+      let newMemberStatus = if memberPending toMember then memberStatus toMember else GSMemIntroInvited
+      withStore' $ \db -> saveMemberInvitation db toMember introInv newMemberStatus
       subMode <- chatReadVar subscriptionMode
       -- [incognito] send membership incognito profile, create direct connection as incognito
       let membershipProfile = redactedMemberProfile $ fromLocalProfile $ memberProfile membership
@@ -2565,9 +2596,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | senderRole < GRAdmin || senderRole < fromRole = messageError "x.grp.mem.role with insufficient member permissions"
           | otherwise = do
               withStore' $ \db -> updateGroupMemberRole db user member memRole
-              ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
-              groupMsgToView gInfo ci
-              toView CRMemberRole {user, groupInfo = gInfo', byMember = m, member = member {memberRole = memRole}, fromRole, toRole = memRole}
+              (gInfo'', m', scopeInfo) <- mkGroupChatScope gInfo' m
+              (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo'' scopeInfo m') msg brokerTs (CIRcvGroupEvent gEvent)
+              groupMsgToView cInfo ci
+              toView CEvtMemberRole {user, groupInfo = gInfo'', byMember = m', member = member {memberRole = memRole}, fromRole, toRole = memRole}
 
     checkHostRole :: GroupMember -> GroupMemberRole -> CM ()
     checkHostRole GroupMember {memberRole, localDisplayName} memRole =
@@ -2575,7 +2607,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
 
     xGrpMemRestrict :: GroupInfo -> GroupMember -> MemberId -> MemberRestrictions -> RcvMessage -> UTCTime -> CM ()
     xGrpMemRestrict
-      gInfo@GroupInfo {groupId, membership = GroupMember {memberId = membershipMemId}}
+      gInfo@GroupInfo {membership = GroupMember {memberId = membershipMemId}}
       m@GroupMember {memberRole = senderRole}
       memId
       MemberRestrictions {restriction}
@@ -2586,25 +2618,24 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             messageError "x.grp.mem.restrict: admin blocks you"
         | otherwise =
             withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memId) >>= \case
-              Right bm@GroupMember {groupMemberId = bmId, memberRole, memberProfile = bmp}
+              Right bm@GroupMember {groupMemberId = bmId, memberRole, blockedByAdmin, memberProfile = bmp}
+                | blockedByAdmin == mrsBlocked restriction -> pure ()
                 | senderRole < GRModerator || senderRole < memberRole -> messageError "x.grp.mem.restrict with insufficient member permissions"
                 | otherwise -> do
-                    bm' <- setMemberBlocked bmId
-                    toggleNtf user bm' (not blocked)
+                    bm' <- setMemberBlocked bm
+                    toggleNtf bm' (not blocked)
                     let ciContent = CIRcvGroupEvent $ RGEMemberBlocked bmId (fromLocalProfile bmp) blocked
-                    ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs ciContent
-                    groupMsgToView gInfo ci
-                    toView CRMemberBlockedForAll {user, groupInfo = gInfo, byMember = m, member = bm, blocked}
+                    (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
+                    (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m') msg brokerTs ciContent
+                    groupMsgToView cInfo ci
+                    toView CEvtMemberBlockedForAll {user, groupInfo = gInfo', byMember = m', member = bm, blocked}
               Left (SEGroupMemberNotFoundByMemberId _) -> do
                 bm <- createUnknownMember gInfo memId
-                bm' <- setMemberBlocked $ groupMemberId' bm
-                toView $ CRUnknownMemberBlocked user gInfo m bm'
+                bm' <- setMemberBlocked bm
+                toView $ CEvtUnknownMemberBlocked user gInfo m bm'
               Left e -> throwError $ ChatErrorStore e
         where
-          setMemberBlocked bmId =
-            withStore $ \db -> do
-              liftIO $ updateGroupMemberBlocked db user groupId bmId restriction
-              getGroupMember db vr user groupId bmId
+          setMemberBlocked bm = withStore' $ \db -> updateGroupMemberBlocked db user gInfo restriction bm
           blocked = mrsBlocked restriction
 
     xGrpMemCon :: GroupInfo -> GroupMember -> MemberId -> CM ()
@@ -2648,8 +2679,8 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           _ -> updateStatus introId GMIntroReConnected
         updateStatus introId status = withStore' $ \db -> updateIntroStatus db introId status
 
-    xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> RcvMessage -> UTCTime -> CM ()
-    xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId msg brokerTs = do
+    xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> Bool -> RcvMessage -> UTCTime -> CM ()
+    xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId withMessages msg brokerTs = do
       let GroupMember {memberId = membershipMemId} = membership
       if membershipMemId == memId
         then checkRole membership $ do
@@ -2658,36 +2689,48 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           members <- withStore' $ \db -> getGroupMembers db vr user gInfo
           deleteMembersConnections user members
           withStore' $ \db -> updateGroupMemberStatus db userId membership GSMemRemoved
+          when withMessages $ deleteMessages membership SMDSnd
           deleteMemberItem RGEUserDeleted
-          toView $ CRDeletedMemberUser user gInfo {membership = membership {memberStatus = GSMemRemoved}} m
+          toView $ CEvtDeletedMemberUser user gInfo {membership = membership {memberStatus = GSMemRemoved}} m withMessages
         else
           withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memId) >>= \case
             Left _ -> messageError "x.grp.mem.del with unknown member ID"
             Right member@GroupMember {groupMemberId, memberProfile} ->
               checkRole member $ do
                 -- ? prohibit deleting member if it's the sender - sender should use x.grp.leave
-                deleteMemberConnection user member
+                deleteMemberConnection member
                 -- undeleted "member connected" chat item will prevent deletion of member record
-                deleteOrUpdateMemberRecord user member
+                gInfo' <- deleteOrUpdateMemberRecord user gInfo member
+                when withMessages $ deleteMessages member SMDRcv
                 deleteMemberItem $ RGEMemberDeleted groupMemberId (fromLocalProfile memberProfile)
-                toView $ CRDeletedMember user gInfo m member {memberStatus = GSMemRemoved}
+                toView $ CEvtDeletedMember user gInfo' m member {memberStatus = GSMemRemoved} withMessages
       where
         checkRole GroupMember {memberRole} a
           | senderRole < GRAdmin || senderRole < memberRole =
               messageError "x.grp.mem.del with insufficient member permissions"
           | otherwise = a
         deleteMemberItem gEvent = do
-          ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
-          groupMsgToView gInfo ci
+          (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
+          (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m') msg brokerTs (CIRcvGroupEvent gEvent)
+          groupMsgToView cInfo ci
+        deleteMessages :: MsgDirectionI d => GroupMember -> SMsgDirection d -> CM ()
+        deleteMessages delMem msgDir
+          | groupFeatureMemberAllowed SGFFullDelete m gInfo = deleteGroupMemberCIs user gInfo delMem m msgDir
+          | otherwise = markGroupMemberCIsDeleted user gInfo delMem m
 
     xGrpLeave :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> CM ()
     xGrpLeave gInfo m msg brokerTs = do
-      deleteMemberConnection user m
+      deleteMemberConnection m
       -- member record is not deleted to allow creation of "member left" chat item
-      withStore' $ \db -> updateGroupMemberStatus db userId m GSMemLeft
-      ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent RGEMemberLeft)
-      groupMsgToView gInfo ci
-      toView $ CRLeftMember user gInfo m {memberStatus = GSMemLeft}
+      gInfo' <- withStore' $ \db -> do
+        updateGroupMemberStatus db userId m GSMemLeft
+        if gmRequiresAttention m
+          then decreaseGroupMembersRequireAttention db user gInfo
+          else pure gInfo
+      (gInfo'', m', scopeInfo) <- mkGroupChatScope gInfo' m
+      (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo'' scopeInfo m') msg brokerTs (CIRcvGroupEvent RGEMemberLeft)
+      groupMsgToView cInfo ci
+      toView $ CEvtLeftMember user gInfo'' m' {memberStatus = GSMemLeft}
 
     xGrpDel :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> CM ()
     xGrpDel gInfo@GroupInfo {membership} m@GroupMember {memberRole} msg brokerTs = do
@@ -2698,9 +2741,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         pure members
       -- member records are not deleted to keep history
       deleteMembersConnections user ms
-      ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent RGEGroupDeleted)
-      groupMsgToView gInfo ci
-      toView $ CRGroupDeleted user gInfo {membership = membership {memberStatus = GSMemGroupDeleted}} m
+      (gInfo'', m', scopeInfo) <- mkGroupChatScope gInfo m
+      (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo'' scopeInfo m') msg brokerTs (CIRcvGroupEvent RGEGroupDeleted)
+      groupMsgToView cInfo ci
+      toView $ CEvtGroupDeleted user gInfo'' {membership = membership {memberStatus = GSMemGroupDeleted}} m'
 
     xGrpInfo :: GroupInfo -> GroupMember -> GroupProfile -> RcvMessage -> UTCTime -> CM ()
     xGrpInfo g@GroupInfo {groupProfile = p, businessChat} m@GroupMember {memberRole} p' msg brokerTs
@@ -2708,12 +2752,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       | otherwise = case businessChat of
           Nothing -> unless (p == p') $ do
             g' <- withStore $ \db -> updateGroupProfile db user g p'
-            toView $ CRGroupUpdated user g g' (Just m)
-            let cd = CDGroupRcv g' m
+            (g'', m', scopeInfo) <- mkGroupChatScope g' m
+            toView $ CEvtGroupUpdated user g g'' (Just m')
+            let cd = CDGroupRcv g'' scopeInfo m'
             unless (sameGroupProfileInfo p p') $ do
-              ci <- saveRcvChatItem user cd msg brokerTs (CIRcvGroupEvent $ RGEGroupUpdated p')
-              groupMsgToView g' ci
-            createGroupFeatureChangedItems user cd CIRcvGroupFeature g g'
+              (ci, cInfo) <- saveRcvChatItemNoParse user cd msg brokerTs (CIRcvGroupEvent $ RGEGroupUpdated p')
+              groupMsgToView cInfo ci
+            createGroupFeatureChangedItems user cd CIRcvGroupFeature g g''
           Just _ -> updateGroupPrefs_ g m $ fromMaybe defaultBusinessGroupPrefs $ groupPreferences p'
 
     xGrpPrefs :: GroupInfo -> GroupMember -> GroupPreferences -> CM ()
@@ -2725,9 +2770,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     updateGroupPrefs_ g@GroupInfo {groupProfile = p} m ps' =
       unless (groupPreferences p == Just ps') $ do
         g' <- withStore' $ \db -> updateGroupPreferences db user g ps'
-        toView $ CRGroupUpdated user g g' (Just m)
-        let cd = CDGroupRcv g' m
-        createGroupFeatureChangedItems user cd CIRcvGroupFeature g g'
+        toView $ CEvtGroupUpdated user g g' (Just m)
+        (g'', m', scopeInfo) <- mkGroupChatScope g' m
+        let cd = CDGroupRcv g'' scopeInfo m'
+        createGroupFeatureChangedItems user cd CIRcvGroupFeature g g''
 
     xGrpDirectInv :: GroupInfo -> GroupMember -> Connection -> ConnReqInvitation -> Maybe MsgContent -> RcvMessage -> UTCTime -> CM ()
     xGrpDirectInv g m mConn connReq mContent_ msg brokerTs = do
@@ -2767,15 +2813,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           dm <- encodeConnInfo $ XInfo p
           joinAgentConnectionAsync user True connReq dm subMode
         createItems mCt' m' = do
-          createInternalChatItem user (CDGroupRcv g m') (CIRcvGroupEvent RGEMemberCreatedContact) Nothing
-          toView $ CRNewMemberContactReceivedInv user mCt' g m'
+          (g', m'', scopeInfo) <- mkGroupChatScope g m'
+          createInternalChatItem user (CDGroupRcv g' scopeInfo m'') (CIRcvGroupEvent RGEMemberCreatedContact) Nothing
+          toView $ CEvtNewMemberContactReceivedInv user mCt' g' m''
           forM_ mContent_ $ \mc -> do
-            ci <- saveRcvChatItem user (CDDirectRcv mCt') msg brokerTs (CIRcvMsgContent mc)
-            toView $ CRNewChatItems user [AChatItem SCTDirect SMDRcv (DirectChat mCt') ci]
+            (ci, cInfo) <- saveRcvChatItem user (CDDirectRcv mCt') msg brokerTs (CIRcvMsgContent mc, msgContentTexts mc)
+            toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
 
     securityCodeChanged :: Contact -> CM ()
     securityCodeChanged ct = do
-      toView $ CRContactVerificationReset user ct
+      toViewTE $ TEContactVerificationReset user ct
       createInternalChatItem user (CDDirectRcv ct) (CIRcvConnEvent RCEVerificationCodeReset) Nothing
 
     xGrpMsgForward :: GroupInfo -> GroupMember -> MemberId -> ChatMessage 'Json -> UTCTime -> CM ()
@@ -2785,7 +2832,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         Right author -> processForwardedMsg author msg
         Left (SEGroupMemberNotFoundByMemberId _) -> do
           unknownAuthor <- createUnknownMember gInfo memberId
-          toView $ CRUnknownMemberCreated user gInfo m unknownAuthor
+          toView $ CEvtUnknownMemberCreated user gInfo m unknownAuthor
           processForwardedMsg unknownAuthor msg
         Left e -> throwError $ ChatErrorStore e
       where
@@ -2795,16 +2842,18 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           let body = LB.toStrict $ J.encode msg
           rcvMsg@RcvMessage {chatMsgEvent = ACME _ event} <- saveGroupFwdRcvMsg user groupId m author body chatMsg
           case event of
-            XMsgNew mc -> memberCanSend author $ newGroupContentMessage gInfo author mc rcvMsg msgTs True
-            XMsgFileDescr sharedMsgId fileDescr -> memberCanSend author $ groupMessageFileDescription gInfo author sharedMsgId fileDescr
-            XMsgUpdate sharedMsgId mContent ttl live -> memberCanSend author $ groupMessageUpdate gInfo author sharedMsgId mContent rcvMsg msgTs ttl live
+            XMsgNew mc -> memberCanSend author scope $ newGroupContentMessage gInfo author mc rcvMsg msgTs True
+              where ExtMsgContent {scope} = mcExtMsgContent mc
+            -- file description is always allowed, to allow sending files to support scope
+            XMsgFileDescr sharedMsgId fileDescr -> groupMessageFileDescription gInfo author sharedMsgId fileDescr
+            XMsgUpdate sharedMsgId mContent mentions ttl live msgScope -> memberCanSend author msgScope $ groupMessageUpdate gInfo author sharedMsgId mContent mentions msgScope rcvMsg msgTs ttl live
             XMsgDel sharedMsgId memId -> groupMessageDelete gInfo author sharedMsgId memId rcvMsg msgTs
             XMsgReact sharedMsgId (Just memId) reaction add -> groupMsgReaction gInfo author sharedMsgId memId reaction add rcvMsg msgTs
             XFileCancel sharedMsgId -> xFileCancelGroup gInfo author sharedMsgId
             XInfo p -> xInfoMember gInfo author p msgTs
-            XGrpMemNew memInfo -> xGrpMemNew gInfo author memInfo rcvMsg msgTs
+            XGrpMemNew memInfo msgScope -> xGrpMemNew gInfo author memInfo msgScope rcvMsg msgTs
             XGrpMemRole memId memRole -> xGrpMemRole gInfo author memId memRole rcvMsg msgTs
-            XGrpMemDel memId -> xGrpMemDel gInfo author memId rcvMsg msgTs
+            XGrpMemDel memId withMessages -> xGrpMemDel gInfo author memId withMessages rcvMsg msgTs
             XGrpLeave -> xGrpLeave gInfo author rcvMsg msgTs
             XGrpDel -> xGrpDel gInfo author rcvMsg msgTs
             XGrpInfo p' -> xGrpInfo gInfo author p' rcvMsg msgTs
@@ -2813,7 +2862,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
 
     createUnknownMember :: GroupInfo -> MemberId -> CM GroupMember
     createUnknownMember gInfo memberId = do
-      let name = T.take 7 . safeDecodeUtf8 . B64.encode . unMemberId $ memberId
+      let name = nameFromMemberId memberId
       withStore $ \db -> createNewUnknownGroupMember db vr user gInfo memberId name
 
     directMsgReceived :: Contact -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> CM ()
@@ -2825,17 +2874,18 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
 
     groupMsgReceived :: GroupInfo -> GroupMember -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> CM ()
     groupMsgReceived gInfo m conn@Connection {connId} msgMeta msgRcpts = do
-      checkIntegrityCreateItem (CDGroupRcv gInfo m) msgMeta `catchChatError` \_ -> pure ()
+      (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
+      checkIntegrityCreateItem (CDGroupRcv gInfo' scopeInfo m') msgMeta `catchChatError` \_ -> pure ()
       forM_ msgRcpts $ \MsgReceipt {agentMsgId, msgRcptStatus} -> do
         withStore' $ \db -> updateSndMsgDeliveryStatus db connId agentMsgId $ MDSSndRcvd msgRcptStatus
-        updateGroupItemsStatus gInfo m conn agentMsgId (GSSRcvd msgRcptStatus) Nothing
+        updateGroupItemsStatus gInfo' m' conn agentMsgId (GSSRcvd msgRcptStatus) Nothing
 
     -- Searches chat items for many agent message IDs and updates their status
     updateDirectItemsStatusMsgs :: Contact -> Connection -> [AgentMsgId] -> CIStatus 'MDSnd -> CM ()
     updateDirectItemsStatusMsgs ct conn msgIds newStatus = do
       cis <- withStore' $ \db -> forM msgIds $ \msgId -> runExceptT $ updateDirectItemsStatus' db ct conn msgId newStatus
       let acis = map ctItem $ concat $ rights cis
-      unless (null acis) $ toView $ CRChatItemsStatusesUpdated user acis
+      unless (null acis) $ toView $ CEvtChatItemsStatusesUpdated user acis
       where
         ctItem = AChatItem SCTDirect SMDSnd (DirectChat ct)
 
@@ -2843,7 +2893,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     updateDirectItemStatus ct conn msgId newStatus = do
       cis <- withStore $ \db -> updateDirectItemsStatus' db ct conn msgId newStatus
       let acis = map ctItem cis
-      unless (null acis) $ toView $ CRChatItemsStatusesUpdated user acis
+      unless (null acis) $ toView $ CEvtChatItemsStatusesUpdated user acis
       where
         ctItem = AChatItem SCTDirect SMDSnd (DirectChat ct)
 
@@ -2873,10 +2923,15 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     updateGroupItemsStatus gInfo@GroupInfo {groupId} GroupMember {groupMemberId} Connection {connId} msgId newMemStatus viaProxy_ = do
       items <- withStore' (\db -> getGroupChatItemsByAgentMsgId db user groupId connId msgId)
       cis <- catMaybes <$> withStore (\db -> mapM (updateItem db) items)
-      let acis = map gItem cis
-      unless (null acis) $ toView $ CRChatItemsStatusesUpdated user acis
+      -- SENT and RCVD events are received for messages that may be batched in single scope,
+      -- so we can look up scope of first item
+      scopeInfo <- case cis of
+        (ci : _) -> withStore $ \db -> getGroupChatScopeInfoForItem db vr user gInfo (chatItemId' ci)
+        _ -> pure Nothing
+      let acis = map (gItem scopeInfo) cis
+      unless (null acis) $ toView $ CEvtChatItemsStatusesUpdated user acis
       where
-        gItem = AChatItem SCTGroup SMDSnd (GroupChat gInfo)
+        gItem scopeInfo ci = AChatItem SCTGroup SMDSnd (GroupChat gInfo scopeInfo) ci
         updateItem :: DB.Connection -> CChatItem 'CTGroup -> ExceptT StoreError IO (Maybe (ChatItem 'CTGroup 'MDSnd))
         updateItem db = \case
           (CChatItem SMDSnd ChatItem {meta = CIMeta {itemStatus = CISSndRcvd _ SSPComplete}}) -> pure Nothing
diff --git a/src/Simplex/Chat/Markdown.hs b/src/Simplex/Chat/Markdown.hs
index 8e82bfe727..9811556fe0 100644
--- a/src/Simplex/Chat/Markdown.hs
+++ b/src/Simplex/Chat/Markdown.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TupleSections #-}
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 {-# HLINT ignore "Use newtype instead of data" #-}
@@ -16,24 +17,23 @@ import qualified Data.Aeson as J
 import qualified Data.Aeson.TH as JQ
 import Data.Attoparsec.Text (Parser)
 import qualified Data.Attoparsec.Text as A
-import Data.Char (isDigit, isPunctuation)
+import Data.Char (isAlpha, isAscii, isDigit, isPunctuation, isSpace)
 import Data.Either (fromRight)
 import Data.Functor (($>))
 import Data.List (foldl', intercalate)
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as L
-import Data.Maybe (fromMaybe, isNothing)
+import Data.Maybe (fromMaybe, isNothing, mapMaybe)
 import Data.Semigroup (sconcat)
 import Data.String
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import Simplex.Chat.Types
-import Simplex.Messaging.Agent.Protocol (AConnectionRequestUri (..), ConnReqUriData (..), ConnectionRequestUri (..), SMPQueue (..))
+import Simplex.Messaging.Agent.Protocol (AConnectionLink (..), ConnReqUriData (..), ConnShortLink (..), ConnectionLink (..), ConnectionRequestUri (..), ContactConnType (..), SMPQueue (..), simplexConnReqUri, simplexShortLink)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fstToLower, sumTypeJSON)
 import Simplex.Messaging.Protocol (ProtocolServer (..))
-import Simplex.Messaging.ServiceScheme (ServiceScheme (..))
 import Simplex.Messaging.Util (decodeJSON, safeDecodeUtf8)
 import System.Console.ANSI.Types
 import qualified Text.Email.Validate as Email
@@ -49,19 +49,29 @@ data Format
   | Secret
   | Colored {color :: FormatColor}
   | Uri
-  | SimplexLink {linkType :: SimplexLinkType, simplexUri :: Text, smpHosts :: NonEmpty Text}
+  | SimplexLink {linkType :: SimplexLinkType, simplexUri :: AConnectionLink, smpHosts :: NonEmpty Text}
+  | Mention {memberName :: Text}
   | Email
   | Phone
   deriving (Eq, Show)
 
-data SimplexLinkType = XLContact | XLInvitation | XLGroup
+mentionedNames :: MarkdownList -> [Text]
+mentionedNames = mapMaybe (\(FormattedText f _) -> mentionedName =<< f)
+  where
+    mentionedName = \case
+      Mention name -> Just name
+      _ -> Nothing
+
+data SimplexLinkType = XLContact | XLInvitation | XLGroup | XLChannel
   deriving (Eq, Show)
 
 colored :: Color -> Format
 colored = Colored . FormatColor
+{-# INLINE colored #-}
 
 markdown :: Format -> Text -> Markdown
 markdown = Markdown . Just
+{-# INLINE markdown #-}
 
 instance Semigroup Markdown where
   m <> (Markdown _ "") = m
@@ -163,6 +173,7 @@ markdownP = mconcat <$> A.many' fragmentP
           '`' -> formattedP '`' Snippet
           '#' -> A.char '#' *> secretP
           '!' -> coloredP <|> wordP
+          '@' -> mentionP <|> wordP
           _
             | isDigit c -> phoneP <|> wordP
             | otherwise -> wordP
@@ -192,14 +203,20 @@ markdownP = mconcat <$> A.many' fragmentP
       if T.null s || T.last s == ' '
         then fail "not colored"
         else pure $ markdown (colored clr) s
+    mentionP = do
+      c <- A.char '@' *> A.peekChar'
+      (name, punct) <- displayNameTextP_
+      let sName = if c == '\'' then '\'' `T.cons` name `T.snoc` '\'' else name
+          mention = markdown (Mention name) ('@' `T.cons` sName)
+      pure $ if T.null punct then mention else mention :|: unmarked punct
     colorP =
       A.anyChar >>= \case
-        'r' -> "ed" $> Red <|> pure Red
-        'g' -> "reen" $> Green <|> pure Green
-        'b' -> "lue" $> Blue <|> pure Blue
-        'y' -> "ellow" $> Yellow <|> pure Yellow
-        'c' -> "yan" $> Cyan <|> pure Cyan
-        'm' -> "agenta" $> Magenta <|> pure Magenta
+        'r' -> optional "ed" $> Red
+        'g' -> optional "reen" $> Green
+        'b' -> optional "lue" $> Blue
+        'y' -> optional "ellow" $> Yellow
+        'c' -> optional "yan" $> Cyan
+        'm' -> optional "agenta" $> Magenta
         '1' -> pure Red
         '2' -> pure Green
         '3' -> pure Blue
@@ -221,35 +238,105 @@ markdownP = mconcat <$> A.many' fragmentP
     wordMD :: Text -> Markdown
     wordMD s
       | T.null s = unmarked s
-      | isUri s =
-          let t = T.takeWhileEnd isPunctuation' s
-              uri = uriMarkdown $ T.dropWhileEnd isPunctuation' s
-           in if T.null t then uri else uri :|: unmarked t
-      | isEmail s = markdown Email s
+      | isUri s' = res $ uriMarkdown s'
+      | isDomain s' = res $ markdown Uri s'
+      | isEmail s' = res $ markdown Email s'
       | otherwise = unmarked s
+      where
+        punct = T.takeWhileEnd isPunctuation' s
+        s' = T.dropWhileEnd isPunctuation' s
+        res md' = if T.null punct then md' else md' :|: unmarked punct
     isPunctuation' = \case
       '/' -> False
       ')' -> False
       c -> isPunctuation c
     uriMarkdown s = case strDecode $ encodeUtf8 s of
-      Right cReq -> markdown (simplexUriFormat cReq) s
+      Right cLink -> markdown (simplexUriFormat cLink) s
       _ -> markdown Uri s
     isUri s = T.length s >= 10 && any (`T.isPrefixOf` s) ["http://", "https://", "simplex:/"]
+    -- matches what is likely to be a domain, not all valid domain names
+    isDomain s = case T.splitOn "." s of
+      [name, tld] -> isDomain_ name tld
+      [sub, name, tld] -> T.length sub >= 3 && T.length sub <= 8 && isDomain_ name tld
+      _ -> False
+      where
+        isDomain_ name tld =
+          (let n = T.length name in n >= 1 && n <= 24)
+            && (let n = T.length tld in n >= 2 && n <= 8)
+            && (let p c = isAscii c && isAlpha c in T.all p name && T.all p tld)
     isEmail s = T.any (== '@') s && Email.isValid (encodeUtf8 s)
     noFormat = pure . unmarked
-    simplexUriFormat :: AConnectionRequestUri -> Format
+    simplexUriFormat :: AConnectionLink -> Format
     simplexUriFormat = \case
-      ACR _ (CRContactUri crData) ->
-        let uri = safeDecodeUtf8 . strEncode $ CRContactUri crData {crScheme = SSSimplex}
-         in SimplexLink (linkType' crData) uri $ uriHosts crData
-      ACR _ (CRInvitationUri crData e2e) ->
-        let uri = safeDecodeUtf8 . strEncode $ CRInvitationUri crData {crScheme = SSSimplex} e2e
-         in SimplexLink XLInvitation uri $ uriHosts crData
-      where
-        uriHosts ConnReqUriData {crSmpQueues} = L.map (safeDecodeUtf8 . strEncode) $ sconcat $ L.map (host . qServer) crSmpQueues
-        linkType' ConnReqUriData {crClientData} = case crClientData >>= decodeJSON of
-          Just (CRDataGroup _) -> XLGroup
-          Nothing -> XLContact
+      ACL m (CLFull cReq) -> case cReq of
+        CRContactUri crData -> SimplexLink (linkType' crData) cLink $ uriHosts crData
+        CRInvitationUri crData _ -> SimplexLink XLInvitation cLink $ uriHosts crData
+        where
+          cLink = ACL m $ CLFull $ simplexConnReqUri cReq
+          uriHosts ConnReqUriData {crSmpQueues} = L.map strEncodeText $ sconcat $ L.map (host . qServer) crSmpQueues
+          linkType' ConnReqUriData {crClientData} = case crClientData >>= decodeJSON of
+            Just (CRDataGroup _) -> XLGroup
+            Nothing -> XLContact
+      ACL m (CLShort sLnk) -> case sLnk of
+        CSLContact _ ct srv _ -> SimplexLink (linkType' ct) cLink $ uriHosts srv
+        CSLInvitation _ srv _ _ -> SimplexLink XLInvitation cLink $ uriHosts srv
+        where
+          cLink = ACL m $ CLShort $ simplexShortLink sLnk
+          uriHosts srv = L.map strEncodeText $ host srv
+          linkType' = \case
+            CCTGroup -> XLGroup
+            CCTChannel -> XLChannel
+            CCTContact -> XLContact
+    strEncodeText :: StrEncoding a => a -> Text
+    strEncodeText = safeDecodeUtf8 . strEncode
+
+markdownText :: FormattedText -> Text
+markdownText (FormattedText f_ t) = case f_ of
+  Nothing -> t
+  Just f -> case f of
+    Bold -> around '*'
+    Italic -> around '_'
+    StrikeThrough -> around '~'
+    Snippet -> around '`'
+    Secret -> around '#'
+    Colored (FormatColor c) -> color c
+    Uri -> t
+    SimplexLink {} -> t
+    Mention _ -> t
+    Email -> t
+    Phone -> t
+    where
+      around c = c `T.cons` t `T.snoc` c
+      color c = case colorStr c of
+        Just cStr -> cStr <> t `T.snoc` '!'
+        Nothing -> t
+      colorStr = \case
+        Red -> Just "!1 " 
+        Green -> Just "!2 "
+        Blue -> Just "!3 "
+        Yellow -> Just "!4 "
+        Cyan -> Just "!5 "
+        Magenta -> Just "!6 "
+        Black -> Nothing
+        White -> Nothing
+
+displayNameTextP :: Parser Text
+displayNameTextP = displayNameTextP_ >>= \(t, sfx) -> if T.null sfx then pure t else fail "Name ends with punctuation"
+{-# INLINE displayNameTextP #-}
+
+displayNameTextP_ :: Parser (Text, Text)
+displayNameTextP_ = (,"") <$> quoted '\'' <|> splitPunctuation <$> takeNameTill isSpace
+  where
+    takeNameTill p =
+      A.peekChar' >>= \c ->
+        if refChar c then A.takeTill p else fail "invalid first character in display name"
+    splitPunctuation s = (T.dropWhileEnd isPunctuation s, T.takeWhileEnd isPunctuation s)
+    quoted c = A.char c *> takeNameTill (== c) <* A.char c
+    refChar c = c > ' ' && c /= '#' && c /= '@' && c /= '\''
+
+-- quotes names that contain spaces or end on punctuation
+viewName :: Text -> Text
+viewName s = if T.any isSpace s || maybe False (isPunctuation . snd) (T.unsnoc s) then "'" <> s <> "'" else s
 
 $(JQ.deriveJSON (enumJSON $ dropPrefix "XL") ''SimplexLinkType)
 
diff --git a/src/Simplex/Chat/Messages.hs b/src/Simplex/Chat/Messages.hs
index 55542b1d2f..dfd37527d1 100644
--- a/src/Simplex/Chat/Messages.hs
+++ b/src/Simplex/Chat/Messages.hs
@@ -31,6 +31,7 @@ import Data.Char (isSpace)
 import Data.Int (Int64)
 import Data.Kind (Constraint)
 import Data.List.NonEmpty (NonEmpty)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe, isJust, isNothing)
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -46,21 +47,52 @@ import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Protocol
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
+import Simplex.Chat.Types.Shared
 import Simplex.Chat.Types.Util (textParseJSON)
 import Simplex.Messaging.Agent.Protocol (AgentMsgId, MsgMeta (..), MsgReceiptStatus (..))
+import Simplex.Messaging.Agent.Store.DB (fromTextField_)
 import Simplex.Messaging.Crypto.File (CryptoFile (..))
 import qualified Simplex.Messaging.Crypto.File as CF
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fromTextField_, parseAll, sumTypeJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, parseAll, sumTypeJSON)
 import Simplex.Messaging.Protocol (BlockingInfo, MsgBody)
 import Simplex.Messaging.Util (eitherToMaybe, safeDecodeUtf8, (<$?>))
 
 data ChatType = CTDirect | CTGroup | CTLocal | CTContactRequest | CTContactConnection
   deriving (Eq, Show, Ord)
 
+data GroupChatScope
+  = GCSMemberSupport {groupMemberId_ :: Maybe GroupMemberId} -- Nothing means own conversation with support
+  deriving (Eq, Show, Ord)
+
+data GroupChatScopeTag
+  = GCSTMemberSupport_
+  deriving (Eq, Show)
+
+instance FromField GroupChatScopeTag where fromField = fromTextField_ textDecode
+
+instance ToField GroupChatScopeTag where toField = toField . textEncode
+
+instance TextEncoding GroupChatScopeTag where
+  textDecode = \case
+    "member_support" -> Just GCSTMemberSupport_
+    _ -> Nothing
+  textEncode = \case
+    GCSTMemberSupport_ -> "member_support"
+
 data ChatName = ChatName {chatType :: ChatType, chatName :: Text}
   deriving (Show)
 
+data SendName
+  = SNDirect ContactName
+  | SNGroup GroupName (Maybe GroupScopeName)
+  | SNLocal
+  deriving (Show)
+
+data GroupScopeName
+  = GSNMemberSupport (Maybe ContactName)
+  deriving (Show)
+
 chatTypeStr :: ChatType -> Text
 chatTypeStr = \case
   CTDirect -> "@"
@@ -72,44 +104,52 @@ chatTypeStr = \case
 chatNameStr :: ChatName -> String
 chatNameStr (ChatName cType name) = T.unpack $ chatTypeStr cType <> if T.any isSpace name then "'" <> name <> "'" else name
 
-data ChatRef = ChatRef ChatType Int64
+data ChatRef = ChatRef ChatType Int64 (Maybe GroupChatScope)
   deriving (Eq, Show, Ord)
 
 data ChatInfo (c :: ChatType) where
   DirectChat :: Contact -> ChatInfo 'CTDirect
-  GroupChat :: GroupInfo -> ChatInfo 'CTGroup
+  GroupChat :: GroupInfo -> Maybe GroupChatScopeInfo -> ChatInfo 'CTGroup
   LocalChat :: NoteFolder -> ChatInfo 'CTLocal
   ContactRequest :: UserContactRequest -> ChatInfo 'CTContactRequest
   ContactConnection :: PendingContactConnection -> ChatInfo 'CTContactConnection
 
 deriving instance Show (ChatInfo c)
 
-chatInfoChatTs :: ChatInfo c -> Maybe UTCTime
-chatInfoChatTs = \case
-  DirectChat Contact {chatTs} -> chatTs
-  GroupChat GroupInfo {chatTs} -> chatTs
-  _ -> Nothing
+data GroupChatScopeInfo
+  = GCSIMemberSupport {groupMember_ :: Maybe GroupMember}
+  deriving (Show)
+
+toChatScope :: GroupChatScopeInfo -> GroupChatScope
+toChatScope = \case
+  GCSIMemberSupport {groupMember_} -> GCSMemberSupport $ groupMemberId' <$> groupMember_
+
+toMsgScope :: GroupInfo -> GroupChatScopeInfo -> MsgScope
+toMsgScope GroupInfo {membership} = \case
+  GCSIMemberSupport {groupMember_} -> MSMember $ memberId' $ fromMaybe membership groupMember_
 
 chatInfoToRef :: ChatInfo c -> ChatRef
 chatInfoToRef = \case
-  DirectChat Contact {contactId} -> ChatRef CTDirect contactId
-  GroupChat GroupInfo {groupId} -> ChatRef CTGroup groupId
-  LocalChat NoteFolder {noteFolderId} -> ChatRef CTLocal noteFolderId
-  ContactRequest UserContactRequest {contactRequestId} -> ChatRef CTContactRequest contactRequestId
-  ContactConnection PendingContactConnection {pccConnId} -> ChatRef CTContactConnection pccConnId
+  DirectChat Contact {contactId} -> ChatRef CTDirect contactId Nothing
+  GroupChat GroupInfo {groupId} scopeInfo -> ChatRef CTGroup groupId (toChatScope <$> scopeInfo)
+  LocalChat NoteFolder {noteFolderId} -> ChatRef CTLocal noteFolderId Nothing
+  ContactRequest UserContactRequest {contactRequestId} -> ChatRef CTContactRequest contactRequestId Nothing
+  ContactConnection PendingContactConnection {pccConnId} -> ChatRef CTContactConnection pccConnId Nothing
 
 chatInfoMembership :: ChatInfo c -> Maybe GroupMember
 chatInfoMembership = \case
-  GroupChat GroupInfo {membership} -> Just membership
+  GroupChat GroupInfo {membership} _scopeInfo -> Just membership
   _ -> Nothing
 
 data JSONChatInfo
   = JCInfoDirect {contact :: Contact}
-  | JCInfoGroup {groupInfo :: GroupInfo}
+  | JCInfoGroup {groupInfo :: GroupInfo, groupChatScope :: Maybe GroupChatScopeInfo}
   | JCInfoLocal {noteFolder :: NoteFolder}
   | JCInfoContactRequest {contactRequest :: UserContactRequest}
   | JCInfoContactConnection {contactConnection :: PendingContactConnection}
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "GCSI") ''GroupChatScopeInfo)
+
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "JCInfo") ''JSONChatInfo)
 
 instance ChatTypeI c => FromJSON (ChatInfo c) where
@@ -122,7 +162,7 @@ instance ToJSON (ChatInfo c) where
 jsonChatInfo :: ChatInfo c -> JSONChatInfo
 jsonChatInfo = \case
   DirectChat c -> JCInfoDirect c
-  GroupChat g -> JCInfoGroup g
+  GroupChat g s -> JCInfoGroup g s
   LocalChat l -> JCInfoLocal l
   ContactRequest g -> JCInfoContactRequest g
   ContactConnection c -> JCInfoContactConnection c
@@ -134,7 +174,7 @@ deriving instance Show AChatInfo
 jsonAChatInfo :: JSONChatInfo -> AChatInfo
 jsonAChatInfo = \case
   JCInfoDirect c -> AChatInfo SCTDirect $ DirectChat c
-  JCInfoGroup g -> AChatInfo SCTGroup $ GroupChat g
+  JCInfoGroup g s -> AChatInfo SCTGroup $ GroupChat g s
   JCInfoLocal l -> AChatInfo SCTLocal $ LocalChat l
   JCInfoContactRequest g -> AChatInfo SCTContactRequest $ ContactRequest g
   JCInfoContactConnection c -> AChatInfo SCTContactConnection $ ContactConnection c
@@ -150,6 +190,9 @@ data ChatItem (c :: ChatType) (d :: MsgDirection) = ChatItem
   { chatDir :: CIDirection c d,
     meta :: CIMeta c d,
     content :: CIContent d,
+    -- The `mentions` map prevents loading all members from UI.
+    -- The key is a name used in the message text, used to look up CIMention.
+    mentions :: Map MemberName CIMention,
     formattedText :: Maybe MarkdownList,
     quotedItem :: Maybe (CIQuote c),
     reactions :: [CIReactionCount],
@@ -157,18 +200,26 @@ data ChatItem (c :: ChatType) (d :: MsgDirection) = ChatItem
   }
   deriving (Show)
 
-isMention :: ChatItem c d -> Bool
-isMention ChatItem {chatDir, quotedItem} = case chatDir of
-  CIDirectRcv -> userItem quotedItem
-  CIGroupRcv _ -> userItem quotedItem
-  _ -> False
-  where
-    userItem = \case
-      Nothing -> False
-      Just CIQuote {chatDir = cd} -> case cd of
-        CIQDirectSnd -> True
-        CIQGroupSnd -> True
-        _ -> False
+data CIMention = CIMention
+  { memberId :: MemberId,
+    -- member record can be created later than the mention is received
+    memberRef :: Maybe CIMentionMember
+  }
+  deriving (Eq, Show)
+
+data CIMentionMember = CIMentionMember
+  { groupMemberId :: GroupMemberId,
+    displayName :: Text, -- use `displayName` in copy/share actions
+    localAlias :: Maybe Text, -- use `fromMaybe displayName localAlias` in chat view
+    memberRole :: GroupMemberRole -- shown for admins/owners in the message
+  }
+  deriving (Eq, Show)
+
+isACIUserMention :: AChatItem -> Bool
+isACIUserMention (AChatItem _ _ _ ci) = isUserMention ci
+
+isUserMention :: ChatItem c d -> Bool
+isUserMention ChatItem {meta = CIMeta {userMention}} = userMention
 
 data CIDirection (c :: ChatType) (d :: MsgDirection) where
   CIDirectSnd :: CIDirection 'CTDirect 'MDSnd
@@ -247,6 +298,16 @@ chatItemMember GroupInfo {membership} ChatItem {chatDir} = case chatDir of
   CIGroupSnd -> membership
   CIGroupRcv m -> m
 
+chatItemRcvFromMember :: ChatItem c d -> Maybe GroupMember
+chatItemRcvFromMember ChatItem {chatDir} = case chatDir of
+  CIGroupRcv m -> Just m
+  _ -> Nothing
+
+chatItemIsRcvNew :: ChatItem c d -> Bool
+chatItemIsRcvNew ChatItem {meta = CIMeta {itemStatus}} = case itemStatus of
+  CISRcvNew -> True
+  _ -> False
+
 ciReactionAllowed :: ChatItem c d -> Bool
 ciReactionAllowed ChatItem {meta = CIMeta {itemDeleted = Just _}} = False
 ciReactionAllowed ChatItem {content} = isJust $ ciMsgContent content
@@ -254,8 +315,8 @@ ciReactionAllowed ChatItem {content} = isJust $ ciMsgContent content
 data ChatDirection (c :: ChatType) (d :: MsgDirection) where
   CDDirectSnd :: Contact -> ChatDirection 'CTDirect 'MDSnd
   CDDirectRcv :: Contact -> ChatDirection 'CTDirect 'MDRcv
-  CDGroupSnd :: GroupInfo -> ChatDirection 'CTGroup 'MDSnd
-  CDGroupRcv :: GroupInfo -> GroupMember -> ChatDirection 'CTGroup 'MDRcv
+  CDGroupSnd :: GroupInfo -> Maybe GroupChatScopeInfo -> ChatDirection 'CTGroup 'MDSnd
+  CDGroupRcv :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> ChatDirection 'CTGroup 'MDRcv
   CDLocalSnd :: NoteFolder -> ChatDirection 'CTLocal 'MDSnd
   CDLocalRcv :: NoteFolder -> ChatDirection 'CTLocal 'MDRcv
 
@@ -263,8 +324,8 @@ toCIDirection :: ChatDirection c d -> CIDirection c d
 toCIDirection = \case
   CDDirectSnd _ -> CIDirectSnd
   CDDirectRcv _ -> CIDirectRcv
-  CDGroupSnd _ -> CIGroupSnd
-  CDGroupRcv _ m -> CIGroupRcv m
+  CDGroupSnd _ _ -> CIGroupSnd
+  CDGroupRcv _ _ m -> CIGroupRcv m
   CDLocalSnd _ -> CILocalSnd
   CDLocalRcv _ -> CILocalRcv
 
@@ -272,8 +333,8 @@ toChatInfo :: ChatDirection c d -> ChatInfo c
 toChatInfo = \case
   CDDirectSnd c -> DirectChat c
   CDDirectRcv c -> DirectChat c
-  CDGroupSnd g -> GroupChat g
-  CDGroupRcv g _ -> GroupChat g
+  CDGroupSnd g s -> GroupChat g s
+  CDGroupRcv g s _ -> GroupChat g s
   CDLocalSnd l -> LocalChat l
   CDLocalRcv l -> LocalChat l
 
@@ -310,6 +371,7 @@ deriving instance Show AChat
 
 data ChatStats = ChatStats
   { unreadCount :: Int, -- returned both in /_get chat initial API and in /_get chats API
+    unreadMentions :: Int, -- returned both in /_get chat initial API and in /_get chats API
     reportsCount :: Int, -- returned both in /_get chat initial API and in /_get chats API
     minUnreadItemId :: ChatItemId,
     unreadChat :: Bool
@@ -317,7 +379,7 @@ data ChatStats = ChatStats
   deriving (Show)
 
 emptyChatStats :: ChatStats
-emptyChatStats = ChatStats 0 0 0 False
+emptyChatStats = ChatStats 0 0 0 0 False
 
 data NavigationInfo = NavigationInfo
   { afterUnread :: Int,
@@ -346,6 +408,12 @@ aChatItemTs (AChatItem _ _ _ ci) = chatItemTs' ci
 aChatItemDir :: AChatItem -> MsgDirection
 aChatItemDir (AChatItem _ sMsgDir _ _) = toMsgDirection sMsgDir
 
+aChatItemRcvFromMember :: AChatItem -> Maybe GroupMember
+aChatItemRcvFromMember (AChatItem _ _ _ ci) = chatItemRcvFromMember ci
+
+aChatItemIsRcvNew :: AChatItem -> Bool
+aChatItemIsRcvNew (AChatItem _ _ _ ci) = chatItemIsRcvNew ci
+
 updateFileStatus :: forall c d. ChatItem c d -> CIFileStatus d -> ChatItem c d
 updateFileStatus ci@ChatItem {file} status = case file of
   Just f -> ci {file = Just (f :: CIFile d) {fileStatus = status}}
@@ -364,6 +432,7 @@ data CIMeta (c :: ChatType) (d :: MsgDirection) = CIMeta
     itemEdited :: Bool,
     itemTimed :: Maybe CITimed,
     itemLive :: Maybe Bool,
+    userMention :: Bool, -- True for messages that mention user or reply to user messages
     deletable :: Bool,
     editable :: Bool,
     forwardedByMember :: Maybe GroupMemberId,
@@ -372,11 +441,11 @@ data CIMeta (c :: ChatType) (d :: MsgDirection) = CIMeta
   }
   deriving (Show)
 
-mkCIMeta :: forall c d. ChatTypeI c => ChatItemId -> CIContent d -> Text -> CIStatus d -> Maybe Bool -> Maybe SharedMsgId -> Maybe CIForwardedFrom -> Maybe (CIDeleted c) -> Bool -> Maybe CITimed -> Maybe Bool -> UTCTime -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> UTCTime -> CIMeta c d
-mkCIMeta itemId itemContent itemText itemStatus sentViaProxy itemSharedMsgId itemForwarded itemDeleted itemEdited itemTimed itemLive currentTs itemTs forwardedByMember createdAt updatedAt =
+mkCIMeta :: forall c d. ChatTypeI c => ChatItemId -> CIContent d -> Text -> CIStatus d -> Maybe Bool -> Maybe SharedMsgId -> Maybe CIForwardedFrom -> Maybe (CIDeleted c) -> Bool -> Maybe CITimed -> Maybe Bool -> Bool -> UTCTime -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> UTCTime -> CIMeta c d
+mkCIMeta itemId itemContent itemText itemStatus sentViaProxy itemSharedMsgId itemForwarded itemDeleted itemEdited itemTimed itemLive userMention currentTs itemTs forwardedByMember createdAt updatedAt =
   let deletable = deletable' itemContent itemDeleted itemTs nominalDay currentTs
       editable = deletable && isNothing itemForwarded
-   in CIMeta {itemId, itemTs, itemText, itemStatus, sentViaProxy, itemSharedMsgId, itemForwarded, itemDeleted, itemEdited, itemTimed, itemLive, deletable, editable, forwardedByMember, createdAt, updatedAt}
+   in CIMeta {itemId, itemTs, itemText, itemStatus, sentViaProxy, itemSharedMsgId, itemForwarded, itemDeleted, itemEdited, itemTimed, itemLive, userMention, deletable, editable, forwardedByMember, createdAt, updatedAt}
 
 deletable' :: forall c d. ChatTypeI c => CIContent d -> Maybe (CIDeleted c) -> UTCTime -> NominalDiffTime -> UTCTime -> Bool
 deletable' itemContent itemDeleted itemTs allowedInterval currentTs =
@@ -401,6 +470,7 @@ dummyMeta itemId ts itemText =
       itemEdited = False,
       itemTimed = Nothing,
       itemLive = Nothing,
+      userMention = False,
       deletable = False,
       editable = False,
       forwardedByMember = Nothing,
@@ -915,7 +985,10 @@ ciStatusNew = case msgDirection @d of
 ciCreateStatus :: forall d. MsgDirectionI d => CIContent d -> CIStatus d
 ciCreateStatus content = case msgDirection @d of
   SMDSnd -> ciStatusNew
-  SMDRcv -> if ciRequiresAttention content then ciStatusNew else CISRcvRead
+  SMDRcv
+    | isCIReport content -> CISRcvRead
+    | ciRequiresAttention content -> ciStatusNew
+    | otherwise -> CISRcvRead
 
 membersGroupItemStatus :: [(GroupSndStatus, Int)] -> CIStatus 'MDSnd
 membersGroupItemStatus memStatusCounts
@@ -1247,14 +1320,14 @@ data ChatItemVersion = ChatItemVersion
   deriving (Eq, Show)
 
 mkItemVersion :: ChatItem c d -> Maybe ChatItemVersion
-mkItemVersion ChatItem {content, meta} = version <$> ciMsgContent content
+mkItemVersion ChatItem {content, formattedText, meta} = version <$> ciMsgContent content
   where
     CIMeta {itemId, itemTs, createdAt} = meta
     version mc =
       ChatItemVersion
         { chatItemVersionId = itemId,
           msgContent = mc,
-          formattedText = parseMaybeMarkdownList $ msgContentText mc,
+          formattedText,
           itemVersionTs = itemTs,
           createdAt = createdAt
         }
@@ -1358,6 +1431,8 @@ instance MsgDirectionI d => ToJSON (CIFile d) where
   toJSON = $(JQ.mkToJSON defaultJSON ''CIFile)
   toEncoding = $(JQ.mkToEncoding defaultJSON ''CIFile)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "GCS") ''GroupChatScope)
+
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "JCI") ''JSONCIDirection)
 
 instance (ChatTypeI c, MsgDirectionI d) => FromJSON (CIDirection c d) where
@@ -1387,6 +1462,10 @@ $(JQ.deriveToJSON defaultJSON ''CIQuote)
 
 $(JQ.deriveJSON defaultJSON ''CIReactionCount)
 
+$(JQ.deriveJSON defaultJSON ''CIMentionMember)
+
+$(JQ.deriveJSON defaultJSON ''CIMention)
+
 instance (ChatTypeI c, MsgDirectionI d) => FromJSON (ChatItem c d) where
   parseJSON = $(JQ.mkParseJSON defaultJSON ''ChatItem)
 
diff --git a/src/Simplex/Chat/Messages/CIContent.hs b/src/Simplex/Chat/Messages/CIContent.hs
index 60d5464b79..cc6529831c 100644
--- a/src/Simplex/Chat/Messages/CIContent.hs
+++ b/src/Simplex/Chat/Messages/CIContent.hs
@@ -182,6 +182,9 @@ ciMsgContent = \case
   CIRcvMsgContent mc -> Just mc
   _ -> Nothing
 
+isCIReport :: CIContent d -> Bool
+isCIReport = maybe False isReport . ciMsgContent
+
 data MsgDecryptError
   = MDERatchetHeader
   | MDETooManySkipped
@@ -206,6 +209,8 @@ ciRequiresAttention content = case msgDirection @d of
     CIRcvGroupEvent rge -> case rge of
       RGEMemberAdded {} -> False
       RGEMemberConnected -> False
+      RGEMemberAccepted {} -> False
+      RGEUserAccepted -> False
       RGEMemberLeft -> False
       RGEMemberRole {} -> False
       RGEMemberBlocked {} -> False
@@ -217,6 +222,7 @@ ciRequiresAttention content = case msgDirection @d of
       RGEInvitedViaGroupLink -> False
       RGEMemberCreatedContact -> False
       RGEMemberProfileUpdated {} -> False
+      RGENewMemberPendingReview -> True
     CIRcvConnEvent _ -> True
     CIRcvChatFeature {} -> False
     CIRcvChatPreference {} -> False
@@ -317,6 +323,8 @@ rcvGroupEventToText :: RcvGroupEvent -> Text
 rcvGroupEventToText = \case
   RGEMemberAdded _ p -> "added " <> profileToText p
   RGEMemberConnected -> "connected"
+  RGEMemberAccepted _ p -> "accepted " <> profileToText p
+  RGEUserAccepted -> "accepted you"
   RGEMemberLeft -> "left"
   RGEMemberRole _ p r -> "changed role of " <> profileToText p <> " to " <> safeDecodeUtf8 (strEncode r)
   RGEMemberBlocked _ p blocked -> (if blocked then "blocked" else "unblocked") <> " " <> profileToText p
@@ -328,6 +336,7 @@ rcvGroupEventToText = \case
   RGEInvitedViaGroupLink -> "invited via your group link"
   RGEMemberCreatedContact -> "started direct connection with you"
   RGEMemberProfileUpdated {} -> "updated profile"
+  RGENewMemberPendingReview -> "new member wants to join the group"
 
 sndGroupEventToText :: SndGroupEvent -> Text
 sndGroupEventToText = \case
@@ -337,6 +346,18 @@ sndGroupEventToText = \case
   SGEMemberDeleted _ p -> "removed " <> profileToText p
   SGEUserLeft -> "left"
   SGEGroupUpdated _ -> "group profile updated"
+  SGEMemberAccepted _ _p -> "you accepted this member"
+  SGEUserPendingReview -> "please wait for group moderators to review your request to join the group"
+
+-- used to send to members with old version
+pendingReviewMessage :: Text
+pendingReviewMessage =
+  "Please wait for group moderators to review your request to join the group."
+
+-- used to send to members with old version
+acceptedToGroupMessage :: Text
+acceptedToGroupMessage =
+  "You are accepted to the group."
 
 rcvConnEventToText :: RcvConnEvent -> Text
 rcvConnEventToText = \case
diff --git a/src/Simplex/Chat/Messages/CIContent/Events.hs b/src/Simplex/Chat/Messages/CIContent/Events.hs
index 74f7d94399..539c1f524c 100644
--- a/src/Simplex/Chat/Messages/CIContent/Events.hs
+++ b/src/Simplex/Chat/Messages/CIContent/Events.hs
@@ -14,7 +14,9 @@ import Simplex.Messaging.Crypto.Ratchet (PQEncryption)
 
 data RcvGroupEvent
   = RGEMemberAdded {groupMemberId :: GroupMemberId, profile :: Profile} -- CRJoinedGroupMemberConnecting
-  | RGEMemberConnected -- CRUserJoinedGroup, CRJoinedGroupMember, CRConnectedToGroupMember
+  | RGEMemberConnected -- CEvtUserJoinedGroup, CRJoinedGroupMember, CEvtConnectedToGroupMember
+  | RGEMemberAccepted {groupMemberId :: GroupMemberId, profile :: Profile}
+  | RGEUserAccepted
   | RGEMemberLeft -- CRLeftMember
   | RGEMemberRole {groupMemberId :: GroupMemberId, profile :: Profile, role :: GroupMemberRole}
   | RGEMemberBlocked {groupMemberId :: GroupMemberId, profile :: Profile, blocked :: Bool} -- CRMemberBlockedForAll
@@ -29,15 +31,18 @@ data RcvGroupEvent
   | RGEInvitedViaGroupLink -- CRSentGroupInvitationViaLink
   | RGEMemberCreatedContact -- CRNewMemberContactReceivedInv
   | RGEMemberProfileUpdated {fromProfile :: Profile, toProfile :: Profile} -- CRGroupMemberUpdated
+  | RGENewMemberPendingReview
   deriving (Show)
 
 data SndGroupEvent
   = SGEMemberRole {groupMemberId :: GroupMemberId, profile :: Profile, role :: GroupMemberRole}
-  | SGEMemberBlocked {groupMemberId :: GroupMemberId, profile :: Profile, blocked :: Bool} -- CRMemberBlockedForAllUser
+  | SGEMemberBlocked {groupMemberId :: GroupMemberId, profile :: Profile, blocked :: Bool} -- CRMembersBlockedForAllUser
   | SGEUserRole {role :: GroupMemberRole}
-  | SGEMemberDeleted {groupMemberId :: GroupMemberId, profile :: Profile} -- CRUserDeletedMember
+  | SGEMemberDeleted {groupMemberId :: GroupMemberId, profile :: Profile} -- CRUserDeletedMembers
   | SGEUserLeft -- CRLeftMemberUser
   | SGEGroupUpdated {groupProfile :: GroupProfile} -- CRGroupUpdated
+  | SGEMemberAccepted {groupMemberId :: GroupMemberId, profile :: Profile}
+  | SGEUserPendingReview
   deriving (Show)
 
 data RcvConnEvent
diff --git a/src/Simplex/Chat/Mobile.hs b/src/Simplex/Chat/Mobile.hs
index b30c004b97..194fc1bb06 100644
--- a/src/Simplex/Chat/Mobile.hs
+++ b/src/Simplex/Chat/Mobile.hs
@@ -13,10 +13,10 @@ import Control.Concurrent.STM
 import Control.Exception (SomeException, catch)
 import Control.Monad.Except
 import Control.Monad.Reader
+import Data.Aeson (ToJSON (..))
 import qualified Data.Aeson as J
 import qualified Data.Aeson.TH as JQ
 import Data.Bifunctor (first)
-import Data.ByteArray (ScrubbedBytes)
 import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -52,13 +52,15 @@ import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation (..), Migrati
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, sumTypeJSON)
-import Simplex.Messaging.Protocol (AProtoServerWithAuth (..), AProtocolType (..), BasicAuth (..), CorrId (..), ProtoServerWithAuth (..), ProtocolServer (..))
+import Simplex.Messaging.Protocol (AProtoServerWithAuth (..), AProtocolType (..), BasicAuth (..), ProtoServerWithAuth (..), ProtocolServer (..))
 import Simplex.Messaging.Util (catchAll, liftEitherWith, safeDecodeUtf8)
 import System.IO (utf8)
 import System.Timeout (timeout)
 #if !defined(dbPostgres)
+import Data.ByteArray (ScrubbedBytes)
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB
+import qualified Simplex.Messaging.Agent.Store.DB as DB
 #endif
 
 data DBMigrationResult
@@ -71,9 +73,19 @@ data DBMigrationResult
 
 $(JQ.deriveToJSON (sumTypeJSON $ dropPrefix "DBM") ''DBMigrationResult)
 
-data APIResponse = APIResponse {corr :: Maybe CorrId, remoteHostId :: Maybe RemoteHostId, resp :: ChatResponse}
+data APIResult r
+  = APIResult  {remoteHostId :: Maybe RemoteHostId, result :: r}
+  | APIError {remoteHostId :: Maybe RemoteHostId, error :: ChatError}
 
-$(JQ.deriveToJSON defaultJSON ''APIResponse)
+eitherToResult :: Maybe RemoteHostId -> Either ChatError r -> APIResult r
+eitherToResult rhId = either (APIError rhId) (APIResult rhId)
+{-# INLINE eitherToResult #-}
+
+$(pure [])
+
+instance ToJSON r => ToJSON (APIResult r) where
+  toEncoding = $(JQ.mkToEncoding (defaultJSON {J.sumEncoding = J.UntaggedValue}) ''APIResult)
+  toJSON = $(JQ.mkToJSON (defaultJSON {J.sumEncoding = J.UntaggedValue}) ''APIResult)
 
 foreign export ccall "chat_migrate_init" cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
 
@@ -203,10 +215,10 @@ mobileChatOpts dbOptions =
             logAgent = Nothing,
             logFile = Nothing,
             tbqSize = 4096,
+            deviceName = Nothing,
             highlyAvailable = False,
             yesToUpMigrations = False
           },
-      deviceName = Nothing,
       chatCmd = "",
       chatCmdDelay = 3,
       chatCmdLog = CCLNone,
@@ -237,7 +249,7 @@ getActiveUser_ st = find activeUser <$> withTransaction st getUsers
 -- only used in tests
 chatMigrateInit :: String -> ScrubbedBytes -> String -> IO (Either DBMigrationResult ChatController)
 chatMigrateInit dbFilePrefix dbKey confirm = do
-  let chatDBOpts = ChatDbOpts {dbFilePrefix, dbKey, vacuumOnMigration = True}
+  let chatDBOpts = ChatDbOpts {dbFilePrefix, dbKey, trackQueries = DB.TQSlow 5000, vacuumOnMigration = True}
   chatMigrateInitKey chatDBOpts False confirm False
 #endif
 
@@ -285,21 +297,15 @@ chatSendCmd :: ChatController -> B.ByteString -> IO JSONByteString
 chatSendCmd cc = chatSendRemoteCmd cc Nothing
 
 chatSendRemoteCmd :: ChatController -> Maybe RemoteHostId -> B.ByteString -> IO JSONByteString
-chatSendRemoteCmd cc rh s = J.encode . APIResponse Nothing rh <$> runReaderT (execChatCommand rh s) cc
+chatSendRemoteCmd cc rh s = J.encode . eitherToResult rh <$> runReaderT (execChatCommand rh s) cc
 
 chatRecvMsg :: ChatController -> IO JSONByteString
-chatRecvMsg ChatController {outputQ} = json <$> readChatResponse
+chatRecvMsg ChatController {outputQ} = J.encode . uncurry eitherToResult <$> readChatResponse
   where
-    json (corr, remoteHostId, resp) = J.encode APIResponse {corr, remoteHostId, resp}
-    readChatResponse = do
-      out@(_, _, cr) <- atomically $ readTBQueue outputQ
-      if filterEvent cr then pure out else readChatResponse
-    filterEvent = \case
-      CRGroupSubscribed {} -> False
-      CRGroupEmpty {} -> False
-      CRMemberSubSummary {} -> False
-      CRPendingSubSummary {} -> False
-      _ -> True
+    readChatResponse =
+      atomically (readTBQueue outputQ) >>= \case
+        (_, Right CEvtTerminalEvent {}) -> readChatResponse
+        out -> pure out
 
 chatRecvMsgWait :: ChatController -> Int -> IO JSONByteString
 chatRecvMsgWait cc time = fromMaybe "" <$> timeout time (chatRecvMsg cc)
diff --git a/src/Simplex/Chat/Operators.hs b/src/Simplex/Chat/Operators.hs
index 6af0c4a17e..c9b5e020d9 100644
--- a/src/Simplex/Chat/Operators.hs
+++ b/src/Simplex/Chat/Operators.hs
@@ -37,7 +37,6 @@ import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import Data.Maybe (fromMaybe, isNothing, mapMaybe)
-import Data.Scientific (floatingOrInteger)
 import Data.Set (Set)
 import qualified Data.Set as S
 import Data.Text (Text)
@@ -46,21 +45,22 @@ import Data.Time (addUTCTime)
 import Data.Time.Clock (UTCTime, nominalDay)
 import Language.Haskell.TH.Syntax (lift)
 import Simplex.Chat.Operators.Conditions
-import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types (User)
 import Simplex.Chat.Types.Util (textParseJSON)
 import Simplex.Messaging.Agent.Env.SQLite (ServerCfg (..), ServerRoles (..), allRoles)
+import Simplex.Messaging.Agent.Store.DB (FromField (..), ToField (..), fromTextField_)
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, fromTextField_, sumTypeJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, sumTypeJSON)
 import Simplex.Messaging.Protocol (AProtocolType (..), ProtoServerWithAuth (..), ProtocolServer (..), ProtocolType (..), ProtocolTypeI, SProtocolType (..), UserProtocol)
 import Simplex.Messaging.Transport.Client (TransportHost (..))
 import Simplex.Messaging.Util (atomicModifyIORef'_, safeDecodeUtf8)
 
 usageConditionsCommit :: Text
-usageConditionsCommit = "a5061f3147165a05979d6ace33960aced2d6ac03"
+usageConditionsCommit = "7471fd2af5838dc0467aebc570b5ea75e5df3209"
 
 previousConditionsCommit :: Text
-previousConditionsCommit = "11a44dc1fd461a93079f897048b46998db55da5c"
+previousConditionsCommit = "a5061f3147165a05979d6ace33960aced2d6ac03"
 
 usageConditionsText :: Text
 usageConditionsText =
@@ -68,32 +68,6 @@ usageConditionsText =
       in [|stripFrontMatter $(lift (safeDecodeUtf8 s))|]
    )
 
-data DBStored = DBStored | DBNew
-
-data SDBStored (s :: DBStored) where
-  SDBStored :: SDBStored 'DBStored
-  SDBNew :: SDBStored 'DBNew
-
-deriving instance Show (SDBStored s)
-
-class DBStoredI s where sdbStored :: SDBStored s
-
-instance DBStoredI 'DBStored where sdbStored = SDBStored
-
-instance DBStoredI 'DBNew where sdbStored = SDBNew
-
-data DBEntityId' (s :: DBStored) where
-  DBEntityId :: Int64 -> DBEntityId' 'DBStored
-  DBNewEntity :: DBEntityId' 'DBNew
-
-deriving instance Show (DBEntityId' s)
-
-deriving instance Eq (DBEntityId' s)
-
-type DBEntityId = DBEntityId' 'DBStored
-
-type DBNewEntity = DBEntityId' 'DBNew
-
 data OperatorTag = OTSimplex | OTFlux
   deriving (Eq, Ord, Show)
 
@@ -117,19 +91,6 @@ instance TextEncoding OperatorTag where
     OTSimplex -> "simplex"
     OTFlux -> "flux"
 
--- this and other types only define instances of serialization for known DB IDs only,
--- entities without IDs cannot be serialized to JSON
-instance FromField DBEntityId
-#if defined(dbPostgres)
-  where
-    fromField f dat = DBEntityId <$> fromField f dat
-#else
-  where
-    fromField f = DBEntityId <$> fromField f
-#endif
-
-instance ToField DBEntityId where toField (DBEntityId i) = toField i
-
 data UsageConditions = UsageConditions
   { conditionsId :: Int64,
     conditionsCommit :: Text,
@@ -274,6 +235,10 @@ data UserServer' s (p :: ProtocolType) = UserServer
   }
   deriving (Show)
 
+presetServerAddress :: UserServer' s p -> ProtocolServer p
+presetServerAddress UserServer {server = ProtoServerWithAuth srv _} = srv
+{-# INLINE presetServerAddress #-}
+
 data PresetOperator = PresetOperator
   { operator :: Maybe NewServerOperator,
     smp :: [NewUserServer 'PSMP],
@@ -296,6 +261,9 @@ operatorServersToUse p PresetOperator {useSMP, useXFTP} = case p of
   SPSMP -> useSMP
   SPXFTP -> useXFTP
 
+presetServer' :: Bool -> ProtocolServer p -> NewUserServer p
+presetServer' enabled = presetServer enabled . (`ProtoServerWithAuth` Nothing)
+
 presetServer :: Bool -> ProtoServerWithAuth p -> NewUserServer p
 presetServer = newUserServer_ True
 
@@ -478,25 +446,6 @@ validateUserServers curr others = currUserErrs <> concatMap otherUserErrs others
     userServers :: (UserServersClass u, UserProtocol p) => SProtocolType p -> [u] -> [AUserServer p]
     userServers p = map aUserServer' . concatMap (servers' p)
 
-instance ToJSON (DBEntityId' s) where
-  toEncoding = \case
-    DBEntityId i -> toEncoding i
-    DBNewEntity -> JE.null_
-  toJSON = \case
-    DBEntityId i -> toJSON i
-    DBNewEntity -> J.Null
-
-instance DBStoredI s => FromJSON (DBEntityId' s) where
-  parseJSON v = case (v, sdbStored @s) of
-    (J.Null, SDBNew) -> pure DBNewEntity
-    (J.Number n, SDBStored) -> case floatingOrInteger n of
-      Left (_ :: Double) -> fail "bad DBEntityId"
-      Right i -> pure $ DBEntityId (fromInteger i)
-    _ -> fail "bad DBEntityId"
-  omittedField = case sdbStored @s of
-    SDBStored -> Nothing
-    SDBNew -> Just DBNewEntity
-
 $(JQ.deriveJSON defaultJSON ''UsageConditions)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CA") ''ConditionsAcceptance)
diff --git a/src/Simplex/Chat/Operators/Presets.hs b/src/Simplex/Chat/Operators/Presets.hs
new file mode 100644
index 0000000000..18a0b7ebed
--- /dev/null
+++ b/src/Simplex/Chat/Operators/Presets.hs
@@ -0,0 +1,118 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.Operators.Presets where
+
+import Data.List.NonEmpty (NonEmpty)
+import qualified Data.List.NonEmpty as L
+import Simplex.Chat.Operators
+import Simplex.Messaging.Agent.Env.SQLite (ServerRoles (..), allRoles)
+import Simplex.Messaging.Agent.Store.Entity
+import Simplex.Messaging.Protocol (ProtocolType (..), SMPServer)
+
+operatorSimpleXChat :: NewServerOperator
+operatorSimpleXChat =
+  ServerOperator
+    { operatorId = DBNewEntity,
+      operatorTag = Just OTSimplex,
+      tradeName = "SimpleX Chat",
+      legalName = Just "SimpleX Chat Ltd",
+      serverDomains = ["simplex.im"],
+      conditionsAcceptance = CARequired Nothing,
+      enabled = True,
+      smpRoles = allRoles,
+      xftpRoles = allRoles
+    }
+
+operatorFlux :: NewServerOperator
+operatorFlux =
+  ServerOperator
+    { operatorId = DBNewEntity,
+      operatorTag = Just OTFlux,
+      tradeName = "Flux",
+      legalName = Just "InFlux Technologies Limited",
+      serverDomains = ["simplexonflux.com"],
+      conditionsAcceptance = CARequired Nothing,
+      enabled = False,
+      smpRoles = ServerRoles {storage = False, proxy = True},
+      xftpRoles = ServerRoles {storage = False, proxy = True}
+    }
+
+-- Please note: if any servers are removed from the lists below, they MUST be added here.
+-- Otherwise previously created short links won't work.
+--
+-- !!! Also, if any servers need to be added, shortLinkPresetServers will need to be be split to two,
+-- so that option used for restoring links is updated earlier, for backward/forward compatibility.
+allPresetServers :: NonEmpty SMPServer
+allPresetServers = enabledSimplexChatSMPServers <> disabledSimplexChatSMPServers <> fluxSMPServers_
+  -- added for testing, not preset in the clients
+  <> ["smp://8Af90NX2TTkKEJAF1RCg69P_Odg2Z-6_J6DOKUqK3rQ=@smp7.simplex.im,dbxqutskmmbkbrs7ofi7pmopeyhgi5cxbjbh4ummgmep4r6bz4cbrcid.onion"]
+
+simplexChatSMPServers :: [NewUserServer 'PSMP]
+simplexChatSMPServers =
+  map (presetServer' True) (L.toList enabledSimplexChatSMPServers)
+    <> map (presetServer' False) (L.toList disabledSimplexChatSMPServers)
+
+-- Please note: if any servers are removed from this list, they MUST be added to allPresetServers.
+-- Otherwise previously created short links won't work.
+--
+-- !!! Also, if any servers need to be added, shortLinkPresetServers will need to be be split to two,
+-- so that option used for restoring links is updated earlier, for backward/forward compatibility.
+enabledSimplexChatSMPServers :: NonEmpty SMPServer
+enabledSimplexChatSMPServers =
+  [ "smp://0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU=@smp8.simplex.im,beccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion",
+    "smp://SkIkI6EPd2D63F4xFKfHk7I1UGZVNn6k1QWZ5rcyr6w=@smp9.simplex.im,jssqzccmrcws6bhmn77vgmhfjmhwlyr3u7puw4erkyoosywgl67slqqd.onion",
+    "smp://6iIcWT_dF2zN_w5xzZEY7HI2Prbh3ldP07YTyDexPjE=@smp10.simplex.im,rb2pbttocvnbrngnwziclp2f4ckjq65kebafws6g4hy22cdaiv5dwjqd.onion",
+    "smp://1OwYGt-yqOfe2IyVHhxz3ohqo3aCCMjtB-8wn4X_aoY=@smp11.simplex.im,6ioorbm6i3yxmuoezrhjk6f6qgkc4syabh7m3so74xunb5nzr4pwgfqd.onion",
+    "smp://UkMFNAXLXeAAe0beCa4w6X_zp18PwxSaSjY17BKUGXQ=@smp12.simplex.im,ie42b5weq7zdkghocs3mgxdjeuycheeqqmksntj57rmejagmg4eor5yd.onion",
+    "smp://enEkec4hlR3UtKx2NMpOUK_K4ZuDxjWBO1d9Y4YXVaA=@smp14.simplex.im,aspkyu2sopsnizbyfabtsicikr2s4r3ti35jogbcekhm3fsoeyjvgrid.onion",
+    "smp://h--vW7ZSkXPeOUpfxlFGgauQmXNFOzGoizak7Ult7cw=@smp15.simplex.im,oauu4bgijybyhczbnxtlggo6hiubahmeutaqineuyy23aojpih3dajad.onion",
+    "smp://hejn2gVIqNU6xjtGM3OwQeuk8ZEbDXVJXAlnSBJBWUA=@smp16.simplex.im,p3ktngodzi6qrf7w64mmde3syuzrv57y55hxabqcq3l5p6oi7yzze6qd.onion",
+    "smp://ZKe4uxF4Z_aLJJOEsC-Y6hSkXgQS5-oc442JQGkyP8M=@smp17.simplex.im,ogtwfxyi3h2h5weftjjpjmxclhb5ugufa5rcyrmg7j4xlch7qsr5nuqd.onion",
+    "smp://PtsqghzQKU83kYTlQ1VKg996dW4Cw4x_bvpKmiv8uns=@smp18.simplex.im,lyqpnwbs2zqfr45jqkncwpywpbtq7jrhxnib5qddtr6npjyezuwd3nqd.onion",
+    "smp://N_McQS3F9TGoh4ER0QstUf55kGnNSd-wXfNPZ7HukcM=@smp19.simplex.im,i53bbtoqhlc365k6kxzwdp5w3cdt433s7bwh3y32rcbml2vztiyyz5id.onion"
+  ]
+
+-- Please note: if any servers are removed from this list, they MUST be added to allPresetServers.
+-- Otherwise previously created short links won't work.
+--
+-- !!! Also, if any servers need to be added, shortLinkPresetServers will need to be be split to two,
+-- so that option used for restoring links is updated earlier, for backward/forward compatibility.
+disabledSimplexChatSMPServers :: NonEmpty SMPServer
+disabledSimplexChatSMPServers =
+  [ "smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im,o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion",
+    "smp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im,jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion",
+    "smp://PQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo=@smp6.simplex.im,bylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion"
+  ]
+
+fluxSMPServers :: [NewUserServer 'PSMP]
+fluxSMPServers = map (presetServer' True) (L.toList fluxSMPServers_)
+
+-- Please note: if any servers are removed from this list, they MUST be added to allPresetServers.
+-- Otherwise previously created short links won't work.
+--
+-- !!! Also, if any servers need to be added, shortLinkPresetServers will need to be be split to two,
+-- so that option used for restoring links is updated earlier, for backward/forward compatibility.
+fluxSMPServers_ :: NonEmpty SMPServer
+fluxSMPServers_ =
+  [ "smp://xQW_ufMkGE20UrTlBl8QqceG1tbuylXhr9VOLPyRJmw=@smp1.simplexonflux.com,qb4yoanyl4p7o33yrknv4rs6qo7ugeb2tu2zo66sbebezs4cpyosarid.onion",
+    "smp://LDnWZVlAUInmjmdpQQoIo6FUinRXGe0q3zi5okXDE4s=@smp2.simplexonflux.com,yiqtuh3q4x7hgovkomafsod52wvfjucdljqbbipg5sdssnklgongxbqd.onion",
+    "smp://1jne379u7IDJSxAvXbWb_JgoE7iabcslX0LBF22Rej0=@smp3.simplexonflux.com,a5lm4k7ufei66cdck6fy63r4lmkqy3dekmmb7jkfdm5ivi6kfaojshad.onion",
+    "smp://xmAmqj75I9mWrUihLUlI0ZuNLXlIwFIlHRq5Pb6cHAU=@smp4.simplexonflux.com,qpcz2axyy66u26hfdd2e23uohcf3y6c36mn7dcuilcgnwjasnrvnxjqd.onion",
+    "smp://rWvBYyTamuRCBYb_KAn-nsejg879ndhiTg5Sq3k0xWA=@smp5.simplexonflux.com,4ao347qwiuluyd45xunmii4skjigzuuox53hpdsgbwxqafd4yrticead.onion",
+    "smp://PN7-uqLBToqlf1NxHEaiL35lV2vBpXq8Nj8BW11bU48=@smp6.simplexonflux.com,hury6ot3ymebbr2535mlp7gcxzrjpc6oujhtfxcfh2m4fal4xw5fq6qd.onion"
+  ]
+
+fluxXFTPServers :: [NewUserServer 'PXFTP]
+fluxXFTPServers =
+  map
+    (presetServer True)
+    [ "xftp://92Sctlc09vHl_nAqF2min88zKyjdYJ9mgxRCJns5K2U=@xftp1.simplexonflux.com,apl3pumq3emwqtrztykyyoomdx4dg6ysql5zek2bi3rgznz7ai3odkid.onion",
+      "xftp://YBXy4f5zU1CEhnbbCzVWTNVNsaETcAGmYqGNxHntiE8=@xftp2.simplexonflux.com,c5jjecisncnngysah3cz2mppediutfelco4asx65mi75d44njvua3xid.onion",
+      "xftp://ARQO74ZSvv2OrulRF3CdgwPz_AMy27r0phtLSq5b664=@xftp3.simplexonflux.com,dc4mohiubvbnsdfqqn7xhlhpqs5u4tjzp7xpz6v6corwvzvqjtaqqiqd.onion",
+      "xftp://ub2jmAa9U0uQCy90O-fSUNaYCj6sdhl49Jh3VpNXP58=@xftp4.simplexonflux.com,4qq5pzier3i4yhpuhcrhfbl6j25udc4czoyascrj4yswhodhfwev3nyd.onion",
+      "xftp://Rh19D5e4Eez37DEE9hAlXDB3gZa1BdFYJTPgJWPO9OI=@xftp5.simplexonflux.com,q7itltdn32hjmgcqwhow4tay5ijetng3ur32bolssw32fvc5jrwvozad.onion",
+      "xftp://0AznwoyfX8Od9T_acp1QeeKtxUi676IBIiQjXVwbdyU=@xftp6.simplexonflux.com,upvzf23ou6nrmaf3qgnhd6cn3d74tvivlmz3p7wdfwq6fhthjrjiiqid.onion"
+    ]
diff --git a/src/Simplex/Chat/Options.hs b/src/Simplex/Chat/Options.hs
index c58c792819..ff2af56b85 100644
--- a/src/Simplex/Chat/Options.hs
+++ b/src/Simplex/Chat/Options.hs
@@ -29,7 +29,7 @@ import Numeric.Natural (Natural)
 import Options.Applicative
 import Simplex.Chat.Controller (ChatLogLevel (..), SimpleNetCfg (..), updateStr, versionNumber, versionString)
 import Simplex.FileTransfer.Description (mb)
-import Simplex.Messaging.Client (HostMode (..), SocksMode (..), textToHostMode)
+import Simplex.Messaging.Client (HostMode (..), SMPWebPortServers (..), SocksMode (..), textToHostMode)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (parseAll)
 import Simplex.Messaging.Protocol (ProtoServerWithAuth, ProtocolTypeI, SMPServerWithAuth, XFTPServerWithAuth)
@@ -38,7 +38,6 @@ import Simplex.Chat.Options.DB
 
 data ChatOpts = ChatOpts
   { coreOptions :: CoreChatOpts,
-    deviceName :: Maybe Text,
     chatCmd :: String,
     chatCmdDelay :: Int,
     chatCmdLog :: ChatCmdLog,
@@ -64,6 +63,7 @@ data CoreChatOpts = CoreChatOpts
     logAgent :: Maybe LogLevel,
     logFile :: Maybe FilePath,
     tbqSize :: Natural,
+    deviceName :: Maybe Text,
     highlyAvailable :: Bool,
     yesToUpMigrations :: Bool
   }
@@ -153,11 +153,17 @@ coreChatOptsP appDir defaultDbName = do
             <> metavar "SMP_PROXY_FALLBACK_MODE"
             <> help "Allow downgrade and connect directly: no, [when IP address is] protected (default), yes"
         )
-  smpWebPort <-
-    switch
+  smpWebPortServers <-
+    flag' SWPAll
       ( long "smp-web-port"
           <> help "Use port 443 with SMP servers when not specified"
       )
+      <|> option
+        strParse
+          ( long "smp-web-port-servers"
+              <> help "Use port 443 with SMP servers when not specified: all, preset (default), off"
+              <> value SWPPreset
+          )
   t <-
     option
       auto
@@ -212,6 +218,13 @@ coreChatOptsP appDir defaultDbName = do
           <> value 1024
           <> showDefault
       )
+  deviceName <-
+    optional $
+      strOption
+        ( long "device-name"
+            <> metavar "DEVICE"
+            <> help "Device name to use in connections with remote hosts and controller"
+        )
   highlyAvailable <-
     switch
       ( long "ha"
@@ -236,7 +249,7 @@ coreChatOptsP appDir defaultDbName = do
               requiredHostMode,
               smpProxyMode_,
               smpProxyFallback_,
-              smpWebPort,
+              smpWebPortServers,
               tcpTimeout_ = Just $ useTcpTimeout socksProxy t,
               logTLSErrors
             },
@@ -246,6 +259,7 @@ coreChatOptsP appDir defaultDbName = do
         logAgent = if logAgent || logLevel == CLLDebug then Just $ agentLogLevel logLevel else Nothing,
         logFile,
         tbqSize,
+        deviceName,
         highlyAvailable,
         yesToUpMigrations
       }
@@ -260,13 +274,6 @@ defaultHostMode = \case
 chatOptsP :: FilePath -> FilePath -> Parser ChatOpts
 chatOptsP appDir defaultDbName = do
   coreOptions <- coreChatOptsP appDir defaultDbName
-  deviceName <-
-    optional $
-      strOption
-        ( long "device-name"
-            <> metavar "DEVICE"
-            <> help "Device name to use in connections with remote hosts and controller"
-        )
   chatCmd <-
     strOption
       ( long "execute"
@@ -356,7 +363,6 @@ chatOptsP appDir defaultDbName = do
   pure
     ChatOpts
       { coreOptions,
-        deviceName,
         chatCmd,
         chatCmdDelay,
         chatCmdLog,
diff --git a/src/Simplex/Chat/Options/Postgres.hs b/src/Simplex/Chat/Options/Postgres.hs
index b174ecd02e..f7c429e93e 100644
--- a/src/Simplex/Chat/Options/Postgres.hs
+++ b/src/Simplex/Chat/Options/Postgres.hs
@@ -7,11 +7,14 @@ module Simplex.Chat.Options.Postgres where
 import qualified Data.ByteString.Char8 as B
 import Foreign.C.String
 import Options.Applicative
+import Numeric.Natural (Natural)
 import Simplex.Messaging.Agent.Store.Interface (DBOpts (..))
 
 data ChatDbOpts = ChatDbOpts
   { dbConnstr :: String,
-    dbSchemaPrefix :: String
+    dbSchemaPrefix :: String,
+    dbPoolSize :: Natural,
+    dbCreateSchema :: Bool
   }
 
 chatDbOptsP :: FilePath -> String -> Parser ChatDbOpts
@@ -33,16 +36,32 @@ chatDbOptsP _appDir defaultDbName = do
           <> value "simplex_v1"
           <> showDefault
       )
-  pure ChatDbOpts {dbConnstr, dbSchemaPrefix}
+  dbPoolSize <-
+    option
+      auto
+      ( long "pool-size"
+          <> metavar "DB_POOL_SIZE"
+          <> help "Database connection pool size"
+          <> value 1
+          <> showDefault
+      )
+  dbCreateSchema <-
+    switch
+      ( long "create-schema"
+          <> help "Create database schema when it does not exist"
+      )
+  pure ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema}
 
 dbString :: ChatDbOpts -> String
 dbString ChatDbOpts {dbConnstr} = dbConnstr
 
 toDBOpts :: ChatDbOpts -> String -> Bool -> DBOpts
-toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix} dbSuffix _keepKey =
+toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema} dbSuffix _keepKey =
   DBOpts
     { connstr = B.pack dbConnstr,
-      schema = if null dbSchemaPrefix then "simplex_v1" <> dbSuffix else dbSchemaPrefix <> dbSuffix
+      schema = B.pack $ if null dbSchemaPrefix then "simplex_v1" <> dbSuffix else dbSchemaPrefix <> dbSuffix,
+      poolSize = dbPoolSize,
+      createSchema = dbCreateSchema
     }
 
 chatSuffix :: String
@@ -58,11 +77,13 @@ mobileDbOpts schemaPrefix connstr = do
   pure $
     ChatDbOpts
       { dbConnstr,
-        dbSchemaPrefix
+        dbSchemaPrefix,
+        dbPoolSize = 1,
+        dbCreateSchema = True
       }
 
 removeDbKey :: ChatDbOpts -> ChatDbOpts
 removeDbKey = id
 
 errorDbStr :: DBOpts -> String
-errorDbStr DBOpts {schema} = schema
+errorDbStr DBOpts {schema} = B.unpack schema
diff --git a/src/Simplex/Chat/Options/SQLite.hs b/src/Simplex/Chat/Options/SQLite.hs
index 11eaf7e58c..0507076613 100644
--- a/src/Simplex/Chat/Options/SQLite.hs
+++ b/src/Simplex/Chat/Options/SQLite.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Options.SQLite where
 
@@ -11,11 +12,13 @@ import qualified Data.ByteString.Char8 as B
 import Foreign.C.String
 import Options.Applicative
 import Simplex.Messaging.Agent.Store.Interface (DBOpts (..))
+import Simplex.Messaging.Agent.Store.SQLite.DB (TrackQueries (..))
 import System.FilePath (combine)
 
 data ChatDbOpts = ChatDbOpts
   { dbFilePrefix :: String,
     dbKey :: ScrubbedBytes,
+    trackQueries :: TrackQueries,
     vacuumOnMigration :: Bool
   }
 
@@ -43,17 +46,24 @@ chatDbOptsP appDir defaultDbName = do
       ( long "disable-vacuum"
           <> help "Do not vacuum database after migrations"
       )
-  pure ChatDbOpts {dbFilePrefix, dbKey, vacuumOnMigration = not disableVacuum}
+  pure
+    ChatDbOpts
+      { dbFilePrefix,
+        dbKey,
+        trackQueries = TQSlow 5000, -- 5ms
+        vacuumOnMigration = not disableVacuum
+      }
 
 dbString :: ChatDbOpts -> String
 dbString ChatDbOpts {dbFilePrefix} = dbFilePrefix <> "_chat.db, " <> dbFilePrefix <> "_agent.db"
 
 toDBOpts :: ChatDbOpts -> String -> Bool -> DBOpts
-toDBOpts ChatDbOpts {dbFilePrefix, dbKey, vacuumOnMigration} dbSuffix keepKey = do
+toDBOpts ChatDbOpts {dbFilePrefix, dbKey, trackQueries, vacuumOnMigration} dbSuffix keepKey = do
   DBOpts
     { dbFilePath = dbFilePrefix <> dbSuffix,
       dbKey,
       keepKey,
+      track = trackQueries,
       vacuum = vacuumOnMigration
     }
 
@@ -71,18 +81,14 @@ mobileDbOpts fp key = do
     ChatDbOpts
       { dbFilePrefix,
         dbKey,
+        trackQueries = TQSlow 5000, -- 5ms
         vacuumOnMigration = True
       }
 
 -- used to create new chat controller,
 -- at that point database is already opened, and the key in options is not used
 removeDbKey :: ChatDbOpts -> ChatDbOpts
-removeDbKey ChatDbOpts {dbFilePrefix, vacuumOnMigration} =
-  ChatDbOpts
-    { dbFilePrefix,
-      dbKey = "",
-      vacuumOnMigration
-    }
+removeDbKey opts = opts {dbKey = ""} :: ChatDbOpts
 
 errorDbStr :: DBOpts -> String
 errorDbStr DBOpts {dbFilePath} = dbFilePath
diff --git a/src/Simplex/Chat/ProfileGenerator.hs b/src/Simplex/Chat/ProfileGenerator.hs
index 95f5f16207..5b6c9222cc 100644
--- a/src/Simplex/Chat/ProfileGenerator.hs
+++ b/src/Simplex/Chat/ProfileGenerator.hs
@@ -1492,7 +1492,6 @@ adjectives =
     "Recommendable",
     "Rectangular",
     "Recuperative",
-    "Red",
     "Refined",
     "Reflecting",
     "Reflective",
@@ -2929,7 +2928,6 @@ nouns =
     "Sister",
     "Size",
     "Skill",
-    "Skin",
     "Skipper",
     "Sleek",
     "Slick",
diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs
index 9cbc63b0e2..151b1b0d27 100644
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -33,8 +33,11 @@ import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import Data.ByteString.Internal (c2w, w2c)
 import qualified Data.ByteString.Lazy.Char8 as LB
+import Data.Either (fromRight)
 import Data.List.NonEmpty (NonEmpty (..))
 import qualified Data.List.NonEmpty as L
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as M
 import Data.Maybe (fromMaybe, mapMaybe)
 import Data.String
 import Data.Text (Text)
@@ -50,11 +53,12 @@ import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.Messaging.Agent.Protocol (VersionSMPA, pqdrSMPAgentVersion)
+import Simplex.Messaging.Agent.Store.DB (fromTextField_)
 import qualified Simplex.Messaging.Agent.Store.DB as DB
 import Simplex.Messaging.Compression (Compressed, compress1, decompress1)
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, fromTextField_, fstToLower, parseAll, sumTypeJSON, taggedObjectJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, fstToLower, parseAll, sumTypeJSON, taggedObjectJSON)
 import Simplex.Messaging.Protocol (MsgBody)
 import Simplex.Messaging.Util (decodeJSON, eitherToMaybe, encodeJSON, safeDecodeUtf8, (<$?>))
 import Simplex.Messaging.Version hiding (version)
@@ -72,12 +76,14 @@ import Simplex.Messaging.Version hiding (version)
 -- 10 - business chats (2024-11-29)
 -- 11 - fix profile update in business chats (2024-12-05)
 -- 12 - support sending and receiving content reports (2025-01-03)
+-- 14 - support sending and receiving group join rejection (2025-02-24)
+-- 15 - support specifying message scopes for group messages (2025-03-12)
 
 -- This should not be used directly in code, instead use `maxVersion chatVRange` from ChatConfig.
 -- This indirection is needed for backward/forward compatibility testing.
 -- Testing with real app versions is still needed, as tests use the current code with different version ranges, not the old code.
 currentChatVersion :: VersionChat
-currentChatVersion = VersionChat 12
+currentChatVersion = VersionChat 15
 
 -- This should not be used directly in code, instead use `chatVRange` from ChatConfig (see comment above)
 supportedChatVRange :: VersionRangeChat
@@ -128,6 +134,14 @@ businessChatPrefsVersion = VersionChat 11
 contentReportsVersion :: VersionChat
 contentReportsVersion = VersionChat 12
 
+-- support sending and receiving group join rejection (XGrpLinkReject)
+groupJoinRejectVersion :: VersionChat
+groupJoinRejectVersion = VersionChat 14
+
+-- support group knocking (MsgScope)
+groupKnockingVersion :: VersionChat
+groupKnockingVersion = VersionChat 15
+
 agentToChatVersion :: VersionSMPA -> VersionChat
 agentToChatVersion v
   | v < pqdrSMPAgentVersion = initialChatVersion
@@ -234,6 +248,12 @@ instance ToJSON SharedMsgId where
   toJSON = strToJSON
   toEncoding = strToJEncoding
 
+data MsgScope
+  = MSMember {memberId :: MemberId} -- Admins can use any member id; members can use only their own id
+  deriving (Eq, Show)
+
+$(JQ.deriveJSON (taggedObjectJSON $ dropPrefix "MS") ''MsgScope)
+
 $(JQ.deriveJSON defaultJSON ''AppMessageJson)
 
 data MsgRef = MsgRef
@@ -310,7 +330,7 @@ data AChatMessage = forall e. MsgEncodingI e => ACMsg (SMsgEncoding e) (ChatMess
 data ChatMsgEvent (e :: MsgEncoding) where
   XMsgNew :: MsgContainer -> ChatMsgEvent 'Json
   XMsgFileDescr :: {msgId :: SharedMsgId, fileDescr :: FileDescr} -> ChatMsgEvent 'Json
-  XMsgUpdate :: {msgId :: SharedMsgId, content :: MsgContent, ttl :: Maybe Int, live :: Maybe Bool} -> ChatMsgEvent 'Json
+  XMsgUpdate :: {msgId :: SharedMsgId, content :: MsgContent, mentions :: Map MemberName MsgMention, ttl :: Maybe Int, live :: Maybe Bool, scope :: Maybe MsgScope} -> ChatMsgEvent 'Json
   XMsgDel :: SharedMsgId -> Maybe MemberId -> ChatMsgEvent 'Json
   XMsgDeleted :: ChatMsgEvent 'Json
   XMsgReact :: {msgId :: SharedMsgId, memberId :: Maybe MemberId, reaction :: MsgReaction, add :: Bool} -> ChatMsgEvent 'Json
@@ -324,8 +344,10 @@ data ChatMsgEvent (e :: MsgEncoding) where
   XGrpInv :: GroupInvitation -> ChatMsgEvent 'Json
   XGrpAcpt :: MemberId -> ChatMsgEvent 'Json
   XGrpLinkInv :: GroupLinkInvitation -> ChatMsgEvent 'Json
+  XGrpLinkReject :: GroupLinkRejection -> ChatMsgEvent 'Json
   XGrpLinkMem :: Profile -> ChatMsgEvent 'Json
-  XGrpMemNew :: MemberInfo -> ChatMsgEvent 'Json
+  XGrpLinkAcpt :: GroupAcceptance -> GroupMemberRole -> MemberId -> ChatMsgEvent 'Json
+  XGrpMemNew :: MemberInfo -> Maybe MsgScope -> ChatMsgEvent 'Json
   XGrpMemIntro :: MemberInfo -> Maybe MemberRestrictions -> ChatMsgEvent 'Json
   XGrpMemInv :: MemberId -> IntroInvitation -> ChatMsgEvent 'Json
   XGrpMemFwd :: MemberInfo -> IntroInvitation -> ChatMsgEvent 'Json
@@ -334,12 +356,12 @@ data ChatMsgEvent (e :: MsgEncoding) where
   XGrpMemRestrict :: MemberId -> MemberRestrictions -> ChatMsgEvent 'Json
   XGrpMemCon :: MemberId -> ChatMsgEvent 'Json
   XGrpMemConAll :: MemberId -> ChatMsgEvent 'Json -- TODO not implemented
-  XGrpMemDel :: MemberId -> ChatMsgEvent 'Json
+  XGrpMemDel :: MemberId -> Bool -> ChatMsgEvent 'Json
   XGrpLeave :: ChatMsgEvent 'Json
   XGrpDel :: ChatMsgEvent 'Json
   XGrpInfo :: GroupProfile -> ChatMsgEvent 'Json
   XGrpPrefs :: GroupPreferences -> ChatMsgEvent 'Json
-  XGrpDirectInv :: ConnReqInvitation -> Maybe MsgContent -> ChatMsgEvent 'Json
+  XGrpDirectInv :: ConnReqInvitation -> Maybe MsgContent -> Maybe MsgScope -> ChatMsgEvent 'Json
   XGrpMsgForward :: MemberId -> ChatMessage 'Json -> UTCTime -> ChatMsgEvent 'Json
   XInfoProbe :: Probe -> ChatMsgEvent 'Json
   XInfoProbeCheck :: ProbeHash -> ChatMsgEvent 'Json
@@ -372,10 +394,10 @@ isForwardedGroupMsg ev = case ev of
   XMsgReact {} -> True
   XFileCancel _ -> True
   XInfo _ -> True
-  XGrpMemNew _ -> True
+  XGrpMemNew {} -> True
   XGrpMemRole {} -> True
   XGrpMemRestrict {} -> True
-  XGrpMemDel _ -> True -- TODO there should be a special logic when deleting host member (e.g., host forwards it before deleting connections)
+  XGrpMemDel {} -> True -- TODO there should be a special logic when deleting host member (e.g., host forwards it before deleting connections)
   XGrpLeave -> True
   XGrpDel -> True -- TODO there should be a special logic - host should forward before deleting connections
   XGrpInfo _ -> True
@@ -388,19 +410,34 @@ forwardedGroupMsg msg@ChatMessage {chatMsgEvent} = case encoding @e of
   _ -> Nothing
 
 -- applied after checking forwardedGroupMsg and building list of group members to forward to, see Chat;
+--
 -- this filters out members if any of forwarded events in batch is an XGrpMemRestrict event referring to them,
 -- but practically XGrpMemRestrict is not batched with other events so it wouldn't prevent forwarding of other events
--- to these members
+-- to these members;
+--
+-- same for reports (MCReport) - they are not batched with other events, so we can safely filter out
+-- members with role less than moderator when forwarding
 forwardedToGroupMembers :: forall e. MsgEncodingI e => [GroupMember] -> NonEmpty (ChatMessage e) -> [GroupMember]
 forwardedToGroupMembers ms forwardedMsgs =
-  filter (\GroupMember {memberId} -> memberId `notElem` restrictMemberIds) ms
+  filter forwardToMember ms
   where
+    forwardToMember GroupMember {memberId, memberRole} =
+      (memberId `notElem` restrictMemberIds)
+        && (not hasReport || memberRole >= GRModerator)
     restrictMemberIds = mapMaybe restrictMemberId $ L.toList forwardedMsgs
     restrictMemberId ChatMessage {chatMsgEvent} = case encoding @e of
       SJson -> case chatMsgEvent of
         XGrpMemRestrict mId _ -> Just mId
         _ -> Nothing
       _ -> Nothing
+    hasReport = any isReportEvent forwardedMsgs
+    isReportEvent ChatMessage {chatMsgEvent} = case encoding @e of
+      SJson -> case chatMsgEvent of
+        XMsgNew mc -> case mcExtMsgContent mc of
+          ExtMsgContent {content = MCReport {}} -> True
+          _ -> False
+        _ -> False
+      _ -> False
 
 data MsgReaction = MREmoji {emoji :: MREmojiChar} | MRUnknown {tag :: Text, json :: J.Object}
   deriving (Eq, Show)
@@ -408,6 +445,13 @@ data MsgReaction = MREmoji {emoji :: MREmojiChar} | MRUnknown {tag :: Text, json
 emojiTag :: IsString a => a
 emojiTag = "emoji"
 
+knownReaction :: MsgReaction -> Either String MsgReaction
+knownReaction = \case
+  r@MREmoji {} -> Right r
+  MRUnknown {} -> Left "unknown MsgReaction"
+
+-- parseJSON for MsgReaction parses unknown emoji reactions as MRUnknown with type "emoji",
+-- allowing to add new emojis in a backwards compatible way - UI shows them as ?
 instance FromJSON MsgReaction where
   parseJSON (J.Object v) = do
     tag <- v .: "type"
@@ -531,13 +575,18 @@ mcExtMsgContent = \case
   MCComment _ c -> c
   MCForward c -> c
 
+isMCForward :: MsgContainer -> Bool
+isMCForward = \case
+  MCForward _ -> True
+  _ -> False
+
 data MsgContent
-  = MCText Text
+  = MCText {text :: Text}
   | MCLink {text :: Text, preview :: LinkPreview}
   | MCImage {text :: Text, image :: ImageData}
   | MCVideo {text :: Text, image :: ImageData, duration :: Int}
   | MCVoice {text :: Text, duration :: Int}
-  | MCFile Text
+  | MCFile {text :: Text}
   | MCReport {text :: Text, reason :: ReportReason}
   | MCUnknown {tag :: Text, text :: Text, json :: J.Object}
   deriving (Eq, Show)
@@ -578,6 +627,11 @@ isVoice = \case
   MCVoice {} -> True
   _ -> False
 
+isReport :: MsgContent -> Bool
+isReport = \case
+  MCReport {} -> True
+  _ -> False
+
 msgContentTag :: MsgContent -> MsgContentTag
 msgContentTag = \case
   MCText _ -> MCText_
@@ -589,9 +643,24 @@ msgContentTag = \case
   MCReport {} -> MCReport_
   MCUnknown {tag} -> MCUnknown_ tag
 
-data ExtMsgContent = ExtMsgContent {content :: MsgContent, file :: Maybe FileInvitation, ttl :: Maybe Int, live :: Maybe Bool}
+data ExtMsgContent = ExtMsgContent
+  { content :: MsgContent,
+    -- the key used in mentions is a locally (per message) unique display name of member.
+    -- Suffixes _1, _2 should be appended to make names locally unique.
+    -- It should be done in the UI, as they will be part of the text, and validated in the API.
+    mentions :: Map MemberName MsgMention,
+    file :: Maybe FileInvitation,
+    ttl :: Maybe Int,
+    live :: Maybe Bool,
+    scope :: Maybe MsgScope
+  }
   deriving (Eq, Show)
 
+data MsgMention = MsgMention {memberId :: MemberId}
+  deriving (Eq, Show)
+
+$(JQ.deriveJSON defaultJSON ''MsgMention)
+
 $(JQ.deriveJSON defaultJSON ''QuotedMsg)
 
 -- this limit reserves space for metadata in forwarded messages
@@ -657,10 +726,17 @@ parseMsgContainer v =
     <|> (MCForward <$> ((v .: "forward" :: JT.Parser J.Object) *> mc))
     <|> MCSimple <$> mc
   where
-    mc = ExtMsgContent <$> v .: "content" <*> v .:? "file" <*> v .:? "ttl" <*> v .:? "live"
+    mc = do
+      content <- v .: "content"
+      file <- v .:? "file"
+      ttl <- v .:? "ttl"
+      live <- v .:? "live"
+      mentions <- fromMaybe M.empty <$> (v .:? "mentions")
+      scope <- v .:? "scope"
+      pure ExtMsgContent {content, mentions, file, ttl, live, scope}
 
 extMsgContent :: MsgContent -> Maybe FileInvitation -> ExtMsgContent
-extMsgContent mc file = ExtMsgContent mc file Nothing Nothing
+extMsgContent mc file = ExtMsgContent mc M.empty file Nothing Nothing Nothing
 
 justTrue :: Bool -> Maybe Bool
 justTrue True = Just True
@@ -709,7 +785,12 @@ msgContainerJSON = \case
   MCSimple mc -> o $ msgContent mc
   where
     o = JM.fromList
-    msgContent (ExtMsgContent c file ttl live) = ("file" .=? file) $ ("ttl" .=? ttl) $ ("live" .=? live) ["content" .= c]
+    msgContent ExtMsgContent {content, mentions, file, ttl, live, scope} =
+      ("file" .=? file) $ ("ttl" .=? ttl) $ ("live" .=? live) $ ("mentions" .=? nonEmptyMap mentions) $ ("scope" .=? scope) ["content" .= content]
+
+nonEmptyMap :: Map k v -> Maybe (Map k v)
+nonEmptyMap m = if M.null m then Nothing else Just m
+{-# INLINE nonEmptyMap #-}
 
 instance ToJSON MsgContent where
   toJSON = \case
@@ -756,7 +837,9 @@ data CMEventTag (e :: MsgEncoding) where
   XGrpInv_ :: CMEventTag 'Json
   XGrpAcpt_ :: CMEventTag 'Json
   XGrpLinkInv_ :: CMEventTag 'Json
+  XGrpLinkReject_ :: CMEventTag 'Json
   XGrpLinkMem_ :: CMEventTag 'Json
+  XGrpLinkAcpt_ :: CMEventTag 'Json
   XGrpMemNew_ :: CMEventTag 'Json
   XGrpMemIntro_ :: CMEventTag 'Json
   XGrpMemInv_ :: CMEventTag 'Json
@@ -807,7 +890,9 @@ instance MsgEncodingI e => StrEncoding (CMEventTag e) where
     XGrpInv_ -> "x.grp.inv"
     XGrpAcpt_ -> "x.grp.acpt"
     XGrpLinkInv_ -> "x.grp.link.inv"
+    XGrpLinkReject_ -> "x.grp.link.reject"
     XGrpLinkMem_ -> "x.grp.link.mem"
+    XGrpLinkAcpt_ -> "x.grp.link.acpt"
     XGrpMemNew_ -> "x.grp.mem.new"
     XGrpMemIntro_ -> "x.grp.mem.intro"
     XGrpMemInv_ -> "x.grp.mem.inv"
@@ -859,7 +944,9 @@ instance StrEncoding ACMEventTag where
         "x.grp.inv" -> XGrpInv_
         "x.grp.acpt" -> XGrpAcpt_
         "x.grp.link.inv" -> XGrpLinkInv_
+        "x.grp.link.reject" -> XGrpLinkReject_
         "x.grp.link.mem" -> XGrpLinkMem_
+        "x.grp.link.acpt" -> XGrpLinkAcpt_
         "x.grp.mem.new" -> XGrpMemNew_
         "x.grp.mem.intro" -> XGrpMemIntro_
         "x.grp.mem.inv" -> XGrpMemInv_
@@ -907,8 +994,10 @@ toCMEventTag msg = case msg of
   XGrpInv _ -> XGrpInv_
   XGrpAcpt _ -> XGrpAcpt_
   XGrpLinkInv _ -> XGrpLinkInv_
+  XGrpLinkReject _ -> XGrpLinkReject_
   XGrpLinkMem _ -> XGrpLinkMem_
-  XGrpMemNew _ -> XGrpMemNew_
+  XGrpLinkAcpt {} -> XGrpLinkAcpt_
+  XGrpMemNew {} -> XGrpMemNew_
   XGrpMemIntro _ _ -> XGrpMemIntro_
   XGrpMemInv _ _ -> XGrpMemInv_
   XGrpMemFwd _ _ -> XGrpMemFwd_
@@ -917,12 +1006,12 @@ toCMEventTag msg = case msg of
   XGrpMemRestrict _ _ -> XGrpMemRestrict_
   XGrpMemCon _ -> XGrpMemCon_
   XGrpMemConAll _ -> XGrpMemConAll_
-  XGrpMemDel _ -> XGrpMemDel_
+  XGrpMemDel {} -> XGrpMemDel_
   XGrpLeave -> XGrpLeave_
   XGrpDel -> XGrpDel_
   XGrpInfo _ -> XGrpInfo_
   XGrpPrefs _ -> XGrpPrefs_
-  XGrpDirectInv _ _ -> XGrpDirectInv_
+  XGrpDirectInv {} -> XGrpDirectInv_
   XGrpMsgForward {} -> XGrpMsgForward_
   XInfoProbe _ -> XInfoProbe_
   XInfoProbeCheck _ -> XInfoProbeCheck_
@@ -994,7 +1083,14 @@ appJsonToCM AppMessageJson {v, msgId, event, params} = do
     msg = \case
       XMsgNew_ -> XMsgNew <$> JT.parseEither parseMsgContainer params
       XMsgFileDescr_ -> XMsgFileDescr <$> p "msgId" <*> p "fileDescr"
-      XMsgUpdate_ -> XMsgUpdate <$> p "msgId" <*> p "content" <*> opt "ttl" <*> opt "live"
+      XMsgUpdate_ -> do
+        msgId' <- p "msgId"
+        content <- p "content"
+        mentions <- fromMaybe M.empty <$> opt "mentions"
+        ttl <- opt "ttl"
+        live <- opt "live"
+        scope <- opt "scope"
+        pure XMsgUpdate {msgId = msgId', content, mentions, ttl, live, scope}
       XMsgDel_ -> XMsgDel <$> p "msgId" <*> opt "memberId"
       XMsgDeleted_ -> pure XMsgDeleted
       XMsgReact_ -> XMsgReact <$> p "msgId" <*> opt "memberId" <*> p "reaction" <*> p "add"
@@ -1008,8 +1104,10 @@ appJsonToCM AppMessageJson {v, msgId, event, params} = do
       XGrpInv_ -> XGrpInv <$> p "groupInvitation"
       XGrpAcpt_ -> XGrpAcpt <$> p "memberId"
       XGrpLinkInv_ -> XGrpLinkInv <$> p "groupLinkInvitation"
+      XGrpLinkReject_ -> XGrpLinkReject <$> p "groupLinkRejection"
       XGrpLinkMem_ -> XGrpLinkMem <$> p "profile"
-      XGrpMemNew_ -> XGrpMemNew <$> p "memberInfo"
+      XGrpLinkAcpt_ -> XGrpLinkAcpt <$> p "acceptance" <*> p "role" <*> p "memberId"
+      XGrpMemNew_ -> XGrpMemNew <$> p "memberInfo" <*> opt "scope"
       XGrpMemIntro_ -> XGrpMemIntro <$> p "memberInfo" <*> opt "memberRestrictions"
       XGrpMemInv_ -> XGrpMemInv <$> p "memberId" <*> p "memberIntro"
       XGrpMemFwd_ -> XGrpMemFwd <$> p "memberInfo" <*> p "memberIntro"
@@ -1018,12 +1116,12 @@ appJsonToCM AppMessageJson {v, msgId, event, params} = do
       XGrpMemRestrict_ -> XGrpMemRestrict <$> p "memberId" <*> p "memberRestrictions"
       XGrpMemCon_ -> XGrpMemCon <$> p "memberId"
       XGrpMemConAll_ -> XGrpMemConAll <$> p "memberId"
-      XGrpMemDel_ -> XGrpMemDel <$> p "memberId"
+      XGrpMemDel_ -> XGrpMemDel <$> p "memberId" <*> Right (fromRight False $ p "messages")
       XGrpLeave_ -> pure XGrpLeave
       XGrpDel_ -> pure XGrpDel
       XGrpInfo_ -> XGrpInfo <$> p "groupProfile"
       XGrpPrefs_ -> XGrpPrefs <$> p "groupPreferences"
-      XGrpDirectInv_ -> XGrpDirectInv <$> p "connReq" <*> opt "content"
+      XGrpDirectInv_ -> XGrpDirectInv <$> p "connReq" <*> opt "content" <*> opt "scope"
       XGrpMsgForward_ -> XGrpMsgForward <$> p "memberId" <*> p "msg" <*> p "msgTs"
       XInfoProbe_ -> XInfoProbe <$> p "probe"
       XInfoProbeCheck_ -> XInfoProbeCheck <$> p "probeHash"
@@ -1056,7 +1154,7 @@ chatToAppMessage ChatMessage {chatVRange, msgId, chatMsgEvent} = case encoding @
     params = \case
       XMsgNew container -> msgContainerJSON container
       XMsgFileDescr msgId' fileDescr -> o ["msgId" .= msgId', "fileDescr" .= fileDescr]
-      XMsgUpdate msgId' content ttl live -> o $ ("ttl" .=? ttl) $ ("live" .=? live) ["msgId" .= msgId', "content" .= content]
+      XMsgUpdate {msgId = msgId', content, mentions, ttl, live, scope} -> o $ ("ttl" .=? ttl) $ ("live" .=? live) $ ("scope" .=? scope) $ ("mentions" .=? nonEmptyMap mentions) ["msgId" .= msgId', "content" .= content]
       XMsgDel msgId' memberId -> o $ ("memberId" .=? memberId) ["msgId" .= msgId']
       XMsgDeleted -> JM.empty
       XMsgReact msgId' memberId reaction add -> o $ ("memberId" .=? memberId) ["msgId" .= msgId', "reaction" .= reaction, "add" .= add]
@@ -1070,8 +1168,10 @@ chatToAppMessage ChatMessage {chatVRange, msgId, chatMsgEvent} = case encoding @
       XGrpInv groupInv -> o ["groupInvitation" .= groupInv]
       XGrpAcpt memId -> o ["memberId" .= memId]
       XGrpLinkInv groupLinkInv -> o ["groupLinkInvitation" .= groupLinkInv]
+      XGrpLinkReject groupLinkRjct -> o ["groupLinkRejection" .= groupLinkRjct]
       XGrpLinkMem profile -> o ["profile" .= profile]
-      XGrpMemNew memInfo -> o ["memberInfo" .= memInfo]
+      XGrpLinkAcpt acceptance role memberId -> o ["acceptance" .= acceptance, "role" .= role, "memberId" .= memberId]
+      XGrpMemNew memInfo scope -> o $ ("scope" .=? scope) ["memberInfo" .= memInfo]
       XGrpMemIntro memInfo memRestrictions -> o $ ("memberRestrictions" .=? memRestrictions) ["memberInfo" .= memInfo]
       XGrpMemInv memId memIntro -> o ["memberId" .= memId, "memberIntro" .= memIntro]
       XGrpMemFwd memInfo memIntro -> o ["memberInfo" .= memInfo, "memberIntro" .= memIntro]
@@ -1080,12 +1180,12 @@ chatToAppMessage ChatMessage {chatVRange, msgId, chatMsgEvent} = case encoding @
       XGrpMemRestrict memId memRestrictions -> o ["memberId" .= memId, "memberRestrictions" .= memRestrictions]
       XGrpMemCon memId -> o ["memberId" .= memId]
       XGrpMemConAll memId -> o ["memberId" .= memId]
-      XGrpMemDel memId -> o ["memberId" .= memId]
+      XGrpMemDel memId messages -> o $ ("messages" .=? if messages then Just True else Nothing) ["memberId" .= memId]
       XGrpLeave -> JM.empty
       XGrpDel -> JM.empty
       XGrpInfo p -> o ["groupProfile" .= p]
       XGrpPrefs p -> o ["groupPreferences" .= p]
-      XGrpDirectInv connReq content -> o $ ("content" .=? content) ["connReq" .= connReq]
+      XGrpDirectInv connReq content scope -> o $ ("content" .=? content) $ ("scope" .=? scope) ["connReq" .= connReq]
       XGrpMsgForward memberId msg msgTs -> o ["memberId" .= memberId, "msg" .= msg, "msgTs" .= msgTs]
       XInfoProbe probe -> o ["probe" .= probe]
       XInfoProbeCheck probeHash -> o ["probeHash" .= probeHash]
diff --git a/src/Simplex/Chat/Remote.hs b/src/Simplex/Chat/Remote.hs
index a2eaad11fe..92b499d8ef 100644
--- a/src/Simplex/Chat/Remote.hs
+++ b/src/Simplex/Chat/Remote.hs
@@ -58,7 +58,7 @@ import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..))
 import qualified Simplex.Messaging.Crypto.File as CF
 import Simplex.Messaging.Encoding.String (StrEncoding (..))
 import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Transport (TLS, closeConnection, tlsUniq)
+import Simplex.Messaging.Transport (TLS, TransportPeer (..), closeConnection, tlsUniq)
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2ClientError, closeHTTP2Client)
 import Simplex.Messaging.Transport.HTTP2.Server (HTTP2Request (..))
 import Simplex.Messaging.Util
@@ -75,11 +75,11 @@ remoteFilesFolder = "simplex_v1_files"
 
 -- when acting as host
 minRemoteCtrlVersion :: AppVersion
-minRemoteCtrlVersion = AppVersion [6, 3, 0, 1]
+minRemoteCtrlVersion = AppVersion [6, 4, 0, 2]
 
 -- when acting as controller
 minRemoteHostVersion :: AppVersion
-minRemoteHostVersion = AppVersion [6, 3, 0, 1]
+minRemoteHostVersion = AppVersion [6, 4, 0, 2]
 
 currentAppVersion :: AppVersion
 currentAppVersion = AppVersion SC.version
@@ -184,7 +184,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
       action `catchChatError` \err -> do
         logError $ "startRemoteHost.waitForHostSession crashed: " <> tshow err
         readTVarIO rhKeyVar >>= cancelRemoteHostSession (Just (sessSeq, RHSRCrashed err))
-    waitForHostSession :: Maybe RemoteHostInfo -> RHKey -> SessionSeq -> Maybe RCCtrlAddress -> TVar RHKey -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> CM ()
+    waitForHostSession :: Maybe RemoteHostInfo -> RHKey -> SessionSeq -> Maybe RCCtrlAddress -> TVar RHKey -> RCStepTMVar (ByteString, TLS 'TServer, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> CM ()
     waitForHostSession remoteHost_ rhKey sseq rcAddr_ rhKeyVar vars = do
       (sessId, tls, vars') <- timeoutThrow (ChatErrorRemoteHost rhKey RHETimeout) 60000000 $ takeRCStep vars
       let sessionCode = verificationCode sessId
@@ -192,7 +192,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         RHSessionConnecting _inv rhs' -> Right ((), RHSessionPendingConfirmation sessionCode tls rhs')
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
       let rh_' = (\rh -> (rh :: RemoteHostInfo) {sessionState = Just RHSPendingConfirmation {sessionCode}}) <$> remoteHost_
-      toView CRRemoteHostSessionCode {remoteHost_ = rh_', sessionCode}
+      toView CEvtRemoteHostSessionCode {remoteHost_ = rh_', sessionCode}
       (RCHostSession {sessionKeys}, rhHello, pairing') <- timeoutThrow (ChatErrorRemoteHost rhKey RHETimeout) 60000000 $ takeRCStep vars'
       hostInfo@HostAppInfo {deviceName = hostDeviceName} <-
         liftError (ChatErrorRemoteHost rhKey) $ parseHostAppInfo rhHello
@@ -203,7 +203,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
       let rhKey' = RHId remoteHostId -- rhKey may be invalid after upserting on RHNew
       when (rhKey' /= rhKey) $ do
         atomically $ writeTVar rhKeyVar rhKey'
-        toView $ CRNewRemoteHost rhi
+        toView $ CEvtNewRemoteHost rhi
       -- set up HTTP transport and remote profile protocol
       disconnected <- toIO $ onDisconnected rhKey' sseq
       httpClient <- liftError' (httpError remoteHostId) $ attachRevHTTP2Client disconnected tls
@@ -213,7 +213,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         RHSessionConfirmed _ RHPendingSession {rchClient} -> Right ((), RHSessionConnected {rchClient, tls, rhClient, pollAction, storePath})
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
       chatWriteVar currentRemoteHost $ Just remoteHostId -- this is required for commands to be passed to remote host
-      toView $ CRRemoteHostConnected rhi {sessionState = Just RHSConnected {sessionCode}}
+      toView $ CEvtRemoteHostConnected rhi {sessionState = Just RHSConnected {sessionCode}}
     upsertRemoteHost :: RCHostPairing -> Maybe RemoteHostInfo -> Maybe RCCtrlAddress -> Text -> SessionSeq -> RemoteHostSessionState -> CM RemoteHostInfo
     upsertRemoteHost pairing'@RCHostPairing {knownHost = kh_} rhi_ rcAddr_ hostDeviceName sseq state = do
       KnownHostPairing {hostDhPubKey = hostDhPubKey'} <- maybe (throwError . ChatError $ CEInternalError "KnownHost is known after verification") pure kh_
@@ -235,7 +235,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
       oq <- asks outputQ
       forever $ do
         r_ <- liftRH rhId $ remoteRecv rhClient 10000000
-        forM r_ $ \r -> atomically $ writeTBQueue oq (Nothing, Just rhId, r)
+        forM r_ $ \r -> atomically $ writeTBQueue oq (Just rhId, r)
     httpError :: RemoteHostId -> HTTP2ClientError -> ChatError
     httpError rhId = ChatErrorRemoteHost (RHId rhId) . RHEProtocolError . RPEHTTP2 . tshow
 
@@ -271,7 +271,7 @@ cancelRemoteHostSession handlerInfo_ rhKey = do
   forM_ deregistered $ \session -> do
     liftIO $ cancelRemoteHost handlingError session `catchAny` (logError . tshow)
     forM_ (snd <$> handlerInfo_) $ \rhStopReason ->
-      toView CRRemoteHostStopped {remoteHostId_, rhsState = rhsSessionState session, rhStopReason}
+      toView CEvtRemoteHostStopped {remoteHostId_, rhsState = rhsSessionState session, rhStopReason}
   where
     handlingError = isJust handlerInfo_
     remoteHostId_ = case rhKey of
@@ -370,16 +370,17 @@ processRemoteCommand :: RemoteHostId -> RemoteHostClient -> ChatCommand -> ByteS
 processRemoteCommand remoteHostId c cmd s = case cmd of
   SendFile chatName f -> sendFile "/f" chatName f
   SendImage chatName f -> sendFile "/img" chatName f
-  _ -> liftRH remoteHostId $ remoteSend c s
+  _ -> chatRemoteSend s
   where
     sendFile cmdName chatName (CryptoFile path cfArgs) = do
       -- don't encrypt in host if already encrypted locally
       CryptoFile path' cfArgs' <- storeRemoteFile remoteHostId (cfArgs $> False) path
       let f = CryptoFile path' (cfArgs <|> cfArgs') -- use local or host encryption
-      liftRH remoteHostId $ remoteSend c $ B.unwords [cmdName, B.pack (chatNameStr chatName), cryptoFileStr f]
+      chatRemoteSend $ B.unwords [cmdName, B.pack (chatNameStr chatName), cryptoFileStr f]
     cryptoFileStr CryptoFile {filePath, cryptoArgs} =
       maybe "" (\(CFArgs key nonce) -> "key=" <> strEncode key <> " nonce=" <> strEncode nonce <> " ") cryptoArgs
         <> encodeUtf8 (T.pack filePath)
+    chatRemoteSend = either throwError pure <=< liftRH remoteHostId . remoteSend c
 
 liftRH :: RemoteHostId -> ExceptT RemoteProtocolError IO a -> CM a
 liftRH rhId = liftError (ChatErrorRemoteHost (RHId rhId) . RHEProtocolError)
@@ -417,7 +418,7 @@ findKnownRemoteCtrl = do
         Just rc -> pure rc
     atomically $ putTMVar foundCtrl (rc, inv)
     let compatible = isJust $ compatibleAppVersion hostAppVersionRange . appVersionRange =<< ctrlAppInfo_
-    toView CRRemoteCtrlFound {remoteCtrl = remoteCtrlInfo rc (Just RCSSearching), ctrlAppInfo_, appVersion = currentAppVersion, compatible}
+    toView CEvtRemoteCtrlFound {remoteCtrl = remoteCtrlInfo rc (Just RCSSearching), ctrlAppInfo_, appVersion = currentAppVersion, compatible}
   updateRemoteCtrlSession sseq $ \case
     RCSessionStarting -> Right RCSessionSearching {action, foundCtrl}
     _ -> Left $ ChatErrorRemoteCtrl RCEBadState
@@ -473,7 +474,7 @@ connectRemoteCtrl verifiedInv@(RCVerifiedInvitation inv@RCInvitation {ca, app})
   where
     validateRemoteCtrl RCInvitation {idkey} RemoteCtrl {ctrlPairing = RCCtrlPairing {idPubKey}} =
       unless (idkey == idPubKey) $ throwError $ ChatErrorRemoteCtrl $ RCEProtocolError $ PRERemoteControl RCEIdentity
-    waitForCtrlSession :: Maybe RemoteCtrl -> Text -> RCCtrlClient -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCCtrlSession, RCCtrlPairing)) -> CM ()
+    waitForCtrlSession :: Maybe RemoteCtrl -> Text -> RCCtrlClient -> RCStepTMVar (ByteString, TLS 'TClient, RCStepTMVar (RCCtrlSession, RCCtrlPairing)) -> CM ()
     waitForCtrlSession rc_ ctrlName rcsClient vars = do
       (uniq, tls, rcsWaitConfirmation) <- timeoutThrow (ChatErrorRemoteCtrl RCETimeout) networkIOTimeout $ takeRCStep vars
       let sessionCode = verificationCode uniq
@@ -482,7 +483,7 @@ connectRemoteCtrl verifiedInv@(RCVerifiedInvitation inv@RCInvitation {ca, app})
           let remoteCtrlId_ = remoteCtrlId' <$> rc_
            in Right RCSessionPendingConfirmation {remoteCtrlId_, ctrlDeviceName = ctrlName, rcsClient, tls, sessionCode, rcsWaitSession, rcsWaitConfirmation}
         _ -> Left $ ChatErrorRemoteCtrl RCEBadState
-      toView CRRemoteCtrlSessionCode {remoteCtrl_ = (`remoteCtrlInfo` Just RCSPendingConfirmation {sessionCode}) <$> rc_, sessionCode}
+      toView CEvtRemoteCtrlSessionCode {remoteCtrl_ = (`remoteCtrlInfo` Just RCSPendingConfirmation {sessionCode}) <$> rc_, sessionCode}
     checkAppVersion CtrlAppInfo {appVersionRange} =
       case compatibleAppVersion hostAppVersionRange appVersionRange of
         Just (AppCompatible v) -> pure v
@@ -496,7 +497,7 @@ parseCtrlAppInfo :: JT.Value -> CM CtrlAppInfo
 parseCtrlAppInfo ctrlAppInfo = do
   liftEitherWith (const $ ChatErrorRemoteCtrl RCEBadInvitation) $ JT.parseEither J.parseJSON ctrlAppInfo
 
-handleRemoteCommand :: (ByteString -> CM' ChatResponse) -> RemoteCrypto -> TBQueue ChatResponse -> HTTP2Request -> CM' ()
+handleRemoteCommand :: (ByteString -> CM' (Either ChatError ChatResponse)) -> RemoteCrypto -> TBQueue (Either ChatError ChatEvent) -> HTTP2Request -> CM' ()
 handleRemoteCommand execChatCommand encryption remoteOutputQ HTTP2Request {request, reqBody, sendResponse} = do
   logDebug "handleRemoteCommand"
   liftIO (tryRemoteError' parseRequest) >>= \case
@@ -510,7 +511,7 @@ handleRemoteCommand execChatCommand encryption remoteOutputQ HTTP2Request {reque
     parseRequest = do
       (rfKN, header, getNext) <- parseDecryptHTTP2Body encryption request reqBody
       (rfKN,getNext,) <$> liftEitherWith RPEInvalidJSON (J.eitherDecode header)
-    replyError = reply . RRChatResponse . CRChatCmdError Nothing
+    replyError = reply . RRChatResponse . RRError
     processCommand :: User -> C.SbKeyNonce -> GetChunk -> RemoteCommand -> CM ()
     processCommand user rfKN getNext = \case
       RCSend {command} -> lift $ handleSend execChatCommand command >>= reply
@@ -527,7 +528,7 @@ handleRemoteCommand execChatCommand encryption remoteOutputQ HTTP2Request {reque
           send resp
           attach sfKN send
           flush
-        Left e -> toView' . CRChatError Nothing . ChatErrorRemoteCtrl $ RCEProtocolError e
+        Left e -> eToView' $ ChatErrorRemoteCtrl $ RCEProtocolError e
 
 takeRCStep :: RCStepTMVar a -> CM a
 takeRCStep = liftError' (\e -> ChatErrorAgent {agentError = RCP e, connectionEntity_ = Nothing}) . atomically . takeTMVar
@@ -549,17 +550,17 @@ tryRemoteError' :: ExceptT RemoteProtocolError IO a -> IO (Either RemoteProtocol
 tryRemoteError' = tryAllErrors' (RPEException . tshow)
 {-# INLINE tryRemoteError' #-}
 
-handleSend :: (ByteString -> CM' ChatResponse) -> Text -> CM' RemoteResponse
+handleSend :: (ByteString -> CM' (Either ChatError ChatResponse)) -> Text -> CM' RemoteResponse
 handleSend execChatCommand command = do
   logDebug $ "Send: " <> tshow command
   -- execChatCommand checks for remote-allowed commands
   -- convert errors thrown in execChatCommand into error responses to prevent aborting the protocol wrapper
-  RRChatResponse <$> execChatCommand (encodeUtf8 command)
+  RRChatResponse . eitherToResult <$> execChatCommand (encodeUtf8 command)
 
-handleRecv :: Int -> TBQueue ChatResponse -> IO RemoteResponse
+handleRecv :: Int -> TBQueue (Either ChatError ChatEvent) -> IO RemoteResponse
 handleRecv time events = do
   logDebug $ "Recv: " <> tshow time
-  RRChatEvent <$> (timeout time . atomically $ readTBQueue events)
+  RRChatEvent . fmap eitherToResult <$> (timeout time . atomically $ readTBQueue events)
 
 -- TODO this command could remember stored files and return IDs to allow removing files that are not needed.
 -- Also, there should be some process removing unused files uploaded to remote host (possibly, all unused files).
@@ -614,7 +615,7 @@ remoteCtrlInfo RemoteCtrl {remoteCtrlId, ctrlDeviceName} sessionState =
   RemoteCtrlInfo {remoteCtrlId, ctrlDeviceName, sessionState}
 
 -- | Take a look at emoji of tlsunique, commit pairing, and start session server
-verifyRemoteCtrlSession :: (ByteString -> CM' ChatResponse) -> Text -> CM RemoteCtrlInfo
+verifyRemoteCtrlSession :: (ByteString -> CM' (Either ChatError ChatResponse)) -> Text -> CM RemoteCtrlInfo
 verifyRemoteCtrlSession execChatCommand sessCode' = do
   (sseq, client, ctrlName, sessionCode, vars) <-
     chatReadVar remoteCtrlSession >>= \case
@@ -675,7 +676,7 @@ cancelActiveRemoteCtrl handlerInfo_ = handleAny (logError . tshow) $ do
   forM_ session_ $ \session -> do
     liftIO $ cancelRemoteCtrl handlingError session
     forM_ (snd <$> handlerInfo_) $ \rcStopReason ->
-      toView CRRemoteCtrlStopped {rcsState = rcsSessionState session, rcStopReason}
+      toView CEvtRemoteCtrlStopped {rcsState = rcsSessionState session, rcStopReason}
   where
     handlingError = isJust handlerInfo_
 
diff --git a/src/Simplex/Chat/Remote/Protocol.hs b/src/Simplex/Chat/Remote/Protocol.hs
index 00fc56f897..207eade665 100644
--- a/src/Simplex/Chat/Remote/Protocol.hs
+++ b/src/Simplex/Chat/Remote/Protocol.hs
@@ -16,11 +16,11 @@ import Control.Monad.Except
 import Control.Monad.Reader
 import Crypto.Hash (SHA512)
 import qualified Crypto.Hash as CH
-import Data.Aeson ((.=))
+import Data.Aeson (FromJSON (..), ToJSON (..), (.=))
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Key as JK
 import qualified Data.Aeson.KeyMap as JM
-import Data.Aeson.TH (deriveJSON)
+import qualified Data.Aeson.TH as JQ
 import qualified Data.Aeson.Types as JT
 import qualified Data.ByteArray as BA
 import Data.ByteString (ByteString)
@@ -42,7 +42,7 @@ import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile (..))
 import Simplex.Messaging.Crypto.Lazy (LazyByteString)
 import Simplex.Messaging.Encoding
-import Simplex.Messaging.Parsers (dropPrefix, taggedObjectJSON, pattern SingleFieldJSONTag, pattern TaggedObjectJSONData, pattern TaggedObjectJSONTag)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, taggedObjectJSON, pattern SingleFieldJSONTag, pattern TaggedObjectJSONData, pattern TaggedObjectJSONTag)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport (TSbChainKeys)
 import Simplex.Messaging.Transport.Buffer (getBuffered)
@@ -64,16 +64,40 @@ data RemoteCommand
   deriving (Show)
 
 data RemoteResponse
-  = RRChatResponse {chatResponse :: ChatResponse}
-  | RRChatEvent {chatEvent :: Maybe ChatResponse} -- 'Nothing' on poll timeout
+  = RRChatResponse {chatResponse :: RRResult ChatResponse}
+  | RRChatEvent {chatEvent :: Maybe (RRResult ChatEvent)} -- 'Nothing' on poll timeout
   | RRFileStored {filePath :: String}
   | RRFile {fileSize :: Word32, fileDigest :: FileDigest} -- provides attachment , fileDigest :: FileDigest
   | RRProtocolError {remoteProcotolError :: RemoteProtocolError} -- The protocol error happened on the server side
   deriving (Show)
 
+data RRResult r
+  = RRResult {result :: r}
+  | RRError {error :: ChatError}
+  deriving (Show)
+
+resultToEither :: RRResult r -> Either ChatError r
+resultToEither = \case
+  RRResult r -> Right r
+  RRError e -> Left e
+{-# INLINE resultToEither #-}
+
+eitherToResult :: Either ChatError r -> RRResult r
+eitherToResult = either RRError RRResult
+{-# INLINE eitherToResult #-}
+
+$(pure [])
+
 -- Force platform-independent encoding as the types aren't UI-visible
-$(deriveJSON (taggedObjectJSON $ dropPrefix "RC") ''RemoteCommand)
-$(deriveJSON (taggedObjectJSON $ dropPrefix "RR") ''RemoteResponse)
+instance ToJSON r => ToJSON (RRResult r) where
+  toEncoding = $(JQ.mkToEncoding (defaultJSON {J.sumEncoding = J.UntaggedValue}) ''RRResult)
+  toJSON = $(JQ.mkToJSON (defaultJSON {J.sumEncoding = J.UntaggedValue}) ''RRResult)
+
+instance FromJSON r => FromJSON (RRResult r) where
+  parseJSON = $(JQ.mkParseJSON (defaultJSON {J.sumEncoding = J.UntaggedValue}) ''RRResult)
+
+$(JQ.deriveJSON (taggedObjectJSON $ dropPrefix "RC") ''RemoteCommand)
+$(JQ.deriveJSON (taggedObjectJSON $ dropPrefix "RR") ''RemoteResponse)
 
 -- * Client side / desktop
 
@@ -109,16 +133,16 @@ closeRemoteHostClient RemoteHostClient {httpClient} = closeHTTP2Client httpClien
 
 -- ** Commands
 
-remoteSend :: RemoteHostClient -> ByteString -> ExceptT RemoteProtocolError IO ChatResponse
+remoteSend :: RemoteHostClient -> ByteString -> ExceptT RemoteProtocolError IO (Either ChatError ChatResponse)
 remoteSend c cmd =
   sendRemoteCommand' c Nothing RCSend {command = decodeUtf8 cmd} >>= \case
-    RRChatResponse cr -> pure cr
+    RRChatResponse cr -> pure $ resultToEither cr
     r -> badResponse r
 
-remoteRecv :: RemoteHostClient -> Int -> ExceptT RemoteProtocolError IO (Maybe ChatResponse)
+remoteRecv :: RemoteHostClient -> Int -> ExceptT RemoteProtocolError IO (Maybe (Either ChatError ChatEvent))
 remoteRecv c ms =
   sendRemoteCommand' c Nothing RCRecv {wait = ms} >>= \case
-    RRChatEvent cr_ -> pure cr_
+    RRChatEvent cEvt_ -> pure $ resultToEither <$> cEvt_
     r -> badResponse r
 
 remoteStoreFile :: RemoteHostClient -> FilePath -> FilePath -> ExceptT RemoteProtocolError IO FilePath
@@ -172,7 +196,7 @@ convertJSON :: PlatformEncoding -> PlatformEncoding -> J.Value -> J.Value
 convertJSON _remote@PEKotlin _local@PEKotlin = id
 convertJSON PESwift PESwift = id
 convertJSON PESwift PEKotlin = owsf2tagged
-convertJSON PEKotlin PESwift = error "unsupported convertJSON: K/S" -- guarded by handshake
+convertJSON PEKotlin PESwift = Prelude.error "unsupported convertJSON: K/S" -- guarded by handshake
 
 -- | Convert swift single-field sum encoding into tagged/discriminator-field
 owsf2tagged :: J.Value -> J.Value
diff --git a/src/Simplex/Chat/Remote/RevHTTP.hs b/src/Simplex/Chat/Remote/RevHTTP.hs
index 4df5bcac2a..20484c0b10 100644
--- a/src/Simplex/Chat/Remote/RevHTTP.hs
+++ b/src/Simplex/Chat/Remote/RevHTTP.hs
@@ -8,18 +8,18 @@
 
 module Simplex.Chat.Remote.RevHTTP where
 
-import Simplex.Messaging.Transport (TLS)
+import Simplex.Messaging.Transport (TLS, TransportPeer (..))
 import Simplex.Messaging.Transport.HTTP2 (defaultHTTP2BufferSize, getHTTP2Body)
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client, HTTP2ClientError (..), attachHTTP2Client, bodyHeadSize, connTimeout, defaultHTTP2ClientConfig)
 import Simplex.Messaging.Transport.HTTP2.Server (HTTP2Request (..), runHTTP2ServerWith)
 import Simplex.RemoteControl.Discovery
 
-attachRevHTTP2Client :: IO () -> TLS -> IO (Either HTTP2ClientError HTTP2Client)
+attachRevHTTP2Client :: IO () -> TLS 'TServer -> IO (Either HTTP2ClientError HTTP2Client)
 attachRevHTTP2Client disconnected = attachHTTP2Client config ANY_ADDR_V4 "0" disconnected defaultHTTP2BufferSize
   where
     config = defaultHTTP2ClientConfig {bodyHeadSize = doNotPrefetchHead, connTimeout = maxBound}
 
-attachHTTP2Server :: TLS -> (HTTP2Request -> IO ()) -> IO ()
+attachHTTP2Server :: TLS 'TClient -> (HTTP2Request -> IO ()) -> IO ()
 attachHTTP2Server tls processRequest =
   runHTTP2ServerWith defaultHTTP2BufferSize ($ tls) $ \sessionId sessionALPN r sendResponse -> do
     reqBody <- getHTTP2Body r doNotPrefetchHead
diff --git a/src/Simplex/Chat/Remote/Types.hs b/src/Simplex/Chat/Remote/Types.hs
index a5396e7945..defbe7e72c 100644
--- a/src/Simplex/Chat/Remote/Types.hs
+++ b/src/Simplex/Chat/Remote/Types.hs
@@ -25,7 +25,7 @@ import Simplex.Chat.Types (verificationCode)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile)
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON)
-import Simplex.Messaging.Transport (TLS (..), TSbChainKeys (..))
+import Simplex.Messaging.Transport (TLS (..), TSbChainKeys (..), TransportPeer (..))
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.RemoteControl.Client
@@ -102,11 +102,11 @@ data RHPendingSession = RHPendingSession
 data RemoteHostSession
   = RHSessionStarting
   | RHSessionConnecting {invitation :: Text, rhPendingSession :: RHPendingSession}
-  | RHSessionPendingConfirmation {sessionCode :: Text, tls :: TLS, rhPendingSession :: RHPendingSession}
-  | RHSessionConfirmed {tls :: TLS, rhPendingSession :: RHPendingSession}
+  | RHSessionPendingConfirmation {sessionCode :: Text, tls :: TLS 'TServer, rhPendingSession :: RHPendingSession}
+  | RHSessionConfirmed {tls :: TLS 'TServer, rhPendingSession :: RHPendingSession}
   | RHSessionConnected
       { rchClient :: RCHostClient,
-        tls :: TLS,
+        tls :: TLS 'TServer,
         rhClient :: RemoteHostClient,
         pollAction :: Async (),
         storePath :: FilePath
@@ -128,7 +128,7 @@ rhsSessionState = \case
   RHSessionConfirmed {tls} -> RHSConfirmed {sessionCode = tlsSessionCode tls}
   RHSessionConnected {tls} -> RHSConnected {sessionCode = tlsSessionCode tls}
 
-tlsSessionCode :: TLS -> Text
+tlsSessionCode :: TLS p -> Text
 tlsSessionCode = verificationCode . tlsUniq
 
 data RemoteProtocolError
diff --git a/src/Simplex/Chat/Store.hs b/src/Simplex/Chat/Store.hs
index 03b4d7a640..a41641f88d 100644
--- a/src/Simplex/Chat/Store.hs
+++ b/src/Simplex/Chat/Store.hs
@@ -6,6 +6,7 @@ module Simplex.Chat.Store
     ChatLockEntity (..),
     UserMsgReceiptSettings (..),
     UserContactLink (..),
+    GroupLinkInfo (..),
     AutoAccept (..),
     createChatStore,
     migrations, -- used in tests
diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs
index 589b8e39f2..b69f6f646c 100644
--- a/src/Simplex/Chat/Store/Connections.hs
+++ b/src/Simplex/Chat/Store/Connections.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
@@ -12,6 +13,7 @@ module Simplex.Chat.Store.Connections
   ( getChatLockEntity,
     getConnectionEntity,
     getConnectionEntityByConnReq,
+    getConnectionEntityViaShortLink,
     getContactConnEntityByConnReqHash,
     getConnectionsToSubscribe,
     unsetConnectionToSubscribe,
@@ -33,7 +35,7 @@ import Simplex.Chat.Store.Groups
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
-import Simplex.Messaging.Agent.Protocol (ConnId)
+import Simplex.Messaging.Agent.Protocol (ConnId, ConnShortLink, ConnectionMode (..))
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, firstRow', maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -134,16 +136,21 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
                 SELECT
                   -- GroupInfo
                   g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
-                  g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-                  g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.custom_data, g.chat_item_ttl,
+                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+                  g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+                  g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
                   -- GroupInfo {membership}
                   mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
                   mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
                   -- GroupInfo {membership = GroupMember {memberProfile}}
                   pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+                  mu.created_at, mu.updated_at,
+                  mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
                   -- from GroupMember
                   m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences
+                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+                  m.created_at, m.updated_at,
+                  m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
                 FROM group_members m
                 JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
                 JOIN groups g ON g.group_id = m.group_id
@@ -202,6 +209,26 @@ getConnectionEntityByConnReq db vr user@User {userId} (cReqSchema1, cReqSchema2)
       DB.query db "SELECT agent_conn_id FROM connections WHERE user_id = ? AND conn_req_inv IN (?,?) LIMIT 1" (userId, cReqSchema1, cReqSchema2)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getConnectionEntity db vr user) connId_
 
+getConnectionEntityViaShortLink :: DB.Connection -> VersionRangeChat -> User -> ConnShortLink 'CMInvitation -> IO (Maybe (ConnReqInvitation, ConnectionEntity))
+getConnectionEntityViaShortLink db vr user@User {userId} shortLink = fmap eitherToMaybe $ runExceptT $ do
+  (cReq, connId) <- ExceptT getConnReqConnId
+  (cReq,) <$> getConnectionEntity db vr user connId
+  where
+    getConnReqConnId = 
+      firstRow' toConnReqConnId (SEInternalError "connection not found") $
+        DB.query
+          db
+          [sql|
+            SELECT conn_req_inv, agent_conn_id
+            FROM connections
+            WHERE user_id = ? AND short_link_inv = ? LIMIT 1
+          |]
+          (userId, shortLink)
+    -- cReq is Maybe - it is removed when connection is established
+    toConnReqConnId = \case
+      (Just cReq, connId) -> Right (cReq, connId)
+      _ -> Left $ SEInternalError "no connection request"
+
 -- search connection for connection plan:
 -- multiple connections can have same via_contact_uri_hash if request was repeated;
 -- this function searches for latest connection with contact so that "known contact" plan would be chosen;
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index 44ee662c75..4de832a8b1 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -35,7 +35,6 @@ module Simplex.Chat.Store.Direct
     deleteContactFiles,
     deleteContact,
     deleteContactWithoutGroups,
-    setContactDeleted,
     getDeletedContacts,
     getContactByName,
     getContact,
@@ -46,7 +45,6 @@ module Simplex.Chat.Store.Direct
     updateContactConnectionAlias,
     updatePCCIncognito,
     deletePCCIncognitoProfile,
-    updateContactUsed,
     updateContactUnreadChat,
     setUserChatsRead,
     updateContactStatus,
@@ -102,7 +100,7 @@ import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.UITheme
-import Simplex.Messaging.Agent.Protocol (ConnId, InvitationId, UserId)
+import Simplex.Messaging.Agent.Protocol (ConnId, CreatedConnLink (..), InvitationId, UserId)
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (Binary (..), BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -124,7 +122,7 @@ getPendingContactConnection db userId connId = do
     DB.query
       db
       [sql|
-        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, local_alias, created_at, updated_at
+        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
         FROM connections
         WHERE user_id = ?
           AND connection_id = ?
@@ -150,14 +148,14 @@ deletePendingContactConnection db userId connId =
     |]
     (userId, connId, ConnContact)
 
-createAddressContactConnection :: DB.Connection -> VersionRangeChat -> User -> Contact -> ConnId -> ConnReqUriHash -> XContactId -> Maybe Profile -> SubscriptionMode -> VersionChat -> PQSupport -> ExceptT StoreError IO (Int64, Contact)
-createAddressContactConnection db vr user@User {userId} Contact {contactId} acId cReqHash xContactId incognitoProfile subMode chatV pqSup = do
-  PendingContactConnection {pccConnId} <- liftIO $ createConnReqConnection db userId acId cReqHash xContactId incognitoProfile Nothing subMode chatV pqSup
+createAddressContactConnection :: DB.Connection -> VersionRangeChat -> User -> Contact -> ConnId -> ConnReqUriHash -> Maybe ShortLinkContact -> XContactId -> Maybe Profile -> SubscriptionMode -> VersionChat -> PQSupport -> ExceptT StoreError IO (Int64, Contact)
+createAddressContactConnection db vr user@User {userId} Contact {contactId} acId cReqHash sLnk xContactId incognitoProfile subMode chatV pqSup = do
+  PendingContactConnection {pccConnId} <- liftIO $ createConnReqConnection db userId acId cReqHash sLnk xContactId incognitoProfile Nothing subMode chatV pqSup
   liftIO $ DB.execute db "UPDATE connections SET contact_id = ? WHERE connection_id = ?" (contactId, pccConnId)
   (pccConnId,) <$> getContact db vr user contactId
 
-createConnReqConnection :: DB.Connection -> UserId -> ConnId -> ConnReqUriHash -> XContactId -> Maybe Profile -> Maybe GroupLinkId -> SubscriptionMode -> VersionChat -> PQSupport -> IO PendingContactConnection
-createConnReqConnection db userId acId cReqHash xContactId incognitoProfile groupLinkId subMode chatV pqSup = do
+createConnReqConnection :: DB.Connection -> UserId -> ConnId -> ConnReqUriHash -> Maybe ShortLinkContact -> XContactId -> Maybe Profile -> Maybe GroupLinkId -> SubscriptionMode -> VersionChat -> PQSupport -> IO PendingContactConnection
+createConnReqConnection db userId acId cReqHash sLnk xContactId incognitoProfile groupLinkId subMode chatV pqSup = do
   createdAt <- getCurrentTime
   customUserProfileId <- mapM (createIncognitoProfile_ db userId createdAt) incognitoProfile
   let pccConnStatus = ConnJoined
@@ -166,16 +164,16 @@ createConnReqConnection db userId acId cReqHash xContactId incognitoProfile grou
     [sql|
       INSERT INTO connections (
         user_id, agent_conn_id, conn_status, conn_type, contact_conn_initiated,
-        via_contact_uri_hash, xcontact_id, custom_user_profile_id, via_group_link, group_link_id,
+        via_contact_uri_hash, via_short_link_contact, xcontact_id, custom_user_profile_id, via_group_link, group_link_id,
         created_at, updated_at, to_subscribe, conn_chat_version, pq_support, pq_encryption
-      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
     |]
-    ( (userId, acId, pccConnStatus, ConnContact, BI True, cReqHash, xContactId)
+    ( (userId, acId, pccConnStatus, ConnContact, BI True, cReqHash, sLnk, xContactId)
         :. (customUserProfileId, BI (isJust groupLinkId), groupLinkId)
         :. (createdAt, createdAt, BI (subMode == SMOnlyCreate), chatV, pqSup, pqSup)
     )
   pccConnId <- insertedRowId db
-  pure PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = True, viaUserContactLink = Nothing, groupLinkId, customUserProfileId, connReqInv = Nothing, localAlias = "", createdAt, updatedAt = createdAt}
+  pure PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = True, viaUserContactLink = Nothing, groupLinkId, customUserProfileId, connLinkInv = Nothing, localAlias = "", createdAt, updatedAt = createdAt}
 
 getConnReqContactXContactId :: DB.Connection -> VersionRangeChat -> User -> ConnReqUriHash -> IO (Maybe Contact, Maybe XContactId)
 getConnReqContactXContactId db vr user@User {userId} cReqHash = do
@@ -216,8 +214,8 @@ getContactByConnReqHash db vr user@User {userId} cReqHash = do
         (userId, cReqHash, CSActive)
   mapM (addDirectChatTags db) ct_
 
-createDirectConnection :: DB.Connection -> User -> ConnId -> ConnReqInvitation -> ConnStatus -> Maybe Profile -> SubscriptionMode -> VersionChat -> PQSupport -> IO PendingContactConnection
-createDirectConnection db User {userId} acId cReq pccConnStatus incognitoProfile subMode chatV pqSup = do
+createDirectConnection :: DB.Connection -> User -> ConnId -> CreatedLinkInvitation -> ConnStatus -> Maybe Profile -> SubscriptionMode -> VersionChat -> PQSupport -> IO PendingContactConnection
+createDirectConnection db User {userId} acId ccLink@(CCLink cReq shortLinkInv) pccConnStatus incognitoProfile subMode chatV pqSup = do
   createdAt <- getCurrentTime
   customUserProfileId <- mapM (createIncognitoProfile_ db userId createdAt) incognitoProfile
   let contactConnInitiated = pccConnStatus == ConnNew
@@ -225,25 +223,25 @@ createDirectConnection db User {userId} acId cReq pccConnStatus incognitoProfile
     db
     [sql|
       INSERT INTO connections
-        (user_id, agent_conn_id, conn_req_inv, conn_status, conn_type, contact_conn_initiated, custom_user_profile_id,
+        (user_id, agent_conn_id, conn_req_inv, short_link_inv, conn_status, conn_type, contact_conn_initiated, custom_user_profile_id,
          created_at, updated_at, to_subscribe, conn_chat_version, pq_support, pq_encryption)
-      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
     |]
-    ( (userId, acId, cReq, pccConnStatus, ConnContact, BI contactConnInitiated, customUserProfileId)
+    ( (userId, acId, cReq, shortLinkInv, pccConnStatus, ConnContact, BI contactConnInitiated, customUserProfileId)
         :. (createdAt, createdAt, BI (subMode == SMOnlyCreate), chatV, pqSup, pqSup)
     )
   pccConnId <- insertedRowId db
-  pure PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = False, viaUserContactLink = Nothing, groupLinkId = Nothing, customUserProfileId, connReqInv = Just cReq, localAlias = "", createdAt, updatedAt = createdAt}
+  pure PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = False, viaUserContactLink = Nothing, groupLinkId = Nothing, customUserProfileId, connLinkInv = Just ccLink, localAlias = "", createdAt, updatedAt = createdAt}
 
 createIncognitoProfile :: DB.Connection -> User -> Profile -> IO Int64
 createIncognitoProfile db User {userId} p = do
   createdAt <- getCurrentTime
   createIncognitoProfile_ db userId createdAt p
 
-createDirectContact :: DB.Connection -> User -> Connection -> Profile -> Bool -> ExceptT StoreError IO Contact
-createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p@Profile {preferences} contactUsed = do
+createDirectContact :: DB.Connection -> User -> Connection -> Profile -> ExceptT StoreError IO Contact
+createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p@Profile {preferences} = do
   currentTs <- liftIO getCurrentTime
-  (localDisplayName, contactId, profileId) <- createContact_ db userId p localAlias Nothing currentTs contactUsed
+  (localDisplayName, contactId, profileId) <- createContact_ db userId p localAlias Nothing currentTs
   liftIO $ DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, currentTs, connId)
   let profile = toLocalProfile profileId p localAlias
       userPreferences = emptyChatPrefs
@@ -255,7 +253,7 @@ createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p
         profile,
         activeConn = Just conn,
         viaGroup = Nothing,
-        contactUsed,
+        contactUsed = True,
         contactStatus = CSActive,
         chatSettings = defaultChatSettings,
         userPreferences,
@@ -295,7 +293,7 @@ deleteContact db user@User {userId} ct@Contact {contactId, localDisplayName, act
   assertNotUser db user ct
   liftIO $ do
     DB.execute db "DELETE FROM chat_items WHERE user_id = ? AND contact_id = ?" (userId, contactId)
-    ctMember :: (Maybe ContactId) <- maybeFirstRow fromOnly $ DB.query db "SELECT contact_id FROM group_members WHERE user_id = ? AND contact_id = ? LIMIT 1" (userId, contactId)
+    ctMember :: (Maybe ContactId) <- maybeFirstRow fromOnly $ DB.query db "SELECT contact_id FROM group_members WHERE contact_id = ? LIMIT 1" (Only contactId)
     if isNothing ctMember
       then do
         deleteContactProfile_ db userId contactId
@@ -323,13 +321,7 @@ deleteContactWithoutGroups db user@User {userId} ct@Contact {contactId, localDis
       forM_ customUserProfileId $ \profileId ->
         deleteUnusedIncognitoProfileById_ db user profileId
 
-setContactDeleted :: DB.Connection -> User -> Contact -> ExceptT StoreError IO ()
-setContactDeleted db user@User {userId} ct@Contact {contactId} = do
-  assertNotUser db user ct
-  liftIO $ do
-    currentTs <- getCurrentTime
-    DB.execute db "UPDATE contacts SET deleted = 1, updated_at = ? WHERE user_id = ? AND contact_id = ?" (currentTs, userId, contactId)
-
+-- TODO remove in future versions: only used for legacy contact cleanup
 getDeletedContacts :: DB.Connection -> VersionRangeChat -> User -> IO [Contact]
 getDeletedContacts db vr user@User {userId} = do
   contactIds <- map fromOnly <$> DB.query db "SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 1" (Only userId)
@@ -471,11 +463,6 @@ deletePCCIncognitoProfile db User {userId} profileId =
     |]
     (userId, profileId)
 
-updateContactUsed :: DB.Connection -> User -> Contact -> IO ()
-updateContactUsed db User {userId} Contact {contactId} = do
-  updatedAt <- getCurrentTime
-  DB.execute db "UPDATE contacts SET contact_used = 1, updated_at = ? WHERE user_id = ? AND contact_id = ?" (updatedAt, userId, contactId)
-
 updateContactUnreadChat :: DB.Connection -> User -> Contact -> Bool -> IO ()
 updateContactUnreadChat db User {userId} Contact {contactId} unreadChat = do
   updatedAt <- getCurrentTime
@@ -917,7 +904,7 @@ getPendingContactConnections db User {userId} = do
     <$> DB.query
       db
       [sql|
-        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, local_alias, created_at, updated_at
+        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
         FROM connections
         WHERE user_id = ?
           AND conn_type = ?
@@ -1002,7 +989,7 @@ updateConnectionStatus_ :: DB.Connection -> Int64 -> ConnStatus -> IO ()
 updateConnectionStatus_ db connId connStatus = do
   currentTs <- getCurrentTime
   if connStatus == ConnReady
-    then DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ?, conn_req_inv = NULL WHERE connection_id = ?" (connStatus, currentTs, connId)
+    then DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ?, conn_req_inv = NULL, short_link_inv = NULL WHERE connection_id = ?" (connStatus, currentTs, connId)
     else DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ? WHERE connection_id = ?" (connStatus, currentTs, connId)
 
 updateContactSettings :: DB.Connection -> User -> Int64 -> ChatSettings -> IO ()
diff --git a/src/Simplex/Chat/Store/Files.hs b/src/Simplex/Chat/Store/Files.hs
index 95e169e400..81dbb4ca54 100644
--- a/src/Simplex/Chat/Store/Files.hs
+++ b/src/Simplex/Chat/Store/Files.hs
@@ -371,9 +371,9 @@ getXFTPRcvFileDBIds db aRcvFileId =
 
 toFileRef :: (FileTransferId, Maybe Int64, Maybe Int64, Maybe Int64) -> Either StoreError (Maybe ChatRef, FileTransferId)
 toFileRef = \case
-  (fileId, Just contactId, Nothing, Nothing) -> Right (Just $ ChatRef CTDirect contactId, fileId)
-  (fileId, Nothing, Just groupId, Nothing) -> Right (Just $ ChatRef CTGroup groupId, fileId)
-  (fileId, Nothing, Nothing, Just folderId) -> Right (Just $ ChatRef CTLocal folderId, fileId)
+  (fileId, Just contactId, Nothing, Nothing) -> Right (Just $ ChatRef CTDirect contactId Nothing, fileId)
+  (fileId, Nothing, Just groupId, Nothing) -> Right (Just $ ChatRef CTGroup groupId Nothing, fileId)
+  (fileId, Nothing, Nothing, Just folderId) -> Right (Just $ ChatRef CTLocal folderId Nothing, fileId)
   (fileId, _, _, _) -> Right (Nothing, fileId)
 
 updateFileCancelled :: MsgDirectionI d => DB.Connection -> User -> Int64 -> CIFileStatus d -> IO ()
@@ -444,8 +444,8 @@ getChatRefByFileId db user fileId = liftIO (lookupChatRefByFileId db user fileId
 lookupChatRefByFileId :: DB.Connection -> User -> Int64 -> IO (Maybe ChatRef)
 lookupChatRefByFileId db User {userId} fileId =
   getChatRef <&> \case
-    [(Just contactId, Nothing)] -> Just $ ChatRef CTDirect contactId
-    [(Nothing, Just groupId)] -> Just $ ChatRef CTGroup groupId
+    [(Just contactId, Nothing)] -> Just $ ChatRef CTDirect contactId Nothing
+    [(Nothing, Just groupId)] -> Just $ ChatRef CTGroup groupId Nothing
     _ -> Nothing
   where
     getChatRef =
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index 589e220690..f3661699cb 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -33,11 +33,13 @@ module Simplex.Chat.Store.Groups
     createGroupInvitation,
     deleteContactCardKeepConn,
     createGroupInvitedViaLink,
+    createGroupRejectedViaLink,
     setViaGroupLinkHash,
     setGroupInvitationChatItemId,
     getGroup,
     getGroupInfo,
     getGroupInfoByUserContactLinkConnReq,
+    getGroupInfoViaUserShortLink,
     getGroupInfoByGroupLinkHash,
     updateGroupProfile,
     updateGroupPreferences,
@@ -47,26 +49,28 @@ module Simplex.Chat.Store.Groups
     getActiveMembersByName,
     getGroupInfoByName,
     getGroupMember,
+    getMentionedGroupMember,
+    getMentionedMemberByMemberId,
     getGroupMemberById,
     getGroupMemberByMemberId,
     getGroupMembers,
     getGroupModerators,
     getGroupMembersForExpiration,
     getGroupCurrentMembersCount,
-    deleteGroupConnectionsAndFiles,
-    deleteGroupItemsAndMembers,
+    deleteGroupChatItems,
+    deleteGroupMembers,
+    cleanupHostGroupLinkConn,
     deleteGroup,
-    getUserGroups,
+    getUserGroupsToSubscribe,
     getUserGroupDetails,
     getUserGroupsWithSummary,
     getGroupSummary,
     getContactGroupPreferences,
-    checkContactHasGroups,
     getGroupInvitation,
     createNewContactMember,
     createNewContactMemberAsync,
-    createAcceptedMember,
-    createAcceptedMemberConnection,
+    createJoiningMember,
+    createJoiningMemberConnection,
     createBusinessRequestGroup,
     getContactViaMember,
     setNewContactMemberConnRequest,
@@ -75,6 +79,11 @@ module Simplex.Chat.Store.Groups
     createMemberConnectionAsync,
     updateGroupMemberStatus,
     updateGroupMemberStatusById,
+    updateGroupMemberAccepted,
+    deleteGroupMemberSupportChat,
+    updateGroupMembersRequireAttention,
+    decreaseGroupMembersRequireAttention,
+    increaseGroupMembersRequireAttention,
     createNewGroupMember,
     checkGroupMemberHasItems,
     deleteGroupMember,
@@ -84,6 +93,7 @@ module Simplex.Chat.Store.Groups
     updateIntroStatus,
     saveIntroInvitation,
     getIntroduction,
+    getIntroducedGroupMemberIds,
     getForwardIntroducedMembers,
     getForwardInvitedMembers,
     createIntroReMember,
@@ -107,7 +117,6 @@ module Simplex.Chat.Store.Groups
     updateGroupMemberSettings,
     updateGroupMemberBlocked,
     getXGrpMemIntroContDirect,
-    getXGrpMemIntroContGroup,
     getHostConnId,
     createMemberContact,
     getMemberContact,
@@ -147,42 +156,46 @@ import Data.Ord (Down (..))
 import Data.Text (Text)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
 import Simplex.Chat.Messages
-import Simplex.Chat.Protocol (groupForwardVersion)
+import Simplex.Chat.Protocol (MsgMention (..), groupForwardVersion)
 import Simplex.Chat.Store.Direct
 import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.Chat.Types.UITheme
-import Simplex.Messaging.Agent.Protocol (ConnId, UserId)
+import Simplex.Messaging.Agent.Protocol (ConnId, CreatedConnLink (..), UserId)
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, fromOnlyBI, maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (Binary (..), BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.Ratchet (pattern PQEncOff, pattern PQSupportOff)
 import Simplex.Messaging.Protocol (SubscriptionMode (..))
-import Simplex.Messaging.Util (eitherToMaybe, ($>>=), (<$$>))
+import Simplex.Messaging.Util (eitherToMaybe, firstRow', ($>>=), (<$$>))
 import Simplex.Messaging.Version
 import UnliftIO.STM
-
+#if defined(dbPostgres)
+import Database.PostgreSQL.Simple (Only (..), Query, (:.) (..))
+import Database.PostgreSQL.Simple.SqlQQ (sql)
+#else
 import Database.SQLite.Simple (Only (..), Query, (:.) (..))
 import Database.SQLite.Simple.QQ (sql)
+#endif
 
-type MaybeGroupMemberRow = ((Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId, Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe ImageData, Maybe ConnReqContact, Maybe LocalAlias, Maybe Preferences))
+type MaybeGroupMemberRow = (Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId, Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe LocalAlias, Maybe Preferences) :. (Maybe UTCTime, Maybe UTCTime) :. (Maybe UTCTime, Maybe Int64, Maybe Int64, Maybe Int64, Maybe UTCTime)
 
 toMaybeGroupMember :: Int64 -> MaybeGroupMemberRow -> Maybe GroupMember
-toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked) :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId, Just profileId, Just displayName, Just fullName, image, contactLink, Just localAlias, contactPreferences)) =
-  Just $ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, contactPreferences))
+toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked) :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId, Just profileId, Just displayName, Just fullName, image, contactLink, Just localAlias, contactPreferences) :. (Just createdAt, Just updatedAt) :. (supportChatTs, Just supportChatUnread, Just supportChatUnanswered, Just supportChatMentions, supportChatLastMsgFromMemberTs)) =
+  Just $ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, contactPreferences) :. (createdAt, updatedAt) :. (supportChatTs, supportChatUnread, supportChatUnanswered, supportChatMentions, supportChatLastMsgFromMemberTs))
 toMaybeGroupMember _ _ = Nothing
 
-createGroupLink :: DB.Connection -> User -> GroupInfo -> ConnId -> ConnReqContact -> GroupLinkId -> GroupMemberRole -> SubscriptionMode -> ExceptT StoreError IO ()
-createGroupLink db User {userId} groupInfo@GroupInfo {groupId, localDisplayName} agentConnId cReq groupLinkId memberRole subMode =
+createGroupLink :: DB.Connection -> User -> GroupInfo -> ConnId -> CreatedLinkContact -> GroupLinkId -> GroupMemberRole -> SubscriptionMode -> ExceptT StoreError IO ()
+createGroupLink db User {userId} groupInfo@GroupInfo {groupId, localDisplayName} agentConnId (CCLink cReq shortLink) groupLinkId memberRole subMode =
   checkConstraint (SEDuplicateGroupLink groupInfo) . liftIO $ do
     currentTs <- getCurrentTime
     DB.execute
       db
-      "INSERT INTO user_contact_links (user_id, group_id, group_link_id, local_display_name, conn_req_contact, group_link_member_role, auto_accept, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
-      (userId, groupId, groupLinkId, "group_link_" <> localDisplayName, cReq, memberRole, BI True, currentTs, currentTs)
+      "INSERT INTO user_contact_links (user_id, group_id, group_link_id, local_display_name, conn_req_contact, short_link_contact, group_link_member_role, auto_accept, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)"
+      (userId, groupId, groupLinkId, "group_link_" <> localDisplayName, cReq, shortLink, memberRole, BI True, currentTs, currentTs)
     userContactLinkId <- insertedRowId db
     void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId ConnNew initialChatVersion chatInitialVRange Nothing Nothing Nothing 0 currentTs subMode PQSupportOff
 
@@ -243,12 +256,12 @@ deleteGroupLink db User {userId} GroupInfo {groupId} = do
     (userId, groupId)
   DB.execute db "DELETE FROM user_contact_links WHERE user_id = ? AND group_id = ?" (userId, groupId)
 
-getGroupLink :: DB.Connection -> User -> GroupInfo -> ExceptT StoreError IO (Int64, ConnReqContact, GroupMemberRole)
+getGroupLink :: DB.Connection -> User -> GroupInfo -> ExceptT StoreError IO (Int64, CreatedLinkContact, GroupLinkId, GroupMemberRole)
 getGroupLink db User {userId} gInfo@GroupInfo {groupId} =
   ExceptT . firstRow groupLink (SEGroupLinkNotFound gInfo) $
-    DB.query db "SELECT user_contact_link_id, conn_req_contact, group_link_member_role FROM user_contact_links WHERE user_id = ? AND group_id = ? LIMIT 1" (userId, groupId)
+    DB.query db "SELECT user_contact_link_id, conn_req_contact, short_link_contact, group_link_id, group_link_member_role FROM user_contact_links WHERE user_id = ? AND group_id = ? LIMIT 1" (userId, groupId)
   where
-    groupLink (linkId, cReq, mRole_) = (linkId, cReq, fromMaybe GRMember mRole_)
+    groupLink (linkId, cReq, shortLink, gLinkId, mRole_) = (linkId, CCLink cReq shortLink, gLinkId, fromMaybe GRMember mRole_)
 
 getGroupLinkId :: DB.Connection -> User -> GroupInfo -> IO (Maybe GroupLinkId)
 getGroupLinkId db User {userId} GroupInfo {groupId} =
@@ -269,16 +282,21 @@ getGroupAndMember db User {userId, userContactId} groupMemberId vr = do
           SELECT
             -- GroupInfo
             g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
-            g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.custom_data, g.chat_item_ttl,
+            g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+            g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
             -- GroupInfo {membership}
             mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
             mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
             -- GroupInfo {membership = GroupMember {memberProfile}}
             pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.created_at, mu.updated_at,
+            mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
             -- from GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
             m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.created_at, m.updated_at,
+            m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
             c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
             c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
@@ -308,7 +326,7 @@ getGroupAndMember db User {userId, userContactId} groupMemberId vr = do
 -- | creates completely new group with a single member - the current user
 createNewGroup :: DB.Connection -> VersionRangeChat -> TVar ChaChaDRG -> User -> GroupProfile -> Maybe Profile -> ExceptT StoreError IO GroupInfo
 createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = ExceptT $ do
-  let GroupProfile {displayName, fullName, description, image, groupPreferences} = groupProfile
+  let GroupProfile {displayName, fullName, description, image, groupPreferences, memberAdmission} = groupProfile
       fullGroupPreferences = mergeGroupPreferences groupPreferences
   currentTs <- getCurrentTime
   customUserProfileId <- mapM (createIncognitoProfile_ db userId currentTs) incognitoProfile
@@ -316,8 +334,8 @@ createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = Exc
     groupId <- liftIO $ do
       DB.execute
         db
-        "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-        (displayName, fullName, description, image, userId, groupPreferences, currentTs, currentTs)
+        "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, member_admission, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
+        (displayName, fullName, description, image, userId, groupPreferences, memberAdmission, currentTs, currentTs)
       profileId <- insertedRowId db
       DB.execute
         db
@@ -341,7 +359,6 @@ createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = Exc
           businessChat = Nothing,
           fullGroupPreferences,
           membership,
-          hostConnCustomUserProfileId = Nothing,
           chatSettings,
           createdAt = currentTs,
           updatedAt = currentTs,
@@ -350,22 +367,23 @@ createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = Exc
           chatTags = [],
           chatItemTTL = Nothing,
           uiThemes = Nothing,
-          customData = Nothing
+          customData = Nothing,
+          membersRequireAttention = 0
         }
 
 -- | creates a new group record for the group the current user was invited to, or returns an existing one
 createGroupInvitation :: DB.Connection -> VersionRangeChat -> User -> Contact -> GroupInvitation -> Maybe ProfileId -> ExceptT StoreError IO (GroupInfo, GroupMemberId)
 createGroupInvitation _ _ _ Contact {localDisplayName, activeConn = Nothing} _ _ = throwError $ SEContactNotReady localDisplayName
-createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activeConn = Just Connection {customUserProfileId, peerChatVRange}} GroupInvitation {fromMember, invitedMember, connRequest, groupProfile, business} incognitoProfileId = do
+createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activeConn = Just Connection {peerChatVRange}} GroupInvitation {fromMember, invitedMember, connRequest, groupProfile, business} incognitoProfileId = do
   liftIO getInvitationGroupId_ >>= \case
     Nothing -> createGroupInvitation_
     Just gId -> do
       gInfo@GroupInfo {membership, groupProfile = p'} <- getGroupInfo db vr user gId
       hostId <- getHostMemberId_ db user gId
       let GroupMember {groupMemberId, memberId, memberRole} = membership
-          MemberIdRole {memberId = memberId', memberRole = memberRole'} = invitedMember
-      liftIO . when (memberId /= memberId' || memberRole /= memberRole') $
-        DB.execute db "UPDATE group_members SET member_id = ?, member_role = ? WHERE group_member_id = ?" (memberId', memberRole', groupMemberId)
+          MemberIdRole {memberId = invMemberId, memberRole = memberRole'} = invitedMember
+      liftIO . when (memberId /= invMemberId || memberRole /= memberRole') $
+        DB.execute db "UPDATE group_members SET member_id = ?, member_role = ? WHERE group_member_id = ?" (invMemberId, memberRole', groupMemberId)
       gInfo' <-
         if p' == groupProfile
           then pure gInfo
@@ -378,7 +396,7 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
         DB.query db "SELECT group_id FROM groups WHERE inv_queue_info = ? AND user_id = ? LIMIT 1" (connRequest, userId)
     createGroupInvitation_ :: ExceptT StoreError IO (GroupInfo, GroupMemberId)
     createGroupInvitation_ = do
-      let GroupProfile {displayName, fullName, description, image, groupPreferences} = groupProfile
+      let GroupProfile {displayName, fullName, description, image, groupPreferences, memberAdmission} = groupProfile
           fullGroupPreferences = mergeGroupPreferences groupPreferences
       ExceptT $
         withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do
@@ -386,18 +404,18 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
           groupId <- liftIO $ do
             DB.execute
               db
-              "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-              (displayName, fullName, description, image, userId, groupPreferences, currentTs, currentTs)
+              "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, member_admission, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
+              (displayName, fullName, description, image, userId, groupPreferences, memberAdmission, currentTs, currentTs)
             profileId <- insertedRowId db
             DB.execute
               db
               [sql|
                 INSERT INTO groups
-                  (group_profile_id, local_display_name, inv_queue_info, host_conn_custom_user_profile_id, user_id, enable_ntfs,
+                  (group_profile_id, local_display_name, inv_queue_info, user_id, enable_ntfs,
                    created_at, updated_at, chat_ts, user_member_profile_sent_at, business_chat, business_member_id, customer_member_id)
-                VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
               |]
-              ((profileId, localDisplayName, connRequest, customUserProfileId, userId, BI True, currentTs, currentTs, currentTs, currentTs) :. businessChatInfoRow business)
+              ((profileId, localDisplayName, connRequest, userId, BI True, currentTs, currentTs, currentTs, currentTs) :. businessChatInfoRow business)
             insertedRowId db
           let hostVRange = adjustedMemberVRange vr peerChatVRange
           GroupMember {groupMemberId} <- createContactMemberInv_ db user groupId Nothing contact fromMember GCHostMember GSMemInvited IBUnknown Nothing currentTs hostVRange
@@ -412,7 +430,6 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
                   businessChat = Nothing,
                   fullGroupPreferences,
                   membership,
-                  hostConnCustomUserProfileId = customUserProfileId,
                   chatSettings,
                   createdAt = currentTs,
                   updatedAt = currentTs,
@@ -421,7 +438,8 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
                   chatTags = [],
                   chatItemTTL = Nothing,
                   uiThemes = Nothing,
-                  customData = Nothing
+                  customData = Nothing,
+                  membersRequireAttention = 0
                 },
               groupMemberId
             )
@@ -466,7 +484,10 @@ createContactMemberInv_ db User {userId, userContactId} groupId invitedByGroupMe
         memberContactId = Just $ contactId' userOrContact,
         memberContactProfileId = localProfileId (profile' userOrContact),
         activeConn = Nothing,
-        memberChatVRange
+        memberChatVRange,
+        createdAt,
+        updatedAt = createdAt,
+        supportChat = Nothing
       }
   where
     memberChatVRange@(VersionRange minV maxV) = vr
@@ -512,42 +533,57 @@ deleteContactCardKeepConn db connId Contact {contactId, profile = LocalProfile {
   DB.execute db "DELETE FROM contact_profiles WHERE contact_profile_id = ?" (Only profileId)
 
 createGroupInvitedViaLink :: DB.Connection -> VersionRangeChat -> User -> Connection -> GroupLinkInvitation -> ExceptT StoreError IO (GroupInfo, GroupMember)
-createGroupInvitedViaLink
+createGroupInvitedViaLink db vr user conn GroupLinkInvitation {fromMember, fromMemberName, invitedMember, groupProfile, accepted, business} = do
+  let fromMemberProfile = profileFromName fromMemberName
+      initialStatus = maybe GSMemAccepted (acceptanceToStatus $ memberAdmission groupProfile) accepted
+  createGroupViaLink' db vr user conn fromMember fromMemberProfile invitedMember groupProfile business initialStatus
+
+createGroupRejectedViaLink :: DB.Connection -> VersionRangeChat -> User -> Connection -> GroupLinkRejection -> ExceptT StoreError IO (GroupInfo, GroupMember)
+createGroupRejectedViaLink db vr user conn GroupLinkRejection {fromMember = fromMember@MemberIdRole {memberId}, invitedMember, groupProfile} = do
+  let fromMemberProfile = profileFromName $ nameFromMemberId memberId
+  createGroupViaLink' db vr user conn fromMember fromMemberProfile invitedMember groupProfile Nothing GSMemRejected
+
+createGroupViaLink' :: DB.Connection -> VersionRangeChat -> User -> Connection -> MemberIdRole -> Profile -> MemberIdRole -> GroupProfile -> Maybe BusinessChatInfo -> GroupMemberStatus -> ExceptT StoreError IO (GroupInfo, GroupMember)
+createGroupViaLink'
   db
   vr
   user@User {userId, userContactId}
   Connection {connId, customUserProfileId}
-  GroupLinkInvitation {fromMember, fromMemberName, invitedMember, groupProfile, business} = do
+  fromMember
+  fromMemberProfile
+  invitedMember
+  groupProfile
+  business
+  membershipStatus = do
     currentTs <- liftIO getCurrentTime
     groupId <- insertGroup_ currentTs
     hostMemberId <- insertHost_ currentTs groupId
     liftIO $ DB.execute db "UPDATE connections SET conn_type = ?, group_member_id = ?, updated_at = ? WHERE connection_id = ?" (ConnMember, hostMemberId, currentTs, connId)
     -- using IBUnknown since host is created without contact
-    void $ createContactMemberInv_ db user groupId (Just hostMemberId) user invitedMember GCUserMember GSMemAccepted IBUnknown customUserProfileId currentTs vr
+    void $ createContactMemberInv_ db user groupId (Just hostMemberId) user invitedMember GCUserMember membershipStatus IBUnknown customUserProfileId currentTs vr
     liftIO $ setViaGroupLinkHash db groupId connId
     (,) <$> getGroupInfo db vr user groupId <*> getGroupMemberById db vr user hostMemberId
     where
       insertGroup_ currentTs = ExceptT $ do
-        let GroupProfile {displayName, fullName, description, image, groupPreferences} = groupProfile
+        let GroupProfile {displayName, fullName, description, image, groupPreferences, memberAdmission} = groupProfile
         withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do
           liftIO $ do
             DB.execute
               db
-              "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-              (displayName, fullName, description, image, userId, groupPreferences, currentTs, currentTs)
+              "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, member_admission, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
+              (displayName, fullName, description, image, userId, groupPreferences, memberAdmission, currentTs, currentTs)
             profileId <- insertedRowId db
             DB.execute
               db
               [sql|
                 INSERT INTO groups
-                  (group_profile_id, local_display_name, host_conn_custom_user_profile_id, user_id, enable_ntfs,
+                  (group_profile_id, local_display_name, user_id, enable_ntfs,
                    created_at, updated_at, chat_ts, user_member_profile_sent_at, business_chat, business_member_id, customer_member_id)
-                VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?)
               |]
-              ((profileId, localDisplayName, customUserProfileId, userId, BI True, currentTs, currentTs, currentTs, currentTs) :. businessChatInfoRow business)
+              ((profileId, localDisplayName, userId, BI True, currentTs, currentTs, currentTs, currentTs) :. businessChatInfoRow business)
             insertedRowId db
       insertHost_ currentTs groupId = do
-        let fromMemberProfile = profileFromName fromMemberName
         (localDisplayName, profileId) <- createNewMemberProfile_ db user fromMemberProfile currentTs
         let MemberIdRole {memberId, memberRole} = fromMember
         liftIO $ do
@@ -588,33 +624,120 @@ getGroup db vr user groupId = do
   members <- liftIO $ getGroupMembers db vr user gInfo
   pure $ Group gInfo members
 
-deleteGroupConnectionsAndFiles :: DB.Connection -> User -> GroupInfo -> [GroupMember] -> IO ()
-deleteGroupConnectionsAndFiles db User {userId} GroupInfo {groupId} members = do
-  forM_ members $ \m -> DB.execute db "DELETE FROM connections WHERE user_id = ? AND group_member_id = ?" (userId, groupMemberId' m)
-  DB.execute db "DELETE FROM files WHERE user_id = ? AND group_id = ?" (userId, groupId)
-
-deleteGroupItemsAndMembers :: DB.Connection -> User -> GroupInfo -> [GroupMember] -> IO ()
-deleteGroupItemsAndMembers db user@User {userId} g@GroupInfo {groupId} members = do
-  DB.execute db "DELETE FROM chat_items WHERE user_id = ? AND group_id = ?" (userId, groupId)
-  void $ runExceptT cleanupHostGroupLinkConn_ -- to allow repeat connection via the same group link if one was used
-  DB.execute db "DELETE FROM group_members WHERE user_id = ? AND group_id = ?" (userId, groupId)
-  forM_ members $ cleanupMemberProfileAndName_ db user
-  forM_ (incognitoMembershipProfile g) $ deleteUnusedIncognitoProfileById_ db user . localProfileId
+getGroupToSubscribe :: DB.Connection -> User -> GroupId -> ExceptT StoreError IO ShortGroup
+getGroupToSubscribe db User {userId, userContactId} groupId = do
+  shortInfo <- getGroupInfoToSubscribe
+  members <- liftIO getGroupMembersToSubscribe
+  pure $ ShortGroup shortInfo members
   where
-    cleanupHostGroupLinkConn_ = do
-      hostId <- getHostMemberId_ db user groupId
-      liftIO $
-        DB.execute
+    getGroupInfoToSubscribe :: ExceptT StoreError IO ShortGroupInfo
+    getGroupInfoToSubscribe = ExceptT $ do
+      firstRow toInfo (SEGroupNotFound groupId) $
+        DB.query
           db
           [sql|
-            UPDATE connections SET via_contact_uri_hash = NULL, xcontact_id = NULL
-            WHERE user_id = ? AND via_group_link = 1 AND contact_id IN (
-              SELECT contact_id
-              FROM group_members
-              WHERE user_id = ? AND group_member_id = ?
-            )
+              SELECT g.local_display_name, mu.member_status
+              FROM groups g
+              JOIN group_members mu ON mu.group_id = g.group_id
+              WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?
+                AND mu.member_status NOT IN (?,?,?)
           |]
-          (userId, userId, hostId)
+          (groupId, userId, userContactId, GSMemRemoved, GSMemLeft, GSMemGroupDeleted)
+      where
+        toInfo :: (GroupName, GroupMemberStatus) -> ShortGroupInfo
+        toInfo (groupName, membershipStatus) =
+          ShortGroupInfo groupId groupName membershipStatus
+    getGroupMembersToSubscribe :: IO [ShortGroupMember]
+    getGroupMembersToSubscribe = do
+      map toShortMember
+        <$> DB.query
+          db
+          [sql|
+              SELECT m.group_member_id, m.local_display_name, c.agent_conn_id
+              FROM group_members m
+              JOIN connections c ON c.connection_id = (
+                SELECT max(cc.connection_id)
+                FROM connections cc
+                WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+              )
+              WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)
+                AND m.member_status NOT IN (?,?,?)
+          |]
+          (userId, userId, groupId, userContactId, GSMemRemoved, GSMemLeft, GSMemGroupDeleted)
+      where
+        toShortMember :: (GroupMemberId, ContactName, AgentConnId) -> ShortGroupMember
+        toShortMember (groupMemberId, localDisplayName, agentConnId) =
+          ShortGroupMember groupMemberId groupId localDisplayName agentConnId
+
+deleteGroupChatItems :: DB.Connection -> User -> GroupInfo -> IO ()
+deleteGroupChatItems db User {userId} GroupInfo {groupId} =
+  DB.execute db "DELETE FROM chat_items WHERE user_id = ? AND group_id = ?" (userId, groupId)
+
+deleteGroupMembers :: DB.Connection -> User -> GroupInfo -> IO ()
+deleteGroupMembers db User {userId} GroupInfo {groupId} = do
+  DB.execute_ db "DROP TABLE IF EXISTS temp_delete_members"
+#if defined(dbPostgres)
+  DB.execute_ db "CREATE TABLE temp_delete_members (contact_profile_id BIGINT, member_profile_id BIGINT, local_display_name TEXT)"
+#else
+  DB.execute_ db "CREATE TABLE temp_delete_members (contact_profile_id INTEGER, member_profile_id INTEGER, local_display_name TEXT)"
+#endif
+  DB.execute
+    db
+    [sql|
+      INSERT INTO temp_delete_members (contact_profile_id, member_profile_id, local_display_name)
+      SELECT contact_profile_id, member_profile_id, local_display_name FROM group_members WHERE group_id = ?
+    |]
+    (Only groupId)
+  DB.execute db "DELETE FROM group_members WHERE user_id = ? AND group_id = ?" (userId, groupId)
+  DB.execute
+    db
+    [sql|
+      DELETE FROM contact_profiles
+      WHERE
+        user_id = ?
+        AND (contact_profile_id IN (SELECT contact_profile_id FROM temp_delete_members)
+          OR contact_profile_id IN (SELECT member_profile_id FROM temp_delete_members WHERE member_profile_id IS NOT NULL))
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM group_members)
+        AND contact_profile_id NOT IN (SELECT member_profile_id FROM group_members)
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contacts)
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contact_requests)
+        AND contact_profile_id NOT IN (SELECT custom_user_profile_id FROM connections)
+    |]
+    (Only userId)
+  DB.execute
+    db
+    [sql|
+      DELETE FROM display_names
+      WHERE
+        user_id = ?
+        AND local_display_name IN (SELECT local_display_name FROM temp_delete_members)
+        AND local_display_name NOT IN (SELECT local_display_name FROM group_members)
+        AND local_display_name NOT IN (SELECT local_display_name FROM contacts)
+        AND local_display_name NOT IN (SELECT local_display_name FROM users)
+        AND local_display_name NOT IN (SELECT local_display_name FROM groups)
+        AND local_display_name NOT IN (SELECT local_display_name FROM user_contact_links)
+        AND local_display_name NOT IN (SELECT local_display_name FROM contact_requests)
+    |]
+    (Only userId)
+  DB.execute_ db "DROP TABLE temp_delete_members"
+
+-- to allow repeat connection via the same group link if one was used
+cleanupHostGroupLinkConn :: DB.Connection -> User -> GroupInfo -> IO ()
+cleanupHostGroupLinkConn db user@User {userId} GroupInfo {groupId} = do
+  runExceptT (getHostMemberId_ db user groupId) >>= \case
+    Left _ -> pure ()
+    Right hostId ->
+      DB.execute
+        db
+        [sql|
+          UPDATE connections SET via_contact_uri_hash = NULL, xcontact_id = NULL
+          WHERE user_id = ? AND via_group_link = 1 AND contact_id IN (
+            SELECT contact_id
+            FROM group_members
+            WHERE user_id = ? AND group_member_id = ?
+          )
+        |]
+        (userId, userId, hostId)
 
 deleteGroup :: DB.Connection -> User -> GroupInfo -> IO ()
 deleteGroup db user@User {userId} g@GroupInfo {groupId, localDisplayName} = do
@@ -637,10 +760,10 @@ deleteGroupProfile_ db userId groupId =
     |]
     (userId, groupId)
 
-getUserGroups :: DB.Connection -> VersionRangeChat -> User -> IO [Group]
-getUserGroups db vr user@User {userId} = do
+getUserGroupsToSubscribe :: DB.Connection -> User -> IO [ShortGroup]
+getUserGroupsToSubscribe db user@User {userId} = do
   groupIds <- map fromOnly <$> DB.query db "SELECT group_id FROM groups WHERE user_id = ?" (Only userId)
-  rights <$> mapM (runExceptT . getGroup db vr user) groupIds
+  rights <$> mapM (runExceptT . getGroupToSubscribe db user) groupIds
 
 getUserGroupDetails :: DB.Connection -> VersionRangeChat -> User -> Maybe ContactId -> Maybe String -> IO [GroupInfo]
 getUserGroupDetails db vr User {userId, userContactId} _contactId_ search_ = do
@@ -651,10 +774,13 @@ getUserGroupDetails db vr User {userId, userContactId} _contactId_ search_ = do
         [sql|
           SELECT
             g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
-            g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.custom_data, g.chat_item_ttl,
+            g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+            g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
             mu.group_member_id, g.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction,
-            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences
+            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.created_at, mu.updated_at,
+            mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
           FROM groups g
           JOIN group_profiles gp USING (group_profile_id)
           JOIN group_members mu USING (group_id)
@@ -688,9 +814,9 @@ getGroupSummary db User {userId} groupId = do
           JOIN group_members m USING (group_id)
           WHERE g.user_id = ?
             AND g.group_id = ?
-            AND m.member_status NOT IN (?,?,?,?)
+            AND m.member_status NOT IN (?,?,?,?,?)
         |]
-        (userId, groupId, GSMemRemoved, GSMemLeft, GSMemUnknown, GSMemInvited)
+        (userId, groupId, GSMemRejected, GSMemRemoved, GSMemLeft, GSMemUnknown, GSMemInvited)
   pure GroupSummary {currentMembers = fromMaybe 0 currentMembers_}
 
 getContactGroupPreferences :: DB.Connection -> User -> Contact -> IO [(GroupMemberRole, FullGroupPreferences)]
@@ -707,10 +833,6 @@ getContactGroupPreferences db User {userId} Contact {contactId} = do
       |]
       (userId, contactId)
 
-checkContactHasGroups :: DB.Connection -> User -> Contact -> IO (Maybe GroupId)
-checkContactHasGroups db User {userId} Contact {contactId} =
-  maybeFirstRow fromOnly $ DB.query db "SELECT group_id FROM group_members WHERE user_id = ? AND contact_id = ? LIMIT 1" (userId, contactId)
-
 getGroupInfoByName :: DB.Connection -> VersionRangeChat -> User -> GroupName -> ExceptT StoreError IO GroupInfo
 getGroupInfoByName db vr user gName = do
   gId <- getGroupIdByName db user gName
@@ -722,6 +844,8 @@ groupMemberQuery =
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
       m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
       c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
       c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
@@ -743,6 +867,39 @@ getGroupMember db vr user@User {userId} groupId groupMemberId =
       (groupMemberQuery <> " WHERE m.group_id = ? AND m.group_member_id = ? AND m.user_id = ?")
       (userId, groupId, groupMemberId, userId)
 
+getMentionedGroupMember :: DB.Connection -> User -> GroupId -> GroupMemberId -> ExceptT StoreError IO CIMention
+getMentionedGroupMember db User {userId} groupId gmId =
+  ExceptT $
+    firstRow toMentionedMember (SEGroupMemberNotFound gmId) $
+      DB.query
+        db
+        (mentionedMemberQuery <> " WHERE m.group_id = ? AND m.group_member_id = ? AND m.user_id = ?")
+        (groupId, gmId, userId)
+
+getMentionedMemberByMemberId :: DB.Connection -> User -> GroupId -> MsgMention -> IO CIMention
+getMentionedMemberByMemberId db User {userId} groupId MsgMention {memberId} =
+  fmap (fromMaybe mentionedMember) $
+    maybeFirstRow toMentionedMember $
+      DB.query
+        db
+        (mentionedMemberQuery <> " WHERE m.group_id = ? AND m.member_id = ? AND m.user_id = ?")
+        (groupId, memberId, userId)
+  where
+    mentionedMember = CIMention {memberId, memberRef = Nothing}
+
+mentionedMemberQuery :: Query
+mentionedMemberQuery =
+  [sql|
+    SELECT m.group_member_id, m.member_id, m.member_role, p.display_name, p.local_alias
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+  |]
+
+toMentionedMember :: (GroupMemberId, MemberId, GroupMemberRole, Text, Maybe Text) -> CIMention
+toMentionedMember (groupMemberId, memberId, memberRole, displayName, localAlias) =
+  let memberRef = Just CIMentionMember {groupMemberId, displayName, localAlias, memberRole}
+   in CIMention {memberId, memberRef}
+
 getGroupMemberById :: DB.Connection -> VersionRangeChat -> User -> GroupMemberId -> ExceptT StoreError IO GroupMember
 getGroupMemberById db vr user@User {userId} groupMemberId =
   ExceptT . firstRow (toContactMember vr user) (SEGroupMemberNotFound groupMemberId) $
@@ -772,7 +929,7 @@ getGroupModerators db vr user@User {userId, userContactId} GroupInfo {groupId} =
   map (toContactMember vr user)
     <$> DB.query
       db
-      (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND member_role IN (?,?,?)")
+      (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?)")
       (userId, userId, groupId, userContactId, GRModerator, GRAdmin, GROwner)
 
 getGroupMembersForExpiration :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> IO [GroupMember]
@@ -856,7 +1013,10 @@ createNewContactMember db gVar User {userId, userContactId} GroupInfo {groupId,
             memberContactId = Just contactId,
             memberContactProfileId = localProfileId profile,
             activeConn = Nothing,
-            memberChatVRange = peerChatVRange
+            memberChatVRange = peerChatVRange,
+            createdAt,
+            updatedAt = createdAt,
+            supportChat = Nothing
           }
       where
         insertMember_ =
@@ -899,14 +1059,15 @@ createNewContactMemberAsync db gVar user@User {userId, userContactId} GroupInfo
             :. (minV, maxV)
         )
 
-createAcceptedMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> ExceptT StoreError IO (GroupMemberId, MemberId)
-createAcceptedMember
+createJoiningMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> GroupMemberStatus -> ExceptT StoreError IO (GroupMemberId, MemberId)
+createJoiningMember
   db
   gVar
   User {userId, userContactId}
   GroupInfo {groupId, membership}
   UserContactRequest {cReqChatVRange, localDisplayName, profileId}
-  memberRole =
+  memberRole
+  memberStatus =
     createWithRandomId gVar $ \memId -> do
       createdAt <- liftIO getCurrentTime
       insertMember_ (MemberId memId) createdAt
@@ -924,13 +1085,13 @@ createAcceptedMember
                 peer_chat_min_version, peer_chat_max_version)
             VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
           |]
-          ( (groupId, memberId, memberRole, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership)
+          ( (groupId, memberId, memberRole, GCInviteeMember, memberStatus, fromInvitedBy userContactId IBUser, groupMemberId' membership)
               :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, createdAt, createdAt)
               :. (minV, maxV)
           )
 
-createAcceptedMemberConnection :: DB.Connection -> User -> (CommandId, ConnId) -> VersionChat -> UserContactRequest -> GroupMemberId -> SubscriptionMode -> IO ()
-createAcceptedMemberConnection
+createJoiningMemberConnection :: DB.Connection -> User -> (CommandId, ConnId) -> VersionChat -> UserContactRequest -> GroupMemberId -> SubscriptionMode -> IO ()
+createJoiningMemberConnection
   db
   user@User {userId}
   (cmdId, agentConnId)
@@ -1058,6 +1219,84 @@ updateGroupMemberStatusById db userId groupMemberId memStatus = do
     |]
     (memStatus, currentTs, userId, groupMemberId)
 
+updateGroupMemberAccepted :: DB.Connection -> User -> GroupMember -> GroupMemberStatus -> GroupMemberRole -> IO GroupMember
+updateGroupMemberAccepted db User {userId} m@GroupMember {groupMemberId} status role = do
+  currentTs <- getCurrentTime
+  DB.execute
+    db
+    [sql|
+      UPDATE group_members
+      SET member_status = ?, member_role = ?, updated_at = ?
+      WHERE user_id = ? AND group_member_id = ?
+    |]
+    (status, role, currentTs, userId, groupMemberId)
+  pure m {memberStatus = status, memberRole = role, updatedAt = currentTs}
+
+deleteGroupMemberSupportChat :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO (GroupInfo, GroupMember)
+deleteGroupMemberSupportChat db user g m@GroupMember {groupMemberId} = do
+  let requiredAttention = gmRequiresAttention m
+  currentTs <- getCurrentTime
+  DB.execute
+    db
+    [sql|
+      DELETE FROM chat_items
+      WHERE group_scope_group_member_id = ?
+    |]
+    (Only groupMemberId)
+  DB.execute
+    db
+    [sql|
+      UPDATE group_members
+      SET support_chat_ts = NULL,
+          support_chat_items_unread = 0,
+          support_chat_items_member_attention = 0,
+          support_chat_items_mentions = 0,
+          support_chat_last_msg_from_member_ts = NULL,
+          updated_at = ?
+      WHERE group_member_id = ?
+    |]
+    (currentTs, groupMemberId)
+  let m' = m {supportChat = Nothing, updatedAt = currentTs}
+  g' <- if requiredAttention
+    then decreaseGroupMembersRequireAttention db user g
+    else pure g
+  pure (g', m')
+
+updateGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> IO GroupInfo
+updateGroupMembersRequireAttention db user g member member'
+  | nowRequires && not didRequire =
+      increaseGroupMembersRequireAttention db user g
+  | not nowRequires && didRequire =
+      decreaseGroupMembersRequireAttention db user g
+  | otherwise = pure g
+  where
+    didRequire = gmRequiresAttention member
+    nowRequires = gmRequiresAttention member'
+
+decreaseGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> IO GroupInfo
+decreaseGroupMembersRequireAttention db User {userId} g@GroupInfo {groupId, membersRequireAttention} = do
+  DB.execute
+    db
+    [sql|
+      UPDATE groups
+      SET members_require_attention = members_require_attention - 1
+      WHERE user_id = ? AND group_id = ?
+    |]
+    (userId, groupId)
+  pure g {membersRequireAttention = membersRequireAttention - 1}
+
+increaseGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> IO GroupInfo
+increaseGroupMembersRequireAttention db User {userId} g@GroupInfo {groupId, membersRequireAttention} = do
+  DB.execute
+    db
+    [sql|
+      UPDATE groups
+      SET members_require_attention = members_require_attention + 1
+      WHERE user_id = ? AND group_id = ?
+    |]
+    (userId, groupId)
+  pure g {membersRequireAttention = membersRequireAttention + 1}
+
 -- | add new member with profile
 createNewGroupMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> MemberInfo -> GroupMemberCategory -> GroupMemberStatus -> ExceptT StoreError IO GroupMember
 createNewGroupMember db user gInfo invitingMember memInfo@MemberInfo {profile} memCategory memStatus = do
@@ -1138,7 +1377,10 @@ createNewMember_
           memberContactId,
           memberContactProfileId,
           activeConn,
-          memberChatVRange
+          memberChatVRange,
+          createdAt,
+          updatedAt = createdAt,
+          supportChat = Nothing
         }
 
 checkGroupMemberHasItems :: DB.Connection -> User -> GroupMember -> IO (Maybe ChatItemId)
@@ -1236,8 +1478,8 @@ saveIntroInvitation db reMember toMember introInv@IntroInvitation {groupConnReq}
       (GMIntroInvReceived, groupConnReq, directConnReq introInv, currentTs, introId intro)
   pure intro {introInvitation = Just introInv, introStatus = GMIntroInvReceived}
 
-saveMemberInvitation :: DB.Connection -> GroupMember -> IntroInvitation -> IO ()
-saveMemberInvitation db GroupMember {groupMemberId} IntroInvitation {groupConnReq, directConnReq} = do
+saveMemberInvitation :: DB.Connection -> GroupMember -> IntroInvitation -> GroupMemberStatus -> IO ()
+saveMemberInvitation db GroupMember {groupMemberId} IntroInvitation {groupConnReq, directConnReq} newMemberStatus = do
   currentTs <- getCurrentTime
   DB.execute
     db
@@ -1249,7 +1491,7 @@ saveMemberInvitation db GroupMember {groupMemberId} IntroInvitation {groupConnRe
           updated_at = ?
       WHERE group_member_id = ?
     |]
-    (GSMemIntroInvited, groupConnReq, directConnReq, currentTs, groupMemberId)
+    (newMemberStatus, groupConnReq, directConnReq, currentTs, groupMemberId)
 
 getIntroduction :: DB.Connection -> GroupMember -> GroupMember -> ExceptT StoreError IO GroupMemberIntro
 getIntroduction db reMember toMember = ExceptT $ do
@@ -1269,6 +1511,14 @@ getIntroduction db reMember toMember = ExceptT $ do
        in Right GroupMemberIntro {introId, reMember, toMember, introStatus, introInvitation}
     toIntro _ = Left SEIntroNotFound
 
+getIntroducedGroupMemberIds :: DB.Connection -> GroupMember -> IO [GroupMemberId]
+getIntroducedGroupMemberIds db invitee =
+  map fromOnly <$>
+    DB.query
+      db
+      "SELECT re_group_member_id FROM group_member_intros WHERE to_group_member_id = ?"
+      (Only $ groupMemberId' invitee)
+
 getForwardIntroducedMembers :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> Bool -> IO [GroupMember]
 getForwardIntroducedMembers db vr user invitee highlyAvailable = do
   memberIds <- map fromOnly <$> query
@@ -1309,33 +1559,23 @@ getForwardInvitedMembers db vr user forwardMember highlyAvailable = do
         WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?)
       |]
 
-createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> VersionChat -> MemberInfo -> Maybe MemberRestrictions -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> ExceptT StoreError IO GroupMember
+createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> VersionChat -> MemberInfo -> Maybe MemberRestrictions -> (CommandId, ConnId) -> SubscriptionMode -> ExceptT StoreError IO GroupMember
 createIntroReMember
   db
   user@User {userId}
-  gInfo@GroupInfo {groupId}
+  gInfo
   _host@GroupMember {memberContactId, activeConn}
   chatV
   memInfo@(MemberInfo _ _ memChatVRange memberProfile)
   memRestrictions_
   (groupCmdId, groupAgentConnId)
-  directConnIds
-  customUserProfileId
   subMode = do
     let mcvr = maybe chatInitialVRange fromChatVRange memChatVRange
         cLevel = 1 + maybe 0 (\Connection {connLevel} -> connLevel) activeConn
         memRestriction = restriction <$> memRestrictions_
     currentTs <- liftIO getCurrentTime
-    newMember <- case directConnIds of
-      Just (directCmdId, directAgentConnId) -> do
-        Connection {connId = directConnId} <- liftIO $ createConnection_ db userId ConnContact Nothing directAgentConnId ConnNew chatV mcvr memberContactId Nothing customUserProfileId cLevel currentTs subMode PQSupportOff
-        liftIO $ setCommandConnId db user directCmdId directConnId
-        (localDisplayName, contactId, memProfileId) <- createContact_ db userId memberProfile "" (Just groupId) currentTs False
-        liftIO $ DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, currentTs, directConnId)
-        pure $ NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memRestriction, memInvitedBy = IBUnknown, memInvitedByGroupMemberId = Nothing, localDisplayName, memContactId = Just contactId, memProfileId}
-      Nothing -> do
-        (localDisplayName, memProfileId) <- createNewMemberProfile_ db user memberProfile currentTs
-        pure $ NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memRestriction, memInvitedBy = IBUnknown, memInvitedByGroupMemberId = Nothing, localDisplayName, memContactId = Nothing, memProfileId}
+    (localDisplayName, memProfileId) <- createNewMemberProfile_ db user memberProfile currentTs
+    let newMember = NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memRestriction, memInvitedBy = IBUnknown, memInvitedByGroupMemberId = Nothing, localDisplayName, memContactId = Nothing, memProfileId}
     liftIO $ do
       member <- createNewMember_ db user gInfo newMember currentTs
       conn@Connection {connId = groupConnId} <- createMemberConnection_ db userId (groupMemberId' member) groupAgentConnId chatV mcvr memberContactId cLevel currentTs subMode
@@ -1393,16 +1633,21 @@ getViaGroupMember db vr User {userId, userContactId} Contact {contactId} = do
           SELECT
             -- GroupInfo
             g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
-            g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.custom_data, g.chat_item_ttl,
+            g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+            g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
             -- GroupInfo {membership}
             mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
             mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
             -- GroupInfo {membership = GroupMember {memberProfile}}
             pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.created_at, mu.updated_at,
+            mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
             -- via GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
             m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.created_at, m.updated_at,
+            m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
             c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
             c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
@@ -1448,7 +1693,7 @@ getViaGroupContact db vr user@User {userId} GroupMember {groupMemberId} = do
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getContact db vr user) contactId_
 
 updateGroupProfile :: DB.Connection -> User -> GroupInfo -> GroupProfile -> ExceptT StoreError IO GroupInfo
-updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName}} p'@GroupProfile {displayName = newName, fullName, description, image, groupPreferences}
+updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName}} p'@GroupProfile {displayName = newName, fullName, description, image, groupPreferences, memberAdmission}
   | displayName == newName = liftIO $ do
       currentTs <- getCurrentTime
       updateGroupProfile_ currentTs
@@ -1466,14 +1711,14 @@ updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName,
         db
         [sql|
           UPDATE group_profiles
-          SET display_name = ?, full_name = ?, description = ?, image = ?, preferences = ?, updated_at = ?
+          SET display_name = ?, full_name = ?, description = ?, image = ?, preferences = ?, member_admission = ?, updated_at = ?
           WHERE group_profile_id IN (
             SELECT group_profile_id
             FROM groups
             WHERE user_id = ? AND group_id = ?
           )
         |]
-        (newName, fullName, description, image, groupPreferences, currentTs, userId, groupId)
+        (newName, fullName, description, image, groupPreferences, memberAdmission, currentTs, userId, groupId)
     updateGroup_ ldn currentTs = do
       DB.execute
         db
@@ -1511,14 +1756,14 @@ updateGroupProfileFromMember db user g@GroupInfo {groupId} Profile {displayName
           DB.query
             db
             [sql|
-            SELECT gp.display_name, gp.full_name, gp.description, gp.image, gp.preferences
+            SELECT gp.display_name, gp.full_name, gp.description, gp.image, gp.preferences, gp.member_admission
             FROM group_profiles gp
             JOIN groups g ON gp.group_profile_id = g.group_profile_id
             WHERE g.group_id = ?
           |]
             (Only groupId)
-    toGroupProfile (displayName, fullName, description, image, groupPreferences) =
-      GroupProfile {displayName, fullName, description, image, groupPreferences}
+    toGroupProfile (displayName, fullName, description, image, groupPreferences, memberAdmission) =
+      GroupProfile {displayName, fullName, description, image, groupPreferences, memberAdmission}
 
 getGroupInfo :: DB.Connection -> VersionRangeChat -> User -> Int64 -> ExceptT StoreError IO GroupInfo
 getGroupInfo db vr User {userId, userContactId} groupId = ExceptT $ do
@@ -1531,8 +1776,9 @@ getGroupInfo db vr User {userId, userContactId} groupId = ExceptT $ do
 
 getGroupInfoByUserContactLinkConnReq :: DB.Connection -> VersionRangeChat -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe GroupInfo)
 getGroupInfoByUserContactLinkConnReq db vr user@User {userId} (cReqSchema1, cReqSchema2) = do
+  -- fmap join is to support group_id = NULL if non-group contact request is sent to this function (e.g., if client data is appended).
   groupId_ <-
-    maybeFirstRow fromOnly $
+    fmap join . maybeFirstRow fromOnly $
       DB.query
         db
         [sql|
@@ -1543,6 +1789,26 @@ getGroupInfoByUserContactLinkConnReq db vr user@User {userId} (cReqSchema1, cReq
         (userId, cReqSchema1, cReqSchema2)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getGroupInfo db vr user) groupId_
 
+getGroupInfoViaUserShortLink :: DB.Connection -> VersionRangeChat -> User -> ShortLinkContact -> IO (Maybe (ConnReqContact, GroupInfo))
+getGroupInfoViaUserShortLink db vr user@User {userId} shortLink = fmap eitherToMaybe $ runExceptT $ do
+  (cReq, groupId) <- ExceptT getConnReqGroup
+  (cReq,) <$> getGroupInfo db vr user groupId
+  where
+    getConnReqGroup = 
+      firstRow' toConnReqGroupId (SEInternalError "group link not found") $
+        DB.query
+          db
+          [sql|
+            SELECT conn_req_contact, group_id
+            FROM user_contact_links
+            WHERE user_id = ? AND short_link_contact = ?
+          |]
+          (userId, shortLink)
+    toConnReqGroupId = \case
+      -- cReq is "not null", group_id is nullable
+      (cReq, Just groupId) -> Right (cReq, groupId)
+      _ -> Left $ SEInternalError "no conn req or group ID"
+
 getGroupInfoByGroupLinkHash :: DB.Connection -> VersionRangeChat -> User -> (ConnReqUriHash, ConnReqUriHash) -> IO (Maybe GroupInfo)
 getGroupInfoByGroupLinkHash db vr user@User {userId, userContactId} (groupLinkHash1, groupLinkHash2) = do
   groupId_ <-
@@ -1762,12 +2028,6 @@ mergeContactRecords db vr user@User {userId} to@Contact {localDisplayName = keep
   assertNotUser db user fromCt
   liftIO $ do
     currentTs <- getCurrentTime
-    -- next query fixes incorrect unused contacts deletion
-    when (contactDirect toCt && not (contactUsed toCt)) $
-      DB.execute
-        db
-        "UPDATE contacts SET contact_used = 1, updated_at = ? WHERE user_id = ? AND contact_id = ?"
-        (currentTs, userId, toContactId)
     DB.execute
       db
       "UPDATE connections SET contact_id = ?, updated_at = ? WHERE contact_id = ? AND user_id = ?"
@@ -1931,8 +2191,8 @@ updateGroupMemberSettings db User {userId} gId gMemberId GroupMemberSettings {sh
     |]
     (BI showMessages, currentTs, userId, gId, gMemberId)
 
-updateGroupMemberBlocked :: DB.Connection -> User -> GroupId -> GroupMemberId -> MemberRestrictionStatus -> IO ()
-updateGroupMemberBlocked db User {userId} gId gMemberId memberBlocked = do
+updateGroupMemberBlocked :: DB.Connection -> User -> GroupInfo -> MemberRestrictionStatus -> GroupMember -> IO GroupMember
+updateGroupMemberBlocked db User {userId} GroupInfo {groupId} mrs m@GroupMember {groupMemberId} = do
   currentTs <- getCurrentTime
   DB.execute
     db
@@ -1941,7 +2201,8 @@ updateGroupMemberBlocked db User {userId} gId gMemberId memberBlocked = do
       SET member_restriction = ?, updated_at = ?
       WHERE user_id = ? AND group_id = ? AND group_member_id = ?
     |]
-    (memberBlocked, currentTs, userId, gId, gMemberId)
+    (mrs, currentTs, userId, groupId, groupMemberId)
+  pure m {blockedByAdmin = mrsBlocked mrs}
 
 getXGrpMemIntroContDirect :: DB.Connection -> User -> Contact -> IO (Maybe (Int64, XGrpMemIntroCont))
 getXGrpMemIntroContDirect db User {userId} Contact {contactId} = do
@@ -1973,36 +2234,6 @@ getXGrpMemIntroContDirect db User {userId} Contact {contactId} = do
       Just groupConnReq -> Just (hostConnId, XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq})
       _ -> Nothing
 
-getXGrpMemIntroContGroup :: DB.Connection -> User -> GroupMember -> IO (Maybe (Int64, ConnReqInvitation))
-getXGrpMemIntroContGroup db User {userId} GroupMember {groupMemberId} = do
-  fmap join . maybeFirstRow toCont $
-    DB.query
-      db
-      [sql|
-        SELECT ch.connection_id, c.conn_req_inv
-        FROM group_members m
-        JOIN contacts ct ON ct.contact_id = m.contact_id
-        LEFT JOIN connections c ON c.connection_id = (
-          SELECT MAX(cc.connection_id)
-          FROM connections cc
-          WHERE cc.contact_id = ct.contact_id
-        )
-        JOIN groups g ON g.group_id = m.group_id AND g.group_id = ct.via_group
-        JOIN group_members mh ON mh.group_id = g.group_id
-        LEFT JOIN connections ch ON ch.connection_id = (
-          SELECT max(cc.connection_id)
-          FROM connections cc
-          where cc.user_id = ? AND cc.group_member_id = mh.group_member_id
-        )
-        WHERE m.user_id = ? AND m.group_member_id = ? AND mh.member_category = ? AND ct.deleted = 0
-      |]
-      (userId, userId, groupMemberId, GCHostMember)
-  where
-    toCont :: (Int64, Maybe ConnReqInvitation) -> Maybe (Int64, ConnReqInvitation)
-    toCont (hostConnId, connReq_) = case connReq_ of
-      Just connReq -> Just (hostConnId, connReq)
-      _ -> Nothing
-
 getHostConnId :: DB.Connection -> User -> GroupId -> ExceptT StoreError IO GroupMemberId
 getHostConnId db user@User {userId} groupId = do
   hostMemberId <- getHostMemberId_ db user groupId
@@ -2285,8 +2516,8 @@ createNewUnknownGroupMember db vr user@User {userId, userContactId} GroupInfo {g
   where
     VersionRange minV maxV = vr
 
-updateUnknownMemberAnnounced :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> GroupMember -> MemberInfo -> ExceptT StoreError IO GroupMember
-updateUnknownMemberAnnounced db vr user@User {userId} invitingMember unknownMember@GroupMember {groupMemberId, memberChatVRange} MemberInfo {memberRole, v, profile} = do
+updateUnknownMemberAnnounced :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> GroupMember -> MemberInfo -> GroupMemberStatus -> ExceptT StoreError IO GroupMember
+updateUnknownMemberAnnounced db vr user@User {userId} invitingMember unknownMember@GroupMember {groupMemberId, memberChatVRange} MemberInfo {memberRole, v, profile} status = do
   _ <- updateMemberProfile db user unknownMember profile
   currentTs <- liftIO getCurrentTime
   liftIO $
@@ -2303,7 +2534,7 @@ updateUnknownMemberAnnounced db vr user@User {userId} invitingMember unknownMemb
             updated_at = ?
         WHERE user_id = ? AND group_member_id = ?
       |]
-      ( (memberRole, GCPostMember, GSMemAnnounced, groupMemberId' invitingMember)
+      ( (memberRole, GCPostMember, status, groupMemberId' invitingMember)
           :. (minV, maxV, currentTs, userId, groupMemberId)
       )
   getGroupMemberById db vr user groupMemberId
diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs
index a828a30925..a9bd03ed0e 100644
--- a/src/Simplex/Chat/Store/Messages.hs
+++ b/src/Simplex/Chat/Store/Messages.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -10,6 +11,7 @@
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
@@ -21,6 +23,7 @@ module Simplex.Chat.Store.Messages
     -- * Message and chat item functions
     deleteContactCIs,
     getGroupFileInfo,
+    getGroupMemberFileInfo,
     deleteGroupChatItemsMessages,
     createNewSndMessage,
     createSndMsgDelivery,
@@ -32,7 +35,9 @@ module Simplex.Chat.Store.Messages
     getPendingGroupMessages,
     deletePendingGroupMessage,
     deleteOldMessages,
-    updateChatTs,
+    MemberAttention (..),
+    updateChatTsStats,
+    setSupportChatTs,
     createNewSndChatItem,
     createNewRcvChatItem,
     createNewChatItemNoMsg,
@@ -40,6 +45,7 @@ module Simplex.Chat.Store.Messages
     getChatPreviews,
     getDirectChat,
     getGroupChat,
+    getGroupChatScopeInfoForItem,
     getLocalChat,
     getDirectChatItemLast,
     getAllChatItems,
@@ -53,13 +59,18 @@ module Simplex.Chat.Store.Messages
     markDirectChatItemDeleted,
     updateGroupChatItemStatus,
     updateGroupChatItem,
+    createGroupCIMentions,
+    updateGroupCIMentions,
     deleteGroupChatItem,
     updateGroupChatItemModerated,
+    updateMemberCIsModerated,
     updateGroupCIBlockedByAdmin,
     markGroupChatItemDeleted,
+    markMemberCIsDeleted,
     markGroupChatItemBlocked,
     markGroupCIBlockedByAdmin,
     markMessageReportsDeleted,
+    markReceivedGroupReportsDeleted,
     deleteLocalChatItem,
     updateDirectChatItemsRead,
     getDirectUnreadTimedItems,
@@ -69,6 +80,7 @@ module Simplex.Chat.Store.Messages
     updateGroupChatItemsRead,
     getGroupUnreadTimedItems,
     updateGroupChatItemsReadList,
+    updateGroupScopeUnreadStats,
     setGroupChatItemsDeleteAt,
     updateLocalChatItemsRead,
     getChatRefViaItemId,
@@ -125,6 +137,7 @@ module Simplex.Chat.Store.Messages
   )
 where
 
+import qualified Control.Exception as E
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Class
@@ -133,10 +146,12 @@ import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)
 import Data.Either (fromRight, rights)
 import Data.Int (Int64)
-import Data.List (sortBy)
+import Data.List (foldl', sortBy)
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as L
-import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe)
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as M
+import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, mapMaybe)
 import Data.Ord (Down (..), comparing)
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -152,7 +167,8 @@ import Simplex.Chat.Store.Groups
 import Simplex.Chat.Store.NoteFolders
 import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
-import Simplex.Messaging.Agent.Protocol (AgentMsgId, ConnId, MsgMeta (..), UserId)
+import Simplex.Chat.Types.Shared
+import Simplex.Messaging.Agent.Protocol (AgentMsgId, ConnId, ConnShortLink, ConnectionMode (..), MsgMeta (..), UserId)
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, firstRow', maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -186,6 +202,11 @@ getGroupFileInfo db User {userId} GroupInfo {groupId} =
   map toFileInfo
     <$> DB.query db (fileInfoQuery <> " WHERE i.user_id = ? AND i.group_id = ?") (userId, groupId)
 
+getGroupMemberFileInfo :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO [CIFileInfo]
+getGroupMemberFileInfo db User {userId} GroupInfo {groupId} GroupMember {groupMemberId} =
+  map toFileInfo
+    <$> DB.query db (fileInfoQuery <> " WHERE i.user_id = ? AND i.group_id = ? AND i.group_member_id = ?") (userId, groupId, groupMemberId)
+
 deleteGroupChatItemsMessages :: DB.Connection -> User -> GroupInfo -> IO ()
 deleteGroupChatItemsMessages db User {userId} GroupInfo {groupId} = do
   DB.execute db "DELETE FROM messages WHERE group_id = ?" (Only groupId)
@@ -346,28 +367,136 @@ deleteOldMessages db createdAtCutoff = do
 
 type NewQuoteRow = (Maybe SharedMsgId, Maybe UTCTime, Maybe MsgContent, Maybe Bool, Maybe MemberId)
 
-updateChatTs :: DB.Connection -> User -> ChatDirection c d -> UTCTime -> IO ()
-updateChatTs db User {userId} chatDirection chatTs = case toChatInfo chatDirection of
-  DirectChat Contact {contactId} ->
+-- For support chats with members we track unanswered count - number of messages from the member
+-- that weren't followed up by a message from any of moderators.
+data MemberAttention
+  -- Message was received from member, increase unanswered counter and set support_chat_last_msg_from_member_ts.
+  -- `MAInc 0 Nothing` is used in two cases:
+  -- - when message from moderator is older than the last message from member (support_chat_last_msg_from_member_ts);
+  -- - for user's chat with moderators, where unanswered count is not tracked.
+  = MAInc Int (Maybe UTCTime)
+  -- Message was received from moderator, reset unanswered counter.
+  | MAReset
+  deriving (Show)
+
+updateChatTsStats :: DB.Connection -> VersionRangeChat -> User -> ChatDirection c d -> UTCTime -> Maybe (Int, MemberAttention, Int) -> IO (ChatInfo c)
+updateChatTsStats db vr user@User {userId} chatDirection chatTs chatStats_ = case toChatInfo chatDirection of
+  DirectChat ct@Contact {contactId} -> do
     DB.execute
       db
       "UPDATE contacts SET chat_ts = ?, chat_deleted = 0 WHERE user_id = ? AND contact_id = ?"
       (chatTs, userId, contactId)
-  GroupChat GroupInfo {groupId} ->
+    pure $ DirectChat ct {chatTs = Just chatTs}
+  GroupChat g@GroupInfo {groupId} Nothing -> do
     DB.execute
       db
       "UPDATE groups SET chat_ts = ? WHERE user_id = ? AND group_id = ?"
       (chatTs, userId, groupId)
-  LocalChat NoteFolder {noteFolderId} ->
+    pure $ GroupChat g {chatTs = Just chatTs} Nothing
+  GroupChat g@GroupInfo {groupId, membership, membersRequireAttention} (Just GCSIMemberSupport {groupMember_}) ->
+    case groupMember_ of
+      Nothing -> do
+        membership' <- updateGMStats membership
+        DB.execute
+          db
+          "UPDATE groups SET chat_ts = ? WHERE user_id = ? AND group_id = ?"
+          (chatTs, userId, groupId)
+        pure $ GroupChat g {membership = membership', chatTs = Just chatTs} (Just $ GCSIMemberSupport Nothing)
+      Just member -> do
+        member' <- updateGMStats member
+        let didRequire = gmRequiresAttention member
+            nowRequires = gmRequiresAttention member'
+        if
+          | nowRequires && not didRequire -> do
+              DB.execute
+                db
+                [sql|
+                  UPDATE groups
+                  SET chat_ts = ?,
+                      members_require_attention = members_require_attention + 1
+                  WHERE user_id = ? AND group_id = ?
+                |]
+                (chatTs, userId, groupId)
+              pure $ GroupChat g {membersRequireAttention = membersRequireAttention + 1, chatTs = Just chatTs} (Just $ GCSIMemberSupport (Just member'))
+          | not nowRequires && didRequire -> do
+              DB.execute
+                db
+                [sql|
+                  UPDATE groups
+                  SET chat_ts = ?,
+                      members_require_attention = members_require_attention - 1
+                  WHERE user_id = ? AND group_id = ?
+                |]
+                (chatTs, userId, groupId)
+              pure $ GroupChat g {membersRequireAttention = membersRequireAttention - 1, chatTs = Just chatTs} (Just $ GCSIMemberSupport (Just member'))
+          | otherwise -> do
+              DB.execute
+                db
+                "UPDATE groups SET chat_ts = ? WHERE user_id = ? AND group_id = ?"
+                (chatTs, userId, groupId)
+              pure $ GroupChat g {chatTs = Just chatTs} (Just $ GCSIMemberSupport (Just member'))
+    where
+      updateGMStats m@GroupMember {groupMemberId} = do
+        case chatStats_ of
+          Nothing ->
+            DB.execute
+              db
+              "UPDATE group_members SET support_chat_ts = ? WHERE group_member_id = ?"
+              (chatTs, groupMemberId)
+          Just (unread, MAInc unanswered Nothing, mentions) ->
+            DB.execute
+              db
+              [sql|
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = support_chat_items_member_attention + ?,
+                    support_chat_items_mentions = support_chat_items_mentions + ?
+                WHERE group_member_id = ?
+              |]
+              (chatTs, unread, unanswered, mentions, groupMemberId)
+          Just (unread, MAInc unanswered (Just lastMsgFromMemberTs), mentions) ->
+            DB.execute
+              db
+              [sql|
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = support_chat_items_member_attention + ?,
+                    support_chat_items_mentions = support_chat_items_mentions + ?,
+                    support_chat_last_msg_from_member_ts = ?
+                WHERE group_member_id = ?
+              |]
+              (chatTs, unread, unanswered, mentions, lastMsgFromMemberTs, groupMemberId)
+          Just (unread, MAReset, mentions) ->
+            DB.execute
+              db
+              [sql|
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = 0,
+                    support_chat_items_mentions = support_chat_items_mentions + ?
+                WHERE group_member_id = ?
+              |]
+              (chatTs, unread, mentions, groupMemberId)
+        m_ <- runExceptT $ getGroupMemberById db vr user groupMemberId
+        pure $ either (const m) id m_ -- Left shouldn't happen, but types require it
+  LocalChat nf@NoteFolder {noteFolderId} -> do
     DB.execute
       db
       "UPDATE note_folders SET chat_ts = ? WHERE user_id = ? AND note_folder_id = ?"
       (chatTs, userId, noteFolderId)
-  _ -> pure ()
+    pure $ LocalChat nf {chatTs = chatTs}
+  cInfo -> pure cInfo
+
+setSupportChatTs :: DB.Connection -> GroupMemberId -> UTCTime -> IO ()
+setSupportChatTs db groupMemberId chatTs =
+  DB.execute db "UPDATE group_members SET support_chat_ts = ? WHERE group_member_id = ?" (chatTs, groupMemberId)
 
 createNewSndChatItem :: DB.Connection -> User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> Maybe (CIQuote c) -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> UTCTime -> IO ChatItemId
 createNewSndChatItem db user chatDirection SndMessage {msgId, sharedMsgId} ciContent quotedItem itemForwarded timed live createdAt =
-  createNewChatItem_ db user chatDirection createdByMsgId (Just sharedMsgId) ciContent quoteRow itemForwarded timed live createdAt Nothing createdAt
+  createNewChatItem_ db user chatDirection createdByMsgId (Just sharedMsgId) ciContent quoteRow itemForwarded timed live False createdAt Nothing createdAt
   where
     createdByMsgId = if msgId == 0 then Nothing else Just msgId
     quoteRow :: NewQuoteRow
@@ -381,9 +510,9 @@ createNewSndChatItem db user chatDirection SndMessage {msgId, sharedMsgId} ciCon
           CIQGroupRcv (Just GroupMember {memberId}) -> (Just False, Just memberId)
           CIQGroupRcv Nothing -> (Just False, Nothing)
 
-createNewRcvChatItem :: ChatTypeQuotable c => DB.Connection -> User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> CIContent 'MDRcv -> Maybe CITimed -> Bool -> UTCTime -> UTCTime -> IO (ChatItemId, Maybe (CIQuote c), Maybe CIForwardedFrom)
-createNewRcvChatItem db user chatDirection RcvMessage {msgId, chatMsgEvent, forwardedByMember} sharedMsgId_ ciContent timed live itemTs createdAt = do
-  ciId <- createNewChatItem_ db user chatDirection (Just msgId) sharedMsgId_ ciContent quoteRow itemForwarded timed live itemTs forwardedByMember createdAt
+createNewRcvChatItem :: ChatTypeQuotable c => DB.Connection -> User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> CIContent 'MDRcv -> Maybe CITimed -> Bool -> Bool -> UTCTime -> UTCTime -> IO (ChatItemId, Maybe (CIQuote c), Maybe CIForwardedFrom)
+createNewRcvChatItem db user chatDirection RcvMessage {msgId, chatMsgEvent, forwardedByMember} sharedMsgId_ ciContent timed live userMention itemTs createdAt = do
+  ciId <- createNewChatItem_ db user chatDirection (Just msgId) sharedMsgId_ ciContent quoteRow itemForwarded timed live userMention itemTs forwardedByMember createdAt
   quotedItem <- mapM (getChatItemQuote_ db user chatDirection) quotedMsg
   pure (ciId, quotedItem, itemForwarded)
   where
@@ -395,49 +524,62 @@ createNewRcvChatItem db user chatDirection RcvMessage {msgId, chatMsgEvent, forw
       Just QuotedMsg {msgRef = MsgRef {msgId = sharedMsgId, sentAt, sent, memberId}, content} ->
         uncurry (sharedMsgId,Just sentAt,Just content,,) $ case chatDirection of
           CDDirectRcv _ -> (Just $ not sent, Nothing)
-          CDGroupRcv GroupInfo {membership = GroupMember {memberId = userMemberId}} _ ->
+          CDGroupRcv GroupInfo {membership = GroupMember {memberId = userMemberId}} _ _ ->
             (Just $ Just userMemberId == memberId, memberId)
 
 createNewChatItemNoMsg :: forall c d. MsgDirectionI d => DB.Connection -> User -> ChatDirection c d -> CIContent d -> UTCTime -> UTCTime -> IO ChatItemId
 createNewChatItemNoMsg db user chatDirection ciContent itemTs =
-  createNewChatItem_ db user chatDirection Nothing Nothing ciContent quoteRow Nothing Nothing False itemTs Nothing
+  createNewChatItem_ db user chatDirection Nothing Nothing ciContent quoteRow Nothing Nothing False False itemTs Nothing
   where
     quoteRow :: NewQuoteRow
     quoteRow = (Nothing, Nothing, Nothing, Nothing, Nothing)
 
-createNewChatItem_ :: forall c d. MsgDirectionI d => DB.Connection -> User -> ChatDirection c d -> Maybe MessageId -> Maybe SharedMsgId -> CIContent d -> NewQuoteRow -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> UTCTime -> Maybe GroupMemberId -> UTCTime -> IO ChatItemId
-createNewChatItem_ db User {userId} chatDirection msgId_ sharedMsgId ciContent quoteRow itemForwarded timed live itemTs forwardedByMember createdAt = do
+createNewChatItem_ :: forall c d. MsgDirectionI d => DB.Connection -> User -> ChatDirection c d -> Maybe MessageId -> Maybe SharedMsgId -> CIContent d -> NewQuoteRow -> Maybe CIForwardedFrom -> Maybe CITimed -> Bool -> Bool -> UTCTime -> Maybe GroupMemberId -> UTCTime -> IO ChatItemId
+createNewChatItem_ db User {userId} chatDirection msgId_ sharedMsgId ciContent quoteRow itemForwarded timed live userMention itemTs forwardedByMember createdAt = do
   DB.execute
     db
     [sql|
       INSERT INTO chat_items (
         -- user and IDs
-        user_id, created_by_msg_id, contact_id, group_id, group_member_id, note_folder_id,
+        user_id, created_by_msg_id, contact_id, group_id, group_member_id, note_folder_id, group_scope_tag, group_scope_group_member_id,
         -- meta
         item_sent, item_ts, item_content, item_content_tag, item_text, item_status, msg_content_tag, shared_msg_id,
-        forwarded_by_group_member_id, created_at, updated_at, item_live, timed_ttl, timed_delete_at,
+        forwarded_by_group_member_id, include_in_history, created_at, updated_at, item_live, user_mention, timed_ttl, timed_delete_at,
         -- quote
         quoted_shared_msg_id, quoted_sent_at, quoted_content, quoted_sent, quoted_member_id,
         -- forwarded from
         fwd_from_tag, fwd_from_chat_name, fwd_from_msg_dir, fwd_from_contact_id, fwd_from_group_id, fwd_from_chat_item_id
-      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
     |]
-    ((userId, msgId_) :. idsRow :. itemRow :. quoteRow' :. forwardedFromRow)
+    ((userId, msgId_) :. idsRow :. groupScopeRow :. itemRow :. quoteRow' :. forwardedFromRow)
   ciId <- insertedRowId db
   forM_ msgId_ $ \msgId -> insertChatItemMessage_ db ciId msgId createdAt
   pure ciId
   where
-    itemRow :: (SMsgDirection d, UTCTime, CIContent d, Text, Text, CIStatus d, Maybe MsgContentTag, Maybe SharedMsgId, Maybe GroupMemberId) :. (UTCTime, UTCTime, Maybe BoolInt) :. (Maybe Int, Maybe UTCTime)
-    itemRow = (msgDirection @d, itemTs, ciContent, toCIContentTag ciContent, ciContentToText ciContent, ciCreateStatus ciContent, msgContentTag <$> ciMsgContent ciContent, sharedMsgId, forwardedByMember) :. (createdAt, createdAt, BI <$> (justTrue live)) :. ciTimedRow timed
+    itemRow :: (SMsgDirection d, UTCTime, CIContent d, Text, Text, CIStatus d, Maybe MsgContentTag, Maybe SharedMsgId, Maybe GroupMemberId, BoolInt) :. (UTCTime, UTCTime, Maybe BoolInt, BoolInt) :. (Maybe Int, Maybe UTCTime)
+    itemRow = (msgDirection @d, itemTs, ciContent, toCIContentTag ciContent, ciContentToText ciContent, ciCreateStatus ciContent, msgContentTag <$> ciMsgContent ciContent, sharedMsgId, forwardedByMember, BI includeInHistory) :. (createdAt, createdAt, BI <$> (justTrue live), BI userMention) :. ciTimedRow timed
     quoteRow' = let (a, b, c, d, e) = quoteRow in (a, b, c, BI <$> d, e)
-    idsRow :: (Maybe Int64, Maybe Int64, Maybe Int64, Maybe Int64)
+    idsRow :: (Maybe ContactId, Maybe GroupId, Maybe GroupMemberId, Maybe NoteFolderId)
     idsRow = case chatDirection of
       CDDirectRcv Contact {contactId} -> (Just contactId, Nothing, Nothing, Nothing)
       CDDirectSnd Contact {contactId} -> (Just contactId, Nothing, Nothing, Nothing)
-      CDGroupRcv GroupInfo {groupId} GroupMember {groupMemberId} -> (Nothing, Just groupId, Just groupMemberId, Nothing)
-      CDGroupSnd GroupInfo {groupId} -> (Nothing, Just groupId, Nothing, Nothing)
+      CDGroupRcv GroupInfo {groupId} _ GroupMember {groupMemberId} -> (Nothing, Just groupId, Just groupMemberId, Nothing)
+      CDGroupSnd GroupInfo {groupId} _ -> (Nothing, Just groupId, Nothing, Nothing)
       CDLocalRcv NoteFolder {noteFolderId} -> (Nothing, Nothing, Nothing, Just noteFolderId)
       CDLocalSnd NoteFolder {noteFolderId} -> (Nothing, Nothing, Nothing, Just noteFolderId)
+    groupScope :: Maybe (Maybe GroupChatScopeInfo)
+    groupScope = case chatDirection of
+      CDGroupRcv _ scope _ -> Just scope
+      CDGroupSnd _ scope -> Just scope
+      _ -> Nothing
+    groupScopeRow :: (Maybe GroupChatScopeTag, Maybe GroupMemberId)
+    groupScopeRow = case groupScope of
+      Just (Just GCSIMemberSupport {groupMember_}) -> (Just GCSTMemberSupport_, groupMemberId' <$> groupMember_)
+      _ -> (Nothing, Nothing)
+    includeInHistory :: Bool
+    includeInHistory = case groupScope of
+      Just Nothing -> isJust (ciMsgContent ciContent) && ((msgContentTag <$> ciMsgContent ciContent) /= Just MCReport_)
+      _ -> False
     forwardedFromRow :: (Maybe CIForwardedFromTag, Maybe Text, Maybe MsgDirection, Maybe Int64, Maybe Int64, Maybe Int64)
     forwardedFromRow = case itemForwarded of
       Nothing ->
@@ -460,7 +602,7 @@ getChatItemQuote_ :: ChatTypeQuotable c => DB.Connection -> User -> ChatDirectio
 getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRef = MsgRef {msgId, sentAt, sent, memberId}, content} =
   case chatDirection of
     CDDirectRcv Contact {contactId} -> getDirectChatItemQuote_ contactId (not sent)
-    CDGroupRcv GroupInfo {groupId, membership = GroupMember {memberId = userMemberId}} sender@GroupMember {groupMemberId = senderGMId, memberId = senderMemberId} ->
+    CDGroupRcv GroupInfo {groupId, membership = GroupMember {memberId = userMemberId}} _s sender@GroupMember {groupMemberId = senderGMId, memberId = senderMemberId} ->
       case memberId of
         Just mId
           | mId == userMemberId -> (`ciQuote` CIQGroupSnd) <$> getUserGroupChatItemId_ groupId
@@ -504,7 +646,9 @@ getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRe
               -- GroupMember
               m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
               m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-              p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences
+              p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+              m.created_at, m.updated_at,
+              m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
             FROM group_members m
             JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
             LEFT JOIN contacts c ON m.contact_id = c.contact_id
@@ -558,10 +702,17 @@ data ChatPreviewData (c :: ChatType) where
 
 data AChatPreviewData = forall c. ChatTypeI c => ACPD (SChatType c) (ChatPreviewData c)
 
-type ChatStatsRow = (Int, Int, ChatItemId, BoolInt)
+type ChatStatsRow = (Int, ChatItemId, BoolInt)
 
 toChatStats :: ChatStatsRow -> ChatStats
-toChatStats (unreadCount, reportsCount, minUnreadItemId, BI unreadChat) = ChatStats {unreadCount, reportsCount, minUnreadItemId, unreadChat}
+toChatStats (unreadCount, minUnreadItemId, BI unreadChat) =
+  ChatStats {unreadCount, unreadMentions = 0, reportsCount = 0, minUnreadItemId, unreadChat}
+
+type GroupStatsRow = (Int, Int, Int, ChatItemId, BoolInt)
+
+toGroupStats :: GroupStatsRow -> ChatStats
+toGroupStats (unreadCount, unreadMentions, reportsCount, minUnreadItemId, BI unreadChat) =
+  ChatStats {unreadCount, unreadMentions, reportsCount, minUnreadItemId, unreadChat}
 
 findDirectChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
 findDirectChatPreviews_ db User {userId} pagination clq =
@@ -583,7 +734,6 @@ findDirectChatPreviews_ db User {userId} pagination clq =
             LIMIT 1
           ) AS chat_item_id,
           COALESCE(ChatStats.UnreadCount, 0),
-          0,
           COALESCE(ChatStats.MinUnread, 0),
           ct.unread_chat
         FROM contacts ct
@@ -665,9 +815,9 @@ findGroupChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQ
 findGroupChatPreviews_ db User {userId} pagination clq =
   map toPreview <$> getPreviews
   where
-    toPreview :: (GroupId, UTCTime, Maybe ChatItemId) :. ChatStatsRow -> AChatPreviewData
+    toPreview :: (GroupId, UTCTime, Maybe ChatItemId) :. GroupStatsRow -> AChatPreviewData
     toPreview ((groupId, ts, lastItemId_) :. statsRow) =
-      ACPD SCTGroup $ GroupChatPD ts groupId lastItemId_ (toChatStats statsRow)
+      ACPD SCTGroup $ GroupChatPD ts groupId lastItemId_ (toGroupStats statsRow)
     baseQuery =
       [sql|
         SELECT
@@ -676,19 +826,20 @@ findGroupChatPreviews_ db User {userId} pagination clq =
           (
             SELECT chat_item_id
             FROM chat_items ci
-            WHERE ci.user_id = ? AND ci.group_id = g.group_id
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
             ORDER BY ci.item_ts DESC
             LIMIT 1
           ) AS chat_item_id,
           COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
           COALESCE(ReportCount.Count, 0),
           COALESCE(ChatStats.MinUnread, 0),
           g.unread_chat
         FROM groups g
         LEFT JOIN (
-          SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
           FROM chat_items
-          WHERE user_id = ? AND group_id IS NOT NULL AND item_status = ?
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
           GROUP BY group_id
         ) ChatStats ON ChatStats.group_id = g.group_id
         LEFT JOIN (
@@ -752,7 +903,7 @@ findGroupChatPreviews_ db User {userId} pagination clq =
                    |]
             p = baseParams :. (userId, search, search, search, search)
         queryWithPagination q p
-    queryWithPagination :: ToRow p => Query -> p -> IO [(GroupId, UTCTime, Maybe ChatItemId) :. ChatStatsRow]
+    queryWithPagination :: ToRow p => Query -> p -> IO [(GroupId, UTCTime, Maybe ChatItemId) :. GroupStatsRow]
     queryWithPagination query params = case pagination of
       PTLast count -> DB.query db (query <> " ORDER BY g.chat_ts DESC LIMIT ?") (params :. Only count)
       PTAfter ts count -> DB.query db (query <> " AND g.chat_ts > ? ORDER BY g.chat_ts ASC LIMIT ?") (params :. (ts, count))
@@ -762,9 +913,9 @@ getGroupChatPreview_ :: DB.Connection -> VersionRangeChat -> User -> ChatPreview
 getGroupChatPreview_ db vr user (GroupChatPD _ groupId lastItemId_ stats) = do
   groupInfo <- getGroupInfo db vr user groupId
   lastItem <- case lastItemId_ of
-    Just lastItemId -> (: []) <$> getGroupChatItem db user groupId lastItemId
+    Just lastItemId -> (: []) <$> getGroupCIWithReactions db user groupInfo lastItemId
     Nothing -> pure []
-  pure $ AChat SCTGroup (Chat (GroupChat groupInfo) lastItem stats)
+  pure $ AChat SCTGroup (Chat (GroupChat groupInfo Nothing) lastItem stats)
 
 findLocalChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
 findLocalChatPreviews_ db User {userId} pagination clq =
@@ -786,7 +937,6 @@ findLocalChatPreviews_ db User {userId} pagination clq =
             LIMIT 1
           ) AS chat_item_id,
           COALESCE(ChatStats.UnreadCount, 0),
-          0,
           COALESCE(ChatStats.MinUnread, 0),
           nf.unread_chat
         FROM note_folders nf
@@ -851,7 +1001,7 @@ getLocalChatPreview_ db user (LocalChatPD _ noteFolderId lastItemId_ stats) = do
 
 -- this function can be changed so it never fails, not only avoid failure on invalid json
 toLocalChatItem :: UTCTime -> ChatItemRow -> Either StoreError (CChatItem 'CTLocal)
-toLocalChatItem currentTs ((itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. forwardedFromRow :. (timedTTL, timedDeleteAt, itemLive) :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)) =
+toLocalChatItem currentTs ((itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. forwardedFromRow :. (timedTTL, timedDeleteAt, itemLive, BI userMention) :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)) =
   chatItem $ fromRight invalid $ dbParseACIContent itemContentText
   where
     invalid = ACIContent msgDir $ CIInvalidJSON itemContentText
@@ -875,7 +1025,7 @@ toLocalChatItem currentTs ((itemId, itemTs, AMsgDirection msgDir, itemContentTex
         _ -> Nothing
     cItem :: MsgDirectionI d => SMsgDirection d -> CIDirection 'CTLocal d -> CIStatus d -> CIContent d -> Maybe (CIFile d) -> CChatItem 'CTLocal
     cItem d chatDir ciStatus content file =
-      CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, formattedText = parseMaybeMarkdownList itemText, quotedItem = Nothing, reactions = [], file}
+      CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, mentions = M.empty, formattedText = parseMaybeMarkdownList itemText, quotedItem = Nothing, reactions = [], file}
     badItem = Left $ SEBadChatItem itemId (Just itemTs)
     ciMeta :: CIContent d -> CIStatus d -> CIMeta 'CTLocal d
     ciMeta content status =
@@ -884,7 +1034,7 @@ toLocalChatItem currentTs ((itemId, itemTs, AMsgDirection msgDir, itemContentTex
             _ -> Just (CIDeleted @'CTLocal deletedTs)
           itemEdited' = maybe False unBI itemEdited
           itemForwarded = toCIForwardedFrom forwardedFromRow
-       in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) currentTs itemTs Nothing createdAt updatedAt
+       in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) userMention currentTs itemTs Nothing createdAt updatedAt
     ciTimed :: Maybe CITimed
     ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
 
@@ -940,7 +1090,7 @@ getContactConnectionChatPreviews_ db User {userId} pagination clq = case clq of
       [sql|
         SELECT
           connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id,
-          custom_user_profile_id, conn_req_inv, local_alias, created_at, updated_at
+          custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
         FROM connections
         WHERE user_id = ?
           AND conn_type = ?
@@ -956,7 +1106,7 @@ getContactConnectionChatPreviews_ db User {userId} pagination clq = case clq of
       PTLast count -> DB.query db (query <> " ORDER BY updated_at DESC LIMIT ?") (params search :. Only count)
       PTAfter ts count -> DB.query db (query <> " AND updated_at > ? ORDER BY updated_at ASC LIMIT ?") (params search :. (ts, count))
       PTBefore ts count -> DB.query db (query <> " AND updated_at < ? ORDER BY updated_at DESC LIMIT ?") (params search :. (ts, count))
-    toPreview :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, LocalAlias, UTCTime, UTCTime) -> AChatPreviewData
+    toPreview :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, Maybe (ConnShortLink 'CMInvitation), LocalAlias, UTCTime, UTCTime) -> AChatPreviewData
     toPreview connRow =
       let conn@PendingContactConnection {updatedAt} = toPendingContactConnection connRow
           aChat = AChat SCTContactConnection $ Chat (ContactConnection conn) [] emptyChatStats
@@ -1017,6 +1167,7 @@ safeToDirectItem currentTs itemId = \case
               { chatDir = CIDirectSnd,
                 meta = dummyMeta itemId ts errorText,
                 content = CIInvalidJSON errorText,
+                mentions = M.empty,
                 formattedText = Nothing,
                 quotedItem = Nothing,
                 reactions = [],
@@ -1198,32 +1349,101 @@ getContactNavInfo_ db User {userId} Contact {contactId} afterCI = do
               :. (userId, contactId, ciCreatedAt afterCI, cChatItemId afterCI)
           )
 
-getGroupChat :: DB.Connection -> VersionRangeChat -> User -> Int64 -> Maybe MsgContentTag -> ChatPagination -> Maybe String -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
-getGroupChat db vr user groupId contentFilter pagination search_ = do
+getGroupChat :: DB.Connection -> VersionRangeChat -> User -> Int64 -> Maybe GroupChatScope -> Maybe MsgContentTag -> ChatPagination -> Maybe String -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
+getGroupChat db vr user groupId scope_ contentFilter pagination search_ = do
   let search = fromMaybe "" search_
   g <- getGroupInfo db vr user groupId
+  scopeInfo <- mapM (getCreateGroupChatScopeInfo db vr user g) scope_
   case pagination of
-    CPLast count -> liftIO $ (,Nothing) <$> getGroupChatLast_ db user g contentFilter count search emptyChatStats
-    CPAfter afterId count -> (,Nothing) <$> getGroupChatAfter_ db user g contentFilter afterId count search
-    CPBefore beforeId count -> (,Nothing) <$> getGroupChatBefore_ db user g contentFilter beforeId count search
-    CPAround aroundId count -> getGroupChatAround_ db user g contentFilter aroundId count search
+    CPLast count -> (,Nothing) <$> getGroupChatLast_ db user g scopeInfo contentFilter count search emptyChatStats
+    CPAfter afterId count -> (,Nothing) <$> getGroupChatAfter_ db user g scopeInfo contentFilter afterId count search
+    CPBefore beforeId count -> (,Nothing) <$> getGroupChatBefore_ db user g scopeInfo contentFilter beforeId count search
+    CPAround aroundId count -> getGroupChatAround_ db user g scopeInfo contentFilter aroundId count search
     CPInitial count -> do
       unless (null search) $ throwError $ SEInternalError "initial chat pagination doesn't support search"
-      getGroupChatInitial_ db user g contentFilter count
+      getGroupChatInitial_ db user g scopeInfo contentFilter count
 
-getGroupChatLast_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> Int -> String -> ChatStats -> IO (Chat 'CTGroup)
-getGroupChatLast_ db user g contentFilter count search stats = do
-  ciIds <- getGroupChatItemIDs db user g contentFilter GRLast count search
-  ts <- getCurrentTime
-  cis <- mapM (safeGetGroupItem db user g ts) ciIds
-  pure $ Chat (GroupChat g) (reverse cis) stats
+getCreateGroupChatScopeInfo :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupChatScope -> ExceptT StoreError IO GroupChatScopeInfo
+getCreateGroupChatScopeInfo db vr user GroupInfo {membership} = \case
+  GCSMemberSupport Nothing -> do
+    when (isNothing $ supportChat membership) $ do
+      ts <- liftIO getCurrentTime
+      liftIO $ setSupportChatTs db (groupMemberId' membership) ts
+    pure $ GCSIMemberSupport {groupMember_ = Nothing}
+  GCSMemberSupport (Just gmId) -> do
+    m <- getGroupMemberById db vr user gmId
+    when (isNothing $ supportChat m) $ do
+      ts <- liftIO getCurrentTime
+      liftIO $ setSupportChatTs db gmId ts
+    pure GCSIMemberSupport {groupMember_ = Just m}
+
+getGroupChatScopeInfoForItem :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> ChatItemId -> ExceptT StoreError IO (Maybe GroupChatScopeInfo)
+getGroupChatScopeInfoForItem db vr user g itemId =
+  getGroupChatScopeForItem_ db itemId >>= mapM (getGroupChatScopeInfo db vr user g)
+
+getGroupChatScopeInfo :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupChatScope -> ExceptT StoreError IO GroupChatScopeInfo
+getGroupChatScopeInfo db vr user GroupInfo {membership} = \case
+  GCSMemberSupport Nothing -> case supportChat membership of
+    Nothing -> throwError $ SEInternalError "no moderators support chat"
+    Just _supportChat -> pure $ GCSIMemberSupport {groupMember_ = Nothing}
+  GCSMemberSupport (Just gmId) -> do
+    m <- getGroupMemberById db vr user gmId
+    case supportChat m of
+      Nothing -> throwError $ SEInternalError "no support chat"
+      Just _supportChat -> pure GCSIMemberSupport {groupMember_ = Just m}
+
+getGroupChatScopeForItem_ :: DB.Connection -> ChatItemId -> ExceptT StoreError IO (Maybe GroupChatScope)
+getGroupChatScopeForItem_ db itemId =
+  ExceptT . firstRow toScope (SEChatItemNotFound itemId) $
+    DB.query
+      db
+      [sql|
+        SELECT group_scope_tag, group_scope_group_member_id
+        FROM chat_items
+        WHERE chat_item_id = ?
+      |]
+      (Only itemId)
+  where
+    toScope (scopeTag, scopeMemberId) =
+      case (scopeTag, scopeMemberId) of
+        (Just GCSTMemberSupport_, Just gmId) -> Just $ GCSMemberSupport gmId
+        (Just GCSTMemberSupport_, Nothing) -> Just $ GCSMemberSupport Nothing
+        (Nothing, Nothing) -> Nothing
+        (Nothing, Just _) -> Nothing -- shouldn't happen
+
+getGroupChatLast_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> Int -> String -> ChatStats -> ExceptT StoreError IO (Chat 'CTGroup)
+getGroupChatLast_ db user g scopeInfo_ contentFilter count search stats = do
+  ciIds <- getGroupChatItemIDs db user g scopeInfo_ contentFilter GRLast count search
+  ts <- liftIO getCurrentTime
+  cis <- mapM (liftIO . safeGetGroupItem db user g ts) ciIds
+  pure $ Chat (GroupChat g scopeInfo_) (reverse cis) stats
 
 data GroupItemIDsRange = GRLast | GRAfter UTCTime ChatItemId | GRBefore UTCTime ChatItemId
 
-getGroupChatItemIDs :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> GroupItemIDsRange -> Int -> String -> IO [ChatItemId]
-getGroupChatItemIDs db User {userId} GroupInfo {groupId} contentFilter range count search = case contentFilter of
-  Just mcTag -> idsQuery (baseCond <> " AND msg_content_tag = ? ") (userId, groupId, mcTag)
-  Nothing -> idsQuery baseCond (userId, groupId)
+getGroupChatItemIDs :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> GroupItemIDsRange -> Int -> String -> ExceptT StoreError IO [ChatItemId]
+getGroupChatItemIDs db User {userId} GroupInfo {groupId} scopeInfo_ contentFilter range count search = case (scopeInfo_, contentFilter) of
+  (Nothing, Nothing) ->
+    liftIO $
+      idsQuery
+        (baseCond <> " AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL ")
+        (userId, groupId)
+  (Nothing, Just mcTag) ->
+    liftIO $
+      idsQuery
+        (baseCond <> " AND msg_content_tag = ? ")
+        (userId, groupId, mcTag)
+  (Just GCSIMemberSupport {groupMember_ = Just m}, Nothing) ->
+    liftIO $
+      idsQuery
+        (baseCond <> " AND group_scope_tag = ? AND group_scope_group_member_id = ? ")
+        (userId, groupId, GCSTMemberSupport_, groupMemberId' m)
+  (Just GCSIMemberSupport {groupMember_ = Nothing}, Nothing) ->
+    liftIO $
+      idsQuery
+        (baseCond <> " AND group_scope_tag = ? AND group_scope_group_member_id IS NULL ")
+        (userId, groupId, GCSTMemberSupport_)
+  (Just _scope, Just _mcTag) ->
+    throwError $ SEInternalError "group scope and content filter are not supported together"
   where
     baseQuery = " SELECT chat_item_id FROM chat_items WHERE "
     baseCond = " user_id = ? AND group_id = ? "
@@ -1241,7 +1461,7 @@ getGroupChatItemIDs db User {userId} GroupInfo {groupId} contentFilter range cou
           (orParams ts itemId)
           " ORDER BY item_ts DESC, chat_item_id DESC "
       where
-        orCond c1 c2 = " (" <> c <> " AND " <> c1 <> ") OR (" <> c <> " AND " <> c2 <> ") "
+        orCond c1 c2 = " ((" <> c <> " AND " <> c1 <> ") OR (" <> c <> " AND " <> c2 <> ")) "
         orParams ts itemId = (p :. (Only ts) :. p :. (ts, itemId))
     rangeQuery :: ToRow p => Query -> p -> Query -> IO [ChatItemId]
     rangeQuery c p ob
@@ -1272,6 +1492,7 @@ safeToGroupItem currentTs itemId = \case
               { chatDir = CIGroupSnd,
                 meta = dummyMeta itemId ts errorText,
                 content = CIInvalidJSON errorText,
+                mentions = M.empty,
                 formattedText = Nothing,
                 quotedItem = Nothing,
                 reactions = [],
@@ -1294,81 +1515,82 @@ getGroupMemberChatItemLast db user@User {userId} groupId groupMemberId = do
         (userId, groupId, groupMemberId)
   getGroupChatItem db user groupId chatItemId
 
-getGroupChatAfter_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup)
-getGroupChatAfter_ db user g@GroupInfo {groupId} contentFilter afterId count search = do
+getGroupChatAfter_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup)
+getGroupChatAfter_ db user g@GroupInfo {groupId} scopeInfo contentFilter afterId count search = do
   afterCI <- getGroupChatItem db user groupId afterId
   let range = GRAfter (chatItemTs afterCI) (cChatItemId afterCI)
-  ciIds <- liftIO $ getGroupChatItemIDs db user g contentFilter range count search
+  ciIds <- getGroupChatItemIDs db user g scopeInfo contentFilter range count search
   ts <- liftIO getCurrentTime
   cis <- liftIO $ mapM (safeGetGroupItem db user g ts) ciIds
-  pure $ Chat (GroupChat g) cis emptyChatStats
+  pure $ Chat (GroupChat g scopeInfo) cis emptyChatStats
 
-getGroupChatBefore_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup)
-getGroupChatBefore_ db user g@GroupInfo {groupId} contentFilter beforeId count search = do
+getGroupChatBefore_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup)
+getGroupChatBefore_ db user g@GroupInfo {groupId} scopeInfo contentFilter beforeId count search = do
   beforeCI <- getGroupChatItem db user groupId beforeId
   let range = GRBefore (chatItemTs beforeCI) (cChatItemId beforeCI)
-  ciIds <- liftIO $ getGroupChatItemIDs db user g contentFilter range count search
+  ciIds <- getGroupChatItemIDs db user g scopeInfo contentFilter range count search
   ts <- liftIO getCurrentTime
   cis <- liftIO $ mapM (safeGetGroupItem db user g ts) ciIds
-  pure $ Chat (GroupChat g) (reverse cis) emptyChatStats
+  pure $ Chat (GroupChat g scopeInfo) (reverse cis) emptyChatStats
 
-getGroupChatAround_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
-getGroupChatAround_ db user g contentFilter aroundId count search = do
-  stats <- liftIO $ getGroupStats_ db user g
-  getGroupChatAround' db user g contentFilter aroundId count search stats
+getGroupChatAround_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
+getGroupChatAround_ db user g scopeInfo contentFilter aroundId count search = do
+  stats <- getGroupStats_ db user g scopeInfo
+  getGroupChatAround' db user g scopeInfo contentFilter aroundId count search stats
 
-getGroupChatAround' :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ChatStats -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
-getGroupChatAround' db user g@GroupInfo {groupId} contentFilter aroundId count search stats = do
-  aroundCI <- getGroupChatItem db user groupId aroundId
+getGroupChatAround' :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ChatItemId -> Int -> String -> ChatStats -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
+getGroupChatAround' db user g scopeInfo contentFilter aroundId count search stats = do
+  aroundCI <- getGroupCIWithReactions db user g aroundId
   let beforeRange = GRBefore (chatItemTs aroundCI) (cChatItemId aroundCI)
       afterRange = GRAfter (chatItemTs aroundCI) (cChatItemId aroundCI)
-  beforeIds <- liftIO $ getGroupChatItemIDs db user g contentFilter beforeRange count search
-  afterIds <- liftIO $ getGroupChatItemIDs db user g contentFilter afterRange count search
+  beforeIds <- getGroupChatItemIDs db user g scopeInfo contentFilter beforeRange count search
+  afterIds <- getGroupChatItemIDs db user g scopeInfo contentFilter afterRange count search
   ts <- liftIO getCurrentTime
   beforeCIs <- liftIO $ mapM (safeGetGroupItem db user g ts) beforeIds
   afterCIs <- liftIO $ mapM (safeGetGroupItem db user g ts) afterIds
   let cis = reverse beforeCIs <> [aroundCI] <> afterCIs
   navInfo <- liftIO $ getNavInfo cis
-  pure (Chat (GroupChat g) cis stats, Just navInfo)
+  pure (Chat (GroupChat g scopeInfo) cis stats, Just navInfo)
   where
     getNavInfo cis_ = case cis_ of
       [] -> pure $ NavigationInfo 0 0
       cis -> getGroupNavInfo_ db user g (last cis)
 
-getGroupChatInitial_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> Int -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
-getGroupChatInitial_ db user g contentFilter count = do
-  liftIO (getGroupMinUnreadId_ db user g contentFilter) >>= \case
+getGroupChatInitial_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> Int -> ExceptT StoreError IO (Chat 'CTGroup, Maybe NavigationInfo)
+getGroupChatInitial_ db user g scopeInfo_ contentFilter count = do
+  getGroupMinUnreadId_ db user g scopeInfo_ contentFilter >>= \case
     Just minUnreadItemId -> do
-      stats <- liftIO $ getStats minUnreadItemId =<< getGroupUnreadCount_ db user g Nothing
-      getGroupChatAround' db user g contentFilter minUnreadItemId count "" stats
-    Nothing -> liftIO $ do
-      stats <- getStats 0 0
-      (,Just $ NavigationInfo 0 0) <$> getGroupChatLast_ db user g contentFilter count "" stats
+      unreadCounts <- getGroupUnreadCount_ db user g scopeInfo_ Nothing
+      stats <- liftIO $ getStats minUnreadItemId unreadCounts
+      getGroupChatAround' db user g scopeInfo_ contentFilter minUnreadItemId count "" stats
+    Nothing -> do
+      stats <- liftIO $ getStats 0 (0, 0)
+      (,Just $ NavigationInfo 0 0) <$> getGroupChatLast_ db user g scopeInfo_ contentFilter count "" stats
   where
-    getStats minUnreadItemId unreadCount = do
+    getStats minUnreadItemId (unreadCount, unreadMentions) = do
       reportsCount <- getGroupReportsCount_ db user g False
-      pure ChatStats {unreadCount, reportsCount, minUnreadItemId, unreadChat = False}
+      pure ChatStats {unreadCount, unreadMentions, reportsCount, minUnreadItemId, unreadChat = False}
 
-getGroupStats_ :: DB.Connection -> User -> GroupInfo -> IO ChatStats
-getGroupStats_ db user g = do
-  minUnreadItemId <- fromMaybe 0 <$> getGroupMinUnreadId_ db user g Nothing
-  unreadCount <- getGroupUnreadCount_ db user g Nothing
-  reportsCount <- getGroupReportsCount_ db user g False
-  pure ChatStats {unreadCount, reportsCount, minUnreadItemId, unreadChat = False}
+getGroupStats_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> ExceptT StoreError IO ChatStats
+getGroupStats_ db user g scopeInfo_ = do
+  minUnreadItemId <- fromMaybe 0 <$> getGroupMinUnreadId_ db user g scopeInfo_ Nothing
+  (unreadCount, unreadMentions) <- getGroupUnreadCount_ db user g scopeInfo_ Nothing
+  reportsCount <- liftIO $ getGroupReportsCount_ db user g False
+  pure ChatStats {unreadCount, unreadMentions, reportsCount, minUnreadItemId, unreadChat = False}
 
-getGroupMinUnreadId_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> IO (Maybe ChatItemId)
-getGroupMinUnreadId_ db user g contentFilter =
+getGroupMinUnreadId_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ExceptT StoreError IO (Maybe ChatItemId)
+getGroupMinUnreadId_ db user g scopeInfo_ contentFilter =
   fmap join . maybeFirstRow fromOnly $
-    queryUnreadGroupItems db user g contentFilter baseQuery orderLimit
+    queryUnreadGroupItems db user g scopeInfo_ contentFilter baseQuery orderLimit
   where
     baseQuery = "SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? "
     orderLimit = " ORDER BY item_ts ASC, chat_item_id ASC LIMIT 1"
 
-getGroupUnreadCount_ :: DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> IO Int
-getGroupUnreadCount_ db user g contentFilter =
-  fromOnly . head <$> queryUnreadGroupItems db user g contentFilter baseQuery ""
+getGroupUnreadCount_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ExceptT StoreError IO (Int, Int)
+getGroupUnreadCount_ db user g scopeInfo_ contentFilter =
+  head <$> queryUnreadGroupItems db user g scopeInfo_ contentFilter baseQuery ""
   where
-    baseQuery = "SELECT COUNT(1) FROM chat_items WHERE user_id = ? AND group_id = ? "
+    baseQuery = "SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? AND group_scope_tag IS NULL "
 
 getGroupReportsCount_ :: DB.Connection -> User -> GroupInfo -> Bool -> IO Int
 getGroupReportsCount_ db User {userId} GroupInfo {groupId} archived =
@@ -1378,19 +1600,35 @@ getGroupReportsCount_ db User {userId} GroupInfo {groupId} archived =
       "SELECT COUNT(1) FROM chat_items WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0"
       (userId, groupId, MCReport_, BI archived)
 
-queryUnreadGroupItems :: FromRow r => DB.Connection -> User -> GroupInfo -> Maybe MsgContentTag -> Query -> Query -> IO [r]
-queryUnreadGroupItems db User {userId} GroupInfo {groupId} contentFilter baseQuery orderLimit =
-  case contentFilter of
-    Just mcTag ->
-      DB.query
-        db
-        (baseQuery <> " AND msg_content_tag = ? AND item_status = ? " <> orderLimit)
-        (userId, groupId, mcTag, CISRcvNew)
-    Nothing ->
-      DB.query
-        db
-        (baseQuery <> " AND item_status = ? " <> orderLimit)
-        (userId, groupId, CISRcvNew)
+queryUnreadGroupItems :: FromRow r => DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> Query -> Query -> ExceptT StoreError IO [r]
+queryUnreadGroupItems db User {userId} GroupInfo {groupId} scopeInfo_ contentFilter baseQuery orderLimit =
+  case (scopeInfo_, contentFilter) of
+    (Nothing, Nothing) ->
+      liftIO $
+        DB.query
+          db
+          (baseQuery <> " AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? " <> orderLimit)
+          (userId, groupId, CISRcvNew)
+    (Nothing, Just mcTag) ->
+      liftIO $
+        DB.query
+          db
+          (baseQuery <> " AND msg_content_tag = ? AND item_status = ? " <> orderLimit)
+          (userId, groupId, mcTag, CISRcvNew)
+    (Just GCSIMemberSupport {groupMember_ = Just m}, Nothing) ->
+      liftIO $
+        DB.query
+          db
+          (baseQuery <> " AND group_scope_tag = ? AND group_scope_group_member_id = ? AND item_status = ? " <> orderLimit)
+          (userId, groupId, GCSTMemberSupport_, groupMemberId' m, CISRcvNew)
+    (Just GCSIMemberSupport {groupMember_ = Nothing}, Nothing) ->
+      liftIO $
+        DB.query
+          db
+          (baseQuery <> " AND group_scope_tag = ? AND group_scope_group_member_id IS NULL AND item_status = ? " <> orderLimit)
+          (userId, groupId, GCSTMemberSupport_, CISRcvNew)
+    (Just _scope, Just _mcTag) ->
+      throwError $ SEInternalError "group scope and content filter are not supported together"
 
 getGroupNavInfo_ :: DB.Connection -> User -> GroupInfo -> CChatItem 'CTGroup -> IO NavigationInfo
 getGroupNavInfo_ db User {userId} GroupInfo {groupId} afterCI = do
@@ -1497,6 +1735,7 @@ safeToLocalItem currentTs itemId = \case
               { chatDir = CILocalSnd,
                 meta = dummyMeta itemId ts errorText,
                 content = CIInvalidJSON errorText,
+                mentions = M.empty,
                 formattedText = Nothing,
                 quotedItem = Nothing,
                 reactions = [],
@@ -1662,12 +1901,22 @@ getLocalNavInfo_ db User {userId} NoteFolder {noteFolderId} afterCI = do
               :. (userId, noteFolderId, ciCreatedAt afterCI, cChatItemId afterCI)
           )
 
-toChatItemRef :: (ChatItemId, Maybe Int64, Maybe Int64, Maybe Int64) -> Either StoreError (ChatRef, ChatItemId)
+toChatItemRef ::
+  (ChatItemId, Maybe ContactId, Maybe GroupId, Maybe GroupChatScopeTag, Maybe GroupMemberId, Maybe NoteFolderId) ->
+  Either StoreError (ChatRef, ChatItemId)
 toChatItemRef = \case
-  (itemId, Just contactId, Nothing, Nothing) -> Right (ChatRef CTDirect contactId, itemId)
-  (itemId, Nothing, Just groupId, Nothing) -> Right (ChatRef CTGroup groupId, itemId)
-  (itemId, Nothing, Nothing, Just folderId) -> Right (ChatRef CTLocal folderId, itemId)
-  (itemId, _, _, _) -> Left $ SEBadChatItem itemId Nothing
+  (itemId, Just contactId, Nothing, Nothing, Nothing, Nothing) ->
+    Right (ChatRef CTDirect contactId Nothing, itemId)
+  (itemId, Nothing, Just groupId, Nothing, Nothing, Nothing) ->
+    Right (ChatRef CTGroup groupId Nothing, itemId)
+  (itemId, Nothing, Just groupId, Just GCSTMemberSupport_, Nothing, Nothing) ->
+    Right (ChatRef CTGroup groupId (Just (GCSMemberSupport Nothing)), itemId)
+  (itemId, Nothing, Just groupId, Just GCSTMemberSupport_, Just scopeGMId, Nothing) ->
+    Right (ChatRef CTGroup groupId (Just (GCSMemberSupport $ Just scopeGMId)), itemId)
+  (itemId, Nothing, Nothing, Nothing, Nothing, Just folderId) ->
+    Right (ChatRef CTLocal folderId Nothing, itemId)
+  (itemId, _, _, _, _, _) ->
+    Left $ SEBadChatItem itemId Nothing
 
 updateDirectChatItemsRead :: DB.Connection -> User -> ContactId -> IO ()
 updateDirectChatItemsRead db User {userId} contactId = do
@@ -1734,8 +1983,8 @@ setDirectChatItemsDeleteAt db User {userId} contactId itemIds currentTs = forM i
     (deleteAt, userId, contactId, chatItemId)
   pure (chatItemId, deleteAt)
 
-updateGroupChatItemsRead :: DB.Connection -> User -> GroupId -> IO ()
-updateGroupChatItemsRead db User {userId} groupId = do
+updateGroupChatItemsRead :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScope -> IO ()
+updateGroupChatItemsRead db User {userId} GroupInfo {groupId, membership} scope = do
   currentTs <- getCurrentTime
   DB.execute
     db
@@ -1744,6 +1993,20 @@ updateGroupChatItemsRead db User {userId} groupId = do
       WHERE user_id = ? AND group_id = ? AND item_status = ?
     |]
     (CISRcvRead, currentTs, userId, groupId, CISRcvNew)
+  case scope of
+    Nothing -> pure ()
+    Just GCSMemberSupport {groupMemberId_} -> do
+      let gmId = fromMaybe (groupMemberId' membership) groupMemberId_
+      DB.execute
+        db
+        [sql|
+          UPDATE group_members
+          SET support_chat_items_unread = 0,
+              support_chat_items_member_attention = 0,
+              support_chat_items_mentions = 0
+          WHERE group_member_id = ?
+        |]
+        (Only gmId)
 
 getGroupUnreadTimedItems :: DB.Connection -> User -> GroupId -> IO [(ChatItemId, Int)]
 getGroupUnreadTimedItems db User {userId} groupId =
@@ -1756,33 +2019,83 @@ getGroupUnreadTimedItems db User {userId} groupId =
     |]
     (userId, groupId, CISRcvNew)
 
-updateGroupChatItemsReadList :: DB.Connection -> User -> GroupId -> NonEmpty ChatItemId -> IO [(ChatItemId, Int)]
-updateGroupChatItemsReadList db User {userId} groupId itemIds = do
-  currentTs <- getCurrentTime
-  catMaybes . L.toList <$> mapM (getUpdateGroupItem currentTs) itemIds
+updateGroupChatItemsReadList :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> NonEmpty ChatItemId -> ExceptT StoreError IO ([(ChatItemId, Int)], GroupInfo)
+updateGroupChatItemsReadList db vr user@User {userId} g@GroupInfo {groupId} scopeInfo_ itemIds = do
+  currentTs <- liftIO getCurrentTime
+  -- Possible improvement is to differentiate retrieval queries for each scope,
+  -- but we rely on UI to not pass item IDs from incorrect scope.
+  readItemsData <- liftIO $ catMaybes . L.toList <$> mapM (getUpdateGroupItem currentTs) itemIds
+  g' <- case scopeInfo_ of
+    Nothing -> pure g
+    Just scopeInfo@GCSIMemberSupport {groupMember_} -> do
+      let decStats = countReadItems groupMember_ readItemsData
+      liftIO $ updateGroupScopeUnreadStats db vr user g scopeInfo decStats
+  pure (timedItems readItemsData, g')
   where
-    getUpdateGroupItem currentTs itemId = do
-      ttl_ <- maybeFirstRow fromOnly getUnreadTimedItem
-      setItemRead
-      pure $ (itemId,) <$> ttl_
+    getUpdateGroupItem :: UTCTime -> ChatItemId -> IO (Maybe (ChatItemId, Maybe Int, Maybe UTCTime, Maybe GroupMemberId, Maybe BoolInt))
+    getUpdateGroupItem currentTs itemId =
+      maybeFirstRow id $
+        DB.query
+          db
+          [sql|
+            UPDATE chat_items SET item_status = ?, updated_at = ?
+            WHERE user_id = ? AND group_id = ? AND item_status = ? AND chat_item_id = ?
+            RETURNING chat_item_id, timed_ttl, timed_delete_at, group_member_id, user_mention
+          |]
+          (CISRcvRead, currentTs, userId, groupId, CISRcvNew, itemId)
+    countReadItems :: Maybe GroupMember -> [(ChatItemId, Maybe Int, Maybe UTCTime, Maybe GroupMemberId, Maybe BoolInt)] -> (Int, Int, Int)
+    countReadItems scopeMember_ readItemsData =
+      let unread = length readItemsData
+          (unanswered, mentions) = foldl' countItem (0, 0) readItemsData
+       in (unread, unanswered, mentions)
       where
-        getUnreadTimedItem =
-          DB.query
-            db
-            [sql|
-              SELECT timed_ttl
-              FROM chat_items
-              WHERE user_id = ? AND group_id = ? AND item_status = ? AND chat_item_id = ? AND timed_ttl IS NOT NULL AND timed_delete_at IS NULL
-            |]
-            (userId, groupId, CISRcvNew, itemId)
-        setItemRead =
-          DB.execute
-            db
-            [sql|
-              UPDATE chat_items SET item_status = ?, updated_at = ?
-              WHERE user_id = ? AND group_id = ? AND item_status = ? AND chat_item_id = ?
-            |]
-            (CISRcvRead, currentTs, userId, groupId, CISRcvNew, itemId)
+        countItem :: (Int, Int) -> (ChatItemId, Maybe Int, Maybe UTCTime, Maybe GroupMemberId, Maybe BoolInt) -> (Int, Int)
+        countItem (!unanswered, !mentions) (_, _, _, itemGMId_, userMention_) =
+          let unanswered' = case (scopeMember_, itemGMId_) of
+                (Just scopeMember, Just itemGMId) | itemGMId == groupMemberId' scopeMember -> unanswered + 1
+                _ -> unanswered
+              mentions' = case userMention_ of
+                Just (BI True) -> mentions + 1
+                _ -> mentions
+          in (unanswered', mentions')
+    timedItems :: [(ChatItemId, Maybe Int, Maybe UTCTime, Maybe GroupMemberId, Maybe BoolInt)] -> [(ChatItemId, Int)]
+    timedItems = foldl' addTimedItem []
+      where
+        addTimedItem acc (itemId, Just ttl, Nothing, _, _) = (itemId, ttl) : acc
+        addTimedItem acc _ = acc
+
+updateGroupScopeUnreadStats :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupChatScopeInfo -> (Int, Int, Int) -> IO GroupInfo
+updateGroupScopeUnreadStats db vr user g@GroupInfo {membership} scopeInfo (unread, unanswered, mentions) =
+  case scopeInfo of
+    GCSIMemberSupport {groupMember_} -> case groupMember_ of
+      Nothing -> do
+        membership' <- updateGMStats membership
+        pure g {membership = membership'}
+      Just member -> do
+        member' <- updateGMStats member
+        let didRequire = gmRequiresAttention member
+            nowRequires = gmRequiresAttention member'
+        if (not nowRequires && didRequire)
+          then decreaseGroupMembersRequireAttention db user g
+          else pure g
+  where
+    updateGMStats m@GroupMember {groupMemberId} = do
+      currentTs <- getCurrentTime
+      DB.execute
+        db
+        [sql|
+          UPDATE group_members
+          SET support_chat_items_unread = support_chat_items_unread - ?,
+              support_chat_items_member_attention = support_chat_items_member_attention - ?,
+              support_chat_items_mentions = support_chat_items_mentions - ?,
+              updated_at = ?
+          WHERE group_member_id = ?
+        |]
+        (unread, unanswered, mentions, currentTs, groupMemberId)
+      m_ <- runExceptT $ getGroupMemberById db vr user groupMemberId
+      pure $ either (const m) id m_ -- Left shouldn't happen, but types require it
+
+deriving instance Show BoolInt
 
 setGroupChatItemsDeleteAt :: DB.Connection -> User -> GroupId -> [(ChatItemId, Int)] -> UTCTime -> IO [(ChatItemId, UTCTime)]
 setGroupChatItemsDeleteAt db User {userId} groupId itemIds currentTs = forM itemIds $ \(chatItemId, ttl) -> do
@@ -1806,7 +2119,7 @@ updateLocalChatItemsRead db User {userId} noteFolderId = do
 
 type MaybeCIFIleRow = (Maybe Int64, Maybe String, Maybe Integer, Maybe FilePath, Maybe C.SbKey, Maybe C.CbNonce, Maybe ACIFileStatus, Maybe FileProtocol)
 
-type ChatItemModeRow = (Maybe Int, Maybe UTCTime, Maybe BoolInt)
+type ChatItemModeRow = (Maybe Int, Maybe UTCTime, Maybe BoolInt, BoolInt)
 
 type ChatItemForwardedFromRow = (Maybe CIForwardedFromTag, Maybe Text, Maybe MsgDirection, Maybe Int64, Maybe Int64, Maybe Int64)
 
@@ -1830,7 +2143,7 @@ toQuote (quotedItemId, quotedSharedMsgId, quotedSentAt, quotedMsgContent, _) dir
 
 -- this function can be changed so it never fails, not only avoid failure on invalid json
 toDirectChatItem :: UTCTime -> ChatItemRow :. QuoteRow -> Either StoreError (CChatItem 'CTDirect)
-toDirectChatItem currentTs (((itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. forwardedFromRow :. (timedTTL, timedDeleteAt, itemLive) :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)) :. quoteRow) =
+toDirectChatItem currentTs (((itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. forwardedFromRow :. (timedTTL, timedDeleteAt, itemLive, BI userMention) :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)) :. quoteRow) =
   chatItem $ fromRight invalid $ dbParseACIContent itemContentText
   where
     invalid = ACIContent msgDir $ CIInvalidJSON itemContentText
@@ -1854,7 +2167,7 @@ toDirectChatItem currentTs (((itemId, itemTs, AMsgDirection msgDir, itemContentT
         _ -> Nothing
     cItem :: MsgDirectionI d => SMsgDirection d -> CIDirection 'CTDirect d -> CIStatus d -> CIContent d -> Maybe (CIFile d) -> CChatItem 'CTDirect
     cItem d chatDir ciStatus content file =
-      CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, formattedText = parseMaybeMarkdownList itemText, quotedItem = toDirectQuote quoteRow, reactions = [], file}
+      CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, mentions = M.empty, formattedText = parseMaybeMarkdownList itemText, quotedItem = toDirectQuote quoteRow, reactions = [], file}
     badItem = Left $ SEBadChatItem itemId (Just itemTs)
     ciMeta :: CIContent d -> CIStatus d -> CIMeta 'CTDirect d
     ciMeta content status =
@@ -1863,7 +2176,7 @@ toDirectChatItem currentTs (((itemId, itemTs, AMsgDirection msgDir, itemContentT
             _ -> Just (CIDeleted @'CTDirect deletedTs)
           itemEdited' = maybe False unBI itemEdited
           itemForwarded = toCIForwardedFrom forwardedFromRow
-       in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) currentTs itemTs Nothing createdAt updatedAt
+       in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) userMention currentTs itemTs Nothing createdAt updatedAt
     ciTimed :: Maybe CITimed
     ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
 
@@ -1886,48 +2199,69 @@ toGroupQuote qr@(_, _, _, _, quotedSent) quotedMember_ = toQuote qr $ direction
     direction _ _ = Nothing
 
 -- this function can be changed so it never fails, not only avoid failure on invalid json
-toGroupChatItem :: UTCTime -> Int64 -> ChatItemRow :. Only (Maybe GroupMemberId) :. MaybeGroupMemberRow :. GroupQuoteRow :. MaybeGroupMemberRow -> Either StoreError (CChatItem 'CTGroup)
-toGroupChatItem currentTs userContactId (((itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. forwardedFromRow :. (timedTTL, timedDeleteAt, itemLive) :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)) :. Only forwardedByMember :. memberRow_ :. (quoteRow :. quotedMemberRow_) :. deletedByGroupMemberRow_) = do
-  chatItem $ fromRight invalid $ dbParseACIContent itemContentText
-  where
-    member_ = toMaybeGroupMember userContactId memberRow_
-    quotedMember_ = toMaybeGroupMember userContactId quotedMemberRow_
-    deletedByGroupMember_ = toMaybeGroupMember userContactId deletedByGroupMemberRow_
-    invalid = ACIContent msgDir $ CIInvalidJSON itemContentText
-    chatItem itemContent = case (itemContent, itemStatus, member_, fileStatus_) of
-      (ACIContent SMDSnd ciContent, ACIStatus SMDSnd ciStatus, _, Just (AFS SMDSnd fileStatus)) ->
-        Right $ cItem SMDSnd CIGroupSnd ciStatus ciContent (maybeCIFile fileStatus)
-      (ACIContent SMDSnd ciContent, ACIStatus SMDSnd ciStatus, _, Nothing) ->
-        Right $ cItem SMDSnd CIGroupSnd ciStatus ciContent Nothing
-      (ACIContent SMDRcv ciContent, ACIStatus SMDRcv ciStatus, Just member, Just (AFS SMDRcv fileStatus)) ->
-        Right $ cItem SMDRcv (CIGroupRcv member) ciStatus ciContent (maybeCIFile fileStatus)
-      (ACIContent SMDRcv ciContent, ACIStatus SMDRcv ciStatus, Just member, Nothing) ->
-        Right $ cItem SMDRcv (CIGroupRcv member) ciStatus ciContent Nothing
-      _ -> badItem
-    maybeCIFile :: CIFileStatus d -> Maybe (CIFile d)
-    maybeCIFile fileStatus =
-      case (fileId_, fileName_, fileSize_, fileProtocol_) of
-        (Just fileId, Just fileName, Just fileSize, Just fileProtocol) ->
-          let cfArgs = CFArgs <$> fileKey <*> fileNonce
-              fileSource = (`CryptoFile` cfArgs) <$> filePath
-           in Just CIFile {fileId, fileName, fileSize, fileSource, fileStatus, fileProtocol}
-        _ -> Nothing
-    cItem :: MsgDirectionI d => SMsgDirection d -> CIDirection 'CTGroup d -> CIStatus d -> CIContent d -> Maybe (CIFile d) -> CChatItem 'CTGroup
-    cItem d chatDir ciStatus content file =
-      CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, formattedText = parseMaybeMarkdownList itemText, quotedItem = toGroupQuote quoteRow quotedMember_, reactions = [], file}
-    badItem = Left $ SEBadChatItem itemId (Just itemTs)
-    ciMeta :: CIContent d -> CIStatus d -> CIMeta 'CTGroup d
-    ciMeta content status =
-      let itemDeleted' = case itemDeleted of
-            DBCINotDeleted -> Nothing
-            DBCIBlocked -> Just (CIBlocked deletedTs)
-            DBCIBlockedByAdmin -> Just (CIBlockedByAdmin deletedTs)
-            _ -> Just (maybe (CIDeleted @'CTGroup deletedTs) (CIModerated deletedTs) deletedByGroupMember_)
-          itemEdited' = maybe False unBI itemEdited
-          itemForwarded = toCIForwardedFrom forwardedFromRow
-       in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) currentTs itemTs forwardedByMember createdAt updatedAt
-    ciTimed :: Maybe CITimed
-    ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
+toGroupChatItem ::
+  UTCTime ->
+  Int64 ->
+  ChatItemRow
+    :. Only (Maybe GroupMemberId)
+    :. MaybeGroupMemberRow
+    :. GroupQuoteRow
+    :. MaybeGroupMemberRow ->
+  Either StoreError (CChatItem 'CTGroup)
+toGroupChatItem
+  currentTs
+  userContactId
+  ( ( (itemId, itemTs, AMsgDirection msgDir, itemContentText, itemText, itemStatus, sentViaProxy, sharedMsgId)
+        :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt)
+        :. forwardedFromRow
+        :. (timedTTL, timedDeleteAt, itemLive, BI userMention)
+        :. (fileId_, fileName_, fileSize_, filePath, fileKey, fileNonce, fileStatus_, fileProtocol_)
+      )
+      :. Only forwardedByMember
+      :. memberRow_
+      :. (quoteRow :. quotedMemberRow_)
+      :. deletedByGroupMemberRow_
+    ) = do
+    chatItem $ fromRight invalid $ dbParseACIContent itemContentText
+    where
+      member_ = toMaybeGroupMember userContactId memberRow_
+      quotedMember_ = toMaybeGroupMember userContactId quotedMemberRow_
+      deletedByGroupMember_ = toMaybeGroupMember userContactId deletedByGroupMemberRow_
+      invalid = ACIContent msgDir $ CIInvalidJSON itemContentText
+      chatItem itemContent = case (itemContent, itemStatus, member_, fileStatus_) of
+        (ACIContent SMDSnd ciContent, ACIStatus SMDSnd ciStatus, _, Just (AFS SMDSnd fileStatus)) ->
+          Right $ cItem SMDSnd CIGroupSnd ciStatus ciContent (maybeCIFile fileStatus)
+        (ACIContent SMDSnd ciContent, ACIStatus SMDSnd ciStatus, _, Nothing) ->
+          Right $ cItem SMDSnd CIGroupSnd ciStatus ciContent Nothing
+        (ACIContent SMDRcv ciContent, ACIStatus SMDRcv ciStatus, Just member, Just (AFS SMDRcv fileStatus)) ->
+          Right $ cItem SMDRcv (CIGroupRcv member) ciStatus ciContent (maybeCIFile fileStatus)
+        (ACIContent SMDRcv ciContent, ACIStatus SMDRcv ciStatus, Just member, Nothing) ->
+          Right $ cItem SMDRcv (CIGroupRcv member) ciStatus ciContent Nothing
+        _ -> badItem
+      maybeCIFile :: CIFileStatus d -> Maybe (CIFile d)
+      maybeCIFile fileStatus =
+        case (fileId_, fileName_, fileSize_, fileProtocol_) of
+          (Just fileId, Just fileName, Just fileSize, Just fileProtocol) ->
+            let cfArgs = CFArgs <$> fileKey <*> fileNonce
+                fileSource = (`CryptoFile` cfArgs) <$> filePath
+             in Just CIFile {fileId, fileName, fileSize, fileSource, fileStatus, fileProtocol}
+          _ -> Nothing
+      cItem :: MsgDirectionI d => SMsgDirection d -> CIDirection 'CTGroup d -> CIStatus d -> CIContent d -> Maybe (CIFile d) -> CChatItem 'CTGroup
+      cItem d chatDir ciStatus content file =
+        CChatItem d ChatItem {chatDir, meta = ciMeta content ciStatus, content, mentions = M.empty, formattedText = parseMaybeMarkdownList itemText, quotedItem = toGroupQuote quoteRow quotedMember_, reactions = [], file}
+      badItem = Left $ SEBadChatItem itemId (Just itemTs)
+      ciMeta :: CIContent d -> CIStatus d -> CIMeta 'CTGroup d
+      ciMeta content status =
+        let itemDeleted' = case itemDeleted of
+              DBCINotDeleted -> Nothing
+              DBCIBlocked -> Just (CIBlocked deletedTs)
+              DBCIBlockedByAdmin -> Just (CIBlockedByAdmin deletedTs)
+              _ -> Just (maybe (CIDeleted @'CTGroup deletedTs) (CIModerated deletedTs) deletedByGroupMember_)
+            itemEdited' = maybe False unBI itemEdited
+            itemForwarded = toCIForwardedFrom forwardedFromRow
+         in mkCIMeta itemId content itemText status (unBI <$> sentViaProxy) sharedMsgId itemForwarded itemDeleted' itemEdited' ciTimed (unBI <$> itemLive) userMention currentTs itemTs forwardedByMember createdAt updatedAt
+      ciTimed :: Maybe CITimed
+      ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
 
 getAllChatItems :: DB.Connection -> VersionRangeChat -> User -> ChatPagination -> Maybe String -> ExceptT StoreError IO [AChatItem]
 getAllChatItems db vr user@User {userId} pagination search_ = do
@@ -1953,7 +2287,7 @@ getAllChatItems db vr user@User {userId} pagination search_ = do
         <$> DB.query
           db
           [sql|
-            SELECT chat_item_id, contact_id, group_id, note_folder_id
+            SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
             FROM chat_items
             WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
             ORDER BY item_ts DESC, chat_item_id DESC
@@ -1964,7 +2298,7 @@ getAllChatItems db vr user@User {userId} pagination search_ = do
       DB.query
         db
         [sql|
-          SELECT chat_item_id, contact_id, group_id, note_folder_id
+          SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
           FROM chat_items
           WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
             AND (item_ts > ? OR (item_ts = ? AND chat_item_id > ?))
@@ -1977,7 +2311,7 @@ getAllChatItems db vr user@User {userId} pagination search_ = do
         <$> DB.query
           db
           [sql|
-            SELECT chat_item_id, contact_id, group_id, note_folder_id
+            SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
             FROM chat_items
             WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
               AND (item_ts < ? OR (item_ts = ? AND chat_item_id < ?))
@@ -1989,7 +2323,7 @@ getAllChatItems db vr user@User {userId} pagination search_ = do
       DB.query
         db
         [sql|
-          SELECT chat_item_id, contact_id, group_id, note_folder_id
+          SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
           FROM chat_items
           WHERE chat_item_id = ?
         |]
@@ -2129,18 +2463,18 @@ deleteDirectChatItem db User {userId} Contact {contactId} ci = do
     (userId, contactId, itemId)
 
 deleteChatItemMessages_ :: DB.Connection -> ChatItemId -> IO ()
-deleteChatItemMessages_ db itemId =
-  DB.execute
-    db
-    [sql|
-      DELETE FROM messages
-      WHERE message_id IN (
-        SELECT message_id
-        FROM chat_item_messages
-        WHERE chat_item_id = ?
-      )
-    |]
-    (Only itemId)
+deleteChatItemMessages_ db itemId = DB.execute db deleteChatItemMessagesQuery (Only itemId)
+
+deleteChatItemMessagesQuery :: Query
+deleteChatItemMessagesQuery =
+  [sql|
+    DELETE FROM messages
+    WHERE message_id IN (
+      SELECT message_id
+      FROM chat_item_messages
+      WHERE chat_item_id = ?
+    )
+  |]
 
 deleteChatItemVersions_ :: DB.Connection -> ChatItemId -> IO ()
 deleteChatItemVersions_ db itemId =
@@ -2198,7 +2532,7 @@ getDirectChatItem db User {userId} contactId itemId = ExceptT $ do
             i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
             i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
             i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
-            i.timed_ttl, i.timed_delete_at, i.item_live,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
             -- CIFile
             f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
             -- DirectQuote
@@ -2250,12 +2584,14 @@ getGroupCIWithReactions db user g@GroupInfo {groupId} itemId = do
   liftIO . groupCIWithReactions db g =<< getGroupChatItem db user groupId itemId
 
 groupCIWithReactions :: DB.Connection -> GroupInfo -> CChatItem 'CTGroup -> IO (CChatItem 'CTGroup)
-groupCIWithReactions db g cci@(CChatItem md ci@ChatItem {meta = CIMeta {itemSharedMsgId}}) = case itemSharedMsgId of
-  Just sharedMsgId -> do
-    let GroupMember {memberId} = chatItemMember g ci
-    reactions <- getGroupCIReactions db g memberId sharedMsgId
-    pure $ CChatItem md ci {reactions}
-  Nothing -> pure cci
+groupCIWithReactions db g cci@(CChatItem md ci@ChatItem {meta = CIMeta {itemId, itemSharedMsgId}}) = do
+  mentions <- getGroupCIMentions db itemId
+  case itemSharedMsgId of
+    Just sharedMsgId -> do
+      let GroupMember {memberId} = chatItemMember g ci
+      reactions <- getGroupCIReactions db g memberId sharedMsgId
+      pure $ CChatItem md ci {reactions, mentions}
+    Nothing -> pure $ if null mentions then cci else CChatItem md ci {mentions}
 
 updateGroupChatItem :: MsgDirectionI d => DB.Connection -> User -> Int64 -> ChatItem 'CTGroup d -> CIContent d -> Bool -> Bool -> Maybe MessageId -> IO (ChatItem 'CTGroup d)
 updateGroupChatItem db user groupId ci newContent edited live msgId_ = do
@@ -2281,6 +2617,28 @@ updateGroupChatItem_ db User {userId} groupId ChatItem {content, meta} msgId_ =
     ((content, itemText, itemStatus, BI itemDeleted', itemDeletedTs', BI itemEdited, BI <$> itemLive, updatedAt) :. ciTimedRow itemTimed :. (userId, groupId, itemId))
   forM_ msgId_ $ \msgId -> insertChatItemMessage_ db itemId msgId updatedAt
 
+createGroupCIMentions :: forall d. DB.Connection -> GroupInfo -> ChatItem 'CTGroup d -> Map MemberName CIMention -> IO (ChatItem 'CTGroup d)
+createGroupCIMentions db GroupInfo {groupId} ci mentions = do
+  DB.executeMany db "INSERT INTO chat_item_mentions (chat_item_id, group_id, member_id, display_name) VALUES (?, ?, ?, ?)" rows
+  pure (ci :: ChatItem 'CTGroup d) {mentions}
+  where
+    rows = map (\(name, CIMention {memberId}) -> (ciId, groupId, memberId, name)) $ M.assocs mentions
+    ciId = chatItemId' ci
+
+updateGroupCIMentions :: DB.Connection -> GroupInfo -> ChatItem 'CTGroup d -> Map MemberName CIMention -> IO (ChatItem 'CTGroup d)
+updateGroupCIMentions db g ci@ChatItem {mentions} mentions'
+  | mentions' == mentions = pure ci
+  | otherwise = do
+      unless (null mentions) $ deleteMentions
+      if null mentions'
+        then pure ci
+        else -- This is a fallback for the error that should not happen in practice.
+        -- In theory, it may happen in item mentions in database are different from item record.
+          createMentions `E.catch` \e -> if constraintError e then deleteMentions >> createMentions else E.throwIO e
+  where
+    deleteMentions = DB.execute db "DELETE FROM chat_item_mentions WHERE chat_item_id = ?" (Only $ chatItemId' ci)
+    createMentions = createGroupCIMentions db g ci mentions'
+
 deleteGroupChatItem :: DB.Connection -> User -> GroupInfo -> ChatItem 'CTGroup d -> IO ()
 deleteGroupChatItem db User {userId} g@GroupInfo {groupId} ci = do
   let itemId = chatItemId' ci
@@ -2314,6 +2672,34 @@ updateGroupChatItemModerated db User {userId} GroupInfo {groupId} ci m@GroupMemb
       (deletedTs, groupMemberId, toContent, toText, currentTs, userId, groupId, itemId)
   pure ci {content = toContent, meta = (meta ci) {itemText = toText, itemDeleted = Just (CIModerated (Just deletedTs) m), editable = False, deletable = False}, formattedText = Nothing}
 
+updateMemberCIsModerated :: MsgDirectionI d => DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> SMsgDirection d -> UTCTime -> IO ()
+updateMemberCIsModerated db User {userId} GroupInfo {groupId, membership} member byGroupMember md deletedTs = do
+  itemIds <- updateCIs =<< getCurrentTime
+  DB.executeMany db deleteChatItemMessagesQuery itemIds
+  DB.executeMany db "DELETE FROM chat_item_versions WHERE chat_item_id = ?" itemIds
+  where
+    memId = groupMemberId' member
+    updateQuery =
+      [sql|
+        UPDATE chat_items
+        SET item_deleted = 1, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, item_content = ?, item_text = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+      |]
+    updateCIs :: UTCTime -> IO [Only Int64]
+    updateCIs currentTs
+      | memId == groupMemberId' membership =
+          DB.query
+            db
+            (updateQuery <> " AND group_member_id IS NULL AND item_sent = 1 RETURNING chat_item_id")
+            (columns :. (userId, groupId))
+      | otherwise =
+          DB.query
+            db
+            (updateQuery <> " AND group_member_id = ? RETURNING chat_item_id")
+            (columns :. (userId, groupId, memId))
+      where
+        columns = (deletedTs, groupMemberId' byGroupMember, msgDirToModeratedContent_ md, ciModeratedText, currentTs)
+
 updateGroupCIBlockedByAdmin :: DB.Connection -> User -> GroupInfo -> ChatItem 'CTGroup d -> UTCTime -> IO (ChatItem 'CTGroup d)
 updateGroupCIBlockedByAdmin db User {userId} GroupInfo {groupId} ci deletedTs = do
   currentTs <- getCurrentTime
@@ -2360,6 +2746,31 @@ markGroupChatItemDeleted db User {userId} GroupInfo {groupId} ci@ChatItem {meta}
     (DBCIDeleted, deletedTs, deletedByGroupMemberId, currentTs, userId, groupId, itemId)
   pure ci {meta = meta {itemDeleted, editable = False, deletable = False}}
 
+markMemberCIsDeleted :: DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> UTCTime -> IO ()
+markMemberCIsDeleted db User {userId} GroupInfo {groupId, membership} member byGroupMember deletedTs =
+  updateCIs =<< getCurrentTime
+  where
+    memId = groupMemberId' member
+    updateQuery =
+      [sql|
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+      |]
+    updateCIs currentTs
+      | memId == groupMemberId' membership =
+          DB.execute
+            db
+            (updateQuery <> " AND group_member_id IS NULL AND item_sent = 1")
+            (columns :. (userId, groupId))
+      | otherwise =
+          DB.execute
+            db
+            (updateQuery <> " AND group_member_id = ?")
+            (columns :. (userId, groupId, memId))
+      where
+        columns = (DBCIDeleted, deletedTs, groupMemberId' byGroupMember, currentTs)
+
 markGroupChatItemBlocked :: DB.Connection -> User -> GroupInfo -> ChatItem 'CTGroup 'MDRcv -> IO (ChatItem 'CTGroup 'MDRcv)
 markGroupChatItemBlocked db User {userId} GroupInfo {groupId} ci@ChatItem {meta} = do
   deletedTs <- getCurrentTime
@@ -2395,13 +2806,27 @@ markMessageReportsDeleted db User {userId} GroupInfo {groupId} ChatItem {meta =
       [sql|
         UPDATE chat_items
         SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
-        WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND quoted_shared_msg_id = ?
+        WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND quoted_shared_msg_id = ? AND item_deleted = ?
         RETURNING chat_item_id;
       |]
-      (DBCIDeleted, deletedTs, groupMemberId, currentTs, userId, groupId, MCReport_, itemSharedMsgId)
+      (DBCIDeleted, deletedTs, groupMemberId, currentTs, userId, groupId, MCReport_, itemSharedMsgId, DBCINotDeleted)
 
-getGroupChatItemBySharedMsgId :: DB.Connection -> User -> GroupId -> GroupMemberId -> SharedMsgId -> ExceptT StoreError IO (CChatItem 'CTGroup)
-getGroupChatItemBySharedMsgId db user@User {userId} groupId groupMemberId sharedMsgId = do
+markReceivedGroupReportsDeleted :: DB.Connection -> User -> GroupInfo -> UTCTime -> IO [ChatItemId]
+markReceivedGroupReportsDeleted db User {userId} GroupInfo {groupId, membership} deletedTs = do
+  currentTs <- liftIO getCurrentTime
+  map fromOnly
+    <$> DB.query
+      db
+      [sql|
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+        RETURNING chat_item_id
+      |]
+      (DBCIDeleted, deletedTs, groupMemberId' membership, currentTs, userId, groupId, MCReport_, DBCINotDeleted)
+
+getGroupChatItemBySharedMsgId :: DB.Connection -> User -> GroupInfo -> GroupMemberId -> SharedMsgId -> ExceptT StoreError IO (CChatItem 'CTGroup)
+getGroupChatItemBySharedMsgId db user@User {userId} g@GroupInfo {groupId} groupMemberId sharedMsgId = do
   itemId <-
     ExceptT . firstRow fromOnly (SEChatItemSharedMsgIdNotFound sharedMsgId) $
       DB.query
@@ -2414,10 +2839,10 @@ getGroupChatItemBySharedMsgId db user@User {userId} groupId groupMemberId shared
           LIMIT 1
         |]
         (userId, groupId, groupMemberId, sharedMsgId)
-  getGroupChatItem db user groupId itemId
+  getGroupCIWithReactions db user g itemId
 
-getGroupMemberCIBySharedMsgId :: DB.Connection -> User -> GroupId -> MemberId -> SharedMsgId -> ExceptT StoreError IO (CChatItem 'CTGroup)
-getGroupMemberCIBySharedMsgId db user@User {userId} groupId memberId sharedMsgId = do
+getGroupMemberCIBySharedMsgId :: DB.Connection -> User -> GroupInfo -> MemberId -> SharedMsgId -> ExceptT StoreError IO (CChatItem 'CTGroup)
+getGroupMemberCIBySharedMsgId db user@User {userId} g@GroupInfo {groupId} memberId sharedMsgId = do
   itemId <-
     ExceptT . firstRow fromOnly (SEChatItemSharedMsgIdNotFound sharedMsgId) $
       DB.query
@@ -2433,7 +2858,7 @@ getGroupMemberCIBySharedMsgId db user@User {userId} groupId memberId sharedMsgId
           LIMIT 1
         |]
         (GCUserMember, userId, groupId, memberId, sharedMsgId)
-  getGroupChatItem db user groupId itemId
+  getGroupCIWithReactions db user g itemId
 
 getGroupChatItemsByAgentMsgId :: DB.Connection -> User -> GroupId -> Int64 -> AgentMsgId -> IO [CChatItem 'CTGroup]
 getGroupChatItemsByAgentMsgId db user groupId connId msgId = do
@@ -2454,7 +2879,7 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do
             i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
             i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
             i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
-            i.timed_ttl, i.timed_delete_at, i.item_live,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
             -- CIFile
             f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
             -- CIMeta forwardedByMember
@@ -2463,18 +2888,26 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
             m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
             p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.created_at, m.updated_at,
+            m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             -- quoted ChatItem
             ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent,
             -- quoted GroupMember
             rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category,
             rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id,
             rp.display_name, rp.full_name, rp.image, rp.contact_link, rp.local_alias, rp.preferences,
+            rm.created_at, rm.updated_at,
+            rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts,
             -- deleted by GroupMember
             dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category,
             dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id,
-            dbp.display_name, dbp.full_name, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences
+            dbp.display_name, dbp.full_name, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences,
+            dbm.created_at, dbm.updated_at,
+            dbm.support_chat_ts, dbm.support_chat_items_unread, dbm.support_chat_items_member_attention, dbm.support_chat_items_mentions, dbm.support_chat_last_msg_from_member_ts
           FROM chat_items i
           LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
+          LEFT JOIN group_members gsm ON gsm.group_member_id = i.group_scope_group_member_id
+          LEFT JOIN contact_profiles gsp ON gsp.contact_profile_id = COALESCE(gsm.member_profile_id, gsm.contact_profile_id)
           LEFT JOIN group_members m ON m.group_member_id = i.group_member_id
           LEFT JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
           LEFT JOIN chat_items ri ON ri.shared_msg_id = i.quoted_shared_msg_id AND ri.group_id = i.group_id
@@ -2523,8 +2956,7 @@ getGroupChatItemIdByText db User {userId, localDisplayName = userName} groupId c
           SELECT i.chat_item_id
           FROM chat_items i
           JOIN group_members m ON m.group_member_id = i.group_member_id
-          JOIN contacts c ON c.contact_id = m.contact_id
-          WHERE i.user_id = ? AND i.group_id = ? AND c.local_display_name = ? AND i.item_text like ?
+          WHERE i.user_id = ? AND i.group_id = ? AND m.local_display_name = ? AND i.item_text like ?
           ORDER BY i.chat_item_id DESC
           LIMIT 1
         |]
@@ -2558,7 +2990,7 @@ getLocalChatItem db User {userId} folderId itemId = ExceptT $ do
             i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
             i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
             i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
-            i.timed_ttl, i.timed_delete_at, i.item_live,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
             -- CIFile
             f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol
           FROM chat_items i
@@ -2637,7 +3069,7 @@ getChatItemByFileId db vr user@User {userId} fileId = do
       DB.query
         db
         [sql|
-            SELECT i.chat_item_id, i.contact_id, i.group_id, i.note_folder_id
+            SELECT i.chat_item_id, i.contact_id, i.group_id, i.group_scope_tag, i.group_scope_group_member_id, i.note_folder_id
             FROM chat_items i
             JOIN files f ON f.chat_item_id = i.chat_item_id
             WHERE f.user_id = ? AND f.file_id = ?
@@ -2659,7 +3091,7 @@ getChatItemByGroupId db vr user@User {userId} groupId = do
       DB.query
         db
         [sql|
-          SELECT i.chat_item_id, i.contact_id, i.group_id, i.note_folder_id
+          SELECT i.chat_item_id, i.contact_id, i.group_id, i.group_scope_tag, i.group_scope_group_member_id, i.note_folder_id
           FROM chat_items i
           JOIN groups g ON g.chat_item_id = i.chat_item_id
           WHERE g.user_id = ? AND g.group_id = ?
@@ -2674,24 +3106,26 @@ getChatRefViaItemId db User {userId} itemId = do
     DB.query db "SELECT contact_id, group_id FROM chat_items WHERE user_id = ? AND chat_item_id = ?" (userId, itemId)
   where
     toChatRef = \case
-      (Just contactId, Nothing) -> Right $ ChatRef CTDirect contactId
-      (Nothing, Just groupId) -> Right $ ChatRef CTGroup groupId
+      (Just contactId, Nothing) -> Right $ ChatRef CTDirect contactId Nothing
+      -- Only used in CLI and unused APIs
+      (Nothing, Just groupId) -> Right $ ChatRef CTGroup groupId Nothing
       (_, _) -> Left $ SEBadChatItem itemId Nothing
 
 getAChatItem :: DB.Connection -> VersionRangeChat -> User -> ChatRef -> ChatItemId -> ExceptT StoreError IO AChatItem
-getAChatItem db vr user chatRef itemId = do
-  aci <- case chatRef of
-    ChatRef CTDirect contactId -> do
-      ct <- getContact db vr user contactId
-      (CChatItem msgDir ci) <- getDirectChatItem db user contactId itemId
+getAChatItem db vr user (ChatRef cType chatId scope) itemId = do
+  aci <- case cType of
+    CTDirect -> do
+      ct <- getContact db vr user chatId
+      (CChatItem msgDir ci) <- getDirectChatItem db user chatId itemId
       pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
-    ChatRef CTGroup groupId -> do
-      gInfo <- getGroupInfo db vr user groupId
-      (CChatItem msgDir ci) <- getGroupChatItem db user groupId itemId
-      pure $ AChatItem SCTGroup msgDir (GroupChat gInfo) ci
-    ChatRef CTLocal folderId -> do
-      nf <- getNoteFolder db user folderId
-      CChatItem msgDir ci <- getLocalChatItem db user folderId itemId
+    CTGroup -> do
+      gInfo <- getGroupInfo db vr user chatId
+      (CChatItem msgDir ci) <- getGroupChatItem db user chatId itemId
+      scopeInfo <- mapM (getGroupChatScopeInfo db vr user gInfo) scope
+      pure $ AChatItem SCTGroup msgDir (GroupChat gInfo scopeInfo) ci
+    CTLocal -> do
+      nf <- getNoteFolder db user chatId
+      CChatItem msgDir ci <- getLocalChatItem db user chatId itemId
       pure $ AChatItem SCTLocal msgDir (LocalChat nf) ci
     _ -> throwError $ SEChatItemNotFound itemId
   liftIO $ getACIReactions db aci
@@ -2701,9 +3135,9 @@ getAChatItemBySharedMsgId db user cd sharedMsgId = case cd of
   CDDirectRcv ct@Contact {contactId} -> do
     (CChatItem msgDir ci) <- getDirectChatItemBySharedMsgId db user contactId sharedMsgId
     pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
-  CDGroupRcv g@GroupInfo {groupId} GroupMember {groupMemberId} -> do
-    (CChatItem msgDir ci) <- getGroupChatItemBySharedMsgId db user groupId groupMemberId sharedMsgId
-    pure $ AChatItem SCTGroup msgDir (GroupChat g) ci
+  CDGroupRcv g scopeInfo GroupMember {groupMemberId} -> do
+    (CChatItem msgDir ci) <- getGroupChatItemBySharedMsgId db user g groupMemberId sharedMsgId
+    pure $ AChatItem SCTGroup msgDir (GroupChat g scopeInfo) ci
 
 getChatItemVersions :: DB.Connection -> ChatItemId -> IO [ChatItemVersion]
 getChatItemVersions db itemId = do
@@ -2756,13 +3190,35 @@ getGroupCIReactions db GroupInfo {groupId} itemMemberId itemSharedMsgId =
       |]
       (groupId, itemMemberId, itemSharedMsgId)
 
+getGroupCIMentions :: DB.Connection -> ChatItemId -> IO (Map MemberName CIMention)
+getGroupCIMentions db ciId =
+  M.fromList . map mentionedMember
+    <$> DB.query
+      db
+      [sql|
+        SELECT r.display_name, r.member_id, m.group_member_id, m.member_role, p.display_name, p.local_alias
+        FROM chat_item_mentions r
+        LEFT JOIN group_members m ON r.group_id = m.group_id AND r.member_id = m.member_id
+        LEFT JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) 
+        WHERE r.chat_item_id = ?
+      |]
+      (Only ciId)
+  where
+    mentionedMember :: (ContactName, MemberId, Maybe GroupMemberId, Maybe GroupMemberRole, Maybe Text, Maybe Text) -> (ContactName, CIMention)
+    mentionedMember (name, memberId, gmId_, mRole_, displayName_, localAlias) =
+      let memberRef = case (gmId_, mRole_, displayName_) of
+            (Just groupMemberId, Just memberRole, Just displayName) ->
+              Just CIMentionMember {groupMemberId, displayName, localAlias, memberRole}
+            _ -> Nothing
+       in (name, CIMention {memberId, memberRef})
+
 getACIReactions :: DB.Connection -> AChatItem -> IO AChatItem
 getACIReactions db aci@(AChatItem _ md chat ci@ChatItem {meta = CIMeta {itemSharedMsgId}}) = case itemSharedMsgId of
   Just itemSharedMId -> case chat of
     DirectChat ct -> do
       reactions <- getDirectCIReactions db ct itemSharedMId
       pure $ AChatItem SCTDirect md chat ci {reactions}
-    GroupChat g -> do
+    GroupChat g _s -> do
       let GroupMember {memberId} = chatItemMember g ci
       reactions <- getGroupCIReactions db g memberId itemSharedMId
       pure $ AChatItem SCTGroup md chat ci {reactions}
@@ -2874,16 +3330,23 @@ getTimedItems db User {userId} startTimedThreadCutoff =
     <$> DB.query
       db
       [sql|
-        SELECT chat_item_id, contact_id, group_id, timed_delete_at
+        SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, timed_delete_at
         FROM chat_items
         WHERE user_id = ? AND timed_delete_at IS NOT NULL AND timed_delete_at <= ?
       |]
       (userId, startTimedThreadCutoff)
   where
-    toCIRefDeleteAt :: (ChatItemId, Maybe ContactId, Maybe GroupId, UTCTime) -> Maybe ((ChatRef, ChatItemId), UTCTime)
+    toCIRefDeleteAt :: (ChatItemId, Maybe ContactId, Maybe GroupId, Maybe GroupChatScopeTag, Maybe GroupMemberId, UTCTime) -> Maybe ((ChatRef, ChatItemId), UTCTime)
     toCIRefDeleteAt = \case
-      (itemId, Just contactId, Nothing, deleteAt) -> Just ((ChatRef CTDirect contactId, itemId), deleteAt)
-      (itemId, Nothing, Just groupId, deleteAt) -> Just ((ChatRef CTGroup groupId, itemId), deleteAt)
+      (itemId, Just contactId, Nothing, Nothing, Nothing, deleteAt) ->
+        Just ((ChatRef CTDirect contactId Nothing, itemId), deleteAt)
+      (itemId, Nothing, Just groupId, scopeTag_, scopeGMId_, deleteAt) ->
+        let scope = case (scopeTag_, scopeGMId_) of
+              (Nothing, Nothing) -> Nothing
+              (Just GCSTMemberSupport_, Just groupMemberId) -> Just $ GCSMemberSupport (Just groupMemberId)
+              (Just GCSTMemberSupport_, Nothing) -> Just $ GCSMemberSupport Nothing
+              (Nothing, Just _) -> Nothing -- should not happen
+         in Just ((ChatRef CTGroup groupId scope, itemId), deleteAt)
       _ -> Nothing
 
 getChatItemTTL :: DB.Connection -> User -> IO Int64
@@ -3056,10 +3519,9 @@ getGroupSndStatusCounts db itemId =
     (Only itemId)
 
 getGroupHistoryItems :: DB.Connection -> User -> GroupInfo -> GroupMember -> Int -> IO [Either StoreError (CChatItem 'CTGroup)]
-getGroupHistoryItems db user@User {userId} GroupInfo {groupId} m count = do
+getGroupHistoryItems db user@User {userId} g@GroupInfo {groupId} m count = do
   ciIds <- getLastItemIds_
-  -- use getGroupCIWithReactions to read reactions data
-  reverse <$> mapM (runExceptT . getGroupChatItem db user groupId) ciIds
+  reverse <$> mapM (runExceptT . getGroupCIWithReactions db user g) ciIds
   where
     getLastItemIds_ :: IO [ChatItemId]
     getLastItemIds_ =
@@ -3070,12 +3532,11 @@ getGroupHistoryItems db user@User {userId} GroupInfo {groupId} m count = do
             SELECT i.chat_item_id
             FROM chat_items i
             LEFT JOIN group_snd_item_statuses s ON s.chat_item_id = i.chat_item_id AND s.group_member_id = ?
-            WHERE i.user_id = ? AND i.group_id = ?
-              AND i.item_content_tag IN (?,?)
-              AND i.msg_content_tag NOT IN (?)
+            WHERE s.group_snd_item_status_id IS NULL
+              AND i.user_id = ? AND i.group_id = ?
+              AND i.include_in_history = 1
               AND i.item_deleted = 0
-              AND s.group_snd_item_status_id IS NULL
             ORDER BY i.item_ts DESC, i.chat_item_id DESC
             LIMIT ?
           |]
-          (groupMemberId' m, userId, groupId, rcvMsgContentTag, sndMsgContentTag, MCReport_, count)
+          (groupMemberId' m, userId, groupId, count)
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs
index 285a952279..2e9ff571e9 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs
@@ -5,11 +5,17 @@ module Simplex.Chat.Store.Postgres.Migrations (migrations) where
 import Data.List (sortOn)
 import Data.Text (Text)
 import Simplex.Chat.Store.Postgres.Migrations.M20241220_initial
+import Simplex.Chat.Store.Postgres.Migrations.M20250402_short_links
+import Simplex.Chat.Store.Postgres.Migrations.M20250512_member_admission
+import Simplex.Chat.Store.Postgres.Migrations.M20250513_group_scope
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Text, Maybe Text)]
 schemaMigrations =
-  [ ("20241220_initial", m20241220_initial, Nothing)
+  [ ("20241220_initial", m20241220_initial, Nothing),
+    ("20250402_short_links", m20250402_short_links, Just down_m20250402_short_links),
+    ("20250512_member_admission", m20250512_member_admission, Just down_m20250512_member_admission),
+    ("20250513_group_scope", m20250513_group_scope, Just down_m20250513_group_scope)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20241220_initial.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20241220_initial.hs
index e8fd77aa0d..08ce2d81bc 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/M20241220_initial.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20241220_initial.hs
@@ -128,7 +128,6 @@ CREATE TABLE groups(
   updated_at TIMESTAMPTZ NOT NULL,
   chat_item_id BIGINT DEFAULT NULL,
   enable_ntfs SMALLINT,
-  host_conn_custom_user_profile_id BIGINT REFERENCES contact_profiles ON DELETE SET NULL,
   unread_chat SMALLINT NOT NULL DEFAULT 0,
   chat_ts TIMESTAMPTZ,
   favorite SMALLINT NOT NULL DEFAULT 0,
@@ -425,7 +424,9 @@ CREATE TABLE chat_items(
   fwd_from_group_id BIGINT REFERENCES groups ON DELETE SET NULL,
   fwd_from_chat_item_id BIGINT REFERENCES chat_items ON DELETE SET NULL,
   via_proxy SMALLINT,
-  msg_content_tag TEXT
+  msg_content_tag TEXT,
+  include_in_history SMALLINT NOT NULL DEFAULT 0,
+  user_mention SMALLINT NOT NULL DEFAULT 0
 );
 ALTER TABLE groups
 ADD CONSTRAINT fk_groups_chat_items
@@ -675,6 +676,13 @@ CREATE TABLE chat_tags_chats(
   group_id BIGINT REFERENCES groups ON DELETE CASCADE,
   chat_tag_id BIGINT NOT NULL REFERENCES chat_tags ON DELETE CASCADE
 );
+CREATE TABLE chat_item_mentions (
+  chat_item_mention_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  chat_item_id BIGINT NOT NULL REFERENCES chat_items ON DELETE CASCADE,
+  group_id BIGINT NOT NULL REFERENCES groups ON DELETE CASCADE,
+  member_id BYTEA NOT NULL,
+  display_name TEXT NOT NULL
+);
 CREATE INDEX contact_profiles_index ON contact_profiles(
   display_name,
   full_name
@@ -683,7 +691,6 @@ CREATE INDEX idx_groups_inv_queue_info ON groups(inv_queue_info);
 CREATE INDEX idx_contact_requests_xcontact_id ON contact_requests(xcontact_id);
 CREATE INDEX idx_contacts_xcontact_id ON contacts(xcontact_id);
 CREATE INDEX idx_messages_shared_msg_id ON messages(shared_msg_id);
-CREATE INDEX idx_chat_items_shared_msg_id ON chat_items(shared_msg_id);
 CREATE UNIQUE INDEX idx_chat_items_direct_shared_msg_id ON chat_items(
   user_id,
   contact_id,
@@ -756,9 +763,6 @@ CREATE INDEX idx_group_members_contact_profile_id ON group_members(
 CREATE INDEX idx_group_members_user_id ON group_members(user_id);
 CREATE INDEX idx_group_members_invited_by ON group_members(invited_by);
 CREATE INDEX idx_group_profiles_user_id ON group_profiles(user_id);
-CREATE INDEX idx_groups_host_conn_custom_user_profile_id ON groups(
-  host_conn_custom_user_profile_id
-);
 CREATE INDEX idx_groups_chat_item_id ON groups(chat_item_id);
 CREATE INDEX idx_groups_group_profile_id ON groups(group_profile_id);
 CREATE INDEX idx_messages_group_id ON messages(group_id);
@@ -1012,4 +1016,40 @@ CREATE INDEX idx_chat_items_groups_msg_content_tag_deleted ON chat_items(
   item_deleted,
   item_sent
 );
+CREATE INDEX idx_chat_items_groups_history ON chat_items(
+  user_id,
+  group_id,
+  include_in_history,
+  item_deleted,
+  item_ts,
+  chat_item_id
+);
+CREATE INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id ON group_snd_item_statuses(
+  chat_item_id,
+  group_member_id
+);
+CREATE INDEX idx_chat_item_mentions_group_id ON chat_item_mentions(group_id);
+CREATE INDEX idx_chat_item_mentions_chat_item_id ON chat_item_mentions(
+  chat_item_id
+);
+CREATE UNIQUE INDEX idx_chat_item_mentions_display_name ON chat_item_mentions(
+  chat_item_id,
+  display_name
+);
+CREATE UNIQUE INDEX idx_chat_item_mentions_member_id ON chat_item_mentions(
+  chat_item_id,
+  member_id
+);
+CREATE INDEX idx_chat_items_groups_user_mention ON chat_items(
+  user_id,
+  group_id,
+  item_status,
+  user_mention
+);
+CREATE INDEX idx_chat_items_group_id ON chat_items(group_id);
+CREATE INDEX idx_connections_group_member_id ON connections(group_member_id);
+CREATE INDEX idx_chat_items_group_id_shared_msg_id ON chat_items(
+  group_id,
+  shared_msg_id
+);
 |]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20250402_short_links.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20250402_short_links.hs
new file mode 100644
index 0000000000..4b3b7e9640
--- /dev/null
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20250402_short_links.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20250402_short_links where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+import Text.RawString.QQ (r)
+
+m20250402_short_links :: Text
+m20250402_short_links =
+  T.pack
+    [r|
+ALTER TABLE user_contact_links ADD COLUMN short_link_contact BYTEA;
+ALTER TABLE connections ADD COLUMN short_link_inv BYTEA;
+ALTER TABLE connections ADD COLUMN via_short_link_contact BYTEA;
+|]
+
+down_m20250402_short_links :: Text
+down_m20250402_short_links =
+  T.pack
+    [r|
+ALTER TABLE user_contact_links DROP COLUMN short_link_contact;
+ALTER TABLE connections DROP COLUMN short_link_inv;
+ALTER TABLE connections DROP COLUMN via_short_link_contact;
+|]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20250512_member_admission.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20250512_member_admission.hs
new file mode 100644
index 0000000000..eb0d73a523
--- /dev/null
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20250512_member_admission.hs
@@ -0,0 +1,21 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20250512_member_admission where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+import Text.RawString.QQ (r)
+
+m20250512_member_admission :: Text
+m20250512_member_admission =
+  T.pack
+    [r|
+ALTER TABLE group_profiles ADD COLUMN member_admission TEXT;
+|]
+
+down_m20250512_member_admission :: Text
+down_m20250512_member_admission =
+  T.pack
+    [r|
+ALTER TABLE group_profiles DROP COLUMN member_admission;
+|]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20250513_group_scope.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20250513_group_scope.hs
new file mode 100644
index 0000000000..cca2cff969
--- /dev/null
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20250513_group_scope.hs
@@ -0,0 +1,64 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20250513_group_scope where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+import Text.RawString.QQ (r)
+
+m20250513_group_scope :: Text
+m20250513_group_scope =
+  T.pack
+    [r|
+ALTER TABLE group_members ADD COLUMN support_chat_ts TIMESTAMPTZ;
+ALTER TABLE group_members ADD COLUMN support_chat_items_unread BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_items_member_attention BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_items_mentions BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_last_msg_from_member_ts TIMESTAMPTZ;
+
+ALTER TABLE groups ADD COLUMN members_require_attention BIGINT NOT NULL DEFAULT 0;
+
+ALTER TABLE chat_items ADD COLUMN group_scope_tag TEXT;
+ALTER TABLE chat_items ADD COLUMN group_scope_group_member_id BIGINT REFERENCES group_members(group_member_id) ON DELETE CASCADE;
+
+CREATE INDEX idx_chat_items_group_scope_group_member_id ON chat_items(group_scope_group_member_id);
+
+CREATE INDEX idx_chat_items_group_scope_item_ts ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_ts
+);
+
+CREATE INDEX idx_chat_items_group_scope_item_status ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_status,
+  item_ts
+);
+|]
+
+down_m20250513_group_scope :: Text
+down_m20250513_group_scope =
+  T.pack
+    [r|
+DROP INDEX idx_chat_items_group_scope_item_status;
+
+DROP INDEX idx_chat_items_group_scope_item_ts;
+
+DROP INDEX idx_chat_items_group_scope_group_member_id;
+
+ALTER TABLE chat_items DROP COLUMN group_scope_tag;
+ALTER TABLE chat_items DROP COLUMN group_scope_group_member_id;
+
+ALTER TABLE groups DROP COLUMN members_require_attention;
+
+ALTER TABLE group_members DROP COLUMN support_chat_ts;
+ALTER TABLE group_members DROP COLUMN support_chat_items_unread;
+ALTER TABLE group_members DROP COLUMN support_chat_items_member_attention;
+ALTER TABLE group_members DROP COLUMN support_chat_items_mentions;
+ALTER TABLE group_members DROP COLUMN support_chat_last_msg_from_member_ts;
+|]
diff --git a/src/Simplex/Chat/Store/Profiles.hs b/src/Simplex/Chat/Store/Profiles.hs
index 4fca5fb1a4..38b2615686 100644
--- a/src/Simplex/Chat/Store/Profiles.hs
+++ b/src/Simplex/Chat/Store/Profiles.hs
@@ -18,6 +18,7 @@ module Simplex.Chat.Store.Profiles
   ( AutoAccept (..),
     UserMsgReceiptSettings (..),
     UserContactLink (..),
+    GroupLinkInfo (..),
     createUserRecord,
     createUserRecordAt,
     getUsersInfo,
@@ -42,12 +43,15 @@ module Simplex.Chat.Store.Profiles
     setUserProfileContactLink,
     getUserContactProfiles,
     createUserContactLink,
-    getUserAddressConnections,
+    getUserAddressConnection,
     getUserContactLinks,
     deleteUserAddress,
     getUserAddress,
     getUserContactLinkById,
+    getGroupLinkInfo,
     getUserContactLinkByConnReq,
+    getUserContactLinkViaShortLink,
+    setUserContactLinkShortLink,
     getContactWithoutConnViaAddress,
     updateUserAddressAutoAccept,
     getProtocolServers,
@@ -98,7 +102,7 @@ import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.Chat.Types.UITheme
 import Simplex.Messaging.Agent.Env.SQLite (ServerRoles (..))
-import Simplex.Messaging.Agent.Protocol (ACorrId, ConnId, UserId)
+import Simplex.Messaging.Agent.Protocol (ACorrId, ConnId, ConnectionLink (..), CreatedConnLink (..), UserId)
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -107,6 +111,7 @@ import qualified Simplex.Messaging.Crypto.Ratchet as CR
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (defaultJSON)
 import Simplex.Messaging.Protocol (BasicAuth (..), ProtoServerWithAuth (..), ProtocolServer (..), ProtocolType (..), ProtocolTypeI (..), SProtocolType (..), SubscriptionMode)
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Transport.Client (TransportHost)
 import Simplex.Messaging.Util (eitherToMaybe, safeDecodeUtf8)
 #if defined(dbPostgres)
@@ -150,6 +155,7 @@ createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, image,
     DB.execute db "UPDATE users SET contact_id = ? WHERE user_id = ?" (contactId, userId)
     pure $ toUser $ (userId, auId, contactId, profileId, BI activeUser, order, displayName, fullName, image, Nothing, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, Nothing, Nothing, Nothing, Nothing)
 
+-- TODO [mentions]
 getUsersInfo :: DB.Connection -> IO [UserInfo]
 getUsersInfo db = getUsers db >>= mapM getUserInfo
   where
@@ -174,7 +180,8 @@ getUsersInfo db = getUsers db >>= mapM getUserInfo
               SELECT COUNT(1)
               FROM chat_items i
               JOIN groups g USING (group_id)
-              WHERE i.user_id = ? AND i.item_status = ? AND (g.enable_ntfs = 1 OR g.enable_ntfs IS NULL)
+              WHERE i.user_id = ? AND i.item_status = ?
+                AND (g.enable_ntfs = 1 OR g.enable_ntfs IS NULL OR (g.enable_ntfs = 2 AND i.user_mention = 1))
             |]
             (userId, CISRcvNew)
       pure UserInfo {user, unreadCount = fromMaybe 0 ctCount + fromMaybe 0 gCount}
@@ -322,11 +329,13 @@ setUserProfileContactLink db user@User {userId, profile = p@LocalProfile {profil
       SET contact_link = ?, updated_at = ?
       WHERE user_id = ? AND contact_profile_id = ?
     |]
-    (connReqContact_, ts, userId, profileId)
-  pure (user :: User) {profile = p {contactLink = connReqContact_}}
+    (contactLink, ts, userId, profileId)
+  pure (user :: User) {profile = p {contactLink}}
   where
-    connReqContact_ = case ucl_ of
-      Just UserContactLink {connReqContact} -> Just connReqContact
+    -- TODO [short links] this should be replaced with short links once they are supported by all clients.
+    -- Or, maybe, we want to allow both, when both are optional.
+    contactLink = case ucl_ of
+      Just UserContactLink {connLinkContact = CCLink cReq _} -> Just $ CLFull cReq
       _ -> Nothing
 
 -- only used in tests
@@ -342,40 +351,35 @@ getUserContactProfiles db User {userId} =
       |]
       (Only userId)
   where
-    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) -> Profile
+    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, Maybe Preferences) -> Profile
     toContactProfile (displayName, fullName, image, contactLink, preferences) = Profile {displayName, fullName, image, contactLink, preferences}
 
-createUserContactLink :: DB.Connection -> User -> ConnId -> ConnReqContact -> SubscriptionMode -> ExceptT StoreError IO ()
-createUserContactLink db User {userId} agentConnId cReq subMode =
+createUserContactLink :: DB.Connection -> User -> ConnId -> CreatedLinkContact -> SubscriptionMode -> ExceptT StoreError IO ()
+createUserContactLink db User {userId} agentConnId (CCLink cReq shortLink) subMode =
   checkConstraint SEDuplicateContactLink . liftIO $ do
     currentTs <- getCurrentTime
     DB.execute
       db
-      "INSERT INTO user_contact_links (user_id, conn_req_contact, created_at, updated_at) VALUES (?,?,?,?)"
-      (userId, cReq, currentTs, currentTs)
+      "INSERT INTO user_contact_links (user_id, conn_req_contact, short_link_contact, created_at, updated_at) VALUES (?,?,?,?,?)"
+      (userId, cReq, shortLink, currentTs, currentTs)
     userContactLinkId <- insertedRowId db
     void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId ConnNew initialChatVersion chatInitialVRange Nothing Nothing Nothing 0 currentTs subMode CR.PQSupportOff
 
-getUserAddressConnections :: DB.Connection -> VersionRangeChat -> User -> ExceptT StoreError IO [Connection]
-getUserAddressConnections db vr User {userId} = do
-  cs <- liftIO getUserAddressConnections_
-  if null cs then throwError SEUserContactLinkNotFound else pure cs
-  where
-    getUserAddressConnections_ :: IO [Connection]
-    getUserAddressConnections_ =
-      map (toConnection vr)
-        <$> DB.query
-          db
-          [sql|
-            SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-              c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
-              c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
-              c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
-            FROM connections c
-            JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
-            WHERE c.user_id = ? AND uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
-          |]
-          (userId, userId)
+getUserAddressConnection :: DB.Connection -> VersionRangeChat -> User -> ExceptT StoreError IO Connection
+getUserAddressConnection db vr User {userId} = do
+  ExceptT . firstRow (toConnection vr) SEUserContactLinkNotFound $
+    DB.query
+      db
+      [sql|
+        SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+          c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+          c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+          c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+        FROM connections c
+        JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
+        WHERE c.user_id = ? AND uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
+      |]
+      (userId, userId)
 
 getUserContactLinks :: DB.Connection -> VersionRangeChat -> User -> IO [(Connection, UserContact)]
 getUserContactLinks db vr User {userId} =
@@ -446,11 +450,17 @@ data UserMsgReceiptSettings = UserMsgReceiptSettings
   deriving (Show)
 
 data UserContactLink = UserContactLink
-  { connReqContact :: ConnReqContact,
+  { connLinkContact :: CreatedLinkContact,
     autoAccept :: Maybe AutoAccept
   }
   deriving (Show)
 
+data GroupLinkInfo = GroupLinkInfo
+  { groupId :: GroupId,
+    memberRole :: GroupMemberRole
+  }
+  deriving (Show)
+
 data AutoAccept = AutoAccept
   { businessAddress :: Bool, -- possibly, it can be wrapped together with acceptIncognito, or AutoAccept made sum type
     acceptIncognito :: IncognitoEnabled,
@@ -462,47 +472,72 @@ $(J.deriveJSON defaultJSON ''AutoAccept)
 
 $(J.deriveJSON defaultJSON ''UserContactLink)
 
-toUserContactLink :: (ConnReqContact, BoolInt, BoolInt, BoolInt, Maybe MsgContent) -> UserContactLink
-toUserContactLink (connReq, BI autoAccept, BI businessAddress, BI acceptIncognito, autoReply) =
-  UserContactLink connReq $
+toUserContactLink :: (ConnReqContact, Maybe ShortLinkContact, BoolInt, BoolInt, BoolInt, Maybe MsgContent) -> UserContactLink
+toUserContactLink (connReq, shortLink, BI autoAccept, BI businessAddress, BI acceptIncognito, autoReply) =
+  UserContactLink (CCLink connReq shortLink) $
     if autoAccept then Just AutoAccept {businessAddress, acceptIncognito, autoReply} else Nothing
 
 getUserAddress :: DB.Connection -> User -> ExceptT StoreError IO UserContactLink
 getUserAddress db User {userId} =
   ExceptT . firstRow toUserContactLink SEUserContactLinkNotFound $
-    DB.query
-      db
-      [sql|
-        SELECT conn_req_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
-        FROM user_contact_links
-        WHERE user_id = ? AND local_display_name = '' AND group_id IS NULL
-      |]
-      (Only userId)
+    DB.query db (userContactLinkQuery <> " WHERE user_id = ? AND local_display_name = '' AND group_id IS NULL") (Only userId)
 
-getUserContactLinkById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO (UserContactLink, Maybe GroupId, GroupMemberRole)
+getUserContactLinkById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO (UserContactLink, Maybe GroupLinkInfo)
 getUserContactLinkById db userId userContactLinkId =
-  ExceptT . firstRow (\(ucl :. (groupId_, mRole_)) -> (toUserContactLink ucl, groupId_, fromMaybe GRMember mRole_)) SEUserContactLinkNotFound $
+  ExceptT . firstRow (\(ucl :. gli) -> (toUserContactLink ucl, toGroupLinkInfo gli)) SEUserContactLinkNotFound $
     DB.query
       db
       [sql|
-        SELECT conn_req_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content, group_id, group_link_member_role
+        SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content, group_id, group_link_member_role
         FROM user_contact_links
-        WHERE user_id = ?
-          AND user_contact_link_id = ?
+        WHERE user_id = ? AND user_contact_link_id = ?
       |]
       (userId, userContactLinkId)
 
+toGroupLinkInfo :: (Maybe GroupId, Maybe GroupMemberRole) -> Maybe GroupLinkInfo
+toGroupLinkInfo (groupId_, mRole_) =
+  (\groupId -> GroupLinkInfo {groupId, memberRole = fromMaybe GRMember mRole_})
+    <$> groupId_
+
+getGroupLinkInfo :: DB.Connection -> UserId -> GroupId -> IO (Maybe GroupLinkInfo)
+getGroupLinkInfo db userId groupId =
+  fmap join $ maybeFirstRow toGroupLinkInfo $
+    DB.query
+      db
+      [sql|
+        SELECT group_id, group_link_member_role
+        FROM user_contact_links
+        WHERE user_id = ? AND group_id = ?
+      |]
+      (userId, groupId)
+
 getUserContactLinkByConnReq :: DB.Connection -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe UserContactLink)
 getUserContactLinkByConnReq db User {userId} (cReqSchema1, cReqSchema2) =
   maybeFirstRow toUserContactLink $
-    DB.query
-      db
-      [sql|
-        SELECT conn_req_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
-        FROM user_contact_links
-        WHERE user_id = ? AND conn_req_contact IN (?,?)
-      |]
-      (userId, cReqSchema1, cReqSchema2)
+    DB.query db (userContactLinkQuery <> " WHERE user_id = ? AND conn_req_contact IN (?,?)") (userId, cReqSchema1, cReqSchema2)
+
+getUserContactLinkViaShortLink :: DB.Connection -> User -> ShortLinkContact -> IO (Maybe UserContactLink)
+getUserContactLinkViaShortLink db User {userId} shortLink =
+  maybeFirstRow toUserContactLink $
+    DB.query db (userContactLinkQuery <> " WHERE user_id = ? AND short_link_contact = ?") (userId, shortLink)
+
+userContactLinkQuery :: Query
+userContactLinkQuery =
+  [sql|
+    SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
+    FROM user_contact_links
+  |]
+
+setUserContactLinkShortLink :: DB.Connection -> Int64 -> ShortLinkContact -> IO ()
+setUserContactLinkShortLink db userContactLinkId shortLink =
+  DB.execute
+    db
+    [sql|
+      UPDATE user_contact_links
+      SET short_link_contact = ?
+      WHERE user_contact_link_id = ?
+    |]
+    (shortLink, userContactLinkId)
 
 getContactWithoutConnViaAddress :: DB.Connection -> VersionRangeChat -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe Contact)
 getContactWithoutConnViaAddress db vr user@User {userId} (cReqSchema1, cReqSchema2) = do
diff --git a/src/Simplex/Chat/Store/Remote.hs b/src/Simplex/Chat/Store/Remote.hs
index 4921369b10..cc626ddcf0 100644
--- a/src/Simplex/Chat/Store/Remote.hs
+++ b/src/Simplex/Chat/Store/Remote.hs
@@ -10,6 +10,7 @@ import Control.Monad.Except
 import Data.Int (Int64)
 import Data.Text (Text)
 import Data.Text.Encoding (decodeASCII, encodeUtf8)
+import qualified Data.X509 as X
 import Data.Word (Word16)
 import Simplex.Chat.Remote.Types
 import Simplex.Chat.Store.Shared
@@ -66,7 +67,7 @@ remoteHostQuery =
     FROM remote_hosts
   |]
 
-toRemoteHost :: (Int64, Text, FilePath, C.APrivateSignKey, C.SignedObject C.Certificate, C.PrivateKeyEd25519, C.KeyHash, C.PublicKeyX25519, Maybe Text, Maybe Text, Maybe Word16) -> RemoteHost
+toRemoteHost :: (Int64, Text, FilePath, C.APrivateSignKey, C.SignedObject X.Certificate, C.PrivateKeyEd25519, C.KeyHash, C.PublicKeyX25519, Maybe Text, Maybe Text, Maybe Word16) -> RemoteHost
 toRemoteHost (remoteHostId, hostDeviceName, storePath, caKey, C.SignedObject caCert, idPrivKey, hostFingerprint, hostDhPubKey, ifaceName_, ifaceAddr_, bindPort_) =
   RemoteHost {remoteHostId, hostDeviceName, storePath, hostPairing, bindAddress_, bindPort_}
   where
@@ -133,7 +134,7 @@ toRemoteCtrl ::
   ( RemoteCtrlId,
     Text,
     C.APrivateSignKey,
-    C.SignedObject C.Certificate,
+    C.SignedObject X.Certificate,
     C.KeyHash,
     C.PublicKeyEd25519,
     C.PrivateKeyX25519,
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs
index f8bdc0d788..871cb62220 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs
@@ -124,6 +124,13 @@ import Simplex.Chat.Store.SQLite.Migrations.M20241223_chat_tags
 import Simplex.Chat.Store.SQLite.Migrations.M20241230_reports
 import Simplex.Chat.Store.SQLite.Migrations.M20250105_indexes
 import Simplex.Chat.Store.SQLite.Migrations.M20250115_chat_ttl
+import Simplex.Chat.Store.SQLite.Migrations.M20250122_chat_items_include_in_history
+import Simplex.Chat.Store.SQLite.Migrations.M20250126_mentions
+import Simplex.Chat.Store.SQLite.Migrations.M20250129_delete_unused_contacts
+import Simplex.Chat.Store.SQLite.Migrations.M20250130_indexes
+import Simplex.Chat.Store.SQLite.Migrations.M20250402_short_links
+import Simplex.Chat.Store.SQLite.Migrations.M20250512_member_admission
+import Simplex.Chat.Store.SQLite.Migrations.M20250513_group_scope
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -247,7 +254,14 @@ schemaMigrations =
     ("20241223_chat_tags", m20241223_chat_tags, Just down_m20241223_chat_tags),
     ("20241230_reports", m20241230_reports, Just down_m20241230_reports),
     ("20250105_indexes", m20250105_indexes, Just down_m20250105_indexes),
-    ("20250115_chat_ttl", m20250115_chat_ttl, Just down_m20250115_chat_ttl)
+    ("20250115_chat_ttl", m20250115_chat_ttl, Just down_m20250115_chat_ttl),
+    ("20250122_chat_items_include_in_history", m20250122_chat_items_include_in_history, Just down_m20250122_chat_items_include_in_history),
+    ("20250126_mentions", m20250126_mentions, Just down_m20250126_mentions),
+    ("20250129_delete_unused_contacts", m20250129_delete_unused_contacts, Just down_m20250129_delete_unused_contacts),
+    ("20250130_indexes", m20250130_indexes, Just down_m20250130_indexes),
+    ("20250402_short_links", m20250402_short_links, Just down_m20250402_short_links),
+    ("20250512_member_admission", m20250512_member_admission, Just down_m20250512_member_admission),
+    ("20250513_group_scope", m20250513_group_scope, Just down_m20250513_group_scope)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250122_chat_items_include_in_history.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250122_chat_items_include_in_history.hs
new file mode 100644
index 0000000000..afc8544b4a
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250122_chat_items_include_in_history.hs
@@ -0,0 +1,39 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250122_chat_items_include_in_history where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250122_chat_items_include_in_history :: Query
+m20250122_chat_items_include_in_history =
+  [sql|
+ALTER TABLE chat_items ADD COLUMN include_in_history INTEGER NOT NULL DEFAULT 0;
+
+CREATE INDEX idx_chat_items_groups_history ON chat_items(
+  user_id,
+  group_id,
+  include_in_history,
+  item_deleted,
+  item_ts,
+  chat_item_id
+);
+
+UPDATE chat_items
+SET include_in_history = 1
+WHERE group_id IS NOT NULL
+  AND item_content_tag IN ('rcvMsgContent', 'sndMsgContent')
+  AND msg_content_tag NOT IN ('report');
+
+CREATE INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id ON group_snd_item_statuses(chat_item_id, group_member_id);
+|]
+
+down_m20250122_chat_items_include_in_history :: Query
+down_m20250122_chat_items_include_in_history =
+  [sql|
+DROP INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id;
+
+DROP INDEX idx_chat_items_groups_history;
+
+ALTER TABLE chat_items DROP COLUMN include_in_history;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250126_mentions.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250126_mentions.hs
new file mode 100644
index 0000000000..a920c17859
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250126_mentions.hs
@@ -0,0 +1,41 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250126_mentions where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250126_mentions :: Query
+m20250126_mentions =
+  [sql|
+ALTER TABLE chat_items ADD COLUMN user_mention INTEGER NOT NULL DEFAULT 0;
+
+CREATE TABLE chat_item_mentions (
+  chat_item_mention_id INTEGER PRIMARY KEY AUTOINCREMENT,
+  group_id INTEGER NOT NULL REFERENCES groups ON DELETE CASCADE,
+  member_id BLOB NOT NULL,
+  chat_item_id INTEGER NOT NULL REFERENCES chat_items ON DELETE CASCADE,
+  display_name TEXT NOT NULL
+);
+
+CREATE INDEX idx_chat_item_mentions_group_id ON chat_item_mentions(group_id);
+CREATE INDEX idx_chat_item_mentions_chat_item_id ON chat_item_mentions(chat_item_id);
+CREATE UNIQUE INDEX idx_chat_item_mentions_display_name ON chat_item_mentions(chat_item_id, display_name);
+CREATE UNIQUE INDEX idx_chat_item_mentions_member_id ON chat_item_mentions(chat_item_id, member_id);
+
+CREATE INDEX idx_chat_items_groups_user_mention ON chat_items(user_id, group_id, item_status, user_mention);
+|]
+
+down_m20250126_mentions :: Query
+down_m20250126_mentions =
+  [sql|
+DROP INDEX idx_chat_items_groups_user_mention;
+
+DROP INDEX idx_chat_item_mentions_group_id;
+DROP INDEX idx_chat_item_mentions_chat_item_id;
+DROP INDEX idx_chat_item_mentions_display_name;
+DROP INDEX idx_chat_item_mentions_member_id;
+
+DROP TABLE chat_item_mentions;
+ALTER TABLE chat_items DROP COLUMN user_mention;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250129_delete_unused_contacts.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250129_delete_unused_contacts.hs
new file mode 100644
index 0000000000..91b3f688c1
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250129_delete_unused_contacts.hs
@@ -0,0 +1,66 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250129_delete_unused_contacts where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250129_delete_unused_contacts :: Query
+m20250129_delete_unused_contacts =
+  [sql|
+CREATE TEMPORARY TABLE temp_delete_contacts (
+    contact_id INTEGER PRIMARY KEY,
+    contact_profile_id INTEGER NOT NULL,
+    local_display_name TEXT NOT NULL
+);
+
+INSERT INTO temp_delete_contacts(contact_id, contact_profile_id, local_display_name)
+SELECT contact_id, contact_profile_id, local_display_name
+FROM contacts
+WHERE contact_used = 0 AND is_user = 0
+  AND contact_id NOT IN (SELECT contact_id FROM users)
+  AND contact_id NOT IN (SELECT contact_id FROM contact_requests);
+
+CREATE TEMPORARY TABLE temp_delete_profiles (contact_profile_id INTEGER PRIMARY KEY);
+
+INSERT OR IGNORE INTO temp_delete_profiles(contact_profile_id)
+SELECT custom_user_profile_id FROM connections
+WHERE contact_id IN (SELECT contact_id FROM temp_delete_contacts)
+  AND custom_user_profile_id IS NOT NULL;
+
+UPDATE group_members SET contact_id = NULL
+WHERE contact_id IN (SELECT contact_id FROM temp_delete_contacts);
+
+DELETE FROM connections
+WHERE contact_id IN (SELECT contact_id FROM temp_delete_contacts);
+
+DELETE FROM contacts
+WHERE contact_id IN (SELECT contact_id FROM temp_delete_contacts);
+
+DELETE FROM contact_profiles
+WHERE
+  (contact_profile_id IN (SELECT contact_profile_id FROM temp_delete_profiles)
+    OR contact_profile_id IN (SELECT contact_profile_id FROM temp_delete_contacts))
+  AND contact_profile_id NOT IN (SELECT contact_profile_id FROM group_members)
+  AND contact_profile_id NOT IN (SELECT member_profile_id FROM group_members)
+  AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contacts)
+  AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contact_requests)
+  AND contact_profile_id NOT IN (SELECT custom_user_profile_id FROM connections);
+
+DELETE FROM display_names
+WHERE local_display_name IN (SELECT local_display_name FROM temp_delete_contacts)
+  AND local_display_name NOT IN (SELECT local_display_name FROM group_members)
+  AND local_display_name NOT IN (SELECT local_display_name FROM contacts)
+  AND local_display_name NOT IN (SELECT local_display_name FROM users)
+  AND local_display_name NOT IN (SELECT local_display_name FROM groups)
+  AND local_display_name NOT IN (SELECT local_display_name FROM user_contact_links)
+  AND local_display_name NOT IN (SELECT local_display_name FROM contact_requests);
+
+DROP TABLE temp_delete_contacts;
+DROP TABLE temp_delete_profiles;
+|]
+
+down_m20250129_delete_unused_contacts :: Query
+down_m20250129_delete_unused_contacts =
+  [sql|
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250130_indexes.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250130_indexes.hs
new file mode 100644
index 0000000000..c0dbd05fcf
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250130_indexes.hs
@@ -0,0 +1,36 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250130_indexes where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250130_indexes :: Query
+m20250130_indexes =
+  [sql|
+CREATE INDEX idx_chat_items_group_id ON chat_items(group_id);
+
+CREATE INDEX idx_connections_group_member_id ON connections(group_member_id);
+
+DROP INDEX idx_chat_items_shared_msg_id;
+CREATE INDEX idx_chat_items_group_id_shared_msg_id ON chat_items(group_id, shared_msg_id);
+
+
+DROP INDEX idx_groups_host_conn_custom_user_profile_id;
+ALTER TABLE groups DROP COLUMN host_conn_custom_user_profile_id;
+|]
+
+down_m20250130_indexes :: Query
+down_m20250130_indexes =
+  [sql|
+ALTER TABLE groups ADD COLUMN host_conn_custom_user_profile_id INTEGER REFERENCES contact_profiles ON DELETE SET NULL;
+CREATE INDEX idx_groups_host_conn_custom_user_profile_id ON groups(host_conn_custom_user_profile_id);
+
+
+DROP INDEX idx_chat_items_group_id_shared_msg_id;
+CREATE INDEX idx_chat_items_shared_msg_id ON chat_items(shared_msg_id);
+
+DROP INDEX idx_connections_group_member_id;
+
+DROP INDEX idx_chat_items_group_id;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250402_short_links.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250402_short_links.hs
new file mode 100644
index 0000000000..62637c0782
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250402_short_links.hs
@@ -0,0 +1,23 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250402_short_links where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250402_short_links :: Query
+m20250402_short_links =
+  [sql|
+ALTER TABLE user_contact_links ADD COLUMN short_link_contact BLOB;
+ALTER TABLE connections ADD COLUMN short_link_inv BLOB;
+ALTER TABLE connections ADD COLUMN via_short_link_contact BLOB;
+
+|]
+
+down_m20250402_short_links :: Query
+down_m20250402_short_links =
+  [sql|
+ALTER TABLE user_contact_links DROP COLUMN short_link_contact;
+ALTER TABLE connections DROP COLUMN short_link_inv;
+ALTER TABLE connections DROP COLUMN via_short_link_contact;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250512_member_admission.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250512_member_admission.hs
new file mode 100644
index 0000000000..e1f45beef1
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250512_member_admission.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250512_member_admission where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250512_member_admission :: Query
+m20250512_member_admission =
+  [sql|
+ALTER TABLE group_profiles ADD COLUMN member_admission TEXT;
+|]
+
+down_m20250512_member_admission :: Query
+down_m20250512_member_admission =
+  [sql|
+ALTER TABLE group_profiles DROP COLUMN member_admission;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250513_group_scope.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250513_group_scope.hs
new file mode 100644
index 0000000000..34ec6ee382
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250513_group_scope.hs
@@ -0,0 +1,61 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250513_group_scope where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250513_group_scope :: Query
+m20250513_group_scope =
+  [sql|
+ALTER TABLE group_members ADD COLUMN support_chat_ts TEXT;
+ALTER TABLE group_members ADD COLUMN support_chat_items_unread INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_items_member_attention INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_items_mentions INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE group_members ADD COLUMN support_chat_last_msg_from_member_ts TEXT;
+
+ALTER TABLE groups ADD COLUMN members_require_attention INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE chat_items ADD COLUMN group_scope_tag TEXT;
+ALTER TABLE chat_items ADD COLUMN group_scope_group_member_id INTEGER REFERENCES group_members(group_member_id) ON DELETE CASCADE;
+
+CREATE INDEX idx_chat_items_group_scope_group_member_id ON chat_items(group_scope_group_member_id);
+
+CREATE INDEX idx_chat_items_group_scope_item_ts ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_ts
+);
+
+CREATE INDEX idx_chat_items_group_scope_item_status ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_status,
+  item_ts
+);
+|]
+
+down_m20250513_group_scope :: Query
+down_m20250513_group_scope =
+  [sql|
+DROP INDEX idx_chat_items_group_scope_item_status;
+
+DROP INDEX idx_chat_items_group_scope_item_ts;
+
+DROP INDEX idx_chat_items_group_scope_group_member_id;
+
+ALTER TABLE chat_items DROP COLUMN group_scope_tag;
+ALTER TABLE chat_items DROP COLUMN group_scope_group_member_id;
+
+ALTER TABLE groups DROP COLUMN members_require_attention;
+
+ALTER TABLE group_members DROP COLUMN support_chat_ts;
+ALTER TABLE group_members DROP COLUMN support_chat_items_unread;
+ALTER TABLE group_members DROP COLUMN support_chat_items_member_attention;
+ALTER TABLE group_members DROP COLUMN support_chat_items_mentions;
+ALTER TABLE group_members DROP COLUMN support_chat_last_msg_from_member_ts;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
new file mode 100644
index 0000000000..13215dcb75
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
@@ -0,0 +1,1181 @@
+Query: 
+              SELECT
+                f.snd_file_id, f.snd_file_entity_id, f.user_id, f.num_recipients, f.prefix_path,
+                c.snd_file_chunk_id, c.chunk_no, c.chunk_offset, c.chunk_size, c.digest,
+                r.snd_file_chunk_replica_id, r.replica_id, r.replica_key, r.replica_status, r.delay, r.retries
+              FROM snd_file_chunk_replicas r
+              JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+              JOIN snd_file_chunks c ON c.snd_file_chunk_id = r.snd_file_chunk_id
+              JOIN snd_files f ON f.snd_file_id = c.snd_file_id
+              WHERE r.snd_file_chunk_replica_id = ?
+            
+Plan:
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              SELECT
+                m.msg_type, m.msg_flags, m.msg_body, m.pq_encryption, m.internal_ts, m.internal_snd_id, s.previous_msg_hash,
+                s.retry_int_slow, s.retry_int_fast, s.msg_encrypt_key, s.padded_msg_len, sb.agent_msg
+              FROM messages m
+              JOIN snd_messages s ON s.conn_id = m.conn_id AND s.internal_id = m.internal_id
+              LEFT JOIN snd_message_bodies sb ON sb.snd_message_body_id = s.snd_message_body_id
+              WHERE m.conn_id = ? AND m.internal_id = ?
+            
+Plan:
+SEARCH m USING PRIMARY KEY (conn_id=? AND internal_id=?)
+SEARCH s USING PRIMARY KEY (conn_id=?)
+SEARCH sb USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+              SELECT
+                r.snd_file_chunk_replica_id, r.replica_id, r.replica_key, r.replica_status, r.delay, r.retries,
+                s.xftp_host, s.xftp_port, s.xftp_key_hash
+              FROM snd_file_chunk_replicas r
+              JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+              WHERE r.snd_file_chunk_id = ?
+            
+Plan:
+SEARCH r USING INDEX idx_snd_file_chunk_replicas_snd_file_chunk_id (snd_file_chunk_id=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              SELECT command_id FROM commands
+              WHERE conn_id = ? AND host = ? AND port = ? AND failed = 0
+              ORDER BY created_at ASC, command_id ASC
+              LIMIT 1
+            
+Plan:
+SEARCH commands USING INDEX idx_commands_server_commands (host=? AND port=?)
+
+Query: 
+              SELECT command_id FROM commands
+              WHERE conn_id = ? AND host IS NULL AND port IS NULL AND failed = 0
+              ORDER BY created_at ASC, command_id ASC
+              LIMIT 1
+            
+Plan:
+SEARCH commands USING INDEX idx_commands_server_commands (host=? AND port=?)
+
+Query: 
+              SELECT rcv_file_chunk_id, chunk_no, chunk_size, digest, tmp_path
+              FROM rcv_file_chunks
+              WHERE rcv_file_id = ?
+            
+Plan:
+SEARCH rcv_file_chunks USING INDEX idx_rcv_file_chunks_rcv_file_id (rcv_file_id=?)
+
+Query: 
+              SELECT snd_file_chunk_id, chunk_no, chunk_offset, chunk_size, digest
+              FROM snd_file_chunks
+              WHERE snd_file_id = ?
+            
+Plan:
+SEARCH snd_file_chunks USING INDEX idx_snd_file_chunks_snd_file_id (snd_file_id=?)
+
+Query: 
+            DELETE FROM snd_message_bodies
+            WHERE NOT EXISTS (SELECT 1 FROM snd_messages WHERE snd_message_body_id = ?)
+              AND snd_message_body_id = ?
+          
+Plan:
+SEARCH snd_message_bodies USING INTEGER PRIMARY KEY (rowid=?)
+SCALAR SUBQUERY 1
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_snd_message_body_id (snd_message_body_id=?)
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_snd_message_body_id (snd_message_body_id=?)
+
+Query: 
+            SELECT
+              f.rcv_file_id, f.rcv_file_entity_id, f.user_id, c.rcv_file_chunk_id, c.chunk_no, c.chunk_size, c.digest, f.tmp_path, c.tmp_path,
+              r.rcv_file_chunk_replica_id, r.replica_id, r.replica_key, r.received, r.delay, r.retries,
+              f.approved_relays, f.redirect_entity_id
+            FROM rcv_file_chunk_replicas r
+            JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+            JOIN rcv_file_chunks c ON c.rcv_file_chunk_id = r.rcv_file_chunk_id
+            JOIN rcv_files f ON f.rcv_file_id = c.rcv_file_id
+            WHERE r.rcv_file_chunk_replica_id = ?
+          
+Plan:
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT
+              r.rcv_file_chunk_replica_id, r.replica_id, r.replica_key, r.received, r.delay, r.retries,
+              s.xftp_host, s.xftp_port, s.xftp_key_hash
+            FROM rcv_file_chunk_replicas r
+            JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+            WHERE r.rcv_file_chunk_id = ?
+          
+Plan:
+SEARCH r USING INDEX idx_rcv_file_chunk_replicas_rcv_file_chunk_id (rcv_file_chunk_id=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT c.corr_id, cs.user_id, c.command
+            FROM commands c
+            JOIN connections cs USING (conn_id)
+            WHERE c.command_id = ?
+          
+Plan:
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH cs USING PRIMARY KEY (conn_id=?)
+
+Query: 
+            SELECT internal_id
+            FROM snd_message_deliveries
+            WHERE conn_id = ? AND snd_queue_id = ? AND failed = 0 AND internal_id <= ?
+            ORDER BY internal_id ASC
+          
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_expired (conn_id=? AND snd_queue_id=? AND failed=? AND internal_id<?)
+
+Query: 
+            SELECT internal_id
+            FROM snd_message_deliveries d
+            WHERE conn_id = ? AND snd_queue_id = ? AND failed = 0
+            ORDER BY internal_id ASC
+            LIMIT 1
+          
+Plan:
+SEARCH d USING COVERING INDEX idx_snd_message_deliveries_expired (conn_id=? AND snd_queue_id=? AND failed=?)
+
+Query: 
+            SELECT r.deleted_snd_chunk_replica_id
+            FROM deleted_snd_chunk_replicas r
+            JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+            WHERE s.xftp_host = ? AND s.xftp_port = ? AND s.xftp_key_hash = ?
+              AND r.created_at >= ?
+              AND failed = 0
+            ORDER BY r.retries ASC, r.created_at ASC
+            LIMIT 1
+          
+Plan:
+SEARCH s USING COVERING INDEX sqlite_autoindex_xftp_servers_1 (xftp_host=? AND xftp_port=? AND xftp_key_hash=?)
+SEARCH r USING INDEX idx_deleted_snd_chunk_replicas_xftp_server_id (xftp_server_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT r.rcv_file_chunk_replica_id, f.rcv_file_id
+            FROM rcv_file_chunk_replicas r
+            JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+            JOIN rcv_file_chunks c ON c.rcv_file_chunk_id = r.rcv_file_chunk_id
+            JOIN rcv_files f ON f.rcv_file_id = c.rcv_file_id
+            WHERE s.xftp_host = ? AND s.xftp_port = ? AND s.xftp_key_hash = ?
+              AND r.received = 0 AND r.replica_number = 1
+              AND f.status = ? AND f.deleted = 0 AND f.created_at >= ?
+              AND f.failed = 0
+            ORDER BY r.retries ASC, r.created_at ASC
+            LIMIT 1
+          
+Plan:
+SEARCH s USING COVERING INDEX sqlite_autoindex_xftp_servers_1 (xftp_host=? AND xftp_port=? AND xftp_key_hash=?)
+SEARCH r USING INDEX idx_rcv_file_chunk_replicas_pending (received=? AND replica_number=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT r.snd_file_chunk_replica_id, f.snd_file_id
+            FROM snd_file_chunk_replicas r
+            JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+            JOIN snd_file_chunks c ON c.snd_file_chunk_id = r.snd_file_chunk_id
+            JOIN snd_files f ON f.snd_file_id = c.snd_file_id
+            WHERE s.xftp_host = ? AND s.xftp_port = ? AND s.xftp_key_hash = ?
+              AND r.replica_status = ? AND r.replica_number = 1
+              AND (f.status = ? OR f.status = ?) AND f.deleted = 0 AND f.created_at >= ?
+              AND f.failed = 0
+            ORDER BY r.retries ASC, r.created_at ASC
+            LIMIT 1
+          
+Plan:
+SEARCH s USING COVERING INDEX sqlite_autoindex_xftp_servers_1 (xftp_host=? AND xftp_port=? AND xftp_key_hash=?)
+SEARCH r USING INDEX idx_snd_file_chunk_replicas_pending (replica_status=? AND replica_number=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT rcpt_status, snd_message_body_id FROM snd_messages
+            WHERE NOT EXISTS (SELECT 1 FROM snd_message_deliveries WHERE conn_id = ? AND internal_id = ? AND failed = 0)
+              AND conn_id = ? AND internal_id = ?
+          
+Plan:
+SEARCH snd_messages USING PRIMARY KEY (conn_id=?)
+SCALAR SUBQUERY 1
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_expired (conn_id=?)
+
+Query: 
+            SELECT rcv_file_entity_id, user_id, size, digest, key, nonce, chunk_size, prefix_path, tmp_path, save_path, save_file_key, save_file_nonce, status, deleted, redirect_id, redirect_entity_id, redirect_size, redirect_digest
+            FROM rcv_files
+            WHERE rcv_file_id = ?
+          
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT rcv_file_id
+            FROM rcv_files
+            WHERE status IN (?,?) AND deleted = 0 AND created_at >= ?
+              AND failed = 0
+            ORDER BY created_at ASC LIMIT 1
+          
+Plan:
+SEARCH rcv_files USING INDEX idx_rcv_files_status_created_at (status=? AND created_at>?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT snd_file_entity_id, user_id, path, src_file_key, src_file_nonce, num_recipients, digest, prefix_path, key, nonce, status, deleted, redirect_size, redirect_digest
+            FROM snd_files
+            WHERE snd_file_id = ?
+          
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT snd_file_id
+            FROM snd_files
+            WHERE status IN (?,?,?) AND deleted = 0 AND created_at >= ?
+              AND failed = 0
+            ORDER BY created_at ASC LIMIT 1
+          
+Plan:
+SEARCH snd_files USING INDEX idx_snd_files_status_created_at (status=? AND created_at>?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+          SELECT MAX(internal_id)
+          FROM messages
+          WHERE conn_id = ? AND internal_snd_id IS NOT NULL AND internal_ts < ?
+        
+Plan:
+SEARCH messages USING PRIMARY KEY (conn_id=?)
+
+Query: 
+          SELECT user_id FROM users u
+          WHERE u.user_id = ?
+            AND u.deleted = ?
+            AND NOT EXISTS (SELECT c.conn_id FROM connections c WHERE c.user_id = u.user_id)
+        
+Plan:
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+CORRELATED SCALAR SUBQUERY 1
+SEARCH c USING COVERING INDEX idx_connections_user (user_id=?)
+
+Query: 
+        INSERT INTO conn_confirmations
+        (confirmation_id, conn_id, sender_key, e2e_snd_pub_key, ratchet_state, sender_conn_info, smp_reply_queues, smp_client_version, accepted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0);
+      
+Plan:
+
+Query: 
+        INSERT INTO conn_invitations
+        (invitation_id,  contact_conn_id, cr_invitation, recipient_conn_info, accepted) VALUES (?, ?, ?, ?, 0);
+      
+Plan:
+
+Query: 
+        INSERT INTO snd_file_chunk_replica_recipients
+          (snd_file_chunk_replica_id, rcv_replica_id, rcv_replica_key)
+        VALUES (?,?,?)
+      
+Plan:
+
+Query: 
+        SELECT
+          r.internal_id, m.internal_ts, r.broker_id, r.broker_ts, r.external_snd_id, r.integrity, r.internal_hash,
+          m.msg_type, m.msg_body, m.pq_encryption, s.internal_id, s.rcpt_status, r.user_ack
+        FROM rcv_messages r
+        JOIN messages m ON r.conn_id = m.conn_id AND r.internal_id = m.internal_id
+        JOIN connections c ON r.conn_id = c.conn_id AND c.last_internal_msg_id = r.internal_id
+        LEFT JOIN snd_messages s ON s.conn_id = r.conn_id AND s.rcpt_internal_id = r.internal_id
+        WHERE r.conn_id = ? AND r.broker_id = ?
+      
+Plan:
+SEARCH c USING PRIMARY KEY (conn_id=?)
+SEARCH m USING PRIMARY KEY (conn_id=? AND internal_id=?)
+SEARCH r USING PRIMARY KEY (conn_id=?)
+SEARCH s USING PRIMARY KEY (conn_id=?) LEFT-JOIN
+
+Query: 
+        SELECT
+          r.internal_id, m.internal_ts, r.broker_id, r.broker_ts, r.external_snd_id, r.integrity, r.internal_hash,
+          m.msg_type, m.msg_body, m.pq_encryption, s.internal_id, s.rcpt_status, r.user_ack
+        FROM rcv_messages r
+        JOIN messages m ON r.conn_id = m.conn_id AND r.internal_id = m.internal_id
+        LEFT JOIN snd_messages s ON s.conn_id = r.conn_id AND s.rcpt_internal_id = r.internal_id
+        WHERE r.conn_id = ? AND r.internal_id = ?
+      
+Plan:
+SEARCH m USING PRIMARY KEY (conn_id=? AND internal_id=?)
+SEARCH r USING PRIMARY KEY (conn_id=?)
+SEARCH s USING PRIMARY KEY (conn_id=?) LEFT-JOIN
+
+Query: 
+        SELECT
+          r.user_id, r.replica_id, r.replica_key, r.chunk_digest, r.delay, r.retries,
+          s.xftp_host, s.xftp_port, s.xftp_key_hash
+        FROM deleted_snd_chunk_replicas r
+        JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+        WHERE r.deleted_snd_chunk_replica_id = ?
+      
+Plan:
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT
+          user_id, conn_id, conn_mode, smp_agent_version, enable_ntfs,
+          last_external_snd_msg_id, deleted, ratchet_sync_state, pq_support
+        FROM connections
+        WHERE conn_id = ?
+      
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+        SELECT DISTINCT
+          s.xftp_host, s.xftp_port, s.xftp_key_hash
+        FROM deleted_snd_chunk_replicas r
+        JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+        WHERE r.created_at >= ?
+      
+Plan:
+SEARCH r USING INDEX idx_deleted_snd_chunk_replicas_pending (created_at>?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR DISTINCT
+
+Query: 
+        SELECT DISTINCT
+          s.xftp_host, s.xftp_port, s.xftp_key_hash
+        FROM rcv_file_chunk_replicas r
+        JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+        JOIN rcv_file_chunks c ON c.rcv_file_chunk_id = r.rcv_file_chunk_id
+        JOIN rcv_files f ON f.rcv_file_id = c.rcv_file_id
+        WHERE r.received = 0 AND r.replica_number = 1
+          AND f.status = ? AND f.deleted = 0 AND f.created_at >= ?
+      
+Plan:
+SEARCH r USING INDEX idx_rcv_file_chunk_replicas_pending (received=? AND replica_number=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR DISTINCT
+
+Query: 
+        SELECT DISTINCT
+          s.xftp_host, s.xftp_port, s.xftp_key_hash
+        FROM snd_file_chunk_replicas r
+        JOIN xftp_servers s ON s.xftp_server_id = r.xftp_server_id
+        JOIN snd_file_chunks c ON c.snd_file_chunk_id = r.snd_file_chunk_id
+        JOIN snd_files f ON f.snd_file_id = c.snd_file_id
+        WHERE r.replica_status = ? AND r.replica_number = 1
+          AND (f.status = ? OR f.status = ?) AND f.deleted = 0 AND f.created_at >= ?
+      
+Plan:
+SEARCH r USING INDEX idx_snd_file_chunk_replicas_pending (replica_status=? AND replica_number=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR DISTINCT
+
+Query: 
+        SELECT DISTINCT c.host, c.port, COALESCE(c.server_key_hash, s.key_hash)
+        FROM commands c
+        LEFT JOIN servers s ON s.host = c.host AND s.port = c.port
+        WHERE conn_id = ?
+      
+Plan:
+SEARCH c USING INDEX idx_commands_conn_id (conn_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?) LEFT-JOIN
+USE TEMP B-TREE FOR DISTINCT
+
+Query: 
+        SELECT DISTINCT ntf_host, ntf_port, ntf_key_hash
+        FROM ntf_tokens_to_delete
+      
+Plan:
+SCAN ntf_tokens_to_delete
+USE TEMP B-TREE FOR DISTINCT
+
+Query: 
+        SELECT confirmation_id, ratchet_state, own_conn_info, sender_key, e2e_snd_pub_key, sender_conn_info, smp_reply_queues, smp_client_version
+        FROM conn_confirmations
+        WHERE conn_id = ? AND accepted = 1;
+      
+Plan:
+SEARCH conn_confirmations USING INDEX idx_conn_confirmations_conn_id (conn_id=?)
+
+Query: 
+        SELECT conn_id, ratchet_state, sender_key, e2e_snd_pub_key, sender_conn_info, smp_reply_queues, smp_client_version
+        FROM conn_confirmations
+        WHERE confirmation_id = ?;
+      
+Plan:
+SEARCH conn_confirmations USING PRIMARY KEY (confirmation_id=?)
+
+Query: 
+        SELECT contact_conn_id, cr_invitation, recipient_conn_info, own_conn_info, accepted
+        FROM conn_invitations
+        WHERE invitation_id = ?
+          AND accepted = 0
+      
+Plan:
+SEARCH conn_invitations USING PRIMARY KEY (invitation_id=?)
+
+Query: 
+        SELECT last_internal_msg_id, last_internal_rcv_msg_id, last_external_snd_msg_id, last_rcv_msg_hash
+        FROM connections
+        WHERE conn_id = ?
+      
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+        SELECT last_internal_msg_id, last_internal_snd_msg_id, last_snd_msg_hash
+        FROM connections
+        WHERE conn_id = ?
+      
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+        SELECT link_id, snd_private_key
+        FROM inv_short_links
+        WHERE host = ? AND port = ? AND snd_id = ?
+      
+Plan:
+SEARCH inv_short_links USING INDEX idx_inv_short_links_link_id (host=? AND port=?)
+
+Query: 
+        SELECT link_key, snd_private_key, snd_id
+        FROM inv_short_links
+        WHERE host = ? AND port = ? AND link_id = ?
+      
+Plan:
+SEARCH inv_short_links USING INDEX idx_inv_short_links_link_id (host=? AND port=? AND link_id=?)
+
+Query: 
+        SELECT s.internal_id, m.msg_type, s.internal_hash, s.rcpt_internal_id, s.rcpt_status
+        FROM snd_messages s
+        JOIN messages m ON s.conn_id = m.conn_id AND s.internal_id = m.internal_id
+        WHERE s.conn_id = ? AND s.internal_snd_id = ?
+      
+Plan:
+SEARCH s USING PRIMARY KEY (conn_id=? AND internal_snd_id=?)
+SEARCH m USING PRIMARY KEY (conn_id=? AND internal_id=?)
+
+Query: 
+      DELETE FROM conn_confirmations
+      WHERE conn_id = ?
+    
+Plan:
+SEARCH conn_confirmations USING COVERING INDEX idx_conn_confirmations_conn_id (conn_id=?)
+
+Query: 
+      INSERT INTO connections
+        (user_id, conn_id, conn_mode, smp_agent_version, enable_ntfs, pq_support, duplex_handshake) VALUES (?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO inv_short_links
+        (host, port, server_key_hash, link_id, link_key, snd_private_key, snd_id)
+      VALUES (?,?,?,?,?,?,?)
+      ON CONFLICT (host, port, link_id)
+      DO UPDATE SET
+        server_key_hash = EXCLUDED.server_key_hash,
+        link_key = EXCLUDED.link_key,
+        snd_private_key = EXCLUDED.snd_private_key,
+        snd_id = EXCLUDED.snd_id
+    
+Plan:
+
+Query: 
+      INSERT INTO messages
+        (conn_id, internal_id, internal_ts, internal_rcv_id, internal_snd_id, msg_type, msg_flags, msg_body, pq_encryption)
+        VALUES (?,?,?,?,?,?,?,?,?);
+    
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: 
+      INSERT INTO messages
+        (conn_id, internal_id, internal_ts, internal_rcv_id, internal_snd_id, msg_type, msg_flags, msg_body, pq_encryption)
+      VALUES
+        (?,?,?,?,?,?,?,?,?);
+    
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: 
+      INSERT INTO ratchets
+        (conn_id, ratchet_state, x3dh_pub_key_1, x3dh_pub_key_2, pq_pub_kem) VALUES (?, ?, ?, ?, ?)
+      ON CONFLICT (conn_id) DO UPDATE SET
+        ratchet_state = EXCLUDED.ratchet_state,
+        x3dh_priv_key_1 = NULL,
+        x3dh_priv_key_2 = NULL,
+        x3dh_pub_key_1 = EXCLUDED.x3dh_pub_key_1,
+        x3dh_pub_key_2 = EXCLUDED.x3dh_pub_key_2,
+        pq_priv_kem = NULL,
+        pq_pub_kem = EXCLUDED.pq_pub_kem
+    
+Plan:
+
+Query: 
+      INSERT INTO ratchets (conn_id, ratchet_state)
+      VALUES (?, ?)
+      ON CONFLICT (conn_id) DO UPDATE SET
+        ratchet_state = ?,
+        x3dh_priv_key_1 = NULL,
+        x3dh_priv_key_2 = NULL,
+        x3dh_pub_key_1 = NULL,
+        x3dh_pub_key_2 = NULL,
+        pq_priv_kem = NULL,
+        pq_pub_kem = NULL
+    
+Plan:
+
+Query: 
+      INSERT INTO rcv_messages
+        ( conn_id, rcv_queue_id, internal_rcv_id, internal_id, external_snd_id,
+          broker_id, broker_ts,
+          internal_hash, external_prev_snd_hash, integrity)
+      VALUES
+        (?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+SEARCH messages USING COVERING INDEX idx_messages_conn_id_internal_rcv_id (conn_id=? AND internal_rcv_id=?)
+
+Query: 
+      INSERT INTO rcv_queues
+        ( host, port, rcv_id, conn_id, rcv_private_key, rcv_dh_secret, e2e_priv_key, e2e_dh_secret,
+          snd_id, queue_mode, status, rcv_queue_id, rcv_primary, replace_rcv_queue_id, smp_client_version, server_key_hash,
+          link_id, link_key, link_priv_sig_key, link_enc_fixed_data
+        ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);
+    
+Plan:
+
+Query: 
+      INSERT INTO snd_file_chunk_replicas
+        (snd_file_chunk_id, replica_number, xftp_server_id, replica_id, replica_key, replica_status)
+      VALUES (?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO snd_messages
+        ( conn_id, internal_snd_id, internal_id, internal_hash, previous_msg_hash, msg_encrypt_key, padded_msg_len, snd_message_body_id)
+      VALUES
+        (?,?,?,?,?,?,?,?)
+    
+Plan:
+SEARCH messages USING COVERING INDEX idx_messages_conn_id_internal_snd_id (conn_id=? AND internal_snd_id=?)
+
+Query: 
+      INSERT INTO snd_queues
+        (host, port, snd_id, queue_mode, conn_id, snd_public_key, snd_private_key, e2e_pub_key, e2e_dh_secret,
+         status, snd_queue_id, snd_primary, replace_snd_queue_id, smp_client_version, server_key_hash)
+      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      ON CONFLICT (host, port, snd_id) DO UPDATE SET
+        host=EXCLUDED.host,
+        port=EXCLUDED.port,
+        snd_id=EXCLUDED.snd_id,
+        queue_mode=EXCLUDED.queue_mode,
+        conn_id=EXCLUDED.conn_id,
+        snd_public_key=EXCLUDED.snd_public_key,
+        snd_private_key=EXCLUDED.snd_private_key,
+        e2e_pub_key=EXCLUDED.e2e_pub_key,
+        e2e_dh_secret=EXCLUDED.e2e_dh_secret,
+        status=EXCLUDED.status,
+        snd_queue_id=EXCLUDED.snd_queue_id,
+        snd_primary=EXCLUDED.snd_primary,
+        replace_snd_queue_id=EXCLUDED.replace_snd_queue_id,
+        smp_client_version=EXCLUDED.smp_client_version,
+        server_key_hash=EXCLUDED.server_key_hash
+    
+Plan:
+
+Query: 
+      SELECT rcv_replica_id, rcv_replica_key
+      FROM snd_file_chunk_replica_recipients
+      WHERE snd_file_chunk_replica_id = ?
+    
+Plan:
+SEARCH snd_file_chunk_replica_recipients USING INDEX idx_snd_file_chunk_replica_recipients_snd_file_chunk_replica_id (snd_file_chunk_replica_id=?)
+
+Query: 
+      UPDATE conn_confirmations
+      SET accepted = 1,
+          own_conn_info = ?
+      WHERE confirmation_id = ?
+    
+Plan:
+SEARCH conn_confirmations USING PRIMARY KEY (confirmation_id=?)
+
+Query: 
+      UPDATE conn_invitations
+      SET accepted = 1,
+          own_conn_info = ?
+      WHERE invitation_id = ?
+    
+Plan:
+SEARCH conn_invitations USING PRIMARY KEY (invitation_id=?)
+
+Query: 
+      UPDATE connections
+      SET last_external_snd_msg_id = ?,
+          last_rcv_msg_hash = ?
+      WHERE conn_id = ?
+        AND last_internal_rcv_msg_id = ?
+    
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+      UPDATE connections
+      SET last_internal_msg_id = ?,
+          last_internal_rcv_msg_id = ?
+      WHERE conn_id = ?
+    
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+      UPDATE connections
+      SET last_internal_msg_id = ?,
+          last_internal_snd_msg_id = ?
+      WHERE conn_id = ?
+    
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+      UPDATE connections
+      SET last_snd_msg_hash = ?
+      WHERE conn_id = ?
+        AND last_internal_snd_msg_id = ?;
+    
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: 
+      UPDATE inv_short_links
+      SET snd_id = ?
+      WHERE host = ? AND port = ? AND link_id = ?
+    
+Plan:
+SEARCH inv_short_links USING INDEX idx_inv_short_links_link_id (host=? AND port=? AND link_id=?)
+
+Query: 
+      UPDATE ratchets
+      SET x3dh_priv_key_1 = ?, x3dh_priv_key_2 = ?, pq_priv_kem = ?
+      WHERE conn_id = ?
+    
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+
+Query: 
+      UPDATE rcv_queues
+      SET deleted = 1
+      WHERE host = ? AND port = ? AND rcv_id = ?
+    
+Plan:
+SEARCH rcv_queues USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+
+Query: 
+      UPDATE rcv_queues
+      SET e2e_dh_secret = ?,
+          status = ?,
+          smp_client_version = ?
+      WHERE host = ? AND port = ? AND rcv_id = ?
+    
+Plan:
+SEARCH rcv_queues USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+
+Query: 
+      UPDATE rcv_queues
+      SET status = ?
+      WHERE host = ? AND port = ? AND rcv_id = ?
+    
+Plan:
+SEARCH rcv_queues USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+
+Query: 
+      UPDATE rcv_queues
+      SET switch_status = ?
+      WHERE host = ? AND port = ? AND rcv_id = ?
+    
+Plan:
+SEARCH rcv_queues USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+
+Query: 
+      UPDATE snd_queues
+      SET status = ?
+      WHERE host = ? AND port = ? AND snd_id = ?
+    
+Plan:
+SEARCH snd_queues USING PRIMARY KEY (host=? AND port=? AND snd_id=?)
+
+Query: 
+      UPDATE snd_queues
+      SET switch_status = ?
+      WHERE host = ? AND port = ? AND snd_id = ?
+    
+Plan:
+SEARCH snd_queues USING PRIMARY KEY (host=? AND port=? AND snd_id=?)
+
+Query: 
+    SELECT
+      c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.snd_id, q.queue_mode,
+      q.snd_public_key, q.snd_private_key, q.e2e_pub_key, q.e2e_dh_secret, q.status,
+      q.snd_queue_id, q.snd_primary, q.replace_snd_queue_id, q.switch_status, q.smp_client_version
+    FROM snd_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.conn_id = ?
+Plan:
+SEARCH c USING PRIMARY KEY (conn_id=?)
+SEARCH q USING INDEX idx_snd_queue_id (conn_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+
+Query: 
+    SELECT c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.rcv_id, q.rcv_private_key, q.rcv_dh_secret,
+      q.e2e_priv_key, q.e2e_dh_secret, q.snd_id, q.queue_mode, q.status,
+      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id, q.switch_status, q.smp_client_version, q.delete_errors,
+      q.ntf_public_key, q.ntf_private_key, q.ntf_id, q.rcv_ntf_dh_secret,
+      q.link_id, q.link_key, q.link_priv_sig_key, q.link_enc_fixed_data
+    FROM rcv_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.conn_id = ? AND q.deleted = 0
+Plan:
+SEARCH c USING PRIMARY KEY (conn_id=?)
+SEARCH q USING INDEX idx_rcv_queue_id (conn_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+
+Query: 
+    SELECT c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.rcv_id, q.rcv_private_key, q.rcv_dh_secret,
+      q.e2e_priv_key, q.e2e_dh_secret, q.snd_id, q.queue_mode, q.status,
+      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id, q.switch_status, q.smp_client_version, q.delete_errors,
+      q.ntf_public_key, q.ntf_private_key, q.ntf_id, q.rcv_ntf_dh_secret,
+      q.link_id, q.link_key, q.link_priv_sig_key, q.link_enc_fixed_data
+    FROM rcv_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.conn_id = ? AND q.host = ? AND q.port = ? AND q.rcv_id = ? AND q.deleted = 0
+Plan:
+SEARCH q USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+SEARCH c USING PRIMARY KEY (conn_id=?)
+
+Query: 
+    SELECT c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.rcv_id, q.rcv_private_key, q.rcv_dh_secret,
+      q.e2e_priv_key, q.e2e_dh_secret, q.snd_id, q.queue_mode, q.status,
+      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id, q.switch_status, q.smp_client_version, q.delete_errors,
+      q.ntf_public_key, q.ntf_private_key, q.ntf_id, q.rcv_ntf_dh_secret,
+      q.link_id, q.link_key, q.link_priv_sig_key, q.link_enc_fixed_data
+    FROM rcv_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.conn_id = ? AND q.host = ? AND q.port = ? AND q.rcv_id = ? AND q.deleted = 1
+Plan:
+SEARCH q USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+SEARCH c USING PRIMARY KEY (conn_id=?)
+
+Query: 
+    SELECT c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.rcv_id, q.rcv_private_key, q.rcv_dh_secret,
+      q.e2e_priv_key, q.e2e_dh_secret, q.snd_id, q.queue_mode, q.status,
+      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id, q.switch_status, q.smp_client_version, q.delete_errors,
+      q.ntf_public_key, q.ntf_private_key, q.ntf_id, q.rcv_ntf_dh_secret,
+      q.link_id, q.link_key, q.link_priv_sig_key, q.link_enc_fixed_data
+    FROM rcv_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.conn_id = ? AND q.rcv_queue_id = ? AND q.deleted = 0
+Plan:
+SEARCH c USING PRIMARY KEY (conn_id=?)
+SEARCH q USING INDEX idx_rcv_queue_id (conn_id=? AND rcv_queue_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+
+Query: 
+    SELECT c.user_id, COALESCE(q.server_key_hash, s.key_hash), q.conn_id, q.host, q.port, q.rcv_id, q.rcv_private_key, q.rcv_dh_secret,
+      q.e2e_priv_key, q.e2e_dh_secret, q.snd_id, q.queue_mode, q.status,
+      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id, q.switch_status, q.smp_client_version, q.delete_errors,
+      q.ntf_public_key, q.ntf_private_key, q.ntf_id, q.rcv_ntf_dh_secret,
+      q.link_id, q.link_key, q.link_priv_sig_key, q.link_enc_fixed_data
+    FROM rcv_queues q
+    JOIN servers s ON q.host = s.host AND q.port = s.port
+    JOIN connections c ON q.conn_id = c.conn_id
+   WHERE q.host = ? AND q.port = ? AND q.rcv_id = ? AND q.deleted = 0
+Plan:
+SEARCH q USING PRIMARY KEY (host=? AND port=? AND rcv_id=?)
+SEARCH s USING PRIMARY KEY (host=? AND port=?)
+SEARCH c USING PRIMARY KEY (conn_id=?)
+
+Query: DELETE FROM commands WHERE command_id = ?
+Plan:
+SEARCH commands USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM conn_invitations WHERE contact_conn_id = ? AND invitation_id = ?
+Plan:
+SEARCH conn_invitations USING PRIMARY KEY (invitation_id=?)
+
+Query: DELETE FROM connections WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_hash (conn_id=?)
+SEARCH encrypted_rcv_message_hashes USING COVERING INDEX idx_encrypted_rcv_message_hashes_hash (conn_id=?)
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_conn_id (conn_id=?)
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+SEARCH conn_invitations USING COVERING INDEX idx_conn_invitations_contact_conn_id (contact_conn_id=?)
+SEARCH conn_confirmations USING COVERING INDEX idx_conn_confirmations_conn_id (conn_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_conn_id (conn_id=?)
+SEARCH snd_queues USING COVERING INDEX idx_snd_queue_id (conn_id=?)
+SEARCH rcv_queues USING COVERING INDEX idx_rcv_queue_id (conn_id=?)
+
+Query: DELETE FROM deleted_snd_chunk_replicas WHERE deleted_snd_chunk_replica_id = ?
+Plan:
+SEARCH deleted_snd_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM inv_short_links WHERE host = ? AND port = ? AND link_id = ?
+Plan:
+SEARCH inv_short_links USING INDEX idx_inv_short_links_link_id (host=? AND port=? AND link_id=?)
+
+Query: DELETE FROM messages WHERE conn_id = ? AND internal_id = ?;
+Plan:
+SEARCH messages USING PRIMARY KEY (conn_id=? AND internal_id=?)
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=? AND internal_id=?)
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
+SEARCH rcv_messages USING COVERING INDEX idx_rcv_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: DELETE FROM ntf_subscriptions WHERE conn_id = ?
+Plan:
+SEARCH ntf_subscriptions USING PRIMARY KEY (conn_id=?)
+
+Query: DELETE FROM ratchets WHERE conn_id = ?
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+SEARCH skipped_messages USING COVERING INDEX idx_skipped_messages_conn_id (conn_id=?)
+
+Query: DELETE FROM rcv_files WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH rcv_file_chunks USING COVERING INDEX idx_rcv_file_chunks_rcv_file_id (rcv_file_id=?)
+SEARCH rcv_files USING COVERING INDEX idx_rcv_files_redirect_id (redirect_id=?)
+
+Query: DELETE FROM rcv_queues WHERE conn_id = ? AND rcv_queue_id = ?
+Plan:
+SEARCH rcv_queues USING COVERING INDEX idx_rcv_queue_id (conn_id=? AND rcv_queue_id=?)
+
+Query: DELETE FROM snd_files WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH snd_file_chunks USING COVERING INDEX idx_snd_file_chunks_snd_file_id (snd_file_id=?)
+
+Query: DELETE FROM snd_message_deliveries WHERE conn_id = ? AND snd_queue_id = ?
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries (conn_id=? AND snd_queue_id=?)
+
+Query: DELETE FROM snd_message_deliveries WHERE conn_id = ? AND snd_queue_id = ? AND internal_id = ?
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_expired (conn_id=? AND snd_queue_id=?)
+
+Query: DELETE FROM snd_queues WHERE conn_id = ? AND snd_queue_id = ?
+Plan:
+SEARCH snd_queues USING COVERING INDEX idx_snd_queue_id (conn_id=? AND snd_queue_id=?)
+
+Query: DELETE FROM users WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH deleted_snd_chunk_replicas USING COVERING INDEX idx_deleted_snd_chunk_replicas_user_id (user_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_user_id (user_id=?)
+SEARCH rcv_files USING COVERING INDEX idx_rcv_files_user_id (user_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_user (user_id=?)
+
+Query: INSERT INTO commands (host, port, corr_id, conn_id, command_tag, command, server_key_hash, created_at) VALUES (?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO deleted_snd_chunk_replicas (user_id, xftp_server_id, replica_id, replica_key, chunk_digest) VALUES (?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO encrypted_rcv_message_hashes (conn_id, hash) VALUES (?,?)
+Plan:
+
+Query: INSERT INTO processed_ratchet_key_hashes (conn_id, hash) VALUES (?,?)
+Plan:
+
+Query: INSERT INTO ratchets (conn_id, x3dh_priv_key_1, x3dh_priv_key_2, pq_priv_kem) VALUES (?, ?, ?, ?)
+Plan:
+
+Query: INSERT INTO rcv_file_chunk_replicas (replica_number, rcv_file_chunk_id, xftp_server_id, replica_id, replica_key) VALUES (?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO rcv_file_chunks (rcv_file_id, chunk_no, chunk_size, digest) VALUES (?,?,?,?)
+Plan:
+
+Query: INSERT INTO rcv_files (rcv_file_entity_id, user_id, size, digest, key, nonce, chunk_size, prefix_path, tmp_path, save_path, save_file_key, save_file_nonce, status, redirect_id, redirect_entity_id, redirect_digest, redirect_size, approved_relays) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO servers (host, port, key_hash) VALUES (?,?,?)
+Plan:
+
+Query: INSERT INTO skipped_messages (conn_id, header_key, msg_n, msg_key) VALUES (?, ?, ?, ?)
+Plan:
+
+Query: INSERT INTO snd_file_chunks (snd_file_id, chunk_no, chunk_offset, chunk_size, digest) VALUES (?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO snd_files (snd_file_entity_id, user_id, path, src_file_key, src_file_nonce, num_recipients, prefix_path, key, nonce, status, redirect_size, redirect_digest) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO snd_message_bodies (agent_msg) VALUES (?) RETURNING snd_message_body_id
+Plan:
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_snd_message_body_id (snd_message_body_id=?)
+
+Query: INSERT INTO snd_message_deliveries (conn_id, snd_queue_id, internal_id) VALUES (?, ?, ?)
+Plan:
+
+Query: INSERT INTO users (user_id) VALUES (1)
+Plan:
+
+Query: INSERT INTO users DEFAULT VALUES
+Plan:
+
+Query: INSERT INTO xftp_servers (xftp_host, xftp_port, xftp_key_hash) VALUES (?,?,?)
+Plan:
+
+Query: SELECT 1 FROM encrypted_rcv_message_hashes WHERE conn_id = ? AND hash = ? LIMIT 1
+Plan:
+SEARCH encrypted_rcv_message_hashes USING COVERING INDEX idx_encrypted_rcv_message_hashes_hash (conn_id=? AND hash=?)
+
+Query: SELECT 1 FROM processed_ratchet_key_hashes WHERE conn_id = ? AND hash = ? LIMIT 1
+Plan:
+SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_hash (conn_id=? AND hash=?)
+
+Query: SELECT 1 FROM snd_message_deliveries WHERE conn_id = ? AND failed = 0 LIMIT 1
+Plan:
+SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_expired (conn_id=?)
+
+Query: SELECT DISTINCT conn_id FROM snd_message_deliveries WHERE failed = 0
+Plan:
+SCAN snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_expired
+
+Query: SELECT conn_id FROM connections WHERE user_id = ?
+Plan:
+SEARCH connections USING COVERING INDEX idx_connections_user (user_id=?)
+
+Query: SELECT count(1) FROM snd_message_bodies
+Plan:
+SCAN snd_message_bodies
+
+Query: SELECT deleted FROM snd_files WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT header_key, msg_n, msg_key FROM skipped_messages WHERE conn_id = ?
+Plan:
+SEARCH skipped_messages USING INDEX idx_skipped_messages_conn_id (conn_id=?)
+
+Query: SELECT key_hash FROM servers WHERE host = ? AND port = ?
+Plan:
+SEARCH servers USING PRIMARY KEY (host=? AND port=?)
+
+Query: SELECT last_insert_rowid()
+Plan:
+SCAN CONSTANT ROW
+
+Query: SELECT ratchet_state FROM ratchets WHERE conn_id = ?
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+
+Query: SELECT ratchet_state, x3dh_pub_key_1, x3dh_pub_key_2, pq_pub_kem FROM ratchets WHERE conn_id = ?
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+
+Query: SELECT rcv_file_id FROM rcv_files WHERE rcv_file_entity_id = ?
+Plan:
+SEARCH rcv_files USING COVERING INDEX sqlite_autoindex_rcv_files_1 (rcv_file_entity_id=?)
+
+Query: SELECT rcv_file_id FROM rcv_files WHERE redirect_id = ?
+Plan:
+SEARCH rcv_files USING COVERING INDEX idx_rcv_files_redirect_id (redirect_id=?)
+
+Query: SELECT rcv_queue_id FROM rcv_queues WHERE conn_id = ? AND host = ? AND port = ? AND snd_id = ?
+Plan:
+SEARCH rcv_queues USING INDEX sqlite_autoindex_rcv_queues_2 (host=? AND port=? AND snd_id=?)
+
+Query: SELECT rcv_queue_id FROM rcv_queues WHERE conn_id = ? ORDER BY rcv_queue_id DESC LIMIT 1
+Plan:
+SEARCH rcv_queues USING COVERING INDEX idx_rcv_queue_id (conn_id=?)
+
+Query: SELECT rcv_queue_id, broker_id FROM rcv_messages WHERE conn_id = ? AND internal_id = ?
+Plan:
+SEARCH rcv_messages USING PRIMARY KEY (conn_id=?)
+
+Query: SELECT snd_file_id FROM snd_files WHERE snd_file_entity_id = ?
+Plan:
+SEARCH snd_files USING COVERING INDEX idx_snd_files_snd_file_entity_id (snd_file_entity_id=?)
+
+Query: SELECT snd_queue_id FROM snd_queues WHERE conn_id = ? AND host = ? AND port = ? AND snd_id = ?
+Plan:
+SEARCH snd_queues USING PRIMARY KEY (host=? AND port=? AND snd_id=?)
+
+Query: SELECT snd_queue_id FROM snd_queues WHERE conn_id = ? ORDER BY snd_queue_id DESC LIMIT 1
+Plan:
+SEARCH snd_queues USING COVERING INDEX idx_snd_queue_id (conn_id=?)
+
+Query: SELECT started_at, servers_stats FROM servers_stats WHERE servers_stats_id = 1
+Plan:
+SEARCH servers_stats USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT user_id FROM users WHERE user_id = ? AND deleted = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT x3dh_priv_key_1, x3dh_priv_key_2, pq_priv_kem FROM ratchets WHERE conn_id = ?
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+
+Query: SELECT xftp_server_id FROM xftp_servers WHERE xftp_host = ? AND xftp_port = ? AND xftp_key_hash = ?
+Plan:
+SEARCH xftp_servers USING COVERING INDEX sqlite_autoindex_xftp_servers_1 (xftp_host=? AND xftp_port=? AND xftp_key_hash=?)
+
+Query: UPDATE connections SET deleted = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET deleted_at_wait_delivery = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET enable_ntfs = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET pq_support = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET ratchet_sync_state = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET smp_agent_version = ? WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE connections SET user_id = ? WHERE conn_id = ? and user_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE messages SET msg_body = x'' WHERE conn_id = ? AND internal_id = ?
+Plan:
+SEARCH messages USING PRIMARY KEY (conn_id=? AND internal_id=?)
+
+Query: UPDATE ratchets SET ratchet_state = ? WHERE conn_id = ?
+Plan:
+SEARCH ratchets USING PRIMARY KEY (conn_id=?)
+
+Query: UPDATE rcv_file_chunk_replicas SET delay = ?, retries = retries + 1, updated_at = ? WHERE rcv_file_chunk_replica_id = ?
+Plan:
+SEARCH rcv_file_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_file_chunk_replicas SET received = 1, updated_at = ? WHERE rcv_file_chunk_replica_id = ?
+Plan:
+SEARCH rcv_file_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_file_chunks SET tmp_path = ?, updated_at = ? WHERE rcv_file_chunk_id = ?
+Plan:
+SEARCH rcv_file_chunks USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET deleted = 1, updated_at = ? WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET key = ?, nonce = ?, chunk_size = ?, updated_at = ? WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET status = ?, updated_at = ? WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET tmp_path = NULL, error = ?, status = ?, updated_at = ? WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET tmp_path = NULL, status = ?, updated_at = ? WHERE rcv_file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_messages SET user_ack = ? WHERE conn_id = ? AND internal_id = ?
+Plan:
+SEARCH rcv_messages USING COVERING INDEX idx_rcv_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: UPDATE rcv_queues SET last_broker_ts = ? WHERE conn_id = ? AND rcv_queue_id = ? AND (last_broker_ts IS NULL OR last_broker_ts < ?)
+Plan:
+SEARCH rcv_queues USING INDEX idx_rcv_queue_id (conn_id=? AND rcv_queue_id=?)
+
+Query: UPDATE rcv_queues SET rcv_primary = ? WHERE conn_id = ?
+Plan:
+SEARCH rcv_queues USING COVERING INDEX idx_rcv_queue_id (conn_id=?)
+
+Query: UPDATE rcv_queues SET rcv_primary = ?, replace_rcv_queue_id = ? WHERE conn_id = ? AND rcv_queue_id = ?
+Plan:
+SEARCH rcv_queues USING COVERING INDEX idx_rcv_queue_id (conn_id=? AND rcv_queue_id=?)
+
+Query: UPDATE servers_stats SET servers_stats = ?, updated_at = ? WHERE servers_stats_id = 1
+Plan:
+SEARCH servers_stats USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_file_chunk_replicas SET replica_status = ?, updated_at = ? WHERE snd_file_chunk_replica_id = ?
+Plan:
+SEARCH snd_file_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_files SET deleted = 1, updated_at = ? WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_files SET prefix_path = NULL, status = ?, updated_at = ? WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_files SET status = ?, digest = ?, updated_at = ? WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_files SET status = ?, updated_at = ? WHERE snd_file_id = ?
+Plan:
+SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE snd_messages SET rcpt_internal_id = ?, rcpt_status = ? WHERE conn_id = ? AND internal_snd_id = ?
+Plan:
+SEARCH snd_messages USING PRIMARY KEY (conn_id=? AND internal_snd_id=?)
+
+Query: UPDATE snd_messages SET retry_int_slow = ?, retry_int_fast = ? WHERE conn_id = ? AND internal_id = ?
+Plan:
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: UPDATE snd_messages SET snd_message_body_id = NULL WHERE conn_id = ? AND internal_id = ?
+Plan:
+SEARCH snd_messages USING COVERING INDEX idx_snd_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
+
+Query: UPDATE snd_queues SET snd_primary = ? WHERE conn_id = ?
+Plan:
+SEARCH snd_queues USING COVERING INDEX idx_snd_queue_id (conn_id=?)
+
+Query: UPDATE snd_queues SET snd_primary = ?, replace_snd_queue_id = ? WHERE conn_id = ? AND snd_queue_id = ?
+Plan:
+SEARCH snd_queues USING COVERING INDEX idx_snd_queue_id (conn_id=? AND snd_queue_id=?)
+
+Query: UPDATE users SET deleted = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_lint.sql b/src/Simplex/Chat/Store/SQLite/Migrations/chat_lint.sql
index 86047070fb..e69de29bb2 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_lint.sql
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_lint.sql
@@ -1,2 +0,0 @@
-CREATE INDEX 'chat_items_group_id' ON 'chat_items'('group_id'); --> groups(group_id)
-CREATE INDEX 'connections_group_member_id' ON 'connections'('group_member_id'); --> group_members(group_member_id)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
new file mode 100644
index 0000000000..ea91bced4d
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -0,0 +1,6120 @@
+Query: 
+                  UPDATE groups
+                  SET chat_ts = ?,
+                      members_require_attention = members_require_attention + 1
+                  WHERE user_id = ? AND group_id = ?
+                
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                  UPDATE groups
+                  SET chat_ts = ?,
+                      members_require_attention = members_require_attention - 1
+                  WHERE user_id = ? AND group_id = ?
+                
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                INSERT INTO group_members
+                  ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+                    user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+                    peer_chat_min_version, peer_chat_max_version)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+              
+Plan:
+
+Query: 
+                INSERT INTO groups
+                  (group_profile_id, local_display_name, inv_queue_info, user_id, enable_ntfs,
+                   created_at, updated_at, chat_ts, user_member_profile_sent_at, business_chat, business_member_id, customer_member_id)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
+              
+Plan:
+
+Query: 
+                INSERT INTO groups
+                  (group_profile_id, local_display_name, user_id, enable_ntfs,
+                   created_at, updated_at, chat_ts, user_member_profile_sent_at, business_chat, business_member_id, customer_member_id)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?)
+              
+Plan:
+
+Query: 
+                INSERT INTO groups
+                  (group_profile_id, local_display_name, user_id, enable_ntfs,
+                   created_at, updated_at, chat_ts, user_member_profile_sent_at, business_chat, business_xcontact_id)
+                VALUES (?,?,?,?,?,?,?,?,?,?)
+              
+Plan:
+
+Query: 
+                SELECT
+                  -- GroupInfo
+                  g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
+                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+                  g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+                  g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
+                  -- GroupInfo {membership}
+                  mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
+                  mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
+                  -- GroupInfo {membership = GroupMember {memberProfile}}
+                  pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+                  mu.created_at, mu.updated_at,
+                  mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
+                  -- from GroupMember
+                  m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+                  m.created_at, m.updated_at,
+                  m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
+                FROM group_members m
+                JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+                JOIN groups g ON g.group_id = m.group_id
+                JOIN group_profiles gp USING (group_profile_id)
+                JOIN group_members mu ON g.group_id = mu.group_id
+                JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
+                WHERE m.group_member_id = ? AND g.user_id = ? AND mu.contact_id = ?
+              
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH pu USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                UPDATE contact_requests
+                SET agent_invitation_id = ?, pq_support = ?, peer_chat_min_version = ?, peer_chat_max_version = ?, local_display_name = ?, updated_at = ?
+                WHERE user_id = ? AND contact_request_id = ?
+              
+Plan:
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                UPDATE contact_requests
+                SET agent_invitation_id = ?, pq_support = ?, peer_chat_min_version = ?, peer_chat_max_version = ?, updated_at = ?
+                WHERE user_id = ? AND contact_request_id = ?
+              
+Plan:
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = 0,
+                    support_chat_items_mentions = support_chat_items_mentions + ?
+                WHERE group_member_id = ?
+              
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = support_chat_items_member_attention + ?,
+                    support_chat_items_mentions = support_chat_items_mentions + ?
+                WHERE group_member_id = ?
+              
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+                UPDATE group_members
+                SET support_chat_ts = ?,
+                    support_chat_items_unread = support_chat_items_unread + ?,
+                    support_chat_items_member_attention = support_chat_items_member_attention + ?,
+                    support_chat_items_mentions = support_chat_items_mentions + ?,
+                    support_chat_last_msg_from_member_ts = ?
+                WHERE group_member_id = ?
+              
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              INSERT INTO contact_requests
+                (user_contact_link_id, agent_invitation_id, peer_chat_min_version, peer_chat_max_version, contact_profile_id, local_display_name, user_id,
+                 created_at, updated_at, xcontact_id, pq_support)
+              VALUES (?,?,?,?,?,?,?,?,?,?,?)
+            
+Plan:
+
+Query: 
+              INSERT INTO display_names
+                (local_display_name, ldn_base, ldn_suffix, user_id, created_at, updated_at)
+              VALUES (?,?,?,?,?,?)
+            
+Plan:
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              INSERT INTO group_member_intros
+                (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at)
+              VALUES (?,?,?,?,?,?)
+            
+Plan:
+
+Query: 
+              INSERT INTO group_members
+                ( group_id, member_id, member_role, member_category, member_status, invited_by,
+                  user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at)
+              VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
+            
+Plan:
+
+Query: 
+              INSERT INTO group_members
+                ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+                  user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at,
+                  peer_chat_min_version, peer_chat_max_version)
+              VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+            
+Plan:
+
+Query: 
+              SELECT
+                -- Contact
+                ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+                cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+                -- Connection
+                c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
+                c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+                c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+              FROM contacts ct
+              JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
+              LEFT JOIN connections c ON c.contact_id = ct.contact_id
+              WHERE ct.user_id = ? AND ct.xcontact_id = ? AND ct.deleted = 0
+              ORDER BY c.created_at DESC
+              LIMIT 1
+            
+Plan:
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH cp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_contact_id (contact_id=?) LEFT-JOIN
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+              SELECT COUNT(1)
+              FROM chat_items i
+              JOIN contacts ct USING (contact_id)
+              WHERE i.user_id = ? AND i.item_status = ? AND (ct.enable_ntfs = 1 OR ct.enable_ntfs IS NULL) AND ct.deleted = 0
+            
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_contacts (user_id=?)
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              SELECT COUNT(1)
+              FROM chat_items i
+              JOIN groups g USING (group_id)
+              WHERE i.user_id = ? AND i.item_status = ?
+                AND (g.enable_ntfs = 1 OR g.enable_ntfs IS NULL OR (g.enable_ntfs = 2 AND i.user_mention = 1))
+            
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_groups_user_mention (user_id=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              SELECT conditions_commit, accepted_at, auto_accepted
+              FROM operator_usage_conditions
+              WHERE server_operator_id = ?
+              ORDER BY operator_usage_conditions_id DESC
+              LIMIT 1
+            
+Plan:
+SEARCH operator_usage_conditions USING INDEX idx_operator_usage_conditions_server_operator_id (server_operator_id=?)
+
+Query: 
+              SELECT g.local_display_name, mu.member_status
+              FROM groups g
+              JOIN group_members mu ON mu.group_id = g.group_id
+              WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?
+                AND mu.member_status NOT IN (?,?,?)
+          
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+
+Query: 
+              SELECT m.group_member_id, m.local_display_name, c.agent_conn_id
+              FROM group_members m
+              JOIN connections c ON c.connection_id = (
+                SELECT max(cc.connection_id)
+                FROM connections cc
+                WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+              )
+              WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)
+                AND m.member_status NOT IN (?,?,?)
+          
+Plan:
+SEARCH m USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+              SELECT timed_ttl
+              FROM chat_items
+              WHERE user_id = ? AND contact_id = ? AND item_status = ? AND chat_item_id = ? AND timed_ttl IS NOT NULL AND timed_delete_at IS NULL
+            
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              UPDATE contact_profiles
+              SET display_name = ?,
+                  full_name = ?,
+                  image = ?,
+                  contact_link = ?,
+                  updated_at = ?
+              WHERE contact_profile_id IN (
+                SELECT contact_profile_id
+                FROM contact_requests
+                WHERE user_id = ?
+                  AND contact_request_id = ?
+              )
+            
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+              UPDATE xftp_file_descriptions
+              SET file_descr_text = ?, file_descr_part_no = ?, file_descr_complete = ?
+              WHERE file_descr_id = ?
+            
+Plan:
+SEARCH xftp_file_descriptions USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            INSERT INTO contacts (
+              user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, contact_used,
+              created_at, updated_at, chat_ts
+            ) VALUES (?,?,?,?,?,?,?,?,?)
+          
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: 
+            INSERT INTO group_members
+              ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+                user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+                peer_chat_min_version, peer_chat_max_version)
+            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+          
+Plan:
+
+Query: 
+            INSERT INTO group_members
+              ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+                user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at,
+                peer_chat_min_version, peer_chat_max_version)
+            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+          
+Plan:
+
+Query: 
+            INSERT INTO messages (
+              msg_sent, chat_msg_event, msg_body, connection_id, group_id,
+              shared_msg_id, shared_msg_id_user, created_at, updated_at
+            ) VALUES (?,?,?,?,?,?,?,?,?)
+          
+Plan:
+
+Query: 
+            SELECT
+              c.contact_profile_id, c.local_display_name, c.via_group, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
+              p.preferences, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.contact_group_member_id, c.contact_grp_inv_sent, c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl
+            FROM contacts c
+            JOIN contact_profiles p ON c.contact_profile_id = p.contact_profile_id
+            WHERE c.user_id = ? AND c.contact_id = ? AND c.deleted = 0
+          
+Plan:
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT
+              cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.contact_id, cr.user_contact_link_id,
+              c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, cr.pq_support, p.preferences, cr.created_at, cr.updated_at,
+              cr.peer_chat_min_version, cr.peer_chat_max_version
+            FROM contact_requests cr
+            JOIN connections c USING (user_contact_link_id)
+            JOIN contact_profiles p USING (contact_profile_id)
+            WHERE cr.user_id = ?
+              AND cr.xcontact_id = ?
+            LIMIT 1
+          
+Plan:
+SEARCH cr USING INDEX idx_contact_requests_xcontact_id (xcontact_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND contact_id = ?
+                AND created_at > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND contact_id = ?
+                AND created_at = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=? AND created_at>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=? AND created_at=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND contact_id = ? AND item_status = ?
+                AND created_at > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND contact_id = ? AND item_status = ?
+                AND created_at = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=? AND created_at>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=? AND created_at=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND group_id = ?
+                AND item_ts > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND group_id = ?
+                AND item_ts = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=? AND item_ts>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=? AND item_ts=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND group_id = ? AND item_status = ?
+                AND item_ts > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND group_id = ? AND item_status = ?
+                AND item_ts = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups (user_id=? AND group_id=? AND item_status=? AND item_ts>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups (user_id=? AND group_id=? AND item_status=? AND item_ts=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND note_folder_id = ?
+                AND created_at > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND note_folder_id = ?
+                AND created_at = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=? AND created_at>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=? AND created_at=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT COUNT(1)
+            FROM (
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND note_folder_id = ? AND item_status = ?
+                AND created_at > ?
+              UNION ALL
+              SELECT 1
+              FROM chat_items
+              WHERE user_id = ? AND note_folder_id = ? AND item_status = ?
+                AND created_at = ? AND chat_item_id > ?
+            ) ci
+          
+Plan:
+CO-ROUTINE ci
+COMPOUND QUERY
+LEFT-MOST SUBQUERY
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id=? AND item_status=? AND created_at>?)
+UNION ALL
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id=? AND item_status=? AND created_at=? AND rowid>?)
+SCAN ci
+
+Query: 
+            SELECT author_group_member_id, forwarded_by_group_member_id
+            FROM messages
+            WHERE group_id = ? AND shared_msg_id = ? LIMIT 1
+          
+Plan:
+SEARCH messages USING INDEX idx_messages_group_id_shared_msg_id (group_id=? AND shared_msg_id=?)
+
+Query: 
+            SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
+            FROM chat_items
+            WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+              AND (item_ts < ? OR (item_ts = ? AND chat_item_id < ?))
+            ORDER BY item_ts DESC, chat_item_id DESC
+            LIMIT ?
+          
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_ts (user_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
+            FROM chat_items
+            WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+            ORDER BY item_ts DESC, chat_item_id DESC
+            LIMIT ?
+          
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_ts (user_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+            SELECT conn_req_contact, group_id
+            FROM user_contact_links
+            WHERE user_id = ? AND short_link_contact = ?
+          
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=?)
+
+Query: 
+            SELECT conn_req_contact, group_id
+            FROM user_contact_links
+            WHERE user_id = ? AND user_contact_link_id = ?
+          
+Plan:
+SEARCH user_contact_links USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT conn_req_inv, agent_conn_id
+            FROM connections
+            WHERE user_id = ? AND short_link_inv = ? LIMIT 1
+          
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=?)
+
+Query: 
+            SELECT connection_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, group_link_id, custom_user_profile_id,
+              conn_status, conn_type, contact_conn_initiated, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id,
+              created_at, security_code, security_code_verified_at, pq_support, pq_encryption, pq_snd_enabled, pq_rcv_enabled, auth_err_counter, quota_err_counter,
+              conn_chat_version, peer_chat_min_version, peer_chat_max_version
+            FROM connections
+            WHERE user_id = ? AND agent_conn_id = ?
+          
+Plan:
+SEARCH connections USING INDEX sqlite_autoindex_connections_1 (agent_conn_id=?)
+
+Query: 
+            SELECT ct.contact_id
+            FROM group_members m
+            JOIN contacts ct ON ct.contact_id = m.contact_id
+            WHERE m.user_id = ? AND m.group_member_id = ? AND ct.deleted = 0
+            LIMIT 1
+          
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT gp.display_name, gp.full_name, gp.description, gp.image, gp.preferences, gp.member_admission
+            FROM group_profiles gp
+            JOIN groups g ON gp.group_profile_id = g.group_profile_id
+            WHERE g.group_id = ?
+          
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT i.chat_item_id
+            FROM chat_items i
+            LEFT JOIN group_snd_item_statuses s ON s.chat_item_id = i.chat_item_id AND s.group_member_id = ?
+            WHERE s.group_snd_item_status_id IS NULL
+              AND i.user_id = ? AND i.group_id = ?
+              AND i.include_in_history = 1
+              AND i.item_deleted = 0
+            ORDER BY i.item_ts DESC, i.chat_item_id DESC
+            LIMIT ?
+          
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_groups_history (user_id=? AND group_id=? AND include_in_history=? AND item_deleted=?)
+SEARCH s USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=? AND group_member_id=?) LEFT-JOIN
+
+Query: 
+            SELECT i.chat_item_id,
+              -- GroupMember
+              m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
+              m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
+              p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+              m.created_at, m.updated_at,
+              m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
+            FROM group_members m
+            JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+            LEFT JOIN contacts c ON m.contact_id = c.contact_id
+            LEFT JOIN chat_items i ON i.user_id = m.user_id
+                                      AND i.group_id = m.group_id
+                                      AND m.group_member_id = i.group_member_id
+                                      AND i.shared_msg_id = ?
+            WHERE m.user_id = ? AND m.group_id = ? AND m.member_id = ?
+          
+Plan:
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH i USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=? AND shared_msg_id=?) LEFT-JOIN
+
+Query: 
+            SELECT i.chat_item_id, i.contact_id, i.group_id, i.group_scope_tag, i.group_scope_group_member_id, i.note_folder_id
+            FROM chat_items i
+            JOIN files f ON f.chat_item_id = i.chat_item_id
+            WHERE f.user_id = ? AND f.file_id = ?
+            LIMIT 1
+          
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+            SELECT ldn_suffix FROM display_names
+            WHERE user_id = ? AND ldn_base = ?
+            ORDER BY ldn_suffix DESC
+            LIMIT 1
+          
+Plan:
+SEARCH display_names USING COVERING INDEX sqlite_autoindex_display_names_2 (user_id=? AND ldn_base=?)
+
+Query: 
+            SELECT s.contact_id, g.group_id, s.group_member_id
+            FROM sent_probes s
+            LEFT JOIN contacts c ON s.contact_id = c.contact_id AND c.deleted = 0
+            LEFT JOIN group_members m ON s.group_member_id = m.group_member_id
+            LEFT JOIN groups g ON g.group_id = m.group_id
+            JOIN sent_probe_hashes h ON h.sent_probe_id = s.sent_probe_id
+            WHERE s.user_id = ? AND s.probe = ?
+              AND (h.contact_id = ? OR h.group_member_id = ?)
+          
+Plan:
+SEARCH s USING INDEX sqlite_autoindex_sent_probes_1 (user_id=? AND probe=?)
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH h USING INDEX idx_sent_probe_hashes_sent_probe_id (sent_probe_id=?)
+
+Query: 
+            UPDATE chat_items SET item_status = ?, updated_at = ?
+            WHERE user_id = ? AND group_id = ? AND item_status = ? AND chat_item_id = ?
+            RETURNING chat_item_id, timed_ttl, timed_delete_at, group_member_id, user_mention
+          
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          DELETE FROM chat_item_reactions
+          WHERE contact_id = ? AND shared_msg_id = ? AND reaction_sent = ? AND reaction = ?
+        
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_contact (contact_id=? AND shared_msg_id=?)
+
+Query: 
+          DELETE FROM chat_item_reactions
+          WHERE group_id = ? AND group_member_id = ? AND shared_msg_id = ? AND item_member_id = ? AND reaction_sent = ? AND reaction = ?
+        
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_group (group_id=? AND shared_msg_id=?)
+
+Query: 
+          INSERT INTO chat_item_reactions
+            (contact_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
+            VALUES (?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO chat_item_reactions
+            (group_id, group_member_id, item_member_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
+            VALUES (?,?,?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO group_members
+            ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+              user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+              peer_chat_min_version, peer_chat_max_version)
+          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO groups
+            (local_display_name, user_id, group_profile_id, enable_ntfs,
+             created_at, updated_at, chat_ts, user_member_profile_sent_at)
+          VALUES (?,?,?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO messages
+            (msg_sent, chat_msg_event, msg_body, created_at, updated_at, connection_id, group_id, shared_msg_id, author_group_member_id, forwarded_by_group_member_id)
+          VALUES (?,?,?,?,?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO server_operators
+            (server_operator_tag, trade_name, legal_name, server_domains, enabled, smp_role_storage, smp_role_proxy, xftp_role_storage, xftp_role_proxy)
+          VALUES (?,?,?,?,?,?,?,?,?)
+        
+Plan:
+
+Query: 
+          INSERT INTO usage_conditions
+            (usage_conditions_id, conditions_commit, notified_at, created_at)
+          VALUES (?,?,?,?)
+        
+Plan:
+
+Query: 
+          SELECT
+            -- ChatItem
+            i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
+            i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
+            i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
+            -- CIFile
+            f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol
+          FROM chat_items i
+          LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
+          WHERE i.user_id = ? AND i.note_folder_id = ? AND i.chat_item_id = ?
+        
+Plan:
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?) LEFT-JOIN
+
+Query: 
+          SELECT
+            -- ChatItem
+            i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
+            i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
+            i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
+            -- CIFile
+            f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
+            -- CIMeta forwardedByMember
+            i.forwarded_by_group_member_id,
+            -- GroupMember
+            m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
+            m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
+            p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.created_at, m.updated_at,
+            m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+            -- quoted ChatItem
+            ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent,
+            -- quoted GroupMember
+            rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category,
+            rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id,
+            rp.display_name, rp.full_name, rp.image, rp.contact_link, rp.local_alias, rp.preferences,
+            rm.created_at, rm.updated_at,
+            rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts,
+            -- deleted by GroupMember
+            dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category,
+            dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id,
+            dbp.display_name, dbp.full_name, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences,
+            dbm.created_at, dbm.updated_at,
+            dbm.support_chat_ts, dbm.support_chat_items_unread, dbm.support_chat_items_member_attention, dbm.support_chat_items_mentions, dbm.support_chat_last_msg_from_member_ts
+          FROM chat_items i
+          LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
+          LEFT JOIN group_members gsm ON gsm.group_member_id = i.group_scope_group_member_id
+          LEFT JOIN contact_profiles gsp ON gsp.contact_profile_id = COALESCE(gsm.member_profile_id, gsm.contact_profile_id)
+          LEFT JOIN group_members m ON m.group_member_id = i.group_member_id
+          LEFT JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+          LEFT JOIN chat_items ri ON ri.shared_msg_id = i.quoted_shared_msg_id AND ri.group_id = i.group_id
+          LEFT JOIN group_members rm ON rm.group_member_id = ri.group_member_id
+          LEFT JOIN contact_profiles rp ON rp.contact_profile_id = COALESCE(rm.member_profile_id, rm.contact_profile_id)
+          LEFT JOIN group_members dbm ON dbm.group_member_id = i.item_deleted_by_group_member_id
+          LEFT JOIN contact_profiles dbp ON dbp.contact_profile_id = COALESCE(dbm.member_profile_id, dbm.contact_profile_id)
+          WHERE i.user_id = ? AND i.group_id = ? AND i.chat_item_id = ?
+        
+Plan:
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?) LEFT-JOIN
+SEARCH gsm USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH ri USING INDEX idx_chat_items_group_id_shared_msg_id (group_id=? AND shared_msg_id=?) LEFT-JOIN
+SEARCH rm USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH rp USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH dbm USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH dbp USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+          SELECT
+            -- ChatItem
+            i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.via_proxy, i.shared_msg_id,
+            i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at,
+            i.fwd_from_tag, i.fwd_from_chat_name, i.fwd_from_msg_dir, i.fwd_from_contact_id, i.fwd_from_group_id, i.fwd_from_chat_item_id,
+            i.timed_ttl, i.timed_delete_at, i.item_live, i.user_mention,
+            -- CIFile
+            f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
+            -- DirectQuote
+            ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent
+          FROM chat_items i
+          LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
+          LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
+          WHERE i.user_id = ? AND i.contact_id = ? AND i.chat_item_id = ?
+        
+Plan:
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?) LEFT-JOIN
+SEARCH ri USING COVERING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AND contact_id=? AND shared_msg_id=?) LEFT-JOIN
+
+Query: 
+          SELECT
+            -- Contact
+            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+            cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+            -- Connection
+            c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
+            c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+            c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+          FROM contacts ct
+          JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
+          JOIN connections c ON c.contact_id = ct.contact_id
+          WHERE c.user_id = ? AND c.via_contact_uri_hash = ? AND ct.contact_status = ? AND ct.deleted = 0
+          ORDER BY c.created_at DESC
+          LIMIT 1
+        
+Plan:
+SEARCH c USING INDEX idx_connections_via_contact_uri_hash (user_id=? AND via_contact_uri_hash=?)
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH cp USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+          SELECT
+            -- GroupInfo
+            g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
+            g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+            g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
+            -- GroupInfo {membership}
+            mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
+            mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
+            -- GroupInfo {membership = GroupMember {memberProfile}}
+            pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.created_at, mu.updated_at,
+            mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
+            -- via GroupMember
+            m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+            m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.created_at, m.updated_at,
+            m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+            c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+            c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+            c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+            c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+          FROM group_members m
+          JOIN contacts ct ON ct.contact_id = m.contact_id
+          JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+          JOIN groups g ON g.group_id = m.group_id AND g.group_id = ct.via_group
+          JOIN group_profiles gp USING (group_profile_id)
+          JOIN group_members mu ON g.group_id = mu.group_id
+          JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
+          LEFT JOIN connections c ON c.connection_id = (
+            SELECT max(cc.connection_id)
+            FROM connections cc
+            where cc.user_id = ? AND cc.group_member_id = m.group_member_id
+          )
+          WHERE ct.user_id = ? AND ct.contact_id = ? AND mu.contact_id = ? AND ct.deleted = 0
+        
+Plan:
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH pu USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+          SELECT
+            g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
+            g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+            g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+            g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
+            mu.group_member_id, g.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction,
+            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.created_at, mu.updated_at,
+            mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
+          FROM groups g
+          JOIN group_profiles gp USING (group_profile_id)
+          JOIN group_members mu USING (group_id)
+          JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
+          WHERE g.user_id = ? AND mu.contact_id = ?
+            AND (LOWER(gp.display_name) LIKE '%' || LOWER(?) || '%'
+              OR LOWER(gp.full_name) LIKE '%' || LOWER(?) || '%'
+              OR LOWER(gp.description) LIKE '%' || LOWER(?) || '%'
+            )
+        
+Plan:
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH pu USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT 1 FROM users
+          WHERE (user_id = ? AND local_display_name = ?)
+             OR contact_id = ?
+          LIMIT 1
+        
+Plan:
+MULTI-INDEX OR
+INDEX 1
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+INDEX 2
+SEARCH users USING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: 
+          SELECT DISTINCT f.file_id
+          FROM files f
+          JOIN snd_files s USING (file_id)
+          WHERE f.user_id = ?
+            AND s.file_status IN (?, ?, ?)
+            AND s.file_descr_id IS NULL
+            AND s.file_inline IS NULL
+            AND s.created_at > ?
+        
+Plan:
+SEARCH f USING COVERING INDEX idx_files_user_id (user_id=?)
+SEARCH s USING INDEX idx_snd_files_file_descr_id (file_descr_id=? AND file_id=?)
+
+Query: 
+          SELECT agent_conn_id FROM (
+            SELECT
+              agent_conn_id,
+              (CASE WHEN contact_id IS NOT NULL THEN 1 ELSE 0 END) AS conn_ord
+            FROM connections
+            WHERE user_id = ? AND via_contact_uri_hash IN (?,?) AND conn_status != ?
+            ORDER BY conn_ord DESC, created_at DESC
+            LIMIT 1
+          ) c
+        
+Plan:
+SEARCH connections USING INDEX idx_connections_via_contact_uri_hash (user_id=? AND via_contact_uri_hash=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+          SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+            c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+            c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+            c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+          FROM connections c
+          JOIN contacts ct ON ct.contact_id = c.contact_id
+          WHERE c.user_id = ? AND ct.user_id = ? AND ct.contact_id = ?
+        
+Plan:
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_contact_id (contact_id=?)
+
+Query: 
+          SELECT chat_item_id
+          FROM chat_items
+          WHERE user_id = ? AND contact_id = ?
+          ORDER BY created_at DESC, chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+          SELECT chat_item_id
+          FROM chat_items
+          WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+          ORDER BY item_ts DESC, chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+          SELECT chat_item_id
+          FROM chat_items
+          WHERE user_id = ? AND group_id = ? AND group_member_id = ? AND shared_msg_id = ?
+          ORDER BY chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=? AND shared_msg_id=?)
+
+Query: 
+          SELECT chat_item_id
+          FROM chat_items
+          WHERE user_id = ? AND group_id = ? AND group_member_id IS NULL AND item_text like ?
+          ORDER BY chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_id (group_id=?)
+
+Query: 
+          SELECT chat_item_id
+          FROM chat_items
+          WHERE user_id = ? AND group_id = ? AND item_text like ?
+          ORDER BY chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_id (group_id=?)
+
+Query: 
+          SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
+          FROM chat_items
+          WHERE chat_item_id = ?
+        
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, note_folder_id
+          FROM chat_items
+          WHERE user_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+            AND (item_ts > ? OR (item_ts = ? AND chat_item_id > ?))
+          ORDER BY item_ts ASC, chat_item_id ASC
+          LIMIT ?
+        
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_ts (user_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+          SELECT chat_item_moderation_id, moderator_member_id, created_by_msg_id, moderated_at
+          FROM chat_item_moderations
+          WHERE group_id = ? AND item_member_id = ? AND shared_msg_id = ?
+          LIMIT 1
+        
+Plan:
+SEARCH chat_item_moderations USING INDEX idx_chat_item_moderations_group (group_id=? AND item_member_id=? AND shared_msg_id=?)
+
+Query: 
+          SELECT connection_id, conn_type, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id
+          FROM connections
+          WHERE agent_conn_id = ?
+        
+Plan:
+SEARCH connections USING INDEX sqlite_autoindex_connections_1 (agent_conn_id=?)
+
+Query: 
+          SELECT contact_id, group_id
+          FROM files
+          WHERE user_id = ? AND file_id = ?
+          LIMIT 1
+        
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT count (m.group_member_id)
+          FROM groups g
+          JOIN group_members m USING (group_id)
+          WHERE g.user_id = ?
+            AND g.group_id = ?
+            AND m.member_status NOT IN (?,?,?,?,?)
+        
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=?)
+
+Query: 
+          SELECT ct.contact_id
+          FROM contacts ct
+          JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
+          LEFT JOIN connections c ON c.contact_id = ct.contact_id
+          WHERE cp.user_id = ? AND cp.contact_link IN (?,?) AND c.connection_id IS NULL
+        
+Plan:
+SEARCH cp USING COVERING INDEX idx_contact_profiles_contact_link (user_id=? AND contact_link=?)
+SEARCH ct USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+SEARCH c USING COVERING INDEX idx_connections_contact_id (contact_id=?) LEFT-JOIN
+
+Query: 
+          SELECT ct.contact_id
+          FROM group_members m
+          JOIN groups g ON g.group_id = m.group_id
+          JOIN contacts ct ON ct.contact_id = m.contact_id AND ct.via_group = g.group_id
+          WHERE m.user_id = ? AND m.group_member_id = ? AND ct.deleted = 0
+          LIMIT 1
+        
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT ct.contact_id, c.connection_id, c.agent_conn_id, ct.local_display_name
+          FROM contacts ct
+          JOIN connections c ON c.contact_id = ct.contact_id
+          WHERE c.agent_conn_id IN (SELECT conn_id FROM temp_conn_ids)
+            AND c.conn_type = ?
+            AND ct.deleted = 0
+        
+Plan:
+SEARCH c USING INDEX sqlite_autoindex_connections_1 (agent_conn_id=?)
+LIST SUBQUERY 1
+SCAN temp_conn_ids
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT f.file_id
+          FROM files f
+          JOIN rcv_files r USING (file_id)
+          WHERE f.user_id = ? AND r.file_status IN (?, ?)
+            AND r.rcv_file_inline IS NULL
+            AND r.file_descr_id IS NULL
+            AND r.created_at > ?
+        
+Plan:
+SEARCH f USING COVERING INDEX idx_files_user_id (user_id=?)
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT g.group_id
+          FROM groups g
+          JOIN group_members mu ON mu.group_id = g.group_id
+          WHERE g.user_id = ? AND g.via_group_link_uri_hash IN (?,?)
+            AND mu.contact_id = ? AND mu.member_status NOT IN (?,?,?,?)
+          LIMIT 1
+        
+Plan:
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT group_id
+          FROM user_contact_links
+          WHERE user_id = ? AND conn_req_contact IN (?,?)
+        
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=?)
+
+Query: 
+          SELECT group_id, group_member_id
+          FROM group_members
+          WHERE user_id = ? AND local_display_name = ?
+            AND member_status IN (?,?) AND member_category != ?
+        
+Plan:
+SEARCH group_members USING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+
+Query: 
+          SELECT i.chat_item_id
+          FROM chat_items i
+          JOIN group_members m ON m.group_id = i.group_id
+                              AND ((i.group_member_id IS NULL AND m.member_category = ?)
+                                  OR i.group_member_id = m.group_member_id)
+          WHERE i.user_id = ? AND i.group_id = ? AND m.member_id = ? AND i.shared_msg_id = ?
+          ORDER BY i.chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?)
+SEARCH i USING INDEX idx_chat_items_group_id_shared_msg_id (group_id=? AND shared_msg_id=?)
+
+Query: 
+          SELECT i.chat_item_id
+          FROM chat_items i
+          JOIN group_members m ON m.group_member_id = i.group_member_id
+          WHERE i.user_id = ? AND i.group_id = ? AND m.local_display_name = ? AND i.item_text like ?
+          ORDER BY i.chat_item_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH i USING INDEX idx_chat_items_group_id (group_id=?)
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT i.chat_item_id, i.contact_id, i.group_id, i.group_scope_tag, i.group_scope_group_member_id, i.note_folder_id
+          FROM chat_items i
+          JOIN groups g ON g.chat_item_id = i.chat_item_id
+          WHERE g.user_id = ? AND g.group_id = ?
+          LIMIT 1
+        
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT member_status
+          FROM group_members
+          WHERE group_id = ? AND user_id = ?
+        
+Plan:
+SEARCH group_members USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+
+Query: 
+          SELECT r.file_id
+          FROM rcv_files r
+          JOIN files f ON f.file_id = r.file_id
+          WHERE f.user_id = ? AND r.file_status = ?
+            AND r.to_receive = 1 AND r.created_at > ?
+        
+Plan:
+SEARCH f USING COVERING INDEX idx_files_user_id (user_id=?)
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          SELECT r.file_status, r.file_queue_info, r.group_member_id, f.file_name,
+            f.file_size, f.chunk_size, f.cancelled, cs.local_display_name, m.local_display_name,
+            f.file_path, f.file_crypto_key, f.file_crypto_nonce, r.file_inline, r.rcv_file_inline,
+            r.agent_rcv_file_id, r.agent_rcv_file_deleted, r.user_approved_relays,
+            c.connection_id, c.agent_conn_id
+          FROM rcv_files r
+          JOIN files f USING (file_id)
+          LEFT JOIN connections c ON r.file_id = c.rcv_file_id
+          LEFT JOIN contacts cs ON cs.contact_id = f.contact_id
+          LEFT JOIN group_members m ON m.group_member_id = r.group_member_id
+          WHERE f.user_id = ? AND f.file_id = ?
+        
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_rcv_file_id (rcv_file_id=?) LEFT-JOIN
+SEARCH cs USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+          SELECT r.probe, r.contact_id, g.group_id, r.group_member_id
+          FROM received_probes r
+          LEFT JOIN contacts c ON r.contact_id = c.contact_id AND c.deleted = 0
+          LEFT JOIN group_members m ON r.group_member_id = m.group_member_id
+          LEFT JOIN groups g ON g.group_id = m.group_id
+          WHERE r.user_id = ? AND r.probe_hash = ? AND r.probe IS NOT NULL
+        
+Plan:
+SEARCH r USING INDEX idx_received_probes_user_id (user_id=?)
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+          UPDATE connections SET via_contact_uri_hash = NULL, xcontact_id = NULL
+          WHERE user_id = ? AND via_group_link = 1 AND contact_id IN (
+            SELECT contact_id
+            FROM group_members
+            WHERE user_id = ? AND group_member_id = ?
+          )
+        
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=?)
+LIST SUBQUERY 1
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE contacts
+          SET local_display_name = ?, contact_profile_id = ?, updated_at = ?
+          WHERE user_id = ? AND contact_id = ?
+        
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE group_members
+          SET contact_id = ?, updated_at = ?
+          WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+        
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE group_members
+          SET support_chat_items_unread = 0,
+              support_chat_items_member_attention = 0,
+              support_chat_items_mentions = 0
+          WHERE group_member_id = ?
+        
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE group_members
+          SET support_chat_items_unread = support_chat_items_unread - ?,
+              support_chat_items_member_attention = support_chat_items_member_attention - ?,
+              support_chat_items_mentions = support_chat_items_mentions - ?,
+              updated_at = ?
+          WHERE group_member_id = ?
+        
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE group_profiles
+          SET display_name = ?, full_name = ?, description = ?, image = ?, preferences = ?, member_admission = ?, updated_at = ?
+          WHERE group_profile_id IN (
+            SELECT group_profile_id
+            FROM groups
+            WHERE user_id = ? AND group_id = ?
+          )
+        
+Plan:
+SEARCH group_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+          UPDATE user_contact_links
+          SET auto_accept = ?, business_address = ?, auto_accept_incognito = ?, auto_reply_msg_content = ?
+          WHERE user_id = ? AND local_display_name = '' AND group_id IS NULL
+        
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+
+Query: 
+        INSERT INTO connections (
+          user_id, agent_conn_id, conn_level, conn_status, conn_type, contact_id, custom_user_profile_id,
+          conn_chat_version, peer_chat_min_version, peer_chat_max_version, created_at, updated_at, to_subscribe
+        ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO connections (
+          user_id, agent_conn_id, conn_req_inv, conn_level, conn_status, conn_type, contact_conn_initiated, contact_id, custom_user_profile_id,
+          conn_chat_version, peer_chat_min_version, peer_chat_max_version, created_at, updated_at, to_subscribe
+        ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO contacts (
+          user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, contact_used,
+          contact_group_member_id, contact_grp_inv_sent, created_at, updated_at, chat_ts
+        ) VALUES (?,?,?,?,?,?,?,?,?,?,?)
+      
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: 
+        INSERT INTO group_members
+          ( group_id, member_id, member_role, member_category, member_status, invited_by,
+            user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+            peer_chat_min_version, peer_chat_max_version)
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO group_members
+          (group_id, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id,
+           user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+           peer_chat_min_version, peer_chat_max_version)
+          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO msg_deliveries
+          (message_id, connection_id, agent_msg_id, agent_msg_meta, chat_ts, created_at, updated_at, delivery_status)
+        VALUES (?,?,?,?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO operator_usage_conditions
+          (server_operator_id, server_operator_tag, conditions_commit, accepted_at, auto_accepted)
+        VALUES (?,?,?,?,?)
+      
+Plan:
+
+Query: 
+        INSERT INTO remote_hosts
+          (host_device_name, store_path, bind_addr, bind_iface, bind_port, ca_key, ca_cert, id_key, host_fingerprint, host_dh_pub)
+        VALUES
+          (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      
+Plan:
+
+Query: 
+        SELECT
+          -- Contact
+          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+          -- Connection
+          c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
+          c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+          c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+        FROM contacts ct
+        JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
+        LEFT JOIN connections c ON c.contact_id = ct.contact_id
+        WHERE ct.user_id = ? AND ct.contact_id = ?
+          AND ct.deleted = ?
+          AND (
+            c.connection_id = (
+              SELECT cc_connection_id FROM (
+                SELECT
+                  cc.connection_id AS cc_connection_id,
+                  cc.created_at AS cc_created_at,
+                  (CASE WHEN cc.conn_status = ? OR cc.conn_status = ? THEN 1 ELSE 0 END) AS cc_conn_status_ord
+                FROM connections cc
+                WHERE cc.user_id = ct.user_id AND cc.contact_id = ct.contact_id
+                ORDER BY cc_conn_status_ord DESC, cc_created_at DESC
+                LIMIT 1
+              ) cc
+            )
+            OR c.connection_id IS NULL
+          )
+      
+Plan:
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH cp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_contact_id (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 2
+CO-ROUTINE cc
+SEARCH cc USING INDEX idx_connections_contact_id (contact_id=?)
+USE TEMP B-TREE FOR ORDER BY
+SCAN cc
+
+Query: 
+        SELECT
+          connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id,
+          custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
+        FROM connections
+        WHERE user_id = ?
+          AND conn_type = ?
+          AND conn_status != ?
+          AND contact_id IS NULL
+          AND conn_level = 0
+          AND via_contact IS NULL
+          AND (via_group_link = 0 OR (via_group_link = 1 AND group_link_id IS NOT NULL))
+          AND LOWER(local_alias) LIKE '%' || LOWER(?) || '%'
+       AND updated_at < ? ORDER BY updated_at DESC LIMIT ?
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=? AND updated_at<?)
+
+Query: 
+        SELECT
+          connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id,
+          custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
+        FROM connections
+        WHERE user_id = ?
+          AND conn_type = ?
+          AND conn_status != ?
+          AND contact_id IS NULL
+          AND conn_level = 0
+          AND via_contact IS NULL
+          AND (via_group_link = 0 OR (via_group_link = 1 AND group_link_id IS NOT NULL))
+          AND LOWER(local_alias) LIKE '%' || LOWER(?) || '%'
+       AND updated_at > ? ORDER BY updated_at ASC LIMIT ?
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=? AND updated_at>?)
+
+Query: 
+        SELECT
+          connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id,
+          custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
+        FROM connections
+        WHERE user_id = ?
+          AND conn_type = ?
+          AND conn_status != ?
+          AND contact_id IS NULL
+          AND conn_level = 0
+          AND via_contact IS NULL
+          AND (via_group_link = 0 OR (via_group_link = 1 AND group_link_id IS NOT NULL))
+          AND LOWER(local_alias) LIKE '%' || LOWER(?) || '%'
+       ORDER BY updated_at DESC LIMIT ?
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=?)
+
+Query: 
+        SELECT
+          contact_id, shared_call_id, call_uuid, chat_item_id, call_state, call_ts
+        FROM calls
+        ORDER BY call_ts ASC
+      
+Plan:
+SCAN calls
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.contact_id, cr.user_contact_link_id,
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, cr.pq_support, p.preferences,
+          cr.created_at, cr.updated_at,
+          cr.peer_chat_min_version, cr.peer_chat_max_version
+        FROM contact_requests cr
+        JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
+        JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id
+        JOIN user_contact_links uc ON uc.user_contact_link_id = cr.user_contact_link_id
+        WHERE cr.user_id = ?
+          AND uc.user_id = ?
+          AND uc.local_display_name = ''
+          AND uc.group_id IS NULL
+          AND (
+            LOWER(cr.local_display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.full_name) LIKE '%' || LOWER(?) || '%'
+          )
+       AND cr.updated_at < ? ORDER BY cr.updated_at DESC LIMIT ?
+Plan:
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH cr USING INDEX idx_contact_requests_updated_at (user_id=? AND updated_at<?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT
+          cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.contact_id, cr.user_contact_link_id,
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, cr.pq_support, p.preferences,
+          cr.created_at, cr.updated_at,
+          cr.peer_chat_min_version, cr.peer_chat_max_version
+        FROM contact_requests cr
+        JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
+        JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id
+        JOIN user_contact_links uc ON uc.user_contact_link_id = cr.user_contact_link_id
+        WHERE cr.user_id = ?
+          AND uc.user_id = ?
+          AND uc.local_display_name = ''
+          AND uc.group_id IS NULL
+          AND (
+            LOWER(cr.local_display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.full_name) LIKE '%' || LOWER(?) || '%'
+          )
+       AND cr.updated_at > ? ORDER BY cr.updated_at ASC LIMIT ?
+Plan:
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH cr USING INDEX idx_contact_requests_updated_at (user_id=? AND updated_at>?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT
+          cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.contact_id, cr.user_contact_link_id,
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, cr.pq_support, p.preferences,
+          cr.created_at, cr.updated_at,
+          cr.peer_chat_min_version, cr.peer_chat_max_version
+        FROM contact_requests cr
+        JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
+        JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id
+        JOIN user_contact_links uc ON uc.user_contact_link_id = cr.user_contact_link_id
+        WHERE cr.user_id = ?
+          AND uc.user_id = ?
+          AND uc.local_display_name = ''
+          AND uc.group_id IS NULL
+          AND (
+            LOWER(cr.local_display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.display_name) LIKE '%' || LOWER(?) || '%'
+            OR LOWER(p.full_name) LIKE '%' || LOWER(?) || '%'
+          )
+       ORDER BY cr.updated_at DESC LIMIT ?
+Plan:
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH cr USING INDEX idx_contact_requests_updated_at (user_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT
+          cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.contact_id, cr.user_contact_link_id,
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, cr.pq_support, p.preferences, cr.created_at, cr.updated_at,
+          cr.peer_chat_min_version, cr.peer_chat_max_version
+        FROM contact_requests cr
+        JOIN connections c USING (user_contact_link_id)
+        JOIN contact_profiles p USING (contact_profile_id)
+        WHERE cr.user_id = ?
+          AND cr.contact_request_id = ?
+      
+Plan:
+SEARCH cr USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT
+          created_at, updated_at, chat_ts, favorite, unread_chat
+        FROM note_folders
+        WHERE user_id = ?
+          AND note_folder_id = ?
+      
+Plan:
+SEARCH note_folders USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND (
+                          LOWER(ct.local_display_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(cp.display_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(cp.full_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(cp.local_alias) LIKE '%' || LOWER(?) || '%'
+                        )
+                    ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH cp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND (ct.favorite = 1
+                          OR ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND (ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND ct.chat_ts < ? ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND (ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND ct.chat_ts > ? ORDER BY ct.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND (ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND ct.favorite = 1
+                    AND ct.chat_ts < ? ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND ct.favorite = 1
+                    AND ct.chat_ts > ? ORDER BY ct.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       
+                      WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1
+                        AND ct.favorite = 1
+                    ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1 AND ct.chat_ts < ? ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1 AND ct.chat_ts > ? ORDER BY ct.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          ct.contact_id,
+          ct.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.contact_id = ct.contact_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          ct.unread_chat
+        FROM contacts ct
+        LEFT JOIN (
+          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND contact_id IS NOT NULL AND item_status = ?
+          GROUP BY contact_id
+        ) ChatStats ON ChatStats.contact_id = ct.contact_id
+       WHERE ct.user_id = ? AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used = 1 ORDER BY ct.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id>?)
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (contact_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
+                      WHERE g.user_id = ?
+                        AND (
+                          LOWER(g.local_display_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(gp.display_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(gp.full_name) LIKE '%' || LOWER(?) || '%'
+                          OR LOWER(gp.description) LIKE '%' || LOWER(?) || '%'
+                        )
+                    ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND (g.favorite = 1
+                          OR g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND (g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND g.chat_ts < ? ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND (g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND g.chat_ts > ? ORDER BY g.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND (g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND g.favorite = 1
+                    AND g.chat_ts < ? ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND g.favorite = 1
+                    AND g.chat_ts > ? ORDER BY g.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       
+                      WHERE g.user_id = ?
+                        AND g.favorite = 1
+                    ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       WHERE g.user_id = ? AND g.chat_ts < ? ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts<?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       WHERE g.user_id = ? AND g.chat_ts > ? ORDER BY g.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=? AND chat_ts>?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          g.group_id,
+          g.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.group_id = g.group_id AND ci.group_scope_tag IS NULL
+            ORDER BY ci.item_ts DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.UnreadMentions, 0),
+          COALESCE(ReportCount.Count, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          g.unread_chat
+        FROM groups g
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS UnreadCount, SUM(user_mention) as UnreadMentions, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL AND group_scope_tag IS NULL AND item_status = ?
+          GROUP BY group_id
+        ) ChatStats ON ChatStats.group_id = g.group_id
+        LEFT JOIN (
+          SELECT group_id, COUNT(1) AS Count
+          FROM chat_items
+          WHERE user_id = ? AND group_id IS NOT NULL
+            AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+          GROUP BY group_id
+        ) ReportCount ON ReportCount.group_id = g.group_id
+       WHERE g.user_id = ? ORDER BY g.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id>?)
+MATERIALIZE ReportCount
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id>?)
+SEARCH g USING INDEX idx_groups_chat_ts (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+SEARCH ReportCount USING AUTOMATIC COVERING INDEX (group_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING INDEX idx_chat_items_groups_item_ts (user_id=? AND group_id=?)
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND (nf.favorite = 1
+                          OR nf.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND (nf.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND nf.chat_ts < ? ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND (nf.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    AND nf.chat_ts > ? ORDER BY nf.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND (nf.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+                    ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND nf.favorite = 1
+                    AND nf.chat_ts < ? ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND nf.favorite = 1
+                    AND nf.chat_ts > ? ORDER BY nf.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       
+                      WHERE nf.user_id = ?
+                        AND nf.favorite = 1
+                    ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       WHERE nf.user_id = ? AND nf.chat_ts < ? ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       WHERE nf.user_id = ? AND nf.chat_ts > ? ORDER BY nf.chat_ts ASC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT
+          nf.note_folder_id,
+          nf.chat_ts,
+          (
+            SELECT chat_item_id
+            FROM chat_items ci
+            WHERE ci.user_id = ? AND ci.note_folder_id = nf.note_folder_id
+            ORDER BY ci.created_at DESC
+            LIMIT 1
+          ) AS chat_item_id,
+          COALESCE(ChatStats.UnreadCount, 0),
+          COALESCE(ChatStats.MinUnread, 0),
+          nf.unread_chat
+        FROM note_folders nf
+        LEFT JOIN (
+          SELECT note_folder_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+          FROM chat_items
+          WHERE user_id = ? AND note_folder_id IS NOT NULL AND item_status = ?
+          GROUP BY note_folder_id
+        ) ChatStats ON ChatStats.note_folder_id = nf.note_folder_id
+       WHERE nf.user_id = ? ORDER BY nf.chat_ts DESC LIMIT ?
+Plan:
+MATERIALIZE ChatStats
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id>?)
+SEARCH nf USING INDEX note_folders_user_id (user_id=?)
+SEARCH ChatStats USING AUTOMATIC COVERING INDEX (note_folder_id=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH ci USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT COUNT(1)
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_status = ?
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=?)
+
+Query: 
+        SELECT COUNT(1)
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND item_status = ?
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id=? AND item_status=?)
+
+Query: 
+        SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+          c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+          c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+          c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+        FROM connections c
+        JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
+        WHERE c.user_id = ? AND uc.user_id = ? AND uc.group_id = ?
+      
+Plan:
+SEARCH uc USING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+          c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+          c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+          c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+        FROM connections c
+        JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
+        WHERE c.user_id = ? AND uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
+      
+Plan:
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH c USING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: 
+        SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+          c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+          c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+          c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version,
+          uc.user_contact_link_id, uc.conn_req_contact, uc.group_id
+        FROM connections c
+        JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
+        WHERE c.user_id = ? AND uc.user_id = ?
+      
+Plan:
+SEARCH c USING INDEX idx_connections_updated_at (user_id=?)
+SEARCH uc USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_item_messages
+        WHERE message_id IN (
+          SELECT message_id
+          FROM msg_deliveries
+          WHERE connection_id = ? AND agent_msg_id = ?
+        )
+      
+Plan:
+SEARCH chat_item_messages USING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+LIST SUBQUERY 1
+SEARCH msg_deliveries USING INDEX idx_msg_deliveries_agent_msg_id (connection_id=? AND agent_msg_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+          AND (created_at < ? OR (created_at = ? AND chat_item_id < ?))
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+          AND (created_at > ? OR (created_at = ? AND chat_item_id > ?))
+        ORDER BY created_at ASC, chat_item_id ASC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_sent = ? AND item_text LIKE ?
+        ORDER BY chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contact_id (contact_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_status = ?
+        ORDER BY created_at ASC, chat_item_id ASC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_text LIKE ?
+        ORDER BY chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contact_id (contact_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND shared_msg_id = ?
+        ORDER BY chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AND contact_id=? AND shared_msg_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND group_id = ? AND item_text like ?
+        ORDER BY chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_id (group_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+          AND (created_at < ? OR (created_at = ? AND chat_item_id < ?))
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+          AND (created_at > ? OR (created_at = ? AND chat_item_id > ?))
+        ORDER BY created_at ASC, chat_item_id ASC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND item_status = ?
+        ORDER BY created_at ASC, chat_item_id ASC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes (user_id=? AND note_folder_id=? AND item_status=?)
+
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND note_folder_id = ? AND item_text LIKE ?
+        ORDER BY chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING INDEX chat_items_note_folder_id (note_folder_id=?)
+
+Query: 
+        SELECT chat_item_id, contact_id, group_id, group_scope_tag, group_scope_group_member_id, timed_delete_at
+        FROM chat_items
+        WHERE user_id = ? AND timed_delete_at IS NOT NULL AND timed_delete_at <= ?
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_timed_delete_at (user_id=? AND timed_delete_at>? AND timed_delete_at<?)
+
+Query: 
+        SELECT chat_item_version_id, msg_content, item_version_ts, created_at
+        FROM chat_item_versions
+        WHERE chat_item_id = ?
+        ORDER BY chat_item_version_id DESC
+      
+Plan:
+SEARCH chat_item_versions USING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+
+Query: 
+        SELECT command_id, connection_id, command_function, command_status
+        FROM commands
+        WHERE user_id = ? AND command_id = ?
+      
+Plan:
+SEARCH commands USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content, group_id, group_link_member_role
+        FROM user_contact_links
+        WHERE user_id = ? AND user_contact_link_id = ?
+      
+Plan:
+SEARCH user_contact_links USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT connection_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, group_link_id, custom_user_profile_id,
+          conn_status, conn_type, contact_conn_initiated, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id,
+          created_at, security_code, security_code_verified_at, pq_support, pq_encryption, pq_snd_enabled, pq_rcv_enabled, auth_err_counter, quota_err_counter,
+          conn_chat_version, peer_chat_min_version, peer_chat_max_version
+        FROM connections
+        WHERE user_id = ? AND connection_id = ?
+      
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
+        FROM connections
+        WHERE user_id = ?
+          AND conn_type = ?
+          AND contact_id IS NULL
+      
+Plan:
+SEARCH connections USING INDEX idx_connections_updated_at (user_id=?)
+
+Query: 
+        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, short_link_inv, local_alias, created_at, updated_at
+        FROM connections
+        WHERE user_id = ?
+          AND connection_id = ?
+          AND conn_type = ?
+          AND contact_id IS NULL
+          AND conn_level = 0
+          AND via_contact IS NULL
+      
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, cp.preferences -- , ct.user_preferences
+        FROM contact_profiles cp
+        WHERE cp.user_id = ? AND cp.contact_profile_id = ?
+      
+Plan:
+SEARCH cp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT ct.contact_id
+        FROM contacts ct
+        JOIN contact_profiles p ON ct.contact_profile_id = p.contact_profile_id
+        WHERE ct.user_id = ?
+          AND ct.contact_status = ? AND ct.deleted = 0 AND ct.is_user = 0
+          AND p.display_name = ? AND p.full_name = ?
+       AND p.image = ?
+Plan:
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT ct.contact_id
+        FROM contacts ct
+        JOIN contact_profiles p ON ct.contact_profile_id = p.contact_profile_id
+        WHERE ct.user_id = ?
+          AND ct.contact_status = ? AND ct.deleted = 0 AND ct.is_user = 0
+          AND p.display_name = ? AND p.full_name = ?
+       AND p.image is NULL
+Plan:
+SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT d.file_descr_id, d.file_descr_text, d.file_descr_part_no, d.file_descr_complete
+        FROM xftp_file_descriptions d
+        JOIN rcv_files f ON f.file_descr_id = d.file_descr_id
+        WHERE f.file_id = ?
+        LIMIT 1
+      
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH d USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT d.file_descr_id, d.file_descr_text, d.file_descr_part_no, d.file_descr_complete
+        FROM xftp_file_descriptions d
+        JOIN snd_files f ON f.file_descr_id = d.file_descr_id
+        WHERE f.file_id = ?
+        LIMIT 1
+      
+Plan:
+SEARCH f USING PRIMARY KEY (file_id=?)
+SEARCH d USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT display_name, full_name, image, contact_link, preferences
+        FROM contact_profiles
+        WHERE user_id = ?
+      
+Plan:
+SEARCH contact_profiles USING INDEX idx_contact_profiles_user_id (user_id=?)
+
+Query: 
+        SELECT f.file_id
+        FROM files f
+        JOIN chat_items i ON i.chat_item_id = f.chat_item_id
+        WHERE i.user_id = ? AND i.contact_id = ? AND i.shared_msg_id = ?
+      
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AND contact_id=? AND shared_msg_id=?)
+SEARCH f USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+        SELECT f.file_id
+        FROM files f
+        JOIN chat_items i ON i.chat_item_id = f.chat_item_id
+        WHERE i.user_id = ? AND i.group_id = ? AND i.shared_msg_id = ?
+      
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=?)
+SEARCH f USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+        SELECT file_id, contact_id, group_id, note_folder_id
+        FROM files
+        WHERE agent_snd_file_id = ?
+      
+Plan:
+SCAN files
+
+Query: 
+        SELECT file_name, file_size, chunk_size, file_path, file_crypto_key, file_crypto_nonce, file_inline, agent_snd_file_id, agent_snd_file_deleted, private_snd_file_descr, cancelled, redirect_file_id
+        FROM files
+        WHERE user_id = ? AND file_id = ?
+      
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT group_member_id, group_snd_item_status, via_proxy
+        FROM group_snd_item_statuses
+        WHERE chat_item_id = ?
+      
+Plan:
+SEARCH group_snd_item_statuses USING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=?)
+
+Query: 
+        SELECT group_member_id, reaction_ts
+        FROM chat_item_reactions
+        WHERE group_id = ? AND shared_msg_id = ? AND reaction = ?
+      
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_group (group_id=? AND shared_msg_id=?)
+
+Query: 
+        SELECT group_member_intro_id, group_queue_info, direct_queue_info, intro_status
+        FROM group_member_intros
+        WHERE re_group_member_id = ? AND to_group_member_id = ?
+      
+Plan:
+SEARCH group_member_intros USING INDEX sqlite_autoindex_group_member_intros_1 (re_group_member_id=? AND to_group_member_id=?)
+
+Query: 
+        SELECT group_scope_tag, group_scope_group_member_id
+        FROM chat_items
+        WHERE chat_item_id = ?
+      
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT group_snd_item_status
+        FROM group_snd_item_statuses
+        WHERE chat_item_id = ? AND group_member_id = ?
+        LIMIT 1
+      
+Plan:
+SEARCH group_snd_item_statuses USING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=? AND group_member_id=?)
+
+Query: 
+        SELECT i.shared_msg_id
+        FROM chat_items i
+        JOIN files f ON f.chat_item_id = i.chat_item_id
+        WHERE f.user_id = ? AND f.file_id = ?
+      
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT m.group_member_id
+        FROM group_members m
+        JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+        WHERE m.user_id = ? AND m.contact_id IS NULL
+          AND m.member_category != ?
+          AND p.display_name = ? AND p.full_name = ?
+       AND p.image = ?
+Plan:
+SEARCH m USING INDEX idx_group_members_user_id (user_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT m.group_member_id
+        FROM group_members m
+        JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+        WHERE m.user_id = ? AND m.contact_id IS NULL
+          AND m.member_category != ?
+          AND p.display_name = ? AND p.full_name = ?
+       AND p.image is NULL
+Plan:
+SEARCH m USING INDEX idx_group_members_user_id (user_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT pgm.message_id, m.shared_msg_id, m.msg_body, m.chat_msg_event, pgm.group_member_intro_id
+        FROM pending_group_messages pgm
+        JOIN messages m USING (message_id)
+        WHERE pgm.group_member_id = ?
+        ORDER BY pgm.created_at ASC, pgm.message_id ASC
+      
+Plan:
+SEARCH pgm USING INDEX idx_pending_group_messages_group_member_id (group_member_id=?)
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT r.contact_id, g.group_id, r.group_member_id
+        FROM received_probes r
+        LEFT JOIN contacts c ON r.contact_id = c.contact_id AND c.deleted = 0
+        LEFT JOIN group_members m ON r.group_member_id = m.group_member_id
+        LEFT JOIN groups g ON g.group_id = m.group_id
+        WHERE r.user_id = ? AND r.probe_hash = ? AND r.probe IS NULL
+      
+Plan:
+SEARCH r USING INDEX idx_received_probes_user_id (user_id=?)
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+        SELECT r.display_name, r.member_id, m.group_member_id, m.member_role, p.display_name, p.local_alias
+        FROM chat_item_mentions r
+        LEFT JOIN group_members m ON r.group_id = m.group_id AND r.member_id = m.member_id
+        LEFT JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) 
+        WHERE r.chat_item_id = ?
+      
+Plan:
+SEARCH r USING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?) LEFT-JOIN
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+        SELECT re_group_member_id
+        FROM group_member_intros
+        WHERE to_group_member_id = ? AND intro_status NOT IN (?,?,?)
+       AND intro_chat_protocol_version >= ?
+Plan:
+SEARCH group_member_intros USING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?)
+
+Query: 
+        SELECT reaction
+        FROM chat_item_reactions
+        WHERE contact_id = ? AND shared_msg_id = ? AND reaction_sent = ?
+      
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_contact (contact_id=? AND shared_msg_id=?)
+
+Query: 
+        SELECT reaction
+        FROM chat_item_reactions
+        WHERE group_id = ? AND group_member_id = ? AND item_member_id = ? AND shared_msg_id = ? AND reaction_sent = ?
+      
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_group (group_id=? AND shared_msg_id=?)
+
+Query: 
+        SELECT reaction, MAX(reaction_sent), COUNT(chat_item_reaction_id)
+        FROM chat_item_reactions
+        WHERE contact_id = ? AND shared_msg_id = ?
+        GROUP BY reaction
+      
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_contact (contact_id=? AND shared_msg_id=?)
+USE TEMP B-TREE FOR GROUP BY
+
+Query: 
+        SELECT reaction, MAX(reaction_sent), COUNT(chat_item_reaction_id)
+        FROM chat_item_reactions
+        WHERE group_id = ? AND item_member_id = ? AND shared_msg_id = ?
+        GROUP BY reaction
+      
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_group (group_id=? AND shared_msg_id=?)
+USE TEMP B-TREE FOR GROUP BY
+
+Query: 
+        SELECT rf.file_id, f.contact_id, f.group_id, f.note_folder_id
+        FROM rcv_files rf
+        JOIN files f ON f.file_id = rf.file_id
+        WHERE rf.agent_rcv_file_id = ?
+      
+Plan:
+SCAN rf
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        SELECT s.file_id, s.file_status, f.file_name, f.file_size, f.chunk_size, f.file_path, s.file_descr_id, s.file_inline, s.group_member_id, c.local_display_name, m.local_display_name
+        FROM msg_deliveries d
+        JOIN snd_files s ON s.connection_id = d.connection_id AND s.last_inline_msg_delivery_id = d.msg_delivery_id
+        JOIN files f ON f.file_id = s.file_id
+        LEFT JOIN contacts c USING (contact_id)
+        LEFT JOIN group_members m USING (group_member_id)
+        WHERE d.connection_id = ? AND d.agent_msg_id = ? AND f.user_id = ?
+          AND (s.file_descr_id IS NOT NULL OR s.file_inline IS NOT NULL)
+      
+Plan:
+SEARCH d USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=? AND agent_msg_id=?)
+SEARCH s USING INDEX idx_snd_files_last_inline_msg_delivery_id (last_inline_msg_delivery_id=?)
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+        SELECT s.file_status, f.file_name, f.file_size, f.chunk_size, f.file_path, s.file_descr_id, s.file_inline, s.connection_id, c.agent_conn_id, s.group_member_id,
+          cs.local_display_name, m.local_display_name
+        FROM snd_files s
+        JOIN files f USING (file_id)
+        JOIN connections c USING (connection_id)
+        LEFT JOIN contacts cs ON cs.contact_id = f.contact_id
+        LEFT JOIN group_members m ON m.group_member_id = s.group_member_id
+        WHERE f.user_id = ? AND f.file_id = ?
+      
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING PRIMARY KEY (file_id=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH cs USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+        SELECT smp_server_id, host, port, key_hash, basic_auth, preset, tested, enabled
+        FROM protocol_servers
+        WHERE user_id = ? AND protocol = ?
+      
+Plan:
+SEARCH protocol_servers USING INDEX idx_smp_servers_user_id (user_id=?)
+
+Query: 
+        SELECT to_group_member_id
+        FROM group_member_intros
+        WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?)
+       AND intro_chat_protocol_version >= ?
+Plan:
+SEARCH group_member_intros USING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?)
+
+Query: 
+        SELECT usage_conditions_id, conditions_commit, notified_at, created_at
+        FROM usage_conditions
+        WHERE conditions_commit = (
+          SELECT conditions_commit
+          FROM operator_usage_conditions
+          ORDER BY accepted_at DESC
+          LIMIT 1
+        )
+      
+Plan:
+SEARCH usage_conditions USING INDEX sqlite_autoindex_usage_conditions_1 (conditions_commit=?)
+SCALAR SUBQUERY 1
+SCAN operator_usage_conditions
+USE TEMP B-TREE FOR ORDER BY
+
+Query: 
+        SELECT usage_conditions_id, conditions_commit, notified_at, created_at
+        FROM usage_conditions
+        WHERE usage_conditions_id = ?
+      
+Plan:
+SEARCH usage_conditions USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = 1, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, item_content = ?, item_text = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+       AND group_member_id = ? RETURNING chat_item_id
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = 1, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, item_content = ?, item_text = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+       AND group_member_id IS NULL AND item_sent = 1 RETURNING chat_item_id
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = 1, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, item_content = ?, item_text = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+      
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+       AND group_member_id = ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ?
+       AND group_member_id IS NULL AND item_sent = 1
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+        RETURNING chat_item_id
+      
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id=? AND msg_content_tag=? AND item_deleted=? AND item_sent=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND quoted_shared_msg_id = ? AND item_deleted = ?
+        RETURNING chat_item_id;
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id=? AND msg_content_tag=? AND item_deleted=?)
+
+Query: 
+        UPDATE chat_items
+        SET item_deleted = ?, item_deleted_ts = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+      
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        UPDATE group_member_intros
+        SET intro_status = ?,
+            group_queue_info = ?,
+            direct_queue_info = ?,
+            updated_at = ?
+        WHERE group_member_intro_id = ?
+      
+Plan:
+SEARCH group_member_intros USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+        UPDATE group_members
+        SET contact_id = ?, local_display_name = ?, contact_profile_id = ?, updated_at = ?
+        WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+      
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM chat_items
+      WHERE group_scope_group_member_id = ?
+    
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: 
+      DELETE FROM chat_items
+      WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: 
+      DELETE FROM chat_items
+      WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: 
+      DELETE FROM chat_items
+      WHERE user_id = ? AND note_folder_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: 
+      DELETE FROM connections
+        WHERE user_id = ?
+          AND connection_id = ?
+          AND conn_type = ?
+          AND contact_id IS NULL
+          AND conn_level = 0
+          AND via_contact IS NULL
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: 
+      DELETE FROM connections WHERE connection_id IN (
+        SELECT connection_id
+        FROM connections c
+        JOIN contacts ct ON ct.contact_id = c.contact_id
+        WHERE ct.user_id = ? AND ct.contact_id = ?
+      )
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING COVERING INDEX idx_connections_contact_id (contact_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: 
+      DELETE FROM connections WHERE connection_id IN (
+        SELECT connection_id
+        FROM connections c
+        JOIN user_contact_links uc USING (user_contact_link_id)
+        WHERE uc.user_id = ? AND uc.group_id = ?
+      )
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH c USING COVERING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: 
+      DELETE FROM connections WHERE connection_id IN (
+        SELECT connection_id
+        FROM connections c
+        JOIN user_contact_links uc USING (user_contact_link_id)
+        WHERE uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
+      )
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH c USING COVERING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE
+        user_id = ?
+        AND (contact_profile_id IN (SELECT contact_profile_id FROM temp_delete_members)
+          OR contact_profile_id IN (SELECT member_profile_id FROM temp_delete_members WHERE member_profile_id IS NOT NULL))
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM group_members)
+        AND contact_profile_id NOT IN (SELECT member_profile_id FROM group_members)
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contacts)
+        AND contact_profile_id NOT IN (SELECT contact_profile_id FROM contact_requests)
+        AND contact_profile_id NOT IN (SELECT custom_user_profile_id FROM connections)
+    
+Plan:
+SEARCH contact_profiles USING COVERING INDEX idx_contact_profiles_user_id (user_id=?)
+LIST SUBQUERY 1
+SCAN temp_delete_members
+LIST SUBQUERY 2
+SCAN temp_delete_members
+USING INDEX idx_group_members_contact_profile_id FOR IN-OPERATOR
+USING INDEX idx_group_members_member_profile_id FOR IN-OPERATOR
+USING INDEX idx_contacts_contact_profile_id FOR IN-OPERATOR
+USING INDEX idx_contact_requests_contact_profile_id FOR IN-OPERATOR
+USING INDEX idx_connections_custom_user_profile_id FOR IN-OPERATOR
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE contact_profile_id in (
+        SELECT contact_profile_id
+        FROM contact_requests
+        WHERE user_id = ? AND contact_request_id = ?
+      )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE contact_profile_id in (
+        SELECT contact_profile_id
+        FROM contacts
+        WHERE user_id = ? AND contact_id = ?
+      )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE contact_profile_id in (
+        SELECT cr.contact_profile_id
+        FROM contact_requests cr
+        JOIN user_contact_links uc USING (user_contact_link_id)
+        WHERE uc.user_id = ? AND uc.group_id = ?
+      )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH cr USING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE contact_profile_id in (
+        SELECT cr.contact_profile_id
+        FROM contact_requests cr
+        JOIN user_contact_links uc USING (user_contact_link_id)
+        WHERE uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
+      )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH cr USING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE user_id = ? AND contact_profile_id = ?
+        AND 1 NOT IN (
+          SELECT 1 FROM connections
+          WHERE user_id = ? AND custom_user_profile_id = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM contacts
+          WHERE user_id = ? AND contact_profile_id = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM contact_requests
+          WHERE user_id = ? AND contact_profile_id = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM group_members
+          WHERE user_id = ?
+            AND (member_profile_id = ? OR contact_profile_id = ?)
+          LIMIT 1
+        )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH connections USING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+LIST SUBQUERY 2
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_2 (user_id=? AND contact_profile_id=?)
+LIST SUBQUERY 3
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_2 (user_id=? AND contact_profile_id=?)
+LIST SUBQUERY 4
+SEARCH group_members USING INDEX idx_group_members_user_id (user_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE user_id = ? AND contact_profile_id = ? AND incognito = 1
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM contact_profiles
+      WHERE user_id = ? AND contact_profile_id = ? AND incognito = 1
+        AND 1 NOT IN (
+          SELECT 1 FROM connections
+          WHERE user_id = ? AND custom_user_profile_id = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM group_members
+          WHERE user_id = ? AND member_profile_id = ? LIMIT 1
+        )
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH connections USING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+LIST SUBQUERY 2
+SEARCH group_members USING INDEX idx_group_members_user_id (user_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE
+        user_id = ?
+        AND local_display_name IN (SELECT local_display_name FROM temp_delete_members)
+        AND local_display_name NOT IN (SELECT local_display_name FROM group_members)
+        AND local_display_name NOT IN (SELECT local_display_name FROM contacts)
+        AND local_display_name NOT IN (SELECT local_display_name FROM users)
+        AND local_display_name NOT IN (SELECT local_display_name FROM groups)
+        AND local_display_name NOT IN (SELECT local_display_name FROM user_contact_links)
+        AND local_display_name NOT IN (SELECT local_display_name FROM contact_requests)
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+LIST SUBQUERY 1
+SCAN temp_delete_members
+LIST SUBQUERY 2
+SCAN group_members USING COVERING INDEX idx_group_members_user_id_local_display_name
+LIST SUBQUERY 3
+SCAN contacts USING COVERING INDEX sqlite_autoindex_contacts_1
+USING INDEX sqlite_autoindex_users_2 FOR IN-OPERATOR
+LIST SUBQUERY 5
+SCAN groups USING COVERING INDEX sqlite_autoindex_groups_1
+LIST SUBQUERY 6
+SCAN user_contact_links USING COVERING INDEX sqlite_autoindex_user_contact_links_1
+LIST SUBQUERY 7
+SCAN contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE user_id = ?
+        AND local_display_name in (
+          SELECT cr.local_display_name
+          FROM contact_requests cr
+          JOIN user_contact_links uc USING (user_contact_link_id)
+          WHERE uc.user_id = ? AND uc.group_id = ?
+        )
+        AND local_display_name NOT IN (SELECT local_display_name FROM users WHERE user_id = ?)
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH cr USING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+LIST SUBQUERY 2
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE user_id = ?
+        AND local_display_name in (
+          SELECT cr.local_display_name
+          FROM contact_requests cr
+          JOIN user_contact_links uc USING (user_contact_link_id)
+          WHERE uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
+        )
+        AND local_display_name NOT IN (SELECT local_display_name FROM users WHERE user_id = ?)
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+LIST SUBQUERY 1
+SEARCH uc USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH cr USING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+LIST SUBQUERY 2
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE user_id = ? AND local_display_name = (
+        SELECT local_display_name FROM contact_requests
+        WHERE user_id = ? AND contact_request_id = ?
+      )
+      AND local_display_name NOT IN (SELECT local_display_name FROM users WHERE user_id = ?)
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+SCALAR SUBQUERY 1
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 2
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE user_id = ? AND local_display_name = ?
+        AND 1 NOT IN (
+          SELECT 1 FROM users
+          WHERE local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM contacts
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM groups
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM group_members
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM user_contact_links
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM contact_requests
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+        AND 1 NOT IN (
+          SELECT 1 FROM contact_requests
+          WHERE user_id = ? AND local_display_name = ? LIMIT 1
+        )
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+LIST SUBQUERY 1
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_2 (local_display_name=?)
+LIST SUBQUERY 2
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+LIST SUBQUERY 3
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+LIST SUBQUERY 4
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+LIST SUBQUERY 5
+SEARCH user_contact_links USING COVERING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+LIST SUBQUERY 6
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+LIST SUBQUERY 7
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM display_names
+      WHERE user_id = ? AND local_display_name = ?
+        AND local_display_name NOT IN (SELECT local_display_name FROM users WHERE user_id = ?)
+    
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+LIST SUBQUERY 1
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      DELETE FROM files
+      WHERE user_id = ?
+        AND chat_item_id IN (
+          SELECT chat_item_id FROM chat_items WHERE user_id = ? AND note_folder_id = ?
+        )
+    
+Plan:
+SEARCH files USING INDEX idx_files_user_id (user_id=?)
+LIST SUBQUERY 1
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+SEARCH extra_xftp_file_descriptions USING COVERING INDEX idx_extra_xftp_file_descriptions_file_id (file_id=?)
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_file_id (file_id=?)
+SEARCH files USING COVERING INDEX idx_files_redirect_file_id (redirect_file_id=?)
+
+Query: 
+      DELETE FROM group_profiles
+      WHERE group_profile_id in (
+        SELECT group_profile_id
+        FROM groups
+        WHERE user_id = ? AND group_id = ?
+      )
+    
+Plan:
+SEARCH group_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH groups USING COVERING INDEX idx_groups_group_profile_id (group_profile_id=?)
+
+Query: 
+      INSERT INTO calls
+        (contact_id, shared_call_id, call_uuid, chat_item_id, call_state, call_ts, user_id, created_at, updated_at)
+      VALUES (?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO chat_item_moderations
+        (group_id, moderator_member_id, item_member_id, shared_msg_id, created_by_msg_id, moderated_at)
+        VALUES (?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO chat_item_versions (chat_item_id, msg_content, item_version_ts)
+      VALUES (?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO chat_items (
+        -- user and IDs
+        user_id, created_by_msg_id, contact_id, group_id, group_member_id, note_folder_id, group_scope_tag, group_scope_group_member_id,
+        -- meta
+        item_sent, item_ts, item_content, item_content_tag, item_text, item_status, msg_content_tag, shared_msg_id,
+        forwarded_by_group_member_id, include_in_history, created_at, updated_at, item_live, user_mention, timed_ttl, timed_delete_at,
+        -- quote
+        quoted_shared_msg_id, quoted_sent_at, quoted_content, quoted_sent, quoted_member_id,
+        -- forwarded from
+        fwd_from_tag, fwd_from_chat_name, fwd_from_msg_dir, fwd_from_contact_id, fwd_from_group_id, fwd_from_chat_item_id
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO commands (connection_id, command_function, command_status, user_id, created_at, updated_at)
+      VALUES (?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO connections
+        (user_id, agent_conn_id, conn_req_inv, short_link_inv, conn_status, conn_type, contact_conn_initiated, custom_user_profile_id,
+         created_at, updated_at, to_subscribe, conn_chat_version, pq_support, pq_encryption)
+      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO connections (
+        user_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, custom_user_profile_id, conn_status, conn_type,
+        contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, updated_at,
+        conn_chat_version, peer_chat_min_version, peer_chat_max_version, to_subscribe, pq_support, pq_encryption
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO connections (
+        user_id, agent_conn_id, conn_status, conn_type, contact_conn_initiated,
+        via_contact_uri_hash, via_short_link_contact, xcontact_id, custom_user_profile_id, via_group_link, group_link_id,
+        created_at, updated_at, to_subscribe, conn_chat_version, pq_support, pq_encryption
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO contact_profiles (display_name, full_name, image, user_id, incognito, created_at, updated_at)
+      VALUES (?,?,?,?,?,?,?)
+    
+Plan:
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+
+Query: 
+      INSERT INTO files
+        ( user_id, note_folder_id,
+          file_name, file_path, file_size,
+          file_crypto_key, file_crypto_nonce,
+          chunk_size, file_inline, ci_file_status, protocol, created_at, updated_at
+        )
+      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO msg_deliveries
+        (message_id, connection_id, agent_msg_id, chat_ts, created_at, updated_at, delivery_status)
+      VALUES (?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO pending_group_messages
+        (group_member_id, message_id, group_member_intro_id, created_at, updated_at) VALUES (?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO protocol_servers
+        (protocol, host, port, key_hash, basic_auth, preset, tested, enabled, user_id, created_at, updated_at)
+      VALUES (?,?,?,?,?,?,?,?,?,?,?)
+    
+Plan:
+
+Query: 
+      INSERT INTO remote_controllers
+        (ctrl_device_name, ca_key, ca_cert, ctrl_fingerprint, id_pub, dh_priv_key, prev_dh_priv_key)
+      VALUES
+        (?, ?, ?, ?, ?, ?, ?)
+    
+Plan:
+
+Query: 
+      INSERT INTO temp_delete_members (contact_profile_id, member_profile_id, local_display_name)
+      SELECT contact_profile_id, member_profile_id, local_display_name FROM group_members WHERE group_id = ?
+    
+Plan:
+SEARCH group_members USING INDEX sqlite_autoindex_group_members_1 (group_id=?)
+
+Query: 
+      SELECT chat_item_id, timed_ttl
+      FROM chat_items
+      WHERE user_id = ? AND contact_id = ? AND item_status = ? AND timed_ttl IS NOT NULL AND timed_delete_at IS NULL
+    
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=?)
+
+Query: 
+      SELECT chat_item_id, timed_ttl
+      FROM chat_items
+      WHERE user_id = ? AND group_id = ? AND item_status = ? AND timed_ttl IS NOT NULL AND timed_delete_at IS NULL
+    
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id=? AND item_status=?)
+
+Query: 
+      SELECT group_snd_item_status, COUNT(1)
+      FROM group_snd_item_statuses
+      WHERE chat_item_id = ?
+      GROUP BY group_snd_item_status
+    
+Plan:
+SEARCH group_snd_item_statuses USING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=?)
+USE TEMP B-TREE FOR GROUP BY
+
+Query: 
+      SELECT s.file_id, r.file_id, f.protocol
+      FROM files f
+      LEFT JOIN snd_files s ON s.file_id = f.file_id
+      LEFT JOIN rcv_files r ON r.file_id = f.file_id
+      WHERE user_id = ? AND f.file_id = ?
+    
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH s USING COVERING INDEX idx_snd_files_file_id (file_id=?) LEFT-JOIN
+SEARCH r USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+
+Query: 
+      UPDATE chat_items
+      SET item_content = ?, item_text = ?, item_status = ?, item_deleted = ?, item_deleted_ts = ?, item_edited = ?, item_live = ?, updated_at = ?, timed_ttl = ?, timed_delete_at = ?
+      WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items
+      SET item_content = ?, item_text = ?, item_status = ?, item_deleted = ?, item_deleted_ts = ?, item_edited = ?, item_live = ?, updated_at = ?, timed_ttl = ?, timed_delete_at = ?
+      WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items
+      SET item_content = ?, item_text = ?, item_status = ?, item_deleted = ?, item_deleted_ts = ?, item_edited = ?, updated_at = ?
+      WHERE user_id = ? AND note_folder_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items
+      SET item_deleted = ?, item_deleted_ts = ?, item_deleted_by_group_member_id = ?, updated_at = ?
+      WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items
+      SET item_deleted = ?, item_deleted_ts = ?, updated_at = ?
+      WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items
+      SET item_deleted = ?, item_deleted_ts = ?, updated_at = ?
+      WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items SET item_status = ?, updated_at = ?
+      WHERE user_id = ? AND contact_id = ? AND item_status = ?
+    
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts (user_id=? AND contact_id=? AND item_status=?)
+
+Query: 
+      UPDATE chat_items SET item_status = ?, updated_at = ?
+      WHERE user_id = ? AND contact_id = ? AND item_status = ? AND chat_item_id = ?
+    
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE chat_items SET item_status = ?, updated_at = ?
+      WHERE user_id = ? AND group_id = ? AND item_status = ?
+    
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id=? AND item_status=?)
+
+Query: 
+      UPDATE chat_items SET item_status = ?, updated_at = ?
+      WHERE user_id = ? AND note_folder_id = ? AND item_status = ?
+    
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_notes (user_id=? AND note_folder_id=? AND item_status=?)
+
+Query: 
+      UPDATE commands
+      SET connection_id = ?, updated_at = ?
+      WHERE user_id = ? AND command_id = ?
+    
+Plan:
+SEARCH commands USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET conn_chat_version = ?, peer_chat_min_version = ?, peer_chat_max_version = ?
+      WHERE connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET conn_req_inv = ?, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET contact_conn_initiated = 0, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET custom_user_profile_id = ?, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET local_alias = ?, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET pq_rcv_enabled = ?
+      WHERE connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET pq_snd_enabled = ?
+      WHERE connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET pq_snd_enabled = ?, pq_rcv_enabled = ?
+      WHERE connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET pq_support = ?, pq_encryption = ?
+      WHERE connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE connections
+      SET user_id = ?, custom_user_profile_id = NULL, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contact_profiles
+      SET contact_link = ?, updated_at = ?
+      WHERE user_id = ? AND contact_profile_id = ?
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contact_profiles
+      SET display_name = ?, full_name = ?, image = ?, contact_link = ?, preferences = ?, updated_at = ?
+      WHERE user_id = ? AND contact_profile_id = ?
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contact_profiles
+      SET display_name = ?, full_name = ?, image = ?, contact_link = NULL, preferences = NULL, updated_at = ?
+      WHERE user_id = ? AND contact_profile_id = ?
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contact_profiles
+      SET display_name = ?, full_name = ?, image = ?, updated_at = ?
+      WHERE user_id = ? AND contact_profile_id = ?
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contact_profiles
+      SET local_alias = ?, updated_at = ?
+      WHERE user_id = ? AND contact_profile_id = ?
+    
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contacts
+      SET contact_group_member_id = NULL, contact_grp_inv_sent = 0, updated_at = ?
+      WHERE contact_id = ?
+    
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE contacts
+      SET contact_status = ?, updated_at = ?
+      WHERE user_id = ? AND contact_id = ?
+    
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_member_intros
+      SET intro_status = ?, updated_at = ?
+      WHERE group_member_intro_id = ?
+    
+Plan:
+SEARCH group_member_intros USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET member_restriction = ?, updated_at = ?
+      WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET member_status = ?,
+          group_queue_info = ?,
+          direct_queue_info = ?,
+          updated_at = ?
+      WHERE group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET member_status = ?, member_role = ?, updated_at = ?
+      WHERE user_id = ? AND group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET member_status = ?, updated_at = ?
+      WHERE user_id = ? AND group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET show_messages = ?, updated_at = ?
+      WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_members
+      SET support_chat_ts = NULL,
+          support_chat_items_unread = 0,
+          support_chat_items_member_attention = 0,
+          support_chat_items_mentions = 0,
+          support_chat_last_msg_from_member_ts = NULL,
+          updated_at = ?
+      WHERE group_member_id = ?
+    
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_profiles
+      SET preferences = ?, updated_at = ?
+      WHERE group_profile_id IN (
+        SELECT group_profile_id
+        FROM groups
+        WHERE user_id = ? AND group_id = ?
+      )
+    
+Plan:
+SEARCH group_profiles USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE group_snd_item_statuses
+      SET group_snd_item_status = ?, updated_at = ?
+      WHERE chat_item_id = ? AND group_member_id  = ?
+    
+Plan:
+SEARCH group_snd_item_statuses USING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=? AND group_member_id=?)
+
+Query: 
+      UPDATE group_snd_item_statuses
+      SET via_proxy = ?
+      WHERE chat_item_id = ? AND group_member_id  = ?
+    
+Plan:
+SEARCH group_snd_item_statuses USING INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id (chat_item_id=? AND group_member_id=?)
+
+Query: 
+      UPDATE groups
+      SET members_require_attention = members_require_attention + 1
+      WHERE user_id = ? AND group_id = ?
+    
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE groups
+      SET members_require_attention = members_require_attention - 1
+      WHERE user_id = ? AND group_id = ?
+    
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE groups
+      SET via_group_link_uri_hash = (SELECT via_contact_uri_hash FROM connections WHERE connection_id = ?)
+      WHERE group_id = ?
+    
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+SCALAR SUBQUERY 1
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE msg_deliveries
+      SET delivery_status = ?, updated_at = ?
+      WHERE connection_id = ? AND agent_msg_id = ?
+    
+Plan:
+SEARCH msg_deliveries USING INDEX idx_msg_deliveries_agent_msg_id (connection_id=? AND agent_msg_id=?)
+
+Query: 
+      UPDATE protocol_servers
+      SET protocol = ?, host = ?, port = ?, key_hash = ?, basic_auth = ?,
+          preset = ?, tested = ?, enabled = ?, updated_at = ?
+      WHERE smp_server_id = ?
+    
+Plan:
+SEARCH protocol_servers USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE rcv_files
+      SET to_receive = 1, user_approved_relays = ?, updated_at = ?
+      WHERE file_id = ?
+    
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE remote_controllers
+      SET ctrl_device_name = ?, dh_priv_key = ?, prev_dh_priv_key = dh_priv_key
+      WHERE remote_ctrl_id = ?
+    
+Plan:
+SEARCH remote_controllers USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE remote_hosts
+      SET host_device_name = ?, host_dh_pub = ?, bind_addr = ?, bind_iface = ?, bind_port = ?
+      WHERE remote_host_id = ?
+    
+Plan:
+SEARCH remote_hosts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE server_operators
+      SET enabled = ?, smp_role_storage = ?, smp_role_proxy = ?, xftp_role_storage = ?, xftp_role_proxy = ?, updated_at = ?
+      WHERE server_operator_id = ?
+    
+Plan:
+SEARCH server_operators USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE users
+      SET view_pwd_hash = ?, view_pwd_salt = ?, show_ntfs = ?
+      WHERE user_id = ?
+    
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+      UPDATE xftp_file_descriptions
+      SET file_descr_text = ?, file_descr_part_no = ?, file_descr_complete = ?, updated_at = ?
+      WHERE user_id = ? AND file_descr_id = ?
+    
+Plan:
+SEARCH xftp_file_descriptions USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    DELETE FROM messages
+    WHERE message_id IN (
+      SELECT message_id
+      FROM chat_item_messages
+      WHERE chat_item_id = ?
+    )
+  
+Plan:
+SEARCH messages USING INTEGER PRIMARY KEY (rowid=?)
+LIST SUBQUERY 1
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
+
+Query: 
+    SELECT
+      -- GroupInfo
+      g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+      g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+      g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
+      -- GroupMember - membership
+      mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
+      mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
+      pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      mu.created_at, mu.updated_at,
+      mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
+    FROM groups g
+    JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
+    JOIN group_members mu ON mu.group_id = g.group_id
+    JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
+   WHERE g.business_xcontact_id = ? AND g.user_id = ? AND mu.contact_id = ?
+Plan:
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH pu USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT
+      -- GroupInfo
+      g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+      g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+      g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
+      -- GroupMember - membership
+      mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
+      mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
+      pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      mu.created_at, mu.updated_at,
+      mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
+    FROM groups g
+    JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
+    JOIN group_members mu ON mu.group_id = g.group_id
+    JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
+   WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH gp USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH mu USING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH pu USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+  
+                WHERE m.group_id = ? AND m.user_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)
+                  AND m.member_status IN (?, ?, ?, ?)
+                  AND m.group_member_id NOT IN (
+                    SELECT DISTINCT group_member_id FROM chat_items
+                  )
+              
+Plan:
+SEARCH m USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+LIST SUBQUERY 2
+SCAN chat_items USING COVERING INDEX idx_chat_items_group_member_id
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+   WHERE m.group_id = ? AND m.group_member_id = ? AND m.user_id = ?
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+   WHERE m.group_id = ? AND m.member_id = ?
+Plan:
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+   WHERE m.group_member_id = ? AND m.user_id = ?
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+   WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)
+Plan:
+SEARCH m USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT
+      m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.created_at, m.updated_at,
+      m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
+      c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
+      c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id,
+      c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter,
+      c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+    LEFT JOIN connections c ON c.connection_id = (
+      SELECT max(cc.connection_id)
+      FROM connections cc
+      WHERE cc.user_id = ? AND cc.group_member_id = m.group_member_id
+    )
+   WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?)
+Plan:
+SEARCH m USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH c USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+CORRELATED SCALAR SUBQUERY 1
+SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: 
+    SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
+    FROM user_contact_links
+   WHERE user_id = ? AND conn_req_contact IN (?,?)
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=?)
+
+Query: 
+    SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
+    FROM user_contact_links
+   WHERE user_id = ? AND local_display_name = '' AND group_id IS NULL
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+
+Query: 
+    SELECT conn_req_contact, short_link_contact, auto_accept, business_address, auto_accept_incognito, auto_reply_msg_content
+    FROM user_contact_links
+   WHERE user_id = ? AND short_link_contact = ?
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ? AND i.contact_id = ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ? AND i.contact_id = ? AND i.created_at <= ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=? AND created_at<?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ? AND i.group_id = ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ? AND i.group_id = ? AND i.group_member_id = ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT f.file_id, f.ci_file_status, f.file_path
+    FROM chat_items i
+    JOIN files f ON f.chat_item_id = i.chat_item_id
+   WHERE i.user_id = ? AND i.note_folder_id = ?
+Plan:
+SEARCH i USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+SEARCH f USING INDEX idx_files_chat_item_id (chat_item_id=?)
+
+Query: 
+    SELECT m.group_member_id, m.member_id, m.member_role, p.display_name, p.local_alias
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+   WHERE m.group_id = ? AND m.group_member_id = ? AND m.user_id = ?
+Plan:
+SEARCH m USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT m.group_member_id, m.member_id, m.member_role, p.display_name, p.local_alias
+    FROM group_members m
+    JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
+   WHERE m.group_id = ? AND m.member_id = ? AND m.user_id = ?
+Plan:
+SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?)
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT remote_ctrl_id, ctrl_device_name, ca_key, ca_cert, ctrl_fingerprint, id_pub, dh_priv_key, prev_dh_priv_key
+    FROM remote_controllers
+  
+Plan:
+SCAN remote_controllers
+
+Query: 
+    SELECT remote_ctrl_id, ctrl_device_name, ca_key, ca_cert, ctrl_fingerprint, id_pub, dh_priv_key, prev_dh_priv_key
+    FROM remote_controllers
+   WHERE ctrl_fingerprint = ?
+Plan:
+SEARCH remote_controllers USING INDEX idx_remote_controllers_ctrl_fingerprint (ctrl_fingerprint=?)
+
+Query: 
+    SELECT remote_ctrl_id, ctrl_device_name, ca_key, ca_cert, ctrl_fingerprint, id_pub, dh_priv_key, prev_dh_priv_key
+    FROM remote_controllers
+   WHERE remote_ctrl_id = ?
+Plan:
+SEARCH remote_controllers USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT remote_host_id, host_device_name, store_path, ca_key, ca_cert, id_key, host_fingerprint, host_dh_pub, bind_iface, bind_addr, bind_port
+    FROM remote_hosts
+  
+Plan:
+SCAN remote_hosts
+
+Query: 
+    SELECT remote_host_id, host_device_name, store_path, ca_key, ca_cert, id_key, host_fingerprint, host_dh_pub, bind_iface, bind_addr, bind_port
+    FROM remote_hosts
+   WHERE remote_host_id = ?
+Plan:
+SEARCH remote_hosts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT server_operator_id, server_operator_tag, trade_name, legal_name,
+      server_domains, enabled, smp_role_storage, smp_role_proxy, xftp_role_storage, xftp_role_proxy
+    FROM server_operators
+  
+Plan:
+SCAN server_operators
+
+Query: 
+    SELECT server_operator_id, server_operator_tag, trade_name, legal_name,
+      server_domains, enabled, smp_role_storage, smp_role_proxy, xftp_role_storage, xftp_role_proxy
+    FROM server_operators
+   WHERE server_operator_id = ?
+Plan:
+SEARCH server_operators USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+  
+Plan:
+SCAN u
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN connections c ON c.user_id = u.user_id WHERE c.agent_conn_id = ?
+Plan:
+SEARCH c USING INDEX sqlite_autoindex_connections_1 (agent_conn_id=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN contact_requests cr ON cr.user_id = u.user_id WHERE cr.contact_request_id = ?
+Plan:
+SEARCH cr USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN contacts ct ON ct.user_id = u.user_id WHERE ct.contact_id = ? AND ct.deleted = 0
+Plan:
+SEARCH ct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN files f ON f.user_id = u.user_id JOIN rcv_files r ON r.file_id = f.file_id WHERE r.agent_rcv_file_id = ?
+Plan:
+SCAN r
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN files f ON f.user_id = u.user_id WHERE f.agent_snd_file_id = ?
+Plan:
+SCAN f
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN files f ON f.user_id = u.user_id WHERE f.file_id = ?
+Plan:
+SEARCH f USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN groups g ON g.user_id = u.user_id WHERE g.group_id = ?
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   JOIN note_folders nf ON nf.user_id = u.user_id WHERE nf.note_folder_id = ?
+Plan:
+SEARCH nf USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.image, ucp.contact_link, ucp.preferences,
+      u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
+    FROM users u
+    JOIN contacts uct ON uct.contact_id = u.contact_id
+    JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
+   WHERE u.user_id = ?
+Plan:
+SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: 
+    SELECT usage_conditions_id, conditions_commit, notified_at, created_at
+    FROM usage_conditions
+    ORDER BY usage_conditions_id
+  
+Plan:
+SCAN usage_conditions
+
+Query: 
+    SELECT usage_conditions_id, conditions_commit, notified_at, created_at
+    FROM usage_conditions
+    ORDER BY usage_conditions_id
+   DESC LIMIT 1
+Plan:
+SCAN usage_conditions
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  (( user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  AND  item_ts < ? ) OR ( user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  AND  item_ts = ? AND chat_item_id < ? ))  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+MULTI-INDEX OR
+INDEX 1
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_ts<?)
+INDEX 2
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_ts=? AND rowid<?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  (( user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  AND  item_ts > ? ) OR ( user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  AND  item_ts = ? AND chat_item_id > ? ))  ORDER BY item_ts ASC, chat_item_id ASC  LIMIT ?
+Plan:
+MULTI-INDEX OR
+INDEX 1
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_ts>?)
+INDEX 2
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_ts=? AND rowid>?)
+USE TEMP B-TREE FOR ORDER BY
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  user_id = ? AND group_id = ?  AND group_scope_tag = ? AND group_scope_group_member_id = ?  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=?)
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  user_id = ? AND group_id = ?  AND group_scope_tag = ? AND group_scope_group_member_id IS NULL  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=?)
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  AND LOWER(item_text) LIKE '%' || LOWER(?) || '%'  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=?)
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=?)
+
+Query:  SELECT chat_item_id FROM chat_items WHERE  user_id = ? AND group_id = ?  AND msg_content_tag = ?  ORDER BY item_ts DESC, chat_item_id DESC  LIMIT ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_item_ts (user_id=? AND group_id=? AND msg_content_tag=?)
+
+Query: CREATE TABLE temp_conn_ids (conn_id BLOB)
+Error: SQLite3 returned ErrorError while attempting to perform prepare "explain query plan CREATE TABLE temp_conn_ids (conn_id BLOB)": table temp_conn_ids already exists
+
+Query: CREATE TABLE temp_delete_members (contact_profile_id INTEGER, member_profile_id INTEGER, local_display_name TEXT)
+Error: SQLite3 returned ErrorError while attempting to perform prepare "explain query plan CREATE TABLE temp_delete_members (contact_profile_id INTEGER, member_profile_id INTEGER, local_display_name TEXT)": table temp_delete_members already exists
+
+Query: DELETE FROM app_settings
+Plan:
+
+Query: DELETE FROM calls WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH calls USING INDEX idx_calls_contact_id (contact_id=?)
+
+Query: DELETE FROM chat_item_mentions WHERE chat_item_id = ?
+Plan:
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_item_moderations WHERE group_id = ? AND item_member_id = ? AND shared_msg_id = ?
+Plan:
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_group (group_id=? AND item_member_id=? AND shared_msg_id=?)
+
+Query: DELETE FROM chat_item_reactions WHERE contact_id = ?
+Plan:
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_contact_id (contact_id=?)
+
+Query: DELETE FROM chat_item_reactions WHERE contact_id = ? AND created_at <= ?
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_contact_id (contact_id=?)
+
+Query: DELETE FROM chat_item_reactions WHERE contact_id = ? AND shared_msg_id = ?
+Plan:
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_contact (contact_id=? AND shared_msg_id=?)
+
+Query: DELETE FROM chat_item_reactions WHERE group_id = ?
+Plan:
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_id (group_id=?)
+
+Query: DELETE FROM chat_item_reactions WHERE group_id = ? AND shared_msg_id = ? AND item_member_id = ?
+Plan:
+SEARCH chat_item_reactions USING INDEX idx_chat_item_reactions_group (group_id=? AND shared_msg_id=?)
+
+Query: DELETE FROM chat_item_versions WHERE chat_item_id = ?
+Plan:
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_items WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_items WHERE user_id = ? AND contact_id = ? AND created_at <= ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=? AND created_at<?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_items WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_user_mention (user_id=? AND group_id=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_items WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM chat_items WHERE user_id = ? AND note_folder_id = ?
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_notes_created_at (user_id=? AND note_folder_id=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id (chat_item_id=?)
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_chat_item_id (chat_item_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_chat_item_id (fwd_from_chat_item_id=?)
+SEARCH files USING COVERING INDEX idx_files_chat_item_id (chat_item_id=?)
+SEARCH groups USING COVERING INDEX idx_groups_chat_item_id (chat_item_id=?)
+
+Query: DELETE FROM commands WHERE user_id = ? AND command_id = ?
+Plan:
+SEARCH commands USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM connections WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: DELETE FROM connections WHERE user_id = ? AND group_member_id = ?
+Plan:
+SEARCH connections USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_agent_msg_id (connection_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_connection_id (connection_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_connection_id (connection_id=?)
+
+Query: DELETE FROM contact_profiles WHERE user_id = ? AND contact_profile_id = ?
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_custom_user_profile_id (custom_user_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_member_profile_id (member_profile_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_profile_id (contact_profile_id=?)
+
+Query: DELETE FROM contact_requests WHERE user_id = ? AND contact_request_id = ?
+Plan:
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM contacts WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_tags_chats USING COVERING INDEX idx_chat_tags_chats_chat_tag_id_contact_id (contact_id=?)
+SEARCH received_probes USING COVERING INDEX idx_received_probes_contact_id (contact_id=?)
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_contact_id (contact_id=?)
+SEARCH sent_probes USING COVERING INDEX idx_sent_probes_contact_id (contact_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_contact_id (contact_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_contact_id (contact_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_contact_id (fwd_from_contact_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_contact_id (contact_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_id (contact_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_contact_id (contact_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_via_contact (via_contact=?)
+SEARCH files USING COVERING INDEX idx_files_contact_id (contact_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_id (contact_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_invited_by (invited_by=?)
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: DELETE FROM display_names WHERE user_id = ? AND local_display_name = ?
+Plan:
+SEARCH display_names USING PRIMARY KEY (user_id=? AND local_display_name=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id_local_display_name (user_id=? AND local_display_name=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM files WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH files USING INDEX idx_files_contact_id (contact_id=?)
+SEARCH extra_xftp_file_descriptions USING COVERING INDEX idx_extra_xftp_file_descriptions_file_id (file_id=?)
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_file_id (file_id=?)
+SEARCH files USING COVERING INDEX idx_files_redirect_file_id (redirect_file_id=?)
+
+Query: DELETE FROM group_members WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH group_members USING COVERING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?)
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?)
+SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?)
+SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?)
+SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?)
+SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?)
+
+Query: DELETE FROM group_members WHERE user_id = ? AND group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?)
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?)
+SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?)
+SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?)
+SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?)
+SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?)
+SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?)
+SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?)
+
+Query: DELETE FROM groups WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_item_mentions USING COVERING INDEX idx_chat_item_mentions_group_id (group_id=?)
+SEARCH chat_tags_chats USING COVERING INDEX idx_chat_tags_chats_chat_tag_id_group_id (group_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_group_id (group_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_id (group_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_fwd_from_group_id (fwd_from_group_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_id (group_id=?)
+SEARCH messages USING COVERING INDEX idx_messages_group_id (group_id=?)
+SEARCH user_contact_links USING COVERING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH files USING COVERING INDEX idx_files_group_id (group_id=?)
+SEARCH group_members USING COVERING INDEX sqlite_autoindex_group_members_1 (group_id=?)
+SEARCH contacts USING COVERING INDEX idx_contacts_via_group (via_group=?)
+
+Query: DELETE FROM messages WHERE connection_id = ?
+Plan:
+SEARCH messages USING COVERING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
+
+Query: DELETE FROM messages WHERE connection_id = ? AND created_at <= ?
+Plan:
+SEARCH messages USING INDEX idx_messages_connection_id (connection_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
+
+Query: DELETE FROM messages WHERE created_at <= ?
+Plan:
+SEARCH messages USING COVERING INDEX idx_messages_created_at (created_at<?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
+
+Query: DELETE FROM messages WHERE group_id = ?
+Plan:
+SEARCH messages USING COVERING INDEX idx_messages_group_id (group_id=?)
+SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
+SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_created_by_msg_id (created_by_msg_id=?)
+SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_1 (message_id=?)
+SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
+SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
+
+Query: DELETE FROM pending_group_messages WHERE group_member_id = ? AND message_id = ?
+Plan:
+SEARCH pending_group_messages USING INDEX idx_pending_group_messages_group_member_id (group_member_id=?)
+
+Query: DELETE FROM protocol_servers WHERE user_id = ? AND smp_server_id = ? AND preset = ?
+Plan:
+SEARCH protocol_servers USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM rcv_file_chunks WHERE file_id = ?
+Plan:
+SEARCH rcv_file_chunks USING COVERING INDEX idx_rcv_file_chunks_file_id (file_id=?)
+
+Query: DELETE FROM received_probes WHERE created_at <= ?
+Plan:
+SEARCH received_probes USING COVERING INDEX idx_received_probes_created_at (created_at<?)
+
+Query: DELETE FROM remote_controllers WHERE remote_ctrl_id = ?
+Plan:
+SEARCH remote_controllers USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM remote_hosts WHERE remote_host_id = ?
+Plan:
+SEARCH remote_hosts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: DELETE FROM sent_probe_hashes WHERE created_at <= ?
+Plan:
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_created_at (created_at<?)
+
+Query: DELETE FROM sent_probes WHERE created_at <= ?
+Plan:
+SEARCH sent_probes USING COVERING INDEX idx_sent_probes_created_at (created_at<?)
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_sent_probe_id (sent_probe_id=?)
+
+Query: DELETE FROM snd_file_chunks WHERE file_id = ? AND connection_id = ?
+Plan:
+SEARCH snd_file_chunks USING COVERING INDEX idx_snd_file_chunks_file_id_connection_id (file_id=? AND connection_id=?)
+
+Query: DELETE FROM user_contact_links WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH user_contact_links USING INDEX idx_user_contact_links_group_id (group_id=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_via_user_contact_link (via_user_contact_link=?)
+SEARCH connections USING COVERING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: DELETE FROM user_contact_links WHERE user_id = ? AND local_display_name = '' AND group_id IS NULL
+Plan:
+SEARCH user_contact_links USING INDEX sqlite_autoindex_user_contact_links_1 (user_id=? AND local_display_name=?)
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_user_contact_link_id (user_contact_link_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_via_user_contact_link (via_user_contact_link=?)
+SEARCH connections USING COVERING INDEX idx_connections_user_contact_link_id (user_contact_link_id=?)
+
+Query: DELETE FROM users WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+SEARCH chat_tags USING COVERING INDEX idx_chat_tags_user_id (user_id=?)
+SEARCH note_folders USING COVERING INDEX note_folders_user_id (user_id=?)
+SEARCH received_probes USING COVERING INDEX idx_received_probes_user_id (user_id=?)
+SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_user_id (user_id=?)
+SEARCH sent_probes USING COVERING INDEX idx_sent_probes_user_id (user_id=?)
+SEARCH extra_xftp_file_descriptions USING COVERING INDEX idx_extra_xftp_file_descriptions_user_id (user_id=?)
+SEARCH xftp_file_descriptions USING COVERING INDEX idx_xftp_file_descriptions_user_id (user_id=?)
+SEARCH protocol_servers USING COVERING INDEX idx_smp_servers_user_id (user_id=?)
+SEARCH settings USING COVERING INDEX idx_settings_user_id (user_id=?)
+SEARCH commands USING COVERING INDEX idx_commands_user_id (user_id=?)
+SEARCH calls USING COVERING INDEX idx_calls_user_id (user_id=?)
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_ts (user_id=?)
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_2 (user_id=?)
+SEARCH user_contact_links USING COVERING INDEX sqlite_autoindex_user_contact_links_1 (user_id=?)
+SEARCH connections USING COVERING INDEX idx_connections_group_member (user_id=?)
+SEARCH files USING COVERING INDEX idx_files_user_id (user_id=?)
+SEARCH group_members USING COVERING INDEX idx_group_members_user_id (user_id=?)
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_2 (user_id=?)
+SEARCH group_profiles USING COVERING INDEX idx_group_profiles_user_id (user_id=?)
+SEARCH known_servers USING COVERING INDEX sqlite_autoindex_known_servers_1 (user_id=?)
+SEARCH contacts USING COVERING INDEX sqlite_autoindex_contacts_2 (user_id=?)
+SEARCH display_names USING COVERING INDEX sqlite_autoindex_display_names_2 (user_id=?)
+SEARCH contact_profiles USING COVERING INDEX idx_contact_profiles_user_id (user_id=?)
+
+Query: DROP TABLE IF EXISTS temp_conn_ids
+Plan:
+
+Query: DROP TABLE IF EXISTS temp_delete_members
+Plan:
+
+Query: DROP TABLE temp_conn_ids
+Plan:
+
+Query: DROP TABLE temp_delete_members
+Plan:
+
+Query: INSERT INTO app_settings (app_settings) VALUES (?)
+Plan:
+
+Query: INSERT INTO chat_item_mentions (chat_item_id, group_id, member_id, display_name) VALUES (?, ?, ?, ?)
+Plan:
+
+Query: INSERT INTO chat_item_messages (chat_item_id, message_id, created_at, updated_at) VALUES (?,?,?,?)
+Plan:
+
+Query: INSERT INTO contact_profiles (display_name, full_name, image, contact_link, user_id, local_alias, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+Plan:
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+
+Query: INSERT INTO contact_profiles (display_name, full_name, image, contact_link, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)
+Plan:
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+
+Query: INSERT INTO contact_profiles (display_name, full_name, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?)
+Plan:
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+
+Query: INSERT INTO contacts (contact_profile_id, local_display_name, user_id, is_user, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?)
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: INSERT INTO contacts (contact_profile_id, local_display_name, user_id, via_group, created_at, updated_at, chat_ts, contact_used) VALUES (?,?,?,?,?,?,?,?)
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: INSERT INTO contacts (user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, created_at, updated_at, chat_ts, xcontact_id, contact_used) VALUES (?,?,?,?,?,?,?,?,?,?)
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
+
+Query: INSERT INTO display_names (local_display_name, ldn_base, user_id, created_at, updated_at) VALUES (?,?,?,?,?)
+Plan:
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: INSERT INTO extra_xftp_file_descriptions (file_id, user_id, file_descr_text, created_at, updated_at) VALUES (?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO files (contact_id, group_id, user_id, file_name, file_path, file_crypto_key, file_crypto_nonce, file_size, chunk_size, redirect_file_id, agent_snd_file_id, ci_file_status, protocol, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO files (user_id, contact_id, file_name, file_size, chunk_size, file_inline, ci_file_status, protocol, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO files (user_id, file_name, file_path, file_size, chunk_size, ci_file_status, protocol, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO files (user_id, group_id, file_name, file_size, chunk_size, file_inline, ci_file_status, protocol, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, member_admission, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO group_profiles (display_name, full_name, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO group_snd_item_statuses (chat_item_id, group_member_id, group_snd_item_status) VALUES (?,?,?)
+Plan:
+
+Query: INSERT INTO note_folders (user_id) VALUES (?)
+Plan:
+
+Query: INSERT INTO rcv_files (file_id, file_status, created_at, updated_at) VALUES (?,?,?,?)
+Plan:
+
+Query: INSERT INTO rcv_files (file_id, file_status, file_queue_info, file_inline, rcv_file_inline, file_descr_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO rcv_files (file_id, file_status, file_queue_info, file_inline, rcv_file_inline, group_member_id, file_descr_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO received_probes (contact_id, group_member_id, probe, probe_hash, user_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO received_probes (contact_id, group_member_id, probe_hash, user_id, created_at, updated_at) VALUES (?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO sent_probe_hashes (sent_probe_id, contact_id, group_member_id, user_id, created_at, updated_at) VALUES (?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO sent_probes (contact_id, group_member_id, probe, user_id, created_at, updated_at) VALUES (?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO settings (user_id, chat_item_ttl, created_at, updated_at) VALUES (?,?,?,?)
+Plan:
+
+Query: INSERT INTO snd_files (file_id, file_status, file_descr_id, group_member_id, connection_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?)
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: INSERT INTO temp_conn_ids (conn_id) VALUES (?)
+Plan:
+
+Query: INSERT INTO user_contact_links (user_id, conn_req_contact, short_link_contact, created_at, updated_at) VALUES (?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO user_contact_links (user_id, group_id, group_link_id, local_display_name, conn_req_contact, short_link_contact, group_link_member_role, auto_accept, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO users (agent_user_id, local_display_name, active_user, active_order, contact_id, show_ntfs, send_rcpts_contacts, send_rcpts_small_groups, created_at, updated_at) VALUES (?,?,?,?,0,?,?,?,?,?)
+Plan:
+
+Query: INSERT INTO xftp_file_descriptions (user_id, file_descr_text, file_descr_part_no, file_descr_complete, created_at, updated_at) VALUES (?,?,?,?,?,?)
+Plan:
+
+Query: SELECT 1 FROM group_member_intros WHERE re_group_member_id = ? AND to_group_member_id = ? LIMIT 1
+Plan:
+SEARCH group_member_intros USING COVERING INDEX sqlite_autoindex_group_member_intros_1 (re_group_member_id=? AND to_group_member_id=?)
+
+Query: SELECT 1 FROM settings WHERE user_id = ? LIMIT 1
+Plan:
+SEARCH settings USING COVERING INDEX idx_settings_user_id (user_id=?)
+
+Query: SELECT COUNT(1) FROM chat_item_versions WHERE chat_item_id = ?
+Plan:
+SEARCH chat_item_versions USING COVERING INDEX idx_chat_item_versions_chat_item_id (chat_item_id=?)
+
+Query: SELECT COUNT(1) FROM chat_items WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_groups_msg_content_tag_deleted (user_id=? AND group_id=? AND msg_content_tag=? AND item_deleted=? AND item_sent=?)
+
+Query: SELECT COUNT(1) FROM contacts WHERE user_id = ? AND chat_item_ttl > 0
+Plan:
+SEARCH contacts USING INDEX idx_contacts_chat_ts (user_id=?)
+
+Query: SELECT COUNT(1) FROM groups WHERE user_id = ? AND chat_item_ttl > 0
+Plan:
+SEARCH groups USING INDEX idx_groups_chat_ts (user_id=?)
+
+Query: SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? AND group_scope_tag IS NULL  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? 
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_status (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_status=?)
+
+Query: SELECT accepted_at FROM operator_usage_conditions WHERE server_operator_id = ? AND conditions_commit = ?
+Plan:
+SEARCH operator_usage_conditions USING INDEX idx_operator_usage_conditions_conditions_commit (conditions_commit=? AND server_operator_id=?)
+
+Query: SELECT agent_conn_id FROM connections WHERE user_id = ? AND conn_req_inv IN (?,?) LIMIT 1
+Plan:
+SEARCH connections USING INDEX idx_connections_conn_req_inv (user_id=? AND conn_req_inv=?)
+
+Query: SELECT agent_conn_id FROM connections where to_subscribe = 1
+Plan:
+SEARCH connections USING INDEX idx_connections_to_subscribe (to_subscribe=?)
+
+Query: SELECT app_settings FROM app_settings
+Plan:
+SCAN app_settings
+
+Query: SELECT auth_err_counter FROM connections WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND contact_id = ? AND shared_msg_id = ? AND item_sent = ?
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AND contact_id=? AND shared_msg_id=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ?  ORDER BY item_ts ASC, chat_item_id ASC LIMIT 1
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_status (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_status=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? AND group_member_id = ? LIMIT 1
+Plan:
+SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? AND shared_msg_id = ? AND item_sent = ? AND group_member_id = ?
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=? AND shared_msg_id=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? AND shared_msg_id = ? AND item_sent = ? AND group_member_id IS NULL
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=? AND shared_msg_id=?)
+
+Query: SELECT chat_item_ttl FROM contacts WHERE contact_id = ? LIMIT 1
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT chat_item_ttl FROM settings WHERE user_id = ? LIMIT 1
+Plan:
+SEARCH settings USING INDEX idx_settings_user_id (user_id=?)
+
+Query: SELECT chat_tag_id FROM chat_tags_chats WHERE contact_id = ?
+Plan:
+SEARCH chat_tags_chats USING COVERING INDEX idx_chat_tags_chats_chat_tag_id_contact_id (contact_id=?)
+
+Query: SELECT chat_tag_id FROM chat_tags_chats WHERE group_id = ?
+Plan:
+SEARCH chat_tags_chats USING COVERING INDEX idx_chat_tags_chats_chat_tag_id_group_id (group_id=?)
+
+Query: SELECT conn_req_inv FROM connections WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT conn_status FROM connections WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT connection_id FROM connections WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH connections USING INDEX idx_connections_contact_id (contact_id=?)
+
+Query: SELECT connection_id FROM connections WHERE user_id = ? AND group_member_id = ?
+Plan:
+SEARCH connections USING COVERING INDEX idx_connections_group_member (user_id=? AND group_member_id=?)
+
+Query: SELECT contact_id FROM contacts WHERE user_id = ? AND chat_item_ttl > 0 OR chat_item_ttl IS NULL
+Plan:
+SCAN contacts
+
+Query: SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 0
+Plan:
+SEARCH contacts USING INDEX idx_contacts_chat_ts (user_id=?)
+
+Query: SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 1
+Plan:
+SEARCH contacts USING INDEX idx_contacts_chat_ts (user_id=?)
+
+Query: SELECT contact_id FROM contacts WHERE user_id = ? AND local_display_name = ? AND deleted = 0
+Plan:
+SEARCH contacts USING INDEX sqlite_autoindex_contacts_1 (user_id=? AND local_display_name=?)
+
+Query: SELECT contact_id FROM group_members WHERE contact_id = ? LIMIT 1
+Plan:
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_id (contact_id=?)
+
+Query: SELECT contact_id, group_id FROM chat_items WHERE user_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT contact_request_id FROM contact_requests WHERE user_id = ? AND local_display_name = ?
+Plan:
+SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+
+Query: SELECT count(1) FROM chat_items WHERE chat_item_id > ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid>?)
+
+Query: SELECT count(1) FROM group_members
+Plan:
+SCAN group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id
+
+Query: SELECT count(1) FROM pending_group_messages
+Plan:
+SCAN pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id
+
+Query: SELECT file_id FROM files WHERE user_id = ? AND redirect_file_id = ?
+Plan:
+SEARCH files USING INDEX idx_files_redirect_file_id (redirect_file_id=?)
+
+Query: SELECT g.inv_queue_info FROM groups g WHERE g.group_id = ? AND g.user_id = ?
+Plan:
+SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT group_id FROM group_members WHERE group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT group_id FROM groups WHERE inv_queue_info = ? AND user_id = ? LIMIT 1
+Plan:
+SEARCH groups USING INDEX idx_groups_chat_ts (user_id=?)
+
+Query: SELECT group_id FROM groups WHERE user_id = ?
+Plan:
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_2 (user_id=?)
+
+Query: SELECT group_id FROM groups WHERE user_id = ? AND chat_item_ttl > 0 OR chat_item_ttl IS NULL
+Plan:
+SCAN groups
+
+Query: SELECT group_id FROM groups WHERE user_id = ? AND local_display_name = ?
+Plan:
+SEARCH groups USING COVERING INDEX sqlite_autoindex_groups_1 (user_id=? AND local_display_name=?)
+
+Query: SELECT group_id FROM user_contact_links WHERE user_id = ? AND user_contact_link_id = ? AND group_id IS NOT NULL
+Plan:
+SEARCH user_contact_links USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT group_member_id FROM group_members WHERE user_id = ? AND contact_profile_id = ? AND group_member_id != ? LIMIT 1
+Plan:
+SEARCH group_members USING INDEX idx_group_members_user_id (user_id=?)
+
+Query: SELECT group_member_id FROM group_members WHERE user_id = ? AND group_id = ? AND local_display_name = ?
+Plan:
+SEARCH group_members USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+
+Query: SELECT group_member_id FROM group_members WHERE user_id = ? AND group_id = ? AND member_category = ?
+Plan:
+SEARCH group_members USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
+
+Query: SELECT image FROM contact_profiles WHERE display_name = ? LIMIT 1
+Plan:
+SEARCH contact_profiles USING INDEX contact_profiles_index (display_name=?)
+
+Query: SELECT last_insert_rowid()
+Plan:
+SCAN CONSTANT ROW
+
+Query: SELECT max(active_order) FROM users
+Plan:
+SEARCH users
+
+Query: SELECT note_folder_id FROM note_folders WHERE user_id = ?
+Plan:
+SEARCH note_folders USING COVERING INDEX note_folders_user_id (user_id=?)
+
+Query: SELECT note_folder_id FROM note_folders WHERE user_id = ? LIMIT 1
+Plan:
+SEARCH note_folders USING COVERING INDEX note_folders_user_id (user_id=?)
+
+Query: SELECT quota_err_counter FROM connections WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT re_group_member_id FROM group_member_intros WHERE to_group_member_id = ?
+Plan:
+SEARCH group_member_intros USING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?)
+
+Query: SELECT sent_inv_queue_info FROM group_members WHERE group_member_id = ? AND user_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT user_contact_link_id FROM contact_requests WHERE contact_request_id = ?
+Plan:
+SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: SELECT user_contact_link_id, conn_req_contact, short_link_contact, group_link_id, group_link_member_role FROM user_contact_links WHERE user_id = ? AND group_id = ? LIMIT 1
+Plan:
+SEARCH user_contact_links USING INDEX idx_user_contact_links_group_id (group_id=?)
+
+Query: SELECT user_id FROM users WHERE local_display_name = ?
+Plan:
+SEARCH users USING COVERING INDEX sqlite_autoindex_users_2 (local_display_name=?)
+
+Query: SELECT xcontact_id FROM connections WHERE user_id = ? AND via_contact_uri_hash = ? LIMIT 1
+Plan:
+SEARCH connections USING INDEX idx_connections_via_contact_uri_hash (user_id=? AND via_contact_uri_hash=?)
+
+Query: SELECT xgrplinkmem_received FROM group_members WHERE group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE chat_items SET item_status = ?, updated_at = ? WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE chat_items SET item_status = ?, updated_at = ? WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE chat_items SET item_status = ?, updated_at = ? WHERE user_id = ? AND item_status = ?
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_user_id_item_status (user_id=? AND item_status=?)
+
+Query: UPDATE chat_items SET timed_delete_at = ? WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE chat_items SET timed_delete_at = ? WHERE user_id = ? AND group_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE chat_items SET via_proxy = ? WHERE user_id = ? AND contact_id = ? AND chat_item_id = ?
+Plan:
+SEARCH chat_items USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET auth_err_counter = ?, updated_at = ? WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET conn_status = ?, updated_at = ? WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET conn_status = ?, updated_at = ?, conn_req_inv = NULL, short_link_inv = NULL WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET conn_status='deleted' WHERE group_member_id = 3
+Plan:
+SEARCH connections USING INDEX idx_connections_group_member_id (group_member_id=?)
+
+Query: UPDATE connections SET conn_type = ?, group_member_id = ?, updated_at = ? WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET contact_id = ? WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET quota_err_counter = ?, updated_at = ? WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET security_code = ?, security_code_verified_at = ?, updated_at = ? WHERE user_id = ? AND connection_id = ?
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE connections SET to_subscribe = 0 WHERE to_subscribe = 1
+Plan:
+SEARCH connections USING INDEX idx_connections_to_subscribe (to_subscribe=?)
+
+Query: UPDATE contact_requests SET contact_id = ? WHERE user_id = ? AND local_display_name = ?
+Plan:
+SEARCH contact_requests USING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?)
+
+Query: UPDATE contacts SET chat_deleted = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET chat_item_ttl = ?, updated_at = ? WHERE contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET chat_ts = ?, chat_deleted = 0 WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET contact_grp_inv_sent = ?, updated_at = ? WHERE contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET contact_used = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET enable_ntfs = ?, send_rcpts = ?, favorite = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET send_rcpts = NULL
+Plan:
+SCAN contacts
+
+Query: UPDATE contacts SET ui_themes = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE contacts SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND unread_chat = ?
+Plan:
+SEARCH contacts USING INDEX idx_contacts_chat_ts (user_id=?)
+
+Query: UPDATE contacts SET user_preferences = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET agent_snd_file_deleted = 1, updated_at = ? WHERE user_id = ? AND file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET cancelled = 1, ci_file_status = ?, updated_at = ? WHERE user_id = ? AND file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET chat_item_id = ?, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET ci_file_status = ?, updated_at = ? WHERE user_id = ? AND file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET file_crypto_key = ?, file_crypto_nonce = ?, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET file_path = ?, ci_file_status = ?, updated_at = ? WHERE user_id = ? AND file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE files SET private_snd_file_descr = ?, updated_at = ? WHERE user_id = ? AND file_id = ?
+Plan:
+SEARCH files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE group_member_intros SET intro_status='con'
+Plan:
+SCAN group_member_intros
+
+Query: UPDATE group_member_intros SET intro_status='fwd'
+Plan:
+SCAN group_member_intros
+
+Query: UPDATE group_members SET contact_id = ?, updated_at = ? WHERE contact_profile_id = ?
+Plan:
+SEARCH group_members USING COVERING INDEX idx_group_members_contact_profile_id (contact_profile_id=?)
+
+Query: UPDATE group_members SET contact_id = NULL, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH group_members USING INDEX idx_group_members_user_id (user_id=?)
+
+Query: UPDATE group_members SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?
+Plan:
+SEARCH group_members USING INDEX idx_group_members_user_id (user_id=?)
+
+Query: UPDATE group_members SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE group_members SET member_id = ?, member_role = ? WHERE group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE group_members SET member_role = ? WHERE user_id = ? AND group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE group_members SET support_chat_ts = ? WHERE group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE group_members SET xgrplinkmem_received = ?, updated_at = ? WHERE group_member_id = ?
+Plan:
+SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET business_member_id = ?, customer_member_id = ? WHERE group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET chat_item_id = ?, updated_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET chat_ts = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET enable_ntfs = ?, send_rcpts = ?, favorite = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET local_alias = ?, updated_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET send_rcpts = NULL
+Plan:
+SCAN groups
+
+Query: UPDATE groups SET ui_themes = ?, updated_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE groups SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND unread_chat = ?
+Plan:
+SEARCH groups USING INDEX idx_groups_chat_ts (user_id=?)
+
+Query: UPDATE groups SET user_member_profile_sent_at = ? WHERE user_id = ? AND group_id = ?
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE note_folders SET chat_ts = ? WHERE user_id = ? AND note_folder_id = ?
+Plan:
+SEARCH note_folders USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE note_folders SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND note_folder_id = ?
+Plan:
+SEARCH note_folders USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE note_folders SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND unread_chat = ?
+Plan:
+SEARCH note_folders USING INDEX note_folders_user_id (user_id=?)
+
+Query: UPDATE rcv_files SET agent_rcv_file_deleted = 1, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET agent_rcv_file_id = ?, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET file_status = ?, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE rcv_files SET user_approved_relays = ?, rcv_file_inline = ?, file_status = ?, updated_at = ? WHERE file_id = ?
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE settings SET chat_item_ttl = ?, updated_at = ? WHERE user_id = ?
+Plan:
+SEARCH settings USING INDEX idx_settings_user_id (user_id=?)
+
+Query: UPDATE snd_files SET file_status = ?, updated_at = ? WHERE file_id = ? AND connection_id = ?
+Plan:
+SEARCH snd_files USING PRIMARY KEY (file_id=? AND connection_id=?)
+
+Query: UPDATE snd_files SET last_inline_msg_delivery_id = ? WHERE connection_id = ? AND file_id = ? AND file_descr_id = ?
+Plan:
+SEARCH snd_files USING PRIMARY KEY (file_id=? AND connection_id=?)
+
+Query: UPDATE usage_conditions SET notified_at = ? WHERE usage_conditions_id = ?
+Plan:
+SEARCH usage_conditions USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET active_user = 0
+Plan:
+SCAN users
+
+Query: UPDATE users SET active_user = 1, active_order = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET contact_id = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET local_display_name = ?, updated_at = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET send_rcpts_contacts = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET send_rcpts_contacts = ?, send_rcpts_small_groups = ? WHERE view_pwd_hash IS NULL
+Plan:
+SCAN users
+
+Query: UPDATE users SET send_rcpts_small_groups = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET ui_themes = ?, updated_at = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
+Query: UPDATE users SET user_member_profile_updated_at = ? WHERE user_id = ?
+Plan:
+SEARCH users USING INTEGER PRIMARY KEY (rowid=?)
+
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
index 923928ad5c..91670ffc7b 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
@@ -108,7 +108,8 @@ CREATE TABLE group_profiles(
   image TEXT,
   user_id INTEGER DEFAULT NULL REFERENCES users ON DELETE CASCADE,
   preferences TEXT,
-  description TEXT NULL
+  description TEXT NULL,
+  member_admission TEXT
 );
 CREATE TABLE groups(
   group_id INTEGER PRIMARY KEY, -- local group ID
@@ -120,7 +121,6 @@ CREATE TABLE groups(
   updated_at TEXT CHECK(updated_at NOT NULL),
   chat_item_id INTEGER DEFAULT NULL REFERENCES chat_items ON DELETE SET NULL,
   enable_ntfs INTEGER,
-  host_conn_custom_user_profile_id INTEGER REFERENCES contact_profiles ON DELETE SET NULL,
   unread_chat INTEGER DEFAULT 0 CHECK(unread_chat NOT NULL),
   chat_ts TEXT,
   favorite INTEGER NOT NULL DEFAULT 0,
@@ -134,7 +134,8 @@ CREATE TABLE groups(
   business_xcontact_id BLOB NULL,
   customer_member_id BLOB NULL,
   chat_item_ttl INTEGER,
-  local_alias TEXT DEFAULT '', -- received
+  local_alias TEXT DEFAULT '',
+  members_require_attention INTEGER NOT NULL DEFAULT 0, -- received
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -167,6 +168,11 @@ CREATE TABLE group_members(
   peer_chat_min_version INTEGER NOT NULL DEFAULT 1,
   peer_chat_max_version INTEGER NOT NULL DEFAULT 1,
   member_restriction TEXT,
+  support_chat_ts TEXT,
+  support_chat_items_unread INTEGER NOT NULL DEFAULT 0,
+  support_chat_items_member_attention INTEGER NOT NULL DEFAULT 0,
+  support_chat_items_mentions INTEGER NOT NULL DEFAULT 0,
+  support_chat_last_msg_from_member_ts TEXT,
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -298,6 +304,8 @@ CREATE TABLE connections(
   pq_snd_enabled INTEGER,
   pq_rcv_enabled INTEGER,
   quota_err_counter INTEGER NOT NULL DEFAULT 0,
+  short_link_inv BLOB,
+  via_short_link_contact BLOB,
   FOREIGN KEY(snd_file_id, connection_id)
   REFERENCES snd_files(file_id, connection_id)
   ON DELETE CASCADE
@@ -317,6 +325,7 @@ CREATE TABLE user_contact_links(
   group_link_id BLOB,
   group_link_member_role TEXT NULL,
   business_address INTEGER DEFAULT 0,
+  short_link_contact BLOB,
   UNIQUE(user_id, local_display_name)
 );
 CREATE TABLE contact_requests(
@@ -406,7 +415,11 @@ CREATE TABLE chat_items(
   fwd_from_group_id INTEGER REFERENCES groups ON DELETE SET NULL,
   fwd_from_chat_item_id INTEGER REFERENCES chat_items ON DELETE SET NULL,
   via_proxy INTEGER,
-  msg_content_tag TEXT
+  msg_content_tag TEXT,
+  include_in_history INTEGER NOT NULL DEFAULT 0,
+  user_mention INTEGER NOT NULL DEFAULT 0,
+  group_scope_tag TEXT,
+  group_scope_group_member_id INTEGER REFERENCES group_members(group_member_id) ON DELETE CASCADE
 );
 CREATE TABLE sqlite_sequence(name,seq);
 CREATE TABLE chat_item_messages(
@@ -641,6 +654,13 @@ CREATE TABLE chat_tags_chats(
   group_id INTEGER REFERENCES groups ON DELETE CASCADE,
   chat_tag_id INTEGER NOT NULL REFERENCES chat_tags ON DELETE CASCADE
 );
+CREATE TABLE chat_item_mentions(
+  chat_item_mention_id INTEGER PRIMARY KEY AUTOINCREMENT,
+  group_id INTEGER NOT NULL REFERENCES groups ON DELETE CASCADE,
+  member_id BLOB NOT NULL,
+  chat_item_id INTEGER NOT NULL REFERENCES chat_items ON DELETE CASCADE,
+  display_name TEXT NOT NULL
+);
 CREATE INDEX contact_profiles_index ON contact_profiles(
   display_name,
   full_name
@@ -649,7 +669,6 @@ CREATE INDEX idx_groups_inv_queue_info ON groups(inv_queue_info);
 CREATE INDEX idx_contact_requests_xcontact_id ON contact_requests(xcontact_id);
 CREATE INDEX idx_contacts_xcontact_id ON contacts(xcontact_id);
 CREATE INDEX idx_messages_shared_msg_id ON messages(shared_msg_id);
-CREATE INDEX idx_chat_items_shared_msg_id ON chat_items(shared_msg_id);
 CREATE UNIQUE INDEX idx_chat_items_direct_shared_msg_id ON chat_items(
   user_id,
   contact_id,
@@ -722,9 +741,6 @@ CREATE INDEX idx_group_members_contact_profile_id ON group_members(
 CREATE INDEX idx_group_members_user_id ON group_members(user_id);
 CREATE INDEX idx_group_members_invited_by ON group_members(invited_by);
 CREATE INDEX idx_group_profiles_user_id ON group_profiles(user_id);
-CREATE INDEX idx_groups_host_conn_custom_user_profile_id ON groups(
-  host_conn_custom_user_profile_id
-);
 CREATE INDEX idx_groups_chat_item_id ON groups(chat_item_id);
 CREATE INDEX idx_groups_group_profile_id ON groups(group_profile_id);
 CREATE INDEX idx_messages_group_id ON messages(group_id);
@@ -978,3 +994,57 @@ CREATE INDEX idx_chat_items_groups_msg_content_tag_deleted ON chat_items(
   item_deleted,
   item_sent
 );
+CREATE INDEX idx_chat_items_groups_history ON chat_items(
+  user_id,
+  group_id,
+  include_in_history,
+  item_deleted,
+  item_ts,
+  chat_item_id
+);
+CREATE INDEX idx_group_snd_item_statuses_chat_item_id_group_member_id ON group_snd_item_statuses(
+  chat_item_id,
+  group_member_id
+);
+CREATE INDEX idx_chat_item_mentions_group_id ON chat_item_mentions(group_id);
+CREATE INDEX idx_chat_item_mentions_chat_item_id ON chat_item_mentions(
+  chat_item_id
+);
+CREATE UNIQUE INDEX idx_chat_item_mentions_display_name ON chat_item_mentions(
+  chat_item_id,
+  display_name
+);
+CREATE UNIQUE INDEX idx_chat_item_mentions_member_id ON chat_item_mentions(
+  chat_item_id,
+  member_id
+);
+CREATE INDEX idx_chat_items_groups_user_mention ON chat_items(
+  user_id,
+  group_id,
+  item_status,
+  user_mention
+);
+CREATE INDEX idx_chat_items_group_id ON chat_items(group_id);
+CREATE INDEX idx_connections_group_member_id ON connections(group_member_id);
+CREATE INDEX idx_chat_items_group_id_shared_msg_id ON chat_items(
+  group_id,
+  shared_msg_id
+);
+CREATE INDEX idx_chat_items_group_scope_group_member_id ON chat_items(
+  group_scope_group_member_id
+);
+CREATE INDEX idx_chat_items_group_scope_item_ts ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_ts
+);
+CREATE INDEX idx_chat_items_group_scope_item_status ON chat_items(
+  user_id,
+  group_id,
+  group_scope_tag,
+  group_scope_group_member_id,
+  item_status,
+  item_ts
+);
diff --git a/src/Simplex/Chat/Store/Shared.hs b/src/Simplex/Chat/Store/Shared.hs
index fab4c344bf..8c9c50e9de 100644
--- a/src/Simplex/Chat/Store/Shared.hs
+++ b/src/Simplex/Chat/Store/Shared.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
@@ -35,7 +36,7 @@ import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.Chat.Types.UITheme
-import Simplex.Messaging.Agent.Protocol (ConnId, UserId)
+import Simplex.Messaging.Agent.Protocol (ConnId, ConnShortLink, ConnectionMode (..), CreatedConnLink (..), UserId)
 import Simplex.Messaging.Agent.Store.AgentStore (firstRow, maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (BoolInt (..))
 import qualified Simplex.Messaging.Agent.Store.DB as DB
@@ -140,6 +141,8 @@ data StoreError
   | SEProhibitedDeleteUser {userId :: UserId, contactId :: ContactId}
   | SEOperatorNotFound {serverOperatorId :: Int64}
   | SEUsageConditionsNotFound
+  | SEInvalidQuote
+  | SEInvalidMention
   deriving (Show, Exception)
 
 $(J.deriveJSON (sumTypeJSON $ dropPrefix "SE") ''StoreError)
@@ -379,10 +382,10 @@ setCommandConnId db User {userId} cmdId connId = do
 createContact :: DB.Connection -> User -> Profile -> ExceptT StoreError IO ()
 createContact db User {userId} profile = do
   currentTs <- liftIO getCurrentTime
-  void $ createContact_ db userId profile "" Nothing currentTs True
+  void $ createContact_ db userId profile "" Nothing currentTs
 
-createContact_ :: DB.Connection -> UserId -> Profile -> LocalAlias -> Maybe Int64 -> UTCTime -> Bool -> ExceptT StoreError IO (Text, ContactId, ProfileId)
-createContact_ db userId Profile {displayName, fullName, image, contactLink, preferences} localAlias viaGroup currentTs contactUsed =
+createContact_ :: DB.Connection -> UserId -> Profile -> LocalAlias -> Maybe Int64 -> UTCTime -> ExceptT StoreError IO (Text, ContactId, ProfileId)
+createContact_ db userId Profile {displayName, fullName, image, contactLink, preferences} localAlias viaGroup currentTs =
   ExceptT . withLocalDisplayName db userId displayName $ \ldn -> do
     DB.execute
       db
@@ -392,7 +395,7 @@ createContact_ db userId Profile {displayName, fullName, image, contactLink, pre
     DB.execute
       db
       "INSERT INTO contacts (contact_profile_id, local_display_name, user_id, via_group, created_at, updated_at, chat_ts, contact_used) VALUES (?,?,?,?,?,?,?,?)"
-      (profileId, ldn, userId, viaGroup, currentTs, currentTs, currentTs, BI contactUsed)
+      (profileId, ldn, userId, viaGroup, currentTs, currentTs, currentTs, BI True)
     contactId <- insertedRowId db
     pure $ Right (ldn, contactId, profileId)
 
@@ -414,7 +417,7 @@ deleteUnusedIncognitoProfileById_ db User {userId} profileId =
     |]
     (userId, profileId, userId, profileId, userId, profileId)
 
-type ContactRow' = (ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. (Maybe GroupMemberId, BoolInt, Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64)
+type ContactRow' = (ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. (Maybe GroupMemberId, BoolInt, Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64)
 
 type ContactRow = Only ContactId :. ContactRow'
 
@@ -439,10 +442,10 @@ getProfileById db userId profileId =
       |]
       (userId, profileId)
   where
-    toProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Preferences) -> LocalProfile
+    toProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, Maybe Preferences) -> LocalProfile
     toProfile (displayName, fullName, image, contactLink, localAlias, preferences) = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
 
-type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Int64, AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact) :. (Maybe XContactId, PQSupport, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
+type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Int64, AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact) :. (Maybe XContactId, PQSupport, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
 
 toContactRequest :: ContactRequestRow -> UserContactRequest
 toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, contactId_, userContactLinkId, agentContactConnId, profileId, displayName, fullName, image, contactLink) :. (xContactId, pqSupport, preferences, createdAt, updatedAt, minVer, maxVer)) = do
@@ -460,7 +463,7 @@ userQuery =
     JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
   |]
 
-toUser :: (UserId, UserId, ContactId, ProfileId, BoolInt, Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) :. (BoolInt, BoolInt, BoolInt, Maybe B64UrlByteString, Maybe B64UrlByteString, Maybe UTCTime, Maybe UIThemeEntityOverrides) -> User
+toUser :: (UserId, UserId, ContactId, ProfileId, BoolInt, Int64, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, Maybe Preferences) :. (BoolInt, BoolInt, BoolInt, Maybe B64UrlByteString, Maybe B64UrlByteString, Maybe UTCTime, Maybe UIThemeEntityOverrides) -> User
 toUser ((userId, auId, userContactId, profileId, BI activeUser, activeOrder, displayName, fullName, image, contactLink, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, viewPwdHash_, viewPwdSalt_, userMemberProfileUpdatedAt, uiThemes)) =
   User {userId, agentUserId = AgentUserId auId, userContactId, localDisplayName = displayName, profile, activeUser, activeOrder, fullPreferences, showNtfs, sendRcptsContacts, sendRcptsSmallGroups, viewPwdHash, userMemberProfileUpdatedAt, uiThemes}
   where
@@ -468,9 +471,10 @@ toUser ((userId, auId, userContactId, profileId, BI activeUser, activeOrder, dis
     fullPreferences = mergePreferences Nothing userPreferences
     viewPwdHash = UserPwdHash <$> viewPwdHash_ <*> viewPwdSalt_
 
-toPendingContactConnection :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, LocalAlias, UTCTime, UTCTime) -> PendingContactConnection
-toPendingContactConnection (pccConnId, acId, pccConnStatus, connReqHash, viaUserContactLink, groupLinkId, customUserProfileId, connReqInv, localAlias, createdAt, updatedAt) =
-  PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = isJust connReqHash, viaUserContactLink, groupLinkId, customUserProfileId, connReqInv, localAlias, createdAt, updatedAt}
+toPendingContactConnection :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, Maybe (ConnShortLink 'CMInvitation), LocalAlias, UTCTime, UTCTime) -> PendingContactConnection
+toPendingContactConnection (pccConnId, acId, pccConnStatus, connReqHash, viaUserContactLink, groupLinkId, customUserProfileId, connReqInv, shortLinkInv, localAlias, createdAt, updatedAt) =
+  let connLinkInv = (`CCLink` shortLinkInv) <$> connReqInv
+   in PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = isJust connReqHash, viaUserContactLink, groupLinkId, customUserProfileId, connLinkInv, localAlias, createdAt, updatedAt}
 
 getConnReqInv :: DB.Connection -> Int64 -> ExceptT StoreError IO ConnReqInvitation
 getConnReqInv db connId =
@@ -575,27 +579,37 @@ safeDeleteLDN db User {userId} localDisplayName = do
 
 type BusinessChatInfoRow = (Maybe BusinessChatType, Maybe MemberId, Maybe MemberId)
 
-type GroupInfoRow = (Int64, GroupName, GroupName, Text, Text, Maybe Text, Maybe ImageData, Maybe ProfileId, Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe GroupPreferences) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime) :. BusinessChatInfoRow :. (Maybe UIThemeEntityOverrides, Maybe CustomData, Maybe Int64) :. GroupMemberRow
+type GroupInfoRow = (Int64, GroupName, GroupName, Text, Text, Maybe Text, Maybe ImageData, Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe GroupPreferences, Maybe GroupMemberAdmission) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime) :. BusinessChatInfoRow :. (Maybe UIThemeEntityOverrides, Maybe CustomData, Maybe Int64, Int) :. GroupMemberRow
 
-type GroupMemberRow = ((Int64, Int64, MemberId, VersionChat, VersionChat, GroupMemberRole, GroupMemberCategory, GroupMemberStatus, BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, ContactName, Maybe ContactId, ProfileId, ProfileId, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Preferences))
+type GroupMemberRow = (Int64, Int64, MemberId, VersionChat, VersionChat, GroupMemberRole, GroupMemberCategory, GroupMemberStatus, BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, ContactName, Maybe ContactId, ProfileId, ProfileId, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, Maybe Preferences) :. (UTCTime, UTCTime) :. (Maybe UTCTime, Int64, Int64, Int64, Maybe UTCTime)
 
 toGroupInfo :: VersionRangeChat -> Int64 -> [ChatTagId] -> GroupInfoRow -> GroupInfo
-toGroupInfo vr userContactId chatTags ((groupId, localDisplayName, displayName, fullName, localAlias, description, image, hostConnCustomUserProfileId, enableNtfs_, sendRcpts, BI favorite, groupPreferences) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. businessRow :. (uiThemes, customData, chatItemTTL) :. userMemberRow) =
+toGroupInfo vr userContactId chatTags ((groupId, localDisplayName, displayName, fullName, localAlias, description, image, enableNtfs_, sendRcpts, BI favorite, groupPreferences, memberAdmission) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. businessRow :. (uiThemes, customData, chatItemTTL, membersRequireAttention) :. userMemberRow) =
   let membership = (toGroupMember userContactId userMemberRow) {memberChatVRange = vr}
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts = unBI <$> sendRcpts, favorite}
       fullGroupPreferences = mergeGroupPreferences groupPreferences
-      groupProfile = GroupProfile {displayName, fullName, description, image, groupPreferences}
+      groupProfile = GroupProfile {displayName, fullName, description, image, groupPreferences, memberAdmission}
       businessChat = toBusinessChatInfo businessRow
-   in GroupInfo {groupId, localDisplayName, groupProfile, localAlias, businessChat, fullGroupPreferences, membership, hostConnCustomUserProfileId, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt, chatTags, chatItemTTL, uiThemes, customData}
+   in GroupInfo {groupId, localDisplayName, groupProfile, localAlias, businessChat, fullGroupPreferences, membership, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt, chatTags, chatItemTTL, uiThemes, customData, membersRequireAttention}
 
 toGroupMember :: Int64 -> GroupMemberRow -> GroupMember
-toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, BI showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, preferences)) =
+toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, BI showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, preferences) :. (createdAt, updatedAt) :. (supportChatTs_, supportChatUnread, supportChatMemberAttention, supportChatMentions, supportChatLastMsgFromMemberTs)) =
   let memberProfile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
       memberSettings = GroupMemberSettings {showMessages}
       blockedByAdmin = maybe False mrsBlocked memberRestriction_
       invitedBy = toInvitedBy userContactId invitedById
       activeConn = Nothing
       memberChatVRange = fromMaybe (versionToRange maxVer) $ safeVersionRange minVer maxVer
+      supportChat = case supportChatTs_ of
+        Just chatTs ->
+          Just GroupSupportChat {
+            chatTs,
+            unread = supportChatUnread,
+            memberAttention = supportChatMemberAttention,
+            mentions = supportChatMentions,
+            lastMsgFromMemberTs = supportChatLastMsgFromMemberTs
+          }
+        _ -> Nothing
    in GroupMember {..}
 
 toBusinessChatInfo :: BusinessChatInfoRow -> Maybe BusinessChatInfo
@@ -608,12 +622,15 @@ groupInfoQuery =
     SELECT
       -- GroupInfo
       g.group_id, g.local_display_name, gp.display_name, gp.full_name, g.local_alias, gp.description, gp.image,
-      g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-      g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.custom_data, g.chat_item_ttl,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.member_admission,
+      g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.business_chat, g.business_member_id, g.customer_member_id,
+      g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention,
       -- GroupMember - membership
       mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
       mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
-      pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences
+      pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      mu.created_at, mu.updated_at,
+      mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
     FROM groups g
     JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
     JOIN group_members mu ON mu.group_id = g.group_id
diff --git a/src/Simplex/Chat/Terminal.hs b/src/Simplex/Chat/Terminal.hs
index 829bdc3d31..e432343839 100644
--- a/src/Simplex/Chat/Terminal.hs
+++ b/src/Simplex/Chat/Terminal.hs
@@ -9,14 +9,14 @@ module Simplex.Chat.Terminal where
 
 import Control.Monad
 import qualified Data.List.NonEmpty as L
-import Simplex.Chat (defaultChatConfig, operatorSimpleXChat)
+import Simplex.Chat (defaultChatConfig)
 import Simplex.Chat.Controller
 import Simplex.Chat.Core
 import Simplex.Chat.Help (chatWelcome)
 import Simplex.Chat.Library.Commands (_defaultNtfServers)
 import Simplex.Chat.Operators
+import Simplex.Chat.Operators.Presets (operatorSimpleXChat)
 import Simplex.Chat.Options
-import Simplex.Chat.Options.DB
 import Simplex.Chat.Terminal.Input
 import Simplex.Chat.Terminal.Output
 import Simplex.FileTransfer.Client.Presets (defaultXFTPServers)
@@ -29,6 +29,7 @@ import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB
+import Simplex.Chat.Options.DB
 import System.IO (hFlush, hSetEcho, stdin, stdout)
 #endif
 
diff --git a/src/Simplex/Chat/Terminal/Input.hs b/src/Simplex/Chat/Terminal/Input.hs
index bf48d1d4f5..7c52f59a50 100644
--- a/src/Simplex/Chat/Terminal/Input.hs
+++ b/src/Simplex/Chat/Terminal/Input.hs
@@ -64,12 +64,14 @@ runInputLoop ct@ChatTerminal {termState, liveMessageState} cc = forever $ do
       rh' = if either (const False) allowRemoteCommand cmd then rh else Nothing
   unless (isMessage cmd) $ echo s
   r <- runReaderT (execChatCommand rh' bs) cc
-  processResp s cmd rh r
+  case r of
+    Right r' -> processResp cmd rh r'
+    Left _ -> when (isMessage cmd) $ echo s
   printRespToTerminal ct cc False rh r
-  startLiveMessage cmd r
+  mapM_ (startLiveMessage cmd) r
   where
     echo s = printToTerminal ct [plain s]
-    processResp s cmd rh = \case
+    processResp cmd rh = \case
       CRActiveUser u -> case rh of
         Nothing -> setActive ct ""
         Just rhId -> updateRemoteUser ct u rhId
@@ -80,8 +82,6 @@ runInputLoop ct@ChatTerminal {termState, liveMessageState} cc = forever $ do
       CRContactDeleted u c -> whenCurrUser cc u $ unsetActiveContact ct c
       CRGroupDeletedUser u g -> whenCurrUser cc u $ unsetActiveGroup ct g
       CRSentGroupInvitation u g _ _ -> whenCurrUser cc u $ setActiveGroup ct g
-      CRChatCmdError _ _ -> when (isMessage cmd) $ echo s
-      CRChatError _ _ -> when (isMessage cmd) $ echo s
       CRCmdOk _ -> case cmd of
         Right APIDeleteUser {} -> setActive ct ""
         _ -> pure ()
@@ -133,7 +133,7 @@ runInputLoop ct@ChatTerminal {termState, liveMessageState} cc = forever $ do
         updateLiveMessage typedMsg lm = case liveMessageToSend typedMsg lm of
           Just sentMsg ->
             sendUpdatedLiveMessage cc sentMsg lm True >>= \case
-              CRChatItemUpdated {} -> setLiveMessage lm {sentMsg, typedMsg}
+              Right CRChatItemUpdated {} -> setLiveMessage lm {sentMsg, typedMsg}
               _ -> do
                 -- TODO print error
                 setLiveMessage lm {typedMsg}
@@ -147,10 +147,10 @@ runInputLoop ct@ChatTerminal {termState, liveMessageState} cc = forever $ do
               | otherwise = (s <> reverse (c : w), "")
     startLiveMessage _ _ = pure ()
 
-sendUpdatedLiveMessage :: ChatController -> String -> LiveMessage -> Bool -> IO ChatResponse
+sendUpdatedLiveMessage :: ChatController -> String -> LiveMessage -> Bool -> IO (Either ChatError ChatResponse)
 sendUpdatedLiveMessage cc sentMsg LiveMessage {chatName, chatItemId} live = do
   let cmd = UpdateLiveMessage chatName chatItemId live $ T.pack sentMsg
-  either (CRChatCmdError Nothing) id <$> runExceptT (processChatCommand cmd) `runReaderT` cc
+  runExceptT (processChatCommand cmd) `runReaderT` cc
 
 runTerminalInput :: ChatTerminal -> ChatController -> IO ()
 runTerminalInput ct cc = withChatTerm ct $ do
diff --git a/src/Simplex/Chat/Terminal/Main.hs b/src/Simplex/Chat/Terminal/Main.hs
index aa9adb059f..38b0e91a8a 100644
--- a/src/Simplex/Chat/Terminal/Main.hs
+++ b/src/Simplex/Chat/Terminal/Main.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
 module Simplex.Chat.Terminal.Main where
@@ -7,15 +8,13 @@ import Control.Concurrent (forkIO, threadDelay)
 import Control.Concurrent.STM
 import Control.Monad
 import Data.Maybe (fromMaybe)
-import Data.Time.Clock (getCurrentTime)
-import Data.Time.LocalTime (getCurrentTimeZone)
 import Network.Socket
-import Simplex.Chat.Controller (ChatConfig (..), ChatController (..), ChatResponse (..), PresetServers (..), SimpleNetCfg (..), currentRemoteHost, versionNumber, versionString)
+import Simplex.Chat.Controller (ChatConfig (..), ChatController (..), ChatError, ChatEvent (..), PresetServers (..), SimpleNetCfg (..), currentRemoteHost, versionNumber, versionString)
 import Simplex.Chat.Core
 import Simplex.Chat.Options
 import Simplex.Chat.Options.DB
 import Simplex.Chat.Terminal
-import Simplex.Chat.View (serializeChatResponse, smpProxyModeStr)
+import Simplex.Chat.View (ChatResponseEvent, smpProxyModeStr)
 import Simplex.Messaging.Client (NetworkConfig (..), SocksMode (..))
 import System.Directory (getAppUserDataDirectory)
 import System.Exit (exitFailure)
@@ -43,18 +42,17 @@ simplexChatCLI' cfg opts@ChatOpts {chatCmd, chatCmdLog, chatCmdDelay, chatServer
       simplexChatTerminal cfg opts t
     runCommand user cc = do
       when (chatCmdLog /= CCLNone) . void . forkIO . forever $ do
-        (_, _, r') <- atomically . readTBQueue $ outputQ cc
-        case r' of
-          CRNewChatItems {} -> printResponse r'
-          _ -> when (chatCmdLog == CCLAll) $ printResponse r'
+        (_, r) <- atomically . readTBQueue $ outputQ cc
+        case r of
+          Right CEvtNewChatItems {} -> printResponse r
+          _ -> when (chatCmdLog == CCLAll) $ printResponse r
       sendChatCmdStr cc chatCmd >>= printResponse
       threadDelay $ chatCmdDelay * 1000000
       where
+        printResponse :: ChatResponseEvent r => Either ChatError r -> IO ()
         printResponse r = do
-          ts <- getCurrentTime
-          tz <- getCurrentTimeZone
           rh <- readTVarIO $ currentRemoteHost cc
-          putStrLn $ serializeChatResponse (rh, Just user) ts tz rh r
+          printResponseEvent (rh, Just user) cfg r
 
 welcome :: ChatConfig -> ChatOpts -> IO ()
 welcome ChatConfig {presetServers = PresetServers {netCfg}} ChatOpts {coreOptions = CoreChatOpts {dbOptions, simpleNetCfg = SimpleNetCfg {socksProxy, socksMode, smpProxyMode_, smpProxyFallback_}}} =
diff --git a/src/Simplex/Chat/Terminal/Output.hs b/src/Simplex/Chat/Terminal/Output.hs
index 6c914c7c6d..1ec09d43d6 100644
--- a/src/Simplex/Chat/Terminal/Output.hs
+++ b/src/Simplex/Chat/Terminal/Output.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Simplex.Chat.Terminal.Output where
 
@@ -146,22 +147,22 @@ withTermLock ChatTerminal {termLock} action = do
 runTerminalOutput :: ChatTerminal -> ChatController -> ChatOpts -> IO ()
 runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} ChatOpts {markRead} = do
   forever $ do
-    (_, outputRH, r) <- atomically $ readTBQueue outputQ
-    case r of
-      CRNewChatItems u (ci : _) -> when markRead $ markChatItemRead u ci -- At the moment of writing received items are created one at a time
-      CRChatItemUpdated u ci -> when markRead $ markChatItemRead u ci
-      CRRemoteHostConnected {remoteHost = RemoteHostInfo {remoteHostId}} -> getRemoteUser remoteHostId
-      CRRemoteHostStopped {remoteHostId_} -> mapM_ removeRemoteUser remoteHostId_
+    (outputRH, r_) <- atomically $ readTBQueue outputQ
+    forM_ r_ $ \case
+      CEvtNewChatItems u (ci : _) -> when markRead $ markChatItemRead u ci -- At the moment of writing received items are created one at a time
+      CEvtChatItemUpdated u ci -> when markRead $ markChatItemRead u ci
+      CEvtRemoteHostConnected {remoteHost = RemoteHostInfo {remoteHostId}} -> getRemoteUser remoteHostId
+      CEvtRemoteHostStopped {remoteHostId_} -> mapM_ removeRemoteUser remoteHostId_
       _ -> pure ()
-    let printResp = case logFilePath of
-          Just path -> if logResponseToFile r then logResponse path else printToTerminal ct
+    let printEvent = case logFilePath of
+          Just path -> if either (const True) logEventToFile r_ then logResponse path else printToTerminal ct
           _ -> printToTerminal ct
     liveItems <- readTVarIO showLiveItems
-    responseString ct cc liveItems outputRH r >>= printResp
-    responseNotification ct cc r
+    responseString ct cc liveItems outputRH r_ >>= printEvent
+    mapM_ (chatEventNotification ct cc) r_
   where
     markChatItemRead u (AChatItem _ _ chat ci@ChatItem {chatDir, meta = CIMeta {itemStatus}}) =
-      case (chatDirNtf u chat chatDir (isMention ci), itemStatus) of
+      case (chatDirNtf u chat chatDir (isUserMention ci), itemStatus) of
         (True, CISRcvNew) -> do
           let itemId = chatItemId' ci
               chatRef = chatInfoToRef chat
@@ -170,45 +171,47 @@ runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} Cha
     logResponse path s = withFile path AppendMode $ \h -> mapM_ (hPutStrLn h . unStyle) s
     getRemoteUser rhId =
       runReaderT (execChatCommand (Just rhId) "/user") cc >>= \case
-        CRActiveUser {user} -> updateRemoteUser ct user rhId
+        Right CRActiveUser {user} -> updateRemoteUser ct user rhId
         cr -> logError $ "Unexpected reply while getting remote user: " <> tshow cr
     removeRemoteUser rhId = atomically $ TM.delete rhId (currentRemoteUsers ct)
 
-responseNotification :: ChatTerminal -> ChatController -> ChatResponse -> IO ()
-responseNotification t@ChatTerminal {sendNotification} cc = \case
+chatEventNotification :: ChatTerminal -> ChatController -> ChatEvent -> IO ()
+chatEventNotification t@ChatTerminal {sendNotification} cc = \case
   -- At the moment of writing received items are created one at a time
-  CRNewChatItems u ((AChatItem _ SMDRcv cInfo ci@ChatItem {chatDir, content = CIRcvMsgContent mc, formattedText}) : _) ->
-    when (chatDirNtf u cInfo chatDir $ isMention ci) $ do
+  CEvtNewChatItems u ((AChatItem _ SMDRcv cInfo ci@ChatItem {chatDir, content = CIRcvMsgContent mc, formattedText}) : _) ->
+    when (chatDirNtf u cInfo chatDir $ isUserMention ci) $ do
       whenCurrUser cc u $ setActiveChat t cInfo
       case (cInfo, chatDir) of
         (DirectChat ct, _) -> sendNtf (viewContactName ct <> "> ", text)
-        (GroupChat g, CIGroupRcv m) -> sendNtf (fromGroup_ g m, text)
+        (GroupChat g scopeInfo, CIGroupRcv m) -> sendNtf (fromGroup_ g scopeInfo m, text)
         _ -> pure ()
     where
       text = msgText mc formattedText
-  CRChatItemUpdated u (AChatItem _ SMDRcv cInfo ci@ChatItem {chatDir, content = CIRcvMsgContent _}) ->
-    whenCurrUser cc u $ when (chatDirNtf u cInfo chatDir $ isMention ci) $ setActiveChat t cInfo
-  CRContactConnected u ct _ -> when (contactNtf u ct False) $ do
+  CEvtChatItemUpdated u (AChatItem _ SMDRcv cInfo ci@ChatItem {chatDir, content = CIRcvMsgContent _}) ->
+    whenCurrUser cc u $ when (chatDirNtf u cInfo chatDir $ isUserMention ci) $ setActiveChat t cInfo
+  CEvtContactConnected u ct _ -> when (contactNtf u ct False) $ do
     whenCurrUser cc u $ setActiveContact t ct
     sendNtf (viewContactName ct <> "> ", "connected")
-  CRContactSndReady u ct ->
+  CEvtContactSndReady u ct ->
     whenCurrUser cc u $ setActiveContact t ct
-  CRContactAnotherClient u ct -> do
+  CEvtContactAnotherClient u ct -> do
     whenCurrUser cc u $ unsetActiveContact t ct
     when (contactNtf u ct False) $ sendNtf (viewContactName ct <> "> ", "connected to another client")
-  CRContactsDisconnected srv _ -> serverNtf srv "disconnected"
-  CRContactsSubscribed srv _ -> serverNtf srv "connected"
-  CRReceivedGroupInvitation u g ct _ _ ->
+  CEvtContactsDisconnected srv _ -> serverNtf srv "disconnected"
+  CEvtContactsSubscribed srv _ -> serverNtf srv "connected"
+  CEvtReceivedGroupInvitation u g ct _ _ ->
     when (contactNtf u ct False) $
       sendNtf ("#" <> viewGroupName g <> " " <> viewContactName ct <> "> ", "invited you to join the group")
-  CRUserJoinedGroup u g _ -> when (groupNtf u g False) $ do
+  CEvtUserJoinedGroup u g _ -> when (groupNtf u g False) $ do
     whenCurrUser cc u $ setActiveGroup t g
     sendNtf ("#" <> viewGroupName g, "you are connected to group")
-  CRJoinedGroupMember u g m ->
+  CEvtJoinedGroupMember u g m ->
     when (groupNtf u g False) $ sendNtf ("#" <> viewGroupName g, "member " <> viewMemberName m <> " is connected")
-  CRConnectedToGroupMember u g m _ ->
+  CEvtJoinedGroupMemberConnecting u g _ m | memberStatus m == GSMemPendingReview ->
+    when (groupNtf u g False) $ sendNtf ("#" <> viewGroupName g, "member " <> viewMemberName m <> " is pending review")
+  CEvtConnectedToGroupMember u g m _ ->
     when (groupNtf u g False) $ sendNtf ("#" <> viewGroupName g, "member " <> viewMemberName m <> " is connected")
-  CRReceivedContactRequest u UserContactRequest {localDisplayName = n} ->
+  CEvtReceivedContactRequest u UserContactRequest {localDisplayName = n} ->
     when (userNtf u) $ sendNtf (viewName n <> ">", "wants to connect to you")
   _ -> pure ()
   where
@@ -232,7 +235,7 @@ chatActiveTo (ChatName cType name) = case cType of
 chatInfoActiveTo :: ChatInfo c -> String
 chatInfoActiveTo = \case
   DirectChat c -> contactActiveTo c
-  GroupChat g -> groupActiveTo g
+  GroupChat g _scopeInfo -> groupActiveTo g
   _ -> ""
 
 contactActiveTo :: Contact -> String
@@ -271,15 +274,17 @@ whenCurrUser cc u a = do
   where
     sameUser User {userId = uId} = maybe False $ \User {userId} -> userId == uId
 
-printRespToTerminal :: ChatTerminal -> ChatController -> Bool -> Maybe RemoteHostId -> ChatResponse -> IO ()
+printRespToTerminal :: ChatTerminal -> ChatController -> Bool -> Maybe RemoteHostId -> Either ChatError ChatResponse -> IO ()
 printRespToTerminal ct cc liveItems outputRH r = responseString ct cc liveItems outputRH r >>= printToTerminal ct
 
-responseString :: ChatTerminal -> ChatController -> Bool -> Maybe RemoteHostId -> ChatResponse -> IO [StyledString]
-responseString ct cc liveItems outputRH r = do
-  cu <- getCurrentUser ct cc
-  ts <- getCurrentTime
-  tz <- getCurrentTimeZone
-  pure $ responseToView cu (config cc) liveItems ts tz outputRH r
+responseString :: forall r. ChatResponseEvent r => ChatTerminal -> ChatController -> Bool -> Maybe RemoteHostId -> Either ChatError r -> IO [StyledString]
+responseString ct cc liveItems outputRH = \case
+  Right r -> do
+    cu <- getCurrentUser ct cc
+    ts <- getCurrentTime
+    tz <- getCurrentTimeZone
+    pure $ responseToView cu (config cc) liveItems ts tz outputRH r
+  Left e -> pure $ chatErrorToView (isCommandResponse @r) (config cc) e
 
 updateRemoteUser :: ChatTerminal -> User -> RemoteHostId -> IO ()
 updateRemoteUser ct user rhId = atomically $ TM.insert rhId user (currentRemoteUsers ct)
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index 11587694cb..567baf0cdf 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -26,14 +26,17 @@
 
 module Simplex.Chat.Types where
 
+import Control.Applicative ((<|>))
 import Crypto.Number.Serialize (os2ip)
 import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Encoding as JE
 import qualified Data.Aeson.TH as JQ
 import qualified Data.Attoparsec.ByteString.Char8 as A
+import qualified Data.ByteString.Base64 as B64
 import Data.ByteString.Char8 (ByteString, pack, unpack)
 import qualified Data.ByteString.Lazy as LB
+import Data.Functor (($>))
 import Data.Int (Int64)
 import Data.Maybe (isJust)
 import Data.Text (Text)
@@ -48,13 +51,13 @@ import Simplex.Chat.Types.UITheme
 import Simplex.Chat.Types.Util
 import Simplex.FileTransfer.Description (FileDigest)
 import Simplex.FileTransfer.Types (RcvFileId, SndFileId)
-import Simplex.Messaging.Agent.Protocol (ACorrId, AEventTag (..), AEvtTag (..), ConnId, ConnectionMode (..), ConnectionRequestUri, InvitationId, SAEntity (..), UserId)
-import Simplex.Messaging.Agent.Store.DB (Binary (..))
+import Simplex.Messaging.Agent.Protocol (ACorrId, AEventTag (..), AEvtTag (..), ConnId, ConnShortLink, ConnectionLink, ConnectionMode (..), ConnectionRequestUri, CreatedConnLink, InvitationId, SAEntity (..), UserId)
+import Simplex.Messaging.Agent.Store.DB (Binary (..), blobFieldDecoder, fromTextField_)
 import Simplex.Messaging.Crypto.File (CryptoFileArgs (..))
 import Simplex.Messaging.Crypto.Ratchet (PQEncryption (..), PQSupport, pattern PQEncOff)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (blobFieldDecoder, defaultJSON, dropPrefix, enumJSON, fromTextField_, sumTypeJSON)
-import Simplex.Messaging.Util (safeDecodeUtf8, (<$?>))
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON)
+import Simplex.Messaging.Util (decodeJSON, encodeJSON, safeDecodeUtf8, (<$?>))
 import Simplex.Messaging.Version
 import Simplex.Messaging.Version.Internal
 #if defined(dbPostgres)
@@ -217,6 +220,8 @@ contactConnId c = aConnId <$> contactConn c
 
 type IncognitoEnabled = Bool
 
+type CreateShortLink = Bool
+
 contactConnIncognito :: Contact -> IncognitoEnabled
 contactConnIncognito = maybe False connIncognito . contactConn
 
@@ -366,6 +371,8 @@ type UserName = Text
 
 type ContactName = Text
 
+type MemberName = Text
+
 type GroupName = Text
 
 optionalFullName :: ContactName -> Text -> Text
@@ -373,6 +380,26 @@ optionalFullName displayName fullName
   | T.null fullName || displayName == fullName = ""
   | otherwise = " (" <> fullName <> ")"
 
+data ShortGroup = ShortGroup
+  { shortInfo :: ShortGroupInfo,
+    members :: [ShortGroupMember]
+  }
+
+data ShortGroupInfo = ShortGroupInfo
+  { groupId :: GroupId,
+    groupName :: GroupName,
+    membershipStatus :: GroupMemberStatus
+  }
+  deriving (Eq, Show)
+
+data ShortGroupMember = ShortGroupMember
+  { groupMemberId :: GroupMemberId,
+    groupId :: GroupId,
+    memberName :: ContactName,
+    connId :: AgentConnId
+  }
+  deriving (Show)
+
 data Group = Group {groupInfo :: GroupInfo, members :: [GroupMember]}
   deriving (Eq, Show)
 
@@ -386,7 +413,6 @@ data GroupInfo = GroupInfo
     businessChat :: Maybe BusinessChatInfo,
     fullGroupPreferences :: FullGroupPreferences,
     membership :: GroupMember,
-    hostConnCustomUserProfileId :: Maybe ProfileId,
     chatSettings :: ChatSettings,
     createdAt :: UTCTime,
     updatedAt :: UTCTime,
@@ -395,7 +421,8 @@ data GroupInfo = GroupInfo
     chatTags :: [ChatTagId],
     chatItemTTL :: Maybe Int64,
     uiThemes :: Maybe UIThemeEntityOverrides,
-    customData :: Maybe CustomData
+    customData :: Maybe CustomData,
+    membersRequireAttention :: Int
   }
   deriving (Eq, Show)
 
@@ -535,7 +562,7 @@ data Profile = Profile
   { displayName :: ContactName,
     fullName :: Text,
     image :: Maybe ImageData,
-    contactLink :: Maybe ConnReqContact,
+    contactLink :: Maybe ConnLinkContact,
     preferences :: Maybe Preferences
     -- fields that should not be read into this data type to prevent sending them as part of profile to contacts:
     -- - contact_profile_id
@@ -568,7 +595,7 @@ data LocalProfile = LocalProfile
     displayName :: ContactName,
     fullName :: Text,
     image :: Maybe ImageData,
-    contactLink :: Maybe ConnReqContact,
+    contactLink :: Maybe ConnLinkContact,
     preferences :: Maybe Preferences,
     localAlias :: LocalAlias
   }
@@ -590,10 +617,24 @@ data GroupProfile = GroupProfile
     fullName :: Text,
     description :: Maybe Text,
     image :: Maybe ImageData,
-    groupPreferences :: Maybe GroupPreferences
+    groupPreferences :: Maybe GroupPreferences,
+    memberAdmission :: Maybe GroupMemberAdmission
   }
   deriving (Eq, Show)
 
+data GroupMemberAdmission = GroupMemberAdmission
+  { -- names :: Maybe MemberCriteria,
+    -- captcha :: Maybe MemberCriteria,
+    review :: Maybe MemberCriteria
+  }
+  deriving (Eq, Show)
+
+data MemberCriteria = MCAll
+  deriving (Eq, Show)
+
+emptyGroupMemberAdmission :: GroupMemberAdmission
+emptyGroupMemberAdmission = GroupMemberAdmission Nothing
+
 newtype ImageData = ImageData Text
   deriving (Eq, Show)
 
@@ -644,11 +685,47 @@ data GroupLinkInvitation = GroupLinkInvitation
     fromMemberName :: ContactName,
     invitedMember :: MemberIdRole,
     groupProfile :: GroupProfile,
+    accepted :: Maybe GroupAcceptance,
     business :: Maybe BusinessChatInfo,
     groupSize :: Maybe Int
   }
   deriving (Eq, Show)
 
+data GroupLinkRejection = GroupLinkRejection
+  { fromMember :: MemberIdRole,
+    invitedMember :: MemberIdRole,
+    groupProfile :: GroupProfile,
+    rejectionReason :: GroupRejectionReason
+  }
+  deriving (Eq, Show)
+
+data GroupRejectionReason
+  = GRRLongName
+  | GRRBlockedName
+  | GRRUnknown {text :: Text}
+  deriving (Eq, Show)
+
+instance FromField GroupRejectionReason where fromField = blobFieldDecoder strDecode
+
+instance ToField GroupRejectionReason where toField = toField . strEncode
+
+instance StrEncoding GroupRejectionReason where
+  strEncode = \case
+    GRRLongName -> "long_name"
+    GRRBlockedName -> "blocked_name"
+    GRRUnknown text -> encodeUtf8 text
+  strP =
+    "long_name" $> GRRLongName
+    <|> "blocked_name" $> GRRBlockedName
+    <|> GRRUnknown . safeDecodeUtf8 <$> A.takeByteString
+
+instance FromJSON GroupRejectionReason where
+  parseJSON = strParseJSON "GroupRejectionReason"
+
+instance ToJSON GroupRejectionReason where
+  toJSON = strToJSON
+  toEncoding = strToJEncoding
+
 data MemberIdRole = MemberIdRole
   { memberId :: MemberId,
     memberRole :: GroupMemberRole
@@ -763,10 +840,29 @@ data GroupMember = GroupMember
     -- member chat protocol version range; if member has active connection, its version range is preferred;
     -- for membership current supportedChatVRange is set, it's not updated on protocol version increase in database,
     -- but it's correctly set on read (see toGroupInfo)
-    memberChatVRange :: VersionRangeChat
+    memberChatVRange :: VersionRangeChat,
+    createdAt :: UTCTime,
+    updatedAt :: UTCTime,
+    supportChat :: Maybe GroupSupportChat
   }
   deriving (Eq, Show)
 
+data GroupSupportChat = GroupSupportChat
+  { chatTs :: UTCTime,
+    unread :: Int64,
+    memberAttention :: Int64,
+    mentions :: Int64,
+    lastMsgFromMemberTs :: Maybe UTCTime
+  }
+  deriving (Eq, Show)
+
+gmRequiresAttention :: GroupMember -> Bool
+gmRequiresAttention m@GroupMember {supportChat} =
+  memberPending m || maybe False supportChatAttention supportChat
+  where
+    supportChatAttention GroupSupportChat {memberAttention, mentions} =
+      memberAttention > 0 || mentions > 0
+
 data GroupMemberRef = GroupMemberRef {groupMemberId :: Int64, profile :: Profile}
   deriving (Eq, Show)
 
@@ -780,6 +876,9 @@ memberConn GroupMember {activeConn} = activeConn
 memberConnId :: GroupMember -> Maybe ConnId
 memberConnId GroupMember {activeConn} = aConnId <$> activeConn
 
+sameMemberId :: MemberId -> GroupMember -> Bool
+sameMemberId memId GroupMember {memberId} = memId == memberId
+
 memberChatVRange' :: GroupMember -> VersionRangeChat
 memberChatVRange' GroupMember {activeConn, memberChatVRange} = case activeConn of
   Just Connection {peerChatVRange} -> peerChatVRange
@@ -791,6 +890,9 @@ supportsVersion m v = maxVersion (memberChatVRange' m) >= v
 groupMemberId' :: GroupMember -> GroupMemberId
 groupMemberId' GroupMember {groupMemberId} = groupMemberId
 
+memberId' :: GroupMember -> MemberId
+memberId' GroupMember {memberId} = memberId
+
 memberIncognito :: GroupMember -> IncognitoEnabled
 memberIncognito GroupMember {memberProfile, memberContactProfileId} = localProfileId memberProfile /= memberContactProfileId
 
@@ -819,7 +921,7 @@ data NewGroupMember = NewGroupMember
   }
 
 newtype MemberId = MemberId {unMemberId :: ByteString}
-  deriving (Eq, Show)
+  deriving (Eq, Ord, Show)
   deriving newtype (FromField)
 
 instance ToField MemberId where toField (MemberId m) = toField $ Binary m
@@ -836,6 +938,9 @@ instance ToJSON MemberId where
   toJSON = strToJSON
   toEncoding = strToJEncoding
 
+nameFromMemberId :: MemberId -> ContactName
+nameFromMemberId = T.take 7 . safeDecodeUtf8 . B64.encode . unMemberId
+
 data InvitedBy = IBContact {byContactId :: Int64} | IBUser | IBUnknown
   deriving (Eq, Show)
 
@@ -924,11 +1029,14 @@ instance TextEncoding GroupMemberCategory where
     GCPostMember -> "post"
 
 data GroupMemberStatus
-  = GSMemRemoved -- member who was removed from the group
+  = GSMemRejected -- joining member who was rejected by the host, or host that rejected the join
+  | GSMemRemoved -- member who was removed from the group
   | GSMemLeft -- member who left the group
   | GSMemGroupDeleted -- user member of the deleted group
   | GSMemUnknown -- unknown member, whose message was forwarded by an admin (likely member wasn't introduced due to not being a current member, but message was included in history)
   | GSMemInvited -- member is sent to or received invitation to join the group
+  | GSMemPendingApproval -- member is connected to host but pending host approval before connecting to other members ("knocking")
+  | GSMemPendingReview -- member is introduced to admins but pending admin review before connecting to other members ("knocking")
   | GSMemIntroduced -- user received x.grp.mem.intro for this member (only with GCPreMember)
   | GSMemIntroInvited -- member is sent to or received from intro invitation
   | GSMemAccepted -- member accepted invitation (only User and Invitee)
@@ -949,13 +1057,23 @@ instance ToJSON GroupMemberStatus where
   toJSON = J.String . textEncode
   toEncoding = JE.text . textEncode
 
+acceptanceToStatus :: Maybe GroupMemberAdmission -> GroupAcceptance -> GroupMemberStatus
+acceptanceToStatus memberAdmission groupAcceptance
+  | groupAcceptance == GAPendingApproval = GSMemPendingApproval
+  | groupAcceptance == GAPendingReview = GSMemPendingReview
+  | (memberAdmission >>= review) == Just MCAll = GSMemPendingReview
+  | otherwise = GSMemAccepted
+
 memberActive :: GroupMember -> Bool
 memberActive m = case memberStatus m of
+  GSMemRejected -> False
   GSMemRemoved -> False
   GSMemLeft -> False
   GSMemGroupDeleted -> False
   GSMemUnknown -> False
   GSMemInvited -> False
+  GSMemPendingApproval -> True
+  GSMemPendingReview -> True
   GSMemIntroduced -> False
   GSMemIntroInvited -> False
   GSMemAccepted -> False
@@ -967,14 +1085,26 @@ memberActive m = case memberStatus m of
 memberCurrent :: GroupMember -> Bool
 memberCurrent = memberCurrent' . memberStatus
 
+memberPending :: GroupMember -> Bool
+memberPending m = case memberStatus m of
+  GSMemPendingApproval -> True
+  GSMemPendingReview -> True
+  _ -> False
+
+memberCurrentOrPending :: GroupMember -> Bool
+memberCurrentOrPending m = memberCurrent m || memberPending m
+
 -- update getGroupSummary if this is changed
 memberCurrent' :: GroupMemberStatus -> Bool
 memberCurrent' = \case
+  GSMemRejected -> False
   GSMemRemoved -> False
   GSMemLeft -> False
   GSMemGroupDeleted -> False
   GSMemUnknown -> False
   GSMemInvited -> False
+  GSMemPendingApproval -> False
+  GSMemPendingReview -> False
   GSMemIntroduced -> True
   GSMemIntroInvited -> True
   GSMemAccepted -> True
@@ -985,11 +1115,14 @@ memberCurrent' = \case
 
 memberRemoved :: GroupMember -> Bool
 memberRemoved m = case memberStatus m of
+  GSMemRejected -> True
   GSMemRemoved -> True
   GSMemLeft -> True
   GSMemGroupDeleted -> True
   GSMemUnknown -> False
   GSMemInvited -> False
+  GSMemPendingApproval -> False
+  GSMemPendingReview -> False
   GSMemIntroduced -> False
   GSMemIntroInvited -> False
   GSMemAccepted -> False
@@ -1000,11 +1133,14 @@ memberRemoved m = case memberStatus m of
 
 instance TextEncoding GroupMemberStatus where
   textDecode = \case
+    "rejected" -> Just GSMemRejected
     "removed" -> Just GSMemRemoved
     "left" -> Just GSMemLeft
     "deleted" -> Just GSMemGroupDeleted
     "unknown" -> Just GSMemUnknown
     "invited" -> Just GSMemInvited
+    "pending_approval" -> Just GSMemPendingApproval
+    "pending_review" -> Just GSMemPendingReview
     "introduced" -> Just GSMemIntroduced
     "intro-inv" -> Just GSMemIntroInvited
     "accepted" -> Just GSMemAccepted
@@ -1014,11 +1150,14 @@ instance TextEncoding GroupMemberStatus where
     "creator" -> Just GSMemCreator
     _ -> Nothing
   textEncode = \case
+    GSMemRejected -> "rejected"
     GSMemRemoved -> "removed"
     GSMemLeft -> "left"
     GSMemGroupDeleted -> "deleted"
     GSMemUnknown -> "unknown"
     GSMemInvited -> "invited"
+    GSMemPendingApproval -> "pending_approval"
+    GSMemPendingReview -> "pending_review"
     GSMemIntroduced -> "introduced"
     GSMemIntroInvited -> "intro-inv"
     GSMemAccepted -> "accepted"
@@ -1322,6 +1461,14 @@ type ConnReqInvitation = ConnectionRequestUri 'CMInvitation
 
 type ConnReqContact = ConnectionRequestUri 'CMContact
 
+type CreatedLinkInvitation = CreatedConnLink 'CMInvitation
+
+type CreatedLinkContact = CreatedConnLink 'CMContact
+
+type ConnLinkContact = ConnectionLink 'CMContact
+
+type ShortLinkContact = ConnShortLink 'CMContact
+
 data Connection = Connection
   { connId :: Int64,
     agentConnId :: AgentConnId,
@@ -1399,7 +1546,7 @@ data PendingContactConnection = PendingContactConnection
     viaUserContactLink :: Maybe Int64,
     groupLinkId :: Maybe GroupLinkId,
     customUserProfileId :: Maybe Int64,
-    connReqInv :: Maybe ConnReqInvitation,
+    connLinkInv :: Maybe CreatedLinkInvitation,
     localAlias :: Text,
     createdAt :: UTCTime,
     updatedAt :: UTCTime
@@ -1721,6 +1868,16 @@ $(JQ.deriveJSON defaultJSON ''LocalProfile)
 
 $(JQ.deriveJSON defaultJSON ''UserContactRequest)
 
+$(JQ.deriveJSON (enumJSON $ dropPrefix "MC") {J.tagSingleConstructors = True} ''MemberCriteria)
+
+$(JQ.deriveJSON defaultJSON ''GroupMemberAdmission)
+
+instance ToField GroupMemberAdmission where
+  toField = toField . encodeJSON
+
+instance FromField GroupMemberAdmission where
+  fromField = fromTextField_ decodeJSON
+
 $(JQ.deriveJSON defaultJSON ''GroupProfile)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "IB") ''InvitedBy)
@@ -1737,6 +1894,8 @@ $(JQ.deriveJSON defaultJSON ''Connection)
 
 $(JQ.deriveJSON defaultJSON ''PendingContactConnection)
 
+$(JQ.deriveJSON defaultJSON ''GroupSupportChat)
+
 $(JQ.deriveJSON defaultJSON ''GroupMember)
 
 $(JQ.deriveJSON (enumJSON $ dropPrefix "MF") ''MsgFilter)
@@ -1767,6 +1926,8 @@ $(JQ.deriveJSON defaultJSON ''GroupInvitation)
 
 $(JQ.deriveJSON defaultJSON ''GroupLinkInvitation)
 
+$(JQ.deriveJSON defaultJSON ''GroupLinkRejection)
+
 $(JQ.deriveJSON defaultJSON ''IntroInvitation)
 
 $(JQ.deriveJSON defaultJSON ''MemberRestrictions)
@@ -1812,3 +1973,7 @@ $(JQ.deriveJSON defaultJSON ''ContactRef)
 $(JQ.deriveJSON defaultJSON ''NoteFolder)
 
 $(JQ.deriveJSON defaultJSON ''ChatTag)
+
+$(JQ.deriveJSON defaultJSON ''ShortGroupInfo)
+
+$(JQ.deriveJSON defaultJSON ''ShortGroupMember)
diff --git a/src/Simplex/Chat/Types/Preferences.hs b/src/Simplex/Chat/Types/Preferences.hs
index 07e32e7d56..63d80657dc 100644
--- a/src/Simplex/Chat/Types/Preferences.hs
+++ b/src/Simplex/Chat/Types/Preferences.hs
@@ -32,8 +32,9 @@ import qualified Data.Text as T
 import GHC.Records.Compat
 import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types.Shared
+import Simplex.Messaging.Agent.Store.DB (blobFieldDecoder, fromTextField_)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (blobFieldDecoder, defaultJSON, dropPrefix, enumJSON, fromTextField_, sumTypeJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON)
 import Simplex.Messaging.Util (decodeJSON, encodeJSON, safeDecodeUtf8, (<$?>))
 
 data ChatFeature
@@ -149,6 +150,7 @@ data GroupFeature
   | GFVoice
   | GFFiles
   | GFSimplexLinks
+  | GFReports
   | GFHistory
   deriving (Show)
 
@@ -160,6 +162,7 @@ data SGroupFeature (f :: GroupFeature) where
   SGFVoice :: SGroupFeature 'GFVoice
   SGFFiles :: SGroupFeature 'GFFiles
   SGFSimplexLinks :: SGroupFeature 'GFSimplexLinks
+  SGFReports :: SGroupFeature 'GFReports
   SGFHistory :: SGroupFeature 'GFHistory
 
 deriving instance Show (SGroupFeature f)
@@ -185,6 +188,7 @@ groupFeatureNameText = \case
   GFVoice -> "Voice messages"
   GFFiles -> "Files and media"
   GFSimplexLinks -> "SimpleX links"
+  GFReports -> "Member reports"
   GFHistory -> "Recent history"
 
 groupFeatureNameText' :: SGroupFeature f -> Text
@@ -208,11 +212,12 @@ allGroupFeatures =
     AGF SGFVoice,
     AGF SGFFiles,
     AGF SGFSimplexLinks,
+    AGF SGFReports,
     AGF SGFHistory
   ]
 
 groupPrefSel :: SGroupFeature f -> GroupPreferences -> Maybe (GroupFeaturePreference f)
-groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, history} = case f of
+groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history} = case f of
   SGFTimedMessages -> timedMessages
   SGFDirectMessages -> directMessages
   SGFFullDelete -> fullDelete
@@ -220,6 +225,7 @@ groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reac
   SGFVoice -> voice
   SGFFiles -> files
   SGFSimplexLinks -> simplexLinks
+  SGFReports -> reports
   SGFHistory -> history
 
 toGroupFeature :: SGroupFeature f -> GroupFeature
@@ -231,6 +237,7 @@ toGroupFeature = \case
   SGFVoice -> GFVoice
   SGFFiles -> GFFiles
   SGFSimplexLinks -> GFSimplexLinks
+  SGFReports -> GFReports
   SGFHistory -> GFHistory
 
 class GroupPreferenceI p where
@@ -243,7 +250,7 @@ instance GroupPreferenceI (Maybe GroupPreferences) where
   getGroupPreference pt prefs = fromMaybe (getGroupPreference pt defaultGroupPrefs) (groupPrefSel pt =<< prefs)
 
 instance GroupPreferenceI FullGroupPreferences where
-  getGroupPreference f FullGroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, history} = case f of
+  getGroupPreference f FullGroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history} = case f of
     SGFTimedMessages -> timedMessages
     SGFDirectMessages -> directMessages
     SGFFullDelete -> fullDelete
@@ -251,6 +258,7 @@ instance GroupPreferenceI FullGroupPreferences where
     SGFVoice -> voice
     SGFFiles -> files
     SGFSimplexLinks -> simplexLinks
+    SGFReports -> reports
     SGFHistory -> history
   {-# INLINE getGroupPreference #-}
 
@@ -263,6 +271,7 @@ data GroupPreferences = GroupPreferences
     voice :: Maybe VoiceGroupPreference,
     files :: Maybe FilesGroupPreference,
     simplexLinks :: Maybe SimplexLinksGroupPreference,
+    reports :: Maybe ReportsGroupPreference,
     history :: Maybe HistoryGroupPreference
   }
   deriving (Eq, Show)
@@ -296,6 +305,7 @@ setGroupPreference_ f pref prefs =
     SGFVoice -> prefs {voice = pref}
     SGFFiles -> prefs {files = pref}
     SGFSimplexLinks -> prefs {simplexLinks = pref}
+    SGFReports -> prefs {reports = pref}
     SGFHistory -> prefs {history = pref}
 
 setGroupTimedMessagesPreference :: TimedMessagesGroupPreference -> Maybe GroupPreferences -> GroupPreferences
@@ -325,6 +335,7 @@ data FullGroupPreferences = FullGroupPreferences
     voice :: VoiceGroupPreference,
     files :: FilesGroupPreference,
     simplexLinks :: SimplexLinksGroupPreference,
+    reports :: ReportsGroupPreference,
     history :: HistoryGroupPreference
   }
   deriving (Eq, Show)
@@ -377,22 +388,23 @@ defaultGroupPrefs =
   FullGroupPreferences
     { timedMessages = TimedMessagesGroupPreference {enable = FEOff, ttl = Just 86400},
       directMessages = DirectMessagesGroupPreference {enable = FEOff, role = Nothing},
-      fullDelete = FullDeleteGroupPreference {enable = FEOff},
+      fullDelete = FullDeleteGroupPreference {enable = FEOff, role = Nothing},
       reactions = ReactionsGroupPreference {enable = FEOn},
       voice = VoiceGroupPreference {enable = FEOn, role = Nothing},
       files = FilesGroupPreference {enable = FEOn, role = Nothing},
       simplexLinks = SimplexLinksGroupPreference {enable = FEOn, role = Nothing},
+      reports = ReportsGroupPreference {enable = FEOn},
       history = HistoryGroupPreference {enable = FEOff}
     }
 
 emptyGroupPrefs :: GroupPreferences
-emptyGroupPrefs = GroupPreferences Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+emptyGroupPrefs = GroupPreferences Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
 
 businessGroupPrefs :: Preferences -> GroupPreferences
 businessGroupPrefs Preferences {timedMessages, fullDelete, reactions, voice} =
   defaultBusinessGroupPrefs
     { timedMessages = Just TimedMessagesGroupPreference {enable = maybe FEOff enableFeature timedMessages, ttl = maybe Nothing prefParam timedMessages},
-      fullDelete = Just FullDeleteGroupPreference {enable = maybe FEOff enableFeature fullDelete},
+      fullDelete = Just FullDeleteGroupPreference {enable = maybe FEOff enableFeature fullDelete, role = Nothing},
       reactions = Just ReactionsGroupPreference {enable = maybe FEOn enableFeature reactions},
       voice = Just VoiceGroupPreference {enable = maybe FEOff enableFeature voice, role = Nothing}
     }
@@ -407,11 +419,12 @@ defaultBusinessGroupPrefs =
   GroupPreferences
     { timedMessages = Just $ TimedMessagesGroupPreference FEOff Nothing,
       directMessages = Just $ DirectMessagesGroupPreference FEOff Nothing,
-      fullDelete = Just $ FullDeleteGroupPreference FEOff,
+      fullDelete = Just $ FullDeleteGroupPreference FEOn (Just GRModerator),
       reactions = Just $ ReactionsGroupPreference FEOn,
       voice = Just $ VoiceGroupPreference FEOff Nothing,
       files = Just $ FilesGroupPreference FEOn Nothing,
       simplexLinks = Just $ SimplexLinksGroupPreference FEOn Nothing,
+      reports = Just $ ReportsGroupPreference FEOff,
       history = Just $ HistoryGroupPreference FEOn
     }
 
@@ -493,7 +506,7 @@ data DirectMessagesGroupPreference = DirectMessagesGroupPreference
   deriving (Eq, Show)
 
 data FullDeleteGroupPreference = FullDeleteGroupPreference
-  {enable :: GroupFeatureEnabled}
+  {enable :: GroupFeatureEnabled, role :: Maybe GroupMemberRole}
   deriving (Eq, Show)
 
 data ReactionsGroupPreference = ReactionsGroupPreference
@@ -512,6 +525,10 @@ data SimplexLinksGroupPreference = SimplexLinksGroupPreference
   {enable :: GroupFeatureEnabled, role :: Maybe GroupMemberRole}
   deriving (Eq, Show)
 
+data ReportsGroupPreference = ReportsGroupPreference
+  {enable :: GroupFeatureEnabled}
+  deriving (Eq, Show)
+
 data HistoryGroupPreference = HistoryGroupPreference
   {enable :: GroupFeatureEnabled}
   deriving (Eq, Show)
@@ -550,6 +567,9 @@ instance HasField "enable" FilesGroupPreference GroupFeatureEnabled where
 instance HasField "enable" SimplexLinksGroupPreference GroupFeatureEnabled where
   hasField p@SimplexLinksGroupPreference {enable} = (\e -> p {enable = e}, enable)
 
+instance HasField "enable" ReportsGroupPreference GroupFeatureEnabled where
+  hasField p@ReportsGroupPreference {enable} = (\e -> p {enable = e}, enable)
+
 instance HasField "enable" HistoryGroupPreference GroupFeatureEnabled where
   hasField p@HistoryGroupPreference {enable} = (\e -> p {enable = e}, enable)
 
@@ -569,7 +589,7 @@ instance GroupFeatureI 'GFFullDelete where
   type GroupFeaturePreference 'GFFullDelete = FullDeleteGroupPreference
   sGroupFeature = SGFFullDelete
   groupPrefParam _ = Nothing
-  groupPrefRole _ = Nothing
+  groupPrefRole FullDeleteGroupPreference {role} = role
 
 instance GroupFeatureI 'GFReactions where
   type GroupFeaturePreference 'GFReactions = ReactionsGroupPreference
@@ -595,6 +615,12 @@ instance GroupFeatureI 'GFSimplexLinks where
   groupPrefParam _ = Nothing
   groupPrefRole SimplexLinksGroupPreference {role} = role
 
+instance GroupFeatureI 'GFReports where
+  type GroupFeaturePreference 'GFReports = ReportsGroupPreference
+  sGroupFeature = SGFReports
+  groupPrefParam _ = Nothing
+  groupPrefRole _ = Nothing
+
 instance GroupFeatureI 'GFHistory where
   type GroupFeaturePreference 'GFHistory = HistoryGroupPreference
   sGroupFeature = SGFHistory
@@ -607,11 +633,16 @@ instance GroupFeatureNoRoleI 'GFFullDelete
 
 instance GroupFeatureNoRoleI 'GFReactions
 
+instance GroupFeatureNoRoleI 'GFReports
+
 instance GroupFeatureNoRoleI 'GFHistory
 
 instance HasField "role" DirectMessagesGroupPreference (Maybe GroupMemberRole) where
   hasField p@DirectMessagesGroupPreference {role} = (\r -> p {role = r}, role)
 
+instance HasField "role" FullDeleteGroupPreference (Maybe GroupMemberRole) where
+  hasField p@FullDeleteGroupPreference {role} = (\r -> p {role = r}, role)
+
 instance HasField "role" VoiceGroupPreference (Maybe GroupMemberRole) where
   hasField p@VoiceGroupPreference {role} = (\r -> p {role = r}, role)
 
@@ -623,6 +654,8 @@ instance HasField "role" SimplexLinksGroupPreference (Maybe GroupMemberRole) whe
 
 instance GroupFeatureRoleI 'GFDirectMessages
 
+instance GroupFeatureRoleI 'GFFullDelete
+
 instance GroupFeatureRoleI 'GFVoice
 
 instance GroupFeatureRoleI 'GFFiles
@@ -756,6 +789,7 @@ mergeGroupPreferences groupPreferences =
       voice = pref SGFVoice,
       files = pref SGFFiles,
       simplexLinks = pref SGFSimplexLinks,
+      reports = pref SGFReports,
       history = pref SGFHistory
     }
   where
@@ -772,6 +806,7 @@ toGroupPreferences groupPreferences =
       voice = pref SGFVoice,
       files = pref SGFFiles,
       simplexLinks = pref SGFSimplexLinks,
+      reports = pref SGFReports,
       history = pref SGFHistory
     }
   where
@@ -880,6 +915,8 @@ $(J.deriveJSON defaultJSON ''FilesGroupPreference)
 
 $(J.deriveJSON defaultJSON ''SimplexLinksGroupPreference)
 
+$(J.deriveJSON defaultJSON ''ReportsGroupPreference)
+
 $(J.deriveJSON defaultJSON ''HistoryGroupPreference)
 
 $(J.deriveJSON defaultJSON ''GroupPreferences)
diff --git a/src/Simplex/Chat/Types/Shared.hs b/src/Simplex/Chat/Types/Shared.hs
index d5c8f48776..60ebe9d033 100644
--- a/src/Simplex/Chat/Types/Shared.hs
+++ b/src/Simplex/Chat/Types/Shared.hs
@@ -7,8 +7,8 @@ import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import qualified Data.ByteString.Char8 as B
 import Simplex.Chat.Options.DB (FromField (..), ToField (..))
+import Simplex.Messaging.Agent.Store.DB (blobFieldDecoder)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (blobFieldDecoder)
 import Simplex.Messaging.Util ((<$?>))
 
 data GroupMemberRole
@@ -48,3 +48,24 @@ instance FromJSON GroupMemberRole where
 instance ToJSON GroupMemberRole where
   toJSON = strToJSON
   toEncoding = strToJEncoding
+
+data GroupAcceptance = GAAccepted | GAPendingApproval | GAPendingReview  deriving (Eq, Show)
+
+instance StrEncoding GroupAcceptance where
+  strEncode = \case
+    GAAccepted -> "accepted"
+    GAPendingApproval -> "pending"
+    GAPendingReview -> "pending_review"
+  strDecode = \case
+    "accepted" -> Right GAAccepted
+    "pending" -> Right GAPendingApproval
+    "pending_review" -> Right GAPendingReview
+    r -> Left $ "bad GroupAcceptance " <> B.unpack r
+  strP = strDecode <$?> A.takeByteString
+
+instance FromJSON GroupAcceptance where
+  parseJSON = strParseJSON "GroupAcceptance"
+
+instance ToJSON GroupAcceptance where
+  toJSON = strToJSON
+  toEncoding = strToJEncoding
diff --git a/src/Simplex/Chat/Types/UITheme.hs b/src/Simplex/Chat/Types/UITheme.hs
index f2512a3a5a..d0f23a7307 100644
--- a/src/Simplex/Chat/Types/UITheme.hs
+++ b/src/Simplex/Chat/Types/UITheme.hs
@@ -15,8 +15,9 @@ import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types.Util
+import Simplex.Messaging.Agent.Store.DB (fromTextField_)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fromTextField_)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON)
 import Simplex.Messaging.Util (decodeJSON, encodeJSON)
 
 data UITheme = UITheme
diff --git a/src/Simplex/Chat/Util.hs b/src/Simplex/Chat/Util.hs
index 3f7d19fd6d..796b32778b 100644
--- a/src/Simplex/Chat/Util.hs
+++ b/src/Simplex/Chat/Util.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE TupleSections #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module Simplex.Chat.Util (week, encryptFile, chunkSize, liftIOEither, shuffle) where
+module Simplex.Chat.Util (week, encryptFile, chunkSize, liftIOEither, shuffle, zipWith3') where
 
 import Control.Exception (Exception)
 import Control.Monad
@@ -15,6 +15,7 @@ import Control.Monad.Reader
 import Data.Bifunctor (first)
 import qualified Data.ByteString.Lazy as LB
 import Data.List (sortBy)
+import Data.List.NonEmpty (NonEmpty (..))
 import Data.Ord (comparing)
 import Data.Time (NominalDiffTime)
 import Data.Word (Word16)
@@ -52,6 +53,9 @@ shuffle xs = map snd . sortBy (comparing fst) <$> mapM (\x -> (,x) <$> random) x
     random :: IO Word16
     random = randomRIO (0, 65535)
 
+zipWith3' :: (a -> b -> c -> d) -> NonEmpty a -> NonEmpty b -> NonEmpty c -> NonEmpty d
+zipWith3' f ~(x :| xs) ~(y :| ys) ~(z :| zs) = f x y z :| zipWith3 f xs ys zs
+
 liftIOEither :: (MonadIO m, MonadError e m) => IO (Either e a) -> m a
 liftIOEither a = liftIO a >>= liftEither
 {-# INLINE liftIOEither #-}
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 84cb561396..54e888ea86 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -7,6 +8,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
@@ -17,7 +19,7 @@ import qualified Data.Aeson as J
 import qualified Data.Aeson.TH as JQ
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Char (isSpace, toUpper)
+import Data.Char (toUpper)
 import Data.Function (on)
 import Data.Int (Int64)
 import Data.List (groupBy, intercalate, intersperse, partition, sortOn)
@@ -37,7 +39,6 @@ import Data.Time.Format (defaultTimeLocale, formatTime)
 import qualified Data.Version as V
 import qualified Network.HTTP.Types as Q
 import Numeric (showFFloat)
-import Simplex.Chat (defaultChatConfig)
 import Simplex.Chat.Call
 import Simplex.Chat.Controller
 import Simplex.Chat.Help
@@ -59,6 +60,7 @@ import qualified Simplex.FileTransfer.Transport as XFTP
 import Simplex.Messaging.Agent.Client (ProtocolTestFailure (..), ProtocolTestStep (..), SubscriptionsInfo (..))
 import Simplex.Messaging.Agent.Env.SQLite (NetworkConfig (..), ServerRoles (..))
 import Simplex.Messaging.Agent.Protocol
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Client (SMPProxyFallback, SMPProxyMode (..), SocksMode (..))
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..))
@@ -86,29 +88,45 @@ data WCallCommand
 
 $(JQ.deriveToJSON (taggedObjectJSON $ dropPrefix "WCCall") ''WCallCommand)
 
-serializeChatResponse :: (Maybe RemoteHostId, Maybe User) -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> ChatResponse -> String
-serializeChatResponse user_ ts tz remoteHost_ = unlines . map unStyle . responseToView user_ defaultChatConfig False ts tz remoteHost_
+serializeChatError :: Bool -> ChatConfig -> ChatError -> String
+serializeChatError isCmd cfg = unlines . map unStyle . chatErrorToView isCmd cfg
 
-responseToView :: (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Bool -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> ChatResponse -> [StyledString]
-responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showReceipts, testView} liveItems ts tz outputRH = \case
+serializeChatResponse :: ChatResponseEvent r => (Maybe RemoteHostId, Maybe User) -> ChatConfig -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> r -> String
+serializeChatResponse hu cfg ts tz remoteHost_ = unlines . map unStyle . responseToView hu cfg False ts tz remoteHost_
+
+class ChatResponseEvent r where
+  responseToView :: (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Bool -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> r -> [StyledString]
+  isCommandResponse :: Bool
+
+instance ChatResponseEvent ChatResponse where
+  responseToView = chatResponseToView
+  isCommandResponse = True
+
+instance ChatResponseEvent ChatEvent where
+  responseToView = chatEventToView
+  isCommandResponse = False
+
+chatErrorToView :: Bool -> ChatConfig -> ChatError -> [StyledString]
+chatErrorToView isCmd ChatConfig {logLevel, testView} = viewChatError isCmd logLevel testView
+
+chatResponseToView :: (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Bool -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> ChatResponse -> [StyledString]
+chatResponseToView hu cfg@ChatConfig {logLevel, showReactions, testView} liveItems ts tz outputRH = \case
   CRActiveUser User {profile, uiThemes} -> viewUserProfile (fromLocalProfile profile) <> viewUITheme uiThemes
   CRUsersList users -> viewUsersList users
   CRChatStarted -> ["chat started"]
   CRChatRunning -> ["chat is running"]
   CRChatStopped -> ["chat stopped"]
-  CRChatSuspended -> ["chat suspended"]
   CRApiChats u chats -> ttyUser u $ if testView then testViewChats chats else [viewJSON chats]
   CRChats chats -> viewChats ts tz chats
   CRApiChat u chat _ -> ttyUser u $ if testView then testViewChat chat else [viewJSON chat]
   CRChatTags u tags -> ttyUser u $ [viewJSON tags]
-  CRApiParsedMarkdown ft -> [viewJSON ft]
   CRServerTestResult u srv testFailure -> ttyUser u $ viewServerTestResult srv testFailure
   CRServerOperatorConditions (ServerOperatorConditions ops _ ca) -> viewServerOperators ops ca
   CRUserServers u uss -> ttyUser u $ concatMap viewUserServers uss <> (if testView then [] else serversUserHelp)
   CRUserServersValidation {} -> []
   CRUsageConditions current _ accepted_ -> viewUsageConditions current accepted_
   CRChatItemTTL u ttl -> ttyUser u $ viewChatItemTTL ttl
-  CRNetworkConfig cfg -> viewNetworkConfig cfg
+  CRNetworkConfig netCfg -> viewNetworkConfig netCfg
   CRContactInfo u ct cStats customUserProfile -> ttyUser u $ viewContactInfo ct cStats customUserProfile
   CRGroupInfo u g s -> ttyUser u $ viewGroupInfo g s
   CRGroupMemberInfo u g m cStats -> ttyUser u $ viewGroupMemberInfo g m cStats
@@ -117,55 +135,26 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
       "server queue info: " <> viewJSON qInfo
     ]
   CRContactSwitchStarted {} -> ["switch started"]
-  CRGroupMemberSwitchStarted {} -> ["switch started"]
+  CEvtGroupMemberSwitchStarted {} -> ["switch started"]
   CRContactSwitchAborted {} -> ["switch aborted"]
-  CRGroupMemberSwitchAborted {} -> ["switch aborted"]
-  CRContactSwitch u ct progress -> ttyUser u $ viewContactSwitch ct progress
-  CRGroupMemberSwitch u g m progress -> ttyUser u $ viewGroupMemberSwitch g m progress
+  CEvtGroupMemberSwitchAborted {} -> ["switch aborted"]
   CRContactRatchetSyncStarted {} -> ["connection synchronization started"]
   CRGroupMemberRatchetSyncStarted {} -> ["connection synchronization started"]
-  CRContactRatchetSync u ct progress -> ttyUser u $ viewContactRatchetSync ct progress
-  CRGroupMemberRatchetSync u g m progress -> ttyUser u $ viewGroupMemberRatchetSync g m progress
-  CRContactVerificationReset u ct -> ttyUser u $ viewContactVerificationReset ct
-  CRGroupMemberVerificationReset u g m -> ttyUser u $ viewGroupMemberVerificationReset g m
   CRConnectionVerified u verified code -> ttyUser u [plain $ if verified then "connection verified" else "connection not verified, current code is " <> code]
   CRContactCode u ct code -> ttyUser u $ viewContactCode ct code testView
   CRGroupMemberCode u g m code -> ttyUser u $ viewGroupMemberCode g m code testView
-  CRNewChatItems u chatItems
-    | length chatItems > 20 ->
-        if
-          | all (\aci -> aChatItemDir aci == MDRcv) chatItems -> ttyUser u [sShow (length chatItems) <> " new messages"]
-          | all (\aci -> aChatItemDir aci == MDSnd) chatItems -> ttyUser u [sShow (length chatItems) <> " messages sent"]
-          | otherwise -> ttyUser u [sShow (length chatItems) <> " new messages created"]
-    | otherwise ->
-        concatMap
-          (\(AChatItem _ _ chat item) -> ttyUser u $ unmuted u chat item $ viewChatItem chat item False ts tz <> viewItemReactions item)
-          chatItems
+  CRNewChatItems u chatItems -> viewChatItems ttyUser unmuted u chatItems ts tz
   CRChatItems u _ chatItems -> ttyUser u $ concatMap (\(AChatItem _ _ chat item) -> viewChatItem chat item True ts tz <> viewItemReactions item) chatItems
   CRChatItemInfo u ci ciInfo -> ttyUser u $ viewChatItemInfo ci ciInfo tz
   CRChatItemId u itemId -> ttyUser u [plain $ maybe "no item" show itemId]
-  CRChatItemsStatusesUpdated u chatItems
-    | length chatItems <= 20 ->
-        concatMap
-          (\ci -> ttyUser u $ viewChatItemStatusUpdated ci ts tz testView showReceipts)
-          chatItems
-    | testView && showReceipts ->
-        ttyUser u [sShow (length chatItems) <> " message statuses updated"]
-    | otherwise -> []
   CRChatItemUpdated u (AChatItem _ _ chat item) -> ttyUser u $ unmuted u chat item $ viewItemUpdate chat item liveItems ts tz
   CRChatItemNotChanged u ci -> ttyUser u $ viewItemNotChanged ci
   CRTagsUpdated u _ _ -> ttyUser u ["chat tags updated"]
-  CRChatItemsDeleted u deletions byUser timed -> case deletions of
-    [ChatItemDeletion (AChatItem _ _ chat deletedItem) toItem] ->
-      ttyUser u $ unmuted u chat deletedItem $ viewItemDelete chat deletedItem toItem byUser timed ts tz testView
-    deletions' -> ttyUser u [sShow (length deletions') <> " messages deleted"]
-  CRGroupChatItemsDeleted u g ciIds byUser member_ -> ttyUser u [ttyGroup' g <> ": " <> sShow (length ciIds) <> " messages deleted by " <> if byUser then "user" else "member" <> maybe "" (\m -> " " <> ttyMember m) member_]
+  CRChatItemsDeleted u deletions byUser timed -> ttyUser u $ viewChatItemsDeleted (unmuted u) deletions byUser timed ts tz testView
+  CRGroupChatItemsDeleted u g ciIds byUser member_ -> ttyUser u $ viewGroupChatItemsDeleted g ciIds byUser member_
   CRChatItemReaction u added (ACIReaction _ _ chat reaction) -> ttyUser u $ unmutedReaction u chat reaction $ viewItemReaction showReactions chat reaction added ts tz
   CRReactionMembers u memberReactions -> ttyUser u $ viewReactionMembers memberReactions
-  CRChatItemDeletedNotFound u Contact {localDisplayName = c} _ -> ttyUser u [ttyFrom $ c <> "> [deleted - original message not found]"]
   CRBroadcastSent u mc s f t -> ttyUser u $ viewSentBroadcast mc s f ts tz t
-  CRMsgIntegrityError u mErr -> ttyUser u $ viewMsgIntegrityError mErr
-  CRCmdAccepted _ -> []
   CRCmdOk u_ -> ttyUser' u_ ["ok"]
   CRChatHelp section -> case section of
     HSMain -> chatHelpInfo
@@ -181,54 +170,43 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
     HSDatabase -> databaseHelpInfo
   CRWelcome user -> chatWelcome user
   CRContactsList u cs -> ttyUser u $ viewContactsList cs
-  CRUserContactLink u UserContactLink {connReqContact, autoAccept} -> ttyUser u $ connReqContact_ "Your chat address:" connReqContact <> autoAcceptStatus_ autoAccept
+  CRUserContactLink u UserContactLink {connLinkContact, autoAccept} -> ttyUser u $ connReqContact_ "Your chat address:" connLinkContact <> autoAcceptStatus_ autoAccept
   CRUserContactLinkUpdated u UserContactLink {autoAccept} -> ttyUser u $ autoAcceptStatus_ autoAccept
   CRContactRequestRejected u UserContactRequest {localDisplayName = c} -> ttyUser u [ttyContact c <> ": contact request rejected"]
   CRGroupCreated u g -> ttyUser u $ viewGroupCreated g testView
   CRGroupMembers u g -> ttyUser u $ viewGroupMembers g
+  CRMemberSupportChats u g ms -> ttyUser u $ viewMemberSupportChats g ms
+  -- CRGroupConversationsArchived u _g _conversations -> ttyUser u []
+  -- CRGroupConversationsDeleted u _g _conversations -> ttyUser u []
   CRGroupsList u gs -> ttyUser u $ viewGroupsList gs
-  CRSentGroupInvitation u g c _ ->
-    ttyUser u $
-      case contactConn c of
-        Just Connection {viaGroupLink}
-          | viaGroupLink -> [ttyContact' c <> " invited to group " <> ttyGroup' g <> " via your group link"]
-          | otherwise -> ["invitation to join the group " <> ttyGroup' g <> " sent to " <> ttyContact' c]
-        Nothing -> []
+  CRSentGroupInvitation u g c _ -> ttyUser u $ viewSentGroupInvitation g c
   CRFileTransferStatus u ftStatus -> ttyUser u $ viewFileTransferStatus ftStatus
   CRFileTransferStatusXFTP u ci -> ttyUser u $ viewFileTransferStatusXFTP ci
   CRUserProfile u p -> ttyUser u $ viewUserProfile p
   CRUserProfileNoChange u -> ttyUser u ["user profile did not change"]
-  CRUserPrivacy u u' -> ttyUserPrefix u $ viewUserPrivacy u u'
+  CRUserPrivacy u u' -> ttyUserPrefix hu outputRH u $ viewUserPrivacy u u'
   CRVersionInfo info _ _ -> viewVersionInfo logLevel info
-  CRInvitation u cReq _ -> ttyUser u $ viewConnReqInvitation cReq
+  CRInvitation u ccLink _ -> ttyUser u $ viewConnReqInvitation ccLink
   CRConnectionIncognitoUpdated u c -> ttyUser u $ viewConnectionIncognitoUpdated c
   CRConnectionUserChanged u c c' nu -> ttyUser u $ viewConnectionUserChanged u c nu c'
-  CRConnectionPlan u connectionPlan -> ttyUser u $ viewConnectionPlan connectionPlan
+  CRConnectionPlan u _ connectionPlan -> ttyUser u $ viewConnectionPlan cfg connectionPlan
   CRSentConfirmation u _ -> ttyUser u ["confirmation sent!"]
   CRSentInvitation u _ customUserProfile -> ttyUser u $ viewSentInvitation customUserProfile testView
   CRSentInvitationToContact u _c customUserProfile -> ttyUser u $ viewSentInvitation customUserProfile testView
+  CRItemsReadForChat u _chatId -> ttyUser u ["items read for chat"]
   CRContactDeleted u c -> ttyUser u [ttyContact' c <> ": contact is deleted"]
-  CRContactDeletedByContact u c -> ttyUser u [ttyFullContact c <> " deleted contact with you"]
   CRChatCleared u chatInfo -> ttyUser u $ viewChatCleared chatInfo
   CRAcceptingContactRequest u c -> ttyUser u $ viewAcceptingContactRequest c
-  CRAcceptingBusinessRequest u g -> ttyUser u $ viewAcceptingBusinessRequest g
   CRContactAlreadyExists u c -> ttyUser u [ttyFullContact c <> ": contact already exists"]
-  CRContactRequestAlreadyAccepted u c -> ttyUser u [ttyFullContact c <> ": sent you a duplicate contact request, but you are already connected, no action needed"]
-  CRBusinessRequestAlreadyAccepted u g -> ttyUser u [ttyFullGroup g <> ": sent you a duplicate connection request, but you are already connected, no action needed"]
-  CRUserContactLinkCreated u cReq -> ttyUser u $ connReqContact_ "Your new chat address is created!" cReq
+  CRUserContactLinkCreated u ccLink -> ttyUser u $ connReqContact_ "Your new chat address is created!" ccLink
   CRUserContactLinkDeleted u -> ttyUser u viewUserContactLinkDeleted
   CRUserAcceptedGroupSent u _g _ -> ttyUser u [] -- [ttyGroup' g <> ": joining the group..."]
-  CRGroupLinkConnecting u g _ -> ttyUser u [ttyGroup' g <> ": joining the group..."]
-  CRBusinessLinkConnecting u g _ _ -> ttyUser u [ttyGroup' g <> ": joining the group..."]
-  CRUserDeletedMember u g m -> ttyUser u [ttyGroup' g <> ": you removed " <> ttyMember m <> " from the group"]
+  CRUserDeletedMembers u g members wm -> case members of
+    [m] -> ttyUser u [ttyGroup' g <> ": you removed " <> ttyMember m <> " from the group" <> withMessages wm]
+    mems' -> ttyUser u [ttyGroup' g <> ": you removed " <> sShow (length mems') <> " members from the group" <> withMessages wm]
   CRLeftMemberUser u g -> ttyUser u $ [ttyGroup' g <> ": you left the group"] <> groupPreserved g
-  CRUnknownMemberCreated u g fwdM um -> ttyUser u [ttyGroup' g <> ": " <> ttyMember fwdM <> " forwarded a message from an unknown member, creating unknown member record " <> ttyMember um]
-  CRUnknownMemberBlocked u g byM um -> ttyUser u [ttyGroup' g <> ": " <> ttyMember byM <> " blocked an unknown member, creating unknown member record " <> ttyMember um]
-  CRUnknownMemberAnnounced u g _ um m -> ttyUser u [ttyGroup' g <> ": unknown member " <> ttyMember um <> " updated to " <> ttyMember m]
   CRGroupDeletedUser u g -> ttyUser u [ttyGroup' g <> ": you deleted the group"]
   CRForwardPlan u count itemIds fc -> ttyUser u $ viewForwardPlan count itemIds fc
-  CRRcvFileDescrReady _ _ _ _ -> []
-  CRRcvFileProgressXFTP {} -> []
   CRRcvFileAccepted u ci -> ttyUser u $ savingFile' ci
   CRRcvFileAcceptedSndCancelled u ft -> ttyUser u $ viewRcvFileSndCancelled ft
   CRSndFileCancelled u _ ftm fts -> ttyUser u $ viewSndFileCancelled ftm fts
@@ -239,112 +217,29 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRContactAliasUpdated u c -> ttyUser u $ viewContactAliasUpdated c
   CRGroupAliasUpdated u g -> ttyUser u $ viewGroupAliasUpdated g
   CRConnectionAliasUpdated u c -> ttyUser u $ viewConnectionAliasUpdated c
-  CRContactUpdated {user = u, fromContact = c, toContact = c'} -> ttyUser u $ viewContactUpdated c c' <> viewContactPrefsUpdated u c c'
-  CRGroupMemberUpdated {} -> []
-  CRContactsMerged u intoCt mergedCt ct' -> ttyUser u $ viewContactsMerged intoCt mergedCt ct'
-  CRReceivedContactRequest u UserContactRequest {localDisplayName = c, profile} -> ttyUser u $ viewReceivedContactRequest c profile
   CRRcvStandaloneFileCreated u ft -> ttyUser u $ receivingFileStandalone "started" ft
-  CRRcvFileStart u ci -> ttyUser u $ receivingFile_' hu testView "started" ci
-  CRRcvFileComplete u ci -> ttyUser u $ receivingFile_' hu testView "completed" ci
-  CRRcvStandaloneFileComplete u _ ft -> ttyUser u $ receivingFileStandalone "completed" ft
-  CRRcvFileSndCancelled u _ ft -> ttyUser u $ viewRcvFileSndCancelled ft
-  CRRcvFileError u (Just ci) e _ -> ttyUser u $ receivingFile_' hu testView "error" ci <> [sShow e]
-  CRRcvFileError u Nothing e ft -> ttyUser u $ receivingFileStandalone "error" ft <> [sShow e]
-  CRRcvFileWarning u (Just ci) e _ -> ttyUser u $ receivingFile_' hu testView "warning: " ci <> [sShow e]
-  CRRcvFileWarning u Nothing e ft -> ttyUser u $ receivingFileStandalone "warning: " ft <> [sShow e]
-  CRSndFileStart u _ ft -> ttyUser u $ sendingFile_ "started" ft
-  CRSndFileComplete u _ ft -> ttyUser u $ sendingFile_ "completed" ft
   CRSndStandaloneFileCreated u ft -> ttyUser u $ uploadingFileStandalone "started" ft
-  CRSndFileStartXFTP {} -> []
-  CRSndFileProgressXFTP {} -> []
-  CRSndFileRedirectStartXFTP u ft ftRedirect -> ttyUser u $ standaloneUploadRedirect ft ftRedirect
-  CRSndStandaloneFileComplete u ft uris -> ttyUser u $ standaloneUploadComplete ft uris
-  CRSndFileCompleteXFTP u ci _ -> ttyUser u $ uploadingFile "completed" ci
-  CRSndFileCancelledXFTP {} -> []
-  CRSndFileError u Nothing ft e -> ttyUser u $ uploadingFileStandalone "error" ft <> [plain e]
-  CRSndFileError u (Just ci) _ e -> ttyUser u $ uploadingFile "error" ci <> [plain e]
-  CRSndFileWarning u Nothing ft e -> ttyUser u $ uploadingFileStandalone "warning: " ft <> [plain e]
-  CRSndFileWarning u (Just ci) _ e -> ttyUser u $ uploadingFile "warning: " ci <> [plain e]
-  CRSndFileRcvCancelled u _ ft@SndFileTransfer {recipientDisplayName = c} ->
-    ttyUser u [ttyContact c <> " cancelled receiving " <> sndFile ft]
   CRStandaloneFileInfo info_ -> maybe ["no file information in URI"] (\j -> [viewJSON j]) info_
-  CRContactConnecting u _ -> ttyUser u []
-  CRContactConnected u ct userCustomProfile -> ttyUser u $ viewContactConnected ct userCustomProfile testView
-  CRContactSndReady u ct -> ttyUser u [ttyFullContact ct <> ": you can send messages to contact"]
-  CRContactAnotherClient u c -> ttyUser u [ttyContact' c <> ": contact is connected to another client"]
-  CRSubscriptionEnd u acEntity ->
-    let Connection {connId} = entityConnection acEntity
-     in ttyUser u [sShow connId <> ": END"]
-  CRContactsDisconnected srv cs -> [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
-  CRContactsSubscribed srv cs -> [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
-  CRContactSubError u c e -> ttyUser u [ttyContact' c <> ": contact error " <> sShow e]
-  CRContactSubSummary u summary ->
-    ttyUser u $ [sShow (length subscribed) <> " contacts connected (use " <> highlight' "/cs" <> " for the list)" | not (null subscribed)] <> viewErrorsSummary errors " contact errors"
-    where
-      (errors, subscribed) = partition (isJust . contactError) summary
-  CRUserContactSubSummary u summary ->
-    ttyUser u $
-      map addressSS addresses
-        <> ([sShow (length groupLinksSubscribed) <> " group links active" | not (null groupLinksSubscribed)] <> viewErrorsSummary groupLinkErrors " group link errors")
-    where
-      (addresses, groupLinks) = partition (\UserContactSubStatus {userContact} -> isNothing . userContactGroupId $ userContact) summary
-      addressSS UserContactSubStatus {userContactError} = maybe ("Your address is active! To show: " <> highlight' "/sa") (\e -> "User address error: " <> sShow e <> ", to delete your address: " <> highlight' "/da") userContactError
-      (groupLinkErrors, groupLinksSubscribed) = partition (isJust . userContactError) groupLinks
-  CRNetworkStatus status conns -> if testView then [plain $ show (length conns) <> " connections " <> netStatusStr status] else []
   CRNetworkStatuses u statuses -> if testView then ttyUser' u $ viewNetworkStatuses statuses else []
-  CRGroupInvitation u g -> ttyUser u [groupInvitation' g]
-  CRReceivedGroupInvitation {user = u, groupInfo = g, contact = c, memberRole = r} -> ttyUser u $ viewReceivedGroupInvitation g c r
-  CRUserJoinedGroup u g _ -> ttyUser u $ viewUserJoinedGroup g
   CRJoinedGroupMember u g m -> ttyUser u $ viewJoinedGroupMember g m
-  CRHostConnected p h -> [plain $ "connected to " <> viewHostEvent p h]
-  CRHostDisconnected p h -> [plain $ "disconnected from " <> viewHostEvent p h]
-  CRJoinedGroupMemberConnecting u g host m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember host <> " added " <> ttyFullMember m <> " to the group (connecting...)"]
-  CRConnectedToGroupMember u g m _ -> ttyUser u [ttyGroup' g <> ": " <> connectedMember m <> " is connected"]
-  CRMemberRole u g by m r r' -> ttyUser u $ viewMemberRoleChanged g by m r r'
-  CRMemberRoleUser u g m r r' -> ttyUser u $ viewMemberRoleUserChanged g m r r'
-  CRMemberBlockedForAll u g by m blocked -> ttyUser u $ viewMemberBlockedForAll g by m blocked
-  CRMemberBlockedForAllUser u g m blocked -> ttyUser u $ viewMemberBlockedForAllUser g m blocked
-  CRDeletedMemberUser u g by -> ttyUser u $ [ttyGroup' g <> ": " <> ttyMember by <> " removed you from the group"] <> groupPreserved g
-  CRDeletedMember u g by m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember by <> " removed " <> ttyMember m <> " from the group"]
-  CRLeftMember u g m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember m <> " left the group"]
-  CRGroupEmpty u g -> ttyUser u [ttyFullGroup g <> ": group is empty"]
-  CRGroupRemoved u g -> ttyUser u [ttyFullGroup g <> ": you are no longer a member or group deleted"]
-  CRGroupDeleted u g m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember m <> " deleted the group", "use " <> highlight ("/d #" <> viewGroupName g) <> " to delete the local copy of the group"]
+  CRMemberAccepted u g m -> ttyUser u $ viewMemberAccepted g m
+  CRMemberSupportChatDeleted u g m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember m <> " support chat deleted"]
+  CRMembersRoleUser u g members r' -> ttyUser u $ viewMemberRoleUserChanged g members r'
+  CRMembersBlockedForAllUser u g members blocked -> ttyUser u $ viewMembersBlockedForAllUser g members blocked
   CRGroupUpdated u g g' m -> ttyUser u $ viewGroupUpdated g g' m
   CRGroupProfile u g -> ttyUser u $ viewGroupProfile g
   CRGroupDescription u g -> ttyUser u $ viewGroupDescription g
-  CRGroupLinkCreated u g cReq mRole -> ttyUser u $ groupLink_ "Group link is created!" g cReq mRole
-  CRGroupLink u g cReq mRole -> ttyUser u $ groupLink_ "Group link:" g cReq mRole
+  CRGroupLinkCreated u g ccLink mRole -> ttyUser u $ groupLink_ "Group link is created!" g ccLink mRole
+  CRGroupLink u g ccLink mRole -> ttyUser u $ groupLink_ "Group link:" g ccLink mRole
   CRGroupLinkDeleted u g -> ttyUser u $ viewGroupLinkDeleted g
-  CRAcceptingGroupJoinRequest _ g c -> [ttyFullContact c <> ": accepting request to join group " <> ttyGroup' g <> "..."]
-  CRAcceptingGroupJoinRequestMember _ g m -> [ttyFullMember m <> ": accepting request to join group " <> ttyGroup' g <> "..."]
-  CRNoMemberContactCreating u g m -> ttyUser u ["member " <> ttyGroup' g <> " " <> ttyMember m <> " does not have direct connection, creating"]
   CRNewMemberContact u _ g m -> ttyUser u ["contact for member " <> ttyGroup' g <> " " <> ttyMember m <> " is created"]
   CRNewMemberContactSentInv u _ct g m -> ttyUser u ["sent invitation to connect directly to member " <> ttyGroup' g <> " " <> ttyMember m]
-  CRNewMemberContactReceivedInv u ct g m -> ttyUser u [ttyGroup' g <> " " <> ttyMember m <> " is creating direct contact " <> ttyContact' ct <> " with you"]
-  CRContactAndMemberAssociated u ct g m ct' -> ttyUser u $ viewContactAndMemberAssociated ct g m ct'
-  CRMemberSubError u g m e -> ttyUser u [ttyGroup' g <> " member " <> ttyMember m <> " error: " <> sShow e]
-  CRMemberSubSummary u summary -> ttyUser u $ viewErrorsSummary (filter (isJust . memberError) summary) " group member errors"
-  CRGroupSubscribed u g -> ttyUser u $ viewGroupSubscribed g
-  CRPendingSubSummary u _ -> ttyUser u []
-  CRSndFileSubError u SndFileTransfer {fileId, fileName} e ->
-    ttyUser u ["sent file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
-  CRRcvFileSubError u RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName}} e ->
-    ttyUser u ["received file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
-  CRCallInvitation RcvCallInvitation {user, contact, callType, sharedKey} -> ttyUser user $ viewCallInvitation contact callType sharedKey
-  CRCallOffer {user = u, contact, callType, offer, sharedKey} -> ttyUser u $ viewCallOffer contact callType offer sharedKey
-  CRCallAnswer {user = u, contact, answer} -> ttyUser u $ viewCallAnswer contact answer
-  CRCallExtraInfo {user = u, contact} -> ttyUser u ["call extra info from " <> ttyContact' contact]
-  CRCallEnded {user = u, contact} -> ttyUser u ["call with " <> ttyContact' contact <> " ended"]
   CRCallInvitations _ -> []
-  CRUserContactLinkSubscribed -> ["Your address is active! To show: " <> highlight' "/sa"]
-  CRUserContactLinkSubError e -> ["user address error: " <> sShow e, "to delete your address: " <> highlight' "/da"]
   CRContactConnectionDeleted u PendingContactConnection {pccConnId} -> ttyUser u ["connection :" <> sShow pccConnId <> " deleted"]
   CRNtfTokenStatus status -> ["device token status: " <> plain (smpEncode status)]
   CRNtfToken _ status mode srv -> ["device token status: " <> plain (smpEncode status) <> ", notifications mode: " <> plain (strEncode mode) <> ", server: " <> sShow srv]
-  CRNtfConns {} -> []
-  CRConnNtfMessages {} -> []
-  CRNtfMessage {} -> []
+  CRNtfConns {ntfConns} -> map (\NtfConn {agentConnId, expectedMsg_} -> plain $ show agentConnId <> " " <> show expectedMsg_) ntfConns
+  CRConnNtfMessages ntfMsgs -> [sShow ntfMsgs]
   CRCurrentRemoteHost rhi_ ->
     [ maybe
         "Using local profile"
@@ -359,40 +254,16 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
     ]
     where
       started = " started on " <> B.unpack (strEncode address) <> ":" <> ctrlPort
-  CRRemoteHostSessionCode {remoteHost_, sessionCode} ->
-    [ maybe "new remote host connecting" (\RemoteHostInfo {remoteHostId = rhId} -> "remote host " <> sShow rhId <> " connecting") remoteHost_,
-      "Compare session code with host:",
-      plain sessionCode
-    ]
-  CRNewRemoteHost RemoteHostInfo {remoteHostId = rhId, hostDeviceName} -> ["new remote host " <> sShow rhId <> " added: " <> plain hostDeviceName]
-  CRRemoteHostConnected RemoteHostInfo {remoteHostId = rhId} -> ["remote host " <> sShow rhId <> " connected"]
-  CRRemoteHostStopped {remoteHostId_} ->
-    [ maybe "new remote host" (mappend "remote host " . sShow) remoteHostId_ <> " stopped"
-    ]
   CRRemoteFileStored rhId (CryptoFile filePath cfArgs_) ->
     [plain $ "file " <> filePath <> " stored on remote host " <> show rhId]
       <> maybe [] ((: []) . cryptoFileArgsStr testView) cfArgs_
   CRRemoteCtrlList cs -> viewRemoteCtrls cs
-  CRRemoteCtrlFound {remoteCtrl = RemoteCtrlInfo {remoteCtrlId, ctrlDeviceName}, ctrlAppInfo_, appVersion, compatible} ->
-    [ ("remote controller " <> sShow remoteCtrlId <> " found: ")
-        <> maybe (deviceName <> "not compatible") (\info -> viewRemoteCtrl info appVersion compatible) ctrlAppInfo_
-    ]
-      <> ["use " <> highlight ("/confirm remote ctrl " <> show remoteCtrlId) <> " to connect" | isJust ctrlAppInfo_ && compatible]
-    where
-      deviceName = if T.null ctrlDeviceName then "" else plain ctrlDeviceName <> ", "
   CRRemoteCtrlConnecting {remoteCtrl_, ctrlAppInfo, appVersion} ->
     [ (maybe "connecting new remote controller" (\RemoteCtrlInfo {remoteCtrlId} -> "connecting remote controller " <> sShow remoteCtrlId) remoteCtrl_ <> ": ")
         <> viewRemoteCtrl ctrlAppInfo appVersion True
     ]
-  CRRemoteCtrlSessionCode {remoteCtrl_, sessionCode} ->
-    [ maybe "new remote controller connected" (\RemoteCtrlInfo {remoteCtrlId} -> "remote controller " <> sShow remoteCtrlId <> " connected") remoteCtrl_,
-      "Compare session code with controller and use:",
-      "/verify remote ctrl " <> plain sessionCode -- TODO maybe pass rcId
-    ]
   CRRemoteCtrlConnected RemoteCtrlInfo {remoteCtrlId = rcId, ctrlDeviceName} ->
     ["remote controller " <> sShow rcId <> " session started with " <> plain ctrlDeviceName]
-  CRRemoteCtrlStopped {rcStopReason} -> viewRemoteCtrlStopped rcStopReason
-  CRContactPQEnabled u c (CR.PQEncryption pqOn) -> ttyUser u [ttyContact' c <> ": " <> (if pqOn then "quantum resistant" else "standard") <> " end-to-end encryption enabled"]
   CRSQLResult rows -> map plain rows
 #if !defined(dbPostgres)
   CRArchiveExported archiveErrs -> if null archiveErrs then ["ok"] else ["archive export errors: " <> plain (show archiveErrs)]
@@ -433,50 +304,21 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
     [ "agent queues info:",
       plain . LB.unpack $ J.encode agentQueuesInfo
     ]
-  CRContactDisabled u c -> ttyUser u ["[" <> ttyContact' c <> "] connection is disabled, to enable: " <> highlight ("/enable " <> viewContactName c) <> ", to delete: " <> highlight ("/d " <> viewContactName c)]
-  CRConnectionDisabled entity -> viewConnectionEntityDisabled entity
-  CRConnectionInactive entity inactive -> viewConnectionEntityInactive entity inactive
-  CRAgentRcvQueueDeleted acId srv aqId err_ ->
-    [ ("completed deleting rcv queue, agent connection id: " <> sShow acId)
-        <> (", server: " <> sShow srv)
-        <> (", agent queue id: " <> sShow aqId)
-        <> maybe "" (\e -> ", error: " <> sShow e) err_
-      | logLevel <= CLLInfo
-    ]
-  CRAgentConnDeleted acId -> ["completed deleting connection, agent connection id: " <> sShow acId | logLevel <= CLLInfo]
-  CRAgentUserDeleted auId -> ["completed deleting user" <> if logLevel <= CLLInfo then ", agent user id: " <> sShow auId else ""]
-  CRMessageError u prefix err -> ttyUser u [plain prefix <> ": " <> plain err | prefix == "error" || logLevel <= CLLWarning]
-  CRChatCmdError u e -> ttyUserPrefix' u $ viewChatError True logLevel testView e
-  CRChatError u e -> ttyUser' u $ viewChatError False logLevel testView e
-  CRChatErrors u errs -> ttyUser' u $ concatMap (viewChatError False logLevel testView) errs
   CRAppSettings as -> ["app settings: " <> viewJSON as]
-  CRTimedAction _ _ -> []
   CRCustomChatResponse u r -> ttyUser' u $ map plain $ T.lines r
   where
     ttyUser :: User -> [StyledString] -> [StyledString]
     ttyUser user@User {showNtfs, activeUser, viewPwdHash} ss
-      | (showNtfs && isNothing viewPwdHash) || activeUser = ttyUserPrefix user ss
+      | (showNtfs && isNothing viewPwdHash) || activeUser = ttyUserPrefix hu outputRH user ss
       | otherwise = []
-    ttyUserPrefix :: User -> [StyledString] -> [StyledString]
-    ttyUserPrefix _ [] = []
-    ttyUserPrefix User {userId, localDisplayName = u} ss
-      | null prefix = ss
-      | otherwise = prependFirst ("[" <> mconcat prefix <> "] ") ss
-      where
-        prefix = intersperse ", " $ remotePrefix <> userPrefix
-        remotePrefix = [maybe "local" (("remote: " <>) . highlight . show) outputRH | outputRH /= currentRH]
-        userPrefix = ["user: " <> highlight u | Just userId /= currentUserId]
-        currentUserId = (\User {userId = uId} -> uId) <$> user_
     ttyUser' :: Maybe User -> [StyledString] -> [StyledString]
     ttyUser' = maybe id ttyUser
-    ttyUserPrefix' :: Maybe User -> [StyledString] -> [StyledString]
-    ttyUserPrefix' = maybe id ttyUserPrefix
     testViewChats :: [AChat] -> [StyledString]
     testViewChats chats = [sShow $ map toChatView chats]
       where
         toChatView :: AChat -> (Text, Text, Maybe ConnStatus)
         toChatView (AChat _ (Chat (DirectChat Contact {localDisplayName, activeConn}) items _)) = ("@" <> localDisplayName, toCIPreview items Nothing, connStatus <$> activeConn)
-        toChatView (AChat _ (Chat (GroupChat GroupInfo {membership, localDisplayName}) items _)) = ("#" <> localDisplayName, toCIPreview items (Just membership), Nothing)
+        toChatView (AChat _ (Chat (GroupChat GroupInfo {membership, localDisplayName} _scopeInfo) items _)) = ("#" <> localDisplayName, toCIPreview items (Just membership), Nothing)
         toChatView (AChat _ (Chat (LocalChat _) items _)) = ("*", toCIPreview items Nothing, Nothing)
         toChatView (AChat _ (Chat (ContactRequest UserContactRequest {localDisplayName}) items _)) = ("<@" <> localDisplayName, toCIPreview items Nothing, Nothing)
         toChatView (AChat _ (Chat (ContactConnection PendingContactConnection {pccConnId, pccConnStatus}) items _)) = (":" <> T.pack (show pccConnId), toCIPreview items Nothing, Just pccConnStatus)
@@ -501,12 +343,207 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
     testViewItem (CChatItem _ ci@ChatItem {meta = CIMeta {itemText}}) membership_ =
       let deleted_ = maybe "" (\t -> " [" <> t <> "]") (chatItemDeletedText ci membership_)
        in itemText <> deleted_
-    viewErrorsSummary :: [a] -> StyledString -> [StyledString]
-    viewErrorsSummary summary s = [ttyError (T.pack . show $ length summary) <> s <> " (run with -c option to show each error)" | not (null summary)]
-    contactList :: [ContactRef] -> String
-    contactList cs = T.unpack . T.intercalate ", " $ map (\ContactRef {localDisplayName = n} -> "@" <> n) cs
     unmuted :: User -> ChatInfo c -> ChatItem c d -> [StyledString] -> [StyledString]
-    unmuted u chat ci@ChatItem {chatDir} = unmuted' u chat chatDir $ isMention ci
+    unmuted u chat ci@ChatItem {chatDir} = unmuted' u chat chatDir $ isUserMention ci
+    unmutedReaction :: User -> ChatInfo c -> CIReaction c d -> [StyledString] -> [StyledString]
+    unmutedReaction u chat CIReaction {chatDir} = unmuted' u chat chatDir False
+    unmuted' :: User -> ChatInfo c -> CIDirection c d -> Bool -> [StyledString] -> [StyledString]
+    unmuted' u chat chatDir mention s
+      | chatDirNtf u chat chatDir mention = s
+      | testView = map (<> " <muted>") s
+      | otherwise = []
+    withMessages wm = if wm then " with all messages" else ""
+
+ttyUserPrefix :: (Maybe RemoteHostId, Maybe User) -> Maybe RemoteHostId -> User -> [StyledString] -> [StyledString]
+ttyUserPrefix _ _ _ [] = []
+ttyUserPrefix (currentRH, user_) outputRH User {userId, localDisplayName = u} ss
+  | null prefix = ss
+  | otherwise = prependFirst ("[" <> mconcat prefix <> "] ") ss
+  where
+    prefix = intersperse ", " $ remotePrefix <> userPrefix
+    remotePrefix = [maybe "local" (("remote: " <>) . highlight . show) outputRH | outputRH /= currentRH]
+    userPrefix = ["user: " <> highlight u | Just userId /= currentUserId]
+    currentUserId = (\User {userId = uId} -> uId) <$> user_
+
+viewErrorsSummary :: [a] -> StyledString -> [StyledString]
+viewErrorsSummary summary s = [ttyError (T.pack . show $ length summary) <> s <> " (run with -c option to show each error)" | not (null summary)]
+
+contactList :: [ContactRef] -> String
+contactList cs = T.unpack . T.intercalate ", " $ map (\ContactRef {localDisplayName = n} -> "@" <> n) cs
+
+chatEventToView :: (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Bool -> CurrentTime -> TimeZone -> Maybe RemoteHostId -> ChatEvent -> [StyledString]
+chatEventToView hu ChatConfig {logLevel, showReactions, showReceipts, testView} liveItems ts tz outputRH = \case
+  CEvtChatSuspended -> ["chat suspended"]
+  CEvtContactSwitch u ct progress -> ttyUser u $ viewContactSwitch ct progress
+  CEvtGroupMemberSwitch u g m progress -> ttyUser u $ viewGroupMemberSwitch g m progress
+  CEvtContactRatchetSync u ct progress -> ttyUser u $ viewContactRatchetSync ct progress
+  CEvtGroupMemberRatchetSync u g m progress -> ttyUser u $ viewGroupMemberRatchetSync g m progress
+  CEvtNewChatItems u chatItems -> viewChatItems ttyUser unmuted u chatItems ts tz
+  CEvtChatItemsStatusesUpdated u chatItems
+    | length chatItems <= 20 ->
+        concatMap
+          (\ci -> ttyUser u $ viewChatItemStatusUpdated ci ts tz testView showReceipts)
+          chatItems
+    | testView && showReceipts ->
+        ttyUser u [sShow (length chatItems) <> " message statuses updated"]
+    | otherwise -> []
+  CEvtChatItemUpdated u (AChatItem _ _ chat item) -> ttyUser u $ unmuted u chat item $ viewItemUpdate chat item liveItems ts tz
+  CEvtChatItemNotChanged u ci -> ttyUser u $ viewItemNotChanged ci
+  CEvtChatItemReaction u added (ACIReaction _ _ chat reaction) -> ttyUser u $ unmutedReaction u chat reaction $ viewItemReaction showReactions chat reaction added ts tz
+  CEvtChatItemsDeleted u deletions byUser timed -> ttyUser u $ viewChatItemsDeleted (unmuted u) deletions byUser timed ts tz testView
+  CEvtGroupChatItemsDeleted u g ciIds byUser member_ -> ttyUser u $ viewGroupChatItemsDeleted g ciIds byUser member_
+  CEvtChatItemDeletedNotFound u Contact {localDisplayName = c} _ -> ttyUser u [ttyFrom $ c <> "> [deleted - original message not found]"]
+  CEvtUserAcceptedGroupSent u _g _ -> ttyUser u [] -- [ttyGroup' g <> ": joining the group..."]
+  CEvtSentGroupInvitation u g c _ -> ttyUser u $ viewSentGroupInvitation g c
+  CEvtContactDeletedByContact u c -> ttyUser u [ttyFullContact c <> " deleted contact with you"]
+  CEvtAcceptingContactRequest u c -> ttyUser u $ viewAcceptingContactRequest c
+  CEvtAcceptingBusinessRequest u g -> ttyUser u $ viewAcceptingBusinessRequest g
+  CEvtContactRequestAlreadyAccepted u c -> ttyUser u [ttyFullContact c <> ": sent you a duplicate contact request, but you are already connected, no action needed"]
+  CEvtBusinessRequestAlreadyAccepted u g -> ttyUser u [ttyFullGroup g <> ": sent you a duplicate connection request, but you are already connected, no action needed"]
+  CEvtGroupLinkConnecting u g _ -> ttyUser u [ttyGroup' g <> ": joining the group..."]
+  CEvtBusinessLinkConnecting u g _ _ -> ttyUser u [ttyGroup' g <> ": joining the group..."]
+  CEvtUnknownMemberCreated u g fwdM um -> ttyUser u [ttyGroup' g <> ": " <> ttyMember fwdM <> " forwarded a message from an unknown member, creating unknown member record " <> ttyMember um]
+  CEvtUnknownMemberBlocked u g byM um -> ttyUser u [ttyGroup' g <> ": " <> ttyMember byM <> " blocked an unknown member, creating unknown member record " <> ttyMember um]
+  CEvtUnknownMemberAnnounced u g _ um m -> ttyUser u [ttyGroup' g <> ": unknown member " <> ttyMember um <> " updated to " <> ttyMember m]
+  CEvtRcvFileDescrReady _ _ _ _ -> []
+  CEvtRcvFileAccepted u ci -> ttyUser u $ savingFile' ci
+  CEvtRcvFileAcceptedSndCancelled u ft -> ttyUser u $ viewRcvFileSndCancelled ft
+  CEvtRcvFileProgressXFTP {} -> []
+  CEvtContactUpdated {user = u, fromContact = c, toContact = c'} -> ttyUser u $ viewContactUpdated c c' <> viewContactPrefsUpdated u c c'
+  CEvtGroupMemberUpdated {} -> []
+  CEvtContactsMerged u intoCt mergedCt ct' -> ttyUser u $ viewContactsMerged intoCt mergedCt ct'
+  CEvtReceivedContactRequest u UserContactRequest {localDisplayName = c, profile} -> ttyUser u $ viewReceivedContactRequest c profile
+  CEvtRcvFileStart u ci -> ttyUser u $ receivingFile_' hu testView "started" ci
+  CEvtRcvFileComplete u ci -> ttyUser u $ receivingFile_' hu testView "completed" ci
+  CEvtRcvStandaloneFileComplete u _ ft -> ttyUser u $ receivingFileStandalone "completed" ft
+  CEvtRcvFileSndCancelled u _ ft -> ttyUser u $ viewRcvFileSndCancelled ft
+  CEvtRcvFileError u (Just ci) e _ -> ttyUser u $ receivingFile_' hu testView "error" ci <> [sShow e]
+  CEvtRcvFileError u Nothing e ft -> ttyUser u $ receivingFileStandalone "error" ft <> [sShow e]
+  CEvtRcvFileWarning u (Just ci) e _ -> ttyUser u $ receivingFile_' hu testView "warning: " ci <> [sShow e]
+  CEvtRcvFileWarning u Nothing e ft -> ttyUser u $ receivingFileStandalone "warning: " ft <> [sShow e]
+  CEvtSndFileStart u _ ft -> ttyUser u $ sendingFile_ "started" ft
+  CEvtSndFileComplete u _ ft -> ttyUser u $ sendingFile_ "completed" ft
+  CEvtSndFileStartXFTP {} -> []
+  CEvtSndFileProgressXFTP {} -> []
+  CEvtSndFileRedirectStartXFTP u ft ftRedirect -> ttyUser u $ standaloneUploadRedirect ft ftRedirect
+  CEvtSndStandaloneFileComplete u ft uris -> ttyUser u $ standaloneUploadComplete ft uris
+  CEvtSndFileCompleteXFTP u ci _ -> ttyUser u $ uploadingFile "completed" ci
+  CEvtSndFileCancelledXFTP {} -> []
+  CEvtSndFileError u Nothing ft e -> ttyUser u $ uploadingFileStandalone "error" ft <> [plain e]
+  CEvtSndFileError u (Just ci) _ e -> ttyUser u $ uploadingFile "error" ci <> [plain e]
+  CEvtSndFileWarning u Nothing ft e -> ttyUser u $ uploadingFileStandalone "warning: " ft <> [plain e]
+  CEvtSndFileWarning u (Just ci) _ e -> ttyUser u $ uploadingFile "warning: " ci <> [plain e]
+  CEvtSndFileRcvCancelled u _ ft@SndFileTransfer {recipientDisplayName = c} ->
+    ttyUser u [ttyContact c <> " cancelled receiving " <> sndFile ft]
+  CEvtContactConnecting u _ -> ttyUser u []
+  CEvtContactConnected u ct userCustomProfile -> ttyUser u $ viewContactConnected ct userCustomProfile testView
+  CEvtContactSndReady u ct -> ttyUser u [ttyFullContact ct <> ": you can send messages to contact"]
+  CEvtContactAnotherClient u c -> ttyUser u [ttyContact' c <> ": contact is connected to another client"]
+  CEvtSubscriptionEnd u acEntity ->
+    let Connection {connId} = entityConnection acEntity
+     in ttyUser u [sShow connId <> ": END"]
+  CEvtContactsDisconnected srv cs -> [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
+  CEvtContactsSubscribed srv cs -> [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
+  CEvtContactSubError u c e -> ttyUser u [ttyContact' c <> ": contact error " <> sShow e]
+  CEvtContactSubSummary u summary ->
+    ttyUser u $ [sShow (length subscribed) <> " contacts connected (use " <> highlight' "/cs" <> " for the list)" | not (null subscribed)] <> viewErrorsSummary errors " contact errors"
+    where
+      (errors, subscribed) = partition (isJust . contactError) summary
+  CEvtUserContactSubSummary u summary ->
+    ttyUser u $
+      map addressSS addresses
+        <> ([sShow (length groupLinksSubscribed) <> " group links active" | not (null groupLinksSubscribed)] <> viewErrorsSummary groupLinkErrors " group link errors")
+    where
+      (addresses, groupLinks) = partition (\UserContactSubStatus {userContact} -> isNothing . userContactGroupId $ userContact) summary
+      addressSS UserContactSubStatus {userContactError} = maybe ("Your address is active! To show: " <> highlight' "/sa") (\e -> "User address error: " <> sShow e <> ", to delete your address: " <> highlight' "/da") userContactError
+      (groupLinkErrors, groupLinksSubscribed) = partition (isJust . userContactError) groupLinks
+  CEvtNetworkStatus status conns -> if testView then [plain $ show (length conns) <> " connections " <> netStatusStr status] else []
+  CEvtNetworkStatuses u statuses -> if testView then ttyUser' u $ viewNetworkStatuses statuses else []
+  CEvtReceivedGroupInvitation {user = u, groupInfo = g, contact = c, memberRole = r} -> ttyUser u $ viewReceivedGroupInvitation g c r
+  CEvtUserJoinedGroup u g _ -> ttyUser u $ viewUserJoinedGroup g
+  CEvtJoinedGroupMember u g m -> ttyUser u $ viewJoinedGroupMember g m
+  CEvtHostConnected p h -> [plain $ "connected to " <> viewHostEvent p h]
+  CEvtHostDisconnected p h -> [plain $ "disconnected from " <> viewHostEvent p h]
+  CEvtJoinedGroupMemberConnecting u g host m -> ttyUser u $ viewJoinedGroupMemberConnecting g host m
+  CEvtConnectedToGroupMember u g m _ -> ttyUser u $ viewConnectedToGroupMember g m
+  CEvtMemberAcceptedByOther u g acceptingMember m -> ttyUser u $ viewMemberAcceptedByOther g acceptingMember m
+  CEvtMemberRole u g by m r r' -> ttyUser u $ viewMemberRoleChanged g by m r r'
+  CEvtMemberBlockedForAll u g by m blocked -> ttyUser u $ viewMemberBlockedForAll g by m blocked
+  CEvtDeletedMemberUser u g by wm -> ttyUser u $ [ttyGroup' g <> ": " <> ttyMember by <> " removed you from the group" <> withMessages wm] <> groupPreserved g
+  CEvtDeletedMember u g by m wm -> ttyUser u [ttyGroup' g <> ": " <> ttyMember by <> " removed " <> ttyMember m <> " from the group" <> withMessages wm]
+  CEvtLeftMember u g m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember m <> " left the group"]
+  CEvtGroupDeleted u g m -> ttyUser u [ttyGroup' g <> ": " <> ttyMember m <> " deleted the group", "use " <> highlight ("/d #" <> viewGroupName g) <> " to delete the local copy of the group"]
+  CEvtGroupUpdated u g g' m -> ttyUser u $ viewGroupUpdated g g' m
+  CEvtAcceptingGroupJoinRequestMember _ g m -> [ttyFullMember m <> ": accepting request to join group " <> ttyGroup' g <> "..."]
+  CEvtNoMemberContactCreating u g m -> ttyUser u ["member " <> ttyGroup' g <> " " <> ttyMember m <> " does not have direct connection, creating"]
+  CEvtNewMemberContactReceivedInv u ct g m -> ttyUser u [ttyGroup' g <> " " <> ttyMember m <> " is creating direct contact " <> ttyContact' ct <> " with you"]
+  CEvtContactAndMemberAssociated u ct g m ct' -> ttyUser u $ viewContactAndMemberAssociated ct g m ct'
+  CEvtCallInvitation RcvCallInvitation {user, contact, callType, sharedKey} -> ttyUser user $ viewCallInvitation contact callType sharedKey
+  CEvtCallOffer {user = u, contact, callType, offer, sharedKey} -> ttyUser u $ viewCallOffer contact callType offer sharedKey
+  CEvtCallAnswer {user = u, contact, answer} -> ttyUser u $ viewCallAnswer contact answer
+  CEvtCallExtraInfo {user = u, contact} -> ttyUser u ["call extra info from " <> ttyContact' contact]
+  CEvtCallEnded {user = u, contact} -> ttyUser u ["call with " <> ttyContact' contact <> " ended"]
+  CEvtNtfMessage {} -> []
+  CEvtRemoteHostSessionCode {remoteHost_, sessionCode} ->
+    [ maybe "new remote host connecting" (\RemoteHostInfo {remoteHostId = rhId} -> "remote host " <> sShow rhId <> " connecting") remoteHost_,
+      "Compare session code with host:",
+      plain sessionCode
+    ]
+  CEvtNewRemoteHost RemoteHostInfo {remoteHostId = rhId, hostDeviceName} -> ["new remote host " <> sShow rhId <> " added: " <> plain hostDeviceName]
+  CEvtRemoteHostConnected RemoteHostInfo {remoteHostId = rhId} -> ["remote host " <> sShow rhId <> " connected"]
+  CEvtRemoteHostStopped {remoteHostId_} ->
+    [ maybe "new remote host" (mappend "remote host " . sShow) remoteHostId_ <> " stopped"
+    ]
+  CEvtRemoteCtrlFound {remoteCtrl = RemoteCtrlInfo {remoteCtrlId, ctrlDeviceName}, ctrlAppInfo_, appVersion, compatible} ->
+    [ ("remote controller " <> sShow remoteCtrlId <> " found: ")
+        <> maybe (deviceName <> "not compatible") (\info -> viewRemoteCtrl info appVersion compatible) ctrlAppInfo_
+    ]
+      <> ["use " <> highlight ("/confirm remote ctrl " <> show remoteCtrlId) <> " to connect" | isJust ctrlAppInfo_ && compatible]
+    where
+      deviceName = if T.null ctrlDeviceName then "" else plain ctrlDeviceName <> ", "
+  CEvtRemoteCtrlSessionCode {remoteCtrl_, sessionCode} ->
+    [ maybe "new remote controller connected" (\RemoteCtrlInfo {remoteCtrlId} -> "remote controller " <> sShow remoteCtrlId <> " connected") remoteCtrl_,
+      "Compare session code with controller and use:",
+      "/verify remote ctrl " <> plain sessionCode -- TODO maybe pass rcId
+    ]
+  CEvtRemoteCtrlStopped {rcStopReason} -> viewRemoteCtrlStopped rcStopReason
+  CEvtContactPQEnabled u c (CR.PQEncryption pqOn) -> ttyUser u [ttyContact' c <> ": " <> (if pqOn then "quantum resistant" else "standard") <> " end-to-end encryption enabled"]
+  CEvtContactDisabled u c -> ttyUser u ["[" <> ttyContact' c <> "] connection is disabled, to enable: " <> highlight ("/enable " <> viewContactName c) <> ", to delete: " <> highlight ("/d " <> viewContactName c)]
+  CEvtConnectionDisabled entity -> viewConnectionEntityDisabled entity
+  CEvtConnectionInactive entity inactive -> viewConnectionEntityInactive entity inactive
+  CEvtAgentRcvQueuesDeleted delQs -> ["completed deleting rcv queues: " <> sShow (length delQs) | logLevel <= CLLInfo]
+  CEvtAgentConnsDeleted acIds -> ["completed deleting connections: " <> sShow (length acIds) | logLevel <= CLLInfo]
+  CEvtAgentUserDeleted auId -> ["completed deleting user" <> if logLevel <= CLLInfo then ", agent user id: " <> sShow auId else ""]
+  CEvtMessageError u prefix err -> ttyUser u [plain prefix <> ": " <> plain err | prefix == "error" || logLevel <= CLLWarning]
+  CEvtChatErrors errs -> concatMap (viewChatError False logLevel testView) errs
+  CEvtTimedAction _ _ -> []
+  CEvtTerminalEvent te -> case te of
+    TERejectingGroupJoinRequestMember _ g m reason -> [ttyFullMember m <> ": rejecting request to join group " <> ttyGroup' g <> ", reason: " <> sShow reason]
+    TEGroupLinkRejected u g reason -> ttyUser u [ttyGroup' g <> ": join rejected, reason: " <> sShow reason]
+    TENewMemberContact u _ g m -> ttyUser u ["contact for member " <> ttyGroup' g <> " " <> ttyMember m <> " is created"]
+    TEContactVerificationReset u ct -> ttyUser u $ viewContactVerificationReset ct
+    TEGroupMemberVerificationReset u g m -> ttyUser u $ viewGroupMemberVerificationReset g m
+    TEGroupSubscribed u ShortGroupInfo {groupName = g} -> ttyUser u $ viewGroupSubscribed g
+    TEGroupInvitation u g -> ttyUser u [groupInvitationSub g]
+    TEGroupEmpty u ShortGroupInfo {groupName = g} -> ttyUser u [ttyGroup g <> ": group is empty"]
+    TEMemberSubError u ShortGroupInfo {groupName = g} ShortGroupMember {memberName = n} e -> ttyUser u [ttyGroup g <> " member " <> ttyContact n <> " error: " <> sShow e]
+    TEMemberSubSummary u summary -> ttyUser u $ viewErrorsSummary (filter (isJust . memberError) summary) " group member errors"
+    TEPendingSubSummary u _ -> ttyUser u []
+    TESndFileSubError u SndFileTransfer {fileId, fileName} e ->
+      ttyUser u ["sent file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
+    TERcvFileSubError u RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName}} e ->
+      ttyUser u ["received file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
+  CEvtCustomChatEvent u r -> ttyUser' u $ map plain $ T.lines r
+  where
+    ttyUser :: User -> [StyledString] -> [StyledString]
+    ttyUser user@User {showNtfs, activeUser, viewPwdHash} ss
+      | (showNtfs && isNothing viewPwdHash) || activeUser = ttyUserPrefix hu outputRH user ss
+      | otherwise = []
+    ttyUser' :: Maybe User -> [StyledString] -> [StyledString]
+    ttyUser' = maybe id ttyUser
+    withMessages wm = if wm then " with all messages" else ""
+    unmuted :: User -> ChatInfo c -> ChatItem c d -> [StyledString] -> [StyledString]
+    unmuted u chat ci@ChatItem {chatDir} = unmuted' u chat chatDir $ isUserMention ci
     unmutedReaction :: User -> ChatInfo c -> CIReaction c d -> [StyledString] -> [StyledString]
     unmutedReaction u chat CIReaction {chatDir} = unmuted' u chat chatDir False
     unmuted' :: User -> ChatInfo c -> CIDirection c d -> Bool -> [StyledString] -> [StyledString]
@@ -521,7 +558,7 @@ userNtf User {showNtfs, activeUser} = showNtfs || activeUser
 chatDirNtf :: User -> ChatInfo c -> CIDirection c d -> Bool -> Bool
 chatDirNtf user cInfo chatDir mention = case (cInfo, chatDir) of
   (DirectChat ct, CIDirectRcv) -> contactNtf user ct mention
-  (GroupChat g, CIGroupRcv m) -> groupNtf user g mention && not (blockedByAdmin m) && showMessages (memberSettings m)
+  (GroupChat g _scopeInfo, CIGroupRcv m) -> groupNtf user g mention && not (blockedByAdmin m) && showMessages (memberSettings m)
   _ -> True
 
 contactNtf :: User -> Contact -> Bool -> Bool
@@ -571,8 +608,8 @@ viewUsersList us =
             <> ["muted" | not showNtfs]
             <> [plain ("unread: " <> show count) | count /= 0]
 
-viewGroupSubscribed :: GroupInfo -> [StyledString]
-viewGroupSubscribed g = [membershipIncognito g <> ttyFullGroup g <> ": connected to server(s)"]
+viewGroupSubscribed :: GroupName -> [StyledString]
+viewGroupSubscribed g = [ttyGroup g <> ": connected to server(s)"]
 
 showSMPServer :: SMPServer -> String
 showSMPServer ProtocolServer {host} = B.unpack $ strEncode host
@@ -591,11 +628,28 @@ viewChats ts tz = concatMap chatPreview . reverse
       where
         chatName = case chat of
           DirectChat ct -> ["      " <> ttyToContact' ct]
-          GroupChat g -> ["      " <> ttyToGroup g]
+          GroupChat g scopeInfo -> ["      " <> ttyToGroup g scopeInfo]
           _ -> []
 
+viewChatItems ::
+  (User -> [StyledString] -> [StyledString]) ->
+  (forall c d. User -> ChatInfo c -> ChatItem c d -> [StyledString] -> [StyledString]) ->
+  User ->
+  [AChatItem] ->
+  UTCTime ->
+  TimeZone ->
+  [StyledString]
+viewChatItems ttyUser unmuted u chatItems ts tz
+  | length chatItems <= 20 =
+      concatMap
+        (\(AChatItem _ _ chat item) -> ttyUser u $ unmuted u chat item $ viewChatItem chat item False ts tz <> viewItemReactions item)
+        chatItems
+  | all (\aci -> aChatItemDir aci == MDRcv) chatItems = ttyUser u [sShow (length chatItems) <> " new messages"]
+  | all (\aci -> aChatItemDir aci == MDSnd) chatItems = ttyUser u [sShow (length chatItems) <> " messages sent"]
+  | otherwise = ttyUser u [sShow (length chatItems) <> " new messages created"]
+
 viewChatItem :: forall c d. MsgDirectionI d => ChatInfo c -> ChatItem c d -> Bool -> CurrentTime -> TimeZone -> [StyledString]
-viewChatItem chat ci@ChatItem {chatDir, meta = meta@CIMeta {itemForwarded, forwardedByMember}, content, quotedItem, file} doShow ts tz =
+viewChatItem chat ci@ChatItem {chatDir, meta = meta@CIMeta {itemForwarded, forwardedByMember, userMention}, content, quotedItem, file} doShow ts tz =
   withGroupMsgForwarded . withItemDeleted <$> viewCI
   where
     viewCI = case chat of
@@ -619,22 +673,22 @@ viewChatItem chat ci@ChatItem {chatDir, meta = meta@CIMeta {itemForwarded, forwa
               (maybe [] forwardedFrom itemForwarded)
               (directQuote chatDir)
               quotedItem
-      GroupChat g -> case chatDir of
+      GroupChat g scopeInfo -> case chatDir of
         CIGroupSnd -> case content of
           CISndMsgContent mc -> hideLive meta $ withSndFile to $ sndMsg to context mc
           CISndGroupInvitation {} -> showSndItemProhibited to
           _ -> showSndItem to
           where
-            to = ttyToGroup g
+            to = ttyToGroup g scopeInfo
         CIGroupRcv m -> case content of
           CIRcvMsgContent mc -> withRcvFile from $ rcvMsg from context mc
           CIRcvIntegrityError err -> viewRcvIntegrityError from err ts tz meta
           CIRcvGroupInvitation {} -> showRcvItemProhibited from
-          CIRcvModerated {} -> receivedWithTime_ ts tz (ttyFromGroup g m) context meta [plainContent content] False
-          CIRcvBlocked {} -> receivedWithTime_ ts tz (ttyFromGroup g m) context meta [plainContent content] False
+          CIRcvModerated {} -> receivedWithTime_ ts tz (ttyFromGroup g scopeInfo m) context meta [plainContent content] False
+          CIRcvBlocked {} -> receivedWithTime_ ts tz (ttyFromGroup g scopeInfo m) context meta [plainContent content] False
           _ -> showRcvItem from
           where
-            from = ttyFromGroup g m
+            from = ttyFromGroupAttention g scopeInfo m userMention
         where
           context =
             maybe
@@ -712,8 +766,8 @@ viewChatItemInfo (AChatItem _ msgDir _ ChatItem {meta = CIMeta {itemTs, itemTime
             fwdDir_ = case (fwdMsgDir, fwdChatInfo) of
               (SMDSnd, DirectChat ct) -> Just $ "you @" <> viewContactName ct
               (SMDRcv, DirectChat ct) -> Just $ "@" <> viewContactName ct
-              (SMDSnd, GroupChat gInfo) -> Just $ "you #" <> viewGroupName gInfo
-              (SMDRcv, GroupChat gInfo) -> Just $ "#" <> viewGroupName gInfo
+              (SMDSnd, GroupChat gInfo _scopeInfo) -> Just $ "you #" <> viewGroupName gInfo
+              (SMDRcv, GroupChat gInfo _scopeInfo) -> Just $ "#" <> viewGroupName gInfo
               _ -> Nothing
             fwdItemId = "chat item id: " <> (T.pack . show $ aChatItemId fwdACI)
         _ -> []
@@ -727,14 +781,10 @@ localTs tz ts = do
 viewChatItemStatusUpdated :: AChatItem -> CurrentTime -> TimeZone -> Bool -> Bool -> [StyledString]
 viewChatItemStatusUpdated (AChatItem _ _ chat item@ChatItem {meta = CIMeta {itemStatus}}) ts tz testView showReceipts =
   case itemStatus of
-    CISSndRcvd rcptStatus SSPPartial ->
-      if testView && showReceipts
-        then prependFirst (viewDeliveryReceiptPartial rcptStatus <> " ") $ viewChatItem chat item False ts tz
-        else []
-    CISSndRcvd rcptStatus SSPComplete ->
-      if testView && showReceipts
-        then prependFirst (viewDeliveryReceipt rcptStatus <> " ") $ viewChatItem chat item False ts tz
-        else []
+    CISSndRcvd rcptStatus SSPPartial | testView && showReceipts ->
+      prependFirst (viewDeliveryReceiptPartial rcptStatus <> " ") $ viewChatItem chat item False ts tz
+    CISSndRcvd rcptStatus SSPComplete | testView && showReceipts ->
+      prependFirst (viewDeliveryReceipt rcptStatus <> " ") $ viewChatItem chat item False ts tz
     _ -> []
 
 viewDeliveryReceiptPartial :: MsgReceiptStatus -> StyledString
@@ -768,19 +818,19 @@ viewItemUpdate chat ChatItem {chatDir, meta = meta@CIMeta {itemForwarded, itemEd
           (maybe [] forwardedFrom itemForwarded)
           (directQuote chatDir)
           quotedItem
-  GroupChat g -> case chatDir of
+  GroupChat g scopeInfo -> case chatDir of
     CIGroupRcv m -> case content of
       CIRcvMsgContent mc
         | itemLive == Just True && not liveItems -> []
         | otherwise -> viewReceivedUpdatedMessage from context mc ts tz meta
       _ -> []
       where
-        from = if itemEdited then ttyFromGroupEdited g m else ttyFromGroup g m
+        from = if itemEdited then ttyFromGroupEdited g scopeInfo m else ttyFromGroup g scopeInfo m
     CIGroupSnd -> case content of
       CISndMsgContent mc -> hideLive meta $ viewSentMessage to context mc ts tz meta
       _ -> []
       where
-        to = if itemEdited then ttyToGroupEdited g else ttyToGroup g
+        to = if itemEdited then ttyToGroupEdited g scopeInfo else ttyToGroup g scopeInfo
     where
       context =
         maybe
@@ -798,6 +848,23 @@ viewItemNotChanged (AChatItem _ msgDir _ _) = case msgDir of
   SMDSnd -> ["message didn't change"]
   SMDRcv -> []
 
+viewChatItemsDeleted ::
+  (forall c d. ChatInfo c -> ChatItem c d -> [StyledString] -> [StyledString]) ->
+  [ChatItemDeletion] ->
+  Bool ->
+  Bool ->
+  UTCTime ->
+  TimeZone ->
+  Bool ->
+  [StyledString]
+viewChatItemsDeleted unmuted deletions byUser timed ts tz testView = case deletions of
+  [ChatItemDeletion (AChatItem _ _ chat deletedItem) toItem] ->
+    unmuted chat deletedItem $ viewItemDelete chat deletedItem toItem byUser timed ts tz testView
+  deletions' -> [sShow (length deletions') <> " messages deleted"]
+
+viewGroupChatItemsDeleted :: GroupInfo -> [ChatItemId] -> Bool -> Maybe GroupMember -> [StyledString]
+viewGroupChatItemsDeleted g ciIds byUser member_ = [ttyGroup' g <> ": " <> sShow (length ciIds) <> " messages deleted by " <> if byUser then "user" else "member" <> maybe "" (\m -> " " <> ttyMember m) member_]
+
 viewItemDelete :: ChatInfo c -> ChatItem c d -> Maybe AChatItem -> Bool -> Bool -> CurrentTime -> TimeZone -> Bool -> [StyledString]
 viewItemDelete chat ci@ChatItem {chatDir, meta, content = deletedContent} toItem byUser timed ts tz testView
   | timed = [plain ("timed message deleted: " <> T.unpack (ciContentToText deletedContent)) | testView]
@@ -806,10 +873,10 @@ viewItemDelete chat ci@ChatItem {chatDir, meta, content = deletedContent} toItem
       DirectChat c -> case (chatDir, deletedContent) of
         (CIDirectRcv, CIRcvMsgContent mc) -> viewReceivedMessage (ttyFromContactDeleted c deletedText_) [] mc ts tz meta
         _ -> prohibited
-      GroupChat g -> case ciMsgContent deletedContent of
+      GroupChat g scopeInfo -> case ciMsgContent deletedContent of
         Just mc ->
           let m = chatItemMember g ci
-           in viewReceivedMessage (ttyFromGroupDeleted g m deletedText_) [] mc ts tz meta
+           in viewReceivedMessage (ttyFromGroupDeleted g scopeInfo m deletedText_) [] mc ts tz meta
         _ -> prohibited
       _ -> prohibited
   where
@@ -828,11 +895,11 @@ viewItemReaction showReactions chat CIReaction {chatDir, chatItem = CChatItem md
       where
         from = ttyFromContact c
         reactionMsg mc = quoteText mc $ if toMsgDirection md == MDSnd then ">>" else ">"
-    (GroupChat g, CIGroupRcv m) -> case ciMsgContent content of
+    (GroupChat g scopeInfo, CIGroupRcv m) -> case ciMsgContent content of
       Just mc -> view from $ reactionMsg mc
       _ -> []
       where
-        from = ttyFromGroup g m
+        from = ttyFromGroup g scopeInfo m
         reactionMsg mc = quoteText mc . ttyQuotedMember . Just $ sentByMember' g itemDir
     (LocalChat _, CILocalRcv) -> case ciMsgContent content of
       Just mc -> view from $ reactionMsg mc
@@ -913,14 +980,17 @@ viewInvalidConnReq =
     plain updateStr
   ]
 
-viewConnReqInvitation :: ConnReqInvitation -> [StyledString]
-viewConnReqInvitation cReq =
+viewConnReqInvitation :: CreatedLinkInvitation -> [StyledString]
+viewConnReqInvitation (CCLink cReq shortLink) =
   [ "pass this invitation link to your contact (via another channel): ",
     "",
-    (plain . strEncode) (simplexChatInvitation cReq),
+    plain $ maybe cReqStr strEncode shortLink,
     "",
     "and ask them to connect: " <> highlight' "/c <invitation_link_above>"
   ]
+    <> ["The invitation link for old clients: " <> plain cReqStr | isJust shortLink]
+  where
+    cReqStr = strEncode $ simplexChatInvitation cReq
 
 simplexChatInvitation :: ConnReqInvitation -> ConnReqInvitation
 simplexChatInvitation (CRInvitationUri crData e2e) = CRInvitationUri crData {crScheme = simplexChat} e2e
@@ -936,7 +1006,7 @@ viewContactNotFound cName suspectedMember =
 viewChatCleared :: AChatInfo -> [StyledString]
 viewChatCleared (AChatInfo _ chatInfo) = case chatInfo of
   DirectChat ct -> [ttyContact' ct <> ": all messages are removed locally ONLY"]
-  GroupChat gi -> [ttyGroup' gi <> ": all messages are removed locally ONLY"]
+  GroupChat gi _scopeInfo -> [ttyGroup' gi <> ": all messages are removed locally ONLY"]
   LocalChat _ -> ["notes: all messages are removed"]
   ContactRequest _ -> []
   ContactConnection _ -> []
@@ -975,21 +1045,29 @@ viewForwardPlan count itemIds = maybe [forwardCount] $ \fc -> [confirmation fc,
       | otherwise = plain $ show len <> " message(s) out of " <> show count <> " can be forwarded"
     len = length itemIds
 
-connReqContact_ :: StyledString -> ConnReqContact -> [StyledString]
-connReqContact_ intro cReq =
+connReqContact_ :: StyledString -> CreatedLinkContact -> [StyledString]
+connReqContact_ intro (CCLink cReq shortLink) =
   [ intro,
     "",
-    (plain . strEncode) (simplexChatContact cReq),
+    plain $ maybe cReqStr strEncode shortLink,
     "",
     "Anybody can send you contact requests with: " <> highlight' "/c <contact_link_above>",
     "to show it again: " <> highlight' "/sa",
     "to share with your contacts: " <> highlight' "/profile_address on",
     "to delete it: " <> highlight' "/da" <> " (accepted contacts will remain connected)"
   ]
+    <> ["The contact link for old clients: " <> plain cReqStr | isJust shortLink]
+  where
+    cReqStr = strEncode $ simplexChatContact cReq
 
 simplexChatContact :: ConnReqContact -> ConnReqContact
 simplexChatContact (CRContactUri crData) = CRContactUri crData {crScheme = simplexChat}
 
+simplexChatContact' :: ConnLinkContact -> ConnLinkContact
+simplexChatContact' = \case
+  CLFull (CRContactUri crData) -> CLFull $ CRContactUri crData {crScheme = simplexChat}
+  l@(CLShort _) -> l
+
 autoAcceptStatus_ :: Maybe AutoAccept -> [StyledString]
 autoAcceptStatus_ = \case
   Just AutoAccept {businessAddress, acceptIncognito, autoReply} ->
@@ -1002,16 +1080,19 @@ autoAcceptStatus_ = \case
         | otherwise = ""
   _ -> ["auto_accept off"]
 
-groupLink_ :: StyledString -> GroupInfo -> ConnReqContact -> GroupMemberRole -> [StyledString]
-groupLink_ intro g cReq mRole =
+groupLink_ :: StyledString -> GroupInfo -> CreatedLinkContact -> GroupMemberRole -> [StyledString]
+groupLink_ intro g (CCLink cReq shortLink) mRole =
   [ intro,
     "",
-    (plain . strEncode) (simplexChatContact cReq),
+    plain $ maybe cReqStr strEncode shortLink,
     "",
     "Anybody can connect to you and join group as " <> showRole mRole <> " with: " <> highlight' "/c <group_link_above>",
     "to show it again: " <> highlight ("/show link #" <> viewGroupName g),
     "to delete it: " <> highlight ("/delete link #" <> viewGroupName g) <> " (joined members will remain connected to you)"
   ]
+    <> ["The group link for old clients: " <> plain cReqStr | isJust shortLink]
+  where
+    cReqStr = strEncode $ simplexChatContact cReq
 
 viewGroupLinkDeleted :: GroupInfo -> [StyledString]
 viewGroupLinkDeleted g =
@@ -1079,14 +1160,53 @@ viewNetworkStatuses = map viewStatuses . L.groupBy ((==) `on` netStatus) . sortO
     viewStatuses ss@(s :| _) = plain $ show (L.length ss) <> " connections " <> netStatusStr (netStatus s)
 
 viewUserJoinedGroup :: GroupInfo -> [StyledString]
-viewUserJoinedGroup g =
+viewUserJoinedGroup g@GroupInfo {membership} =
   case incognitoMembershipProfile g of
-    Just mp -> [ttyGroup' g <> ": you joined the group incognito as " <> incognitoProfile' (fromLocalProfile mp)]
-    Nothing -> [ttyGroup' g <> ": you joined the group"]
+    Just mp -> [ttyGroup' g <> ": you joined the group incognito as " <> incognitoProfile' (fromLocalProfile mp) <> pendingApproval_]
+    Nothing -> [ttyGroup' g <> ": you joined the group" <> pendingApproval_]
+  where
+    pendingApproval_ = case memberStatus membership of
+      GSMemPendingApproval -> ", pending approval"
+      GSMemPendingReview -> ", connecting to group moderators for admission to group"
+      _ -> ""
 
 viewJoinedGroupMember :: GroupInfo -> GroupMember -> [StyledString]
-viewJoinedGroupMember g m =
-  [ttyGroup' g <> ": " <> ttyMember m <> " joined the group "]
+viewJoinedGroupMember g@GroupInfo {groupId} m@GroupMember {groupMemberId, memberStatus} = case memberStatus of
+  GSMemPendingApproval ->
+    [ (ttyGroup' g <> ": " <> ttyMember m <> " connected and pending approval, ")
+      <> ("use " <> highlight ("/_accept member #" <> show groupId <> " " <> show groupMemberId <> " <role>") <> " to accept member")
+    ]
+  GSMemPendingReview -> [ttyGroup' g <> ": " <> ttyMember m <> " connected and pending review"]
+  _ -> [ttyGroup' g <> ": " <> ttyMember m <> " joined the group"]
+
+viewMemberAccepted :: GroupInfo -> GroupMember -> [StyledString]
+viewMemberAccepted g m@GroupMember {memberStatus} = case memberStatus of
+  GSMemPendingReview -> [ttyGroup' g <> ": " <> ttyMember m <> " accepted and pending review (will introduce moderators)"]
+  _ -> [ttyGroup' g <> ": " <> ttyMember m <> " accepted"]
+
+viewMemberAcceptedByOther :: GroupInfo -> GroupMember -> GroupMember -> [StyledString]
+viewMemberAcceptedByOther g acceptingMember m@GroupMember {memberCategory, memberStatus} = case memberCategory of
+  GCUserMember -> case memberStatus of
+    GSMemPendingReview -> [ttyGroup' g <> ": " <> ttyMember acceptingMember <> " accepted you to the group, pending review"]
+    _ -> [ttyGroup' g <> ": " <> ttyMember acceptingMember <> " accepted you to the group [warning - unexpected]"]
+  GCInviteeMember -> [ttyGroup' g <> ": " <> ttyMember acceptingMember <> " accepted " <> ttyMember m <> " to the group (will introduce remaining members)"]
+  _ -> [ttyGroup' g <> ": " <> ttyMember acceptingMember <> " accepted " <> ttyMember m <> " to the group"]
+
+viewJoinedGroupMemberConnecting :: GroupInfo -> GroupMember -> GroupMember -> [StyledString]
+viewJoinedGroupMemberConnecting g@GroupInfo {groupId} host m@GroupMember {groupMemberId, memberStatus} = case memberStatus of
+  GSMemPendingReview ->
+    [ (ttyGroup' g <> ": " <> ttyMember host <> " added " <> ttyFullMember m <> " to the group (connecting and pending review...), ")
+      <> ("use " <> highlight ("/_accept member #" <> show groupId <> " " <> show groupMemberId <> " <role>") <> " to accept member")
+    ]
+  _ -> [ttyGroup' g <> ": " <> ttyMember host <> " added " <> ttyFullMember m <> " to the group (connecting...)"]
+
+viewConnectedToGroupMember :: GroupInfo -> GroupMember -> [StyledString]
+viewConnectedToGroupMember g@GroupInfo {groupId} m@GroupMember {groupMemberId, memberStatus} = case memberStatus of
+  GSMemPendingReview ->
+    [ (ttyGroup' g <> ": " <> connectedMember m <> " is connected and pending review, ")
+      <> ("use " <> highlight ("/_accept member #" <> show groupId <> " " <> show groupMemberId <> " <role>") <> " to accept member")
+    ]
+  _ -> [ttyGroup' g <> ": " <> connectedMember m <> " is connected"]
 
 viewReceivedGroupInvitation :: GroupInfo -> Contact -> GroupMemberRole -> [StyledString]
 viewReceivedGroupInvitation g c role =
@@ -1114,21 +1234,19 @@ viewMemberRoleChanged g@GroupInfo {membership} by m r r'
     memId = groupMemberId' m
     view s = [ttyGroup' g <> ": " <> ttyMember by <> " changed " <> s <> " from " <> showRole r <> " to " <> showRole r']
 
-viewMemberRoleUserChanged :: GroupInfo -> GroupMember -> GroupMemberRole -> GroupMemberRole -> [StyledString]
-viewMemberRoleUserChanged g@GroupInfo {membership} m r r'
-  | r == r' = [ttyGroup' g <> ": member role did not change"]
-  | groupMemberId' membership == groupMemberId' m = view "your role"
-  | otherwise = view $ "the role of " <> ttyMember m
-  where
-    view s = [ttyGroup' g <> ": you changed " <> s <> " from " <> showRole r <> " to " <> showRole r']
+viewMemberRoleUserChanged :: GroupInfo -> [GroupMember] -> GroupMemberRole -> [StyledString]
+viewMemberRoleUserChanged g members r = case members of
+  [m] -> [ttyGroup' g <> ": you changed the role of " <> ttyMember m <> " to " <> showRole r]
+  mems' -> [ttyGroup' g <> ": you changed the role of " <> sShow (length mems') <> " members to " <> showRole r]
 
 viewMemberBlockedForAll :: GroupInfo -> GroupMember -> GroupMember -> Bool -> [StyledString]
 viewMemberBlockedForAll g by m blocked =
   [ttyGroup' g <> ": " <> ttyMember by <> " " <> (if blocked then "blocked" else "unblocked") <> " " <> ttyMember m]
 
-viewMemberBlockedForAllUser :: GroupInfo -> GroupMember -> Bool -> [StyledString]
-viewMemberBlockedForAllUser g m blocked =
-  [ttyGroup' g <> ": you " <> (if blocked then "blocked" else "unblocked") <> " " <> ttyMember m]
+viewMembersBlockedForAllUser :: GroupInfo -> [GroupMember] -> Bool -> [StyledString]
+viewMembersBlockedForAllUser g members blocked = case members of
+  [m] -> [ttyGroup' g <> ": you " <> (if blocked then "blocked" else "unblocked") <> " " <> ttyMember m]
+  mems' -> [ttyGroup' g <> ": you " <> (if blocked then "blocked" else "unblocked") <> " " <> sShow (length mems') <> " members"]
 
 showRole :: GroupMemberRole -> StyledString
 showRole = plain . strEncode
@@ -1136,7 +1254,7 @@ showRole = plain . strEncode
 viewGroupMembers :: Group -> [StyledString]
 viewGroupMembers (Group GroupInfo {membership} members) = map groupMember . filter (not . removedOrLeft) $ membership : members
   where
-    removedOrLeft m = let s = memberStatus m in s == GSMemRemoved || s == GSMemLeft
+    removedOrLeft m = let s = memberStatus m in s == GSMemRejected || s == GSMemRemoved || s == GSMemLeft
     groupMember m = memIncognito m <> ttyFullMember m <> ": " <> plain (intercalate ", " $ [role m] <> category m <> status m <> muted m)
     role :: GroupMember -> String
     role GroupMember {memberRole} = B.unpack $ strEncode memberRole
@@ -1146,6 +1264,7 @@ viewGroupMembers (Group GroupInfo {membership} members) = map groupMember . filt
       GCHostMember -> ["host"]
       _ -> []
     status m = case memberStatus m of
+      GSMemRejected -> ["rejected"]
       GSMemRemoved -> ["removed"]
       GSMemLeft -> ["left"]
       GSMemUnknown -> ["status unknown"]
@@ -1159,6 +1278,18 @@ viewGroupMembers (Group GroupInfo {membership} members) = map groupMember . filt
       | not (showMessages $ memberSettings m) = ["blocked"]
       | otherwise = []
 
+viewMemberSupportChats :: GroupInfo -> [GroupMember] -> [StyledString]
+viewMemberSupportChats GroupInfo {membership} ms = support <> map groupMember ms
+  where
+    support = case supportChat membership of
+      Just sc -> ["support: " <> chatStats sc]
+      Nothing -> []
+    groupMember m@GroupMember {supportChat} = case supportChat of
+      Just sc -> memIncognito m <> ttyFullMember m <> (" (id " <> sShow (groupMemberId' m) <> "): ") <> chatStats sc
+      Nothing -> ""
+    chatStats GroupSupportChat {unread, memberAttention, mentions} =
+      "unread: " <> sShow unread <> ", require attention: " <> sShow memberAttention <> ", mentions: " <> sShow mentions
+
 viewContactConnected :: Contact -> Maybe Profile -> Bool -> [StyledString]
 viewContactConnected ct userIncognitoProfile testView =
   case userIncognitoProfile of
@@ -1186,6 +1317,7 @@ viewGroupsList gs = map groupSS $ sortOn (ldn_ . fst) gs
         s -> membershipIncognito g <> ttyFullGroup g <> viewMemberStatus s <> alias g
       where
         viewMemberStatus = \case
+          GSMemRejected -> delete "you are rejected"
           GSMemRemoved -> delete "you are removed"
           GSMemLeft -> delete "you left"
           GSMemGroupDeleted -> delete "group deleted"
@@ -1202,6 +1334,13 @@ viewGroupsList gs = map groupSS $ sortOn (ldn_ . fst) gs
           | localAlias == "" = ""
           | otherwise = " (alias: " <> plain localAlias <> ")"
 
+viewSentGroupInvitation :: GroupInfo -> Contact -> [StyledString]
+viewSentGroupInvitation g c = case contactConn c of
+  Just Connection {viaGroupLink}
+    | viaGroupLink -> [ttyContact' c <> " invited to group " <> ttyGroup' g <> " via your group link"]
+    | otherwise -> ["invitation to join the group " <> ttyGroup' g <> " sent to " <> ttyContact' c]
+  Nothing -> []
+
 groupInvitation' :: GroupInfo -> StyledString
 groupInvitation' g@GroupInfo {localDisplayName = ldn, groupProfile = GroupProfile {fullName}} =
   highlight ("#" <> viewName ldn)
@@ -1216,6 +1355,15 @@ groupInvitation' g@GroupInfo {localDisplayName = ldn, groupProfile = GroupProfil
       Just mp -> " to join as " <> incognitoProfile' (fromLocalProfile mp) <> ", "
       Nothing -> " to join, "
 
+groupInvitationSub :: ShortGroupInfo -> StyledString
+groupInvitationSub ShortGroupInfo {groupName = ldn} =
+  highlight ("#" <> viewName ldn)
+    <> " - you are invited ("
+    <> highlight ("/j " <> viewName ldn)
+    <> " to join, "
+    <> highlight ("/d #" <> viewName ldn)
+    <> " to delete invitation)"
+
 viewContactsMerged :: Contact -> Contact -> Contact -> [StyledString]
 viewContactsMerged c1 c2 ct' =
   [ "contact " <> ttyContact' c2 <> " is merged into " <> ttyContact' c1,
@@ -1390,7 +1538,7 @@ viewContactInfo :: Contact -> Maybe ConnectionStats -> Maybe Profile -> [StyledS
 viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}, activeConn, uiThemes, customData} stats incognitoProfile =
   ["contact ID: " <> sShow contactId]
     <> maybe [] viewConnectionStats stats
-    <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact l)]) contactLink
+    <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact' l)]) contactLink
     <> maybe
       ["you've shared main profile with this contact"]
       (\p -> ["you've shared incognito profile with this contact: " <> incognitoProfile' p])
@@ -1422,7 +1570,7 @@ viewGroupMemberInfo GroupInfo {groupId} m@GroupMember {groupMemberId, memberProf
     "member ID: " <> sShow groupMemberId
   ]
     <> maybe ["member not connected"] viewConnectionStats stats
-    <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact l)]) contactLink
+    <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact' l)]) contactLink
     <> ["alias: " <> plain localAlias | localAlias /= ""]
     <> [viewConnectionVerified (memberSecurityCode m) | isJust stats]
     <> maybe [] (\ac -> [viewPeerChatVRange (peerChatVRange ac)]) activeConn
@@ -1584,10 +1732,10 @@ countactUserPrefText cup = case cup of
 
 viewGroupUpdated :: GroupInfo -> GroupInfo -> Maybe GroupMember -> [StyledString]
 viewGroupUpdated
-  GroupInfo {localDisplayName = n, groupProfile = GroupProfile {fullName, description, image, groupPreferences = gps}}
-  g'@GroupInfo {localDisplayName = n', groupProfile = GroupProfile {fullName = fullName', description = description', image = image', groupPreferences = gps'}}
+  GroupInfo {localDisplayName = n, groupProfile = GroupProfile {fullName, description, image, groupPreferences = gps, memberAdmission = ma}}
+  g'@GroupInfo {localDisplayName = n', groupProfile = GroupProfile {fullName = fullName', description = description', image = image', groupPreferences = gps', memberAdmission = ma'}}
   m = do
-    let update = groupProfileUpdated <> groupPrefsUpdated
+    let update = groupProfileUpdated <> groupPrefsUpdated <> memberAdmissionUpdated
     if null update
       then []
       else memberUpdated <> update
@@ -1608,6 +1756,9 @@ viewGroupUpdated
             | otherwise = Just . plain $ groupPreferenceText (pref gps')
             where
               pref = getGroupPreference f . mergeGroupPreferences
+      memberAdmissionUpdated
+        | ma == ma' = []
+        | otherwise = ["changed member admission rules"]
 
 viewGroupProfile :: GroupInfo -> [StyledString]
 viewGroupProfile g@GroupInfo {groupProfile = GroupProfile {description, image, groupPreferences = gps}} =
@@ -1648,21 +1799,24 @@ viewConnectionIncognitoUpdated PendingContactConnection {pccConnId, customUserPr
   | otherwise = ["connection " <> sShow pccConnId <> " changed to non incognito"]
 
 viewConnectionUserChanged :: User -> PendingContactConnection -> User -> PendingContactConnection -> [StyledString]
-viewConnectionUserChanged User {localDisplayName = n} PendingContactConnection {pccConnId, connReqInv} User {localDisplayName = n'} PendingContactConnection {connReqInv = connReqInv'} =
-  case (connReqInv, connReqInv') of
-    (Just cReqInv, Just cReqInv')
-      | cReqInv /= cReqInv' -> [userChangedStr <> ", new link:"] <> newLink cReqInv'
+viewConnectionUserChanged User {localDisplayName = n} PendingContactConnection {pccConnId, connLinkInv} User {localDisplayName = n'} PendingContactConnection {connLinkInv = connLinkInv'} =
+  case (connLinkInv, connLinkInv') of
+    (Just ccLink, Just ccLink')
+      | ccLink /= ccLink' -> [userChangedStr <> ", new link:"] <> newLink ccLink'
     _ -> [userChangedStr]
   where
     userChangedStr = "connection " <> sShow pccConnId <> " changed from user " <> plain n <> " to user " <> plain n'
-    newLink cReqInv =
+    newLink (CCLink cReq shortLink) =
       [ "",
-        (plain . strEncode) (simplexChatInvitation cReqInv),
+        plain $ maybe cReqStr strEncode shortLink,
         ""
       ]
+        <> ["The invitation link for old clients: " <> plain cReqStr | isJust shortLink]
+      where
+        cReqStr = strEncode $ simplexChatInvitation cReq
 
-viewConnectionPlan :: ConnectionPlan -> [StyledString]
-viewConnectionPlan = \case
+viewConnectionPlan :: ChatConfig -> ConnectionPlan -> [StyledString]
+viewConnectionPlan ChatConfig {logLevel, testView} = \case
   CPInvitationLink ilp -> case ilp of
     ILPOk -> [invLink "ok to connect"]
     ILPOwnLink -> [invLink "own link"]
@@ -1694,13 +1848,14 @@ viewConnectionPlan = \case
     GLPConnectingProhibit (Just g) -> [grpOrBiz g <> " link: connecting to " <> grpOrBiz g <> " " <> ttyGroup' g]
     GLPKnown g ->
       [ grpOrBiz g <> " link: known " <> grpOrBiz g <> " " <> ttyGroup' g,
-        "use " <> ttyToGroup g <> highlight' "<message>" <> " to send messages"
+        "use " <> ttyToGroup g Nothing <> highlight' "<message>" <> " to send messages"
       ]
     where
       grpLink = ("group link: " <>)
       grpOrBiz GroupInfo {businessChat} = case businessChat of
         Just _ -> "business"
         Nothing -> "group"
+  CPError e -> viewChatError False logLevel testView e
 
 viewContactUpdated :: Contact -> Contact -> [StyledString]
 viewContactUpdated
@@ -1823,7 +1978,7 @@ uploadingFile :: StyledString -> AChatItem -> [StyledString]
 uploadingFile status = \case
   AChatItem _ _ (DirectChat Contact {localDisplayName = c}) ChatItem {file = Just CIFile {fileId, fileName}, chatDir = CIDirectSnd} ->
     [status <> " uploading " <> fileTransferStr fileId fileName <> " for " <> ttyContact c]
-  AChatItem _ _ (GroupChat g) ChatItem {file = Just CIFile {fileId, fileName}, chatDir = CIGroupSnd} ->
+  AChatItem _ _ (GroupChat g _scopeInfo) ChatItem {file = Just CIFile {fileId, fileName}, chatDir = CIGroupSnd} ->
     [status <> " uploading " <> fileTransferStr fileId fileName <> " for " <> ttyGroup' g]
   _ -> [status <> " uploading file"]
 
@@ -2123,8 +2278,8 @@ viewChatError isCmd logLevel testView = \case
     CEChatNotStarted -> ["error: chat not started"]
     CEChatNotStopped -> ["error: chat not stopped"]
     CEChatStoreChanged -> ["error: chat store changed, please restart chat"]
-    CEConnectionPlan connectionPlan -> viewConnectionPlan connectionPlan
     CEInvalidConnReq -> viewInvalidConnReq
+    CEUnsupportedConnReq -> [ "", "Connection link is not supported by the your app version, please ugrade it.", plain updateStr]
     CEInvalidChatMessage Connection {connId} msgMeta_ msg e ->
       [ plain $
           ("chat message error: " <> e <> " (" <> T.unpack (T.take 120 msg) <> ")")
@@ -2176,7 +2331,6 @@ viewChatError isCmd logLevel testView = \case
     CEFileNotApproved fileId unknownSrvs -> ["file " <> sShow fileId <> " aborted, unknwon XFTP servers:"] <> map (plain . show) unknownSrvs
     CEFallbackToSMPProhibited fileId -> ["recipient tried to accept file " <> sShow fileId <> " via old protocol, prohibited"]
     CEInlineFileProhibited _ -> ["A small file sent without acceptance - you can enable receiving such files with -f option."]
-    CEInvalidQuote -> ["cannot reply to this message"]
     CEInvalidForward -> ["cannot forward message(s)"]
     CEInvalidChatItemUpdate -> ["cannot update this item"]
     CEInvalidChatItemDelete -> ["cannot delete this item"]
@@ -2370,18 +2524,26 @@ ttyFullGroup :: GroupInfo -> StyledString
 ttyFullGroup GroupInfo {localDisplayName = g, groupProfile = GroupProfile {fullName}} =
   ttyGroup g <> optFullName g fullName
 
-ttyFromGroup :: GroupInfo -> GroupMember -> StyledString
-ttyFromGroup g m = membershipIncognito g <> ttyFrom (fromGroup_ g m)
+ttyFromGroup :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> StyledString
+ttyFromGroup g scopeInfo m = ttyFromGroupAttention g scopeInfo m False
 
-ttyFromGroupEdited :: GroupInfo -> GroupMember -> StyledString
-ttyFromGroupEdited g m = membershipIncognito g <> ttyFrom (fromGroup_ g m <> "[edited] ")
+ttyFromGroupAttention :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> Bool -> StyledString
+ttyFromGroupAttention g scopeInfo m attention = membershipIncognito g <> ttyFrom (fromGroupAttention_ g scopeInfo m attention)
 
-ttyFromGroupDeleted :: GroupInfo -> GroupMember -> Maybe Text -> StyledString
-ttyFromGroupDeleted g m deletedText_ =
-  membershipIncognito g <> ttyFrom (fromGroup_ g m <> maybe "" (\t -> "[" <> t <> "] ") deletedText_)
+ttyFromGroupEdited :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> StyledString
+ttyFromGroupEdited g scopeInfo m = membershipIncognito g <> ttyFrom (fromGroup_ g scopeInfo m <> "[edited] ")
 
-fromGroup_ :: GroupInfo -> GroupMember -> Text
-fromGroup_ g m = "#" <> viewGroupName g <> " " <> viewMemberName m <> "> "
+ttyFromGroupDeleted :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> Maybe Text -> StyledString
+ttyFromGroupDeleted g scopeInfo m deletedText_ =
+  membershipIncognito g <> ttyFrom (fromGroup_ g scopeInfo m <> maybe "" (\t -> "[" <> t <> "] ") deletedText_)
+
+fromGroup_ :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> Text
+fromGroup_ g scopeInfo m = fromGroupAttention_ g scopeInfo m False
+
+fromGroupAttention_ :: GroupInfo -> Maybe GroupChatScopeInfo -> GroupMember -> Bool -> Text
+fromGroupAttention_ g scopeInfo m attention =
+  let attn = if attention then "!" else ""
+   in "#" <> viewGroupName g <> " " <> groupScopeInfoStr scopeInfo <> viewMemberName m <> attn <> "> "
 
 ttyFrom :: Text -> StyledString
 ttyFrom = styled $ colored Yellow
@@ -2389,14 +2551,18 @@ ttyFrom = styled $ colored Yellow
 ttyTo :: Text -> StyledString
 ttyTo = styled $ colored Cyan
 
-ttyToGroup :: GroupInfo -> StyledString
-ttyToGroup g = membershipIncognito g <> ttyTo ("#" <> viewGroupName g <> " ")
+ttyToGroup :: GroupInfo -> Maybe GroupChatScopeInfo -> StyledString
+ttyToGroup g scopeInfo = membershipIncognito g <> ttyTo ("#" <> viewGroupName g <> " " <> groupScopeInfoStr scopeInfo)
 
-ttyToGroupEdited :: GroupInfo -> StyledString
-ttyToGroupEdited g = membershipIncognito g <> ttyTo ("#" <> viewGroupName g <> " [edited] ")
+ttyToGroupEdited :: GroupInfo -> Maybe GroupChatScopeInfo -> StyledString
+ttyToGroupEdited g scopeInfo = membershipIncognito g <> ttyTo ("#" <> viewGroupName g <> groupScopeInfoStr scopeInfo <> " [edited] ")
 
-viewName :: Text -> Text
-viewName s = if T.any isSpace s then "'" <> s <> "'" else s
+groupScopeInfoStr :: Maybe GroupChatScopeInfo -> Text
+groupScopeInfoStr = \case
+  Nothing -> ""
+  Just (GCSIMemberSupport {groupMember_}) -> case groupMember_ of
+    Nothing -> "(support) "
+    Just m -> "(support: " <> viewMemberName m <> ") "
 
 ttyFilePath :: FilePath -> StyledString
 ttyFilePath = plain
diff --git a/tests/Bots/BroadcastTests.hs b/tests/Bots/BroadcastTests.hs
index 7d10f6a34a..71142c8b60 100644
--- a/tests/Bots/BroadcastTests.hs
+++ b/tests/Bots/BroadcastTests.hs
@@ -8,6 +8,7 @@ module Bots.BroadcastTests where
 import Broadcast.Bot
 import Broadcast.Options
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (forkIO, killThread, threadDelay)
 import Control.Exception (bracket)
@@ -21,7 +22,7 @@ import Test.Hspec hiding (it)
 import System.FilePath ((</>))
 #endif
 
-broadcastBotTests :: SpecWith FilePath
+broadcastBotTests :: SpecWith TestParams
 broadcastBotTests = do
   it "should broadcast message" testBroadcastMessages
 
@@ -34,8 +35,8 @@ withBroadcastBot opts test =
 broadcastBotProfile :: Profile
 broadcastBotProfile = Profile {displayName = "broadcast_bot", fullName = "Broadcast Bot", image = Nothing, contactLink = Nothing, preferences = Nothing}
 
-mkBotOpts :: FilePath -> [KnownContact] -> BroadcastBotOpts
-mkBotOpts tmp publishers =
+mkBotOpts :: TestParams -> [KnownContact] -> BroadcastBotOpts
+mkBotOpts ps publishers =
   BroadcastBotOpts
     { coreOptions =
         testCoreOpts
@@ -44,7 +45,7 @@ mkBotOpts tmp publishers =
 #if defined(dbPostgres)
                 {dbSchemaPrefix = "client_" <> botDbPrefix}
 #else
-                {dbFilePrefix = tmp </> botDbPrefix}
+                {dbFilePrefix = tmpPath ps </> botDbPrefix}
 #endif
 
           },
@@ -56,19 +57,19 @@ mkBotOpts tmp publishers =
 botDbPrefix :: FilePath
 botDbPrefix = "broadcast_bot"
 
-testBroadcastMessages :: HasCallStack => FilePath -> IO ()
-testBroadcastMessages tmp = do
+testBroadcastMessages :: HasCallStack => TestParams -> IO ()
+testBroadcastMessages ps = do
   botLink <-
-    withNewTestChat tmp botDbPrefix broadcastBotProfile $ \bc_bot ->
-      withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps botDbPrefix broadcastBotProfile $ \bc_bot ->
+      withNewTestChat ps "alice" aliceProfile $ \alice -> do
         connectUsers bc_bot alice
         bc_bot ##> "/ad"
         getContactLink bc_bot True
-  let botOpts = mkBotOpts tmp [KnownContact 2 "alice"]
+  let botOpts = mkBotOpts ps [KnownContact 2 "alice"]
   withBroadcastBot botOpts $
-    withTestChat tmp "alice" $ \alice ->
-      withNewTestChat tmp "bob" bobProfile $ \bob ->
-        withNewTestChat tmp "cath" cathProfile $ \cath -> do
+    withTestChat ps "alice" $ \alice ->
+      withNewTestChat ps "bob" bobProfile $ \bob ->
+        withNewTestChat ps "cath" cathProfile $ \cath -> do
           alice <## "1 contacts connected (use /cs for the list)"
           bob `connectVia` botLink
           bob #> "@broadcast_bot hello"
@@ -77,10 +78,11 @@ testBroadcastMessages tmp = do
           bob <## "I broadcast messages to all connected users from @alice."
           cath `connectVia` botLink
           alice #> "@broadcast_bot hello all!"
+          alice <# "broadcast_bot> hello all!" -- we broadcast to the sender too, /feed is used by bot
           bob <# "broadcast_bot> hello all!"
           cath <# "broadcast_bot> hello all!"
           alice <# "broadcast_bot> > hello all!"
-          alice <## "      Forwarded to 2 contact(s)"
+          alice <## "      Forwarded to 3 contact(s), 0 errors"
   where
     cc `connectVia` botLink = do
       cc ##> ("/c " <> botLink)
diff --git a/tests/Bots/DirectoryTests.hs b/tests/Bots/DirectoryTests.hs
index 6cb11f3f93..c8b3d33916 100644
--- a/tests/Bots/DirectoryTests.hs
+++ b/tests/Bots/DirectoryTests.hs
@@ -7,19 +7,21 @@
 module Bots.DirectoryTests where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (forkIO, killThread, threadDelay)
 import Control.Exception (finally)
 import Control.Monad (forM_, when)
 import qualified Data.Text as T
-import qualified Directory.Events as DE
+import Directory.Captcha
 import Directory.Options
 import Directory.Service
 import Directory.Store
 import GHC.IO.Handle (hClose)
 import Simplex.Chat.Bot.KnownContacts
-import Simplex.Chat.Controller (ChatConfig (..))
+import Simplex.Chat.Controller (ChatConfig (..), ChatHooks (..), defaultChatHooks)
 import Simplex.Chat.Core
+import qualified Simplex.Chat.Markdown as MD
 import Simplex.Chat.Options (CoreChatOpts (..))
 import Simplex.Chat.Options.DB
 import Simplex.Chat.Types (Profile (..))
@@ -27,11 +29,12 @@ import Simplex.Chat.Types.Shared (GroupMemberRole (..))
 import System.FilePath ((</>))
 import Test.Hspec hiding (it)
 
-directoryServiceTests :: SpecWith FilePath
+directoryServiceTests :: SpecWith TestParams
 directoryServiceTests = do
   it "should register group" testDirectoryService
   it "should suspend and resume group, send message to owner" testSuspendResume
   it "should delete group registration" testDeleteGroup
+  it "admin should delete group registration" testDeleteGroupAdmin
   it "should change initial member role" testSetRole
   it "should join found group via link" testJoinGroup
   it "should support group names with spaces" testGroupNameWithSpaces
@@ -51,9 +54,11 @@ directoryServiceTests = do
   describe "should require re-approval if profile is changed by" $ do
     it "the registration owner" testRegOwnerChangedProfile
     it "another owner" testAnotherOwnerChangedProfile
+    it "another owner not connected to directory" testNotConnectedOwnerChangedProfile
   describe "should require profile update if group link is removed by " $ do
     it "the registration owner" testRegOwnerRemovedLink
     it "another owner" testAnotherOwnerRemovedLink
+    it "another owner not connected to directory" testNotConnectedOwnerRemovedLink
   describe "duplicate groups (same display name and full name)" $ do
     it "should ask for confirmation if a duplicate group is submitted" testDuplicateAskConfirmation
     it "should prohibit registration if a duplicate group is listed" testDuplicateProhibitRegistration
@@ -62,14 +67,18 @@ directoryServiceTests = do
     it "should prohibit approval if a duplicate group is listed" testDuplicateProhibitApproval
   describe "list groups" $ do
     it "should list user's groups" testListUserGroups
+  describe "member admission" $ do
+    it "should ask member to pass captcha screen" testCapthaScreening
   describe "store log" $ do
     it "should restore directory service state" testRestoreDirectory
+  describe "captcha" $ do
+    it "should accept some incorrect spellings" testCaptcha
 
 directoryProfile :: Profile
 directoryProfile = Profile {displayName = "SimpleX-Directory", fullName = "", image = Nothing, contactLink = Nothing, preferences = Nothing}
 
-mkDirectoryOpts :: FilePath -> [KnownContact] -> Maybe KnownGroup -> DirectoryOpts
-mkDirectoryOpts tmp superUsers ownersGroup =
+mkDirectoryOpts :: TestParams -> [KnownContact] -> Maybe KnownGroup -> DirectoryOpts
+mkDirectoryOpts TestParams {tmpPath = ps} superUsers ownersGroup =
   DirectoryOpts
     { coreOptions =
         testCoreOpts
@@ -78,14 +87,20 @@ mkDirectoryOpts tmp superUsers ownersGroup =
 #if defined(dbPostgres)
                 {dbSchemaPrefix = "client_" <> serviceDbPrefix}
 #else
-                {dbFilePrefix = tmp </> serviceDbPrefix}
+                {dbFilePrefix = ps </> serviceDbPrefix}
 #endif
 
           },
       adminUsers = [],
       superUsers,
       ownersGroup,
-      directoryLog = Just $ tmp </> "directory_service.log",
+      blockedFragmentsFile = Nothing,
+      blockedWordsFile = Nothing,
+      blockedExtensionRules = Nothing,
+      nameSpellingFile = Nothing,
+      profileNameLimit = maxBound,
+      captchaGenerator = Nothing,
+      directoryLog = Just $ ps </> "directory_service.log",
       serviceName = "SimpleX-Directory",
       runCLI = False,
       searchResults = 3,
@@ -96,13 +111,13 @@ serviceDbPrefix :: FilePath
 serviceDbPrefix = "directory_service"
 
 viewName :: String -> String
-viewName = T.unpack . DE.viewName . T.pack
+viewName = T.unpack . MD.viewName . T.pack
 
-testDirectoryService :: HasCallStack => FilePath -> IO ()
-testDirectoryService tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDirectoryService :: HasCallStack => TestParams -> IO ()
+testDirectoryService ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         bob #> "@SimpleX-Directory privacy"
         bob <# "SimpleX-Directory> > privacy"
@@ -116,7 +131,7 @@ testDirectoryService tmp =
         bob <# "SimpleX-Directory> You must grant directory service admin role to register the group"
         bob ##> "/mr PSA SimpleX-Directory admin"
         -- putStrLn "*** discover service joins group and creates the link for profile"
-        bob <## "#PSA: you changed the role of SimpleX-Directory from member to admin"
+        bob <## "#PSA: you changed the role of SimpleX-Directory to admin"
         bob <# "SimpleX-Directory> Joining the group PSA…"
         bob <## "#PSA: SimpleX-Directory joined the group"
         bob <# "SimpleX-Directory> Joined the group PSA, creating the link…"
@@ -174,8 +189,13 @@ testDirectoryService tmp =
         superUser #> "@SimpleX-Directory /approve 1:PSA 1"
         superUser <# "SimpleX-Directory> > /approve 1:PSA 1"
         superUser <## "      Group approved!"
-        bob <# "SimpleX-Directory> The group ID 1 (PSA) is approved and listed in directory!"
+        bob <# "SimpleX-Directory> The group ID 1 (PSA) is approved and listed in directory - please moderate it!"
         bob <## "Please note: if you change the group profile it will be hidden from directory until it is re-approved."
+        bob <## ""
+        bob <## "Supported commands:"
+        bob <## "- /filter 1 - to configure anti-spam filter."
+        bob <## "- /role 1 - to set default member role."
+        bob <## "- /help commands - other commands."
         search bob "privacy" welcomeWithLink'
         search bob "security" welcomeWithLink'
         cath `connectVia` dsLink
@@ -211,10 +231,10 @@ testDirectoryService tmp =
       su <## "To approve send:"
       su <# ("SimpleX-Directory> /approve 1:PSA " <> show grId)
 
-testSuspendResume :: HasCallStack => FilePath -> IO ()
-testSuspendResume tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testSuspendResume :: HasCallStack => TestParams -> IO ()
+testSuspendResume ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       bob `connectVia` dsLink
       registerGroup superUser bob "privacy" "Privacy"
       groupFound bob "privacy"
@@ -229,7 +249,7 @@ testSuspendResume tmp =
       bob <# "SimpleX-Directory> The group ID 1 (privacy) is listed in the directory again!"
       groupFound bob "privacy"
       superUser #> "@SimpleX-Directory privacy"
-      groupFoundN_ (Just 1) 2 superUser "privacy"
+      groupFoundN_ "" (Just 1) 2 superUser "privacy"
       superUser #> "@SimpleX-Directory /link 1:privacy"
       superUser <# "SimpleX-Directory> > /link 1:privacy"
       superUser <## "      The link to join the group ID 1 (privacy):"
@@ -240,10 +260,10 @@ testSuspendResume tmp =
       superUser <## "      Forwarded to @bob, the owner of the group ID 1 (privacy)"
       bob <# "SimpleX-Directory> hello there"
 
-testDeleteGroup :: HasCallStack => FilePath -> IO ()
-testDeleteGroup tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testDeleteGroup :: HasCallStack => TestParams -> IO ()
+testDeleteGroup ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       bob `connectVia` dsLink
       registerGroup superUser bob "privacy" "Privacy"
       groupFound bob "privacy"
@@ -252,11 +272,45 @@ testDeleteGroup tmp =
       bob <## "      Your group privacy is deleted from the directory"
       groupNotFound bob "privacy"
 
-testSetRole :: HasCallStack => FilePath -> IO ()
-testSetRole tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDeleteGroupAdmin :: HasCallStack => TestParams -> IO ()
+testDeleteGroupAdmin ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
+        bob `connectVia` dsLink
+        registerGroup superUser bob "privacy" "Privacy"
+        cath `connectVia` dsLink
+        registerGroupId superUser cath "security" "Security" 2 1
+        groupFound bob "privacy"
+        groupFound bob "security"
+        listUserGroup bob "privacy" "Privacy"
+        listUserGroup cath "security" "Security"
+        superUser #> "@SimpleX-Directory /last"
+        superUser <# "SimpleX-Directory> > /last"
+        superUser <## "      2 registered group(s)"
+        memberGroupListing superUser bob 1 "privacy" "Privacy" 2 "active"
+        memberGroupListing superUser cath 2 "security" "Security" 2 "active"
+        -- trying to register group with the same name
+        submitGroup bob "security" "Security"
+        bob <# "SimpleX-Directory> The group security (Security) is already listed in the directory, please choose another name."
+        bob ##> "/d #security"
+        bob <## "#security: you deleted the group"
+        -- admin can delete the group
+        superUser #> "@SimpleX-Directory /delete 2:security"
+        superUser <# "SimpleX-Directory> > /delete 2:security"
+        superUser <## "      The group security is deleted from the directory"
+        groupFound cath "privacy"
+        listUserGroup bob "privacy" "Privacy"
+        groupNotFound bob "security"
+        sendListCommand cath 0
+        -- another user can register the group with the same name
+        registerGroupId superUser bob "security" "Security" 4 2
+
+testSetRole :: HasCallStack => TestParams -> IO ()
+testSetRole ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         groupFound bob "privacy"
@@ -281,12 +335,12 @@ testSetRole tmp =
         cath ##> "#privacy hello"
         cath <## "#privacy: you don't have permission to send messages"
 
-testJoinGroup :: HasCallStack => FilePath -> IO ()
-testJoinGroup tmp =
-  withDirectoryServiceCfg tmp testCfgGroupLinkViaContact $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgGroupLinkViaContact "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp testCfgGroupLinkViaContact "cath" cathProfile $ \cath ->
-        withNewTestChatCfg tmp testCfgGroupLinkViaContact "dan" danProfile $ \dan -> do
+testJoinGroup :: HasCallStack => TestParams -> IO ()
+testJoinGroup ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
+      withNewTestChat ps "cath" cathProfile $ \cath ->
+        withNewTestChat ps "dan" danProfile $ \dan -> do
           bob `connectVia` dsLink
           registerGroup superUser bob "privacy" "Privacy"
           cath `connectVia` dsLink
@@ -300,10 +354,10 @@ testJoinGroup tmp =
           cath <## "2 members"
           cath ##> ("/c " <> groupLink)
           cath <## "connection request sent!"
-          cath <## "SimpleX-Directory_1: contact is connected"
-          cath <## "contact SimpleX-Directory_1 is merged into SimpleX-Directory"
-          cath <## "use @SimpleX-Directory <message> to send messages"
+          cath <## "#privacy: joining the group..."
           cath <## "#privacy: you joined the group"
+          cath <## "contact and member are merged: SimpleX-Directory, #privacy SimpleX-Directory_1"
+          cath <## "use @SimpleX-Directory <message> to send messages"
           cath <# ("#privacy SimpleX-Directory> " <> welcomeMsg)
           cath <## "#privacy: member bob (Bob) is connected"
           bob <## "#privacy: SimpleX-Directory added cath (Catherine) to the group (connecting...)"
@@ -315,11 +369,9 @@ testJoinGroup tmp =
           concurrentlyN_
             [ do
                 bob <## "dan (Daniel): accepting request to join group #privacy..."
-                bob <## "dan (Daniel): contact is connected"
-                bob <## "dan invited to group #privacy via your group link"
                 bob <## "#privacy: dan joined the group",
               do
-                dan <## "bob (Bob): contact is connected"
+                dan <## "#privacy: joining the group..."
                 dan <## "#privacy: you joined the group"
                 dan <# ("#privacy bob> " <> welcomeMsg)
                 dan
@@ -331,10 +383,10 @@ testJoinGroup tmp =
                 cath <## "#privacy: new member dan is connected"
             ]
 
-testGroupNameWithSpaces :: HasCallStack => FilePath -> IO ()
-testGroupNameWithSpaces tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testGroupNameWithSpaces :: HasCallStack => TestParams -> IO ()
+testGroupNameWithSpaces ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       bob `connectVia` dsLink
       registerGroup superUser bob "Privacy & Security" ""
       groupFound bob "Privacy & Security"
@@ -349,11 +401,11 @@ testGroupNameWithSpaces tmp =
       bob <# "SimpleX-Directory> The group ID 1 (Privacy & Security) is listed in the directory again!"
       groupFound bob "Privacy & Security"
 
-testSearchGroups :: HasCallStack => FilePath -> IO ()
-testSearchGroups tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testSearchGroups :: HasCallStack => TestParams -> IO ()
+testSearchGroups ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         forM_ [1..8 :: Int] $ \i -> registerGroupId superUser bob (groups !! (i - 1)) "" i i
@@ -435,10 +487,10 @@ testSearchGroups tmp =
       u <##. "Link to join the group "
       u <## (show count <> " members")
 
-testInviteToOwnersGroup :: HasCallStack => FilePath -> IO ()
-testInviteToOwnersGroup tmp =
-  withDirectoryServiceCfgOwnersGroup tmp testCfg True $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfg "bob" bobProfile $ \bob -> do
+testInviteToOwnersGroup :: HasCallStack => TestParams -> IO ()
+testInviteToOwnersGroup ps =
+  withDirectoryServiceCfgOwnersGroup ps testCfg True $ \superUser dsLink ->
+    withNewTestChatCfg ps testCfg "bob" bobProfile $ \bob -> do
       bob `connectVia` dsLink
       registerGroupId superUser bob "privacy" "Privacy" 2 1
       bob <## "#owners: SimpleX-Directory invites you to join the group as member"
@@ -453,11 +505,11 @@ testInviteToOwnersGroup tmp =
       registerGroupId superUser bob "security" "Security" 3 2
       superUser <## "Owner is already a member of owners' group"
 
-testDelistedOwnerLeaves :: HasCallStack => FilePath -> IO ()
-testDelistedOwnerLeaves tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testDelistedOwnerLeaves :: HasCallStack => TestParams -> IO ()
+testDelistedOwnerLeaves ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -467,13 +519,16 @@ testDelistedOwnerLeaves tmp =
         bob <## ""
         bob <## "The group is no longer listed in the directory."
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is de-listed (group owner left)."
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupNotFound cath "privacy"
 
-testDelistedOwnerRemoved :: HasCallStack => FilePath -> IO ()
-testDelistedOwnerRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testDelistedOwnerRemoved :: HasCallStack => TestParams -> IO ()
+testDelistedOwnerRemoved ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -482,38 +537,45 @@ testDelistedOwnerRemoved tmp =
         bob <## ""
         bob <## "The group is no longer listed in the directory."
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is de-listed (group owner is removed)."
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupNotFound cath "privacy"
 
-testNotDelistedMemberLeaves :: HasCallStack => FilePath -> IO ()
-testNotDelistedMemberLeaves tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testNotDelistedMemberLeaves :: HasCallStack => TestParams -> IO ()
+testNotDelistedMemberLeaves ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
         leaveGroup "privacy" cath
         bob <## "#privacy: cath left the group"
         (superUser </)
-        groupFound cath "privacy"
+        cath `connectVia` dsLink
+        cath #> "@SimpleX-Directory_1 privacy"
+        groupFoundN_ "_1" Nothing 2 cath "privacy"
 
-testNotDelistedMemberRemoved :: HasCallStack => FilePath -> IO ()
-testNotDelistedMemberRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testNotDelistedMemberRemoved :: HasCallStack => TestParams -> IO ()
+testNotDelistedMemberRemoved ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
         removeMember "privacy" bob cath
         (superUser </)
-        groupFound cath "privacy"
+        cath `connectVia` dsLink
+        cath #> "@SimpleX-Directory_1 privacy"
+        groupFoundN_ "_1" Nothing 2 cath "privacy"
 
-testDelistedServiceRemoved :: HasCallStack => FilePath -> IO ()
-testDelistedServiceRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testDelistedServiceRemoved :: HasCallStack => TestParams -> IO ()
+testDelistedServiceRemoved ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -524,13 +586,14 @@ testDelistedServiceRemoved tmp =
         bob <## ""
         bob <## "The group is no longer listed in the directory."
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is de-listed (directory service is removed)."
-        groupNotFound cath "privacy"
+        cath `connectVia` dsLink
+        groupNotFound_ "_1" cath "privacy"
 
-testDelistedGroupDeleted :: HasCallStack => FilePath -> IO ()
-testDelistedGroupDeleted tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDelistedGroupDeleted :: HasCallStack => TestParams -> IO ()
+testDelistedGroupDeleted ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
@@ -550,18 +613,21 @@ testDelistedGroupDeleted tmp =
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is de-listed (group is deleted)."
         groupNotFound cath "privacy"
 
-testDelistedRoleChanges :: HasCallStack => FilePath -> IO ()
-testDelistedRoleChanges tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testDelistedRoleChanges :: HasCallStack => TestParams -> IO ()
+testDelistedRoleChanges ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupFoundN 3 cath "privacy"
         -- de-listed if service role changed
         bob ##> "/mr privacy SimpleX-Directory member"
-        bob <## "#privacy: you changed the role of SimpleX-Directory from admin to member"
+        bob <## "#privacy: you changed the role of SimpleX-Directory to member"
         cath <## "#privacy: bob changed the role of SimpleX-Directory from admin to member"
         bob <# "SimpleX-Directory> SimpleX-Directory role in the group ID 1 (privacy) is changed to member."
         bob <## ""
@@ -570,7 +636,7 @@ testDelistedRoleChanges tmp =
         groupNotFound cath "privacy"
         -- re-listed if service role changed back without profile changes
         cath ##> "/mr privacy SimpleX-Directory admin"
-        cath <## "#privacy: you changed the role of SimpleX-Directory from member to admin"
+        cath <## "#privacy: you changed the role of SimpleX-Directory to admin"
         bob <## "#privacy: cath changed the role of SimpleX-Directory from member to admin"
         bob <# "SimpleX-Directory> SimpleX-Directory role in the group ID 1 (privacy) is changed to admin."
         bob <## ""
@@ -579,7 +645,7 @@ testDelistedRoleChanges tmp =
         groupFoundN 3 cath "privacy"
         -- de-listed if owner role changed
         cath ##> "/mr privacy bob admin"
-        cath <## "#privacy: you changed the role of bob from owner to admin"
+        cath <## "#privacy: you changed the role of bob to admin"
         bob <## "#privacy: cath changed your role from owner to admin"
         bob <# "SimpleX-Directory> Your role in the group ID 1 (privacy) is changed to admin."
         bob <## ""
@@ -588,7 +654,7 @@ testDelistedRoleChanges tmp =
         groupNotFound cath "privacy"
         -- re-listed if owner role changed back without profile changes
         cath ##> "/mr privacy bob owner"
-        cath <## "#privacy: you changed the role of bob from admin to owner"
+        cath <## "#privacy: you changed the role of bob to owner"
         bob <## "#privacy: cath changed your role from admin to owner"
         bob <# "SimpleX-Directory> Your role in the group ID 1 (privacy) is changed to owner."
         bob <## ""
@@ -596,35 +662,38 @@ testDelistedRoleChanges tmp =
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is listed (user role is set to owner)."
         groupFoundN 3 cath "privacy"
 
-testNotDelistedMemberRoleChanged :: HasCallStack => FilePath -> IO ()
-testNotDelistedMemberRoleChanged tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testNotDelistedMemberRoleChanged :: HasCallStack => TestParams -> IO ()
+testNotDelistedMemberRoleChanged ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupFoundN 3 cath "privacy"
         bob ##> "/mr privacy cath member"
-        bob <## "#privacy: you changed the role of cath from owner to member"
+        bob <## "#privacy: you changed the role of cath to member"
         cath <## "#privacy: bob changed your role from owner to member"
         groupFoundN 3 cath "privacy"
 
-testNotSentApprovalBadRoles :: HasCallStack => FilePath -> IO ()
-testNotSentApprovalBadRoles tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testNotSentApprovalBadRoles :: HasCallStack => TestParams -> IO ()
+testNotSentApprovalBadRoles ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
         welcomeWithLink <- groupAccepted bob "privacy"
         bob ##> "/mr privacy SimpleX-Directory member"
-        bob <## "#privacy: you changed the role of SimpleX-Directory from admin to member"
+        bob <## "#privacy: you changed the role of SimpleX-Directory to member"
         updateProfileWithLink bob "privacy" welcomeWithLink 1
         bob <# "SimpleX-Directory> You must grant directory service admin role to register the group"
         bob ##> "/mr privacy SimpleX-Directory admin"
-        bob <## "#privacy: you changed the role of SimpleX-Directory from member to admin"
+        bob <## "#privacy: you changed the role of SimpleX-Directory to admin"
         bob <# "SimpleX-Directory> SimpleX-Directory role in the group ID 1 (privacy) is changed to admin."
         bob <## ""
         bob <## "The group is submitted for approval."
@@ -633,11 +702,11 @@ testNotSentApprovalBadRoles tmp =
         approveRegistration superUser bob "privacy" 1
         groupFound cath "privacy"
 
-testNotApprovedBadRoles :: HasCallStack => FilePath -> IO ()
-testNotApprovedBadRoles tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testNotApprovedBadRoles :: HasCallStack => TestParams -> IO ()
+testNotApprovedBadRoles ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
@@ -645,14 +714,14 @@ testNotApprovedBadRoles tmp =
         updateProfileWithLink bob "privacy" welcomeWithLink 1
         notifySuperUser superUser bob "privacy" "Privacy" welcomeWithLink 1
         bob ##> "/mr privacy SimpleX-Directory member"
-        bob <## "#privacy: you changed the role of SimpleX-Directory from admin to member"
+        bob <## "#privacy: you changed the role of SimpleX-Directory to member"
         let approve = "/approve 1:privacy 1"
         superUser #> ("@SimpleX-Directory " <> approve)
         superUser <# ("SimpleX-Directory> > " <> approve)
         superUser <## "      Group is not approved: SimpleX-Directory is not an admin."
         groupNotFound cath "privacy"
         bob ##> "/mr privacy SimpleX-Directory admin"
-        bob <## "#privacy: you changed the role of SimpleX-Directory from member to admin"
+        bob <## "#privacy: you changed the role of SimpleX-Directory to admin"
         bob <# "SimpleX-Directory> SimpleX-Directory role in the group ID 1 (privacy) is changed to admin."
         bob <## ""
         bob <## "The group is submitted for approval."
@@ -660,11 +729,11 @@ testNotApprovedBadRoles tmp =
         approveRegistration superUser bob "privacy" 1
         groupFound cath "privacy"
 
-testRegOwnerChangedProfile :: HasCallStack => FilePath -> IO ()
-testRegOwnerChangedProfile tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testRegOwnerChangedProfile :: HasCallStack => TestParams -> IO ()
+testRegOwnerChangedProfile ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -674,35 +743,62 @@ testRegOwnerChangedProfile tmp =
         bob <## "It is hidden from the directory until approved."
         cath <## "bob updated group #privacy:"
         cath <## "full name changed to: Privacy and Security"
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupNotFound cath "privacy"
         superUser <# "SimpleX-Directory> The group ID 1 (privacy) is updated."
         reapproveGroup 3 superUser bob
         groupFoundN 3 cath "privacy"
 
-testAnotherOwnerChangedProfile :: HasCallStack => FilePath -> IO ()
-testAnotherOwnerChangedProfile tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testAnotherOwnerChangedProfile :: HasCallStack => TestParams -> IO ()
+testAnotherOwnerChangedProfile ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         cath ##> "/gp privacy privacy Privacy and Security"
         cath <## "full name changed to: Privacy and Security"
         bob <## "cath updated group #privacy:"
         bob <## "full name changed to: Privacy and Security"
-        bob <# "SimpleX-Directory> The group ID 1 (privacy) is updated!"
+        bob <# "SimpleX-Directory> The group ID 1 (privacy) is updated by cath!"
         bob <## "It is hidden from the directory until approved."
         groupNotFound cath "privacy"
-        superUser <# "SimpleX-Directory> The group ID 1 (privacy) is updated."
+        superUser <# "SimpleX-Directory> The group ID 1 (privacy) is updated by cath."
         reapproveGroup 3 superUser bob
         groupFoundN 3 cath "privacy"
 
-testRegOwnerRemovedLink :: HasCallStack => FilePath -> IO ()
-testRegOwnerRemovedLink tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testNotConnectedOwnerChangedProfile :: HasCallStack => TestParams -> IO ()
+testNotConnectedOwnerChangedProfile ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
+        withNewTestChat ps "dan" danProfile $ \dan -> do
+          bob `connectVia` dsLink
+          dan `connectVia` dsLink
+          registerGroup superUser bob "privacy" "Privacy"
+          addCathAsOwner bob cath
+          cath ##> "/gp privacy privacy Privacy and Security"
+          cath <## "full name changed to: Privacy and Security"
+          bob <## "cath updated group #privacy:"
+          bob <## "full name changed to: Privacy and Security"
+          bob <# "SimpleX-Directory> The group ID 1 (privacy) is updated by cath!"
+          bob <## "It is hidden from the directory until approved."
+          groupNotFound dan "privacy"
+          superUser <# "SimpleX-Directory> The group ID 1 (privacy) is updated by cath."
+          reapproveGroup 3 superUser bob
+          groupFoundN 3 dan "privacy"
+
+testRegOwnerRemovedLink :: HasCallStack => TestParams -> IO ()
+testRegOwnerRemovedLink ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -719,26 +815,33 @@ testRegOwnerRemovedLink tmp =
         cath <## "description changed to:"
         cath <## "Welcome!"
         superUser <# "SimpleX-Directory> The group link is removed from ID 1 (privacy), de-listed."
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         groupNotFound cath "privacy"
-        bob ##> ("/set welcome #privacy " <> welcomeWithLink)
+        let withChangedLink = T.unpack $ T.replace "contact#/?v=2-7&" "contact#/?v=3-7&" $ T.pack welcomeWithLink
+        bob ##> ("/set welcome #privacy " <> withChangedLink)
         bob <## "description changed to:"
-        bob <## welcomeWithLink
+        bob <## withChangedLink
         bob <# "SimpleX-Directory> Thank you! The group link for ID 1 (privacy) is added to the welcome message."
         bob <## "You will be notified once the group is added to the directory - it may take up to 48 hours."
         cath <## "bob updated group #privacy:"
         cath <## "description changed to:"
-        cath <## welcomeWithLink
+        cath <## withChangedLink
         reapproveGroup 3 superUser bob
         groupFoundN 3 cath "privacy"
 
-testAnotherOwnerRemovedLink :: HasCallStack => FilePath -> IO ()
-testAnotherOwnerRemovedLink tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testAnotherOwnerRemovedLink :: HasCallStack => TestParams -> IO ()
+testAnotherOwnerRemovedLink ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
+        cath `connectVia` dsLink
+        cath <## "contact and member are merged: SimpleX-Directory_1, #privacy SimpleX-Directory"
+        cath <## "use @SimpleX-Directory <message> to send messages"
         bob ##> "/show welcome #privacy"
         bob <## "Welcome message:"
         welcomeWithLink <- getTermLine bob
@@ -748,7 +851,7 @@ testAnotherOwnerRemovedLink tmp =
         bob <## "cath updated group #privacy:"
         bob <## "description changed to:"
         bob <## "Welcome!"
-        bob <# "SimpleX-Directory> The group link for ID 1 (privacy) is removed from the welcome message."
+        bob <# "SimpleX-Directory> The group link for ID 1 (privacy) is removed from the welcome message by cath."
         bob <## ""
         bob <## "The group is hidden from the directory until the group link is added and the group is re-approved."
         superUser <# "SimpleX-Directory> The group link is removed from ID 1 (privacy), de-listed."
@@ -759,25 +862,60 @@ testAnotherOwnerRemovedLink tmp =
         bob <## "cath updated group #privacy:"
         bob <## "description changed to:"
         bob <## welcomeWithLink
-        bob <# "SimpleX-Directory> The group link is added by another group member, your registration will not be processed."
-        bob <## ""
-        bob <## "Please update the group profile yourself."
-        bob ##> ("/set welcome #privacy " <> welcomeWithLink <> " - welcome!")
-        bob <## "description changed to:"
-        bob <## (welcomeWithLink <> " - welcome!")
-        bob <# "SimpleX-Directory> Thank you! The group link for ID 1 (privacy) is added to the welcome message."
+        bob <# "SimpleX-Directory> Thank you! The group link for ID 1 (privacy) is added to the welcome message by cath."
         bob <## "You will be notified once the group is added to the directory - it may take up to 48 hours."
-        cath <## "bob updated group #privacy:"
-        cath <## "description changed to:"
-        cath <## (welcomeWithLink <> " - welcome!")
         reapproveGroup 3 superUser bob
         groupFoundN 3 cath "privacy"
 
-testDuplicateAskConfirmation :: HasCallStack => FilePath -> IO ()
-testDuplicateAskConfirmation tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testNotConnectedOwnerRemovedLink :: HasCallStack => TestParams -> IO ()
+testNotConnectedOwnerRemovedLink ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
+        withNewTestChat ps "dan" danProfile $ \dan -> do
+          bob `connectVia` dsLink
+          dan `connectVia` dsLink
+          registerGroup superUser bob "privacy" "Privacy"
+          addCathAsOwner bob cath
+          bob ##> "/show welcome #privacy"
+          bob <## "Welcome message:"
+          welcomeWithLink <- getTermLine bob
+          cath ##> "/set welcome #privacy Welcome!"
+          cath <## "description changed to:"
+          cath <## "Welcome!"
+          bob <## "cath updated group #privacy:"
+          bob <## "description changed to:"
+          bob <## "Welcome!"
+          bob <# "SimpleX-Directory> The group link for ID 1 (privacy) is removed from the welcome message by cath."
+          bob <## ""
+          bob <## "The group is hidden from the directory until the group link is added and the group is re-approved."
+          superUser <# "SimpleX-Directory> The group link is removed from ID 1 (privacy), de-listed."
+          groupNotFound dan "privacy"
+          cath ##> ("/set welcome #privacy " <> welcomeWithLink)
+          cath <## "description changed to:"
+          cath <## welcomeWithLink
+          bob <## "cath updated group #privacy:"
+          bob <## "description changed to:"
+          bob <## welcomeWithLink
+          -- bob <# "SimpleX-Directory> The group link is added by another group member, your registration will not be processed."
+          -- bob <## ""
+          -- bob <## "Please update the group profile yourself."
+          -- bob ##> ("/set welcome #privacy " <> welcomeWithLink <> " - welcome!")
+          -- bob <## "description changed to:"
+          -- bob <## (welcomeWithLink <> " - welcome!")
+          bob <# "SimpleX-Directory> Thank you! The group link for ID 1 (privacy) is added to the welcome message by cath."
+          bob <## "You will be notified once the group is added to the directory - it may take up to 48 hours."
+          -- cath <## "bob updated group #privacy:"
+          -- cath <## "description changed to:"
+          -- cath <## (welcomeWithLink <> " - welcome!")
+          reapproveGroup 3 superUser bob
+          groupFoundN 3 dan "privacy"
+
+testDuplicateAskConfirmation :: HasCallStack => TestParams -> IO ()
+testDuplicateAskConfirmation ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
         _ <- groupAccepted bob "privacy"
@@ -792,11 +930,11 @@ testDuplicateAskConfirmation tmp =
         completeRegistration superUser cath "privacy" "Privacy" welcomeWithLink 2
         groupFound bob "privacy"
 
-testDuplicateProhibitRegistration :: HasCallStack => FilePath -> IO ()
-testDuplicateProhibitRegistration tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDuplicateProhibitRegistration :: HasCallStack => TestParams -> IO ()
+testDuplicateProhibitRegistration ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         cath `connectVia` dsLink
@@ -804,11 +942,11 @@ testDuplicateProhibitRegistration tmp =
         _ <- submitGroup cath "privacy" "Privacy"
         cath <# "SimpleX-Directory> The group privacy (Privacy) is already listed in the directory, please choose another name."
 
-testDuplicateProhibitConfirmation :: HasCallStack => FilePath -> IO ()
-testDuplicateProhibitConfirmation tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDuplicateProhibitConfirmation :: HasCallStack => TestParams -> IO ()
+testDuplicateProhibitConfirmation ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
         welcomeWithLink <- groupAccepted bob "privacy"
@@ -823,11 +961,11 @@ testDuplicateProhibitConfirmation tmp =
         cath #> "@SimpleX-Directory /confirm 1:privacy"
         cath <# "SimpleX-Directory> The group privacy (Privacy) is already listed in the directory, please choose another name."
 
-testDuplicateProhibitWhenUpdated :: HasCallStack => FilePath -> IO ()
-testDuplicateProhibitWhenUpdated tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDuplicateProhibitWhenUpdated :: HasCallStack => TestParams -> IO ()
+testDuplicateProhibitWhenUpdated ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
         welcomeWithLink <- groupAccepted bob "privacy"
@@ -854,11 +992,11 @@ testDuplicateProhibitWhenUpdated tmp =
         groupFound bob "security"
         groupFound cath "security"
 
-testDuplicateProhibitApproval :: HasCallStack => FilePath -> IO ()
-testDuplicateProhibitApproval tmp =
-  withDirectoryService tmp $ \superUser dsLink ->
-    withNewTestChat tmp "bob" bobProfile $ \bob ->
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testDuplicateProhibitApproval :: HasCallStack => TestParams -> IO ()
+testDuplicateProhibitApproval ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         submitGroup bob "privacy" "Privacy"
         welcomeWithLink <- groupAccepted bob "privacy"
@@ -880,11 +1018,11 @@ testDuplicateProhibitApproval tmp =
         superUser <# ("SimpleX-Directory> > " <> approve)
         superUser <## "      The group ID 2 (privacy) is already listed in the directory."
 
-testListUserGroups :: HasCallStack => FilePath -> IO ()
-testListUserGroups tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testListUserGroups :: HasCallStack => TestParams -> IO ()
+testListUserGroups ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
@@ -892,22 +1030,15 @@ testListUserGroups tmp =
         fullAddMember "privacy" "Privacy" bob cath GRMember
         joinGroup "privacy" cath bob
         cath <## "#privacy: member SimpleX-Directory_1 is connected"
-        cath <## "contact SimpleX-Directory_1 is merged into SimpleX-Directory"
+        cath <## "contact and member are merged: SimpleX-Directory, #privacy SimpleX-Directory_1"
         cath <## "use @SimpleX-Directory <message> to send messages"
         registerGroupId superUser bob "security" "Security" 2 2
         registerGroupId superUser cath "anonymity" "Anonymity" 3 1
-        cath #> "@SimpleX-Directory /list"
-        cath <# "SimpleX-Directory> > /list"
-        cath <## "      1 registered group(s)"
-        cath <# "SimpleX-Directory> 1. anonymity (Anonymity)"
-        cath <## "Welcome message:"
-        cath <##. "Link to join the group anonymity: "
-        cath <## "2 members"
-        cath <## "Status: active"
+        listUserGroup cath "anonymity" "Anonymity"
         -- with de-listed group
         groupFound cath "anonymity"
         cath ##> "/mr anonymity SimpleX-Directory member"
-        cath <## "#anonymity: you changed the role of SimpleX-Directory from admin to member"
+        cath <## "#anonymity: you changed the role of SimpleX-Directory to member"
         cath <# "SimpleX-Directory> SimpleX-Directory role in the group ID 1 (anonymity) is changed to member."
         cath <## ""
         cath <## "The group is no longer listed in the directory."
@@ -915,53 +1046,133 @@ testListUserGroups tmp =
         groupNotFound cath "anonymity"
         listGroups superUser bob cath
 
-testRestoreDirectory :: HasCallStack => FilePath -> IO ()
-testRestoreDirectory tmp = do
-  testListUserGroups tmp
-  restoreDirectoryService tmp 3 3 $ \superUser _dsLink ->
-    withTestChat tmp "bob" $ \bob ->
-      withTestChat tmp "cath" $ \cath -> do
+testCapthaScreening :: HasCallStack => TestParams -> IO ()
+testCapthaScreening ps =
+  withDirectoryService ps $ \superUser dsLink ->
+    withNewTestChat ps "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
+        bob `connectVia` dsLink
+        registerGroup superUser bob "privacy" "Privacy"
+        -- check default role
+        bob #> "@SimpleX-Directory /role 1"
+        bob <# "SimpleX-Directory> > /role 1"
+        bob <## "      The initial member role for the group privacy is set to member"
+        bob <## "Send /role 1 observer to change it."
+        bob <## ""
+        note <- getTermLine bob
+        let groupLink = dropStrPrefix "Please note: it applies only to members joining via this link: " note
+        -- enable captcha
+        bob #> "@SimpleX-Directory /filter 1 captcha"
+        bob <# "SimpleX-Directory> > /filter 1 captcha"
+        bob <## "      Spam filter settings for group privacy set to:"
+        bob <## "- reject long/inappropriate names: disabled"
+        bob <## "- pass captcha to join: enabled"
+        bob <## ""
+        bob <## "Use /filter 1 [name] [captcha] to enable and /filter 1 off to disable filter."
+        -- connect with captcha screen
+        _ <- join cath groupLink
+        cath ##> "/_send #1(_support) text 123" -- sending incorrect captcha
+        cath <# "#privacy (support) 123"
+        cath <# "#privacy (support) SimpleX-Directory!> > cath 123"
+        cath <## "      Incorrect text, please try again."
+        captcha <- dropStrPrefix "#privacy (support) SimpleX-Directory> " . dropTime <$> getTermLine cath
+        sendCaptcha cath captcha
+        cath <#. "#privacy SimpleX-Directory> Link to join the group privacy: https://"
+        cath <## "#privacy: member bob (Bob) is connected"
+        bob <## "#privacy: SimpleX-Directory added cath (Catherine) to the group (connecting...)"
+        bob <## "#privacy: new member cath is connected"
+        cath #> "#privacy hello"
+        bob <# "#privacy cath> hello"
+        cath ##> "/l privacy"
+        cath <## "#privacy: you left the group"
+        cath <## "use /d #privacy to delete the group"
+        bob <## "#privacy: cath left the group"
+        cath ##> "/d #privacy"
+        cath <## "#privacy: you deleted the group"
+        -- change default role to observer
+        bob #> "@SimpleX-Directory /role 1 observer"
+        bob <# "SimpleX-Directory> > /role 1 observer"
+        bob <## "      The initial member role for the group privacy is set to observer"
+        bob <## ""
+        bob <##. "Please note: it applies only to members joining via this link: https://"
+        -- connect with captcha screen again, as observer
+        captcha' <- join cath groupLink
+        sendCaptcha cath captcha'
+        -- message from cath that left
+        pastMember <- dropStrPrefix "#privacy: SimpleX-Directory forwarded a message from an unknown member, creating unknown member record " <$> getTermLine cath
+        cath <# ("#privacy " <> pastMember <> "> hello [>>]")
+        cath <#. "#privacy SimpleX-Directory> Link to join the group privacy: https://"
+        cath <## "#privacy: member bob (Bob) is connected"
+        bob <## "#privacy: SimpleX-Directory added cath_1 (Catherine) to the group (connecting...)"
+        bob <## "#privacy: new member cath_1 is connected"
+        cath ##> "#privacy hello"
+        cath <## "#privacy: you don't have permission to send messages"
+        (bob </)
+        cath ##> "/ms privacy"
+        cath <## "cath (Catherine): observer, you, connected"
+        cath <## "SimpleX-Directory: admin, host, connected"
+        cath <## "bob (Bob): owner, connected"
+        cath <## (pastMember <> ": author, status unknown")
+  where
+    join cath groupLink = do
+      cath ##> ("/c " <> groupLink)
+      cath <## "connection request sent!"
+      cath <## "#privacy: joining the group..."
+      cath <## "#privacy: you joined the group, pending approval"
+      cath <# "#privacy (support) SimpleX-Directory> Captcha is generated by SimpleX Directory service."
+      cath <## ""
+      cath <## "Send captcha text to join the group privacy."
+      dropStrPrefix "#privacy (support) SimpleX-Directory> " . dropTime <$> getTermLine cath
+    sendCaptcha cath captcha = do
+      cath ##> ("/_send #1(_support) text " <> captcha)
+      cath <# ("#privacy (support) " <> captcha)
+      cath <# ("#privacy (support) SimpleX-Directory!> > cath " <> captcha)
+      cath <## "      Correct, you joined the group privacy"
+      cath <## "#privacy: you joined the group"
+
+testRestoreDirectory :: HasCallStack => TestParams -> IO ()
+testRestoreDirectory ps = do
+  testListUserGroups ps
+  restoreDirectoryService ps 3 3 $ \superUser _dsLink ->
+    withTestChat ps "bob" $ \bob ->
+      withTestChat ps "cath" $ \cath -> do
         bob <## "2 contacts connected (use /cs for the list)"
         bob
-          <### [ "#privacy (Privacy): connected to server(s)",
-                 "#security (Security): connected to server(s)"
+          <### [ "#privacy: connected to server(s)",
+                 "#security: connected to server(s)"
                ]
         cath <## "2 contacts connected (use /cs for the list)"
         cath
-          <### [ "#privacy (Privacy): connected to server(s)",
-                 "#anonymity (Anonymity): connected to server(s)"
+          <### [ "#privacy: connected to server(s)",
+                 "#anonymity: connected to server(s)"
                ]
         listGroups superUser bob cath
         groupFoundN 3 bob "privacy"
         groupFound bob "security"
         groupFoundN 3 cath "privacy"
         cath #> "@SimpleX-Directory security"
-        cath <## "SimpleX-Directory: quantum resistant end-to-end encryption enabled"
         groupFoundN' 2 cath "security"
 
+testCaptcha :: HasCallStack => TestParams -> IO ()
+testCaptcha _ps = do
+  let captcha = "23456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijkmnpqrty"
+  matchCaptchaStr captcha captcha `shouldBe` True
+  matchCaptchaStr captcha "23456789ABcDEFGH1JKLMNoPQRsTuvwxYzabdefghijkmnpqrty" `shouldBe` True
+  matchCaptchaStr "23456789ABcDEFGH1JKLMNoPQRsTuvwxYzabdefghijkmnpqrty" captcha `shouldBe` True
+  matchCaptchaStr "OOIICPSUVWXZ" "OOIICPSUVWXZ" `shouldBe` True
+  matchCaptchaStr "OOIICPSUVWXZ" "0o1lcpsuvwxz" `shouldBe` True
+  matchCaptchaStr "0o1lcpsuvwxz" "OOIICPSUVWXZ" `shouldBe` True
+  matchCaptchaStr "OOIICPSUVWXZ" "" `shouldBe` False
+  matchCaptchaStr "OOIICPSUVWXZ" "0o1lcpsuvwx" `shouldBe` False
+  matchCaptchaStr "OOIICPSUVWXZ" "0o1lcpsuvwxzz" `shouldBe` False
+
 listGroups :: HasCallStack => TestCC -> TestCC -> TestCC -> IO ()
 listGroups superUser bob cath = do
-  bob #> "@SimpleX-Directory /list"
-  bob <# "SimpleX-Directory> > /list"
-  bob <## "      2 registered group(s)"
-  bob <# "SimpleX-Directory> 1. privacy (Privacy)"
-  bob <## "Welcome message:"
-  bob <##. "Link to join the group privacy: "
-  bob <## "3 members"
-  bob <## "Status: active"
-  bob <# "SimpleX-Directory> 2. security (Security)"
-  bob <## "Welcome message:"
-  bob <##. "Link to join the group security: "
-  bob <## "2 members"
-  bob <## "Status: active"
-  cath #> "@SimpleX-Directory /list"
-  cath <# "SimpleX-Directory> > /list"
-  cath <## "      1 registered group(s)"
-  cath <# "SimpleX-Directory> 1. anonymity (Anonymity)"
-  cath <## "Welcome message:"
-  cath <##. "Link to join the group anonymity: "
-  cath <## "2 members"
-  cath <## "Status: suspended because roles changed"
+  sendListCommand bob 2
+  groupListing bob 1 "privacy" "Privacy" 3 "active"
+  groupListing bob 2 "security" "Security" 2 "active"
+  sendListCommand cath 1
+  groupListing cath 1 "anonymity" "Anonymity" 2 "suspended because roles changed"
   -- superuser lists all groups
   bob #> "@SimpleX-Directory /last"
   bob <# "SimpleX-Directory> > /last"
@@ -969,34 +1180,42 @@ listGroups superUser bob cath = do
   superUser #> "@SimpleX-Directory /last"
   superUser <# "SimpleX-Directory> > /last"
   superUser <## "      3 registered group(s)"
-  superUser <# "SimpleX-Directory> 1. privacy (Privacy)"
-  superUser <## "Welcome message:"
-  superUser <##. "Link to join the group privacy: "
-  superUser <## "Owner: bob"
-  superUser <## "3 members"
-  superUser <## "Status: active"
-  superUser <# "SimpleX-Directory> 2. security (Security)"
-  superUser <## "Welcome message:"
-  superUser <##. "Link to join the group security: "
-  superUser <## "Owner: bob"
-  superUser <## "2 members"
-  superUser <## "Status: active"
-  superUser <# "SimpleX-Directory> 3. anonymity (Anonymity)"
-  superUser <## "Welcome message:"
-  superUser <##. "Link to join the group anonymity: "
-  superUser <## "Owner: cath"
-  superUser <## "2 members"
-  superUser <## "Status: suspended because roles changed"
+  memberGroupListing superUser bob 1 "privacy" "Privacy" 3 "active"
+  memberGroupListing superUser bob 2 "security" "Security" 2 "active"
+  memberGroupListing superUser cath 3 "anonymity" "Anonymity" 2 "suspended because roles changed"
   -- showing last 1 group
   superUser #> "@SimpleX-Directory /last 1"
   superUser <# "SimpleX-Directory> > /last 1"
   superUser <## "      3 registered group(s), showing the last 1"
-  superUser <# "SimpleX-Directory> 3. anonymity (Anonymity)"
-  superUser <## "Welcome message:"
-  superUser <##. "Link to join the group anonymity: "
-  superUser <## "Owner: cath"
-  superUser <## "2 members"
-  superUser <## "Status: suspended because roles changed"
+  memberGroupListing superUser cath 3 "anonymity" "Anonymity" 2 "suspended because roles changed"
+
+listUserGroup :: HasCallStack => TestCC -> String -> String -> IO ()
+listUserGroup u n fn = do
+  sendListCommand u 1
+  groupListing u 1 n fn 2 "active"
+
+sendListCommand :: HasCallStack => TestCC -> Int -> IO ()
+sendListCommand u count = do
+  u #> "@SimpleX-Directory /list"
+  u <# "SimpleX-Directory> > /list"
+  u <## ("      " <> show count <> " registered group(s)")
+
+groupListing :: HasCallStack => TestCC -> Int -> String -> String -> Int -> String -> IO ()
+groupListing u = groupListing_ u Nothing
+
+memberGroupListing :: HasCallStack => TestCC -> TestCC -> Int -> String -> String -> Int -> String -> IO ()
+memberGroupListing su owner = groupListing_ su (Just owner)
+
+groupListing_ :: HasCallStack => TestCC -> Maybe TestCC -> Int -> String -> String -> Int -> String -> IO ()
+groupListing_ su owner_ gId n fn count status = do
+  su <# ("SimpleX-Directory> " <> show gId <> ". " <> n <> " (" <> fn <> ")")
+  su <## "Welcome message:"
+  su <##. ("Link to join the group " <> n <> ": ")
+  forM_ owner_ $ \owner -> do
+    ownerName <- userName owner
+    su <## ("Owner: " <> ownerName)
+  su <## (show count <> " members")
+  su <## ("Status: " <> status)
 
 reapproveGroup :: HasCallStack => Int -> TestCC -> TestCC -> IO ()
 reapproveGroup count superUser bob = do
@@ -1011,8 +1230,13 @@ reapproveGroup count superUser bob = do
   superUser #> "@SimpleX-Directory /approve 1:privacy 1"
   superUser <# "SimpleX-Directory> > /approve 1:privacy 1"
   superUser <## "      Group approved!"
-  bob <# "SimpleX-Directory> The group ID 1 (privacy) is approved and listed in directory!"
+  bob <# "SimpleX-Directory> The group ID 1 (privacy) is approved and listed in directory - please moderate it!"
   bob <## "Please note: if you change the group profile it will be hidden from directory until it is re-approved."
+  bob <## ""
+  bob <## "Supported commands:"
+  bob <## "- /filter 1 - to configure anti-spam filter."
+  bob <## "- /role 1 - to set default member role."
+  bob <## "- /help commands - other commands."
 
 addCathAsOwner :: HasCallStack => TestCC -> TestCC -> IO ()
 addCathAsOwner bob cath = do
@@ -1021,17 +1245,17 @@ addCathAsOwner bob cath = do
   joinGroup "privacy" cath bob
   cath <## "#privacy: member SimpleX-Directory is connected"
 
-withDirectoryService :: HasCallStack => FilePath -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryService tmp = withDirectoryServiceCfg tmp testCfg
+withDirectoryService :: HasCallStack => TestParams -> (TestCC -> String -> IO ()) -> IO ()
+withDirectoryService ps = withDirectoryServiceCfg ps testCfg
 
-withDirectoryServiceCfg :: HasCallStack => FilePath -> ChatConfig -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryServiceCfg tmp cfg = withDirectoryServiceCfgOwnersGroup tmp cfg False
+withDirectoryServiceCfg :: HasCallStack => TestParams -> ChatConfig -> (TestCC -> String -> IO ()) -> IO ()
+withDirectoryServiceCfg ps cfg = withDirectoryServiceCfgOwnersGroup ps cfg False
 
-withDirectoryServiceCfgOwnersGroup :: HasCallStack => FilePath -> ChatConfig -> Bool -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryServiceCfgOwnersGroup tmp cfg createOwnersGroup test = do
+withDirectoryServiceCfgOwnersGroup :: HasCallStack => TestParams -> ChatConfig -> Bool -> (TestCC -> String -> IO ()) -> IO ()
+withDirectoryServiceCfgOwnersGroup ps cfg createOwnersGroup test = do
   dsLink <-
-    withNewTestChatCfg tmp cfg serviceDbPrefix directoryProfile $ \ds ->
-      withNewTestChatCfg tmp cfg "super_user" aliceProfile $ \superUser -> do
+    withNewTestChatCfg ps cfg serviceDbPrefix directoryProfile $ \ds ->
+      withNewTestChatCfg ps cfg "super_user" aliceProfile $ \superUser -> do
         connectUsers ds superUser
         when createOwnersGroup $ do
           superUser ##> "/g owners"
@@ -1046,12 +1270,12 @@ withDirectoryServiceCfgOwnersGroup tmp cfg createOwnersGroup test = do
           superUser <## "#owners: SimpleX-Directory joined the group"
         ds ##> "/ad"
         getContactLink ds True
-  withDirectoryOwnersGroup tmp cfg dsLink createOwnersGroup test
+  withDirectoryOwnersGroup ps cfg dsLink createOwnersGroup test
 
-restoreDirectoryService :: HasCallStack => FilePath -> Int -> Int -> (TestCC -> String -> IO ()) -> IO ()
-restoreDirectoryService tmp ctCount grCount test = do
+restoreDirectoryService :: HasCallStack => TestParams -> Int -> Int -> (TestCC -> String -> IO ()) -> IO ()
+restoreDirectoryService ps ctCount grCount test = do
   dsLink <-
-    withTestChat tmp serviceDbPrefix $ \ds -> do
+    withTestChat ps serviceDbPrefix $ \ds -> do
       ds <## (show ctCount <> " contacts connected (use /cs for the list)")
       ds <## "Your address is active! To show: /sa"
       ds <## (show grCount <> " group links active")
@@ -1060,16 +1284,16 @@ restoreDirectoryService tmp ctCount grCount test = do
       dsLink <- getContactLink ds False
       ds <## "auto_accept on"
       pure dsLink
-  withDirectory tmp testCfg dsLink test
+  withDirectory ps testCfg dsLink test
 
-withDirectory :: HasCallStack => FilePath -> ChatConfig -> String -> (TestCC -> String -> IO ()) -> IO ()
-withDirectory tmp cfg dsLink = withDirectoryOwnersGroup tmp cfg dsLink False
+withDirectory :: HasCallStack => TestParams -> ChatConfig -> String -> (TestCC -> String -> IO ()) -> IO ()
+withDirectory ps cfg dsLink = withDirectoryOwnersGroup ps cfg dsLink False
 
-withDirectoryOwnersGroup :: HasCallStack => FilePath -> ChatConfig -> String -> Bool -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryOwnersGroup tmp cfg dsLink createOwnersGroup test = do
-  let opts = mkDirectoryOpts tmp [KnownContact 2 "alice"] $ if createOwnersGroup then Just $ KnownGroup 1 "owners" else Nothing
+withDirectoryOwnersGroup :: HasCallStack => TestParams -> ChatConfig -> String -> Bool -> (TestCC -> String -> IO ()) -> IO ()
+withDirectoryOwnersGroup ps cfg dsLink createOwnersGroup test = do
+  let opts = mkDirectoryOpts ps [KnownContact 2 "alice"] $ if createOwnersGroup then Just $ KnownGroup 1 "owners" else Nothing
   runDirectory cfg opts $
-    withTestChatCfg tmp cfg "super_user" $ \superUser -> do
+    withTestChatCfg ps cfg "super_user" $ \superUser -> do
       superUser <## "1 contacts connected (use /cs for the list)"
       when createOwnersGroup $
         superUser <## "#owners: connected to server(s)"
@@ -1082,7 +1306,10 @@ runDirectory cfg opts@DirectoryOpts {directoryLog} action = do
   threadDelay 500000
   action `finally` (mapM_ hClose (directoryLogFile st) >> killThread t)
   where
-    bot st = simplexChatCore cfg (mkChatOpts opts) $ directoryService st opts
+    bot st = do
+      env <- newServiceState opts
+      let cfg' = cfg {chatHooks = defaultChatHooks {acceptMember = Just $ acceptMemberHook opts env}}
+      simplexChatCore cfg' (mkChatOpts opts) $ directoryService st opts env
 
 registerGroup :: TestCC -> TestCC -> String -> String -> IO ()
 registerGroup su u n fn = registerGroupId su u n fn 1 1
@@ -1153,15 +1380,20 @@ approveRegistrationId su u n gId ugId = do
   su #> ("@SimpleX-Directory " <> approve)
   su <# ("SimpleX-Directory> > " <> approve)
   su <## "      Group approved!"
-  u <# ("SimpleX-Directory> The group ID " <> show ugId <> " (" <> n <> ") is approved and listed in directory!")
+  u <# ("SimpleX-Directory> The group ID " <> show ugId <> " (" <> n <> ") is approved and listed in directory - please moderate it!")
   u <## "Please note: if you change the group profile it will be hidden from directory until it is re-approved."
+  u <## ""
+  u <## "Supported commands:"
+  u <## ("- /filter " <> show ugId <> " - to configure anti-spam filter.")
+  u <## ("- /role " <> show ugId <> " - to set default member role.")
+  u <## "- /help commands - other commands."
 
 connectVia :: TestCC -> String -> IO ()
 u `connectVia` dsLink = do
   u ##> ("/c " <> dsLink)
   u <## "connection request sent!"
-  u <## "SimpleX-Directory: contact is connected"
-  u <# "SimpleX-Directory> Welcome to SimpleX-Directory service!"
+  u .<## ": contact is connected"
+  u .<# "> Welcome to SimpleX-Directory service!"
   u <## "Send a search string to find groups or /help to learn how to add groups to directory."
   u <## ""
   u <## "For example, send privacy to find groups about privacy."
@@ -1205,19 +1437,22 @@ groupFoundN count u name = do
   groupFoundN' count u name
 
 groupFoundN' :: Int -> TestCC -> String -> IO ()
-groupFoundN' = groupFoundN_ Nothing
+groupFoundN' = groupFoundN_ "" Nothing
 
-groupFoundN_ :: Maybe Int -> Int -> TestCC -> String -> IO ()
-groupFoundN_ shownId_ count u name = do
-  u <# ("SimpleX-Directory> > " <> name)
+groupFoundN_ :: String -> Maybe Int -> Int -> TestCC -> String -> IO ()
+groupFoundN_ suffix shownId_ count u name = do
+  u <# ("SimpleX-Directory" <> suffix <> "> > " <> name)
   u <## "      Found 1 group(s)."
-  u <#. ("SimpleX-Directory> " <> maybe "" (\gId -> show gId <> ". ") shownId_ <> name)
+  u <#. ("SimpleX-Directory" <> suffix <> "> " <> maybe "" (\gId -> show gId <> ". ") shownId_ <> name)
   u <## "Welcome message:"
   u <##. "Link to join the group "
   u <## (show count <> " members")
 
 groupNotFound :: TestCC -> String -> IO ()
-groupNotFound u s = do
-  u #> ("@SimpleX-Directory " <> s)
-  u <# ("SimpleX-Directory> > " <> s)
+groupNotFound = groupNotFound_ ""
+
+groupNotFound_ :: String -> TestCC -> String -> IO ()
+groupNotFound_ suffix u s = do
+  u #> ("@SimpleX-Directory" <> suffix <> " " <> s)
+  u <# ("SimpleX-Directory" <> suffix <> "> > " <> s)
   u <## "      No groups found"
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index 32af1d5c95..ce555c676c 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -12,10 +12,12 @@
 
 module ChatClient where
 
+import ChatTests.DBUtils
 import Control.Concurrent (forkIOWithUnmask, killThread, threadDelay)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Exception (bracket, bracket_)
+import Control.Logger.Simple (LogLevel (..))
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
@@ -53,8 +55,8 @@ import Simplex.Messaging.Crypto.Ratchet (supportedE2EEncryptVRange)
 import qualified Simplex.Messaging.Crypto.Ratchet as CR
 import Simplex.Messaging.Protocol (srvHostnamesSMPClientVersion)
 import Simplex.Messaging.Server (runSMPServerBlocking)
-import Simplex.Messaging.Server.Env.STM
-import Simplex.Messaging.Server.MsgStore.Types (AMSType (..), SMSType (..))
+import Simplex.Messaging.Server.Env.STM (AServerStoreCfg (..), ServerConfig (..), ServerStoreCfg (..), StartOptions (..), StorePaths (..), defaultMessageExpiration, defaultIdleQueueInterval, defaultNtfExpiration, defaultInactiveClientExpiration)
+import Simplex.Messaging.Server.MsgStore.Types (SQSType (..), SMSType (..))
 import Simplex.Messaging.Transport
 import Simplex.Messaging.Transport.Server (ServerCredentials (..), defaultTransportServerConfig)
 import Simplex.Messaging.Version
@@ -68,6 +70,9 @@ import Test.Hspec (Expectation, HasCallStack, shouldReturn)
 import Database.PostgreSQL.Simple (ConnectInfo (..), defaultConnectInfo)
 #else
 import Data.ByteArray (ScrubbedBytes)
+import qualified Data.Map.Strict as M
+import Simplex.Messaging.Agent.Client (agentClientStore)
+import Simplex.Messaging.Agent.Store.Common (withConnection)
 import System.FilePath ((</>))
 #endif
 
@@ -90,7 +95,6 @@ testOpts :: ChatOpts
 testOpts =
   ChatOpts
     { coreOptions = testCoreOpts,
-      deviceName = Nothing,
       chatCmd = "",
       chatCmdDelay = 3,
       chatCmdLog = CCLNone,
@@ -114,10 +118,13 @@ testCoreOpts =
         { dbConnstr = testDBConnstr,
           -- dbSchemaPrefix is not used in tests (except bot tests where it's redefined),
           -- instead different schema prefix is passed per client so that single test database is used
-          dbSchemaPrefix = ""
+          dbSchemaPrefix = "",
+          dbPoolSize = 3,
+          dbCreateSchema = True
 #else
         { dbFilePrefix = "./simplex_v1", -- dbFilePrefix is not used in tests (except bot tests where it's redefined)
           dbKey = "", -- dbKey = "this is a pass-phrase to encrypt the database",
+          trackQueries = DB.TQAll,
           vacuumOnMigration = True
 #endif
         },
@@ -130,6 +137,7 @@ testCoreOpts =
       logAgent = Nothing,
       logFile = Nothing,
       tbqSize = 16,
+      deviceName = Nothing,
       highlyAvailable = False,
       yesToUpMigrations = False
     }
@@ -179,6 +187,7 @@ testCfg =
   defaultChatConfig
     { agentConfig = testAgentCfg,
       showReceipts = False,
+      shortLinkPresetServers = ["smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=@localhost:7001"],
       testView = True,
       tbqSize = 16
     }
@@ -249,117 +258,111 @@ prevVersion (Version v) = Version (v - 1)
 nextVersion :: Version v -> Version v
 nextVersion (Version v) = Version (v + 1)
 
-testCfgCreateGroupDirect :: ChatConfig
-testCfgCreateGroupDirect =
-  mkCfgCreateGroupDirect testCfg
-
-mkCfgCreateGroupDirect :: ChatConfig -> ChatConfig
-mkCfgCreateGroupDirect cfg =
-  cfg
-    { chatVRange = groupCreateDirectVRange,
-      agentConfig = testAgentCfgSlow
-    }
-
-groupCreateDirectVRange :: VersionRangeChat
-groupCreateDirectVRange = mkVersionRange (VersionChat 1) (VersionChat 1)
-
-testCfgGroupLinkViaContact :: ChatConfig
-testCfgGroupLinkViaContact =
-  mkCfgGroupLinkViaContact testCfg
-
-mkCfgGroupLinkViaContact :: ChatConfig -> ChatConfig
-mkCfgGroupLinkViaContact cfg = cfg {chatVRange = groupLinkViaContactVRange}
-
-groupLinkViaContactVRange :: VersionRangeChat
-groupLinkViaContactVRange = mkVersionRange (VersionChat 1) (VersionChat 2)
-
-createTestChat :: FilePath -> ChatConfig -> ChatOpts -> String -> Profile -> IO TestCC
-createTestChat tmp cfg opts@ChatOpts {coreOptions} dbPrefix profile = do
-  Right db@ChatDatabase {chatStore, agentStore} <- createDatabase tmp coreOptions dbPrefix
+createTestChat :: TestParams -> ChatConfig -> ChatOpts -> String -> Profile -> IO TestCC
+createTestChat ps cfg opts@ChatOpts {coreOptions} dbPrefix profile = do
+  Right db@ChatDatabase {chatStore, agentStore} <- createDatabase ps coreOptions dbPrefix
   insertUser agentStore
   Right user <- withTransaction chatStore $ \db' -> runExceptT $ createUserRecord db' (AgentUserId 1) profile True
-  startTestChat_ db cfg opts user
+  startTestChat_ ps db cfg opts user
 
-startTestChat :: FilePath -> ChatConfig -> ChatOpts -> String -> IO TestCC
-startTestChat tmp cfg opts@ChatOpts {coreOptions} dbPrefix = do
-  Right db@ChatDatabase {chatStore} <- createDatabase tmp coreOptions dbPrefix
+startTestChat :: TestParams -> ChatConfig -> ChatOpts -> String -> IO TestCC
+startTestChat ps cfg opts@ChatOpts {coreOptions} dbPrefix = do
+  Right db@ChatDatabase {chatStore} <- createDatabase ps coreOptions dbPrefix
   Just user <- find activeUser <$> withTransaction chatStore getUsers
-  startTestChat_ db cfg opts user
+  startTestChat_ ps db cfg opts user
 
-createDatabase :: FilePath -> CoreChatOpts -> String -> IO (Either MigrationError ChatDatabase)
+createDatabase :: TestParams -> CoreChatOpts -> String -> IO (Either MigrationError ChatDatabase)
 #if defined(dbPostgres)
-createDatabase _tmp CoreChatOpts {dbOptions} dbPrefix = do
+createDatabase _params CoreChatOpts {dbOptions} dbPrefix = do
   createChatDatabase dbOptions {dbSchemaPrefix = "client_" <> dbPrefix} MCError
 
 insertUser :: DBStore -> IO ()
 insertUser st = withTransaction st (`DB.execute_` "INSERT INTO users DEFAULT VALUES")
 #else
-createDatabase tmp CoreChatOpts {dbOptions} dbPrefix = do
-  createChatDatabase dbOptions {dbFilePrefix = tmp </> dbPrefix} MCError
+createDatabase TestParams {tmpPath} CoreChatOpts {dbOptions} dbPrefix = do
+  createChatDatabase dbOptions {dbFilePrefix = tmpPath </> dbPrefix} MCError
 
 insertUser :: DBStore -> IO ()
 insertUser st = withTransaction st (`DB.execute_` "INSERT INTO users (user_id) VALUES (1)")
 #endif
 
-startTestChat_ :: ChatDatabase -> ChatConfig -> ChatOpts -> User -> IO TestCC
-startTestChat_ db cfg opts user = do
+startTestChat_ :: TestParams -> ChatDatabase -> ChatConfig -> ChatOpts -> User -> IO TestCC
+startTestChat_ TestParams {printOutput} db cfg opts@ChatOpts {maintenance} user = do
   t <- withVirtualTerminal termSettings pure
   ct <- newChatTerminal t opts
   cc <- newChatController db (Just user) cfg opts False
   void $ execChatCommand' (SetTempFolder "tests/tmp/tmp") `runReaderT` cc
-  chatAsync <- async . runSimplexChat opts user cc $ \_u cc' -> runChatTerminal ct cc' opts
-  atomically . unless (maintenance opts) $ readTVar (agentAsync cc) >>= \a -> when (isNothing a) retry
+  chatAsync <- async $ runSimplexChat opts user cc $ \_u cc' -> runChatTerminal ct cc' opts
+  unless maintenance $ atomically $ readTVar (agentAsync cc) >>= \a -> when (isNothing a) retry
   termQ <- newTQueueIO
   termAsync <- async $ readTerminalOutput t termQ
-  pure TestCC {chatController = cc, virtualTerminal = t, chatAsync, termAsync, termQ, printOutput = False}
+  pure TestCC {chatController = cc, virtualTerminal = t, chatAsync, termAsync, termQ, printOutput}
 
-stopTestChat :: TestCC -> IO ()
-stopTestChat TestCC {chatController = cc@ChatController {smpAgent, chatStore}, chatAsync, termAsync} = do
+stopTestChat :: TestParams -> TestCC -> IO ()
+stopTestChat ps TestCC {chatController = cc@ChatController {smpAgent, chatStore}, chatAsync, termAsync} = do
   stopChatController cc
   uninterruptibleCancel termAsync
   uninterruptibleCancel chatAsync
   liftIO $ disposeAgentClient smpAgent
+#if !defined(dbPostgres)
+  chatStats <- withConnection chatStore $ readTVarIO . DB.slow
+  atomically $ modifyTVar' (chatQueryStats ps) $ M.unionWith combineStats chatStats
+  agentStats <- withConnection (agentClientStore smpAgent) $ readTVarIO . DB.slow
+  atomically $ modifyTVar' (agentQueryStats ps) $ M.unionWith combineStats agentStats
+#endif
   closeDBStore chatStore
   threadDelay 200000
+#if !defined(dbPostgres)
+  where
+    combineStats
+      DB.SlowQueryStats {count, timeMax, timeAvg, errs}
+      DB.SlowQueryStats {count = count', timeMax = timeMax', timeAvg = timeAvg', errs = errs'} =
+        DB.SlowQueryStats
+          { count = count + count',
+            timeMax = max timeMax timeMax',
+            timeAvg = (timeAvg * count + timeAvg' * count') `div` (count + count'),
+            errs = M.unionWith (+) errs errs'
+          }
+#endif
 
-withNewTestChat :: HasCallStack => FilePath -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
-withNewTestChat tmp = withNewTestChatCfgOpts tmp testCfg testOpts
+withNewTestChat :: HasCallStack => TestParams -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
+withNewTestChat ps = withNewTestChatCfgOpts ps testCfg testOpts
 
-withNewTestChatV1 :: HasCallStack => FilePath -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
-withNewTestChatV1 tmp = withNewTestChatCfg tmp testCfgV1
+withNewTestChatV1 :: HasCallStack => TestParams -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
+withNewTestChatV1 ps = withNewTestChatCfg ps testCfgV1
 
-withNewTestChatCfg :: HasCallStack => FilePath -> ChatConfig -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
-withNewTestChatCfg tmp cfg = withNewTestChatCfgOpts tmp cfg testOpts
+withNewTestChatCfg :: HasCallStack => TestParams -> ChatConfig -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
+withNewTestChatCfg ps cfg = withNewTestChatCfgOpts ps cfg testOpts
 
-withNewTestChatOpts :: HasCallStack => FilePath -> ChatOpts -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
-withNewTestChatOpts tmp = withNewTestChatCfgOpts tmp testCfg
+withNewTestChatOpts :: HasCallStack => TestParams -> ChatOpts -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
+withNewTestChatOpts ps = withNewTestChatCfgOpts ps testCfg
 
-withNewTestChatCfgOpts :: HasCallStack => FilePath -> ChatConfig -> ChatOpts -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
-withNewTestChatCfgOpts tmp cfg opts dbPrefix profile runTest =
+withNewTestChatCfgOpts :: HasCallStack => TestParams -> ChatConfig -> ChatOpts -> String -> Profile -> (HasCallStack => TestCC -> IO a) -> IO a
+withNewTestChatCfgOpts ps cfg opts dbPrefix profile runTest =
   bracket
-    (createTestChat tmp cfg opts dbPrefix profile)
-    stopTestChat
+    (createTestChat ps cfg opts dbPrefix profile)
+    (stopTestChat ps)
     (\cc -> runTest cc >>= ((cc <// 100000) $>))
 
-withTestChatV1 :: HasCallStack => FilePath -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatV1 tmp = withTestChatCfg tmp testCfgV1
+withTestChatV1 :: HasCallStack => TestParams -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatV1 ps = withTestChatCfg ps testCfgV1
 
-withTestChat :: HasCallStack => FilePath -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChat tmp = withTestChatCfgOpts tmp testCfg testOpts
+withTestChat :: HasCallStack => TestParams -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChat ps = withTestChatCfgOpts ps testCfg testOpts
 
-withTestChatCfg :: HasCallStack => FilePath -> ChatConfig -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatCfg tmp cfg = withTestChatCfgOpts tmp cfg testOpts
+withTestChatCfg :: HasCallStack => TestParams -> ChatConfig -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatCfg ps cfg = withTestChatCfgOpts ps cfg testOpts
 
-withTestChatOpts :: HasCallStack => FilePath -> ChatOpts -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatOpts tmp = withTestChatCfgOpts tmp testCfg
+withTestChatOpts :: HasCallStack => TestParams -> ChatOpts -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatOpts ps = withTestChatCfgOpts ps testCfg
 
-withTestChatCfgOpts :: HasCallStack => FilePath -> ChatConfig -> ChatOpts -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatCfgOpts tmp cfg opts dbPrefix = bracket (startTestChat tmp cfg opts dbPrefix) (\cc -> cc <// 100000 >> stopTestChat cc)
+withTestChatCfgOpts :: HasCallStack => TestParams -> ChatConfig -> ChatOpts -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatCfgOpts ps cfg opts dbPrefix = bracket (startTestChat ps cfg opts dbPrefix) (\cc -> cc <// 100000 >> stopTestChat ps cc)
 
--- enable output for specific chat controller, use like this:
--- withNewTestChat tmp "alice" aliceProfile $ \a -> withTestOutput a $ \alice -> do ...
-withTestOutput :: HasCallStack => TestCC -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestOutput cc runTest = runTest cc {printOutput = True}
+-- enable output for specific test.
+-- usage: withTestOutput $ testChat2 aliceProfile bobProfile $ \alice bob -> do ...
+withTestOutput :: HasCallStack => (HasCallStack => TestParams -> IO ()) -> TestParams -> IO ()
+withTestOutput test ps = test ps {printOutput = True}
 
 readTerminalOutput :: VirtualTerminal -> TQueue String -> IO ()
 readTerminalOutput t termQ = do
@@ -390,27 +393,27 @@ withTmpFiles =
     (createDirectoryIfMissing False "tests/tmp")
     (removeDirectoryRecursive "tests/tmp")
 
-testChatN :: HasCallStack => ChatConfig -> ChatOpts -> [Profile] -> (HasCallStack => [TestCC] -> IO ()) -> FilePath -> IO ()
-testChatN cfg opts ps test tmp = do
-  tcs <- getTestCCs (zip ps [1 ..]) []
-  test tcs
-  concurrentlyN_ $ map (<// 100000) tcs
-  concurrentlyN_ $ map stopTestChat tcs
+testChatN :: HasCallStack => ChatConfig -> ChatOpts -> [Profile] -> (HasCallStack => [TestCC] -> IO ()) -> TestParams -> IO ()
+testChatN cfg opts ps test params =
+  bracket (getTestCCs $ zip ps [1 ..]) endTests test
   where
-    getTestCCs :: [(Profile, Int)] -> [TestCC] -> IO [TestCC]
-    getTestCCs [] tcs = pure tcs
-    getTestCCs ((p, db) : envs') tcs = (:) <$> createTestChat tmp cfg opts (show db) p <*> getTestCCs envs' tcs
+    getTestCCs :: [(Profile, Int)] -> IO [TestCC]
+    getTestCCs [] = pure []
+    getTestCCs ((p, db) : envs') = (:) <$> createTestChat params cfg opts (show db) p <*> getTestCCs envs'
+    endTests tcs = do
+      mapConcurrently_ (<// 100000) tcs
+      mapConcurrently_ (stopTestChat params) tcs
 
 (<//) :: HasCallStack => TestCC -> Int -> Expectation
 (<//) cc t = timeout t (getTermLine cc) `shouldReturn` Nothing
 
 getTermLine :: HasCallStack => TestCC -> IO String
-getTermLine cc =
+getTermLine cc@TestCC {printOutput} =
   5000000 `timeout` atomically (readTQueue $ termQ cc) >>= \case
     Just s -> do
       -- remove condition to always echo virtual terminal
       -- when True $ do
-      when (printOutput cc) $ do
+      when printOutput $ do
         name <- userName cc
         putStrLn $ name <> ": " <> s
       pure s
@@ -420,55 +423,71 @@ userName :: TestCC -> IO [Char]
 userName (TestCC ChatController {currentUser} _ _ _ _ _) =
   maybe "no current user" (\User {localDisplayName} -> T.unpack localDisplayName) <$> readTVarIO currentUser
 
-testChat :: HasCallStack => Profile -> (HasCallStack => TestCC -> IO ()) -> FilePath -> IO ()
+testChat :: HasCallStack => Profile -> (HasCallStack => TestCC -> IO ()) -> TestParams -> IO ()
 testChat = testChatCfgOpts testCfg testOpts
 
-testChatCfgOpts :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> (HasCallStack => TestCC -> IO ()) -> FilePath -> IO ()
+testChatCfgOpts :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> (HasCallStack => TestCC -> IO ()) -> TestParams -> IO ()
 testChatCfgOpts cfg opts p test = testChatN cfg opts [p] test_
   where
     test_ :: HasCallStack => [TestCC] -> IO ()
     test_ [tc] = test tc
     test_ _ = error "expected 1 chat client"
 
-testChat2 :: HasCallStack => Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChat2 :: HasCallStack => Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChat2 = testChatCfgOpts2 testCfg testOpts
 
-testChatCfg2 :: HasCallStack => ChatConfig -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChatCfg2 :: HasCallStack => ChatConfig -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChatCfg2 cfg = testChatCfgOpts2 cfg testOpts
 
-testChatOpts2 :: HasCallStack => ChatOpts -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChatOpts2 :: HasCallStack => ChatOpts -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChatOpts2 = testChatCfgOpts2 testCfg
 
-testChatCfgOpts2 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChatCfgOpts2 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChatCfgOpts2 cfg opts p1 p2 test = testChatN cfg opts [p1, p2] test_
   where
     test_ :: HasCallStack => [TestCC] -> IO ()
     test_ [tc1, tc2] = test tc1 tc2
     test_ _ = error "expected 2 chat clients"
 
-testChat3 :: HasCallStack => Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChat3 :: HasCallStack => Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChat3 = testChatCfgOpts3 testCfg testOpts
 
-testChatCfg3 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChatCfg3 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChatCfg3 cfg = testChatCfgOpts3 cfg testOpts
 
-testChatCfgOpts3 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
+testChatCfgOpts3 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
 testChatCfgOpts3 cfg opts p1 p2 p3 test = testChatN cfg opts [p1, p2, p3] test_
   where
     test_ :: HasCallStack => [TestCC] -> IO ()
     test_ [tc1, tc2, tc3] = test tc1 tc2 tc3
     test_ _ = error "expected 3 chat clients"
 
-testChat4 :: HasCallStack => Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-testChat4 = testChatCfg4 testCfg
+testChat4 :: HasCallStack => Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChat4 = testChatCfgOpts4 testCfg testOpts
 
-testChatCfg4 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-testChatCfg4 cfg p1 p2 p3 p4 test = testChatN cfg testOpts [p1, p2, p3, p4] test_
+testChatCfg4 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChatCfg4 cfg = testChatCfgOpts4 cfg testOpts
+
+testChatOpts4 :: HasCallStack => ChatOpts -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChatOpts4 = testChatCfgOpts4 testCfg
+
+testChatCfgOpts4 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChatCfgOpts4 cfg opts p1 p2 p3 p4 test = testChatN cfg opts [p1, p2, p3, p4] test_
   where
     test_ :: HasCallStack => [TestCC] -> IO ()
     test_ [tc1, tc2, tc3, tc4] = test tc1 tc2 tc3 tc4
     test_ _ = error "expected 4 chat clients"
 
+testChat5 :: HasCallStack => Profile -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChat5 = testChatCfg5 testCfg
+
+testChatCfg5 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+testChatCfg5 cfg p1 p2 p3 p4 p5 test = testChatN cfg testOpts [p1, p2, p3, p4, p5] test_
+  where
+    test_ :: HasCallStack => [TestCC] -> IO ()
+    test_ [tc1, tc2, tc3, tc4, tc5] = test tc1 tc2 tc3 tc4 tc5
+    test_ _ = error "expected 5 chat clients"
+
 concurrentlyN_ :: [IO a] -> IO ()
 concurrentlyN_ = mapConcurrently_ id
 
@@ -477,14 +496,12 @@ smpServerCfg =
   ServerConfig
     { transports = [(serverPort, transport @TLS, False)],
       tbqSize = 1,
-      msgStoreType = AMSType SMSMemory,
       msgQueueQuota = 16,
       maxJournalMsgCount = 24,
       maxJournalStateLines = 4,
-      queueIdBytes = 12,
+      queueIdBytes = 24,
       msgIdBytes = 6,
-      storeLogFile = Nothing,
-      storeMsgsFile = Nothing,
+      serverStoreCfg = ASSCfg SQSMemory SMSMemory $ SSCMemory Nothing,
       storeNtfsFile = Nothing,
       allowNewQueues = True,
       -- server password is disabled as otherwise v1 tests fail
@@ -518,9 +535,13 @@ smpServerCfg =
       smpAgentCfg = defaultSMPClientAgentConfig,
       allowSMPProxy = True,
       serverClientConcurrency = 16,
-      information = Nothing
+      information = Nothing,
+      startOptions = StartOptions {maintenance = False, compactLog = False, logLevel = LogError, skipWarnings = False, confirmMigrations = MCYesUp}
     }
 
+persistentServerStoreCfg :: FilePath -> AServerStoreCfg
+persistentServerStoreCfg tmp = ASSCfg SQSMemory SMSMemory $ SSCMemory $ Just StorePaths {storeLogFile = tmp <> "/smp-server-store.log", storeMsgsFile = Just $ tmp <> "/smp-server-messages.log"}
+
 withSmpServer :: IO () -> IO ()
 withSmpServer = withSmpServer' smpServerCfg
 
diff --git a/tests/ChatTests.hs b/tests/ChatTests.hs
index e8f3838eb6..20fccf6c64 100644
--- a/tests/ChatTests.hs
+++ b/tests/ChatTests.hs
@@ -1,6 +1,7 @@
 module ChatTests where
 
 import ChatTests.ChatList
+import ChatTests.DBUtils
 import ChatTests.Direct
 import ChatTests.Files
 import ChatTests.Forward
@@ -9,7 +10,7 @@ import ChatTests.Local
 import ChatTests.Profiles
 import Test.Hspec hiding (it)
 
-chatTests :: SpecWith FilePath
+chatTests :: SpecWith TestParams
 chatTests = do
   describe "direct tests" chatDirectTests
   describe "forward tests" chatForwardTests
diff --git a/tests/ChatTests/ChatList.hs b/tests/ChatTests/ChatList.hs
index dd88aac54e..dcd18a9818 100644
--- a/tests/ChatTests/ChatList.hs
+++ b/tests/ChatTests/ChatList.hs
@@ -1,12 +1,13 @@
 module ChatTests.ChatList where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Data.Time.Clock (getCurrentTime)
 import Data.Time.Format.ISO8601 (iso8601Show)
 import Test.Hspec hiding (it)
 
-chatListTests :: SpecWith FilePath
+chatListTests :: SpecWith TestParams
 chatListTests = do
   it "get last chats" testPaginationLast
   it "get chats before/after timestamp" testPaginationTs
@@ -16,7 +17,7 @@ chatListTests = do
   it "filter favorite or unread" testFilterFavoriteOrUnread
   it "sort and filter chats of all types" testPaginationAllChatTypes
 
-testPaginationLast :: HasCallStack => FilePath -> IO ()
+testPaginationLast :: HasCallStack => TestParams -> IO ()
 testPaginationLast =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -32,7 +33,7 @@ testPaginationLast =
       alice <# "bob> hey"
       alice <# "@cath hey"
 
-testPaginationTs :: HasCallStack => FilePath -> IO ()
+testPaginationTs :: HasCallStack => TestParams -> IO ()
 testPaginationTs =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -59,7 +60,7 @@ getChats_ :: HasCallStack => TestCC -> String -> [(String, String)] -> Expectati
 getChats_ cc query expected = do
   cc #$> ("/_get chats 1 pcc=on " <> query, chats, expected)
 
-testFilterSearch :: HasCallStack => FilePath -> IO ()
+testFilterSearch :: HasCallStack => TestParams -> IO ()
 testFilterSearch =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -75,7 +76,7 @@ testFilterSearch =
       getChats_ alice (query "bob") [("@bob", "hey")]
       getChats_ alice (query "Bob") [("@bob", "hey")]
 
-testFilterFavorite :: HasCallStack => FilePath -> IO ()
+testFilterFavorite :: HasCallStack => TestParams -> IO ()
 testFilterFavorite =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -99,7 +100,7 @@ testFilterFavorite =
       alice <## "ok"
       getChats_ alice query [("@bob", "hey")]
 
-testFilterUnread :: HasCallStack => FilePath -> IO ()
+testFilterUnread :: HasCallStack => TestParams -> IO ()
 testFilterUnread =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -123,7 +124,7 @@ testFilterUnread =
       alice <## "ok"
       getChats_ alice query [("@bob", "hey")]
 
-testFilterFavoriteOrUnread :: HasCallStack => FilePath -> IO ()
+testFilterFavoriteOrUnread :: HasCallStack => TestParams -> IO ()
 testFilterFavoriteOrUnread =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -154,7 +155,7 @@ testFilterFavoriteOrUnread =
       alice <## "ok"
       getChats_ alice query [("@cath", "hey"), ("@bob", "hey")]
 
-testPaginationAllChatTypes :: HasCallStack => FilePath -> IO ()
+testPaginationAllChatTypes :: HasCallStack => TestParams -> IO ()
 testPaginationAllChatTypes =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
diff --git a/tests/ChatTests/DBUtils.hs b/tests/ChatTests/DBUtils.hs
new file mode 100644
index 0000000000..f6ac2284da
--- /dev/null
+++ b/tests/ChatTests/DBUtils.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE CPP #-}
+
+module ChatTests.DBUtils
+
+#if defined(dbPostgres)
+  ( module ChatTests.DBUtils.Postgres,
+  )
+  where
+import ChatTests.DBUtils.Postgres
+#else
+  ( module ChatTests.DBUtils.SQLite,
+  )
+  where
+import ChatTests.DBUtils.SQLite
+#endif
diff --git a/tests/ChatTests/DBUtils/Postgres.hs b/tests/ChatTests/DBUtils/Postgres.hs
new file mode 100644
index 0000000000..2b160379bb
--- /dev/null
+++ b/tests/ChatTests/DBUtils/Postgres.hs
@@ -0,0 +1,6 @@
+module ChatTests.DBUtils.Postgres where
+
+data TestParams = TestParams
+  { tmpPath :: FilePath,
+    printOutput :: Bool
+  }
diff --git a/tests/ChatTests/DBUtils/SQLite.hs b/tests/ChatTests/DBUtils/SQLite.hs
new file mode 100644
index 0000000000..2de94882cd
--- /dev/null
+++ b/tests/ChatTests/DBUtils/SQLite.hs
@@ -0,0 +1,12 @@
+module ChatTests.DBUtils.SQLite where
+
+import Database.SQLite.Simple (Query)
+import Simplex.Messaging.Agent.Store.SQLite.DB
+import Simplex.Messaging.TMap (TMap)
+
+data TestParams = TestParams
+  { tmpPath :: FilePath,
+    printOutput :: Bool,
+    chatQueryStats :: TMap Query SlowQueryStats,
+    agentQueryStats :: TMap Query SlowQueryStats
+  }
diff --git a/tests/ChatTests/Direct.hs b/tests/ChatTests/Direct.hs
index bc857132eb..21ee1e9218 100644
--- a/tests/ChatTests/Direct.hs
+++ b/tests/ChatTests/Direct.hs
@@ -12,6 +12,7 @@
 module ChatTests.Direct where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
@@ -28,7 +29,6 @@ import Simplex.Chat.Call
 import Simplex.Chat.Controller (ChatConfig (..), PresetServers (..))
 import Simplex.Chat.Messages (ChatItemId)
 import Simplex.Chat.Options
-import Simplex.Chat.Options.DB
 import Simplex.Chat.Protocol (supportedChatVRange)
 import Simplex.Chat.Types (VersionRangeChat, authErrDisableCount, sameVerificationCode, verificationCode, pattern VersionChat)
 import Simplex.Messaging.Agent.Env.SQLite
@@ -45,10 +45,11 @@ import Test.Hspec hiding (it)
 import Database.PostgreSQL.Simple (Only (..))
 #else
 import Database.SQLite.Simple (Only (..))
+import Simplex.Chat.Options.DB
 import System.FilePath ((</>))
 #endif
 
-chatDirectTests :: SpecWith FilePath
+chatDirectTests :: SpecWith TestParams
 chatDirectTests = do
   describe "direct messages" $ do
     describe "add contact and send/receive messages" testAddContact
@@ -59,7 +60,6 @@ chatDirectTests = do
     it "deleting contact deletes profile" testDeleteContactDeletesProfile
     it "delete contact keeping conversation" testDeleteContactKeepConversation
     it "delete conversation keeping contact" testDeleteConversationKeepContact
-    it "unused contact is deleted silently" testDeleteUnusedContactSilent
     it "direct message quoted replies" testDirectMessageQuotedReply
     it "direct message update" testDirectMessageUpdate
     it "direct message edit history" testDirectMessageEditHistory
@@ -180,7 +180,7 @@ chatDirectTests = do
     testInvVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnInvChatVRange vr1 vr2
     testReqVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnReqChatVRange vr1 vr2
 
-testAddContact :: HasCallStack => SpecWith FilePath
+testAddContact :: HasCallStack => SpecWith TestParams
 testAddContact = versionTestMatrix2 runTestAddContact
   where
     runTestAddContact pqExpected alice bob = do
@@ -237,9 +237,10 @@ testAddContact = versionTestMatrix2 runTestAddContact
             then chatFeatures
             else (0, e2eeInfoNoPQStr) : tail chatFeatures
 
-testRetryConnecting :: HasCallStack => FilePath -> IO ()
-testRetryConnecting tmp = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile test tmp
+testRetryConnecting :: HasCallStack => TestParams -> IO ()
+testRetryConnecting ps = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile test ps
   where
+    tmp = tmpPath ps
     test alice bob = do
       inv <- withSmpServer' serverCfg' $ do
         alice ##> "/_connect 1"
@@ -269,8 +270,7 @@ testRetryConnecting tmp = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile te
       smpServerCfg
         { transports = [("7003", transport @TLS, False)],
           msgQueueQuota = 2,
-          storeLogFile = Just $ tmp <> "/smp-server-store.log",
-          storeMsgsFile = Just $ tmp <> "/smp-server-messages.log"
+          serverStoreCfg = persistentServerStoreCfg tmp
         }
     fastRetryInterval = defaultReconnectInterval {initialInterval = 50000} -- same as in agent tests
     cfg' =
@@ -289,14 +289,14 @@ testRetryConnecting tmp = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile te
               }
         }
 
-testRetryConnectingClientTimeout :: HasCallStack => FilePath -> IO ()
-testRetryConnectingClientTimeout tmp = do
+testRetryConnectingClientTimeout :: HasCallStack => TestParams -> IO ()
+testRetryConnectingClientTimeout ps = do
   inv <- withSmpServer' serverCfg' $ do
-    withNewTestChatCfgOpts tmp cfg' opts' "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfgOpts ps cfg' opts' "alice" aliceProfile $ \alice -> do
       alice ##> "/_connect 1"
       inv <- getInvitation alice
 
-      withNewTestChatCfgOpts tmp cfgZeroTimeout opts' "bob" bobProfile $ \bob -> do
+      withNewTestChatCfgOpts ps cfgZeroTimeout opts' "bob" bobProfile $ \bob -> do
         bob ##> ("/_connect plan 1 " <> inv)
         bob <## "invitation link: ok to connect"
         bob ##> ("/_connect 1 " <> inv)
@@ -308,8 +308,8 @@ testRetryConnectingClientTimeout tmp = do
   logFile `shouldContain` "SECURE"
 
   withSmpServer' serverCfg' $ do
-    withTestChatCfgOpts tmp cfg' opts' "alice" $ \alice -> do
-      withTestChatCfgOpts tmp cfg' opts' "bob" $ \bob -> do
+    withTestChatCfgOpts ps cfg' opts' "alice" $ \alice -> do
+      withTestChatCfgOpts ps cfg' opts' "bob" $ \bob -> do
         bob ##> ("/_connect plan 1 " <> inv)
         bob <## "invitation link: ok to connect"
         bob ##> ("/_connect 1 " <> inv)
@@ -323,12 +323,12 @@ testRetryConnectingClientTimeout tmp = do
         bob #> "@alice message 2"
         alice <# "bob> message 2"
   where
+    tmp = tmpPath ps
     serverCfg' =
       smpServerCfg
         { transports = [("7003", transport @TLS, False)],
           msgQueueQuota = 2,
-          storeLogFile = Just $ tmp <> "/smp-server-store.log",
-          storeMsgsFile = Just $ tmp <> "/smp-server-messages.log"
+          serverStoreCfg = persistentServerStoreCfg tmp
         }
     fastRetryInterval = defaultReconnectInterval {initialInterval = 50000} -- same as in agent tests
     cfg' =
@@ -358,7 +358,7 @@ testRetryConnectingClientTimeout tmp = do
               }
         }
 
-testMarkReadDirect :: HasCallStack => FilePath -> IO ()
+testMarkReadDirect :: HasCallStack => TestParams -> IO ()
 testMarkReadDirect = testChat2 aliceProfile bobProfile $ \alice bob -> do
   connectUsers alice bob
   alice #> "@bob 1"
@@ -372,9 +372,9 @@ testMarkReadDirect = testChat2 aliceProfile bobProfile $ \alice bob -> do
   bob ##> "/last_item_id"
   i :: ChatItemId <- read <$> getTermLine bob
   let itemIds = intercalate "," $ map show [i - 3 .. i]
-  bob #$> ("/_read chat items @2 " <> itemIds, id, "ok")
+  bob #$> ("/_read chat items @2 " <> itemIds, id, "items read for chat")
 
-testChatPaginationInitial :: HasCallStack => FilePath -> IO ()
+testChatPaginationInitial :: HasCallStack => TestParams -> IO ()
 testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> do
   connectUsers alice bob
   -- Wait, otherwise ids are going to be wrong.
@@ -391,7 +391,7 @@ testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice
 
   -- Read next 2 items
   let itemIds = intercalate "," $ map itemId [1 .. 2]
-  bob #$> ("/_read chat items @2 " <> itemIds, id, "ok")
+  bob #$> ("/_read chat items @2 " <> itemIds, id, "items read for chat")
   bob #$> ("/_get chat @2 initial=2", chat, [(0, "1"), (0, "2"), (0, "3"), (0, "4"), (0, "5")])
 
   -- Read all items
@@ -404,7 +404,7 @@ testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice
         { markRead = False
         }
 
-testDuplicateContactsSeparate :: HasCallStack => FilePath -> IO ()
+testDuplicateContactsSeparate :: HasCallStack => TestParams -> IO ()
 testDuplicateContactsSeparate =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -430,7 +430,7 @@ testDuplicateContactsSeparate =
       bob @@@ [("@alice", "hey"), ("@alice_1", "2")]
       bob `hasContactProfiles` ["bob", "alice", "alice"]
 
-testDuplicateContactsMultipleSeparate :: HasCallStack => FilePath -> IO ()
+testDuplicateContactsMultipleSeparate :: HasCallStack => TestParams -> IO ()
 testDuplicateContactsMultipleSeparate =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -470,7 +470,7 @@ testDuplicateContactsMultipleSeparate =
       alice `hasContactProfiles` ["alice", "bob", "bob", "bob"]
       bob `hasContactProfiles` ["bob", "alice", "alice", "alice"]
 
-testPlanInvitationLinkOk :: HasCallStack => FilePath -> IO ()
+testPlanInvitationLinkOk :: HasCallStack => TestParams -> IO ()
 testPlanInvitationLinkOk =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -489,9 +489,9 @@ testPlanInvitationLinkOk =
       bob <## "invitation link: ok to connect" -- conn_req_inv is forgotten after connection
       alice <##> bob
 
-testPlanInvitationLinkOwn :: HasCallStack => FilePath -> IO ()
-testPlanInvitationLinkOwn tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPlanInvitationLinkOwn :: HasCallStack => TestParams -> IO ()
+testPlanInvitationLinkOwn ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
     alice ##> "/c"
     inv <- getInvitation alice
     alice ##> ("/_connect plan 1 " <> inv)
@@ -524,12 +524,12 @@ testPlanInvitationLinkOwn tmp =
            ]
     alice @@@ [("@alice_1", "hey"), ("@alice_2", "hey")]
 
-testPlanInvitationLinkConnecting :: HasCallStack => FilePath -> IO ()
-testPlanInvitationLinkConnecting tmp = do
-  inv <- withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPlanInvitationLinkConnecting :: HasCallStack => TestParams -> IO ()
+testPlanInvitationLinkConnecting ps = do
+  inv <- withNewTestChat ps "alice" aliceProfile $ \alice -> do
     alice ##> "/c"
     getInvitation alice
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
 
@@ -540,7 +540,7 @@ testPlanInvitationLinkConnecting tmp = do
     bob ##> ("/_connect plan 1 " <> invSchema2)
     bob <## "invitation link: connecting"
 
-testContactClear :: HasCallStack => FilePath -> IO ()
+testContactClear :: HasCallStack => TestParams -> IO ()
 testContactClear =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -552,7 +552,7 @@ testContactClear =
       bob #$> ("/clear alice", id, "alice: all messages are removed locally ONLY")
       bob #$> ("/_get chat @2 count=100", chat, [])
 
-testDeleteContactDeletesProfile :: HasCallStack => FilePath -> IO ()
+testDeleteContactDeletesProfile :: HasCallStack => TestParams -> IO ()
 testDeleteContactDeletesProfile =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -572,7 +572,7 @@ testDeleteContactDeletesProfile =
       (bob </)
       bob `hasContactProfiles` ["bob"]
 
-testDeleteContactKeepConversation :: HasCallStack => FilePath -> IO ()
+testDeleteContactKeepConversation :: HasCallStack => TestParams -> IO ()
 testDeleteContactKeepConversation =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -590,7 +590,7 @@ testDeleteContactKeepConversation =
       bob ##> "@alice hey"
       bob <## "alice: not ready"
 
-testDeleteConversationKeepContact :: HasCallStack => FilePath -> IO ()
+testDeleteConversationKeepContact :: HasCallStack => TestParams -> IO ()
 testDeleteConversationKeepContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -609,43 +609,7 @@ testDeleteConversationKeepContact =
       alice @@@ [("@bob", "hi")]
       alice <##> bob
 
-testDeleteUnusedContactSilent :: HasCallStack => FilePath -> IO ()
-testDeleteUnusedContactSilent =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      createGroup3 "team" alice bob cath
-      bob ##> "/contacts"
-      bob <### ["alice (Alice)", "cath (Catherine)"]
-      bob `hasContactProfiles` ["bob", "alice", "cath"]
-      cath ##> "/contacts"
-      cath <### ["alice (Alice)", "bob (Bob)"]
-      cath `hasContactProfiles` ["cath", "alice", "bob"]
-      -- bob deletes cath, cath's bob contact is deleted silently
-      bob ##> "/d cath"
-      bob <## "cath: contact is deleted"
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      threadDelay 50000
-      cath ##> "/contacts"
-      cath <## "alice (Alice)"
-      -- group messages work
-      alice #> "#team hello"
-      concurrentlyN_
-        [ bob <# "#team alice> hello",
-          cath <# "#team alice> hello"
-        ]
-      bob #> "#team hi there"
-      concurrentlyN_
-        [ alice <# "#team bob> hi there",
-          cath <# "#team bob> hi there"
-        ]
-      cath #> "#team hey"
-      concurrentlyN_
-        [ alice <# "#team cath> hey",
-          bob <# "#team cath> hey"
-        ]
-
-testDirectMessageQuotedReply :: HasCallStack => FilePath -> IO ()
+testDirectMessageQuotedReply :: HasCallStack => TestParams -> IO ()
 testDirectMessageQuotedReply =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -670,7 +634,7 @@ testDirectMessageQuotedReply =
       bob #$> ("/_get chat @2 count=1", chat', [((1, "will tell more"), Just (1, "all good - you?"))])
       alice #$> ("/_get chat @2 count=1", chat', [((0, "will tell more"), Just (0, "all good - you?"))])
 
-testDirectMessageUpdate :: HasCallStack => FilePath -> IO ()
+testDirectMessageUpdate :: HasCallStack => TestParams -> IO ()
 testDirectMessageUpdate =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -734,7 +698,7 @@ testDirectMessageUpdate =
       alice #$> ("/_get chat @2 count=100", chat', chatFeatures' <> [((1, "greetings 🤝"), Nothing), ((0, "hey Alice"), Just (1, "hello 🙂")), ((0, "greetings Alice"), Just (1, "hey 👋"))])
       bob #$> ("/_get chat @2 count=100", chat', chatFeatures' <> [((0, "greetings 🤝"), Nothing), ((1, "hey Alice"), Just (0, "hello 🙂")), ((1, "greetings Alice"), Just (0, "hey 👋"))])
 
-testDirectMessageEditHistory :: HasCallStack => FilePath -> IO ()
+testDirectMessageEditHistory :: HasCallStack => TestParams -> IO ()
 testDirectMessageEditHistory =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -805,7 +769,7 @@ testDirectMessageEditHistory =
       bob <## "message history:"
       bob .<## ": hey there"
 
-testDirectMessageDelete :: HasCallStack => FilePath -> IO ()
+testDirectMessageDelete :: HasCallStack => TestParams -> IO ()
 testDirectMessageDelete =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -886,7 +850,7 @@ testDirectMessageDelete =
       bob #$> ("/_delete item @2 " <> itemId 4 <> " internal", id, "message deleted")
       bob #$> ("/_get chat @2 count=100", chat', chatFeatures' <> [((0, "hello 🙂"), Nothing), ((1, "do you receive my messages?"), Just (0, "hello 🙂"))])
 
-testDirectMessageDeleteMultiple :: HasCallStack => FilePath -> IO ()
+testDirectMessageDeleteMultiple :: HasCallStack => TestParams -> IO ()
 testDirectMessageDeleteMultiple =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -908,7 +872,7 @@ testDirectMessageDeleteMultiple =
       alice #$> ("/_get chat @2 count=2", chat, [(1, "hello [marked deleted]"), (1, "hey [marked deleted]")])
       bob #$> ("/_get chat @2 count=2", chat, [(0, "hello [marked deleted]"), (0, "hey [marked deleted]")])
 
-testDirectMessageDeleteMultipleManyBatches :: HasCallStack => FilePath -> IO ()
+testDirectMessageDeleteMultipleManyBatches :: HasCallStack => TestParams -> IO ()
 testDirectMessageDeleteMultipleManyBatches =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -937,7 +901,7 @@ testDirectMessageDeleteMultipleManyBatches =
       forM_ [(1 :: Int) .. 300] $ \i -> do
         bob <# ("alice> [marked deleted] message " <> show i)
 
-testDirectLiveMessage :: HasCallStack => FilePath -> IO ()
+testDirectLiveMessage :: HasCallStack => TestParams -> IO ()
 testDirectLiveMessage =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
@@ -966,7 +930,7 @@ testDirectLiveMessage =
     bob .<## ": hello 2"
     bob .<## ":"
 
-testDirectTimedMessage :: HasCallStack => FilePath -> IO ()
+testDirectTimedMessage :: HasCallStack => TestParams -> IO ()
 testDirectTimedMessage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -992,7 +956,7 @@ testDirectTimedMessage =
       alice <# "@bob hi"
       bob <# "alice> hi"
 
-testRepeatAuthErrorsDisableContact :: HasCallStack => FilePath -> IO ()
+testRepeatAuthErrorsDisableContact :: HasCallStack => TestParams -> IO ()
 testRepeatAuthErrorsDisableContact =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
@@ -1012,7 +976,7 @@ testRepeatAuthErrorsDisableContact =
       alice #> "@bob hey"
       alice <## "[bob, contactId: 2, connId: 1] error: connection authorization failed - this could happen if connection was deleted, secured with different credentials, or due to a bug - please re-create the connection"
 
-testMultilineMessage :: HasCallStack => FilePath -> IO ()
+testMultilineMessage :: HasCallStack => TestParams -> IO ()
 testMultilineMessage = testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
   connectUsers alice bob
   connectUsers alice cath
@@ -1029,7 +993,7 @@ testMultilineMessage = testChat3 aliceProfile bobProfile cathProfile $ \alice bo
   cath <# "alice> hello"
   cath <## "there"
 
-testLargeMessage :: HasCallStack => FilePath -> IO ()
+testLargeMessage :: HasCallStack => TestParams -> IO ()
 testLargeMessage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1043,7 +1007,7 @@ testLargeMessage =
       bob <## "contact alice changed to alice2"
       bob <## "use @alice2 <message> to send messages"
 
-testSendMulti :: HasCallStack => FilePath -> IO ()
+testSendMulti :: HasCallStack => TestParams -> IO ()
 testSendMulti =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1055,7 +1019,7 @@ testSendMulti =
       bob <# "alice> test 1"
       bob <# "alice> test 2"
 
-testSendMultiTimed :: HasCallStack => FilePath -> IO ()
+testSendMultiTimed :: HasCallStack => TestParams -> IO ()
 testSendMultiTimed =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1076,7 +1040,7 @@ testSendMultiTimed =
                "timed message deleted: test 2"
              ]
 
-testSendMultiWithQuote :: HasCallStack => FilePath -> IO ()
+testSendMultiWithQuote :: HasCallStack => TestParams -> IO ()
 testSendMultiWithQuote =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1119,7 +1083,7 @@ testSendMultiWithQuote =
       bob <## "      message 3"
       bob <# "alice> message 1"
 
-testSendMultiManyBatches :: HasCallStack => FilePath -> IO ()
+testSendMultiManyBatches :: HasCallStack => TestParams -> IO ()
 testSendMultiManyBatches =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1149,7 +1113,9 @@ testSendMultiManyBatches =
         DB.query db "SELECT count(1) FROM chat_items WHERE chat_item_id > ?" (Only msgIdBob) :: IO [[Int]]
       bobItemsCount `shouldBe` [[300]]
 
-testGetSetSMPServers :: HasCallStack => FilePath -> IO ()
+      threadDelay 1000000
+
+testGetSetSMPServers :: HasCallStack => TestParams -> IO ()
 testGetSetSMPServers =
   testChat aliceProfile $
     \alice -> do
@@ -1177,7 +1143,7 @@ testGetSetSMPServers =
       alice <## "    smp://2345-w==@smp2.example.im"
       alice <## "    smp://3456-w==@smp3.example.im:5224"
 
-testTestSMPServerConnection :: HasCallStack => FilePath -> IO ()
+testTestSMPServerConnection :: HasCallStack => TestParams -> IO ()
 testTestSMPServerConnection =
   testChat aliceProfile $
     \alice -> do
@@ -1192,7 +1158,7 @@ testTestSMPServerConnection =
       alice <## "SMP server test failed at Connect, error: BROKER {brokerAddress = \"smp://LcJU@localhost:7001\", brokerErr = NETWORK}"
       alice <## "Possibly, certificate fingerprint in SMP server address is incorrect"
 
-testGetSetXFTPServers :: HasCallStack => FilePath -> IO ()
+testGetSetXFTPServers :: HasCallStack => TestParams -> IO ()
 testGetSetXFTPServers =
   testChat aliceProfile $
     \alice -> withXFTPServer $ do
@@ -1219,7 +1185,7 @@ testGetSetXFTPServers =
       alice <## "    xftp://2345-w==@xftp2.example.im"
       alice <## "    xftp://3456-w==@xftp3.example.im:5224"
 
-testTestXFTPServer :: HasCallStack => FilePath -> IO ()
+testTestXFTPServer :: HasCallStack => TestParams -> IO ()
 testTestXFTPServer =
   testChat aliceProfile $
     \alice -> withXFTPServer $ do
@@ -1234,7 +1200,7 @@ testTestXFTPServer =
       alice <## "XFTP server test failed at Connect, error: BROKER {brokerAddress = \"xftp://LcJU@localhost:7002\", brokerErr = NETWORK}"
       alice <## "Possibly, certificate fingerprint in XFTP server address is incorrect"
 
-testOperators  :: HasCallStack => FilePath -> IO ()
+testOperators  :: HasCallStack => TestParams -> IO ()
 testOperators =
   testChatCfgOpts testCfg opts' aliceProfile $
     \alice -> do
@@ -1264,59 +1230,59 @@ testOperators =
   where
     opts' = testOpts {coreOptions = testCoreOpts {smpServers = [], xftpServers = []}}
 
-testAsyncInitiatingOffline :: HasCallStack => ChatConfig -> ChatConfig -> FilePath -> IO ()
-testAsyncInitiatingOffline aliceCfg bobCfg tmp = do
-  inv <- withNewTestChatCfg tmp aliceCfg "alice" aliceProfile $ \alice -> do
+testAsyncInitiatingOffline :: HasCallStack => ChatConfig -> ChatConfig -> TestParams -> IO ()
+testAsyncInitiatingOffline aliceCfg bobCfg ps = do
+  inv <- withNewTestChatCfg ps aliceCfg "alice" aliceProfile $ \alice -> do
     threadDelay 250000
     alice ##> "/c"
     getInvitation alice
-  withNewTestChatCfg tmp bobCfg "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps bobCfg "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
-    withTestChatCfg tmp aliceCfg "alice" $ \alice -> do
+    withTestChatCfg ps aliceCfg "alice" $ \alice -> do
       concurrently_
         (bob <## "alice (Alice): contact is connected")
         (alice <## "bob (Bob): contact is connected")
 
-testAsyncAcceptingOffline :: HasCallStack => ChatConfig -> ChatConfig -> FilePath -> IO ()
-testAsyncAcceptingOffline aliceCfg bobCfg tmp = do
-  inv <- withNewTestChatCfg tmp aliceCfg "alice" aliceProfile $ \alice -> do
+testAsyncAcceptingOffline :: HasCallStack => ChatConfig -> ChatConfig -> TestParams -> IO ()
+testAsyncAcceptingOffline aliceCfg bobCfg ps = do
+  inv <- withNewTestChatCfg ps aliceCfg "alice" aliceProfile $ \alice -> do
     alice ##> "/c"
     getInvitation alice
-  withNewTestChatCfg tmp bobCfg "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps bobCfg "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
-  withTestChatCfg tmp aliceCfg "alice" $ \alice -> do
-    withTestChatCfg tmp bobCfg "bob" $ \bob -> do
+  withTestChatCfg ps aliceCfg "alice" $ \alice -> do
+    withTestChatCfg ps bobCfg "bob" $ \bob -> do
       concurrently_
         (bob <## "alice (Alice): contact is connected")
         (alice <## "bob (Bob): contact is connected")
 
-testFullAsyncFast :: HasCallStack => FilePath -> IO ()
-testFullAsyncFast tmp = do
-  inv <- withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testFullAsyncFast :: HasCallStack => TestParams -> IO ()
+testFullAsyncFast ps = do
+  inv <- withNewTestChat ps "alice" aliceProfile $ \alice -> do
     threadDelay 250000
     alice ##> "/c"
     getInvitation alice
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
     threadDelay 250000
-  withTestChat tmp "alice" $ \alice ->
+  withTestChat ps "alice" $ \alice ->
     alice <## "bob (Bob): contact is connected"
-  withTestChat tmp "bob" $ \bob ->
+  withTestChat ps "bob" $ \bob ->
     bob <## "alice (Alice): contact is connected"
 
-testFullAsyncSlow :: HasCallStack => ChatConfig -> ChatConfig -> FilePath -> IO ()
-testFullAsyncSlow aliceCfg bobCfg tmp = do
-  inv <- withNewTestChatCfg tmp aliceCfg "alice" aliceProfile $ \alice -> do
+testFullAsyncSlow :: HasCallStack => ChatConfig -> ChatConfig -> TestParams -> IO ()
+testFullAsyncSlow aliceCfg bobCfg ps = do
+  inv <- withNewTestChatCfg ps aliceCfg "alice" aliceProfile $ \alice -> do
     threadDelay 250000
     alice ##> "/c"
     getInvitation alice
-  withNewTestChatCfg tmp bobCfg "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps bobCfg "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
@@ -1329,8 +1295,8 @@ testFullAsyncSlow aliceCfg bobCfg tmp = do
     bob <## "1 contacts connected (use /cs for the list)"
     bob <## "alice (Alice): contact is connected"
   where
-    withAlice = withTestChatCfg tmp aliceCfg "alice"
-    withBob = withTestChatCfg tmp aliceCfg "bob"
+    withAlice = withTestChatCfg ps aliceCfg "alice"
+    withBob = withTestChatCfg ps aliceCfg "bob"
 
 testCallType :: CallType
 testCallType = CallType {media = CMVideo, capabilities = CallCapabilities {encryption = True}}
@@ -1355,7 +1321,7 @@ serialize = B.unpack . LB.toStrict . J.encode
 repeatM_ :: Int -> IO a -> IO ()
 repeatM_ n a = forM_ [1 .. n] $ const a
 
-testNegotiateCall :: HasCallStack => FilePath -> IO ()
+testNegotiateCall :: HasCallStack => TestParams -> IO ()
 testNegotiateCall =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
@@ -1402,10 +1368,10 @@ testNegotiateCall =
     alice <## "call with bob ended"
     alice #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(1, "outgoing call: ended (00:00)")])
 
-testMaintenanceMode :: HasCallStack => FilePath -> IO ()
-testMaintenanceMode tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatOpts tmp testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
+testMaintenanceMode :: HasCallStack => TestParams -> IO ()
+testMaintenanceMode ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatOpts ps testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
       alice ##> "/c"
       alice <## "error: chat not started"
       alice ##> "/_start"
@@ -1437,7 +1403,7 @@ testMaintenanceMode tmp = do
       alice ##> "/_start"
       alice <## "error: chat store changed, please restart chat"
     -- works after full restart
-    withTestChat tmp "alice" $ \alice -> testChatWorking alice bob
+    withTestChat ps "alice" $ \alice -> testChatWorking alice bob
 
 testChatWorking :: HasCallStack => TestCC -> TestCC -> IO ()
 testChatWorking alice bob = do
@@ -1447,10 +1413,10 @@ testChatWorking alice bob = do
   bob #> "@alice hello too"
   alice <# "bob> hello too"
 
-testMaintenanceModeWithFiles :: HasCallStack => FilePath -> IO ()
-testMaintenanceModeWithFiles tmp = withXFTPServer $ do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatOpts tmp testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
+testMaintenanceModeWithFiles :: HasCallStack => TestParams -> IO ()
+testMaintenanceModeWithFiles ps = withXFTPServer $ do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatOpts ps testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
       alice ##> "/_start"
       alice <## "chat started"
       alice ##> "/_files_folder ./tests/tmp/alice_files"
@@ -1490,13 +1456,13 @@ testMaintenanceModeWithFiles tmp = withXFTPServer $ do
       alice <## "ok"
       B.readFile "./tests/tmp/alice_files/test.jpg" `shouldReturn` src
     -- works after full restart
-    withTestChat tmp "alice" $ \alice -> testChatWorking alice bob
+    withTestChat ps "alice" $ \alice -> testChatWorking alice bob
 
 #if !defined(dbPostgres)
-testDatabaseEncryption :: HasCallStack => FilePath -> IO ()
-testDatabaseEncryption tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatOpts tmp testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
+testDatabaseEncryption :: HasCallStack => TestParams -> IO ()
+testDatabaseEncryption ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatOpts ps testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
       alice ##> "/_start"
       alice <## "chat started"
       connectUsers alice bob
@@ -1514,7 +1480,7 @@ testDatabaseEncryption tmp = do
       alice <## "ok"
       alice ##> "/_start"
       alice <## "error: chat store changed, please restart chat"
-    withTestChatOpts tmp (getTestOpts True "mykey") "alice" $ \alice -> do
+    withTestChatOpts ps (getTestOpts True "mykey") "alice" $ \alice -> do
       alice ##> "/_start"
       alice <## "chat started"
       testChatWorking alice bob
@@ -1530,7 +1496,7 @@ testDatabaseEncryption tmp = do
       alice <## "ok"
       alice ##> "/_db encryption {\"currentKey\":\"nextkey\",\"newKey\":\"anotherkey\"}"
       alice <## "ok"
-    withTestChatOpts tmp (getTestOpts True "anotherkey") "alice" $ \alice -> do
+    withTestChatOpts ps (getTestOpts True "anotherkey") "alice" $ \alice -> do
       alice ##> "/_start"
       alice <## "chat started"
       testChatWorking alice bob
@@ -1538,15 +1504,15 @@ testDatabaseEncryption tmp = do
       alice <## "chat stopped"
       alice ##> "/db decrypt anotherkey"
       alice <## "ok"
-    withTestChat tmp "alice" $ \alice -> do
+    withTestChat ps "alice" $ \alice -> do
       testChatWorking alice bob
 #endif
 
-testSubscribeAppNSE :: HasCallStack => FilePath -> IO ()
-testSubscribeAppNSE tmp =
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-      withTestChatOpts tmp testOpts {maintenance = True} "alice" $ \nseAlice -> do
+testSubscribeAppNSE :: HasCallStack => TestParams -> IO ()
+testSubscribeAppNSE ps =
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChat ps "alice" aliceProfile $ \alice -> do
+      withTestChatOpts ps testOpts {maintenance = True} "alice" $ \nseAlice -> do
         alice ##> "/_app suspend 1"
         alice <## "ok"
         alice <## "chat suspended"
@@ -1572,7 +1538,7 @@ testSubscribeAppNSE tmp =
         threadDelay 100000
         alice <##> bob
 
-testMuteContact :: HasCallStack => FilePath -> IO ()
+testMuteContact :: HasCallStack => TestParams -> IO ()
 testMuteContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1592,7 +1558,7 @@ testMuteContact =
       alice #> "@bob hi again"
       bob <# "alice> hi again"
 
-testMuteGroup :: HasCallStack => FilePath -> IO ()
+testMuteGroup :: HasCallStack => TestParams -> IO ()
 testMuteGroup =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1617,7 +1583,7 @@ testMuteGroup =
       cath <## "      hello too!"
       concurrentlyN_
         [ do
-            bob <# "#team cath> > bob hello <muted>"
+            bob <# "#team cath!> > bob hello <muted>"
             bob <## "      hello too! <muted>",
           do
             alice <# "#team cath> > bob hello"
@@ -1630,7 +1596,7 @@ testMuteGroup =
       alice <## "      hey bob!"
       concurrentlyN_
         [ do
-            bob <# "#team alice> > bob hello"
+            bob <# "#team alice!> > bob hello"
             bob <## "      hey bob!",
           do
             cath <# "#team alice> > bob hello"
@@ -1644,7 +1610,7 @@ testMuteGroup =
             bob <# "#team alice> > cath hello too! <muted>"
             bob <## "      hey cath! <muted>",
           do
-            cath <# "#team alice> > cath hello too!"
+            cath <# "#team alice!> > cath hello too!"
             cath <## "      hey cath!"
         ]
       bob ##> "/gs"
@@ -1706,7 +1672,7 @@ testMuteGroup =
       bob ##> "/gs"
       bob <## "#team (3 members)"
 
-testCreateSecondUser :: HasCallStack => FilePath -> IO ()
+testCreateSecondUser :: HasCallStack => TestParams -> IO ()
 testCreateSecondUser =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1757,10 +1723,10 @@ testCreateSecondUser =
       alice ##> "/_user 2"
       showActiveUser alice "alisa"
 
-testUsersSubscribeAfterRestart :: HasCallStack => FilePath -> IO ()
-testUsersSubscribeAfterRestart tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testUsersSubscribeAfterRestart :: HasCallStack => TestParams -> IO ()
+testUsersSubscribeAfterRestart ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChat ps "alice" aliceProfile $ \alice -> do
       connectUsers alice bob
       alice <##> bob
 
@@ -1769,7 +1735,7 @@ testUsersSubscribeAfterRestart tmp = do
       connectUsers alice bob
       alice <##> bob
 
-    withTestChat tmp "alice" $ \alice -> do
+    withTestChat ps "alice" $ \alice -> do
       -- second user is active
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "[user: alice] 1 contacts connected (use /cs for the list)"
@@ -1781,7 +1747,7 @@ testUsersSubscribeAfterRestart tmp = do
       bob #> "@alice hey alice"
       (alice, "alice") $<# "bob> hey alice"
 
-testMultipleUserAddresses :: HasCallStack => FilePath -> IO ()
+testMultipleUserAddresses :: HasCallStack => TestParams -> IO ()
 testMultipleUserAddresses =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1853,7 +1819,7 @@ testMultipleUserAddresses =
       showActiveUser alice "alice (Alice)"
       alice @@@ [("@bob", "hey alice")]
 
-testCreateUserSameServers :: HasCallStack => FilePath -> IO ()
+testCreateUserSameServers :: HasCallStack => TestParams -> IO ()
 testCreateUserSameServers =
   testChat2 aliceProfile bobProfile $
     \alice _ -> do
@@ -1878,7 +1844,7 @@ testCreateUserSameServers =
       alice <## "    xftp://2345-w==@xftp2.example.im"
       alice <## "    xftp://3456-w==@xftp3.example.im:5224"
 
-testDeleteUser :: HasCallStack => FilePath -> IO ()
+testDeleteUser :: HasCallStack => TestParams -> IO ()
 testDeleteUser =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -1965,10 +1931,10 @@ testDeleteUser =
       alice ##> "/users"
       alice <## "no users"
 
-testUsersDifferentCIExpirationTTL :: HasCallStack => FilePath -> IO ()
-testUsersDifferentCIExpirationTTL tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
+testUsersDifferentCIExpirationTTL :: HasCallStack => TestParams -> IO ()
+testUsersDifferentCIExpirationTTL ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
       -- first user messages
       connectUsers alice bob
 
@@ -2040,10 +2006,10 @@ testUsersDifferentCIExpirationTTL tmp = do
   where
     cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerStepDelay = 0, ciExpirationInterval = 500000}
 
-testUsersRestartCIExpiration :: HasCallStack => FilePath -> IO ()
-testUsersRestartCIExpiration tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
+testUsersRestartCIExpiration :: HasCallStack => TestParams -> IO ()
+testUsersRestartCIExpiration ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
       -- set ttl for first user
       alice #$> ("/_ttl 1 2", id, "ok")
       connectUsers alice bob
@@ -2076,7 +2042,7 @@ testUsersRestartCIExpiration tmp = do
       alice ##> "/user alice"
       showActiveUser alice "alice (Alice)"
 
-    withTestChatCfg tmp cfg "alice" $ \alice -> do
+    withTestChatCfg ps cfg "alice" $ \alice -> do
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "[user: alisa] 1 contacts connected (use /cs for the list)"
 
@@ -2123,10 +2089,10 @@ testUsersRestartCIExpiration tmp = do
   where
     cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerStepDelay = 0, ciExpirationInterval = 500000}
 
-testEnableCIExpirationOnlyForOneUser :: HasCallStack => FilePath -> IO ()
-testEnableCIExpirationOnlyForOneUser tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
+testEnableCIExpirationOnlyForOneUser :: HasCallStack => TestParams -> IO ()
+testEnableCIExpirationOnlyForOneUser ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
       -- first user messages
       connectUsers alice bob
 
@@ -2175,7 +2141,7 @@ testEnableCIExpirationOnlyForOneUser tmp = do
       showActiveUser alice "alisa"
       alice #$> ("/_get chat @6 count=100", chat, chatFeatures <> [(1, "alisa 1"), (0, "alisa 2"), (1, "alisa 3"), (0, "alisa 4")])
 
-    withTestChatCfg tmp cfg "alice" $ \alice -> do
+    withTestChatCfg ps cfg "alice" $ \alice -> do
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "[user: alice] 1 contacts connected (use /cs for the list)"
 
@@ -2194,10 +2160,10 @@ testEnableCIExpirationOnlyForOneUser tmp = do
   where
     cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerStepDelay = 0, ciExpirationInterval = 500000}
 
-testDisableCIExpirationOnlyForOneUser :: HasCallStack => FilePath -> IO ()
-testDisableCIExpirationOnlyForOneUser tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
+testDisableCIExpirationOnlyForOneUser :: HasCallStack => TestParams -> IO ()
+testDisableCIExpirationOnlyForOneUser ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
       -- set ttl for first user
       alice #$> ("/_ttl 1 1", id, "ok")
       connectUsers alice bob
@@ -2231,7 +2197,7 @@ testDisableCIExpirationOnlyForOneUser tmp = do
       -- second user messages are deleted
       alice #$> ("/_get chat @6 count=100", chat, [])
 
-    withTestChatCfg tmp cfg "alice" $ \alice -> do
+    withTestChatCfg ps cfg "alice" $ \alice -> do
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "[user: alice] 1 contacts connected (use /cs for the list)"
 
@@ -2252,10 +2218,10 @@ testDisableCIExpirationOnlyForOneUser tmp = do
   where
     cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerStepDelay = 0, ciExpirationInterval = 500000}
 
-testUsersTimedMessages :: HasCallStack => FilePath -> IO ()
-testUsersTimedMessages tmp = do
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
-    withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testUsersTimedMessages :: HasCallStack => TestParams -> IO ()
+testUsersTimedMessages ps = do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
+    withNewTestChat ps "alice" aliceProfile $ \alice -> do
       connectUsers alice bob
       configureTimedMessages alice bob "2" "2"
 
@@ -2338,7 +2304,7 @@ testUsersTimedMessages tmp = do
       bob #> "@alisa alisa 4"
       alice <# "bob> alisa 4"
 
-    withTestChat tmp "alice" $ \alice -> do
+    withTestChat ps "alice" $ \alice -> do
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "[user: alice] 1 contacts connected (use /cs for the list)"
 
@@ -2387,7 +2353,7 @@ testUsersTimedMessages tmp = do
       bob <## ("Disappearing messages: enabled (you allow: yes (" <> ttl <> " sec), contact allows: yes (" <> ttl <> " sec))")
       alice #$> ("/clear bob", id, "bob: all messages are removed locally ONLY") -- to remove feature items
 
-testUserPrivacy :: HasCallStack => FilePath -> IO ()
+testUserPrivacy :: HasCallStack => TestParams -> IO ()
 testUserPrivacy =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2528,7 +2494,7 @@ testUserPrivacy =
         "bob> this won't show"
       ]
 
-testSetChatItemTTL :: HasCallStack => FilePath -> IO ()
+testSetChatItemTTL :: HasCallStack => TestParams -> IO ()
 testSetChatItemTTL =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2562,9 +2528,9 @@ testSetChatItemTTL =
       alice #$> ("/ttl none", id, "ok")
       alice #$> ("/ttl", id, "old messages are not being deleted")
 
-testSetDirectChatTTL :: HasCallStack => FilePath -> IO ()
+testSetDirectChatTTL :: HasCallStack => TestParams -> IO ()
 testSetDirectChatTTL =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
         connectUsers alice bob
         connectUsers alice cath
@@ -2638,9 +2604,9 @@ testSetDirectChatTTL =
         alice #$> ("/ttl @cath year", id, "ok")
         alice #$> ("/ttl @cath", id, "old messages are set to be deleted after: one year")
 
-testAppSettings :: HasCallStack => FilePath -> IO ()
-testAppSettings tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testAppSettings :: HasCallStack => TestParams -> IO ()
+testAppSettings ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
     let settings = T.unpack . safeDecodeUtf8 . LB.toStrict $ J.encode defaultAppSettings
         settingsApp = T.unpack . safeDecodeUtf8 . LB.toStrict $ J.encode defaultAppSettings {AS.webrtcICEServers = Just ["non-default.value.com"]}
     -- app-provided defaults
@@ -2656,7 +2622,7 @@ testAppSettings tmp =
     alice ##> "/_get app settings"
     alice <## ("app settings: " <> settingsApp)
 
-testSwitchContact :: HasCallStack => FilePath -> IO ()
+testSwitchContact :: HasCallStack => TestParams -> IO ()
 testSwitchContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2671,10 +2637,10 @@ testSwitchContact =
       bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "started changing address for you..."), (0, "changed address for you")])
       alice <##> bob
 
-testAbortSwitchContact :: HasCallStack => FilePath -> IO ()
-testAbortSwitchContact tmp = do
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testAbortSwitchContact :: HasCallStack => TestParams -> IO ()
+testAbortSwitchContact ps = do
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       connectUsers alice bob
     alice #$> ("/switch bob", id, "switch started")
     alice <## "bob: you started changing address"
@@ -2686,7 +2652,7 @@ testAbortSwitchContact tmp = do
     -- repeat switch stop is prohibited
     alice ##> "/abort switch bob"
     alice <## "error: command is prohibited, abortConnectionSwitch: not allowed"
-    withTestChatContactConnected tmp "bob" $ \bob -> do
+    withTestChatContactConnected ps "bob" $ \bob -> do
       bob <## "alice started changing address for you"
       -- alice changes address again
       alice #$> ("/switch bob", id, "switch started")
@@ -2699,7 +2665,7 @@ testAbortSwitchContact tmp = do
       bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "started changing address for you..."), (0, "started changing address for you..."), (0, "changed address for you")])
       alice <##> bob
 
-testSwitchGroupMember :: HasCallStack => FilePath -> IO ()
+testSwitchGroupMember :: HasCallStack => TestParams -> IO ()
 testSwitchGroupMember =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2717,10 +2683,10 @@ testSwitchGroupMember =
       bob #> "#team hi"
       alice <# "#team bob> hi"
 
-testAbortSwitchGroupMember :: HasCallStack => FilePath -> IO ()
-testAbortSwitchGroupMember tmp = do
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testAbortSwitchGroupMember :: HasCallStack => TestParams -> IO ()
+testAbortSwitchGroupMember ps = do
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
     alice #$> ("/switch #team bob", id, "switch started")
     alice <## "#team: you started changing address for bob"
@@ -2732,7 +2698,7 @@ testAbortSwitchGroupMember tmp = do
     -- repeat switch stop is prohibited
     alice ##> "/abort switch #team bob"
     alice <## "error: command is prohibited, abortConnectionSwitch: not allowed"
-    withTestChatContactConnected tmp "bob" $ \bob -> do
+    withTestChatContactConnected ps "bob" $ \bob -> do
       bob <## "#team: connected to server(s)"
       bob <## "#team: alice started changing address for you"
       -- alice changes address again
@@ -2749,7 +2715,7 @@ testAbortSwitchGroupMember tmp = do
       bob #> "#team hi"
       alice <# "#team bob> hi"
 
-testMarkContactVerified :: HasCallStack => FilePath -> IO ()
+testMarkContactVerified :: HasCallStack => TestParams -> IO ()
 testMarkContactVerified =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
@@ -2785,7 +2751,7 @@ testMarkContactVerified =
           | verified = "connection verified"
           | otherwise = "connection not verified, use /code command to see security code"
 
-testMarkGroupMemberVerified :: HasCallStack => FilePath -> IO ()
+testMarkGroupMemberVerified :: HasCallStack => TestParams -> IO ()
 testMarkGroupMemberVerified =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     createGroup2 "team" alice bob
@@ -2821,17 +2787,17 @@ testMarkGroupMemberVerified =
           | otherwise = "connection not verified, use /code command to see security code"
 
 #if !defined(dbPostgres)
-testMsgDecryptError :: HasCallStack => FilePath -> IO ()
-testMsgDecryptError tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testMsgDecryptError :: HasCallStack => TestParams -> IO ()
+testMsgDecryptError ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       connectUsers alice bob
       alice #> "@bob hi"
       bob <# "alice> hi"
       bob #> "@alice hey"
       alice <# "bob> hey"
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       alice #> "@bob hello again"
       bob <# "alice> skipped message ID 9..11"
@@ -2839,10 +2805,10 @@ testMsgDecryptError tmp =
       bob #> "@alice received!"
       alice <# "bob> received!"
 
-setupDesynchronizedRatchet :: HasCallStack => FilePath -> TestCC -> IO ()
-setupDesynchronizedRatchet tmp alice = do
+setupDesynchronizedRatchet :: HasCallStack => TestParams -> TestCC -> IO ()
+setupDesynchronizedRatchet ps alice = do
   copyDb "bob" "bob_old"
-  withTestChat tmp "bob" $ \bob -> do
+  withTestChat ps "bob" $ \bob -> do
     bob <## "1 contacts connected (use /cs for the list)"
     alice #> "@bob 1"
     bob <# "alice> 1"
@@ -2853,7 +2819,7 @@ setupDesynchronizedRatchet tmp alice = do
     bob #> "@alice 4"
     alice <# "bob> 4"
     threadDelay 500000
-  withTestChat tmp "bob_old" $ \bob -> do
+  withTestChat ps "bob_old" $ \bob -> do
     bob <## "1 contacts connected (use /cs for the list)"
     bob ##> "/sync alice"
     bob <## "error: command is prohibited, synchronizeRatchet: not allowed"
@@ -2869,21 +2835,22 @@ setupDesynchronizedRatchet tmp alice = do
     bob <## "error: command is prohibited, sendMessagesB: send prohibited"
     (alice </)
   where
+    tmp = tmpPath ps
     copyDb from to = do
       copyFile (tmp </> (from <> chatSuffix)) (tmp </> (to <> chatSuffix))
       copyFile (tmp </> (from <> agentSuffix)) (tmp </> (to <> agentSuffix))
 
-testSyncRatchet :: HasCallStack => FilePath -> IO ()
-testSyncRatchet tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testSyncRatchet :: HasCallStack => TestParams -> IO ()
+testSyncRatchet ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       connectUsers alice bob
       alice #> "@bob hi"
       bob <# "alice> hi"
       bob #> "@alice hey"
       alice <# "bob> hey"
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob_old" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob ##> "/sync alice"
       bob <## "connection synchronization started"
@@ -2901,10 +2868,10 @@ testSyncRatchet tmp =
       bob #> "@alice received!"
       alice <# "bob> received!"
 
-testSyncRatchetCodeReset :: HasCallStack => FilePath -> IO ()
-testSyncRatchetCodeReset tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testSyncRatchetCodeReset :: HasCallStack => TestParams -> IO ()
+testSyncRatchetCodeReset ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       connectUsers alice bob
       alice #> "@bob hi"
       bob <# "alice> hi"
@@ -2921,8 +2888,8 @@ testSyncRatchetCodeReset tmp =
       -- connection verified
       bob ##> "/i alice"
       aliceInfo bob True
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob_old" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob ##> "/sync alice"
       bob <## "connection synchronization started"
@@ -2960,7 +2927,7 @@ testSyncRatchetCodeReset tmp =
           | otherwise = "connection not verified, use /code command to see security code"
 #endif
 
-testSetMessageReactions :: HasCallStack => FilePath -> IO ()
+testSetMessageReactions :: HasCallStack => TestParams -> IO ()
 testSetMessageReactions =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -3008,10 +2975,10 @@ testSetMessageReactions =
       bob <# "alice> hi"
       bob <## "      👍 1"
 
-testSendDeliveryReceipts :: HasCallStack => FilePath -> IO ()
-testSendDeliveryReceipts tmp =
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+testSendDeliveryReceipts :: HasCallStack => TestParams -> IO ()
+testSendDeliveryReceipts ps =
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
       connectUsers alice bob
 
       alice #> "@bob hi"
@@ -3024,11 +2991,11 @@ testSendDeliveryReceipts tmp =
   where
     cfg = testCfg {showReceipts = True}
 
-testConfigureDeliveryReceipts :: HasCallStack => FilePath -> IO ()
-testConfigureDeliveryReceipts tmp =
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+testConfigureDeliveryReceipts :: HasCallStack => TestParams -> IO ()
+testConfigureDeliveryReceipts ps =
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
+      withNewTestChatCfg ps cfg "cath" cathProfile $ \cath -> do
         connectUsers alice bob
         connectUsers alice cath
 
@@ -3102,10 +3069,10 @@ testConfigureDeliveryReceipts tmp =
       cc2 <# (name1 <> "> " <> msg)
       cc1 <// 50000
 
-testConnInvChatVRange :: HasCallStack => VersionRangeChat -> VersionRangeChat -> FilePath -> IO ()
-testConnInvChatVRange ct1VRange ct2VRange tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
+testConnInvChatVRange :: HasCallStack => VersionRangeChat -> VersionRangeChat -> TestParams -> IO ()
+testConnInvChatVRange ct1VRange ct2VRange ps =
+  withNewTestChatCfg ps testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
       connectUsers alice bob
 
       alice ##> "/i bob"
@@ -3114,10 +3081,10 @@ testConnInvChatVRange ct1VRange ct2VRange tmp =
       bob ##> "/i alice"
       contactInfoChatVRange bob ct1VRange
 
-testConnReqChatVRange :: HasCallStack => VersionRangeChat -> VersionRangeChat -> FilePath -> IO ()
-testConnReqChatVRange ct1VRange ct2VRange tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
+testConnReqChatVRange :: HasCallStack => VersionRangeChat -> VersionRangeChat -> TestParams -> IO ()
+testConnReqChatVRange ct1VRange ct2VRange ps =
+  withNewTestChatCfg ps testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
       alice ##> "/ad"
       cLink <- getContactLink alice True
       bob ##> ("/c " <> cLink)
@@ -3134,10 +3101,10 @@ testConnReqChatVRange ct1VRange ct2VRange tmp =
       bob ##> "/i alice"
       contactInfoChatVRange bob ct1VRange
 
-testUpdatePeerChatVRange :: HasCallStack => FilePath -> IO ()
-testUpdatePeerChatVRange tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg11 "bob" bobProfile $ \bob -> do
+testUpdatePeerChatVRange :: HasCallStack => TestParams -> IO ()
+testUpdatePeerChatVRange ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg11 "bob" bobProfile $ \bob -> do
       connectUsers alice bob
 
       alice ##> "/i bob"
@@ -3146,7 +3113,7 @@ testUpdatePeerChatVRange tmp =
       bob ##> "/i alice"
       contactInfoChatVRange bob supportedChatVRange
 
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
 
       bob #> "@alice hello 1"
@@ -3158,7 +3125,7 @@ testUpdatePeerChatVRange tmp =
       bob ##> "/i alice"
       contactInfoChatVRange bob supportedChatVRange
 
-    withTestChatCfg tmp cfg11 "bob" $ \bob -> do
+    withTestChatCfg ps cfg11 "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
 
       bob #> "@alice hello 2"
@@ -3172,15 +3139,15 @@ testUpdatePeerChatVRange tmp =
   where
     cfg11 = testCfg {chatVRange = vr11} :: ChatConfig
 
-testGetNetworkStatuses :: HasCallStack => FilePath -> IO ()
-testGetNetworkStatuses tmp = do
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+testGetNetworkStatuses :: HasCallStack => TestParams -> IO ()
+testGetNetworkStatuses ps = do
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
       connectUsers alice bob
       alice ##> "/_network_statuses"
       alice <## "1 connections connected"
-  withTestChatCfg tmp cfg "alice" $ \alice ->
-    withTestChatCfg tmp cfg "bob" $ \bob -> do
+  withTestChatCfg ps cfg "alice" $ \alice ->
+    withTestChatCfg ps cfg "bob" $ \bob -> do
       alice <## "1 connections connected"
       bob <## "1 connections connected"
   where
diff --git a/tests/ChatTests/Files.hs b/tests/ChatTests/Files.hs
index 98b995e4ec..c573a1957a 100644
--- a/tests/ChatTests/Files.hs
+++ b/tests/ChatTests/Files.hs
@@ -6,6 +6,7 @@
 module ChatTests.Files where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
@@ -24,7 +25,7 @@ import Simplex.Messaging.Encoding.String
 import System.Directory (copyFile, createDirectoryIfMissing, doesFileExist, getFileSize)
 import Test.Hspec hiding (it)
 
-chatFileTests :: SpecWith FilePath
+chatFileTests :: SpecWith TestParams
 chatFileTests = do
   describe "messages with files" $ do
     it "send and receive message with file" runTestMessageWithFile
@@ -63,7 +64,7 @@ chatFileTests = do
     xit "removes sent file from server" testXFTPStandaloneCancelSnd -- no error shown in tests
     it "removes received temporary files" testXFTPStandaloneCancelRcv
 
-runTestMessageWithFile :: HasCallStack => FilePath -> IO ()
+runTestMessageWithFile :: HasCallStack => TestParams -> IO ()
 runTestMessageWithFile = testChat2 aliceProfile bobProfile $ \alice bob -> withXFTPServer $ do
   connectUsers alice bob
 
@@ -89,7 +90,7 @@ runTestMessageWithFile = testChat2 aliceProfile bobProfile $ \alice bob -> withX
   alice #$> ("/_get chat @2 count=100", chatF, chatFeaturesF <> [((1, "hi, sending a file"), Just "./tests/fixtures/test.jpg")])
   bob #$> ("/_get chat @2 count=100", chatF, chatFeaturesF <> [((0, "hi, sending a file"), Just "./tests/tmp/test.jpg")])
 
-testSendImage :: HasCallStack => FilePath -> IO ()
+testSendImage :: HasCallStack => TestParams -> IO ()
 testSendImage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -120,7 +121,7 @@ testSendImage =
       fileExists <- doesFileExist "./tests/tmp/test.jpg"
       fileExists `shouldBe` True
 
-testSenderMarkItemDeleted :: HasCallStack => FilePath -> IO ()
+testSenderMarkItemDeleted :: HasCallStack => TestParams -> IO ()
 testSenderMarkItemDeleted =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -143,7 +144,7 @@ testSenderMarkItemDeleted =
       bob ##> "/fs 1"
       bob <## "receiving file 1 (test_1MB.pdf) cancelled"
 
-testFilesFoldersSendImage :: HasCallStack => FilePath -> IO ()
+testFilesFoldersSendImage :: HasCallStack => TestParams -> IO ()
 testFilesFoldersSendImage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -175,7 +176,7 @@ testFilesFoldersSendImage =
         bob <## "alice: contact is deleted"
         alice <## "bob (Bob) deleted contact with you"
 
-testFilesFoldersImageSndDelete :: HasCallStack => FilePath -> IO ()
+testFilesFoldersImageSndDelete :: HasCallStack => TestParams -> IO ()
 testFilesFoldersImageSndDelete =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -208,7 +209,7 @@ testFilesFoldersImageSndDelete =
         bob ##> "/d alice"
         bob <## "alice: contact is deleted"
 
-testFilesFoldersImageRcvDelete :: HasCallStack => FilePath -> IO ()
+testFilesFoldersImageRcvDelete :: HasCallStack => TestParams -> IO ()
 testFilesFoldersImageRcvDelete =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -235,7 +236,7 @@ testFilesFoldersImageRcvDelete =
         bob <## "alice: contact is deleted"
         alice <## "bob (Bob) deleted contact with you"
 
-testSendImageWithTextAndQuote :: HasCallStack => FilePath -> IO ()
+testSendImageWithTextAndQuote :: HasCallStack => TestParams -> IO ()
 testSendImageWithTextAndQuote =
   testChat2 aliceProfile bobProfile $
     \alice bob -> withXFTPServer $ do
@@ -310,7 +311,7 @@ testSendImageWithTextAndQuote =
 
       B.readFile "./tests/tmp/test_1.jpg" `shouldReturn` src
 
-testGroupSendImage :: HasCallStack => FilePath -> IO ()
+testGroupSendImage :: HasCallStack => TestParams -> IO ()
 testGroupSendImage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -352,7 +353,7 @@ testGroupSendImage =
       bob #$> ("/_get chat #1 count=1", chatF, [((0, ""), Just "./tests/tmp/test.jpg")])
       cath #$> ("/_get chat #1 count=1", chatF, [((0, ""), Just "./tests/tmp/test_1.jpg")])
 
-testGroupSendImageWithTextAndQuote :: HasCallStack => FilePath -> IO ()
+testGroupSendImageWithTextAndQuote :: HasCallStack => TestParams -> IO ()
 testGroupSendImageWithTextAndQuote =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -371,9 +372,9 @@ testGroupSendImageWithTextAndQuote =
       alice <## "use /fc 1 to cancel sending"
       concurrentlyN_
         [ do
-            bob <# "#team alice> > bob hi team"
+            bob <# "#team alice!> > bob hi team"
             bob <## "      hey bob"
-            bob <# "#team alice> sends file test.jpg (136.5 KiB / 139737 bytes)"
+            bob <# "#team alice!> sends file test.jpg (136.5 KiB / 139737 bytes)"
             bob <## "use /fr 1 [<dir>/ | <path>] to receive it",
           do
             cath <# "#team alice> > bob hi team"
@@ -409,7 +410,7 @@ testGroupSendImageWithTextAndQuote =
       cath #$> ("/_get chat #1 count=2", chat'', [((0, "hi team"), Nothing, Nothing), ((0, "hey bob"), Just (0, "hi team"), Just "./tests/tmp/test_1.jpg")])
       cath @@@ [("#team", "hey bob"), ("@alice", "received invitation to join group team as admin")]
 
-testSendMultiFilesDirect :: HasCallStack => FilePath -> IO ()
+testSendMultiFilesDirect :: HasCallStack => TestParams -> IO ()
 testSendMultiFilesDirect =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -473,7 +474,7 @@ testSendMultiFilesDirect =
       alice #$> ("/_get chat @2 count=3", chatF, [((1, "message without file"), Nothing), ((1, "sending file 1"), Just "test.jpg"), ((1, "sending file 2"), Just "test.pdf")])
       bob #$> ("/_get chat @2 count=3", chatF, [((0, "message without file"), Nothing), ((0, "sending file 1"), Just "test.jpg"), ((0, "sending file 2"), Just "test.pdf")])
 
-testSendMultiFilesGroup :: HasCallStack => FilePath -> IO ()
+testSendMultiFilesGroup :: HasCallStack => TestParams -> IO ()
 testSendMultiFilesGroup =
   testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
     withXFTPServer $ do
@@ -582,7 +583,7 @@ testXFTPRoundFDCount = do
   roundedFDCount 128 `shouldBe` 128
   roundedFDCount 500 `shouldBe` 512
 
-testXFTPFileTransfer :: HasCallStack => FilePath -> IO ()
+testXFTPFileTransfer :: HasCallStack => TestParams -> IO ()
 testXFTPFileTransfer =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -611,7 +612,7 @@ testXFTPFileTransfer =
       dest <- B.readFile "./tests/tmp/test.pdf"
       dest `shouldBe` src
 
-testXFTPFileTransferEncrypted :: HasCallStack => FilePath -> IO ()
+testXFTPFileTransferEncrypted :: HasCallStack => TestParams -> IO ()
 testXFTPFileTransferEncrypted =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     src <- B.readFile "./tests/fixtures/test.pdf"
@@ -638,7 +639,7 @@ testXFTPFileTransferEncrypted =
       LB.length dest `shouldBe` fromIntegral srcLen
       LB.toStrict dest `shouldBe` src
 
-testXFTPAcceptAfterUpload :: HasCallStack => FilePath -> IO ()
+testXFTPAcceptAfterUpload :: HasCallStack => TestParams -> IO ()
 testXFTPAcceptAfterUpload =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -663,7 +664,7 @@ testXFTPAcceptAfterUpload =
       dest <- B.readFile "./tests/tmp/test.pdf"
       dest `shouldBe` src
 
-testXFTPGroupFileTransfer :: HasCallStack => FilePath -> IO ()
+testXFTPGroupFileTransfer :: HasCallStack => TestParams -> IO ()
 testXFTPGroupFileTransfer =
   testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
     withXFTPServer $ do
@@ -701,7 +702,7 @@ testXFTPGroupFileTransfer =
       dest1 `shouldBe` src
       dest2 `shouldBe` src
 
-testXFTPDeleteUploadedFile :: HasCallStack => FilePath -> IO ()
+testXFTPDeleteUploadedFile :: HasCallStack => TestParams -> IO ()
 testXFTPDeleteUploadedFile =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -722,7 +723,7 @@ testXFTPDeleteUploadedFile =
       bob ##> "/fr 1 ./tests/tmp"
       bob <## "file cancelled: test.pdf"
 
-testXFTPDeleteUploadedFileGroup :: HasCallStack => FilePath -> IO ()
+testXFTPDeleteUploadedFileGroup :: HasCallStack => TestParams -> IO ()
 testXFTPDeleteUploadedFileGroup =
   testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
     withXFTPServer $ do
@@ -774,7 +775,7 @@ testXFTPDeleteUploadedFileGroup =
       cath ##> "/fr 1 ./tests/tmp"
       cath <## "file cancelled: test.pdf"
 
-testXFTPWithRelativePaths :: HasCallStack => FilePath -> IO ()
+testXFTPWithRelativePaths :: HasCallStack => TestParams -> IO ()
 testXFTPWithRelativePaths =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -802,11 +803,11 @@ testXFTPWithRelativePaths =
       dest <- B.readFile "./tests/tmp/bob_files/test.pdf"
       dest `shouldBe` src
 
-testXFTPContinueRcv :: HasCallStack => FilePath -> IO ()
-testXFTPContinueRcv tmp = do
+testXFTPContinueRcv :: HasCallStack => TestParams -> IO ()
+testXFTPContinueRcv ps = do
   withXFTPServer $ do
-    withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-      withNewTestChat tmp "bob" bobProfile $ \bob -> do
+    withNewTestChat ps "alice" aliceProfile $ \alice -> do
+      withNewTestChat ps "bob" bobProfile $ \bob -> do
         connectUsers alice bob
 
         alice #> "/f @bob ./tests/fixtures/test.pdf"
@@ -816,7 +817,7 @@ testXFTPContinueRcv tmp = do
         alice <## "completed uploading file 1 (test.pdf) for bob"
 
   -- server is down - file is not received
-  withTestChat tmp "bob" $ \bob -> do
+  withTestChat ps "bob" $ \bob -> do
     bob <## "1 contacts connected (use /cs for the list)"
     bob ##> "/fr 1 ./tests/tmp"
     bob
@@ -831,14 +832,14 @@ testXFTPContinueRcv tmp = do
 
   withXFTPServer $ do
     -- server is up - file reception is continued
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "completed receiving file 1 (test.pdf) from alice"
       src <- B.readFile "./tests/fixtures/test.pdf"
       dest <- B.readFile "./tests/tmp/test.pdf"
       dest `shouldBe` src
 
-testXFTPMarkToReceive :: HasCallStack => FilePath -> IO ()
+testXFTPMarkToReceive :: HasCallStack => TestParams -> IO ()
 testXFTPMarkToReceive = do
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -875,11 +876,11 @@ testXFTPMarkToReceive = do
       dest <- B.readFile "./tests/tmp/bob_files/test.pdf"
       dest `shouldBe` src
 
-testXFTPRcvError :: HasCallStack => FilePath -> IO ()
-testXFTPRcvError tmp = do
+testXFTPRcvError :: HasCallStack => TestParams -> IO ()
+testXFTPRcvError ps = do
   withXFTPServer $ do
-    withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-      withNewTestChat tmp "bob" bobProfile $ \bob -> do
+    withNewTestChat ps "alice" aliceProfile $ \alice -> do
+      withNewTestChat ps "bob" bobProfile $ \bob -> do
         connectUsers alice bob
 
         alice #> "/f @bob ./tests/fixtures/test.pdf"
@@ -890,7 +891,7 @@ testXFTPRcvError tmp = do
 
   -- server is up w/t store log - file reception should fail
   withXFTPServer' xftpServerConfig {storeLogFile = Nothing} $ do
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob ##> "/fr 1 ./tests/tmp"
       bob
@@ -903,7 +904,7 @@ testXFTPRcvError tmp = do
       bob ##> "/fs 1"
       bob <## "receiving file 1 (test.pdf) error: FileErrAuth"
 
-testXFTPCancelRcvRepeat :: HasCallStack => FilePath -> IO ()
+testXFTPCancelRcvRepeat :: HasCallStack => TestParams -> IO ()
 testXFTPCancelRcvRepeat =
   testChatCfg2 cfg aliceProfile bobProfile $ \alice bob -> do
     withXFTPServer $ do
@@ -952,7 +953,7 @@ testXFTPCancelRcvRepeat =
   where
     cfg = testCfg {xftpDescrPartSize = 200}
 
-testAutoAcceptFile :: HasCallStack => FilePath -> IO ()
+testAutoAcceptFile :: HasCallStack => TestParams -> IO ()
 testAutoAcceptFile =
   testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> withXFTPServer $ do
     connectUsers alice bob
@@ -977,7 +978,7 @@ testAutoAcceptFile =
   where
     opts = (testOpts :: ChatOpts) {autoAcceptFileSize = 200000}
 
-testProhibitFiles :: HasCallStack => FilePath -> IO ()
+testProhibitFiles :: HasCallStack => TestParams -> IO ()
 testProhibitFiles =
   testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> withXFTPServer $ do
     createGroup3 "team" alice bob cath
@@ -999,7 +1000,7 @@ testProhibitFiles =
     (bob </)
     (cath </)
 
-testXFTPStandaloneSmall :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneSmall :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneSmall = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     logNote "sending"
@@ -1024,7 +1025,7 @@ testXFTPStandaloneSmall = testChat2 aliceProfile aliceDesktopProfile $ \src dst
     srcBody <- B.readFile "./tests/fixtures/logo.jpg"
     B.readFile dstFile `shouldReturn` srcBody
 
-testXFTPStandaloneSmallInfo :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneSmallInfo :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneSmallInfo = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     logNote "sending"
@@ -1054,7 +1055,7 @@ testXFTPStandaloneSmallInfo = testChat2 aliceProfile aliceDesktopProfile $ \src
     srcBody <- B.readFile "./tests/fixtures/logo.jpg"
     B.readFile dstFile `shouldReturn` srcBody
 
-testXFTPStandaloneLarge :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneLarge :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneLarge = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     xftpCLI ["rand", "./tests/tmp/testfile.in", "17mb"] `shouldReturn` ["File created: " <> "./tests/tmp/testfile.in"]
@@ -1081,7 +1082,7 @@ testXFTPStandaloneLarge = testChat2 aliceProfile aliceDesktopProfile $ \src dst
     srcBody <- B.readFile "./tests/tmp/testfile.in"
     B.readFile dstFile `shouldReturn` srcBody
 
-testXFTPStandaloneLargeInfo :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneLargeInfo :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneLargeInfo = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     xftpCLI ["rand", "./tests/tmp/testfile.in", "17mb"] `shouldReturn` ["File created: " <> "./tests/tmp/testfile.in"]
@@ -1114,7 +1115,7 @@ testXFTPStandaloneLargeInfo = testChat2 aliceProfile aliceDesktopProfile $ \src
     srcBody <- B.readFile "./tests/tmp/testfile.in"
     B.readFile dstFile `shouldReturn` srcBody
 
-testXFTPStandaloneCancelSnd :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneCancelSnd :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneCancelSnd = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     xftpCLI ["rand", "./tests/tmp/testfile.in", "17mb"] `shouldReturn` ["File created: " <> "./tests/tmp/testfile.in"]
@@ -1144,7 +1145,7 @@ testXFTPStandaloneCancelSnd = testChat2 aliceProfile aliceDesktopProfile $ \src
     dst <## "error receiving file 1 (should.not.extist)"
     dst <## "INTERNAL {internalErr = \"XFTP {xftpErr = AUTH}\"}"
 
-testXFTPStandaloneRelativePaths :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneRelativePaths :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneRelativePaths = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     logNote "sending"
@@ -1175,7 +1176,7 @@ testXFTPStandaloneRelativePaths = testChat2 aliceProfile aliceDesktopProfile $ \
     srcBody <- B.readFile "./tests/tmp/src_files/testfile.in"
     B.readFile "./tests/tmp/dst_files/testfile.out" `shouldReturn` srcBody
 
-testXFTPStandaloneCancelRcv :: HasCallStack => FilePath -> IO ()
+testXFTPStandaloneCancelRcv :: HasCallStack => TestParams -> IO ()
 testXFTPStandaloneCancelRcv = testChat2 aliceProfile aliceDesktopProfile $ \src dst -> do
   withXFTPServer $ do
     xftpCLI ["rand", "./tests/tmp/testfile.in", "17mb"] `shouldReturn` ["File created: " <> "./tests/tmp/testfile.in"]
diff --git a/tests/ChatTests/Forward.hs b/tests/ChatTests/Forward.hs
index 6a1edfe3d4..483c2269b1 100644
--- a/tests/ChatTests/Forward.hs
+++ b/tests/ChatTests/Forward.hs
@@ -4,6 +4,7 @@
 module ChatTests.Forward where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import qualified Data.ByteString.Char8 as B
@@ -14,7 +15,7 @@ import Simplex.Chat.Types (ImageData (..))
 import System.Directory (copyFile, doesFileExist, removeFile)
 import Test.Hspec hiding (it)
 
-chatForwardTests :: SpecWith FilePath
+chatForwardTests :: SpecWith TestParams
 chatForwardTests = do
   describe "forward messages" $ do
     it "from contact to contact" testForwardContactToContact
@@ -42,7 +43,7 @@ chatForwardTests = do
     it "from group to group" testForwardGroupToGroupMulti
     it "with relative paths: multiple files from contact to contact" testMultiForwardFiles
 
-testForwardContactToContact :: HasCallStack => FilePath -> IO ()
+testForwardContactToContact :: HasCallStack => TestParams -> IO ()
 testForwardContactToContact =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -88,7 +89,7 @@ testForwardContactToContact =
       alice .<## ": hey"
       alice <##. "forwarded from: @bob, chat item id:"
 
-testForwardContactToGroup :: HasCallStack => FilePath -> IO ()
+testForwardContactToGroup :: HasCallStack => TestParams -> IO ()
 testForwardContactToGroup =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -112,7 +113,7 @@ testForwardContactToGroup =
       cath <# "#team alice> -> forwarded"
       cath <## "      hey"
 
-testForwardContactToNotes :: HasCallStack => FilePath -> IO ()
+testForwardContactToNotes :: HasCallStack => TestParams -> IO ()
 testForwardContactToNotes =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -132,7 +133,7 @@ testForwardContactToNotes =
       alice <# "* <- @bob"
       alice <## "      hey"
 
-testForwardGroupToContact :: HasCallStack => FilePath -> IO ()
+testForwardGroupToContact :: HasCallStack => TestParams -> IO ()
 testForwardGroupToContact =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -156,7 +157,7 @@ testForwardGroupToContact =
       cath <# "alice> -> forwarded"
       cath <## "      hey"
 
-testForwardGroupToGroup :: HasCallStack => FilePath -> IO ()
+testForwardGroupToGroup :: HasCallStack => TestParams -> IO ()
 testForwardGroupToGroup =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -197,7 +198,7 @@ testForwardGroupToGroup =
       cath <# "#club alice> -> forwarded"
       cath <## "      hey"
 
-testForwardGroupToNotes :: HasCallStack => FilePath -> IO ()
+testForwardGroupToNotes :: HasCallStack => TestParams -> IO ()
 testForwardGroupToNotes =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -217,7 +218,7 @@ testForwardGroupToNotes =
       alice <# "* <- #team"
       alice <## "      hey"
 
-testForwardNotesToContact :: HasCallStack => FilePath -> IO ()
+testForwardNotesToContact :: HasCallStack => TestParams -> IO ()
 testForwardNotesToContact =
   testChat2 aliceProfile cathProfile $
     \alice cath -> do
@@ -230,7 +231,7 @@ testForwardNotesToContact =
       alice <# "@cath hi"
       cath <# "alice> hi"
 
-testForwardNotesToGroup :: HasCallStack => FilePath -> IO ()
+testForwardNotesToGroup :: HasCallStack => TestParams -> IO ()
 testForwardNotesToGroup =
   testChat2 aliceProfile cathProfile $
     \alice cath -> do
@@ -243,9 +244,9 @@ testForwardNotesToGroup =
       alice <# "#team hi"
       cath <# "#team alice> hi"
 
-testForwardNotesToNotes :: HasCallStack => FilePath -> IO ()
-testForwardNotesToNotes tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testForwardNotesToNotes :: HasCallStack => TestParams -> IO ()
+testForwardNotesToNotes ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
     createCCNoteFolder alice
 
     alice >* "hi"
@@ -257,7 +258,7 @@ testForwardNotesToNotes tmp =
     alice <# "* hi"
     alice <# "* hi"
 
-testForwardPreserveInfo :: HasCallStack => FilePath -> IO ()
+testForwardPreserveInfo :: HasCallStack => TestParams -> IO ()
 testForwardPreserveInfo =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -285,7 +286,7 @@ testForwardPreserveInfo =
       dan <# "#team alice> -> forwarded"
       dan <## "      hey"
 
-testForwardRcvMsgNewInfo :: HasCallStack => FilePath -> IO ()
+testForwardRcvMsgNewInfo :: HasCallStack => TestParams -> IO ()
 testForwardRcvMsgNewInfo =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -313,7 +314,7 @@ testForwardRcvMsgNewInfo =
       cath <# "alice> -> forwarded"
       cath <## "      hey"
 
-testForwardQuotedMsg :: HasCallStack => FilePath -> IO ()
+testForwardQuotedMsg :: HasCallStack => TestParams -> IO ()
 testForwardQuotedMsg =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -343,7 +344,7 @@ testForwardQuotedMsg =
       cath <# "alice> -> forwarded"
       cath <## "      hey"
 
-testForwardEditProhibited :: HasCallStack => FilePath -> IO ()
+testForwardEditProhibited :: HasCallStack => TestParams -> IO ()
 testForwardEditProhibited =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -363,7 +364,7 @@ testForwardEditProhibited =
       alice ##> ("/_update item @3 " <> msgId <> " text hey edited")
       alice <## "cannot update this item"
 
-testForwardDeleteForOther :: HasCallStack => FilePath -> IO ()
+testForwardDeleteForOther :: HasCallStack => TestParams -> IO ()
 testForwardDeleteForOther =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -384,7 +385,7 @@ testForwardDeleteForOther =
       alice <## "message marked deleted"
       cath <# "alice> [marked deleted] hey"
 
-testForwardFileNoFilesFolder :: HasCallStack => FilePath -> IO ()
+testForwardFileNoFilesFolder :: HasCallStack => TestParams -> IO ()
 testForwardFileNoFilesFolder =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -438,7 +439,7 @@ testForwardFileNoFilesFolder =
       dest2 <- B.readFile "./tests/tmp/test_1.pdf"
       dest2 `shouldBe` src
 
-testForwardFileContactToContact :: HasCallStack => FilePath -> IO ()
+testForwardFileContactToContact :: HasCallStack => TestParams -> IO ()
 testForwardFileContactToContact =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -504,7 +505,7 @@ testForwardFileContactToContact =
       fwdFileExists <- doesFileExist "./tests/tmp/bob_files/test_1.pdf"
       fwdFileExists `shouldBe` True
 
-testForwardFileGroupToNotes :: HasCallStack => FilePath -> IO ()
+testForwardFileGroupToNotes :: HasCallStack => TestParams -> IO ()
 testForwardFileGroupToNotes =
   testChat2 aliceProfile cathProfile $
     \alice cath -> withXFTPServer $ do
@@ -552,7 +553,7 @@ testForwardFileGroupToNotes =
       fwdFileExists <- doesFileExist "./tests/tmp/cath_files/test_1.pdf"
       fwdFileExists `shouldBe` True
 
-testForwardFileNotesToGroup :: HasCallStack => FilePath -> IO ()
+testForwardFileNotesToGroup :: HasCallStack => TestParams -> IO ()
 testForwardFileNotesToGroup =
   testChat2 aliceProfile cathProfile $
     \alice cath -> withXFTPServer $ do
@@ -599,7 +600,7 @@ testForwardFileNotesToGroup =
       fwdFileExists <- doesFileExist "./tests/tmp/alice_files/test_1.pdf"
       fwdFileExists `shouldBe` True
 
-testForwardContactToContactMulti :: HasCallStack => FilePath -> IO ()
+testForwardContactToContactMulti :: HasCallStack => TestParams -> IO ()
 testForwardContactToContactMulti =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -629,7 +630,7 @@ testForwardContactToContactMulti =
       cath <# "alice> -> forwarded"
       cath <## "      hey"
 
-testForwardGroupToGroupMulti :: HasCallStack => FilePath -> IO ()
+testForwardGroupToGroupMulti :: HasCallStack => TestParams -> IO ()
 testForwardGroupToGroupMulti =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -673,7 +674,7 @@ testForwardGroupToGroupMulti =
       cath <# "#club alice> -> forwarded"
       cath <## "      hey"
 
-testMultiForwardFiles :: HasCallStack => FilePath -> IO ()
+testMultiForwardFiles :: HasCallStack => TestParams -> IO ()
 testMultiForwardFiles =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs
index b9fee913d8..1cf6d0d0d6 100644
--- a/tests/ChatTests/Groups.hs
+++ b/tests/ChatTests/Groups.hs
@@ -10,42 +10,47 @@
 module ChatTests.Groups where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
 import Control.Monad (forM_, void, when)
+import Data.Bifunctor (second)
 import qualified Data.ByteString.Char8 as B
 import Data.List (intercalate, isInfixOf)
+import qualified Data.Map.Strict as M
 import qualified Data.Text as T
-import Simplex.Chat.Controller (ChatConfig (..))
-import Simplex.Chat.Messages (ChatItemId)
+import Simplex.Chat.Controller (ChatConfig (..), ChatHooks (..), defaultChatHooks)
+import Simplex.Chat.Library.Internal (uniqueMsgMentions, updatedMentionNames)
+import Simplex.Chat.Markdown (parseMaybeMarkdownList)
+import Simplex.Chat.Messages (CIMention (..), CIMentionMember (..), ChatItemId)
 import Simplex.Chat.Options
-import Simplex.Chat.Options.DB
-import Simplex.Chat.Protocol (supportedChatVRange)
-import Simplex.Chat.Types (VersionRangeChat)
-import Simplex.Chat.Types.Shared (GroupMemberRole (..))
+import Simplex.Chat.Protocol (MsgMention (..), MsgContent (..), msgContentText)
+import Simplex.Chat.Types
+import Simplex.Chat.Types.Shared (GroupMemberRole (..), GroupAcceptance (..))
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.RetryInterval
 import qualified Simplex.Messaging.Agent.Store.DB as DB
 import Simplex.Messaging.Server.Env.STM hiding (subscriptions)
 import Simplex.Messaging.Transport
+import Simplex.Messaging.Version
 import Test.Hspec hiding (it)
 #if defined(dbPostgres)
 import Database.PostgreSQL.Simple (Only (..))
 #else
 import Database.SQLite.Simple (Only (..))
+import Simplex.Chat.Options.DB
 import System.Directory (copyFile)
 import System.FilePath ((</>))
 #endif
 
-chatGroupTests :: SpecWith FilePath
+chatGroupTests :: SpecWith TestParams
 chatGroupTests = do
   describe "chat groups" $ do
     describe "add contacts, create group and send/receive messages" testGroupMatrix
+    it "add contacts, create group and send/receive messages, check messages" testGroupCheckMessages
     it "mark multiple messages as read" testMarkReadGroup
     it "initial chat pagination" testChatPaginationInitial
-    it "v1: add contacts, create group and send/receive messages" testGroup
-    it "v1: add contacts, create group and send/receive messages, check messages" testGroupCheckMessages
     it "send large message" testGroupLargeMessage
     it "create group with incognito membership" testNewGroupIncognito
     it "create and join group with 4 members" testGroup2
@@ -67,7 +72,6 @@ chatGroupTests = do
     it "group live message" testGroupLiveMessage
     it "update group profile" testUpdateGroupProfile
     it "update member role" testUpdateMemberRole
-    it "unused contacts are deleted after all their groups are deleted" testGroupDeleteUnusedContacts
     it "group description is shown as the first message to new members" testGroupDescription
     it "moderate message of another group member" testGroupModerate
     it "moderate own message (should process as deletion)" testGroupModerateOwn
@@ -75,40 +79,39 @@ chatGroupTests = do
     it "moderate message of another group member (full delete)" testGroupModerateFullDelete
     it "moderate message that arrives after the event of moderation" testGroupDelayedModeration
     it "moderate message that arrives after the event of moderation (full delete)" testGroupDelayedModerationFullDelete
+    it "remove member with messages (full deletion is enabled)" testDeleteMemberWithMessages
+    it "remove member with messages mark deleted" testDeleteMemberMarkMessagesDeleted
   describe "batch send messages" $ do
     it "send multiple messages api" testSendMulti
     it "send multiple timed messages" testSendMultiTimed
     it "send multiple messages (many chat batches)" testSendMultiManyBatches
+    xit'' "shared message body is reused" testSharedMessageBody
+    xit'' "shared batch body is reused" testSharedBatchBody
   describe "async group connections" $ do
     xit "create and join group when clients go offline" testGroupAsync
   describe "group links" $ do
     it "create group link, join via group link" testGroupLink
+    it "invitees were previously connected as contacts" testGroupLinkInviteesWereConnected
+    it "all members were previously connected as contacts" testGroupLinkAllMembersWereConnected
     it "delete group, re-join via same link" testGroupLinkDeleteGroupRejoin
-    it "sending message to contact created via group link marks it used" testGroupLinkContactUsed
-    it "create group link, join via group link - incognito membership" testGroupLinkIncognitoMembership
-    it "unused host contact is deleted after all groups with it are deleted" testGroupLinkUnusedHostContactDeleted
-    it "leaving groups with unused host contacts deletes incognito profiles" testGroupLinkIncognitoUnusedHostContactsDeleted
+    it "host incognito" testGroupLinkHostIncognito
+    it "invitee incognito" testGroupLinkInviteeIncognito
+    it "incognito - join/invite" testGroupLinkIncognitoJoinInvite
     it "group link member role" testGroupLinkMemberRole
-    it "leaving and deleting the group joined via link should NOT delete previously existing direct contacts" testGroupLinkLeaveDelete
+    it "host profile received" testGroupLinkHostProfileReceived
+    it "existing contact merged" testGroupLinkExistingContactMerged
+  describe "group links - member screening" $ do
+    it "reject member - blocked name" testGLinkRejectBlockedName
+    it "accept member - only host approval" testGLinkApproveMember
+    it "accept member - only moderators review" testGLinkReviewMember
+    it "accept member - host approval, then moderators review" testGLinkApproveThenReviewMember
+    it "delete pending approval member" testGLinkDeletePendingApprovalMember
   describe "group link connection plan" $ do
-    it "group link ok to connect; known group" testPlanGroupLinkOkKnown
-    it "group is known if host contact was deleted" testPlanHostContactDeletedGroupLinkKnown
+    it "ok to connect; known group" testPlanGroupLinkKnown
     it "own group link" testPlanGroupLinkOwn
-    it "connecting via group link" testPlanGroupLinkConnecting
+    it "group link without contact - connecting" testPlanGroupLinkConnecting
+    it "group link without contact - connecting (slow handshake)" testPlanGroupLinkConnectingSlow
     it "re-join existing group after leaving" testPlanGroupLinkLeaveRejoin
-  describe "group links without contact" $ do
-    it "join via group link without creating contact" testGroupLinkNoContact
-    it "invitees were previously connected as contacts" testGroupLinkNoContactInviteesWereConnected
-    it "all members were previously connected as contacts" testGroupLinkNoContactAllMembersWereConnected
-    it "group link member role" testGroupLinkNoContactMemberRole
-    it "host incognito" testGroupLinkNoContactHostIncognito
-    it "invitee incognito" testGroupLinkNoContactInviteeIncognito
-    it "host profile received" testGroupLinkNoContactHostProfileReceived
-    it "existing contact merged" testGroupLinkNoContactExistingContactMerged
-  describe "group links without contact connection plan" $ do
-    it "group link without contact - known group" testPlanGroupLinkNoContactKnown
-    it "group link without contact - connecting" testPlanGroupLinkNoContactConnecting
-    it "group link without contact - connecting (slow handshake)" testPlanGroupLinkNoContactConnectingSlow
 #if !defined(dbPostgres)
   -- TODO [postgres] restore from outdated db backup (same as in agent)
   describe "group message errors" $ do
@@ -122,11 +125,7 @@ chatGroupTests = do
     it "should send delivery receipts in group" testSendGroupDeliveryReceipts
     it "should send delivery receipts in group depending on configuration" testConfigureGroupDeliveryReceipts
   describe "direct connections in group are not established based on chat protocol version" $ do
-    describe "3 members group" $ do
-      testNoDirect _0 _0 True
-      testNoDirect _0 _1 True
-      testNoDirect _1 _0 False
-      testNoDirect _1 _1 False
+    it "direct contacts are not created" testNoGroupDirectConns
     it "members have different local display names in different groups" testNoDirectDifferentLDNs
   describe "merge members and contacts" $ do
     it "new member should merge with existing contact" testMergeMemberExistingContact
@@ -144,6 +143,7 @@ chatGroupTests = do
     it "re-create member contact after deletion, many groups" testRecreateMemberContactManyGroups
   describe "group message forwarding" $ do
     it "forward messages between invitee and introduced (x.msg.new)" testGroupMsgForward
+    it "forward reports to moderators, don't forward to members (x.msg.new, MCReport)" testGroupMsgForwardReport
     it "deduplicate forwarded messages" testGroupMsgForwardDeduplicate
     it "forward message edit (x.msg.update)" testGroupMsgForwardEdit
     it "forward message reaction (x.msg.react)" testGroupMsgForwardReaction
@@ -180,42 +180,36 @@ chatGroupTests = do
     it "messages are fully deleted" testBlockForAllFullDelete
     it "another admin can unblock" testBlockForAllAnotherAdminUnblocks
     it "member was blocked before joining group" testBlockForAllBeforeJoining
-    it "can't repeat block, unblock" testBlockForAllCantRepeat
+    it "repeat block, unblock" testBlockForAllRepeat
+    it "block multiple members" testBlockForAllMultipleMembers
   describe "group member inactivity" $ do
     it "mark member inactive on reaching quota" testGroupMemberInactive
   describe "group member reports" $ do
     it "should send report to group owner, admins and moderators, but not other users" testGroupMemberReports
-  where
-    _0 = supportedChatVRange -- don't create direct connections
-    _1 = groupCreateDirectVRange
-    -- having host configured with older version doesn't have effect in tests
-    -- because host uses current code and sends version in MemberInfo
-    testNoDirect vrMem2 vrMem3 noConns =
-      it
-        ( "host "
-            <> vRangeStr supportedChatVRange
-            <> (", 2nd mem " <> vRangeStr vrMem2)
-            <> (", 3rd mem " <> vRangeStr vrMem3)
-            <> (if noConns then " : 2 <!!> 3" else " : 2 <##> 3")
-        )
-        $ testNoGroupDirectConns supportedChatVRange vrMem2 vrMem3 noConns
+  describe "group member mentions" $ do
+    it "should send and edit messages with member mentions" testMemberMention
+    it "should forward and quote message updating mentioned member name" testForwardQuoteMention
+    it "should send updated mentions in history" testGroupHistoryWithMentions
+    describe "uniqueMsgMentions" testUniqueMsgMentions
+    describe "updatedMentionNames" testUpdatedMentionNames
+  describe "group scoped messages" $ do
+    it "should send scoped messages to support (single moderator)" testScopedSupportSingleModerator
+    it "should send scoped messages to support (many moderators)" testScopedSupportManyModerators
+    it "should send messages to admins and members" testSupportCLISendCommand
+    it "should correctly maintain unread stats for support chats on reading chat items" testScopedSupportUnreadStatsOnRead
+    it "should correctly maintain unread stats for support chats on deleting chat items" testScopedSupportUnreadStatsOnDelete
 
-testGroup :: HasCallStack => FilePath -> IO ()
-testGroup =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> testGroupShared alice bob cath False True
-
-testGroupCheckMessages :: HasCallStack => FilePath -> IO ()
+testGroupCheckMessages :: HasCallStack => TestParams -> IO ()
 testGroupCheckMessages =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> testGroupShared alice bob cath True True
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> testGroupShared alice bob cath True
 
-testGroupMatrix :: SpecWith FilePath
+testGroupMatrix :: SpecWith TestParams
 testGroupMatrix =
-  versionTestMatrix3 $ \alice bob cath -> testGroupShared alice bob cath False False
+  versionTestMatrix3 $ \alice bob cath -> testGroupShared alice bob cath False
 
-testGroupShared :: HasCallStack => TestCC -> TestCC -> TestCC -> Bool -> Bool -> IO ()
-testGroupShared alice bob cath checkMessages directConnections = do
+testGroupShared :: HasCallStack => TestCC -> TestCC -> TestCC -> Bool -> IO ()
+testGroupShared alice bob cath checkMessages = do
   connectUsers alice bob
   connectUsers alice cath
   alice ##> "/g team"
@@ -267,8 +261,6 @@ testGroupShared alice bob cath checkMessages directConnections = do
     (alice <# "#team cath> hey team")
     (bob <# "#team cath> hey team")
   msgItem2 <- lastItemId alice
-  when directConnections $
-    bob <##> cath
   when checkMessages $ getReadChats msgItem1 msgItem2
   -- list groups
   alice ##> "/gs"
@@ -287,7 +279,7 @@ testGroupShared alice bob cath checkMessages directConnections = do
   -- test observer role
   alice ##> "/mr team bob observer"
   concurrentlyN_
-    [ alice <## "#team: you changed the role of bob from admin to observer",
+    [ alice <## "#team: you changed the role of bob to observer",
       bob <## "#team: alice changed your role from admin to observer",
       cath <## "#team: alice changed the role of bob from admin to observer"
     ]
@@ -302,7 +294,7 @@ testGroupShared alice bob cath checkMessages directConnections = do
     ]
   alice ##> "/mr team bob admin"
   concurrentlyN_
-    [ alice <## "#team: you changed the role of bob from observer to admin",
+    [ alice <## "#team: you changed the role of bob to admin",
       bob <## "#team: alice changed your role from observer to admin",
       cath <## "#team: alice changed the role of bob from observer to admin"
     ]
@@ -324,9 +316,7 @@ testGroupShared alice bob cath checkMessages directConnections = do
     (bob <# "#team alice> hello")
     (cath </)
   cath ##> "#team hello"
-  cath <## "you are no longer a member of the group"
-  when directConnections $
-    bob <##> cath
+  cath <## "bad chat command: not current member"
   -- delete contact
   alice ##> "/d bob"
   alice <## "bob: contact is deleted"
@@ -339,7 +329,7 @@ testGroupShared alice bob cath checkMessages directConnections = do
   alice <# "#team bob> received"
   when checkMessages $ do
     alice @@@ [("@cath", "sent invitation to join group team as admin"), ("#team", "received")]
-    bob @@@ [("@alice", "contact deleted"), ("@cath", "hey"), ("#team", "received")]
+    bob @@@ [("@alice", "contact deleted"), ("#team", "received")]
   -- test clearing chat
   threadDelay 1000000
   alice #$> ("/clear #team", id, "#team: all messages are removed locally ONLY")
@@ -359,9 +349,9 @@ testGroupShared alice bob cath checkMessages directConnections = do
       alice #$> ("/_get chat #1 before=" <> msgItem2 <> " count=100", chat, sndGroupFeatures <> [(0, "connected"), (0, "connected"), (1, "hello"), (0, "hi there")])
       alice #$> ("/_get chat #1 around=" <> msgItem1 <> " count=2", chat, [(0, "connected"), (0, "connected"), (1, "hello"), (0, "hi there"), (0, "hey team")])
       alice #$> ("/_get chat #1 count=100 search=team", chat, [(0, "hey team")])
-      bob @@@ [("@cath", "hey"), ("#team", "hey team"), ("@alice", "received invitation to join group team as admin")]
+      bob @@@ [("#team", "hey team"), ("@alice", "received invitation to join group team as admin")]
       bob #$> ("/_get chat #1 count=100", chat, groupFeatures <> [(0, "connected"), (0, "added cath (Catherine)"), (0, "connected"), (0, "hello"), (1, "hi there"), (0, "hey team")])
-      cath @@@ [("@bob", "hey"), ("#team", "hey team"), ("@alice", "received invitation to join group team as admin")]
+      cath @@@ [("#team", "hey team"), ("@alice", "received invitation to join group team as admin")]
       cath #$> ("/_get chat #1 count=100", chat, groupFeatures <> [(0, "connected"), (0, "connected"), (0, "hello"), (0, "hi there"), (1, "hey team")])
       alice #$> ("/_read chat #1", id, "ok")
       bob #$> ("/_read chat #1", id, "ok")
@@ -369,7 +359,7 @@ testGroupShared alice bob cath checkMessages directConnections = do
       alice #$> ("/_unread chat #1 on", id, "ok")
       alice #$> ("/_unread chat #1 off", id, "ok")
 
-testMarkReadGroup :: HasCallStack => FilePath -> IO ()
+testMarkReadGroup :: HasCallStack => TestParams -> IO ()
 testMarkReadGroup = testChat2 aliceProfile bobProfile $ \alice bob -> do
   createGroup2 "team" alice bob
   alice #> "#team 1"
@@ -383,9 +373,9 @@ testMarkReadGroup = testChat2 aliceProfile bobProfile $ \alice bob -> do
   bob ##> "/last_item_id"
   i :: ChatItemId <- read <$> getTermLine bob
   let itemIds = intercalate "," $ map show [i - 3 .. i]
-  bob #$> ("/_read chat items #1 " <> itemIds, id, "ok")
+  bob #$> ("/_read chat items #1 " <> itemIds, id, "items read for chat")
 
-testChatPaginationInitial :: HasCallStack => FilePath -> IO ()
+testChatPaginationInitial :: HasCallStack => TestParams -> IO ()
 testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> do
   createGroup2 "team" alice bob
   -- Wait, otherwise ids are going to be wrong.
@@ -404,7 +394,7 @@ testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice
 
   -- Read next 2 items
   let itemIds = intercalate "," $ map groupItemId [1 .. 2]
-  bob #$> ("/_read chat items #1 " <> itemIds, id, "ok")
+  bob #$> ("/_read chat items #1 " <> itemIds, id, "items read for chat")
   bob #$> ("/_get chat #1 initial=2", chat, [(0, "1"), (0, "2"), (0, "3"), (0, "4"), (0, "5")])
 
   -- Read all items
@@ -417,7 +407,7 @@ testChatPaginationInitial = testChatOpts2 opts aliceProfile bobProfile $ \alice
         { markRead = False
         }
 
-testGroupLargeMessage :: HasCallStack => FilePath -> IO ()
+testGroupLargeMessage :: HasCallStack => TestParams -> IO ()
 testGroupLargeMessage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -431,9 +421,9 @@ testGroupLargeMessage =
       bob <## "alice updated group #team:"
       bob <## "profile image updated"
 
-testNewGroupIncognito :: HasCallStack => FilePath -> IO ()
+testNewGroupIncognito :: HasCallStack => TestParams -> IO ()
 testNewGroupIncognito =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
+  testChat2 aliceProfile bobProfile $
     \alice bob -> do
       connectUsers alice bob
 
@@ -452,22 +442,35 @@ testNewGroupIncognito =
       bob ##> ("/c " <> gLink)
       bob <## "connection request sent!"
       alice <## "bob_1 (Bob): accepting request to join group #team..."
-      _ <- getTermLine alice
       concurrentlyN_
-        [ do
-            alice <## ("bob_1 (Bob): contact is connected, your incognito profile for this contact is " <> aliceIncognito)
-            alice <## "use /i bob_1 to print out this incognito profile again"
-            alice <## "bob_1 invited to group #team via your group link"
-            alice <## "#team: bob_1 joined the group",
+        [ alice <## "#team: bob_1 joined the group",
           do
-            bob <## (aliceIncognito <> ": contact is connected")
+            bob <## "#team: joining the group..."
             bob <## "#team: you joined the group"
         ]
 
       alice <##> bob
 
-      alice ?#> "@bob_1 hi, I'm incognito"
-      bob <# (aliceIncognito <> "> hi, I'm incognito")
+      alice ##> "@#team bob_1 hi, I'm incognito"
+      alice
+        <### [ "member #team bob_1 does not have direct connection, creating",
+                "contact for member #team bob_1 is created",
+                "sent invitation to connect directly to member #team bob_1",
+                WithTime "i @bob_1 hi, I'm incognito"
+              ]
+      bob
+        <### [ ConsoleString ("#team " <> aliceIncognito <> " is creating direct contact " <> aliceIncognito <> " with you"),
+                WithTime (aliceIncognito <> "> hi, I'm incognito")
+              ]
+      bob <## (aliceIncognito <> ": you can send messages to contact")
+      _ <- getTermLine alice
+      concurrentlyN_
+        [ do
+            alice <## ("bob_1 (Bob): contact is connected, your incognito profile for this contact is " <> aliceIncognito)
+            alice <## "use /i bob_1 to print out this incognito profile again",
+          bob <## (aliceIncognito <> ": contact is connected")
+        ]
+
       bob #> ("@" <> aliceIncognito <> " hey, I'm bob")
       alice ?<# "bob_1> hey, I'm bob"
 
@@ -481,9 +484,9 @@ testNewGroupIncognito =
       bob ##> "/gs"
       bob <## "#team (2 members)"
 
-testGroup2 :: HasCallStack => FilePath -> IO ()
+testGroup2 :: HasCallStack => TestParams -> IO ()
 testGroup2 =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       connectUsers alice bob
       connectUsers alice cath
@@ -534,14 +537,14 @@ testGroup2 =
             dan <## "#club: you joined the group"
             dan
               <### [ "#club: member alice_1 (Alice) is connected",
-                     "contact alice_1 is merged into alice",
+                     "contact and member are merged: alice, #club alice_1",
                      "use @alice <message> to send messages",
                      "#club: member cath (Catherine) is connected"
                    ],
           do
             alice <## "#club: bob added dan_1 (Daniel) to the group (connecting...)"
             alice <## "#club: new member dan_1 is connected"
-            alice <## "contact dan_1 is merged into dan"
+            alice <## "contact and member are merged: dan, #club dan_1"
             alice <## "use @dan <message> to send messages",
           do
             cath <## "#club: bob added dan (Daniel) to the group (connecting...)"
@@ -571,11 +574,9 @@ testGroup2 =
           bob <# "#club dan> how is it going?",
           cath <# "#club dan> how is it going?"
         ]
-      bob <##> cath
-      dan <##> cath
       dan <##> alice
       -- show last messages
-      alice ##> "/t #club 17"
+      alice ##> "/t #club 19"
       alice -- these strings are expected in any order because of sorting by time and rounding of time for sent
         <##?
           ( map (ConsoleString . ("#club " <> )) groupFeatureStrs
@@ -652,10 +653,9 @@ testGroup2 =
           (dan </)
         ]
       dan ##> "#club how is it going?"
-      dan <## "you are no longer a member of the group"
+      dan <## "bad chat command: not current member"
       dan ##> "/d #club"
       dan <## "#club: you deleted the group"
-      dan <##> cath
       dan <##> alice
       -- member leaves
       bob ##> "/l club"
@@ -675,13 +675,12 @@ testGroup2 =
         (alice <# "#club cath> hey")
         (bob </)
       bob ##> "#club how is it going?"
-      bob <## "you are no longer a member of the group"
+      bob <## "bad chat command: not current member"
       bob ##> "/d #club"
       bob <## "#club: you deleted the group"
-      bob <##> cath
       bob <##> alice
 
-testGroupDelete :: HasCallStack => FilePath -> IO ()
+testGroupDelete :: HasCallStack => TestParams -> IO ()
 testGroupDelete =
   testChatCfg3 cfg aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -701,7 +700,7 @@ testGroupDelete =
       bob ##> "/d #team"
       bob <## "#team: you deleted the group"
       cath ##> "#team hi"
-      cath <## "you are no longer a member of the group"
+      cath <## "bad chat command: not current member"
       cath ##> "/d #team"
       cath <## "#team: you deleted the group"
       alice <##> bob
@@ -717,7 +716,7 @@ testGroupDelete =
   where
     cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
 
-testGroupSameName :: HasCallStack => FilePath -> IO ()
+testGroupSameName :: HasCallStack => TestParams -> IO ()
 testGroupSameName =
   testChat2 aliceProfile bobProfile $
     \alice _ -> do
@@ -729,7 +728,7 @@ testGroupSameName =
       alice <## "group #team_1 is created"
       alice <## "to add members use /a team_1 <name> or /create link #team_1"
 
-testGroupDeleteWhenInvited :: HasCallStack => FilePath -> IO ()
+testGroupDeleteWhenInvited :: HasCallStack => TestParams -> IO ()
 testGroupDeleteWhenInvited =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -756,7 +755,7 @@ testGroupDeleteWhenInvited =
             bob <## "use /j team to accept"
         ]
 
-testGroupReAddInvited :: HasCallStack => FilePath -> IO ()
+testGroupReAddInvited :: HasCallStack => TestParams -> IO ()
 testGroupReAddInvited =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -791,7 +790,7 @@ testGroupReAddInvited =
             bob <## "use /j team_1 to accept"
         ]
 
-testGroupReAddInvitedChangeRole :: HasCallStack => FilePath -> IO ()
+testGroupReAddInvitedChangeRole :: HasCallStack => TestParams -> IO ()
 testGroupReAddInvitedChangeRole =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -831,7 +830,7 @@ testGroupReAddInvitedChangeRole =
       alice ##> "/d #team"
       alice <## "#team: you deleted the group"
 
-testGroupDeleteInvitedContact :: HasCallStack => FilePath -> IO ()
+testGroupDeleteInvitedContact :: HasCallStack => TestParams -> IO ()
 testGroupDeleteInvitedContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -876,7 +875,7 @@ testGroupDeleteInvitedContact =
         (bob <## "alice (Alice): contact is connected")
       alice <##> bob
 
-testDeleteGroupMemberProfileKept :: HasCallStack => FilePath -> IO ()
+testDeleteGroupMemberProfileKept :: HasCallStack => TestParams -> IO ()
 testDeleteGroupMemberProfileKept =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -946,9 +945,9 @@ testDeleteGroupMemberProfileKept =
       bob #> "#club received"
       alice <# "#club bob> received"
 
-testGroupRemoveAdd :: HasCallStack => FilePath -> IO ()
+testGroupRemoveAdd :: HasCallStack => TestParams -> IO ()
 testGroupRemoveAdd =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
 
@@ -975,14 +974,10 @@ testGroupRemoveAdd =
         [ alice <## "#team: bob joined the group",
           do
             bob <## "#team_1: you joined the group"
-            bob <## "#team_1: member cath_1 (Catherine) is connected"
-            bob <## "contact cath_1 is merged into cath"
-            bob <## "use @cath <message> to send messages",
+            bob <## "#team_1: member cath_1 (Catherine) is connected",
           do
             cath <## "#team: alice added bob_1 (Bob) to the group (connecting...)"
             cath <## "#team: new member bob_1 is connected"
-            cath <## "contact bob_1 is merged into bob"
-            cath <## "use @bob <message> to send messages"
         ]
       alice #> "#team hi"
       concurrently_
@@ -991,13 +986,13 @@ testGroupRemoveAdd =
       bob #> "#team_1 hey"
       concurrently_
         (alice <# "#team bob> hey")
-        (cath <# "#team bob> hey")
+        (cath <# "#team bob_1> hey")
       cath #> "#team hello"
       concurrently_
         (alice <# "#team cath> hello")
-        (bob <# "#team_1 cath> hello")
+        (bob <# "#team_1 cath_1> hello")
 
-testGroupList :: HasCallStack => FilePath -> IO ()
+testGroupList :: HasCallStack => TestParams -> IO ()
 testGroupList =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1027,9 +1022,9 @@ testGroupList =
       bob ##> "/gs"
       bob <## "#team (2 members)"
 
-testGroupMessageQuotedReply :: HasCallStack => FilePath -> IO ()
+testGroupMessageQuotedReply :: HasCallStack => TestParams -> IO ()
 testGroupMessageQuotedReply =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       threadDelay 1000000
@@ -1043,7 +1038,7 @@ testGroupMessageQuotedReply =
       bob <## "      hello, all good, you?"
       concurrently_
         ( do
-            alice <# "#team bob> > alice hello! how are you?"
+            alice <# "#team bob!> > alice hello! how are you?"
             alice <## "      hello, all good, you?"
         )
         ( do
@@ -1078,7 +1073,7 @@ testGroupMessageQuotedReply =
             alice <## "      hi there!"
         )
         ( do
-            bob <# "#team cath> > bob hello, all good, you?"
+            bob <# "#team cath!> > bob hello, all good, you?"
             bob <## "      hi there!"
         )
       cath #$> ("/_get chat #1 count=1", chat', [((1, "hi there!"), Just (0, "hello, all good, you?"))])
@@ -1089,7 +1084,7 @@ testGroupMessageQuotedReply =
       alice <## "      go on"
       concurrently_
         ( do
-            bob <# "#team alice> > bob will tell more"
+            bob <# "#team alice!> > bob will tell more"
             bob <## "      go on"
         )
         ( do
@@ -1097,7 +1092,7 @@ testGroupMessageQuotedReply =
             cath <## "      go on"
         )
 
-testGroupMessageUpdate :: HasCallStack => FilePath -> IO ()
+testGroupMessageUpdate :: HasCallStack => TestParams -> IO ()
 testGroupMessageUpdate =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1130,7 +1125,7 @@ testGroupMessageUpdate =
       bob <## "      hi alice"
       concurrently_
         ( do
-            alice <# "#team bob> > alice hey 👋"
+            alice <# "#team bob!> > alice hey 👋"
             alice <## "      hi alice"
         )
         ( do
@@ -1157,7 +1152,7 @@ testGroupMessageUpdate =
       cath <## "      greetings!"
       concurrently_
         ( do
-            alice <# "#team cath> > alice greetings 🤝"
+            alice <# "#team cath!> > alice greetings 🤝"
             alice <## "      greetings!"
         )
         ( do
@@ -1169,7 +1164,7 @@ testGroupMessageUpdate =
       bob #$> ("/_get chat #1 count=3", chat', [((0, "greetings 🤝"), Nothing), ((1, "hi alice"), Just (0, "hey 👋")), ((0, "greetings!"), Just (0, "greetings 🤝"))])
       cath #$> ("/_get chat #1 count=3", chat', [((0, "greetings 🤝"), Nothing), ((0, "hi alice"), Just (0, "hey 👋")), ((1, "greetings!"), Just (0, "greetings 🤝"))])
 
-testGroupMessageEditHistory :: HasCallStack => FilePath -> IO ()
+testGroupMessageEditHistory :: HasCallStack => TestParams -> IO ()
 testGroupMessageEditHistory =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1243,11 +1238,12 @@ testGroupMessageEditHistory =
       bob <## "message history:"
       bob .<## ": hey there"
 
-testGroupMessageDelete :: HasCallStack => FilePath -> IO ()
+testGroupMessageDelete :: HasCallStack => TestParams -> IO ()
 testGroupMessageDelete =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
       threadDelay 1000000
       -- alice, bob: msg id 5, cath: msg id 4 (after group invitations & group events)
       alice #> "#team hello!"
@@ -1259,7 +1255,7 @@ testGroupMessageDelete =
       msgItemId1 <- lastItemId alice
       alice #$> ("/_delete item #1 " <> msgItemId1 <> " internal", id, "message deleted")
 
-      alice #$> ("/_get chat #1 count=1", chat, [(0, "connected")])
+      alice #$> ("/_get chat #1 count=2", chat, [(0, "connected"), (0, "connected")])
       bob #$> ("/_get chat #1 count=1", chat, [(0, "hello!")])
       cath #$> ("/_get chat #1 count=1", chat, [(0, "hello!")])
 
@@ -1270,7 +1266,7 @@ testGroupMessageDelete =
       bob <## "      hi alic"
       concurrently_
         ( do
-            alice <# "#team bob> > alice hello!"
+            alice <# "#team bob!> > alice hello!"
             alice <## "      hi alic"
         )
         ( do
@@ -1285,7 +1281,7 @@ testGroupMessageDelete =
       msgItemId2 <- lastItemId alice
       alice #$> ("/_delete item #1 " <> msgItemId2 <> " internal", id, "message deleted")
 
-      alice #$> ("/_get chat #1 count=1", chat', [((0, "connected"), Nothing)])
+      alice #$> ("/_get chat #1 count=2", chat', [((0, "connected"), Nothing), ((0, "connected"), Nothing)])
       bob #$> ("/_get chat #1 count=2", chat', [((0, "hello!"), Nothing), ((1, "hi alic"), Just (0, "hello!"))])
       cath #$> ("/_get chat #1 count=2", chat', [((0, "hello!"), Nothing), ((0, "hi alic"), Just (0, "hello!"))])
 
@@ -1327,11 +1323,12 @@ testGroupMessageDelete =
       bob #$> ("/_get chat #1 count=3", chat', [((0, "hello!"), Nothing), ((1, "hi alice"), Just (0, "hello!")), ((0, "how are you? [marked deleted]"), Nothing)])
       cath #$> ("/_get chat #1 count=3", chat', [((0, "hello!"), Nothing), ((0, "hi alice"), Just (0, "hello!")), ((1, "how are you? [marked deleted]"), Nothing)])
 
-testGroupMessageDeleteMultiple :: HasCallStack => FilePath -> IO ()
+testGroupMessageDeleteMultiple :: HasCallStack => TestParams -> IO ()
 testGroupMessageDeleteMultiple =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       threadDelay 1000000
       alice #> "#team hello"
@@ -1363,11 +1360,12 @@ testGroupMessageDeleteMultiple =
       bob #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted]"), (0, "hey [marked deleted]")])
       cath #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted]"), (0, "hey [marked deleted]")])
 
-testGroupMessageDeleteMultipleManyBatches :: HasCallStack => FilePath -> IO ()
+testGroupMessageDeleteMultipleManyBatches :: HasCallStack => TestParams -> IO ()
 testGroupMessageDeleteMultipleManyBatches =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       bob ##> "/set receipts all off"
       bob <## "ok"
@@ -1401,7 +1399,7 @@ testGroupMessageDeleteMultipleManyBatches =
           (bob <# ("#team alice> [marked deleted] message " <> show i))
           (cath <# ("#team alice> [marked deleted] message " <> show i))
 
-testGroupLiveMessage :: HasCallStack => FilePath -> IO ()
+testGroupLiveMessage :: HasCallStack => TestParams -> IO ()
 testGroupLiveMessage =
   testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
     createGroup3 "team" alice bob cath
@@ -1439,7 +1437,7 @@ testGroupLiveMessage =
     bob .<## ": hello 2"
     bob .<## ":"
 
-testUpdateGroupProfile :: HasCallStack => FilePath -> IO ()
+testUpdateGroupProfile :: HasCallStack => TestParams -> IO ()
 testUpdateGroupProfile =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1466,7 +1464,7 @@ testUpdateGroupProfile =
         (alice <# "#my_team bob> hi")
         (cath <# "#my_team bob> hi")
 
-testUpdateMemberRole :: HasCallStack => FilePath -> IO ()
+testUpdateMemberRole :: HasCallStack => TestParams -> IO ()
 testUpdateMemberRole =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1476,7 +1474,7 @@ testUpdateMemberRole =
       alice <## "to add members use /a team <name> or /create link #team"
       addMember "team" alice bob GRAdmin
       alice ##> "/mr team bob member"
-      alice <## "#team: you changed the role of bob from admin to member"
+      alice <## "#team: you changed the role of bob to member"
       bob <## "#team: alice invites you to join the group as member"
       bob <## "use /j team to accept"
       bob ##> "/j team"
@@ -1488,7 +1486,7 @@ testUpdateMemberRole =
       bob <## "#team: you have insufficient permissions for this action, the required role is admin"
       alice ##> "/mr team bob admin"
       concurrently_
-        (alice <## "#team: you changed the role of bob from member to admin")
+        (alice <## "#team: you changed the role of bob to admin")
         (bob <## "#team: alice changed your role from member to admin")
       bob ##> "/a team cath owner"
       bob <## "#team: you have insufficient permissions for this action, the required role is owner"
@@ -1504,107 +1502,17 @@ testUpdateMemberRole =
             alice <## "#team: new member cath is connected"
         ]
       alice ##> "/mr team alice admin"
-      concurrentlyN_
-        [ alice <## "#team: you changed your role from owner to admin",
-          bob <## "#team: alice changed the role from owner to admin",
-          cath <## "#team: alice changed the role from owner to admin"
-        ]
-      alice ##> "/d #team"
-      alice <## "#team: you have insufficient permissions for this action, the required role is owner"
+      alice <## "bad chat command: can't change role for self"
 
-testGroupDeleteUnusedContacts :: HasCallStack => FilePath -> IO ()
-testGroupDeleteUnusedContacts =
-  testChatCfg3 cfg aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      -- create group 1
-      createGroup3 "team" alice bob cath
-      -- create group 2
-      alice ##> "/g club"
-      alice <## "group #club is created"
-      alice <## "to add members use /a club <name> or /create link #club"
-      alice ##> "/a club bob"
-      concurrentlyN_
-        [ alice <## "invitation to join the group #club sent to bob",
-          do
-            bob <## "#club: alice invites you to join the group as member"
-            bob <## "use /j club to accept"
-        ]
-      bob ##> "/j club"
-      concurrently_
-        (alice <## "#club: bob joined the group")
-        (bob <## "#club: you joined the group")
-      alice ##> "/a club cath"
-      concurrentlyN_
-        [ alice <## "invitation to join the group #club sent to cath",
-          do
-            cath <## "#club: alice invites you to join the group as member"
-            cath <## "use /j club to accept"
-        ]
-      cath ##> "/j club"
-      concurrentlyN_
-        [ alice <## "#club: cath joined the group",
-          do
-            cath <## "#club: you joined the group"
-            cath <## "#club: member bob_1 (Bob) is connected"
-            cath <## "contact bob_1 is merged into bob"
-            cath <## "use @bob <message> to send messages",
-          do
-            bob <## "#club: alice added cath_1 (Catherine) to the group (connecting...)"
-            bob <## "#club: new member cath_1 is connected"
-            bob <## "contact cath_1 is merged into cath"
-            bob <## "use @cath <message> to send messages"
-        ]
-      -- list contacts
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob <## "cath (Catherine)"
-      cath ##> "/contacts"
-      cath <## "alice (Alice)"
-      cath <## "bob (Bob)"
-      -- delete group 1, contacts and profiles are kept
-      deleteGroup alice bob cath "team"
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob <## "cath (Catherine)"
-      bob `hasContactProfiles` ["alice", "bob", "cath"]
-      cath ##> "/contacts"
-      cath <## "alice (Alice)"
-      cath <## "bob (Bob)"
-      cath `hasContactProfiles` ["alice", "bob", "cath"]
-      -- delete group 2, unused contacts and profiles are deleted
-      deleteGroup alice bob cath "club"
-      threadDelay 3000000
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob `hasContactProfiles` ["alice", "bob"]
-      cath ##> "/contacts"
-      cath <## "alice (Alice)"
-      cath `hasContactProfiles` ["alice", "cath"]
-  where
-    cfg = mkCfgCreateGroupDirect $ testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
-    deleteGroup :: HasCallStack => TestCC -> TestCC -> TestCC -> String -> IO ()
-    deleteGroup alice bob cath group = do
-      alice ##> ("/d #" <> group)
-      concurrentlyN_
-        [ alice <## ("#" <> group <> ": you deleted the group"),
-          do
-            bob <## ("#" <> group <> ": alice deleted the group")
-            bob <## ("use /d #" <> group <> " to delete the local copy of the group"),
-          do
-            cath <## ("#" <> group <> ": alice deleted the group")
-            cath <## ("use /d #" <> group <> " to delete the local copy of the group")
-        ]
-      bob ##> ("/d #" <> group)
-      bob <## ("#" <> group <> ": you deleted the group")
-      cath ##> ("/d #" <> group)
-      cath <## ("#" <> group <> ": you deleted the group")
-
-testGroupDescription :: HasCallStack => FilePath -> IO ()
+testGroupDescription :: HasCallStack => TestParams -> IO ()
 testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
   connectUsers alice bob
   alice ##> "/g team"
   alice <## "group #team is created"
   alice <## "to add members use /a team <name> or /create link #team"
+  -- alice ##> "/set delete #team off"
+  -- alice <## "updated group preferences:"
+  -- alice <## "Full deletion: off"
   addMember "team" alice bob GRAdmin
   bob ##> "/j team"
   concurrentlyN_
@@ -1613,7 +1521,7 @@ testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile
     ]
   alice ##> "/group_profile team"
   alice <## "#team"
-  groupInfo alice
+  groupInfo' alice
   alice ##> "/group_descr team Welcome to the team!"
   alice <## "description changed to:"
   alice <## "Welcome to the team!"
@@ -1624,7 +1532,7 @@ testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile
   alice <## "#team"
   alice <## "description:"
   alice <## "Welcome to the team!"
-  groupInfo alice
+  groupInfo' alice
   connectUsers alice cath
   addMember "team" alice cath GRMember
   cath ##> "/j team"
@@ -1654,8 +1562,8 @@ testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile
       bobAddedDan cath
     ]
   where
-    groupInfo :: HasCallStack => TestCC -> IO ()
-    groupInfo alice = do
+    groupInfo' :: HasCallStack => TestCC -> IO ()
+    groupInfo' alice = do
       alice <## "group preferences:"
       alice <## "Disappearing messages: off"
       alice <## "Direct messages: on"
@@ -1664,20 +1572,22 @@ testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile
       alice <## "Voice messages: on"
       alice <## "Files and media: on"
       alice <## "SimpleX links: on"
+      alice <## "Member reports: on"
       alice <## "Recent history: on"
     bobAddedDan :: HasCallStack => TestCC -> IO ()
     bobAddedDan cc = do
       cc <## "#team: bob added dan (Daniel) to the group (connecting...)"
       cc <## "#team: new member dan is connected"
 
-testGroupModerate :: HasCallStack => FilePath -> IO ()
+testGroupModerate :: HasCallStack => TestParams -> IO ()
 testGroupModerate =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
       alice ##> "/mr team cath member"
       concurrentlyN_
-        [ alice <## "#team: you changed the role of cath from admin to member",
+        [ alice <## "#team: you changed the role of cath to member",
           bob <## "#team: alice changed the role of cath from admin to member",
           cath <## "#team: alice changed your role from admin to member"
         ]
@@ -1701,11 +1611,12 @@ testGroupModerate =
       bob #$> ("/_get chat #1 count=1", chat, [(0, "hi [marked deleted by you]")])
       cath #$> ("/_get chat #1 count=1", chat, [(1, "hi [marked deleted by bob]")])
 
-testGroupModerateOwn :: HasCallStack => FilePath -> IO ()
+testGroupModerateOwn :: HasCallStack => TestParams -> IO ()
 testGroupModerateOwn =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       createGroup2 "team" alice bob
+      -- disableFullDeletion2 "team" alice bob
       threadDelay 1000000
       alice #> "#team hello"
       bob <# "#team alice> hello"
@@ -1715,11 +1626,12 @@ testGroupModerateOwn =
       alice #$> ("/_get chat #1 count=1", chat, [(1, "hello [marked deleted by you]")])
       bob #$> ("/_get chat #1 count=1", chat, [(0, "hello [marked deleted by alice]")])
 
-testGroupModerateMultiple :: HasCallStack => FilePath -> IO ()
+testGroupModerateMultiple :: HasCallStack => TestParams -> IO ()
 testGroupModerateMultiple =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       threadDelay 1000000
       alice #> "#team hello"
@@ -1750,14 +1662,15 @@ testGroupModerateMultiple =
       bob #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted by alice]"), (1, "hey [marked deleted by alice]")])
       cath #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted by alice]"), (0, "hey [marked deleted by alice]")])
 
-testGroupModerateFullDelete :: HasCallStack => FilePath -> IO ()
+testGroupModerateFullDelete :: HasCallStack => TestParams -> IO ()
 testGroupModerateFullDelete =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
       alice ##> "/mr team cath member"
       concurrentlyN_
-        [ alice <## "#team: you changed the role of cath from admin to member",
+        [ alice <## "#team: you changed the role of cath to member",
           bob <## "#team: alice changed the role of cath from admin to member",
           cath <## "#team: alice changed your role from admin to member"
         ]
@@ -1788,12 +1701,13 @@ testGroupModerateFullDelete =
       bob #$> ("/_get chat #1 count=1", chat, [(0, "moderated [deleted by you]")])
       cath #$> ("/_get chat #1 count=1", chat, [(1, "moderated [deleted by bob]")])
 
-testGroupDelayedModeration :: HasCallStack => FilePath -> IO ()
-testGroupDelayedModeration tmp = do
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+testGroupDelayedModeration :: HasCallStack => TestParams -> IO ()
+testGroupDelayedModeration ps = do
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
-    withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+      -- disableFullDeletion2 "team" alice bob
+    withNewTestChatCfg ps cfg "cath" cathProfile $ \cath -> do
       connectUsers alice cath
       addMember "team" alice cath GRMember
       cath ##> "/j team"
@@ -1814,12 +1728,12 @@ testGroupDelayedModeration tmp = do
       alice ##> "\\\\ #team @cath hi"
       alice <## "message marked deleted by you"
       cath <# "#team cath> [marked deleted by alice] hi"
-    withTestChatCfg tmp cfg "bob" $ \bob -> do
+    withTestChatCfg ps cfg "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
-      withTestChatCfg tmp cfg "cath" $ \cath -> do
-        cath <## "2 contacts connected (use /cs for the list)"
+      withTestChatCfg ps cfg "cath" $ \cath -> do
+        cath <## "1 contacts connected (use /cs for the list)"
         cath <## "#team: connected to server(s)"
         cath <## "#team: member bob (Bob) is connected"
         bob
@@ -1832,14 +1746,16 @@ testGroupDelayedModeration tmp = do
         r <- chat <$> getTermLine bob
         r `shouldMatchList` [(0, "connected"), (0, "hi [marked deleted by alice]")]
   where
-    cfg = testCfgCreateGroupDirect
+    -- version before forwarding, so cath doesn't expect alice to forward messages (groupForwardVersion = 4)
+    cfg = testCfg {chatVRange = mkVersionRange (VersionChat 1) (VersionChat 3)}
 
-testGroupDelayedModerationFullDelete :: HasCallStack => FilePath -> IO ()
-testGroupDelayedModerationFullDelete tmp = do
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+testGroupDelayedModerationFullDelete :: HasCallStack => TestParams -> IO ()
+testGroupDelayedModerationFullDelete ps = do
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
-    withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+      -- disableFullDeletion2 "team" alice bob
+    withNewTestChatCfg ps cfg "cath" cathProfile $ \cath -> do
       connectUsers alice cath
       addMember "team" alice cath GRMember
       cath ##> "/j team"
@@ -1868,15 +1784,15 @@ testGroupDelayedModerationFullDelete tmp = do
       cath <## "alice updated group #team:"
       cath <## "updated group preferences:"
       cath <## "Full deletion: on"
-    withTestChatCfg tmp cfg "bob" $ \bob -> do
+    withTestChatCfg ps cfg "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
       bob <## "alice updated group #team:"
       bob <## "updated group preferences:"
       bob <## "Full deletion: on"
-      withTestChatCfg tmp cfg "cath" $ \cath -> do
-        cath <## "2 contacts connected (use /cs for the list)"
+      withTestChatCfg ps cfg "cath" $ \cath -> do
+        cath <## "1 contacts connected (use /cs for the list)"
         cath <## "#team: connected to server(s)"
         cath <## "#team: member bob (Bob) is connected"
         bob
@@ -1889,9 +1805,71 @@ testGroupDelayedModerationFullDelete tmp = do
         r <- chat <$> getTermLine bob
         r `shouldMatchList` [(0, "Full deletion: on"), (0, "connected"), (0, "moderated [deleted by alice]")]
   where
-    cfg = testCfgCreateGroupDirect
+    -- version before forwarding, so cath doesn't expect alice to forward messages (groupForwardVersion = 4)
+    cfg = testCfg {chatVRange = mkVersionRange (VersionChat 1) (VersionChat 3)}
 
-testSendMulti :: HasCallStack => FilePath -> IO ()
+testDeleteMemberWithMessages :: HasCallStack => TestParams -> IO ()
+testDeleteMemberWithMessages =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      threadDelay 750000
+      alice ##> "/set delete #team on"
+      alice <## "updated group preferences:"
+      alice <## "Full deletion: on"
+      threadDelay 750000
+      concurrentlyN_
+        [ do
+            bob <## "alice updated group #team:"
+            bob <## "updated group preferences:"
+            bob <## "Full deletion: on",
+          do
+            cath <## "alice updated group #team:"
+            cath <## "updated group preferences:"
+            cath <## "Full deletion: on"            
+        ]
+      threadDelay 750000
+      bob #> "#team hello"
+      concurrently_
+        (alice <# "#team bob> hello")
+        (cath <# "#team bob> hello")
+      alice #$> ("/_get chat #1 count=1", chat, [(0, "hello")])
+      bob #$> ("/_get chat #1 count=1", chat, [(1, "hello")])
+      cath #$> ("/_get chat #1 count=1", chat, [(0, "hello")])
+      threadDelay 1000000
+      alice ##> "/rm #team bob messages=on"
+      alice <## "#team: you removed bob from the group with all messages"
+      bob <## "#team: alice removed you from the group with all messages"
+      bob <## "use /d #team to delete the group"
+      cath <## "#team: alice removed bob from the group with all messages"
+      alice #$> ("/_get chat #1 count=2", chat, [(0, "moderated [deleted by you]"), (1, "removed bob (Bob)")])
+      bob #$> ("/_get chat #1 count=2", chat, [(1, "moderated [deleted by alice]"), (0, "removed you")])
+      cath #$> ("/_get chat #1 count=2", chat, [(0, "moderated [deleted by alice]"), (0, "removed bob (Bob)")])
+
+testDeleteMemberMarkMessagesDeleted :: HasCallStack => TestParams -> IO ()
+testDeleteMemberMarkMessagesDeleted =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      threadDelay 1000000
+      bob #> "#team hello"
+      concurrently_
+        (alice <# "#team bob> hello")
+        (cath <# "#team bob> hello")
+      alice #$> ("/_get chat #1 count=1", chat, [(0, "hello")])
+      bob #$> ("/_get chat #1 count=1", chat, [(1, "hello")])
+      cath #$> ("/_get chat #1 count=1", chat, [(0, "hello")])
+      threadDelay 1000000
+      alice ##> "/rm #team bob messages=on"
+      alice <## "#team: you removed bob from the group with all messages"
+      bob <## "#team: alice removed you from the group with all messages"
+      bob <## "use /d #team to delete the group"
+      cath <## "#team: alice removed bob from the group with all messages"
+      alice #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted by you]"), (1, "removed bob (Bob)")])
+      bob #$> ("/_get chat #1 count=2", chat, [(1, "hello [marked deleted by alice]"), (0, "removed you")])
+      cath #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted by alice]"), (0, "removed bob (Bob)")])
+
+testSendMulti :: HasCallStack => TestParams -> IO ()
 testSendMulti =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1905,7 +1883,7 @@ testSendMulti =
       cath <# "#team alice> test 1"
       cath <# "#team alice> test 2"
 
-testSendMultiTimed :: HasCallStack => FilePath -> IO ()
+testSendMultiTimed :: HasCallStack => TestParams -> IO ()
 testSendMultiTimed =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1942,7 +1920,7 @@ testSendMultiTimed =
                "timed message deleted: test 2"
              ]
 
-testSendMultiManyBatches :: HasCallStack => FilePath -> IO ()
+testSendMultiManyBatches :: HasCallStack => TestParams -> IO ()
 testSendMultiManyBatches =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -1977,10 +1955,114 @@ testSendMultiManyBatches =
         DB.query db "SELECT count(1) FROM chat_items WHERE chat_item_id > ?" (Only msgIdCath) :: IO [[Int]]
       cathItemsCount `shouldBe` [[300]]
 
-testGroupAsync :: HasCallStack => FilePath -> IO ()
-testGroupAsync tmp = do
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testSharedMessageBody :: HasCallStack => TestParams -> IO ()
+testSharedMessageBody ps =
+  withNewTestChatOpts ps opts' "alice" aliceProfile $ \alice -> do
+    withSmpServer' serverCfg' $
+      withNewTestChatOpts ps opts' "bob" bobProfile $ \bob ->
+        withNewTestChatOpts ps opts' "cath" cathProfile $ \cath -> do
+          createGroup3 "team" alice bob cath
+
+    alice <##. "server disconnected localhost"
+    alice #> "#team hello"
+    bodiesCount1 <- withCCAgentTransaction alice $ \db ->
+      DB.query_ db "SELECT count(1) FROM snd_message_bodies" :: IO [[Int]]
+    bodiesCount1 `shouldBe` [[1]]
+
+    withSmpServer' serverCfg' $
+      withTestChatOpts ps opts' "bob" $ \bob ->
+        withTestChatOpts ps opts' "cath" $ \cath -> do
+          concurrentlyN_
+            [ alice <##. "server connected localhost",
+              do
+                bob <## "1 contacts connected (use /cs for the list)"
+                bob <## "#team: connected to server(s)",
+              do
+                cath <## "1 contacts connected (use /cs for the list)"
+                cath <## "#team: connected to server(s)"
+            ]
+          bob <# "#team alice> hello"
+          cath <# "#team alice> hello"
+          bodiesCount2 <- withCCAgentTransaction alice $ \db ->
+            DB.query_ db "SELECT count(1) FROM snd_message_bodies" :: IO [[Int]]
+          bodiesCount2 `shouldBe` [[0]]
+
+    alice <##. "server disconnected localhost"
+  where
+    tmp = tmpPath ps
+    serverCfg' =
+      smpServerCfg
+        { transports = [("7003", transport @TLS, False)],
+          serverStoreCfg = persistentServerStoreCfg tmp
+        }
+    opts' =
+      testOpts
+        { coreOptions =
+            testCoreOpts
+              { smpServers = ["smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=:server_password@localhost:7003"]
+              }
+        }
+
+testSharedBatchBody :: HasCallStack => TestParams -> IO ()
+testSharedBatchBody ps =
+  withNewTestChatOpts ps opts' "alice" aliceProfile $ \alice -> do
+    withSmpServer' serverCfg' $
+      withNewTestChatOpts ps opts' "bob" bobProfile $ \bob ->
+        withNewTestChatOpts ps opts' "cath" cathProfile $ \cath -> do
+          createGroup3 "team" alice bob cath
+
+    alice <##. "server disconnected localhost"
+
+    let cm i = "{\"msgContent\": {\"type\": \"text\", \"text\": \"message " <> show i <> "\"}}"
+        cms = intercalate ", " (map cm [1 .. 300 :: Int])
+    alice `send` ("/_send #1 json [" <> cms <> "]")
+    _ <- getTermLine alice
+    alice <## "300 messages sent"
+
+    bodiesCount1 <- withCCAgentTransaction alice $ \db ->
+      DB.query_ db "SELECT count(1) FROM snd_message_bodies" :: IO [[Int]]
+    bodiesCount1 `shouldBe` [[3]]
+
+    withSmpServer' serverCfg' $
+      withTestChatOpts ps opts' "bob" $ \bob ->
+        withTestChatOpts ps opts' "cath" $ \cath -> do
+          concurrentlyN_
+            [ alice <##. "server connected localhost",
+              do
+                bob <## "1 contacts connected (use /cs for the list)"
+                bob <## "#team: connected to server(s)",
+              do
+                cath <## "1 contacts connected (use /cs for the list)"
+                cath <## "#team: connected to server(s)"
+            ]
+          forM_ [(1 :: Int) .. 300] $ \i -> do
+            concurrently_
+              (bob <# ("#team alice> message " <> show i))
+              (cath <# ("#team alice> message " <> show i))
+          bodiesCount2 <- withCCAgentTransaction alice $ \db ->
+            DB.query_ db "SELECT count(1) FROM snd_message_bodies" :: IO [[Int]]
+          bodiesCount2 `shouldBe` [[0]]
+
+    alice <##. "server disconnected localhost"
+  where
+    tmp = tmpPath ps
+    serverCfg' =
+      smpServerCfg
+        { transports = [("7003", transport @TLS, False)],
+          serverStoreCfg = persistentServerStoreCfg tmp
+        }
+    opts' =
+      testOpts
+        { coreOptions =
+            testCoreOpts
+              { smpServers = ["smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=:server_password@localhost:7003"]
+              }
+        }
+
+testGroupAsync :: HasCallStack => TestParams -> IO ()
+testGroupAsync ps = do
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       connectUsers alice bob
       alice ##> "/g team"
       alice <## "group #team is created"
@@ -1998,8 +2080,8 @@ testGroupAsync tmp = do
         (bob <## "#team: you joined the group")
       alice #> "#team hello bob"
       bob <# "#team alice> hello bob"
-  withTestChat tmp "alice" $ \alice -> do
-    withNewTestChat tmp "cath" cathProfile $ \cath -> do
+  withTestChat ps "alice" $ \alice -> do
+    withNewTestChat ps "cath" cathProfile $ \cath -> do
       alice <## "1 contacts connected (use /cs for the list)"
       alice <## "#team: connected to server(s)"
       connectUsers alice cath
@@ -2017,8 +2099,8 @@ testGroupAsync tmp = do
         ]
       alice #> "#team hello cath"
       cath <# "#team alice> hello cath"
-  withTestChat tmp "bob" $ \bob -> do
-    withTestChat tmp "cath" $ \cath -> do
+  withTestChat ps "bob" $ \bob -> do
+    withTestChat ps "cath" $ \cath -> do
       concurrentlyN_
         [ do
             bob <## "1 contacts connected (use /cs for the list)"
@@ -2032,8 +2114,8 @@ testGroupAsync tmp = do
             cath <## "#team: member bob (Bob) is connected"
         ]
   threadDelay 500000
-  withTestChat tmp "bob" $ \bob -> do
-    withNewTestChat tmp "dan" danProfile $ \dan -> do
+  withTestChat ps "bob" $ \bob -> do
+    withNewTestChat ps "dan" danProfile $ \dan -> do
       bob <## "2 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       connectUsers bob dan
@@ -2051,9 +2133,9 @@ testGroupAsync tmp = do
         ]
       threadDelay 1000000
   threadDelay 1000000
-  withTestChat tmp "alice" $ \alice -> do
-    withTestChat tmp "cath" $ \cath -> do
-      withTestChat tmp "dan" $ \dan -> do
+  withTestChat ps "alice" $ \alice -> do
+    withTestChat ps "cath" $ \cath -> do
+      withTestChat ps "dan" $ \dan -> do
         concurrentlyN_
           [ do
               alice <## "2 contacts connected (use /cs for the list)"
@@ -2072,10 +2154,10 @@ testGroupAsync tmp = do
               dan <## "#team: member cath (Catherine) is connected"
           ]
         threadDelay 1000000
-  withTestChat tmp "alice" $ \alice -> do
-    withTestChat tmp "bob" $ \bob -> do
-      withTestChat tmp "cath" $ \cath -> do
-        withTestChat tmp "dan" $ \dan -> do
+  withTestChat ps "alice" $ \alice -> do
+    withTestChat ps "bob" $ \bob -> do
+      withTestChat ps "cath" $ \cath -> do
+        withTestChat ps "dan" $ \dan -> do
           concurrentlyN_
             [ do
                 alice <## "3 contacts connected (use /cs for the list)"
@@ -2118,113 +2200,9 @@ testGroupAsync tmp = do
           dan <##> cath
           dan <##> alice
 
-testGroupLink :: HasCallStack => FilePath -> IO ()
-testGroupLink =
-  testChatCfg3 testCfgGroupLinkViaContact aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/show link #team"
-      alice <## "no group link, to create: /create link #team"
-      alice ##> "/create link #team"
-      _ <- getGroupLink alice "team" GRMember True
-      alice ##> "/delete link #team"
-      alice <## "Group link is deleted - joined members will remain connected."
-      alice <## "To create a new group link use /create link #team"
-      alice ##> "/create link #team"
-      gLink <- getGroupLink alice "team" GRMember True
-      alice ##> "/show link #team"
-      _ <- getGroupLink alice "team" GRMember False
-      alice ##> "/create link #team"
-      alice <## "you already have link for this group, to show: /show link #team"
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      threadDelay 100000
-      alice #$> ("/_get chat #1 count=100", chat, sndGroupFeatures <> [(0, "invited via your group link"), (0, "connected")])
-      -- contacts connected via group link are not in chat previews
-      alice @@@ [("#team", "connected")]
-      bob @@@ [("#team", "connected")]
-      alice <##> bob
-      alice @@@ [("@bob", "hey"), ("#team", "connected")]
-
-      -- user address doesn't interfere
-      alice ##> "/ad"
-      cLink <- getContactLink alice True
-      cath ##> ("/c " <> cLink)
-      alice <#? cath
-      alice ##> "/ac cath"
-      alice <## "cath (Catherine): accepting contact request, you can send messages to contact"
-      concurrently_
-        (cath <## "alice (Alice): contact is connected")
-        (alice <## "cath (Catherine): contact is connected")
-      alice <##> cath
-
-      -- third member
-      cath ##> ("/c " <> gLink)
-      cath <## "connection request sent!"
-      alice <## "cath_1 (Catherine): accepting request to join group #team..."
-      -- if contact existed it is merged
-      concurrentlyN_
-        [ alice
-            <### [ "cath_1 (Catherine): contact is connected",
-                   "contact cath_1 is merged into cath",
-                   "use @cath <message> to send messages",
-                   EndsWith "invited to group #team via your group link",
-                   EndsWith "joined the group"
-                 ],
-          cath
-            <### [ "alice_1 (Alice): contact is connected",
-                   "contact alice_1 is merged into alice",
-                   "use @alice <message> to send messages",
-                   "#team: you joined the group",
-                   "#team: member bob (Bob) is connected"
-                 ],
-          do
-            bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
-            bob <## "#team: new member cath is connected"
-        ]
-      alice #> "#team hello"
-      concurrently_
-        (bob <# "#team alice> hello")
-        (cath <# "#team alice> hello")
-      bob #> "#team hi there"
-      concurrently_
-        (alice <# "#team bob> hi there")
-        (cath <# "#team bob> hi there")
-      cath #> "#team hey team"
-      concurrently_
-        (alice <# "#team cath> hey team")
-        (bob <# "#team cath> hey team")
-
-      threadDelay 100000
-
-      -- leaving team removes link
-      alice ##> "/l team"
-      concurrentlyN_
-        [ do
-            alice <## "#team: you left the group"
-            alice <## "use /d #team to delete the group",
-          bob <## "#team: alice left the group",
-          cath <## "#team: alice left the group"
-        ]
-      alice ##> "/show link #team"
-      alice <## "no group link, to create: /create link #team"
-
-testGroupLinkDeleteGroupRejoin :: HasCallStack => FilePath -> IO ()
+testGroupLinkDeleteGroupRejoin :: HasCallStack => TestParams -> IO ()
 testGroupLinkDeleteGroupRejoin =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
+  testChat2 aliceProfile bobProfile $
     \alice bob -> do
       threadDelay 100000
       alice ##> "/g team"
@@ -2236,16 +2214,11 @@ testGroupLinkDeleteGroupRejoin =
       bob <## "connection request sent!"
       alice <## "bob (Bob): accepting request to join group #team..."
       concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
+        [ alice <## "#team: bob joined the group",
           do
-            bob <## "alice (Alice): contact is connected"
+            bob <## "#team: joining the group..."
             bob <## "#team: you joined the group"
         ]
-      -- use contact so it's not deleted when deleting group
-      bob <##> alice
       bob ##> "/l team"
       concurrentlyN_
         [ do
@@ -2260,62 +2233,20 @@ testGroupLinkDeleteGroupRejoin =
       bob <## "connection request sent!"
       alice <## "bob_1 (Bob): accepting request to join group #team..."
       concurrentlyN_
-        [ alice
-            <### [ "bob_1 (Bob): contact is connected",
-                   "contact bob_1 is merged into bob",
-                   "use @bob <message> to send messages",
-                   EndsWith "invited to group #team via your group link",
-                   EndsWith "joined the group"
-                 ],
+        [ alice <## "#team: bob_1 joined the group",
           bob
-            <### [ "alice_1 (Alice): contact is connected",
-                   "contact alice_1 is merged into alice",
-                   "use @alice <message> to send messages",
+            <### [ "#team: joining the group...",
                    "#team: you joined the group"
                  ]
         ]
       alice #> "#team hello"
       bob <# "#team alice> hello"
       bob #> "#team hi there"
-      alice <# "#team bob> hi there"
+      alice <# "#team bob_1> hi there"
 
-testGroupLinkContactUsed :: HasCallStack => FilePath -> IO ()
-testGroupLinkContactUsed =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
-    \alice bob -> do
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team"
-      gLink <- getGroupLink alice "team" GRMember True
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      -- sending/receiving a message marks contact as used
-      threadDelay 100000
-      alice @@@ [("#team", "connected")]
-      bob @@@ [("#team", "connected")]
-      alice #> "@bob hello"
-      bob <# "alice> hello"
-      threadDelay 500000
-      alice #$> ("/clear bob", id, "bob: all messages are removed locally ONLY")
-      alice @@@ [("@bob", ""), ("#team", "connected")]
-      bob #$> ("/clear alice", id, "alice: all messages are removed locally ONLY")
-      bob @@@ [("@alice", ""), ("#team", "connected")]
-
-testGroupLinkIncognitoMembership :: HasCallStack => FilePath -> IO ()
-testGroupLinkIncognitoMembership =
-  testChatCfg4 testCfgGroupLinkViaContact aliceProfile bobProfile cathProfile danProfile $
+testGroupLinkIncognitoJoinInvite :: HasCallStack => TestParams -> IO ()
+testGroupLinkIncognitoJoinInvite =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       -- bob connected incognito to alice
       alice ##> "/c"
@@ -2351,41 +2282,25 @@ testGroupLinkIncognitoMembership =
       cath ##> ("/c " <> gLink)
       cath <## "connection request sent!"
       bob <## "cath (Catherine): accepting request to join group #team..."
-      _ <- getTermLine bob
       concurrentlyN_
-        [ do
-            bob <## ("cath (Catherine): contact is connected, your incognito profile for this contact is " <> bobIncognito)
-            bob <## "use /i cath to print out this incognito profile again"
-            bob <## "cath invited to group #team via your group link"
-            bob <## "#team: cath joined the group",
+        [ bob <## "#team: cath joined the group",
           do
-            cath <## (bobIncognito <> ": contact is connected")
+            cath <## "#team: joining the group..."
             cath <## "#team: you joined the group"
             cath <## "#team: member alice (Alice) is connected",
           do
             alice <## ("#team: " <> bobIncognito <> " added cath (Catherine) to the group (connecting...)")
             alice <## "#team: new member cath is connected"
         ]
-      bob ?#> "@cath hi, I'm incognito"
-      cath <# (bobIncognito <> "> hi, I'm incognito")
-      cath #> ("@" <> bobIncognito <> " hey, I'm cath")
-      bob ?<# "cath> hey, I'm cath"
       -- dan joins incognito
       dan ##> ("/c i " <> gLink)
       danIncognito <- getTermLine dan
       dan <## "connection request sent incognito!"
       bob <## (danIncognito <> ": accepting request to join group #team...")
-      _ <- getTermLine bob
-      _ <- getTermLine dan
       concurrentlyN_
-        [ do
-            bob <## (danIncognito <> ": contact is connected, your incognito profile for this contact is " <> bobIncognito)
-            bob <## ("use /i " <> danIncognito <> " to print out this incognito profile again")
-            bob <## (danIncognito <> " invited to group #team via your group link")
-            bob <## ("#team: " <> danIncognito <> " joined the group"),
+        [ bob <## ("#team: " <> danIncognito <> " joined the group"),
           do
-            dan <## (bobIncognito <> ": contact is connected, your incognito profile for this contact is " <> danIncognito)
-            dan <## ("use /i " <> bobIncognito <> " to print out this incognito profile again")
+            dan <## "#team: joining the group..."
             dan <## ("#team: you joined the group incognito as " <> danIncognito)
             dan
               <### [ "#team: member alice (Alice) is connected",
@@ -2398,10 +2313,6 @@ testGroupLinkIncognitoMembership =
             cath <## ("#team: " <> bobIncognito <> " added " <> danIncognito <> " to the group (connecting...)")
             cath <## ("#team: new member " <> danIncognito <> " is connected")
         ]
-      bob ?#> ("@" <> danIncognito <> " hi, I'm incognito")
-      dan ?<# (bobIncognito <> "> hi, I'm incognito")
-      dan ?#> ("@" <> bobIncognito <> " hey, me too")
-      bob ?<# (danIncognito <> "> hey, me too")
       alice #> "#team hello"
       concurrentlyN_
         [ bob ?<# "#team alice> hello",
@@ -2427,372 +2338,9 @@ testGroupLinkIncognitoMembership =
           cath <# ("#team " <> danIncognito <> "> how is it going?")
         ]
 
-testGroupLinkUnusedHostContactDeleted :: HasCallStack => FilePath -> IO ()
-testGroupLinkUnusedHostContactDeleted =
-  testChatCfg2 cfg aliceProfile bobProfile $
-    \alice bob -> do
-      -- create group 1
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team"
-      gLinkTeam <- getGroupLink alice "team" GRMember True
-      bob ##> ("/c " <> gLinkTeam)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      -- create group 2
-      alice ##> "/g club"
-      alice <## "group #club is created"
-      alice <## "to add members use /a club <name> or /create link #club"
-      alice ##> "/create link #club"
-      gLinkClub <- getGroupLink alice "club" GRMember True
-      bob ##> ("/c " <> gLinkClub)
-      bob <## "connection request sent!"
-      alice <## "bob_1 (Bob): accepting request to join group #club..."
-      concurrentlyN_
-        [ alice
-            <### [ "bob_1 (Bob): contact is connected",
-                   "contact bob_1 is merged into bob",
-                   "use @bob <message> to send messages",
-                   EndsWith "invited to group #club via your group link",
-                   EndsWith "joined the group"
-                 ],
-          bob
-            <### [ "alice_1 (Alice): contact is connected",
-                   "contact alice_1 is merged into alice",
-                   "use @alice <message> to send messages",
-                   "#club: you joined the group"
-                 ]
-        ]
-      -- list contacts
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      -- delete group 1, host contact and profile are kept
-      bobLeaveDeleteGroup alice bob "team"
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob `hasContactProfiles` ["alice", "bob"]
-      -- delete group 2, unused host contact and profile are deleted
-      bobLeaveDeleteGroup alice bob "club"
-      threadDelay 3000000
-      bob ##> "/contacts"
-      (bob </)
-      bob `hasContactProfiles` ["bob"]
-  where
-    cfg = mkCfgGroupLinkViaContact $ testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
-    bobLeaveDeleteGroup :: HasCallStack => TestCC -> TestCC -> String -> IO ()
-    bobLeaveDeleteGroup alice bob group = do
-      bob ##> ("/l " <> group)
-      concurrentlyN_
-        [ do
-            bob <## ("#" <> group <> ": you left the group")
-            bob <## ("use /d #" <> group <> " to delete the group"),
-          alice <## ("#" <> group <> ": bob left the group")
-        ]
-      bob ##> ("/d #" <> group)
-      bob <## ("#" <> group <> ": you deleted the group")
-
-testGroupLinkIncognitoUnusedHostContactsDeleted :: HasCallStack => FilePath -> IO ()
-testGroupLinkIncognitoUnusedHostContactsDeleted =
-  testChatCfg2 cfg aliceProfile bobProfile $
-    \alice bob -> do
-      bobIncognitoTeam <- createGroupBobIncognito alice bob "team" "alice"
-      bobIncognitoClub <- createGroupBobIncognito alice bob "club" "alice_1"
-      bobIncognitoTeam `shouldNotBe` bobIncognitoClub
-      -- list contacts
-      bob ##> "/contacts"
-      bob <## "i alice (Alice)"
-      bob <## "i alice_1 (Alice)"
-      bob `hasContactProfiles` ["alice", "alice", "bob", T.pack bobIncognitoTeam, T.pack bobIncognitoClub]
-      -- delete group 1, unused host contact and profile are deleted
-      bobLeaveDeleteGroup alice bob "team" bobIncognitoTeam
-      threadDelay 3000000
-      bob ##> "/contacts"
-      bob <## "i alice_1 (Alice)"
-      bob `hasContactProfiles` ["alice", "bob", T.pack bobIncognitoClub]
-      -- delete group 2, unused host contact and profile are deleted
-      bobLeaveDeleteGroup alice bob "club" bobIncognitoClub
-      threadDelay 3000000
-      bob ##> "/contacts"
-      (bob </)
-      bob `hasContactProfiles` ["bob"]
-  where
-    cfg = mkCfgGroupLinkViaContact $ testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
-    createGroupBobIncognito :: HasCallStack => TestCC -> TestCC -> String -> String -> IO String
-    createGroupBobIncognito alice bob group bobsAliceContact = do
-      alice ##> ("/g " <> group)
-      alice <## ("group #" <> group <> " is created")
-      alice <## ("to add members use /a " <> group <> " <name> or /create link #" <> group)
-      alice ##> ("/create link #" <> group)
-      gLinkTeam <- getGroupLink alice group GRMember True
-      bob ##> ("/c i " <> gLinkTeam)
-      bobIncognito <- getTermLine bob
-      bob <## "connection request sent incognito!"
-      alice <## (bobIncognito <> ": accepting request to join group #" <> group <> "...")
-      _ <- getTermLine bob
-      concurrentlyN_
-        [ do
-            alice <## (bobIncognito <> ": contact is connected")
-            alice <## (bobIncognito <> " invited to group #" <> group <> " via your group link")
-            alice <## ("#" <> group <> ": " <> bobIncognito <> " joined the group"),
-          do
-            bob <## (bobsAliceContact <> " (Alice): contact is connected, your incognito profile for this contact is " <> bobIncognito)
-            bob <## ("use /i " <> bobsAliceContact <> " to print out this incognito profile again")
-            bob <## ("#" <> group <> ": you joined the group incognito as " <> bobIncognito)
-        ]
-      pure bobIncognito
-    bobLeaveDeleteGroup :: HasCallStack => TestCC -> TestCC -> String -> String -> IO ()
-    bobLeaveDeleteGroup alice bob group bobIncognito = do
-      bob ##> ("/l " <> group)
-      concurrentlyN_
-        [ do
-            bob <## ("#" <> group <> ": you left the group")
-            bob <## ("use /d #" <> group <> " to delete the group"),
-          alice <## ("#" <> group <> ": " <> bobIncognito <> " left the group")
-        ]
-      bob ##> ("/d #" <> group)
-      bob <## ("#" <> group <> ": you deleted the group")
-
-testGroupLinkMemberRole :: HasCallStack => FilePath -> IO ()
-testGroupLinkMemberRole =
-  testChatCfg3 testCfgGroupLinkViaContact aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team admin"
-      alice <## "#team: initial role for group member cannot be admin, use member or observer"
-      alice ##> "/create link #team observer"
-      gLink <- getGroupLink alice "team" GRObserver True
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      alice ##> "/set link role #team admin"
-      alice <## "#team: initial role for group member cannot be admin, use member or observer"
-      alice ##> "/set link role #team member"
-      _ <- getGroupLink alice "team" GRMember False
-      cath ##> ("/c " <> gLink)
-      cath <## "connection request sent!"
-      alice <## "cath (Catherine): accepting request to join group #team..."
-      -- if contact existed it is merged
-      concurrentlyN_
-        [ alice
-            <### [ "cath (Catherine): contact is connected",
-                   EndsWith "invited to group #team via your group link",
-                   EndsWith "joined the group"
-                 ],
-          cath
-            <### [ "alice (Alice): contact is connected",
-                   "#team: you joined the group",
-                   "#team: member bob (Bob) is connected"
-                 ],
-          do
-            bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
-            bob <## "#team: new member cath is connected"
-        ]
-      alice #> "#team hello"
-      concurrently_
-        (bob <# "#team alice> hello")
-        (cath <# "#team alice> hello")
-      cath #> "#team hello too"
-      concurrently_
-        (alice <# "#team cath> hello too")
-        (bob <# "#team cath> hello too")
-      bob ##> "#team hey"
-      bob <## "#team: you don't have permission to send messages"
-      alice ##> "/mr #team bob member"
-      alice <## "#team: you changed the role of bob from observer to member"
-      concurrently_
-        (bob <## "#team: alice changed your role from observer to member")
-        (cath <## "#team: alice changed the role of bob from observer to member")
-      bob #> "#team hey now"
-      concurrently_
-        (alice <# "#team bob> hey now")
-        (cath <# "#team bob> hey now")
-
-testGroupLinkLeaveDelete :: HasCallStack => FilePath -> IO ()
-testGroupLinkLeaveDelete =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      connectUsers alice bob
-      connectUsers cath bob
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team"
-      gLink <- getGroupLink alice "team" GRMember True
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob_1 (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ alice
-            <### [ "bob_1 (Bob): contact is connected",
-                   "contact bob_1 is merged into bob",
-                   "use @bob <message> to send messages",
-                   EndsWith "invited to group #team via your group link",
-                   EndsWith "joined the group"
-                 ],
-          bob
-            <### [ "alice_1 (Alice): contact is connected",
-                   "contact alice_1 is merged into alice",
-                   "use @alice <message> to send messages",
-                   "#team: you joined the group"
-                 ]
-        ]
-      cath ##> ("/c " <> gLink)
-      cath <## "connection request sent!"
-      alice <## "cath (Catherine): accepting request to join group #team..."
-      concurrentlyN_
-        [ alice
-            <### [ "cath (Catherine): contact is connected",
-                   "cath invited to group #team via your group link",
-                   "#team: cath joined the group"
-                 ],
-          cath
-            <### [ "alice (Alice): contact is connected",
-                   "#team: you joined the group",
-                   "#team: member bob_1 (Bob) is connected",
-                   "contact bob_1 is merged into bob",
-                   "use @bob <message> to send messages"
-                 ],
-          bob
-            <### [ "#team: alice added cath_1 (Catherine) to the group (connecting...)",
-                   "#team: new member cath_1 is connected",
-                   "contact cath_1 is merged into cath",
-                   "use @cath <message> to send messages"
-                 ]
-        ]
-      bob ##> "/l team"
-      concurrentlyN_
-        [ do
-            bob <## "#team: you left the group"
-            bob <## "use /d #team to delete the group",
-          alice <## "#team: bob left the group",
-          cath <## "#team: bob left the group"
-        ]
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob <## "cath (Catherine)"
-      bob ##> "/d #team"
-      bob <## "#team: you deleted the group"
-      bob ##> "/contacts"
-      bob <## "alice (Alice)"
-      bob <## "cath (Catherine)"
-
-testPlanGroupLinkOkKnown :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkOkKnown =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
-    \alice bob -> do
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team"
-      gLink <- getGroupLink alice "team" GRMember True
-
-      bob ##> ("/_connect plan 1 " <> gLink)
-      bob <## "group link: ok to connect"
-
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      alice #> "#team hi"
-      bob <# "#team alice> hi"
-      bob #> "#team hey"
-      alice <# "#team bob> hey"
-
-      bob ##> ("/_connect plan 1 " <> gLink)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-      let gLinkSchema2 = linkAnotherSchema gLink
-      bob ##> ("/_connect plan 1 " <> gLinkSchema2)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-      bob ##> ("/c " <> gLink)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-testPlanHostContactDeletedGroupLinkKnown :: HasCallStack => FilePath -> IO ()
-testPlanHostContactDeletedGroupLinkKnown =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
-    \alice bob -> do
-      threadDelay 100000
-      alice ##> "/g team"
-      alice <## "group #team is created"
-      alice <## "to add members use /a team <name> or /create link #team"
-      alice ##> "/create link #team"
-      gLink <- getGroupLink alice "team" GRMember True
-
-      bob ##> ("/c " <> gLink)
-      bob <## "connection request sent!"
-      alice <## "bob (Bob): accepting request to join group #team..."
-      concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
-          do
-            bob <## "alice (Alice): contact is connected"
-            bob <## "#team: you joined the group"
-        ]
-      alice #> "#team hi"
-      bob <# "#team alice> hi"
-      bob #> "#team hey"
-      alice <# "#team bob> hey"
-
-      alice <##> bob
-      threadDelay 500000
-      bob ##> "/d alice"
-      bob <## "alice: contact is deleted"
-      alice <## "bob (Bob) deleted contact with you"
-
-      bob ##> ("/_connect plan 1 " <> gLink)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-      let gLinkSchema2 = linkAnotherSchema gLink
-      bob ##> ("/_connect plan 1 " <> gLinkSchema2)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-      bob ##> ("/c " <> gLink)
-      bob <## "group link: known group #team"
-      bob <## "use #team <message> to send messages"
-
-testPlanGroupLinkOwn :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkOwn tmp =
-  withNewTestChatCfg tmp (mkCfgGroupLinkViaContact testCfgSlow) "alice" aliceProfile $ \alice -> do
+testPlanGroupLinkOwn :: HasCallStack => TestParams -> IO ()
+testPlanGroupLinkOwn ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
     threadDelay 100000
     alice ##> "/g team"
     alice <## "group #team is created"
@@ -2811,18 +2359,14 @@ testPlanGroupLinkOwn tmp =
     alice <## "connection request sent!"
     alice <## "alice_1 (Alice): accepting request to join group #team..."
     alice
-      <### [ "alice_1 (Alice): contact is connected",
-             "alice_1 invited to group #team via your group link",
-             "#team: alice_1 joined the group",
-             "alice_2 (Alice): contact is connected",
-             "#team_1: you joined the group",
-             "contact alice_2 is merged into alice_1",
-             "use @alice_1 <message> to send messages"
+      <### [ "#team: alice_1 joined the group",
+             "#team_1: joining the group...",
+             "#team_1: you joined the group"
            ]
     alice `send` "#team 1"
     alice
       <### [ WithTime "#team 1",
-             WithTime "#team_1 alice_1> 1"
+             WithTime "#team_1 alice_2> 1"
            ]
     alice `send` "#team_1 2"
     alice
@@ -2836,71 +2380,9 @@ testPlanGroupLinkOwn tmp =
     alice ##> ("/_connect plan 1 " <> gLinkSchema2)
     alice <## "group link: own link for group #team"
 
-    -- group works if merged contact is deleted
-    alice ##> "/d alice_1"
-    alice <## "alice_1: contact is deleted"
-
-    alice `send` "#team 3"
-    alice
-      <### [ WithTime "#team 3",
-             WithTime "#team_1 alice_1> 3"
-           ]
-    alice `send` "#team_1 4"
-    alice
-      <### [ WithTime "#team_1 4",
-             WithTime "#team alice_1> 4"
-           ]
-
-testPlanGroupLinkConnecting :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkConnecting tmp = do
-  -- gLink <- withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-  gLink <- withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    threadDelay 100000
-    alice ##> "/g team"
-    alice <## "group #team is created"
-    alice <## "to add members use /a team <name> or /create link #team"
-    alice ##> "/create link #team"
-    getGroupLink alice "team" GRMember True
-  -- withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
-  withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
-    threadDelay 100000
-
-    bob ##> ("/c " <> gLink)
-    bob <## "connection request sent!"
-
-    bob ##> ("/_connect plan 1 " <> gLink)
-    bob <## "group link: connecting, allowed to reconnect"
-
-    let gLinkSchema2 = linkAnotherSchema gLink
-    bob ##> ("/_connect plan 1 " <> gLinkSchema2)
-    bob <## "group link: connecting, allowed to reconnect"
-
-    threadDelay 100000
-  -- withTestChatCfg tmp cfg "alice" $ \alice -> do
-  withTestChatCfg tmp cfg "alice" $ \alice -> do
-    alice
-      <### [ "1 group links active",
-             "#team: group is empty",
-             "bob (Bob): accepting request to join group #team..."
-           ]
-  -- withTestChatCfg tmp cfg "bob" $ \bob -> do
-  withTestChatCfg tmp cfg "bob" $ \bob -> do
-    threadDelay 500000
-    bob ##> ("/_connect plan 1 " <> gLink)
-    bob <## "group link: connecting"
-
-    let gLinkSchema2 = linkAnotherSchema gLink
-    bob ##> ("/_connect plan 1 " <> gLinkSchema2)
-    bob <## "group link: connecting"
-
-    bob ##> ("/c " <> gLink)
-    bob <## "group link: connecting"
-  where
-    cfg = mkCfgGroupLinkViaContact testCfgSlow
-
-testPlanGroupLinkLeaveRejoin :: HasCallStack => FilePath -> IO ()
+testPlanGroupLinkLeaveRejoin :: HasCallStack => TestParams -> IO ()
 testPlanGroupLinkLeaveRejoin =
-  testChatCfg2 testCfgGroupLinkViaContact aliceProfile bobProfile $
+  testChat2 aliceProfile bobProfile $
     \alice bob -> do
       threadDelay 100000
       alice ##> "/g team"
@@ -2913,12 +2395,9 @@ testPlanGroupLinkLeaveRejoin =
       bob <## "connection request sent!"
       alice <## "bob (Bob): accepting request to join group #team..."
       concurrentlyN_
-        [ do
-            alice <## "bob (Bob): contact is connected"
-            alice <## "bob invited to group #team via your group link"
-            alice <## "#team: bob joined the group",
+        [ alice <## "#team: bob joined the group",
           do
-            bob <## "alice (Alice): contact is connected"
+            bob <## "#team: joining the group..."
             bob <## "#team: you joined the group"
         ]
 
@@ -2955,25 +2434,17 @@ testPlanGroupLinkLeaveRejoin =
       bob <## "connection request sent!"
       alice <## "bob_1 (Bob): accepting request to join group #team..."
       concurrentlyN_
-        [ alice
-            <### [ "bob_1 (Bob): contact is connected",
-                   EndsWith "invited to group #team via your group link",
-                   EndsWith "joined the group",
-                   "contact bob_1 is merged into bob",
-                   "use @bob <message> to send messages"
-                 ],
+        [ alice <## "#team: bob_1 joined the group",
           bob
-            <### [ "alice_1 (Alice): contact is connected",
-                   "#team_1: you joined the group",
-                   "contact alice_1 is merged into alice",
-                   "use @alice <message> to send messages"
+            <### [ "#team_1: joining the group...",
+                   "#team_1: you joined the group"
                  ]
         ]
 
       alice #> "#team hi"
-      bob <# "#team_1 alice> hi"
+      bob <# "#team_1 alice_1> hi"
       bob #> "#team_1 hey"
-      alice <# "#team bob> hey"
+      alice <# "#team bob_1> hey"
 
       bob ##> ("/_connect plan 1 " <> gLink)
       bob <## "group link: known group #team_1"
@@ -2987,8 +2458,8 @@ testPlanGroupLinkLeaveRejoin =
       bob <## "group link: known group #team_1"
       bob <## "use #team_1 <message> to send messages"
 
-testGroupLinkNoContact :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContact =
+testGroupLink :: HasCallStack => TestParams -> IO ()
+testGroupLink =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       threadDelay 100000
@@ -3025,16 +2496,34 @@ testGroupLinkNoContact =
       bob #> "#team hi there"
       alice <# "#team bob> hi there"
 
+      -- user address doesn't interfere
+      alice ##> "/ad"
+      cLink <- getContactLink alice True
+      cath ##> ("/c " <> cLink)
+      alice <#? cath
+      alice ##> "/ac cath"
+      alice <## "cath (Catherine): accepting contact request, you can send messages to contact"
+      concurrently_
+        (cath <## "alice (Alice): contact is connected")
+        (alice <## "cath (Catherine): contact is connected")
+      alice <##> cath
+
+      -- third member
       cath ##> ("/c " <> gLink)
       cath <## "connection request sent!"
       concurrentlyN_
         [ do
-            alice <## "cath (Catherine): accepting request to join group #team..."
-            alice <## "#team: cath joined the group",
-          do
-            cath <## "#team: joining the group..."
-            cath <## "#team: you joined the group"
-            cath <## "#team: member bob (Bob) is connected",
+            alice <## "cath_1 (Catherine): accepting request to join group #team..."
+            alice <## "#team: cath_1 joined the group"
+            alice <## "contact and member are merged: cath, #team cath_1"
+            alice <## "use @cath <message> to send messages",
+          cath
+            <### [ "#team: joining the group...",
+                   "#team: you joined the group",
+                   "#team: member bob (Bob) is connected",
+                   "contact and member are merged: alice, #team alice_1",
+                   "use @alice <message> to send messages"
+                 ],
           do
             bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
             bob <## "#team: new member cath is connected"
@@ -3048,8 +2537,28 @@ testGroupLinkNoContact =
       alice <# "#team bob> hi cath"
       cath <# "#team bob> hi cath"
 
-testGroupLinkNoContactInviteesWereConnected :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactInviteesWereConnected =
+      -- leaving group removes link
+      alice ##> "/l team"
+      concurrentlyN_
+        [ do
+            alice <## "#team: you left the group"
+            alice <## "use /d #team to delete the group",
+          bob <## "#team: alice left the group",
+          cath <## "#team: alice left the group"
+        ]
+      alice ##> "/show link #team"
+      alice <## "no group link, to create: /create link #team"
+
+      -- deleting group keeps contacts
+      alice ##> "/contacts"
+      alice <## "cath (Catherine)"
+      alice ##> "/d #team"
+      alice <## "#team: you deleted the group"
+      alice ##> "/contacts"
+      alice <## "cath (Catherine)"
+
+testGroupLinkInviteesWereConnected :: HasCallStack => TestParams -> IO ()
+testGroupLinkInviteesWereConnected =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       connectUsers bob cath
@@ -3120,8 +2629,8 @@ testGroupLinkNoContactInviteesWereConnected =
       cath #> "#team 3"
       [alice, bob] *<# "#team cath> 3"
 
-testGroupLinkNoContactAllMembersWereConnected :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactAllMembersWereConnected =
+testGroupLinkAllMembersWereConnected :: HasCallStack => TestParams -> IO ()
+testGroupLinkAllMembersWereConnected =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       connectUsers alice bob
@@ -3211,8 +2720,8 @@ testGroupLinkNoContactAllMembersWereConnected =
       cath #> "#team 3"
       [alice, bob] *<# "#team cath> 3"
 
-testGroupLinkNoContactMemberRole :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactMemberRole =
+testGroupLinkMemberRole :: HasCallStack => TestParams -> IO ()
+testGroupLinkMemberRole =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       threadDelay 100000
@@ -3249,7 +2758,7 @@ testGroupLinkNoContactMemberRole =
       bob <## "#team: you don't have permission to send messages"
 
       alice ##> "/mr #team bob member"
-      alice <## "#team: you changed the role of bob from observer to member"
+      alice <## "#team: you changed the role of bob to member"
       bob <## "#team: alice changed your role from observer to member"
 
       bob #> "#team hey now"
@@ -3279,7 +2788,7 @@ testGroupLinkNoContactMemberRole =
       cath <## "#team: you don't have permission to send messages"
 
       alice ##> "/mr #team cath admin"
-      alice <## "#team: you changed the role of cath from observer to admin"
+      alice <## "#team: you changed the role of cath to admin"
       cath <## "#team: alice changed your role from observer to admin"
       bob <## "#team: alice changed the role of cath from observer to admin"
 
@@ -3288,12 +2797,12 @@ testGroupLinkNoContactMemberRole =
       bob <# "#team cath> hey"
 
       cath ##> "/mr #team bob admin"
-      cath <## "#team: you changed the role of bob from member to admin"
+      cath <## "#team: you changed the role of bob to admin"
       bob <## "#team: cath changed your role from member to admin"
       alice <## "#team: cath changed the role of bob from member to admin"
 
-testGroupLinkNoContactHostIncognito :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactHostIncognito =
+testGroupLinkHostIncognito :: HasCallStack => TestParams -> IO ()
+testGroupLinkHostIncognito =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       alice ##> "/g i team"
@@ -3325,8 +2834,8 @@ testGroupLinkNoContactHostIncognito =
       bob #> "#team hi there"
       alice ?<# "#team bob> hi there"
 
-testGroupLinkNoContactInviteeIncognito :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactInviteeIncognito =
+testGroupLinkInviteeIncognito :: HasCallStack => TestParams -> IO ()
+testGroupLinkInviteeIncognito =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       threadDelay 100000
@@ -3359,8 +2868,8 @@ testGroupLinkNoContactInviteeIncognito =
       bob ?#> "#team hi there"
       alice <# ("#team " <> bobIncognito <> "> hi there")
 
-testGroupLinkNoContactHostProfileReceived :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactHostProfileReceived =
+testGroupLinkHostProfileReceived :: HasCallStack => TestParams -> IO ()
+testGroupLinkHostProfileReceived =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       let profileImage = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="
@@ -3387,8 +2896,8 @@ testGroupLinkNoContactHostProfileReceived =
       aliceImage <- getProfilePictureByName bob "alice"
       aliceImage `shouldBe` Just profileImage
 
-testGroupLinkNoContactExistingContactMerged :: HasCallStack => FilePath -> IO ()
-testGroupLinkNoContactExistingContactMerged =
+testGroupLinkExistingContactMerged :: HasCallStack => TestParams -> IO ()
+testGroupLinkExistingContactMerged =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       connectUsers alice bob
@@ -3430,8 +2939,413 @@ testGroupLinkNoContactExistingContactMerged =
       bob #> "#team hi there"
       alice <# "#team bob> hi there"
 
-testPlanGroupLinkNoContactKnown :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkNoContactKnown =
+testGLinkRejectBlockedName :: HasCallStack => TestParams -> IO ()
+testGLinkRejectBlockedName =
+  testChatCfg2 cfg aliceProfile bobProfile $
+    \alice bob -> do
+      alice ##> "/g team"
+      alice <## "group #team is created"
+      alice <## "to add members use /a team <name> or /create link #team"
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+      bob ##> ("/c " <> gLink)
+      bob <## "connection request sent!"
+      alice <## "bob (Bob): rejecting request to join group #team, reason: GRRBlockedName"
+      bob <## "#team: joining the group..."
+      bob <## "#team: join rejected, reason: GRRBlockedName"
+
+      threadDelay 100000
+
+      alice `hasContactProfiles` ["alice"]
+      memCount <- withCCTransaction alice $ \db ->
+        DB.query_ db "SELECT count(1) FROM group_members" :: IO [[Int]]
+      memCount `shouldBe` [[1]]
+
+      -- rejected member can't send messages to group
+      bob ##> "#team hello"
+      bob <## "bad chat command: not current member"
+
+      bob ##> ("/c " <> gLink)
+      bob <## "group link: known group #team"
+      bob <## "use #team <message> to send messages"
+  where
+    cfg = testCfg {chatHooks = defaultChatHooks {acceptMember = Just (\_ _ _ -> pure $ Left GRRBlockedName)}}
+
+testGLinkApproveMember :: HasCallStack => TestParams -> IO ()
+testGLinkApproveMember =
+  testChatCfg3 cfg aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup2 "team" alice bob
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+      cath ##> ("/c " <> gLink)
+      cath <## "connection request sent!"
+      alice <## "cath (Catherine): accepting request to join group #team..."
+      concurrentlyN_
+        [ alice <## "#team: cath connected and pending approval, use /_accept member #1 3 <role> to accept member",
+          do
+            cath <## "#team: joining the group..."
+            cath <## "#team: you joined the group, pending approval"
+        ]
+
+      -- pending member doesn't see messages sent in group
+      alice #> "#team hi group"
+      bob <# "#team alice> hi group"
+
+      bob #> "#team hey"
+      alice <# "#team bob> hey"
+
+      -- pending member can't send messages to group
+      cath ##> "#team hello"
+      cath <## "bad chat command: not current member"
+
+      -- pending member and host can send messages to each other
+      alice ##> "/_send #1(_support:3) text send me proofs"
+      alice <# "#team (support: cath) send me proofs"
+      cath <# "#team (support) alice> send me proofs"
+
+      cath ##> "/_send #1(_support) text proofs"
+      cath <# "#team (support) proofs"
+      alice <# "#team (support: cath) cath> proofs"
+
+      -- accept member
+      alice ##> "/accept member #team cath"
+      concurrentlyN_
+        [ alice <## "#team: cath accepted",
+          cath
+            <### [ "#team: you joined the group",
+                   WithTime "#team alice> hi group [>>]",
+                   WithTime "#team bob> hey [>>]",
+                   "#team: member bob (Bob) is connected"
+                 ],
+          do
+            bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
+            bob <## "#team: new member cath is connected"
+        ]
+
+      alice #> "#team welcome cath"
+      [bob, cath] *<# "#team alice> welcome cath"
+
+      bob #> "#team hi cath"
+      [alice, cath] *<# "#team bob> hi cath"
+
+      cath #> "#team hi group"
+      [alice, bob] *<# "#team cath> hi group"
+  where
+    cfg = testCfg {chatHooks = defaultChatHooks {acceptMember = Just (\_ _ _ -> pure $ Right (GAPendingApproval, GRObserver))}}
+
+testGLinkReviewMember :: HasCallStack => TestParams -> IO ()
+testGLinkReviewMember =
+  testChat5 aliceProfile bobProfile cathProfile danProfile eveProfile $
+    \alice bob cath dan eve -> do
+      createGroup4 "team" alice (bob, GRMember) (cath, GRModerator) (dan, GRModerator)
+
+      alice ##> "/set admission review #team all"
+      alice <## "changed member admission rules"
+      concurrentlyN_
+        [ do
+            bob <## "alice updated group #team:"
+            bob <## "changed member admission rules",
+          do
+            cath <## "alice updated group #team:"
+            cath <## "changed member admission rules",
+          do
+            dan <## "alice updated group #team:"
+            dan <## "changed member admission rules"
+        ]
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+      eve ##> ("/c " <> gLink)
+      eve <## "connection request sent!"
+      alice <## "eve (Eve): accepting request to join group #team..."
+      concurrentlyN_
+        [ alice <## "#team: eve connected and pending review",
+          eve
+            <### [ "#team: alice accepted you to the group, pending review",
+                   "#team: joining the group...",
+                   "#team: you joined the group, connecting to group moderators for admission to group",
+                   "#team: member cath (Catherine) is connected",
+                   "#team: member dan (Daniel) is connected"
+                 ],
+          do
+            cath <## "#team: alice added eve (Eve) to the group (connecting and pending review...), use /_accept member #1 5 <role> to accept member"
+            cath <## "#team: new member eve is connected and pending review, use /_accept member #1 5 <role> to accept member",
+          do
+            dan <## "#team: alice added eve (Eve) to the group (connecting and pending review...), use /_accept member #1 5 <role> to accept member"
+            dan <## "#team: new member eve is connected and pending review, use /_accept member #1 5 <role> to accept member"
+        ]
+
+      -- pending member doesn't see messages sent in group
+      alice #> "#team 1"
+      [bob, cath, dan] *<# "#team alice> 1"
+
+      bob #> "#team 2"
+      [alice, cath, dan] *<# "#team bob> 2"
+
+      cath #> "#team 3"
+      [alice, bob, dan] *<# "#team cath> 3"
+
+      dan #> "#team 4"
+      [alice, bob, cath] *<# "#team dan> 4"
+
+      (eve </)
+
+      -- pending member can't send messages to group
+      eve ##> "#team hello"
+      eve <## "bad chat command: not current member"
+
+      -- pending member and moderators can send messages to each other
+      alice ##> "/_send #1(_support:5) text 5"
+      alice <# "#team (support: eve) 5"
+      [cath, dan] *<# "#team (support: eve) alice> 5"
+      eve <# "#team (support) alice> 5"
+
+      cath ##> "/_send #1(_support:5) text 6"
+      cath <# "#team (support: eve) 6"
+      [alice, dan] *<# "#team (support: eve) cath> 6"
+      eve <# "#team (support) cath> 6"
+
+      dan ##> "/_send #1(_support:5) text 7"
+      dan <# "#team (support: eve) 7"
+      [alice, cath] *<# "#team (support: eve) dan> 7"
+      eve <# "#team (support) dan> 7"
+
+      eve ##> "/_send #1(_support) text 8"
+      eve <# "#team (support) 8"
+      [alice, cath, dan] *<# "#team (support: eve) eve> 8"
+
+      (bob </)
+
+      -- deleting support chat with pending member is prohibited
+      alice ##> "/_delete member chat #1 5"
+      alice <## "bad chat command: member is pending"
+
+      -- accept member
+      dan ##> "/_accept member #1 5 member"
+      concurrentlyN_
+        [ dan <## "#team: eve accepted",
+          alice <## "#team: dan accepted eve to the group (will introduce remaining members)",
+          cath <## "#team: dan accepted eve to the group",
+          eve
+            <### [ "#team: you joined the group",
+                   WithTime "#team alice> 1 [>>]",
+                   WithTime "#team bob> 2 [>>]",
+                   WithTime "#team cath> 3 [>>]",
+                   WithTime "#team dan> 4 [>>]",
+                   "#team: member bob (Bob) is connected"
+                 ],
+          do
+            bob <## "#team: alice added eve (Eve) to the group (connecting...)"
+            bob <## "#team: new member eve is connected"
+        ]
+
+      alice #> "#team 9"
+      [bob, cath, dan, eve] *<# "#team alice> 9"
+
+      bob #> "#team 10"
+      [alice, cath, dan, eve] *<# "#team bob> 10"
+
+      cath #> "#team 11"
+      [alice, bob, dan, eve] *<# "#team cath> 11"
+
+      dan #> "#team 12"
+      [alice, bob, cath, eve] *<# "#team dan> 12"
+
+      eve #> "#team 13"
+      [alice, bob, cath, dan] *<# "#team eve> 13"
+
+testGLinkApproveThenReviewMember :: HasCallStack => TestParams -> IO ()
+testGLinkApproveThenReviewMember =
+  testChatCfg5 cfg aliceProfile bobProfile cathProfile danProfile eveProfile $
+    \alice bob cath dan eve -> do
+      createGroup4 "team" alice (bob, GRMember) (cath, GRModerator) (dan, GRModerator)
+
+      alice ##> "/set admission review #team all"
+      alice <## "changed member admission rules"
+      concurrentlyN_
+        [ do
+            bob <## "alice updated group #team:"
+            bob <## "changed member admission rules",
+          do
+            cath <## "alice updated group #team:"
+            cath <## "changed member admission rules",
+          do
+            dan <## "alice updated group #team:"
+            dan <## "changed member admission rules"
+        ]
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+      eve ##> ("/c " <> gLink)
+      eve <## "connection request sent!"
+      alice <## "eve (Eve): accepting request to join group #team..."
+      concurrentlyN_
+        [ alice <## "#team: eve connected and pending approval, use /_accept member #1 5 <role> to accept member",
+          do
+            eve <## "#team: joining the group..."
+            eve <## "#team: you joined the group, pending approval"
+        ]
+
+      -- pending member doesn't see messages sent in group
+      alice #> "#team 1"
+      [bob, cath, dan] *<# "#team alice> 1"
+
+      bob #> "#team 2"
+      [alice, cath, dan] *<# "#team bob> 2"
+
+      cath #> "#team 3"
+      [alice, bob, dan] *<# "#team cath> 3"
+
+      dan #> "#team 4"
+      [alice, bob, cath] *<# "#team dan> 4"
+
+      (eve </)
+
+      -- pending member can't send messages to group
+      eve ##> "#team hello"
+      eve <## "bad chat command: not current member"
+
+      -- pending member and host can send messages to each other
+      alice ##> "/_send #1(_support:5) text 5"
+      alice <# "#team (support: eve) 5"
+      eve <# "#team (support) alice> 5"
+
+      eve ##> "/_send #1(_support) text 6"
+      eve <# "#team (support) 6"
+      alice <# "#team (support: eve) eve> 6"
+
+      (bob </)
+      (cath </)
+      (dan </)
+
+      -- accept member
+      alice ##> "/_accept member #1 5 member"
+      concurrentlyN_
+        [ alice <## "#team: eve accepted and pending review (will introduce moderators)",
+          eve
+            <### [ "#team: alice accepted you to the group, pending review",
+                   "#team: member cath (Catherine) is connected",
+                   "#team: member dan (Daniel) is connected"
+                 ],
+          do
+            cath <## "#team: alice added eve (Eve) to the group (connecting and pending review...), use /_accept member #1 5 <role> to accept member"
+            cath <## "#team: new member eve is connected and pending review, use /_accept member #1 5 <role> to accept member",
+          do
+            dan <## "#team: alice added eve (Eve) to the group (connecting and pending review...), use /_accept member #1 5 <role> to accept member"
+            dan <## "#team: new member eve is connected and pending review, use /_accept member #1 5 <role> to accept member"
+        ]
+
+      -- pending member doesn't see messages sent in group
+      alice #> "#team 7"
+      [bob, cath, dan] *<# "#team alice> 7"
+
+      bob #> "#team 8"
+      [alice, cath, dan] *<# "#team bob> 8"
+
+      cath #> "#team 9"
+      [alice, bob, dan] *<# "#team cath> 9"
+
+      dan #> "#team 10"
+      [alice, bob, cath] *<# "#team dan> 10"
+
+      (eve </)
+
+      -- pending member can't send messages to group
+      eve ##> "#team hello"
+      eve <## "bad chat command: not current member"
+
+      -- pending member and moderators can send messages to each other
+      alice ##> "/_send #1(_support:5) text 11"
+      alice <# "#team (support: eve) 11"
+      [cath, dan] *<# "#team (support: eve) alice> 11"
+      eve <# "#team (support) alice> 11"
+
+      cath ##> "/_send #1(_support:5) text 12"
+      cath <# "#team (support: eve) 12"
+      [alice, dan] *<# "#team (support: eve) cath> 12"
+      eve <# "#team (support) cath> 12"
+
+      dan ##> "/_send #1(_support:5) text 13"
+      dan <# "#team (support: eve) 13"
+      [alice, cath] *<# "#team (support: eve) dan> 13"
+      eve <# "#team (support) dan> 13"
+
+      eve ##> "/_send #1(_support) text 14"
+      eve <# "#team (support) 14"
+      [alice, cath, dan] *<# "#team (support: eve) eve> 14"
+
+      (bob </)
+
+      -- accept member
+      dan ##> "/_accept member #1 5 member"
+      concurrentlyN_
+        [ dan <## "#team: eve accepted",
+          alice <## "#team: dan accepted eve to the group (will introduce remaining members)",
+          cath <## "#team: dan accepted eve to the group",
+          eve
+            <### [ "#team: you joined the group",
+                   WithTime "#team alice> 1 [>>]",
+                   WithTime "#team bob> 2 [>>]",
+                   WithTime "#team cath> 3 [>>]",
+                   WithTime "#team dan> 4 [>>]",
+                   WithTime "#team alice> 7 [>>]",
+                   WithTime "#team bob> 8 [>>]",
+                   WithTime "#team cath> 9 [>>]",
+                   WithTime "#team dan> 10 [>>]",
+                   "#team: member bob (Bob) is connected"
+                 ],
+          do
+            bob <## "#team: alice added eve (Eve) to the group (connecting...)"
+            bob <## "#team: new member eve is connected"
+        ]
+
+      alice #> "#team 15"
+      [bob, cath, dan, eve] *<# "#team alice> 15"
+
+      bob #> "#team 16"
+      [alice, cath, dan, eve] *<# "#team bob> 16"
+
+      cath #> "#team 17"
+      [alice, bob, dan, eve] *<# "#team cath> 17"
+
+      dan #> "#team 18"
+      [alice, bob, cath, eve] *<# "#team dan> 18"
+
+      eve #> "#team 19"
+      [alice, bob, cath, dan] *<# "#team eve> 19"
+  where
+    cfg = testCfg {chatHooks = defaultChatHooks {acceptMember = Just (\_ _ _ -> pure $ Right (GAPendingApproval, GRObserver))}}
+
+testGLinkDeletePendingApprovalMember :: HasCallStack => TestParams -> IO ()
+testGLinkDeletePendingApprovalMember =
+  testChatCfg3 cfg aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup2 "team" alice bob
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+      cath ##> ("/c " <> gLink)
+      cath <## "connection request sent!"
+      alice <## "cath (Catherine): accepting request to join group #team..."
+      concurrentlyN_
+        [ alice <## "#team: cath connected and pending approval, use /_accept member #1 3 <role> to accept member",
+          do
+            cath <## "#team: joining the group..."
+            cath <## "#team: you joined the group, pending approval"
+        ]
+
+      alice ##> "/rm team cath"
+      alice <## "#team: you removed cath from the group"
+      cath <## "#team: alice removed you from the group"
+      cath <## "use /d #team to delete the group"
+  where
+    cfg = testCfg {chatHooks = defaultChatHooks {acceptMember = Just (\_ _ _ -> pure $ Right (GAPendingApproval, GRObserver))}}
+
+testPlanGroupLinkKnown :: HasCallStack => TestParams -> IO ()
+testPlanGroupLinkKnown =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       threadDelay 100000
@@ -3467,16 +3381,16 @@ testPlanGroupLinkNoContactKnown =
       bob <## "group link: known group #team"
       bob <## "use #team <message> to send messages"
 
-testPlanGroupLinkNoContactConnecting :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkNoContactConnecting tmp = do
-  gLink <- withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPlanGroupLinkConnecting :: HasCallStack => TestParams -> IO ()
+testPlanGroupLinkConnecting ps = do
+  gLink <- withNewTestChat ps "alice" aliceProfile $ \alice -> do
     threadDelay 100000
     alice ##> "/g team"
     alice <## "group #team is created"
     alice <## "to add members use /a team <name> or /create link #team"
     alice ##> "/create link #team"
     getGroupLink alice "team" GRMember True
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
     threadDelay 100000
 
     bob ##> ("/c " <> gLink)
@@ -3490,13 +3404,13 @@ testPlanGroupLinkNoContactConnecting tmp = do
     bob <## "group link: connecting, allowed to reconnect"
 
     threadDelay 100000
-  withTestChat tmp "alice" $ \alice -> do
+  withTestChat ps "alice" $ \alice -> do
     alice
       <### [ "1 group links active",
              "#team: group is empty",
              "bob (Bob): accepting request to join group #team..."
            ]
-  withTestChat tmp "bob" $ \bob -> do
+  withTestChat ps "bob" $ \bob -> do
     threadDelay 500000
     bob <## "#team: joining the group..."
     bob <## "#team: you joined the group"
@@ -3514,16 +3428,16 @@ testPlanGroupLinkNoContactConnecting tmp = do
     bob <## "group link: known group #team"
     bob <## "use #team <message> to send messages"
 
-testPlanGroupLinkNoContactConnectingSlow :: HasCallStack => FilePath -> IO ()
-testPlanGroupLinkNoContactConnectingSlow tmp = do
-  gLink <- withNewTestChatCfg tmp testCfgSlow "alice" aliceProfile $ \alice -> do
+testPlanGroupLinkConnectingSlow :: HasCallStack => TestParams -> IO ()
+testPlanGroupLinkConnectingSlow ps = do
+  gLink <- withNewTestChatCfg ps testCfgSlow "alice" aliceProfile $ \alice -> do
     threadDelay 100000
     alice ##> "/g team"
     alice <## "group #team is created"
     alice <## "to add members use /a team <name> or /create link #team"
     alice ##> "/create link #team"
     getGroupLink alice "team" GRMember True
-  withNewTestChatCfg tmp testCfgSlow "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps testCfgSlow "bob" bobProfile $ \bob -> do
     threadDelay 100000
 
     bob ##> ("/c " <> gLink)
@@ -3537,13 +3451,13 @@ testPlanGroupLinkNoContactConnectingSlow tmp = do
     bob <## "group link: connecting, allowed to reconnect"
 
     threadDelay 100000
-  withTestChatCfg tmp testCfgSlow "alice" $ \alice -> do
+  withTestChatCfg ps testCfgSlow "alice" $ \alice -> do
     alice
       <### [ "1 group links active",
              "#team: group is empty",
              "bob (Bob): accepting request to join group #team..."
            ]
-  withTestChatCfg tmp testCfgSlow "bob" $ \bob -> do
+  withTestChatCfg ps testCfgSlow "bob" $ \bob -> do
     threadDelay 500000
     bob <## "#team: joining the group..."
 
@@ -3558,17 +3472,17 @@ testPlanGroupLinkNoContactConnectingSlow tmp = do
     bob <## "group link: connecting to group #team"
 
 #if !defined(dbPostgres)
-testGroupMsgDecryptError :: HasCallStack => FilePath -> IO ()
-testGroupMsgDecryptError tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testGroupMsgDecryptError :: HasCallStack => TestParams -> IO ()
+testGroupMsgDecryptError ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
       alice #> "#team hi"
       bob <# "#team alice> hi"
       bob #> "#team hey"
       alice <# "#team bob> hey"
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       alice #> "#team hello again"
@@ -3577,10 +3491,10 @@ testGroupMsgDecryptError tmp =
       bob #> "#team received!"
       alice <# "#team bob> received!"
 
-setupDesynchronizedRatchet :: HasCallStack => FilePath -> TestCC -> IO ()
-setupDesynchronizedRatchet tmp alice = do
+setupDesynchronizedRatchet :: HasCallStack => TestParams -> TestCC -> IO ()
+setupDesynchronizedRatchet ps alice = do
   copyDb "bob" "bob_old"
-  withTestChat tmp "bob" $ \bob -> do
+  withTestChat ps "bob" $ \bob -> do
     bob <## "1 contacts connected (use /cs for the list)"
     bob <## "#team: connected to server(s)"
     alice #> "#team 1"
@@ -3591,7 +3505,7 @@ setupDesynchronizedRatchet tmp alice = do
     bob <# "#team alice> 3"
     bob #> "#team 4"
     alice <# "#team bob> 4"
-  withTestChat tmp "bob_old" $ \bob -> do
+  withTestChat ps "bob_old" $ \bob -> do
     bob <## "1 contacts connected (use /cs for the list)"
     bob <## "#team: connected to server(s)"
     bob ##> "/sync #team alice"
@@ -3605,21 +3519,22 @@ setupDesynchronizedRatchet tmp alice = do
     bob ##> "/tail #team 1"
     bob <# "#team alice> decryption error, possibly due to the device change (header, 3 messages)"
   where
+    tmp = tmpPath ps
     copyDb from to = do
       copyFile (tmp </> (from <> chatSuffix)) (tmp </> (to <> chatSuffix))
       copyFile (tmp </> (from <> agentSuffix)) (tmp </> (to <> agentSuffix))
 
-testGroupSyncRatchet :: HasCallStack => FilePath -> IO ()
-testGroupSyncRatchet tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testGroupSyncRatchet :: HasCallStack => TestParams -> IO ()
+testGroupSyncRatchet ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
       alice #> "#team hi"
       bob <# "#team alice> hi"
       bob #> "#team hey"
       alice <# "#team bob> hey"
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob_old" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob `send` "#team 1"
@@ -3644,10 +3559,10 @@ testGroupSyncRatchet tmp =
       bob #> "#team received!"
       alice <# "#team bob> received!"
 
-testGroupSyncRatchetCodeReset :: HasCallStack => FilePath -> IO ()
-testGroupSyncRatchetCodeReset tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
+testGroupSyncRatchetCodeReset :: HasCallStack => TestParams -> IO ()
+testGroupSyncRatchetCodeReset ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
       alice #> "#team hi"
       bob <# "#team alice> hi"
@@ -3664,8 +3579,8 @@ testGroupSyncRatchetCodeReset tmp =
       -- connection verified
       bob ##> "/i #team alice"
       aliceInfo bob True
-    setupDesynchronizedRatchet tmp alice
-    withTestChat tmp "bob_old" $ \bob -> do
+    setupDesynchronizedRatchet ps alice
+    withTestChat ps "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob ##> "/sync #team alice"
@@ -3703,7 +3618,7 @@ testGroupSyncRatchetCodeReset tmp =
           | otherwise = "connection not verified, use /code command to see security code"
 #endif
 
-testSetGroupMessageReactions :: HasCallStack => FilePath -> IO ()
+testSetGroupMessageReactions :: HasCallStack => TestParams -> IO ()
 testSetGroupMessageReactions =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -3775,11 +3690,11 @@ testSetGroupMessageReactions =
       cath <# "#team alice> hi"
       cath <## "      👍 1"
 
-testSendGroupDeliveryReceipts :: HasCallStack => FilePath -> IO ()
-testSendGroupDeliveryReceipts tmp =
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+testSendGroupDeliveryReceipts :: HasCallStack => TestParams -> IO ()
+testSendGroupDeliveryReceipts ps =
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
+      withNewTestChatCfg ps cfg "cath" cathProfile $ \cath -> do
         -- turn off contacts receipts for tests
         alice ##> "/_set receipts contacts 1 off"
         alice <## "ok"
@@ -3805,11 +3720,11 @@ testSendGroupDeliveryReceipts tmp =
   where
     cfg = testCfg {showReceipts = True}
 
-testConfigureGroupDeliveryReceipts :: HasCallStack => FilePath -> IO ()
-testConfigureGroupDeliveryReceipts tmp =
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+testConfigureGroupDeliveryReceipts :: HasCallStack => TestParams -> IO ()
+testConfigureGroupDeliveryReceipts ps =
+  withNewTestChatCfg ps cfg "alice" aliceProfile $ \alice -> do
+    withNewTestChatCfg ps cfg "bob" bobProfile $ \bob -> do
+      withNewTestChatCfg ps cfg "cath" cathProfile $ \cath -> do
         -- turn off contacts receipts for tests
         alice ##> "/_set receipts contacts 1 off"
         alice <## "ok"
@@ -3849,14 +3764,10 @@ testConfigureGroupDeliveryReceipts tmp =
           [ alice <## "#club: cath joined the group",
             do
               cath <## "#club: you joined the group"
-              cath <## "#club: member bob_1 (Bob) is connected"
-              cath <## "contact bob_1 is merged into bob"
-              cath <## "use @bob <message> to send messages",
+              cath <## "#club: member bob_1 (Bob) is connected",
             do
               bob <## "#club: alice added cath_1 (Catherine) to the group (connecting...)"
               bob <## "#club: new member cath_1 is connected"
-              bob <## "contact cath_1 is merged into cath"
-              bob <## "use @cath <message> to send messages"
           ]
         threadDelay 1000000
 
@@ -3933,56 +3844,35 @@ testConfigureGroupDeliveryReceipts tmp =
         receipt bob alice cath "team" "25"
         noReceipt bob alice cath "club" "26"
   where
-    cfg = mkCfgCreateGroupDirect $ testCfg {showReceipts = True}
+    cfg = testCfg {showReceipts = True}
     receipt cc1 cc2 cc3 gName msg = do
-      name1 <- userName cc1
       cc1 #> ("#" <> gName <> " " <> msg)
-      cc2 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
-      cc3 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
+      cc2 .<## ("> " <> msg)
+      cc3 .<## ("> " <> msg)
       cc1 % ("#" <> gName <> " " <> msg)
       cc1 ⩗ ("#" <> gName <> " " <> msg)
     partialReceipt cc1 cc2 cc3 gName msg = do
-      name1 <- userName cc1
       cc1 #> ("#" <> gName <> " " <> msg)
-      cc2 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
-      cc3 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
+      cc2 .<## ("> " <> msg)
+      cc3 .<## ("> " <> msg)
       cc1 % ("#" <> gName <> " " <> msg)
     noReceipt cc1 cc2 cc3 gName msg = do
-      name1 <- userName cc1
       cc1 #> ("#" <> gName <> " " <> msg)
-      cc2 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
-      cc3 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
+      cc2 .<## ("> " <> msg)
+      cc3 .<## ("> " <> msg)
       cc1 <// 50000
 
-testNoGroupDirectConns :: HasCallStack => VersionRangeChat -> VersionRangeChat -> VersionRangeChat -> Bool -> FilePath -> IO ()
-testNoGroupDirectConns hostVRange mem2VRange mem3VRange noDirectConns tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = hostVRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = mem2VRange} "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp testCfg {chatVRange = mem3VRange} "cath" cathProfile $ \cath -> do
-        createGroup3 "team" alice bob cath
-        if noDirectConns
-          then contactsDontExist bob cath
-          else contactsExist bob cath
-  where
-    contactsDontExist bob cath = do
+testNoGroupDirectConns :: HasCallStack => TestParams -> IO ()
+testNoGroupDirectConns =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
       bob ##> "/contacts"
       bob <## "alice (Alice)"
       cath ##> "/contacts"
       cath <## "alice (Alice)"
-    contactsExist bob cath = do
-      bob ##> "/contacts"
-      bob
-        <### [ "alice (Alice)",
-               "cath (Catherine)"
-             ]
-      cath ##> "/contacts"
-      cath
-        <### [ "alice (Alice)",
-               "bob (Bob)"
-             ]
-      bob <##> cath
 
-testNoDirectDifferentLDNs :: HasCallStack => FilePath -> IO ()
+testNoDirectDifferentLDNs :: HasCallStack => TestParams -> IO ()
 testNoDirectDifferentLDNs =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4052,7 +3942,7 @@ testNoDirectDifferentLDNs =
           bob <# ("#" <> gName <> " " <> cathLDN <> "> hey")
         ]
 
-testMergeMemberExistingContact :: HasCallStack => FilePath -> IO ()
+testMergeMemberExistingContact :: HasCallStack => TestParams -> IO ()
 testMergeMemberExistingContact =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4099,7 +3989,7 @@ testMergeMemberExistingContact =
       alice `hasContactProfiles` ["alice", "bob", "cath"]
       cath `hasContactProfiles` ["cath", "alice", "bob"]
 
-testMergeContactExistingMember :: HasCallStack => FilePath -> IO ()
+testMergeContactExistingMember :: HasCallStack => TestParams -> IO ()
 testMergeContactExistingMember =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4130,7 +4020,7 @@ testMergeContactExistingMember =
       bob `hasContactProfiles` ["alice", "bob", "cath"]
       cath `hasContactProfiles` ["cath", "alice", "bob"]
 
-testMergeContactMultipleMembers :: HasCallStack => FilePath -> IO ()
+testMergeContactMultipleMembers :: HasCallStack => TestParams -> IO ()
 testMergeContactMultipleMembers =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4168,9 +4058,9 @@ testMergeContactMultipleMembers =
       bob `hasContactProfiles` ["alice", "bob", "cath"]
       cath `hasContactProfiles` ["cath", "alice", "bob"]
 
-testMergeGroupLinkHostMultipleContacts :: HasCallStack => FilePath -> IO ()
+testMergeGroupLinkHostMultipleContacts :: HasCallStack => TestParams -> IO ()
 testMergeGroupLinkHostMultipleContacts =
-  testChatCfg2 testCfgGroupLinkViaContact bobProfile cathProfile $
+  testChat2 bobProfile cathProfile $
     \bob cath -> do
       connectUsers bob cath
 
@@ -4195,16 +4085,14 @@ testMergeGroupLinkHostMultipleContacts =
       bob <## "cath_2 (Catherine): accepting request to join group #party..."
       concurrentlyN_
         [ bob
-            <### [ "cath_2 (Catherine): contact is connected",
-                   EndsWith "invited to group #party via your group link",
-                   EndsWith "joined the group",
-                   StartsWith "contact cath_2 is merged into cath",
+            <### [ EndsWith "joined the group",
+                   "contact and member are merged: cath, #party cath_2",
                    StartsWith "use @cath"
                  ],
           cath
-            <### [ "bob_2 (Bob): contact is connected",
+            <### [ "#party: joining the group...",
                    "#party: you joined the group",
-                   StartsWith "contact bob_2 is merged into bob",
+                   "contact and member are merged: bob, #party bob_2",
                    StartsWith "use @bob"
                  ]
         ]
@@ -4217,7 +4105,7 @@ testMergeGroupLinkHostMultipleContacts =
       bob `hasContactProfiles` ["bob", "cath", "cath"]
       cath `hasContactProfiles` ["cath", "bob", "bob"]
 
-testMemberContactMessage :: HasCallStack => FilePath -> IO ()
+testMemberContactMessage :: HasCallStack => TestParams -> IO ()
 testMemberContactMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4284,7 +4172,7 @@ testMemberContactMessage =
       cath #$> ("/_get chat #1 count=1", chat, [(0, "started direct connection with you")])
       bob <##> cath
 
-testMemberContactNoMessage :: HasCallStack => FilePath -> IO ()
+testMemberContactNoMessage :: HasCallStack => TestParams -> IO ()
 testMemberContactNoMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4305,7 +4193,7 @@ testMemberContactNoMessage =
       cath #$> ("/_get chat #1 count=1", chat, [(0, "started direct connection with you")])
       bob <##> cath
 
-testMemberContactProhibitedContactExists :: HasCallStack => FilePath -> IO ()
+testMemberContactProhibitedContactExists :: HasCallStack => TestParams -> IO ()
 testMemberContactProhibitedContactExists =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4318,7 +4206,7 @@ testMemberContactProhibitedContactExists =
       alice <# "@bob hi"
       bob <# "alice> hi"
 
-testMemberContactProhibitedRepeatInv :: HasCallStack => FilePath -> IO ()
+testMemberContactProhibitedRepeatInv :: HasCallStack => TestParams -> IO ()
 testMemberContactProhibitedRepeatInv =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4345,11 +4233,11 @@ testMemberContactProhibitedRepeatInv =
 
       bob <##> cath
 
-testMemberContactInvitedConnectionReplaced :: HasCallStack => FilePath -> IO ()
-testMemberContactInvitedConnectionReplaced tmp = do
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+testMemberContactInvitedConnectionReplaced :: HasCallStack => TestParams -> IO ()
+testMemberContactInvitedConnectionReplaced ps = do
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
+    withNewTestChat ps "bob" bobProfile $ \bob -> do
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
         createGroup3 "team" alice bob cath
 
         alice ##> "/d bob"
@@ -4377,20 +4265,20 @@ testMemberContactInvitedConnectionReplaced tmp = do
         items <- chat <$> getTermLine bob
         items `shouldContain` [(0, "security code changed")]
 
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       subscriptions bob 1
 
       checkConnectionsWork alice bob
 
-  withTestChat tmp "alice" $ \alice -> do
+  withTestChat ps "alice" $ \alice -> do
     subscriptions alice 2
 
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       subscriptions bob 1
 
       checkConnectionsWork alice bob
 
-      withTestChat tmp "cath" $ \cath -> do
+      withTestChat ps "cath" $ \cath -> do
         subscriptions cath 1
 
         -- group messages work
@@ -4416,9 +4304,9 @@ testMemberContactInvitedConnectionReplaced tmp = do
       alice @@@ [("@bob", "hey"), ("@cath", "sent invitation to join group team as admin"), ("#team", "connected")]
       bob @@@ [("@alice", "hey"), ("#team", "started direct connection with you")]
 
-testMemberContactIncognito :: HasCallStack => FilePath -> IO ()
+testMemberContactIncognito :: HasCallStack => TestParams -> IO ()
 testMemberContactIncognito =
-  testChatCfg3 testCfgGroupLinkViaContact aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       -- create group, bob joins incognito
       threadDelay 100000
@@ -4431,15 +4319,10 @@ testMemberContactIncognito =
       bobIncognito <- getTermLine bob
       bob <## "connection request sent incognito!"
       alice <## (bobIncognito <> ": accepting request to join group #team...")
-      _ <- getTermLine bob
       concurrentlyN_
-        [ do
-            alice <## (bobIncognito <> ": contact is connected")
-            alice <## (bobIncognito <> " invited to group #team via your group link")
-            alice <## ("#team: " <> bobIncognito <> " joined the group"),
+        [ alice <## ("#team: " <> bobIncognito <> " joined the group"),
           do
-            bob <## ("alice (Alice): contact is connected, your incognito profile for this contact is " <> bobIncognito)
-            bob <## "use /i alice to print out this incognito profile again"
+            bob <## "#team: joining the group..."
             bob <## ("#team: you joined the group incognito as " <> bobIncognito)
         ]
       -- cath joins incognito
@@ -4447,15 +4330,10 @@ testMemberContactIncognito =
       cathIncognito <- getTermLine cath
       cath <## "connection request sent incognito!"
       alice <## (cathIncognito <> ": accepting request to join group #team...")
-      _ <- getTermLine cath
       concurrentlyN_
-        [ do
-            alice <## (cathIncognito <> ": contact is connected")
-            alice <## (cathIncognito <> " invited to group #team via your group link")
-            alice <## ("#team: " <> cathIncognito <> " joined the group"),
+        [ alice <## ("#team: " <> cathIncognito <> " joined the group"),
           do
-            cath <## ("alice (Alice): contact is connected, your incognito profile for this contact is " <> cathIncognito)
-            cath <## "use /i alice to print out this incognito profile again"
+            cath <## "#team: joining the group..."
             cath <## ("#team: you joined the group incognito as " <> cathIncognito)
             cath <## ("#team: member " <> bobIncognito <> " is connected"),
           do
@@ -4516,7 +4394,7 @@ testMemberContactIncognito =
           bob ?<# ("#team " <> cathIncognito <> "> hey")
         ]
 
-testMemberContactProfileUpdate :: HasCallStack => FilePath -> IO ()
+testMemberContactProfileUpdate :: HasCallStack => TestParams -> IO ()
 testMemberContactProfileUpdate =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4584,13 +4462,13 @@ testMemberContactProfileUpdate =
       alice <# "#team kate> hello there"
       bob <# "#team kate> hello there" -- updated profile
 
-testRecreateMemberContactManyGroups :: HasCallStack => FilePath -> IO ()
+testRecreateMemberContactManyGroups :: HasCallStack => TestParams -> IO ()
 testRecreateMemberContactManyGroups =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       connectUsers alice bob
-      createGroup2' "team" alice bob False
-      createGroup2' "club" alice bob False
+      createGroup2' "team" alice (bob, GRAdmin) False
+      createGroup2' "club" alice (bob, GRAdmin) False
 
       -- alice can message bob via team and via club
       alice ##> "@#team bob 1"
@@ -4617,6 +4495,12 @@ testRecreateMemberContactManyGroups =
       bob ##> "/d alice"
       bob <## "alice: contact is deleted"
 
+      -- group messages work
+      alice #> "#team hello"
+      bob <# "#team alice> hello"
+      bob #> "#team hi there"
+      alice <# "#team bob> hi there"
+
       -- alice creates member contact with bob
       alice ##> "@#team bob hi"
       alice
@@ -4651,7 +4535,7 @@ testRecreateMemberContactManyGroups =
       bob <# "@alice 4"
       alice <# "bob> 4"
 
-testGroupMsgForward :: HasCallStack => FilePath -> IO ()
+testGroupMsgForward :: HasCallStack => TestParams -> IO ()
 testGroupMsgForward =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4679,6 +4563,64 @@ testGroupMsgForward =
       cath <# "#team bob> hi there [>>]"
       cath <# "#team hey team"
 
+testGroupMsgForwardReport :: HasCallStack => TestParams -> IO ()
+testGroupMsgForwardReport =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      setupGroupForwarding3 "team" alice bob cath
+
+      bob #> "#team hi there"
+      alice <# "#team bob> hi there"
+      cath <# "#team bob> hi there [>>]"
+
+      alice ##> "/mr team bob moderator"
+      concurrentlyN_
+        [ alice <## "#team: you changed the role of bob to moderator",
+          bob <## "#team: alice changed your role from admin to moderator",
+          cath <## "#team: alice changed the role of bob from admin to moderator"
+        ]
+
+      alice ##> "/mr team cath member"
+      concurrentlyN_
+        [ alice <## "#team: you changed the role of cath to member",
+          bob <## "#team: alice changed the role of cath from admin to member",
+          cath <## "#team: alice changed your role from admin to member"
+        ]
+      cath ##> "/report #team content hi there"
+      cath <# "#team (support) > bob hi there"
+      cath <## "      report content"
+      concurrentlyN_
+        [ do
+            alice <# "#team (support: cath) cath> > bob hi there"
+            alice <## "      report content",
+          do
+            bob <# "#team (support: cath) cath!> > bob hi there [>>]"
+            bob <## "      report content [>>]"
+        ]
+
+      alice ##> "/mr team bob member"
+      concurrentlyN_
+        [ alice <## "#team: you changed the role of bob to member",
+          bob <## "#team: alice changed your role from moderator to member",
+          cath <## "#team: alice changed the role of bob from moderator to member"
+        ]
+
+      cath ##> "/report #team content hi there"
+      cath <# "#team (support) > bob hi there"
+      cath <## "      report content"
+      concurrentlyN_
+        [ do
+            alice <# "#team (support: cath) cath> > bob hi there"
+            alice <## "      report content",
+          (bob </)
+        ]
+
+      -- regular messages are still forwarded
+
+      cath #> "#team hey team"
+      alice <# "#team cath> hey team"
+      bob <# "#team cath> hey team [>>]"
+
 setupGroupForwarding3 :: String -> TestCC -> TestCC -> TestCC -> IO ()
 setupGroupForwarding3 gName alice bob cath = do
   createGroup3 gName alice bob cath
@@ -4691,7 +4633,7 @@ setupGroupForwarding3 gName alice bob cath = do
   void $ withCCTransaction alice $ \db ->
     DB.execute_ db "UPDATE group_member_intros SET intro_status='fwd'"
 
-testGroupMsgForwardDeduplicate :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardDeduplicate :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardDeduplicate =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4728,7 +4670,7 @@ testGroupMsgForwardDeduplicate =
       cath <#. "#team bob> hi there"
       cath <# "#team hey team"
 
-testGroupMsgForwardEdit :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardEdit :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardEdit =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4751,7 +4693,7 @@ testGroupMsgForwardEdit =
       cath ##> "/tail #team 1"
       cath <# "#team bob> hello there [>>]"
 
-testGroupMsgForwardReaction :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardReaction :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardReaction =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4768,11 +4710,12 @@ testGroupMsgForwardReaction =
       bob <# "#team cath> > bob hi there"
       bob <## "    + 👍"
 
-testGroupMsgForwardDeletion :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardDeletion :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardDeletion =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       bob #> "#team hi there"
       alice <# "#team bob> hi there"
@@ -4783,7 +4726,7 @@ testGroupMsgForwardDeletion =
       alice <# "#team bob> [marked deleted] hi there"
       cath <# "#team bob> [marked deleted] hi there" -- TODO show as forwarded
 
-testGroupMsgForwardFile :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardFile :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardFile =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -4808,18 +4751,18 @@ testGroupMsgForwardFile =
       dest <- B.readFile "./tests/tmp/test.jpg"
       dest `shouldBe` src
 
-testGroupMsgForwardChangeRole :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardChangeRole :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardChangeRole =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       cath ##> "/mr #team bob member"
-      cath <## "#team: you changed the role of bob from admin to member"
+      cath <## "#team: you changed the role of bob to member"
       alice <## "#team: cath changed the role of bob from admin to member"
       bob <## "#team: cath changed your role from admin to member" -- TODO show as forwarded
 
-testGroupMsgForwardNewMember :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardNewMember :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardNewMember =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -4860,7 +4803,7 @@ testGroupMsgForwardNewMember =
                "dan (Daniel): member"
              ]
 
-testGroupMsgForwardLeave :: HasCallStack => FilePath -> IO ()
+testGroupMsgForwardLeave :: HasCallStack => TestParams -> IO ()
 testGroupMsgForwardLeave =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4872,7 +4815,7 @@ testGroupMsgForwardLeave =
       alice <## "#team: bob left the group"
       cath <## "#team: bob left the group"
 
-testGroupHistory :: HasCallStack => FilePath -> IO ()
+testGroupHistory :: HasCallStack => TestParams -> IO ()
 testGroupHistory =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4916,7 +4859,7 @@ testGroupHistory =
       cath #> "#team 3"
       [alice, bob] *<# "#team cath> 3"
 
-testGroupHistoryGroupLink :: HasCallStack => FilePath -> IO ()
+testGroupHistoryGroupLink :: HasCallStack => TestParams -> IO ()
 testGroupHistoryGroupLink =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -4964,7 +4907,7 @@ testGroupHistoryGroupLink =
       cath #> "#team 3"
       [alice, bob] *<# "#team cath> 3"
 
-testGroupHistoryPreferenceOff :: HasCallStack => FilePath -> IO ()
+testGroupHistoryPreferenceOff :: HasCallStack => TestParams -> IO ()
 testGroupHistoryPreferenceOff =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -5049,7 +4992,7 @@ testGroupHistoryPreferenceOff =
       cc <## "#team: alice added dan (Daniel) to the group (connecting...)"
       cc <## "#team: new member dan is connected"
 
-testGroupHistoryHostFile :: HasCallStack => FilePath -> IO ()
+testGroupHistoryHostFile :: HasCallStack => TestParams -> IO ()
 testGroupHistoryHostFile =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5088,7 +5031,7 @@ testGroupHistoryHostFile =
       dest <- B.readFile "./tests/tmp/test.jpg"
       dest `shouldBe` src
 
-testGroupHistoryMemberFile :: HasCallStack => FilePath -> IO ()
+testGroupHistoryMemberFile :: HasCallStack => TestParams -> IO ()
 testGroupHistoryMemberFile =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5127,7 +5070,7 @@ testGroupHistoryMemberFile =
       dest <- B.readFile "./tests/tmp/test.jpg"
       dest `shouldBe` src
 
-testGroupHistoryLargeFile :: HasCallStack => FilePath -> IO ()
+testGroupHistoryLargeFile :: HasCallStack => TestParams -> IO ()
 testGroupHistoryLargeFile =
   testChatCfg3 cfg aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5185,7 +5128,7 @@ testGroupHistoryLargeFile =
   where
     cfg = testCfg {xftpDescrPartSize = 200}
 
-testGroupHistoryMultipleFiles :: HasCallStack => FilePath -> IO ()
+testGroupHistoryMultipleFiles :: HasCallStack => TestParams -> IO ()
 testGroupHistoryMultipleFiles =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5265,7 +5208,7 @@ testGroupHistoryMultipleFiles =
                           ((0, "hey bob"), Just "./tests/tmp/testfile_alice_1")
                         ]
 
-testGroupHistoryFileCancel :: HasCallStack => FilePath -> IO ()
+testGroupHistoryFileCancel :: HasCallStack => TestParams -> IO ()
 testGroupHistoryFileCancel =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5320,7 +5263,7 @@ testGroupHistoryFileCancel =
             bob <## "#team: new member cath is connected"
         ]
 
-testGroupHistoryFileCancelNoText :: HasCallStack => FilePath -> IO ()
+testGroupHistoryFileCancelNoText :: HasCallStack => TestParams -> IO ()
 testGroupHistoryFileCancelNoText =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> withXFTPServer $ do
@@ -5379,7 +5322,7 @@ testGroupHistoryFileCancelNoText =
             bob <## "#team: new member cath is connected"
         ]
 
-testGroupHistoryQuotes :: HasCallStack => FilePath -> IO ()
+testGroupHistoryQuotes :: HasCallStack => TestParams -> IO ()
 testGroupHistoryQuotes =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -5408,7 +5351,7 @@ testGroupHistoryQuotes =
       alice `send` "> #team @bob (BOB) 2"
       alice <# "#team > bob BOB"
       alice <## "      2"
-      bob <# "#team alice> > bob BOB"
+      bob <# "#team alice!> > bob BOB"
       bob <## "      2"
 
       threadDelay 1000000
@@ -5416,7 +5359,7 @@ testGroupHistoryQuotes =
       bob `send` "> #team @alice (ALICE) 3"
       bob <# "#team > alice ALICE"
       bob <## "      3"
-      alice <# "#team bob> > alice ALICE"
+      alice <# "#team bob!> > alice ALICE"
       alice <## "      3"
 
       threadDelay 1000000
@@ -5485,11 +5428,12 @@ testGroupHistoryQuotes =
                           ((0, "4"), Just (0, "BOB"))
                         ]
 
-testGroupHistoryDeletedMessage :: HasCallStack => FilePath -> IO ()
+testGroupHistoryDeletedMessage :: HasCallStack => TestParams -> IO ()
 testGroupHistoryDeletedMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup2 "team" alice bob
+      -- disableFullDeletion2 "team" alice bob
 
       alice #> "#team hello"
       bob <# "#team alice> hello"
@@ -5523,7 +5467,7 @@ testGroupHistoryDeletedMessage =
       r `shouldContain` [(0, "hello")]
       r `shouldNotContain` [(0, "hey!")]
 
-testGroupHistoryDisappearingMessage :: HasCallStack => FilePath -> IO ()
+testGroupHistoryDisappearingMessage :: HasCallStack => TestParams -> IO ()
 testGroupHistoryDisappearingMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -5607,7 +5551,7 @@ testGroupHistoryDisappearingMessage =
       r2 `shouldNotContain` [(0, "2")]
       r2 `shouldNotContain` [(0, "3")]
 
-testGroupHistoryWelcomeMessage :: HasCallStack => FilePath -> IO ()
+testGroupHistoryWelcomeMessage :: HasCallStack => TestParams -> IO ()
 testGroupHistoryWelcomeMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -5664,7 +5608,7 @@ testGroupHistoryWelcomeMessage =
       cath #> "#team 3"
       [alice, bob] *<# "#team cath> 3"
 
-testGroupHistoryUnknownMember :: HasCallStack => FilePath -> IO ()
+testGroupHistoryUnknownMember :: HasCallStack => TestParams -> IO ()
 testGroupHistoryUnknownMember =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -5732,7 +5676,7 @@ testGroupHistoryUnknownMember =
       dan #> "#team 3"
       [alice, cath] *<# "#team dan> 3"
 
-testMembershipProfileUpdateNextGroupMessage :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateNextGroupMessage :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateNextGroupMessage =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -5830,12 +5774,12 @@ testMembershipProfileUpdateNextGroupMessage =
       rc <- chat <$> getTermLine cath
       rc `shouldContain` [(0, "updated profile")]
 
-testMembershipProfileUpdateSameMember :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateSameMember :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateSameMember =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
       createGroup2 "team" alice bob
-      createGroup2' "club" alice bob False
+      createGroup2' "club" alice (bob, GRAdmin) False
 
       alice ##> "/d bob"
       alice <## "bob: contact is deleted"
@@ -5888,7 +5832,7 @@ testMembershipProfileUpdateSameMember =
       rClub <- chat <$> getTermLine bob
       rClub `shouldNotContain` [(0, "updated profile")]
 
-testMembershipProfileUpdateContactActive :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateContactActive :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateContactActive =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -5959,7 +5903,7 @@ testMembershipProfileUpdateContactActive =
       bob <## "connection not verified, use /code command to see security code"
       bob <## currentChatVRangeInfo
 
-testMembershipProfileUpdateContactDeleted :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateContactDeleted :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateContactDeleted =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -6038,7 +5982,7 @@ testMembershipProfileUpdateContactDeleted =
       bob <## "connection not verified, use /code command to see security code"
       bob <## currentChatVRangeInfo
 
-testMembershipProfileUpdateContactDisabled :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateContactDisabled :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateContactDisabled =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -6093,7 +6037,7 @@ testMembershipProfileUpdateContactDisabled =
       rGrp <- chat <$> getTermLine bob
       rGrp `shouldContain` [(0, "updated profile")]
 
-testMembershipProfileUpdateNoChangeIgnored :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateNoChangeIgnored :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateNoChangeIgnored =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -6132,7 +6076,7 @@ testMembershipProfileUpdateNoChangeIgnored =
       rGrp <- chat <$> getTermLine bob
       rGrp `shouldNotContain` [(0, "updated profile")]
 
-testMembershipProfileUpdateContactLinkIgnored :: HasCallStack => FilePath -> IO ()
+testMembershipProfileUpdateContactLinkIgnored :: HasCallStack => TestParams -> IO ()
 testMembershipProfileUpdateContactLinkIgnored =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -6174,11 +6118,12 @@ testMembershipProfileUpdateContactLinkIgnored =
       bob <## "connection not verified, use /code command to see security code"
       bob <## currentChatVRangeInfo
 
-testBlockForAllMarkedBlocked :: HasCallStack => FilePath -> IO ()
+testBlockForAllMarkedBlocked :: HasCallStack => TestParams -> IO ()
 testBlockForAllMarkedBlocked =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       threadDelay 1000000
 
@@ -6261,11 +6206,12 @@ testBlockForAllMarkedBlocked =
             )
       bob #$> ("/_get chat #1 count=4", chat, [(1, "1"), (1, "2"), (1, "3"), (1, "4")])
 
-testBlockForAllFullDelete :: HasCallStack => FilePath -> IO ()
+testBlockForAllFullDelete :: HasCallStack => TestParams -> IO ()
 testBlockForAllFullDelete =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       alice ##> "/set delete #team on"
       alice <## "updated group preferences:"
@@ -6341,11 +6287,12 @@ testBlockForAllFullDelete =
             )
       bob #$> ("/_get chat #1 count=4", chat, [(1, "1"), (1, "2"), (1, "3"), (1, "4")])
 
-testBlockForAllAnotherAdminUnblocks :: HasCallStack => FilePath -> IO ()
+testBlockForAllAnotherAdminUnblocks :: HasCallStack => TestParams -> IO ()
 testBlockForAllAnotherAdminUnblocks =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       bob #> "#team 1"
       [alice, cath] *<# "#team bob> 1"
@@ -6369,11 +6316,12 @@ testBlockForAllAnotherAdminUnblocks =
 
       bob #$> ("/_get chat #1 count=3", chat, [(1, "1"), (1, "2"), (1, "3")])
 
-testBlockForAllBeforeJoining :: HasCallStack => FilePath -> IO ()
+testBlockForAllBeforeJoining :: HasCallStack => TestParams -> IO ()
 testBlockForAllBeforeJoining =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       createGroup3 "team" alice bob cath
+      -- disableFullDeletion3 "team" alice bob cath
 
       bob #> "#team 1"
       [alice, cath] *<# "#team bob> 1"
@@ -6437,17 +6385,12 @@ testBlockForAllBeforeJoining =
       cc <## "#team: alice added dan (Daniel) to the group (connecting...)"
       cc <## "#team: new member dan is connected"
 
-testBlockForAllCantRepeat :: HasCallStack => FilePath -> IO ()
-testBlockForAllCantRepeat =
+testBlockForAllRepeat :: HasCallStack => TestParams -> IO ()
+testBlockForAllRepeat =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
-
-      alice ##> "/unblock for all #team bob"
-      alice <## "bad chat command: already unblocked"
-
-      cath ##> "/unblock for all #team bob"
-      cath <## "bad chat command: already unblocked"
+      -- disableFullDeletion3 "team" alice bob cath
 
       bob #> "#team 1"
       [alice, cath] *<# "#team bob> 1"
@@ -6458,10 +6401,10 @@ testBlockForAllCantRepeat =
       bob <// 50000
 
       alice ##> "/block for all #team bob"
-      alice <## "bad chat command: already blocked"
+      alice <## "#team: you blocked bob"
 
       cath ##> "/block for all #team bob"
-      cath <## "bad chat command: already blocked"
+      cath <## "#team: you blocked bob"
 
       bob #> "#team 2"
       alice <# "#team bob> 2 [blocked by admin] <muted>"
@@ -6473,21 +6416,97 @@ testBlockForAllCantRepeat =
       bob <// 50000
 
       alice ##> "/unblock for all #team bob"
-      alice <## "bad chat command: already unblocked"
+      alice <## "#team: you unblocked bob"
 
       cath ##> "/unblock for all #team bob"
-      cath <## "bad chat command: already unblocked"
+      cath <## "#team: you unblocked bob"
 
       bob #> "#team 3"
       [alice, cath] *<# "#team bob> 3"
 
       bob #$> ("/_get chat #1 count=3", chat, [(1, "1"), (1, "2"), (1, "3")])
 
-testGroupMemberInactive :: HasCallStack => FilePath -> IO ()
-testGroupMemberInactive tmp = do
+testBlockForAllMultipleMembers :: HasCallStack => TestParams -> IO ()
+testBlockForAllMultipleMembers =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
+    \alice bob cath dan -> do
+      createGroup3 "team" alice bob cath
+
+      connectUsers alice dan
+      addMember "team" alice dan GRMember
+      dan ##> "/j team"
+      concurrentlyN_
+        [ alice <## "#team: dan joined the group",
+          do
+            dan <## "#team: you joined the group"
+            dan
+              <### [ "#team: member bob (Bob) is connected",
+                     "#team: member cath (Catherine) is connected"
+                   ],
+          do
+            bob <## "#team: alice added dan (Daniel) to the group (connecting...)"
+            bob <## "#team: new member dan is connected",
+          do
+            cath <## "#team: alice added dan (Daniel) to the group (connecting...)"
+            cath <## "#team: new member dan is connected"
+        ]
+
+      -- lower roles to for batch block to be allowed (can't batch block if admins are selected)
+      alice ##> "/mr team bob member"
+      concurrentlyN_
+        [ alice <## "#team: you changed the role of bob to member",
+          bob <## "#team: alice changed your role from admin to member",
+          cath <## "#team: alice changed the role of bob from admin to member",
+          dan <## "#team: alice changed the role of bob from admin to member"
+        ]
+      alice ##> "/mr team cath member"
+      concurrentlyN_
+        [ alice <## "#team: you changed the role of cath to member",
+          bob <## "#team: alice changed the role of cath from admin to member",
+          cath <## "#team: alice changed your role from admin to member",
+          dan <## "#team: alice changed the role of cath from admin to member"
+        ]
+
+      bob #> "#team 1"
+      [alice, cath, dan] *<# "#team bob> 1"
+
+      cath #> "#team 2"
+      [alice, bob, dan] *<# "#team cath> 2"
+
+      alice ##> "/_block #1 2,3 blocked=on"
+      alice <## "#team: you blocked 2 members"
+      dan <## "#team: alice blocked bob"
+      dan <## "#team: alice blocked cath"
+      bob <// 50000
+      cath <// 50000
+
+      -- bob and cath don't know they are blocked and receive each other's messages
+      bob #> "#team 3"
+      [alice, dan] *<# "#team bob> 3 [blocked by admin] <muted>"
+      cath <# "#team bob> 3"
+
+      cath #> "#team 4"
+      [alice, dan] *<# "#team cath> 4 [blocked by admin] <muted>"
+      bob <# "#team cath> 4"
+
+      alice ##> "/_block #1 2,3 blocked=off"
+      alice <## "#team: you unblocked 2 members"
+      dan <## "#team: alice unblocked bob"
+      dan <## "#team: alice unblocked cath"
+      bob <// 50000
+      cath <// 50000
+
+      bob #> "#team 5"
+      [alice, cath, dan] *<# "#team bob> 5"
+
+      cath #> "#team 6"
+      [alice, bob, dan] *<# "#team cath> 6"
+
+testGroupMemberInactive :: HasCallStack => TestParams -> IO ()
+testGroupMemberInactive ps = do
   withSmpServer' serverCfg' $ do
-    withNewTestChatCfgOpts tmp cfg' opts' "alice" aliceProfile $ \alice -> do
-      withNewTestChatCfgOpts tmp cfg' opts' "bob" bobProfile $ \bob -> do
+    withNewTestChatCfgOpts ps cfg' opts' "alice" aliceProfile $ \alice -> do
+      withNewTestChatCfgOpts ps cfg' opts' "bob" bobProfile $ \bob -> do
         createGroup2 "team" alice bob
 
         alice #> "#team hi"
@@ -6510,7 +6529,7 @@ testGroupMemberInactive tmp = do
 
       threadDelay 1500000
 
-      withTestChatCfgOpts tmp cfg' opts' "bob" $ \bob -> do
+      withTestChatCfgOpts ps cfg' opts' "bob" $ \bob -> do
         bob <## "1 contacts connected (use /cs for the list)"
         bob <## "#team: connected to server(s)"
         bob <# "#team alice> 1"
@@ -6553,20 +6572,21 @@ testGroupMemberInactive tmp = do
               }
         }
 
-testGroupMemberReports :: HasCallStack => FilePath -> IO ()
+testGroupMemberReports :: HasCallStack => TestParams -> IO ()
 testGroupMemberReports =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       createGroup3 "jokes" alice bob cath
+      -- disableFullDeletion3 "jokes" alice bob cath
       alice ##> "/mr jokes bob moderator"
       concurrentlyN_
-        [ alice <## "#jokes: you changed the role of bob from admin to moderator",
+        [ alice <## "#jokes: you changed the role of bob to moderator",
           bob <## "#jokes: alice changed your role from admin to moderator",
           cath <## "#jokes: alice changed the role of bob from admin to moderator"
         ]
       alice ##> "/mr jokes cath member"
       concurrentlyN_
-        [ alice <## "#jokes: you changed the role of cath from admin to member",
+        [ alice <## "#jokes: you changed the role of cath to member",
           bob <## "#jokes: alice changed the role of cath from admin to member",
           cath <## "#jokes: alice changed your role from admin to member"
         ]
@@ -6599,14 +6619,14 @@ testGroupMemberReports =
           dan <# "#jokes cath> inappropriate joke"
         ]
       dan ##> "/report #jokes content inappropriate joke"
-      dan <# "#jokes > cath inappropriate joke"
+      dan <# "#jokes (support) > cath inappropriate joke"
       dan <## "      report content"
       concurrentlyN_
         [ do
-            alice <# "#jokes dan> > cath inappropriate joke"
+            alice <# "#jokes (support: dan) dan> > cath inappropriate joke"
             alice <## "      report content",
           do
-            bob <# "#jokes dan> > cath inappropriate joke"
+            bob <# "#jokes (support: dan) dan> > cath inappropriate joke"
             bob <## "      report content",
           (cath </)
         ]
@@ -6616,7 +6636,7 @@ testGroupMemberReports =
       alice ##> "\\\\ #jokes cath inappropriate joke"
       concurrentlyN_
         [ do
-            alice <## "#jokes: 1 messages deleted by member alice"
+            alice <## "#jokes: 1 messages deleted by user"
             alice <## "message marked deleted by you",
           do
             bob <# "#jokes cath> [marked deleted by alice] inappropriate joke"
@@ -6629,3 +6649,534 @@ testGroupMemberReports =
       alice #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by you]")])
       bob #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by alice]")])
       dan #$> ("/_get chat #1 content=report count=100", chat, [(1, "report content [marked deleted by alice]")])
+      -- delete all reports locally
+      alice #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      bob #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      dan #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      cath #> "#jokes ok joke"
+      concurrentlyN_
+        [ alice <# "#jokes cath> ok joke",
+          bob <# "#jokes cath> ok joke",
+          dan <# "#jokes cath> ok joke"
+        ]
+      dan ##> "/report #jokes content ok joke"
+      dan <# "#jokes (support) > cath ok joke"
+      dan <## "      report content"
+      dan ##> "/report #jokes spam ok joke"
+      dan <# "#jokes (support) > cath ok joke"
+      dan <## "      report spam"
+      concurrentlyN_
+        [ do
+            alice <# "#jokes (support: dan) dan> > cath ok joke"
+            alice <## "      report content"
+            alice <# "#jokes (support: dan) dan> > cath ok joke"
+            alice <## "      report spam",
+          do
+            bob <# "#jokes (support: dan) dan> > cath ok joke"
+            bob <## "      report content"
+            bob <# "#jokes (support: dan) dan> > cath ok joke"
+            bob <## "      report spam",
+          (cath </)
+        ]
+      alice #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content"), (0, "report spam")])
+      bob #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content"), (0, "report spam")])
+      cath #$> ("/_get chat #1 content=report count=100", chat, [])
+      dan #$> ("/_get chat #1 content=report count=100", chat, [(1, "report content"), (1, "report spam")])
+      alice ##> "/_archive reports #1"
+      alice <## "#jokes: 2 messages deleted by user"
+      (bob </)
+      alice #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by you]"), (0, "report spam [marked deleted by you]")])
+      bob #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content"), (0, "report spam")])
+      bob ##> "/_archive reports #1"
+      bob <## "#jokes: 2 messages deleted by user"
+      bob #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by you]"), (0, "report spam [marked deleted by you]")])
+      -- delete reports for all admins
+      alice #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      bob #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      dan #$> ("/clear #jokes", id, "#jokes: all messages are removed locally ONLY")
+      cath #> "#jokes ok joke 2"
+      concurrentlyN_
+        [ alice <# "#jokes cath> ok joke 2",
+          bob <# "#jokes cath> ok joke 2",
+          dan <# "#jokes cath> ok joke 2"
+        ]
+      dan ##> "/report #jokes content ok joke 2"
+      dan <# "#jokes (support) > cath ok joke 2"
+      dan <## "      report content"
+      concurrentlyN_
+        [ do
+            alice <# "#jokes (support: dan) dan> > cath ok joke 2"
+            alice <## "      report content",
+          do
+            bob <# "#jokes (support: dan) dan> > cath ok joke 2"
+            bob <## "      report content",
+          (cath </)
+        ]
+      alice ##> "/last_item_id"
+      i :: ChatItemId <- read <$> getTermLine alice
+      alice ##> ("/_delete reports #1 " <> show i <> " broadcast")
+      alice <## "message marked deleted by you"
+      bob <# "#jokes (support: dan) dan> [marked deleted by alice] report content"
+      alice #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by you]")])
+      bob #$> ("/_get chat #1 content=report count=100", chat, [(0, "report content [marked deleted by alice]")])
+      dan #$> ("/_get chat #1 content=report count=100", chat, [(1, "report content")])
+
+testMemberMention :: HasCallStack => TestParams -> IO ()
+testMemberMention =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      alice #> "#team hello!"
+      concurrentlyN_
+        [ bob <# "#team alice> hello!",
+          cath <# "#team alice> hello!"
+        ]
+      bob #> "#team hello @alice"
+      concurrentlyN_
+        [ alice <# "#team bob!> hello @alice",
+          cath <# "#team bob> hello @alice"
+        ]
+      alice #> "#team hello @bob @bob @cath"
+      concurrentlyN_
+        [ bob <# "#team alice!> hello @bob @bob @cath",
+          cath <# "#team alice!> hello @bob @bob @cath"
+        ]
+      cath #> "#team hello @Alice" -- not a mention
+      concurrentlyN_
+        [ alice <# "#team cath> hello @Alice",
+          bob <# "#team cath> hello @Alice"
+        ]
+      cath ##> "! #team hello @alice" -- make it a mention
+      cath <# "#team [edited] hello @alice"
+      concurrentlyN_
+        [ alice <# "#team cath> [edited] hello @alice",
+          bob <# "#team cath> [edited] hello @alice"
+        ]
+      cath ##> "! #team hello @alice @bob" -- add a mention
+      cath <# "#team [edited] hello @alice @bob"
+      concurrentlyN_
+        [ alice <# "#team cath> [edited] hello @alice @bob",
+          bob <# "#team cath> [edited] hello @alice @bob"
+        ]
+
+testForwardQuoteMention :: HasCallStack => TestParams -> IO ()
+testForwardQuoteMention =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      bob #> "#team hello @alice @cath"
+      concurrentlyN_
+        [ alice <# "#team bob!> hello @alice @cath",
+          cath <# "#team bob!> hello @alice @cath"
+        ]
+      -- quote mentions
+      alice `send` "> #team @bob (hello) hi there!"
+      alice <# "#team > bob hello @alice @cath"
+      alice <## "      hi there!"
+      concurrently_
+        ( do
+            bob <# "#team alice!> > bob hello @alice @cath"
+            bob <## "      hi there!"
+        )
+        ( do
+            cath <# "#team alice> > bob hello @alice @cath"
+            cath <## "      hi there!"
+        )
+      -- forward mentions to the same group
+      alice `send` "#team <- #team hello"
+      alice <# "#team <- #team"
+      alice <## "      hello @alice @cath"
+      concurrentlyN_
+        [ do
+            bob <# "#team alice> -> forwarded"
+            bob <## "      hello @alice @cath",
+          do
+            cath <# "#team alice!> -> forwarded"
+            cath <## "      hello @alice @cath"          
+        ]
+      -- forward mentions
+      alice `send` "@bob <- #team hello"
+      alice <# "@bob <- #team"
+      alice <## "      hello @alice @cath"
+      bob <# "alice> -> forwarded"
+      bob <## "      hello @alice @cath"
+      -- member renamed to duplicate name
+      cath ##> "/p alice_1"
+      cath <## "user profile is changed to alice_1 (your 1 contacts are notified)"
+      alice <## "contact cath changed to alice_1"
+      alice <## "use @alice_1 <message> to send messages"
+      -- mention changed in quoted mentions
+      alice `send` "> #team @bob (hello) hi there!"
+      alice <# "#team > bob hello @alice @alice_1"
+      alice <## "      hi there!"
+      concurrently_
+        ( do
+            bob <# "#team alice!> > bob hello @alice @alice_1"
+            bob <## "      hi there!"
+        )
+        ( do
+            cath <# "#team alice> > bob hello @alice @alice_1"
+            cath <## "      hi there!"
+        )
+      -- mention changed in forwarded message
+      alice `send` "@bob <- #team hello"
+      alice <# "@bob <- #team"
+      alice <## "      hello @alice @alice_1"
+      bob <# "alice> -> forwarded"
+      bob <## "      hello @alice @alice_1"
+
+testGroupHistoryWithMentions :: HasCallStack => TestParams -> IO ()
+testGroupHistoryWithMentions =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup2 "team" alice bob
+
+      threadDelay 1000000
+
+      alice #> "#team hello @bob"
+      bob <# "#team alice!> hello @bob"
+
+      bob ##> "/p robert"
+      bob <## "user profile is changed to robert (your 1 contacts are notified)"
+      alice <## "contact bob changed to robert"
+      alice <## "use @robert <message> to send messages"
+
+      alice ##> "/create link #team"
+      gLink <- getGroupLink alice "team" GRMember True
+
+      cath ##> ("/c " <> gLink)
+      cath <## "connection request sent!"
+      alice <## "cath (Catherine): accepting request to join group #team..."
+      concurrentlyN_
+        [ alice <## "#team: cath joined the group",
+          cath
+            <### [ "#team: joining the group...",
+                   "#team: you joined the group",
+                   WithTime "#team alice> hello @robert [>>]",
+                   "#team: member robert is connected"
+                 ],
+          do
+            bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
+            bob <## "#team: new member cath is connected"
+        ]
+
+testUniqueMsgMentions :: SpecWith TestParams
+testUniqueMsgMentions = do
+  it "1 correct mention" $ \_ ->
+    uniqueMsgMentions 2 (mm [("alice", "abcd")]) ["alice"]
+      `shouldBe` (mm [("alice", "abcd")])
+  it "2 correct mentions" $ \_ ->
+    uniqueMsgMentions 2 (mm [("alice", "abcd"), ("bob", "efgh")]) ["alice", "bob"]
+      `shouldBe` (mm [("alice", "abcd"), ("bob", "efgh")])
+  it "2 correct mentions with repetition" $ \_ ->
+    uniqueMsgMentions 2 (mm [("alice", "abcd"), ("bob", "efgh")]) ["alice", "alice", "alice", "bob", "bob", "bob"]
+      `shouldBe` (mm [("alice", "abcd"), ("bob", "efgh")])
+  it "too many mentions - drop extras" $ \_ ->
+    uniqueMsgMentions 3 (mm [("a", "abcd"), ("b", "efgh"), ("c", "1234"), ("d", "5678")]) ["a", "a", "a", "b", "b", "c", "d"]
+      `shouldBe` (mm [("a", "abcd"), ("b", "efgh"), ("c", "1234")])
+  it "repeated-with-different name - drop extras" $ \_ ->
+    uniqueMsgMentions 2 (mm [("alice", "abcd"), ("alice2", "abcd"), ("bob", "efgh"), ("bob2", "efgh")]) ["alice", "alice2", "bob", "bob2"]
+      `shouldBe` (mm [("alice", "abcd"), ("bob", "efgh")])
+  where
+    mm = M.fromList . map (second $ MsgMention . MemberId)
+
+testUpdatedMentionNames :: SpecWith TestParams
+testUpdatedMentionNames = do
+  it "keep mentions" $ \_ -> do
+    test (mm [("alice", Just "alice"), ("bob", Nothing)]) "hello @alice @bob"
+      `shouldBe` "hello @alice @bob"
+    test (mm [("alice_1", Just "alice"), ("alice", Just "alice")]) "hello @alice @alice_1"
+      `shouldBe` "hello @alice @alice_1"
+  it "keep non-mentions" $ \_ -> do
+    test (mm []) "hello @alice @bob"
+      `shouldBe` "hello @alice @bob"
+    test (mm [("alice", Just "alice")]) "hello @alice @bob"
+      `shouldBe` "hello @alice @bob"
+  it "replace changed names" $ \_ -> do
+    test (mm [("alice", Just "Alice Jones"), ("bob", Just "robert")]) "hello @alice @bob"
+      `shouldBe` "hello @'Alice Jones' @robert"
+    test (mm [("alice", Just "alice"), ("cath", Just "alice")]) "hello @alice @cath"
+      `shouldBe` "hello @alice @alice_1"
+  where
+    test mentionsMap t =
+      let (mc', _, _) = updatedMentionNames (MCText t) (parseMaybeMarkdownList t) mentionsMap
+       in msgContentText mc'
+    mm = M.fromList . map (second mentionedMember)
+    mentionedMember name_ = CIMention {memberId = MemberId "abcd", memberRef = ciMentionMember <$> name_}
+      where
+        ciMentionMember name = CIMentionMember {groupMemberId = 1, displayName = name, localAlias = Nothing, memberRole = GRMember}
+
+testScopedSupportSingleModerator :: HasCallStack => TestParams -> IO ()
+testScopedSupportSingleModerator =
+  testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
+    createGroup3' "team" alice (bob, GRMember) (cath, GRMember)
+
+    alice #> "#team 1"
+    [bob, cath] *<# "#team alice> 1"
+
+    bob #> "#team 2"
+    [alice, cath] *<# "#team bob> 2"
+
+    alice ##> "/_send #1(_support:2) text 3"
+    alice <# "#team (support: bob) 3"
+    bob <# "#team (support) alice> 3"
+
+    bob ##> "/_send #1(_support) text 4"
+    bob <# "#team (support) 4"
+    alice <# "#team (support: bob) bob> 4"
+
+    cath ##> "/_send #1(_support:3) text 5"
+    cath <## "#team: you have insufficient permissions for this action, the required role is moderator"
+
+    alice ##> "/_delete member chat #1 2"
+    alice <## "#team: bob support chat deleted"
+
+testScopedSupportManyModerators :: HasCallStack => TestParams -> IO ()
+testScopedSupportManyModerators =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
+    createGroup4 "team" alice (bob, GRMember) (cath, GRMember) (dan, GRModerator)
+
+    threadDelay 1000000
+
+    alice #> "#team 1"
+    [bob, cath, dan] *<# "#team alice> 1"
+
+    threadDelay 1000000
+
+    bob #> "#team 2"
+    [alice, cath, dan] *<# "#team bob> 2"
+
+    threadDelay 1000000
+
+    alice ##> "/_send #1(_support:2) text 3"
+    alice <# "#team (support: bob) 3"
+    bob <# "#team (support) alice> 3"
+    dan <# "#team (support: bob) alice> 3"
+
+    threadDelay 1000000
+
+    bob ##> "/_send #1(_support) text 4"
+    bob <# "#team (support) 4"
+    [alice, dan] *<# "#team (support: bob) bob> 4"
+
+    threadDelay 1000000
+
+    dan ##> "/_send #1(_support:3) text 5"
+    dan <# "#team (support: bob) 5"
+    alice <# "#team (support: bob) dan> 5"
+    bob <# "#team (support) dan> 5"
+
+    alice @@@ [("#team","2"), ("@dan","sent invitation to join group team as moderator"), ("@cath","sent invitation to join group team as member"), ("@bob","sent invitation to join group team as member")]
+    bob @@@ [("#team","2"), ("@alice","received invitation to join group team as member")]
+    dan @@@ [("#team","2"), ("@alice","received invitation to join group team as moderator")]
+    cath @@@ [("#team","2"), ("@alice","received invitation to join group team as member")]
+
+    alice #$> ("/_get chat #1 count=3", chat, [(0, "connected"), (1, "1"), (0, "2")])
+    alice #$> ("/_get chat #1(_support:2) count=100", chat, [(1, "3"), (0, "4"), (0, "5")])
+    bob #$> ("/_get chat #1 count=3", chat, [(0, "connected"), (0, "1"), (1, "2")])
+    bob #$> ("/_get chat #1(_support) count=100", chat, [(0, "3"), (1, "4"), (0, "5")])
+    dan #$> ("/_get chat #1 count=3", chat, [(0, "connected"), (0, "1"), (0, "2")])
+    dan #$> ("/_get chat #1(_support:3) count=100", chat, [(0, "3"), (0, "4"), (1, "5")])
+    cath #$> ("/_get chat #1 count=3", chat, [(0, "connected"), (0, "1"), (0, "2")])
+    cath #$> ("/_get chat #1(_support:3) count=100", chat, [])
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 0, require attention: 0, mentions: 0"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 0, require attention: 0, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 0, require attention: 0, mentions: 0"
+    cath ##> "/member support chats #team"
+    cath <## "bob (Bob) (id 3): unread: 0, require attention: 0, mentions: 0"
+
+testSupportCLISendCommand :: HasCallStack => TestParams -> IO ()
+testSupportCLISendCommand =
+  testChat2 aliceProfile bobProfile $ \alice bob -> do
+    createGroup2' "team" alice (bob, GRObserver) True
+
+    alice #> "#team 1"
+    bob <# "#team alice> 1"
+
+    bob ##> "#team 2"
+    bob <## "#team: you don't have permission to send messages"
+    (alice </)
+
+    alice #> "#team (support: bob) 3"
+    bob <# "#team (support) alice> 3"
+
+    bob #> "#team (support) 4"
+    alice <# "#team (support: bob) bob> 4"
+
+    bob ##> "#team (support 4"
+    bob <## "bad chat command: Failed reading: empty"
+
+testScopedSupportUnreadStatsOnRead :: HasCallStack => TestParams -> IO ()
+testScopedSupportUnreadStatsOnRead =
+  testChatOpts4 opts aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
+    createGroup4 "team" alice (bob, GRMember) (cath, GRMember) (dan, GRModerator)
+
+    alice #> "#team 1"
+    [bob, cath, dan] *<# "#team alice> 1"
+
+    bob #> "#team 2"
+    [alice, cath, dan] *<# "#team bob> 2"
+
+    alice ##> "/_send #1(_support:2) text 3"
+    alice <# "#team (support: bob) 3"
+    bob <# "#team (support) alice> 3"
+    dan <# "#team (support: bob) alice> 3"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 0, require attention: 0, mentions: 0"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 1, require attention: 0, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 1, require attention: 0, mentions: 0"
+
+    bob ##> "/_send #1(_support) text 4"
+    bob <# "#team (support) 4"
+    [alice, dan] *<# "#team (support: bob) bob> 4"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 1, require attention: 1, mentions: 0"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 2, require attention: 1, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 1, require attention: 0, mentions: 0"
+
+    threadDelay 1000000
+
+    dan ##> "/_send #1(_support:3) text 5"
+    dan <# "#team (support: bob) 5"
+    alice <# "#team (support: bob) dan> 5"
+    bob <# "#team (support) dan> 5"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 2, require attention: 0, mentions: 0"
+    -- In test "answering" doesn't reset unanswered, but in UI items would be marked read on opening chat
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 2, require attention: 1, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 2, require attention: 0, mentions: 0"
+
+    threadDelay 1000000
+
+    dan ##> "/_send #1(_support:3) json [{\"msgContent\": {\"type\": \"text\", \"text\": \"@alice 6\"}, \"mentions\": {\"alice\": 1}}]"
+    dan <# "#team (support: bob) @alice 6"
+    alice <# "#team (support: bob) dan!> @alice 6"
+    bob <# "#team (support) dan> @alice 6"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 3, require attention: 0, mentions: 1"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 2, require attention: 1, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 3, require attention: 0, mentions: 0"
+
+    aliceMentionedByDanItemId <- lastItemId alice
+
+    threadDelay 1000000
+
+    bob ##> "/_send #1(_support) json [{\"msgContent\": {\"type\": \"text\", \"text\": \"@alice 7\"}, \"mentions\": {\"alice\": 1}}]"
+    bob <# "#team (support) @alice 7"
+    alice <# "#team (support: bob) bob!> @alice 7"
+    dan <# "#team (support: bob) bob> @alice 7"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 4, require attention: 1, mentions: 2"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 3, require attention: 2, mentions: 0"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 3, require attention: 0, mentions: 0"
+
+    aliceMentionedByBobItemId <- lastItemId alice
+
+    bob ##> "/_send #1(_support) json [{\"msgContent\": {\"type\": \"text\", \"text\": \"@dan 8\"}, \"mentions\": {\"dan\": 4}}]"
+    bob <# "#team (support) @dan 8"
+    alice <# "#team (support: bob) bob> @dan 8"
+    dan <# "#team (support: bob) bob!> @dan 8"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 5, require attention: 2, mentions: 2"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 4, require attention: 3, mentions: 1"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 3, require attention: 0, mentions: 0"
+
+    alice #$> ("/_read chat items #1(_support:2) " <> aliceMentionedByDanItemId, id, "items read for chat")
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 4, require attention: 2, mentions: 1"
+
+    alice #$> ("/_read chat items #1(_support:2) " <> aliceMentionedByBobItemId, id, "items read for chat")
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 3, require attention: 1, mentions: 0"
+
+    threadDelay 1000000
+
+    dan ##> "/_send #1(_support:3) json [{\"msgContent\": {\"type\": \"text\", \"text\": \"@bob 9\"}, \"mentions\": {\"bob\": 3}}]"
+    dan <# "#team (support: bob) @bob 9"
+    alice <# "#team (support: bob) dan> @bob 9"
+    bob <# "#team (support) dan!> @bob 9"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 4, require attention: 0, mentions: 0"
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 4, require attention: 3, mentions: 1"
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 4, require attention: 0, mentions: 1"
+
+    alice #$> ("/_read chat #1(_support:2)", id, "ok")
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 0, require attention: 0, mentions: 0"
+
+    dan #$> ("/_read chat #1(_support:3)", id, "ok")
+
+    dan ##> "/member support chats #team"
+    dan <## "bob (Bob) (id 3): unread: 0, require attention: 0, mentions: 0"
+
+    bob #$> ("/_read chat #1(_support)", id, "ok")
+
+    bob ##> "/member support chats #team"
+    bob <## "support: unread: 0, require attention: 0, mentions: 0"
+
+    cath ##> "/member support chats #team"
+    cath <// 50000
+  where
+    opts =
+      testOpts
+        { markRead = False
+        }
+
+testScopedSupportUnreadStatsOnDelete :: HasCallStack => TestParams -> IO ()
+testScopedSupportUnreadStatsOnDelete =
+  testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> do
+    createGroup2 "team" alice bob
+
+    alice ##> "/set delete #team on"
+    alice <## "updated group preferences:"
+    alice <## "Full deletion: on"
+    bob <## "alice updated group #team:"
+    bob <## "updated group preferences:"
+    bob <## "Full deletion: on"
+
+    bob #> "#team (support) 1"
+    alice <# "#team (support: bob) bob> 1"
+
+    msgIdBob <- lastItemId bob
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 1, require attention: 1, mentions: 0"
+
+    bob #$> ("/_delete item #1(_support) " <> msgIdBob <> " broadcast", id, "message deleted")
+    alice <# "#team (support: bob) bob> [deleted] 1"
+
+    alice ##> "/member support chats #team"
+    alice <## "bob (Bob) (id 2): unread: 0, require attention: 0, mentions: 0"
+  where
+    opts =
+      testOpts
+        { markRead = False
+        }
diff --git a/tests/ChatTests/Local.hs b/tests/ChatTests/Local.hs
index 594e6e47b0..a5fb31ad77 100644
--- a/tests/ChatTests/Local.hs
+++ b/tests/ChatTests/Local.hs
@@ -5,6 +5,7 @@ module ChatTests.Local where
 
 import ChatClient
 import ChatTests.ChatList (getChats_)
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Data.Time (getCurrentTime)
 import Data.Time.Format.ISO8601 (iso8601Show)
@@ -13,7 +14,7 @@ import System.Directory (copyFile, doesFileExist)
 import System.FilePath ((</>))
 import Test.Hspec hiding (it)
 
-chatLocalChatsTests :: SpecWith FilePath
+chatLocalChatsTests :: SpecWith TestParams
 chatLocalChatsTests = do
   describe "note folders" $ do
     it "create folders, add notes, read, search" testNotes
@@ -26,8 +27,8 @@ chatLocalChatsTests = do
     it "create multiple messages api" testCreateMulti
     it "create multiple messages with files" testCreateMultiFiles
 
-testNotes :: FilePath -> IO ()
-testNotes tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testNotes :: TestParams -> IO ()
+testNotes ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
 
   alice ##> "/contacts"
@@ -55,8 +56,8 @@ testNotes tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
   alice ##> "/tail *"
   alice <# "* Greetings."
 
-testUserNotes :: FilePath -> IO ()
-testUserNotes tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testUserNotes :: TestParams -> IO ()
+testUserNotes ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
 
   alice >* "keep in mind"
@@ -73,8 +74,8 @@ testUserNotes tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
   alice ##> "/_delete item *1 1 internal"
   alice <## "chat db error: SENoteFolderNotFound {noteFolderId = 1}"
 
-testPreviewsPagination :: FilePath -> IO ()
-testPreviewsPagination tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPreviewsPagination :: TestParams -> IO ()
+testPreviewsPagination ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
 
   tsS <- iso8601Show <$> getCurrentTime
@@ -91,8 +92,8 @@ testPreviewsPagination tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -
   getChats_ alice ("before=" <> tsE <> " count=10") [("*", "last")]
   getChats_ alice ("before=" <> tsS <> " count=10") []
 
-testChatPagination :: FilePath -> IO ()
-testChatPagination tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testChatPagination :: TestParams -> IO ()
+testChatPagination ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
 
   alice >* "hello world"
@@ -115,8 +116,8 @@ testChatPagination tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
 
   alice #$> ("/_get chat *1 count=10 search=k-k", chat, [(1, "knock-knock")])
 
-testFiles :: FilePath -> IO ()
-testFiles tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testFiles :: TestParams -> IO ()
+testFiles ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   -- setup
   createCCNoteFolder alice
   let files = "./tests/tmp/app_files"
@@ -163,7 +164,7 @@ testFiles tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
   alice ##> "/tail"
   doesFileExist stored `shouldReturn` False
 
-testOtherFiles :: FilePath -> IO ()
+testOtherFiles :: TestParams -> IO ()
 testOtherFiles =
   testChatCfg2 cfg aliceProfile bobProfile $ \alice bob -> withXFTPServer $ do
     connectUsers alice bob
@@ -196,16 +197,16 @@ testOtherFiles =
   where
     cfg = testCfg {inlineFiles = defaultInlineFilesConfig {offerChunks = 100, sendChunks = 100, receiveChunks = 100}}
 
-testCreateMulti :: FilePath -> IO ()
-testCreateMulti tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testCreateMulti :: TestParams -> IO ()
+testCreateMulti ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
 
   alice ##> "/_create *1 json [{\"msgContent\": {\"type\": \"text\", \"text\": \"test 1\"}}, {\"msgContent\": {\"type\": \"text\", \"text\": \"test 2\"}}]"
   alice <# "* test 1"
   alice <# "* test 2"
 
-testCreateMultiFiles :: FilePath -> IO ()
-testCreateMultiFiles tmp = withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testCreateMultiFiles :: TestParams -> IO ()
+testCreateMultiFiles ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   createCCNoteFolder alice
   alice #$> ("/_files_folder ./tests/tmp/alice_app_files", id, "ok")
   copyFile "./tests/fixtures/test.jpg" "./tests/tmp/alice_app_files/test.jpg"
diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs
index 36fe576dcb..fe933d5b98 100644
--- a/tests/ChatTests/Profiles.hs
+++ b/tests/ChatTests/Profiles.hs
@@ -8,6 +8,7 @@
 module ChatTests.Profiles where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
@@ -32,7 +33,7 @@ import Simplex.Messaging.Util (encodeJSON)
 import System.Directory (copyFile, createDirectoryIfMissing)
 import Test.Hspec hiding (it)
 
-chatProfileTests :: SpecWith FilePath
+chatProfileTests :: SpecWith TestParams
 chatProfileTests = do
   describe "user profiles" $ do
     it "update user profile and notify contacts" testUpdateProfile
@@ -100,12 +101,19 @@ chatProfileTests = do
       it "files & media" testGroupPrefsFilesForRole
       it "SimpleX links" testGroupPrefsSimplexLinksForRole
     it "set user, contact and group UI theme" testSetUITheme
+  describe "short links" $ do
+    it "should connect via one-time inviation" testShortLinkInvitation
+    it "should plan and connect via one-time inviation" testPlanShortLinkInvitation
+    it "should connect via contact address" testShortLinkContactAddress
+    it "should join group" testShortLinkJoinGroup
 
-testUpdateProfile :: HasCallStack => FilePath -> IO ()
+testUpdateProfile :: HasCallStack => TestParams -> IO ()
 testUpdateProfile =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
-      createGroup3 "team" alice bob cath
+      connectUsers alice bob
+      connectUsers alice cath
+      connectUsers bob cath
       alice ##> "/p"
       alice <## "user profile: alice (Alice)"
       alice <## "use /p <display name> to change it"
@@ -143,7 +151,7 @@ testUpdateProfile =
             bob <## "use @cat <message> to send messages"
         ]
 
-testUpdateProfileImage :: HasCallStack => FilePath -> IO ()
+testUpdateProfileImage :: HasCallStack => TestParams -> IO ()
 testUpdateProfileImage =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -163,7 +171,7 @@ testUpdateProfileImage =
       bob <## "use @alice2 <message> to send messages"
       (bob </)
 
-testMultiWordProfileNames :: HasCallStack => FilePath -> IO ()
+testMultiWordProfileNames :: HasCallStack => TestParams -> IO ()
 testMultiWordProfileNames =
   testChat3 aliceProfile' bobProfile' cathProfile' $
     \alice bob cath -> do
@@ -236,7 +244,7 @@ testMultiWordProfileNames =
     cathProfile' = baseProfile {displayName = "Cath Johnson"}
     baseProfile = Profile {displayName = "", fullName = "", image = Nothing, contactLink = Nothing, preferences = defaultPrefs}
 
-testUserContactLink :: HasCallStack => FilePath -> IO ()
+testUserContactLink :: HasCallStack => TestParams -> IO ()
 testUserContactLink =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -266,9 +274,10 @@ testUserContactLink =
       alice @@@ [("@cath", lastChatFeature), ("@bob", "hey")]
       alice <##> cath
 
-testRetryAcceptingViaContactLink :: HasCallStack => FilePath -> IO ()
-testRetryAcceptingViaContactLink tmp = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile test tmp
+testRetryAcceptingViaContactLink :: HasCallStack => TestParams -> IO ()
+testRetryAcceptingViaContactLink ps = testChatCfgOpts2 cfg' opts' aliceProfile bobProfile test ps
   where
+    tmp = tmpPath ps
     test alice bob = do
       cLink <- withSmpServer' serverCfg' $ do
         alice ##> "/ad"
@@ -307,8 +316,7 @@ testRetryAcceptingViaContactLink tmp = testChatCfgOpts2 cfg' opts' aliceProfile
       smpServerCfg
         { transports = [("7003", transport @TLS, False)],
           msgQueueQuota = 2,
-          storeLogFile = Just $ tmp <> "/smp-server-store.log",
-          storeMsgsFile = Just $ tmp <> "/smp-server-messages.log"
+          serverStoreCfg = persistentServerStoreCfg tmp
         }
     fastRetryInterval = defaultReconnectInterval {initialInterval = 50000} -- same as in agent tests
     cfg' =
@@ -327,7 +335,7 @@ testRetryAcceptingViaContactLink tmp = testChatCfgOpts2 cfg' opts' aliceProfile
               }
         }
 
-testProfileLink :: HasCallStack => FilePath -> IO ()
+testProfileLink :: HasCallStack => TestParams -> IO ()
 testProfileLink =
   testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
@@ -408,7 +416,7 @@ testProfileLink =
       cc <## "quantum resistant end-to-end encryption"
       cc <## currentChatVRangeInfo
 
-testUserContactLinkAutoAccept :: HasCallStack => FilePath -> IO ()
+testUserContactLinkAutoAccept :: HasCallStack => TestParams -> IO ()
 testUserContactLinkAutoAccept =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
@@ -456,7 +464,7 @@ testUserContactLinkAutoAccept =
       alice @@@ [("@dan", lastChatFeature), ("@cath", "hey"), ("@bob", "hey")]
       alice <##> dan
 
-testDeduplicateContactRequests :: HasCallStack => FilePath -> IO ()
+testDeduplicateContactRequests :: HasCallStack => TestParams -> IO ()
 testDeduplicateContactRequests = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/ad"
@@ -515,7 +523,7 @@ testDeduplicateContactRequests = testChat3 aliceProfile bobProfile cathProfile $
     alice @@@ [("@cath", lastChatFeature), ("@bob", "hey")]
     alice <##> cath
 
-testDeduplicateContactRequestsProfileChange :: HasCallStack => FilePath -> IO ()
+testDeduplicateContactRequestsProfileChange :: HasCallStack => TestParams -> IO ()
 testDeduplicateContactRequestsProfileChange = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/ad"
@@ -592,7 +600,7 @@ testDeduplicateContactRequestsProfileChange = testChat3 aliceProfile bobProfile
     alice @@@ [("@cath", lastChatFeature), ("@robert", "hey")]
     alice <##> cath
 
-testRejectContactAndDeleteUserContact :: HasCallStack => FilePath -> IO ()
+testRejectContactAndDeleteUserContact :: HasCallStack => TestParams -> IO ()
 testRejectContactAndDeleteUserContact = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/_address 1"
@@ -615,7 +623,7 @@ testRejectContactAndDeleteUserContact = testChat3 aliceProfile bobProfile cathPr
     cath ##> ("/c " <> cLink)
     cath <## "error: connection authorization failed - this could happen if connection was deleted, secured with different credentials, or due to a bug - please re-create the connection"
 
-testDeleteConnectionRequests :: HasCallStack => FilePath -> IO ()
+testDeleteConnectionRequests :: HasCallStack => TestParams -> IO ()
 testDeleteConnectionRequests = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/ad"
@@ -637,7 +645,7 @@ testDeleteConnectionRequests = testChat3 aliceProfile bobProfile cathProfile $
     cath ##> ("/c " <> cLink')
     alice <#? cath
 
-testAutoReplyMessage :: HasCallStack => FilePath -> IO ()
+testAutoReplyMessage :: HasCallStack => TestParams -> IO ()
 testAutoReplyMessage = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/ad"
@@ -659,7 +667,7 @@ testAutoReplyMessage = testChat2 aliceProfile bobProfile $
         alice <## "bob (Bob): contact is connected"
       ]
 
-testAutoReplyMessageInIncognito :: HasCallStack => FilePath -> IO ()
+testAutoReplyMessageInIncognito :: HasCallStack => TestParams -> IO ()
 testAutoReplyMessageInIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/ad"
@@ -684,7 +692,7 @@ testAutoReplyMessageInIncognito = testChat2 aliceProfile bobProfile $
           alice <## "use /i bob to print out this incognito profile again"
       ]
 
-testBusinessAddress :: HasCallStack => FilePath -> IO ()
+testBusinessAddress :: HasCallStack => TestParams -> IO ()
 testBusinessAddress = testChat3 businessProfile aliceProfile {fullName = "Alice @ Biz"} bobProfile $
   \biz alice bob -> do
     biz ##> "/ad"
@@ -737,7 +745,7 @@ testBusinessAddress = testChat3 businessProfile aliceProfile {fullName = "Alice
       (alice <# "#bob bob_1> hey there")
       (biz <# "#bob bob_1> hey there")
 
-testBusinessUpdateProfiles :: HasCallStack => FilePath -> IO ()
+testBusinessUpdateProfiles :: HasCallStack => TestParams -> IO ()
 testBusinessUpdateProfiles = testChat4 businessProfile aliceProfile bobProfile cathProfile $
   \biz alice bob cath -> do
     biz ##> "/ad"
@@ -752,8 +760,11 @@ testBusinessUpdateProfiles = testChat4 businessProfile aliceProfile bobProfile c
     alice <## "#biz: joining the group..."
     biz <# "#alice Welcome" -- auto reply
     biz <## "#alice: alice_1 joined the group"
-    alice <# "#biz biz_1> Welcome"
-    alice <## "#biz: you joined the group"
+    alice
+      <###
+        [ WithTime "#biz biz_1> Welcome",
+          "#biz: you joined the group"
+        ]
     biz #> "#alice hi"
     alice <# "#biz biz_1> hi"
     alice #> "#biz hello"
@@ -766,7 +777,7 @@ testBusinessUpdateProfiles = testChat4 businessProfile aliceProfile bobProfile c
     biz <# "#alisa alisa_1> hello again"
     -- customer can invite members too, if business allows
     biz ##> "/mr alisa alisa_1 admin"
-    biz <## "#alisa: you changed the role of alisa_1 from member to admin"
+    biz <## "#alisa: you changed the role of alisa_1 to admin"
     alice <## "#biz: biz_1 changed your role from member to admin"
     connectUsers alice bob
     alice ##> "/a #biz bob"
@@ -866,7 +877,7 @@ testBusinessUpdateProfiles = testChat4 businessProfile aliceProfile bobProfile c
     bob #$> ("/_get chat #1 count=1", chat, [(0, "Voice messages: on")])
     cath #$> ("/_get chat #1 count=1", chat, [(0, "Voice messages: on")])
 
-testPlanAddressOkKnown :: HasCallStack => FilePath -> IO ()
+testPlanAddressOkKnown :: HasCallStack => TestParams -> IO ()
 testPlanAddressOkKnown =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -899,9 +910,9 @@ testPlanAddressOkKnown =
       bob <## "contact address: known contact alice"
       bob <## "use @alice <message> to send messages"
 
-testPlanAddressOwn :: HasCallStack => FilePath -> IO ()
-testPlanAddressOwn tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPlanAddressOwn :: HasCallStack => TestParams -> IO ()
+testPlanAddressOwn ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice -> do
     alice ##> "/ad"
     cLink <- getContactLink alice True
 
@@ -945,12 +956,12 @@ testPlanAddressOwn tmp =
     alice ##> ("/c " <> cLink)
     alice <## "alice_2 (Alice): contact already exists"
 
-testPlanAddressConnecting :: HasCallStack => FilePath -> IO ()
-testPlanAddressConnecting tmp = do
-  cLink <- withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testPlanAddressConnecting :: HasCallStack => TestParams -> IO ()
+testPlanAddressConnecting ps = do
+  cLink <- withNewTestChat ps "alice" aliceProfile $ \alice -> do
     alice ##> "/ad"
     getContactLink alice True
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
     threadDelay 100000
 
     bob ##> ("/c " <> cLink)
@@ -964,14 +975,14 @@ testPlanAddressConnecting tmp = do
     bob <## "contact address: connecting, allowed to reconnect"
 
     threadDelay 100000
-  withTestChat tmp "alice" $ \alice -> do
+  withTestChat ps "alice" $ \alice -> do
     alice <## "Your address is active! To show: /sa"
     alice <## "bob (Bob) wants to connect to you!"
     alice <## "to accept: /ac bob"
     alice <## "to reject: /rc bob (the sender will NOT be notified)"
     alice ##> "/ac bob"
     alice <## "bob (Bob): accepting contact request, you can send messages to contact"
-  withTestChat tmp "bob" $ \bob -> do
+  withTestChat ps "bob" $ \bob -> do
     threadDelay 500000
     bob <## "alice (Alice): contact is connected"
     bob @@@ [("@alice", "Audio/video calls: enabled")]
@@ -988,12 +999,12 @@ testPlanAddressConnecting tmp = do
     bob <## "contact address: known contact alice"
     bob <## "use @alice <message> to send messages"
 
-testPlanAddressConnectingSlow :: HasCallStack => FilePath -> IO ()
-testPlanAddressConnectingSlow tmp = do
-  cLink <- withNewTestChatCfg tmp testCfgSlow "alice" aliceProfile $ \alice -> do
+testPlanAddressConnectingSlow :: HasCallStack => TestParams -> IO ()
+testPlanAddressConnectingSlow ps = do
+  cLink <- withNewTestChatCfg ps testCfgSlow "alice" aliceProfile $ \alice -> do
     alice ##> "/ad"
     getContactLink alice True
-  withNewTestChatCfg tmp testCfgSlow "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps testCfgSlow "bob" bobProfile $ \bob -> do
     threadDelay 100000
 
     bob ##> ("/c " <> cLink)
@@ -1007,14 +1018,14 @@ testPlanAddressConnectingSlow tmp = do
     bob <## "contact address: connecting, allowed to reconnect"
 
     threadDelay 100000
-  withTestChatCfg tmp testCfgSlow "alice" $ \alice -> do
+  withTestChatCfg ps testCfgSlow "alice" $ \alice -> do
     alice <## "Your address is active! To show: /sa"
     alice <## "bob (Bob) wants to connect to you!"
     alice <## "to accept: /ac bob"
     alice <## "to reject: /rc bob (the sender will NOT be notified)"
     alice ##> "/ac bob"
     alice <## "bob (Bob): accepting contact request..."
-  withTestChatCfg tmp testCfgSlow "bob" $ \bob -> do
+  withTestChatCfg ps testCfgSlow "bob" $ \bob -> do
     threadDelay 500000
     bob @@@ [("@alice", "")]
     bob ##> ("/_connect plan 1 " <> cLink)
@@ -1027,7 +1038,7 @@ testPlanAddressConnectingSlow tmp = do
     bob ##> ("/c " <> cLink)
     bob <## "contact address: connecting to contact alice"
 
-testPlanAddressContactDeletedReconnected :: HasCallStack => FilePath -> IO ()
+testPlanAddressContactDeletedReconnected :: HasCallStack => TestParams -> IO ()
 testPlanAddressContactDeletedReconnected =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1090,7 +1101,7 @@ testPlanAddressContactDeletedReconnected =
       bob <## "contact address: known contact alice_1"
       bob <## "use @alice_1 <message> to send messages"
 
-testPlanAddressContactViaAddress :: HasCallStack => FilePath -> IO ()
+testPlanAddressContactViaAddress :: HasCallStack => TestParams -> IO ()
 testPlanAddressContactViaAddress =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -1154,7 +1165,7 @@ testPlanAddressContactViaAddress =
       alice <##> bob
       bob @@@ [("@alice", "hey")]
 
-testConnectIncognitoInvitationLink :: HasCallStack => FilePath -> IO ()
+testConnectIncognitoInvitationLink :: HasCallStack => TestParams -> IO ()
 testConnectIncognitoInvitationLink = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/connect incognito"
@@ -1228,7 +1239,7 @@ testConnectIncognitoInvitationLink = testChat3 aliceProfile bobProfile cathProfi
     (bob </)
     bob `hasContactProfiles` ["bob"]
 
-testConnectIncognitoContactAddress :: HasCallStack => FilePath -> IO ()
+testConnectIncognitoContactAddress :: HasCallStack => TestParams -> IO ()
 testConnectIncognitoContactAddress = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/ad"
@@ -1266,7 +1277,7 @@ testConnectIncognitoContactAddress = testChat2 aliceProfile bobProfile $
     (bob </)
     bob `hasContactProfiles` ["bob"]
 
-testAcceptContactRequestIncognito :: HasCallStack => FilePath -> IO ()
+testAcceptContactRequestIncognito :: HasCallStack => TestParams -> IO ()
 testAcceptContactRequestIncognito = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/ad"
@@ -1314,7 +1325,7 @@ testAcceptContactRequestIncognito = testChat3 aliceProfile bobProfile cathProfil
     alice `hasContactProfiles` ["alice", "cath", T.pack aliceIncognitoCath]
     cath `hasContactProfiles` ["cath", T.pack aliceIncognitoCath]
 
-testSetConnectionIncognito :: HasCallStack => FilePath -> IO ()
+testSetConnectionIncognito :: HasCallStack => TestParams -> IO ()
 testSetConnectionIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/connect"
@@ -1337,7 +1348,7 @@ testSetConnectionIncognito = testChat2 aliceProfile bobProfile $
     alice `hasContactProfiles` ["alice", "bob", T.pack aliceIncognito]
     bob `hasContactProfiles` ["bob", T.pack aliceIncognito]
 
-testResetConnectionIncognito :: HasCallStack => FilePath -> IO ()
+testResetConnectionIncognito :: HasCallStack => TestParams -> IO ()
 testResetConnectionIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/_connect 1 incognito=on"
@@ -1353,42 +1364,42 @@ testResetConnectionIncognito = testChat2 aliceProfile bobProfile $
     alice `hasContactProfiles` ["alice", "bob"]
     bob `hasContactProfiles` ["alice", "bob"]
 
-testSetConnectionIncognitoProhibitedDuringNegotiation :: HasCallStack => FilePath -> IO ()
-testSetConnectionIncognitoProhibitedDuringNegotiation tmp = do
-  inv <- withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+testSetConnectionIncognitoProhibitedDuringNegotiation :: HasCallStack => TestParams -> IO ()
+testSetConnectionIncognitoProhibitedDuringNegotiation ps = do
+  inv <- withNewTestChat ps "alice" aliceProfile $ \alice -> do
     threadDelay 250000
     alice ##> "/connect"
     getInvitation alice
-  withNewTestChat tmp "bob" bobProfile $ \bob -> do
+  withNewTestChat ps "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
-  withTestChat tmp "alice" $ \alice -> do
+  withTestChat ps "alice" $ \alice -> do
     threadDelay 250000
     alice <## "bob (Bob): contact is connected"
     alice ##> "/_set incognito :1 on"
     alice <## "chat db error: SEPendingConnectionNotFound {connId = 1}"
-    withTestChat tmp "bob" $ \bob -> do
+    withTestChat ps "bob" $ \bob -> do
       bob <## "alice (Alice): contact is connected"
       alice <##> bob
       alice `hasContactProfiles` ["alice", "bob"]
       bob `hasContactProfiles` ["alice", "bob"]
 
-testSetConnectionIncognitoProhibitedDuringNegotiationSlow :: HasCallStack => FilePath -> IO ()
-testSetConnectionIncognitoProhibitedDuringNegotiationSlow tmp = do
-  inv <- withNewTestChatCfg tmp testCfgSlow "alice" aliceProfile $ \alice -> do
+testSetConnectionIncognitoProhibitedDuringNegotiationSlow :: HasCallStack => TestParams -> IO ()
+testSetConnectionIncognitoProhibitedDuringNegotiationSlow ps = do
+  inv <- withNewTestChatCfg ps testCfgSlow "alice" aliceProfile $ \alice -> do
     threadDelay 250000
     alice ##> "/connect"
     getInvitation alice
-  withNewTestChatCfg tmp testCfgSlow "bob" bobProfile $ \bob -> do
+  withNewTestChatCfg ps testCfgSlow "bob" bobProfile $ \bob -> do
     threadDelay 250000
     bob ##> ("/c " <> inv)
     bob <## "confirmation sent!"
-  withTestChatCfg tmp testCfgSlow "alice" $ \alice -> do
+  withTestChatCfg ps testCfgSlow "alice" $ \alice -> do
     threadDelay 250000
     alice ##> "/_set incognito :1 on"
     alice <## "chat db error: SEPendingConnectionNotFound {connId = 1}"
-    withTestChatCfg tmp testCfgSlow "bob" $ \bob -> do
+    withTestChatCfg ps testCfgSlow "bob" $ \bob -> do
       concurrently_
         (bob <## "alice (Alice): contact is connected")
         (alice <## "bob (Bob): contact is connected")
@@ -1396,7 +1407,7 @@ testSetConnectionIncognitoProhibitedDuringNegotiationSlow tmp = do
       alice `hasContactProfiles` ["alice", "bob"]
       bob `hasContactProfiles` ["alice", "bob"]
 
-testConnectionIncognitoUnchangedErrors :: HasCallStack => FilePath -> IO ()
+testConnectionIncognitoUnchangedErrors :: HasCallStack => TestParams -> IO ()
 testConnectionIncognitoUnchangedErrors = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/connect"
@@ -1420,7 +1431,7 @@ testConnectionIncognitoUnchangedErrors = testChat2 aliceProfile bobProfile $
     alice `hasContactProfiles` ["alice", "bob"]
     bob `hasContactProfiles` ["alice", "bob"]
 
-testSetResetSetConnectionIncognito :: HasCallStack => FilePath -> IO ()
+testSetResetSetConnectionIncognito :: HasCallStack => TestParams -> IO ()
 testSetResetSetConnectionIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/_connect 1 incognito=off"
@@ -1447,9 +1458,9 @@ testSetResetSetConnectionIncognito = testChat2 aliceProfile bobProfile $
     alice `hasContactProfiles` ["alice", "bob", T.pack aliceIncognito]
     bob `hasContactProfiles` ["bob", T.pack aliceIncognito]
 
-testJoinGroupIncognito :: HasCallStack => FilePath -> IO ()
+testJoinGroupIncognito :: HasCallStack => TestParams -> IO ()
 testJoinGroupIncognito =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       -- non incognito connections
       connectUsers alice bob
@@ -1524,13 +1535,13 @@ testJoinGroupIncognito =
             dan
               <### [ ConsoleString $ "#secret_club: member " <> cathIncognito <> " is connected",
                      "#secret_club: member bob_1 (Bob) is connected",
-                     "contact bob_1 is merged into bob",
+                     "contact and member are merged: bob, #secret_club bob_1",
                      "use @bob <message> to send messages"
                    ],
           do
             bob <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
             bob <## "#secret_club: new member dan_1 is connected"
-            bob <## "contact dan_1 is merged into dan"
+            bob <## "contact and member are merged: dan, #secret_club dan_1"
             bob <## "use @dan <message> to send messages",
           do
             cath <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
@@ -1561,17 +1572,7 @@ testJoinGroupIncognito =
           bob <# "#secret_club dan> how is it going?",
           cath ?<# "#secret_club dan_1> how is it going?"
         ]
-      -- cath and bob can send messages via new direct connection, cath is incognito
-      bob #> ("@" <> cathIncognito <> " hi, I'm bob")
-      cath ?<# "bob_1> hi, I'm bob"
-      cath ?#> "@bob_1 hey, I'm incognito"
-      bob <# (cathIncognito <> "> hey, I'm incognito")
-      -- cath and dan can send messages via new direct connection, cath is incognito
-      dan #> ("@" <> cathIncognito <> " hi, I'm dan")
-      cath ?<# "dan_1> hi, I'm dan"
-      cath ?#> "@dan_1 hey, I'm incognito"
-      dan <# (cathIncognito <> "> hey, I'm incognito")
-      -- non incognito connections are separate
+      -- non incognito direct connections are separate
       bob <##> cath
       dan <##> cath
       -- list groups
@@ -1629,14 +1630,9 @@ testJoinGroupIncognito =
           (cath </)
         ]
       cath ##> "#secret_club hello"
-      cath <## "you are no longer a member of the group"
-      -- cath can still message members directly
-      bob #> ("@" <> cathIncognito <> " I removed you from group")
-      cath ?<# "bob_1> I removed you from group"
-      cath ?#> "@bob_1 ok"
-      bob <# (cathIncognito <> "> ok")
+      cath <## "bad chat command: not current member"
 
-testCantInviteContactIncognito :: HasCallStack => FilePath -> IO ()
+testCantInviteContactIncognito :: HasCallStack => TestParams -> IO ()
 testCantInviteContactIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- alice connected incognito to bob
@@ -1660,7 +1656,7 @@ testCantInviteContactIncognito = testChat2 aliceProfile bobProfile $
     -- bob doesn't receive invitation
     (bob </)
 
-testCantSeeGlobalPrefsUpdateIncognito :: HasCallStack => FilePath -> IO ()
+testCantSeeGlobalPrefsUpdateIncognito :: HasCallStack => TestParams -> IO ()
 testCantSeeGlobalPrefsUpdateIncognito = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     alice ##> "/c i"
@@ -1711,7 +1707,7 @@ testCantSeeGlobalPrefsUpdateIncognito = testChat3 aliceProfile bobProfile cathPr
     cath <## "alice updated preferences for you:"
     cath <## "Full deletion: off (you allow: default (no), contact allows: yes)"
 
-testDeleteContactThenGroupDeletesIncognitoProfile :: HasCallStack => FilePath -> IO ()
+testDeleteContactThenGroupDeletesIncognitoProfile :: HasCallStack => TestParams -> IO ()
 testDeleteContactThenGroupDeletesIncognitoProfile = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- bob connects incognito to alice
@@ -1763,7 +1759,7 @@ testDeleteContactThenGroupDeletesIncognitoProfile = testChat2 aliceProfile bobPr
     bob <## "#team: you deleted the group"
     bob `hasContactProfiles` ["bob"]
 
-testDeleteGroupThenContactDeletesIncognitoProfile :: HasCallStack => FilePath -> IO ()
+testDeleteGroupThenContactDeletesIncognitoProfile :: HasCallStack => TestParams -> IO ()
 testDeleteGroupThenContactDeletesIncognitoProfile = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- bob connects incognito to alice
@@ -1815,7 +1811,7 @@ testDeleteGroupThenContactDeletesIncognitoProfile = testChat2 aliceProfile bobPr
     (bob </)
     bob `hasContactProfiles` ["bob"]
 
-testSetAlias :: HasCallStack => FilePath -> IO ()
+testSetAlias :: HasCallStack => TestParams -> IO ()
 testSetAlias = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     connectUsers alice bob
@@ -1826,7 +1822,7 @@ testSetAlias = testChat2 aliceProfile bobProfile $
     alice ##> "/contacts"
     alice <## "bob (Bob)"
 
-testChangePCCUser :: HasCallStack => FilePath -> IO ()
+testChangePCCUser :: HasCallStack => TestParams -> IO ()
 testChangePCCUser = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite
@@ -1856,7 +1852,7 @@ testChangePCCUser = testChat2 aliceProfile bobProfile $
       (alice <## "bob (Bob): contact is connected")
       (bob <## "alisa2: contact is connected")
 
-testChangePCCUserFromIncognito :: HasCallStack => FilePath -> IO ()
+testChangePCCUserFromIncognito :: HasCallStack => TestParams -> IO ()
 testChangePCCUserFromIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite and set as incognito
@@ -1887,7 +1883,7 @@ testChangePCCUserFromIncognito = testChat2 aliceProfile bobProfile $
       (alice <## "bob (Bob): contact is connected")
       (bob <## "alice (Alice): contact is connected")
 
-testChangePCCUserAndThenIncognito :: HasCallStack => FilePath -> IO ()
+testChangePCCUserAndThenIncognito :: HasCallStack => TestParams -> IO ()
 testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite and set as incognito
@@ -1916,11 +1912,11 @@ testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
           alice <## ("use /i bob to print out this incognito profile again")
       ]
 
-testChangePCCUserDiffSrv :: HasCallStack => FilePath -> IO ()
-testChangePCCUserDiffSrv tmp = do
+testChangePCCUserDiffSrv :: HasCallStack => TestParams -> IO ()
+testChangePCCUserDiffSrv ps = do
   withSmpServer' serverCfg' $ do
-    withNewTestChatCfgOpts tmp testCfg testOpts "alice" aliceProfile $ \alice -> do
-      withNewTestChatCfgOpts tmp testCfg testOpts "bob" bobProfile $ \bob -> do
+    withNewTestChatCfgOpts ps testCfg testOpts "alice" aliceProfile $ \alice -> do
+      withNewTestChatCfgOpts ps testCfg testOpts "bob" bobProfile $ \bob -> do
         -- Create a new invite
         alice ##> "/connect"
         _ <- getInvitation alice
@@ -1962,7 +1958,7 @@ testChangePCCUserDiffSrv tmp = do
           msgQueueQuota = 2
         }
 
-testSetConnectionAlias :: HasCallStack => FilePath -> IO ()
+testSetConnectionAlias :: HasCallStack => TestParams -> IO ()
 testSetConnectionAlias = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     alice ##> "/c"
@@ -1980,7 +1976,7 @@ testSetConnectionAlias = testChat2 aliceProfile bobProfile $
     alice ##> "/contacts"
     alice <## "bob (Bob) (alias: friend)"
 
-testSetGroupAlias :: HasCallStack => FilePath -> IO ()
+testSetGroupAlias :: HasCallStack => TestParams -> IO ()
 testSetGroupAlias = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     createGroup2 "team" alice bob
@@ -1994,7 +1990,7 @@ testSetGroupAlias = testChat2 aliceProfile bobProfile $
     alice ##> "/groups"
     alice <## "#team (2 members)"
 
-testSetContactPrefs :: HasCallStack => FilePath -> IO ()
+testSetContactPrefs :: HasCallStack => TestParams -> IO ()
 testSetContactPrefs = testChat2 aliceProfile bobProfile $
   \alice bob -> withXFTPServer $ do
     alice #$> ("/_files_folder ./tests/tmp/alice", id, "ok")
@@ -2087,7 +2083,7 @@ testSetContactPrefs = testChat2 aliceProfile bobProfile $
     bob <## "Voice messages: off (you allow: default (yes), contact allows: no)"
     bob #$> ("/_get chat @2 count=100", chat, startFeatures <> [(0, "Voice messages: enabled for you"), (1, "voice message (00:10)"), (0, "Voice messages: off"), (1, "Voice messages: enabled"), (0, "Voice messages: off")])
 
-testFeatureOffers :: HasCallStack => FilePath -> IO ()
+testFeatureOffers :: HasCallStack => TestParams -> IO ()
 testFeatureOffers = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     connectUsers alice bob
@@ -2106,7 +2102,7 @@ testFeatureOffers = testChat2 aliceProfile bobProfile $
     bob <## "Full deletion: off (you allow: default (no), contact allows: no)"
     bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "offered Full deletion"), (0, "cancelled Full deletion")])
 
-testUpdateGroupPrefs :: HasCallStack => FilePath -> IO ()
+testUpdateGroupPrefs :: HasCallStack => TestParams -> IO ()
 testUpdateGroupPrefs =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2157,7 +2153,7 @@ testUpdateGroupPrefs =
       alice #$> ("/_get chat #1 count=100", chat, sndGroupFeatures <> [(0, "connected"), (1, "Full deletion: on"), (1, "Full deletion: off"), (1, "Voice messages: off"), (1, "Voice messages: on"), (1, "hey"), (0, "hi")])
       bob #$> ("/_get chat #1 count=100", chat, groupFeatures <> [(0, "connected"), (0, "Full deletion: on"), (0, "Full deletion: off"), (0, "Voice messages: off"), (0, "Voice messages: on"), (0, "hey"), (1, "hi")])
 
-testAllowFullDeletionContact :: HasCallStack => FilePath -> IO ()
+testAllowFullDeletionContact :: HasCallStack => TestParams -> IO ()
 testAllowFullDeletionContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2175,7 +2171,7 @@ testAllowFullDeletionContact =
       alice #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(1, "hi"), (1, "Full deletion: enabled for contact")])
       bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "hi"), (0, "Full deletion: enabled for you")])
 
-testAllowFullDeletionGroup :: HasCallStack => FilePath -> IO ()
+testAllowFullDeletionGroup :: HasCallStack => TestParams -> IO ()
 testAllowFullDeletionGroup =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2201,9 +2197,9 @@ testAllowFullDeletionGroup =
       alice #$> ("/_get chat #1 count=100", chat, sndGroupFeatures <> [(0, "connected"), (1, "hi"), (1, "Full deletion: on")])
       bob #$> ("/_get chat #1 count=100", chat, groupFeatures <> [(0, "connected"), (0, "hi"), (0, "Full deletion: on")])
 
-testProhibitDirectMessages :: HasCallStack => FilePath -> IO ()
+testProhibitDirectMessages :: HasCallStack => TestParams -> IO ()
 testProhibitDirectMessages =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       createGroup3 "team" alice bob cath
       threadDelay 1000000
@@ -2219,7 +2215,7 @@ testProhibitDirectMessages =
       alice #> "@cath hello again"
       cath <# "alice> hello again"
       bob ##> "@cath hello again"
-      bob <## "direct messages to indirect contact cath are prohibited"
+      bob <## "bad chat command: direct messages not allowed"
       (cath </)
       connectUsers cath dan
       addMember "team" cath dan GRMember
@@ -2240,14 +2236,14 @@ testProhibitDirectMessages =
             bob <## "#team: new member dan is connected"
         ]
       alice ##> "@dan hi"
-      alice <## "direct messages to indirect contact dan are prohibited"
+      alice <## "bad chat command: direct messages not allowed"
       bob ##> "@dan hi"
-      bob <## "direct messages to indirect contact dan are prohibited"
+      bob <## "bad chat command: direct messages not allowed"
       (dan </)
       dan ##> "@alice hi"
-      dan <## "direct messages to indirect contact alice are prohibited"
+      dan <## "bad chat command: direct messages not allowed"
       dan ##> "@bob hi"
-      dan <## "direct messages to indirect contact bob are prohibited"
+      dan <## "bad chat command: direct messages not allowed"
       dan #> "@cath hi"
       cath <# "dan> hi"
       cath #> "@dan hi"
@@ -2259,7 +2255,7 @@ testProhibitDirectMessages =
       cc <## "updated group preferences:"
       cc <## "Direct messages: off"
 
-testEnableTimedMessagesContact :: HasCallStack => FilePath -> IO ()
+testEnableTimedMessagesContact :: HasCallStack => TestParams -> IO ()
 testEnableTimedMessagesContact =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2304,7 +2300,7 @@ testEnableTimedMessagesContact =
       alice <## "bob updated preferences for you:"
       alice <## "Disappearing messages: enabled (you allow: yes (1 week), contact allows: yes (1 week))"
 
-testEnableTimedMessagesGroup :: HasCallStack => FilePath -> IO ()
+testEnableTimedMessagesGroup :: HasCallStack => TestParams -> IO ()
 testEnableTimedMessagesGroup =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2354,7 +2350,7 @@ testEnableTimedMessagesGroup =
       bob <## "updated group preferences:"
       bob <## "Disappearing messages: on (1 week)"
 
-testTimedMessagesEnabledGlobally :: HasCallStack => FilePath -> IO ()
+testTimedMessagesEnabledGlobally :: HasCallStack => TestParams -> IO ()
 testTimedMessagesEnabledGlobally =
   testChat2 aliceProfile bobProfile $
     \alice bob -> do
@@ -2378,7 +2374,7 @@ testTimedMessagesEnabledGlobally =
       alice #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "Disappearing messages: enabled (1 sec)")])
       bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(1, "Disappearing messages: enabled (1 sec)")])
 
-testUpdateMultipleUserPrefs :: HasCallStack => FilePath -> IO ()
+testUpdateMultipleUserPrefs :: HasCallStack => TestParams -> IO ()
 testUpdateMultipleUserPrefs = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> do
     connectUsers alice bob
@@ -2405,7 +2401,7 @@ testUpdateMultipleUserPrefs = testChat3 aliceProfile bobProfile cathProfile $
     alice #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(1, "hi bob"), (1, "Full deletion: enabled for contact"), (1, "Message reactions: off")])
     alice #$> ("/_get chat @3 count=100", chat, chatFeatures <> [(1, "hi cath"), (1, "Full deletion: enabled for contact"), (1, "Message reactions: off")])
 
-testGroupPrefsDirectForRole :: HasCallStack => FilePath -> IO ()
+testGroupPrefsDirectForRole :: HasCallStack => TestParams -> IO ()
 testGroupPrefsDirectForRole = testChat4 aliceProfile bobProfile cathProfile danProfile $
   \alice bob cath dan -> do
     createGroup3 "team" alice bob cath
@@ -2471,7 +2467,7 @@ testGroupPrefsDirectForRole = testChat4 aliceProfile bobProfile cathProfile danP
       cc <## "updated group preferences:"
       cc <## "Direct messages: on for owners"
 
-testGroupPrefsFilesForRole :: HasCallStack => FilePath -> IO ()
+testGroupPrefsFilesForRole :: HasCallStack => TestParams -> IO ()
 testGroupPrefsFilesForRole = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> withXFTPServer $ do
     alice #$> ("/_files_folder ./tests/tmp/alice", id, "ok")
@@ -2506,7 +2502,7 @@ testGroupPrefsFilesForRole = testChat3 aliceProfile bobProfile cathProfile $
       cc <## "updated group preferences:"
       cc <## "Files and media: on for owners"
 
-testGroupPrefsSimplexLinksForRole :: HasCallStack => FilePath -> IO ()
+testGroupPrefsSimplexLinksForRole :: HasCallStack => TestParams -> IO ()
 testGroupPrefsSimplexLinksForRole = testChat3 aliceProfile bobProfile cathProfile $
   \alice bob cath -> withXFTPServer $ do
     createGroup3 "team" alice bob cath
@@ -2542,7 +2538,7 @@ testGroupPrefsSimplexLinksForRole = testChat3 aliceProfile bobProfile cathProfil
       cc <## "updated group preferences:"
       cc <## "SimpleX links: on for owners"
 
-testSetUITheme :: HasCallStack => FilePath -> IO ()
+testSetUITheme :: HasCallStack => TestParams -> IO ()
 testSetUITheme =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
@@ -2592,3 +2588,162 @@ testSetUITheme =
     groupInfo a = do
       a <## "group ID: 1"
       a <## "current members: 1"
+
+testShortLinkInvitation :: HasCallStack => TestParams -> IO ()
+testShortLinkInvitation =
+  testChat2 aliceProfile bobProfile $ \alice bob -> do
+    alice ##> "/c short"
+    inv <- getShortInvitation alice
+    bob ##> ("/c " <> inv)
+    bob <## "confirmation sent!"
+    concurrently_
+      (alice <## "bob (Bob): contact is connected")
+      (bob <## "alice (Alice): contact is connected")
+    alice #> "@bob hi"
+    bob <# "alice> hi"
+    bob #> "@alice hey"
+    alice <# "bob> hey"
+
+testPlanShortLinkInvitation :: HasCallStack => TestParams -> IO ()
+testPlanShortLinkInvitation =
+  testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
+    alice ##> "/c short"
+    inv <- getShortInvitation alice
+    alice ##> ("/_connect plan 1 " <> inv)
+    alice <## "invitation link: own link"
+    alice ##> ("/_connect plan 1 " <> slSimplexScheme inv)
+    alice <## "invitation link: own link"
+    bob ##> ("/_connect plan 1 " <> inv)
+    bob <## "invitation link: ok to connect"
+    -- nobody else can connect
+    cath ##> ("/_connect plan 1 " <> inv)
+    cath <##. "error: connection authorization failed"
+    cath ##> ("/c " <> inv)
+    cath <##. "error: connection authorization failed"
+    -- bob can retry "plan"
+    bob ##> ("/_connect plan 1 " <> inv)
+    bob <## "invitation link: ok to connect"
+    -- with simplex: scheme too
+    bob ##> ("/_connect plan 1 " <> slSimplexScheme inv)
+    bob <## "invitation link: ok to connect"
+    bob ##> ("/c " <> inv)
+    bob <## "confirmation sent!"
+    concurrently_
+      (alice <## "bob (Bob): contact is connected")
+      (bob <## "alice (Alice): contact is connected")
+    alice #> "@bob hi"
+    bob <# "alice> hi"
+    bob #> "@alice hey"
+    alice <# "bob> hey"
+    bob ##> ("/_connect plan 1 " <> inv)
+    bob <##. "error: connection authorization failed"
+    alice ##> ("/_connect plan 1 " <> inv)
+    alice <##. "error: connection authorization failed" -- short_link_inv and conn_req_inv are removed after connection
+
+slSimplexScheme :: String -> String
+slSimplexScheme sl = T.unpack $ T.replace "https://localhost/" "simplex:/" (T.pack sl) <> "?h=localhost"
+
+testShortLinkContactAddress :: HasCallStack => TestParams -> IO ()
+testShortLinkContactAddress =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
+    alice ##> "/ad short"
+    (shortLink, fullLink) <- getShortContactLink alice True
+    alice ##> ("/_connect plan 1 " <> shortLink)
+    alice <## "contact address: own address"
+    alice ##> ("/_connect plan 1 " <> slSimplexScheme shortLink)
+    alice <## "contact address: own address"
+    alice ##> ("/_connect plan 1 " <> fullLink)
+    alice <## "contact address: own address"
+    (alice, bob) `connectVia` shortLink
+    bob ##> ("/_connect plan 1 " <> slSimplexScheme shortLink)
+    bob <## "contact address: known contact alice"
+    bob <## "use @alice <message> to send messages"
+    (alice, cath) `connectVia` slSimplexScheme shortLink
+    cath ##> ("/_connect plan 1 " <> shortLink)
+    cath <## "contact address: known contact alice"
+    cath <## "use @alice <message> to send messages"
+    (alice, dan) `connectVia` fullLink
+  where
+    (alice, cc) `connectVia` cLink = do
+      name <- userName cc
+      sName <- showName cc
+      cc ##> ("/_connect plan 1 " <> cLink)
+      cc <## "contact address: ok to connect"
+      cc ##> ("/c " <> cLink)
+      alice <#? cc
+      alice ##> ("/ac " <> name)
+      alice <## (sName <> ": accepting contact request, you can send messages to contact")
+      concurrently_
+        (cc <## "alice (Alice): contact is connected")
+        (alice <## (sName <> ": contact is connected"))
+      cc ##> ("/_connect plan 1 " <> cLink)
+      cc <## "contact address: known contact alice"
+      cc <## "use @alice <message> to send messages"
+
+testShortLinkJoinGroup :: HasCallStack => TestParams -> IO ()
+testShortLinkJoinGroup =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
+    threadDelay 100000
+    alice ##> "/ad short" -- create the address to test that it can co-exist with group link
+    _ <- getShortContactLink alice True
+    alice ##> "/g team"
+    alice <## "group #team is created"
+    alice <## "to add members use /a team <name> or /create link #team"
+    alice ##> "/create link #team short"
+    (shortLink, fullLink) <- getShortGroupLink alice "team" GRMember True
+    alice ##> ("/_connect plan 1 " <> shortLink)
+    alice <## "group link: own link for group #team"
+    alice ##> ("/_connect plan 1 " <> slSimplexScheme shortLink)
+    alice <## "group link: own link for group #team"
+    alice ##> ("/_connect plan 1 " <> fullLink)
+    alice <## "group link: own link for group #team"
+    joinGroup alice bob shortLink
+    bob ##> ("/_connect plan 1 " <> shortLink)
+    bob <## "group link: known group #team"
+    bob <## "use #team <message> to send messages"
+    bob ##> ("/_connect plan 1 " <> slSimplexScheme shortLink)
+    bob <## "group link: known group #team"
+    bob <## "use #team <message> to send messages"
+    joinGroup alice cath $ slSimplexScheme shortLink
+    concurrentlyN_
+      [ do
+          bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
+          bob <## "#team: new member cath is connected",
+        cath <## "#team: member bob (Bob) is connected"
+      ]
+    cath ##> ("/_connect plan 1 " <> slSimplexScheme shortLink)
+    cath <## "group link: known group #team"
+    cath <## "use #team <message> to send messages"
+    cath ##> ("/_connect plan 1 " <> shortLink)
+    cath <## "group link: known group #team"
+    cath <## "use #team <message> to send messages"
+    joinGroup alice dan fullLink
+    concurrentlyN_
+      [ do
+          bob <## "#team: alice added dan (Daniel) to the group (connecting...)"
+          bob <## "#team: new member dan is connected",
+        do
+          cath <## "#team: alice added dan (Daniel) to the group (connecting...)"
+          cath <## "#team: new member dan is connected",
+        do
+          dan <## "#team: member bob (Bob) is connected"
+          dan <## "#team: member cath (Catherine) is connected"
+      ]
+    dan ##> ("/_connect plan 1 " <> fullLink)
+    dan <## "group link: known group #team"
+    dan <## "use #team <message> to send messages"
+  where
+    joinGroup alice cc link = do
+      name <- userName cc
+      sName <- showName cc
+      cc ##> ("/_connect plan 1 " <> link)
+      cc <## "group link: ok to connect"
+      cc ##> ("/c " <> link)
+      cc <## "connection request sent!"
+      alice <## (sName <> ": accepting request to join group #team...")
+      concurrentlyN_
+        [ alice <## ("#team: " <> name <> " joined the group"),
+          do
+            cc <## "#team: joining the group..."
+            cc <## "#team: you joined the group"
+        ]
diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs
index 24178125ee..38c8c308c8 100644
--- a/tests/ChatTests/Utils.hs
+++ b/tests/ChatTests/Utils.hs
@@ -9,8 +9,9 @@
 module ChatTests.Utils where
 
 import ChatClient
+import ChatTests.DBUtils
 import Control.Concurrent (threadDelay)
-import Control.Concurrent.Async (concurrently_)
+import Control.Concurrent.Async (concurrently_, mapConcurrently_)
 import Control.Concurrent.STM
 import Control.Monad (unless, when)
 import Control.Monad.Except (runExceptT)
@@ -32,6 +33,7 @@ import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.FileTransfer.Client.Main (xftpClientCLI)
+import Simplex.Messaging.Agent.Client (agentClientStore)
 import Simplex.Messaging.Agent.Store.AgentStore (maybeFirstRow, withTransaction)
 import qualified Simplex.Messaging.Agent.Store.DB as DB
 import qualified Simplex.Messaging.Crypto as C
@@ -69,16 +71,19 @@ cathProfile = Profile {displayName = "cath", fullName = "Catherine", image = Not
 danProfile :: Profile
 danProfile = Profile {displayName = "dan", fullName = "Daniel", image = Nothing, contactLink = Nothing, preferences = defaultPrefs}
 
+eveProfile :: Profile
+eveProfile = Profile {displayName = "eve", fullName = "Eve", image = Nothing, contactLink = Nothing, preferences = defaultPrefs}
+
 businessProfile :: Profile
 businessProfile = Profile {displayName = "biz", fullName = "Biz Inc", image = Nothing, contactLink = Nothing, preferences = defaultPrefs}
 
-it :: HasCallStack => String -> (FilePath -> Expectation) -> SpecWith (Arg (FilePath -> Expectation))
+it :: HasCallStack => String -> (TestParams -> Expectation) -> SpecWith (Arg (TestParams -> Expectation))
 it name test =
   Hspec.it name $ \tmp -> timeout t (test tmp) >>= maybe (error "test timed out") pure
   where
     t = 90 * 1000000
 
-xit' :: HasCallStack => String -> (FilePath -> Expectation) -> SpecWith (Arg (FilePath -> Expectation))
+xit' :: HasCallStack => String -> (TestParams -> Expectation) -> SpecWith (Arg (TestParams -> Expectation))
 xit' = if os == "linux" then xit else it
 
 xit'' :: (HasCallStack, Example a) => String -> a -> SpecWith (Arg a)
@@ -96,7 +101,7 @@ skip :: String -> SpecWith a -> SpecWith a
 skip = before_ . pendingWith
 
 -- Bool is pqExpected - see testAddContact
-versionTestMatrix2 :: (HasCallStack => Bool -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
+versionTestMatrix2 :: (HasCallStack => Bool -> TestCC -> TestCC -> IO ()) -> SpecWith TestParams
 versionTestMatrix2 runTest = do
   it "current" $ testChat2 aliceProfile bobProfile (runTest True)
   it "prev" $ testChatCfg2 testCfgVPrev aliceProfile bobProfile (runTest False)
@@ -106,7 +111,7 @@ versionTestMatrix2 runTest = do
   it "old to curr" $ runTestCfg2 testCfg testCfgV1 (runTest False)
   it "curr to old" $ runTestCfg2 testCfgV1 testCfg (runTest False)
 
-versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
+versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith TestParams
 versionTestMatrix3 runTest = do
   it "current" $ testChat3 aliceProfile bobProfile cathProfile runTest
   it "prev" $ testChatCfg3 testCfgVPrev aliceProfile bobProfile cathProfile runTest
@@ -115,46 +120,46 @@ versionTestMatrix3 runTest = do
   it "curr to prev" $ runTestCfg3 testCfgVPrev testCfg testCfg runTest
   it "curr+prev to prev" $ runTestCfg3 testCfgVPrev testCfg testCfgVPrev runTest
 
-runTestCfg2 :: ChatConfig -> ChatConfig -> (HasCallStack => TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-runTestCfg2 aliceCfg bobCfg runTest tmp =
-  withNewTestChatCfg tmp aliceCfg "alice" aliceProfile $ \alice ->
-    withNewTestChatCfg tmp bobCfg "bob" bobProfile $ \bob ->
+runTestCfg2 :: ChatConfig -> ChatConfig -> (HasCallStack => TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+runTestCfg2 aliceCfg bobCfg runTest ps =
+  withNewTestChatCfg ps aliceCfg "alice" aliceProfile $ \alice ->
+    withNewTestChatCfg ps bobCfg "bob" bobProfile $ \bob ->
       runTest alice bob
 
-runTestCfg3 :: ChatConfig -> ChatConfig -> ChatConfig -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-runTestCfg3 aliceCfg bobCfg cathCfg runTest tmp =
-  withNewTestChatCfg tmp aliceCfg "alice" aliceProfile $ \alice ->
-    withNewTestChatCfg tmp bobCfg "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp cathCfg "cath" cathProfile $ \cath ->
+runTestCfg3 :: ChatConfig -> ChatConfig -> ChatConfig -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO ()
+runTestCfg3 aliceCfg bobCfg cathCfg runTest ps =
+  withNewTestChatCfg ps aliceCfg "alice" aliceProfile $ \alice ->
+    withNewTestChatCfg ps bobCfg "bob" bobProfile $ \bob ->
+      withNewTestChatCfg ps cathCfg "cath" cathProfile $ \cath ->
         runTest alice bob cath
 
-withTestChatGroup3Connected :: HasCallStack => FilePath -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatGroup3Connected tmp dbPrefix action = do
-  withTestChat tmp dbPrefix $ \cc -> do
+withTestChatGroup3Connected :: HasCallStack => TestParams -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatGroup3Connected ps dbPrefix action = do
+  withTestChat ps dbPrefix $ \cc -> do
     cc <## "2 contacts connected (use /cs for the list)"
     cc <## "#team: connected to server(s)"
     action cc
 
-withTestChatGroup3Connected' :: HasCallStack => FilePath -> String -> IO ()
-withTestChatGroup3Connected' tmp dbPrefix = withTestChatGroup3Connected tmp dbPrefix $ \_ -> pure ()
+withTestChatGroup3Connected' :: HasCallStack => TestParams -> String -> IO ()
+withTestChatGroup3Connected' ps dbPrefix = withTestChatGroup3Connected ps dbPrefix $ \_ -> pure ()
 
-withTestChatContactConnected :: HasCallStack => FilePath -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatContactConnected tmp dbPrefix action =
-  withTestChat tmp dbPrefix $ \cc -> do
+withTestChatContactConnected :: HasCallStack => TestParams -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatContactConnected ps dbPrefix action =
+  withTestChat ps dbPrefix $ \cc -> do
     cc <## "1 contacts connected (use /cs for the list)"
     action cc
 
-withTestChatContactConnected' :: HasCallStack => FilePath -> String -> IO ()
-withTestChatContactConnected' tmp dbPrefix = withTestChatContactConnected tmp dbPrefix $ \_ -> pure ()
+withTestChatContactConnected' :: HasCallStack => TestParams -> String -> IO ()
+withTestChatContactConnected' ps dbPrefix = withTestChatContactConnected ps dbPrefix $ \_ -> pure ()
 
-withTestChatContactConnectedV1 :: HasCallStack => FilePath -> String -> (HasCallStack => TestCC -> IO a) -> IO a
-withTestChatContactConnectedV1 tmp dbPrefix action =
-  withTestChatV1 tmp dbPrefix $ \cc -> do
+withTestChatContactConnectedV1 :: HasCallStack => TestParams -> String -> (HasCallStack => TestCC -> IO a) -> IO a
+withTestChatContactConnectedV1 ps dbPrefix action =
+  withTestChatV1 ps dbPrefix $ \cc -> do
     cc <## "1 contacts connected (use /cs for the list)"
     action cc
 
-withTestChatContactConnectedV1' :: HasCallStack => FilePath -> String -> IO ()
-withTestChatContactConnectedV1' tmp dbPrefix = withTestChatContactConnectedV1 tmp dbPrefix $ \_ -> pure ()
+withTestChatContactConnectedV1' :: HasCallStack => TestParams -> String -> IO ()
+withTestChatContactConnectedV1' ps dbPrefix = withTestChatContactConnectedV1 ps dbPrefix $ \_ -> pure ()
 
 -- | test sending direct messages
 (<##>) :: HasCallStack => TestCC -> TestCC -> IO ()
@@ -304,6 +309,7 @@ groupFeatures'' dir =
     ((dir, "Voice messages: on"), Nothing, Nothing),
     ((dir, "Files and media: on"), Nothing, Nothing),
     ((dir, "SimpleX links: on"), Nothing, Nothing),
+    ((dir, "Member reports: on"), Nothing, Nothing),
     ((dir, "Recent history: on"), Nothing, Nothing)
   ]
 
@@ -360,6 +366,13 @@ cc <#. line = do
   unless prefix $ print ("expected to start from: " <> line, ", got: " <> l)
   prefix `shouldBe` True
 
+(.<#) :: HasCallStack => TestCC -> String -> Expectation
+cc .<# line = do
+  l <- dropTime <$> getTermLine cc
+  let suffix = line `isSuffixOf` l
+  unless suffix $ print ("expected to end with: " <> line, ", got: " <> l)
+  suffix `shouldBe` True
+
 (<##..) :: HasCallStack => TestCC -> [String] -> Expectation
 cc <##.. ls = do
   l <- getTermLine cc
@@ -414,7 +427,7 @@ getInAnyOrder f cc ls = do
 cc <# line = (dropTime <$> getTermLine cc) `shouldReturn` line
 
 (*<#) :: HasCallStack => [TestCC] -> String -> Expectation
-ccs *<# line = concurrentlyN_ $ map (<# line) ccs
+ccs *<# line = mapConcurrently_ (<# line) ccs
 
 (?<#) :: HasCallStack => TestCC -> String -> Expectation
 cc ?<# line = (dropTime <$> getTermLine cc) `shouldReturn` "i " <> line
@@ -492,14 +505,27 @@ dropPartialReceipt_ msg = case splitAt 2 msg of
   _ -> Nothing
 
 getInvitation :: HasCallStack => TestCC -> IO String
-getInvitation cc = do
+getInvitation = getInvitation_ False
+
+getShortInvitation :: HasCallStack => TestCC -> IO String
+getShortInvitation = getInvitation_ True
+
+getInvitation_ :: HasCallStack => Bool -> TestCC -> IO String
+getInvitation_ short cc = do
   cc <## "pass this invitation link to your contact (via another channel):"
   cc <## ""
   inv <- getTermLine cc
   cc <## ""
   cc <## "and ask them to connect: /c <invitation_link_above>"
+  when short $ cc <##. "The invitation link for old clients: https://simplex.chat/invitation#"
   pure inv
 
+getShortContactLink :: HasCallStack => TestCC -> Bool -> IO (String, String)
+getShortContactLink cc created = do
+  shortLink <- getContactLink cc created
+  fullLink <- dropLinePrefix "The contact link for old clients: " =<< getTermLine cc
+  pure (shortLink, fullLink)
+
 getContactLink :: HasCallStack => TestCC -> Bool -> IO String
 getContactLink cc created = do
   cc <## if created then "Your new chat address is created!" else "Your chat address:"
@@ -512,6 +538,17 @@ getContactLink cc created = do
   cc <## "to delete it: /da (accepted contacts will remain connected)"
   pure link
 
+dropLinePrefix :: String -> String -> IO String
+dropLinePrefix line s
+  | line `isPrefixOf` s = pure $ drop (length line) s
+  | otherwise = error $ "expected to start from: " <> line <> ", got: " <> s
+
+getShortGroupLink :: HasCallStack => TestCC -> String -> GroupMemberRole -> Bool -> IO (String, String)
+getShortGroupLink cc gName mRole created = do
+  shortLink <- getGroupLink cc gName mRole created
+  fullLink <- dropLinePrefix "The group link for old clients: " =<< getTermLine cc
+  pure (shortLink, fullLink)
+
 getGroupLink :: HasCallStack => TestCC -> String -> GroupMemberRole -> Bool -> IO String
 getGroupLink cc gName mRole created = do
   cc <## if created then "Group link is created!" else "Group link:"
@@ -547,6 +584,10 @@ withCCTransaction :: TestCC -> (DB.Connection -> IO a) -> IO a
 withCCTransaction cc action =
   withTransaction (chatStore $ chatController cc) $ \db -> action db
 
+withCCAgentTransaction :: TestCC -> (DB.Connection -> IO a) -> IO a
+withCCAgentTransaction TestCC {chatController = ChatController {smpAgent}} action =
+  withTransaction (agentClientStore smpAgent) $ \db -> action db
+
 createCCNoteFolder :: TestCC -> IO ()
 createCCNoteFolder cc =
   withCCTransaction cc $ \db ->
@@ -616,30 +657,44 @@ showName (TestCC ChatController {currentUser} _ _ _ _ _) = do
   pure . T.unpack $ localDisplayName <> optionalFullName localDisplayName fullName
 
 createGroup2 :: HasCallStack => String -> TestCC -> TestCC -> IO ()
-createGroup2 gName cc1 cc2 = createGroup2' gName cc1 cc2 True
+createGroup2 gName cc1 cc2 = createGroup2' gName cc1 (cc2, GRAdmin) True
 
-createGroup2' :: HasCallStack => String -> TestCC -> TestCC -> Bool -> IO ()
-createGroup2' gName cc1 cc2 doConnectUsers = do
+createGroup2' :: HasCallStack => String -> TestCC -> (TestCC, GroupMemberRole) -> Bool -> IO ()
+createGroup2' gName cc1 (cc2, role2) doConnectUsers = do
   when doConnectUsers $ connectUsers cc1 cc2
   name2 <- userName cc2
   cc1 ##> ("/g " <> gName)
   cc1 <## ("group #" <> gName <> " is created")
   cc1 <## ("to add members use /a " <> gName <> " <name> or /create link #" <> gName)
-  addMember gName cc1 cc2 GRAdmin
+  addMember gName cc1 cc2 role2
   cc2 ##> ("/j " <> gName)
   concurrently_
     (cc1 <## ("#" <> gName <> ": " <> name2 <> " joined the group"))
     (cc2 <## ("#" <> gName <> ": you joined the group"))
 
+disableFullDeletion2 :: HasCallStack => String -> TestCC -> TestCC -> IO ()
+disableFullDeletion2 gName cc1 cc2 = do
+  cc1 ##> ("/set delete #" <> gName <> " off")
+  cc1 <## "updated group preferences:"
+  cc1 <## "Full deletion: off"
+  name1 <- userName cc1
+  cc2 <## (name1 <> " updated group #" <> gName <> ":")
+  cc2 <## "updated group preferences:"
+  cc2 <## "Full deletion: off"
+
 createGroup3 :: HasCallStack => String -> TestCC -> TestCC -> TestCC -> IO ()
 createGroup3 gName cc1 cc2 cc3 = do
-  createGroup2 gName cc1 cc2
+  createGroup3' gName cc1 (cc2, GRAdmin) (cc3, GRAdmin)
+
+createGroup3' :: HasCallStack => String -> TestCC -> (TestCC, GroupMemberRole) -> (TestCC, GroupMemberRole) -> IO ()
+createGroup3' gName cc1 (cc2, role2) (cc3, role3) = do
+  createGroup2' gName cc1 (cc2, role2) True
   connectUsers cc1 cc3
   name1 <- userName cc1
   name3 <- userName cc3
   sName2 <- showName cc2
   sName3 <- showName cc3
-  addMember gName cc1 cc3 GRAdmin
+  addMember gName cc1 cc3 role3
   cc3 ##> ("/j " <> gName)
   concurrentlyN_
     [ cc1 <## ("#" <> gName <> ": " <> name3 <> " joined the group"),
@@ -651,10 +706,43 @@ createGroup3 gName cc1 cc2 cc3 = do
         cc2 <## ("#" <> gName <> ": new member " <> name3 <> " is connected")
     ]
 
+createGroup4 :: HasCallStack => String -> TestCC -> (TestCC, GroupMemberRole) -> (TestCC, GroupMemberRole) -> (TestCC, GroupMemberRole) -> IO ()
+createGroup4 gName cc1 (cc2, role2) (cc3, role3) (cc4, role4) = do
+  createGroup3' gName cc1 (cc2, role2) (cc3, role3)
+  connectUsers cc1 cc4
+  name1 <- userName cc1
+  name4 <- userName cc4
+  sName2 <- showName cc2
+  sName3 <- showName cc3
+  sName4 <- showName cc4
+  addMember gName cc1 cc4 role4
+  cc4 ##> ("/j " <> gName)
+  concurrentlyN_
+    [ cc1 <## "#team: dan joined the group",
+      do
+        cc4 <## ("#" <> gName <> ": you joined the group")
+        cc4 <## ("#" <> gName <> ": member " <> sName2 <> " is connected")
+        cc4 <## ("#" <> gName <> ": member " <> sName3 <> " is connected"),
+      do
+        cc2 <## ("#" <> gName <> ": " <> name1 <> " added " <> sName4 <> " to the group (connecting...)")
+        cc2 <## ("#" <> gName <> ": new member " <> name4 <> " is connected"),
+      do
+        cc3 <## ("#" <> gName <> ": " <> name1 <> " added " <> sName4 <> " to the group (connecting...)")
+        cc3 <## ("#" <> gName <> ": new member " <> name4 <> " is connected")
+    ]
+
+disableFullDeletion3 :: HasCallStack => String -> TestCC -> TestCC -> TestCC -> IO ()
+disableFullDeletion3 gName cc1 cc2 cc3 = do
+  disableFullDeletion2 gName cc1 cc2
+  name1 <- userName cc1
+  cc3 <## (name1 <> " updated group #" <> gName <> ":")
+  cc3 <## "updated group preferences:"
+  cc3 <## "Full deletion: off"
+
 create2Groups3 :: HasCallStack => String -> String -> TestCC -> TestCC -> TestCC -> IO ()
 create2Groups3 gName1 gName2 cc1 cc2 cc3 = do
   createGroup3 gName1 cc1 cc2 cc3
-  createGroup2' gName2 cc1 cc2 False
+  createGroup2' gName2 cc1 (cc2, GRAdmin) False
   name1 <- userName cc1
   name3 <- userName cc3
   addMember gName2 cc1 cc3 GRAdmin
diff --git a/tests/JSONFixtures.hs b/tests/JSONFixtures.hs
index 32e90cf754..bd74f44022 100644
--- a/tests/JSONFixtures.hs
+++ b/tests/JSONFixtures.hs
@@ -5,55 +5,55 @@ module JSONFixtures where
 import qualified Data.ByteString.Lazy.Char8 as LB
 
 noActiveUserSwift :: LB.ByteString
-noActiveUserSwift = "{\"resp\":{\"_owsf\":true,\"chatCmdError\":{\"chatError\":{\"_owsf\":true,\"error\":{\"errorType\":{\"_owsf\":true,\"noActiveUser\":{}}}}}}}"
+noActiveUserSwift = "{\"error\":{\"_owsf\":true,\"error\":{\"errorType\":{\"_owsf\":true,\"noActiveUser\":{}}}}}"
 
 noActiveUserTagged :: LB.ByteString
-noActiveUserTagged = "{\"resp\":{\"type\":\"chatCmdError\",\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"noActiveUser\"}}}}"
+noActiveUserTagged = "{\"error\":{\"type\":\"error\",\"errorType\":{\"type\":\"noActiveUser\"}}}"
 
 activeUserExistsSwift :: LB.ByteString
-activeUserExistsSwift = "{\"resp\":{\"_owsf\":true,\"chatCmdError\":{\"user_\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true},\"chatError\":{\"_owsf\":true,\"error\":{\"errorType\":{\"_owsf\":true,\"userExists\":{\"contactName\":\"alice\"}}}}}}}"
+activeUserExistsSwift = "{\"error\":{\"_owsf\":true,\"error\":{\"errorType\":{\"_owsf\":true,\"userExists\":{\"contactName\":\"alice\"}}}}}"
 
 activeUserExistsTagged :: LB.ByteString
-activeUserExistsTagged = "{\"resp\":{\"type\":\"chatCmdError\",\"user_\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true},\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"userExists\",\"contactName\":\"alice\"}}}}"
+activeUserExistsTagged = "{\"error\":{\"type\":\"error\",\"errorType\":{\"type\":\"userExists\",\"contactName\":\"alice\"}}}"
 
 activeUserSwift :: LB.ByteString
-activeUserSwift = "{\"resp\":{\"_owsf\":true,\"activeUser\":{\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}}}}"
+activeUserSwift = "{\"result\":{\"_owsf\":true,\"activeUser\":{\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}}}}"
 
 activeUserTagged :: LB.ByteString
-activeUserTagged = "{\"resp\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}}}"
+activeUserTagged = "{\"result\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}}}"
 
 chatStartedSwift :: LB.ByteString
-chatStartedSwift = "{\"resp\":{\"_owsf\":true,\"chatStarted\":{}}}"
+chatStartedSwift = "{\"result\":{\"_owsf\":true,\"chatStarted\":{}}}"
 
 chatStartedTagged :: LB.ByteString
-chatStartedTagged = "{\"resp\":{\"type\":\"chatStarted\"}}"
+chatStartedTagged = "{\"result\":{\"type\":\"chatStarted\"}}"
 
 networkStatusesSwift :: LB.ByteString
-networkStatusesSwift = "{\"resp\":{\"_owsf\":true,\"networkStatuses\":{\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}}"
+networkStatusesSwift = "{\"result\":{\"_owsf\":true,\"networkStatuses\":{\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}}"
 
 networkStatusesTagged :: LB.ByteString
-networkStatusesTagged = "{\"resp\":{\"type\":\"networkStatuses\",\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}"
+networkStatusesTagged = "{\"result\":{\"type\":\"networkStatuses\",\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}"
 
 userJSON :: LB.ByteString
 userJSON = "{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true}"
 
 memberSubSummarySwift :: LB.ByteString
-memberSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"memberSubSummary\":{\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}}"
+memberSubSummarySwift = "{\"result\":{\"_owsf\":true,\"memberSubSummary\":{\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}}"
 
 memberSubSummaryTagged :: LB.ByteString
-memberSubSummaryTagged = "{\"resp\":{\"type\":\"memberSubSummary\",\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}"
+memberSubSummaryTagged = "{\"result\":{\"type\":\"memberSubSummary\",\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}"
 
 userContactSubSummarySwift :: LB.ByteString
-userContactSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"userContactSubSummary\":{\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}}"
+userContactSubSummarySwift = "{\"result\":{\"_owsf\":true,\"userContactSubSummary\":{\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}}"
 
 userContactSubSummaryTagged :: LB.ByteString
-userContactSubSummaryTagged = "{\"resp\":{\"type\":\"userContactSubSummary\",\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}"
+userContactSubSummaryTagged = "{\"result\":{\"type\":\"userContactSubSummary\",\"user\":" <> userJSON <> ",\"userContactSubscriptions\":[]}}"
 
 pendingSubSummarySwift :: LB.ByteString
-pendingSubSummarySwift = "{\"resp\":{\"_owsf\":true,\"pendingSubSummary\":{\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}}"
+pendingSubSummarySwift = "{\"result\":{\"_owsf\":true,\"pendingSubSummary\":{\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}}"
 
 pendingSubSummaryTagged :: LB.ByteString
-pendingSubSummaryTagged = "{\"resp\":{\"type\":\"pendingSubSummary\",\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}"
+pendingSubSummaryTagged = "{\"result\":{\"type\":\"pendingSubSummary\",\"user\":" <> userJSON <> ",\"pendingSubscriptions\":[]}}"
 
 parsedMarkdownSwift :: LB.ByteString
 parsedMarkdownSwift = "{\"formattedText\":[{\"format\":{\"_owsf\":true,\"bold\":{}},\"text\":\"hello\"}]}"
diff --git a/tests/MarkdownTests.hs b/tests/MarkdownTests.hs
index 615edc02c4..05d5362cf1 100644
--- a/tests/MarkdownTests.hs
+++ b/tests/MarkdownTests.hs
@@ -7,7 +7,10 @@ module MarkdownTests where
 
 import Data.List.NonEmpty (NonEmpty)
 import Data.Text (Text)
+import qualified Data.Text as T
+import Data.Text.Encoding (encodeUtf8)
 import Simplex.Chat.Markdown
+import Simplex.Messaging.Encoding.String
 import System.Console.ANSI.Types
 import Test.Hspec
 
@@ -19,81 +22,109 @@ markdownTests = do
   textWithUri
   textWithEmail
   textWithPhone
+  textWithMentions
   multilineMarkdownList
 
+infixr 1 ==>, <==, <==>, ==>>, <<==, <<==>>
+
+(==>) :: Text -> Markdown -> Expectation
+s ==> m = parseMarkdown s `shouldBe` m
+
+(<==) :: Text -> Markdown -> Expectation
+s <== m = s <<== markdownToList m
+
+(<==>) :: Text -> Markdown -> Expectation
+s <==> m = (s ==> m) >> (s <== m)
+
+(==>>) :: Text -> MarkdownList -> Expectation
+s ==>> ft = parseMaybeMarkdownList s `shouldBe` Just ft
+
+(<<==) :: Text -> MarkdownList -> Expectation
+s <<== ft = T.concat (map markdownText ft) `shouldBe` s
+
+(<<==>>) :: Text -> MarkdownList -> Expectation
+s <<==>> ft = (s ==>> ft) >> (s <<== ft)
+
+bold :: Text -> Markdown
+bold = markdown Bold
+
 textFormat :: Spec
 textFormat = describe "text format (bold)" do
   it "correct markdown" do
-    parseMarkdown "this is *bold formatted* text"
-      `shouldBe` "this is " <> markdown Bold "bold formatted" <> " text"
-    parseMarkdown "*bold formatted* text"
-      `shouldBe` markdown Bold "bold formatted" <> " text"
-    parseMarkdown "this is *bold*"
-      `shouldBe` "this is " <> markdown Bold "bold"
-    parseMarkdown " *bold* text"
-      `shouldBe` " " <> markdown Bold "bold" <> " text"
-    parseMarkdown "   *bold* text"
-      `shouldBe` "   " <> markdown Bold "bold" <> " text"
-    parseMarkdown "this is *bold* "
-      `shouldBe` "this is " <> markdown Bold "bold" <> " "
-    parseMarkdown "this is *bold*   "
-      `shouldBe` "this is " <> markdown Bold "bold" <> "   "
+    "this is *bold formatted* text"
+      <==> "this is " <> bold "bold formatted" <> " text"
+    "*bold formatted* text"
+      <==> bold "bold formatted" <> " text"
+    "this is *bold*"
+      <==> "this is " <> bold "bold"
+    " *bold* text"
+      <==> " " <> bold "bold" <> " text"
+    "   *bold* text"
+      <==> "   " <> bold "bold" <> " text"
+    "this is *bold* "
+      <==> "this is " <> bold "bold" <> " "
+    "this is *bold*   "
+      <==> "this is " <> bold "bold" <> "   "
   it "ignored as markdown" do
-    parseMarkdown "this is * unformatted * text"
-      `shouldBe` "this is * unformatted * text"
-    parseMarkdown "this is *unformatted * text"
-      `shouldBe` "this is *unformatted * text"
-    parseMarkdown "this is * unformatted* text"
-      `shouldBe` "this is * unformatted* text"
-    parseMarkdown "this is **unformatted** text"
-      `shouldBe` "this is **unformatted** text"
-    parseMarkdown "this is*unformatted* text"
-      `shouldBe` "this is*unformatted* text"
-    parseMarkdown "this is *unformatted text"
-      `shouldBe` "this is *unformatted text"
+    "this is * unformatted * text"
+      <==> "this is * unformatted * text"
+    "this is *unformatted * text"
+      <==> "this is *unformatted * text"
+    "this is * unformatted* text"
+      <==> "this is * unformatted* text"
+    "this is **unformatted** text"
+      <==> "this is **unformatted** text"
+    "this is*unformatted* text"
+      <==> "this is*unformatted* text"
+    "this is *unformatted text"
+      <==> "this is *unformatted text"
+    "*this* is *unformatted text"
+      <==> bold "this" <> " is *unformatted text"
   it "ignored internal markdown" do
-    parseMarkdown "this is *long _bold_ (not italic)* text"
-      `shouldBe` "this is " <> markdown Bold "long _bold_ (not italic)" <> " text"
-    parseMarkdown "snippet: `this is *bold text*`"
-      `shouldBe` "snippet: " <> markdown Snippet "this is *bold text*"
+    "this is *long _bold_ (not italic)* text"
+      <==> "this is " <> bold "long _bold_ (not italic)" <> " text"
+    "snippet: `this is *bold text*`"
+      <==> "snippet: " <> markdown Snippet "this is *bold text*"
 
 secretText :: Spec
 secretText = describe "secret text" do
   it "correct markdown" do
-    parseMarkdown "this is #black_secret# text"
-      `shouldBe` "this is " <> markdown Secret "black_secret" <> " text"
-    parseMarkdown "##black_secret### text"
-      `shouldBe` markdown Secret "#black_secret##" <> " text"
-    parseMarkdown "this is #black secret# text"
-      `shouldBe` "this is " <> markdown Secret "black secret" <> " text"
-    parseMarkdown "##black secret### text"
-      `shouldBe` markdown Secret "#black secret##" <> " text"
-    parseMarkdown "this is #secret#"
-      `shouldBe` "this is " <> markdown Secret "secret"
-    parseMarkdown " #secret# text"
-      `shouldBe` " " <> markdown Secret "secret" <> " text"
-    parseMarkdown "   #secret# text"
-      `shouldBe` "   " <> markdown Secret "secret" <> " text"
-    parseMarkdown "this is #secret# "
-      `shouldBe` "this is " <> markdown Secret "secret" <> " "
-    parseMarkdown "this is #secret#   "
-      `shouldBe` "this is " <> markdown Secret "secret" <> "   "
+    "this is #black_secret# text"
+      <==> "this is " <> markdown Secret "black_secret" <> " text"
+    "##black_secret### text"
+      <==> markdown Secret "#black_secret##" <> " text"
+    "this is #black secret# text"
+      <==> "this is " <> markdown Secret "black secret" <> " text"
+    "##black secret### text"
+      <==> markdown Secret "#black secret##" <> " text"
+    "this is #secret#"
+      <==> "this is " <> markdown Secret "secret"
+    " #secret# text"
+      <==> " " <> markdown Secret "secret" <> " text"
+    "   #secret# text"
+      <==> "   " <> markdown Secret "secret" <> " text"
+    "this is #secret# "
+      <==> "this is " <> markdown Secret "secret" <> " "
+    "this is #secret#   "
+      <==> "this is " <> markdown Secret "secret" <> "   "
   it "ignored as markdown" do
-    parseMarkdown "this is # unformatted # text"
-      `shouldBe` "this is # unformatted # text"
-    parseMarkdown "this is #unformatted # text"
-      `shouldBe` "this is #unformatted # text"
-    parseMarkdown "this is # unformatted# text"
-      `shouldBe` "this is # unformatted# text"
-    parseMarkdown "this is ## unformatted ## text"
-      `shouldBe` "this is ## unformatted ## text"
-    parseMarkdown "this is#unformatted# text"
-      `shouldBe` "this is#unformatted# text"
-    parseMarkdown "this is #unformatted text"
-      `shouldBe` "this is #unformatted text"
+    "this is # unformatted # text"
+      <==> "this is # unformatted # text"
+    "this is #unformatted # text"
+      <==> "this is #unformatted # text"
+    "this is # unformatted# text"
+      <==> "this is # unformatted# text"
+    "this is ## unformatted ## text"
+      <==> "this is ## unformatted ## text"
+    "this is#unformatted# text"
+      <==> "this is#unformatted# text"
+    "this is #unformatted text"
+      <==> "this is #unformatted text"
+    "*this* is #unformatted text"
+      <==> bold "this" <> " is #unformatted text"
   it "ignored internal markdown" do
-    parseMarkdown "snippet: `this is #secret_text#`"
-      `shouldBe` "snippet: " <> markdown Snippet "this is #secret_text#"
+    "snippet: `this is #secret_text#`"
+      <==> "snippet: " <> markdown Snippet "this is #secret_text#"
 
 red :: Text -> Markdown
 red = markdown (colored Red)
@@ -101,71 +132,94 @@ red = markdown (colored Red)
 textColor :: Spec
 textColor = describe "text color (red)" do
   it "correct markdown" do
-    parseMarkdown "this is !1 red color! text"
-      `shouldBe` "this is " <> red "red color" <> " text"
-    parseMarkdown "!1 red! text"
-      `shouldBe` red "red" <> " text"
-    parseMarkdown "this is !1 red!"
-      `shouldBe` "this is " <> red "red"
-    parseMarkdown " !1 red! text"
-      `shouldBe` " " <> red "red" <> " text"
-    parseMarkdown "   !1 red! text"
-      `shouldBe` "   " <> red "red" <> " text"
-    parseMarkdown "this is !1 red! "
-      `shouldBe` "this is " <> red "red" <> " "
-    parseMarkdown "this is !1 red!   "
-      `shouldBe` "this is " <> red "red" <> "   "
+    "this is !1 red color! text"
+      <==> "this is " <> red "red color" <> " text"
+    "!1 red! text"
+      <==> red "red" <> " text"
+    "this is !1 red!"
+      <==> "this is " <> red "red"
+    " !1 red! text"
+      <==> " " <> red "red" <> " text"
+    "   !1 red! text"
+      <==> "   " <> red "red" <> " text"
+    "this is !1 red! "
+      <==> "this is " <> red "red" <> " "
+    "this is !1 red!   "
+      <==> "this is " <> red "red" <> "   "
   it "ignored as markdown" do
-    parseMarkdown "this is !1 unformatted ! text"
-      `shouldBe` "this is !1 unformatted ! text"
-    parseMarkdown "this is !1 unformatted ! text"
-      `shouldBe` "this is !1 unformatted ! text"
-    parseMarkdown "this is !1  unformatted! text"
-      `shouldBe` "this is !1  unformatted! text"
-    -- parseMarkdown "this is !!1 unformatted!! text"
-    --   `shouldBe` "this is " <> "!!1" <> "unformatted!! text"
-    parseMarkdown "this is!1 unformatted! text"
-      `shouldBe` "this is!1 unformatted! text"
-    parseMarkdown "this is !1 unformatted text"
-      `shouldBe` "this is !1 unformatted text"
+    "this is !1 unformatted ! text"
+      <==> "this is !1 unformatted ! text"
+    "this is !1 unformatted ! text"
+      <==> "this is !1 unformatted ! text"
+    "this is !1  unformatted! text"
+      <==> "this is !1  unformatted! text"
+    -- "this is !!1 unformatted!! text"
+    --   <==> "this is " <> "!!1" <> "unformatted!! text"
+    "this is!1 unformatted! text"
+      <==> "this is!1 unformatted! text"
+    "this is !1 unformatted text"
+      <==> "this is !1 unformatted text"
+    "*this* is !1 unformatted text"
+      <==> bold "this" <> " is !1 unformatted text"
   it "ignored internal markdown" do
-    parseMarkdown "this is !1 long *red* (not bold)! text"
-      `shouldBe` "this is " <> red "long *red* (not bold)" <> " text"
-    parseMarkdown "snippet: `this is !1 red text!`"
-      `shouldBe` "snippet: " <> markdown Snippet "this is !1 red text!"
+    "this is !1 long *red* (not bold)! text"
+      <==> "this is " <> red "long *red* (not bold)" <> " text"
+    "snippet: `this is !1 red text!`"
+      <==> "snippet: " <> markdown Snippet "this is !1 red text!"
 
 uri :: Text -> Markdown
 uri = Markdown $ Just Uri
 
 simplexLink :: SimplexLinkType -> Text -> NonEmpty Text -> Text -> Markdown
-simplexLink linkType simplexUri smpHosts = Markdown $ Just SimplexLink {linkType, simplexUri, smpHosts}
+simplexLink linkType uriText smpHosts t = Markdown (simplexLinkFormat linkType uriText smpHosts) t
+
+simplexLinkFormat :: SimplexLinkType -> Text -> NonEmpty Text -> Maybe Format
+simplexLinkFormat linkType uriText smpHosts = case strDecode $ encodeUtf8 uriText of
+  Right simplexUri -> Just SimplexLink {linkType, simplexUri, smpHosts}
+  Left e -> error e
 
 textWithUri :: Spec
 textWithUri = describe "text with Uri" do
   it "correct markdown" do
-    parseMarkdown "https://simplex.chat" `shouldBe` uri "https://simplex.chat"
-    parseMarkdown "https://simplex.chat." `shouldBe` uri "https://simplex.chat" <> "."
-    parseMarkdown "https://simplex.chat, hello" `shouldBe` uri "https://simplex.chat" <> ", hello"
-    parseMarkdown "http://simplex.chat" `shouldBe` uri "http://simplex.chat"
-    parseMarkdown "this is https://simplex.chat" `shouldBe` "this is " <> uri "https://simplex.chat"
-    parseMarkdown "https://simplex.chat site" `shouldBe` uri "https://simplex.chat" <> " site"
-    parseMarkdown "SimpleX on GitHub: https://github.com/simplex-chat/" `shouldBe` "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat/"
-    parseMarkdown "SimpleX on GitHub: https://github.com/simplex-chat." `shouldBe` "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat" <> "."
-    parseMarkdown "https://github.com/simplex-chat/ - SimpleX on GitHub" `shouldBe` uri "https://github.com/simplex-chat/" <> " - SimpleX on GitHub"
-    -- parseMarkdown "SimpleX on GitHub (https://github.com/simplex-chat/)" `shouldBe` "SimpleX on GitHub (" <> uri "https://github.com/simplex-chat/" <> ")"
-    parseMarkdown "https://en.m.wikipedia.org/wiki/Servo_(software)" `shouldBe` uri "https://en.m.wikipedia.org/wiki/Servo_(software)"
+    "https://simplex.chat" <==> uri "https://simplex.chat"
+    "https://simplex.chat." <==> uri "https://simplex.chat" <> "."
+    "https://simplex.chat, hello" <==> uri "https://simplex.chat" <> ", hello"
+    "http://simplex.chat" <==> uri "http://simplex.chat"
+    "this is https://simplex.chat" <==> "this is " <> uri "https://simplex.chat"
+    "https://simplex.chat site" <==> uri "https://simplex.chat" <> " site"
+    "SimpleX on GitHub: https://github.com/simplex-chat/" <==> "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat/"
+    "SimpleX on GitHub: https://github.com/simplex-chat." <==> "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat" <> "."
+    "https://github.com/simplex-chat/ - SimpleX on GitHub" <==> uri "https://github.com/simplex-chat/" <> " - SimpleX on GitHub"
+    -- "SimpleX on GitHub (https://github.com/simplex-chat/)" <==> "SimpleX on GitHub (" <> uri "https://github.com/simplex-chat/" <> ")"
+    "https://en.m.wikipedia.org/wiki/Servo_(software)" <==> uri "https://en.m.wikipedia.org/wiki/Servo_(software)"
+    "example.com" <==> uri "example.com"
+    "example.com." <==> uri "example.com" <> "."
+    "example.com..." <==> uri "example.com" <> "..."
+    "www.example.com" <==> uri "www.example.com"
+    "example.academy" <==> uri "example.academy"
+    "this is example.com" <==> "this is " <> uri "example.com"
+    "x.com" <==> uri "x.com"
   it "ignored as markdown" do
-    parseMarkdown "_https://simplex.chat" `shouldBe` "_https://simplex.chat"
-    parseMarkdown "this is _https://simplex.chat" `shouldBe` "this is _https://simplex.chat"
+    "_https://simplex.chat" <==> "_https://simplex.chat"
+    "this is _https://simplex.chat" <==> "this is _https://simplex.chat"
+    "this is https://" <==> "this is https://"
+    "example.c" <==> "example.c"
+    "www.www.example.com" <==> "www.www.example.com"
+    "www.example1.com" <==> "www.example1.com"
+    "www." <==> "www."
+    ".com" <==> ".com"
+    "example.academytoolong" <==> "example.academytoolong"
   it "SimpleX links" do
     let inv = "/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D"
-    parseMarkdown ("https://simplex.chat" <> inv) `shouldBe` simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("https://simplex.chat" <> inv)
-    parseMarkdown ("simplex:" <> inv) `shouldBe` simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("simplex:" <> inv)
-    parseMarkdown ("https://example.com" <> inv) `shouldBe` simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("https://example.com" <> inv)
+    ("https://simplex.chat" <> inv) <==> simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("https://simplex.chat" <> inv)
+    ("simplex:" <> inv) <==> simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("simplex:" <> inv)
+    ("https://example.com" <> inv) <==> simplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"] ("https://example.com" <> inv)
     let ct = "/contact#/?v=2&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D"
-    parseMarkdown ("https://simplex.chat" <> ct) `shouldBe` simplexLink XLContact ("simplex:" <> ct) ["smp.simplex.im"] ("https://simplex.chat" <> ct)
+    ("https://simplex.chat" <> ct) <==> simplexLink XLContact ("simplex:" <> ct) ["smp.simplex.im"] ("https://simplex.chat" <> ct)
+    ("simplex:" <> ct) <==> simplexLink XLContact ("simplex:" <> ct) ["smp.simplex.im"] ("simplex:" <> ct)
     let gr = "/contact#/?v=2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FWHV0YU1sYlU7NqiEHkHDB6gxO1ofTync%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAWbebOqVYuBXaiqHcXYjEHCpYi6VzDlu6CVaijDTmsQU%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22mL-7Divb94GGmGmRBef5Dg%3D%3D%22%7D"
-    parseMarkdown ("https://simplex.chat" <> gr) `shouldBe` simplexLink XLGroup ("simplex:" <> gr) ["smp4.simplex.im", "o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"] ("https://simplex.chat" <> gr)
+    ("https://simplex.chat" <> gr) <==> simplexLink XLGroup ("simplex:" <> gr) ["smp4.simplex.im", "o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"] ("https://simplex.chat" <> gr)
+    ("simplex:" <> gr) <==> simplexLink XLGroup ("simplex:" <> gr) ["smp4.simplex.im", "o5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"] ("simplex:" <> gr)
 
 email :: Text -> Markdown
 email = Markdown $ Just Email
@@ -173,15 +227,20 @@ email = Markdown $ Just Email
 textWithEmail :: Spec
 textWithEmail = describe "text with Email" do
   it "correct markdown" do
-    parseMarkdown "chat@simplex.chat" `shouldBe` email "chat@simplex.chat"
-    parseMarkdown "test chat@simplex.chat" `shouldBe` "test " <> email "chat@simplex.chat"
-    parseMarkdown "test chat+123@simplex.chat" `shouldBe` "test " <> email "chat+123@simplex.chat"
-    parseMarkdown "test chat.chat+123@simplex.chat" `shouldBe` "test " <> email "chat.chat+123@simplex.chat"
-    parseMarkdown "chat@simplex.chat test" `shouldBe` email "chat@simplex.chat" <> " test"
-    parseMarkdown "test1 chat@simplex.chat test2" `shouldBe` "test1 " <> email "chat@simplex.chat" <> " test2"
-  it "ignored as markdown" do
-    parseMarkdown "chat @simplex.chat" `shouldBe` "chat @simplex.chat"
-    parseMarkdown "this is chat @simplex.chat" `shouldBe` "this is chat @simplex.chat"
+    "chat@simplex.chat" <==> email "chat@simplex.chat"
+    "test chat@simplex.chat" <==> "test " <> email "chat@simplex.chat"
+    "test chat+123@simplex.chat" <==> "test " <> email "chat+123@simplex.chat"
+    "test chat.chat+123@simplex.chat" <==> "test " <> email "chat.chat+123@simplex.chat"
+    "chat@simplex.chat test" <==> email "chat@simplex.chat" <> " test"
+    "test1 chat@simplex.chat test2" <==> "test1 " <> email "chat@simplex.chat" <> " test2"
+    "test chat@simplex.chat." <==> "test " <> email "chat@simplex.chat" <> "."
+    "test chat@simplex.chat..." <==> "test " <> email "chat@simplex.chat" <> "..."
+  it "ignored as email markdown" do
+    "chat @simplex.chat" <==> "chat " <> mention "simplex.chat" "@simplex.chat"
+    "this is chat @simplex.chat" <==> "this is chat " <> mention "simplex.chat" "@simplex.chat"
+    "this is chat@ simplex.chat" <==> "this is chat@ " <> uri "simplex.chat"
+    "this is chat @ simplex.chat" <==> "this is chat @ " <> uri "simplex.chat"
+    "*this* is chat @ simplex.chat" <==> bold "this" <> " is chat @ " <> uri "simplex.chat"
 
 phone :: Text -> Markdown
 phone = Markdown $ Just Phone
@@ -189,20 +248,44 @@ phone = Markdown $ Just Phone
 textWithPhone :: Spec
 textWithPhone = describe "text with Phone" do
   it "correct markdown" do
-    parseMarkdown "07777777777" `shouldBe` phone "07777777777"
-    parseMarkdown "test 07777777777" `shouldBe` "test " <> phone "07777777777"
-    parseMarkdown "07777777777 test" `shouldBe` phone "07777777777" <> " test"
-    parseMarkdown "test1 07777777777 test2" `shouldBe` "test1 " <> phone "07777777777" <> " test2"
-    parseMarkdown "test 07777 777 777 test" `shouldBe` "test " <> phone "07777 777 777" <> " test"
-    parseMarkdown "test +447777777777 test" `shouldBe` "test " <> phone "+447777777777" <> " test"
-    parseMarkdown "test +44 (0) 7777 777 777 test" `shouldBe` "test " <> phone "+44 (0) 7777 777 777" <> " test"
-    parseMarkdown "test +44-7777-777-777 test" `shouldBe` "test " <> phone "+44-7777-777-777" <> " test"
-    parseMarkdown "test +44 (0) 7777.777.777 https://simplex.chat test"
-      `shouldBe` "test " <> phone "+44 (0) 7777.777.777" <> " " <> uri "https://simplex.chat" <> " test"
+    "07777777777" <==> phone "07777777777"
+    "test 07777777777" <==> "test " <> phone "07777777777"
+    "07777777777 test" <==> phone "07777777777" <> " test"
+    "test1 07777777777 test2" <==> "test1 " <> phone "07777777777" <> " test2"
+    "test 07777 777 777 test" <==> "test " <> phone "07777 777 777" <> " test"
+    "test +447777777777 test" <==> "test " <> phone "+447777777777" <> " test"
+    "test +44 (0) 7777 777 777 test" <==> "test " <> phone "+44 (0) 7777 777 777" <> " test"
+    "test +44-7777-777-777 test" <==> "test " <> phone "+44-7777-777-777" <> " test"
+    "test +44 (0) 7777.777.777 https://simplex.chat test"
+      <==> "test " <> phone "+44 (0) 7777.777.777" <> " " <> uri "https://simplex.chat" <> " test"
   it "ignored as markdown (too short)" $
-    parseMarkdown "test 077777 test" `shouldBe` "test 077777 test"
-  it "ignored as markdown (double spaces)" $
-    parseMarkdown "test 07777  777  777 test" `shouldBe` "test 07777  777  777 test"
+    "test 077777 test" <==> "test 077777 test"
+  it "ignored as markdown (double spaces)" $ do
+    "test 07777  777  777 test" <==> "test 07777  777  777 test"
+    "*test* 07777  777  777 test" <==> bold "test" <> " 07777  777  777 test"
+
+mention :: Text -> Text -> Markdown
+mention = Markdown . Just . Mention
+
+textWithMentions :: Spec
+textWithMentions = describe "text with mentions" do
+  it "correct markdown" do
+    "@alice" <==> mention "alice" "@alice"
+    "hello @alice" <==> "hello " <> mention "alice" "@alice"
+    "hello @alice !" <==> "hello " <> mention "alice" "@alice" <> " !"
+    "hello @alice!" <==> "hello " <> mention "alice" "@alice" <> "!"
+    "hello @alice..." <==> "hello " <> mention "alice" "@alice" <> "..."
+    "hello @alice@example.com" <==> "hello " <> mention "alice@example.com" "@alice@example.com"
+    "hello @'alice @ example.com'" <==> "hello " <> mention "alice @ example.com" "@'alice @ example.com'"
+    "@'alice jones'" <==> mention "alice jones" "@'alice jones'"
+    "hello @'alice jones'!" <==> "hello " <> mention "alice jones" "@'alice jones'" <> "!"
+    "hello @'a.j.'!" <==> "hello " <> mention "a.j." "@'a.j.'" <> "!"
+  it "ignored as markdown" $ do
+    "hello @'alice jones!" <==> "hello @'alice jones!"
+    "hello @bob @'alice jones!" <==> "hello " <> mention "bob" "@bob" <> " @'alice jones!"
+    "hello @ alice!" <==> "hello @ alice!"
+    "hello @bob @ alice!" <==> "hello " <> mention "bob" "@bob" <> " @ alice!"
+    "hello @bob @" <==> "hello " <> mention "bob" "@bob" <> " @"
 
 uri' :: Text -> FormattedText
 uri' = FormattedText $ Just Uri
@@ -210,15 +293,15 @@ uri' = FormattedText $ Just Uri
 multilineMarkdownList :: Spec
 multilineMarkdownList = describe "multiline markdown" do
   it "correct markdown" do
-    parseMaybeMarkdownList "http://simplex.chat\nhttp://app.simplex.chat" `shouldBe` Just [uri' "http://simplex.chat", "\n", uri' "http://app.simplex.chat"]
+    "http://simplex.chat\nhttp://app.simplex.chat" <<==>> [uri' "http://simplex.chat", "\n", uri' "http://app.simplex.chat"]
   it "combines the same formats" do
-    parseMaybeMarkdownList "http://simplex.chat\ntext 1\ntext 2\nhttp://app.simplex.chat" `shouldBe` Just [uri' "http://simplex.chat", "\ntext 1\ntext 2\n", uri' "http://app.simplex.chat"]
+    "http://simplex.chat\ntext 1\ntext 2\nhttp://app.simplex.chat" <<==>> [uri' "http://simplex.chat", "\ntext 1\ntext 2\n", uri' "http://app.simplex.chat"]
   it "no markdown" do
     parseMaybeMarkdownList "not a\nmarkdown" `shouldBe` Nothing
   let inv = "/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D"
   it "multiline with simplex link" do
-    parseMaybeMarkdownList ("https://simplex.chat" <> inv <> "\ntext")
-      `shouldBe` Just
-        [ FormattedText (Just $ SimplexLink XLInvitation ("simplex:" <> inv) ["smp.simplex.im"]) ("https://simplex.chat" <> inv),
+    ("https://simplex.chat" <> inv <> "\ntext")
+      <<==>>
+        [ FormattedText (simplexLinkFormat XLInvitation ("simplex:" <> inv) ["smp.simplex.im"]) ("https://simplex.chat" <> inv),
           "\ntext"
         ]
diff --git a/tests/MobileTests.hs b/tests/MobileTests.hs
index 5c4ab29c60..11a89bc62e 100644
--- a/tests/MobileTests.hs
+++ b/tests/MobileTests.hs
@@ -7,6 +7,7 @@
 
 module MobileTests where
 
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent.STM
 import Control.Monad.Except
@@ -28,7 +29,7 @@ import Foreign.Storable (peek)
 import GHC.IO.Encoding (setLocaleEncoding, setFileSystemEncoding, setForeignEncoding)
 import JSONFixtures
 import Simplex.Chat.Controller (ChatController (..))
-import Simplex.Chat.Mobile
+import Simplex.Chat.Mobile hiding (error)
 import Simplex.Chat.Mobile.File
 import Simplex.Chat.Mobile.Shared
 import Simplex.Chat.Mobile.WebRTC
@@ -38,6 +39,7 @@ import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types (AgentUserId (..), Profile (..))
 import Simplex.Messaging.Agent.Store.Interface
 import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation (..))
+import qualified Simplex.Messaging.Agent.Store.SQLite.DB as DB
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile(..), CryptoFileArgs (..))
 import qualified Simplex.Messaging.Crypto.File as CF
@@ -48,7 +50,7 @@ import System.FilePath ((</>))
 import System.IO (utf8)
 import Test.Hspec hiding (it)
 
-mobileTests :: HasCallStack => SpecWith FilePath
+mobileTests :: HasCallStack => SpecWith TestParams
 mobileTests = do
   describe "mobile API" $ do
     runIO $ do
@@ -146,9 +148,10 @@ parsedMarkdown =
   parsedMarkdownTagged
 #endif
 
-testChatApiNoUser :: FilePath -> IO ()
-testChatApiNoUser tmp = do
-  let dbPrefix = tmp </> "1"
+testChatApiNoUser :: TestParams -> IO ()
+testChatApiNoUser ps = do
+  let tmp = tmpPath ps
+      dbPrefix = tmp </> "1"
   Right cc <- chatMigrateInit dbPrefix "" "yesUp"
   Left (DBMErrorNotADatabase _) <- chatMigrateInit dbPrefix "myKey" "yesUp"
   chatSendCmd cc "/u" `shouldReturn` noActiveUser
@@ -156,11 +159,12 @@ testChatApiNoUser tmp = do
   chatSendCmd cc "/create user alice Alice" `shouldReturn` activeUser
   chatSendCmd cc "/_start" `shouldReturn` chatStarted
 
-testChatApi :: FilePath -> IO ()
-testChatApi tmp = do
-  let dbPrefix = tmp </> "1"
+testChatApi :: TestParams -> IO ()
+testChatApi ps = do
+  let tmp = tmpPath ps
+      dbPrefix = tmp </> "1"
       f = dbPrefix <> chatSuffix
-  Right st <- createChatStore (DBOpts f "myKey" False True) MCYesUp
+  Right st <- createChatStore (DBOpts f "myKey" False True DB.TQOff) MCYesUp
   Right _ <- withTransaction st $ \db -> runExceptT $ createUserRecord db (AgentUserId 1) aliceProfile {preferences = Nothing} True
   Right cc <- chatMigrateInit dbPrefix "myKey" "yesUp"
   Left (DBMErrorNotADatabase _) <- chatMigrateInit dbPrefix "" "yesUp"
@@ -169,13 +173,13 @@ testChatApi tmp = do
   chatSendCmd cc "/create user alice Alice" `shouldReturn` activeUserExists
   chatSendCmd cc "/_start" `shouldReturn` chatStarted
   chatRecvMsg cc `shouldReturn` networkStatuses
-  chatRecvMsg cc `shouldReturn` userContactSubSummary
   chatRecvMsgWait cc 10000 `shouldReturn` ""
   chatParseMarkdown "hello" `shouldBe` "{}"
   chatParseMarkdown "*hello*" `shouldBe` parsedMarkdown
 
-testMediaApi :: HasCallStack => FilePath -> IO ()
-testMediaApi tmp = do
+testMediaApi :: HasCallStack => TestParams -> IO ()
+testMediaApi ps = do
+  let tmp = tmpPath ps
   Right c@ChatController {random = g} <- chatMigrateInit (tmp </> "1") "" "yesUp"
   cc <- newStablePtr c
   key <- atomically $ C.randomBytes 32 g
@@ -188,8 +192,9 @@ testMediaApi tmp = do
   B.length encrypted `shouldBe` B.length frame'
   runExceptT (chatDecryptMedia keyStr encrypted) `shouldReturn` Right frame'
 
-testMediaCApi :: HasCallStack => FilePath -> IO ()
-testMediaCApi tmp = do
+testMediaCApi :: HasCallStack => TestParams -> IO ()
+testMediaCApi ps = do
+  let tmp = tmpPath ps
   Right c@ChatController {random = g} <- chatMigrateInit (tmp </> "1") "" "yesUp"
   cc <- newStablePtr c
   key <- atomically $ C.randomBytes 32 g
@@ -217,8 +222,9 @@ instance FromJSON WriteFileResult where
 instance FromJSON ReadFileResult where
   parseJSON = $(JQ.mkParseJSON (sumTypeJSON $ dropPrefix "RF") ''ReadFileResult)
 
-testFileCApi :: FilePath -> FilePath -> IO ()
-testFileCApi fileName tmp = do
+testFileCApi :: FilePath -> TestParams -> IO ()
+testFileCApi fileName ps = do
+  let tmp = tmpPath ps
   cc <- mkCCPtr tmp
   src <- B.readFile "./tests/fixtures/test.pdf"
   let path = tmp </> (fileName <> ".pdf")
@@ -242,8 +248,9 @@ testFileCApi fileName tmp = do
   contents `shouldBe` src
   sz' `shouldBe` len
 
-testMissingFileCApi :: FilePath -> IO ()
-testMissingFileCApi tmp = do
+testMissingFileCApi :: TestParams -> IO ()
+testMissingFileCApi ps = do
+  let tmp = tmpPath ps
   let path = tmp </> "missing_file"
   cPath <- newCString path
   CFArgs key nonce <- atomically . CF.randomArgs =<< C.newRandom
@@ -254,8 +261,9 @@ testMissingFileCApi tmp = do
   err <- peekCAString (ptr `plusPtr` 1)
   err `shouldContain` "missing_file: openBinaryFile: does not exist"
 
-testFileEncryptionCApi :: FilePath -> FilePath -> IO ()
-testFileEncryptionCApi fileName tmp = do
+testFileEncryptionCApi :: FilePath -> TestParams -> IO ()
+testFileEncryptionCApi fileName ps = do
+  let tmp = tmpPath ps
   cc <- mkCCPtr tmp
   let fromPath = tmp </> (fileName <> ".source.pdf")
   copyFile "./tests/fixtures/test.pdf" fromPath
@@ -273,8 +281,9 @@ testFileEncryptionCApi fileName tmp = do
   "" <- peekCAString =<< cChatDecryptFile cToPath cKey cNonce cToPath'
   B.readFile toPath' `shouldReturn` src
 
-testMissingFileEncryptionCApi :: FilePath -> IO ()
-testMissingFileEncryptionCApi tmp = do
+testMissingFileEncryptionCApi :: TestParams -> IO ()
+testMissingFileEncryptionCApi ps = do
+  let tmp = tmpPath ps
   cc <- mkCCPtr tmp
   let fromPath = tmp </> "missing_file.source.pdf"
       toPath = tmp </> "missing_file.encrypted.pdf"
@@ -294,7 +303,7 @@ testMissingFileEncryptionCApi tmp = do
 mkCCPtr :: FilePath -> IO (StablePtr ChatController)
 mkCCPtr tmp = either (error . show) newStablePtr =<< chatMigrateInit (tmp </> "1") "" "yesUp"
 
-testValidNameCApi :: FilePath -> IO ()
+testValidNameCApi :: TestParams -> IO ()
 testValidNameCApi _ = do
   let goodName = "Джон Доу 👍"
   cName1 <- cChatValidName =<< newCString goodName
@@ -302,7 +311,7 @@ testValidNameCApi _ = do
   cName2 <- cChatValidName =<< newCString " @'Джон'  Доу   👍 "
   peekCString cName2 `shouldReturn` goodName
 
-testChatJsonLengthCApi :: FilePath -> IO ()
+testChatJsonLengthCApi :: TestParams -> IO ()
 testChatJsonLengthCApi _ = do
   cInt1 <- cChatJsonLength =<< newCString "Hello!"
   cInt1 `shouldBe` 6
diff --git a/tests/OperatorTests.hs b/tests/OperatorTests.hs
index 0a00d7b83c..656f0ae0e2 100644
--- a/tests/OperatorTests.hs
+++ b/tests/OperatorTests.hs
@@ -19,9 +19,11 @@ import qualified Data.List.NonEmpty as L
 import Simplex.Chat
 import Simplex.Chat.Controller (ChatConfig (..), PresetServers (..))
 import Simplex.Chat.Operators
+import Simplex.Chat.Operators.Presets
 import Simplex.Chat.Types
 import Simplex.FileTransfer.Client.Presets (defaultXFTPServers)
 import Simplex.Messaging.Agent.Env.SQLite (ServerRoles (..), allRoles)
+import Simplex.Messaging.Agent.Store.Entity
 import Simplex.Messaging.Protocol
 import Test.Hspec
 
diff --git a/tests/ProtocolTests.hs b/tests/ProtocolTests.hs
index aba67ed034..61e75d116b 100644
--- a/tests/ProtocolTests.hs
+++ b/tests/ProtocolTests.hs
@@ -35,7 +35,7 @@ queue =
       { smpServer = srv,
         senderId = EntityId "\223\142z\251",
         dhPublicKey = "MCowBQYDK2VuAyEAjiswwI3O/NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o=",
-        sndSecure = False
+        queueMode = Nothing
       }
 
 connReqData :: ConnReqUriData
@@ -101,13 +101,13 @@ testChatPreferences :: Maybe Preferences
 testChatPreferences = Just Preferences {voice = Just VoicePreference {allow = FAYes}, fullDelete = Nothing, timedMessages = Nothing, calls = Nothing, reactions = Just ReactionsPreference {allow = FAYes}}
 
 testGroupPreferences :: Maybe GroupPreferences
-testGroupPreferences = Just GroupPreferences {timedMessages = Nothing, directMessages = Nothing, reactions = Just ReactionsGroupPreference {enable = FEOn}, voice = Just VoiceGroupPreference {enable = FEOn, role = Nothing}, files = Nothing, fullDelete = Nothing, simplexLinks = Nothing, history = Nothing}
+testGroupPreferences = Just GroupPreferences {timedMessages = Nothing, directMessages = Nothing, reactions = Just ReactionsGroupPreference {enable = FEOn}, voice = Just VoiceGroupPreference {enable = FEOn, role = Nothing}, files = Nothing, fullDelete = Nothing, simplexLinks = Nothing, history = Nothing, reports = Nothing}
 
 testProfile :: Profile
 testProfile = Profile {displayName = "alice", fullName = "Alice", image = Just (ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="), contactLink = Nothing, preferences = testChatPreferences}
 
 testGroupProfile :: GroupProfile
-testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", description = Nothing, image = Nothing, groupPreferences = testGroupPreferences}
+testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", description = Nothing, image = Nothing, groupPreferences = testGroupPreferences, memberAdmission = Nothing}
 
 decodeChatMessageTest :: Spec
 decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
@@ -116,10 +116,10 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
       #==# XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing))
   it "x.msg.new simple text - timed message TTL" $
     "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"ttl\":3600}}"
-      #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") Nothing (Just 3600) Nothing))
+      #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") [] Nothing (Just 3600) Nothing Nothing))
   it "x.msg.new simple text - live message" $
     "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"live\":true}}"
-      #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") Nothing Nothing (Just True)))
+      #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") [] Nothing Nothing (Just True) Nothing))
   it "x.msg.new simple link" $
     "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"https://simplex.chat\",\"type\":\"link\",\"preview\":{\"description\":\"SimpleX Chat\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgA\",\"title\":\"SimpleX Chat\",\"uri\":\"https://simplex.chat\"}}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCLink "https://simplex.chat" $ LinkPreview {uri = "https://simplex.chat", title = "SimpleX Chat", description = "SimpleX Chat", image = ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgA", content = Nothing}) Nothing))
@@ -133,7 +133,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
       ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing)))
   it "x.msg.new chat message with chat version range" $
-    "{\"v\":\"1-12\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+    "{\"v\":\"1-15\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
       ##==## ChatMessage supportedChatVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing)))
   it "x.msg.new quote" $
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}}}}"
@@ -146,22 +146,22 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
       ##==## ChatMessage
         chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
-        (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") Nothing (Just 3600) Nothing)))
+        (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") [] Nothing (Just 3600) Nothing Nothing)))
   it "x.msg.new quote - live message" $
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"live\":true}}"
       ##==## ChatMessage
         chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
-        (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") Nothing Nothing (Just True))))
+        (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") [] Nothing Nothing (Just True) Nothing)))
   it "x.msg.new forward" $
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true}}"
       ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") Nothing))
   it "x.msg.new forward - timed message TTL" $
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"ttl\":3600}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing (Just 3600) Nothing))
+      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") [] Nothing (Just 3600) Nothing Nothing))
   it "x.msg.new forward - live message" $
     "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"live\":true}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing Nothing (Just True)))
+      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") [] Nothing Nothing (Just True) Nothing))
   it "x.msg.new simple text with file" $
     "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCText "hello") (Just FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
@@ -193,7 +193,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
       ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") (Just FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
   it "x.msg.update" $
     "{\"v\":\"1\",\"event\":\"x.msg.update\",\"params\":{\"msgId\":\"AQIDBA==\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
-      #==# XMsgUpdate (SharedMsgId "\1\2\3\4") (MCText "hello") Nothing Nothing
+      #==# XMsgUpdate (SharedMsgId "\1\2\3\4") (MCText "hello") [] Nothing Nothing Nothing
   it "x.msg.del" $
     "{\"v\":\"1\",\"event\":\"x.msg.del\",\"params\":{\"msgId\":\"AQIDBA==\"}}"
       #==# XMsgDel (SharedMsgId "\1\2\3\4") Nothing
@@ -201,7 +201,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
     "{\"v\":\"1\",\"event\":\"x.msg.deleted\",\"params\":{}}"
       #==# XMsgDeleted
   it "x.file" $
-    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       #==# XFile FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Just testConnReq, fileInline = Nothing, fileDescr = Nothing}
   it "x.file without file invitation" $
     "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
@@ -210,7 +210,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
     "{\"v\":\"1\",\"event\":\"x.file.acpt\",\"params\":{\"fileName\":\"photo.jpg\"}}"
       #==# XFileAcpt "photo.jpg"
   it "x.file.acpt.inv" $
-    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
+    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
       #==# XFileAcptInv (SharedMsgId "\1\2\3\4") (Just testConnReq) "photo.jpg"
   it "x.file.acpt.inv" $
     "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\"}}"
@@ -237,40 +237,40 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
     "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       ==# XContact testProfile Nothing
   it "x.grp.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
       #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, business = Nothing, groupLinkId = Nothing, groupSize = Nothing}
   it "x.grp.inv with group link id" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
       #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, business = Nothing, groupLinkId = Just $ GroupLinkId "\1\2\3\4", groupSize = Nothing}
   it "x.grp.acpt without incognito profile" $
     "{\"v\":\"1\",\"event\":\"x.grp.acpt\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpAcpt (MemberId "\1\2\3\4")
   it "x.grp.mem.new" $
     "{\"v\":\"1\",\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile}
+      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} Nothing
   it "x.grp.mem.new with member chat version range" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-12\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile}
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-15\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile} Nothing
   it "x.grp.mem.intro" $
     "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
       #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} Nothing
   it "x.grp.mem.intro with member chat version range" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-12\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-15\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
       #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile} Nothing
   it "x.grp.mem.intro with member restrictions" $
     "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberRestrictions\":{\"restriction\":\"blocked\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
       #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} (Just MemberRestrictions {restriction = MRSBlocked})
   it "x.grp.mem.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
       #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
   it "x.grp.mem.inv w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
       #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
   it "x.grp.mem.fwd" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
       #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
   it "x.grp.mem.fwd with member chat version range and w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-12\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-15\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
       #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
   it "x.grp.mem.info" $
     "{\"v\":\"1\",\"event\":\"x.grp.mem.info\",\"params\":{\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
@@ -283,7 +283,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
       #==# XGrpMemConAll (MemberId "\1\2\3\4")
   it "x.grp.mem.del" $
     "{\"v\":\"1\",\"event\":\"x.grp.mem.del\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
-      #==# XGrpMemDel (MemberId "\1\2\3\4")
+      #==# XGrpMemDel (MemberId "\1\2\3\4") False
   it "x.grp.leave" $
     "{\"v\":\"1\",\"event\":\"x.grp.leave\",\"params\":{}}"
       ==# XGrpLeave
@@ -291,11 +291,11 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
     "{\"v\":\"1\",\"event\":\"x.grp.del\",\"params\":{}}"
       ==# XGrpDel
   it "x.grp.direct.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
-      #==# XGrpDirectInv testConnReq (Just $ MCText "hello")
+    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+      #==# XGrpDirectInv testConnReq (Just $ MCText "hello") Nothing
   it "x.grp.direct.inv without content" $
-    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
-      #==# XGrpDirectInv testConnReq Nothing
+    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-4%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
+      #==# XGrpDirectInv testConnReq Nothing Nothing
   -- it "x.grp.msg.forward"
   --   $ "{\"v\":\"1\",\"event\":\"x.grp.msg.forward\",\"params\":{\"msgForward\":{\"memberId\":\"AQIDBA==\",\"msg\":\"{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}\",\"msgTs\":\"1970-01-01T00:00:01.000000001Z\"}}}"
   --   #==# XGrpMsgForward
diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs
index dd4032e274..f18b097e9c 100644
--- a/tests/RemoteTests.hs
+++ b/tests/RemoteTests.hs
@@ -6,6 +6,7 @@
 module RemoteTests where
 
 import ChatClient
+import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Logger.Simple
 import qualified Data.Aeson as J
@@ -26,7 +27,7 @@ import UnliftIO
 import UnliftIO.Concurrent
 import UnliftIO.Directory
 
-remoteTests :: SpecWith FilePath
+remoteTests :: SpecWith TestParams
 remoteTests = describe "Remote" $ do
   describe "protocol handshake" $ do
     it "connects with new pairing (stops mobile)" $ remoteHandshakeTest False
@@ -45,7 +46,7 @@ remoteTests = describe "Remote" $ do
 
 -- * Chat commands
 
-remoteHandshakeTest :: HasCallStack => Bool -> FilePath -> IO ()
+remoteHandshakeTest :: HasCallStack => Bool -> TestParams -> IO ()
 remoteHandshakeTest viaDesktop = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
   desktop ##> "/list remote hosts"
   desktop <## "No remote hosts"
@@ -74,7 +75,7 @@ remoteHandshakeTest viaDesktop = testChat2 aliceProfile aliceDesktopProfile $ \m
   mobile ##> "/list remote ctrls"
   mobile <## "No remote controllers"
 
-remoteHandshakeStoredTest :: HasCallStack => FilePath -> IO ()
+remoteHandshakeStoredTest :: HasCallStack => TestParams -> IO ()
 remoteHandshakeStoredTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
   logNote "Starting new session"
   startRemote mobile desktop
@@ -95,7 +96,7 @@ remoteHandshakeStoredTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile
   startRemoteStored mobile desktop
   stopMobile mobile desktop `catchAny` (logError . tshow)
 
-remoteHandshakeDiscoverTest :: HasCallStack => FilePath -> IO ()
+remoteHandshakeDiscoverTest :: HasCallStack => TestParams -> IO ()
 remoteHandshakeDiscoverTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
   logNote "Preparing new session"
   startRemote mobile desktop
@@ -105,7 +106,7 @@ remoteHandshakeDiscoverTest = testChat2 aliceProfile aliceDesktopProfile $ \mobi
   startRemoteDiscover mobile desktop
   stopMobile mobile desktop `catchAny` (logError . tshow)
 
-remoteHandshakeRejectTest :: HasCallStack => FilePath -> IO ()
+remoteHandshakeRejectTest :: HasCallStack => TestParams -> IO ()
 remoteHandshakeRejectTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop mobileBob -> do
   logNote "Starting new session"
   startRemote mobile desktop
@@ -135,7 +136,7 @@ remoteHandshakeRejectTest = testChat3 aliceProfile aliceDesktopProfile bobProfil
   desktop <## "remote host 1 connected"
   stopMobile mobile desktop
 
-storedBindingsTest :: HasCallStack => FilePath -> IO ()
+storedBindingsTest :: HasCallStack => TestParams -> IO ()
 storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
   desktop ##> "/set device name My desktop"
   desktop <## "ok"
@@ -166,7 +167,7 @@ storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskto
 
 -- TODO: more parser tests
 
-remoteMessageTest :: HasCallStack => FilePath -> IO ()
+remoteMessageTest :: HasCallStack => TestParams -> IO ()
 remoteMessageTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> do
   startRemote mobile desktop
   contactBob desktop bob
@@ -192,7 +193,7 @@ remoteMessageTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mob
   threadDelay 1000000
   logNote "done"
 
-remoteStoreFileTest :: HasCallStack => FilePath -> IO ()
+remoteStoreFileTest :: HasCallStack => TestParams -> IO ()
 remoteStoreFileTest =
   testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob ->
     withXFTPServer $ do
@@ -322,7 +323,7 @@ remoteStoreFileTest =
       r `shouldStartWith` "remote host 1 error"
       r `shouldContain` err
 
-remoteCLIFileTest :: HasCallStack => FilePath -> IO ()
+remoteCLIFileTest :: HasCallStack => TestParams -> IO ()
 remoteCLIFileTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> withXFTPServer $ do
   let mobileFiles = "./tests/tmp/mobile_files"
   mobile ##> ("/_files_folder " <> mobileFiles)
@@ -391,7 +392,7 @@ remoteCLIFileTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mob
 
   stopMobile mobile desktop
 
-switchRemoteHostTest :: FilePath -> IO ()
+switchRemoteHostTest :: TestParams -> IO ()
 switchRemoteHostTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> do
   startRemote mobile desktop
   contactBob desktop bob
@@ -417,7 +418,7 @@ switchRemoteHostTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \
   desktop <## "remote host 1 error: RHEInactive"
   desktop ##> "/contacts"
 
-indicateRemoteHostTest :: FilePath -> IO ()
+indicateRemoteHostTest :: TestParams -> IO ()
 indicateRemoteHostTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cathProfile $ \mobile desktop bob cath -> do
   connectUsers desktop cath
   startRemote mobile desktop
@@ -441,7 +442,7 @@ indicateRemoteHostTest = testChat4 aliceProfile aliceDesktopProfile bobProfile c
   desktop <##> cath
   cath <##> desktop
 
-multipleProfilesTest :: FilePath -> IO ()
+multipleProfilesTest :: TestParams -> IO ()
 multipleProfilesTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cathProfile $ \mobile desktop bob cath -> do
   connectUsers desktop cath
 
diff --git a/tests/SchemaDump.hs b/tests/SchemaDump.hs
index 307e715dfb..807fa4a0cb 100644
--- a/tests/SchemaDump.hs
+++ b/tests/SchemaDump.hs
@@ -1,19 +1,33 @@
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module SchemaDump where
 
 import ChatClient (withTmpFiles)
+import ChatTests.DBUtils
+import Control.Concurrent.STM
 import Control.DeepSeq
+import qualified Control.Exception as E
 import Control.Monad (unless, void)
-import Data.List (dropWhileEnd)
+import Data.List (dropWhileEnd, sort)
+import qualified Data.Map.Strict as M
 import Data.Maybe (fromJust, isJust)
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Text.IO as T
+import Database.SQLite.Simple (Query (..))
 import Simplex.Chat.Store (createChatStore)
 import qualified Simplex.Chat.Store as Store
+import Simplex.Messaging.Agent.Env.SQLite (createAgentStore)
+import Simplex.Messaging.Agent.Store.Common (withConnection)
+import Simplex.Messaging.Agent.Store.DB (TrackQueries (..))
+import qualified Simplex.Messaging.Agent.Store.DB as DB
 import Simplex.Messaging.Agent.Store.Interface
-import Simplex.Messaging.Agent.Store.Shared (Migration (..), MigrationConfirmation (..), MigrationsToRun (..), toDownMigration)
 import qualified Simplex.Messaging.Agent.Store.SQLite.Migrations as Migrations
-import Simplex.Messaging.Util (ifM, whenM)
+import Simplex.Messaging.Agent.Store.Shared (Migration (..), MigrationConfirmation (..), MigrationsToRun (..), toDownMigration)
+import Simplex.Messaging.Util (ifM, tshow, whenM)
 import System.Directory (doesFileExist, removeFile)
 import System.Process (readCreateProcess, shell)
 import Test.Hspec
@@ -21,25 +35,21 @@ import Test.Hspec
 testDB :: FilePath
 testDB = "tests/tmp/test_chat.db"
 
+testAgentDB :: FilePath
+testAgentDB = "tests/tmp/test_agent.db"
+
 appSchema :: FilePath
 appSchema = "src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql"
 
--- Some indexes found by `.lint fkey-indexes` are not added to schema, explanation:
---
--- - CREATE INDEX 'chat_items_group_id' ON 'chat_items'('group_id'); --> groups(group_id)
---
---   Covering index is used instead. See for example:
---   EXPLAIN QUERY PLAN DELETE FROM groups;
---   (uses idx_chat_items_groups_item_status)
---
--- - CREATE INDEX 'connections_group_member_id' ON 'connections'('group_member_id'); --> group_members(group_member_id)
---
---   Covering index is used instead. See for example:
---   EXPLAIN QUERY PLAN DELETE FROM group_members;
---   (uses idx_connections_group_member)
 appLint :: FilePath
 appLint = "src/Simplex/Chat/Store/SQLite/Migrations/chat_lint.sql"
 
+appChatQueryPlans :: FilePath
+appChatQueryPlans = "src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt"
+
+appAgentQueryPlans :: FilePath
+appAgentQueryPlans = "src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt"
+
 testSchema :: FilePath
 testSchema = "tests/tmp/test_agent_schema.sql"
 
@@ -53,7 +63,7 @@ testVerifySchemaDump :: IO ()
 testVerifySchemaDump = withTmpFiles $ do
   savedSchema <- ifM (doesFileExist appSchema) (readFile appSchema) (pure "")
   savedSchema `deepseq` pure ()
-  void $ createChatStore (DBOpts testDB "" False True) MCError
+  void $ createChatStore (DBOpts testDB "" False True TQOff) MCError
   getSchema testDB appSchema `shouldReturn` savedSchema
   removeFile testDB
 
@@ -61,14 +71,14 @@ testVerifyLintFKeyIndexes :: IO ()
 testVerifyLintFKeyIndexes = withTmpFiles $ do
   savedLint <- ifM (doesFileExist appLint) (readFile appLint) (pure "")
   savedLint `deepseq` pure ()
-  void $ createChatStore (DBOpts testDB "" False True) MCError
+  void $ createChatStore (DBOpts testDB "" False True TQOff) MCError
   getLintFKeyIndexes testDB "tests/tmp/chat_lint.sql" `shouldReturn` savedLint
   removeFile testDB
 
 testSchemaMigrations :: IO ()
 testSchemaMigrations = withTmpFiles $ do
   let noDownMigrations = dropWhileEnd (\Migration {down} -> isJust down) Store.migrations
-  Right st <- createDBStore (DBOpts testDB "" False True) noDownMigrations MCError
+  Right st <- createDBStore (DBOpts testDB "" False True TQOff) noDownMigrations MCError
   mapM_ (testDownMigration st) $ drop (length noDownMigrations) Store.migrations
   closeDBStore st
   removeFile testDB
@@ -80,7 +90,8 @@ testSchemaMigrations = withTmpFiles $ do
       schema <- getSchema testDB testSchema
       Migrations.run st True $ MTRUp [m]
       schema' <- getSchema testDB testSchema
-      schema' `shouldNotBe` schema
+      unless (name m `elem` skipComparisonForUpMigrations) $
+        schema' `shouldNotBe` schema
       Migrations.run st True $ MTRDown [downMigr]
       unless (name m `elem` skipComparisonForDownMigrations) $ do
         schema'' <- getSchema testDB testSchema
@@ -89,6 +100,12 @@ testSchemaMigrations = withTmpFiles $ do
       schema''' <- getSchema testDB testSchema
       schema''' `shouldBe` schema'
 
+skipComparisonForUpMigrations :: [String]
+skipComparisonForUpMigrations =
+  [ -- schema doesn't change
+    "20250129_delete_unused_contacts"
+  ]
+
 skipComparisonForDownMigrations :: [String]
 skipComparisonForDownMigrations =
   [ -- on down migration msg_delivery_events table moves down to the end of the file
@@ -106,7 +123,11 @@ skipComparisonForDownMigrations =
     -- sequence table moves down to the end of the file
     "20241023_chat_item_autoincrement_id",
     -- indexes move down to the end of the file
-    "20241125_indexes"
+    "20241125_indexes",
+    -- indexes move down to the end of the file
+    "20250130_indexes",
+    -- index moves down to the end of the file
+    "20250227_member_acceptance"
   ]
 
 getSchema :: FilePath -> FilePath -> IO String
@@ -120,3 +141,45 @@ getLintFKeyIndexes dbPath lintPath = do
   void $ readCreateProcess (shell $ "sqlite3 " <> dbPath <> " '.lint fkey-indexes' > " <> lintPath) ""
   lint <- readFile lintPath
   lint `deepseq` pure lint
+
+saveQueryPlans :: SpecWith TestParams
+saveQueryPlans = it "verify and overwrite query plans" $ \TestParams {chatQueryStats, agentQueryStats} -> do
+  (chatSavedPlans, chatSavedPlans') <-
+    updatePlans
+      appChatQueryPlans
+      chatQueryStats
+      (createChatStore (DBOpts testDB "" False True TQOff) MCError)
+      (\db -> do
+        DB.execute_ db "CREATE TABLE IF NOT EXISTS temp_conn_ids (conn_id BLOB)"
+        DB.execute_ db "CREATE TABLE IF NOT EXISTS temp_delete_members (contact_profile_id INTEGER, member_profile_id INTEGER, local_display_name TEXT)"
+      )
+  (agentSavedPlans, agentSavedPlans') <-
+    updatePlans
+      appAgentQueryPlans
+      agentQueryStats
+      (createAgentStore (DBOpts testAgentDB "" False True TQOff) MCError)
+      (const $ pure ())
+  chatSavedPlans' == chatSavedPlans `shouldBe` True
+  agentSavedPlans' == agentSavedPlans `shouldBe` True
+  removeFile testDB
+  removeFile testAgentDB
+  where
+    updatePlans plansFile statsSel createStore prepareStore = do
+      savedPlans <- ifM (doesFileExist plansFile) (T.readFile plansFile) (pure "")
+      savedPlans `deepseq` pure ()
+      queries <- sort . M.keys <$> readTVarIO statsSel
+      Right st <- createStore
+      plans' <- withConnection st $ \db -> do
+        void $ prepareStore db
+        mapM (getQueryPlan db) queries
+      let savedPlans' = T.unlines plans'
+      T.writeFile plansFile savedPlans'
+      pure (savedPlans, savedPlans')
+    getQueryPlan :: DB.Connection -> Query -> IO Text
+    getQueryPlan db q =
+      (("Query: " <> fromQuery q) <>) . result <$> E.try (DB.query_ db $ "explain query plan " <> q)
+    result = \case
+      Right r -> "\nPlan:\n" <> T.unlines (map planDetail r)
+      Left (e :: E.SomeException) -> "\nError: " <> tshow e <> "\n"
+    planDetail :: (Int, Int, Int, Text) -> Text
+    planDetail (_, _, _, detail) = detail
diff --git a/tests/Test.hs b/tests/Test.hs
index 042f699d3f..1d8d45ebb4 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -1,9 +1,13 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE TupleSections #-}
 
 import Bots.BroadcastTests
 import Bots.DirectoryTests
 import ChatClient
 import ChatTests
+import ChatTests.DBUtils
 import ChatTests.Utils (xdescribe'')
 import Control.Logger.Simple
 import Data.Time.Clock.System
@@ -21,6 +25,7 @@ import ViewTests
 #if defined(dbPostgres)
 import Simplex.Messaging.Agent.Store.Postgres.Util (createDBAndUserIfNotExists, dropAllSchemasExceptSystem, dropDatabaseAndUser)
 #else
+import qualified Simplex.Messaging.TMap as TM
 import MobileTests
 import SchemaDump
 import WebRTCTests
@@ -29,6 +34,10 @@ import WebRTCTests
 main :: IO ()
 main = do
   setLogLevel LogError
+#if !defined(dbPostgres)
+  chatQueryStats <- TM.emptyIO
+  agentQueryStats <- TM.emptyIO
+#endif
   withGlobalLogging logCfg . hspec
 #if defined(dbPostgres)
     . beforeAll_ (dropDatabaseAndUser testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
@@ -48,9 +57,11 @@ main = do
       describe "Message batching" batchingTests
       describe "Operators" operatorTests
       describe "Random servers" randomServersTests
-      around testBracket
 #if defined(dbPostgres)
+      around testBracket
         . after_ (dropAllSchemasExceptSystem testDBConnectInfo)
+#else
+      around (testBracket chatQueryStats agentQueryStats)
 #endif
         $ do
 #if !defined(dbPostgres)
@@ -60,8 +71,16 @@ main = do
           xdescribe'' "SimpleX Broadcast bot" broadcastBotTests
           xdescribe'' "SimpleX Directory service bot" directoryServiceTests
           describe "Remote session" remoteTests
+#if !defined(dbPostgres)
+          xdescribe'' "Save query plans" saveQueryPlans
+#endif
   where
-    testBracket test = withSmpServer $ tmpBracket test
+#if defined(dbPostgres)
+    testBracket test = withSmpServer $ tmpBracket $ \tmpPath -> test TestParams {tmpPath, printOutput = False}
+#else
+    testBracket chatQueryStats agentQueryStats test =
+      withSmpServer $ tmpBracket $ \tmpPath -> test TestParams {tmpPath, chatQueryStats, agentQueryStats, printOutput = False}
+#endif
     tmpBracket test = do
       t <- getSystemTime
       let ts = show (systemSeconds t) <> show (systemNanoseconds t)
diff --git a/tests/ValidNames.hs b/tests/ValidNames.hs
index bbc9c853ea..22ac4a695d 100644
--- a/tests/ValidNames.hs
+++ b/tests/ValidNames.hs
@@ -21,6 +21,7 @@ testMkValidName = do
   mkValidName "J . . Doe" `shouldBe` "J . Doe"
   mkValidName "@alice" `shouldBe` "alice"
   mkValidName "#alice" `shouldBe` "alice"
+  mkValidName "'alice" `shouldBe` "alice"
   mkValidName " alice" `shouldBe` "alice"
   mkValidName "alice " `shouldBe` "alice"
   mkValidName "John  Doe" `shouldBe` "John Doe"
@@ -37,3 +38,5 @@ testMkValidName = do
   mkValidName "alice@example.com" `shouldBe` "alice@example.com"
   mkValidName "alice <> bob" `shouldBe` "alice <> bob"
   mkValidName "alice -> bob" `shouldBe` "alice -> bob"
+  mkValidName "01234567890123456789012345678901234567890123456789extra" `shouldBe` "01234567890123456789012345678901234567890123456789"
+  mkValidName "0123456789012345678901234567890123456789012345678 extra" `shouldBe` "0123456789012345678901234567890123456789012345678"
diff --git a/website/langs/ar.json b/website/langs/ar.json
index f257c1c747..0c1fb4515a 100644
--- a/website/langs/ar.json
+++ b/website/langs/ar.json
@@ -29,9 +29,9 @@
     "simplex-explained-tab-2-text": "2. كيف يعمل",
     "simplex-explained-tab-1-p-2": "كيف يمكن أن تعمل مع قوائم انتظار أحادية الاتجاه وبدون معرّفات ملف تعريف المستخدم؟",
     "simplex-explained-tab-2-p-1": "لكل اتصال، تستخدم قائمتي انتظار منفصلتين للمُراسلة لإرسال واستلام الرسائل عبر خوادم مختلفة.",
-    "simplex-explained-tab-2-p-2": "تقوم الخوادم بتمرير الرسائل في اتجاه واحد فقط، دون الحصول على الصورة الكاملة لمُحادثات المستخدم أو اتصالاته.",
+    "simplex-explained-tab-2-p-2": "تمرّر الخوادم الرسائل في اتجاه واحد فقط، دون الحصول على الصورة الكاملة لمُحادثات المستخدم أو اتصالاته.",
     "simplex-explained-tab-3-p-1": "تحتوي الخوادم على بيانات اعتماد مجهولة منفصلة لكل قائمة انتظار، ولا تعرف المستخدمين الذين ينتمون إليهم.",
-    "copyright-label": "مشروع مفتوح المصدر © SimpleX 2020-2024",
+    "copyright-label": "مشروع مفتوح المصدر © SimpleX 2020-2025",
     "simplex-chat-protocol": "بروتوكول دردشة SimpleX",
     "developers": "المطورين",
     "hero-subheader": "أول نظام مُراسلة<br> دون معرّفات مُستخدم",
@@ -51,13 +51,13 @@
     "simplex-private-5-title": "طبقات متعددة من <br> حشوة المحتوى",
     "simplex-private-7-title": "التحقق <br> من سلامة الرسالة",
     "simplex-private-8-title": "خلط الرسائل <br> لتقليل من الارتباط",
-    "simplex-private-10-title": "معرفات زوجية مجهولة مؤقتة",
+    "simplex-private-10-title": "معرّفات زوجية مجهولة مؤقتة",
     "simplex-private-card-3-point-1": "يتم استخدام TLS 1.2 / 1.3 مع خوارزميات قوية فقط لاتصالات الخادم والعميل.",
     "simplex-private-card-3-point-2": "تعمل بصمة الخادم وربط القناة على منع هجمات الوسيط (MITM) وإعادة التشغيل.",
     "simplex-private-card-3-point-3": "استئناف الاتصال معطل لمنع هجمات الجلسة.",
     "simplex-private-card-4-point-1": "لحماية عنوان IP الخاص بك، يمكنك الوصول إلى الخوادم عبر تور أو بعض شبكات تراكب النقل الأخرى.",
     "simplex-private-card-5-point-1": "يستخدم SimpleX حشوة المحتوى لكل طبقة تعمية لإحباط هجمات حجم الرسالة.",
-    "simplex-private-card-6-point-2": "لمنع ذلك، تقوم تطبيقات SimpleX بتمرير مفاتيح لمرة واحدة خارج النطاق، عند مشاركة عنوان كرابط أو رمز QR.",
+    "simplex-private-card-6-point-2": "لمنع ذلك، تقوم تطبيقات SimpleX بتمرير مفاتيح لمرة واحدة خارج النطاق، عندما تُشارك عنوان كرابط أو رمز QR.",
     "simplex-private-card-8-point-1": "تعمل خوادم SimpleX كعقد مختلطة بزمن انتقال منخفض &mdash; الرسائل الواردة والصادرة لها ترتيب مختلف.",
     "simplex-private-card-9-point-1": "كل رسالة انتظار تمرر الرسائل في اتجاه واحد، بعناوين إرسال واستلام مختلفة.",
     "simplex-private-card-9-point-2": "إنه يقلل من نواقل الهجوم، مقارنة بوسطاء الرسائل التقليديين، والبيانات الوصفية المتاحة.",
@@ -74,7 +74,7 @@
     "simplex-unique-1-overlay-1-title": "الخصوصية الكاملة لهويتك وملفك الشخصي وجهات الاتصال والبيانات الوصفية",
     "simplex-unique-2-title": "أنت محمي <br> من رسائل الإزعاج وإساءة الاستخدام",
     "simplex-unique-3-title": "أنت تتحكم في بياناتك",
-    "simplex-unique-3-overlay-1-title": "ملكية ومراقبة وأمان بياناتك",
+    "simplex-unique-3-overlay-1-title": "الملكية والتحكم وأمن بياناتك",
     "simplex-unique-4-title": "أنت تمتلك شبكة SimpleX",
     "simplex-unique-4-overlay-1-title": "لامركزية بالكامل &mdash; يمتلك المستخدمون شبكة SimpleX",
     "hero-overlay-card-1-p-4": "هذا التصميم يمنع تسريب أي البيانات الوصفية للمستخدمين على مستوى التطبيق. لزيادة تحسين الخصوصية وحماية عنوان IP الخاص بك، يمكنك الاتصال بخوادم المراسلة عبر Tor.",
@@ -85,23 +85,23 @@
     "privacy-matters-overlay-card-1-p-2": "يعرف تجار التجزئة عبر الإنترنت أن الأشخاص ذوي الدخل المنخفض هم أكثر عرضة لإجراء عمليات شراء عاجلة، لذلك قد يفرضون أسعارًا أعلى أو يزيلون الخصومات.",
     "simplex-private-6-title": "تبديل <br> خارج النطاق",
     "simplex-private-9-title": "قوائم انتظار <br> أحادية الاتجاه",
-    "privacy-matters-overlay-card-1-p-4": "تحمي منصة SimpleX خصوصية اتصالاتك بشكل أفضل من أي بديل آخر، مما يمنع تمامًا الرسم البياني الاجتماعي الخاص بك من أن يصبح متاحًا لأي شركات أو مؤسسات. حتى عندما يستخدم الأشخاص الخوادم التي توفرها SimpleX Chat، فإننا لا نعرف عدد المستخدمين أو اتصالاتهم.",
+    "privacy-matters-overlay-card-1-p-4": "تحمي شبكة SimpleX خصوصية اتصالاتك بشكل أفضل من أي بديل آخر، مما يمنع تمامًا الرسم البياني الاجتماعي الخاص بك من أن يصبح متاحًا لأي شركات أو مؤسسات. حتى عندما يستخدم الأشخاص الخوادم التي توفرها SimpleX Chat، فإننا لا نعرف عدد المستخدمين أو اتصالاتهم.",
     "simplex-private-card-1-point-1": "بروتوكول السقاطة المزدوجة &mdash; <br> رسائل OTR مع السرية المستمرة واستعادة الاختراق.",
     "simplex-private-card-1-point-2": "NaCL cryptobox في كل قائمة انتظار لمنع ارتباط حركة مرور البيانات بين قوائم انتظار الرسائل في حالة اختراق TLS.",
     "simplex-private-card-2-point-1": "طبقة إضافية من تعمية الخادم للتسليم إلى المُستلم، لمنع الارتباط بين حركة مرور بيانات الخادم المُستلمة والمُرسلة في حالة اختراق TLS.",
     "simplex-private-card-4-point-2": "لاستخدام SimpleX عبر تور، يُرجى تثبيت <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\"> تطبيق Orbot </a> وتمكّين وكيل SOCKS5 (أو VPN <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">على iOS </a>).",
     "simplex-private-card-5-point-2": "يجعل الرسائل ذات الأحجام المختلفة تبدو متشابهة للخوادم ومراقبي الشبكة.",
-    "simplex-private-card-6-point-1": "العديد من منصات الاتصال عرضة لهجمات الوسيط (MITM) من قبل الخوادم أو موفري الشبكات.",
+    "simplex-private-card-6-point-1": "العديد من شبكات التواصل عرضة لهجمات الوسيط (MITM) من قِبل الخوادم أو موفري الشبكات.",
     "simplex-private-card-7-point-1": "لضمان سلامة الرسائل يتم ترقيمها بالتسلسل وتضمين تجزئة الرسالة السابقة.",
     "simplex-private-card-7-point-2": "إذا أُضيفت أي رسالة أو أُزيلت أو تغيّرت، فسيتم تنبيه المُستلم.",
     "simplex-private-card-10-point-2": "يسمح بتسليم الرسائل بدون معرّفات ملف تعريف المستخدم، مما يوفر خصوصية للبيانات الوصفية أفضل من البدائل.",
     "privacy-matters-2-overlay-1-linkText": "تمنحك الخصوصية القوة",
     "simplex-unique-2-overlay-1-title": "أفضل حماية من رسائل الإزعاج وإساءة الاستخدام",
-    "hero-overlay-card-1-p-3": "أنت تحدد الخادم (الخوادم) المراد استخدامه لاستلام الرسائل وجهات الاتصال الخاصة بك &mdash; الخوادم التي تستخدمها لإرسال الرسائل إليهم. من المرجح أن تستخدم كل مُحادثة خادمين مختلفين.",
+    "hero-overlay-card-1-p-3": "أنت تحدد الخادم (الخوادم) المراد استخدامه لاستلام الرسائل وجهات اتصالك &mdash; الخوادم التي تستخدمها لإرسال الرسائل إليهم. من المرجح أن تستخدم كل مُحادثة خادمين مختلفين.",
     "hero-overlay-card-1-p-1": "سأل العديد من المستخدمين: <em> إذا لم يكن لدى SimpleX معرّفات مستخدم، فكيف يمكنها معرفة مكان تسليم الرسائل؟ </em>",
-    "hero-overlay-card-1-p-2": "لتوصيل الرسائل، بدلاً من معرفات المستخدم التي تستخدمها جميع المنصات الأخرى، يستخدم SimpleX معرّفات مزدوجة مؤقتة مجهولة الهوية لقوائم انتظار الرسائل، مختلفة لكل اتصال من اتصالاتك &mdash; لا توجد معرفات مستخدم دائمة.",
+    "hero-overlay-card-1-p-2": "لتسليم الرسائل، بدلاً من معرّفات المُستخدم المُستخدمة من قِبل جميع الشبكات الأخرى، يستخدم SimpleX معرّفات زوجية مجهولة مؤقتة لقوائم الرسائل، منفصلة لكل اتصال من اتصالاتك &mdash; ولا توجد معرّفات طويلة الأجل.",
     "simplex-network-overlay-card-1-p-1": "بروتوكولات المُراسلة والتطبيقات <a href='https://en.wikipedia.org/wiki/Peer-to-peer'> P2P </a> بها مشاكل مختلفة تجعلها أقل موثوقية من SimpleX وأكثر تعقيدًا في التحليل و عرضة لعدة أنواع من الهجمات.",
-    "hero-overlay-card-2-p-1": "عندما يكون لدى المستخدمين هويات ثابتة، حتى لو كان هذا مجرد رقم عشوائي، مثل معرف الجلسة، فهناك خطر يتمثل في أن الموفر أو المهاجم يمكنه مراقبة كيفية اتصال المستخدمين وعدد الرسائل التي يرسلونها.",
+    "hero-overlay-card-2-p-1": "عندما يكون لدى المستخدمين هويات ثابتة، حتى لو كان هذا مجرد رقم عشوائي، مثل معرّف الجلسة، فهناك خطر يتمثل في أن الموفر أو المهاجم يمكنه مراقبة كيفية اتصال المستخدمين وعدد الرسائل التي يرسلونها.",
     "hero-overlay-card-1-p-6": "اقرأ المزيد في <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'> SimpleX whitepaper </a>.",
     "hero-overlay-card-2-p-3": "حتى مع معظم التطبيقات الخاصة التي تستخدم خدمات Tor v3، إذا تحدثت إلى جهتي اتصال مختلفتين عبر نفس الملف الشخصي، فيمكنهما إثبات أنهما متصلان بنفس الشخص.",
     "hero-overlay-card-2-p-4": "يحمي SimpleX من هذه الهجمات من خلال عدم وجود أي معرّفات مستخدم في تصميمه. وإذا كنت تستخدم وضع التخفي، فسيكون لديك اسم عرض مختلف لكل جهة اتصال، مع تجنب أي بيانات مشتركة بينهما.",
@@ -112,29 +112,28 @@
     "simplex-network-overlay-card-1-li-5": "قد تكون جميع شبكات P2P المعروفة عرضة <a href='https://en.wikipedia.org/wiki/Sybil_attack'> لهجوم Sybil</a>، لأن كل عقدة قابلة للاكتشاف، وتعمل الشبكة ككل. تتطلب الإجراءات المعروفة لتخفيفها إما مكونًا مركزيًا أو <a href='https://en.wikipedia.org/wiki/Proof_of_work'> إثبات عمل مكلف </a>. لا تحتوي شبكة SimpleX على إمكانية اكتشاف الخادم، فهي مجزأة وتعمل كشبكات فرعية متعددة ومعزولة، مما يجعل الهجمات على مستوى الشبكة مستحيلة.",
     "privacy-matters-overlay-card-3-p-1": "يجب على الجميع الاهتمام بخصوصية وأمان اتصالاتهم &mdash; يمكن للمُحادثات غير الضارة أن تعرضك للخطر، حتى لو لم يكن لديك ما تخفيه.",
     "privacy-matters-overlay-card-3-p-4": "لا يكفي استخدام برنامج مُراسلة مُعمَّاة بين الطرفين، يجب علينا جميعًا استخدام برامج مُراسلة التي تحمي خصوصية شبكاتنا الشخصية &mdash; مع من نحن مرتبطون.",
-    "simplex-unique-overlay-card-1-p-3": "يحمي هذا التصميم خصوصية الأشخاص الذين تتواصل معهم، ويخفيها عن خوادم منصة SimpleX ومن أي مراقبين. لإخفاء عنوان IP الخاص بك من الخوادم، يمكنك <strong> الاتصال بخوادم SimpleX عبر تور</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "نظرًا لعدم وجود معرف لديك على نظام SimpleX، لا يمكن لأي شخص الاتصال بك ما لم تشارك عنوان مستخدم لمرة واحدة أو مؤقتًا، كرمز QR أو رابط.",
+    "simplex-unique-overlay-card-1-p-3": "يحمي هذا التصميم خصوصية الأشخاص الذين تتواصل معهم، ويخفيها عن خوادم شبكة SimpleX ومن أي مراقبين. لإخفاء عنوان IP الخاص بك من الخوادم، يمكنك <strong> الاتصال بخوادم SimpleX عبر تور</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "نظرًا لعدم وجود معرّف لديك على شبكة SimpleX، لا يمكن لأي شخص الاتصال بك ما لم تشارك عنوان مستخدم لمرة واحدة أو مؤقتًا، كرمز QR أو رابط.",
     "simplex-unique-overlay-card-2-p-2": "حتى مع عنوان المستخدم الاختياري، بينما يمكن استخدامه لإرسال طلبات جهات اتصال مزعجة، يمكنك تغييره أو حذفه بالكامل دون فقد أي من اتصالاتك.",
     "simplex-unique-overlay-card-3-p-2": "يتم الاحتفاظ بالرسائل المُعمَّاة بين الطرفين مؤقتًا على خوادم ترحيل SimpleX حتى يتم استلامها، ثُمَّ تُحذف نهائيًا.",
-    "simplex-unique-overlay-card-3-p-4": "لا توجد معرفّات أو نص مُعَمَّى مشترك بين حركة مرور بيانات الخادم المُرسلة والمُستلمة &mdash; ؛ إذا كان أي شخص يراقب ذلك، فلن يتمكّن بسهولة من تحديد من يتواصل مع من، حتى لو اختُرق TLS.",
-    "simplex-unique-card-1-p-1": "يحمي SimpleX خصوصية ملف التعريف الخاص بك، جهات الاتصال والبيانات الوصفية، ويخفيه عن خوادم منصة SimpleX وأي مراقبين.",
+    "simplex-unique-overlay-card-3-p-4": "لا توجد معرفّات أو نص مُعَمَّى مشترك بين حركة مرور بيانات الخادم المُرسلة والمُستلمة &mdash; إذا كان أي شخص يراقب ذلك، فلن يتمكّن بسهولة من تحديد من يتواصل مع من، حتى لو اختُرق TLS.",
+    "simplex-unique-card-1-p-1": "يحمي SimpleX خصوصية ملف تعريفك، جهات اتصالك والبيانات الوصفية، ويخفيه عن خوادم شبكة SimpleX وأي مراقبين.",
     "privacy-matters-overlay-card-2-p-1": "منذ وقت ليس ببعيد، لاحظنا أن الانتخابات الرئيسية يتم التلاعب بها بواسطة <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'> شركة استشارية ذات سمعة طيبة </a> التي استخدمت الرسوم البيانية الاجتماعية لتشويه نظرتنا للعالم الحقيقي والتلاعب بأصواتنا.",
-    "privacy-matters-overlay-card-2-p-2": "لكي تكون موضوعيًا وتتخذ قرارات مستقلة، يجب أن تكون متحكمًا في مساحة المعلومات الخاصة بك. هذا ممكن فقط إذا كنت تستخدم منصة اتصالات خاصة لا يمكنها الوصول إلى الرسم البياني الاجتماعي الخاص بك.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX هو النظام الأساسي الأول الذي لا يحتوي على أي معرّفات مستخدم صمّم ليكون خاصًا، وبهذه الطريقة تحمي مخطط اتصالاتك بشكل أفضل من أي بديل معروف.",
+    "privacy-matters-overlay-card-2-p-2": "لكي تكون موضوعيًا وتتخذ قرارات مستقلة، عليك التحكم في مساحة معلوماتك. لا يمكن تحقيق ذلك إلا باستخدام شبكة اتصال خاصة لا يمكنها الوصول إلى حسابك على مواقع التواصل الاجتماعي.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX هي أول شبكة لا تحتوي على أي معرّفات مستخدم من حيث التصميم، وبهذه الطريقة تحمي مخطط اتصالاتك بشكل أفضل من أي بديل معروف.",
     "privacy-matters-overlay-card-3-p-2": "واحدة من أكثر القصص إثارة للصدمة هي تجربة <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'> محمدو ولد صلاحي </a> الموصوفة في مذكراته والموضحة في فيلم موريتاني. تم وضعه في معتقل غوانتانامو بدون محاكمة، وتعرض للتعذيب هناك لمدة 15 عامًا بعد مكالمة هاتفية مع قريبه في أفغانستان، للاشتباه في تورطه في هجمات 11 سبتمبر، على الرغم من أنه عاش في ألمانيا طوال السنوات العشر الماضية.",
     "privacy-matters-overlay-card-3-p-3": "يتم القبض على الأشخاص العاديين بسبب ما يشاركونه عبر الإنترنت، حتى عبر حساباتهم \"المجهولة\"، <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>وحتى في البلدان الديمقراطية</a>.",
-    "simplex-unique-overlay-card-1-p-1": "على عكس أنظمة المُراسلة الأخرى، <strong>لا يحتوي SimpleX على معرّفات مخصصة للمستخدمين</strong>. لا يعتمد على أرقام الهواتف أو العناوين المستندة إلى النطاقات (مثل البريد الإلكتروني أو XMPP)، أسماء المستخدمين، المفاتيح العامة أو حتى الأرقام العشوائية لتحديد مستخدميها &mdash; لا نعرف عدد الأشخاص الذين يستخدمون خوادم SimpleX الخاصة بنا.",
-    "simplex-unique-overlay-card-1-p-2": "لتسليم الرسائل، يستخدم SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'> العناوين المزدوجة المجهولة </a> لقوائم انتظار الرسائل أحادية الاتجاه، منفصلة عن الرسائل المُستلمة والمُرسلة، عادةً عبر خوادم مختلفة. إن استخدام SimpleX يشبه امتلاك <strong>بريد إلكتروني أو هاتف &ldquo;مؤقت&rdquo; مختلف لكل جهة اتصال</strong>، ولا توجد متاعب في إدارتها.",
+    "simplex-unique-overlay-card-1-p-1": "على عكس شبكات المُراسلة الأخرى، <strong>لا يحتوي SimpleX على معرّفات مخصصة للمستخدمين</strong>. لا يعتمد على أرقام الهواتف أو العناوين المستندة إلى النطاقات (مثل البريد الإلكتروني أو XMPP)، أسماء المستخدمين، المفاتيح العامة أو حتى الأرقام العشوائية لتحديد مستخدميها &mdash; مُشغلي خادم SimpleX لا يعرفون عدد الأشخاص الذين يستخدمون خوادمهم.",
+    "simplex-unique-overlay-card-1-p-2": "لتسليم الرسائل، يستخدم SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'> العناوين المزدوجة المجهولة </a> لقوائم انتظار الرسائل أحادية الاتجاه، منفصلة عن الرسائل المُستلمة والمُرسلة، عادةً عبر خوادم مختلفة.",
     "simplex-unique-overlay-card-3-p-1": "يخزن SimpleX Chat جميع بيانات المستخدم على أجهزة العميل فقط باستخدام <strong> تنسيق قاعدة بيانات محمولة مُعمَّاة </strong> يمكّن تصديرها ونقلها إلى أي جهاز مدعوم.",
     "simplex-unique-overlay-card-3-p-3": "على عكس خوادم الشبكات الاتحادية (البريد الإلكتروني أو XMPP أو Matrix)، لا تقوم خوادم SimpleX بتخزين حسابات المستخدمين، فهي تقوم فقط بترحيل الرسائل، مما يحمي خصوصية كلا الطرفين.",
-    "simplex-unique-overlay-card-4-p-1": "يمكنك <strong> استخدام SimpleX مع الخوادم الخاصة بك </strong> والاستمرار في التواصل مع الأشخاص الذين يستخدمون الخوادم المهيأة مسبقًا التي نقدمها.",
-    "simplex-unique-overlay-card-4-p-3": "إذا كنت تفكر في التطوير لمنصة SimpleX، على سبيل المثال، بوت الدردشة لمستخدمي تطبيق SimpleX، أو دمج مكتبة SimpleX Chat في تطبيقات الأجهزة المحمولة، من فضلك <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>تواصل معي</a> لأي نصيحة والدعم.",
+    "simplex-unique-overlay-card-4-p-1": "يمكنك <strong> استخدام SimpleX مع خوادمك </strong> والاستمرار في التواصل مع الأشخاص الذين يستخدمون الخوادم المُهيأة مسبقًا في التطبيقات.",
+    "simplex-unique-overlay-card-4-p-3": "إذا كنت تفكر في التطوير شبكة SimpleX، على سبيل المثال، بوت الدردشة لمستخدمي تطبيق SimpleX، أو دمج مكتبة SimpleX Chat في تطبيقات الأجهزة المحمولة، من فضلك <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>تواصل معي</a> لأي نصيحة والدعم.",
     "donate-here-to-help-us": "تبرّع هنا لمساعدتنا",
     "sign-up-to-receive-our-updates": "اشترك للحصول على آخر مستجداتنا",
     "enter-your-email-address": "أدخل عنوان بريدك الإلكتروني",
     "get-simplex": "احصل على <a href=\"/downloads\">تطبيق سطح المكتب</a> SimpleX",
-    "why-simplex-is": "لماذا SimpleX",
-    "unique": "فريد من نوعه",
+    "why-simplex-is-unique": "لماذا SimpleX <span class='gradient-text'>فريد من نوعه</span>",
     "learn-more": "اقرأ أكثر",
     "more-info": "معلومات أكثر",
     "hide-info": "معلومات أقل",
@@ -153,16 +152,16 @@
     "no-decentralized": "لا - لامركزي",
     "no-federated": "لا - اتِحاديّ",
     "comparison-section-list-point-2": "العناوين تعتمد على الـDNS",
-    "comparison-section-list-point-3": "المفتاح العام أو معرف آخر فريد وعام",
+    "comparison-section-list-point-3": "المفتاح العام أو معرّف آخر فريد وعام",
     "comparison-section-list-point-7": "شبكات P2P إما لديها سلطة مركزية أو أن الشبكة كلها يمكن عرضة للخطر",
     "see-here": "اقرأ هنا",
     "no-secure": "لا - آمن",
     "comparison-section-list-point-5": "لا يحمي خصوصية البيانات الوصفية للمستخدمين",
-    "comparison-section-list-point-6": "على الرغم من أن الـP2P موزعة، إلا أنها ليست اتِحاديَّة - يعملون كشبكة واحدة",
+    "comparison-section-list-point-6": "على الرغم من أن الـP2P موزعة، إلا أنها ليست اتِحاديَّة &mdash; يعملون كشبكة واحدة",
     "comparison-section-list-point-1": "عادة ما يكون مكوناً من رقم الهاتف، أو اسم المستخدم في بعض الأحيان",
     "comparison-section-list-point-4": "إذا خوادم المشغّل مُخترقة. تحقق من رمز الأمان في Signal وبعض التطبيقات الأخرى للتخفيف منه",
     "simplex-unique-card-3-p-1": "يخزن SimpleX جميع بيانات المستخدم على الأجهزة العميلة<strong> بتنسيق قاعدة بيانات محمولة مُعمَّاة &mdash; </strong>يمكّن نقلها إلى جهاز آخر.",
-    "simplex-unique-card-4-p-1": "شبكة SimpleX لا مركزية بالكامل ومستقلة عن أي عملة مُعمَّاة أو أي منصة أخرى، بخلاف الإنترنت.",
+    "simplex-unique-card-4-p-1": "شبكة SimpleX لا مركزية بالكامل ومستقلة عن أي عملة مُعمَّاة أو أي شبكة أخرى، بخلاف الإنترنت.",
     "simplex-unique-card-4-p-2": "يمكنك<strong> استخدام SimpleX مع خوادمك الخاصة </strong> أو مع الخوادم التي نوفرها &mdash; ولا يزال الاتصال ممكن بأي مستخدم.",
     "join": "انضم إلى",
     "we-invite-you-to-join-the-conversation": "نحن ندعوك للانضمام إلى المُحادثة",
@@ -179,7 +178,7 @@
     "use-this-command": "استخدم هذا الأمر:",
     "see-simplex-chat": "انظر SimpleX Chat",
     "github-repository": "مستودع Github",
-    "the-instructions--source-code": "التعليمات حول كيفية تنزيله أو تجميعه من التعليمات البرمجية المصدر.",
+    "the-instructions--source-code": "للتعليمات حول كيفية تنزيله أو تجميعه من التعليمات البرمجية المصدر.",
     "if-you-already-installed-simplex-chat-for-the-terminal": "إذا قمت بالفعل بتثبيت SimpleX Chat للوحدة الطرفية",
     "simplex-chat-for-the-terminal": "SimpleX Chat للوحدة الطرفية",
     "privacy-matters-section-header": "لماذا الخصوصية <span class='gradient-text'> مهمة</span>",
@@ -190,8 +189,8 @@
     "simplex-network-3-header": "شبكة SimpleX",
     "protocol-1-text": "Signal، منصات كبيرة",
     "protocol-2-text": "XMPP ،Matrix",
-    "simplex-unique-card-1-p-2": "بخلاف أي نظام مُراسلة آخر، لا يحتوي SimpleX على معرّفات مخصصة للمستخدمين &mdash;<strong> ولا حتى أرقام عشوائية</strong>.",
-    "simplex-unique-card-2-p-1": "نظرًا لعدم وجود معرف أو عنوان ثابت على منصة SimpleX، لا يمكن لأي شخص الاتصال بك ما لم تشارك عنوان مستخدم لمرة واحدة أو مؤقتًا، كرمز QR أو رابط.",
+    "simplex-unique-card-1-p-2": "على عكس أي شبكة مُراسلة آخر، لا يحتوي SimpleX على معرّفات مخصّصة للمستخدمين &mdash;<strong> ولا حتى أرقام عشوائية</strong>.",
+    "simplex-unique-card-2-p-1": "نظرًا لعدم وجود معرّف أو عنوان ثابت على شبكة SimpleX، لا يمكن لأي شخص الاتصال بك ما لم تشارك عنوان مستخدم لمرة واحدة أو مؤقتًا، كرمز QR أو رابط.",
     "simplex-unique-card-3-p-2": "يتم الاحتفاظ بالرسائل المُعمَّاة بين الطرفين مؤقتًا على خوادم ترحيل SimpleX حتى يتم استلامها، ثُمَّ تُحذف نهائيًا.",
     "tap-the-connect-button-in-the-app": "اضغط على زر<span class='text-active-blue'> \"اتصال\"</span> في التطبيق",
     "scan-the-qr-code-with-the-simplex-chat-app": "امسح رمز QR باستخدام تطبيق SimpleX Chat",
@@ -209,7 +208,7 @@
     "simplex-network-2-desc": "لا تقوم خوادم الترحيل SimpleX بتخزين ملفات تعريف المستخدمين وجهات الاتصال والرسائل التي تم تسليمها، ولا تتصل ببعضها البعض، ولا يوجد دليل خوادم.",
     "comparison-point-1-text": "يتطلب هوية عالمية",
     "protocol-3-text": "بروتوكولات P2P",
-    "simplex-unique-overlay-card-4-p-2": "تستخدم منصة SimpleX<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'> بروتوكول مفتوح</a> وتوفر <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'> SDK لإنشاء روبوتات دردشة</a>، مما يسمح بتنفيذ الخدمات التي يمكن للمستخدمين التفاعل معها عبر تطبيقات SimpleX Chat &mdash; التي تتطلع حقًا لمعرفة خدمات SimpleX التي يمكنك إنشاؤها.",
+    "simplex-unique-overlay-card-4-p-2": "تستخدم شبكة SimpleX<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'> بروتوكول مفتوح</a> وتوفر <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'> SDK لإنشاء روبوتات دردشة</a>، مما يسمح بتنفيذ الخدمات التي يمكن للمستخدمين التفاعل معها عبر تطبيقات SimpleX Chat &mdash; التي تتطلع حقًا لمعرفة خدمات SimpleX التي ستبنيها.",
     "guide-dropdown-1": "بداية سريعة",
     "guide-dropdown-2": "إرسال الرسائل",
     "guide-dropdown-3": "مجموعات سرية",
@@ -228,7 +227,7 @@
     "menu": "قائمة",
     "on-this-page": "على هذه الصفحة",
     "back-to-top": "عد إلى الأعلى",
-    "docs-dropdown-1": "منصة SimpleX",
+    "docs-dropdown-1": "شبكة SimpleX",
     "guide": "الدليل",
     "docs-dropdown-2": "الوصول إلى ملفات اندرويد",
     "docs-dropdown-3": "الوصول إلى قاعدة بيانات الدردشة",
@@ -245,7 +244,7 @@
     "f-droid-page-f-droid-org-repo-section-text": "مستودعات SimpleX Chat و F-Droid.org مبنية على مفاتيح مختلفة. للتبديل، يُرجى <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>تصدير</a> قاعدة بيانات الدردشة وإعادة تثبيت التطبيق.",
     "comparison-section-list-point-4a": "مُرحلات SimpleX لا يمكنها أن تتنازل عن تعمية بين الطرفين. تحقق من رمز الأمان للتخفيف من الهجوم على القناة خارج النطاق",
     "hero-overlay-3-title": "التقييمات الأمنية",
-    "hero-overlay-card-3-p-2": "قامت Trail of Bits بمراجعة مكونات التشفير والشبكات الخاصة بمنصة SimpleX في نوفمبر 2022. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">اقرأ المزيد في الإعلان</a>.",
+    "hero-overlay-card-3-p-2": "قامت Trail of Bits بمراجعة مكونات التشفير والشبكات الخاصة بشبكة SimpleX في نوفمبر 2022. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">اقرأ المزيد في الإعلان</a>.",
     "jobs": "انضم للفريق",
     "hero-overlay-3-textlink": "التقييمات الأمنية",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> هي شركة رائدة في مجال الاستشارات الأمنية والتكنولوجية، ومن بين عملائها شركات التكنولوجيا الكبرى والوكالات الحكومية ومشاريع blockchain الكبرى.",
diff --git a/website/langs/bg.json b/website/langs/bg.json
index 963f850e53..21fb93c2cb 100644
--- a/website/langs/bg.json
+++ b/website/langs/bg.json
@@ -21,7 +21,7 @@
     "smp-protocol": "СМП Протокол",
     "chat-protocol": "Чат протокол",
     "donate": "Дарете",
-    "copyright-label": "© 2020-2024 SimpleX | Проект с отворен код",
+    "copyright-label": "© 2020-2025 SimpleX | Проект с отворен код",
     "simplex-chat-protocol": "SimpleX Чат протокол",
     "terminal-cli": "Системна конзола",
     "terms-and-privacy-policy": "Условия и политика за поверителност",
diff --git a/website/langs/cs.json b/website/langs/cs.json
index 0e19fdbfe4..47ab2c99d0 100644
--- a/website/langs/cs.json
+++ b/website/langs/cs.json
@@ -14,7 +14,7 @@
     "features": "Funkce",
     "why-simplex": "Proč SimpleX",
     "simplex-privacy": "SimpleX soukromí",
-    "simplex-explained": "Simplex vysvětlení",
+    "simplex-explained": "SimpleX vysvětlení",
     "simplex-explained-tab-1-text": "1. Co vidí uživatel",
     "simplex-explained-tab-2-text": "2. Jak to funguje",
     "simplex-explained-tab-3-text": "3. Co vidí servery",
@@ -25,7 +25,7 @@
     "smp-protocol": "SMP protokol",
     "chat-protocol": "Chat protokol",
     "donate": "Darovat",
-    "copyright-label": "© 2020-2024 SimpleX | Projekt s otevřeným zdrojovým kódem",
+    "copyright-label": "© 2020-2025 SimpleX | Projekt s otevřeným zdrojovým kódem",
     "simplex-chat-protocol": "SimpleX Chat protokol",
     "terminal-cli": "Terminálové rozhraní příkazového řádku",
     "terms-and-privacy-policy": "Ochrana soukromí",
@@ -115,8 +115,7 @@
     "sign-up-to-receive-our-updates": "Přihlaste se k odběru novinek",
     "enter-your-email-address": "vložte svou e-mailovou adresu",
     "get-simplex": "Získat SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Proč je SimpleX",
-    "unique": "jedinečný",
+    "why-simplex-is-unique": "Proč je SimpleX <span class='gradient-text'>jedinečný</span>",
     "learn-more": "Další informace",
     "more-info": "Více informací",
     "hide-info": "Skrýt informace",
@@ -180,7 +179,7 @@
     "privacy-matters-overlay-card-1-p-2": "Internetoví prodejci vědí, že lidé s nižšími příjmy častěji provádějí urgentní nákupy, takže mohou účtovat vyšší ceny nebo odebírat slevy.",
     "privacy-matters-overlay-card-1-p-4": "Platforma SimpleX chrání soukromí vašich připojení lépe než jakákoli jiná alternativa a plně zabraňuje tomu, aby byl váš sociální graf dostupný všem společnostem nebo organizacím. I když lidé používají servery poskytované SimpleX Chat, neznáme počet uživatelů ani jejich připojení.",
     "privacy-matters-overlay-card-2-p-2": "Chcete-li být objektivní a činit nezávislá rozhodnutí, musíte mít svůj informační prostor pod kontrolou. Je to možné pouze v případě, že používáte soukromou komunikační platformu, která nemá přístup k vašemu sociálnímu grafu.",
-    "simplex-unique-overlay-card-1-p-2": "K doručování zpráv SimpleX používá <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>párové anonymní adresy</a> jednosměrných front zpráv, oddělených pro přijaté a odeslané zprávy, obvykle přes různé servery. Používání SimpleX je jako mít <strong> jinou &ldquo; vypalovačku&rdquo; e-mail nebo telefon pro každý kontakt</strong> a žádné potíže s jejich správou.",
+    "simplex-unique-overlay-card-1-p-2": "K doručování zpráv SimpleX používá <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>párové anonymní adresy</a> jednosměrných front zpráv, oddělených pro přijaté a odeslané zprávy, obvykle přes různé servery.",
     "privacy-matters-overlay-card-3-p-2": "Jedním z nejvíce šokujících příběhů je zkušenost <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedoua Oulda Salahiho</a> popsaná v jeho pamětech a zobrazená v Mauritánském filmu. Byl umístěn do tábora na Guantánamu bez soudu a byl tam 15 let mučen po telefonátu svému příbuznému v Afghánistánu pro podezření z účasti na útocích z 11. září, i když předchozích 10 let žil v Německu.",
     "simplex-unique-overlay-card-1-p-1": "Na rozdíl od jiných platforem pro zasílání zpráv nemá SimpleX <strong> žádné identifikátory přiřazené uživatelům</strong>. Nespoléhá se na telefonní čísla, adresy založené na doméně (jako je e-mail nebo XMPP), uživatelská jména, veřejné klíče nebo dokonce náhodná čísla k identifikaci svých uživatelů &mdash;. Nevíme&apos;, kolik lidí používá naše servery SimpleX.",
     "invitation-hero-header": "Byl vám zaslán odkaz pro připojení na SimpleX Chat",
@@ -209,7 +208,7 @@
     "if-you-already-installed-simplex-chat-for-the-terminal": "Pokud jste již nainstalovali SimpleX Chat pro terminál",
     "if-you-already-installed": "Pokud jste již nainstalovali",
     "simplex-network-1-desc": "Všechny zprávy se odesílají přes servery, což zajišťuje lepší soukromí metadat a spolehlivé asynchronní doručování zpráv, přičemž se zamezuje mnoha",
-    "simplex-private-card-1-point-1": "Protokol s dvojitou západkou &mdash;<br>zprávy OTR s dokonalým dopředným utajením a obnovení po vloupání.",
+    "simplex-private-card-1-point-1": "Double-ratchet protokol &mdash;<br>OTR messaging s dokonalým dopředným utajením a obnovou po vloupání.",
     "guide-dropdown-1": "Rychlý start",
     "guide-dropdown-2": "Odesílání zpráv",
     "guide-dropdown-3": "Tajné skupiny",
@@ -233,8 +232,8 @@
     "back-to-top": "Zpět nahoru",
     "newer-version-of-eng-msg": "V angličtině je novější verze této stránky.",
     "glossary": "Rejstřík",
-    "hero-overlay-3-title": "Posouzení bezpečnosti",
-    "hero-overlay-3-textlink": "Posouzení bezpečnosti",
+    "hero-overlay-3-title": "Hodnocení zabezpečení",
+    "hero-overlay-3-textlink": "Hodnocení zabezpečení",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> je přední bezpečnostní a technologické poradenství, jejichž klienti zahrnují velké technologické firmy, vládní agentury a významné blockchainové projekty.",
     "f-droid-page-simplex-chat-repo-section-text": "Chcete-li jej přidat do vašeho F-Droid clienta, <span class='hide-on-mobile'> naskenujte QR kód nebo</span> použijte tuto adresu URL:",
     "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat a F-Droid.org repozitáře jsou podepsané různými klíči. Chcete-li přepnout, prosím <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>exportujte</a> chat databázi a přeinstalujte aplikaci.",
@@ -254,5 +253,7 @@
     "docs-dropdown-9": "Ke stažení",
     "docs-dropdown-10": "Transparentnost",
     "docs-dropdown-11": "FAQ (často kladené dotazy)",
-    "docs-dropdown-12": "Bezpečnost"
+    "docs-dropdown-12": "Bezpečnost",
+    "hero-overlay-card-3-p-3": "Trail of Bits přezkoumala kryptografický design síťových protokolů SimpleX v červenci 2024. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Přečíst více</a>.",
+    "docs-dropdown-14": "SimpleX pro podnikání"
 }
diff --git a/website/langs/de.json b/website/langs/de.json
index 3b1e9d34e8..3e5ef9fbc4 100644
--- a/website/langs/de.json
+++ b/website/langs/de.json
@@ -15,13 +15,13 @@
     "simplex-explained-tab-1-p-1": "Sie können Kontakte und Gruppen erstellen und haben Zwei-Wege-Kommunikation wie in jedem anderen Messenger.",
     "simplex-explained-tab-1-p-2": "Wie funktioniert das mit den unidirektionalen Warteschlangen und ohne Profilkennungen?",
     "simplex-explained-tab-2-p-1": "Für jede Verbindung nutzen Sie zwei separate Nachrichten-Warteschlangen, um die Nachrichten über verschiedene Server zu senden und zu empfangen.",
-    "simplex-explained-tab-2-p-2": "Die Server leiten Nachrichten immer nur in eine Richtung weiter, ohne den vollständigen Verlauf der Nutzer-Unterhaltung oder seiner Verbindungen zu kennen.",
+    "simplex-explained-tab-2-p-2": "Die Server leiten Nachrichten immer nur in eine Richtung weiter, ohne den vollständigen Verlauf der Nutzer-Unterhaltungen oder seiner Verbindungen zu kennen.",
     "simplex-explained-tab-3-p-1": "Die Server nutzen für jede Warteschlange separate, anonyme Anmeldeinformationen und wissen nicht welchem Nutzer diese gehören.",
     "simplex-explained-tab-3-p-2": "Durch die Verwendung von Tor-Zugangsservern können Nutzer ihre Metadaten-Privatsphäre weiter verbessern und Korellationen von IP-Adressen verhindern.",
     "smp-protocol": "SMP-Protokoll",
     "chat-bot-example": "Beispiel für einen Chatbot",
     "donate": "Spenden",
-    "copyright-label": "© 2020-2024 SimpleX | Open-Source-Projekt",
+    "copyright-label": "© 2020-2025 SimpleX | Open-Source-Projekt",
     "chat-protocol": "Chat-Protokoll",
     "simplex-chat-protocol": "SimpleX-Chat-Protokoll",
     "terminal-cli": "Terminal-Kommandozeilen-Schnittstelle",
@@ -54,7 +54,7 @@
     "simplex-private-6-title": "Out-of-Band-<br>Schlüsselaustausch",
     "simplex-private-9-title": "Unidirektionale<br>Nachrichten-Warteschlangen",
     "simplex-private-10-title": "Temporäre, anonyme paarweise Kennungen",
-    "simplex-private-card-1-point-1": "Double-Ratchet-Protokoll &mdash;<br>Off-the-Record-Nachrichten mit Perfect Forward Secrecy und Einbruchsresistenz.",
+    "simplex-private-card-1-point-1": "Double-Ratchet-Protokoll &mdash;<br>Off-the-Record-Nachrichten mit Perfect Forward Secrecy, Abstreitbarkeit und Wiederherstellung nach einer Kompromittierung.",
     "simplex-private-card-1-point-2": "NaCL-Kryptobox in jeder Warteschlange, um eine Korrelation des Datenverkehrs zwischen Nachrichtenwarteschlangen zu verhindern, falls TLS kompromittiert wurde.",
     "simplex-private-card-3-point-1": "Für Client-Server-Verbindungen wird nur TLS 1.2/1.3 mit starken Algorithmen verwendet.",
     "simplex-private-card-2-point-1": "Zusätzliche Server-Verschlüsselungs-Schicht für die Zustellung an den Empfänger, um eine Korrelation zwischen empfangenen und gesendeten Server-Daten zu vermeiden, falls TLS kompromittiert wurde.",
@@ -64,7 +64,7 @@
     "simplex-private-card-4-point-2": "Um SimpleX per Tor zu nutzen, installieren Sie unter Android bitte die <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">Orbot-App</a> und aktivieren Sie den SOCKS5-Proxy oder <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">unter iOS</a> per VPN.",
     "simplex-private-card-5-point-1": "SimpleX nutzt Inhalte-Auffüllung für jede Verschlüsselungs-Schicht, um Angriffe auf die Nachrichtengröße zu vereiteln.",
     "simplex-private-card-5-point-2": "Erzeugt Nachrichten mit unterschiedlichen Größen, die für Server und Netzwerk-Beobachter identisch aussehen.",
-    "simplex-private-card-6-point-1": "Viele Kommunikations-Plattformen sind für MITM-Angriffe durch Server oder Netzwerk-Anbieter anfällig.",
+    "simplex-private-card-6-point-1": "Viele Kommunikations-Netzwerke sind für MITM-Angriffe durch Server oder Netzwerk-Anbieter anfällig.",
     "simplex-private-card-9-point-1": "Jede Nachrichten-Warteschlange leitet Nachrichten mit unterschiedlichen Sende- und Empfängeradressen jeweils nur in einer Richtung weiter.",
     "simplex-private-card-9-point-2": "Verglichen mit traditionellen Nachrichten-Brokern, werden mögliche Angriffs-Vektoren und vorhandene Metadaten reduziert.",
     "simplex-private-card-10-point-1": "SimpleX nutzt für jeden Nutzer-Kontakt oder jedes Gruppenmitglied eigene temporäre, anonyme und paarweise Adressen und Berechtigungsnachweise.",
@@ -95,29 +95,29 @@
     "hero-overlay-card-1-p-6": "Lesen Sie mehr darüber im <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>SimpleX-Whitepaper</a>.",
     "hero-overlay-card-2-p-2": "Sie können diese Informationen mit bestehenden öffentlichen sozialen Netzwerken korrelieren und damit wahre Identitäten herausfinden.",
     "hero-overlay-card-2-p-3": "Wenn Sie sich mit zwei unterschiedlichen Kontakten über dasselbe Profil unterhalten, können sie, selbst bei sehr auf Privatsphäre bedachten Apps, die Tor-v3-Dienste nutzen, feststellen, dass diese Kontakte mit derselben Person verbunden sind.",
-    "hero-overlay-card-1-p-2": "Um Nachrichten auszuliefern, nutzt SimpleX statt Benutzerkennungen wie auf allen anderen Plattformen temporäre, anonyme und paarweise Kennungen für Nachrichten-Warteschlangen, die für jede Ihrer Verbindungen unterschiedlich sind &mdash; Es gibt keinerlei Langzeit-Kennungen.",
+    "hero-overlay-card-1-p-2": "Um Nachrichten auszuliefern, nutzt SimpleX statt Benutzerkennungen wie alle anderen Netzwerke nur temporäre, anonyme und paarweise Kennungen für Nachrichten-Warteschlangen, die für jede Ihrer Verbindungen unterschiedlich sind &mdash; es gibt keinerlei Langzeit-Kennungen.",
     "hero-overlay-card-1-p-4": "Dieses Design verhindert schon auf der Applikations-Ebene Datenlecks für jegliche Benutzer&apos;Metadaten. Sie können sich über Tor mit Nachrichten-Servern verbinden, um Ihre Privatsphäre weiter zu verbessern und die von Ihnen genutzte IP-Adresse zu schützen.",
     "hero-overlay-card-2-p-1": "Wenn Nutzer dauerhafte Identitäten besitzen, selbst wenn diese eine Zufallsnummer, wie eine Sitzungs-ID, ist, besteht ein Risiko, das Provider oder Angreifer feststellen können, wie Nutzer miteinander verbunden sind und wie viele Nachrichten sie versenden.",
     "hero-overlay-card-2-p-4": "SimpleX schützt gegen solche Angriffe, weil es vom Design her keinerlei Benutzerkennungen besitzt. Und Sie haben sogar unterschiedliche Anzeigenamen für jeden Kontakt und vermeiden jegliche geteilte Daten zwischen diesen, wenn Sie den Inkognito-Modus nutzen.",
     "simplex-network-overlay-card-1-p-1": "<a href='https://en.wikipedia.org/wiki/Peer-to-peer'>Peer-to-Peer</a>-Nachrichten-Protokolle und -Applikationen haben verschiedene Probleme, die diese weniger vertrauenswürdig, die Analyse wesentlich komplexer und anfälliger gegen verschiedene Arten von Angriffen, als bei SimpleX machen.",
     "simplex-network-overlay-card-1-li-2": "Das SimpleX Design hat, im Gegensatz zu den meisten P2P-Netzwerken, keinerlei globalen Benutzerkennungen, auch keine temporären. Es nutzt ausschließlich temporäre paarweise Kennungen, die bessere Anonymität und Metadaten-Schutz bieten.",
-    "simplex-network-overlay-card-1-li-4": "P2P-Implementierungen können durch Internetanbieter blockiert werden, wie beispielweise <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX ist transportunabhängig – es kann über Standard-Web-Protokolle, wie beispielsweise WebSockets, arbeiten.",
+    "simplex-network-overlay-card-1-li-4": "&mdash;&mdash;P2P-Implementierungen können durch Internetanbieter blockiert werden, wie beispielweise <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX ist transportunabhängig &mdash; es kann über Standard-Web-Protokolle, wie beispielsweise WebSockets, arbeiten.",
     "simplex-network-overlay-card-1-li-6": "P2P-Netzwerke können anfällig für <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS-Angriffe</a> sein, wenn die Clients den Datenverkehr erneut senden und verstärken können, was zu einem netzwerkweiten Denial-of-Service führt. SimpleX-Clients leiten nur Datenverkehr von bekannten Verbindungen weiter und können von einem Angreifer nicht dazu verwendet werden, den Datenverkehr im gesamten Netzwerk zu verstärken.",
     "privacy-matters-overlay-card-1-p-1": "Viele große Unternehmen nutzen Informationen, mit wem Sie in Verbindung stehen, um Ihr Einkommen zu schätzen, Ihnen Produkte zu verkaufen, die Sie nicht wirklich benötigen und um die Preise zu bestimmen.",
     "privacy-matters-overlay-card-1-p-2": "Online-Händler wissen, dass Menschen mit geringerem Einkommen eher dringende Einkäufe tätigen, sodass sie möglicherweise höhere Preise verlangen können oder Rabatte streichen.",
     "privacy-matters-overlay-card-1-p-3": "Einige Finanz- und Versicherungsunternehmen verwenden soziale Graphen, um Zinssätze und Prämien zu ermitteln. Menschen mit niedrigerem Einkommen zahlen so häufig mehr &mdash; dies ist als <a href='https://fairbydesign.com/povertypremium/' target='_blank'>\"Armutsprämie\"</a> bekannt.",
-    "privacy-matters-overlay-card-2-p-2": "Um objektiv zu sein und unabhängige Entscheidungen treffen zu können, müssen Sie die Kontrolle über Ihren Informationsraum haben. Dies ist nur möglich, wenn Sie eine private Kommunikationsplattform verwenden, die keinen Zugriff auf Ihren sozialen Graphen hat.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX ist die erste Plattform, die per Design keinerlei Benutzerkennungen hat und auf diese Weise Ihren Verbindungsgraphen besser schützt als jede andere bekannte Alternative.",
+    "privacy-matters-overlay-card-2-p-2": "Um objektiv zu sein und unabhängige Entscheidungen treffen zu können, müssen Sie die Kontrolle über Ihren Informationsraum haben. Dies ist nur möglich, wenn Sie ein privates Kommunikations-Netzwerk verwenden, welches keinen Zugriff auf Ihren sozialen Graphen hat.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX ist das erste Netzwerk, welches per Design keinerlei Benutzerkennungen hat und auf diese Weise Ihren Verbindungsgraphen besser schützt als jede andere bekannte Alternative.",
     "privacy-matters-overlay-card-3-p-1": "Jede Person sollte sich um ihre Privatsphäre und die Sicherheit ihrer Kommunikation kümmern &mdash; Harmlose Gespräche könnten Sie in Gefahr bringen, selbst wenn Sie nichts zu verbergen haben.",
     "privacy-matters-overlay-card-3-p-4": "Es reicht nicht aus, einfach einen Ende-zu-Ende-verschlüsselten Messenger zu verwenden. Wir alle sollten den Messenger verwenden, der die Privatsphäre unserer persönlichen Netzwerke schützt, mit welchen wir verbunden sind.",
-    "simplex-unique-overlay-card-1-p-3": "Dieses Design schützt die Privatsphäre von Ihnen und der Personen, mit denen Sie kommunizieren, und verbirgt die Verbindungen vor den SimpleX-Plattform-Servern und möglichen Beobachtern. Um Ihre IP-Adresse vor den Servern zu verbergen, können Sie sich <strong>per Tor mit den SimpleX-Servern verbinden</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "Da Sie auf der SimpleX-Plattform keine Kennungen haben, kann Sie niemand kontaktieren, es sei denn, Sie geben eine einmalige oder vorübergehende Benutzeradresse in Form eines QR-Codes oder eines Links weiter.",
+    "simplex-unique-overlay-card-1-p-3": "Dieses Design schützt die Privatsphäre von Ihnen und der Nutzer, mit denen Sie kommunizieren, und verbirgt die Verbindungen vor den SimpleX-Netzwerk-Servern und möglichen Beobachtern. Um Ihre IP-Adresse vor den Servern zu verbergen, können Sie sich <strong>per Tor mit den SimpleX-Servern verbinden</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "Da Sie im SimpleX-Netzwerk keine Kennungen haben, kann Sie niemand kontaktieren, es sei denn, Sie geben eine einmalige oder vorübergehende Benutzeradresse in Form eines QR-Codes oder eines Links weiter.",
     "simplex-unique-overlay-card-3-p-2": "Die Ende-zu-Ende-verschlüsselten Nachrichten werden vorübergehend auf SimpleX-Relay-Servern gespeichert, bis sie vom Endgerät empfangen und danach endgültig gelöscht werden.",
     "simplex-unique-overlay-card-3-p-3": "Im Gegensatz zu föderierten Netzwerkservern (wie z.B. Mail, XMPP oder Matrix) speichern die SimpleX-Server keine Benutzerkonten, sondern leiten Nachrichten nur weiter, so dass die Privatsphäre der beteiligten Parteien geschützt ist.",
-    "simplex-unique-overlay-card-4-p-1": "Sie können <strong>SimpleX mit Ihren eigenen Servern verwenden</strong> und trotzdem mit Personen kommunizieren, welche die von uns bereitgestellten und vorkonfigurierten Server verwenden.",
-    "simplex-unique-card-1-p-1": "SimpleX schützt die Privatsphäre Ihres Profils, Ihrer Kontakte und Metadaten und verbirgt sie vor den SimpleX-Plattform-Servern und allen Beobachtern.",
-    "simplex-unique-card-1-p-2": "Im Gegensatz zu allen anderen bestehenden Messaging-Plattformen werden den Nutzern von SimpleX keine Kennungen zugewiesen &mdash; <strong>nicht einmal Zufallszahlen</strong>.",
-    "simplex-unique-card-2-p-1": "Da Sie keine Kennung oder feste Adresse auf der SimpleX-Plattform haben, kann Sie niemand kontaktieren, es sei denn, Sie geben eine einmalige oder vorübergehende Benutzeradresse in Form eines QR-Codes oder Links weiter.",
+    "simplex-unique-overlay-card-4-p-1": "Sie können <strong>SimpleX mit Ihren eigenen Servern verwenden</strong> und trotzdem mit Nutzern kommunizieren, welche die vorkonfigurierten Server der App verwenden.",
+    "simplex-unique-card-1-p-1": "SimpleX schützt die Privatsphäre Ihres Profils, Ihrer Kontakte und Metadaten und verbirgt sie vor den SimpleX-Netzwerk-Servern und weiteren möglichen Beobachtern.",
+    "simplex-unique-card-1-p-2": "Im Gegensatz zu allen anderen bestehenden Messaging-Netzwerken werden den Nutzern von SimpleX keine Kennungen zugewiesen &mdash; <strong>nicht einmal Zufallszahlen</strong>.",
+    "simplex-unique-card-2-p-1": "Da Sie keine Kennung oder feste Adresse im SimpleX-Netzwerk haben, kann Sie niemand kontaktieren, es sei denn, Sie geben eine einmalige oder vorübergehende Benutzeradresse in Form eines QR-Codes oder Links weiter.",
     "simplex-unique-card-3-p-1": "SimpleX speichert Benutzerdaten nur auf den Endgeräten und das in einem <strong>portablen, verschlüsselten Datenbankformat</strong> &mdash; welches auf ein anderes Gerät übertragen werden kann.",
     "simplex-unique-card-3-p-2": "Die Ende-zu-Ende-verschlüsselten Nachrichten werden vorübergehend auf SimpleX-Relay-Servern gespeichert, bis sie vom Endgerät empfangen und danach endgültig gelöscht werden.",
     "join": "Nutzen Sie",
@@ -142,7 +142,7 @@
     "use-this-command": "Benutzen Sie dieses Kommando:",
     "see-simplex-chat": "Siehe SimpleX-Chat",
     "github-repository": "GitHub-Repository",
-    "the-instructions--source-code": "Die Anleitung, wie Sie es herunterladen und aus dem Quellcode kompilieren.",
+    "the-instructions--source-code": "Für die Anleitungen, wie Sie es herunterladen oder aus dem Quellcode kompilieren.",
     "if-you-already-installed": "Wenn Sie es schon installiert haben",
     "simplex-chat-for-the-terminal": "SimpleX Chat für das Terminal",
     "privacy-matters-section-header": "Warum es auf Privatsphäre <span class='gradient-text'>ankommt</span>",
@@ -171,15 +171,14 @@
     "comparison-section-list-point-2": "DNS-basierte Adressen",
     "comparison-section-list-point-3": "Öffentlicher Schlüssel oder eine andere weltweit eindeutige ID",
     "comparison-section-list-point-4": "Wenn die Server des Betreibers kompromittiert werden. In Signal und weiteren Apps kann der Sicherheitscode überprüft werden, um dies zu entschärfen",
-    "comparison-section-list-point-6": "P2P sind zwar verteilt, aber nicht föderiert - sie arbeiten als ein einziges Netzwerk",
+    "comparison-section-list-point-6": "P2P sind zwar verteilt, aber nicht föderiert &mdash; sie arbeiten als ein einziges Netzwerk",
     "comparison-section-list-point-7": "P2P-Netzwerke haben entweder eine zentrale Verwaltung oder das gesamte Netzwerk kann kompromittiert werden",
     "see-here": "Siehe hier",
-    "simplex-unique-card-4-p-1": "Das SimpleX-Netzwerk ist vollständig dezentralisiert und unabhängig von Kryptowährungen oder anderen Plattformen außer dem Internet.",
-    "unique": "einmalig",
+    "simplex-unique-card-4-p-1": "Das SimpleX-Netzwerk ist vollständig dezentralisiert und unabhängig von Kryptowährungen oder anderen Netzwerken außer dem Internet.",
     "privacy-matters-overlay-card-2-p-1": "Vor nicht allzu langer Zeit beobachteten wir, wie große Wahlen von einem <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>angesehenen Beratungsunternehmen</a> manipuliert wurden, welches unsere sozialen Graphen nutzte, um unsere Sicht auf die reale Welt zu verzerren und unsere Stimmen zu manipulieren.",
     "privacy-matters-overlay-card-3-p-2": "Eine der schockierendsten Geschichten ist die Erfahrung von <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a>, welche in seinen Memoiren beschrieben und im Film „The Mauritanian“ gezeigt wird. Er kam nach einem Anruf bei seinen Verwandten in Afghanistan und ohne Gerichtsverfahren in das Guantanamo-Lager und wurde dort einige Jahre lang gefoltert, weil er verdächtigt wurde, an den 9/11-Angriffen beteiligt gewesen zu sein, obwohl er die vorhergehenden 10 Jahre in Deutschland gelebt hatte.",
-    "simplex-unique-overlay-card-1-p-1": "Im Gegensatz zu anderen Nachrichten-Plattformen weist SimpleX <strong>den Benutzern keine Kennungen</strong> zu. Es verlässt sich nicht auf Telefonnummern, domänenbasierte Adressen (wie E-Mail oder XMPP), Benutzernamen, öffentliche Schlüssel oder sogar Zufallszahlen, um seine Benutzer zu identifizieren &mdash; Wir wissen nicht, wie viele Personen unsere SimpleX-Server verwenden.",
-    "simplex-unique-overlay-card-1-p-2": "Um Nachrichten auszuliefern nutzt SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>paarweise anonyme Adressen</a> aus unidirektionalen Nachrichten-Warteschlangen, die für empfangene und gesendete Nachrichten separiert sind und gewöhnlich über verschiedene Server gesendet werden. Die Nutzung von SimpleX entspricht der Nutzung von <strong>unterschiedlichen Mailservern oder Telefonen für jeden einzelnen Kontakt</strong> und vermeidet dabei eine mühsame Verwaltung.",
+    "simplex-unique-overlay-card-1-p-1": "Im Gegensatz zu anderen Nachrichten-Netzwerken weist SimpleX <strong>den Benutzern keine Kennungen</strong> zu. Es verlässt sich nicht auf Telefonnummern, domänenbasierte Adressen (wie E-Mail oder XMPP), Benutzernamen, öffentliche Schlüssel oder Zufallszahlen, um seine Benutzer zu identifizieren &mdash; selbst SimpleX-Server-Betreiber wissen nicht, wie viele Personen deren Server verwenden.",
+    "simplex-unique-overlay-card-1-p-2": "Um Nachrichten auszuliefern nutzt SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>paarweise anonyme Adressen</a> aus unidirektionalen Nachrichten-Warteschlangen, die für empfangene und gesendete Nachrichten separiert sind und gewöhnlich über verschiedene Server gesendet werden.",
     "simplex-network-overlay-card-1-li-5": "Alle bekannten P2P-Netzwerke können anfällig für <a href='https://en.wikipedia.org/wiki/Sybil_attack'>Sybil-Angriffe</a> sein, da jeder Knoten ermittelbar ist und das Netzwerk als Ganzes funktioniert. Bekannte Maßnahmen zur Verhinderung erfordern entweder eine zentralisierte Komponente oder einen teuren <a href='https://en.wikipedia.org/wiki/Proof_of_work'>Ausführungsnachweis</a>. Das SimpleX-Netzwerk bietet keine Ermittlung der Server, ist fragmentiert und arbeitet mit mehreren isolierten Subnetzwerken, wodurch netzwerkweite Angriffe unmöglich werden.",
     "simplex-network-overlay-card-1-li-3": "P2P löst nicht das Problem des <a href='https://en.wikipedia.org/wiki/Man-in-the-middle_attack'>MITM-Angriffs</a> und die meisten bestehenden Implementierungen nutzen für den initialen Schlüsselaustausch keine Out-of-Band-Nachrichten. Im Gegensatz hierzu nutzt SimpleX für den initialen Schlüsselaustausch Out-of-Band-Nachrichten oder zum Teil schon bestehende sichere und vertrauenswürdige Verbindungen.",
     "tap-the-connect-button-in-the-app": "Drücken Sie die <span class='text-active-blue'>„Verbinden“</span>-Taste in der Applikation",
@@ -197,16 +196,16 @@
     "comparison-section-list-point-5": "Die Privatsphäre-Metadaten des Nutzers werden nicht geschützt",
     "simplex-network-overlay-card-1-li-1": "P2P-Netzwerke vertrauen auf Varianten von <a href='https://en.wikipedia.org/wiki/Distributed_hash_table'>DHT</a>, um Nachrichten zu routen. DHT-Designs müssen zwischen Zustellungsgarantie und Latenz ausgleichen. Verglichen mit P2P bietet SimpleX sowohl eine bessere Zustellungsgarantie als auch eine niedrigere Latenz, weil eine Nachricht redundant und parallel über mehrere Server gesendet werden kann, wobei die durch den Empfänger ausgewählten Server genutzt werden. In P2P-Netzwerken werden Nachrichten sequentiell über <em>O(log N)</em>-Knoten gesendet, wobei die Knoten durch einen Algorithmus ausgewählt werden.",
     "simplex-unique-overlay-card-3-p-4": "Zwischen dem gesendeten und empfangenen Serververkehr gibt es keine gemeinsamen Kennungen oder Chiffriertexte &mdash; sodass ein Beobachter nicht ohne weiteres feststellen kann, wer mit wem kommuniziert, selbst wenn TLS kompromittiert wurde.",
-    "simplex-unique-overlay-card-4-p-3": "Wenn Sie darüber nachdenken, für die SimpleX-Plattform entwickeln zu wollen, z.B. einen Chatbot für SimpleX-App-Nutzer oder die Integration der SimpleX-Chat-Bibliothek in Ihre mobilen Apps, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>kontaktieren Sie uns bitte</a> für eine weitere Beratung und Unterstützung.",
-    "privacy-matters-overlay-card-1-p-4": "Die SimpleX-Plattform schützt die Privatsphäre Ihrer Verbindungen besser als jede Alternative und verhindert vollständig, dass Ihr sozialer Graph für Unternehmen oder Organisationen verfügbar wird. Selbst wenn die Anwender SimpleX-Chat-Server verwenden, kennen wir die Anzahl der Benutzer oder ihre Verbindungen nicht.",
+    "simplex-unique-overlay-card-4-p-3": "Falls Sie Interesse daran haben, aktiv bei der Entwicklung des SimpleX-Netzwerks mitzuhelfen, z.B. einen Chatbot für SimpleX-App-Nutzer zu entwickeln oder die Integration der SimpleX-Chat-Bibliothek in mobile Apps voranzutreiben, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>kontaktieren Sie uns bitte</a> für eine weitere Beratung und Unterstützung.",
+    "privacy-matters-overlay-card-1-p-4": "Das SimpleX-Netzwerk schützt die Privatsphäre Ihrer Verbindungen besser als jede Alternative und verhindert vollständig, dass Ihr sozialer Graph für Unternehmen oder Organisationen verfügbar wird. Selbst wenn Anwender die in der SimpleX-Chat-App vorkonfigurierten Server verwenden, kennen die Server-Betreiber die Anzahl der Benutzer oder deren Verbindungen nicht.",
     "contact-hero-header": "Sie haben eine Adresse zur Verbindung mit SimpleX Chat erhalten",
     "invitation-hero-header": "Sie haben einen Einmal-Link zur Verbindung mit SimpleX Chat erhalten",
     "privacy-matters-overlay-card-3-p-3": "Normale Menschen werden für das, was sie online teilen, sogar unter Nutzung ihrer „anonymen“ Konten, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>selbst in demokratischen Ländern</a> verhaftet.",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat speichert alle Benutzerdaten ausschließlich auf den Endgeräten in einem <strong>portablen und verschlüsselten Datenbankformat</strong>, welches exportiert und auf jedes unterstützte Gerät übertragen werden kann.",
     "simplex-unique-overlay-card-2-p-2": "Auch wenn die optionale Benutzeradresse zum Versenden von Spam-Kontaktanfragen verwendet werden kann, können Sie sie ändern oder ganz löschen, ohne dass Ihre Verbindungen verloren gehen.",
-    "simplex-unique-overlay-card-4-p-2": "Die SimpleX-Plattform verwendet ein <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>offenes Protokoll</a> und bietet ein <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK zur Erstellung von Chatbots</a> an, welches die Erstellung von Diensten ermöglicht, mit denen Nutzer über SimpleX-Chat interagieren können &mdash; Wir sind gespannt, welche SimpleX-Dienste Sie erstellen können.",
+    "simplex-unique-overlay-card-4-p-2": "Das SimpleX-Netzwerk verwendet ein <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>offenes Protokoll</a> und bietet ein <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK zur Erstellung von Chatbots</a> an. Dies ermöglicht die Erstellung von Diensten, mit denen Nutzer über SimpleX-Chat-Apps interagieren können &mdash; wir sind gespannt, welche SimpleX-Dienste Sie entwickeln werden.",
     "simplex-unique-card-4-p-2": "Sie können <strong>SimpleX mit Ihren eigenen Servern</strong> oder mit den von uns zur Verfügung gestellten Servern verwenden &mdash; und sich trotzdem mit jedem Benutzer verbinden.",
-    "why-simplex-is": "Warum ist SimpleX",
+    "why-simplex-is-unique": "Warum ist SimpleX <span class='gradient-text'>einmalig</span>",
     "contact-hero-p-1": "Die öffentlichen Schlüssel und die Adresse der Nachrichtenwarteschlange in diesem Link werden NICHT über das Netzwerk gesendet, wenn Sie diese Seite aufrufen &mdash; sie sind in dem Hash-Fragment der Link-URL enthalten.",
     "if-you-already-installed-simplex-chat-for-the-terminal": "Wenn Sie SimpleX schon für das Terminal installiert haben",
     "simplex-network-3-desc": "Die Server stellen <span class='text-active-blue'>unidirektionale Warteschlangen</span> zur Verfügung, um die Benutzer miteinander zu verbinden. Sie haben aber keinen Einblick in den Verbindungs-Graphen des Netzwerks &mdash; Diesen haben nur die Benutzer selbst.",
@@ -219,7 +218,7 @@
     "guide-dropdown-8": "App-Einstellungen",
     "guide-dropdown-9": "Verbindungen herstellen",
     "guide": "Leitfaden",
-    "docs-dropdown-1": "SimpleX-Plattform",
+    "docs-dropdown-1": "SimpleX-Netzwerk",
     "docs-dropdown-2": "Zugriff auf Android-Dateien",
     "docs-dropdown-3": "Zugriff auf die Chat-Datenbank",
     "docs-dropdown-4": "Den SMP-Server hosten",
diff --git a/website/langs/en.json b/website/langs/en.json
index e57b3375de..f9691e2594 100644
--- a/website/langs/en.json
+++ b/website/langs/en.json
@@ -7,21 +7,21 @@
     "why-simplex": "Why SimpleX",
     "simplex-privacy": "SimpleX privacy",
     "simplex-network": "SimpleX network",
-    "simplex-explained": "Simplex explained",
+    "simplex-explained": "SimpleX explained",
     "simplex-explained-tab-1-text": "1. What users experience",
     "simplex-explained-tab-2-text": "2. How does it work",
     "simplex-explained-tab-3-text": "3. What servers see",
     "simplex-explained-tab-1-p-1": "You can create contacts and groups, and have two-way conversations, as in any other messenger.",
     "simplex-explained-tab-1-p-2": "How can it work with unidirectional queues and without user profile identifiers?",
     "simplex-explained-tab-2-p-1": "For each connection you use two separate messaging queues to send and receive messages via different servers.",
-    "simplex-explained-tab-2-p-2": "Servers only pass messages one way, without having the full picture of user's conversation or connections.",
+    "simplex-explained-tab-2-p-2": "Servers only pass messages one way, without having the full picture of user's conversations or connections.",
     "simplex-explained-tab-3-p-1": "The servers have separate anonymous credentials for each queue, and do not know which users they belong to.",
     "simplex-explained-tab-3-p-2": "Users can further improve metadata privacy by using Tor to access servers, preventing corellation by IP address.",
     "chat-bot-example": "Chat bot example",
     "smp-protocol": "SMP protocol",
     "chat-protocol": "Chat protocol",
     "donate": "Donate",
-    "copyright-label": "© 2020-2024 SimpleX | Open-Source Project",
+    "copyright-label": "© 2020-2025 SimpleX | Open-Source Project",
     "simplex-chat-protocol": "SimpleX Chat protocol",
     "terminal-cli": "Terminal CLI",
     "terms-and-privacy-policy": "Privacy Policy",
@@ -65,7 +65,7 @@
     "simplex-private-card-4-point-2": "To use SimpleX via Tor please install <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">Orbot app</a> and enable SOCKS5 proxy (or VPN <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">on iOS</a>).",
     "simplex-private-card-5-point-1": "SimpleX uses content padding for each encryption layer to frustrate message size attacks.",
     "simplex-private-card-5-point-2": "It makes messages of different sizes look the same to the servers and network observers.",
-    "simplex-private-card-6-point-1": "Many communication platforms are vulnerable to MITM attacks by servers or network providers.",
+    "simplex-private-card-6-point-1": "Many communication networks are vulnerable to MITM attacks by servers or network providers.",
     "simplex-private-card-6-point-2": "To prevent it SimpleX apps pass one-time keys out-of-band, when you share an address as a link or a QR code.",
     "simplex-private-card-7-point-1": "To guarantee integrity the messages are sequentially numbered and include the hash of the previous message.",
     "simplex-private-card-7-point-2": "If any message is added, removed or changed the recipient will be alerted.",
@@ -92,7 +92,7 @@
     "simplex-unique-4-title": "You own SimpleX network",
     "simplex-unique-4-overlay-1-title": "Fully decentralised &mdash; users own the SimpleX network",
     "hero-overlay-card-1-p-1": "Many users asked: <em>if SimpleX has no user identifiers, how can it know where to deliver messages?</em>",
-    "hero-overlay-card-1-p-2": "To deliver messages, instead of user IDs used by all other platforms, SimpleX uses temporary anonymous pairwise identifiers of message queues, separate for each of your connections &mdash; there are no long term identifiers.",
+    "hero-overlay-card-1-p-2": "To deliver messages, instead of user IDs used by all other networks, SimpleX uses temporary anonymous pairwise identifiers of message queues, separate for each of your connections &mdash; there are no long term identifiers.",
     "hero-overlay-card-1-p-3": "You define which server(s) to use to receive the messages, your contacts &mdash; the servers you use to send the messages to them. Every conversation is likely to use two different servers.",
     "hero-overlay-card-1-p-4": "This design prevents leaking any users&apos; metadata on the application level. To further improve privacy and protect your IP address you can connect to messaging servers via Tor.",
     "hero-overlay-card-1-p-5": "Only client devices store user profiles, contacts and groups; the messages are sent with 2-layer end-to-end encryption.",
@@ -108,38 +108,38 @@
     "simplex-network-overlay-card-1-li-1": "P2P networks rely on some variant of <a href='https://en.wikipedia.org/wiki/Distributed_hash_table'>DHT</a> to route messages. DHT designs have to balance delivery guarantee and latency. SimpleX has both better delivery guarantee and lower latency than P2P, because the message can be redundantly passed via several servers in parallel, using the servers chosen by the recipient. In P2P networks the message is passed through <em>O(log N)</em> nodes sequentially, using nodes chosen by the algorithm.",
     "simplex-network-overlay-card-1-li-2": "SimpleX design, unlike most P2P networks, has no global user identifiers of any kind, even temporary, and only uses temporary pairwise identifiers, providing better anonymity and metadata protection.",
     "simplex-network-overlay-card-1-li-3": "P2P does not solve <a href='https://en.wikipedia.org/wiki/Man-in-the-middle_attack'>MITM attack</a> problem, and most existing implementations do not use out-of-band messages for the initial key exchange. SimpleX uses out-of-band messages or, in some cases, pre-existing secure and trusted connections for the initial key exchange.",
-    "simplex-network-overlay-card-1-li-4": "P2P implementations can be blocked by some Internet providers (like <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX is transport agnostic - it can work over standard web protocols, e.g. WebSockets.",
+    "simplex-network-overlay-card-1-li-4": "P2P implementations can be blocked by some Internet providers (like <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX is transport agnostic &mdash; it can work over standard web protocols, e.g. WebSockets.",
     "simplex-network-overlay-card-1-li-5": "All known P2P networks may be vulnerable to <a href='https://en.wikipedia.org/wiki/Sybil_attack'>Sybil attack</a>, because each node is discoverable, and the network operates as a whole. Known measures to mitigate it require either a centralized component or expensive <a href='https://en.wikipedia.org/wiki/Proof_of_work'>proof of work</a>. SimpleX network has no server discoverability, it is fragmented and operates as multiple isolated sub-networks, making network-wide attacks impossible.",
     "simplex-network-overlay-card-1-li-6": "P2P networks may be vulnerable to <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS attack</a>, when the clients can rebroadcast and amplify traffic, resulting in network-wide denial of service. SimpleX clients only relay traffic from known connection and cannot be used by an attacker to amplify the traffic in the whole network.",
     "privacy-matters-overlay-card-1-p-1": "Many large companies use information about who you are connected with to estimate your income, sell you the products you don't really need, and to determine the prices.",
     "privacy-matters-overlay-card-1-p-2": "Online retailers know that people with lower incomes are more likely to make urgent purchases, so they may charge higher prices or remove discounts.",
     "privacy-matters-overlay-card-1-p-3": "Some financial and insurance companies use social graphs to determine interest rates and premiums. It often makes people with lower incomes pay more &mdash; it is known as <a href='https://fairbydesign.com/povertypremium/' target='_blank'>'poverty premium'</a>.",
-    "privacy-matters-overlay-card-1-p-4": "SimpleX platform protects the privacy of your connections better than any alternative, fully preventing your social graph becoming available to any companies or organizations. Even when people use servers provided by SimpleX Chat, we do not know the number of users or their connections.",
+    "privacy-matters-overlay-card-1-p-4": "SimpleX network protects the privacy of your connections better than any alternative, fully preventing your social graph becoming available to any companies or organizations. Even when people use servers preconfigured in SimpleX Chat apps, server operators do not know the number of users or their connections.",
     "privacy-matters-overlay-card-2-p-1": "Not so long ago we observed the major elections being manipulated by <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>a reputable consulting company</a> that used our social graphs to distort our view of the real world and manipulate our votes.",
-    "privacy-matters-overlay-card-2-p-2": "To be objective and to make independent decisions you need to be in control of your information space. It is only possible if you use private communication platform that does not have access to your social graph.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX is the first platform that doesn't have any user identifiers by design, in this way protecting your connections graph better than any known alternative.",
+    "privacy-matters-overlay-card-2-p-2": "To be objective and to make independent decisions you need to be in control of your information space. It is only possible if you use private communication network that does not have access to your social graph.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX is the first network that doesn't have any user identifiers by design, in this way protecting your connections graph better than any known alternative.",
     "privacy-matters-overlay-card-3-p-1": "Everyone should care about privacy and security of their communications &mdash; harmless conversations can put you in danger, even if you have nothing to hide.",
     "privacy-matters-overlay-card-3-p-2": "One of the most shocking stories is the experience of <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> described in his memoir and shown in The Mauritanian movie. He was put into Guantanamo camp, without trial, and was tortured there for 15 years after a phone call to his relative in Afghanistan, under suspicion of being involved in 9/11 attacks, even though he lived in Germany for the previous 10 years.",
     "privacy-matters-overlay-card-3-p-3": "Ordinary people get arrested for what they share online, even via their 'anonymous' accounts, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>even in democratic countries</a>.",
     "privacy-matters-overlay-card-3-p-4": "It is not enough to use an end-to-end encrypted messenger, we all should use the messengers that protect the privacy of our personal networks &mdash; who we are connected with.",
-    "simplex-unique-overlay-card-1-p-1": "Unlike other messaging platforms, SimpleX has <strong>no identifiers assigned to the users</strong>. It does not rely on phone numbers, domain-based addresses (like email or XMPP), usernames, public keys or even random numbers to identify its users &mdash; we don&apos;t know how many people use our SimpleX servers.",
-    "simplex-unique-overlay-card-1-p-2": "To deliver messages SimpleX uses <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>pairwise anonymous addresses</a> of unidirectional message queues, separate for received and sent messages, usually via different servers. Using SimpleX is like having <strong>a different &ldquo;burner&rdquo; email or phone for each contact</strong>, and no hassle to manage them.",
-    "simplex-unique-overlay-card-1-p-3": "This design protects the privacy of who you are communicating with, hiding it from SimpleX platform servers and from any observers. To hide your IP address from the servers, you can <strong>connect to SimpleX servers via Tor</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "Because you have no identifier on the SimpleX platform, nobody can contact you unless you share a one-time or temporary user address, as a QR code or a link.",
+    "simplex-unique-overlay-card-1-p-1": "Unlike other messaging networks, SimpleX has <strong>no identifiers assigned to the users</strong>. It does not rely on phone numbers, domain-based addresses (like email or XMPP), usernames, public keys or even random numbers to identify its users &mdash; SimpleX server operators don&apos;t know how many people use their servers.",
+    "simplex-unique-overlay-card-1-p-2": "To deliver messages SimpleX uses <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>pairwise anonymous addresses</a> of unidirectional message queues, separate for received and sent messages, usually via different servers.",
+    "simplex-unique-overlay-card-1-p-3": "This design protects the privacy of who you are communicating with, hiding it from SimpleX network servers and from any observers. To hide your IP address from the servers, you can <strong>connect to SimpleX servers via Tor</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "Because you have no identifier on the SimpleX network, nobody can contact you unless you share a one-time or temporary user address, as a QR code or a link.",
     "simplex-unique-overlay-card-2-p-2": "Even with the optional user address, while it can be used to send spam contact requests, you can change or completely delete it without losing any of your connections.",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat stores all user data only on client devices using a <strong>portable encrypted database format</strong> that can be exported and transferred to any supported device.",
     "simplex-unique-overlay-card-3-p-2": "The end-to-end encrypted messages are held temporarily on SimpleX relay servers until received, then they are permanently deleted.",
     "simplex-unique-overlay-card-3-p-3": "Unlike federated networks servers (email, XMPP or Matrix), SimpleX servers don&apos;t store user accounts, they only relay messages, protecting the privacy of both parties.",
     "simplex-unique-overlay-card-3-p-4": "There are no identifiers or ciphertext in common between sent and received server traffic &mdash; if anybody is observing it, they cannot easily determine who communicates with whom, even if TLS is compromised.",
-    "simplex-unique-overlay-card-4-p-1": "You can <strong>use SimpleX with your own servers</strong> and still communicate with people who use the pre-configured servers provided by us.",
-    "simplex-unique-overlay-card-4-p-2": "SimpleX platform uses an <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>open protocol</a> and provides <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK to create chat bots</a>, allowing implementation of services that users can interact with via SimpleX Chat apps &mdash; we&apos;re really looking forward to see what SimpleX services you can build.",
-    "simplex-unique-overlay-card-4-p-3": "If you are considering developing for the SimpleX platform, for example, the chat bot for SimpleX app users, or the integration of the SimpleX Chat library into your mobile apps, please <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>get in touch</a> for any advice and support.",
-    "simplex-unique-card-1-p-1": "SimpleX protects the privacy of your profile, contacts and metadata, hiding it from SimpleX platform servers and any observers.",
-    "simplex-unique-card-1-p-2": "Unlike any other existing messaging platform, SimpleX has no identifiers assigned to the users &mdash; <strong>not even random numbers</strong>.",
-    "simplex-unique-card-2-p-1": "Because you have no identifier or fixed address on the SimpleX platform, nobody can contact you unless you share a one-time or temporary user address, as a QR code or a link.",
+    "simplex-unique-overlay-card-4-p-1": "You can <strong>use SimpleX with your own servers</strong> and still communicate with people who use the servers preconfigured in the apps.",
+    "simplex-unique-overlay-card-4-p-2": "SimpleX network uses an <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>open protocol</a> and provides <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK to create chat bots</a>, allowing implementation of services that users can interact with via SimpleX Chat apps &mdash; we&apos;re really looking forward to see what SimpleX services you will build.",
+    "simplex-unique-overlay-card-4-p-3": "If you are considering developing for the SimpleX network, for example, the chat bot for SimpleX app users, or the integration of the SimpleX Chat library into your mobile apps, please <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>get in touch</a> for any advice and support.",
+    "simplex-unique-card-1-p-1": "SimpleX protects the privacy of your profile, contacts and metadata, hiding it from SimpleX network servers and any observers.",
+    "simplex-unique-card-1-p-2": "Unlike any other existing messaging network, SimpleX has no identifiers assigned to the users &mdash; <strong>not even random numbers</strong>.",
+    "simplex-unique-card-2-p-1": "Because you have no identifier or fixed address on the SimpleX network, nobody can contact you unless you share a one-time or temporary user address, as a QR code or a link.",
     "simplex-unique-card-3-p-1": "SimpleX stores all user data on client devices in a <strong>portable encrypted database format</strong> &mdash; it can be transferred to another device.",
     "simplex-unique-card-3-p-2": "The end-to-end encrypted messages are held temporarily on SimpleX relay servers until received, then they are permanently deleted.",
-    "simplex-unique-card-4-p-1": "The SimpleX network is fully decentralised and independent of any crypto-currency or any other platform, other than the Internet.",
+    "simplex-unique-card-4-p-1": "The SimpleX network is fully decentralised and independent of any crypto-currency or any other network, other than the Internet.",
     "simplex-unique-card-4-p-2": "You can <strong>use SimpleX with your own servers</strong> or with the servers provided by us &mdash; and still connect to any user.",
     "join": "Join",
     "we-invite-you-to-join-the-conversation": "We invite you to join the conversation",
@@ -149,8 +149,7 @@
     "sign-up-to-receive-our-updates": "Sign up to receive our updates",
     "enter-your-email-address": "Enter your email address",
     "get-simplex": "Get SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Why SimpleX is",
-    "unique": "unique",
+    "why-simplex-is-unique": "Why SimpleX is <span class='gradient-text'>unique</span>",
     "learn-more": "Learn more",
     "more-info": "More info",
     "hide-info": "Hide info",
@@ -172,7 +171,7 @@
     "use-this-command": "Use this command:",
     "see-simplex-chat": "See SimpleX Chat",
     "github-repository": "GitHub repository",
-    "the-instructions--source-code": "the instructions how to download or compile it from the source code.",
+    "the-instructions--source-code": "for the instructions how to download or compile it from the source code.",
     "if-you-already-installed-simplex-chat-for-the-terminal": "If you already installed SimpleX Chat for the terminal",
     "if-you-already-installed": "If you already installed",
     "simplex-chat-for-the-terminal": "SimpleX Chat for the terminal",
@@ -213,7 +212,7 @@
     "comparison-section-list-point-4a": "SimpleX relays cannot compromise e2e encryption. Verify security code to mitigate attack on out-of-band channel",
     "comparison-section-list-point-4": "If operator’s servers are compromised. Verify security code in Signal and some other apps to mitigate it",
     "comparison-section-list-point-5": "Does not protect users' metadata privacy",
-    "comparison-section-list-point-6": "While P2P are distributed, they are not federated - they operate as a single network",
+    "comparison-section-list-point-6": "While P2P are distributed, they are not federated &mdash; they operate as a single network",
     "comparison-section-list-point-7": "P2P networks either have a central authority or the whole network can be compromised",
     "see-here": "see here",
     "guide-dropdown-1": "Quick start",
@@ -226,7 +225,7 @@
     "guide-dropdown-8": "App settings",
     "guide-dropdown-9": "Making connections",
     "guide": "Guide",
-    "docs-dropdown-1": "SimpleX platform",
+    "docs-dropdown-1": "SimpleX network",
     "docs-dropdown-2": "Accessing Android files",
     "docs-dropdown-3": "Accessing chat database",
     "docs-dropdown-4": "Host SMP Server",
diff --git a/website/langs/es.json b/website/langs/es.json
index b88a592ac4..b3cfc83969 100644
--- a/website/langs/es.json
+++ b/website/langs/es.json
@@ -10,7 +10,7 @@
     "simplex-explained-tab-3-p-2": "El usuario puede mejorar aún más la privacidad de sus metadatos haciendo uso de la red Tor para acceder a los servidores, evitando así la correlación por dirección IP.",
     "smp-protocol": "Protocolo SMP",
     "donate": "Donación",
-    "copyright-label": "© 2020-2024 SimpleX | Proyecto de Código Abierto",
+    "copyright-label": "© 2020-2025 SimpleX | Proyecto de Código Abierto",
     "simplex-chat-protocol": "Protocolo de SimpleX Chat",
     "terms-and-privacy-policy": "Política de Privacidad",
     "hero-header": "Privacidad redefinida",
@@ -40,7 +40,7 @@
     "simplex-private-card-7-point-2": "Si se añade, elimina o modifica algún mensaje, el destinatario es avisado.",
     "simplex-private-card-8-point-1": "Los servidores SimpleX actúan como nodos de mezcla de baja latencia &mdash; los mensajes entrantes y salientes siguen un orden diferente.",
     "simplex-private-card-9-point-1": "Cada cola de mensajes transmite los mensajes en un solo sentido, con las distintas direcciones de envío y recepción.",
-    "simplex-explained": "Simplex explicado",
+    "simplex-explained": "SimpleX explicado",
     "simplex-explained-tab-1-p-1": "Puedes crear contactos y grupos, y mantener conversaciones bidireccionales como en cualquier aplicación de mensajería.",
     "simplex-explained-tab-1-p-2": "¿Cómo puede funcionar con colas unidireccionales y sin identificadores de usuario?",
     "simplex-explained-tab-2-p-1": "Por cada conexión se usan dos colas de mensajes separadas para que el envío y recepción se hagan a través de servidores diferentes.",
@@ -122,7 +122,7 @@
     "privacy-matters-overlay-card-3-p-2": "Una de las historias más estremecedoras es la experiencia de <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> descrita en sus memorias y plasmada en la película The Mauritanian. Fue internado en la prisión militar de Guantánamo sin juicio previo, donde fue torturado durante 15 años tras una llamada telefónica a su pariente en Afganistán, bajo sospecha de estar implicado en los atentados del 11-S a pesar de que vivía en Alemania desde hacía 10 años.",
     "privacy-matters-overlay-card-3-p-4": "No basta con usar mensajería cifrada de extremo a extremo, todos deberíamos utilizar las aplicaciones de mensajería que protegen la privacidad de nuestras redes personales y con quién estamos conectados.",
     "privacy-matters-overlay-card-3-p-3": "Personas corrientes son detenidas por lo que comparten en Internet, incluso a través de sus cuentas \"anónimas\" e <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>incluso en países democráticos</a>.",
-    "simplex-unique-overlay-card-1-p-2": "Para enviar mensajes, SimpleX utiliza <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>direcciones anónimas por pares</a> de colas de mensajes unidireccionales, separadas para mensajes recibidos y enviados, y normalmente a través de servidores diferentes. Utilizar SimpleX es como tener <strong>un correo electrónico &ldquo;desechable&rdquo; o un teléfono diferente para cada contacto</strong>, pero sin las complicaciones que implicaría gestionarlos.",
+    "simplex-unique-overlay-card-1-p-2": "Para enviar mensajes, SimpleX utiliza <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>direcciones anónimas por pares</a> de colas de mensajes unidireccionales, separadas para mensajes recibidos y enviados, y normalmente a través de servidores diferentes.",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat almacena todos los datos de usuario únicamente en los dispositivos cliente usando un <strong>formato cifrado y portable de la base de datos</strong>, la cual puede ser exportada y transferida a cualquier dispositivo compatible.",
     "simplex-unique-overlay-card-3-p-3": "A diferencia de los servidores de redes federadas (correo electrónico, XMPP o Matrix), los servidores SimpleX no almacenan cuentas de usuario, sólo retransmiten mensajes, protegiendo así la privacidad de ambas partes.",
     "simplex-unique-overlay-card-4-p-1": "Puede <strong>usar SimpleX con sus propios servidores</strong> y aún así comunicarte con personas conectadas a los servidores preconfigurados y proporcionados por nosotros.",
@@ -138,8 +138,7 @@
     "donate-here-to-help-us": "Para ayudarnos haga una donación aquí",
     "enter-your-email-address": "Escriba su dirección de correo electrónico",
     "get-simplex": "Obtenga SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Por qué SimpleX es",
-    "unique": "único",
+    "why-simplex-is-unique": "Por qué SimpleX es <span class='gradient-text'>único</span>",
     "learn-more": "Descubra más",
     "more-info": "Más información",
     "hide-info": "Ocultar información",
@@ -244,15 +243,17 @@
     "signing-key-fingerprint": "Huella digital de la clave de firma (SHA-256)",
     "releases-to-this-repo-are-done-1-2-days-later": "Las versiones aparecen varios días más tarde en este repositorio",
     "comparison-section-list-point-4a": "Los servidores de retransmisión no pueden comprometer la encriptación e2e. Para evitar posibles ataques, verifique el código de seguridad mediante un canal alternativo",
-    "hero-overlay-3-title": "Evaluación de la seguridad",
+    "hero-overlay-3-title": "Evaluaciones de seguridad",
     "hero-overlay-card-3-p-2": "Trail of Bits revisó la criptografía y los componentes de red de la plataforma SimpleX en noviembre de 2022. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">Más información</a>.",
     "jobs": "Únete al equipo",
-    "hero-overlay-3-textlink": "Evaluación de la seguridad",
+    "hero-overlay-3-textlink": "Evaluaciones de seguridad",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> es una consultora de seguridad y tecnología líder cuyos clientes incluyen grandes tecnológicas, agencias gubernamentales e importantes proyectos de blockchain.",
     "docs-dropdown-9": "Descargas",
     "please-enable-javascript": "Habilita JavaScript para ver el código QR.",
     "please-use-link-in-mobile-app": "Usa el enlace en la apliación móvil",
     "docs-dropdown-10": "Transparencia",
     "docs-dropdown-11": "FAQ",
-    "docs-dropdown-12": "Seguridad"
+    "docs-dropdown-12": "Seguridad",
+    "docs-dropdown-14": "SimpleX para empresas",
+    "hero-overlay-card-3-p-3": "Trail of Bits revisó el diseño criptográfico de los protocolos de red SimpleX en julio de 2024."
 }
diff --git a/website/langs/fi.json b/website/langs/fi.json
index 68c0d4f1b4..460aa7989b 100644
--- a/website/langs/fi.json
+++ b/website/langs/fi.json
@@ -112,7 +112,7 @@
     "simplex-explained-tab-1-p-1": "Voit luoda yhteyshenkilöitä ja ryhmiä sekä käydä kaksisuuntaisia keskusteluja kuten missä tahansa muussa viestisovelluksessa.",
     "simplex-explained-tab-3-p-1": "Palvelimilla on erilliset anonyymit tunnistetiedot kullekin jonolle, eivätkä ne tiedä, mille käyttäjille ne kuuluvat.",
     "donate": "Lahjoita",
-    "copyright-label": "© 2020-2023 SimpleX | Avoin projekti",
+    "copyright-label": "© 2020-2025 SimpleX | Avoin projekti",
     "hero-p-1": "Muissa sovelluksissa on käyttäjätunnuksia: Signal, Matrix, Session, Briar, Jami, Cwtch, jne.<br> SimpleX ei käytä niitä, <strong>ei edes satunnaisia numeroita</strong>.<br> Tämä parantaa yksityisyyttäsi radikaalisti.",
     "simplex-private-1-title": "2 kerrosta päästä päähän salattua viestintää",
     "simplex-private-2-title": "Lisäkerros palvelimen salaukselle",
@@ -168,7 +168,7 @@
     "privacy-matters-overlay-card-3-p-3": "Tavalliset ihmiset pidätetään siitä, mitä he jakavat verkossa, jopa 'anonyymien' tiliensä kautta, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>jopa demokraattisissa maissa</a>.",
     "privacy-matters-overlay-card-3-p-4": "Ei riitä, että käytät päästä päähän salattua viestintäsovellusta, meidän kaikkien pitäisi käyttää viestintäsovelluksia, jotka suojelevat henkilökohtaisten verkostojemme yksityisyyttä &mdash; keiden kanssa olemme yhteydessä.",
     "simplex-unique-overlay-card-1-p-1": "Toisin kuin muut viestintäalustat, SimpleX:llä ei ole <strong>mitään tunnisteita käyttäjille</strong>. Se ei luota puhelinnumeroihin, verkkotunnuksiin perustuviin osoitteisiin (kuten sähköposti tai XMPP), käyttäjänimiin, julkisiin avaimiin tai edes satunnaisiin numeroihin tunnistaakseen käyttäjänsä &mdash; emme tiedä kuinka monta ihmistä käyttää SimpleX-palvelimiamme.",
-    "simplex-unique-overlay-card-1-p-2": "Viestien toimittamiseksi SimpleX käyttää <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>parittaisia nimettömiä osoitteita</a> kaksisuuntaisille viestijonoille, jotka ovat erilliset vastaanotetuille ja lähetetyille viesteille, yleensä eri palvelimien kautta. SimpleX:n käyttö on kuin <strong>eri &ldquo;kertakäyttöinen&rdquo; sähköposti tai puhelin jokaiselle yhteydelle</strong>, eikä sinun tarvitse vaivautua niiden hallitsemiseen.",
+    "simplex-unique-overlay-card-1-p-2": "Viestien toimittamiseksi SimpleX käyttää <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>parittaisia nimettömiä osoitteita</a> kaksisuuntaisille viestijonoille, jotka ovat erilliset vastaanotetuille ja lähetetyille viesteille, yleensä eri palvelimien kautta.",
     "simplex-unique-overlay-card-1-p-3": "Tämä suunnittelu suojaa sitä, kenen kanssa kommunikoit, piilottamalla sen SimpleX-alustan palvelimilta ja kaikilta havainnoijilta. Piilottaaksesi IP-osoitteesi palvelimilta, voit <strong>yhdistää SimpleX-palvelimiin Tor-verkon kautta</strong>.",
     "simplex-unique-overlay-card-2-p-1": "Koska sinulla ei ole tunnistetta SimpleX-alustalla, kukaan ei voi ottaa sinuun yhteyttä, ellei jaa kertakäyttöistä tai väliaikaista käyttäjäosoitetta, kuten QR-koodia tai linkkiä.",
     "simplex-unique-overlay-card-2-p-2": "Jopa valinnaisen käyttäjäosoitteen kanssa, vaikka sitä voitaisiin käyttää roskapostiyhteyspyyntöjen lähettämiseen, voit vaihtaa sen tai poistaa sen kokonaan menettämättä mitään yhteyksiäsi.",
@@ -187,8 +187,7 @@
     "sign-up-to-receive-our-updates": "Tilaa päivityksemme",
     "enter-your-email-address": "Syötä sähköpostiosoitteesi",
     "get-simplex": "Hanki SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Miksi SimpleX on",
-    "unique": "ainutlaatuinen",
+    "why-simplex-is-unique": "Miksi SimpleX on <span class='gradient-text'>ainutlaatuinen</span>",
     "learn-more": "Lue lisää",
     "more-info": "Lisätietoja",
     "contact-hero-subheader": "Skannaa QR-koodi SimpleX Chat -sovelluksella puhelimessasi tai tabletissasi.",
diff --git a/website/langs/fr.json b/website/langs/fr.json
index 61be2c8621..efc8d6c9c6 100644
--- a/website/langs/fr.json
+++ b/website/langs/fr.json
@@ -7,7 +7,7 @@
     "why-simplex": "Pourquoi SimpleX",
     "simplex-privacy": "Confidentialité SimpleX",
     "simplex-network": "Réseau SimpleX",
-    "simplex-explained": "Simplex expliqué",
+    "simplex-explained": "SimpleX expliqué",
     "simplex-explained-tab-1-text": "1. L'expérience des utilisateurs",
     "simplex-explained-tab-2-text": "2. Comment ça marche",
     "simplex-explained-tab-3-text": "3. Ce que voient les serveurs",
@@ -21,7 +21,7 @@
     "smp-protocol": "Protocole SMP",
     "chat-protocol": "Protocole de chat",
     "donate": "Faire un don",
-    "copyright-label": "© 2020-2024 SimpleX | Projet Open-Source",
+    "copyright-label": "© 2020-2025 SimpleX | Projet Open-Source",
     "simplex-chat-protocol": "Protocole SimpleX Chat",
     "terminal-cli": "Terminal CLI",
     "terms-and-privacy-policy": "Politique de confidentialité",
@@ -118,7 +118,7 @@
     "privacy-matters-overlay-card-3-p-3": "Des personnes lambda se font arrêter pour ce qu'elles partagent en ligne, même via leurs comptes \"anonymes\", <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>même dans les pays démocratiques</a>.",
     "privacy-matters-overlay-card-3-p-4": "Il ne suffit pas d'utiliser une messagerie chiffrée de bout en bout, nous devrions tous utiliser des messageries qui protègent la vie privée de nos réseaux personnels &mdash; les personnes avec lesquelles nous sommes connectés.",
     "simplex-unique-overlay-card-1-p-1": "Contrairement aux autres plateformes de messagerie, SimpleX <strong>n'a pas d'identifiant attribué aux utilisateurs</strong>. Il ne s'appuie pas sur des numéros de téléphone, des adresses basées sur des domaines (comme l'e-mail ou XMPP), des noms d'utilisateur, des clés publiques ou même des nombres aléatoires pour identifier ses utilisateurs &mdash; nous ne savons pas combien de personnes utilisent nos serveurs SimpleX.",
-    "simplex-unique-overlay-card-1-p-2": "Pour envoyer des messages, SimpleX utilise des <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>adresses anonymes par paires</a > de files d'attente de messages unidirectionnelles, séparées pour les messages reçus et envoyés, généralement via des serveurs différents. Utiliser SimpleX, c'est comme avoir <strong>un e-mail ou un téléphone jetable différent pour chaque contact</strong>, sans aucune difficulté pour les gérer.",
+    "simplex-unique-overlay-card-1-p-2": "Pour envoyer des messages, SimpleX utilise des <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>adresses anonymes par paires</a > de files d'attente de messages unidirectionnelles, séparées pour les messages reçus et envoyés, généralement via des serveurs différents.",
     "simplex-unique-overlay-card-1-p-3": "Cette approche protège la confidentialité des personnes avec lesquelles vous communiquez, en la cachant des serveurs de la plateforme SimpleX et de tout observateur. Pour cacher votre adresse IP aux serveurs, vous pouvez <strong>vous connecter aux serveurs SimpleX via Tor</strong>.",
     "simplex-unique-overlay-card-2-p-1": "Parce que vous n'avez pas d'identifiant sur la plateforme SimpleX, personne ne peut vous contacter sauf si vous partagez une adresse d'utilisateur unique ou temporaire, sous forme de code QR ou de lien .",
     "simplex-unique-overlay-card-2-p-2": "Même avec l'adresse utilisateur facultative, bien qu'elle puisse être utilisée pour envoyer des demandes de contact de spam, vous pouvez la modifier ou la supprimer complètement sans perdre aucune de vos connexions.",
@@ -144,8 +144,7 @@
     "sign-up-to-receive-our-updates": "Inscrivez-vous pour recevoir nos mises à jour",
     "enter-your-email-address": "Entrez votre adresse e-mail",
     "get-simplex": "Obtenir SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Pourquoi SimpleX est",
-    "unique": "unique",
+    "why-simplex-is-unique": "Pourquoi SimpleX est <span class='gradient-text'>unique</span>",
     "learn-more": "En savoir plus",
     "more-info": "Plus d'infos",
     "hide-info": "Masquer les infos",
@@ -245,15 +244,17 @@
     "f-droid-org-repo": "Dépot F-Droid.org",
     "stable-versions-built-by-f-droid-org": "Versions stables créées par F-Droid.org",
     "comparison-section-list-point-4a": "Les relais SimpleX ne peuvent pas compromettre le chiffrement e2e. Vérifier le code de sécurité pour limiter les attaques sur le canal hors bande",
-    "hero-overlay-3-title": "Évaluation de sécurité",
+    "hero-overlay-3-title": "Évaluation de la sécurité",
     "hero-overlay-card-3-p-2": "Trail of Bits a examiné les composants cryptographiques et réseau de la plateforme SimpleX en novembre 2022. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">En savoir plus</a>.",
     "jobs": "Rejoignez notre équipe",
-    "hero-overlay-3-textlink": "Évaluation de sécurité",
+    "hero-overlay-3-textlink": "Évaluations de la sécurité",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> est un cabinet leader dans le secteur de la sécurité et des technologies qui compte parmi ses clients des grandes entreprises de la tech, des agences gouvernementales et d'importants projets de blockchain.",
     "docs-dropdown-9": "Téléchargements",
     "please-enable-javascript": "Veuillez activer JavaScript pour voir le code QR.",
     "please-use-link-in-mobile-app": "Veuillez utiliser le lien dans l'application mobile",
     "docs-dropdown-10": "Transparence",
     "docs-dropdown-12": "Sécurité",
-    "docs-dropdown-11": "FAQ"
+    "docs-dropdown-11": "FAQ",
+    "hero-overlay-card-3-p-3": "Trail of Bits a examiné la conception cryptographique des protocoles réseau SimpleX en juillet 2024.",
+    "docs-dropdown-14": "SimpleX pour les entreprises"
 }
diff --git a/website/langs/he.json b/website/langs/he.json
index 4fd966f05d..4a61999896 100644
--- a/website/langs/he.json
+++ b/website/langs/he.json
@@ -53,7 +53,7 @@
     "smp-protocol": "פרוטוקול SMP",
     "chat-protocol": "פרוטוקול צ'אט",
     "donate": "תרומה",
-    "copyright-label": "© 2020-2024 SimpleX | פרויקט קוד פתוח",
+    "copyright-label": "© 2020-2025 SimpleX | פרויקט קוד פתוח",
     "hero-p-1": "לאפליקציות אחרות יש מזהי משתמש: Signal, Matrix, Session, Briar, Jami, Cwtch וכו'.<br> ל-SimpleX אין, <strong>אפילו לא מספרים אקראיים</strong>.<br> זה משפר באופן קיצוני את הפרטיות שלך.",
     "hero-overlay-2-title": "מדוע מזהי משתמש מזיקים לפרטיות?",
     "feature-6-title": "שיחות שמע ווידאו<br>מוצפנות מקצה לקצה",
@@ -75,12 +75,12 @@
     "privacy-matters-2-overlay-1-linkText": "פרטיות מעניקה לכם עוצמה",
     "privacy-matters-3-overlay-1-linkText": "פרטיות מגנה על החופש שלכם",
     "simplex-explained-tab-1-p-1": "אתם יכולים ליצור אנשי קשר וקבוצות, ולנהל שיחות דו-כיווניות, כמו בכל תוכנה אחרת לשליחת הודעות.",
-    "hero-overlay-3-title": "הערכת אבטחה",
+    "hero-overlay-3-title": "הערכות אבטחה",
     "simplex-unique-1-overlay-1-title": "פרטיות מלאה של הזהות, הפרופיל, אנשי הקשר והמטא נתונים שלך",
     "simplex-unique-3-overlay-1-title": "בעלות, שליטה ואבטחה של הנתונים שלך",
     "simplex-unique-2-overlay-1-title": "ההגנה הטובה ביותר מפני ספאם וניצול לרעה",
     "simplex-unique-3-title": "אתה שולט בנתונים שלך",
-    "hero-overlay-3-textlink": "הערכת אבטחה",
+    "hero-overlay-3-textlink": "הערכות אבטחה",
     "simplex-unique-4-overlay-1-title": "מבוזר לחלוטין &mdash; המשתמשים הם הבעלים של רשת SimpleX",
     "simplex-unique-2-title": "אתה מוגן<br>מפני ספאם וניצול לרעה",
     "simplex-unique-4-title": "רשת SimpleX בבעלותך",
@@ -163,10 +163,9 @@
     "simplex-unique-overlay-card-3-p-2": "ההודעות המוצפנות מקצה לקצה מוחזקות באופן זמני בשרתי ממסר של SimpleX עד שמתקבלות, ואז הן נמחקות לצמיתות.",
     "simplex-unique-overlay-card-4-p-2": "פלטפורמת SimpleX משתמשת ב<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>פרוטוקול פתוח</a> ומספקת <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK ליצירת צ'אט בוטים</a>, המאפשר הטמעה של שירותים שמשתמשים יכולים לתקשר איתם באמצעות אפליקציות SimpleX Chat &mdash; אנחנו ממש מצפים לראות אילו שירותי SimpleX אתם יכולים לבנות.",
     "contact-hero-p-2": "עדיין לא הורדתם את ה-SimpleX Chat?",
-    "why-simplex-is": "מדוע SimpleX הוא",
+    "why-simplex-is-unique": "מדוע SimpleX הוא <span class='gradient-text'>ייחודי</span>",
     "simplex-network-section-header": "<span class='gradient-text'>רשת</span> SimpleX",
     "tap-the-connect-button-in-the-app": "הקישו על הלחצן <span class='text-active-blue'>'התחבר'</span> באפליקציה",
-    "unique": "ייחודי",
     "simplex-network-1-overlay-linktext": "בעיות של רשתות P2P",
     "protocol-2-text": "XMPP, Matrix",
     "simplex-network-overlay-card-1-li-4": "יישומי P2P יכולים להיחסם על ידי ספקי אינטרנט מסוימים (כמו <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX הוא אגנוסטי לתעבורה - הוא יכול לעבוד על פרוטוקולי אינטרנט סטנדרטיים, למשל WebSockets.",
@@ -254,5 +253,7 @@
     "please-use-link-in-mobile-app": "אנא השתמש בקישור באפליקציה במכשיר נייד",
     "docs-dropdown-10": "שקיפות",
     "docs-dropdown-11": "שאלות ותשובות",
-    "docs-dropdown-12": "אבטחה"
+    "docs-dropdown-12": "אבטחה",
+    "hero-overlay-card-3-p-3": "Trail of bits סקר את הקוד הקריפטוגרפי של פרוטוקולי רשת SimpleX ביולי 2024. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">קרא עוד</a>.",
+    "docs-dropdown-14": "SimpleX לעסקים"
 }
diff --git a/website/langs/hu.json b/website/langs/hu.json
index 7702b56f47..f512cfa7cf 100644
--- a/website/langs/hu.json
+++ b/website/langs/hu.json
@@ -1,37 +1,37 @@
 {
     "home": "Kezdőoldal",
     "developers": "Fejlesztők",
-    "reference": "Referencia",
+    "reference": "Hivatkozás",
     "blog": "Blog",
     "features": "Funkciók",
     "why-simplex": "Miért válassza a SimpleXet",
-    "simplex-privacy": "SimpleX-adatvédelem",
-    "simplex-network": "SimpleX-hálózat",
-    "simplex-explained": "A Simplex bemutatása",
+    "simplex-privacy": "A SimpleX adatvédelme",
+    "simplex-network": "A SimpleX-hálózat",
+    "simplex-explained": "A SimpleX bemutatása",
     "simplex-explained-tab-1-text": "1. Felhasználói élmény",
     "simplex-explained-tab-2-text": "2. Hogyan működik",
     "simplex-explained-tab-3-text": "3. Mit látnak a kiszolgálók",
-    "simplex-explained-tab-1-p-1": "Létrehozhat kapcsolatokat és csoportokat, valamint kétirányú beszélgetéseket folytathat, ugyanúgy mint bármely más üzenetküldőben.",
-    "simplex-explained-tab-1-p-2": "Hogyan működhet egyirányú üzenet sorbaállítással és felhasználói profil-azonosítók nélkül?",
+    "simplex-explained-tab-1-p-1": "Létrehozhat kapcsolatokat és csoportokat, valamint kétirányú beszélgetéseket folytathat, ugyanúgy mint bármely más üzenetváltó-alkalmazásban.",
+    "simplex-explained-tab-1-p-2": "Hogyan működhet egyirányú üzenet-sorballítással és felhasználói profilazonosítók nélkül?",
     "simplex-explained-tab-2-p-1": "Minden kapcsolathoz két különböző üzenetküldési sorbaállítást használ a különböző kiszolgálókon keresztül történő üzenetküldéshez és -fogadáshoz.",
-    "simplex-explained-tab-2-p-2": "A kiszolgálók csak egyirányú üzeneteket továbbítanak, anélkül, hogy teljes képet kapnának a felhasználók beszélgetéseiről vagy kapcsolatairól.",
+    "simplex-explained-tab-2-p-2": "A kiszolgálók csak egyetlen irányba továbbítják az üzeneteket, anélkül, hogy teljes képet kapnának a felhasználók beszélgetéseiről vagy kapcsolatairól.",
     "simplex-explained-tab-3-p-1": "A kiszolgálók minden egyes üzenetsorbaállításhoz külön névtelen hitelesítő-adatokkal rendelkeznek, és nem tudják, hogy melyik felhasználóhoz tartoznak.",
-    "simplex-explained-tab-3-p-2": "A felhasználók tovább fokozhatják a metaadatok adatvédelmét, ha a Tor segítségével férnek hozzá a kiszolgálókhoz, így megakadályozva az IP-cím szerinti korrelációt.",
+    "simplex-explained-tab-3-p-2": "A felhasználók tovább fokozhatják a metaadatok adatvédelmét, ha a Tor-hálózat használatával férnek hozzá a kiszolgálókhoz, így megakadályozva az IP-cím szerinti korrelációt.",
     "smp-protocol": "SMP-protokoll",
-    "chat-protocol": "Csevegésprotokoll",
-    "donate": "Támogatás",
-    "copyright-label": "© 2020-2024 SimpleX | Nyílt forráskódú projekt",
-    "simplex-chat-protocol": "SimpleX Chat-protokoll",
+    "chat-protocol": "Csevegési protokoll",
+    "donate": "Adományozás",
+    "copyright-label": "© 2020-2025 SimpleX | Nyílt forráskódú projekt",
+    "simplex-chat-protocol": "A SimpleX Chat-protokoll",
     "terminal-cli": "Terminál CLI",
     "terms-and-privacy-policy": "Adatvédelmi irányelvek",
-    "hero-header": "Újradefiniált adatvédelem",
-    "hero-subheader": "Az első üzenetküldő<br>felhasználói azonosítók nélkül",
-    "hero-p-1": "Más alkalmazások felhasználói azonosítókkal rendelkeznek: Signal, Matrix, Session, Briar, Jami, Cwtch, stb.<br> A SimpleX nem, <strong>még véletlenszerű számokkal sem</strong>.<br> Ez radikálisan javítja az adatvédelmet.",
+    "hero-header": "Újraértelmezett adatvédelem",
+    "hero-subheader": "Az első üzenetváltó-alkalmazás<br>felhasználói azonosítók nélkül",
+    "hero-p-1": "Más alkalmazások felhasználói azonosítókkal rendelkeznek: Signal, Matrix, Session, Briar, Jami, Cwtch, stb.<br> A SimpleX azonban nem, <strong>még véletlenszerű számokkal sem</strong>.<br> Ez radikálisan javítja az adatvédelmet.",
     "hero-overlay-1-textlink": "Miért ártanak a felhasználói azonosítók az adatvédelemnek?",
     "hero-overlay-2-textlink": "Hogyan működik a SimpleX?",
     "hero-overlay-3-textlink": "Biztonsági felmérések",
     "hero-2-header": "Privát kapcsolat létrehozása",
-    "hero-2-header-desc": "A videó bemutatja, hogyan kapcsolódhat az ismerőséhez egy egyszer használható QR-kód segítségével, személyesen vagy videokapcsolaton keresztül. Ugyanakkor egy meghívó-hivatkozás megosztásával is kapcsolódhat.",
+    "hero-2-header-desc": "A videó bemutatja, hogyan kapcsolódhat a partneréhez egy egyszer használható QR-kód segítségével, személyesen vagy videóhíváson keresztül. Ugyanakkor egy meghívási hivatkozás megosztásával is kapcsolódhat.",
     "hero-overlay-1-title": "Hogyan működik a SimpleX?",
     "hero-overlay-2-title": "Miért ártanak a felhasználói azonosítók az adatvédelemnek?",
     "hero-overlay-3-title": "Biztonsági felmérések",
@@ -40,33 +40,33 @@
     "feature-3-title": "E2E-titkosított decentralizált csoportok &mdash; csak a felhasználók tudják, hogy ezek léteznek",
     "feature-4-title": "E2E-titkosított hangüzenetek",
     "feature-5-title": "Eltűnő üzenetek",
-    "feature-6-title": "E2E-titkosított<br>hang- és videohívások",
+    "feature-6-title": "E2E-titkosított<br>hang- és videóhívások",
     "feature-7-title": "Hordozható titkosított alkalmazás-adattárolás &mdash; profil átköltöztetése egy másik eszközre",
     "feature-8-title": "Az inkognitómód &mdash;<br>egyedülálló a SimpleX Chatben",
-    "simplex-network-overlay-1-title": "Összehasonlítás más P2P üzenetküldő protokollokkal",
+    "simplex-network-overlay-1-title": "Összehasonlítás más P2P-üzenetküldő protokollokkal",
     "simplex-private-1-title": "2 rétegű végpontok közötti titkosítás",
     "simplex-private-2-title": "További rétege a<br>kiszolgáló-titkosítás",
-    "simplex-private-4-title": "Nem kötelező<br>hozzáférés Tor-on keresztül",
-    "simplex-private-5-title": "Több rétegű<br>tartalom kitöltés",
+    "simplex-private-4-title": "Hozzáférés Tor-hálózaton keresztül<br>(nem kötelező)",
+    "simplex-private-5-title": "Több rétegű<br>tartalomkitöltés",
     "simplex-private-6-title": "Sávon kívüli<br>kulcscsere",
     "simplex-private-7-title": "Üzenetintegritás<br>hitelesítés",
     "simplex-private-8-title": "Üzenetek keverése<br>a korreláció csökkentése érdekében",
     "simplex-private-9-title": "Egyirányú<br>üzenetsorbaállítás",
     "simplex-private-10-title": "Ideiglenes, névtelen, páronkénti azonosítók",
     "simplex-private-card-1-point-1": "Double-Ratchet-protokoll &mdash;<br>OTR-üzenetküldés, sérülés utáni titkosság-védelemmel és -helyreállítással.",
-    "simplex-private-card-1-point-2": "NaCL cryptobox minden egyes üzenet sorbaállításához, hogy megakadályozza a forgalom korrelációját az üzenet-sorbaállítások között, ha a TLS veszélybe kerül.",
+    "simplex-private-card-1-point-2": "NaCL cryptobox minden egyes üzenet sorbaállításához, hogy megakadályozza a forgalom korrelációját az üzenetsorbaállítások között, ha a TLS veszélybe kerül.",
     "simplex-private-card-2-point-1": "Kiegészítő kiszolgáló titkosítási réteg a címzettnek történő kézbesítéshez, hogy megakadályozza a fogadott és az elküldött kiszolgálóforgalom közötti korrelációt, ha a TLS veszélybe kerül.",
     "simplex-private-card-3-point-1": "A kliens és a kiszolgálók közötti kapcsolatokhoz csak az erős algoritmusokkal rendelkező TLS 1.2/1.3 protokollt használja.",
     "simplex-private-card-3-point-2": "A kiszolgáló ujjlenyomata és a csatornakötés megakadályozza a MITM- és a visszajátszási támadásokat.",
     "simplex-private-card-3-point-3": "Az újrakapcsolódás le van tiltva a munkamenet elleni támadások megelőzése érdekében.",
-    "simplex-private-card-4-point-1": "Az IP-címe védelme érdekében a kiszolgálókat a TORon vagy más átvitel-átfedő-hálózaton keresztül is elérheti.",
-    "simplex-private-card-6-point-1": "Számos kommunikációs platform sebezhető a kiszolgálók vagy a hálózat-szolgáltatók MITM-támadásaival szemben.",
+    "simplex-private-card-4-point-1": "Az IP-címe védelme érdekében a kiszolgálókat a Tor-hálózaton vagy más átvitelátfedő hálózaton keresztül is elérheti.",
+    "simplex-private-card-6-point-1": "Számos kommunikációs hálózat sebezhető a kiszolgálók vagy a hálózat-szolgáltatók MITM-támadásaival szemben.",
     "simplex-private-card-6-point-2": "Ennek megakadályozása érdekében a SimpleX-alkalmazások egyszeri kulcsokat adnak át sávon kívül, amikor egy címet hivatkozásként vagy QR-kódként oszt meg.",
     "simplex-private-card-7-point-1": "Az integritás garantálása érdekében az üzenetek sorszámozással vannak ellátva, és tartalmazzák az előző üzenet hasítóértékét.",
     "simplex-private-card-7-point-2": "Ha bármilyen üzenetet hozzáadnak, eltávolítanak vagy módosítanak, a címzett értesítést kap róla.",
     "simplex-private-card-8-point-1": "A SimpleX-kiszolgálók alacsony késleltetésű keverési csomópontokként működnek &mdash; a bejövő és kimenő üzenetek sorrendje eltérő.",
     "simplex-private-card-9-point-1": "Minden üzenetsorbaállítás egy irányba továbbítja az üzeneteket, a különböző küldési és vételi címekkel.",
-    "simplex-private-card-9-point-2": "A hagyományos üzenetküldőkhöz képest csökkenti a támadási vektorokat és a rendelkezésre álló metaadatokat.",
+    "simplex-private-card-9-point-2": "Kevesebb támadási felülettel rendelkezik, mint a hagyományos üzenetváltó alkalmazások, és kevesebb metaadatot tesz elérhetővé.",
     "simplex-private-card-10-point-1": "A SimpleX ideiglenes, névtelen, páros címeket és hitelesítő adatokat használ minden egyes felhasználói kapcsolathoz vagy csoporttaghoz.",
     "simplex-private-card-10-point-2": "Lehetővé teszi az üzenetek felhasználói profilazonosítók nélküli kézbesítését, ami az alternatíváknál jobb metaadat-védelmet biztosít.",
     "privacy-matters-1-overlay-1-title": "Az adatvédelemmel pénzt spórol meg",
@@ -79,23 +79,23 @@
     "privacy-matters-3-overlay-1-linkText": "Az adatvédelem szabaddá tesz",
     "simplex-unique-1-title": "Teljes magánéletet élvezhet",
     "simplex-unique-1-overlay-1-title": "Személyazonosságának, profiljának, kapcsolatainak és metaadatainak teljes körű védelme",
-    "simplex-unique-2-title": "Véd<br>a kéretlen üzenetektől és a visszaélésektől",
-    "simplex-unique-2-overlay-1-title": "A legjobb védelem a kéretlen üzenetek és a visszaélések ellen",
+    "simplex-unique-2-title": "Véd<br>a kéretlen tartalmaktól és a visszaélésektől",
+    "simplex-unique-2-overlay-1-title": "A legjobb védelem a kéretlen tartalmak és a visszaélések ellen",
     "simplex-unique-3-title": "Ön kezeli az adatait",
     "simplex-unique-3-overlay-1-title": "Az adatok biztonsága és kezelése az Ön kezében van",
     "simplex-unique-4-title": "Öné a SimpleX-hálózat",
     "simplex-unique-4-overlay-1-title": "Teljesen decentralizált &mdash; a SimpleX-hálózat a felhasználóké",
     "hero-overlay-card-1-p-1": "Sok felhasználó kérdezte: <em>ha a SimpleXnek nincsenek felhasználói azonosítói, honnan tudja, hogy hová kell eljuttatni az üzeneteket?</em>",
-    "hero-overlay-card-1-p-2": "Az üzenetek kézbesítéséhez az összes többi platform által használt felhasználói azonosítók helyett a SimpleX az üzenetek sorbaállításához ideiglenes, névtelen, páros azonosítókat használ, külön-külön minden egyes kapcsolathoz &mdash; nincsenek hosszú távú azonosítók.",
-    "hero-overlay-card-1-p-4": "Ez a kialakítás megakadályozza a felhasználók metaadatainak kiszivárgását az alkalmazás szintjén. Az adatvédelem további javítása és az IP-cím védelme érdekében az üzenetküldő kiszolgálókhoz TOR hálózaton keresztül is kapcsolódhat.",
+    "hero-overlay-card-1-p-2": "Az üzenetek kézbesítéséhez az összes többi hálózat által használt felhasználói azonosítók helyett a SimpleX az üzenetek sorbaállításához ideiglenes, névtelen, páros azonosítókat használ, külön-külön minden egyes kapcsolathoz &mdash; nincsenek hosszú távú azonosítók.",
+    "hero-overlay-card-1-p-4": "Ez a kialakítás megakadályozza a felhasználók metaadatainak kiszivárgását az alkalmazás szintjén. Az adatvédelem további javítása és az IP-cím védelme érdekében az üzenetküldő kiszolgálókhoz Tor-hálózaton keresztül is kapcsolódhat.",
     "hero-overlay-card-1-p-5": "Csak a kliensek tárolják a felhasználói profilokat, kapcsolatokat és csoportokat; az üzenetek küldése 2 rétegű végpontok közötti titkosítással történik.",
     "hero-overlay-card-1-p-6": "További leírást a <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>SimpleX ismertetőben</a> olvashat.",
     "hero-overlay-card-2-p-1": "Ha a felhasználók állandó azonosítóval rendelkeznek, még akkor is, ha ez csak egy véletlenszerű szám, például egy munkamenet-azonosító, fennáll annak a veszélye, hogy a szolgáltató vagy egy támadó megfigyelheti, azt hogy hogyan kapcsolódnak a felhasználók egymáshoz, és hány üzenetet küldenek egymásnak.",
     "hero-overlay-card-2-p-2": "Ezt az információt aztán összefüggésbe hozhatják a meglévő nyilvános közösségi hálózatokkal, és meghatározhatnak néhány valódi személyazonosságot.",
-    "hero-overlay-card-2-p-3": "Még a TOR v3 szolgáltatásokat használó, legprivátabb alkalmazások esetében is, ha két különböző kapcsolattartóval beszél ugyanazon a profilon keresztül, bizonyítani tudják, hogy ugyanahhoz a személyhez kapcsolódnak.",
+    "hero-overlay-card-2-p-3": "Még a Tor v3 szolgáltatásokat használó, legprivátabb alkalmazások esetében is, ha két különböző kapcsolattartóval beszél ugyanazon a profilon keresztül, bizonyítani tudják, hogy ugyanahhoz a személyhez kapcsolódnak.",
     "hero-overlay-card-2-p-4": "A SimpleX úgy védekezik ezen támadások ellen, hogy nem tartalmaz felhasználói azonosítókat. Ha pedig használja az inkognitómódot, akkor minden egyes létrejött kapcsolatban más-más felhasználó név jelenik meg, így elkerülhető a közöttük lévő összefüggések teljes bizonyítása.",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> egy vezető biztonsági és technológiai tanácsadó cég, amelynek az ügyfelei közé tartoznak nagy technológiai cégek, kormányzati ügynökségek és jelentős blokklánc projektek.",
-    "hero-overlay-card-3-p-2": "A Trail of Bits 2022 novemberében áttekintette a SimpleX-platform kriptográfiai és hálózati komponenseit. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">További információk</a>.",
+    "hero-overlay-card-3-p-2": "A Trail of Bits 2022 novemberében auditálta a SimpleX-platform kriptográfiai és hálózati komponenseit. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">További információk</a>.",
     "simplex-network-overlay-card-1-li-1": "A P2P-hálózatok az üzenetek továbbítására a <a href='https://en.wikipedia.org/wiki/Distributed_hash_table'>DHT</a> valamelyik változatát használják. A DHT kialakításakor egyensúlyt kell teremteni a kézbesítési garancia és a késleltetés között. A SimpleX jobb kézbesítési garanciával és alacsonyabb késleltetéssel rendelkezik, mint a P2P, mivel az üzenet redundánsan, a címzett által kiválasztott kiszolgálók segítségével több kiszolgálón keresztül párhuzamosan továbbítható. A P2P-hálózatokban az üzenet <em>O(log N)</em> csomóponton halad át szekvenciálisan, az algoritmus által kiválasztott csomópontok segítségével.",
     "simplex-network-overlay-card-1-li-2": "A SimpleX kialakítása a legtöbb P2P-hálózattól eltérően nem rendelkezik semmiféle globális felhasználói azonosítóval, még ideiglenessel sem, és csak az üzenetekhez használ ideiglenes, páros azonosítókat, ami jobb névtelenséget és metaadatvédelmet biztosít.",
     "simplex-network-overlay-card-1-li-3": "A P2P nem oldja meg a <a href='https://en.wikipedia.org/wiki/Man-in-the-middle_attack'>MITM-támadás</a> problémát, és a legtöbb létező implementáció nem használ sávon kívüli üzeneteket a kezdeti kulcscseréhez. A SimpleX a kezdeti kulcscseréhez sávon kívüli üzeneteket, vagy bizonyos esetekben már meglévő biztonságos és megbízható kapcsolatokat használ.",
@@ -104,81 +104,80 @@
     "privacy-matters-overlay-card-1-p-1": "Sok nagyvállalat arra használja fel az önnel kapcsolatban álló személyek adatait, hogy megbecsülje az ön jövedelmét, hogy olyan termékeket adjon el önnek, amelyekre valójában nincs is szüksége, és hogy meghatározza az árakat.",
     "privacy-matters-overlay-card-1-p-2": "Az online kiskereskedők tudják, hogy az alacsonyabb jövedelműek nagyobb valószínűséggel vásárolnak azonnal, ezért magasabb árakat számíthatnak fel, vagy eltörölhetik a kedvezményeket.",
     "privacy-matters-overlay-card-1-p-3": "Egyes pénzügyi és biztosítótársaságok szociális grafikonokat használnak a kamatlábak és a díjak meghatározásához. Ez gyakran arra készteti az alacsonyabb jövedelmű embereket, hogy többet fizessenek &mdash; ez az úgynevezett <a href='https://fairbydesign.com/povertypremium/' target='_blank'>„szegénységi prémium”</a>.",
-    "privacy-matters-overlay-card-1-p-4": "A SimpleX-platform minden alternatívánál jobban védi a kapcsolatainak adatait, teljes mértékben megakadályozva, hogy a ismeretségi-hálója bármilyen vállalat vagy szervezet számára elérhetővé váljon. Még ha az emberek a SimpleX Chat által biztosított kiszolgálókat is használják, sem a felhasználók számát, sem a kapcsolataikat nem ismerjük.",
+    "privacy-matters-overlay-card-1-p-4": "A SimpleX-hálózat minden alternatívánál jobban védi a kapcsolatainak adatait, teljes mértékben megakadályozva, hogy az ismeretségi-hálója bármilyen vállalat vagy szervezet számára elérhetővé váljon. Még ha az emberek a SimpleX Chat által előre beállított kiszolgálókat is használják, sem az alkalmazások, sem a kiszolgálók üzemeltetői nem ismerik, sem felhasználók számát, sem a kapcsolataikat.",
     "privacy-matters-overlay-card-2-p-1": "Nem is olyan régen megfigyelhettük, hogy a nagy választásokat manipulálta egy <a href='https://en.wikipedia.org/wiki/Facebook-Cambridge_Analytica_data_scandal' target='_blank'>neves tanácsadó cég</a>, amely az ismeretségi-háló segítségével eltorzította a valós világról alkotott képünket, és manipulálta a szavazatainkat.",
-    "privacy-matters-overlay-card-2-p-2": "Ahhoz, hogy objektív legyen és független döntéseket tudjon hozni, az információs terét is kézben kell tartania. Ez csak akkor lehetséges, ha privát kommunikációs platformot használ, amely nem fér hozzá az ismeretségi-hálójához.",
-    "privacy-matters-overlay-card-2-p-3": "A SimpleX az első olyan platform, amely eleve nem rendelkezik felhasználói azonosítókkal, így jobban védi az ismeretségi-hálóját, mint bármely ismert alternatíva.",
+    "privacy-matters-overlay-card-2-p-2": "Ahhoz, hogy objektív legyen és független döntéseket tudjon hozni, az információs terét is kézben kell tartania. Ez csak akkor lehetséges, ha privát kommunikációs hálózatot használ, amely nem fér hozzá az ismeretségi-hálójához.",
+    "privacy-matters-overlay-card-2-p-3": "A SimpleX az első olyan hálózat, amely eleve nem rendelkezik felhasználói azonosítókkal, így jobban védi az ismeretségi-hálóját, mint bármely ismert alternatíva.",
     "privacy-matters-overlay-card-3-p-1": "Mindenkinek törődnie kell a magánélet és a kommunikáció biztonságával &mdash; az ártalmatlan beszélgetések veszélybe sodorhatják, még akkor is, ha nincs semmi rejtegetnivalója.",
     "privacy-matters-overlay-card-3-p-2": "Az egyik legmegdöbbentőbb a <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> memoárjában leírt és az „A mauritániai” c. filmben bemutatott történet. Őt bírósági tárgyalás nélkül a guantánamói táborba zárták, és ott kínozták 15 éven át, miután egy afganisztáni rokonát telefonon felhívta, akit azzal gyanúsítottak a hatóságok, hogy köze van a 9/11-es merényletekhez, holott Salahi az előző 10 évben Németországban élt.",
     "privacy-matters-overlay-card-3-p-3": "Átlagos embereket letartóztatnak azért, amit online megosztanak, még „névtelen” fiókjaikon keresztül is, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>még demokratikus országokban is</a>.",
-    "privacy-matters-overlay-card-3-p-4": "Nem elég, ha csak egy végpontok között titkosított üzenetküldőt használunk, mindannyiunknak olyan üzenetküldőket kell használnunk, amelyek védik személyes ismerőseink magánéletét &mdash; akikkel kapcsolatban állunk.",
-    "simplex-unique-overlay-card-1-p-1": "Más üzenetküldő platformoktól eltérően a SimpleX <strong>nem rendel azonosítókat a felhasználókhoz</strong>. Nem támaszkodik telefonszámokra, tartomány-alapú címekre (mint az e-mail, XMPP vagy a Matrix), felhasználónevekre, nyilvános kulcsokra vagy akár véletlenszerű számokra a felhasználók azonosításához &mdash; nem tudjuk, hogy hányan használják a SimpleX-kiszolgálóinkat.",
-    "simplex-unique-overlay-card-1-p-2": "Az üzenetek kézbesítéséhez a SimpleX az egyirányú üzenet várakoztatást használ <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>páronkénti névtelen címekkel</a>, külön a fogadott és külön az elküldött üzenetek számára, általában különböző kiszolgálókon keresztül. A SimpleX használata olyan, mintha minden egyes kapcsolatnak <strong>más-más &ldquo;eldobható&rdquo; e-mail címe vagy telefonja lenne</strong> és nem kell ezeket gondosan kezelni.",
-    "simplex-unique-overlay-card-1-p-3": "Ez a kialakítás megvédi annak titkosságát, hogy kivel kommunikál, elrejtve azt a SimpleX platform kiszolgálói és a megfigyelők elől. IP-címének a kiszolgálók elől való elrejtéséhez azt teheti meg, hogy <strong> Toron keresztül kapcsolódik a SimpleX-kiszolgálókhoz</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "Mivel ön nem rendelkezik azonosítóval a SimpleX-platformon, senki sem tud kapcsolatba lépni önnel, hacsak nem oszt meg egy egyszeri vagy ideiglenes felhasználói címet, például QR-kódot vagy hivatkozást.",
-    "simplex-unique-overlay-card-2-p-2": "Még a nem kötelező felhasználói cím esetében is, bár spam kapcsolatfelvételi kérések küldésére használható, megváltoztathatja vagy teljesen törölheti azt anélkül, hogy elveszítené a meglévő kapcsolatait.",
+    "privacy-matters-overlay-card-3-p-4": "Nem elég csak egy végpontok között titkosított üzenetváltó-alkalmazást használnunk, mindannyiunknak olyan üzenetváltó-alkalmazásokat kell használnunk, amelyek védik a személyes partnereink magánéletét &mdash; akikkel kapcsolatban állunk.",
+    "simplex-unique-overlay-card-1-p-1": "Más üzenetküldő hálózatoktól eltérően a SimpleX <strong>nem rendel azonosítókat a felhasználókhoz</strong>. Nem támaszkodik telefonszámokra, tartomány-alapú címekre (mint az e-mail, XMPP vagy a Matrix), felhasználónevekre, nyilvános kulcsokra vagy akár véletlenszerű számokra a felhasználók azonosításához &mdash; a SimpleX-kiszolgálók üzemeltetői nem tudják, hogy hányan használják a kiszolgálóikat.",
+    "simplex-unique-overlay-card-1-p-2": "Az üzenetek kézbesítéséhez a SimpleX az egyirányú üzenet várakoztatást használ <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>páronkénti névtelen címekkel</a>, külön a fogadott és külön az elküldött üzenetek számára, általában különböző kiszolgálókon keresztül.",
+    "simplex-unique-overlay-card-1-p-3": "Ez a kialakítás védi partnerének adatait, elrejtve azt a SimpleX-hálózat kiszolgálói és a külső megfigyelők elől. Az IP-címe elrejtésének érdekében a<strong>Tor-hálózaton keresztül is kapcsolódhat a SimpleX-kiszolgálókhoz</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "Mivel ön nem rendelkezik azonosítóval a SimpleX-hálózaton, senki sem tud kapcsolatba lépni önnel, hacsak nem oszt meg egy egyszeri vagy ideiglenes felhasználói címet, például QR-kódot vagy hivatkozást.",
+    "simplex-unique-overlay-card-2-p-2": "Még a felhasználói cím használata esetén is, aminek használata nem kötelező – ugyanakkor ez a kéretlen kapcsolatkérelmek küldésére is használható – módosíthatja vagy teljesen törölheti anélkül, hogy elveszítené a meglévő kapcsolatait.",
     "simplex-unique-overlay-card-3-p-1": "A SimpleX Chat az összes felhasználói adatot kizárólag a klienseken tárolja egy <strong>hordozható titkosított adatbázis-formátumban</strong>, amely exportálható és átvihető bármely más támogatott eszközre.",
-    "simplex-unique-overlay-card-3-p-2": "A végpontok között titkosított üzenetek átmenetileg a SimpleX-közvetítő-kiszolgálókon tartózkodnak, amíg be nem érkeznek a címzetthez, majd véglegesen törlődnek onnan.",
-    "simplex-unique-overlay-card-3-p-3": "A föderált hálózatok kiszolgálóitól (e-mail, XMPP vagy Matrix) eltérően a SimpleX-kiszolgálók nem tárolják a felhasználói fiókokat, csak közvetítik az üzeneteket, így védve mindkét fél magánéletét.",
+    "simplex-unique-overlay-card-3-p-2": "A végpontok között titkosított üzenetek átmenetileg a SimpleX továbbítókiszolgálóin tartózkodnak, amíg be nem érkeznek a címzetthez, majd automatikusan véglegesen törlődnek onnan.",
+    "simplex-unique-overlay-card-3-p-3": "A föderált hálózatok kiszolgálóitól (e-mail, XMPP vagy Matrix) eltérően a SimpleX-kiszolgálók nem tárolják a felhasználói fiókokat, csak továbbítják az üzeneteket, így védve mindkét fél magánéletét.",
     "simplex-unique-overlay-card-3-p-4": "A küldött és a fogadott kiszolgálóforgalom között nincsenek közös azonosítók vagy titkosított szövegek &mdash; ha bárki megfigyeli, nem tudja könnyen megállapítani, hogy ki kivel kommunikál, még akkor sem, ha a TLS-t kompromittálják.",
-    "simplex-unique-overlay-card-4-p-1": "Használhatja <strong>a SimpleXet a saját kiszolgálóival</strong>, és továbbra is kommunikálhat azokkal, akik az általunk biztosított, előre konfigurált kiszolgálókat használják.",
-    "simplex-unique-overlay-card-4-p-2": "A SimpleX platform <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>nyitott protokollt</a> használ és <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK-t biztosít a chatbotok létrehozásához</a>, lehetővé téve olyan szolgáltatások megvalósítását, amelyekkel a felhasználók a SimpleX Chat alkalmazásokon keresztül léphetnek kapcsolatba &mdash; mi már nagyon várjuk, hogy milyen SimpleX szolgáltatásokat készítenek a lelkes közreműködők.",
-    "simplex-unique-overlay-card-4-p-3": "Ha a SimpleX-platformra való fejlesztést fontolgatja, például a SimpleX-alkalmazások felhasználóinak szánt chatbotot, vagy a SimpleX Chat-könvtárbot integrálását más mobilalkalmazásba, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>lépjen velünk kapcsolatba</a>, ha bármilyen tanácsot vagy támogatást szeretne kapni.",
-    "simplex-unique-card-1-p-1": "A SimpleX védi az ön profiljához tartozó kapcsolatait és metaadatait, elrejtve azokat a SimpleX platform kiszolgálói és a megfigyelők elől.",
-    "simplex-unique-card-1-p-2": "Minden más létező üzenetküldő platformtól eltérően a SimpleX nem rendelkezik a felhasználókhoz rendelt azonosítókkal &mdash; <strong>még véletlenszerű számokkal sem</strong>.",
-    "simplex-unique-card-2-p-1": "Mivel a SimpleX platformon nincs azonosítója vagy állandó címe, senki sem tud kapcsolatba lépni önnel, hacsak nem oszt meg egy egyszeri vagy ideiglenes felhasználói címet, például QR-kódot vagy hivatkozást.",
+    "simplex-unique-overlay-card-4-p-1": "Használhatja <strong>a SimpleXet a saját kiszolgálóival</strong>, és továbbra is kommunikálhat azokkal, akik az előre beállított kiszolgálókat használják az alkalmazásban.",
+    "simplex-unique-overlay-card-4-p-2": "A SimpleX-hálózat <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>nyitott protokollt</a> használ és <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK-t biztosít a chatbotok létrehozásához</a>, lehetővé téve olyan szolgáltatások megvalósítását, amelyekkel a felhasználók a SimpleX Chat alkalmazásokon keresztül léphetnek kapcsolatba &mdash; mi már nagyon várjuk, hogy milyen SimpleX szolgáltatásokat készítenek a lelkes közreműködők.",
+    "simplex-unique-overlay-card-4-p-3": "Ha a SimpleX-hálózatra való fejlesztést fontolgatja, például a SimpleX-alkalmazások felhasználóinak szánt chatbotot, vagy a SimpleX Chat könyvtárbotjának integrálását más mobilalkalmazásba, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>lépjen velünk kapcsolatba</a>, ha bármilyen tanácsot vagy támogatást szeretne kapni.",
+    "simplex-unique-card-1-p-1": "A SimpleX megvédi a profilhoz tartozó kapcsolatokat és metaadatokat, elrejtve azokat a SimpleX-hálózat kiszolgálói és a megfigyelők elől.",
+    "simplex-unique-card-1-p-2": "Minden más létező üzenetküldő hálózattól eltérően a SimpleX nem rendelkezik a felhasználókhoz rendelt azonosítókkal &mdash; <strong>még véletlenszerű számokkal sem</strong>.",
+    "simplex-unique-card-2-p-1": "Mivel a SimpleX-hálózaton nincs azonosítója vagy állandó címe, senki sem tud kapcsolatba lépni önnel, hacsak nem oszt meg egy egyszeri vagy ideiglenes felhasználói címet, például QR-kódot vagy hivatkozást.",
     "simplex-unique-card-3-p-1": "A SimpleX Chat az összes felhasználói adatot kizárólag a klienseken tárolja egy <strong>hordozható titkosított adatbázis-formátumban</strong> &mdash;, amely exportálható és átvihető bármely más támogatott eszközre.",
-    "simplex-unique-card-3-p-2": "A végpontok között titkosított üzenetek átmenetileg a SimpleX-közvetítő-kiszolgálókon tartózkodnak, amíg meg nem érkeznek a címzetthez, majd ezt követően véglegesen törlésre kerülnek.",
-    "simplex-unique-card-4-p-1": "A SimpleX hálózat teljesen decentralizált és független bármely kriptopénztől vagy bármely más platformtól, kivéve az internetet.",
-    "simplex-unique-card-4-p-2": "Használhatja <strong>a SimpleX-et saját kiszolgálóival</strong> vagy az általunk biztosított kiszolgálókkal, és továbbra is kapcsolódhat bármely felhasználóhoz.",
-    "join": "Csatlakozás",
-    "we-invite-you-to-join-the-conversation": "Meghívjuk önt, hogy csatlakozzon a beszélgetéshez",
+    "simplex-unique-card-3-p-2": "A végpontok között titkosított üzenetek átmenetileg a SimpleX továbbítókiszolgálóin tartózkodnak, amíg be nem érkeznek a címzetthez, majd automatikusan véglegesen törlődnek onnan.",
+    "simplex-unique-card-4-p-1": "A SimpleX-hálózat teljesen decentralizált és független bármely kriptopénztől vagy bármely más hálózattól, kivéve az internetet.",
+    "simplex-unique-card-4-p-2": "Használhatja <strong>a SimpleXet a saját kiszolgálóival</strong> vagy az általunk biztosított kiszolgálókkal, és továbbra is kapcsolódhat bármely felhasználóhoz.",
+    "join": "Csatlakozzon a közösségeinkhez",
+    "we-invite-you-to-join-the-conversation": "Meghívjuk Önt, hogy csatlakozzon a beszélgetésekhez",
     "join-the-REDDIT-community": "Csatlakozzon a REDDIT közösséghez",
     "join-us-on-GitHub": "Csatlakozzon hozzánk a GitHubon",
     "donate-here-to-help-us": "Adományozzon és segítsen nekünk",
-    "sign-up-to-receive-our-updates": "Regisztráljon az oldalra, hogy megkapja frissítéseinket",
-    "enter-your-email-address": "Adja meg az e-mail címét",
-    "get-simplex": "SimpleX Desktop alkalmazás <a href=\"/downloads\">letöltése</a>",
-    "why-simplex-is": "A SimpleX mitől",
-    "unique": "egyedülálló",
+    "sign-up-to-receive-our-updates": "Regisztráljon a hírleveleinkre, hogy ne maradjon le semmiről",
+    "enter-your-email-address": "Adja meg az e-mail-címét",
+    "get-simplex": "A SimpleX számítógépes alkalmazásának <a href=\"/downloads\">letöltése</a>",
+    "why-simplex-is-unique": "A SimpleX mitől <span class='gradient-text'>egyedülálló</span>",
     "learn-more": "Tudjon meg többet",
     "more-info": "További információ",
     "hide-info": "Információ elrejtése",
-    "contact-hero-subheader": "Szkennelje be a QR-kódot a SimpleX Chat alkalmazással telefonján vagy táblagépén.",
-    "contact-hero-p-1": "A hivatkozásban szereplő nyilvános kulcsokat és az üzenetek várakoztatási címét NEM küldi el a hálózaton keresztül az oldal megtekintésekor &mdash; ezeket a hivatkozás URL-jének hash-töredéke tartalmazza.",
+    "contact-hero-subheader": "Olvassa be a QR-kódot a SimpleX Chat alkalmazással a telefonjával vagy táblagépével.",
+    "contact-hero-p-1": "A hivatkozásban szereplő nyilvános kulcsokat és az üzenetek várakoztatási címét NEM küldi el a hálózaton keresztül, amikor megtekinti ezt az oldalt &mdash; azokat, a hivatkozás webcímének hasítóérték-töredéke tartalmazza.",
     "contact-hero-p-2": "Még nem töltötte le a SimpleX Chatet?",
-    "contact-hero-p-3": "Az alkalmazás letöltéséhez használja az alábbi linkeket.",
+    "contact-hero-p-3": "Az alkalmazás letöltéséhez használja az alábbi hivatkozásokat.",
     "scan-qr-code-from-mobile-app": "QR-kód beolvasása mobilalkalmazásból",
     "to-make-a-connection": "A kapcsolat létrehozásához:",
     "install-simplex-app": "Telepítse a SimpleX alkalmazást",
     "open-simplex-app": "Simplex alkalmazás megnyitása",
     "tap-the-connect-button-in-the-app": "Koppintson a <span class='text-active-blue'>„kapcsolódás”</span> gombra az alkalmazásban",
-    "scan-the-qr-code-with-the-simplex-chat-app": "A QR-kód beolvasása a SimpleX Chat alkalmazással",
-    "scan-the-qr-code-with-the-simplex-chat-app-description": "A hivatkozásban szereplő nyilvános kulcsokat és az üzenetek várakoztatási címét NEM küldjük el a hálózaton keresztül, amikor ezt az oldalt megtekinti &mdash;<br> ezek a hivatkozás URL-jének hash-töredékében szerepelnek.",
-    "installing-simplex-chat-to-terminal": "A SimpleX chat telepítése terminálba",
+    "scan-the-qr-code-with-the-simplex-chat-app": "Olvassa be a QR-kódot a SimpleX Chat alkalmazással",
+    "scan-the-qr-code-with-the-simplex-chat-app-description": "A hivatkozásban szereplő nyilvános kulcsokat és az üzenetek várakoztatási címét NEM küldjük el a hálózaton keresztül, amikor ezt az oldalt megtekinti &mdash;<br> ezek a hivatkozás webcímének hasítóérték-töredékében szerepelnek.",
+    "installing-simplex-chat-to-terminal": "A SimpleX chat telepítése a terminálhoz",
     "use-this-command": "Használja ezt a parancsot:",
-    "see-simplex-chat": "Lásd SimpleX Chat",
+    "see-simplex-chat": "Az utasításokat megtekintheti a SimpleX Chat",
     "connect-in-app": "Kapcsolódás az alkalmazásban",
-    "the-instructions--source-code": "az utasításokat, hogyan töltse le vagy fordítsa le a forráskódból.",
-    "if-you-already-installed-simplex-chat-for-the-terminal": "Ha már telepítette a SimpleX Chat-et a terminálba",
+    "the-instructions--source-code": "és választ kaphat arra, hogy hogyan töltse le vagy fordítsa le a forráskódból.",
+    "if-you-already-installed-simplex-chat-for-the-terminal": "Ha már telepítette a SimpleX Chatet a terminálhoz",
     "if-you-already-installed": "Ha már telepítette a",
-    "simplex-chat-for-the-terminal": "SimpleX Chat-et a terminálba",
+    "simplex-chat-for-the-terminal": "SimpleX Chat a terminálhoz",
     "copy-the-command-below-text": "másolja be az alábbi parancsot, és használja a csevegésben:",
     "privacy-matters-section-header": "Miért <span class='gradient-text'>számít</span> az adatvédelem",
-    "privacy-matters-section-subheader": "A metaadatok védelmének megőrzése &mdash; <span class='text-active-blue'>kivel beszélget</span> &mdash; megvédi a következőktől:",
-    "privacy-matters-section-label": "Győződjön meg róla, hogy az üzenetküldő amit használ nem fér hozzá az adataidhoz!",
+    "privacy-matters-section-subheader": "A metaadatok &mdash; <span class='text-active-blue'>pédául, hogy kivel beszélget</span> &mdash; védelmének megőrzése biztonságot nyújt a következők ellen:",
+    "privacy-matters-section-label": "Győződjön meg arról, hogy az üzenetváltó-alkalmazás amit használ nem fér hozzá az adataihoz!",
     "simplex-private-section-header": "Mitől lesz a SimpleX <span class='gradient-text'>privát</span>",
-    "simplex-network-section-header": "SimpleX <span class='gradient-text'>hálózat</span>",
-    "simplex-network-section-desc": "A Simplex Chat a P2P és a föderált hálózatok előnyeinek kombinálásával biztosítja a legjobb adatvédelmet.",
+    "simplex-network-section-header": "SimpleX-<span class='gradient-text'>hálózat</span>",
+    "simplex-network-section-desc": "A Simplex Chat a P2P- és a föderált hálózatok előnyeinek kombinálásával biztosítja a legjobb adatvédelmet.",
     "simplex-network-1-desc": "Minden üzenet a kiszolgálókon keresztül kerül elküldésre, ami jobb metaadat-védelmet és megbízható aszinkron üzenetkézbesítést biztosít, miközben elkerülhető a sok",
     "simplex-network-2-header": "A föderált hálózatokkal ellentétben",
-    "simplex-network-2-desc": "A SimpleX-közvetítő-kiszolgálók NEM tárolnak felhasználói profilokat, kapcsolatokat és kézbesített üzeneteket, NEM csatlakoznak egymáshoz, és NINCS kiszolgálókönyvtár.",
-    "simplex-network-3-header": "SimpleX hálózat",
+    "simplex-network-2-desc": "A SimpleX továbbítókiszolgálói NEM tárolnak felhasználói profilokat, kapcsolatokat és kézbesített üzeneteket, NEM kapcsolódnak egymáshoz, és NINCS kiszolgálókönyvtár.",
+    "simplex-network-3-header": "SimpleX-hálózat",
     "simplex-network-3-desc": "a kiszolgálók <span class='text-active-blue'>egyirányú üzenet várakoztatásokat</span> biztosítanak a felhasználók összekapcsolásához, de nem látják a hálózati kapcsolati gráfot; azt csak a felhasználók látják.",
     "comparison-section-header": "Összehasonlítás más protokollokkal",
     "protocol-1-text": "Signal, nagy platformok",
     "protocol-2-text": "XMPP, Matrix",
-    "protocol-3-text": "P2P protokollok",
+    "protocol-3-text": "P2P-protokollok",
     "comparison-point-1-text": "Globális személyazonosságot igényel",
     "comparison-point-2-text": "MITM lehetősége",
     "comparison-point-4-text": "Egyetlen vagy központosított hálózat",
@@ -192,28 +191,28 @@
     "comparison-section-list-point-1": "Általában telefonszám alapján, néhány esetben felhasználónév alapján",
     "comparison-section-list-point-2": "DNS-alapú címek",
     "comparison-section-list-point-3": "Nyilvános kulcs vagy más globális egyedi azonosító",
-    "comparison-section-list-point-4a": "A SimpleX-közvetítő-kiszolgálók nem veszélyeztethetik az e2e titkosítást. Hitelesítse a biztonsági kódot a sávon kívüli csatorna elleni támadások veszélyeinek csökkentésére",
+    "comparison-section-list-point-4a": "A SimpleX továbbítókiszolgálói nem veszélyeztethetik az e2e titkosítást. Hitelesítse a biztonsági kódot a sávon kívüli csatorna elleni támadások veszélyeinek csökkentésére",
     "comparison-section-list-point-4": "Ha az üzemeltetett kiszolgálók veszélybe kerülnek. Hitelesítse a biztonsági kódot a Signal vagy más biztonságos üzenetküldő alkalmazás segítségével a támadások veszélyeinek csökkentésére",
     "comparison-section-list-point-5": "Nem védi a felhasználók metaadatait",
-    "comparison-section-list-point-6": "Bár a P2P elosztott, de nem föderált - egyetlen hálózatként működnek",
+    "comparison-section-list-point-6": "Bár a P2P elosztott, de nem föderált &mdash; egyetlen hálózatként működnek",
     "comparison-section-list-point-7": "A P2P-hálózatoknak vagy van egy központi hitelesítője, vagy az egész hálózat kompromittálódhat",
-    "see-here": "lásd itt",
+    "see-here": "tekintse meg itt",
     "guide-dropdown-1": "Gyors indítás",
     "guide-dropdown-2": "Üzenetek küldése",
     "guide-dropdown-3": "Titkos csoportok",
-    "guide-dropdown-4": "Csevegő profilok",
+    "guide-dropdown-4": "Csevegési profilok",
     "guide-dropdown-5": "Adatkezelés",
-    "guide-dropdown-6": "Hang- és videó hívások",
+    "guide-dropdown-6": "Hang- és videóhívások",
     "guide-dropdown-7": "Adatvédelem és biztonság",
     "guide-dropdown-8": "Alkalmazás beállításai",
     "guide": "Útmutató",
-    "docs-dropdown-1": "SimpleX platform",
+    "docs-dropdown-1": "SimpleX-hálózat",
     "docs-dropdown-2": "Android fájlok elérése",
-    "docs-dropdown-3": "Hozzáférés a csevegő adatbázishoz",
-    "docs-dropdown-8": "SimpleX jegyzék szolgáltatás",
+    "docs-dropdown-3": "Hozzáférés a csevegési adatbázishoz",
+    "docs-dropdown-8": "SimpleX jegyzékszolgáltatás",
     "docs-dropdown-9": "Letöltések",
-    "f-droid-page-simplex-chat-repo-section-text": "Ha hozzá szeretné adni az F-Droid klienséhez, <span class='hide-on-mobile'>olvassa be a QR-kódot, vagy</span> használja ezt az URL-t:",
-    "signing-key-fingerprint": "Aláíró kulcs ujjlenyomata (SHA-256)",
+    "f-droid-page-simplex-chat-repo-section-text": "Ha hozzá szeretné adni az F-Droid klienséhez, <span class='hide-on-mobile'>olvassa be a QR-kódot, vagy</span> használja ezt a webcímet:",
+    "signing-key-fingerprint": "Az aláírókulcs ujjlenyomata (SHA-256)",
     "f-droid-org-repo": "F-Droid.org tároló",
     "stable-versions-built-by-f-droid-org": "F-Droid.org által készített stabil verziók",
     "releases-to-this-repo-are-done-1-2-days-later": "A kiadások ebben a tárolóban néhány napot késnek",
@@ -221,21 +220,21 @@
     "jobs": "Csatlakozzon a csapathoz",
     "please-enable-javascript": "Engedélyezze a JavaScriptet a QR-kód megjelenítéséhez.",
     "please-use-link-in-mobile-app": "Használja a mobilalkalmazásban található hivatkozást",
-    "contact-hero-header": "Kapott egy címet a SimpleX Chat-en való kapcsolódáshoz",
-    "invitation-hero-header": "Kapott egy egyszer használatos hivatkozást a SimpleX Chat-en való kapcsolódáshoz",
-    "simplex-network-overlay-card-1-li-4": "A P2P-megvalósításokat egyes internetszolgáltatók blokkolhatják (mint például a <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). A SimpleX átvitel-független - a szabványos webes protokollokon, pl. WebSocketsen keresztül is működik.",
-    "simplex-private-card-4-point-2": "A SimpleX TORon keresztüli használatához telepítse az <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">Orbot alkalmazást</a> és engedélyezze a SOCKS5 proxyt (vagy a VPN-t <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">az iOS-ban</a>).",
-    "simplex-private-card-5-point-1": "A SimpleX minden titkosítási réteghez tartalomkitöltést használ, hogy meghiúsítsa az üzenetméret ellen irányuló támadásokat.",
+    "contact-hero-header": "Kapott egy meghívót a SimpleX Chaten való beszélgetéshez",
+    "invitation-hero-header": "Kapott egy egyszer használható meghívót a SimpleX Chaten való beszélgetéshez",
+    "simplex-network-overlay-card-1-li-4": "A P2P-megvalósításokat egyes internetszolgáltatók blokkolhatják (mint például a <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). A SimpleX átvitel-független &mdash; a szabványos webes protokollokon, például WebSocketsen keresztül is működik.",
+    "simplex-private-card-4-point-2": "A SimpleX, Tor-hálózaton keresztüli használatához telepítse az <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">Orbot alkalmazást</a> és engedélyezze a SOCKS5 proxyt (vagy a VPN-t <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">az iOS-ban</a>).",
+    "simplex-private-card-5-point-1": "A SimpleX minden titkosítási réteghez tartalomkitöltést használ az üzenetméretre irányuló támadások meghiúsítása érdekében.",
     "simplex-private-card-5-point-2": "A kiszolgálók és a hálózatot megfigyelők számára a különböző méretű üzenetek egyformának tűnnek.",
     "privacy-matters-1-title": "Hirdetés és árdiszkrimináció",
     "hero-overlay-card-1-p-3": "Ön határozza meg, hogy melyik kiszolgáló(ka)t használja az üzenetek fogadására, a kapcsolatokhoz &mdash; azokat a kiszolgálókat, amelyeket az üzenetek küldésére használ. Minden beszélgetés két különböző kiszolgálót használ.",
     "simplex-network-overlay-card-1-p-1": "A <a href='https://en.wikipedia.org/wiki/Peer-to-peer'>P2P</a> üzenetküldő protokollok és alkalmazások számos problémával küzdenek, amelyek miatt kevésbé megbízhatóak, mint a SimpleX, bonyolultabb az elemzésük és többféle támadással szemben sebezhetőek.",
-    "chat-bot-example": "Chat bot példa",
+    "chat-bot-example": "Példa csevegési botra",
     "simplex-private-3-title": "Biztonságos, hitelesített<br>TLS adatátvitel",
-    "github-repository": "GitHub tároló",
-    "tap-to-close": "Koppintson a bezáráshoz",
-    "simplex-network-1-header": "A P2P hálózatokkal ellentétben",
-    "simplex-network-1-overlay-linktext": "a P2P hálózat problémái",
+    "github-repository": "GitHub tárolójában",
+    "tap-to-close": "Bezárás",
+    "simplex-network-1-header": "A P2P-hálózatokkal ellentétben",
+    "simplex-network-1-overlay-linktext": "a P2P-hálózatok problémái",
     "comparison-point-3-text": "Függés a DNS-től",
     "yes": "Igen",
     "guide-dropdown-9": "Kapcsolatok létrehozása",
@@ -253,8 +252,8 @@
     "back-to-top": "Vissza a tetejére",
     "glossary": "Fogalomtár",
     "simplex-chat-via-f-droid": "SimpleX Chat az F-Droidon keresztül",
-    "simplex-chat-repo": "SimpleX Chat tároló",
+    "simplex-chat-repo": "A SimpleX Chat tárolója",
     "stable-and-beta-versions-built-by-developers": "A fejlesztők által készített stabil és béta verziók",
-    "hero-overlay-card-3-p-3": "A Trail of Bits 2024 júliusában felülvizsgálta a SimpleX hálózati protokollok kriptográfiai felépítését. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Tudjon meg többet</a>.",
+    "hero-overlay-card-3-p-3": "A Trail of Bits 2024 júliusában ismét auditálta a SimpleX-protokollok kriptográfiai és hálózati komponenseit. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">További információk</a>.",
     "docs-dropdown-14": "SimpleX üzleti célra"
 }
diff --git a/website/langs/it.json b/website/langs/it.json
index 502ab6d886..18a47bfe9f 100644
--- a/website/langs/it.json
+++ b/website/langs/it.json
@@ -10,7 +10,7 @@
     "simplex-explained-tab-3-p-1": "I server hanno credenziali anonime separate per ogni coda e non sanno a quali utenti appartengano.",
     "chat-protocol": "Protocollo di chat",
     "donate": "Dona",
-    "copyright-label": "© 2020-2024 SimpleX | Progetto Open-Source",
+    "copyright-label": "© 2020-2025 SimpleX | Progetto Open-Source",
     "simplex-chat-protocol": "Protocollo di SimpleX Chat",
     "terminal-cli": "Terminale CLI",
     "terms-and-privacy-policy": "Informativa sulla privacy",
@@ -60,30 +60,29 @@
     "hero-overlay-card-2-p-2": "Potrebbero quindi correlare queste informazioni con i social network pubblici esistenti e determinare alcune identità reali.",
     "hero-overlay-card-2-p-4": "SimpleX protegge da questi attacchi non avendo alcun ID utente per design. Inoltre, se usi la modalità di modalità in incognito, il tuo nome mostrato sarà diverso per ogni contatto, evitando dati condivisi tra di loro.",
     "simplex-network-overlay-card-1-li-2": "Il design di SimpleX, a differenza della maggior parte delle reti P2P, non ha identificatori utente globali di alcun tipo, nemmeno temporanei, e usa solo identificatori temporanei a coppie, garantendo una maggiore protezione dell'anonimato e dei metadati.",
-    "simplex-network-overlay-card-1-li-4": "Le implementazioni P2P possono essere bloccate da alcuni fornitori di internet (come <a href='https://it.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX è indipendente dal trasporto - può funzionare su protocolli web standard, es. WebSocket.",
+    "simplex-network-overlay-card-1-li-4": "Le implementazioni P2P possono essere bloccate da alcuni fornitori di internet (come <a href='https://it.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX è indipendente dal trasporto &mdash; può funzionare su protocolli web standard, es. WebSocket.",
     "hero-overlay-card-2-p-1": "Quando gli utenti hanno identità permanenti, anche se si tratta solo di un numero casuale, come un Session ID, c'è il rischio che il fornitore o un malintenzionato possano osservare come gli utenti sono connessi e quanti messaggi inviano.",
     "simplex-network-overlay-card-1-li-6": "Le reti P2P possono essere vulnerabili all'<a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>attacco DRDoS</a>, quando i client possono ritrasmettere e amplificare il traffico, con conseguente \"denial of service\" a livello di rete. I client SimpleX si limitano a inoltrare il traffico da una connessione nota e non possono essere usati da un aggressore per amplificare il traffico nell'intera rete.",
-    "privacy-matters-overlay-card-1-p-4": "La piattaforma SimpleX protegge la privacy delle tue connessioni meglio di qualsiasi alternativa, impedendo completamente che il tuo grafico sociale sia disponibile a qualsiasi azienda o organizzazione. Anche quando le persone usano i server forniti da SimpleX Chat, non conosciamo il numero di utenti o le loro connessioni.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX è la prima piattaforma che non ha alcun identificatore utente per design, proteggendo così il tuo grafico delle connessioni meglio di qualsiasi alternativa conosciuta.",
+    "privacy-matters-overlay-card-1-p-4": "La rete di SimpleX protegge la privacy delle tue connessioni meglio di qualsiasi alternativa, impedendo completamente che il tuo grafico sociale sia disponibile a qualsiasi azienda o organizzazione. Anche quando le persone usano i server preconfigurati in SimpleX Chat, gli operatori dei server non conoscono il numero di utenti o le loro connessioni.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX è la prima rete che non ha alcun identificatore utente per design, proteggendo così il tuo grafico delle connessioni meglio di qualsiasi alternativa conosciuta.",
     "privacy-matters-overlay-card-3-p-1": "Tutti dovrebbero preoccuparsi della privacy e della sicurezza delle proprie comunicazioni &mdash; conversazioni innocue possono metterti in pericolo, anche se non hai nulla da nascondere.",
     "privacy-matters-overlay-card-3-p-3": "Le persone comuni vengono arrestate per ciò che condividono online, anche tramite i loro account \"anonimi\", <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>anche nei Paesi democratici</a>.",
-    "simplex-unique-overlay-card-1-p-3": "Questo design protegge la privacy di chi stai comunicando, nascondendola ai server della piattaforma SimpleX e a qualsiasi osservatore. Per nascondere il tuo indirizzo IP ai server, puoi <strong>connetterti ai server SimpleX tramite Tor</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "Poiché non hai alcun identificatore sulla piattaforma SimpleX, nessuno può contattarti a meno che tu non condivida un indirizzo utente una tantum o temporaneo, come un codice QR o un link.",
+    "simplex-unique-overlay-card-1-p-3": "Questo design protegge la privacy di chi stai comunicando, nascondendola ai server della rete SimpleX e a qualsiasi osservatore. Per nascondere il tuo indirizzo IP ai server, puoi <strong>connetterti ai server SimpleX tramite Tor</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "Poiché non hai alcun identificatore sulla rete SimpleX, nessuno può contattarti a meno che tu non condivida un indirizzo utente una tantum o temporaneo, come un codice QR o un link.",
     "simplex-unique-overlay-card-2-p-2": "Anche l'indirizzo utente opzionale, che può essere usato per inviare richieste di contatto spam, è possibile modificarlo o eliminarlo completamente senza perdere alcuna connessione.",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat conserva tutti i dati utente solo sui dispositivi client usando un <strong>formato trasferibile di database crittografato</strong> che può essere esportato e trasferito su qualsiasi dispositivo supportato.",
     "simplex-unique-overlay-card-3-p-2": "I messaggi crittografati end-to-end vengono conservati temporaneamente sui server di inoltro SimpleX fino alla ricezione, quindi vengono eliminati definitivamente.",
-    "simplex-unique-overlay-card-4-p-1": "Puoi <strong>usare SimpleX con i tuoi server personali</strong> e continuare a comunicare con le persone che usano i server preconfigurati forniti da noi.",
-    "simplex-unique-overlay-card-4-p-3": "Se stai pensando di sviluppare per la piattaforma SimpleX, ad esempio, il chat bot per gli utenti dell'app SimpleX o l'integrazione della libreria SimpleX Chat nelle tue app mobili, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>contattaci</a> per qualsiasi consiglio e supporto.",
-    "simplex-unique-card-1-p-1": "SimpleX protegge la privacy del tuo profilo, contatti e metadati, nascondendoli ai server della piattaforma SimpleX e ad eventuali osservatori.",
-    "simplex-unique-card-1-p-2": "A differenza di qualsiasi altra piattaforma di messaggistica esistente, SimpleX non ha identificatori assegnati agli utenti &mdash; <strong>nemmeno numeri casuali</strong>.",
-    "simplex-unique-card-2-p-1": "Poiché non hai un identificatore o un indirizzo fisso sulla piattaforma SimpleX, nessuno può contattarti a meno che tu non condivida un indirizzo utente una tantum o temporaneo, come codice un QR o un link.",
+    "simplex-unique-overlay-card-4-p-1": "Puoi <strong>usare SimpleX con i tuoi server personali</strong> e continuare a comunicare con le persone che usano i server preconfigurati nelle app.",
+    "simplex-unique-overlay-card-4-p-3": "Se stai pensando di sviluppare per la rete SimpleX, ad esempio, il chat bot per gli utenti dell'app SimpleX o l'integrazione della libreria SimpleX Chat nelle tue app mobili, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>contattaci</a> per qualsiasi consiglio e supporto.",
+    "simplex-unique-card-1-p-1": "SimpleX protegge la privacy del tuo profilo, contatti e metadati, nascondendoli ai server della rete SimpleX e ad eventuali osservatori.",
+    "simplex-unique-card-1-p-2": "A differenza di qualsiasi altra rete di messaggistica esistente, SimpleX non ha identificatori assegnati agli utenti &mdash; <strong>nemmeno numeri casuali</strong>.",
+    "simplex-unique-card-2-p-1": "Poiché non hai un identificatore o un indirizzo fisso sulla rete SimpleX, nessuno può contattarti a meno che tu non condivida un indirizzo utente una tantum o temporaneo, come codice un QR o un link.",
     "simplex-unique-card-3-p-1": "SimpleX conserva tutti i dati utente sui dispositivi client in un <strong>formato trasferibile di database crittografato</strong> &mdash; può essere trasferito su un altro dispositivo.",
     "join": "Unisciti a",
     "we-invite-you-to-join-the-conversation": "Ti invitiamo a unirti alla conversazione",
     "enter-your-email-address": "Inserisci il tuo indirizzo email",
     "get-simplex": "Ottieni SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Perché SimpleX è",
-    "unique": "unico",
+    "why-simplex-is-unique": "Perché SimpleX è <span class='gradient-text'>unico</span>",
     "learn-more": "Maggiori informazioni",
     "more-info": "Mostra info",
     "hide-info": "Nascondi info",
@@ -103,7 +102,7 @@
     "use-this-command": "Usa questo comando:",
     "see-simplex-chat": "Vedi SimpleX Chat",
     "github-repository": "Repository GitHub",
-    "the-instructions--source-code": "le istruzioni su come scaricarlo o compilarlo dal codice sorgente.",
+    "the-instructions--source-code": "per le istruzioni su come scaricarlo o compilarlo dal codice sorgente.",
     "if-you-already-installed-simplex-chat-for-the-terminal": "Se hai già installato SimpleX Chat per il terminale",
     "if-you-already-installed": "Se hai già installato",
     "privacy-matters-section-subheader": "Preservare la privacy dei tuoi metadati &mdash; <span class='text-active-blue'>con chi parli</span> &mdash; ti protegge da:",
@@ -131,13 +130,13 @@
     "no-federated": "No - federato",
     "comparison-section-list-point-1": "Solitamente si basa su un numero di telefono, in alcuni casi su nomi utente",
     "comparison-section-list-point-2": "Indirizzi basati su DNS",
-    "comparison-section-list-point-6": "Sebbene i P2P siano distribuiti, non sono federati - operano come un'unica rete",
+    "comparison-section-list-point-6": "Sebbene i P2P siano distribuiti, non sono federati &mdash; operano come un'unica rete",
     "comparison-section-list-point-7": "Le reti P2P hanno un'autorità centrale o l'intera rete può essere compromessa",
     "see-here": "vedi qui",
     "simplex-network-3-header": "Nella rete di SimpleX",
     "simplex-private-card-7-point-2": "Se un messaggio viene aggiunto, rimosso o modificato, il destinatario verrà avvisato.",
-    "hero-overlay-card-1-p-2": "Per consegnare i messaggi, invece degli ID utente utilizzati da tutte le altre piattaforme, SimpleX usa identificatori temporanei anonimi a coppie delle code di messaggi, separati per ciascuna delle tue connessioni &mdash; non ci sono identificatori a lungo termine.",
-    "simplex-private-card-6-point-1": "Molte piattaforme di comunicazione sono vulnerabili agli attacchi MITM da parte di server o fornitori di rete.",
+    "hero-overlay-card-1-p-2": "Per consegnare i messaggi, invece degli ID utente utilizzati da tutte le altre reti, SimpleX usa identificatori temporanei anonimi a coppie delle code di messaggi, separati per ciascuna delle tue connessioni &mdash; non ci sono identificatori a lungo termine.",
+    "simplex-private-card-6-point-1": "Molte reti di comunicazione sono vulnerabili agli attacchi MITM da parte di server o fornitori di rete.",
     "simplex-private-card-7-point-1": "Per garantire l'integrità, i messaggi sono numerati in sequenza e includono l'hash del messaggio precedente.",
     "simplex-private-card-9-point-2": "Riduce i vettori di attacco, rispetto ai broker di messaggi tradizionali, e i metadati disponibili.",
     "simplex-private-card-10-point-2": "Ciò consente di recapitare messaggi senza identificatori del profilo utente, garantendo una migliore privacy dei metadati rispetto alle alternative.",
@@ -162,7 +161,7 @@
     "feature-3-title": "Gruppi decentralizzati crittografati E2E &mdash; solo gli utenti sanno che esistono",
     "blog": "Blog",
     "simplex-explained-tab-2-p-1": "Per ogni connessione usi due code di messaggi distinte per inviare e ricevere i messaggi attraverso server diversi.",
-    "simplex-explained-tab-2-p-2": "I server passano i messaggi solo in una direzione, senza avere il quadro completo della conversazione dell'utente o delle connessioni.",
+    "simplex-explained-tab-2-p-2": "I server passano i messaggi solo in una direzione, senza avere il quadro completo delle conversazioni dell'utente o delle connessioni.",
     "simplex-explained-tab-3-p-2": "Gli utenti possono aumentare ulteriormente la privacy dei metadati usando Tor per accedere ai server, evitando correlazioni per indirizzo IP.",
     "smp-protocol": "Protocollo SMP",
     "feature-1-title": "Messaggi crittografati E2E con markdown e modifica",
@@ -182,21 +181,21 @@
     "privacy-matters-overlay-card-1-p-2": "I rivenditori online sanno che le persone con redditi più bassi sono più propense a fare acquisti urgenti, quindi possono applicare prezzi più alti o rimuovere sconti.",
     "privacy-matters-overlay-card-1-p-3": "Alcune società finanziarie e assicurative usano grafici sociali per determinare i tassi di interesse e i premi. Spesso ciò fa pagare di più le persone con redditi più bassi &mdash; è noto come <a href='https://fairbydesign.com/povertypremium/' target='_blank'> \"premio di povertà\" </a>.",
     "privacy-matters-overlay-card-2-p-1": "Non molto tempo fa abbiamo assistito alla manipolazione delle principali elezioni da <a href='https://it.wikipedia.org/wiki/Scandalo_Facebook-Cambridge_Analytica' target='_blank'>una rispettabile società di consulenza</a> che ha usato i nostri grafici sociali per distorcere la nostra visione del mondo reale e manipolare i nostri voti.",
-    "privacy-matters-overlay-card-2-p-2": "Per essere obiettivi e prendere decisioni indipendenti devi avere il controllo del tuo spazio informativo. È possibile solo se utilizzi una piattaforma di comunicazione privata che non ha accesso al tuo grafico sociale.",
+    "privacy-matters-overlay-card-2-p-2": "Per essere obiettivi e prendere decisioni indipendenti devi avere il controllo del tuo spazio informativo. È possibile solo se utilizzi una rete di comunicazione privata che non ha accesso al tuo grafico sociale.",
     "privacy-matters-overlay-card-3-p-2": "Una delle storie più scioccanti è l'esperienza di <a href='https://it.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> descritta nel suo libro di memorie e mostrata nel film The Mauritanian. È stato rinchiuso nel campo di Guantánamo, senza processo, e lì è stato torturato per 15 anni dopo una telefonata a un suo parente in Afghanistan, sospettato di essere coinvolto negli attacchi dell'11/9, nonostante avesse vissuto in Germania per i precedenti 10 anni.",
     "join-us-on-GitHub": "Unisciti a noi su GitHub",
     "simplex-chat-for-the-terminal": "SimpleX Chat per il terminale",
     "privacy-matters-overlay-card-3-p-4": "Non è sufficiente usare un messenger crittografato end-to-end, tutti dovremmo usare i messenger che proteggono la privacy delle nostre reti personali &mdash; con chi siamo connessi.",
-    "simplex-unique-overlay-card-1-p-2": "Per recapitare i messaggi, SimpleX usa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>indirizzi anonimi a coppie</a> di code di messaggi unidirezionali, separate per i messaggi ricevuti e inviati, di solito tramite server diversi. Usare SimpleX è come avere <strong>un'email o telefono &ldquo;temporanei&rdquo; per ogni contatto</strong>, e nessuna seccatura per gestirli.",
-    "simplex-unique-overlay-card-1-p-1": "A differenza di altre piattaforme di messaggistica, SimpleX non ha <strong>alcun identificatore assegnato agli utenti</strong>. Non si basa su numeri di telefono, indirizzi basati su domini (come email o XMPP), nomi utente, chiavi pubbliche o persino numeri casuali per identificare i suoi utenti &mdash; non sappiamo quante persone usano i nostri server SimpleX.",
+    "simplex-unique-overlay-card-1-p-2": "Per recapitare i messaggi, SimpleX usa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>indirizzi anonimi a coppie</a> di code di messaggi unidirezionali, separate per i messaggi ricevuti e inviati, di solito tramite server diversi.",
+    "simplex-unique-overlay-card-1-p-1": "A differenza di altre reti di messaggistica, SimpleX non ha <strong>alcun identificatore assegnato agli utenti</strong>. Non si basa su numeri di telefono, indirizzi basati su domini (come email o XMPP), nomi utente, chiavi pubbliche o persino numeri casuali per identificare i suoi utenti &mdash; gli operatori dei server non sanno quante persone usano i loro server.",
     "simplex-unique-overlay-card-3-p-3": "A differenza dei server di reti federate (email, XMPP o Matrix), i server SimpleX non conservano gli account utente, ma trasmettono solo i messaggi, proteggendo la privacy di entrambe le parti.",
     "simplex-unique-card-3-p-2": "I messaggi crittografati end-to-end vengono conservati temporaneamente sui server di inoltro SimpleX fino alla ricezione, quindi vengono eliminati definitivamente.",
     "simplex-unique-card-4-p-2": "Puoi <strong>usare SimpleX con i tuoi server personali</strong> o con i server forniti da noi &mdash; e connetterti comunque a qualsiasi utente.",
     "join-the-REDDIT-community": "Unisciti alla comunità di REDDIT",
     "sign-up-to-receive-our-updates": "Iscriviti per ricevere i nostri aggiornamenti",
     "simplex-unique-overlay-card-3-p-4": "Non ci sono identificatori o testi cifrati in comune tra il traffico del server inviato e quello ricevuto &mdash; se qualcuno lo osserva, non può determinare facilmente chi comunica con chi, anche se il TLS è compromesso.",
-    "simplex-unique-overlay-card-4-p-2": "La piattaforma SimpleX usa un <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>protocollo aperto</a> e fornisce un <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK per creare chat bot</a>, consentendo l'implementazione di servizi con cui gli utenti possono interagire tramite le app SimpleX Chat &mdash; siamo impazienti di vedere quali servizi SimpleX puoi creare.",
-    "simplex-unique-card-4-p-1": "La rete SimpleX è completamente decentralizzata e indipendente da qualsiasi criptovaluta o altra piattaforma, ad eccezione di internet.",
+    "simplex-unique-overlay-card-4-p-2": "La rete di SimpleX usa un <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>protocollo aperto</a> e fornisce un <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK per creare chat bot</a>, consentendo l'implementazione di servizi con cui gli utenti possono interagire tramite le app SimpleX Chat &mdash; siamo impazienti di vedere quali servizi SimpleX creerai.",
+    "simplex-unique-card-4-p-1": "La rete SimpleX è completamente decentralizzata e indipendente da qualsiasi criptovaluta o altra rete, ad eccezione di internet.",
     "donate-here-to-help-us": "Dona qui per aiutarci",
     "to-make-a-connection": "Per stabilire una connessione:",
     "scan-the-qr-code-with-the-simplex-chat-app-description": "Le chiavi pubbliche e l'indirizzo della coda di messaggi in questo link NON vengono inviati in rete quando vedi questa pagina &mdash;<br> sono contenuti nel frammento hash dell'URL del link.",
@@ -219,7 +218,7 @@
     "guide-dropdown-7": "Privacy e sicurezza",
     "guide-dropdown-9": "Creare connessioni",
     "guide": "Guida",
-    "docs-dropdown-1": "Piattaforma SimpleX",
+    "docs-dropdown-1": "Rete di SimpleX",
     "docs-dropdown-2": "Accesso ai file Android",
     "docs-dropdown-3": "Accesso al database di chat",
     "docs-dropdown-4": "Ospita un server SMP",
diff --git a/website/langs/ja.json b/website/langs/ja.json
index 6f994b59da..05365e2271 100644
--- a/website/langs/ja.json
+++ b/website/langs/ja.json
@@ -52,7 +52,7 @@
     "chat-protocol": "チャットプロトコル",
     "chat-bot-example": "チャットボットの例",
     "donate": "寄付",
-    "copyright-label": "© 2020-2024 SimpleX | Open-Source Project",
+    "copyright-label": "© 2020-2025 SimpleX | Open-Source Project",
     "hero-p-1": "他のアプリにはユーザー ID があります: Signal、Matrix、Session、Briar、Jami、Cwtch など。<br> SimpleX にはありません。<strong>乱数さえもありません</strong>。<br> これにより、プライバシーが大幅に向上します。",
     "copy-the-command-below-text": "以下のコマンドをコピーしてチャットで使用します：",
     "simplex-private-card-9-point-1": "各メッセージ キューは、異なる送信アドレスと受信アドレスを使用してメッセージを一方向に渡します。",
@@ -193,13 +193,12 @@
     "simplex-unique-overlay-card-3-p-2": "エンドツーエンドで暗号化されたメッセージは、SimpleXのリレーサーバーで受信するまで一時的に保持され、その後永久に削除されます。",
     "simplex-private-card-7-point-1": "整合性を保証するために、メッセージには連続した番号が付けられ、前のメッセージのハッシュが含まれます。",
     "contact-hero-p-2": "SimpleX Chat をまだダウンロードしていませんか?",
-    "why-simplex-is": "なぜSimpleXなのか",
+    "why-simplex-is-unique": "なぜSimpleXなのか<span class='gradient-text'>唯一</span>",
     "simplex-network-section-header": "SimpleX <span class='gradient-text'>ネットワーク</span>",
     "simplex-private-10-title": "一時的な匿名のペア識別子",
     "privacy-matters-1-overlay-1-linkText": "プライバシーの保護はコストを削減します",
     "tap-the-connect-button-in-the-app": "アプリの <span class='text-active-blue'>「接続」</span> ボタンをタップします",
     "comparison-section-list-point-4a": "SimpleX リレーは e2e 暗号化を侵害できません。 セキュリティ コードを検証して帯域外チャネルへの攻撃を軽減します",
-    "unique": "唯一",
     "simplex-network-1-overlay-linktext": "P2Pネットワークの問題点",
     "no-private": "いいえ - プライベート",
     "simplex-unique-1-title": "プライバシーが完全に守られます",
@@ -246,13 +245,15 @@
     "simplex-private-5-title": "何レイヤーもの<br>コンテンツパディング",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a>は、大手ハイテク企業、政府機関、主要なブロックチェーン・プロジェクトなどを顧客に持つ、セキュリティとテクノロジーの大手コンサルタント会社です。",
     "jobs": "チームに参加する",
-    "hero-overlay-3-textlink": "セキュリティ監査",
-    "hero-overlay-3-title": "セキュリティ監査",
+    "hero-overlay-3-textlink": "セキュリティ評価",
+    "hero-overlay-3-title": "セキュリティ評価",
     "hero-overlay-card-3-p-2": "Trail of Bitsは2022年11月にSimpleXプラットフォームの暗号とネットワークのコンポーネントを検証しました。<a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">詳しくは お知らせをご覧ください。</a>",
     "docs-dropdown-9": "ダウンロード",
     "please-enable-javascript": "QRコードを表示するためにJavaScriptを有効にしてください。",
     "please-use-link-in-mobile-app": "このリンクをモバイルアプリで使用してください",
     "docs-dropdown-10": "透明性",
     "docs-dropdown-11": "よくある質問",
-    "docs-dropdown-12": "セキュリティ"
+    "docs-dropdown-12": "セキュリティ",
+    "docs-dropdown-14": "ビジネス向けSimpleX",
+    "hero-overlay-card-3-p-3": "Trail of Bits は 2024 年 7 月に SimpleX ネットワーク プロトコルの暗号設計をレビューしました。"
 }
diff --git a/website/langs/nl.json b/website/langs/nl.json
index c725cc3d3e..30e751c9f9 100644
--- a/website/langs/nl.json
+++ b/website/langs/nl.json
@@ -7,7 +7,7 @@
     "why-simplex": "Waarom SimpleX",
     "simplex-privacy": "SimpleX privacy",
     "simplex-network": "SimpleX netwerk",
-    "simplex-explained": "Simplex uitgelegd",
+    "simplex-explained": "SimpleX uitgelegd",
     "simplex-explained-tab-1-text": "1. Wat gebruikers ervaren",
     "simplex-explained-tab-3-text": "3. Wat servers zien",
     "simplex-explained-tab-1-p-1": "U kunt contacten en groepen maken en tweerichtings gesprekken voeren, zoals in elke andere messenger.",
@@ -17,7 +17,7 @@
     "chat-bot-example": "Chatbot voorbeeld",
     "smp-protocol": "SMP protocol",
     "donate": "Doneer",
-    "copyright-label": "© 2020-2024 SimpleX | Open-sourceproject",
+    "copyright-label": "© 2020-2025 SimpleX | Open-sourceproject",
     "simplex-chat-protocol": "SimpleX Chat protocol",
     "terminal-cli": "Terminal CLI",
     "terms-and-privacy-policy": "Privacybeleid",
@@ -116,8 +116,7 @@
     "join-us-on-GitHub": "Volg ons op GitHub",
     "donate-here-to-help-us": "Doneer hier om ons te helpen",
     "sign-up-to-receive-our-updates": "Schrijf u in om onze updates te ontvangen",
-    "unique": "uniek",
-    "why-simplex-is": "Waarom is SimpleX",
+    "why-simplex-is-unique": "Waarom is SimpleX <span class='gradient-text'>uniek</span>",
     "learn-more": "Kom meer te weten",
     "more-info": "Meer informatie",
     "hide-info": "Info verbergen",
@@ -183,7 +182,7 @@
     "privacy-matters-overlay-card-3-p-2": "Een van de meest schokkende verhalen is de ervaring van <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> beschreven in zijn memoires en getoond in The Mauritanian movie. Hij werd zonder proces in het Guantanamo kamp geplaatst en werd daar 15 jaar lang gemarteld na een telefoontje naar zijn familielid in Afghanistan, op verdenking van betrokkenheid bij aanslagen van 9/11, ook al woonde hij de afgelopen 10 jaar in Duitsland.",
     "privacy-matters-overlay-card-3-p-3": "Gewone mensen worden gearresteerd voor wat ze online delen, zelfs via hun 'anonieme' accounts, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>zelfs in democratische landen</a>.",
     "privacy-matters-overlay-card-3-p-4": "Het is niet genoeg om een end-to-end versleutelde messenger te gebruiken, we zouden allemaal de messengers moeten gebruiken die de privacy van onze persoonlijke netwerken beschermen &mdash; met wie we verbonden zijn.",
-    "simplex-unique-overlay-card-1-p-2": "Om berichten af te leveren gebruikt SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>paarsgewijze anonieme adressen</a> van unidirectionele  berichten wachtrijen, gescheiden voor ontvangen en verzonden berichten, meestal via verschillende servers. Het gebruik van SimpleX is als het hebben van <strong>een andere &ldquo;brander&rdquo; e-mail of telefoon voor elk contact</strong>, en geen gedoe om ze te beheren.",
+    "simplex-unique-overlay-card-1-p-2": "Om berichten af te leveren gebruikt SimpleX <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>paarsgewijze anonieme adressen</a> van unidirectionele  berichten wachtrijen, gescheiden voor ontvangen en verzonden berichten, meestal via verschillende servers.",
     "simplex-unique-overlay-card-1-p-3": "Dit ontwerp beschermt de privacy van met wie u communiceert en verbergt deze voor SimpleX platform servers en voor waarnemers. Om uw IP-adres voor de servers te verbergen, kunt u <strong> verbinding maken met SimpleX servers via Tor </strong>.",
     "simplex-unique-overlay-card-2-p-1": "Omdat je geen identificatie hebt op het SimpleX platform, kan niemand contact met je opnemen, tenzij je een eenmalig of tijdelijk gebruikers adres deelt, als een QR-code of een link.",
     "simplex-unique-overlay-card-2-p-2": "Zelfs met het optionele gebruikers adres, hoewel het kan worden gebruikt om spam-contact verzoeken te verzenden, kunt u het wijzigen of volledig verwijderen zonder uw verbindingen te verliezen.",
@@ -255,5 +254,6 @@
     "docs-dropdown-10": "Transparantie",
     "docs-dropdown-11": "FAQ",
     "docs-dropdown-12": "Beveiliging",
-    "hero-overlay-card-3-p-3": "Trail of Bits heeft in juli 2024 het cryptografische ontwerp van SimpleX-netwerkprotocollen beoordeeld. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Lees meer</a>."
+    "hero-overlay-card-3-p-3": "Trail of Bits heeft in juli 2024 het cryptografische ontwerp van SimpleX-netwerkprotocollen beoordeeld. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Lees meer</a>.",
+    "docs-dropdown-14": "SimpleX voor bedrijven"
 }
diff --git a/website/langs/pl.json b/website/langs/pl.json
index d0674e3d8a..d45207a709 100644
--- a/website/langs/pl.json
+++ b/website/langs/pl.json
@@ -15,7 +15,7 @@
     "smp-protocol": "Protokół SMP",
     "chat-protocol": "Protokół czatu",
     "donate": "Darowizna",
-    "copyright-label": "© 2020-2024 SimpleX | Projekt Open-Source",
+    "copyright-label": "© 2020-2025 SimpleX | Projekt Open-Source",
     "simplex-chat-protocol": "Protokół SimpleX Chat",
     "terminal-cli": "Terminal CLI",
     "terms-and-privacy-policy": "Polityka prywatności",
@@ -140,7 +140,7 @@
     "simplex-network-overlay-card-1-li-6": "Sieci P2P mogą być podatne na atak <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS</a>, kiedy klienci mogą rozgłaszać i wzmacniać ruch, co powoduje odmowę usługi w całej sieci. Klienci SimpleX przekazują jedynie ruch ze znanego połączenia i nie mogą być wykorzystani przez atakującego do wzmocnienia ruchu w całej sieci.",
     "privacy-matters-overlay-card-1-p-1": "Wiele dużych firm wykorzystuje informacje o tym, z kim jesteś połączony, aby oszacować Twoje dochody, sprzedać Ci produkty, których tak naprawdę nie potrzebujesz, oraz ustalić ceny.",
     "simplex-unique-overlay-card-2-p-2": "Nawet w przypadku opcjonalnego adresu użytkownika, podczas gdy może on być używany do wysyłania spamowych zapytań o kontakt, możesz go zmienić lub całkowicie usunąć bez utraty jakichkolwiek połączeń.",
-    "simplex-unique-overlay-card-1-p-2": "Do dostarczania wiadomości SimpleX używa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>parami anonimowych adresów</a> jednokierunkowych kolejek z wiadomościami, oddzielnych dla wiadomości odbieranych i wysyłanych, zwykle przez różne serwery. Korzystanie z SimpleX jest jak posiadanie <strong>wielu &ldquo;jednorazowych&rdquo; emailów lub osobnego telefonu dla każdego kontaktu</strong> i braku problemów z zarządzaniem nimi.",
+    "simplex-unique-overlay-card-1-p-2": "Do dostarczania wiadomości SimpleX używa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>parami anonimowych adresów</a> jednokierunkowych kolejek z wiadomościami, oddzielnych dla wiadomości odbieranych i wysyłanych, zwykle przez różne serwery.",
     "simplex-unique-overlay-card-1-p-3": "Taka konstrukcja chroni prywatność tego, z kim się komunikujesz, ukrywając ją przed serwerami platformy SimpleX i przed wszelkimi obserwatorami. Aby ukryć swój adres IP przed serwerami, możesz <strong>połączyć się z serwerami SimpleX za pośrednictwem sieci Tor</strong>.",
     "simplex-unique-overlay-card-3-p-4": "Nie ma żadnych identyfikatorów ani szyfrogramów wspólnych między wysyłanym i odbieranym ruchem serwera &mdash; jeśli ktokolwiek to obserwuje, nie może łatwo określić, kto komunikuje się z kim, nawet jeśli bezpieczeństwo protokołu TLS zostało zagrożone.",
     "simplex-unique-overlay-card-2-p-1": "Ponieważ nie masz identyfikatora na platformie SimpleX, nikt nie może się z Tobą skontaktować, chyba że udostępnisz jednorazowy lub tymczasowy adres użytkownika, w postaci kodu QR lub linku.",
@@ -154,13 +154,12 @@
     "simplex-unique-card-1-p-2": "W przeciwieństwie do każdej innej istniejącej platformy komunikacyjnej, SimpleX nie ma żadnych identyfikatorów przypisanych do użytkowników &mdash; <strong>nawet losowych liczb</strong>.",
     "tap-the-connect-button-in-the-app": "Stuknij przycisk <span class='text-active-blue'>'połącz się'</span> w aplikacji",
     "join-the-REDDIT-community": "Dołącz do społeczności REDDIT",
-    "unique": "unikalny",
     "hide-info": "Ukryj informacje",
     "simplex-unique-card-4-p-2": "Możesz <strong>używać SimpleX z własnymi serwerami</strong> lub z serwerami dostarczonymi przez nas &mdash; i nadal łączyć się z dowolnym użytkownikiem.",
     "we-invite-you-to-join-the-conversation": "Zapraszamy do udziału w rozmowie",
     "enter-your-email-address": "Wpisz swój adres e-mail",
     "get-simplex": "Pobierz SimpleX <a href=\"/downloads\">desktop app</a>",
-    "why-simplex-is": "Dlaczego SimpleX jest",
+    "why-simplex-is-unique": "Dlaczego SimpleX jest <span class='gradient-text'>unikalny</span>",
     "join": "Dołącz do",
     "join-us-on-GitHub": "Dołącz do nas na GitHubie",
     "sign-up-to-receive-our-updates": "Zapisz się, aby otrzymywać nasze aktualizacje",
@@ -244,15 +243,17 @@
     "stable-versions-built-by-f-droid-org": "Wersje stabilne zbudowane przez F-Droid.org",
     "releases-to-this-repo-are-done-1-2-days-later": "Wydania na tym repo są kilka dni później",
     "comparison-section-list-point-4a": "Przekaźniki SimpleX nie mogą skompromitować szyfrowania e2e. Zweryfikuj kody bezpieczeństwa aby złagodzić atak na kanał pozapasmowy",
-    "hero-overlay-3-title": "Ocena bezpieczeństwa",
+    "hero-overlay-3-title": "Oceny bezpieczeństwa",
     "hero-overlay-card-3-p-2": "Trail of Bits przejrzał komponenty kryptograficzne i sieciowe platformy SimpleX w listopadzie 2022. Przeczytaj więcej w <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">ogłoszeniach</a>.",
     "jobs": "Dołącz do zespołu",
-    "hero-overlay-3-textlink": "Ocena bezpieczeństwa",
+    "hero-overlay-3-textlink": "Analizy bezpieczeństwa",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> jest wiodącą firmą konsultingową w zakresie bezpieczeństwa i technologii, której klientami są duże firmy technologiczne, agencje rządowe i główne projekty blockchain.",
     "docs-dropdown-9": "Pliki do pobrania",
     "please-enable-javascript": "Prosimy o włączenie JavaScript w celu wyświetlenia kodu QR.",
     "please-use-link-in-mobile-app": "Prosimy o skorzystanie z linku w aplikacji mobilnej",
     "docs-dropdown-10": "Przezroczystość",
     "docs-dropdown-12": "Bezpieczeństwo",
-    "docs-dropdown-11": "Często zadawane pytania"
+    "docs-dropdown-11": "Często zadawane pytania",
+    "hero-overlay-card-3-p-3": "Firma Trail of Bits dokonała analizy projektu kryptograficznego protokołów sieciowych SimpleX w lipcu 2024 roku. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Dowiedz się więcej</a>.",
+    "docs-dropdown-14": "SimpleX dla firm"
 }
diff --git a/website/langs/pt_BR.json b/website/langs/pt_BR.json
index 73095c6db2..77854f5be1 100644
--- a/website/langs/pt_BR.json
+++ b/website/langs/pt_BR.json
@@ -11,7 +11,7 @@
     "simplex-explained-tab-1-p-1": "Você pode criar contatos e grupos e ter conversas bidirecionais, como em qualquer outro mensageiro.",
     "simplex-explained-tab-2-p-1": "Para cada conexão, são usadas duas filas de mensagens separadas para enviar e receber mensagens por meio de servidores diferentes.",
     "hero-p-1": "Outros aplicativos possuem IDs de usuário: Signal, Matrix, Session, Briar, Jami, Cwtch, etc.<br> O SimpleX não tem, <strong>nem mesmo números aleatórios</strong>.<br> Isso melhora radicalmente a sua privacidade.",
-    "terms-and-privacy-policy": "Termos e Política de Privacidade",
+    "terms-and-privacy-policy": "Termos de serviço & Política de Privacidade",
     "hero-2-header-desc": "O vídeo mostra como você se conecta com seu amigo através do QR code de uso único dele, pessoalmente ou via link de vídeo. Você também pode se conectar compartilhando um link de convite.",
     "feature-7-title": "Armazenamento do aplicativo criptografado portátil &mdash; mova o perfil para outro dispositivo",
     "simplex-explained": "Explicação do SimpleX",
@@ -25,7 +25,7 @@
     "smp-protocol": "Protocolo SMP",
     "chat-protocol": "Protocolo de bate-papo",
     "donate": "Doar",
-    "copyright-label": "© 2020-2024 SimpleX | Projeto de Código Livre",
+    "copyright-label": "© 2020-2025 SimpleX | Projeto de Código Livre",
     "simplex-chat-protocol": "Protocolo Chat SimpleX",
     "terminal-cli": "CLI Terminal",
     "hero-header": "Privacidade redefinida",
@@ -127,7 +127,7 @@
     "privacy-matters-overlay-card-2-p-3": "O SimpleX é a primeira plataforma que não tem nenhum identificador de usuário por design, protegendo assim seu gráfico de conexões melhor do que qualquer alternativa conhecida.",
     "privacy-matters-overlay-card-3-p-3": "Pessoas comuns são presas pelo que compartilham online, mesmo por meio de suas contas \"anônimas\", <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>mesmo em países democráticos</a>.",
     "privacy-matters-overlay-card-3-p-4": "Não basta usar um mensageiro criptografado de ponta-a-ponta, todos nós devemos usar os mensageiros que protegem a privacidade de nossas redes pessoais &mdash; com quem estamos conectados.",
-    "simplex-unique-overlay-card-1-p-2": "Para entregar mensagens, o SimpleX usa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>endereços anônimos em pares</a> de filas de mensagens unidirecionais, separadas para mensagens recebidas e enviadas, geralmente por meio de servidores diferentes. Usar o SimpleX é como ter <strong>um email ou telefone de &ldquo;gravação&rdquo; diferente para cada contato</strong>, sem a necessidade de gerenciá-los.",
+    "simplex-unique-overlay-card-1-p-2": "Para entregar mensagens, o SimpleX usa <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>endereços anônimos em pares</a> de filas de mensagens unidirecionais, separadas para mensagens recebidas e enviadas, geralmente por meio de servidores diferentes.",
     "simplex-unique-overlay-card-1-p-3": "Esse design protege a privacidade de quem está se comunicando com você, ocultando-a dos servidores da plataforma SimpleX e de quaisquer observadores. Para ocultar seu endereço IP dos servidores, você pode <strong>se conectar aos servidores do SimpleX via Tor</strong>.",
     "simplex-unique-overlay-card-2-p-2": "Mesmo com o endereço de usuário opcional, embora ele possa ser usado para enviar solicitações de contato de spam, você pode alterá-lo ou excluí-lo completamente sem perder nenhuma das suas conexões.",
     "simplex-unique-overlay-card-2-p-1": "Como você não tem um identificador na plataforma SimpleX, ninguém pode entrar em contato com você, a menos que compartilhe um endereço de usuário único ou temporário, como um QR code ou um link.",
@@ -147,8 +147,7 @@
     "sign-up-to-receive-our-updates": "Inscreva-se para receber nossas atualizações",
     "enter-your-email-address": "Digite seu endereço de email",
     "get-simplex": "Obtenha o SimpleX <a href=\"/downloads\">aplicativo desktop</a>",
-    "why-simplex-is": "Por que o SimpleX é",
-    "unique": "único",
+    "why-simplex-is-unique": "Por que o SimpleX é <span class='gradient-text'>único</span>",
     "learn-more": "Saiba mais",
     "more-info": "Mais informações",
     "contact-hero-header": "Você recebeu um endereço para se conectar no SimpleX Chat",
@@ -242,9 +241,9 @@
     "simplex-chat-repo": "Repositório Simplex Chat",
     "f-droid-org-repo": "Repositório F-Droid.org",
     "stable-versions-built-by-f-droid-org": "Versões estáveis criadas por F-Droid.org",
-    "releases-to-this-repo-are-done-1-2-days-later": "Os lançamentos para este repositório são feitos 1-2 dias depois",
-    "hero-overlay-3-textlink": "Avaliação Segura",
-    "hero-overlay-3-title": "Avaliação Segura",
+    "releases-to-this-repo-are-done-1-2-days-later": "Os lançamentos para este repositório são feitos 1 ou 2 dias depois",
+    "hero-overlay-3-textlink": "Avaliações de segurança",
+    "hero-overlay-3-title": "Avaliações de segurança",
     "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> é uma consultoria líder em segurança e tecnologia cujos clientes incluem grandes empresas de tecnologia, agências governamentais e grandes projetos de blockchain.",
     "hero-overlay-card-3-p-2": "Trail of Bits analisou a criptografia da plataforma SimpleX e os componentes de rede em novembro de 2022. Leia mais em <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">o anúncio</a>.",
     "f-droid-page-f-droid-org-repo-section-text": "Os repositórios SimpleX Chat e F-Droid.org assinam compilações com chaves diferentes. Para mudar, <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>exporte</a> o banco de dados de bate-papo e reinstale o aplicativo.",
@@ -254,5 +253,7 @@
     "docs-dropdown-9": "Baixar",
     "docs-dropdown-11": "FAQ",
     "docs-dropdown-10": "Transparência",
-    "docs-dropdown-12": "Segurança"
+    "docs-dropdown-12": "Segurança",
+    "hero-overlay-card-3-p-3": "Trail of Bits revisou o design criptografico das redes utilizadas pelo SimpleX em julho de 2024",
+    "docs-dropdown-14": "SimpleX para negócios"
 }
diff --git a/website/langs/ru.json b/website/langs/ru.json
index 5d59ec2c76..ea7766db1b 100644
--- a/website/langs/ru.json
+++ b/website/langs/ru.json
@@ -1,259 +1,259 @@
 {
     "copy-the-command-below-text": "скопируйте приведенную ниже команду и используйте ее в чате:",
-    "copyright-label": "© 2020-2024 SimpleX | Проект с открытым исходным кодом",
+    "copyright-label": "© 2020-2025 SimpleX | Проект с открытым исходным кодом",
     "chat-bot-example": "Пример Чат бота",
     "simplex-private-card-9-point-1": "Каждая очередь сообщений передает сообщения в одном направлении с разными адресами отправки и получения.",
-    "simplex-private-card-1-point-2": "Криптобокс NaCL в каждой очереди для предотвращения корреляции трафика между очередями сообщений, в случае компрометации TLS.",
-    "contact-hero-p-1": "Открытые ключи и адрес очереди сообщений по этой ссылке НЕ отправляются по сети при просмотре этой страницы &mdash; они содержатся в хэш-фрагменте URL-адреса ссылки.",
+    "simplex-private-card-1-point-2": "NaCL cryptobox в каждой очереди для предотвращения корреляции трафика между очередями сообщений, в случае компрометированного TLS.",
+    "contact-hero-p-1": "Публичные ключи и адрес очереди сообщений в этой ссылке НЕ отправляются по сети при просмотре этой страницы &mdash; они содержатся в хэш-фрагменте URL-адреса ссылки.",
     "guide-dropdown-5": "Управление данными",
     "scan-the-qr-code-with-the-simplex-chat-app": "Отсканируйте QR-код с помощью приложения SimpleX Chat",
-    "simplex-private-card-9-point-2": "Это уменьшает векторы атак и доступные метаданные, по сравнению с традиционными посредниками для доставки сообщений.",
+    "simplex-private-card-9-point-2": "Это уменьшает векторы атак и доступные метаданные, по сравнению с традиционными серверами доставки сообщений.",
     "simplex-unique-card-3-p-2": "Сквозные зашифрованные сообщения временно хранятся на серверах SimpleX до получения, после чего они удаляются безвозвратно.",
-    "feature-7-title": "Портативное, зашифрованное хранилище в приложении &mdash; можно перенести профиль на другое устройство",
-    "no-federated": "Нет - федеративный",
-    "hero-2-header": "Как начать общаться приватно",
+    "feature-7-title": "Зашифрованное база данных &mdash; Вы можете перенести профиль на другое устройство",
+    "no-federated": "Нет - федеративные",
+    "hero-2-header": "Установите конфиденциальное соединение",
     "simplex-unique-overlay-card-3-p-3": "В отличие от серверов федеративных сетей (электронной почты, XMPP или Matrix), серверы SimpleX не хранят учетные записи пользователей, они только ретранслируют сообщения, защищая конфиденциальность обеих сторон.",
-    "hero-subheader": "Первый мессенджер<br>не нуждающийся в идентификаторах<br>пользователя",
-    "privacy-matters-overlay-card-3-p-2": "Одна из самых шокирующих историй - это опыт <a href='https://ru.wikipedia.org/wiki/Слахи,_Мохаммед_Ульд' target='_blank'>Слахи, Мохаммеда Ульда</a>, описанный в его мемуарах и показанный в фильме <a href='https://ru.wikipedia.org/wiki/Мавританец' target='_blank'>Мавританец</a>. Он был помещен в лагерь Гуантанамо без суда и следствия и подвергался там пыткам в течение 15 лет после телефонного звонка своему родственнику в Афганистан под подозревается в причастности к терактам 11 сентября, хотя предыдущие 10 лет он жил в Германии.",
-    "signing-key-fingerprint": "Отпечаток ключа подписи (SHA-256)",
+    "hero-subheader": "Первый мессенджер<br>без идентификаторов пользователей",
+    "privacy-matters-overlay-card-3-p-2": "Одна из самых шокирующих историй &mdash; это опыт <a href='https://ru.wikipedia.org/wiki/Слахи,_Мохаммед_Ульд' target='_blank'>Слахи, Мохаммеда Ульда</a>, описанный в его мемуарах и показанный в фильме <a href='https://ru.wikipedia.org/wiki/Мавританец' target='_blank'>Мавританец</a>. Он был помещен в лагерь Гуантанамо без суда и следствия и подвергался там пыткам в течение 15 лет после телефонного звонка своему родственнику в Афганистане, из за подозрения в причастности к терактам 11 сентября, хотя предыдущие 10 лет он жил в Германии.",
+    "signing-key-fingerprint": "Идентификатор ключа подписи (SHA-256)",
     "simplex-network-2-desc": "Серверные узлы SimpleX НЕ хранят профили пользователей, контакты и доставленные сообщения, НЕ подключаются друг к другу, и НЕ имеют каталога серверов.",
     "simplex-privacy": "Конфиденциальность SimpleX",
     "docs-dropdown-5": "Свой XFTP Сервер",
-    "simplex-private-card-3-point-2": "Отпечаток сервера и привязка канала предотвращают MITM атаки и Атаки повторного воспроизведения.",
+    "simplex-private-card-3-point-2": "Идентификатор сервера и привязка к TLS сессии предотвращают атаки перехвата (MITM) и повторного использования.",
     "docs-dropdown-3": "Доступ к в базе данных чата",
     "installing-simplex-chat-to-terminal": "Установка SimpleX Chat в терминале",
     "use-this-command": "Используйте эту команду:",
-    "simplex-explained": "Простое объяснение вкратце",
+    "simplex-explained": "Как SimpleX работает",
     "to-make-a-connection": "Чтобы установить соединение:",
-    "comparison-section-list-point-6": "Хотя P2P распределены, они не являются федеративными, то есть P2P - работают как единая сеть",
-    "hero-overlay-2-textlink": "Как работает SimpleX?",
+    "comparison-section-list-point-6": "Хотя P2P распределены, они не являются федеративными, то есть P2P &mdash; работают как единая сеть",
+    "hero-overlay-2-textlink": "Как SimpleX работает?",
     "simplex-chat-via-f-droid": "SimpleX Chat в F-Droid",
-    "privacy-matters-overlay-card-1-p-1": "Многие крупные компании используют информацию о том, с кем вы связаны, чтобы оценить ваш доход, продавать вам больше товаров, которые вам на самом деле не нужны, и определять из этой информации, выгодные для них цены.",
-    "privacy-matters-1-overlay-1-title": "Конфиденциальность экономит ваши деньги",
-    "simplex-private-card-5-point-1": "SimpleX использует заполнение содержимого для каждого уровня шифрования, чтобы предотвратить атаки на размер сообщения.",
-    "privacy-matters-2-overlay-1-linkText": "Конфиденциальность дает вам власть",
-    "hero-overlay-3-title": "Оценка безопасности",
-    "enter-your-email-address": "Email адрес",
-    "simplex-explained-tab-1-text": "1. Как это видят пользователи",
+    "privacy-matters-overlay-card-1-p-1": "Многие крупные компании используют информацию о том, с кем Вы связаны, чтобы оценить Ваш доход, продавать Вам больше товаров, которые Вам на самом деле не нужны, и определять из этой информации, выгодные для них цены.",
+    "privacy-matters-1-overlay-1-title": "Конфиденциальность экономит Ваши деньги",
+    "simplex-private-card-5-point-1": "SimpleX использует дополнение содержания для каждого уровня шифрования, чтобы скрыть размер сообщений.",
+    "privacy-matters-2-overlay-1-linkText": "Конфиденциальность дает Вам власть",
+    "hero-overlay-3-title": "Аудит безопасности",
+    "enter-your-email-address": "Введите Ваш адрес Email",
+    "simplex-explained-tab-1-text": "1. Что видят пользователи",
     "tap-to-close": "Нажмите, чтобы закрыть",
     "simplex-unique-card-4-p-2": "Вы можете <strong>использовать SimpleX со своими собственными серверами</strong> или с серверами, предоставленными нами &mdash; и при этом подключаться к любому пользователю SimpleX.",
-    "hero-overlay-card-3-p-2": "В ноябре 2022 года Trail of Bits провела обзор криптографии и сетевых компонентов SimpleX. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">Дополнительная информация</a>.",
-    "hero-overlay-card-3-p-3": "В июле 2024 года Trail of Bits провела обзор криптографического дизайна протоколов SimpleX. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Дополнительная информация</a>.",
-    "feature-1-title": "Сообщения зашифрованные E2E-шифрованием<br>с поддержкой markdown и редактированием",
+    "hero-overlay-card-3-p-2": "В ноябре 2022 года Trail of Bits провела аудит криптографии и сетевых компонентов SimpleX. <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">Дополнительная информация</a>.",
+    "hero-overlay-card-3-p-3": "В июле 2024 года Trail of Bits провела аудит криптографического дизайна протоколов SimpleX. <a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">Дополнительная информация</a>.",
+    "feature-1-title": "Сообщения с E2E-шифрованием<br>с форматированием и редактированием",
     "comparison-point-4-text": "Единая или Централизованная сеть",
     "guide-dropdown-9": "Установление соединений",
-    "simplex-unique-1-overlay-1-title": "Полная конфиденциальность вашей личности, профиля, контактов и других метаданных",
-    "hero-overlay-card-2-p-4": "SimpleX защищает от этих атак, поскольку в его конструкции нет никаких идентификаторов пользователей. И, если вы используете режим инкогнито, у вас будет другое отображаемое имя для каждого контакта, что позволит избежать какого-либо пересечения между ними.",
-    "privacy-matters-overlay-card-2-p-2": "Чтобы быть объективным и принимать независимые решения, вам необходимо контролировать свое информационное пространство. Это возможно только в том случае, если вы используете приватную, коммуникационную платформу, которая не имеет доступа к вашему социальному графу.",
-    "hero-overlay-card-2-p-1": "Когда у пользователей есть постоянные идентификаторы, даже если это просто случайное число, например идентификатор сеанса, существует риск того, что провайдер или злоумышленник могут наблюдайте за тем, как подключены пользователи и сколько сообщений они отправляют.",
-    "feature-3-title": "Децентрализованные группы &mdash; только<br>их участники знают, что они существуют",
+    "simplex-unique-1-overlay-1-title": "Полная конфиденциальность Вашей личности, профиля, контактов и метаданных",
+    "hero-overlay-card-2-p-4": "SimpleX защищает от этих атак, поскольку он не использует никакие идентификаторы профилей пользователей. И, если Вы используете режим инкогнито, у Вас будет другое отображаемое имя для каждого контакта, что позволит избежать какого-либо пересечения между ними.",
+    "privacy-matters-overlay-card-2-p-2": "Чтобы быть объективным и принимать независимые решения, необходимо контролировать свое информационное пространство. Это возможно только, если Вы используете конфиденциальную коммуникационную сеть, которая не имеет доступа к контактам Вашей социальной сети.",
+    "hero-overlay-card-2-p-1": "Когда у пользователя есть постоянный идентификатор, даже если это просто случайное число, например Session ID, существует риск того, что провайдер или злоумышленник могут наблюдать за тем, как пользователи соединены и сколько сообщений они отправляют.",
+    "feature-3-title": "Децентрализованные группы &mdash; известные только участникам",
     "glossary": "Глоссарий",
     "simplex-network-overlay-1-title": "Сравнение с протоколами обмена сообщениями P2P",
-    "comparison-section-list-point-7": "Сети P2P либо имеют центральный орган управления, либо вся сеть может быть скомпрометирована",
-    "simplex-unique-overlay-card-4-p-1": "Вы можете <strong>использовать SimpleX со своими собственными серверами</strong> или предоставленными нами серверами, при этом имея возможность общаться с любым пользователем.",
-    "simplex-explained-tab-3-p-1": "Серверы имеют отдельные, Анонимные учётные данные для каждой очереди и не знают, к каким пользователям они принадлежат.",
-    "docs-dropdown-1": "Платформа SimpleX",
-    "hero-overlay-card-1-p-5": "Только клиентские устройства хранят профили пользователей, контакты и группы; сообщения отправляются с двухуровневым, Сквозным шифрованием.",
+    "comparison-section-list-point-7": "Сети P2P либо имеют центральный компонент, либо вся сеть может быть атакована",
+    "simplex-unique-overlay-card-4-p-1": "Вы можете <strong>использовать SimpleX со своими собственными серверами</strong> или с серверами предустановленными в приложении, при этом имея возможность общаться с любым пользователем.",
+    "simplex-explained-tab-3-p-1": "Серверы имеют отдельные, анонимные учётные данные для каждой очереди и не знают, каким пользователям они принадлежат.",
+    "docs-dropdown-1": "Сеть SimpleX",
+    "hero-overlay-card-1-p-5": "Только клиентские устройства хранят профили пользователей, контакты и группы; сообщения отправляются с двухуровневым сквозным шифрованием.",
     "simplex-chat-for-the-terminal": "SimpleX Chat для терминала",
-    "simplex-network-overlay-card-1-li-3": "P2P не решает проблему <a href='https://ru.wikipedia.org/wiki/%D0%90%D1%82%D0%B0%D0%BA%D0%B0_%D0%BF%D0%BE%D1%81%D1%80%D0%B5%D0%B4%D0%BD%D0%B8%D0%BA%D0%B0'>MITM-атаки (Атака посредника)</a>, и большинство существующих реализаций не используют внеполосные сообщения для первоначального обмена ключами. SimpleX использует внеполосные сообщения или, в некоторых случаях, ранее существовавшие защищенные и доверенные соединения для первоначального обмена ключами.",
+    "simplex-network-overlay-card-1-li-3": "P2P не решает проблему <a href='https://ru.wikipedia.org/wiki/%D0%90%D1%82%D0%B0%D0%BA%D0%B0_%D0%BF%D0%BE%D1%81%D1%80%D0%B5%D0%B4%D0%BD%D0%B8%D0%BA%D0%B0'>MITM-атаки (Атака посредника)</a>, и многие сети не используют сообщения вне протокола для первоначального обмена ключами. SimpleX использует сообщения вне протокола или, в некоторых случаях, ранее существовавшие защищенные и доверенные соединения для первоначального обмена ключами.",
     "the-instructions--source-code": "SimpleX Chat.",
     "simplex-network-section-desc": "SimpleX Chat обеспечивает наилучшую конфиденциальность, сочетая преимущества P2P и федеративных сетей.",
-    "privacy-matters-section-subheader": "Сохранение конфиденциальности ваших метаданных &mdash; <span class='text-active-blue'>с кем вы общаетесь</span> &mdash; защищает вас от:",
-    "if-you-already-installed": "Если вы уже установили",
-    "simplex-explained-tab-3-p-2": "Пользователи могут еще больше повысить свою конфиденциальность скрыв свой IP-адрес, например используя сеть Tor для доступа к серверам.",
-    "join": "Присоединяйся к",
-    "privacy-matters-section-header": "Почему приватность <span class='gradient-text'>важна</span>",
-    "hero-overlay-1-textlink": "Почему идентификаторы пользователя - вредны для приватности?",
+    "privacy-matters-section-subheader": "Сохранение конфиденциальности Ваших метаданных &mdash; <span class='text-active-blue'>с кем Вы общаетесь</span> &mdash; защищает Вас от:",
+    "if-you-already-installed": "Если Вы уже установили",
+    "simplex-explained-tab-3-p-2": "Пользователи могут повысить свою конфиденциальность используя сеть Tor для доступа к серверам.",
+    "join": "Присоединяйтесь к",
+    "privacy-matters-section-header": "Почему конфиденциальность <span class='gradient-text'>важна</span>",
+    "hero-overlay-1-textlink": "Почему идентификаторы пользователя уменьшают конфиденциальность?",
     "on-this-page": "На этой странице",
     "privacy-matters-overlay-card-1-p-2": "Интернет-магазины знают, что люди с более низкими доходами с большей вероятностью совершают срочные покупки, поэтому они могут устанавливать более высокие цены или отменять скидки.",
-    "simplex-unique-3-overlay-1-title": "Контроль и безопасность ваших данных",
+    "simplex-unique-3-overlay-1-title": "Контроль и безопасность Ваших данных",
     "protocol-3-text": "Протоколы P2P",
-    "simplex-private-card-6-point-2": "Чтобы предотвратить это, приложения SimpleX передают одноразовые ключи внеполосно, когда вы делитесь адресом в виде ссылки или QR-кода.",
+    "simplex-private-card-6-point-2": "Чтобы предотвратить это, приложения SimpleX передают одноразовые ключи вне протокола, когда Вы делитесь адресом в виде ссылки или QR-кода.",
     "no": "Нет",
-    "contact-hero-header": "Вы получили адрес для подключения в SimpleX Chat",
+    "contact-hero-header": "Вы получили адрес контакта для соединения в SimpleX Chat",
     "feature-8-title": "Режим инкогнито &mdash;<br>уникальный для SimpleX Chat",
-    "why-simplex": "Что делает SimpleX уникальным",
+    "why-simplex": "Почему SimpleX",
     "simplex-private-card-4-point-2": "Чтобы использовать SimpleX через сеть Tor, пожалуйста, установите <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">приложение Orbot</a> и включите прокси (или режим VPN <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">на iOS</a>).",
-    "contact-hero-subheader": "Отсканируйте QR-код с помощью приложения SimpleX Chat на вашем телефоне или планшете.",
+    "contact-hero-subheader": "Отсканируйте QR-код с помощью приложения SimpleX Chat на Вашем телефоне или планшете.",
     "simplex-unique-2-overlay-1-title": "Лучшая защита от спама и злоупотреблений",
-    "simplex-private-6-title": "Внеполосный<br>Обмен ключами",
-    "join-us-on-GitHub": "Присоединяйтесь к нам на GitHub",
+    "simplex-private-6-title": "Обмен ключами<br>вне протокола",
+    "join-us-on-GitHub": "Присоединяйтесь на GitHub",
     "comparison-section-header": "Сравнение с другими протоколами",
-    "invitation-hero-header": "Вы получили одноразовую ссылку для подключения в SimpleX Chat",
-    "no-secure": "Нет - безопасно",
-    "hero-overlay-card-1-p-2": "Для доставки сообщений вместо идентификаторов пользователей, используемых всеми другими платформами, SimpleX использует временные, анонимные, попарные идентификаторы очередей сообщений, отдельно для каждого из ваших контактов &mdash; нет долгосрочных идентификаторов.",
+    "invitation-hero-header": "Вы получили одноразовую ссылку для соединения в SimpleX Chat",
+    "no-secure": "Нет - безопасный",
+    "hero-overlay-card-1-p-2": "Для доставки сообщений вместо идентификаторов пользователей, используемых другими сетями, SimpleX использует временные, анонимные, парные идентификаторы очередей сообщений, отдельные для каждого Вашего контакта &mdash; без долгосрочных идентификаторов.",
     "simplex-explained-tab-1-p-2": "Как это может работать с однонаправленными очередями и без идентификаторов профиля пользователя?",
     "simplex-network-1-header": "В отличие от P2P-сетей",
     "jobs": "Присоединиться к команде",
     "simplex-private-card-7-point-2": "Если какое-либо сообщение будет добавлено, удалено или изменено, получатель будет предупрежден об этом.",
-    "simplex-unique-3-title": "Только вы контролируете<br>свои данные",
+    "simplex-unique-3-title": "Только Вы контролируете<br>Ваши данные",
     "guide-dropdown-3": "Секретные группы",
     "no-resilient": "Нет - устойчив",
-    "hide-info": "Спрятать информацию",
+    "hide-info": "Скрыть информацию",
     "privacy-matters-overlay-card-3-p-4": "Недостаточно просто использовать мессенджер со сквозным шифрованием, мы все должны использовать мессенджеры, которые защищают конфиденциальность наших личных сетей &mdash; с какими людьми мы связаны.",
-    "releases-to-this-repo-are-done-1-2-days-later": "Выпуск новых версий в этом репозитории выходит с задержкой в несколько дней",
+    "releases-to-this-repo-are-done-1-2-days-later": "Новые версии в этом репозитории публикуются с задержкой в несколько дней",
     "comparison-point-1-text": "Требуется глобальный идентификатор",
     "comparison-section-list-point-5": "Не защищает конфиденциальность пользовательских метаданных",
-    "hero-overlay-card-2-p-2": "Затем они могли бы сопоставить эту информацию с существующими общедоступными социальными сетями и определить некоторые реальные личности.",
-    "privacy-matters-overlay-card-1-p-3": "Некоторые финансовые и страховые компании используют социальные графики для определения процентных ставок и премий. Это часто заставляет людей с более низкими доходами платить больше &mdash; это известно как <a href='https://fairbydesign.com/povertypremium/' target='_blank'>\"премия за бедность\"</a>.",
+    "hero-overlay-card-2-p-2": "Эта информация может быть сопоставлена с социальными сетями, чтобы определить реальные личности пользователей.",
+    "privacy-matters-overlay-card-1-p-3": "Некоторые финансовые и страховые компании используют социальные сети для определения процентных ставок и премий. Это часто заставляет людей с более низкими доходами платить больше &mdash; это известно как <a href='https://fairbydesign.com/povertypremium/' target='_blank'>\"наценка за бедность\"</a>.",
     "comparison-point-3-text": "Зависимость от DNS",
     "yes": "Да",
     "docs-dropdown-6": "Сервера WebRTC",
     "newer-version-of-eng-msg": "Существует более новая версия этой страницы на английском языке.",
     "install-simplex-app": "Установите приложение SimpleX",
-    "hero-overlay-3-textlink": "Оценка безопасности",
+    "hero-overlay-3-textlink": "Аудит безопасности",
     "comparison-point-2-text": "Возможность MITM",
-    "scan-the-qr-code-with-the-simplex-chat-app-description": "Открытые ключи и адрес очереди сообщений, указанные в этой ссылке, НЕ отправляются по сети при просмотре этой страницы &mdash;<br> они содержатся в хэш-фрагменте URL-адреса ссылки.",
+    "scan-the-qr-code-with-the-simplex-chat-app-description": "Публичные ключи и адрес очереди сообщений, указанные в этой ссылке, НЕ отправляются по сети при просмотре этой страницы &mdash;<br> они содержатся в хэш-фрагменте URL-адреса ссылки.",
     "guide-dropdown-8": "Настройки приложения",
-    "simplex-explained-tab-2-p-2": "Серверы передают сообщения только в одну сторону, не имея полной картины общения пользователя или подключений.",
+    "simplex-explained-tab-2-p-2": "Серверы передают сообщения только в одну сторону, не имея полной информации о разговорах и контактах пользователя.",
     "smp-protocol": "Протокол SMP",
     "open-simplex-app": "Откройте приложение SimpleX",
     "see-simplex-chat": "Инструкции по загрузке или компиляции SimpleX Chat из исходного кода приведены в",
     "terminal-cli": "Приложение для терминала (CLI)",
     "comparison-section-list-point-1": "Обычно требуется номера телефона, в некоторых случаях — имя пользователя",
-    "simplex-explained-tab-3-text": "3. Что видят сервера",
-    "github-repository": "репозиторий Github",
+    "simplex-explained-tab-3-text": "3. Что видят серверы",
+    "github-repository": "репозитории GitHub",
     "feature-5-title": "Исчезающие сообщения",
     "connect-in-app": "Подключитесь в приложении",
     "menu": "Меню",
-    "simplex-private-card-4-point-1": "Чтобы защитить свой IP-адрес вы можете подключаться к серверам через сеть Tor или какую-либо другую транспортную оверлейную сеть.",
-    "privacy-matters-3-title": "Судебное преследование не виновных",
-    "comparison-point-5-text": "Атака на центральный компонент или другая сетевая атака",
+    "simplex-private-card-4-point-1": "Чтобы защитить свой IP-адрес Вы можете подключаться к серверам через сеть Tor или какую-либо другую транспортную оверлейную сеть.",
+    "privacy-matters-3-title": "Преследование из-за невиновного общения",
+    "comparison-point-5-text": "Центральный компонент или атака на всю сеть",
     "click-to-see": "Нажать здесь, чтобы увидеть",
-    "donate-here-to-help-us": "Пожертвуйте здесь, чтобы помочь нам",
+    "donate-here-to-help-us": "Пожертвовать",
     "simplex-private-1-title": "2-уровневое<br>сквозное шифрование",
-    "simplex-unique-card-1-p-2": "В отличие от любой другой существующей платформы обмена сообщениями, SimpleX не имеет идентификаторов пользователей &mdash; <strong>нету даже случайных цифр</strong>.",
-    "privacy-matters-2-overlay-1-title": "Конфиденциальность дает вам власть",
-    "simplex-unique-overlay-card-2-p-2": "Хоть злоумышленники и могут использовать постоянный адрес для отправки нежелательных запросов или спама, вы можете легко его изменить или просто удалить, не теряя связи с уже установленными контактами.",
+    "simplex-unique-card-1-p-2": "В отличие от любой другой существующей сети обмена сообщениями, SimpleX не имеет идентификаторов пользователей &mdash; <strong>нет даже случайных цифр</strong>.",
+    "privacy-matters-2-overlay-1-title": "Конфиденциальность дает Вам власть",
+    "simplex-unique-overlay-card-2-p-2": "Хоть злоумышленники и могут использовать постоянный адрес для отправки нежелательных запросов или спама, Вы можете легко его изменить или просто удалить, не теряя связи с уже установленными контактами.",
     "simplex-unique-4-overlay-1-title": "Полностью децентрализованная &mdash; пользователи владеют сетью SimpleX",
     "guide-dropdown-2": "Отправка сообщений",
-    "simplex-network-overlay-card-1-li-5": "Все известные P2P-сети могут быть уязвимы для <a href='https://ru.wikipedia.org/wiki/Sybil_attack'>Атаки Сивиллы</a>, поскольку каждый узел доступен для обнаружения, и сеть работает как единое целое. Известные меры по его смягчению требуют либо централизованного компонента, либо дорогостоящего <a href='https://ru.wikipedia.org/wiki/Proof-of-work'>Proof-of-work</a>. Сеть SimpleX не имеет функционала по обмену серверами, она фрагментирована и работает как множество изолированных подсетей, из-за чего провести атаку по всей сети - невозможно.",
-    "simplex-private-2-title": "Дополнительный уровень<br>шифрования сервера",
-    "hero-overlay-card-1-p-4": "Такая конструкция предотвращает утечку любых пользовательских метаданных на уровне приложения. Для дальнейшего улучшения конфиденциальности и защиты вашего IP-адреса вы можете подключиться к серверам обмена сообщениями через сеть Tor.",
+    "simplex-network-overlay-card-1-li-5": "Все известные P2P-сети могут быть уязвимы для <a href='https://ru.wikipedia.org/wiki/Sybil_attack'>Атаки Сивиллы</a>, поскольку каждый узел доступен для обнаружения, и сеть работает как единое целое. Известные меры по уменьшению риска требуют либо централизованного компонента, либо дорогостоящего <a href='https://ru.wikipedia.org/wiki/Proof-of-work'>Proof-of-work</a>. Сеть SimpleX не позволяет обнаруживать серверы, она фрагментирована и работает как множество изолированных подсетей, из-за чего провести атаку на всю сеть невозможно.",
+    "simplex-private-2-title": "Дополнительный уровень<br>шифрования с сервером",
+    "hero-overlay-card-1-p-4": "Этот подход предотвращает утечку любых пользовательских метаданных на уровне приложения. Для дальнейшего улучшения конфиденциальности и защиты Вашего IP-адреса Вы можете подключиться к серверам обмена сообщениями через сеть Tor.",
     "f-droid-org-repo": "Репозиторий F-Droid.org",
     "guide-dropdown-4": "Профили чата",
     "simplex-network-2-header": "В отличие от федеративных сетей",
-    "see-here": "подробней тут",
-    "simplex-private-3-title": "Безопасный аутентифицированный<br>протокол TLS",
-    "comparison-section-list-point-3": "Открытый ключ или какой-либо другой глобально уникальный идентификатор",
-    "hero-overlay-card-2-p-3": "Даже в самых приватных приложениях, использующих скрытые сервисы Tor v3, если вы общаетесь с двумя разными контактами через один и тот же профиль, они могут доказать, что они являются связаны с одним и тем же человеком.",
-    "simplex-private-4-title": "Вариант доступа<br>через сеть Tor",
+    "see-here": "подробнее здесь",
+    "simplex-private-3-title": "Безопасное аутентифицированное<br>соединение TLS",
+    "comparison-section-list-point-3": "Публичный ключ или какой-либо другой глобально уникальный идентификатор",
+    "hero-overlay-card-2-p-3": "Даже в самых конфиденциальных приложениях, использующих скрытые адреса Tor, если Вы общаетесь с двумя разными контактами через один и тот же профиль, они могут доказать, что они связаны с одним и тем же человеком.",
+    "simplex-private-4-title": "Возможен доступ<br>через сеть Tor",
     "privacy-matters-1-title": "Реклама и ценовая дискриминация",
     "simplex-unique-card-3-p-1": "SimpleX хранит все пользовательские данные на клиентских устройствах в <strong>портативном формате зашифрованной базы данных</strong> &mdash; их можно перенести на другое устройство.",
-    "hero-overlay-1-title": "Как работает SimpleX?",
+    "hero-overlay-1-title": "Как SimpleX работает?",
     "stable-versions-built-by-f-droid-org": "Стабильные версии, созданные F-Droid.org",
-    "contact-hero-p-3": "Воспользуйтесь ссылками ниже, чтобы загрузить приложение.",
+    "contact-hero-p-3": "Используйте ссылки ниже, чтобы загрузить приложение.",
     "simplex-network": "Сеть SimpleX",
-    "privacy-matters-3-overlay-1-title": "Конфиденциальность защищает вашу свободу",
+    "privacy-matters-3-overlay-1-title": "Конфиденциальность защищает Вашу свободу",
     "docs-dropdown-7": "Перевести SimpleX Chat",
     "back-to-top": "Вернуться к началу",
     "simplex-network-1-desc": "Все сообщения отправляются через серверы, что обеспечивает лучшую конфиденциальность метаданных и надежную асинхронную доставку сообщений, избегая при этом многих",
     "simplex-chat-repo": "Репозиторий SimpleX Chat",
-    "simplex-private-card-6-point-1": "Многие коммуникационные платформы уязвимы для MITM-атак со стороны серверов или сетевых провайдеров.",
-    "privacy-matters-3-overlay-1-linkText": "Конфиденциальность защищает вашу свободу",
-    "simplex-unique-overlay-card-1-p-2": "Для доставки сообщений SimpleX использует <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>попарные, анонимные адреса</a> однонаправленных очередей сообщений, раздельные для полученных и отправленных сообщений, обычно через разные серверы. Использование SimpleX это как иметь <strong>отдельный &ldquo;одноразовый&rdquo; адрес электронной почты или номер телефона для каждого контакта</strong>, при это, не обременяя вас управлять эти вручную.",
-    "simplex-unique-overlay-card-3-p-4": "Со стороны не видно разницу между отправлением или получением сообщений &mdash; если кто-то наблюдает за этим, он не cможет легко определить, кто с кем общается, даже если протокол TLS будет скомпрометирован.",
+    "simplex-private-card-6-point-1": "Многие коммуникационные сети уязвимы для MITM-атак со стороны серверов или сетевых провайдеров.",
+    "privacy-matters-3-overlay-1-linkText": "Конфиденциальность защищает Вашу свободу",
+    "simplex-unique-overlay-card-1-p-2": "Для доставки сообщений SimpleX использует <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>попарные, анонимные адреса</a> однонаправленных очередей сообщений, раздельные для полученных и отправленных сообщений, обычно через разные серверы.",
+    "simplex-unique-overlay-card-3-p-4": "Со стороны не видно разницы между отправлением или получением сообщений &mdash; если кто-то наблюдает за этим, он не cможет легко определить, кто с кем общается, даже если протокол TLS будет скомпрометирован.",
     "docs-dropdown-2": "Доступ к файлам в версии для Android",
-    "get-simplex": "Скачать SimpleX <a href=\"/downloads/#desktop-app\">для ПК</a>",
-    "privacy-matters-overlay-card-3-p-1": "Каждый должен заботиться о конфиденциальности и безопасности своих коммуникаций &mdash; безобидные разговоры могут подвергнуть вас опасности, например за ваши политические взгляды, даже если кажется, что вам \"нечего скрывать\".",
+    "get-simplex": "Скачать SimpleX <a href=\"/downloads/#desktop-app\">для компьютера</a>",
+    "privacy-matters-overlay-card-3-p-1": "Каждый должен заботиться о конфиденциальности и безопасности своих коммуникаций &mdash; безобидные разговоры могут подвергнуть Вас опасности, например за Ваши политические взгляды, даже если кажется, что Вам \"нечего скрывать\".",
     "simplex-unique-2-title": "Вы защищены от<br>спама и злоупотреблений",
-    "simplex-unique-overlay-card-4-p-3": "Если вы рассматриваете возможность разработки платформе SimpleX, например, чат-бота для пользователей SimpleX или интеграции библиотеки SimpleX Chat в ваше мобильное приложение, пожалуйста, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>обращайтесь</a> за любыми советами и поддержкой.",
+    "simplex-unique-overlay-card-4-p-3": "Если Вы рассматриваете возможность разработки для сети SimpleX, например, чат-бота для пользователей SimpleX или интеграции библиотеки SimpleX Chat в Ваше мобильное приложение, пожалуйста, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>обращайтесь</a> за любыми советами и поддержкой.",
     "comparison-section-list-point-2": "Адреса на основе DNS",
     "stable-and-beta-versions-built-by-developers": "Стабильные и бета-версии, созданные разработчиками",
     "simplex-network-3-header": "Сеть SimpleX",
-    "simplex-unique-card-2-p-1": "Поскольку у вас нет идентификатора или фиксированного адреса на платформе SimpleX, никто не сможет связаться с вами, без вашего явного согласия, только если вы сами поделитесь адресом в виде QR-кода или ссылки.",
-    "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> - ведущая консалтинговая компания в области безопасности и технологий, клиентами которой являются крупные технологические компании, правительственные агентства и крупные блокчейн проекты.",
-    "hero-header": "Иной взгляд на приватность",
+    "simplex-unique-card-2-p-1": "Поскольку у Вас нет идентификатора или фиксированного адреса в сети SimpleX, никто не сможет связаться с Вами без Вашего явного согласия mdash; это возможно, только если Вы сами поделитесь адресом в виде QR-кода или ссылки.",
+    "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> &mdash; ведущая консалтинговая компания в области безопасности, клиентами которой являются крупные технологические компании, правительственные агентства и крупные блокчейн проекты.",
+    "hero-header": "Более конфиденциальный",
     "comparison-section-list-point-4": "Если операторы серверов скомпрометированы. В Signal, и некоторых других приложениях, есть возможность подтвердить код безопасности",
-    "simplex-private-card-2-point-1": "Дополнительный уровень серверного шифрования для доставки получателю, чтобы предотвратить корреляцию между полученным и отправленным трафиком сервера, если используемый протокол TLS скомпрометированный.",
-    "f-droid-page-simplex-chat-repo-section-text": "Чтобы добавить его в свой клиент F-Droid, <span class='hide-on-mobile'>отсканируйте QR-код или </span>воспользуйтесь этим URL-адресом:",
-    "guide-dropdown-7": "Приватность и безопасность",
-    "join-the-REDDIT-community": "Присоединяйтесь к нам в сообществе REDDIT",
-    "simplex-private-card-10-point-2": "Это позволяет доставлять сообщения без идентификаторов профиля пользователя, обеспечивая лучшую конфиденциальность метаданных, чем другие альтернативы.",
+    "simplex-private-card-2-point-1": "Дополнительный уровень шифрования между сервером и получателем для предотвращения корреляции полученного и отправленного трафика сервера, в случае компрометированного TLS.",
+    "f-droid-page-simplex-chat-repo-section-text": "Чтобы добавить его в свой клиент F-Droid, <span class='hide-on-mobile'>отсканируйте QR-код или </span>используйте этот адрес:",
+    "guide-dropdown-7": "Конфиденциальность и безопасность",
+    "join-the-REDDIT-community": "Присоединяйтесь в REDDIT",
+    "simplex-private-card-10-point-2": "Это позволяет доставлять сообщения без идентификаторов профиля пользователя, и обеспечивает лучшую конфиденциальность метаданных, чем альтернативы.",
     "privacy-matters-2-title": "Манипулирование выборами",
-    "home": "Домашняя страница",
+    "home": "Главная",
     "chat-protocol": "Протокол чата",
-    "simplex-private-card-5-point-2": "Это позволяет сообщениям разного размера выглядеть одинаково для серверов и сетевых наблюдателей.",
-    "hero-overlay-card-1-p-1": "Многие спрашивают:<em>Если у SimpleX нету никаких идентификаторов пользователя, то как приложение знает, куда доставлять сообщения?</em>",
-    "feature-6-title": "Зашифрованные E2E-шифрованием аудио и видео звонки",
-    "hero-p-1": "Другие приложения имеют ID своих пользователей: Signal, Matrix, Session, Briar, Jami, Cwtch и т. п.<br>SimpleX не имет, <strong>нету даже случайных цифр</strong>.<br>Это значительно повышает вашу приватность.",
-    "simplex-network-overlay-card-1-li-2": "В отличие от многих P2P сетей, SimpleX спроектирован так, чтобы не нуждаться в глобальных идентификаторов его пользователей, даже временных, используя только временные попарные идентификаторы, обеспечивая лучшую анонимность и защиту метаданных пользователя.",
-    "simplex-unique-4-title": "Только вы владеете<br>сетью SimpleX",
+    "simplex-private-card-5-point-2": "Это делает сообщениям разного размера одинаковыми для серверов и сети.",
+    "hero-overlay-card-1-p-1": "Многие спрашивают: <em>Если у SimpleX нет никаких идентификаторов пользователя, то как приложение знает, куда доставлять сообщения?</em>",
+    "feature-6-title": "Аудио и видео звонки с E2E-шифрованием",
+    "hero-p-1": "Другие приложения используют ID пользователей: Signal, Matrix, Session, Briar, Jami, Cwtch и т. п.<br>SimpleX не использует, <strong>даже случайных цифр</strong>.<br>Это значительно повышает Вашу конфиденциальность.",
+    "simplex-network-overlay-card-1-li-2": "В отличие от многих P2P сетей, SimpleX спроектирован так, чтобы не нуждаться в глобальных идентификаторах пользователей, даже временных, используя только временные попарные идентификаторы, обеспечивая лучшую анонимность и защиту метаданных пользователей.",
+    "simplex-unique-4-title": "Вы владеете<br>сетью SimpleX",
     "privacy-matters-overlay-card-3-p-3": "Обычных людей арестовывают за то, чем они делятся в Интернете, даже через свои \"анонимные\" аккаунты, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>даже в демократических странах</a>.",
     "simplex-unique-overlay-card-3-p-2": "Сквозные зашифрованные сообщения временно хранятся на серверах SimpleX до получения, после чего они удаляются безвозвратно.",
-    "blog": "Новости",
-    "simplex-private-card-7-point-1": "Чтобы гарантировать целостность, сообщения последовательно нумеруются и включают в себя хэш предыдущего сообщения.",
-    "simplex-unique-overlay-card-4-p-2": "Платформа SimpleX использует <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>открытый протокол</a> и предоставляет <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK для создания чат-ботов</a>, позволяя внедрять сервисы, с которыми пользователи могут взаимодействовать через приложение SimpleX Chat &mdash; мы с нетерпением ждем возможности увидеть, какие сервисы SimpleX вы сможете создать.",
+    "blog": "Блог",
+    "simplex-private-card-7-point-1": "Для обеспечения неизменности, сообщения нумеруются по порядку и содержат хэш предыдущего сообщения.",
+    "simplex-unique-overlay-card-4-p-2": "Сеть SimpleX использует <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>открытый протокол</a> и предоставляет <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK для создания чат-ботов</a>, позволяя внедрять сервисы, с которыми пользователи могут взаимодействовать через приложение SimpleX Chat &mdash; мы с нетерпением ждем сервисы SimpleX, которые Вы создадите.",
     "simplex-explained-tab-1-p-1": "Вы можете создавать контакты и группы, а также вести двусторонние беседы, как и в любом другом мессенджере.",
     "contact-hero-p-2": "Еще не скачали SimpleX Chat?",
-    "why-simplex-is": "Почему SimpleX",
+    "why-simplex-is-unique": "Почему SimpleX <span class='gradient-text'>уникальный</span>",
     "simplex-network-section-header": "<span class='gradient-text'>Сеть</span> SimpleX",
     "simplex-private-10-title": "Временные анонимные парные идентификаторы",
-    "privacy-matters-1-overlay-1-linkText": "Конфиденциальность экономит ваши деньги",
+    "privacy-matters-1-overlay-1-linkText": "Конфиденциальность экономит Ваши деньги",
     "tap-the-connect-button-in-the-app": "Нажмите на кнопку <span class='text-active-blue'>’подключиться’</span> в приложении",
     "comparison-section-list-point-4a": "Сервера SimpleX не могут скомпрометировать сквозное шифрование",
-    "unique": "уникальный",
     "simplex-network-1-overlay-linktext": "проблем P2P сетей",
-    "no-private": "Нет - приватно",
-    "simplex-unique-1-title": "У вас есть полная<br>конфиденциальность",
+    "no-private": "Нет - конфиденциальный",
+    "simplex-unique-1-title": "У Вас есть полная<br>конфиденциальность",
     "protocol-2-text": "XMPP, Matrix",
     "guide": "Руководство",
-    "simplex-network-overlay-card-1-li-4": "Реализации P2P могут быть заблокированы некоторыми интернет-провайдерами (например, <a href='https://ru.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX не зависит от транспорта - он может работать по стандартным веб-протоколам, например WebSockets.",
-    "hero-overlay-2-title": "Почему идентификаторы пользователя - вредны для приватности?",
+    "simplex-network-overlay-card-1-li-4": "Реализации P2P могут быть заблокированы некоторыми интернет-провайдерами (например, <a href='https://ru.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX протокол не зависит от транспорта &mdash; он может быть реализован через стандартные веб-протоколы, например WebSockets.",
+    "hero-overlay-2-title": "Почему идентификаторы пользователя уменьшают конфиденциальность?",
     "simplex-explained-tab-2-text": "2. Как это работает",
     "docs-dropdown-4": "Свой SMP Сервер",
-    "feature-4-title": "Зашифрованные E2E-шифрованием голосовые сообщения",
-    "privacy-matters-overlay-card-2-p-1": "Не так давно мы наблюдали, как <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>авторитетная консалтинговая компания</a> манипулировала крупными выборами, используя наши социальные графики для искажения нашего мнения из реального мира и манипулируют нашими голосами.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX - это первая платформа, которая по своей конструкции не имеет никаких идентификаторов пользователей, таким образом защищая график ваших контактов лучше, чем любая известная альтернатива.",
-    "learn-more": "Учить больше",
+    "feature-4-title": "Голосовые сообщения с E2E-шифрованием",
+    "privacy-matters-overlay-card-2-p-1": "Не так давно мы наблюдали, как <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>авторитетная консалтинговая компания</a> манипулировала крупными выборами, используя наши контакты в социальных сетях, чтобы изменять наши мнения и манипулировать нашими голосами.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX &mdash; это первая сеть, которая не имеет никаких идентификаторов пользователей, таким образом защищая Ваши контакты лучше, чем любая известная альтернатива.",
+    "learn-more": "Узнать больше",
     "donate": "Пожертвовать",
     "simplex-private-8-title": "Смешивание сообщений<br>для уменьшения корреляции",
     "scan-qr-code-from-mobile-app": "Отсканируйте QR-код в мобильном приложении",
     "simplex-private-card-3-point-3": "Возобновление соединения отключено для предотвращения сеансовых атак.",
-    "simplex-private-card-10-point-1": "SimpleX использует временные анонимные попарные адреса и учетные данные для каждого контакта пользователя или члена группы.",
+    "simplex-private-card-10-point-1": "SimpleX использует временные анонимные парные адреса и учетные данные для каждого контакта пользователя или члена группы.",
     "guide-dropdown-6": "Аудио и видео Звонки",
-    "more-info": "Больше информации",
+    "more-info": "Дополнительная информации",
     "no-decentralized": "Нет - децентрализованный",
     "protocol-1-text": "Signal, большие платформы",
-    "hero-2-header-desc": "В видео показано, как подключиться к своему другу с помощью его одноразового QR-кода, лично или по видеосвязи. Вы также можете подключиться, поделившись ссылкой-приглашением.",
-    "simplex-network-overlay-card-1-li-6": "Сети P2P могут быть уязвимы для <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS атаки</a>, когда клиенты могут ретранслировать и усиливать/увеличивать объём трафика, что приводит к отказу в обслуживании по всей сети. Клиенты SimpleX ретранслируют трафик только из известного соединения и не могут быть использованы злоумышленником для нагрузки трафика всей сети.",
-    "if-you-already-installed-simplex-chat-for-the-terminal": "Если вы уже установили SimpleX Chat для терминала",
+    "hero-2-header-desc": "В видео показано, как подключиться к Вашему другу через одноразовый QR-код, при встрече или во время видеосвязи. Вы также можете соединится, поделившись ссылкой-приглашением.",
+    "simplex-network-overlay-card-1-li-6": "Сети P2P могут быть уязвимы для <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS атаки</a>, когда клиенты могут ретранслировать и увеличивать трафик, что приводит к отказу всей сети. Клиенты SimpleX ретранслируют трафик только из известного соединения и не могут быть использованы злоумышленником для создания трафика во всей сети.",
+    "if-you-already-installed-simplex-chat-for-the-terminal": "Если Вы уже установили SimpleX Chat для терминала",
     "docs-dropdown-8": "Служба Каталогов SimpleX",
-    "simplex-private-card-1-point-1": "Протокол с двойным храповым механизмом &mdash;<br> обмен сообщениями OTR с идеальной секретностью пересылки и восстановлением после взлома.",
+    "simplex-private-card-1-point-1": "Протокол двойного обновления ключей &mdash;<br>\"отрицаемые\" сообщения с идеальной прямой секретностью и восстановлением после взлома.",
     "simplex-private-card-8-point-1": "Серверы SimpleX действуют как узлы-миксеры с низкой задержкой &mdash; входящие и исходящие сообщения имеют разный порядок.",
-    "simplex-unique-overlay-card-2-p-1": "Поскольку у вас нет идентификатора на платформе SimpleX, никто не сможет связаться с вами, если вы сами не предоставите одноразовый или временный адрес в виде QR-кода или ссылки.",
-    "sign-up-to-receive-our-updates": "Введите ваш Email, чтобы получать рассылку обновлений от нас",
+    "simplex-unique-overlay-card-2-p-1": "Поскольку у Вас нет идентификатора в сети SimpleX, никто не сможет связаться с Вами, если Вы сами не предоставите одноразовый или временный адрес в виде QR-кода или ссылки.",
+    "sign-up-to-receive-our-updates": "Подпишитесь на нашу рассылку новостей",
     "guide-dropdown-1": "Быстрый старт",
-    "simplex-explained-tab-2-p-1": "Для каждого подключения вы используете две отдельные очереди обмена сообщениями, то есть отправка и получения сообщений происходит через разные серверы.",
-    "simplex-private-section-header": "Что делает SimpleX <span class='gradient-text'>приватным</span>",
-    "we-invite-you-to-join-the-conversation": "Мы приглашаем вас присоединиться к беседе",
-    "feature-2-title": "Изображения, видео и файлы<br>зашифрованные E2E-шифрованием",
+    "simplex-explained-tab-2-p-1": "Для каждого контакта Вы используете две отдельные очереди сообщений, отправляя и получая сообщения через разные серверы.",
+    "simplex-private-section-header": "Что делает SimpleX <span class='gradient-text'>конфиденциальным</span>",
+    "we-invite-you-to-join-the-conversation": "Мы приглашаем Вас присоединиться к разговору",
+    "feature-2-title": "Изображения, видео и файлы<br>с E2E-шифрованием",
     "simplex-private-9-title": "Однонаправленные<br>очереди сообщений",
-    "simplex-unique-overlay-card-1-p-3": "Этот дизайн защищает конфиденциальность того, с кем вы общаетесь, скрывая это от серверов SimpleX и от любых наблюдателей из вне. Чтобы скрыть свой IP-адрес от серверов, вы можете <strong>подключиться к серверам SimpleX через сеть Tor</strong>.",
+    "simplex-unique-overlay-card-1-p-3": "Этот дизайн защищает конфиденциальность Ваших контактов, скрывая их от серверов SimpleX и от любых внешних наблюдателей. Чтобы скрыть свой IP-адрес от серверов, Вы можете <strong>подключиться к серверам SimpleX через сеть Tor</strong>.",
     "developers": "Разработчики",
-    "simplex-private-7-title": "Проверка целостности<br>сообщения",
-    "privacy-matters-overlay-card-1-p-4": "Платформа SimpleX защищает конфиденциальность ваших контактов лучше, чем любая другая альтернатива, полностью предотвращая доступ к вашему социальному графику каким-либо компаниям или организациям. Даже когда люди используют серверы, предоставляемые SimpleX Chat, мы не знаем точное количество пользователей или с кем они общаются.",
-    "hero-overlay-card-1-p-6": "Подробнее читайте в <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>техническом документе SimpleX</a>.",
+    "simplex-private-7-title": "Проверка неизменности<br>сообщений",
+    "privacy-matters-overlay-card-1-p-4": "Сеть SimpleX защищает конфиденциальность Ваших контактов лучше, чем альтернативы, предотвращая доступ к Вашей социальной сети каким-либо компаниям или организациям. Даже когда люди используют серверы, предоставляемые SimpleX Chat, мы не знаем точное количество пользователей или с кем они общаются.",
+    "hero-overlay-card-1-p-6": "Подробнее читайте в <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>техническом описании SimpleX</a>.",
     "simplex-network-overlay-card-1-p-1": "Протоколы и приложения для обмена сообщениями <a href='https://ru.wikipedia.org/wiki/Peer-to-peer'>P2P</a> имеют различные проблемы, которые делают их менее надежными, чем SimpleX, более сложными для анализа и уязвимыми для нескольких типов атак.",
     "terms-and-privacy-policy": "Политика Конфиденциальности",
-    "simplex-network-overlay-card-1-li-1": "Сети P2P полагаются на тот или иной вариант <a href='https://ru.wikipedia.org/wiki/Distributed_hash_table'>DHT</a> для маршрутизации сообщений. Проекты DHT должны обеспечивать баланс между гарантией доставки и задержкой. SimpleX имеет как лучшую гарантию доставки, так и меньшую задержку, чем P2P. В сетях P2P сообщение передается через нескольких узлов, последовательно, кол-во узлов-посредников будет расти параллельно размеру сети - <em>O(log N)</em>.",
-    "privacy-matters-section-label": "Убедитесь, что ваш мессенджер не может получить доступ к вашим данным!",
+    "simplex-network-overlay-card-1-li-1": "Сети P2P используют <a href='https://ru.wikipedia.org/wiki/Distributed_hash_table'>DHT</a> (распределенные хэш-таблицы) для маршрутизации сообщений. DHT должны обеспечивать баланс между гарантией доставки и задержкой. SimpleX имеет как лучшую гарантию доставки, так и меньшую задержку, чем P2P. В сетях P2P сообщение передается через нескольких узлов, последовательно, кол-во узлов-посредников будет расти параллельно размеру сети &mdash; <em>O(log N)</em>.",
+    "privacy-matters-section-label": "Убедитесь, что Ваш мессенджер не может получить доступ к Вашим данным!",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat хранит все пользовательские данные на клиентских устройствах в <strong>портативном формате зашифрованной базы данных</strong> которую можно перенести на другое устройство.",
     "simplex-network-3-desc": "серверы предоставляют <span class='text-active-blue'>однонаправленные очереди</span> для подключения пользователей, но у них нет видимости графика сетевых подключений &mdash; это делают только пользователи.",
-    "simplex-unique-card-1-p-1": "SimpleX защищает конфиденциальность вашего профиля, контактов и метаданных, скрывая их от серверов платформы SimpleX и любых наблюдателей.",
-    "simplex-private-card-3-point-1": "Для соединений клиент-сервер используется только протокол TLS 1.2/1.3 с надежными алгоритмами.",
-    "simplex-unique-card-4-p-1": "Сеть SimpleX полностью децентрализована и независима от любой криптовалюты/блокчейна или любой другой платформы, кроме Интернета.",
-    "features": "Возможности",
-    "hero-overlay-card-1-p-3": "Вы определяете, какие серверы будете использовать для получения сообщений, а ваши контакты &mdash; серверы, которые вы используете для отправки им сообщений. Каждый новый чат, скорее всего, будет вестись на двух разных серверах.",
+    "simplex-unique-card-1-p-1": "SimpleX защищает конфиденциальность Вашего профиля, контактов и метаданных, скрывая их от серверов сети SimpleX и любых наблюдателей.",
+    "simplex-private-card-3-point-1": "Для соединений клиента и сервера используется только протокол TLS 1.2/1.3 с безопасными алгоритмами.",
+    "simplex-unique-card-4-p-1": "Сеть SimpleX полностью децентрализована и независима от любой криптовалюты/блокчейна или любой другой сети, кроме Интернета.",
+    "features": "Функции",
+    "hero-overlay-card-1-p-3": "Вы определяете, какие серверы использовать для получения сообщений, а Ваши контакты &mdash; серверы, которые Вы используете для отправки им сообщений. Каждый новый чат, скорее всего, будет вестись на двух разных серверах.",
     "docs-dropdown-9": "Скачать",
     "simplex-chat-protocol": "Протокол SimpleX Chat",
-    "simplex-unique-overlay-card-1-p-1": "В отличие от других платформ обмена сообщениями, SimpleX <strong>не имеет идентификаторов, присвоенных пользователям</strong>. Он не полагается на номера телефонов, доменные адреса (например, электронную почту или XMPP), имена пользователей, открытые ключи или даже случайные числа для идентификации своих пользователей &mdash; мы не знаем, сколько людей пользуются нашими SimpleX серверами.",
-    "reference": "Ссылки",
-    "f-droid-page-f-droid-org-repo-section-text": "Приложение SimpleX Chat от разработчиков и от репозитория F-Droid.org имеют разные ключи подписи. Если вы хотите сменить одно на другое, вам сначала нужно будет <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>экспортировать</a> базу данных и только потом скачать другое приложение.",
-    "simplex-private-5-title": "Многоуровневое<br>Заполнения содержимого",
-    "please-use-link-in-mobile-app": "Пожалуйста, воспользуйтесь ссылкой в мобильном приложении",
+    "simplex-unique-overlay-card-1-p-1": "В отличие от других сетей обмена сообщениями, SimpleX <strong>не имеет идентификаторов, присвоенных пользователям</strong>. Он не полагается на номера телефонов, доменные адреса (например, электронную почту или XMPP), имена пользователей, публичные ключи или даже случайные числа для идентификации своих пользователей &mdash; операторы серверов SimpleX не знают, сколько людей пользуются их серверами.",
+    "reference": "Документы",
+    "f-droid-page-f-droid-org-repo-section-text": "Приложение SimpleX Chat от разработчиков и от репозитория F-Droid.org имеют разные ключи подписи. Если Вы хотите сменить одно на другое, Вам сначала нужно будет <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>экспортировать</a> базу данных и только потом скачать другое приложение.",
+    "simplex-private-5-title": "Многоуровневое<br>дополнение сообщений",
+    "please-use-link-in-mobile-app": "Пожалуйста, используйте ссылку в мобильном приложении",
     "please-enable-javascript": "Пожалуйста, включите JavaScript, чтобы увидеть QR-код.",
-    "docs-dropdown-10": "Прозрачность",
+    "docs-dropdown-10": "Запросы данных",
     "docs-dropdown-12": "Безопасность",
-    "docs-dropdown-11": "Часто задаваемые вопросы"
+    "docs-dropdown-11": "Часто задаваемые вопросы",
+    "docs-dropdown-14": "SimpleX для бизнеса"
 }
diff --git a/website/langs/uk.json b/website/langs/uk.json
index 794c65c956..1c1780edb3 100644
--- a/website/langs/uk.json
+++ b/website/langs/uk.json
@@ -14,19 +14,19 @@
     "simplex-network-overlay-card-1-li-6": "P2P-мережі можуть бути вразливими до атаки <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS</a>, коли клієнти можуть ребродкастити та збільшувати трафік, що призводить до відмови в обслуговуванні на рівні всієї мережі. Клієнти SimpleX лише пересилають трафік від відомого підключення і не можуть бути використані зловмисником для збільшення трафіку в усій мережі.",
     "privacy-matters-overlay-card-1-p-2": "Інтернет-роздрібники знають, що люди з низьким доходом частіше роблять термінові покупки, тому вони можуть встановлювати вищі ціни або скасовувати знижки.",
     "privacy-matters-overlay-card-1-p-3": "Деякі фінансові та страхові компанії використовують соціальні графи для визначення ставок та страхових премій. Це часто змушує людей з низькими доходами платити більше &mdash; це відомо як <a href='https://fairbydesign.com/povertypremium/' target='_blank'>'поширений преміум'</a>.",
-    "privacy-matters-overlay-card-1-p-4": "Платформа SimpleX захищає конфіденційність ваших з'єднань краще, ніж будь-яка альтернатива, повністю запобігаючи доступу вашого соціального графа будь-яким компаніям чи організаціям. Навіть коли люди використовують сервери, надані SimpleX Chat, ми не знаємо кількість користувачів чи їх зв'язки.",
+    "privacy-matters-overlay-card-1-p-4": "Мережа SimpleX краще захищає конфіденційність ваших з'єднань, ніж будь-яка інша альтернатива, повністю запобігаючи тому, щоб ваш соціальний граф став доступним для будь-яких компаній чи організацій. Навіть коли люди використовують сервери, попередньо налаштовані в додатках SimpleX Chat, оператори серверів не знають кількості користувачів або їхніх з'єднань.",
     "privacy-matters-overlay-card-2-p-1": "Не так давно ми спостерігали, як великі вибори маніпулювалися <a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>поважною консалтинговою компанією</a>, яка використовувала наші соціальні графи для спотворення нашого уявлення про реальний світ та маніпулювання нашими голосами.",
-    "privacy-matters-overlay-card-2-p-2": "Щоб бути об'єктивним та приймати незалежні рішення, вам потрібно контролювати ваш інформаційний простір. Це можливо лише за умови використання приватної платформи для спілкування, яка не має доступу до вашого соціального графа.",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX - це перша платформа, яка не має жодних ідентифікаторів користувачів за своїм дизайном, таким чином, захищаючи ваш графік з'єднань краще, ніж будь-яка відома альтернатива.",
+    "privacy-matters-overlay-card-2-p-2": "Щоб бути об'єктивним та приймати незалежні рішення, вам потрібно контролювати ваш інформаційний простір. Це можливо лише за умови використання приватної мережі для спілкування, яка не має доступу до вашого соціального графа.",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX - це перша мережа, яка не має жодних ідентифікаторів користувачів за своїм дизайном, таким чином, захищаючи ваш графік з'єднань краще, ніж будь-яка відома альтернатива.",
     "privacy-matters-overlay-card-3-p-1": "Кожен повинен турбуватися про конфіденційність та безпеку свого спілкування &mdash; безпечні розмови можуть поставити вас під загрозу, навіть якщо у вас немає чого приховувати.",
     "privacy-matters-overlay-card-3-p-2": "Однією з найшокуючих історій є досвід <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Мохамеду Ульд Слахі</a>, описаний в його мемуарах і показаний у фільмі \"Мавританець\". Його посадили в табір Гуантанамо без суду і мукили там 15 років після телефонного дзвінка йому родичеві в Афганістані, під підозрою в причетності до атак 11 вересня, навіть не дивлячись на те, що він проживав у Німеччині протягом попередніх 10 років.",
     "privacy-matters-overlay-card-3-p-4": "Недостатньо використовувати зашифрований від кінця до кінця месенджер; ми всі повинні використовувати месенджери, які захищають конфіденційність наших особистих мереж &mdash; з ким ми з'єднані.",
-    "simplex-unique-overlay-card-1-p-1": "На відміну від інших платформ обміну повідомленнями, у SimpleX <strong>не присвоюються ідентифікатори користувачів</strong>. Він не покладається на номери телефонів, адреси на основі домену (наприклад, електронна пошта або XMPP), імена користувачів, публічні ключі або навіть випадкові номери для ідентифікації своїх користувачів &mdash; ми не знаємо, скільки людей використовує наші сервери SimpleX.",
+    "simplex-unique-overlay-card-1-p-1": "На відміну від інших мереж для обміну повідомленнями, у SimpleX <strong>немає ідентифікаторів, призначених користувачам</strong>. Він не покладається на номери телефонів, адреси на основі доменів (як електронна пошта або XMPP), імена користувачів, публічні ключі або навіть випадкові числа для ідентифікації своїх користувачів — оператори серверів SimpleX не знають, скільки людей використовують їхні сервери.",
     "simplex-unique-overlay-card-3-p-3": "На відміну від федеративних мереж серверів (електронна пошта, XMPP або Matrix), сервери SimpleX не зберігають облікові записи користувачів, вони лише ретранслюють повідомлення, захищаючи приватність обох сторін.",
     "simplex-unique-card-3-p-2": "Зашифровані повідомлення від кінця до кінця тимчасово зберігаються на ретрансляційних серверах SimpleX до їх отримання, після чого вони назавжди видаляються.",
-    "simplex-unique-card-4-p-1": "Мережа SimpleX є повністю децентралізованою та незалежною від будь-якої криптовалюти чи іншої платформи, крім Інтернету.",
+    "simplex-unique-card-4-p-1": "Мережа SimpleX повністю децентралізована та незалежна від будь-якої криптовалюти або будь-якої іншої мережі, окрім Інтернету.",
     "simplex-network-overlay-card-1-li-3": "P2P не вирішує проблему атаки <a href='https://en.wikipedia.org/wiki/Man-in-the-middle_attack'>MITM</a>, і більшість існуючих реалізацій не використовують поза каналом повідомлень для початкового обміну ключами. SimpleX використовує поза каналом повідомлень або, у деяких випадках, передбачені і безпечні з'єднання для початкового обміну ключами.",
-    "simplex-network-overlay-card-1-li-4": "Реалізації P2P можуть бути блоковані деякими інтернет-провайдерами (наприклад, <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX є транспортно-агностичним - він може працювати через стандартні веб-протоколи, наприклад, WebSockets.",
+    "simplex-network-overlay-card-1-li-4": "Реалізації P2P можуть бути заблоковані деякими інтернет-провайдерами (наприклад, <a href='https://en.wikipedia.org/wiki/BitTorrent'>BitTorrent</a>). SimpleX є незалежним від транспорту — він може працювати через стандартні веб-протоколи, наприклад, WebSockets.",
     "simplex-unique-card-4-p-2": "Ви можете <strong>використовувати SimpleX з власними серверами</strong> або з серверами, які ми надаємо &mdash; і все одно підключатися до будь-якого користувача.",
     "contact-hero-p-1": "Публічні ключі та адреса черги повідомлень в цьому посиланні НЕ відправляються по мережі під час перегляду цієї сторінки &mdash; вони містяться в хеш-фрагменті URL-посилання.",
     "scan-qr-code-from-mobile-app": "Сканувати QR-код з мобільного додатка",
@@ -46,7 +46,7 @@
     "guide-dropdown-8": "Налаштування додатка",
     "guide-dropdown-9": "Створення підключень",
     "guide": "Посібник",
-    "docs-dropdown-1": "Платформа SimpleX",
+    "docs-dropdown-1": "SimpleX мережа",
     "docs-dropdown-2": "Доступ до файлів Android",
     "docs-dropdown-3": "Доступ до бази даних чату",
     "docs-dropdown-4": "Хостинг сервера SMP",
@@ -71,14 +71,14 @@
     "simplex-explained-tab-1-p-1": "Ви можете створювати контакти та групи і вести двосторонні розмови, як у будь-якому іншому месенджері.",
     "simplex-explained-tab-1-p-2": "Як це може працювати з однобічними чергами та без ідентифікаторів профілю користувача?",
     "simplex-explained-tab-2-p-1": "Для кожного з'єднання ви використовуєте дві окремі черги обміну повідомленнями для відправки та отримання повідомлень через різні сервери.",
-    "simplex-explained-tab-2-p-2": "Сервери передають повідомлення тільки в одному напрямку, не маючи повної картини розмови або підключень користувача.",
+    "simplex-explained-tab-2-p-2": "Сервери передають повідомлення тільки в одному напрямку, не маючи повної картини розмов або підключень користувача.",
     "simplex-explained-tab-3-p-1": "Сервери мають окремі анонімні облікові дані для кожної черги і не знають, які користувачі до них відносяться.",
     "simplex-explained-tab-3-p-2": "Користувачі можуть додатково підвищити конфіденційність метаданих, використовуючи Tor для доступу до серверів, що запобігає кореляції за IP-адресою.",
     "chat-bot-example": "Приклад чат-бота",
     "smp-protocol": "Протокол SMP",
     "chat-protocol": "Протокол чату",
     "donate": "Пожертвувати",
-    "copyright-label": "© 2020-2024 SimpleX | Проект з відкритим кодом",
+    "copyright-label": "© 2020-2025 SimpleX | Проект з відкритим кодом",
     "simplex-chat-protocol": "Протокол чату SimpleX",
     "terminal-cli": "Термінал CLI",
     "hero-header": "Приватність переосмислена",
@@ -116,7 +116,7 @@
     "simplex-private-card-4-point-2": "Для використання SimpleX через Tor, будь ласка, встановіть <a href=\"https://guardianproject.info/apps/org.torproject.android/\" target=\"_blank\">додаток Orbot</a> та активуйте SOCKS5-проксі (або VPN <a href=\"https://apps.apple.com/us/app/orbot/id1609461599?platform=iphone\" target=\"_blank\">на iOS</a>).",
     "simplex-private-card-5-point-1": "SimpleX використовує наповнення вмісту для кожного шару шифрування для ускладнення атак за розміром повідомлень.",
     "simplex-private-card-5-point-2": "Це забезпечує, що повідомлення різних розмірів виглядають однаково для серверів та спостерігачів мережі.",
-    "simplex-private-card-6-point-1": "Багато комунікаційних платформ вразливі до MITM-атак серверів чи постачальників мережі.",
+    "simplex-private-card-6-point-1": "Багато комунікаційних мереж вразливі до MITM-атак серверів чи постачальників мережі.",
     "simplex-private-card-6-point-2": "Щоб запобігти цьому, програми SimpleX передають одноразові ключі позаканально, коли ви ділитесь адресою як посиланням або QR-кодом.",
     "simplex-private-card-7-point-2": "Якщо будь-яке повідомлення додається, вилучається чи змінюється, отримувач буде проінформований.",
     "simplex-private-card-8-point-1": "Сервери SimpleX виступають як вузли низької затримки для змішування &mdash; вхідні та вихідні повідомлення мають різний порядок.",
@@ -140,7 +140,7 @@
     "simplex-unique-4-title": "Ви власник мережі SimpleX",
     "simplex-unique-4-overlay-1-title": "Повністю децентралізована &mdash; користувачі володіють мережею SimpleX",
     "hero-overlay-card-1-p-1": "Багато користувачів запитували: <em>якщо у SimpleX немає ідентифікаторів користувачів, як він може знати, куди відправити повідомлення?</em>",
-    "hero-overlay-card-1-p-2": "Для доставки повідомлень, замість ідентифікаторів користувачів, які використовують усі інші платформи, SimpleX використовує тимчасові анонімні парні ідентифікатори черг повідомлень, окремі для кожного вашого підключення &mdash; тут немає довгострокових ідентифікаторів.",
+    "hero-overlay-card-1-p-2": "Для доставки повідомлень, замість ідентифікаторів користувачів, які використовують усі інші мережі, SimpleX використовує тимчасові анонімні парні ідентифікатори черг повідомлень, окремі для кожного вашого підключення &mdash; тут немає довгострокових ідентифікаторів.",
     "hero-overlay-card-1-p-3": "Ви визначаєте, який(кі) сервер(и) використовувати для отримання повідомлень, ваші контакти &mdash; сервери, які ви використовуєте для відправки повідомлень їм. Кожна розмова, ймовірно, використовує два різних сервери.",
     "hero-overlay-card-1-p-4": "Цей дизайн запобігає витоку метаданих будь-яких користувачів на рівні додатка. Для подальшого покращення конфіденційності та захисту вашої IP-адреси ви можете підключитися до серверів обміну повідомленнями через Tor.",
     "hero-overlay-card-1-p-6": "Докладніше читайте у <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>білетному запису SimpleX</a>.",
@@ -152,19 +152,19 @@
     "simplex-network-overlay-card-1-li-2": "У дизайні SimpleX, на відміну від більшості P2P-мереж, немає жодних глобальних ідентифікаторів користувачів будь-якого виду, навіть тимчасових, та використовуються лише тимчасові парні ідентифікатори, що забезпечує кращу анонімність та захист метаданих.",
     "privacy-matters-overlay-card-1-p-1": "Багато великих компаній використовують інформацію про те, з ким ви з'єднані, щоб оцінити ваш дохід, продавати вам продукти, які вам дійсно не потрібні, і визначати ціни.",
     "privacy-matters-overlay-card-3-p-3": "Звичайних людей арештовують за те, що вони публікують онлайн, навіть через свої 'анонімні' облікові записи, <a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>навіть у демократичних країнах</a>.",
-    "simplex-unique-overlay-card-1-p-2": "Для доставки повідомлень SimpleX використовує <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>парні анонімні адреси</a> однобічних черг повідомлень, окремо для отриманих та відправлених повідомлень, зазвичай через різні сервери. Використання SimpleX схоже на наявність <strong>різної &ldquo;витратної&rdquo; електронної пошти або телефону для кожного контакту</strong>, і немає неприємностей у їх управлінні.",
-    "simplex-unique-overlay-card-1-p-3": "Цей дизайн захищає конфіденційність осіб, з якими ви спілкуєтеся, приховуючи це від серверів платформи SimpleX та будь-яких спостерігачів. Щоб сховати свою IP-адресу від серверів, ви можете <strong>підключитися до серверів SimpleX через Tor</strong>.",
-    "simplex-unique-overlay-card-2-p-1": "Оскільки у вас немає ідентифікатора на платформі SimpleX, ніхто не може з вами зв'язатися, якщо ви не поділитеся одноразовою або тимчасовою адресою користувача, у вигляді QR-коду або посилання.",
+    "simplex-unique-overlay-card-1-p-2": "Для доставки повідомлень SimpleX використовує <a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>парні анонімні адреси</a> однобічних черг повідомлень, окремо для отриманих та відправлених повідомлень, зазвичай через різні сервери.",
+    "simplex-unique-overlay-card-1-p-3": "Цей дизайн захищає конфіденційність того, з ким ви спілкуєтесь, приховуючи це від серверів мережі SimpleX та від будь-яких спостерігачів. Щоб приховати вашу IP-адресу від серверів, ви можете <strong>підключатися до серверів SimpleX через Tor</strong>.",
+    "simplex-unique-overlay-card-2-p-1": "Оскільки у вас немає ідентифікатора в мережі SimpleX, ніхто не може зв'язатися з вами, якщо ви не поділитеся одноразовою або тимчасовою адресою користувача, як QR-кодом або посиланням.",
     "simplex-unique-overlay-card-2-p-2": "Навіть з необов'язковою адресою користувача, яка може бути використана для відправки спамових запитань на зв'язок, ви можете змінити або повністю видалити її, не втрачаючи жодного з ваших з'єднань.",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat зберігає всі дані користувачів лише на пристроях клієнтів за допомогою <strong>переносного зашифрованого формату бази даних</strong>, який можна експортувати і передавати на будь-який підтримуваний пристрій.",
     "simplex-unique-overlay-card-3-p-2": "Зашифровані повідомлення від кінця до кінця тимчасово зберігаються на ретрансляційних серверах SimpleX до їх отримання, після чого вони назавжди видаляються.",
     "simplex-unique-overlay-card-3-p-4": "Між надісланим і отриманим серверним трафіком немає спільних ідентифікаторів чи шифрованого тексту &mdash; якщо хтось його спостерігає, він не може легко визначити, хто спілкується з ким, навіть якщо TLS скомпрометовано.",
-    "simplex-unique-overlay-card-4-p-1": "Ви можете <strong>використовувати SimpleX з власними серверами</strong> і все одно спілкуватися з людьми, які використовують надані нам сервери заздалегідь налаштовані.",
-    "simplex-unique-overlay-card-4-p-2": "Платформа SimpleX використовує <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>відкритий протокол</a> та надає <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK для створення чат-ботів</a>, що дозволяє впроваджувати сервіси, з якими користувачі можуть взаємодіяти через додатки SimpleX Chat &mdash; ми дійсно чекаємо, які сервіси SimpleX ви зможете побудувати.",
-    "simplex-unique-overlay-card-4-p-3": "Якщо ви розглядаєте можливість розробки для платформи SimpleX, наприклад, чат-бота для користувачів додатку SimpleX або інтеграції бібліотеки SimpleX Chat у свої мобільні додатки, будь ласка, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>зв'яжіться з нами</a> для отримання порад та підтримки.",
-    "simplex-unique-card-1-p-1": "SimpleX захищає конфіденційність вашого профілю, контактів та метаданих, приховуючи їх від серверів платформи SimpleX та будь-яких спостерігачів.",
-    "simplex-unique-card-1-p-2": "На відміну від будь-якої іншої існуючої платформи обміну повідомленнями, SimpleX не має ідентифікаторів, призначених користувачам &mdash; <strong>навіть випадкових чисел</strong>.",
-    "simplex-unique-card-2-p-1": "Оскільки у вас немає ідентифікатора або фіксованої адреси на платформі SimpleX, ніхто не може з вами зв'язатися, якщо ви не поділитесь одноразовою або тимчасовою адресою користувача, як QR-код або посиланням.",
+    "simplex-unique-overlay-card-4-p-1": "Ви можете <strong>використовувати SimpleX зі своїми власними серверами</strong> і при цьому спілкуватися з людьми, які використовують сервери, попередньо налаштовані в додатках.",
+    "simplex-unique-overlay-card-4-p-2": "Мережа SimpleX використовує <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>відкритий протокол</a> і надає <a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>SDK для створення чат-ботів</a>, що дозволяє реалізувати сервіси, з якими користувачі можуть взаємодіяти через додатки SimpleX Chat — ми справді чекаємо, щоб побачити, які сервіси SimpleX ви створите.",
+    "simplex-unique-overlay-card-4-p-3": "Якщо ви плануєте розробляти для мережі SimpleX, наприклад, чат-бота для користувачів додатка SimpleX або інтеграцію бібліотеки SimpleX Chat у ваші мобільні додатки, будь ласка, <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>зв'яжіться з нами</a> для отримання порад та підтримки.",
+    "simplex-unique-card-1-p-1": "SimpleX захищає конфіденційність вашого профілю, контактів та метаданих, приховуючи їх від серверів мережі SimpleX та будь-яких спостерігачів.",
+    "simplex-unique-card-1-p-2": "На відміну від будь-якої іншої існуючої мережі для обміну повідомленнями, у SimpleX немає ідентифікаторів, призначених користувачам — <strong>не навіть випадкових чисел</strong>.",
+    "simplex-unique-card-2-p-1": "Оскільки у вас немає ідентифікатора або фіксованої адреси в мережі SimpleX, ніхто не може зв'язатися з вами, якщо ви не поділитеся одноразовою або тимчасовою адресою користувача, як QR-кодом або посиланням.",
     "simplex-unique-card-3-p-1": "SimpleX зберігає всі дані користувачів на пристроях клієнтів у <strong>переносному зашифрованому форматі бази даних</strong> &mdash; його можна передавати на інший пристрій.",
     "join": "Приєднатися",
     "we-invite-you-to-join-the-conversation": "Ми запрошуємо вас приєднатися до розмови",
@@ -174,8 +174,7 @@
     "sign-up-to-receive-our-updates": "Підпишіться, щоб отримувати наші оновлення",
     "enter-your-email-address": "Введіть свою електронну адресу",
     "get-simplex": "Отримати SimpleX <a href=\"/downloads\">додаток для настільних комп'ютерів</a>",
-    "why-simplex-is": "Чому SimpleX є",
-    "unique": "унікальним",
+    "why-simplex-is-unique": "Чому SimpleX є <span class='gradient-text'>унікальним</span>",
     "learn-more": "Дізнатися більше",
     "more-info": "Додаткова інформація",
     "hide-info": "Приховати інформацію",
@@ -192,7 +191,7 @@
     "installing-simplex-chat-to-terminal": "Встановлення SimpleX Chat для терміналу",
     "use-this-command": "Використовуйте цю команду:",
     "see-simplex-chat": "Дивіться SimpleX Chat",
-    "the-instructions--source-code": "інструкції з того, як його завантажити чи скомпілювати з вихідного коду.",
+    "the-instructions--source-code": "для інструкції з того, як його завантажити чи скомпілювати з вихідного коду.",
     "if-you-already-installed-simplex-chat-for-the-terminal": "Якщо ви вже встановили SimpleX Chat для терміналу",
     "if-you-already-installed": "Якщо ви вже встановили",
     "simplex-chat-for-the-terminal": "SimpleX Chat для терміналу",
@@ -228,7 +227,7 @@
     "no-decentralized": "Ні - децентралізовано",
     "comparison-section-list-point-4": "Якщо сервери оператора порушені. Перевірте безпековий код в Signal та деяких інших додатках для зменшення ризику",
     "comparison-section-list-point-5": "Не захищає конфіденційність метаданих користувачів",
-    "comparison-section-list-point-6": "Хоча P2P є розподіленими, вони не є федеративними - вони працюють як єдина мережа",
+    "comparison-section-list-point-6": "Хоча P2P є розподіленими, вони не є федеративними — вони працюють як одна мережа",
     "guide-dropdown-1": "Швидкий старт",
     "guide-dropdown-2": "Відправлення повідомлень",
     "guide-dropdown-3": "Таємні групи",
diff --git a/website/langs/zh_Hans.json b/website/langs/zh_Hans.json
index 836f7057ee..c0b843ca9e 100644
--- a/website/langs/zh_Hans.json
+++ b/website/langs/zh_Hans.json
@@ -24,7 +24,7 @@
     "simplex-network-overlay-card-1-li-2": "与大多数 P2P 网络不同，SimpleX 在设计上没有任何类型的全局用户标识符，甚至临时的也没有。SimpleX 仅使用临时的成对标识符，提供更好的匿名性和元数据保护。",
     "privacy-matters-overlay-card-1-p-1": "许多大型公司会使用您的人际关系来估算您的收入，决定商品的价格，并向您兜售您并不真正需要的产品。",
     "simplex-unique-overlay-card-3-p-4": "发送和接收的服务器流量之间没有共同的标识符或密文—— 如果有人在观察它，他们也无法轻易确定谁与谁通信，即使 TLS 受到威胁。",
-    "simplex-unique-card-4-p-1": "SimpleX 网络是完全去中心化的，并且独立于任何加密货币或除互联网以外的任何其他平台。",
+    "simplex-unique-card-4-p-1": "SimpleX 网络是完全去中心化的，并且独立于任何加密货币或除互联网以外的任何其他网络。",
     "join": "加入",
     "get-simplex": "获取 SimpleX <a href=\"/downloads\">desktop app</a>",
     "hide-info": "隐藏信息",
@@ -49,19 +49,19 @@
     "simplex-explained": "SimpleX 简述",
     "simplex-explained-tab-3-text": "3. 服务器能看到什么",
     "hero-header": "重新定义隐私",
-    "simplex-explained-tab-1-p-2": "它是如何在单向消息队列与没有用户识别符的情况下工作的？",
-    "simplex-explained-tab-2-p-2": "服务器只会单向传输消息，而无法掌握用户的会话或连接的全貌。",
+    "simplex-explained-tab-1-p-2": "它是如何利用单向消息队列并不利用用户识别符工作的？",
+    "simplex-explained-tab-2-p-2": "服务器只会单向传输消息，而无法掌握用户的对话或连接的全貌。",
     "simplex-explained-tab-3-p-1": "服务器对每个队列都有单独的匿名凭证，并且不知道这些凭证属于哪些用户。",
     "donate": "捐赠",
     "simplex-explained-tab-2-p-1": "对于每个连接，您都会使用两个单独的消息队列，通过不同的服务器发送和接收消息。",
     "simplex-chat-protocol": "SimpleX 聊天协议",
     "smp-protocol": "SMP协议",
     "chat-protocol": "聊天协议",
-    "copyright-label": "© 2020-2024 SimpleX | 开源项目",
+    "copyright-label": "© 2020-2025 SimpleX | 开源项目",
     "terminal-cli": "命令行程式",
     "simplex-explained-tab-1-p-1": "您可以创建联系人和群组，并进行双向对话，就像是任何其他即时通讯软件一样。",
     "hero-p-1": "其他应用——如Signal、Matrix、Session、Briar、Jami、Cwtch 等——都需要用户 ID。<br>而SimpleX 不需要用户ID，连<strong>随机生成</strong>的也不需要。<br>这从根本上改善了您的隐私。",
-    "hero-subheader": "首个不使用用户ID的即时通讯软件",
+    "hero-subheader": "首个<br>没有用户ID的即时通讯软件",
     "hero-overlay-2-textlink": "SimpleX 是如何工作的？",
     "hero-2-header-desc": "右侧的视频向您展示了如何通过一次性二维码、面对面交流或通过视频交换链接来连接到您的朋友。您同样可以通过共享邀请链接来进行连接。",
     "hero-overlay-1-title": "SimpleX 是如何工作的？",
@@ -104,7 +104,7 @@
     "simplex-private-card-10-point-1": "SimpleX 为每个用户的联系人或群组成员均使用临时匿名成对地址和凭据。",
     "privacy-matters-3-title": "因无辜结社而被起诉",
     "privacy-matters-2-overlay-1-title": "隐私给您力量",
-    "hero-overlay-card-1-p-2": "为了传递消息，SimpleX 使用消息队列的临时匿名成对标识符(而非其他平台使用的用户 ID)来区分您的每个连接——没有长期标识符这种东西。",
+    "hero-overlay-card-1-p-2": "SimpleX 使用消息队列的临时匿名成对标识符(而非其他网络使用的用户 ID)来传递消息，而每个连接的标识符均不尽相同 &mdash; 没有长期标识符这种东西。",
     "hero-overlay-card-1-p-3": "您定义用于接收消息的服务器、您的联系人—— 您用来向他们发送消息的服务器。 每个会话都很可能会使用两个不同的服务器。",
     "hero-overlay-card-1-p-4": "此设计可防止在应用程序级别泄漏任何用户元数据。 为了进一步改善隐私并保护您的 IP 地址，您可以通过 Tor 连接到消息服务器。",
     "hero-overlay-card-1-p-5": "只有客户端设备存储用户配置文件、联系人和群组； 消息均使用两层端到端加密发送。",
@@ -115,35 +115,35 @@
     "hero-overlay-card-2-p-3": "即使是使用 Tor v3 服务的最私密的应用程序，如果您通过同一个人资料与两个不同的联系人交谈，他们也可以证明他们与同一个人有联系。",
     "hero-overlay-card-2-p-4": "为防止这些攻击，SimpleX 在其设计中不包含任何用户 ID 。 而且，如果您使用隐身模式，您将为每个联系人显示不同的名称，避免他们之间共享任何数据。",
     "simplex-network-overlay-card-1-li-1": "P2P 网络依赖于<a href='https://zh.wikipedia.org/wiki/%E5%88%86%E6%95%A3%E5%BC%8F%E9%9B%9C%E6%B9%8A%E8%A1%A8'> 分布式散列表(DHT) </a> 的某些变体来路由消息。 DHT 在设计上必须平衡可达性和延迟。 SimpleX 比 P2P 具有更好的可达性和更低的延迟，因为消息可以通过通讯双方选择的多个服务器并行地冗余传递。若是在 P2P 网络中，消息则需要使用算法选择，并依次通过 <em>O(log N)</em> 个节点。",
-    "simplex-network-overlay-card-1-li-4": "P2P 实现（如 <a href='https://zh.wikipedia.org/wiki/BitTorrent_(%E5%8D%8F%E8%AE%AE)'>BitTorrent</a>）可能会被某些互联网提供商阻止。 SimpleX 与传输协议无关——它可以在标准网络协议上工作，例如 WebSockets。",
+    "simplex-network-overlay-card-1-li-4": "P2P 实现（如 <a href='https://zh.wikipedia.org/wiki/BitTorrent_(%E5%8D%8F%E8%AE%AE)'>BitTorrent</a>）可能会被某些互联网提供商阻止。 SimpleX 与传输协议无关 &mdash; 它可以在标准网络协议上工作，例如 WebSockets。",
     "simplex-network-overlay-card-1-li-3": "P2P 并未解决<a href='https://zh.wikipedia.org/wiki/%E4%B8%AD%E9%97%B4%E4%BA%BA%E6%94%BB%E5%87%BB'>中间人攻击(MITM Attack)</a> 问题。大多数现有的 P2P 实现没有使用带外通讯来进行初始密钥的交换，而 SimpleX 使用带外通讯，或者在某些情况下，使用预先存在的安全和可信连接来进行初始密钥交换。",
     "simplex-network-overlay-card-1-li-5": "所有已知的 P2P 网络都可能受到 <a href='https://en.wikipedia.org/wiki/Sybil_attack'>Sybil 攻击</a>，因为每个节点都是可发现的，并且网络作为一个整体运行。 已知的缓解措施不是需要一个中心化的组件就是需要昂贵的<a href='https://en.wikipedia.org/wiki/Proof_of_work'>工作量证明</a>。而 SimpleX 网络没有服务器可发现性，它是碎片化的并且作为多个隔离的子网运行，这样全网络范围的攻击便无从实现。",
     "simplex-network-overlay-card-1-li-6": "P2P 网络可能受到 <a href='https://www.usenix.org/conference/woot15/workshop-program/presentation/p2p-file-sharing-hell-exploiting-bittorrent'>DRDoS 攻击</a> 。客户端有能力重新广播和放大流量，从而导致整个网络范围内的服务中断。 SimpleX 客户端仅中继来自已知连接的流量，因此不能被攻击者用来放大整个网络的流量。",
     "privacy-matters-overlay-card-1-p-2": "在线零售商知道收入较低的人更有可能在紧急情况下购买商品，因此他们可能会收取更高的价格或取消折扣。",
     "privacy-matters-overlay-card-1-p-3": "一些金融和保险公司使用社交图谱来确定利率和保费。 它通常会让收入较低的人支付更多—— 它被称为<a href='https://fairbydesign.com/povertypremium/' target='_blank'>“贫困溢价”</a>。",
-    "privacy-matters-overlay-card-1-p-4": "SimpleX 平台比任何替代方案都能更好地保护您人际关系层面的隐私，防止您的社交图谱被任何公司或组织使用。 即使人们使用 SimpleX Chat 提供的服务器，我们也不知道用户数量或他们的连接数。",
+    "privacy-matters-overlay-card-1-p-4": "SimpleX 网络比任何替代方案都能更好地保护您人际关系层面的隐私，防止您的社交图谱被任何公司或组织使用。 即使人们使用 SimpleX Chat 应用预配置的服务器，服务器运营方也不知道用户数量或他们的连接数。",
     "privacy-matters-overlay-card-2-p-1": "不久前，我们观察到几次大选被<a href='https://en.wikipedia.org/wiki/Facebook–Cambridge_Analytica_data_scandal' target='_blank'>一家知名咨询公司</a>操纵，该公司使用我们的社交图谱扭曲我们对现实世界的看法并操纵我们的选票。",
-    "privacy-matters-overlay-card-2-p-2": "为了客观并做出独立的决定，您需要控制您的信息空间。 而这只有当您使用没有能力访问您的社交图谱的，注重隐私的通信平台时，这才有可能。",
-    "privacy-matters-overlay-card-2-p-3": "SimpleX 是第一个没有设计任何用户标识符的平台，这样能比任何已知的替代方案都更好地保护您的连接图谱。",
+    "privacy-matters-overlay-card-2-p-2": "为了客观并做出独立的决定，您需要控制您的信息空间。 而这只有当您使用没有能力访问您的社交图谱的，注重隐私的通信网络时，这才有可能。",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX 是第一个没有设计任何用户标识符的网络，这样能比任何已知的替代方案都更好地保护您的连接图谱。",
     "privacy-matters-overlay-card-3-p-2": "最令人震惊的故事之一是 <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> 在他的回忆录中描述并在毛里塔尼亚电影中展示的经历。 他在未经审判的情况下被关进关塔那摩集中营，并在打电话给他在阿富汗的亲戚后在那里遭受了 15 年的折磨，他被怀疑参与了 9/11 袭击，尽管他在过去 10 年住在德国。",
     "privacy-matters-overlay-card-3-p-1": "每个人都应该关心他们通信的隐私和安全——无害的谈话会让您处于危险之中，即使您没有什么可隐瞒的。",
     "privacy-matters-overlay-card-3-p-3": "普通人会因为他们在网上分享的内容而被捕，即使是通过他们的“匿名”帐户，<a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout -catholic-mother-malicious-online-posts.html' target='_blank'>即使是在民主国家</a>。",
     "privacy-matters-overlay-card-3-p-4": "使用端到端加密的即时通讯软件还不够，我们都应该使用保护我们个人网络隐私——即我们与谁有联系的即时通讯软件。",
-    "simplex-unique-overlay-card-1-p-1": "与其他消息传递平台不同，SimpleX <strong>没有分配给用户的标识符</strong>。 它不依赖电话号码、基于域的地址（如电子邮件或 XMPP）、用户名、公钥甚至随机数来识别其用户—— 我们不知道有多少人使用我们的 SimpleX 服务器。",
-    "simplex-unique-overlay-card-1-p-2": "为了传递消息，SimpleX 使用单向消息队列的<a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>成对匿名地址</a>，通常通过不同的服务器将接收和发送的消息分开。 使用 SimpleX 就像<strong>为每个联系人使用不同的即时电子邮件或电话</strong>，并且无需管理它们。",
-    "simplex-unique-overlay-card-1-p-3": "这种设计保护了您正在与之通信的人的隐私，将其隐藏在 SimpleX 平台服务器和任何观察者之外。 要对服务器隐藏您的 IP 地址，您可以<strong>通过 Tor 连接到 SimpleX 服务器</strong>。",
-    "simplex-unique-overlay-card-4-p-1": "您可以<strong>将 SimpleX 与您自己的服务器一起使用</strong>，并且仍然可以与使用我们提供的预配置服务器的人进行通信。",
+    "simplex-unique-overlay-card-1-p-1": "与其他消息网络不同，SimpleX <strong>没有分配给用户的标识符</strong>。 它不依赖电话号码、基于域的地址（如电子邮件或 XMPP）、用户名、公钥甚至随机数来识别其用户—— SimpleX 服务器运营方不知道有多少人使用其服务器。",
+    "simplex-unique-overlay-card-1-p-2": "为了传递消息，SimpleX 使用单向消息队列的<a href='https://csrc.nist.gov/glossary/term/Pairwise_Pseudonymous_Identifier'>成对匿名地址</a>，通常通过不同的服务器将接收和发送的消息分开。",
+    "simplex-unique-overlay-card-1-p-3": "这种设计保护了您正在与之通信的人的隐私，将其隐藏在 SimpleX 网络的服务器和任何观察者之外。 要对服务器隐藏您的 IP 地址，您可以<strong>通过 Tor 连接到 SimpleX 服务器</strong>。",
+    "simplex-unique-overlay-card-4-p-1": "您可以<strong>将 SimpleX 与您自己的服务器一起使用</strong>，并且仍然可以与使用应用中预配置服务器的人们进行通信。",
     "simplex-unique-card-3-p-2": "端到端加密的消息在被收到前会暂时保存在 SimpleX 中继服务器上，传送完成后它们会被永久删除。",
-    "simplex-unique-card-1-p-1": "SimpleX 保护您的个人资料、联系人和元数据的隐私，将其隐藏在 SimpleX 平台服务器和任何观察者之外。",
-    "simplex-unique-overlay-card-4-p-3": "如果您正在考虑为在SimpleX 平台上开发，例如，为 SimpleX 应用程序用户开发聊天机器人，或将 SimpleX 聊天库集成到您的移动应用程序中，请 <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>联系我们</a> 以获取建议和支持。",
+    "simplex-unique-card-1-p-1": "SimpleX 保护您的个人资料、联系人和元数据的隐私，不让 SimpleX 网络服务器和任何观察者看到它们。",
+    "simplex-unique-overlay-card-4-p-3": "如果您正在考虑为在SimpleX 网络上开发，例如，为 SimpleX 应用程序用户开发聊天机器人，或将 SimpleX 聊天库集成到您的移动应用程序中，请 <a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>联系我们</a> 以获取建议和支持。",
     "simplex-unique-card-4-p-2": "您可以<strong>搭配自己的服务器来使用 SimpleX </strong> 或使用我们提供的服务器 &mdash; 并仍然连接到任何用户。",
-    "simplex-unique-card-2-p-1": "因为您在 SimpleX 平台上没有标识符或固定地址，所以除非您以二维码或链接的形式分享一次性或临时用户地址，没有人可以联系您。",
+    "simplex-unique-card-2-p-1": "因为您在 SimpleX 网络上没有标识符或固定地址，所以除非您以二维码或链接的形式分享一次性或临时用户地址，没有人可以联系您。",
     "simplex-unique-card-3-p-1": "SimpleX 以<strong>便携式加密数据库格式</strong>将所有用户数据存储在客户端设备上—— 它可以转移到另一个设备。",
     "sign-up-to-receive-our-updates": "注册以接收我们的更新",
     "we-invite-you-to-join-the-conversation": "我们邀请您加入对话",
     "enter-your-email-address": "输入您的电子邮箱地址",
     "join-the-REDDIT-community": "加入 REDDIT 社区",
-    "why-simplex-is": "为什么 SimpleX 是",
+    "why-simplex-is-unique": "为什么 SimpleX 是 <span class='gradient-text'>独特的</span>",
     "learn-more": "了解更多",
     "join-us-on-GitHub": "在 GitHub 上加入我们",
     "more-info": "更多信息",
@@ -164,7 +164,7 @@
     "github-repository": "GitHub 仓库",
     "copy-the-command-below-text": "复制下面的命令并在聊天中使用它：",
     "privacy-matters-section-header": "为什么隐私<span class='gradient-text'>很重要</span>",
-    "the-instructions--source-code": "如何从源代码下载或编译它的说明。",
+    "the-instructions--source-code": "如何下载或从源代码下载进行编译的说明。",
     "if-you-already-installed-simplex-chat-for-the-terminal": "如果您已经为终端安装了 SimpleX Chat",
     "if-you-already-installed": "如果您已经安装",
     "simplex-chat-for-the-terminal": "用于终端的 SimpleX Chat",
@@ -197,17 +197,16 @@
     "comparison-section-list-point-4": "如果运营商的服务器受到威胁。 验证 Signal 和其他一些应用程序中的安全代码以缓解该问题",
     "comparison-section-list-point-1": "通常基于电话号码，在某些情况下基于用户名",
     "comparison-section-list-point-2": "基于 DNS 的地址",
-    "comparison-section-list-point-6": "P2P 是分布式的，而非联邦式的 - 它们作为单个网络运行",
+    "comparison-section-list-point-6": "P2P 是分布式的，但并非联邦式的 &mdash; 它们作为单个网络运行",
     "see-here": "参见此处",
     "comparison-section-list-point-7": "P2P 网络要么拥有中央权威，要么整个网络可能被攻陷",
     "simplex-private-card-5-point-1": "SimpleX 为每个加密层进行内容填充来对抗长度扩展攻击。",
-    "simplex-unique-overlay-card-4-p-2": "SimpleX 平台使用<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>开放协议</a>并提供<a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>用于创建聊天机器人的 SDK</a>， 允许用户实现通过 SimpleX Chat 应用程序与之交互的服务—— 我们真的很期待看到您可以依托SimpleX构建哪些服务。",
+    "simplex-unique-overlay-card-4-p-2": "SimpleX 网络使用<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>开放协议</a>并提供<a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>用于创建聊天机器人的 SDK</a>， 允许用户实现通过 SimpleX Chat 应用程序与之交互的服务—— 我们真的很期待看到您会依托SimpleX构建哪些服务。",
     "simplex-unique-overlay-card-2-p-2": "即使使用可选的用户地址，当它被用于发送垃圾邮件联系请求，您可以更改或完全删除它而不会丢失任何连接。",
     "simplex-unique-overlay-card-3-p-1": "SimpleX Chat 使用<strong>便携式加密数据库格式</strong>仅将所有用户数据存储在客户端设备上，该格式可以导出并传输到任何支持的设备。",
     "donate-here-to-help-us": "在这里捐款来帮助我们",
-    "unique": "独特的",
-    "simplex-unique-card-1-p-2": "与任何其他现有的消息传递平台不同，SimpleX 没有分配给用户的标识符—— <strong>甚至随机数也没有</strong>。",
-    "simplex-unique-overlay-card-2-p-1": "因为您在 SimpleX 平台上没有标识符，所以除非您以二维码或链接的形式分享一次性或临时用户地址，没有人可以联系您。",
+    "simplex-unique-card-1-p-2": "与任何其他现有的消息传递网络不同，SimpleX 没有分配给用户的标识符—— <strong>甚至随机数也没有</strong>。",
+    "simplex-unique-overlay-card-2-p-1": "因为您在 SimpleX 网络上没有标识符，所以除非您以二维码或链接的形式分享一次性或临时用户地址，没有人可以联系您。",
     "simplex-unique-overlay-card-3-p-2": "端到端加密的消息在被收到前会暂时保存在 SimpleX 中继服务器上，传送完成后它们会被永久删除。",
     "simplex-unique-overlay-card-3-p-3": "与联合网络服务器（电子邮件、XMPP 或 Matrix）不同，SimpleX 服务器不存储用户帐户，它们仅中继消息，保护双方的隐私。",
     "guide-dropdown-2": "发送消息",
@@ -224,7 +223,7 @@
     "click-to-see": "点击查看",
     "menu": "菜单",
     "guide-dropdown-1": "快速指南",
-    "docs-dropdown-1": "SimpleX 平台",
+    "docs-dropdown-1": "SimpleX 网络",
     "docs-dropdown-5": "托管 XFTP 服务器",
     "newer-version-of-eng-msg": "本页面有较新的英语版本。",
     "guide-dropdown-4": "聊天档案",
diff --git a/website/langs/zh_Hant.json b/website/langs/zh_Hant.json
index 0967ef424b..324360cb19 100644
--- a/website/langs/zh_Hant.json
+++ b/website/langs/zh_Hant.json
@@ -1 +1,206 @@
-{}
+{
+    "home": "开始",
+    "developers": "開發人員",
+    "reference": "參考",
+    "blog": "部落格",
+    "features": "特徵",
+    "why-simplex": "為什麼選擇SimpleX",
+    "simplex-privacy": "SimpleX 隱私",
+    "simplex-network": "SimpleX 網路",
+    "simplex-explained": "SimpleX 解釋",
+    "simplex-explained-tab-1-text": "1. 用戶體驗",
+    "simplex-explained-tab-2-text": "2. 它是如何工作的",
+    "simplex-explained-tab-3-text": "3. 伺服器可以看到什麼",
+    "terminal-cli": "終端 CLI",
+    "hero-header": "重新定義隱私",
+    "hero-subheader": "第一個沒有 User ID 的 Messenger",
+    "simplex-explained-tab-3-p-2": "用戶可以通過使用 Tor 訪問伺服器來進一步提高元數據隱私，防止按 IP 位址進行序列化。",
+    "smp-protocol": "SMP 協定",
+    "simplex-explained-tab-2-p-2": "伺服器僅單向傳遞消息，無法全面瞭解使用者的對話記錄或連接。",
+    "simplex-explained-tab-2-p-1": "對於每個連接，您可以使用兩個單獨的消息佇列通過不同的伺服器發送和接收消息。",
+    "chat-protocol": "聊天協定",
+    "copyright-label": "© 2020-2025 SimpleX |開源專案",
+    "donate": "捐助",
+    "simplex-explained-tab-1-p-1": "您可以創建聯繫人和群組，並進行雙向對話，就像在任何其他 Messenger 中一樣。",
+    "simplex-explained-tab-1-p-2": "它如何在沒有使用者配置檔標識符的情況下使用單向佇列？",
+    "simplex-explained-tab-3-p-1": "伺服器對每個佇列都有單獨的匿名憑證，並且不知道它們屬於哪些使用者。",
+    "chat-bot-example": "聊天機器人示例",
+    "simplex-chat-protocol": "SimpleX Chat 協定",
+    "terms-and-privacy-policy": "隱私策略",
+    "hero-overlay-card-3-p-3": "Trail of Bits 在 2024 年 7 月檢閱了 SimpleX 網路通訊協定的加密設計。<a href=\"/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html\">閱讀更多</a>。",
+    "hero-overlay-3-textlink": "安全評估",
+    "hero-overlay-card-3-p-2": "Trail of Bits 在 2022 年 11 月檢閱了 SimpleX 網路加密和網路元件。<a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">閱讀更多</a>。",
+    "hero-overlay-1-textlink": "用戶ID為何有害私隱？",
+    "hero-overlay-2-textlink": "SimpleX如何工作？",
+    "simplex-private-card-5-point-2": "它讓不同長度的訊息在伺服器和網路觀察者看來相同。",
+    "simplex-private-card-10-point-1": "對用戶與群組成員，SimpleX使用臨時、匿名的地址對與憑證對。",
+    "privacy-matters-1-title": "廣告投放與價格歧視",
+    "privacy-matters-1-overlay-1-linkText": "私隱為您省錢",
+    "privacy-matters-2-title": "操縱選舉",
+    "privacy-matters-2-overlay-1-title": "私隱給您權力",
+    "privacy-matters-2-overlay-1-linkText": "私隱給您權力",
+    "privacy-matters-3-overlay-1-title": "私隱保護您的自由",
+    "privacy-matters-3-overlay-1-linkText": "私隱保護您的自由",
+    "simplex-unique-4-title": "您擁有SimpleX網路",
+    "simplex-unique-4-overlay-1-title": "完全去中心化&mdash;用戶擁有 SimpleX 網路",
+    "hero-overlay-card-1-p-4": "此設計可防止在應用程式層級洩漏任何使用者&apos; 元資料。為了進一步改善隱私並保護您的 IP 位址，您可以透過 Tor 連接到訊息伺服器。",
+    "hero-overlay-card-1-p-5": "只有用戶端會儲存使用者設定檔、聯絡人和群組；訊息傳送採用雙層端對端加密。",
+    "hero-overlay-card-2-p-2": "然後他們可以將這些資訊與現有的公開社交網路進行關聯，並確定一些真實身份。",
+    "simplex-unique-card-1-p-1": "SimpleX 保護您的個人資料、聯絡人和元資料的隱私，使其對 SimpleX 網路伺服器和任何觀察者隱藏。",
+    "scan-qr-code-from-mobile-app": "用手機應用程式掃描二維碼",
+    "scan-the-qr-code-with-the-simplex-chat-app": "使用SimpleX Chat應用程式掃描二維碼",
+    "protocol-3-text": "點對點協議",
+    "hero-p-1": "其他聊天應用，如Signal、Matrix、Session、Briar、Jami、Cwtch等，使用用戶ID；SimpleX不這樣做。它甚至不使用隨機數。這種做法極大地保護用戶私隱。",
+    "hero-2-header-desc": "此視訊教您以一次性QR碼、親身或以視訊連結的方式與聯繫人連線。您也可以通過分享邀請連結與人連線。",
+    "feature-2-title": "端到端加密的圖像、視訊、檔案",
+    "simplex-private-card-9-point-2": "與傳統的訊息代理相比，它可減小攻擊媒介及可見的詮釋資料量。",
+    "simplex-private-10-title": "臨時匿名標識符對",
+    "simplex-private-card-1-point-1": "雙棘輪協定&mdash;帶有前向保密、入侵恢復特質的不留記錄即時通訊協定。",
+    "privacy-matters-3-title": "因無辜關聯而被起訴",
+    "signing-key-fingerprint": "簽名密鑰指紋（SHA-256）",
+    "hero-overlay-card-1-p-3": "您決定用哪個／哪些伺服器接收訊息。您的聯絡人用此伺服器向您傳送訊息。往往每個對話都使用兩台不同的伺服器。",
+    "docs-dropdown-2": "訪問Android檔案",
+    "simplex-unique-card-2-p-1": "由於您在 SimpleX 網路上沒有任何標識符或固定地址，因此除非您分享一次性或臨時地址 (如 二維碼或連結)，任何人都無法與您聯絡。",
+    "see-here": "見此",
+    "privacy-matters-overlay-card-3-p-4": "僅使用端對端加密的通訊工具是不夠的，我們都應使用能保護個人網路隱私的通訊工具。",
+    "hero-overlay-card-1-p-1": "很多用戶問： <em>如果 SimpleX 沒有用戶標識符，它何以知道向何處傳送訊息？</em>",
+    "simplex-unique-overlay-card-4-p-2": "SimpleX網路使用<a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>開源協議</a>並提供<a href='https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-client/typescript' target='_blank'>開發包以編寫聊天機器人</a>，允許使用者透過SimpleX Chat應用程式與服務互動&mdash;我們非常期待看到您的SimpleX服務之作！",
+    "hero-overlay-card-1-p-2": "為傳送訊息，SimpleX 使用消息佇列中的臨時匿名標識符對，每連線各異，而不像其他網路一樣使用用戶ID&mdash; SimpleX 沒有長期標識符。",
+    "privacy-matters-overlay-card-3-p-2": "最令人震驚的故事之一是 <a href='https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi' target='_blank'>Mohamedou Ould Salahi</a> 的經歷，描述於他的回憶錄中，並在《The Mauritanian movie》中呈現。他在未經審訊的情況下被送進關塔納摩集中營，並在那裏遭受了長達 15 年的酷刑，原因是他被懷疑參與了 9/11 襲擊事件，而此前 10 年他一直住在德國。",
+    "simplex-private-2-title": "伺服器附加加密層",
+    "hero-overlay-card-2-p-1": "如使用者擁有持久性身份，即使只是一個隨機數，例如 Session ID，也會有服務提供者或攻擊者可以觀察使用者如何連線以及傳送了多少條訊息的風險。",
+    "simplex-unique-overlay-card-4-p-3": "如您正考慮針對 SimpleX 網路進行開發，例如針對 SimpleX 使用者的聊天機器人，或將 SimpleX 聊天函式庫整合至您的手機應用程式，請<a href='https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D' target='_blank'>與我們聯絡</a>以獲取支持與建議。",
+    "simplex-network-overlay-card-1-li-1": "點對點網路依賴 <a href='https://en.wikipedia.org/wiki/Distributed_hash_table'>DHT</a> 的某些變體來路由訊息。DHT 設計必須平衡傳送保證和延遲。與點對點相比，SimpleX 具有更好的傳送保證和更低的延遲，因為訊息可以使用收件者選擇的伺服器，經由多個伺服器並行冗餘地傳送。在點對點網路中，訊息依次經由<em>O(log N)</em>個由演算法選擇的節點。",
+    "simplex-private-card-3-point-3": "連線恢復被停用，以防止會話攻擊。",
+    "simplex-private-card-2-point-1": "傳送至收件者的伺服器加密附加層，以防止 TLS 遭到攻擊時，接收和傳送的伺服器流量之間的關聯。",
+    "simplex-private-card-5-point-1": "SimpleX 為每個加密層使用內容填充，以挫敗通過監控訊息長度的攻擊。",
+    "comparison-section-list-point-4a": "SimpleX中繼不可能威脅端到端加密。由其他方式驗證安全碼以杜絕攻擊之可能",
+    "docs-dropdown-6": "WebRTC伺服器",
+    "feature-3-title": "端到端加密的、去中心化的群組&mdash;存在只有用戶自己知道",
+    "feature-7-title": "可攜、加密存儲&mdash;將設定檔移至另一設備",
+    "back-to-top": "回到頂部",
+    "click-to-see": "點擊查看",
+    "menu": "功能表",
+    "on-this-page": "此頁中",
+    "docs-dropdown-14": "在商業中使用SimpleX",
+    "glossary": "詞彙表",
+    "simplex-chat-repo": "SimpleX Chat儲存庫",
+    "newer-version-of-eng-msg": "本頁面有更新的英文版本。",
+    "f-droid-page-simplex-chat-repo-section-text": "<span class='hide-on-mobile'>掃描二維碼或</span>使用此URL以添加SimpleX儲存庫至您的F-Droid客戶端：",
+    "jobs": "加入團隊",
+    "please-use-link-in-mobile-app": "請使用手機應用程式中的連結",
+    "stable-versions-built-by-f-droid-org": "由F-Droid.org編譯的穩定版",
+    "please-enable-javascript": "啟用JavaScript以查看二維碼。",
+    "docs-dropdown-8": "SimpleX通訊錄服務",
+    "hero-2-header": "創建私密連線",
+    "hero-overlay-1-title": "SimpleX如何工作？",
+    "hero-overlay-2-title": "用戶ID為何有害私隱？",
+    "hero-overlay-3-title": "安全評估",
+    "feature-1-title": "支持Markdown與編輯的、端到端加密的訊息",
+    "feature-4-title": "端到端加密的語音訊息",
+    "feature-5-title": "自刪除訊息",
+    "feature-6-title": "端到端加密的語音、視訊通話",
+    "simplex-network-overlay-1-title": "與點對點訊息傳輸協定的比較",
+    "simplex-private-1-title": "雙層端到端加密",
+    "simplex-private-3-title": "經安全鑑權的TLS 傳送",
+    "simplex-private-4-title": "可選的經由Tor訪問",
+    "simplex-private-5-title": "多層內容填充",
+    "feature-8-title": "隱身模式&mdash;SimpleX獨有",
+    "simplex-private-6-title": "頻帶外密鑰交換",
+    "simplex-private-7-title": "訊息完整性驗證",
+    "simplex-private-8-title": "訊息混雜以降低關聯性",
+    "simplex-private-card-1-point-2": "如TLS安全受威脅，每個隊列中的NaCL cryptobox可防止關聯訊息隊列間的通訊。",
+    "simplex-private-9-title": "單向訊息隊列",
+    "simplex-private-card-10-point-2": "SimpleX使不用用戶設定檔傳輸訊息成為可能，與其他軟體相比提供更強的詮釋資料私隱性。",
+    "privacy-matters-1-overlay-1-title": "私隱為您省錢",
+    "simplex-unique-1-title": "您擁有完整的私隱權",
+    "simplex-unique-1-overlay-1-title": "您的身份、個人資料、聯絡人與詮釋資料完全隱密",
+    "simplex-unique-2-title": "SimpleX保護您免受垃圾訊息、濫用之害",
+    "simplex-private-card-4-point-1": "為保護您的 IP 位址，您可透過 Tor 或其他傳輸覆蓋網路訪問伺服器。",
+    "simplex-unique-2-overlay-1-title": "防止垃圾郵件和濫用的最佳保護",
+    "simplex-unique-3-title": "您掌控您的數據",
+    "simplex-unique-3-overlay-1-title": "您的數據的擁有權、控制與安全",
+    "hero-overlay-card-2-p-4": "SimpleX 通過在設計中不使用任何使用者 ID以防止這些攻擊。而且，如果您使用匿名聊天模式，每個聯絡人都會有不同的顯示名稱，避免他們之間有任何共用資料。",
+    "hero-overlay-card-2-p-3": "即使是使用 Tor v3 服務的最隱私的應用程式，如果您透過相同的設定檔與兩個不同的人交談，他們也可以證明他們連線的是同一個人。",
+    "hero-overlay-card-1-p-6": "請參閱 <a href='https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md' target='_blank'>SimpleX 白皮書</a>以閱讀更多資訊。",
+    "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> 是一家領先的安全和技術顧問公司，客戶包括大型科技公司、政府機構和主要的區塊鏈專案。",
+    "simplex-network-overlay-card-1-p-1": "<a href='https://en.wikipedia.org/wiki/Peer-to-peer'>點對點</a>通訊協定和應用程式有多種問題，使得它們不如 SimpleX 可靠、分析起來更複雜，而且易受幾種類型的攻擊。",
+    "simplex-network-overlay-card-1-li-2": "SimpleX 的設計與大多數點對點網路不同，沒有任何類型的全局使用者標識符，即使是臨時標識符。SimpleX 只使用臨時的標識符對，提供更好的匿名性和元資料保護。",
+    "privacy-matters-overlay-card-1-p-1": "許多大公司利用與您有聯繫的人的資訊來估計您的收入，向您銷售您並不真正需要的產品，以及定價。",
+    "privacy-matters-overlay-card-1-p-2": "線上零售商知道收入較低的人更有可能進行緊急購物，因此他們可能收取較高的價格或取消折扣。",
+    "enter-your-email-address": "輸入您的電郵地址",
+    "get-simplex": "下載SimpleX <a href=\"/downloads\">桌面版應用程式</a>",
+    "join-us-on-GitHub": "在GitHub上加入我們",
+    "donate-here-to-help-us": "於此捐助以幫助我們",
+    "sign-up-to-receive-our-updates": "登記以收取更新",
+    "join": "加入",
+    "simplex-unique-card-3-p-1": "SimpleX 以 <strong>可攜式加密數據庫格式</strong> 儲存用戶端裝置上的所有使用者資料；這些資料可傳輸至其他設備。",
+    "simplex-unique-card-3-p-2": "端對端加密的訊息暫時保留在 SimpleX 中繼伺服器上，收到訊息後會被永久刪除。",
+    "simplex-unique-card-4-p-2": "您可以<strong>使用您自己的伺服器</strong>運行SimpleX，或使用我們提供的伺服器並仍連線到任何使用者。",
+    "simplex-unique-overlay-card-3-p-4": "傳送與接收的伺服器流量之間沒有共同的標識符或密文&mdash;如果有人觀察，即使 TLS 遭到破壞，也無法輕易確定誰與誰通訊。",
+    "join-the-REDDIT-community": "加入Reddit社群",
+    "privacy-matters-overlay-card-3-p-1": "人人都應關心自己通訊的隱私和安全；無害的對話可能會讓您陷入危險，即使您沒有什麼要隱瞞的。",
+    "privacy-matters-overlay-card-3-p-3": "普通人會因為他們在網路上分享的內容而被捕，即使是透過他們的「匿名」帳號，<a href='https://www.dailymail.co.uk/news/article-11282263/Moment-police-swoop-house-devout-catholic-mother-malicious-online-posts.html' target='_blank'>即使是在民主國家</a>。",
+    "privacy-matters-overlay-card-2-p-1": "不久前我們觀察到大選被<a href='https://en.wikipedia.org/wiki/Facebook-Cambridge_Analytica_data_scandal' target='_blank'>一家聲譽良好的顧問公司</a>操縱，該公司利用我們的社交圖來扭曲我們對真實世界的看法，並操縱我們的選票。",
+    "comparison-section-list-point-2": "基於DNS的位址",
+    "comparison-section-list-point-1": "通常基於電話號碼，有時用戶名",
+    "simplex-private-card-6-point-1": "許多通訊網路容易受到伺服器或網路供應商的中間人攻擊。",
+    "privacy-matters-overlay-card-1-p-4": "SimpleX 網路比任何其他方式都能更好地保護您的連線隱私，完全防止您的社交圖表被任何公司或組織獲得。即使使用 SimpleX Chat 應用程式中預設的伺服器，伺服器操作員也不會知道使用者的數量或他們的連線。",
+    "privacy-matters-overlay-card-2-p-2": "要做到客觀和獨立決策，您需要控制自己的資訊空間。只有當使用無法存取您的社交圖表的私人通訊網路時，您才可能做到這一點。",
+    "simplex-unique-overlay-card-1-p-1": "與其他通訊網路不同，SimpleX <strong>不為使用者指定標識符</strong>。它不依賴電話號碼、網域地址 (如電子郵件或 XMPP)、用戶名、公鑰或甚至隨機數來識別使用者；SimpleX 伺服器操作員不知道有多少人使用他們的伺服器。",
+    "privacy-matters-overlay-card-2-p-3": "SimpleX 是第一個在設計上不使用任何使用者標識符的網路，因此比任何已知的其他方案都能更好地保護您的社交圖。",
+    "simplex-unique-overlay-card-4-p-1": "您可以<strong>使用您自己的伺服器</strong>運行SimpleX，並仍與使用應用程式中預設伺服器的人進行通訊。",
+    "simplex-unique-card-1-p-2": "與任何其他現有的訊息網路不同，SimpleX 不指定使用者的標識符&mdash;<strong>甚至沒有隨機數</strong>。",
+    "why-simplex-is-unique": "SimpleX為何<span class='gradient-text'>與眾不同</span>",
+    "learn-more": "查看更多",
+    "more-info": "更多訊息",
+    "hide-info": "隱藏訊息",
+    "contact-hero-header": "您收到了SimpleX聯絡地址",
+    "simplex-unique-card-4-p-1": "SimpleX 網路是完全去中心化的，獨立於任何加密貨幣或任何其他網路（除Internet）。",
+    "invitation-hero-header": "您收到了SimpleX一次性連結",
+    "contact-hero-subheader": "使用手提電話或平板電腦中的SimpleX應用程式掃描二維碼。",
+    "connect-in-app": "在應用中連結",
+    "contact-hero-p-2": "尚未下載SimpleX？",
+    "contact-hero-p-1": "當您檢視此頁面時，此連結中的公鑰和訊息佇列位址不透過網路傳送；它們包含在連結 URL 的雜湊片段中。",
+    "contact-hero-p-3": "使用以下連結下載應用程式。",
+    "to-make-a-connection": "建立連結：",
+    "install-simplex-app": "安裝 SimpleX 應用程式",
+    "use-this-command": "使用此命令：",
+    "scan-the-qr-code-with-the-simplex-chat-app-description": "當您檢視此頁面時，此連結中的公鑰和訊息佇列位址不會透過網路傳送 &mdash;它們包含在連結 URL 的雜湊片段中。",
+    "installing-simplex-chat-to-terminal": "安裝SimpleX至終端",
+    "open-simplex-app": "開啟SimpleX應用程式",
+    "if-you-already-installed": "如已安裝",
+    "simplex-chat-for-the-terminal": "用於終端的 SimpleX Chat",
+    "if-you-already-installed-simplex-chat-for-the-terminal": "如您已經安裝了用於終端的 SimpleX Chat",
+    "tap-to-close": "輕觸以關閉",
+    "simplex-network-1-desc": "所有訊息都經由伺服器傳送，既能提供更好的元資料隱私和可靠的異步訊息傳送，又能避免許多",
+    "simplex-network-section-desc": "SinpleX Chat 結合點對點和互聯網路的優點，提供最佳的隱私性。",
+    "copy-the-command-below-text": "複製下面的命令並用於聊天：",
+    "privacy-matters-section-header": "隱私為何 <span class='gradient-text'>重要</span>",
+    "privacy-matters-section-label": "確保您的通訊應用程式無法竊取您的資料！",
+    "simplex-network-3-header": "SimpleX網路",
+    "simplex-network-1-overlay-linktext": "點對點網路的弊病",
+    "simplex-network-2-desc": "SimpleX 中繼伺服器不儲存使用者個人資料、聯絡人和傳送的訊息，也不連線彼此，也沒有伺服器目錄。",
+    "simplex-network-2-header": "與互聯網路不同",
+    "comparison-section-header": "與其他協議之比較",
+    "protocol-2-text": "XMPP、Matrix",
+    "comparison-point-1-text": "需要全局身份",
+    "simplex-network-3-desc": "伺服器提供<span class='text-active-blue'>單向佇列</span>以連接使用者，但伺服器無法看到網路連線圖 &mdash;只有使用者能看到。",
+    "protocol-1-text": "Signal，大平台",
+    "comparison-point-2-text": "中間人攻擊之可能",
+    "comparison-point-3-text": "對DNS的依賴",
+    "comparison-point-4-text": "單一或集中式網路",
+    "comparison-section-list-point-3": "公鑰或其他某種全局獨一的標識符",
+    "comparison-section-list-point-5": "不保護使用者的元數據隱私",
+    "comparison-section-list-point-7": "點對點網路必須有中央權威，否則整個網路都可能受到攻擊",
+    "comparison-section-list-point-4": "如果運營商的伺服器受到攻擊，用其他應用程式（如 Signal）驗證 SimpleX 安全碼，以減輕風險",
+    "guide-dropdown-8": "應用程式設定",
+    "guide-dropdown-6": "音視訊通話",
+    "docs-dropdown-1": "SimpleX 網路",
+    "guide": "指南",
+    "docs-dropdown-9": "下載",
+    "docs-dropdown-11": "常見問題",
+    "docs-dropdown-12": "安全性",
+    "docs-dropdown-7": "翻譯SimpleX",
+    "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat 和F-Droid.org 儲存庫使用不同的金鑰為安裝包簽名。若要切換，請<a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>匯出聊天資料庫</a>並重新安裝應用程式。"
+}
diff --git a/website/src/.well-known/apple-app-site-association/index.json b/website/src/.well-known/apple-app-site-association/index.json
index 3cd3fdd043..3b513fe61e 100644
--- a/website/src/.well-known/apple-app-site-association/index.json
+++ b/website/src/.well-known/apple-app-site-association/index.json
@@ -17,6 +17,30 @@
           },
           {
             "/": "/invitation"
+          },
+          {
+            "/": "/a/*"
+          },
+          {
+            "/": "/a"
+          },
+          {
+            "/": "/c/*"
+          },
+          {
+            "/": "/c"
+          },
+          {
+            "/": "/g/*"
+          },
+          {
+            "/": "/g"
+          },
+          {
+            "/": "/i/*"
+          },
+          {
+            "/": "/i"
           }
         ]
       }
diff --git a/website/src/_data/languages.json b/website/src/_data/languages.json
index 0ac05063cc..340cc59da9 100644
--- a/website/src/_data/languages.json
+++ b/website/src/_data/languages.json
@@ -33,12 +33,31 @@
             "flag": "/img/flags/es.svg",
             "enabled": true
         },
+        {
+            "label": "fi",
+            "name": "Suomi",
+            "flag": "/img/flags/fi.svg",
+            "enabled": true
+        },
         {
             "label": "fr",
             "name": "Français",
             "flag": "/img/flags/fr.svg",
             "enabled": true
         },
+        {
+            "label": "he",
+            "name": "עִברִית",
+            "flag": "/img/flags/il.svg",
+            "enabled": true,
+            "rtl": true
+        },
+        {
+            "label": "hu",
+            "name": "Magyar",
+            "flag": "/img/flags/hu.svg",
+            "enabled": true
+        },
         {
             "label": "it",
             "name": "Italiano",
@@ -89,9 +108,9 @@
         },
         {
             "label": "ru",
-            "name": "Russian",
+            "name": "Русский",
             "flag": "/img/flags/ru.svg",
-            "enabled": false
+            "enabled": true
         }
-    ]
+   ]
 }
\ No newline at end of file
diff --git a/website/src/_includes/blog_previews/20250308.html b/website/src/_includes/blog_previews/20250308.html
new file mode 100644
index 0000000000..ab55ecdbca
--- /dev/null
+++ b/website/src/_includes/blog_previews/20250308.html
@@ -0,0 +1,12 @@
+<p><strong>v6.3 is released:</strong></p>
+
+<ul class="mb-[12px]">
+    <li>Preventing spam and abuse in public groups.</li>
+    <li>Group improvements: mention other members and improved performance.</li>
+    <li>Better chat navigation: organize chats into lists and jump to found and forwarded messages.</li>
+    <li>Privacy and security improvements: chat retention period and private media file names.</li>
+</ul>
+
+<p>Also, we added Catalan interface language, thanks to our users and Weblate.</p>
+
+<p>The last but not the least - server builds are now reproducible!</p>
diff --git a/website/src/_includes/sections/simplex_unique.html b/website/src/_includes/sections/simplex_unique.html
index 6759e3a5cb..cdccb3dd5a 100644
--- a/website/src/_includes/sections/simplex_unique.html
+++ b/website/src/_includes/sections/simplex_unique.html
@@ -1,6 +1,6 @@
 <section id="why-simplex" class="bg-primary-bg-light dark:bg-primary-bg-dark py-[90px] overflow-hidden px-0 sm:px-1 xl:h-[888px]">
     <div class="container scale-100">
-        <h2 class="text-grey-black dark:text-white text-[35px] leading-[45px] md:leading-[55px] lg:text-[45px] text-center font-bold mb-14 px-5 sm:px-4">{{ "why-simplex-is" | i18n({}, lang ) | safe }} <span class="gradient-text">{{ "unique" | i18n({}, lang ) | safe }}</span></h2>
+        <h2 class="text-grey-black dark:text-white text-[35px] leading-[45px] md:leading-[55px] lg:text-[45px] text-center font-bold mb-14 px-5 sm:px-4">{{ "why-simplex-is-unique" | i18n({}, lang ) | safe }}</h2>
 
         <div class="swiper unique-swiper px-5 sm:px-4 py-2">
             <div class="swiper-wrapper mb-16">
diff --git a/website/src/finneyforum.html b/website/src/finneyforum.html
deleted file mode 100644
index 06229e4b5d..0000000000
--- a/website/src/finneyforum.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: layouts/group_link.html
-title: "SimpleX Chat - Finney Forum group"
-description: "Join the group of attendees of Finney Forum 2024"
-groupLink: "https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FTlom_0qzRaEWo_4cweE_hzj6KBmqXC8R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAZzyx3sm1tpGsYjXAOR2LxXD0ty1hlAR7Hg0fbCxEoig%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22IfdftVGf9odVOQImmz1I9A%3D%3D%22%7D"
-groupLinkText: Open Finney Forum group link
-templateEngineOverride: njk
----
diff --git a/website/src/img/flags/fi.svg b/website/src/img/flags/fi.svg
new file mode 100644
index 0000000000..470be2d07c
--- /dev/null
+++ b/website/src/img/flags/fi.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-fi" viewBox="0 0 640 480">
+  <path fill="#fff" d="M0 0h640v480H0z"/>
+  <path fill="#002f6c" d="M0 174.5h640v131H0z"/>
+  <path fill="#002f6c" d="M175.5 0h130.9v480h-131z"/>
+</svg>
diff --git a/website/src/img/flags/hu.svg b/website/src/img/flags/hu.svg
new file mode 100644
index 0000000000..baddf7f5ea
--- /dev/null
+++ b/website/src/img/flags/hu.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-hu" viewBox="0 0 640 480">
+  <g fill-rule="evenodd">
+    <path fill="#fff" d="M640 480H0V0h640z"/>
+    <path fill="#388d00" d="M640 480H0V320h640z"/>
+    <path fill="#d43516" d="M640 160.1H0V.1h640z"/>
+  </g>
+</svg>
diff --git a/website/src/img/flags/il.svg b/website/src/img/flags/il.svg
new file mode 100644
index 0000000000..f43be7e8ed
--- /dev/null
+++ b/website/src/img/flags/il.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-il" viewBox="0 0 640 480">
+  <defs>
+    <clipPath id="il-a">
+      <path fill-opacity=".7" d="M-87.6 0H595v512H-87.6z"/>
+    </clipPath>
+  </defs>
+  <g fill-rule="evenodd" clip-path="url(#il-a)" transform="translate(82.1)scale(.94)">
+    <path fill="#fff" d="M619.4 512H-112V0h731.4z"/>
+    <path fill="#0038b8" d="M619.4 115.2H-112V48h731.4zm0 350.5H-112v-67.2h731.4zm-483-275 110.1 191.6L359 191.6z"/>
+    <path fill="#fff" d="m225.8 317.8 20.9 35.5 21.4-35.3z"/>
+    <path fill="#0038b8" d="M136 320.6 246.2 129l112.4 190.8z"/>
+    <path fill="#fff" d="m225.8 191.6 20.9-35.5 21.4 35.4zM182 271.1l-21.7 36 41-.1-19.3-36zm-21.3-66.5 41.2.3-19.8 36.3zm151.2 67 20.9 35.5-41.7-.5zm20.5-67-41.2.3 19.8 36.3zm-114.3 0L189.7 256l28.8 50.3 52.8 1.2 32-51.5-29.6-52z"/>
+  </g>
+</svg>
diff --git a/website/src/livestream.html b/website/src/livestream.html
new file mode 100644
index 0000000000..ee7a96ab30
--- /dev/null
+++ b/website/src/livestream.html
@@ -0,0 +1,8 @@
+---
+layout: layouts/group_link.html
+title: "SimpleX Chat: Power to the People"
+description: "Join the group for livestream Q&A"
+groupLink: "https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2FSkIkI6EPd2D63F4xFKfHk7I1UGZVNn6k1QWZ5rcyr6w%3D%40smp9.simplex.im%2FoVQ-kg2rjMRituleO6t26DhQDPW6OjLL%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEATIRrsU4GwjpF6SeMWa6Li20Rkibgu4ozZMADZfdAZzE%253D%26srv%3Djssqzccmrcws6bhmn77vgmhfjmhwlyr3u7puw4erkyoosywgl67slqqd.onion"
+groupLinkText: Open Livestream Q&A group link
+templateEngineOverride: njk
+---
\ No newline at end of file
diff --git a/website/src/monerokon.html b/website/src/monerokon.html
deleted file mode 100644
index 060c6883bb..0000000000
--- a/website/src/monerokon.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: layouts/group_link.html
-title: "SimpleX Chat - MoneroKon group"
-description: "Join the group of attendees of Monero Konferenco 3 - Praha 2023"
-groupLink: "https://simplex.chat/contact/#/?v=1-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FIE3ZKT3daRLKdQg1nSXK4U1cUK4A81XQ%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAN2vLBKKQiTG58nokhiBIpqvLTyfeyey6UbaFGy4cYH8%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%227LTn4BEWw4bD9Gs8snVEJA%3D%3D%22%7D"
-groupLinkText: Open MoneroKon group link
-templateEngineOverride: njk
----
\ No newline at end of file
diff --git a/website/src/rightscon.html b/website/src/rightscon.html
deleted file mode 100644
index 8cf9c9b484..0000000000
--- a/website/src/rightscon.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: layouts/group_link.html
-title: "SimpleX Chat - RightsCon group"
-description: "Join the group of attendees of RightsCon 2023"
-groupLink: "https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FyHKMxr06RLUiKent0IREl1rwUtsc1MKs%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAwxplfiUKydkqy7Rbl-YQCWUSnrV_ADSd5fWvH17BvEs%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22B3dC9QiKk4AEpGWaLUuPxw%3D%3D%22%7D"
-groupLinkText: Open RightsCon group link
-templateEngineOverride: njk
----
diff --git a/website/web.sh b/website/web.sh
index 4feba4be50..897c87743e 100755
--- a/website/web.sh
+++ b/website/web.sh
@@ -5,6 +5,7 @@ set -e
 cp -R docs website/src
 rm -rf website/src/docs/rfcs
 rm website/src/docs/lang/*/README.md
+rm -rf website/src/docs/dependencies
 cp -R blog website/src
 cp -R images website/src
 rm website/src/blog/README.md